wine-commits June 2008

wine-commits@winehq.org

3 participants
944 discussions

Rob Shearman : include: Add some missing defines and function declarations to rpcdce.h.
by Alexandre Julliard 10 Jun '08

10 Jun '08

Module: wine Branch: master Commit: d6503215ef601e478cc502a6e79dcf633d11f1f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6503215ef601e478cc502a6e… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jun 9 22:36:19 2008 +0100 include: Add some missing defines and function declarations to rpcdce.h. --- dlls/rpcrt4/rpc_binding.c | 4 ++-- include/rpcdce.h | 32 ++++++++++++++++++++++++++++---- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 87ac413..500e5f8 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -1619,8 +1619,8 @@ RpcBindingSetAuthInfoW( RPC_BINDING_HANDLE Binding, RPC_WSTR ServerPrincName, UL /*********************************************************************** * RpcBindingSetOption (RPCRT4.@) */ -RPC_STATUS WINAPI RpcBindingSetOption(RPC_BINDING_HANDLE BindingHandle, ULONG Option, ULONG OptionValue) +RPC_STATUS WINAPI RpcBindingSetOption(RPC_BINDING_HANDLE BindingHandle, ULONG Option, ULONG_PTR OptionValue) { - FIXME("(%p, %d, %d): stub\n", BindingHandle, Option, OptionValue); + FIXME("(%p, %d, %ld): stub\n", BindingHandle, Option, OptionValue); return RPC_S_OK; } diff --git a/include/rpcdce.h b/include/rpcdce.h index 4e08999..0212c4c 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -280,10 +280,13 @@ typedef struct _RPC_SECURITY_QOS_V2_A #define SEC_WINNT_AUTH_IDENTITY_UNICODE 0x2 /* RpcServerRegisterIfEx Flags */ -#define RPC_IF_AUTOLISTEN 0x1 -#define RPC_IF_OLE 0x2 -#define RPC_IF_ALLOW_UNKNOWN_AUTHORITY 0x4 -#define RPC_IF_ALLOW_SECURE_ONLY 0x8 +#define RPC_IF_AUTOLISTEN 0x01 +#define RPC_IF_OLE 0x02 +#define RPC_IF_ALLOW_UNKNOWN_AUTHORITY 0x04 +#define RPC_IF_ALLOW_SECURE_ONLY 0x08 +#define RPC_IF_ALLOW_CALLBACKS_WITH_NO_AUTH 0x10 +#define RPC_IF_ALLOW_LOCAL_ONLY 0x20 +#define RPC_IF_SEC_NO_CACHE 0x40 RPC_STATUS RPC_ENTRY DceErrorInqTextA(RPC_STATUS e, RPC_CSTR buffer); RPC_STATUS RPC_ENTRY DceErrorInqTextW(RPC_STATUS e, RPC_WSTR buffer); @@ -301,10 +304,14 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RPCRTAPI RPC_STATUS RPC_ENTRY RpcBindingInqObject( RPC_BINDING_HANDLE Binding, UUID* ObjectUuid ); RPCRTAPI RPC_STATUS RPC_ENTRY + RpcBindingInqOption( RPC_BINDING_HANDLE Binding, ULONG Option, ULONG_PTR *OptionValue ); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcBindingReset( RPC_BINDING_HANDLE Binding ); RPCRTAPI RPC_STATUS RPC_ENTRY RpcBindingSetObject( RPC_BINDING_HANDLE Binding, UUID* ObjectUuid ); RPCRTAPI RPC_STATUS RPC_ENTRY + RpcBindingSetOption( RPC_BINDING_HANDLE Binding, ULONG Option, ULONG_PTR OptionValue ); +RPCRTAPI RPC_STATUS RPC_ENTRY RpcObjectSetType( UUID* ObjUuid, UUID* TypeUuid ); RPCRTAPI RPC_STATUS RPC_ENTRY @@ -367,6 +374,9 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RPCRTAPI RPC_STATUS RPC_ENTRY RpcServerListen( unsigned int MinimumCallThreads, unsigned int MaxCalls, unsigned int DontWait ); +RPCRTAPI RPC_STATUS RPC_ENTRY + RpcMgmtEnableIdleCleanup( void ); + RPCRTAPI RPC_STATUS RPC_ENTRY RpcMgmtSetCancelTimeout(LONG); RPCRTAPI RPC_STATUS RPC_ENTRY @@ -386,6 +396,12 @@ RPCRTAPI RPC_STATUS RPC_ENTRY ULONG VersOption, UUID *ObjectUuid, RPC_EP_INQ_HANDLE *InquiryContext); RPCRTAPI RPC_STATUS RPC_ENTRY + RpcMgmtSetComTimeout( RPC_BINDING_HANDLE Binding, unsigned int Timeout ); + +RPCRTAPI RPC_STATUS RPC_ENTRY + RpcMgmtSetServerStackSize( ULONG ThreadStackSize ); + +RPCRTAPI RPC_STATUS RPC_ENTRY RpcServerRegisterIf( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, RPC_MGR_EPV* MgrEpv ); RPCRTAPI RPC_STATUS RPC_ENTRY @@ -475,12 +491,20 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RpcCancelThread(void*); RPCRTAPI RPC_STATUS RPC_ENTRY RpcCancelThreadEx(void*,LONG); RPCRTAPI RPC_STATUS RPC_ENTRY + RpcImpersonateClient( RPC_BINDING_HANDLE Binding ); + +RPCRTAPI RPC_STATUS RPC_ENTRY RpcNetworkIsProtseqValidA( RPC_CSTR protseq ); RPCRTAPI RPC_STATUS RPC_ENTRY RpcNetworkIsProtseqValidW( RPC_WSTR protseq ); #define RpcNetworkIsProtseqValid WINELIB_NAME_AW(RpcNetworkIsProtseqValid) RPCRTAPI RPC_STATUS RPC_ENTRY + RpcRevertToSelf( void ); +RPCRTAPI RPC_STATUS RPC_ENTRY + RpcRevertToSelfEx( RPC_BINDING_HANDLE Binding ); + +RPCRTAPI RPC_STATUS RPC_ENTRY RpcStringFreeA(RPC_CSTR* String); RPCRTAPI RPC_STATUS RPC_ENTRY RpcStringFreeW(RPC_WSTR* String);

1 0

Dan Kegel : oleaut32/tests: Initialize reserved fields to unique values.
by Alexandre Julliard 09 Jun '08

09 Jun '08

Module: wine Branch: master Commit: 035f1dd0b0f502675189ee7ca95284d49d164f95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=035f1dd0b0f502675189ee7ca… Author: Dan Kegel <dank(a)kegel.com> Date: Sun Jun 8 16:27:04 2008 -0700 oleaut32/tests: Initialize reserved fields to unique values. --- dlls/oleaut32/tests/usrmarshal.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 70f9fd2..dcf1150 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -528,6 +528,13 @@ static void test_marshal_VARIANT(void) V_VT(&v) = VT_I1; V_I1(&v) = 0x12; + /* check_variant_header tests wReserved[123], so initialize to unique values. + * (Could probably also do this by setting the variant to a known DECIMAL.) + */ + V_U2(&v).wReserved1 = 0x1234; + V_U2(&v).wReserved2 = 0x5678; + V_U2(&v).wReserved3 = 0x9abc; + /* Variants have an alignment of 8 */ rpcMsg.BufferLength = stubMsg.BufferLength = VARIANT_UserSize(&umcb.Flags, 1, &v); ok(stubMsg.BufferLength == 29, "size %d\n", stubMsg.BufferLength); @@ -849,6 +856,7 @@ static void test_marshal_VARIANT(void) /*** DECIMAL ***/ VarDecFromI4(0x12345678, &dec); + dec.wReserved = 0xfedc; /* Also initialize reserved field, as we check it later */ VariantInit(&v); V_DECIMAL(&v) = dec; V_VT(&v) = VT_DECIMAL; @@ -906,6 +914,13 @@ static void test_marshal_VARIANT(void) if (VARIANT_UNMARSHAL_WORKS) { VariantInit(&v2); + /* check_variant_header tests wReserved[123], so initialize to unique values. + * (Could probably also do this by setting the variant to a known DECIMAL.) + */ + V_U2(&v2).wReserved1 = 0x0123; + V_U2(&v2).wReserved2 = 0x4567; + V_U2(&v2).wReserved3 = 0x89ab; + stubMsg.Buffer = buffer; next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2); ok(next == buffer + stubMsg.BufferLength, "got %p expect %p\n", next, buffer + stubMsg.BufferLength);

1 0

Dan Kegel : kernel32/tests: Initialize buffer.
by Alexandre Julliard 09 Jun '08

09 Jun '08

Module: wine Branch: master Commit: 3b0924cf832789238006835ad213b2fb7d760d81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b0924cf832789238006835ad… Author: Dan Kegel <dank(a)kegel.com> Date: Sun Jun 8 11:16:43 2008 -0700 kernel32/tests: Initialize buffer. --- dlls/kernel32/tests/change.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index cdba120..c070eb0 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -223,6 +223,7 @@ static void test_FindFirstChangeNotification(void) file = CreateFileA(filename2, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); ok(file != INVALID_HANDLE_VALUE, "CreateFileA error: %d\n", GetLastError()); + memset(buffer, 0, sizeof(buffer)); ret = WriteFile(file, buffer, sizeof(buffer), &count, NULL); ok(ret && count == sizeof(buffer), "WriteFile error: %d\n", GetLastError()); ret = CloseHandle(file);

1 0

Alexandre Julliard : kernel32: Add support for the execute protection values in CreateFileMappingW.
by Alexandre Julliard 09 Jun '08

09 Jun '08

Module: wine Branch: master Commit: 3a84cbe742fe93f65b7f8a639ac53a727f31cfe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a84cbe742fe93f65b7f8a639… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 9 19:11:25 2008 +0200 kernel32: Add support for the execute protection values in CreateFileMappingW. --- dlls/kernel32/virtual.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index a338a9d..9c5080f 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -374,6 +374,16 @@ HANDLE WINAPI CreateFileMappingW( HANDLE hFile, LPSECURITY_ATTRIBUTES sa, case PAGE_READWRITE: access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE; break; + case PAGE_EXECUTE: + access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_EXECUTE; + break; + case PAGE_EXECUTE_READ: + case PAGE_EXECUTE_WRITECOPY: + access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_EXECUTE; + break; + case PAGE_EXECUTE_READWRITE: + access = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_WRITE | SECTION_MAP_EXECUTE; + break; default: SetLastError( ERROR_INVALID_PARAMETER ); return 0;

1 0

Zhangrong Huang : gdi32: Add more Asian codepages to get default fallback fonts.
by Alexandre Julliard 09 Jun '08

09 Jun '08

Module: wine Branch: master Commit: a21b3f0abd4e98ced61c447ababb729326fc368d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a21b3f0abd4e98ced61c447ab… Author: Zhangrong Huang <hzhrong(a)gmail.com> Date: Sat Jun 7 05:14:39 2008 +0800 gdi32: Add more Asian codepages to get default fallback fonts. --- dlls/gdi32/freetype.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 7400b12..9b5f18c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2205,6 +2205,14 @@ static const struct nls_update_font_list } }; +static inline BOOL is_dbcs_ansi_cp(UINT ansi_cp) +{ + return ( ansi_cp == 932 /* CP932 for Japanese */ + || ansi_cp == 936 /* CP936 for Chinese Simplified */ + || ansi_cp == 949 /* CP949 for Korean */ + || ansi_cp == 950 ); /* CP950 for Chinese Traditional */ +} + static inline HKEY create_fonts_NT_registry_key(void) { HKEY hkey = 0; @@ -2256,8 +2264,8 @@ static void update_font_info(void) (WCHAR *)&oem_cp, sizeof(oem_cp)/sizeof(WCHAR)); sprintf( cpbuf, "%u,%u", ansi_cp, oem_cp ); - /* Setup Default_Fallback usage */ - if (ansi_cp == 932) + /* Setup Default_Fallback usage for DBCS ANSI codepages */ + if (is_dbcs_ansi_cp(ansi_cp)) use_default_fallback = TRUE; len = sizeof(buf);

1 0

Francois Gouget : shell32: Tweak the French license message to better match the English one.
by Alexandre Julliard 09 Jun '08

09 Jun '08

Module: wine Branch: master Commit: 61590c612285167c022e9d4eed922d87ce6a6f38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61590c612285167c022e9d4ee… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 9 16:49:43 2008 +0200 shell32: Tweak the French license message to better match the English one. --- dlls/shell32/shell32_Fr.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32_Fr.rc b/dlls/shell32/shell32_Fr.rc index c3d3ba4..b68c74d 100644 --- a/dlls/shell32/shell32_Fr.rc +++ b/dlls/shell32/shell32_Fr.rc @@ -265,13 +265,13 @@ IDS_LICENSE, le modifier suivant les termes de la Licence Générale Publique Limitée GNU \ telle que publiée par la Free Software Foundation ; soit la version 2.1 \ de la License, soit (à votre gré) toute version ultérieure.\n\n\ -Wine est distribué dans l’espoir qu'il sera utile, mais \ +Wine est distribué dans l’espoir qu'il sera utile, mais \ SANS AUCUNE GARANTIE : sans même la garantie implicite de \ COMMERCIALISABILITÉ ou d’ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez \ la Licence Générale Publique Limitée pour plus de détails.\n\n\ Vous devriez avoir reçu une copie de la Licence Générale Publique Limitée \ -GNU avec cette bibliothèque ; si ce n’est pas le cas, écrivez à la : \ -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, \ +GNU avec Wine ; si ce n’est pas le cas, écrivez à la : \ +Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, \ MA 02110-1301, USA." }

1 0

Alistair Leslie-Hughes : msxml3: Stop tests crashing under windows 98.
by Alexandre Julliard 09 Jun '08

09 Jun '08

Module: wine Branch: master Commit: 558ae52cc464269457833cfb08879550a63a5d13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=558ae52cc464269457833cfb0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 9 22:12:25 2008 +1000 msxml3: Stop tests crashing under windows 98. --- dlls/msxml3/tests/xmldoc.c | 9 ++++++++- dlls/msxml3/tests/xmlelem.c | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index 076d1fe..b444b06 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -28,6 +28,9 @@ #include "wine/test.h" +/* Deprecated Error Code */ +#define XML_E_INVALIDATROOTLEVEL 0xc00ce556 + static void append_str(char **str, const char *data) { sprintf(*str, data); @@ -113,7 +116,10 @@ static void test_xmldoc(void) ok(element == NULL, "Expected NULL element\n"); hr = IPersistStreamInit_Load(psi, stream); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK || hr == XML_E_INVALIDATROOTLEVEL, "Expected S_OK, got %08x\n", hr); + if(hr == XML_E_INVALIDATROOTLEVEL) + goto cleanup; + ok(stream != NULL, "Expected non-NULL stream\n"); hr = IXMLDocument_get_root(doc, &element); @@ -234,6 +240,7 @@ static void test_xmldoc(void) IXMLElement_Release(child); IXMLElementCollection_Release(collection); IXMLElement_Release(element); +cleanup: IStream_Release(stream); IPersistStreamInit_Release(psi); IXMLDocument_Release(doc); diff --git a/dlls/msxml3/tests/xmlelem.c b/dlls/msxml3/tests/xmlelem.c index 61a2300..5c80f7c 100644 --- a/dlls/msxml3/tests/xmlelem.c +++ b/dlls/msxml3/tests/xmlelem.c @@ -30,6 +30,8 @@ #include "wine/test.h" +#define ERROR_URL_NOT_FOUND 0x800c0006 + static void test_xmlelem(void) { HRESULT hr; @@ -281,9 +283,13 @@ static void test_xmlelem_collection(void) url = SysAllocString(path); hr = IXMLDocument_put_URL(doc, url); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); + /* Win98 returns ERROR_URL_NOT_FOUND */ + ok(hr == S_OK || hr == ERROR_URL_NOT_FOUND, "Expected S_OK, got 0x%08x\n", hr); SysFreeString(url); + if(hr == ERROR_URL_NOT_FOUND) + goto cleanup; + hr = IXMLDocument_get_root(doc, &element); ok(hr == S_OK, "Expected S_OK, got %d\n", hr); ok(element != NULL, "Expected non-NULL element\n"); @@ -434,6 +440,7 @@ static void test_xmlelem_collection(void) IEnumVARIANT_Release(enumVar); IXMLElement_Release(element); IXMLElementCollection_Release(collection); +cleanup: IXMLDocument_Release(doc); DeleteFileA("bank.xml"); }

1 0

Alexandre Julliard : winex11: Add a trace in ExtEscape to make wgl problems easier to diagnose.
by Alexandre Julliard 09 Jun '08

09 Jun '08

Module: wine Branch: master Commit: 77416b8668833b3d23afe979afd929b98b8f0176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77416b8668833b3d23afe979a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 9 16:57:38 2008 +0200 winex11: Add a trace in ExtEscape to make wgl problems easier to diagnose. --- dlls/winex11.drv/init.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index cc95057..a8c5695 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -346,6 +346,9 @@ INT X11DRV_ExtEscape( X11DRV_PDEVICE *physDev, INT escape, INT in_count, LPCVOID wine_tsx11_lock(); XSetSubwindowMode( gdi_display, physDev->gc, data->mode ); wine_tsx11_unlock(); + TRACE( "SET_DRAWABLE hdc %p drawable %lx gl_drawable %lx pf %u dc_rect %s drawable_rect %s\n", + physDev->hdc, physDev->drawable, physDev->gl_drawable, physDev->current_pf, + wine_dbgstr_rect(&physDev->dc_rect), wine_dbgstr_rect(&physDev->drawable_rect) ); return TRUE; } break;

1 0

Paul Vriens : setupapi/tests: Fix two more tests on Windows 2000.
by Alexandre Julliard 09 Jun '08

09 Jun '08

Module: wine Branch: master Commit: e63f4fcfbc0a64de8ed824c5b7f2f2be8d054570 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e63f4fcfbc0a64de8ed824c5b… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Jun 9 14:14:25 2008 +0200 setupapi/tests: Fix two more tests on Windows 2000. --- dlls/setupapi/tests/devinst.c | 57 ++++++++++++++++++++++------------------ 1 files changed, 31 insertions(+), 26 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index a47460c..f00de28 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -183,6 +183,33 @@ cleanup: return ret; } +static void clean_devclass_key(void) +{ + static const WCHAR devclass[] = {'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\','D','e','v','i','c','e','C','l','a','s','s','e','s','\\', + '{','6','a','5','5','b','5','a','4','-','3','f','6','5','-', + '1','1','d','b','-','b','7','0','4','-', + '0','0','1','1','9','5','5','c','2','b','d','b','}',0}; + HKEY key; + DWORD subkeys; + + /* Check if we have subkeys as Windows 2000 doesn't delete + * the keys under the DeviceClasses key after a SetupDiDestroyDeviceInfoList. + */ + RegOpenKeyW(HKEY_LOCAL_MACHINE, devclass, &key); + RegQueryInfoKey(key, NULL, NULL, NULL, &subkeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + if (subkeys > 0) + { + trace("We are most likely on Windows 2000\n"); + devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, devclass); + } + else + { + ok(!RegDeleteKeyW(HKEY_LOCAL_MACHINE, devclass), + "Couldn't delete deviceclass key\n"); + } +} static void test_SetupDiCreateDeviceInfoListEx(void) { @@ -704,8 +731,7 @@ static void testCreateDeviceInterface(void) /* Cleanup */ /* FIXME: On Wine we still have the bogus entry in Enum\Root and * subkeys, as well as the deviceclass key with subkeys. - * Only do the RegDeleteKey (and RegDeleteTree on Windows 2000), - * once Wine is fixed. + * Only clean the deviceclass key once Wine if fixed. */ if (!RegOpenKeyW(HKEY_LOCAL_MACHINE, bogus, &key)) { @@ -716,23 +742,7 @@ static void testCreateDeviceInterface(void) } else { - DWORD subkeys; - - /* Check if we have subkeys as Windows 2000 doesn't delete - * the keys under the DeviceClasses key - */ - RegOpenKeyW(HKEY_LOCAL_MACHINE, devclass, &key); - RegQueryInfoKey(key, NULL, NULL, NULL, &subkeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - if (subkeys > 0) - { - trace("We are most likely on Windows 2000\n"); - devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, devclass); - } - else - { - ok(!RegDeleteKeyW(HKEY_LOCAL_MACHINE, devclass), - "Couldn't delete deviceclass key\n"); - } + clean_devclass_key(); } } } @@ -865,8 +875,7 @@ static void testGetDeviceInterfaceDetail(void) } else { - ok(!RegDeleteKeyW(HKEY_LOCAL_MACHINE, devclass), - "Couldn't delete deviceclass key\n"); + clean_devclass_key(); } } } @@ -1125,11 +1134,7 @@ static void testRegisterAndGetDetail(void) } else { - /* There should only be a class key entry, so a simple - * RegDeleteKey should work - */ - ok(!RegDeleteKeyW(HKEY_LOCAL_MACHINE, devclass), - "Couldn't delete classkey\n"); + clean_devclass_key(); } }

1 0

Paul Vriens : setupapi/tests: Fix a test on Windows 2000.
by Alexandre Julliard 09 Jun '08

09 Jun '08

Module: wine Branch: master Commit: 02b05393c8717478d585922f13f3b4c9e04f191a URL: http://source.winehq.org/git/wine.git/?a=commit;h=02b05393c8717478d585922f1… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Jun 9 13:04:58 2008 +0200 setupapi/tests: Fix a test on Windows 2000. --- dlls/setupapi/tests/devinst.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index cd72db4..a47460c 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -698,12 +698,14 @@ static void testCreateDeviceInterface(void) ok(i == 2, "expected 2 interfaces, got %d\n", i); ok(GetLastError() == ERROR_NO_MORE_ITEMS, "SetupDiEnumDeviceInterfaces failed: %08x\n", GetLastError()); - pSetupDiDestroyDeviceInfoList(set); + ret = pSetupDiDestroyDeviceInfoList(set); + ok(ret, "SetupDiDestroyDeviceInfoList failed: %08x\n", GetLastError()); /* Cleanup */ /* FIXME: On Wine we still have the bogus entry in Enum\Root and * subkeys, as well as the deviceclass key with subkeys. - * Only do the RegDeleteKey, once Wine is fixed. + * Only do the RegDeleteKey (and RegDeleteTree on Windows 2000), + * once Wine is fixed. */ if (!RegOpenKeyW(HKEY_LOCAL_MACHINE, bogus, &key)) { @@ -714,8 +716,23 @@ static void testCreateDeviceInterface(void) } else { - ok(!RegDeleteKeyW(HKEY_LOCAL_MACHINE, devclass), - "Couldn't delete deviceclass key\n"); + DWORD subkeys; + + /* Check if we have subkeys as Windows 2000 doesn't delete + * the keys under the DeviceClasses key + */ + RegOpenKeyW(HKEY_LOCAL_MACHINE, devclass, &key); + RegQueryInfoKey(key, NULL, NULL, NULL, &subkeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + if (subkeys > 0) + { + trace("We are most likely on Windows 2000\n"); + devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, devclass); + } + else + { + ok(!RegDeleteKeyW(HKEY_LOCAL_MACHINE, devclass), + "Couldn't delete deviceclass key\n"); + } } } }

1 0

← Newer
1
...
75
76
77
78
79
80
81
...
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2008