September 2015 - Wine-commits

Józef Kucia : d3d10core/tests: Port test_buffer_interfaces() from d3d11.
by Alexandre Julliard 07 Sep '15

07 Sep '15

Module: wine Branch: master Commit: d7af6664ac931f63507a4d22b2d1231cfa73965d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7af6664ac931f63507a4d22b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 6 16:45:51 2015 +0200 d3d10core/tests: Port test_buffer_interfaces() from d3d11. --- dlls/d3d10core/tests/device.c | 130 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 847abd1..ebe50cc 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -518,6 +518,135 @@ static void test_create_texture3d(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_buffer_interfaces(void) +{ + ID3D11Buffer *d3d11_buffer; + D3D10_BUFFER_DESC desc; + ID3D10Buffer *buffer; + ID3D10Device *device; + unsigned int i; + ULONG refcount; + HRESULT hr; + + static const struct test + { + UINT bind_flags; + UINT misc_flags; + UINT expected_bind_flags; + UINT expected_misc_flags; + } + desc_conversion_tests[] = + { + { + D3D10_BIND_VERTEX_BUFFER, 0, + D3D11_BIND_VERTEX_BUFFER, 0 + }, + { + D3D10_BIND_INDEX_BUFFER, 0, + D3D11_BIND_INDEX_BUFFER, 0 + }, + { + D3D10_BIND_CONSTANT_BUFFER, 0, + D3D11_BIND_CONSTANT_BUFFER, 0 + }, + { + D3D10_BIND_SHADER_RESOURCE, 0, + D3D11_BIND_SHADER_RESOURCE, 0 + }, + { + D3D10_BIND_STREAM_OUTPUT, 0, + D3D11_BIND_STREAM_OUTPUT, 0 + }, + { + D3D10_BIND_RENDER_TARGET, 0, + D3D11_BIND_RENDER_TARGET, 0 + }, + { + 0, D3D10_RESOURCE_MISC_SHARED, + 0, D3D11_RESOURCE_MISC_SHARED + }, + }; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + desc.ByteWidth = 1024; + desc.Usage = D3D10_USAGE_DEFAULT; + desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + desc.CPUAccessFlags = 0; + desc.MiscFlags = 0; + + hr = ID3D10Device_CreateBuffer(device, &desc, NULL, &buffer); + ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x.\n", hr); + + hr = ID3D10Buffer_QueryInterface(buffer, &IID_ID3D11Buffer, (void **)&d3d11_buffer); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Buffer should implement ID3D11Buffer.\n"); + if (SUCCEEDED(hr)) ID3D11Buffer_Release(d3d11_buffer); + ID3D10Buffer_Release(buffer); + + if (FAILED(hr)) + { + win_skip("D3D11 is not available.\n"); + ID3D10Device_Release(device); + return; + } + + for (i = 0; i < sizeof(desc_conversion_tests) / sizeof(*desc_conversion_tests); ++i) + { + const struct test *current = &desc_conversion_tests[i]; + D3D11_BUFFER_DESC d3d11_desc; + ID3D11Device *d3d11_device; + + desc.ByteWidth = 1024; + desc.Usage = D3D10_USAGE_DEFAULT; + desc.BindFlags = current->bind_flags; + desc.CPUAccessFlags = 0; + desc.MiscFlags = current->misc_flags; + + hr = ID3D10Device_CreateBuffer(device, &desc, NULL, &buffer); + /* Shared resources are not supported by REF and WARP devices. */ + ok(SUCCEEDED(hr) || broken(hr == E_OUTOFMEMORY), "Test %u: Failed to create a buffer, hr %#x.\n", i, hr); + if (FAILED(hr)) + { + win_skip("Failed to create a buffer, skipping test %u.\n", i); + continue; + } + + hr = ID3D10Buffer_QueryInterface(buffer, &IID_ID3D11Buffer, (void **)&d3d11_buffer); + ok(SUCCEEDED(hr), "Test %u: Buffer should implement ID3D11Buffer.\n", i); + ID3D10Buffer_Release(buffer); + + ID3D11Buffer_GetDesc(d3d11_buffer, &d3d11_desc); + + ok(d3d11_desc.ByteWidth == desc.ByteWidth, + "Test %u: Got unexpected ByteWidth %u.\n", i, d3d11_desc.ByteWidth); + ok(d3d11_desc.Usage == (D3D11_USAGE)desc.Usage, + "Test %u: Got unexpected Usage %u.\n", i, d3d11_desc.Usage); + ok(d3d11_desc.BindFlags == current->expected_bind_flags, + "Test %u: Got unexpected BindFlags %#x.\n", i, d3d11_desc.BindFlags); + ok(d3d11_desc.CPUAccessFlags == desc.CPUAccessFlags, + "Test %u: Got unexpected CPUAccessFlags %#x.\n", i, d3d11_desc.CPUAccessFlags); + ok(d3d11_desc.MiscFlags == current->expected_misc_flags, + "Test %u: Got unexpected MiscFlags %#x.\n", i, d3d11_desc.MiscFlags); + ok(d3d11_desc.StructureByteStride == 0, + "Test %u: Got unexpected StructureByteStride %u.\n", i, d3d11_desc.StructureByteStride); + + d3d11_device = NULL; + ID3D11Buffer_GetDevice(d3d11_buffer, &d3d11_device); + ok(!!d3d11_device, "Test %u: Got NULL, expected device pointer.\n", i); + ID3D11Device_Release(d3d11_device); + + ID3D11Buffer_Release(d3d11_buffer); + } + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_create_depthstencil_view(void) { D3D10_DEPTH_STENCIL_VIEW_DESC dsv_desc; @@ -3607,6 +3736,7 @@ START_TEST(device) test_create_texture2d(); test_texture2d_interfaces(); test_create_texture3d(); + test_buffer_interfaces(); test_create_depthstencil_view(); test_create_rendertarget_view(); test_create_shader_resource_view();

1 0

Jacek Caban : oleaut32: Clean up IPSFactoryBuffer instance.
by Alexandre Julliard 07 Sep '15

07 Sep '15

Module: wine Branch: master Commit: 91bd7ffaa80bafa712aaba2d4fe51a9c91f41495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91bd7ffaa80bafa712aaba2d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 7 13:38:32 2015 +0200 oleaut32: Clean up IPSFactoryBuffer instance. --- dlls/oleaut32/tmarshal.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 6608aed..f4ce311 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -2338,17 +2338,12 @@ static const IPSFactoryBufferVtbl psfacbufvtbl = { PSFacBuf_CreateStub }; -/* This is the whole PSFactoryBuffer object, just the vtableptr */ -static const IPSFactoryBufferVtbl *lppsfac = &psfacbufvtbl; +static IPSFactoryBuffer psfac = { &psfacbufvtbl }; /*********************************************************************** * TMARSHAL_DllGetClassObject */ -HRESULT TMARSHAL_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) +HRESULT TMARSHAL_DllGetClassObject(REFCLSID rclsid, REFIID iid, void **ppv) { - if (IsEqualIID(iid,&IID_IPSFactoryBuffer)) { - *ppv = &lppsfac; - return S_OK; - } - return E_NOINTERFACE; + return IPSFactoryBuffer_QueryInterface(&psfac, iid, ppv); }

1 0

Hugh McMaster : regsvr32: Call InstallDll before UnregisterDll when using /u /i.
by Alexandre Julliard 07 Sep '15

07 Sep '15

Module: wine Branch: master Commit: 48c7a3f4d7ffcbe62b70f6b0eab1bc8c79e2e5aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=48c7a3f4d7ffcbe62b70f6b0e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 7 20:08:10 2015 +1000 regsvr32: Call InstallDll before UnregisterDll when using /u /i. --- programs/regsvr32/regsvr32.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index a2d83a1..ff6a3ae 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -289,6 +289,12 @@ int wmain(int argc, WCHAR* argv[]) int res = 0; DllFound = TRUE; + if (CallInstall && Unregister) + res = InstallDll(!Unregister, DllName, wsCommandLine); + + if (res) + return res; + if (!CallInstall || (CallInstall && CallRegister)) { if(Unregister) @@ -301,10 +307,8 @@ int wmain(int argc, WCHAR* argv[]) return res; /* Confirmed. The Windows version stops on the first error. */ - if (CallInstall) - { + if (CallInstall && !Unregister) res = InstallDll(!Unregister, DllName, wsCommandLine); - } if (res) return res;

1 0

Hugh McMaster : regsvr32: Process the next file in the array if an error occurs.
by Alexandre Julliard 07 Sep '15

07 Sep '15

Module: wine Branch: master Commit: 07cc9a34a87cd08c87ae198e4aeb8c9bb7f55175 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07cc9a34a87cd08c87ae198e4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 7 20:38:04 2015 +1000 regsvr32: Process the next file in the array if an error occurs. The Windows version stops processing the current file and moves to the next file on the first error. --- programs/regsvr32/regsvr32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index ff6a3ae..a1b55a3 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -292,8 +292,9 @@ int wmain(int argc, WCHAR* argv[]) if (CallInstall && Unregister) res = InstallDll(!Unregister, DllName, wsCommandLine); + /* The Windows version stops processing the current file on the first error. */ if (res) - return res; + continue; if (!CallInstall || (CallInstall && CallRegister)) { @@ -304,14 +305,13 @@ int wmain(int argc, WCHAR* argv[]) } if (res) - return res; - /* Confirmed. The Windows version stops on the first error. */ + continue; if (CallInstall && !Unregister) res = InstallDll(!Unregister, DllName, wsCommandLine); if (res) - return res; + continue; } }

1 0

Bruno Jesus : quartz: Ensure pSample is NULL before calling IAsyncReader_WaitForNext.
by Alexandre Julliard 07 Sep '15

07 Sep '15

Module: wine Branch: master Commit: 29a9ea18bc3fa8148f1203e08ec276cb56720817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29a9ea18bc3fa8148f1203e08… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Sep 5 00:25:43 2015 +0800 quartz: Ensure pSample is NULL before calling IAsyncReader_WaitForNext. --- dlls/quartz/pin.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 8377be5..52a3970 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -415,6 +415,7 @@ static void PullPin_Flush(PullPin *This) { DWORD_PTR dwUser; + pSample = NULL; IAsyncReader_WaitForNext(This->pReader, 0, &pSample, &dwUser); if (!pSample)

1 0

Vincent Povirk : mscoree: Send Mono's debug output to Unix stderr.
by Alexandre Julliard 07 Sep '15

07 Sep '15

Module: wine Branch: master Commit: 2ecd3772e3805992f48bb806fd6a595048441011 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ecd3772e3805992f48bb806f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 4 14:05:00 2015 -0500 mscoree: Send Mono's debug output to Unix stderr. --- dlls/mscoree/metahost.c | 18 ++++++++++++++++++ dlls/mscoree/mscoree_private.h | 4 ++++ 2 files changed, 22 insertions(+) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 5e32ecb..6b53cde 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -102,6 +102,8 @@ static char* (CDECL *mono_stringify_assembly_name)(MonoAssemblyName *aname); MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain); void (CDECL *mono_thread_manage)(void); void (CDECL *mono_trace_set_assembly)(MonoAssembly *assembly); +void (CDECL *mono_trace_set_print_handler)(MonoPrintCallback callback); +void (CDECL *mono_trace_set_printerr_handler)(MonoPrintCallback callback); static BOOL get_mono_path(LPWSTR path); @@ -111,12 +113,18 @@ static MonoAssembly* mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char static void mono_shutdown_callback_fn(MonoProfiler *prof); +static void mono_print_handler_fn(const char *string, INT is_stdout); + static MonoImage* CDECL image_open_module_handle_dummy(HMODULE module_handle, char* fname, UINT has_entry_point, MonoImageOpenStatus* status) { return mono_image_open(fname, status); } +static void CDECL set_print_handler_dummy(MonoPrintCallback callback) +{ +} + static void missing_runtime_message(void) { MESSAGE("wine: Install Mono for Windows to run .NET applications.\n"); @@ -204,11 +212,16 @@ static HRESULT load_mono(LPCWSTR mono_path) } while (0); LOAD_OPT_MONO_FUNCTION(mono_image_open_from_module_handle, image_open_module_handle_dummy); + LOAD_OPT_MONO_FUNCTION(mono_trace_set_print_handler, set_print_handler_dummy); + LOAD_OPT_MONO_FUNCTION(mono_trace_set_printerr_handler, set_print_handler_dummy); #undef LOAD_OPT_MONO_FUNCTION mono_profiler_install(NULL, mono_shutdown_callback_fn); + mono_trace_set_print_handler(mono_print_handler_fn); + mono_trace_set_printerr_handler(mono_print_handler_fn); + mono_set_dirs(mono_lib_path_a, mono_etc_path_a); mono_config_parse(NULL); @@ -244,6 +257,11 @@ static void mono_shutdown_callback_fn(MonoProfiler *prof) is_mono_shutdown = TRUE; } +static void mono_print_handler_fn(const char *string, INT is_stdout) +{ + wine_dbg_printf("%s", string); +} + static HRESULT CLRRuntimeInfo_GetRuntimeHost(CLRRuntimeInfo *This, RuntimeHost **result) { HRESULT hr = S_OK; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 0fbbff6..9a7678d 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -132,6 +132,8 @@ typedef MonoAssembly* (*MonoAssemblyPreLoadFunc)(MonoAssemblyName *aname, char * typedef void (*MonoProfileFunc)(MonoProfiler *prof); +typedef void (*MonoPrintCallback) (const char *string, INT is_stdout); + extern BOOL is_mono_started DECLSPEC_HIDDEN; extern MonoImage* (CDECL *mono_assembly_get_image)(MonoAssembly *assembly) DECLSPEC_HIDDEN; @@ -156,6 +158,8 @@ extern MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str) extern MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain) DECLSPEC_HIDDEN; extern void (CDECL *mono_thread_manage)(void) DECLSPEC_HIDDEN; extern void (CDECL *mono_trace_set_assembly)(MonoAssembly *assembly) DECLSPEC_HIDDEN; +extern void (CDECL *mono_trace_set_print_handler)(MonoPrintCallback callback) DECLSPEC_HIDDEN; +extern void (CDECL *mono_trace_set_printerr_handler)(MonoPrintCallback callback) DECLSPEC_HIDDEN; /* loaded runtime interfaces */ extern void expect_no_runtimes(void) DECLSPEC_HIDDEN;

1 0

Gerald Pfeifer : server: Replace 1 << 31 by 1u << 31 to avoid shift overflow in in get_active_hooks.
by Alexandre Julliard 07 Sep '15

07 Sep '15

Module: wine Branch: master Commit: 509d0f06cece4668a04f35f0ca6e924947673c31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=509d0f06cece4668a04f35f0c… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Sep 4 16:07:31 2015 +0200 server: Replace 1 << 31 by 1u << 31 to avoid shift overflow in in get_active_hooks. --- server/hook.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/hook.c b/server/hook.c index 3abd8d9..a8e6ab9 100644 --- a/server/hook.c +++ b/server/hook.c @@ -356,7 +356,7 @@ unsigned int get_active_hooks(void) { struct hook_table *table = get_queue_hooks( current ); struct hook_table *global_hooks = get_global_hooks( current ); - unsigned int ret = 1 << 31; /* set high bit to indicate that the bitmap is valid */ + unsigned int ret = 1u << 31; /* set high bit to indicate that the bitmap is valid */ int id; for (id = WH_MINHOOK; id <= WH_WINEVENT; id++)

1 0

Gerald Pfeifer : propsys: Cast to ULONGLONG instead of LONGLONG in test_intconversions test_intconversions to avoid shift overflow.
by Alexandre Julliard 07 Sep '15

07 Sep '15

Module: wine Branch: master Commit: 519ad57cb5ebdb142bd755f924e8487985801315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=519ad57cb5ebdb142bd755f92… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Sep 4 21:47:36 2015 +0200 propsys: Cast to ULONGLONG instead of LONGLONG in test_intconversions test_intconversions to avoid shift overflow. --- dlls/propsys/tests/propsys.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 99d1c460..0dd052c 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -765,11 +765,11 @@ static void test_intconversions(void) PropVariantClear(&propvar); propvar.vt = VT_I8; - propvar.u.hVal.QuadPart = (LONGLONG)1 << 63; + propvar.u.hVal.QuadPart = (ULONGLONG)1 << 63; hr = PropVariantToInt64(&propvar, &llval); ok(hr == S_OK, "hr=%x\n", hr); - ok(llval == (LONGLONG)1 << 63, "got wrong value %s\n", debugstr_longlong(llval)); + ok(llval == (ULONGLONG)1 << 63, "got wrong value %s\n", debugstr_longlong(llval)); hr = PropVariantToUInt64(&propvar, &ullval); ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "hr=%x\n", hr);

1 0

Bruno Jesus : shlwapi: Reject NULL key on SHRegCloseUSKey with tests.
by Alexandre Julliard 07 Sep '15

07 Sep '15

Module: wine Branch: master Commit: ffb4d151174be47b728099e0d203474e5e6d1b5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffb4d151174be47b728099e0d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Sep 6 08:34:12 2015 +0800 shlwapi: Reject NULL key on SHRegCloseUSKey with tests. --- dlls/shlwapi/reg.c | 3 +++ dlls/shlwapi/tests/shreg.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index 1653b80..a72f4c2 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -193,6 +193,9 @@ LONG WINAPI SHRegCloseUSKey( LPSHUSKEY hKey = hUSKey; LONG ret = ERROR_SUCCESS; + if (!hKey) + return ERROR_INVALID_PARAMETER; + if (hKey->HKCUkey) ret = RegCloseKey(hKey->HKCUkey); if (hKey->HKCUstart && hKey->HKCUstart != HKEY_CURRENT_USER) diff --git a/dlls/shlwapi/tests/shreg.c b/dlls/shlwapi/tests/shreg.c index dfc8c3e..ca7fbad 100644 --- a/dlls/shlwapi/tests/shreg.c +++ b/dlls/shlwapi/tests/shreg.c @@ -38,6 +38,8 @@ static DWORD (WINAPI *pSHCopyKeyA)(HKEY,LPCSTR,HKEY,DWORD); static DWORD (WINAPI *pSHRegGetPathA)(HKEY,LPCSTR,LPCSTR,LPSTR,DWORD); static LSTATUS (WINAPI *pSHRegGetValueA)(HKEY,LPCSTR,LPCSTR,SRRF,LPDWORD,LPVOID,LPDWORD); static LSTATUS (WINAPI *pSHRegCreateUSKeyW)(LPCWSTR,REGSAM,HUSKEY,PHUSKEY,DWORD); +static LSTATUS (WINAPI *pSHRegOpenUSKeyW)(LPCWSTR,REGSAM,HUSKEY,PHUSKEY,BOOL); +static LSTATUS (WINAPI *pSHRegCloseUSKey)(HUSKEY); static const char sTestpath1[] = "%LONGSYSTEMVAR%\\subdir1"; static const char sTestpath2[] = "%FOO%\\subdir1"; @@ -458,6 +460,35 @@ static void test_SHRegCreateUSKeyW(void) ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); } +static void test_SHRegCloseUSKey(void) +{ + static const WCHAR localW[] = {'S','o','f','t','w','a','r','e',0}; + LONG ret; + HUSKEY key; + + if (!pSHRegOpenUSKeyW || !pSHRegCloseUSKey) + { + win_skip("SHRegOpenUSKeyW or SHRegCloseUSKey not available\n"); + return; + } + + ret = pSHRegCloseUSKey(NULL); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + ret = pSHRegOpenUSKeyW(localW, KEY_ALL_ACCESS, NULL, &key, FALSE); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + ret = pSHRegCloseUSKey(key); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + /* Test with limited rights, specially without KEY_SET_VALUE */ + ret = pSHRegOpenUSKeyW(localW, KEY_QUERY_VALUE, NULL, &key, FALSE); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + ret = pSHRegCloseUSKey(key); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); +} + START_TEST(shreg) { HKEY hkey = create_test_entries(); @@ -476,6 +507,8 @@ START_TEST(shreg) pSHRegGetPathA = (void*)GetProcAddress(hshlwapi,"SHRegGetPathA"); pSHRegGetValueA = (void*)GetProcAddress(hshlwapi,"SHRegGetValueA"); pSHRegCreateUSKeyW = (void*)GetProcAddress(hshlwapi, "SHRegCreateUSKeyW"); + pSHRegOpenUSKeyW = (void*)GetProcAddress(hshlwapi, "SHRegOpenUSKeyW"); + pSHRegCloseUSKey = (void*)GetProcAddress(hshlwapi, "SHRegCloseUSKey"); test_SHGetValue(); test_SHRegGetValue(); @@ -484,6 +517,7 @@ START_TEST(shreg) test_SHCopyKey(); test_SHDeleteKey(); test_SHRegCreateUSKeyW(); + test_SHRegCloseUSKey(); delete_key( hkey, "Software\\Wine", "Test" ); }

1 0

Thomas Faller : reg: Implement binary data add operation.
by Alexandre Julliard 07 Sep '15

07 Sep '15

Module: wine Branch: master Commit: 5c9526cb6c6151d0f9093c1ac6bb3b7333c64feb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c9526cb6c6151d0f9093c1ac… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Sun Sep 6 16:07:18 2015 +0200 reg: Implement binary data add operation. --- programs/reg/reg.c | 43 +++++++++++++++++++++++++++++++++++++++++++ programs/reg/tests/reg.c | 6 +++--- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 4ec25bc..e4d121c 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -158,6 +158,19 @@ static DWORD wchar_get_type(const WCHAR *type_name) return ~0u; } +/* hexchar_to_byte from programs/regedit/hexedit.c */ +static inline BYTE hexchar_to_byte(WCHAR ch) +{ + if (ch >= '0' && ch <= '9') + return ch - '0'; + else if (ch >= 'a' && ch <= 'f') + return ch - 'a' + 10; + else if (ch >= 'A' && ch <= 'F') + return ch - 'A' + 10; + else + return -1; +} + static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *reg_count) { LPBYTE out_data = NULL; @@ -187,6 +200,36 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r ((LPDWORD)out_data)[0] = val; break; } + case REG_BINARY: + { + static const WCHAR nohex[] = {'E','r','r','o','r',':',' ','/','d',' ','r','e','q','u','i','r','e','s',' ','h','e','x',' ','d','a','t','a','.','\n',0}; + BYTE hex0, hex1; + int i = 0, destByteIndex = 0, datalen = lstrlenW(data); + *reg_count = ((datalen + datalen % 2) / 2) * sizeof(BYTE); + out_data = HeapAlloc(GetProcessHeap(), 0, *reg_count); + if(datalen % 2) + { + hex1 = hexchar_to_byte(data[i++]); + if(hex1 == 0xFF) + goto no_hex_data; + out_data[destByteIndex++] = hex1; + } + for(;i + 1 < datalen;i += 2) + { + hex0 = hexchar_to_byte(data[i]); + hex1 = hexchar_to_byte(data[i + 1]); + if(hex0 == 0xFF || hex1 == 0xFF) + goto no_hex_data; + out_data[destByteIndex++] = (hex0 << 4) | hex1; + } + break; + no_hex_data: + /* cleanup, print error */ + HeapFree(GetProcessHeap(), 0, out_data); + reg_printfW(nohex); + out_data = NULL; + break; + } default: { static const WCHAR unhandled[] = {'U','n','h','a','n','d','l','e','d',' ','T','y','p','e',' ','0','x','%','x',' ',' ','d','a','t','a',' ','%','s','\n',0}; diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index dbfce89..2880d37 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -214,7 +214,7 @@ static void test_add(void) run_reg_exe("reg add HKEY_CURRENT_USER\\" KEY_BASE " /ve /t REG_BINARY /d deadbeef /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); dword = 0xefbeadde; - verify_reg(hkey, "", REG_BINARY, &dword, sizeof(DWORD), TODO_REG_SIZE); + verify_reg(hkey, "", REG_BINARY, &dword, sizeof(DWORD), 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin1 /f /d 0xDeAdBeEf", &r); todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); @@ -235,8 +235,8 @@ static void test_add(void) err = RegQueryValueExA(hkey, "bin4", NULL, &type, (void *) (buffer+12), &size); ok(err == ERROR_SUCCESS, "RegQueryValueEx failed: got %d\n", err); ok(type == REG_BINARY, "got wrong type %u\n", type); - todo_wine ok(size == 6, "got wrong size %u\n", size); - todo_wine ok(memcmp(buffer, buffer+12, 6) == 0 || + ok(size == 6, "got wrong size %u\n", size); + ok(memcmp(buffer, buffer+12, 6) == 0 || broken(memcmp(buffer+6, buffer+12, 6) == 0 /* WinXP */), "got wrong data\n"); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_BINARY /v bin5 /d \"\" /f", &r);

1 0