August 2006 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Silence WINED3DRS_DEBUGMONITORTOKEN.
by Alexandre Julliard Aug. 16, 2006

Aug. 16, 2006

Module: wine Branch: master Commit: ce5c4d38c4b3d2152dec404bc2a1d8da1295d52b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ce5c4d38c4b3d2152dec404… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Aug 16 13:53:50 2006 +0200 wined3d: Silence WINED3DRS_DEBUGMONITORTOKEN. --- dlls/wined3d/device.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index eb84173..84b2645 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4495,8 +4495,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl if(0xbaadcafe != Value) { /* MSDN says the default is D3DDMT_ENABLE but our tests confirm 0xbaadcafe is the default. */ /* MSDN says anything other than D3DDMT_ENABLE or DISABLE does not change the state, - * but our tests disagree. */ - ERR("(%p)->(%s,%ld) not yet implemented\n", This, debug_d3drenderstate(State), Value); + * but our tests disagree. + * We do not claim to implement a debugging lib, so do not write an ERR + */ + WARN("(%p)->(%s,%ld) not yet implemented\n", This, debug_d3drenderstate(State), Value); } break; }

1 0

Robert Reif : secur32: Fix GetComputerObjectName tests based on feedback from Paul Vriens.
by Alexandre Julliard Aug. 16, 2006

Aug. 16, 2006

Module: wine Branch: master Commit: 51c7c030eedebc40b07c8cd868f4b15df3fb5df3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=51c7c030eedebc40b07c8cd… Author: Robert Reif <reif(a)earthlink.net> Date: Wed Aug 16 07:42:23 2006 -0400 secur32: Fix GetComputerObjectName tests based on feedback from Paul Vriens. --- dlls/secur32/tests/secur32.c | 51 +++++++++++++++++++++++++++++++++++------- 1 files changed, 42 insertions(+), 9 deletions(-) diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index 5c681cd..77e47ce 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -27,22 +27,28 @@ #include <schannel.h> #include "wine/test.h" -static void testGetComputerObjectName() +static HMODULE secdll; + +static BOOLEAN (WINAPI * pGetComputerObjectNameA)(EXTENDED_NAME_FORMAT NameFormat, LPSTR lpNameBuffer, PULONG lpnSize); +static BOOLEAN (WINAPI * pGetComputerObjectNameW)(EXTENDED_NAME_FORMAT NameFormat, LPWSTR lpNameBuffer, PULONG lpnSize); + +static EXTENDED_NAME_FORMAT formats[] = { + NameUnknown, NameFullyQualifiedDN, NameSamCompatible, NameDisplay, + NameUniqueId, NameCanonical, NameUserPrincipal, NameCanonicalEx, + NameServicePrincipal, NameDnsDomain +}; + +static void testGetComputerObjectNameA(void) { char name[256]; - WCHAR nameW[256]; ULONG size; BOOLEAN rc; int i; - EXTENDED_NAME_FORMAT formats[] = { NameUnknown, NameFullyQualifiedDN, - NameSamCompatible, NameDisplay, NameUniqueId, NameCanonical, - NameUserPrincipal, NameCanonicalEx, NameServicePrincipal, - NameDnsDomain }; for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); i++) { size = sizeof(name); ZeroMemory(name, sizeof(name)); - rc = GetComputerObjectNameA(formats[i], name, &size); + rc = pGetComputerObjectNameA(formats[i], name, &size); ok(rc || ((formats[i] == NameUnknown) && (GetLastError() == ERROR_INVALID_PARAMETER)) || (GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO), @@ -50,10 +56,20 @@ static void testGetComputerObjectName() formats[i], GetLastError()); if (rc) trace("GetComputerObjectNameA() returned %s\n", name); + } +} + +static void testGetComputerObjectNameW(void) +{ + WCHAR nameW[256]; + ULONG size; + BOOLEAN rc; + int i; + for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); i++) { size = sizeof(nameW)/sizeof(nameW[0]); ZeroMemory(nameW, sizeof(nameW)); - rc = GetComputerObjectNameW(formats[i], nameW, &size); + rc = pGetComputerObjectNameW(formats[i], nameW, &size); ok(rc || ((formats[i] == NameUnknown) && (GetLastError() == ERROR_INVALID_PARAMETER)) || (GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO), @@ -64,5 +80,22 @@ static void testGetComputerObjectName() START_TEST(secur32) { - testGetComputerObjectName(); + secdll = LoadLibraryA("secur32.dll"); + + if (!secdll) + secdll = LoadLibraryA("security.dll"); + + if (secdll) + { + pGetComputerObjectNameA = (PVOID)GetProcAddress(secdll, "GetComputerObjectNameA"); + pGetComputerObjectNameW = (PVOID)GetProcAddress(secdll, "GetComputerObjectNameW"); + + if (pGetComputerObjectNameA) + testGetComputerObjectNameA(); + + if (pGetComputerObjectNameW) + testGetComputerObjectNameW(); + + FreeLibrary(secdll); + } }

1 0

Alexandre Julliard : user: Explicitly load explorer. exe from the system directory.
by Alexandre Julliard Aug. 16, 2006

Aug. 16, 2006

Module: wine Branch: master Commit: 7814420f2f075a88d9f9dd476c86927029943b1a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7814420f2f075a88d9f9dd4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 16 16:43:08 2006 +0200 user: Explicitly load explorer.exe from the system directory. --- dlls/user/win.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user/win.c b/dlls/user/win.c index a4f2c26..362f18d 100644 --- a/dlls/user/win.c +++ b/dlls/user/win.c @@ -1613,13 +1613,16 @@ HWND WINAPI GetDesktopWindow(void) if (!thread_info->desktop) { + static const WCHAR command_line[] = {'\\','e','x','p','l','o','r','e','r','.','e','x','e',' ','/','d','e','s','k','t','o','p',0}; STARTUPINFOW si; PROCESS_INFORMATION pi; - WCHAR command_line[] = {'e','x','p','l','o','r','e','r','.','e','x','e',' ','/','d','e','s','k','t','o','p',0}; + WCHAR cmdline[MAX_PATH + sizeof(command_line)/sizeof(WCHAR)]; memset( &si, 0, sizeof(si) ); si.cb = sizeof(si); - if (CreateProcessW( NULL, command_line, NULL, NULL, FALSE, DETACHED_PROCESS, + GetSystemDirectoryW( cmdline, MAX_PATH ); + lstrcatW( cmdline, command_line ); + if (CreateProcessW( NULL, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi )) { TRACE( "started explorer pid %04lx tid %04lx\n", pi.dwProcessId, pi.dwThreadId );

1 0

Alexandre Julliard : wine.inf: Create a fake exe for explorer.exe.
by Alexandre Julliard Aug. 16, 2006

Aug. 16, 2006

Module: wine Branch: master Commit: 1787c9e9d2f2874da26c4675aab661a72c7eab3e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1787c9e9d2f2874da26c467… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 16 16:42:55 2006 +0200 wine.inf: Create a fake exe for explorer.exe. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index fb01c5c..a9d0e93 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2123,6 +2123,7 @@ HKLM,%CurrentVersion%\Telephony\Country 11,,urlmon.dll,1 [FakeDllsSection] +11,,explorer.exe 10,,notepad.exe 10,,regedit.exe 10,,rundll32.exe

1 0

Robert Shearman : ole32: Move some functions out of compobj.c that don' t belong there and update the copyright statement.
by Alexandre Julliard Aug. 16, 2006

Aug. 16, 2006

Module: wine Branch: master Commit: f42d61df0d6432eb83d602b139e61d934b75fa6f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f42d61df0d6432eb83d602b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Aug 16 13:00:02 2006 +0100 ole32: Move some functions out of compobj.c that don't belong there and update the copyright statement. --- dlls/ole32/compobj.c | 87 +----------------------------------------------- dlls/ole32/ole2.c | 27 +++++++++++++++ dlls/ole32/storage32.c | 57 +++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 86 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 314411d..e049563 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -7,6 +7,7 @@ * Copyright 1999 Sylvain St-Germain * Copyright 2002 Marcus Meissner * Copyright 2004 Mike Hearn + * Copyright 2005-2006 Robert Shearman (for CodeWeavers) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1321,65 +1322,6 @@ HRESULT WINAPI CoRegisterPSClsid(REFIID } - -/*********************************************************************** - * WriteClassStm (OLE32.@) - * - * Writes a CLSID to a stream. - * - * PARAMS - * pStm [I] Stream to write to. - * rclsid [I] CLSID to write. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - */ -HRESULT WINAPI WriteClassStm(IStream *pStm,REFCLSID rclsid) -{ - TRACE("(%p,%p)\n",pStm,rclsid); - - if (rclsid==NULL) - return E_INVALIDARG; - - return IStream_Write(pStm,rclsid,sizeof(CLSID),NULL); -} - -/*********************************************************************** - * ReadClassStm (OLE32.@) - * - * Reads a CLSID from a stream. - * - * PARAMS - * pStm [I] Stream to read from. - * rclsid [O] CLSID to read. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - */ -HRESULT WINAPI ReadClassStm(IStream *pStm,CLSID *pclsid) -{ - ULONG nbByte; - HRESULT res; - - TRACE("(%p,%p)\n",pStm,pclsid); - - if (pclsid==NULL) - return E_INVALIDARG; - - res = IStream_Read(pStm,(void*)pclsid,sizeof(CLSID),&nbByte); - - if (FAILED(res)) - return res; - - if (nbByte != sizeof(CLSID)) - return S_FALSE; - else - return S_OK; -} - - /*** * COM_GetRegisteredClassObject * @@ -2377,33 +2319,6 @@ HRESULT WINAPI CoSetState(IUnknown * pv) /****************************************************************************** - * OleGetAutoConvert [OLE32.@] - */ -HRESULT WINAPI OleGetAutoConvert(REFCLSID clsidOld, LPCLSID pClsidNew) -{ - static const WCHAR wszAutoConvertTo[] = {'A','u','t','o','C','o','n','v','e','r','t','T','o',0}; - HKEY hkey = NULL; - WCHAR buf[CHARS_IN_GUID]; - LONG len; - HRESULT res = S_OK; - - res = COM_OpenKeyForCLSID(clsidOld, wszAutoConvertTo, KEY_READ, &hkey); - if (FAILED(res)) - goto done; - - len = sizeof(buf); - if (RegQueryValueW(hkey, NULL, buf, &len)) - { - res = REGDB_E_KEYMISSING; - goto done; - } - res = CLSIDFromString(buf, pClsidNew); -done: - if (hkey) RegCloseKey(hkey); - return res; -} - -/****************************************************************************** * CoTreatAsClass [OLE32.@] * * Sets the TreatAs value of a class. diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index e04095a..bf6847c 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2334,6 +2334,33 @@ HRESULT WINAPI OleCreate( } /****************************************************************************** + * OleGetAutoConvert [OLE32.@] + */ +HRESULT WINAPI OleGetAutoConvert(REFCLSID clsidOld, LPCLSID pClsidNew) +{ + static const WCHAR wszAutoConvertTo[] = {'A','u','t','o','C','o','n','v','e','r','t','T','o',0}; + HKEY hkey = NULL; + WCHAR buf[CHARS_IN_GUID]; + LONG len; + HRESULT res = S_OK; + + res = COM_OpenKeyForCLSID(clsidOld, wszAutoConvertTo, KEY_READ, &hkey); + if (FAILED(res)) + goto done; + + len = sizeof(buf); + if (RegQueryValueW(hkey, NULL, buf, &len)) + { + res = REGDB_E_KEYMISSING; + goto done; + } + res = CLSIDFromString(buf, pClsidNew); +done: + if (hkey) RegCloseKey(hkey); + return res; +} + +/****************************************************************************** * OleSetAutoConvert [OLE32.@] */ HRESULT WINAPI OleSetAutoConvert(REFCLSID clsidOld, REFCLSID clsidNew) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index d44d381..cae44c4 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -7871,3 +7871,60 @@ StgIsStorageFile(LPCOLESTR fn) WARN(" -> Invalid header.\n"); return S_FALSE; } + +/*********************************************************************** + * WriteClassStm (OLE32.@) + * + * Writes a CLSID to a stream. + * + * PARAMS + * pStm [I] Stream to write to. + * rclsid [I] CLSID to write. + * + * RETURNS + * Success: S_OK. + * Failure: HRESULT code. + */ +HRESULT WINAPI WriteClassStm(IStream *pStm,REFCLSID rclsid) +{ + TRACE("(%p,%p)\n",pStm,rclsid); + + if (rclsid==NULL) + return E_INVALIDARG; + + return IStream_Write(pStm,rclsid,sizeof(CLSID),NULL); +} + +/*********************************************************************** + * ReadClassStm (OLE32.@) + * + * Reads a CLSID from a stream. + * + * PARAMS + * pStm [I] Stream to read from. + * rclsid [O] CLSID to read. + * + * RETURNS + * Success: S_OK. + * Failure: HRESULT code. + */ +HRESULT WINAPI ReadClassStm(IStream *pStm,CLSID *pclsid) +{ + ULONG nbByte; + HRESULT res; + + TRACE("(%p,%p)\n",pStm,pclsid); + + if (pclsid==NULL) + return E_INVALIDARG; + + res = IStream_Read(pStm,(void*)pclsid,sizeof(CLSID),&nbByte); + + if (FAILED(res)) + return res; + + if (nbByte != sizeof(CLSID)) + return S_FALSE; + else + return S_OK; +}

1 0

Robert Shearman : rpcrt4: Move processing of the arguments from NdrClientCall2 to two new functions.
by Alexandre Julliard Aug. 16, 2006

Aug. 16, 2006

Module: wine Branch: master Commit: 4bbc3ca8dca526c9f922a71181d62c38dc43ff52 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4bbc3ca8dca526c9f922a71… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Aug 16 12:29:12 2006 +0100 rpcrt4: Move processing of the arguments from NdrClientCall2 to two new functions. --- dlls/rpcrt4/ndr_stubless.c | 452 +++++++++++++++++++++++--------------------- 1 files changed, 234 insertions(+), 218 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=4bbc3ca8dca526c9f92…

1 0

Robert Shearman : ole32: Add some more tests for failure cases of Co* functions and make builtin ole32 pass them .
by Alexandre Julliard Aug. 16, 2006

Aug. 16, 2006

Module: wine Branch: master Commit: 0e99d795b71454f131d8992368e64b9ca93833ca URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0e99d795b71454f131d8992… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Aug 16 12:29:17 2006 +0100 ole32: Add some more tests for failure cases of Co* functions and make builtin ole32 pass them. --- dlls/ole32/compobj.c | 27 +++++++++++++++++++++------ dlls/ole32/tests/compobj.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/ole32/tests/marshal.c | 17 ----------------- 3 files changed, 58 insertions(+), 23 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 0537b2c..314411d 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -915,6 +915,9 @@ HRESULT WINAPI CLSIDFromString(LPOLESTR { HRESULT ret; + if (!id) + return E_INVALIDARG; + ret = __CLSIDFromString(idstr, id); if(ret != S_OK) { /* It appears a ProgID is also valid */ ret = CLSIDFromProgID(idstr, id); @@ -1057,21 +1060,27 @@ HRESULT COM_OpenKeyForCLSID(REFCLSID cls * * PARAMS * clsid [I] Class ID, as found in registry. - * lplpszProgID [O] Associated ProgID. + * ppszProgID [O] Associated ProgID. * * RETURNS * S_OK * E_OUTOFMEMORY * REGDB_E_CLASSNOTREG if the given clsid has no associated ProgID */ -HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *lplpszProgID) +HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *ppszProgID) { static const WCHAR wszProgID[] = {'P','r','o','g','I','D',0}; HKEY hkey; HRESULT ret; LONG progidlen = 0; - *lplpszProgID = NULL; + if (!ppszProgID) + { + ERR("ppszProgId isn't optional\n"); + return E_INVALIDARG; + } + + *ppszProgID = NULL; ret = COM_OpenKeyForCLSID(clsid, wszProgID, KEY_READ, &hkey); if (FAILED(ret)) return ret; @@ -1081,10 +1090,10 @@ HRESULT WINAPI ProgIDFromCLSID(REFCLSID if (ret == S_OK) { - *lplpszProgID = CoTaskMemAlloc(progidlen * sizeof(WCHAR)); - if (*lplpszProgID) + *ppszProgID = CoTaskMemAlloc(progidlen * sizeof(WCHAR)); + if (*ppszProgID) { - if (RegQueryValueW(hkey, NULL, *lplpszProgID, &progidlen)) + if (RegQueryValueW(hkey, NULL, *ppszProgID, &progidlen)) ret = REGDB_E_CLASSNOTREG; } else @@ -1200,6 +1209,12 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, return CO_E_NOTINITIALIZED; } + if (!pclsid) + { + ERR("pclsid isn't optional\n"); + return E_INVALIDARG; + } + EnterCriticalSection(&apt->cs); LIST_FOR_EACH_ENTRY(registered_psclsid, &apt->psclsids, struct registered_psclsid, entry) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 6f2247d..326d9c6 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -73,6 +73,9 @@ static void test_ProgIDFromCLSID(void) hr = ProgIDFromCLSID(&CLSID_non_existent, &progid); ok(hr == REGDB_E_CLASSNOTREG, "ProgIDFromCLSID returned %08lx\n", hr); ok(progid == NULL, "ProgIDFromCLSID returns with progid %p\n", progid); + + hr = ProgIDFromCLSID(&CLSID_CDeviceMoniker, NULL); + ok(hr == E_INVALIDARG, "ProgIDFromCLSID should return E_INVALIDARG instead of 0x%08lx\n", hr); } static void test_CLSIDFromProgID(void) @@ -106,6 +109,10 @@ static void test_CLSIDFromString(void) HRESULT hr = CLSIDFromString((LPOLESTR)wszCLSID_CDeviceMoniker, &clsid); ok_ole_success(hr, "CLSIDFromString"); ok(IsEqualCLSID(&clsid, &CLSID_CDeviceMoniker), "clsid wasn't equal to CLSID_CDeviceMoniker\n"); + + hr = CLSIDFromString(NULL, &clsid); + ok_ole_success(hr, "CLSIDFromString"); + ok(IsEqualCLSID(&clsid, &CLSID_NULL), "clsid wasn't equal to CLSID_NULL\n"); } static void test_CoCreateInstance(void) @@ -418,6 +425,35 @@ static void test_CoRegisterPSClsid(void) CoUninitialize(); } +static void test_CoGetPSClsid(void) +{ + HRESULT hr; + CLSID clsid; + + hr = CoGetPSClsid(&IID_IClassFactory, &clsid); + ok(hr == CO_E_NOTINITIALIZED, + "CoGetPSClsid should have returned CO_E_NOTINITIALIZED instead of 0x%08lx\n", + hr); + + pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + hr = CoGetPSClsid(&IID_IClassFactory, &clsid); + ok_ole_success(hr, "CoGetPSClsid"); + + hr = CoGetPSClsid(&IID_IWineTest, &clsid); + ok(hr == REGDB_E_IIDNOTREG, + "CoGetPSClsid for random IID returned 0x%08lx instead of REGDB_E_IIDNOTREG\n", + hr); + + hr = CoGetPSClsid(&IID_IClassFactory, NULL); + ok(hr == E_INVALIDARG, + "CoGetPSClsid for null clsid returned 0x%08lx instead of E_INVALIDARG\n", + hr); + + CoUninitialize(); +} + + START_TEST(compobj) { HMODULE hOle32 = GetModuleHandle("ole32"); @@ -435,4 +471,5 @@ START_TEST(compobj) test_CoGetClassObject(); test_CoRegisterMessageFilter(); test_CoRegisterPSClsid(); + test_CoGetPSClsid(); } diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index fc7c205..13d3d1b 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -46,20 +46,6 @@ static const IID IID_IWineTest = {0xa1, 0xa2, 0x5d, 0x5a, 0x36, 0x54, 0xd3, 0xbd} }; /* 5201163f-8164-4fd0-a1a2-5d5a3654d3bd */ -static void test_CoGetPSClsid(void) -{ - HRESULT hr; - CLSID clsid; - - hr = CoGetPSClsid(&IID_IClassFactory, &clsid); - ok_ole_success(hr, CoGetPSClsid); - - hr = CoGetPSClsid(&IID_IWineTest, &clsid); - ok(hr == REGDB_E_IIDNOTREG, - "CoGetPSClsid for random IID returned 0x%08lx instead of REGDB_E_IIDNOTREG\n", - hr); -} - static void test_cocreateinstance_proxy(void) { IUnknown *pProxy; @@ -2281,9 +2267,6 @@ START_TEST(marshal) /* FIXME: test CoCreateInstanceEx */ - /* helper function tests */ - test_CoGetPSClsid(); - /* lifecycle management and marshaling tests */ test_no_marshaler(); test_normal_marshal_and_release();

1 0

Robert Shearman : ole32: Add tests for the failure cases of CLSIDFromProgID and fix the function to conform to these .
by Alexandre Julliard Aug. 16, 2006

Aug. 16, 2006

Module: wine Branch: master Commit: 31726e3823f822ec107f899003729287930dcbdf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=31726e3823f822ec107f899… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Aug 16 12:29:07 2006 +0100 ole32: Add tests for the failure cases of CLSIDFromProgID and fix the function to conform to these. --- dlls/ole32/compobj.c | 18 ++++++++++++++---- dlls/ole32/tests/compobj.c | 14 ++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 8857fcc..0537b2c 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1102,20 +1102,30 @@ HRESULT WINAPI ProgIDFromCLSID(REFCLSID * * PARAMS * progid [I] Unicode program ID, as found in registry. - * riid [O] Associated CLSID. + * clsid [O] Associated CLSID. * * RETURNS * Success: S_OK * Failure: CO_E_CLASSSTRING - the given ProgID cannot be found. */ -HRESULT WINAPI CLSIDFromProgID(LPCOLESTR progid, LPCLSID riid) +HRESULT WINAPI CLSIDFromProgID(LPCOLESTR progid, LPCLSID clsid) { static const WCHAR clsidW[] = { '\\','C','L','S','I','D',0 }; WCHAR buf2[CHARS_IN_GUID]; LONG buf2len = sizeof(buf2); HKEY xhkey; + WCHAR *buf; - WCHAR *buf = HeapAlloc( GetProcessHeap(),0,(strlenW(progid)+8) * sizeof(WCHAR) ); + if (!progid || !clsid) + { + ERR("neither progid (%p) nor clsid (%p) are optional\n", progid, clsid); + return E_INVALIDARG; + } + + /* initialise clsid in case of failure */ + memset(clsid, 0, sizeof(*clsid)); + + buf = HeapAlloc( GetProcessHeap(),0,(strlenW(progid)+8) * sizeof(WCHAR) ); strcpyW( buf, progid ); strcatW( buf, clsidW ); if (RegOpenKeyW(HKEY_CLASSES_ROOT,buf,&xhkey)) @@ -1131,7 +1141,7 @@ HRESULT WINAPI CLSIDFromProgID(LPCOLESTR return CO_E_CLASSSTRING; } RegCloseKey(xhkey); - return CLSIDFromString(buf2,riid); + return CLSIDFromString(buf2,clsid); } diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index bcce10a..6f2247d 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -37,6 +37,7 @@ #define ok_ole_success(hr, func) ok(hr = static const CLSID CLSID_non_existent = { 0x12345678, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; static const CLSID CLSID_CDeviceMoniker = { 0x4315d437, 0x5b8c, 0x11d0, { 0xbd, 0x3b, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86 } }; static const WCHAR devicedotone[] = {'d','e','v','i','c','e','.','1',0}; +static const WCHAR wszNonExistant[] = {'N','o','n','E','x','i','s','t','a','n','t',0}; static const WCHAR wszCLSID_CDeviceMoniker[] = { '{', @@ -84,6 +85,19 @@ static void test_CLSIDFromProgID(void) hr = CLSIDFromString((LPOLESTR)devicedotone, &clsid); ok_ole_success(hr, "CLSIDFromString"); ok(IsEqualCLSID(&clsid, &CLSID_CDeviceMoniker), "clsid wasn't equal to CLSID_CDeviceMoniker\n"); + + /* test some failure cases */ + + hr = CLSIDFromProgID(wszNonExistant, NULL); + ok(hr == E_INVALIDARG, "CLSIDFromProgID should have returned E_INVALIDARG instead of 0x%08lx\n", hr); + + hr = CLSIDFromProgID(NULL, &clsid); + ok(hr == E_INVALIDARG, "CLSIDFromProgID should have returned E_INVALIDARG instead of 0x%08lx\n", hr); + + memset(&clsid, 0xcc, sizeof(clsid)); + hr = CLSIDFromProgID(wszNonExistant, &clsid); + ok(hr == CO_E_CLASSSTRING, "CLSIDFromProgID on non-existant ProgID should have returned CO_E_CLASSSTRING instead of 0x%08lx\n", hr); + ok(IsEqualCLSID(&clsid, &CLSID_NULL), "CLSIDFromProgID should have set clsid to all-zeros on failure\n"); } static void test_CLSIDFromString(void)

1 0

Alexandre Julliard : configure: Setting rpath should no longer be needed for dlls.
by Alexandre Julliard Aug. 16, 2006

Aug. 16, 2006

Module: wine Branch: master Commit: 4e8cb6170f6582dc18e5df88c480aea55abf20fa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4e8cb6170f6582dc18e5df8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 16 13:25:08 2006 +0200 configure: Setting rpath should no longer be needed for dlls. --- configure | 6 +----- configure.ac | 1 - dlls/Makedll.rules.in | 3 +-- programs/Makeprog.rules.in | 3 +-- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/configure b/configure index c2e0a9c..92e8a71 100755 --- a/configure +++ b/configure @@ -745,7 +745,6 @@ IOKITLIB LDEXECFLAGS COREAUDIO LDEXERPATH -LDDLLRPATH CROSSTEST CROSSCC CROSSWINDRES @@ -15894,8 +15893,6 @@ echo "${ECHO_T}$ac_cv_ld_rpath" >&6; } then LDEXERPATH="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`" - LDDLLRPATH="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(dlldir) \$(libdir)\`" - fi case $host_cpu in @@ -25028,7 +25025,6 @@ IOKITLIB!$IOKITLIB$ac_delim LDEXECFLAGS!$LDEXECFLAGS$ac_delim COREAUDIO!$COREAUDIO$ac_delim LDEXERPATH!$LDEXERPATH$ac_delim -LDDLLRPATH!$LDDLLRPATH$ac_delim CROSSTEST!$CROSSTEST$ac_delim CROSSCC!$CROSSCC$ac_delim CROSSWINDRES!$CROSSWINDRES$ac_delim @@ -25044,7 +25040,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 77; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.ac b/configure.ac index 9c67844..45fe3e0 100644 --- a/configure.ac +++ b/configure.ac @@ -1122,7 +1122,6 @@ case $host_os in if test "$ac_cv_ld_rpath" = "yes" then AC_SUBST(LDEXERPATH,["-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"]) - AC_SUBST(LDDLLRPATH,["-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(dlldir) \$(libdir)\`"]) fi case $host_cpu in diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 416c63c..5b4f62c 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -12,7 +12,6 @@ # DLLFLAGS = @DLLFLAGS@ DLLEXT = @DLLEXT@ IMPLIBEXT = @IMPLIBEXT@ -LDRPATH = @LDDLLRPATH@ DEFS = -D__WINESRC__ $(EXTRADEFS) BASEMODULE = $(MODULE:%.dll=%) MAINSPEC = $(BASEMODULE).spec @@ -33,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,%) $(LDRPATH) -o $@ $(ALL_IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) + $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -shared $(SRCDIR)/$(MAINSPEC) $(ALL_OBJS) $(SUBSYSTEM:%=-Wb,--subsystem,%) $(BASEADDRESS:%=-Wl,--image-base,%) -o $@ $(ALL_IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) # Rules for .dll files diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in index 154f6bb..84cdd12 100644 --- a/programs/Makeprog.rules.in +++ b/programs/Makeprog.rules.in @@ -10,7 +10,6 @@ # plus all variables required by the glo # DLLFLAGS = @DLLFLAGS@ -LDRPATH = @LDDLLRPATH@ DEFS = $(EXTRADEFS) ALL_IMPORTS = $(DELAYIMPORTS) $(IMPORTS) ALL_LIBS = $(ALL_IMPORTS:%=-l%) $(EXTRALIBS) $(LIBPORT) $(LDFLAGS) $(LIBS) @@ -25,7 +24,7 @@ all: $(MODULE)$(DLLEXT) $(BASEMODULE)$(E # Rules for .so main module $(MODULE).so: $(OBJS) $(RC_SRCS:.rc=.res) Makefile.in - $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(LDRPATH) $(ALL_LIBS) $(DELAYIMPORTS:%=-Wb,-d%) + $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild $(APPMODE) $(OBJS) $(RC_SRCS:.rc=.res) -o $@ $(ALL_LIBS) $(DELAYIMPORTS:%=-Wb,-d%) $(BASEMODULE): $(WINEWRAPPER) $(RM) $@ && $(LN_S) $(WINEWRAPPER) $@

1 0

Hans Leidekker : wldap32: Support setting server controls.
by Alexandre Julliard Aug. 16, 2006

Aug. 16, 2006

Module: wine Branch: master Commit: 1219fa5806291a04f413cbfe5307428103ad6583 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1219fa5806291a04f413cbf… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Aug 16 12:53:21 2006 +0200 wldap32: Support setting server controls. --- dlls/wldap32/option.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c index d5206f5..d6cc36d 100644 --- a/dlls/wldap32/option.c +++ b/dlls/wldap32/option.c @@ -150,6 +150,7 @@ #ifdef HAVE_LDAP case LDAP_OPT_SECURITY_CONTEXT: case LDAP_OPT_SEND_TIMEOUT: case LDAP_OPT_SERVER_CERTIFICATE: + case LDAP_OPT_SERVER_CONTROLS: case LDAP_OPT_SERVER_ERROR: case LDAP_OPT_SERVER_EXT_ERROR: case LDAP_OPT_SIGN: @@ -288,6 +289,7 @@ #ifdef HAVE_LDAP case LDAP_OPT_SECURITY_CONTEXT: case LDAP_OPT_SEND_TIMEOUT: case LDAP_OPT_SERVER_CERTIFICATE: + case LDAP_OPT_SERVER_CONTROLS: case LDAP_OPT_SERVER_ERROR: case LDAP_OPT_SERVER_EXT_ERROR: case LDAP_OPT_SIGN: @@ -323,6 +325,17 @@ #ifdef HAVE_LDAP switch (option) { + case LDAP_OPT_SERVER_CONTROLS: + { + LDAPControlW **ctrlsW; + + ctrlsW = controlarrayAtoW( (LDAPControlA **)value ); + if (!ctrlsW) return WLDAP32_LDAP_NO_MEMORY; + + ret = ldap_set_optionW( ld, option, ctrlsW ); + controlarrayfreeW( ctrlsW ); + return ret; + } case LDAP_OPT_DEREF: case LDAP_OPT_DESC: case LDAP_OPT_ERROR_NUMBER: @@ -415,6 +428,17 @@ #ifdef HAVE_LDAP switch (option) { + case LDAP_OPT_SERVER_CONTROLS: + { + LDAPControl **ctrlsU; + + ctrlsU = controlarrayWtoU( (LDAPControlW **)value ); + if (!ctrlsU) return WLDAP32_LDAP_NO_MEMORY; + + ret = ldap_set_option( ld, option, ctrlsU ); + controlarrayfreeU( ctrlsU ); + return ret; + } case LDAP_OPT_DEREF: case LDAP_OPT_DESC: case LDAP_OPT_ERROR_NUMBER:

1 0