wine-commits January 2015

wine-commits@winehq.org

2 participants
302 discussions

Henri Verbeet : wined3d: Implement WINED3DSIH_SAMPLE in the GLSL shader backend.
by Alexandre Julliard 19 Jan '15

19 Jan '15

Module: wine Branch: master Commit: 2e5abc156a8bc3d61d93a75b0ef85ebd1dd168c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e5abc156a8bc3d61d93a75b0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 19 13:44:08 2015 +0100 wined3d: Implement WINED3DSIH_SAMPLE in the GLSL shader backend. --- dlls/wined3d/context.c | 74 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/cs.c | 3 ++ dlls/wined3d/glsl_shader.c | 72 +++++++++++++++++++++++++++++++--------- dlls/wined3d/shader.c | 56 ++++++++++++++++++++++++++++++++ dlls/wined3d/state.c | 10 ++++++ dlls/wined3d/utils.c | 2 ++ dlls/wined3d/wined3d_private.h | 23 +++++++++++-- 7 files changed, 222 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e5abc156a8bc3d61d93a…

1 0

Michael Stefaniuc : ntdll/tests: Remove unused assigments (PVS-Studio).
by Alexandre Julliard 19 Jan '15

19 Jan '15

Module: wine Branch: master Commit: 52e665a3bd4f151c78ee763a2151301924559faa URL: http://source.winehq.org/git/wine.git/?a=commit;h=52e665a3bd4f151c78ee763a2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 19 13:04:48 2015 +0100 ntdll/tests: Remove unused assigments (PVS-Studio). --- dlls/ntdll/tests/om.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index ca84399..2cf59cf 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -835,14 +835,14 @@ static void test_event(void) status = pNtOpenEvent(&Event2, GENERIC_ALL, &attr); ok( status == STATUS_SUCCESS, "NtOpenEvent failed %08x\n", status ); - status = pNtClose(Event); + pNtClose(Event); status = pNtQueryEvent(Event2, EventBasicInformation, &info, sizeof(info), NULL); ok( status == STATUS_SUCCESS, "NtQueryEvent failed %08x\n", status ); ok( info.EventType == 1 && info.EventState == 0, "NtQueryEvent failed, expected 1 0, got %d %d\n", info.EventType, info.EventState ); - status = pNtClose(Event2); + pNtClose(Event2); } static const WCHAR keyed_nameW[] = {'\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s',

1 0

Michael Stefaniuc : msxml3/tests: Actually test the return values ( PVS-Studio).
by Alexandre Julliard 19 Jan '15

19 Jan '15

Module: wine Branch: master Commit: 1caf6286f0b5a596b94f9406c5d83d82c2d23428 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1caf6286f0b5a596b94f9406c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 19 12:58:11 2015 +0100 msxml3/tests: Actually test the return values (PVS-Studio). --- dlls/msxml3/tests/domdoc.c | 1 + dlls/msxml3/tests/schema.c | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index a23fb66..e669de4 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -11085,6 +11085,7 @@ static void test_xmlns_attribute(void) V_VT(&v) = VT_BSTR; V_BSTR(&v) = _bstr_("urn:schemas-microsoft-com:datatypes"); hr = IXMLDOMAttribute_put_nodeValue(pAttribute, v); + ok(hr == S_OK, "ret %08x\n", hr ); hr = IXMLDOMElement_setAttributeNode(root, pAttribute, NULL); ok(hr == S_OK, "ret %08x\n", hr ); diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index f5d6fcd..be18fcf 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -1292,6 +1292,7 @@ static void test_XDR_datatypes(void) VariantClear(&type); hr = IXMLDOMNode_get_nodeTypedValue(node, &type); + EXPECT_HR(hr, S_OK); ok(V_VT(&type) == VT_BSTR, "got variant type %i\n", V_VT(&v)); VariantClear(&type); IXMLDOMNode_Release(node);

1 0

Michael Stefaniuc : msxml3/tests: Remove an unused assignment (PVS-Studio) .
by Alexandre Julliard 19 Jan '15

19 Jan '15

Module: wine Branch: master Commit: fe61400088b59def0cf4f580a9e8bace5132c7c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe61400088b59def0cf4f580a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 19 12:53:18 2015 +0100 msxml3/tests: Remove an unused assignment (PVS-Studio). --- dlls/msxml3/tests/domdoc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 1a73771..a23fb66 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4903,7 +4903,6 @@ static void test_xmlTypes(void) doc = create_document(&IID_IXMLDOMDocument); - pNextChild = (void*)0xdeadbeef; hr = IXMLDOMDocument_get_nextSibling(doc, NULL); ok(hr == E_INVALIDARG, "ret %08x\n", hr );

1 0

Michael Stefaniuc : ole32: Return the buffer pointer when WdtpInterfacePointer_UserMarshal fails.
by Alexandre Julliard 19 Jan '15

19 Jan '15

Module: wine Branch: master Commit: 514951cc1107c1207875809f802d937b9888f93c URL: http://source.winehq.org/git/wine.git/?a=commit;h=514951cc1107c1207875809f8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 19 11:26:14 2015 +0100 ole32: Return the buffer pointer when WdtpInterfacePointer_UserMarshal fails. Found by PVS-Studio. --- dlls/ole32/tests/usrmarshal.c | 1 + dlls/ole32/usrmarshal.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 8bcec74..086760e 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -576,6 +576,7 @@ static void marshal_WdtpInterfacePointer(DWORD umcb_ctx, DWORD ctx) ok(size == 0, "size should be 0 bytes, not %d\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, ctx, buffer, unk, &IID_IUnknown); + ok(buffer_end == buffer, "buffer_end %p buffer %p\n", buffer_end, buffer); HeapFree(GetProcessHeap(), 0, buffer); /* Now for a non-NULL pointer. The marshalled data are two size DWORDS and then diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 9c877b4..6687ac2 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -1641,7 +1641,7 @@ unsigned char * WINAPI WdtpInterfacePointer_UserMarshal(ULONG *pFlags, ULONG Rea if(CoMarshalInterface(stm, riid, punk, LOWORD(RealFlags), NULL, MSHLFLAGS_NORMAL) != S_OK) { IStream_Release(stm); - return NULL; + return pBuffer; } ALIGN_POINTER(pBuffer, 3);

1 0

Michael Stefaniuc : ole32/tests: Remove unused assignments (PVS-Studio).
by Alexandre Julliard 19 Jan '15

19 Jan '15

Module: wine Branch: master Commit: 139ebf643a645160cb63c680bd9a407285b6c481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=139ebf643a645160cb63c680b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 19 11:25:32 2015 +0100 ole32/tests: Remove unused assignments (PVS-Studio). --- dlls/ole32/tests/storage32.c | 2 +- dlls/ole32/tests/usrmarshal.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index e25f976..a373249 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1048,7 +1048,7 @@ static void test_streamenum(void) r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); ok(r==S_OK, "IStorage->CreateStream failed\n"); - r = IStream_Release(stm); + IStream_Release(stm); /* first enum ... should be 1 stream */ r = IStorage_EnumElements(stg, 0, NULL, 0, &ee); diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index d1f0856..8bcec74 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -275,7 +275,6 @@ static void test_marshal_HENHMETAFILE(void) ok(*(DWORD *)wirehemf == (size - 0x10), "wirestgm + 0xc should be size - 0x10 instead of 0x%08x\n", *(DWORD *)wirehemf); wirehemf += sizeof(DWORD); ok(*(DWORD *)wirehemf == EMR_HEADER, "wirestgm + 0x10 should be EMR_HEADER instead of %d\n", *(DWORD *)wirehemf); - wirehemf += sizeof(DWORD); /* ... rest of data not tested - refer to tests for GetEnhMetaFileBits * at this point */ @@ -300,7 +299,6 @@ static void test_marshal_HENHMETAFILE(void) ok(*(DWORD *)wirehemf == WDT_REMOTE_CALL, "wirestgm + 0x0 should be WDT_REMOTE_CALL instead of 0x%08x\n", *(DWORD *)wirehemf); wirehemf += sizeof(DWORD); ok(*(DWORD *)wirehemf == (DWORD)(DWORD_PTR)hemf, "wirestgm + 0x4 should be hemf instead of 0x%08x\n", *(DWORD *)wirehemf); - wirehemf += sizeof(DWORD); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); HENHMETAFILE_UserUnmarshal(&umcb.Flags, buffer, &hemf2); @@ -436,7 +434,6 @@ static void test_marshal_HMETAFILEPICT(void) ok(*(DWORD *)wirehmfp == (buffer_end - buffer - 0x28), "wirestgm + 0x24 should be size - 0x34 instead of 0x%08x\n", *(DWORD *)wirehmfp); wirehmfp += sizeof(DWORD); ok(*(WORD *)wirehmfp == 1, "wirehmfp + 0x28 should be 1 instead of 0x%08x\n", *(DWORD *)wirehmfp); - wirehmfp += sizeof(DWORD); /* ... rest of data not tested - refer to tests for GetMetaFileBits * at this point */

1 0

Michael Stefaniuc : ole32/tests: Actually test some return codes ( PVS-Studio).
by Alexandre Julliard 19 Jan '15

19 Jan '15

Module: wine Branch: master Commit: c2da97a5e5036a7486305e42a028a94e6d24eee2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2da97a5e5036a7486305e42a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 19 11:24:01 2015 +0100 ole32/tests: Actually test some return codes (PVS-Studio). --- dlls/ole32/tests/compobj.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index eed5ac8..4be9c8b 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -382,6 +382,7 @@ static void test_CLSIDFromProgID(void) clsid = CLSID_NULL; hr = CLSIDFromProgID(progidW, &clsid); + ok(hr == S_OK, "got 0x%08x\n", hr); /* it returns generated CLSID here */ ok(!IsEqualCLSID(&clsid, &CLSID_non_existent) && !IsEqualCLSID(&clsid, &CLSID_NULL), "got wrong clsid %s\n", wine_dbgstr_guid(&clsid)); @@ -1158,6 +1159,7 @@ static void test_CoGetPSClsid(void) ok(!res, "RegCreateKeyEx returned %d\n", res); res = RegCreateKeyExA(hkey, "ProxyStubClsid32", 0, NULL, 0, KEY_ALL_ACCESS | opposite, NULL, &hkey_psclsid, NULL); + ok(!res, "RegCreateKeyEx returned %d\n", res); res = RegSetValueExA(hkey_psclsid, NULL, 0, REG_SZ, (const BYTE *)clsidA, strlen(clsidA)+1); ok(!res, "RegSetValueEx returned %d\n", res); RegCloseKey(hkey_psclsid);

1 0

Akihiro Sagawa : msi: Remove 32-bit component registry keys with KEY_WOW64_32KEY flag.
by Alexandre Julliard 19 Jan '15

19 Jan '15

Module: wine Branch: master Commit: e52cbbcd0320d808b1aecaa52e9f32fd30b7ef34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e52cbbcd0320d808b1aecaa52… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Jan 18 22:04:06 2015 +0900 msi: Remove 32-bit component registry keys with KEY_WOW64_32KEY flag. --- dlls/msi/action.c | 62 ++++++++++++++---------------------------------------- dlls/msi/msipriv.h | 1 - 2 files changed, 16 insertions(+), 47 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 4b59b4e..afded69 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2588,30 +2588,6 @@ static const WCHAR *get_root_key( MSIPACKAGE *package, INT root, HKEY *root_key return ret; } -static WCHAR *get_keypath( MSICOMPONENT *comp, HKEY root, const WCHAR *path ) -{ - static const WCHAR prefixW[] = {'S','O','F','T','W','A','R','E','\\'}; - static const UINT len = sizeof(prefixW) / sizeof(prefixW[0]); - - if ((is_64bit || is_wow64) && - !(comp->Attributes & msidbComponentAttributes64bit) && - root == HKEY_LOCAL_MACHINE && !strncmpiW( path, prefixW, len )) - { - UINT size; - WCHAR *path_32node; - - size = (strlenW( path ) + strlenW( szWow6432Node ) + 2) * sizeof(WCHAR); - if (!(path_32node = msi_alloc( size ))) return NULL; - - memcpy( path_32node, path, len * sizeof(WCHAR) ); - strcpyW( path_32node + len, szWow6432Node ); - strcatW( path_32node, szBackSlash ); - strcatW( path_32node, path + len ); - return path_32node; - } - return strdupW( path ); -} - static inline REGSAM get_registry_view( const MSICOMPONENT *comp ) { REGSAM view = 0; @@ -2627,9 +2603,7 @@ static HKEY open_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path, BO HKEY hkey, ret = NULL; LONG res; - if (comp) - access |= get_registry_view( comp ); - else if (is_wow64) access |= KEY_WOW64_64KEY; + access |= get_registry_view( comp ); if (!(subkey = strdupW( path ))) return NULL; p = subkey; @@ -2952,20 +2926,20 @@ static UINT ACTION_WriteRegistryValues(MSIPACKAGE *package) return rc; } -static void delete_key( HKEY root, const WCHAR *path ) +static void delete_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path ) { REGSAM access = 0; WCHAR *subkey, *p; HKEY hkey; LONG res; - if (is_wow64) access |= KEY_WOW64_64KEY; + access |= get_registry_view( comp ); if (!(subkey = strdupW( path ))) return; for (;;) { if ((p = strrchrW( subkey, '\\' ))) *p = 0; - hkey = open_key( NULL, root, subkey, FALSE ); + hkey = open_key( comp, root, subkey, FALSE ); if (!hkey) break; if (p && p[1]) res = RegDeleteKeyExW( hkey, p + 1, access, 0 ); @@ -2982,13 +2956,13 @@ static void delete_key( HKEY root, const WCHAR *path ) msi_free( subkey ); } -static void delete_value( HKEY root, const WCHAR *path, const WCHAR *value ) +static void delete_value( const MSICOMPONENT *comp, HKEY root, const WCHAR *path, const WCHAR *value ) { LONG res; HKEY hkey; DWORD num_subkeys, num_values; - if ((hkey = open_key( NULL, root, path, FALSE ))) + if ((hkey = open_key( comp, root, path, FALSE ))) { if ((res = RegDeleteValueW( hkey, value ))) TRACE("failed to delete value %s (%d)\n", debugstr_w(value), res); @@ -2999,20 +2973,20 @@ static void delete_value( HKEY root, const WCHAR *path, const WCHAR *value ) if (!res && !num_subkeys && !num_values) { TRACE("removing empty key %s\n", debugstr_w(path)); - delete_key( root, path ); + delete_key( comp, root, path ); } } } -static void delete_tree( HKEY root, const WCHAR *path ) +static void delete_tree( const MSICOMPONENT *comp, HKEY root, const WCHAR *path ) { LONG res; HKEY hkey; - if (!(hkey = open_key( NULL, root, path, FALSE ))) return; + if (!(hkey = open_key( comp, root, path, FALSE ))) return; res = RegDeleteTreeW( hkey, NULL ); if (res) TRACE("failed to delete subtree of %s (%d)\n", debugstr_w(path), res); - delete_key( root, path ); + delete_key( comp, root, path ); RegCloseKey( hkey ); } @@ -3020,7 +2994,7 @@ static UINT ITERATE_RemoveRegistryValuesOnUninstall( MSIRECORD *row, LPVOID para { MSIPACKAGE *package = param; LPCWSTR component, name, key_str, root_key_str; - LPWSTR deformated_key, deformated_name, ui_key_str, keypath; + LPWSTR deformated_key, deformated_name, ui_key_str; MSICOMPONENT *comp; MSIRECORD *uirow; BOOL delete_key = FALSE; @@ -3069,11 +3043,9 @@ static UINT ITERATE_RemoveRegistryValuesOnUninstall( MSIRECORD *row, LPVOID para deformat_string( package, name, &deformated_name ); - keypath = get_keypath( comp, hkey_root, deformated_key ); + if (delete_key) delete_tree( comp, hkey_root, deformated_key ); + else delete_value( comp, hkey_root, deformated_key, deformated_name ); msi_free( deformated_key ); - if (delete_key) delete_tree( hkey_root, keypath ); - else delete_value( hkey_root, keypath, deformated_name ); - msi_free( keypath ); uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, ui_key_str ); @@ -3090,7 +3062,7 @@ static UINT ITERATE_RemoveRegistryValuesOnInstall( MSIRECORD *row, LPVOID param { MSIPACKAGE *package = param; LPCWSTR component, name, key_str, root_key_str; - LPWSTR deformated_key, deformated_name, ui_key_str, keypath; + LPWSTR deformated_key, deformated_name, ui_key_str; MSICOMPONENT *comp; MSIRECORD *uirow; BOOL delete_key = FALSE; @@ -3134,11 +3106,9 @@ static UINT ITERATE_RemoveRegistryValuesOnInstall( MSIRECORD *row, LPVOID param deformat_string( package, name, &deformated_name ); - keypath = get_keypath( comp, hkey_root, deformated_key ); + if (delete_key) delete_tree( comp, hkey_root, deformated_key ); + else delete_value( comp, hkey_root, deformated_key, deformated_name ); msi_free( deformated_key ); - if (delete_key) delete_tree( hkey_root, keypath ); - else delete_value( hkey_root, keypath, deformated_name ); - msi_free( keypath ); uirow = MSI_CreateRecord( 2 ); MSI_RecordSetStringW( uirow, 1, ui_key_str ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index fd7b116..88333d3 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1159,7 +1159,6 @@ static const WCHAR szX64[] = {'x','6','4',0}; static const WCHAR szAMD64[] = {'A','M','D','6','4',0}; static const WCHAR szARM[] = {'A','r','m',0}; static const WCHAR szWow6432NodeCLSID[] = {'W','o','w','6','4','3','2','N','o','d','e','\\','C','L','S','I','D',0}; -static const WCHAR szWow6432Node[] = {'W','o','w','6','4','3','2','N','o','d','e',0}; static const WCHAR szStreams[] = {'_','S','t','r','e','a','m','s',0}; static const WCHAR szStorages[] = {'_','S','t','o','r','a','g','e','s',0}; static const WCHAR szMsiPublishAssemblies[] = {'M','s','i','P','u','b','l','i','s','h','A','s','s','e','m','b','l','i','e','s',0};

1 0

Akihiro Sagawa : msi: Open 32-bit component registry keys with KEY_WOW64_32KEY flag.
by Alexandre Julliard 19 Jan '15

19 Jan '15

Module: wine Branch: master Commit: cdf3c23645889d0f1aeabd366c969feb34d5d808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdf3c23645889d0f1aeabd366… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Jan 18 22:04:04 2015 +0900 msi: Open 32-bit component registry keys with KEY_WOW64_32KEY flag. --- dlls/msi/action.c | 34 +++++++++++++++++++++------------- dlls/msi/tests/install.c | 4 ++-- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 34697f3..4b59b4e 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2612,14 +2612,24 @@ static WCHAR *get_keypath( MSICOMPONENT *comp, HKEY root, const WCHAR *path ) return strdupW( path ); } -static HKEY open_key( HKEY root, const WCHAR *path, BOOL create ) +static inline REGSAM get_registry_view( const MSICOMPONENT *comp ) +{ + REGSAM view = 0; + if (is_wow64 || is_64bit) + view |= (comp->Attributes & msidbComponentAttributes64bit) ? KEY_WOW64_64KEY : KEY_WOW64_32KEY; + return view; +} + +static HKEY open_key( const MSICOMPONENT *comp, HKEY root, const WCHAR *path, BOOL create ) { REGSAM access = KEY_ALL_ACCESS; WCHAR *subkey, *p, *q; HKEY hkey, ret = NULL; LONG res; - if (is_wow64) access |= KEY_WOW64_64KEY; + if (comp) + access |= get_registry_view( comp ); + else if (is_wow64) access |= KEY_WOW64_64KEY; if (!(subkey = strdupW( path ))) return NULL; p = subkey; @@ -2636,7 +2646,7 @@ static HKEY open_key( HKEY root, const WCHAR *path, BOOL create ) } if (q && q[1]) { - ret = open_key( hkey, q + 1, create ); + ret = open_key( comp, hkey, q + 1, create ); RegCloseKey( hkey ); } else ret = hkey; @@ -2817,7 +2827,7 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) BYTE *new_value, *old_value = NULL; HKEY root_key, hkey; DWORD type, old_type, new_size, old_size = 0; - LPWSTR deformated, uikey, keypath; + LPWSTR deformated, uikey; const WCHAR *szRoot, *component, *name, *key, *str; MSICOMPONENT *comp; MSIRECORD * uirow; @@ -2861,15 +2871,14 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) strcpyW(uikey,szRoot); strcatW(uikey,deformated); - keypath = get_keypath( comp, root_key, deformated ); - msi_free( deformated ); - if (!(hkey = open_key( root_key, keypath, TRUE ))) + if (!(hkey = open_key( comp, root_key, deformated, TRUE ))) { - ERR("Could not create key %s\n", debugstr_w(keypath)); + ERR("Could not create key %s\n", debugstr_w(deformated)); msi_free(uikey); - msi_free(keypath); + msi_free(deformated); return ERROR_FUNCTION_FAILED; } + msi_free( deformated ); str = msi_record_get_string( row, 5, NULL ); len = deformat_string( package, str, &deformated ); new_value = parse_value( package, deformated, len, &type, &new_size ); @@ -2922,7 +2931,6 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) msi_free(old_value); msi_free(deformated); msi_free(uikey); - msi_free(keypath); return ERROR_SUCCESS; } @@ -2957,7 +2965,7 @@ static void delete_key( HKEY root, const WCHAR *path ) for (;;) { if ((p = strrchrW( subkey, '\\' ))) *p = 0; - hkey = open_key( root, subkey, FALSE ); + hkey = open_key( NULL, root, subkey, FALSE ); if (!hkey) break; if (p && p[1]) res = RegDeleteKeyExW( hkey, p + 1, access, 0 ); @@ -2980,7 +2988,7 @@ static void delete_value( HKEY root, const WCHAR *path, const WCHAR *value ) HKEY hkey; DWORD num_subkeys, num_values; - if ((hkey = open_key( root, path, FALSE ))) + if ((hkey = open_key( NULL, root, path, FALSE ))) { if ((res = RegDeleteValueW( hkey, value ))) TRACE("failed to delete value %s (%d)\n", debugstr_w(value), res); @@ -3001,7 +3009,7 @@ static void delete_tree( HKEY root, const WCHAR *path ) LONG res; HKEY hkey; - if (!(hkey = open_key( root, path, FALSE ))) return; + if (!(hkey = open_key( NULL, root, path, FALSE ))) return; res = RegDeleteTreeW( hkey, NULL ); if (res) TRACE("failed to delete subtree of %s (%d)\n", debugstr_w(path), res); delete_key( root, path ); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 7c4544a..e607bc9 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -5669,7 +5669,7 @@ static void test_mixed_package(void) res = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\\InProcServer32", 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); - todo_wine ok(res == ERROR_SUCCESS, "can't open 32-bit CLSID key, got %d\n", res); + ok(res == ERROR_SUCCESS, "can't open 32-bit CLSID key, got %d\n", res); if (res == ERROR_SUCCESS) { size = sizeof(value); res = RegQueryValueExA(hkey, "", NULL, NULL, (LPBYTE)value, &size); @@ -5732,7 +5732,7 @@ static void test_mixed_package(void) res = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID\\{8dfef911-6885-41eb-b280-8f0304728e8b}\\InProcServer32", 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); - todo_wine ok(res == ERROR_SUCCESS, "can't open 32-bit CLSID key, got %d\n", res); + ok(res == ERROR_SUCCESS, "can't open 32-bit CLSID key, got %d\n", res); if (res == ERROR_SUCCESS) { size = sizeof(value); res = RegQueryValueExA(hkey, "", NULL, NULL, (LPBYTE)value, &size);

1 0

Akihiro Sagawa : advapi32: Fix HKLM\Software handling when opening with KEY_WOW64_32KEY.
by Alexandre Julliard 19 Jan '15

19 Jan '15

Module: wine Branch: master Commit: 03f6a6e924df300c709092a0621721ec6142e760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03f6a6e924df300c709092a06… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Jan 18 22:04:02 2015 +0900 advapi32: Fix HKLM\Software handling when opening with KEY_WOW64_32KEY. --- dlls/advapi32/registry.c | 23 ++++++++++++++++++----- dlls/advapi32/tests/registry.c | 8 +++----- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 620dd6a..06833d6 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -127,12 +127,12 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES { BOOL force_wow32 = is_win64 && (access & KEY_WOW64_32KEY); NTSTATUS status = STATUS_OBJECT_NAME_NOT_FOUND; + HANDLE subkey, root = attr->RootDirectory; - if (!force_wow32) status = NtCreateKey( (HANDLE *)retkey, access, attr, 0, class, options, dispos ); + if (!force_wow32) status = NtCreateKey( &subkey, access, attr, 0, class, options, dispos ); if (status == STATUS_OBJECT_NAME_NOT_FOUND) { - HANDLE subkey, root = attr->RootDirectory; WCHAR *buffer = attr->ObjectName->Buffer; DWORD attrs, pos = 0, i = 0, len = attr->ObjectName->Length / sizeof(WCHAR); UNICODE_STRING str; @@ -160,7 +160,7 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES if (i == len) { attr->Attributes = attrs; - status = NtCreateKey( (PHANDLE)retkey, access, attr, 0, class, options, dispos ); + status = NtCreateKey( &subkey, access, attr, 0, class, options, dispos ); } else { @@ -177,6 +177,13 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES while (i < len && buffer[i] != '\\') i++; } } + attr->RootDirectory = subkey; + if (force_wow32 && (subkey = open_wow6432node( attr->RootDirectory ))) + { + if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); + attr->RootDirectory = subkey; + } + *retkey = attr->RootDirectory; return status; } @@ -214,7 +221,7 @@ static NTSTATUS open_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *a if (i == len) { attr->Attributes = attrs; - status = NtOpenKey( (PHANDLE)retkey, access, attr ); + status = NtOpenKey( &subkey, access, attr ); } else { @@ -223,12 +230,18 @@ static NTSTATUS open_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *a } if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); if (status) return status; - if (i == len) break; attr->RootDirectory = subkey; + if (i == len) break; while (i < len && buffer[i] == '\\') i++; pos = i; while (i < len && buffer[i] != '\\') i++; } + if (force_wow32 && (subkey = open_wow6432node( attr->RootDirectory ))) + { + if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); + attr->RootDirectory = subkey; + } + *retkey = attr->RootDirectory; return status; } diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 3acda0e..f0cfb5c 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -2142,12 +2142,10 @@ static void test_redirection(void) err = RegCreateKeyExA( HKEY_LOCAL_MACHINE, "Software", 0, NULL, 0, KEY_WOW64_32KEY | KEY_ALL_ACCESS, NULL, &key, NULL ); ok( err == ERROR_SUCCESS, "RegCreateKeyExA failed: %u\n", err ); - dw = get_key_value( key, "Wine\\Winetest", 0 ); - todo_wine ok( dw == 32, "wrong value %u\n", dw ); + check_key_value( key, "Wine\\Winetest", 0, 32 ); dw = get_key_value( key, "Wine\\Winetest", KEY_WOW64_64KEY ); - todo_wine ok( dw == 32 || broken(dw == 64) /* vista */, "wrong value %u\n", dw ); - dw = get_key_value( key, "Wine\\Winetest", KEY_WOW64_32KEY ); - todo_wine ok( dw == 32, "wrong value %u\n", dw ); + ok( dw == 32 || broken(dw == 64) /* vista */, "wrong value %u\n", dw ); + check_key_value( key, "Wine\\Winetest", KEY_WOW64_32KEY, 32 ); RegCloseKey( key ); }

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
31
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 January 2015