January 2007 - Wine-commits

Dmitry Timoshkov : user32: Add one more GetSystemMenu test.
by Alexandre Julliard 08 Jan '07

08 Jan '07

Module: wine Branch: master Commit: ccd60c19158b8115ee3062c2dcff3229fee0e5d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccd60c19158b8115ee3062c2d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Jan 8 11:16:36 2007 +0800 user32: Add one more GetSystemMenu test. --- dlls/user32/tests/msg.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 244c7c7..0933c56 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -3588,6 +3588,16 @@ static void test_sys_menu(void) ok(state == 0xffffffff, "wrong SC_CLOSE state %x\n", state); DestroyWindow(hwnd); + + /* test new window without WS_SYSMENU style */ + hwnd = CreateWindowExA(0, "NoCloseWindowClass", NULL, WS_OVERLAPPEDWINDOW & ~WS_SYSMENU, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok(hwnd != 0, "Failed to create overlapped window\n"); + + hmenu = GetSystemMenu(hwnd, FALSE); + ok(!hmenu, "GetSystemMenu error %d\n", GetLastError()); + + DestroyWindow(hwnd); } /* test if we receive the right sequence of messages */

1 0

Rob Shearman : wininet: Rename HTTP_Base64 to HTTP_EncodeBase64 to more accurately reflect what it does .
by Alexandre Julliard 08 Jan '07

08 Jan '07

Module: wine Branch: master Commit: 7e8ef764b8c776b7336117bfb2de9bc757a650bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e8ef764b8c776b7336117bfb… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 7 12:53:38 2007 +0000 wininet: Rename HTTP_Base64 to HTTP_EncodeBase64 to more accurately reflect what it does. --- dlls/wininet/http.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 438a284..eb842b1 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -846,9 +846,9 @@ end: } /*********************************************************************** - * HTTP_Base64 + * HTTP_DecodeBase64 */ -static UINT HTTP_Base64( LPCWSTR bin, LPWSTR base64 ) +static UINT HTTP_EncodeBase64( LPCWSTR bin, LPWSTR base64 ) { UINT n = 0, x; static LPCSTR HTTP_Base64Enc = @@ -914,7 +914,7 @@ static LPWSTR HTTP_EncodeBasicAuth( LPCW lstrcatW( in, szColon ); lstrcatW( in, password ); lstrcpyW( out, szBasic ); - HTTP_Base64( in, &out[strlenW(out)] ); + HTTP_EncodeBase64( in, &out[strlenW(out)] ); } HeapFree( GetProcessHeap(), 0, in );

1 0

Rob Shearman : wininet: Fix the handling of Accept types passed into HttpOpenRequest
by Alexandre Julliard 08 Jan '07

08 Jan '07

Module: wine Branch: master Commit: a9c2cfa8d9424406268f74f29bfe30656f37b665 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c2cfa8d9424406268f74f29… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 7 12:53:50 2007 +0000 wininet: Fix the handling of Accept types passed into HttpOpenRequest by properly coalescing all the types into the Accept header value, rather than just adding the first. --- dlls/wininet/http.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index eb842b1..cb8b844 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1113,7 +1113,8 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(L { int i; for(i=0;lpszAcceptTypes[i]!=NULL;i++) - HTTP_ProcessHeader(lpwhr, HTTP_ACCEPT, lpszAcceptTypes[i], HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA|HTTP_ADDHDR_FLAG_REQ|HTTP_ADDHDR_FLAG_ADD_IF_NEW); + HTTP_ProcessHeader(lpwhr, HTTP_ACCEPT, lpszAcceptTypes[i], + HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA|HTTP_ADDHDR_FLAG_REQ|(i == 0 ? HTTP_ADDHDR_FLAG_REPLACE : 0)); } if (NULL == lpszVerb)

1 0

Rob Shearman : ole32: Fix the OLE clipboard test to call OleInitialize before performing the tests to fix test failures on Windows .
by Alexandre Julliard 08 Jan '07

08 Jan '07

Module: wine Branch: master Commit: b624e8125c91dcc10d65c99259f82d2ce7efcc20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b624e8125c91dcc10d65c9925… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 7 12:16:25 2007 +0000 ole32: Fix the OLE clipboard test to call OleInitialize before performing the tests to fix test failures on Windows. --- dlls/ole32/tests/clipboard.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 165863d..0127ce5 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -119,8 +119,10 @@ static HRESULT WINAPI EnumFormatImpl_Ski static HRESULT WINAPI EnumFormatImpl_Reset(IEnumFORMATETC *iface) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + EnumFormatImpl *This = (EnumFormatImpl*)iface; + + This->cur = 0; + return S_OK; } static HRESULT WINAPI EnumFormatImpl_Clone(IEnumFORMATETC *iface, IEnumFORMATETC **ppenum) @@ -329,6 +331,19 @@ static void test_set_clipboard(void) return; hr = OleSetClipboard(data1); + todo_wine + ok(hr == CO_E_NOTINITIALIZED, "OleSetClipboard should have failed with CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); + + CoInitialize(NULL); + hr = OleSetClipboard(data1); + todo_wine + ok(hr == CO_E_NOTINITIALIZED, "OleSetClipboard should have failed with CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); + CoUninitialize(); + + hr = OleInitialize(NULL); + ok(hr == S_OK, "OleInitialize failed with error 0x%08x\n", hr); + + hr = OleSetClipboard(data1); ok(hr == S_OK, "failed to set clipboard to data1, hr = 0x%08x\n", hr); hr = OleIsCurrentClipboard(data1); ok(hr == S_OK, "expected current clipboard to be data1, hr = 0x%08x\n", hr); @@ -355,6 +370,8 @@ static void test_set_clipboard(void) ok(ref == 0, "expected data1 ref=0, got %d\n", ref); ref = IDataObject_Release(data2); ok(ref == 0, "expected data2 ref=0, got %d\n", ref); + + OleUninitialize(); }

1 0

Rob Shearman : ole32: Add a field to the TLS data to determine whether OLE has been initialised for the current thread .
by Alexandre Julliard 08 Jan '07

08 Jan '07

Module: wine Branch: master Commit: a45a2e37f992a3757b8c3a7f934188b51917fa6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a45a2e37f992a3757b8c3a7f9… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 7 12:16:15 2007 +0000 ole32: Add a field to the TLS data to determine whether OLE has been initialised for the current thread. --- dlls/ole32/compobj_private.h | 1 + dlls/ole32/ole2.c | 17 ++++------------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 6abfdfd..cfee6e3 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -168,6 +168,7 @@ struct oletls IErrorInfo *errorinfo; /* see errorinfo.c */ IUnknown *state; /* see CoSetState */ DWORD inits; /* number of times CoInitializeEx called */ + DWORD ole_inits; /* number of times OleInitialize called */ GUID causality_id; /* unique identifier for each COM call */ LONG pending_call_count_client; /* number of client calls pending */ LONG pending_call_count_server; /* number of server calls pending */ diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 5da68fc..fa02c42 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -107,7 +107,7 @@ static OleMenuHookItem *hook_list; * This is the lock count on the OLE library. It is controlled by the * OLEInitialize/OLEUninitialize methods. */ -static ULONG OLE_moduleLockCount = 0; +static LONG OLE_moduleLockCount = 0; /* * Name of our registered window class. @@ -203,7 +203,8 @@ HRESULT WINAPI OleInitialize(LPVOID rese * Object linking and Embedding * In-place activation */ - if (OLE_moduleLockCount==0) + if (!COM_CurrentInfo()->ole_inits++ && + InterlockedIncrement(&OLE_moduleLockCount) == 1) { /* * Initialize the libraries. @@ -226,11 +227,6 @@ HRESULT WINAPI OleInitialize(LPVOID rese OLEMenu_Initialize(); } - /* - * Then, we increase the lock count on the OLE module. - */ - OLE_moduleLockCount++; - return hr; } @@ -243,14 +239,9 @@ void WINAPI OleUninitialize(void) TRACE("()\n"); /* - * Decrease the lock count on the OLE module. - */ - OLE_moduleLockCount--; - - /* * If we hit the bottom of the lock stack, free the libraries. */ - if (OLE_moduleLockCount==0) + if (!--COM_CurrentInfo()->ole_inits && !InterlockedDecrement(&OLE_moduleLockCount)) { /* * Actually free the libraries.

1 0

Rob Shearman : ole32: IStream inherits from ISequentialStream so the HGLOBALStream implementation must also support ISequentialStream .
by Alexandre Julliard 08 Jan '07

08 Jan '07

Module: wine Branch: master Commit: 482063bc295c06a35272fef7d63cd4b361bdddb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=482063bc295c06a35272fef7d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 7 12:15:59 2007 +0000 ole32: IStream inherits from ISequentialStream so the HGLOBALStream implementation must also support ISequentialStream. --- dlls/ole32/hglobalstream.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index 99669d3..5774c90 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -148,11 +148,9 @@ static HRESULT WINAPI HGLOBALStreamImpl_ /* * Compare the riid with the interface IDs implemented by this object. */ - if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) - { - *ppvObject = (IStream*)This; - } - else if (memcmp(&IID_IStream, riid, sizeof(IID_IStream)) == 0) + if (IsEqualIID(&IID_IUnknown, riid) || + IsEqualIID(&IID_ISequentialStream, riid) || + IsEqualIID(&IID_IStream, riid)) { *ppvObject = (IStream*)This; }

1 0

Rob Shearman : ole32: IPeristStream implies IPersist and IStream implies ISequentialStream so fix the Structured Storage stream implementation 's QueryInterface with to reflect this.
by Alexandre Julliard 08 Jan '07

08 Jan '07

Module: wine Branch: master Commit: 2568c4662a1d4f139f9e3d0810f7a03bc58761d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2568c4662a1d4f139f9e3d081… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 7 12:16:04 2007 +0000 ole32: IPeristStream implies IPersist and IStream implies ISequentialStream so fix the Structured Storage stream implementation's QueryInterface with to reflect this. --- dlls/ole32/stg_stream.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 467c3fc..63bdaad 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -121,9 +121,11 @@ static HRESULT WINAPI StgStreamImpl_Quer /* * Compare the riid with the interface IDs implemented by this object. */ - if (IsEqualGUID(&IID_IUnknown, riid)|| - IsEqualGUID(&IID_IPersistStream, riid)|| - IsEqualGUID(&IID_IStream, riid)) + if (IsEqualIID(&IID_IUnknown, riid) || + IsEqualIID(&IID_IPersist, riid) || + IsEqualIID(&IID_IPersistStream, riid) || + IsEqualIID(&IID_ISequentialStream, riid) || + IsEqualIID(&IID_IStream, riid)) { *ppvObject = (IStream*)This; }

1 0

Rob Shearman : ole32: Release the global interface table in the tests when it is no longer needed .
by Alexandre Julliard 08 Jan '07

08 Jan '07

Module: wine Branch: master Commit: 0c51b6236c7c4f1b23f0cfe993ff950574ae5bd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c51b6236c7c4f1b23f0cfe99… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 7 12:15:54 2007 +0000 ole32: Release the global interface table in the tests when it is no longer needed. --- dlls/ole32/tests/marshal.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 3c8281a..9a30df4 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2136,6 +2136,9 @@ static DWORD CALLBACK get_global_interfa CoInitialize(NULL); hr = IGlobalInterfaceTable_GetInterfaceFromGlobal(params->git, params->cookie, &IID_IClassFactory, (void **)&cf); ok_ole_success(hr, IGlobalInterfaceTable_GetInterfaceFromGlobal); + + IGlobalInterfaceTable_Release(params->git); + CoUninitialize(); return hr;

1 0

Kai Blin : taskmgr: Remove unused variable and if check (Coverity).
by Alexandre Julliard 08 Jan '07

08 Jan '07

Module: wine Branch: master Commit: 56e76849b8f035667dbb3f82f48302d1d72c6e0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=56e76849b8f035667dbb3f82f… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sun Jan 7 10:45:22 2007 +0100 taskmgr: Remove unused variable and if check (Coverity). --- programs/taskmgr/graphctl.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/programs/taskmgr/graphctl.c b/programs/taskmgr/graphctl.c index 9a162a6..749d9fa 100644 --- a/programs/taskmgr/graphctl.c +++ b/programs/taskmgr/graphctl.c @@ -127,15 +127,11 @@ TGraphCtrl::~TGraphCtrl() BOOL GraphCtrl_Create(TGraphCtrl* this, HWND hWnd, HWND hParentWnd, UINT nID) { - BOOL result = 0; - GraphCtrl_Init(this); this->m_hParentWnd = hParentWnd; this->m_hWnd = hWnd; GraphCtrl_Resize(this); - if (result != 0) - GraphCtrl_InvalidateCtrl(this); - return result; + return 0; } void GraphCtrl_SetRange(TGraphCtrl* this, double dLower, double dUpper, int nDecimalPlaces)

1 0

Kai Blin : winmm: Remove unused variable and if check (Coverity).
by Alexandre Julliard 08 Jan '07

08 Jan '07

Module: wine Branch: master Commit: 6819fa520f6d88e1aa6981affedff3bd4f807bdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6819fa520f6d88e1aa6981aff… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sun Jan 7 11:09:24 2007 +0100 winmm: Remove unused variable and if check (Coverity). --- dlls/winmm/mci.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index aa15e00..4eb4a72 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1257,7 +1257,6 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpst DWORD retType; LPCWSTR lpCmd = 0; LPWSTR devAlias = NULL; - BOOL bAutoOpen = FALSE; static const WCHAR wszNew[] = {'n','e','w',0}; static const WCHAR wszSAliasS[] = {' ','a','l','i','a','s',' ',0}; static const WCHAR wszTypeS[] = {'t','y','p','e',' ',0}; @@ -1420,10 +1419,6 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpst if ((dwRet = MCI_ParseOptArgs(data, offset, lpCmd, args, &dwFlags))) goto errCleanUp; - if (bAutoOpen && (dwFlags & MCI_NOTIFY)) { - dwRet = MCIERR_NOTIFY_ON_AUTO_OPEN; - goto errCleanUp; - } /* FIXME: the command should get it's own notification window set up and * ask for device closing while processing the notification mechanism */

1 0