[ruby-dev:35313] Re: [BUG] test_win32ole_event.rb in trunk

artonです。

パッチを作ってみました。手元のVC6＋Windows Vista 64（ただしRubyはx86）で
再現−解消を確認してあります。
ただ、gc中かどうか判断する必要があるため、gc.cにもパッチが必要でした。
また、チェック対象にCALLTYPE_ASYNCは不要なはずですが（待ち状態なので、
Releaseの応答に相当するCALLTYPE_NESTEDと、CALLTYPE_*_CALLPENDINGのみが来
るはず）、一応、アンドキュメンテッドな振る舞いを気にして入れてあります。
パッチの対象は、Ruby-1.9.0-2のソースです。

diff -p gc.c.old gc.c
*** gc.c.old	Wed Jun 18 23:09:33 2008
--- gc.c	Wed Jul 02 18:19:35 2008
*************** rb_fill_value_cache(rb_thread_t *th)
*** 703,708 ****
--- 703,725 ----
  #endif
  
  VALUE
+ rb_during_gc(void)
+ {
+ #if USE_VALUE_CACHE
+     rb_thread_t *th = GET_THREAD();
+     VALUE v = *th->value_cache_ptr;
+ #if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
+     rb_objspace_t *objspace = th->vm->objspace;
+ #else
+     rb_objspace_t *objspace = &rb_objspace;
+ #endif
+ #else
+     rb_objspace_t *objspace = &rb_objspace;
+ #endif
+     return (during_gc) ? Qtrue: Qfalse;
+ }
+ 
+ VALUE
  rb_newobj(void)
  {
  #if USE_VALUE_CACHE

diff -up win32ole.c.old win32ole.c
*** win32ole.c.old	Tue Apr 22 09:58:51 2008
--- win32ole.c	Wed Jul 02 16:49:04 2008
***************
*** 31,37 ****
--- 31,40 ----
  #include <varargs.h>
  #define va_init_list(a,b) va_start(a)
  #endif
+ #include <objidl.h>
  
+ extern VALUE rb_during_gc();
+ 
  #define DOUT fprintf(stderr,"[%d]\n",__LINE__)
  #define DOUTS(x) fprintf(stderr,"[%d]:" #x "=%s\n",__LINE__,x)
  #define DOUTMSG(x) fprintf(stderr, "[%d]:" #x "\n",__LINE__)
*************** static rb_encoding *cWIN32OLE_enc;
*** 201,206 ****
--- 204,212 ----
  static UINT g_cp_to_check = CP_ACP;
  static char g_lcid_to_check[8 + 1];
  static VARTYPE g_nil_to = VT_ERROR;
+ static IMessageFilterVtbl message_filter;
+ static IMessageFilter imessage_filter = { &message_filter };
+ static IMessageFilter* previous_filter;
  
  struct oledata {
      IDispatch *pDispatch;
*************** static VALUE folevariant_ary_aset(int ar
*** 517,522 ****
--- 523,623 ----
  static VALUE folevariant_value(VALUE self);
  static VALUE folevariant_vartype(VALUE self);
  static VALUE folevariant_set_value(VALUE self, VALUE val);
+ 
+ static HRESULT (STDMETHODCALLTYPE mf_QueryInterface)(
+     IMessageFilter __RPC_FAR * This,
+     /* [in] */ REFIID riid,
+     /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject)
+ {
+     if (MEMCMP(riid, &IID_IUnknown, GUID, 1) == 0
+         || MEMCMP(riid, &IID_IMessageFilter, GUID, 1) == 0)
+     {
+         *ppvObject = &message_filter;
+         return S_OK;
+     }
+     return E_NOINTERFACE;
+ }
+ 
+ static ULONG (STDMETHODCALLTYPE mf_AddRef)( 
+     IMessageFilter __RPC_FAR * This)
+ {
+     return 1;
+ }
+         
+ static ULONG (STDMETHODCALLTYPE mf_Release)( 
+     IMessageFilter __RPC_FAR * This)
+ {
+     return 1;
+ }
+ 
+ static DWORD (STDMETHODCALLTYPE mf_HandleInComingCall)(
+     IMessageFilter __RPC_FAR * pThis,
+     DWORD dwCallType,      //Type of incoming call
+     HTASK threadIDCaller,  //Task handle calling this task
+     DWORD dwTickCount,     //Elapsed tick count
+     LPINTERFACEINFO lpInterfaceInfo //Pointer to INTERFACEINFO structure
+     )
+ {
+ #ifdef DEBUG_MESSAGEFILTER
+     printf("incoming %08X, %08X, %d\n", dwCallType, threadIDCaller, dwTickCount);
+     fflush(stdout);
+ #endif
+     switch (dwCallType)
+     {
+     case CALLTYPE_ASYNC:
+     case CALLTYPE_TOPLEVEL_CALLPENDING:
+     case CALLTYPE_ASYNC_CALLPENDING:
+         if (rb_during_gc() == Qtrue) {
+             return SERVERCALL_RETRYLATER;
+         }
+         break;
+     default:
+         break;
+     }
+     if (previous_filter) {
+         return previous_filter->lpVtbl->HandleInComingCall(previous_filter,
+                                                    dwCallType,
+                                                    threadIDCaller,
+                                                    dwTickCount,
+                                                    lpInterfaceInfo);
+     }
+     return SERVERCALL_ISHANDLED;
+ }
+ 
+ static DWORD (STDMETHODCALLTYPE mf_RetryRejectedCall)(
+     IMessageFilter* pThis,
+     HTASK threadIDCallee,  //Server task handle
+     DWORD dwTickCount,     //Elapsed tick count
+     DWORD dwRejectType     //Returned rejection message
+     )
+ {
+     if (previous_filter) {
+         return previous_filter->lpVtbl->RetryRejectedCall(previous_filter,
+                                                   threadIDCallee,
+                                                   dwTickCount,
+                                                   dwRejectType);
+     }
+     return 1000;
+ }
+ 
+ static DWORD (STDMETHODCALLTYPE mf_MessagePending)(
+     IMessageFilter* pThis,
+     HTASK threadIDCallee,  //Called applications task handle
+     DWORD dwTickCount,     //Elapsed tick count
+     DWORD dwPendingType    //Call type
+     )
+ {
+     if (rb_during_gc()) {
+         return PENDINGMSG_WAITNOPROCESS;
+     }
+     if (previous_filter) {
+         return previous_filter->lpVtbl->MessagePending(previous_filter,
+                                                threadIDCallee,
+                                                dwTickCount,
+                                                dwPendingType);
+     }
+     return PENDINGMSG_WAITNOPROCESS;
+ }
    
  typedef struct _Win32OLEIDispatch
  {
*************** ole_initialize() 
*** 1050,1055 ****
--- 1151,1161 ----
          /*
          atexit((void (*)(void))ole_uninitialize);
          */
+         hr = CoRegisterMessageFilter(&imessage_filter, &previous_filter);
+         if(FAILED(hr)) {
+             previous_filter = NULL;
+             ole_raise(hr, rb_eRuntimeError, "fail: install OLE MessageFilter");
+         }
      }
  }
  
*************** Init_win32ole()
*** 8106,8111 ****
--- 8212,8225 ----
      com_vtbl.GetTypeInfo = GetTypeInfo;
      com_vtbl.GetIDsOfNames = GetIDsOfNames;
      com_vtbl.Invoke = Invoke;
+ 
+     message_filter.QueryInterface = mf_QueryInterface;
+     message_filter.AddRef = mf_AddRef;
+     message_filter.Release = mf_Release;
+     message_filter.HandleInComingCall = mf_HandleInComingCall;
+     message_filter.RetryRejectedCall = mf_RetryRejectedCall;
+     message_filter.MessagePending = mf_MessagePending;
+ 
      com_hash = Data_Wrap_Struct(rb_cData, rb_mark_hash, st_free_table, st_init_numtable());
      rb_register_mark_object(com_hash);

--------------------------------------
Stop! Global Warming ~ Yahoo! JAPAN Earth Project
http://pr.mail.yahoo.co.jp/earthproject/