June 2013 - Wine-commits - list.winehq.org

Alexandre Julliard : mshtml/tests: Fix a reference leak.
by Alexandre Julliard 11 Jun '13

11 Jun '13

Module: wine Branch: master Commit: 57f5a5b37220b62d21b9ad1240e992d7bd9eeb21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57f5a5b37220b62d21b9ad124… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 11 13:50:15 2013 +0200 mshtml/tests: Fix a reference leak. --- dlls/mshtml/tests/htmldoc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index c8ed4d4..d5fb9cc 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -5862,6 +5862,7 @@ static void test_open_window(IHTMLDocument2 *doc, BOOL do_block) hres = IHTMLWindow2_close(new_window); ok(hres == S_OK, "close failed: %08x\n", hres); + IHTMLWindow2_Release(new_window); } IHTMLWindow2_Release(window);

1 0

Hans Leidekker : msi/tests: Move some more tests and remove a useless test.
by Alexandre Julliard 11 Jun '13

11 Jun '13

Module: wine Branch: master Commit: edee379d8190f4c492b63b5f1cdcfc0e93c09252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edee379d8190f4c492b63b5f1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 11 15:21:50 2013 +0200 msi/tests: Move some more tests and remove a useless test. --- dlls/msi/tests/install.c | 193 ----------------------------------------- dlls/msi/tests/msi.c | 213 ++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 197 insertions(+), 209 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=edee379d8190f4c492b63…

1 0

Aric Stewart : gdi32: Update Arabic font defaults.
by Alexandre Julliard 11 Jun '13

11 Jun '13

Module: wine Branch: master Commit: f5ec65ad8ebe9f25e360bbc272b1d3b4d4efb609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5ec65ad8ebe9f25e360bbc27… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 11 09:15:38 2013 -0500 gdi32: Update Arabic font defaults. With help from Mosaab Alzoubi <moceap(a)hotmail.com>. --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f884307..62e1608 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3406,7 +3406,7 @@ static const struct nls_update_font_list /* Arabic */ { 1256, 720, "vgaoem.fon", "vgaf1256.fon", "vgas1256.fon", "coue1256.fon", "sere1256.fon", "smae1256.fon", "ssee1256.fon", "ssef1256.fon", - "Tahoma","Times New Roman", /* FIXME unverified */ + "Microsoft Sans Serif","Times New Roman", "Fixedsys,178", "System,178", "Courier New,178", "MS Serif,178", "Small Fonts,178", "MS Sans Serif,178", "MS Sans Serif,178", "MS Serif,178",

1 0

Jacek Caban : userenv.h: Added a few missing declarations.
by Alexandre Julliard 11 Jun '13

11 Jun '13

Module: wine Branch: master Commit: a60029f2bbb681a525858cc1f56423f848527e74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a60029f2bbb681a525858cc1f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 11 16:23:14 2013 +0200 userenv.h: Added a few missing declarations. --- include/userenv.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/include/userenv.h b/include/userenv.h index 136c7f6..afa3515 100644 --- a/include/userenv.h +++ b/include/userenv.h @@ -26,15 +26,62 @@ #define PT_ROAMING 0x00000002 #define PT_MANDATORY 0x00000004 +typedef enum _GPO_LINK { + GPLinkUnknown = 0, + GPLinkMachine, + GPLinkSite, + GPLinkDomain, + GPLinkOrganizationalUnit +} GPO_LINK, *PGPO_LINK; + +typedef struct _GROUP_POLICY_OBJECTA { + DWORD dwOptions; + DWORD dwVersion; + LPSTR lpDSPath; + LPSTR lpFileSysPath; + LPSTR lpDisplayName; + CHAR szGPOName[50]; + GPO_LINK GPOLink; + LPARAM lParam; + struct _GROUP_POLICY_OBJECTA *pNext; + struct _GROUP_POLICY_OBJECTA *pPrev; + LPSTR lpExtensions; + LPARAM lParam2; + LPSTR lpLink; +} GROUP_POLICY_OBJECTA, *PGROUP_POLICY_OBJECTA; + +typedef struct _GROUP_POLICY_OBJECTW { + DWORD dwOptions; + DWORD dwVersion; + LPWSTR lpDSPath; + LPWSTR lpFileSysPath; + LPWSTR lpDisplayName; + WCHAR szGPOName[50]; + GPO_LINK GPOLink; + LPARAM lParam; + struct _GROUP_POLICY_OBJECTW *pNext; + struct _GROUP_POLICY_OBJECTW *pPrev; + LPWSTR lpExtensions; + LPARAM lParam2; + LPWSTR lpLink; +} GROUP_POLICY_OBJECTW, *PGROUP_POLICY_OBJECTW; + +DECL_WINELIB_TYPE_AW(GROUP_POLICY_OBJECT) +DECL_WINELIB_TYPE_AW(PGROUP_POLICY_OBJECT) + #ifdef __cplusplus extern "C" { #endif BOOL WINAPI CreateEnvironmentBlock(LPVOID*,HANDLE,BOOL); BOOL WINAPI DestroyEnvironmentBlock(LPVOID); +HANDLE WINAPI EnterCriticalPolicySection(BOOL); BOOL WINAPI ExpandEnvironmentStringsForUserA(HANDLE,LPCSTR,LPSTR,DWORD); BOOL WINAPI ExpandEnvironmentStringsForUserW(HANDLE,LPCWSTR,LPWSTR,DWORD); #define ExpandEnvironmentStringsForUser WINELIB_NAME_AW(ExpandEnvironmentStringsForUser) +DWORD WINAPI GetAppliedGPOListW(DWORD,LPCWSTR,PSID,GUID*,PGROUP_POLICY_OBJECTW*); +DWORD WINAPI GetAppliedGPOListA(DWORD,LPCSTR,PSID,GUID*,PGROUP_POLICY_OBJECTA*); +#define GetAppliedGPOList WINELIB_NAME_AW(GetAppliedGPOList) BOOL WINAPI GetUserProfileDirectoryA(HANDLE,LPSTR,LPDWORD); BOOL WINAPI GetUserProfileDirectoryW(HANDLE,LPWSTR,LPDWORD); #define GetUserProfileDirectory WINELIB_NAME_AW(GetUserProfileDirectory) @@ -45,6 +92,7 @@ BOOL WINAPI GetAllUsersProfileDirectoryA(LPSTR,LPDWORD); BOOL WINAPI GetAllUsersProfileDirectoryW(LPWSTR,LPDWORD); #define GetAllUsersProfileDirectory WINELIB_NAME_AW(GetAllUsersProfileDirectory) BOOL WINAPI GetProfileType(DWORD*); +BOOL WINAPI LeaveCriticalPolicySection(HANDLE); BOOL WINAPI LoadUserProfileA(HANDLE,LPPROFILEINFOA); BOOL WINAPI LoadUserProfileW(HANDLE,LPPROFILEINFOW); #define LoadUserProfile WINELIB_NAME_AW(LoadUserProfile)

1 0

Tatyana Fokina : kernel32/tests: Add test with a large string for CompareStringA.
by Alexandre Julliard 11 Jun '13

11 Jun '13

Module: wine Branch: master Commit: 28951a0922fecbc10e1043dd32dd5241b074684e URL: http://source.winehq.org/git/wine.git/?a=commit;h=28951a0922fecbc10e1043dd3… Author: Tatyana Fokina <tatyana(a)etersoft.ru> Date: Tue Jun 11 17:35:19 2013 +0400 kernel32/tests: Add test with a large string for CompareStringA. --- dlls/kernel32/tests/locale.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index f1c66e2..b6198d1 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1328,6 +1328,7 @@ static const struct comparestringa_entry comparestringa_data[] = { static void test_CompareStringA(void) { int ret, i; + char a[256]; LCID lcid = MAKELCID(MAKELANGID(LANG_FRENCH, SUBLANG_DEFAULT), SORT_DEFAULT); for (i = 0; i < sizeof(comparestringa_data)/sizeof(struct comparestringa_entry); i++) @@ -1461,6 +1462,13 @@ static void test_CompareStringA(void) todo_wine ok(ret == CSTR_LESS_THAN, "\'\\xB9\' character should be greater than \'a\'\n"); ret = CompareStringA(lcid, 0, "\xB9", 1, "b", 1); ok(ret == CSTR_LESS_THAN, "\'\\xB9\' character should be smaller than \'b\'\n"); + + memset(a, 'a', sizeof(a)); + SetLastError(0xdeadbeef); + ret = CompareStringA(lcid, 0, a, sizeof(a), a, sizeof(a)); + todo_wine + ok (GetLastError() == 0xdeadbeef && ret == CSTR_EQUAL, + "ret %d, error %d, expected value %d\n", ret, GetLastError(), CSTR_EQUAL); } static void test_LCMapStringA(void)

1 0

Tatyana Fokina : kernel32: Check the size of the string in CompareStringA.
by Alexandre Julliard 11 Jun '13

11 Jun '13

Module: wine Branch: master Commit: aaed0e81d51678cbb43cdd4c1b774eaf1e4be71b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaed0e81d51678cbb43cdd4c1… Author: Tatyana Fokina <tatyana(a)etersoft.ru> Date: Tue Jun 11 17:41:16 2013 +0400 kernel32: Check the size of the string in CompareStringA. --- dlls/kernel32/locale.c | 6 +++--- dlls/kernel32/tests/locale.c | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 86720ff..9ddf078 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2979,7 +2979,7 @@ INT WINAPI CompareStringA(LCID lcid, DWORD flags, WCHAR *buf1W = NtCurrentTeb()->StaticUnicodeBuffer; WCHAR *buf2W = buf1W + 130; LPWSTR str1W, str2W; - INT len1W, len2W, ret; + INT len1W = 0, len2W = 0, ret; UINT locale_cp = CP_ACP; if (!str1 || !str2) @@ -2994,7 +2994,7 @@ INT WINAPI CompareStringA(LCID lcid, DWORD flags, if (len1) { - len1W = MultiByteToWideChar(locale_cp, 0, str1, len1, buf1W, 130); + if (len1 <= 130) len1W = MultiByteToWideChar(locale_cp, 0, str1, len1, buf1W, 130); if (len1W) str1W = buf1W; else @@ -3017,7 +3017,7 @@ INT WINAPI CompareStringA(LCID lcid, DWORD flags, if (len2) { - len2W = MultiByteToWideChar(locale_cp, 0, str2, len2, buf2W, 130); + if (len2 <= 130) len2W = MultiByteToWideChar(locale_cp, 0, str2, len2, buf2W, 130); if (len2W) str2W = buf2W; else diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index b6198d1..772d13b 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1466,7 +1466,6 @@ static void test_CompareStringA(void) memset(a, 'a', sizeof(a)); SetLastError(0xdeadbeef); ret = CompareStringA(lcid, 0, a, sizeof(a), a, sizeof(a)); - todo_wine ok (GetLastError() == 0xdeadbeef && ret == CSTR_EQUAL, "ret %d, error %d, expected value %d\n", ret, GetLastError(), CSTR_EQUAL); }

1 0

Alistair Leslie-Hughes : dbs.idl: Add DBPROPVAL defines.
by Alexandre Julliard 11 Jun '13

11 Jun '13

Module: wine Branch: master Commit: 6fd87c4053fb063b84ecfbca8d8491d64f561197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd87c4053fb063b84ecfbca8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 5 09:26:02 2013 +1000 dbs.idl: Add DBPROPVAL defines. --- include/dbs.idl | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/include/dbs.idl b/include/dbs.idl index ee8eacf..46deb6a 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -482,6 +482,32 @@ cpp_quote("#define DBPROMPT_COMPLETE 0x02") cpp_quote("#define DBPROMPT_COMPLETEREQUIRED 0x03") cpp_quote("#define DBPROMPT_NOPROMPT 0x04") +cpp_quote("#define DBPROPVAL_STGM_READ OF_READ") +cpp_quote("#define DBPROPVAL_STGM_WRITE OF_WRITE") +cpp_quote("#define DBPROPVAL_STGM_READWRITE OF_READWRITE") +cpp_quote("#define DBPROPVAL_STGM_SHARE_DENY_NONE OF_SHARE_DENY_NONE") +cpp_quote("#define DBPROPVAL_STGM_SHARE_DENY_READ OF_SHARE_DENY_READ") +cpp_quote("#define DBPROPVAL_STGM_SHARE_DENY_WRITE OF_SHARE_DENY_WRITE)") +cpp_quote("#define DBPROPVAL_STGM_SHARE_EXCLUSIVE OF_SHARE_EXCLUSIVE") +cpp_quote("#define DBPROPVAL_STGM_DIRECT 0x00010000") +cpp_quote("#define DBPROPVAL_STGM_TRANSACTED 0x00020000") +cpp_quote("#define DBPROPVAL_STGM_CREATE OF_CREATE") +cpp_quote("#define DBPROPVAL_STGM_CONVERT 0x00040000") +cpp_quote("#define DBPROPVAL_STGM_FAILIFTHERE 0x00080000") +cpp_quote("#define DBPROPVAL_STGM_PRIORITY 0x00100000") +cpp_quote("#define DBPROPVAL_STGM_DELETEONRELEASE 0x00200000") +cpp_quote("#define DBPROPVAL_GB_COLLATE __MSABI_LONG(0x00000010)") +cpp_quote("#define DBPROPVAL_CS_UNINITIALIZED __MSABI_LONG(0x00000000)") +cpp_quote("#define DBPROPVAL_CS_INITIALIZED __MSABI_LONG(0x00000001)") +cpp_quote("#define DBPROPVAL_CS_COMMUNICATIONFAILURE __MSABI_LONG(0x00000002)") + +cpp_quote("#define DBPROPVAL_RD_RESETALL __MSABI_LONG(0xffffffff)") +cpp_quote("#define DBPROPVAL_OS_RESOURCEPOOLING __MSABI_LONG(0x00000001)") +cpp_quote("#define DBPROPVAL_OS_TXNENLISTMENT __MSABI_LONG(0x00000002)") +cpp_quote("#define DBPROPVAL_OS_CLIENTCURSOR __MSABI_LONG(0x00000004)") +cpp_quote("#define DBPROPVAL_OS_ENABLEALL __MSABI_LONG(0xffffffff)") +cpp_quote("#define DBPROPVAL_BI_CROSSROWSET __MSABI_LONG(0x00000001)") + typedef struct tagDBCOLUMNACCESS {

1 0

André Hentschel : winemaker: Don' t add -mno-cygwin to CXXEXTRA per default.
by Alexandre Julliard 11 Jun '13

11 Jun '13

Module: wine Branch: master Commit: b4b2656bc800c4c3b93c48444c8f002d8330b3cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4b2656bc800c4c3b93c48444… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 11 19:54:00 2013 +0200 winemaker: Don't add -mno-cygwin to CXXEXTRA per default. --- tools/winemaker | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 9c5c6a0..c3921a1 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1121,7 +1121,6 @@ sub source_scan_project_file($$$) if ((@$project_settings[$T_FLAGS] & $TF_NOMSVCRT) == 0) { push @{@$project_settings[$T_CEXTRA]},"-mno-cygwin"; - push @{@$project_settings[$T_CXXEXTRA]},"-mno-cygwin"; if ($opt_arch != $OPT_ARCH_DEFAULT) { push @{@$project_settings[$T_CEXTRA]},"-m$opt_arch"; push @{@$project_settings[$T_CXXEXTRA]},"-m$opt_arch"; @@ -1681,7 +1680,6 @@ sub source_scan_directory($$$$) if ((@$project_settings[$T_FLAGS] & $TF_NOMSVCRT) == 0) { push @{@$project_settings[$T_CEXTRA]},"-mno-cygwin"; - push @{@$project_settings[$T_CXXEXTRA]},"-mno-cygwin"; if ($opt_arch != $OPT_ARCH_DEFAULT) { push @{@$project_settings[$T_CEXTRA]},"-m$opt_arch"; push @{@$project_settings[$T_CXXEXTRA]},"-m$opt_arch";

1 0

Dmitry Timoshkov : ole32/tests: Test remaining class, object and server reference counts at server exit.
by Alexandre Julliard 11 Jun '13

11 Jun '13

Module: wine Branch: master Commit: ac13aa28ad7e67330b26c163bc8e4190f50d196e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac13aa28ad7e67330b26c163b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 11 12:42:49 2013 +0900 ole32/tests: Test remaining class, object and server reference counts at server exit. --- dlls/ole32/tests/ole_server.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/ole_server.c b/dlls/ole32/tests/ole_server.c index 9cff693..9c901ee 100644 --- a/dlls/ole32/tests/ole_server.c +++ b/dlls/ole32/tests/ole_server.c @@ -61,6 +61,8 @@ static const struct #undef GUID_NAME }; +static LONG obj_ref, class_ref, server_locks; + static const char *debugstr_guid(const GUID *guid) { static char buf[50]; @@ -118,6 +120,8 @@ static ULONG WINAPI UnknownImpl_AddRef(IUnknown *iface) UnknownImpl *This = impl_from_IUnknown(iface); ULONG ref = InterlockedIncrement(&This->ref); + InterlockedIncrement(&obj_ref); + trace("server: unknown_AddRef: %p, ref %u\n", iface, ref); return ref; } @@ -127,6 +131,8 @@ static ULONG WINAPI UnknownImpl_Release(IUnknown *iface) UnknownImpl *This = impl_from_IUnknown(iface); ULONG ref = InterlockedDecrement(&This->ref); + InterlockedDecrement(&obj_ref); + trace("server: unknown_Release: %p, ref %u\n", iface, ref); if (ref == 0) HeapFree(GetProcessHeap(), 0, This); return ref; @@ -176,6 +182,8 @@ static ULONG WINAPI ClassFactoryImpl_AddRef(IClassFactory *iface) ClassFactoryImpl *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedIncrement(&This->ref); + InterlockedIncrement(&class_ref); + trace("server: factory_AddRef: %p, ref %u\n", iface, ref); return ref; } @@ -185,6 +193,8 @@ static ULONG WINAPI ClassFactoryImpl_Release(IClassFactory *iface) ClassFactoryImpl *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedDecrement(&This->ref); + InterlockedDecrement(&class_ref); + trace("server: factory_Release: %p, ref %u\n", iface, ref); return ref; } @@ -203,7 +213,8 @@ static HRESULT WINAPI ClassFactoryImpl_CreateInstance(IClassFactory *iface, if (!unknown) return E_OUTOFMEMORY; unknown->IUnknown_iface.lpVtbl = &UnknownImpl_Vtbl; - unknown->ref = 1; + unknown->ref = 0; + IUnknown_AddRef(&unknown->IUnknown_iface); hr = IUnknown_QueryInterface(&unknown->IUnknown_iface, iid, ppv); IUnknown_Release(&unknown->IUnknown_iface); @@ -213,7 +224,6 @@ static HRESULT WINAPI ClassFactoryImpl_CreateInstance(IClassFactory *iface, static HRESULT WINAPI ClassFactoryImpl_LockServer(IClassFactory *iface, BOOL lock) { - static LONG server_locks; ULONG ref = lock ? InterlockedIncrement(&server_locks) : InterlockedDecrement(&server_locks); trace("server: factory_LockServer: %p,%d, ref %u\n", iface, lock, ref); @@ -258,6 +268,11 @@ static void ole_server(void) trace("server: waiting for requests\n"); WaitForSingleObject(done_event, INFINITE); + /* 1 remainining class ref is supposed to be cleared by CoRevokeClassObject */ + ok(class_ref == 1, "expected 1 class refs, got %d\n", class_ref); + ok(!obj_ref, "expected 0 object refs, got %d\n", obj_ref); + ok(!server_locks, "expected 0 server locks, got %d\n", server_locks); + CloseHandle(done_event); CloseHandle(init_done_event); if (0)

1 0

Dmitry Timoshkov : ole32/tests: Make sure that key "Software\\Classes" exists under HKEY_CURRENT_USER.
by Alexandre Julliard 11 Jun '13

11 Jun '13

Module: wine Branch: master Commit: b02951dfa7ff416f54205dab17ae3bb98e53ce7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b02951dfa7ff416f54205dab1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 11 14:47:51 2013 +0900 ole32/tests: Make sure that key "Software\\Classes" exists under HKEY_CURRENT_USER. --- dlls/ole32/tests/compobj.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index f2cdf6d..470adbd 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -444,8 +444,9 @@ static void test_CoGetClassObject(void) { IUnknown_Release(pUnk); - res = RegOpenKeyExA(HKEY_CURRENT_USER, "Software\\Classes", 0, KEY_ALL_ACCESS, &hkey); - ok(!res, "RegOpenKeyExA returned %d\n", res); + res = RegCreateKeyEx(HKEY_CURRENT_USER, "Software\\Classes", 0, NULL, 0, + KEY_ALL_ACCESS, NULL, &hkey, NULL); + ok(!res, "RegCreateKeyEx returned %d\n", res); res = pRegOverridePredefKey(HKEY_CLASSES_ROOT, hkey); ok(!res, "RegOverridePredefKey returned %d\n", res); @@ -780,8 +781,9 @@ static void test_CoGetPSClsid(void) hr = CoGetPSClsid(&IID_IClassFactory, &clsid); ok_ole_success(hr, "CoGetPSClsid"); - res = RegOpenKeyExA(HKEY_CURRENT_USER, "Software\\Classes", 0, KEY_ALL_ACCESS, &hkey); - ok(!res, "RegOpenKeyExA returned %d\n", res); + res = RegCreateKeyEx(HKEY_CURRENT_USER, "Software\\Classes", 0, NULL, 0, + KEY_ALL_ACCESS, NULL, &hkey, NULL); + ok(!res, "RegCreateKeyEx returned %d\n", res); res = pRegOverridePredefKey(HKEY_CLASSES_ROOT, hkey); ok(!res, "RegOverridePredefKey returned %d\n", res);

1 0