September 2017 - Wine-commits

Andrew Eikum : wineandroid: Don't use deprecated SLDataFormat_PCM struct.
by Alexandre Julliard 25 Sep '17

25 Sep '17

Module: wine Branch: master Commit: f5fe252cd165a7966f04651142d39686ff138005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5fe252cd165a7966f0465114… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Sep 25 13:14:21 2017 -0500 wineandroid: Don't use deprecated SLDataFormat_PCM struct. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/mmdevdrv.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index d661fb5..275b652 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -647,7 +647,7 @@ static HRESULT get_audio_session(const GUID *sessionguid, return S_OK; } -static HRESULT waveformat_to_pcm(ACImpl *This, const WAVEFORMATEX *fmt, SLDataFormat_PCM *pcm) +static HRESULT waveformat_to_pcm(ACImpl *This, const WAVEFORMATEX *fmt, SLAndroidDataFormat_PCM_EX *pcm) { /* only support non-float PCM */ if(fmt->wFormatTag != WAVE_FORMAT_PCM && @@ -660,20 +660,26 @@ static HRESULT waveformat_to_pcm(ACImpl *This, const WAVEFORMATEX *fmt, SLDataFo if(fmt->nSamplesPerSec < 8000 || fmt->nSamplesPerSec > 48000) return AUDCLNT_E_UNSUPPORTED_FORMAT; - pcm->formatType = SL_DATAFORMAT_PCM; + pcm->formatType = SL_ANDROID_DATAFORMAT_PCM_EX; pcm->numChannels = fmt->nChannels; - pcm->samplesPerSec = fmt->nSamplesPerSec * 1000; /* no typo, actually in milli-Hz */ + pcm->sampleRate = fmt->nSamplesPerSec * 1000; /* sampleRate is in milli-Hz */ pcm->bitsPerSample = fmt->wBitsPerSample; pcm->containerSize = fmt->wBitsPerSample; /* only up to stereo */ if(pcm->numChannels == 1) - pcm->channelMask = SL_SPEAKER_FRONT_LEFT; + pcm->channelMask = SL_SPEAKER_FRONT_CENTER; else if(This->dataflow == eRender && pcm->numChannels == 2) pcm->channelMask = SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT; else return AUDCLNT_E_UNSUPPORTED_FORMAT; + pcm->endianness = SL_BYTEORDER_LITTLEENDIAN; + if(pcm->bitsPerSample == 8) + pcm->representation = SL_ANDROID_PCM_REPRESENTATION_UNSIGNED_INT; + else + pcm->representation = SL_ANDROID_PCM_REPRESENTATION_SIGNED_INT; + return S_OK; } @@ -686,7 +692,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, int i; HRESULT hr; SLresult sr; - SLDataFormat_PCM pcm; + SLAndroidDataFormat_PCM_EX pcm; SLDataLocator_AndroidSimpleBufferQueue loc_bq; TRACE("(%p)->(%x, %x, %s, %s, %p, %s)\n", This, mode, flags, @@ -1056,7 +1062,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, WAVEFORMATEX **outpwfx) { ACImpl *This = impl_from_IAudioClient(iface); - SLDataFormat_PCM pcm; + SLAndroidDataFormat_PCM_EX pcm; HRESULT hr; TRACE("(%p)->(%x, %p, %p)\n", This, mode, pwfx, outpwfx);

1 0

Fabian Maurer : shell32/tests: Fix typo.
by Alexandre Julliard 25 Sep '17

25 Sep '17

Module: wine Branch: master Commit: 4ef3ffd69da9374876f08cdcb0e61ebba0f2bd97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ef3ffd69da9374876f08cdcb… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Sep 25 20:34:12 2017 +0200 shell32/tests: Fix typo. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelldispatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 21cb6bb..7b5afa0 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1032,7 +1032,7 @@ todo_wine { ok(hr == S_OK || broken(hr == S_FALSE), "got 0x%08x\n", hr); if (hr == S_FALSE) /* winxp and earlier */ { win_skip("SWC_DESKTOP is not supported, some tests will be skipped.\n"); - /* older versions allowed to regiser SWC_DESKTOP and access it with FindWindowSW */ + /* older versions allowed to register SWC_DESKTOP and access it with FindWindowSW */ ok(disp == NULL, "got %p\n", disp); ok(ret == 0, "got %d\n", ret); }

1 0

Nikolay Sivov : shell32: Use regular helper to trace IID, downgrade QI failures to warnings.
by Alexandre Julliard 25 Sep '17

25 Sep '17

Module: wine Branch: master Commit: 709db66f8dd2ab1d937fd3196c7314d1b9bcd357 URL: http://source.winehq.org/git/wine.git/?a=commit;h=709db66f8dd2ab1d937fd3196… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 24 20:38:44 2017 +0300 shell32: Use regular helper to trace IID, downgrade QI failures to warnings. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index da3031b..8742cb3 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -195,9 +195,7 @@ static HRESULT WINAPI FolderItemVerbImpl_QueryInterface(FolderItemVerb *iface, { FolderItemVerbImpl *This = impl_from_FolderItemVerb(iface); - TRACE("(%p,%s,%p)\n", iface, shdebugstr_guid(riid), ppv); - - *ppv = NULL; + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv); if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IDispatch, riid) || @@ -205,7 +203,7 @@ static HRESULT WINAPI FolderItemVerbImpl_QueryInterface(FolderItemVerb *iface, *ppv = &This->FolderItemVerb_iface; else { - FIXME("not implemented for %s\n", shdebugstr_guid(riid)); + WARN("not implemented for %s\n", debugstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } @@ -367,9 +365,7 @@ static HRESULT WINAPI FolderItemVerbsImpl_QueryInterface(FolderItemVerbs *iface, { FolderItemVerbsImpl *This = impl_from_FolderItemVerbs(iface); - TRACE("(%p,%s,%p)\n", iface, shdebugstr_guid(riid), ppv); - - *ppv = NULL; + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv); if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IDispatch, riid) || @@ -377,7 +373,7 @@ static HRESULT WINAPI FolderItemVerbsImpl_QueryInterface(FolderItemVerbs *iface, *ppv = &This->FolderItemVerbs_iface; else { - FIXME("not implemented for %s\n", shdebugstr_guid(riid)); + WARN("not implemented for %s\n", debugstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } @@ -623,7 +619,7 @@ static HRESULT WINAPI FolderItemImpl_QueryInterface(FolderItem2 *iface, { FolderItemImpl *This = impl_from_FolderItem(iface); - TRACE("(%p,%s,%p)\n", iface, shdebugstr_guid(riid), ppv); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv); if (!ppv) return E_INVALIDARG; @@ -634,7 +630,7 @@ static HRESULT WINAPI FolderItemImpl_QueryInterface(FolderItem2 *iface, *ppv = &This->FolderItem2_iface; else { - FIXME("not implemented for %s\n", shdebugstr_guid(riid)); + WARN("not implemented for %s\n", debugstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } @@ -985,7 +981,7 @@ static HRESULT WINAPI FolderItemsImpl_QueryInterface(FolderItems3 *iface, { FolderItemsImpl *This = impl_from_FolderItems(iface); - TRACE("(%p,%s,%p)\n", iface, shdebugstr_guid(riid), ppv); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv); if (!ppv) return E_INVALIDARG; @@ -997,7 +993,7 @@ static HRESULT WINAPI FolderItemsImpl_QueryInterface(FolderItems3 *iface, *ppv = &This->FolderItems3_iface; else { - FIXME("not implemented for %s\n", shdebugstr_guid(riid)); + WARN("not implemented for %s\n", debugstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } @@ -1314,7 +1310,7 @@ static HRESULT WINAPI FolderImpl_QueryInterface(Folder3 *iface, REFIID riid, { FolderImpl *This = impl_from_Folder(iface); - TRACE("(%p,%s,%p)\n", iface, shdebugstr_guid(riid), ppv); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv); if (!ppv) return E_INVALIDARG; @@ -1326,7 +1322,7 @@ static HRESULT WINAPI FolderImpl_QueryInterface(Folder3 *iface, REFIID riid, *ppv = &This->Folder3_iface; else { - FIXME("not implemented for %s\n", shdebugstr_guid(riid)); + WARN("not implemented for %s\n", debugstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } @@ -1668,7 +1664,7 @@ static HRESULT WINAPI ShellDispatch_QueryInterface(IShellDispatch6 *iface, { ShellDispatch *This = impl_from_IShellDispatch6(iface); - TRACE("(%p,%s,%p)\n", iface, shdebugstr_guid(riid), ppv); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv); if (!ppv) return E_INVALIDARG; @@ -1683,7 +1679,7 @@ static HRESULT WINAPI ShellDispatch_QueryInterface(IShellDispatch6 *iface, *ppv = &This->IShellDispatch6_iface; else { - FIXME("not implemented for %s\n", shdebugstr_guid(riid)); + WARN("not implemented for %s\n", debugstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; }

1 0

Henri Verbeet : d2d1: Use the "world" position instead of the render target position in the pixel shader.
by Alexandre Julliard 25 Sep '17

25 Sep '17

Module: wine Branch: master Commit: 119f84099bccc8ecaa4905301e305257e9bc7006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=119f84099bccc8ecaa4905301… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Sep 23 13:37:01 2017 +0200 d2d1: Use the "world" position instead of the render target position in the pixel shader. This slightly simplifies the implementation of bitmap brushes, since the render target transformation no longer needs to be undone. More importantly, it does the same for gradient brushes. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 15 +- dlls/d2d1/render_target.c | 494 +++++++++++++++++++++++++--------------------- 2 files changed, 275 insertions(+), 234 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=119f84099bccc8ecaa490…

1 0

Fabian Maurer : evr/tests: Run the tests with todo_wine instead of skipping them.
by Alexandre Julliard 25 Sep '17

25 Sep '17

Module: wine Branch: master Commit: 1c67258dbf2e0c2ae399bf3ef8a027fe74e9a002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c67258dbf2e0c2ae399bf3ef… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Sep 23 17:21:16 2017 +0200 evr/tests: Run the tests with todo_wine instead of skipping them. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/Makefile.in | 2 +- dlls/evr/tests/filter.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/evr/tests/Makefile.in b/dlls/evr/tests/Makefile.in index c370646..5ee4f84 100644 --- a/dlls/evr/tests/Makefile.in +++ b/dlls/evr/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = evr.dll -IMPORTS = mfuuid strmiids strmbase uuid ole32 oleaut32 +IMPORTS = mfuuid strmiids uuid ole32 oleaut32 C_SRCS = \ filter.c diff --git a/dlls/evr/tests/filter.c b/dlls/evr/tests/filter.c index 4f82b14..3bae738 100644 --- a/dlls/evr/tests/filter.c +++ b/dlls/evr/tests/filter.c @@ -83,8 +83,8 @@ static void test_aggregation(const CLSID clsid_inner, const IID iid_inner, const /* aggregation, request IUnknown */ hr = CoCreateInstance(&clsid_inner, unk_outer, CLSCTX_INPROC_SERVER, &IID_IUnknown, (LPVOID*)&unk_inner); - ok(hr == S_OK, "%s: run %d: Third CoCreateInstance returned %x\n", testid, testrun, hr); - ok(unk_inner != NULL, "%s: run %d: unk_inner is NULL\n", testid, testrun); + todo_wine ok(hr == S_OK, "%s: run %d: Third CoCreateInstance returned %x\n", testid, testrun, hr); + todo_wine ok(unk_inner != NULL, "%s: run %d: unk_inner is NULL\n", testid, testrun); if (!unk_inner) { @@ -163,12 +163,6 @@ static void test_evr_filter_aggregations(void) }; int i; - if(!strcmp(winetest_platform, "wine")) - { - skip("Not supported yet.\n"); - return; - } - for (i = 0; i < sizeof(iids) / sizeof(iids[0]); i++) { test_aggregation(CLSID_EnhancedVideoRenderer, *iids[i], "filter", i);

1 0

Nikolay Sivov : propsys: Fix negative numeric source handling in PropVariantToBoolean().
by Alexandre Julliard 25 Sep '17

25 Sep '17

Module: wine Branch: master Commit: 3b18054f258bd05f3f5f0094c3fce54a04c4cc83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b18054f258bd05f3f5f0094c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 24 12:00:08 2017 +0300 propsys: Fix negative numeric source handling in PropVariantToBoolean(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propvar.c | 2 +- dlls/propsys/tests/propsys.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index bdf9226..3e3b502 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -282,7 +282,7 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret) break; } - hr = PROPVAR_ConvertNumber(propvarIn, 64, FALSE, &res); + hr = PROPVAR_ConvertNumber(propvarIn, 64, TRUE, &res); *ret = !!res; return hr; } diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index ce1ee71..327c606 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -956,7 +956,6 @@ static void test_PropVariantToBoolean(void) propvar.u.lVal = -67; val = FALSE; hr = PropVariantToBoolean(&propvar, &val); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(val == TRUE, "Unexpected value %d\n", val); @@ -986,7 +985,6 @@ todo_wine propvar.u.pwszVal = str_n7; val = FALSE; hr = PropVariantToBoolean(&propvar, &val); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(val == TRUE, "Unexpected value %d\n", val); @@ -1092,7 +1090,6 @@ todo_wine propvar.vt = VT_LPSTR; propvar.u.pszVal = (char *)"-1"; hr = PropVariantToBoolean(&propvar, &val); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(val == TRUE, "Unexpected value %d\n", val); }

1 0

Nikolay Sivov : dwrite: Use single per-process local file loader.
by Alexandre Julliard 25 Sep '17

25 Sep '17

Module: wine Branch: master Commit: 43c16a25ebfd2917af6fff24a29e91039b46f3c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43c16a25ebfd2917af6fff24a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 25 00:08:40 2017 +0300 dwrite: Use single per-process local file loader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 3 +- dlls/dwrite/font.c | 126 +++++++++++++++++++++++++------------------ dlls/dwrite/main.c | 31 +++-------- dlls/dwrite/tests/font.c | 40 +++++++++++++- 4 files changed, 122 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=43c16a25ebfd2917af6ff…

1 0

Hugh McMaster : reg/tests: Test registry export with a simple data structure.
by Alexandre Julliard 25 Sep '17

25 Sep '17

Module: wine Branch: master Commit: ae313198a0f752c711b30bdc536ebc3213e08bf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae313198a0f752c711b30bdc5… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 25 06:55:48 2017 +0000 reg/tests: Test registry export with a simple data structure. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index c069154..a5812e3 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4255,10 +4255,18 @@ error: static void test_export(void) { LONG err; - DWORD r, os_version, major_version, minor_version; + DWORD r, os_version, major_version, minor_version, dword; HKEY hkey; - const char *empty_key_test = "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n\r\n"; + + const char *empty_key_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n\r\n"; + + const char *simple_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"DWORD\"=dword:00000100\r\n" + "\"String\"=\"Your text here...\"\r\n\r\n"; err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); @@ -4325,6 +4333,20 @@ static void test_export(void) err = DeleteFileA("file.reg"); todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError()); + /* Test registry export with a simple data structure */ + dword = 0x100; + add_value(hkey, "DWORD", REG_DWORD, &dword, sizeof(dword)); + add_value(hkey, "String", REG_SZ, "Your text here...", 18); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", simple_test), "compare_export() failed\n"); + + err = DeleteFileA("file.reg"); + todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError()); + + RegCloseKey(hkey); + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", err); }

1 0

Hugh McMaster : reg/tests: Test registry export with a complex data structure.
by Alexandre Julliard 25 Sep '17

25 Sep '17

Module: wine Branch: master Commit: 7d93b9d099fb96afc7a587ab85e314db06947db5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d93b9d099fb96afc7a587ab8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 25 06:55:49 2017 +0000 reg/tests: Test registry export with a complex data structure. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 113 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 110 insertions(+), 3 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index a5812e3..36cb6ed 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -128,6 +128,48 @@ static void add_key_(unsigned line, const HKEY hkey, const char *path, HKEY *sub lok(err == ERROR_SUCCESS, "RegCreateKeyExA failed: %d\n", err); } +static LONG delete_tree(const HKEY key, const char *subkey) +{ + HKEY hkey; + LONG ret; + char *subkey_name = NULL; + DWORD max_subkey_len, subkey_len; + static const char empty[1]; + + ret = RegOpenKeyExA(key, subkey, 0, KEY_READ, &hkey); + if (ret) return ret; + + ret = RegQueryInfoKeyA(hkey, NULL, NULL, NULL, NULL, &max_subkey_len, + NULL, NULL, NULL, NULL, NULL, NULL); + if (ret) goto cleanup; + + max_subkey_len++; + + subkey_name = HeapAlloc(GetProcessHeap(), 0, max_subkey_len); + if (!subkey_name) + { + ret = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + + for (;;) + { + subkey_len = max_subkey_len; + ret = RegEnumKeyExA(hkey, 0, subkey_name, &subkey_len, NULL, NULL, NULL, NULL); + if (ret == ERROR_NO_MORE_ITEMS) break; + if (ret) goto cleanup; + ret = delete_tree(hkey, subkey_name); + if (ret) goto cleanup; + } + + ret = RegDeleteKeyA(hkey, empty); + +cleanup: + HeapFree(GetProcessHeap(), 0, subkey_name); + RegCloseKey(hkey); + return ret; +} + #define add_value(k,n,t,d,s) add_value_(__LINE__,k,n,t,d,s) static void add_value_(unsigned line, HKEY hkey, const char *name, DWORD type, const void *data, size_t size) @@ -4256,7 +4298,7 @@ static void test_export(void) { LONG err; DWORD r, os_version, major_version, minor_version, dword; - HKEY hkey; + HKEY hkey, subkey; const char *empty_key_test = "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" @@ -4268,6 +4310,32 @@ static void test_export(void) "\"DWORD\"=dword:00000100\r\n" "\"String\"=\"Your text here...\"\r\n\r\n"; + const char *complex_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"DWORD\"=dword:00000100\r\n" + "\"String\"=\"Your text here...\"\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1]\r\n" + "\"Binary\"=hex:11,22,33,44\r\n" + "\"Undefined hex\"=hex(100):25,50,41,54,48,25,00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\r\n" + "\"double\\\"quote\"=\"\\\"Hello, World!\\\"\"\r\n" + "\"single'quote\"=dword:00000008\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a\\Subkey2b]\r\n" + "@=\"Default value name\"\r\n" + "\"Multiple strings\"=hex(7):4c,00,69,00,6e,00,65,00,31,00,00,00,4c,00,69,00,6e,\\\r\n" + " 00,65,00,32,00,00,00,4c,00,69,00,6e,00,65,00,33,00,00,00,00,00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey3a]\r\n" + "\"Backslash\"=\"Use \\\\\\\\ to escape a backslash\"\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey3a\\Subkey3b]\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey3a\\Subkey3b\\Subkey3c]\r\n" + "\"String expansion\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00,25,00,50,\\\r\n" + " 00,41,00,54,00,48,00,25,00,00,00\r\n" + "\"Zero data type\"=hex(0):56,61,6c,75,65,00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey4]\r\n" + "@=dword:12345678\r\n" + "\"43981\"=hex(abcd):56,61,6c,75,65,00\r\n\r\n"; + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); @@ -4345,10 +4413,49 @@ static void test_export(void) err = DeleteFileA("file.reg"); todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError()); + /* Test registry export with a complex data structure */ + add_key(hkey, "Subkey1", &subkey); + add_value(subkey, "Binary", REG_BINARY, "\x11\x22\x33\x44", 4); + add_value(subkey, "Undefined hex", 0x100, "%PATH%", 7); + RegCloseKey(subkey); + + add_key(hkey, "Subkey2a", &subkey); + add_value(subkey, "double\"quote", REG_SZ, "\"Hello, World!\"", 16); + dword = 0x8; + add_value(subkey, "single'quote", REG_DWORD, &dword, sizeof(dword)); + RegCloseKey(subkey); + + add_key(hkey, "Subkey2a\\Subkey2b", &subkey); + add_value(subkey, NULL, REG_SZ, "Default value name", 19); + add_value(subkey, "Multiple strings", REG_MULTI_SZ, "Line1\0Line2\0Line3\0", 19); + RegCloseKey(subkey); + + add_key(hkey, "Subkey3a", &subkey); + add_value(subkey, "Backslash", REG_SZ, "Use \\\\ to escape a backslash", 29); + RegCloseKey(subkey); + + add_key(hkey, "Subkey3a\\Subkey3b\\Subkey3c", &subkey); + add_value(subkey, "String expansion", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14); + add_value(subkey, "Zero data type", REG_NONE, "Value", 6); + RegCloseKey(subkey); + + add_key(hkey, "Subkey4", &subkey); + dword = 0x12345678; + add_value(subkey, NULL, REG_DWORD, &dword, sizeof(dword)); + add_value(subkey, "43981", 0xabcd, "Value", 6); + RegCloseKey(subkey); + RegCloseKey(hkey); - err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", err); + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", complex_test), "compare_export() failed\n"); + + err = DeleteFileA("file.reg"); + todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError()); + + err = delete_tree(HKEY_CURRENT_USER, KEY_BASE); + ok(err == ERROR_SUCCESS, "delete_tree() failed: %d\n", err); } START_TEST(reg)

1 0

Hugh McMaster : reg/tests: Test registry export against order of data creation.
by Alexandre Julliard 25 Sep '17

25 Sep '17

Module: wine Branch: master Commit: 08a2a019748adf853be1103c333c248e648dc0a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08a2a019748adf853be1103c3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 25 06:55:49 2017 +0000 reg/tests: Test registry export against order of data creation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 36cb6ed..dca5f78 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4336,6 +4336,18 @@ static void test_export(void) "@=dword:12345678\r\n" "\"43981\"=hex(abcd):56,61,6c,75,65,00\r\n\r\n"; + const char *key_order_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1]\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2]\r\n\r\n"; + + const char *value_order_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"Value 2\"=\"I was added first!\"\r\n" + "\"Value 1\"=\"I was added second!\"\r\n\r\n"; + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); @@ -4456,6 +4468,43 @@ static void test_export(void) err = delete_tree(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS, "delete_tree() failed: %d\n", err); + + /* Test the export order of registry keys */ + add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + add_key(hkey, "Subkey2", &subkey); + RegCloseKey(subkey); + add_key(hkey, "Subkey1", &subkey); + RegCloseKey(subkey); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", key_order_test), "compare_export() failed\n"); + + err = DeleteFileA("file.reg"); + todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError()); + + err = RegDeleteKeyA(hkey, "Subkey1"); + ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", err); + err = RegDeleteKeyA(hkey, "Subkey2"); + ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", err); + + /* Test the export order of registry values. Windows exports registry values + * in order of creation; Wine uses alphabetical order. + */ + add_value(hkey, "Value 2", REG_SZ, "I was added first!", 19); + add_value(hkey, "Value 1", REG_SZ, "I was added second!", 20); + + RegCloseKey(hkey); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", value_order_test), "compare_export() failed\n"); + + err = DeleteFileA("file.reg"); + todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError()); + + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", err); } START_TEST(reg)

1 0