May 2007 - Wine-Commits - list.winehq.org

Rolf Kalbermatter : advapi32: Store process ID into status structure on startup.
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: 4b7c5097c3892c21b785637ddded2370a7169e96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b7c5097c3892c21b785637dd… Author: Rolf Kalbermatter <r.kalbermatter(a)hccnet.nl> Date: Mon May 7 22:11:07 2007 +0200 advapi32: Store process ID into status structure on startup. --- dlls/advapi32/service.c | 48 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 3979b06..69f38fb 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -3,6 +3,7 @@ * * Copyright 1995 Sven Verdoolaege * Copyright 2005 Mike McCormack + * Copyright 2007 Rolf Kalbermatter * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -53,6 +54,7 @@ typedef struct service_start_info_t #define WINESERV_STARTINFO 1 #define WINESERV_GETSTATUS 2 #define WINESERV_SENDCONTROL 3 +#define WINESERV_SETPID 4 typedef struct service_data_t { @@ -520,6 +522,41 @@ static BOOL service_get_status(HANDLE pipe, LPSERVICE_STATUS_PROCESS status) } /****************************************************************************** + * service_handle_set_processID + */ +static BOOL service_handle_set_processID(HANDLE pipe, service_data *service, DWORD dwProcessId) +{ + DWORD count, ret = ERROR_SUCCESS; + + TRACE("received control %d\n", dwProcessId); + service->status.dwProcessId = dwProcessId; + return WriteFile(pipe, &ret, sizeof ret , &count, NULL); +} + +/****************************************************************************** + * service_set_processID + */ +static BOOL service_set_processID(HANDLE pipe, DWORD dwprocessId, LPDWORD dwResult) +{ + DWORD cmd[2], count = 0; + BOOL r; + + cmd[0] = WINESERV_SETPID; + cmd[1] = dwprocessId; + r = WriteFile( pipe, cmd, sizeof cmd, &count, NULL ); + if (!r || count != sizeof cmd) + { + ERR("service protocol error - failed to write pipe!\n"); + return r; + } + r = ReadFile( pipe, dwResult, sizeof *dwResult, &count, NULL ); + if (!r || count != sizeof *dwResult) + ERR("service protocol error - failed to read pipe " + "r = %d count = %d!\n", r, count); + return r; +} + +/****************************************************************************** * service_send_control */ static BOOL service_send_control(HANDLE pipe, DWORD dwControl, DWORD *result) @@ -704,6 +741,9 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) case WINESERV_SENDCONTROL: service_handle_control(pipe, service, req[1]); break; + case WINESERV_SETPID: + service_handle_set_processID(pipe, service, req[1]); + break; default: ERR("received invalid command %d length %d\n", req[0], req[1]); } @@ -1523,7 +1563,7 @@ BOOL WINAPI StartServiceW(SC_HANDLE hService, DWORD dwNumServiceArgs, { struct sc_service *hsvc; BOOL r = FALSE; - DWORD pid; + DWORD dwResult, dwProcessId = 0; SC_LOCK hLock; HANDLE handle = INVALID_HANDLE_VALUE; @@ -1544,15 +1584,15 @@ BOOL WINAPI StartServiceW(SC_HANDLE hService, DWORD dwNumServiceArgs, if (handle==INVALID_HANDLE_VALUE) { /* start the service process */ - if (service_start_process(hsvc, &pid)) + if (service_start_process(hsvc, &dwProcessId)) handle = service_open_pipe(hsvc->name); } if (handle != INVALID_HANDLE_VALUE) { - service_send_start_message(handle, lpServiceArgVectors, dwNumServiceArgs); + if (service_send_start_message(handle, lpServiceArgVectors, dwNumServiceArgs)) + r = service_set_processID(handle, dwProcessId, &dwResult); CloseHandle(handle); - r = TRUE; } UnlockServiceDatabase( hLock );

1 0

Dmitry Timoshkov : user32: Windows doesn' t send the initialization messages to a dialog if a passed in dlgProc is NULL .
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: 1eea906dadd5b134b44a3336afa378a2b1ece074 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eea906dadd5b134b44a3336a… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue May 8 17:47:41 2007 +0900 user32: Windows doesn't send the initialization messages to a dialog if a passed in dlgProc is NULL. --- dlls/user32/dialog.c | 17 ++++--- dlls/user32/tests/msg.c | 104 ++++++++++++++++++++++++++++++++++++++++- dlls/user32/tests/resource.rc | 8 +++ 3 files changed, 121 insertions(+), 8 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 3acd37a..ad729d0 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -651,7 +651,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, if (unicode) SetWindowLongPtrW( hwnd, DWLP_DLGPROC, (ULONG_PTR)dlgProc ); else SetWindowLongPtrA( hwnd, DWLP_DLGPROC, (ULONG_PTR)dlgProc ); - if (dlgInfo->hUserFont) + if (dlgProc && dlgInfo->hUserFont) SendMessageW( hwnd, WM_SETFONT, (WPARAM)dlgInfo->hUserFont, 0 ); /* Create controls */ @@ -660,13 +660,16 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, { /* Send initialisation messages and set focus */ - if (SendMessageW( hwnd, WM_INITDIALOG, (WPARAM)dlgInfo->hwndFocus, param ) && - ((~template.style & DS_CONTROL) || (template.style & WS_VISIBLE))) + if (dlgProc) { - /* By returning TRUE, app has requested a default focus assignment */ - dlgInfo->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE); - if( dlgInfo->hwndFocus ) - SetFocus( dlgInfo->hwndFocus ); + if (SendMessageW( hwnd, WM_INITDIALOG, (WPARAM)dlgInfo->hwndFocus, param ) && + ((~template.style & DS_CONTROL) || (template.style & WS_VISIBLE))) + { + /* By returning TRUE, app has requested a default focus assignment */ + dlgInfo->hwndFocus = GetNextDlgTabItem( hwnd, 0, FALSE); + if( dlgInfo->hwndFocus ) + SetFocus( dlgInfo->hwndFocus ); + } } if (template.style & WS_VISIBLE && !(GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index a6daf82..b40f678 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -207,7 +207,7 @@ static const struct message WmSWP_ResizeNoZOrder[] = { { WM_NCCALCSIZE, sent|wparam, 1 }, { WM_NCPAINT, sent }, { WM_GETTEXT, sent|defwinproc|optional }, - { WM_ERASEBKGND, sent|parent|optional }, /* FIXME: remove optional once Wine is fixed */ + { WM_ERASEBKGND, sent|optional }, /* FIXME: remove optional once Wine is fixed */ { WM_WINDOWPOSCHANGED, sent|wparam, /*SWP_NOZORDER|*/SWP_NOMOVE|SWP_NOCLIENTMOVE }, { WM_SIZE, sent|defwinproc|wparam, 0 }, { WM_NCCALCSIZE, sent|wparam|optional, 1 }, /* Win9x doesn't send it */ @@ -6321,6 +6321,7 @@ static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam) !lstrcmpiA(buf, "my_button_class") || !lstrcmpiA(buf, "my_edit_class") || !lstrcmpiA(buf, "static") || + !lstrcmpiA(buf, "MyDialogClass") || !lstrcmpiA(buf, "#32770")) { struct message msg; @@ -6367,6 +6368,7 @@ static void CALLBACK win_event_proc(HWINEVENTHOOK hevent, !lstrcmpiA(buf, "my_button_class") || !lstrcmpiA(buf, "my_edit_class") || !lstrcmpiA(buf, "static") || + !lstrcmpiA(buf, "MyDialogClass") || !lstrcmpiA(buf, "#32770")) { struct message msg; @@ -8874,6 +8876,56 @@ static void test_ShowWindow(void) DestroyWindow(hwnd); } +static INT_PTR WINAPI test_dlg_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + struct message msg; + + trace("dialog: %p, %04x, %08x, %08lx\n", hwnd, message, wParam, lParam); + + switch (message) + { + case WM_WINDOWPOSCHANGING: + case WM_WINDOWPOSCHANGED: + { + WINDOWPOS *winpos = (WINDOWPOS *)lParam; + + trace("%s\n", (message == WM_WINDOWPOSCHANGING) ? "WM_WINDOWPOSCHANGING" : "WM_WINDOWPOSCHANGED"); + trace("%p after %p, x %d, y %d, cx %d, cy %d flags %08x\n", + winpos->hwnd, winpos->hwndInsertAfter, + winpos->x, winpos->y, winpos->cx, winpos->cy, winpos->flags); + dump_winpos_flags(winpos->flags); + + /* Log only documented flags, win2k uses 0x1000 and 0x2000 + * in the high word for internal purposes + */ + wParam = winpos->flags & 0xffff; + /* We are not interested in the flags that don't match under XP and Win9x */ + wParam &= ~(SWP_NOZORDER); + break; + } + + /* explicitly ignore WM_GETICON message */ + case WM_GETICON: + return 0; + } + + msg.message = message; + msg.flags = sent|wparam|lparam; + msg.wParam = wParam; + msg.lParam = lParam; + add_message(&msg); + + /* calling DefDlgProc leads to a recursion under XP */ + + switch (message) + { + case WM_INITDIALOG: + case WM_GETDLGCODE: + return 0; + } + return 1; +} + static const struct message WmDefDlgSetFocus_1[] = { { WM_GETDLGCODE, sent|wparam|lparam, 0, 0 }, { WM_GETTEXTLENGTH, sent|wparam|lparam|optional, 0, 0 }, /* XP */ @@ -8898,11 +8950,39 @@ static const struct message WmDefDlgSetFocus_2[] = { { WM_GETTEXT, sent|wparam|optional, 6 }, /* XP */ { WM_GETTEXT, sent|wparam|optional, 12 }, /* XP */ { EM_SETSEL, sent|wparam, 0 }, /* XP sets lparam to text length, Win9x to -2 */ + { WM_CTLCOLOREDIT, sent|optional }, /* XP */ + { 0 } +}; +/* Creation of a dialog */ +static const struct message WmCreateDialogParamSeq_1[] = { + { HCBT_CREATEWND, hook }, + { WM_NCCREATE, sent }, + { WM_NCCALCSIZE, sent|wparam, 0 }, + { WM_CREATE, sent }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_SIZE, sent|wparam, SIZE_RESTORED }, + { WM_MOVE, sent }, + { WM_SETFONT, sent }, + { WM_INITDIALOG, sent }, + { WM_CHANGEUISTATE, sent|optional }, + { 0 } +}; +/* Creation of a dialog */ +static const struct message WmCreateDialogParamSeq_2[] = { + { HCBT_CREATEWND, hook }, + { WM_NCCREATE, sent }, + { WM_NCCALCSIZE, sent|wparam, 0 }, + { WM_CREATE, sent }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_SIZE, sent|wparam, SIZE_RESTORED }, + { WM_MOVE, sent }, + { WM_CHANGEUISTATE, sent|optional }, { 0 } }; static void test_dialog_messages(void) { + WNDCLASS cls; HWND hdlg, hedit1, hedit2, hfocus; LRESULT ret; @@ -8973,9 +9053,31 @@ static void test_dialog_messages(void) check_selection(hedit2, 0, 3); EndDialog(hdlg, 0); + flush_sequence(); #undef set_selection #undef check_selection + + ok(GetClassInfo(0, "#32770", &cls), "GetClassInfo failed\n"); + cls.lpszClassName = "MyDialogClass"; + cls.hInstance = GetModuleHandle(0); + /* need a cast since a dlgproc is used as a wndproc */ + cls.lpfnWndProc = (WNDPROC)test_dlg_proc; + if (!RegisterClass(&cls)) assert(0); + + hdlg = CreateDialogParam(0, "CLASS_TEST_DIALOG_2", 0, test_dlg_proc, 0); + ok(IsWindow(hdlg), "CreateDialogParam failed\n"); + ok_sequence(WmCreateDialogParamSeq_1, "CreateDialogParam_1", FALSE); + EndDialog(hdlg, 0); + flush_sequence(); + + hdlg = CreateDialogParam(0, "CLASS_TEST_DIALOG_2", 0, NULL, 0); + ok(IsWindow(hdlg), "CreateDialogParam failed\n"); + ok_sequence(WmCreateDialogParamSeq_2, "CreateDialogParam_2", FALSE); + EndDialog(hdlg, 0); + flush_sequence(); + + UnregisterClass(cls.lpszClassName, cls.hInstance); } static void test_nullCallback(void) diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index 8434f61..47328fc 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -72,6 +72,14 @@ FONT 8, "MS Shell Dlg" { } +CLASS_TEST_DIALOG_2 DIALOG DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "CreateDialogParams Test" +CLASS "MyDialogClass" +FONT 8, "MS Shell Dlg" +{ +} + FOCUS_TEST_DIALOG DIALOG DISCARDABLE 0, 0, 60, 30 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_CONTROL CAPTION "Test dialog"

1 0

Detlef Riekenberg : ddraw/tests: Fix typos in messages.
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: 00028b0c376ae24a4d4c697c106c02fa6687ee49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00028b0c376ae24a4d4c697c1… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue May 8 05:14:41 2007 +0200 ddraw/tests: Fix typos in messages. --- dlls/ddraw/tests/dsurface.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index a2fd5d6..653cf7e 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1810,9 +1810,9 @@ static void SizeTest(void) dsurface = NULL; ok(desc.dwFlags & DDSD_WIDTH, "Primary surface doesn't have width set\n"); - ok(desc.dwFlags & DDSD_HEIGHT, "Primary surface doesn't have hight set\n"); - ok(desc.dwWidth == GetSystemMetrics(SM_CXSCREEN), "Surface Width differs from screen Width\n"); - ok(desc.dwHeight == GetSystemMetrics(SM_CYSCREEN), "Surface Width differs from screen Width\n"); + ok(desc.dwFlags & DDSD_HEIGHT, "Primary surface doesn't have height set\n"); + ok(desc.dwWidth == GetSystemMetrics(SM_CXSCREEN), "Surface width differs from screen width\n"); + ok(desc.dwHeight == GetSystemMetrics(SM_CYSCREEN), "Surface height differs from screen height\n"); } ret = IDirectDraw_SetCooperativeLevel(lpDD, NULL, DDSCL_NORMAL); ok(ret == DD_OK, "SetCooperativeLevel failed with %08x\n", ret);

1 0

Alexandre Julliard : kernel32: Set the dll file name with the correct case to make EXECryptor happy.
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: 6604181c85633b79c7c4804dee0e9723adaa5ff0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6604181c85633b79c7c4804de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 8 13:25:48 2007 +0200 kernel32: Set the dll file name with the correct case to make EXECryptor happy. --- dlls/Makedll.rules.in | 2 +- dlls/kernel32/Makefile.in | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index fe77784..3162175 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -32,7 +32,7 @@ all: $(MODULE)$(DLLEXT) $(SUBDIRS) # Rules for .so files $(MODULE).so: $(MAINSPEC) $(ALL_OBJS) Makefile.in - $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -shared $(SRCDIR)/$(MAINSPEC) $(ALL_OBJS) $(SUBSYSTEM:%=-Wb,--subsystem,%) $(BASEADDRESS:%=-Wl,--image-base,%) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) + $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -shared $(SRCDIR)/$(MAINSPEC) $(ALL_OBJS) $(SUBSYSTEM:%=-Wb,--subsystem,%) $(DLLFILENAME:%=-Wb,-F,%) $(BASEADDRESS:%=-Wl,--image-base,%) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) # Rules for .dll files diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index 09105be..7b0b4cc 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -7,6 +7,7 @@ MODULE = kernel32.dll IMPORTLIB = libkernel32.$(IMPLIBEXT) IMPORTS = ntdll EXTRALIBS = @COREFOUNDATIONLIB@ @LIBPOLL@ +DLLFILENAME = KERNEL32.dll BASEADDRESS = 0x7b800000 SPEC_SRCS16 = \

1 0

Rob Shearman : ole32: Add a test for the retrieved local class object in another thread being a proxy .
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: 71ada5c65472ce16ac5cd9bcf317bec0b49ae027 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71ada5c65472ce16ac5cd9bcf… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue May 8 00:03:18 2007 +0100 ole32: Add a test for the retrieved local class object in another thread being a proxy. --- dlls/ole32/tests/compobj.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 739dec1..12fe4f6 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -747,6 +747,31 @@ static DWORD CALLBACK get_class_object_thread(LPVOID pv) return hr; } +static DWORD CALLBACK get_class_object_proxy_thread(LPVOID pv) +{ + CLSCTX clsctx = (CLSCTX)(DWORD_PTR)pv; + HRESULT hr; + IClassFactory *pcf; + IMultiQI *pMQI; + + pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + hr = CoGetClassObject(&CLSID_WineOOPTest, clsctx, NULL, &IID_IClassFactory, + (void **)&pcf); + + if (SUCCEEDED(hr)) + { + hr = IClassFactory_QueryInterface(pcf, &IID_IMultiQI, (void **)&pMQI); + if (SUCCEEDED(hr)) + IMultiQI_Release(pMQI); + IClassFactory_Release(pcf); + } + + CoUninitialize(); + + return hr; +} + static DWORD CALLBACK register_class_object_thread(LPVOID pv) { HRESULT hr; @@ -821,7 +846,7 @@ static void test_registered_object_thread_affinity(void) CLSCTX_LOCAL_SERVER, REGCLS_MULTIPLEUSE, &cookie); ok_ole_success(hr, "CoRegisterClassObject"); - thread = CreateThread(NULL, 0, get_class_object_thread, (LPVOID)CLSCTX_LOCAL_SERVER, 0, &tid); + thread = CreateThread(NULL, 0, get_class_object_proxy_thread, (LPVOID)CLSCTX_LOCAL_SERVER, 0, &tid); ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); while (MsgWaitForMultipleObjects(1, &thread, FALSE, INFINITE, QS_ALLINPUT) == WAIT_OBJECT_0 + 1) {

1 0

Rob Shearman : ole32: Add documentation for error info functions.
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: 07229ed8ec07cf6a5353e5ff6eab1129a4410d72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07229ed8ec07cf6a5353e5ff6… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue May 8 00:02:06 2007 +0100 ole32: Add documentation for error info functions. --- dlls/ole32/errorinfo.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c index 01dc305..7318a97 100644 --- a/dlls/ole32/errorinfo.c +++ b/dlls/ole32/errorinfo.c @@ -465,8 +465,18 @@ static const ISupportErrorInfoVtbl ISupportErrorInfoImpl_VTable = ISupportErrorInfoImpl_InterfaceSupportsErrorInfo }; + /*********************************************************************** * CreateErrorInfo (OLE32.@) + * + * Creates an object used to set details for an error info object. + * + * PARAMS + * pperrinfo [O]. Address where error info creation object will be stored. + * + * RETURNS + * Success: S_OK. + * Failure: HRESULT code. */ HRESULT WINAPI CreateErrorInfo(ICreateErrorInfo **pperrinfo) { @@ -483,6 +493,21 @@ HRESULT WINAPI CreateErrorInfo(ICreateErrorInfo **pperrinfo) /*********************************************************************** * GetErrorInfo (OLE32.@) + * + * Retrieves the error information object for the current thread. + * + * PARAMS + * dwReserved [I]. Reserved. Must be zero. + * pperrinfo [O]. Address where error information object will be stored on return. + * + * RETURNS + * Success: S_OK if an error information object was set for the current thread. + * S_FALSE if otherwise. + * Failure: E_INVALIDARG if dwReserved is not zero. + * + * NOTES + * This function causes the current error info object for the thread to be + * cleared if one was set beforehand. */ HRESULT WINAPI GetErrorInfo(ULONG dwReserved, IErrorInfo **pperrinfo) { @@ -511,6 +536,16 @@ HRESULT WINAPI GetErrorInfo(ULONG dwReserved, IErrorInfo **pperrinfo) /*********************************************************************** * SetErrorInfo (OLE32.@) + * + * Sets the error information object for the current thread. + * + * PARAMS + * dwReserved [I] Reserved. Must be zero. + * perrinfo [I] Error info object. + * + * RETURNS + * Success: S_OK. + * Failure: E_INVALIDARG if dwReserved is not zero. */ HRESULT WINAPI SetErrorInfo(ULONG dwReserved, IErrorInfo *perrinfo) {

1 0

Rob Shearman : ole32: Add documentation about registered class objects only being visible in the apartment in which they were registered .
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: 314f9fe509f7f96fc2bd9cc38382a50602225409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=314f9fe509f7f96fc2bd9cc38… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue May 8 00:01:19 2007 +0100 ole32: Add documentation about registered class objects only being visible in the apartment in which they were registered. --- dlls/ole32/compobj.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 5ba74d7..7eef76e 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1646,6 +1646,11 @@ static HRESULT COM_GetRegisteredClassObject( * SEE ALSO * CoRevokeClassObject, CoGetClassObject * + * NOTES + * In-process objects are only registered for the current apartment. + * CoGetClassObject() and CoCreateInstance() will not return objects registered + * in other apartments. + * * BUGS * MSDN claims that multiple interface registrations are legal, but we * can't do that with our current implementation. @@ -1801,6 +1806,10 @@ static void COM_RevokeAllClasses(struct apartment *apt) * Success: S_OK. * Failure: HRESULT code. * + * NOTES + * Must be called from the same apartment that called CoRegisterClassObject(), + * otherwise it will fail with RPC_E_WRONG_THREAD. + * * SEE ALSO * CoRegisterClassObject */

1 0

Rob Shearman : ole32: Fix CoRevokeClassObject to return RPC_E_WRONG_THREAD if it was called from a different apartment than the one that called CoRegisterClassObject .
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: 7d7f9a59d0a66647042f5a639fdf584e166b7314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d7f9a59d0a66647042f5a639… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue May 8 00:00:41 2007 +0100 ole32: Fix CoRevokeClassObject to return RPC_E_WRONG_THREAD if it was called from a different apartment than the one that called CoRegisterClassObject. --- dlls/ole32/compobj.c | 21 +++++++++++++++++++-- dlls/ole32/tests/compobj.c | 2 -- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 808d94e..5ba74d7 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1809,9 +1809,17 @@ HRESULT WINAPI CoRevokeClassObject( { HRESULT hr = E_INVALIDARG; RegisteredClass *curClass; + APARTMENT *apt; TRACE("(%08x)\n",dwRegister); + apt = COM_CurrentApt(); + if (!apt) + { + ERR("COM was not initialized\n"); + return CO_E_NOTINITIALIZED; + } + EnterCriticalSection( &csRegisteredClassList ); LIST_FOR_EACH_ENTRY(curClass, &RegisteredClassList, RegisteredClass, entry) @@ -1821,8 +1829,17 @@ HRESULT WINAPI CoRevokeClassObject( */ if (curClass->dwCookie == dwRegister) { - COM_RevokeRegisteredClassObject(curClass); - hr = S_OK; + if (curClass->apartment_id == apt->oxid) + { + COM_RevokeRegisteredClassObject(curClass); + hr = S_OK; + } + else + { + ERR("called from wrong apartment, should be called from %s\n", + wine_dbgstr_longlong(curClass->apartment_id)); + hr = RPC_E_WRONG_THREAD; + } break; } } diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index d9d93a5..739dec1 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -847,7 +847,6 @@ static void test_registered_object_thread_affinity(void) WaitForSingleObject(thread, INFINITE); GetExitCodeThread(thread, &exitcode); hr = exitcode; - todo_wine ok(hr == RPC_E_WRONG_THREAD, "CoRevokeClassObject called from different " "thread to where registered should return RPC_E_WRONG_THREAD instead of 0x%08x\n", hr); @@ -860,7 +859,6 @@ static void test_registered_object_thread_affinity(void) "thread should return S_OK instead of 0x%08x\n", hr); hr = CoRevokeClassObject(cookie); - todo_wine ok_ole_success(hr, "CoRevokeClassObject"); CoUninitialize();

1 0

Rob Shearman : ole32: Split CoRevokeClassObject into a separate function, COM_RevokeRegisteredClassObject, which acts on a RegisteredClass object.
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: 23e43d886e7983eda033d4668cbbdbb1d0821dac URL: http://source.winehq.org/git/wine.git/?a=commit;h=23e43d886e7983eda033d4668… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon May 7 23:59:56 2007 +0100 ole32: Split CoRevokeClassObject into a separate function, COM_RevokeRegisteredClassObject, which acts on a RegisteredClass object. --- dlls/ole32/compobj.c | 77 +++++++++++++++++++++++++------------------------ 1 files changed, 39 insertions(+), 38 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 121b3fd..808d94e 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1624,21 +1624,6 @@ static HRESULT COM_GetRegisteredClassObject( return hr; } -static void COM_RevokeAllClasses(struct apartment *apt) -{ - RegisteredClass *curClass, *cursor; - - EnterCriticalSection( &csRegisteredClassList ); - - LIST_FOR_EACH_ENTRY_SAFE(curClass, cursor, &RegisteredClassList, RegisteredClass, entry) - { - if (curClass->apartment_id == apt->oxid) - CoRevokeClassObject(curClass->dwCookie); - } - - LeaveCriticalSection( &csRegisteredClassList ); -} - /****************************************************************************** * CoRegisterClassObject [OLE32.@] * @@ -1766,6 +1751,44 @@ HRESULT WINAPI CoRegisterClassObject( return S_OK; } +static void COM_RevokeRegisteredClassObject(RegisteredClass *curClass) +{ + list_remove(&curClass->entry); + + if (curClass->runContext & CLSCTX_LOCAL_SERVER) + RPC_StopLocalServer(curClass->RpcRegistration); + + /* + * Release the reference to the class object. + */ + IUnknown_Release(curClass->classObject); + + if (curClass->pMarshaledData) + { + LARGE_INTEGER zero; + memset(&zero, 0, sizeof(zero)); + IStream_Seek(curClass->pMarshaledData, zero, STREAM_SEEK_SET, NULL); + CoReleaseMarshalData(curClass->pMarshaledData); + } + + HeapFree(GetProcessHeap(), 0, curClass); +} + +static void COM_RevokeAllClasses(struct apartment *apt) +{ + RegisteredClass *curClass, *cursor; + + EnterCriticalSection( &csRegisteredClassList ); + + LIST_FOR_EACH_ENTRY_SAFE(curClass, cursor, &RegisteredClassList, RegisteredClass, entry) + { + if (curClass->apartment_id == apt->oxid) + COM_RevokeRegisteredClassObject(curClass); + } + + LeaveCriticalSection( &csRegisteredClassList ); +} + /*********************************************************************** * CoRevokeClassObject [OLE32.@] * @@ -1798,29 +1821,7 @@ HRESULT WINAPI CoRevokeClassObject( */ if (curClass->dwCookie == dwRegister) { - list_remove(&curClass->entry); - - if (curClass->runContext & CLSCTX_LOCAL_SERVER) - RPC_StopLocalServer(curClass->RpcRegistration); - - /* - * Release the reference to the class object. - */ - IUnknown_Release(curClass->classObject); - - if (curClass->pMarshaledData) - { - LARGE_INTEGER zero; - memset(&zero, 0, sizeof(zero)); - IStream_Seek(curClass->pMarshaledData, zero, STREAM_SEEK_SET, NULL); - CoReleaseMarshalData(curClass->pMarshaledData); - } - - /* - * Free the memory used by the chain node. - */ - HeapFree(GetProcessHeap(), 0, curClass); - + COM_RevokeRegisteredClassObject(curClass); hr = S_OK; break; }

1 0

Rob Shearman : ole32: COM_GetRegisteredClassObject should only retrieve objects that were registered in the current apartment .
by Alexandre Julliard May 8, 2007

May 8, 2007

Module: wine Branch: master Commit: 51f85a765b498ba79f0134b097924d4fd6cfb3d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51f85a765b498ba79f0134b09… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon May 7 23:59:09 2007 +0100 ole32: COM_GetRegisteredClassObject should only retrieve objects that were registered in the current apartment. --- dlls/ole32/compobj.c | 25 +++++++++++++++---------- dlls/ole32/tests/compobj.c | 2 -- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index b9669f2..121b3fd 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -76,9 +76,9 @@ HINSTANCE OLE32_hInstance = 0; /* FIXME: make static ... */ * TODO: Most of these things will have to be made thread-safe. */ -static HRESULT COM_GetRegisteredClassObject(REFCLSID rclsid, DWORD dwClsContext, LPUNKNOWN* ppUnk); +static HRESULT COM_GetRegisteredClassObject(struct apartment *apt, REFCLSID rclsid, DWORD dwClsContext, LPUNKNOWN* ppUnk); static void COM_RevokeAllClasses(struct apartment *apt); -static HRESULT get_inproc_class_object(HKEY hkeydll, REFCLSID rclsid, REFIID riid, void **ppv); +static HRESULT get_inproc_class_object(APARTMENT *apt, HKEY hkeydll, REFCLSID rclsid, REFIID riid, void **ppv); static APARTMENT *MTA; /* protected by csApartment */ static APARTMENT *MainApartment; /* the first STA apartment */ @@ -1583,6 +1583,7 @@ HRESULT WINAPI CoRegisterPSClsid(REFIID riid, REFCLSID rclsid) * reference count on this object. */ static HRESULT COM_GetRegisteredClassObject( + struct apartment *apt, REFCLSID rclsid, DWORD dwClsContext, LPUNKNOWN* ppUnk) @@ -1602,7 +1603,8 @@ static HRESULT COM_GetRegisteredClassObject( /* * Check if we have a match on the class ID and context. */ - if ((dwClsContext & curClass->runContext) && + if ((apt->oxid == curClass->apartment_id) && + (dwClsContext & curClass->runContext) && IsEqualGUID(&(curClass->classIdentifier), rclsid)) { /* @@ -1699,7 +1701,7 @@ HRESULT WINAPI CoRegisterClassObject( * First, check if the class is already registered. * If it is, this should cause an error. */ - hr = COM_GetRegisteredClassObject(rclsid, dwClsContext, &foundObject); + hr = COM_GetRegisteredClassObject(apt, rclsid, dwClsContext, &foundObject); if (hr == S_OK) { if (flags & REGCLS_MULTIPLEUSE) { if (dwClsContext & CLSCTX_LOCAL_SERVER) @@ -1867,7 +1869,8 @@ static void get_threading_model(HKEY key, LPWSTR value, DWORD len) value[0] = '\0'; } -static HRESULT get_inproc_class_object(HKEY hkeydll, REFCLSID rclsid, REFIID riid, void **ppv) +static HRESULT get_inproc_class_object(APARTMENT *apt, HKEY hkeydll, + REFCLSID rclsid, REFIID riid, void **ppv) { static const WCHAR wszApartment[] = {'A','p','a','r','t','m','e','n','t',0}; static const WCHAR wszFree[] = {'F','r','e','e',0}; @@ -1875,7 +1878,6 @@ static HRESULT get_inproc_class_object(HKEY hkeydll, REFCLSID rclsid, REFIID rii WCHAR dllpath[MAX_PATH+1]; WCHAR threading_model[10 /* strlenW(L"apartment")+1 */]; HRESULT hr; - APARTMENT *apt = COM_CurrentApt(); get_threading_model(hkeydll, threading_model, ARRAYSIZE(threading_model)); /* "Apartment" */ @@ -1991,6 +1993,7 @@ HRESULT WINAPI CoGetClassObject( { LPUNKNOWN regClassObject; HRESULT hres = E_UNEXPECTED; + APARTMENT *apt; TRACE("\n\tCLSID:\t%s,\n\tIID:\t%s\n", debugstr_guid(rclsid), debugstr_guid(iid)); @@ -1999,7 +2002,8 @@ HRESULT WINAPI CoGetClassObject( *ppv = NULL; - if (!COM_CurrentApt()) + apt = COM_CurrentApt(); + if (!apt) { ERR("apartment not initialised\n"); return CO_E_NOTINITIALIZED; @@ -2014,7 +2018,8 @@ HRESULT WINAPI CoGetClassObject( * First, try and see if we can't match the class ID with one of the * registered classes. */ - if (S_OK == COM_GetRegisteredClassObject(rclsid, dwClsContext, &regClassObject)) + if (S_OK == COM_GetRegisteredClassObject(apt, rclsid, dwClsContext, + &regClassObject)) { /* Get the required interface from the retrieved pointer. */ hres = IUnknown_QueryInterface(regClassObject, iid, ppv); @@ -2052,7 +2057,7 @@ HRESULT WINAPI CoGetClassObject( if (SUCCEEDED(hres)) { - hres = get_inproc_class_object(hkey, rclsid, iid, ppv); + hres = get_inproc_class_object(apt, hkey, rclsid, iid, ppv); RegCloseKey(hkey); } @@ -2082,7 +2087,7 @@ HRESULT WINAPI CoGetClassObject( if (SUCCEEDED(hres)) { - hres = get_inproc_class_object(hkey, rclsid, iid, ppv); + hres = get_inproc_class_object(apt, hkey, rclsid, iid, ppv); RegCloseKey(hkey); } diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index e568fb4..d9d93a5 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -797,7 +797,6 @@ static void test_registered_object_thread_affinity(void) WaitForSingleObject(thread, INFINITE); GetExitCodeThread(thread, &exitcode); hr = exitcode; - todo_wine ok(hr == REGDB_E_CLASSNOTREG, "CoGetClassObject on inproc object " "registered in different thread should return REGDB_E_CLASSNOTREG " "instead of 0x%08x\n", hr); @@ -811,7 +810,6 @@ static void test_registered_object_thread_affinity(void) WaitForSingleObject(thread, INFINITE); GetExitCodeThread(thread, &exitcode); hr = exitcode; - todo_wine ok(hr == S_OK, "CoRegisterClassObject with same CLSID but in different thread should return S_OK instead of 0x%08x\n", hr); hr = CoRevokeClassObject(cookie);

1 0