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

Zebediah Figura : imaadp32.acm: Fix nibble ordering.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 0f0fb984985aa08146996e04baf2b3d6e58abf46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f0fb984985aa08146996e04b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 8 10:15:21 2017 -0500 imaadp32.acm: Fix nibble ordering. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imaadp32.acm/imaadp32.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index 7f4c5ea..474f548 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -445,7 +445,7 @@ static void cvtSS16imaK(PACMDRVSTREAMINSTANCE adsi, &stepIndexL, &sampleL); code2 = generate_nibble(R16(src + (4 * i + 2) * 2), &stepIndexL, &sampleL); - *dst++ = (code1 << 4) | code2; + *dst++ = (code2 << 4) | code1; } for (i = 0; i < 4; i++) { @@ -453,7 +453,7 @@ static void cvtSS16imaK(PACMDRVSTREAMINSTANCE adsi, &stepIndexR, &sampleR); code2 = generate_nibble(R16(src + (4 * i + 3) * 2), &stepIndexR, &sampleR); - *dst++ = (code1 << 4) | code2; + *dst++ = (code2 << 4) | code1; } src += 32; } @@ -509,7 +509,7 @@ static void cvtMM16imaK(PACMDRVSTREAMINSTANCE adsi, src += 2; code2 = generate_nibble(R16(src), &stepIndex, &sample); src += 2; - *dst++ = (code1 << 4) | code2; + *dst++ = (code2 << 4) | code1; } dst = in_dst + adsi->pwfxDst->nBlockAlign; }

1 0

Zebediah Figura : msacm32: Check correct variable.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 7493364b4bffa3563b4f36124b12a29bc59f4e86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7493364b4bffa3563b4f36124… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 8 17:57:12 2017 -0500 msacm32: Check correct variable. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/format.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index f3c5155..e7eab56 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -424,7 +424,7 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD if (pafd->fdwSupport) return MMSYSERR_INVALPARAM; - if (pafd->pwfx->wFormatTag == WAVE_FORMAT_UNKNOWN) + if (pafd->dwFormatTag == WAVE_FORMAT_UNKNOWN) return MMSYSERR_INVALPARAM; switch (fdwDetails) {

1 0

Andrey Gusev : uxtheme/tests: Fix a typo in ok() message.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 1a761379f8742fe79f696ea7c7bbf4aa02e9f764 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a761379f8742fe79f696ea7c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jun 9 17:48:16 2017 +0300 uxtheme/tests: Fix a typo in ok() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index beba353..6989f44 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -687,7 +687,7 @@ todo_wine hr = pGetBufferedPaintBits(NULL, &bits, &row); ok(hr == E_FAIL, "Unexpected return code %#x\n", hr); ok(row == 10, "Unexpected row count %d\n", row); - ok(bits == (void *)0xdeadbeef, "Unepexpected data pointer %p\n", bits); + ok(bits == (void *)0xdeadbeef, "Unexpected data pointer %p\n", bits); hr = pGetBufferedPaintBits(NULL, NULL, NULL); ok(hr == E_POINTER, "Unexpected return code %#x\n", hr);

1 0

Alexandre Julliard : Release 2.10.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 74d93d9bc0acadacc97c3dc803ede6ed4b8becb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74d93d9bc0acadacc97c3dc80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 9 19:41:15 2017 +0200 Release 2.10. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 749 ++++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 396 insertions(+), 373 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=74d93d9bc0acadacc97c3…

1 0

Tag wine-2.10 : Alexandre Julliard : Release 2.10
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: refs/tags/wine-2.10 Tag: 5c8ee03b9d8823fb03baa4016a52edb0ed55ece4 URL: http://source.winehq.org/git/wine.git/?a=tag;h=5c8ee03b9d8823fb03baa4016a52… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 9 19:41:15 2017 +0200 Release 2.10

1 0

Nikolay Sivov : shell32: Use IS_INTRESOURCE() to test context menu verb kind.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 8499ace1ffbd3ffc795fb52047cceae6290e78d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8499ace1ffbd3ffc795fb5204… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 9 02:36:16 2017 +0300 shell32: Use IS_INTRESOURCE() to test context menu verb kind. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlmenu.c | 25 ++++++++++++++----------- dlls/shell32/shlview_cmenu.c | 6 +++--- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index 7a960ad..39ab4c6 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -1114,25 +1114,28 @@ static HRESULT WINAPI CompositeCMenu_GetCommandString(IContextMenu3* iface, UINT static HRESULT WINAPI CompositeCMenu_InvokeCommand(IContextMenu3* iface,LPCMINVOKECOMMANDINFO pici) { CompositeCMenu *This = impl_from_IContextMenu3(iface); - TRACE("(%p)->(%p)\n",iface,pici); - if(HIWORD(pici->lpVerb)) + + TRACE("(%p)->(%p)\n", iface, pici); + + if (IS_INTRESOURCE(pici->lpVerb)) + { + UINT id = (UINT_PTR)pici->lpVerb; + UINT index = CompositeCMenu_GetIndexForCommandId(This, id); + return IContextMenu_InvokeCommand(This->menus[index], pici); + } + else { /*call each handler until one of them succeeds*/ - UINT i=0; - for(;i<This->menu_count;i++) + UINT i; + + for (i = 0; i < This->menu_count; i++) { HRESULT hres; - if(SUCCEEDED(hres=IContextMenu_InvokeCommand(This->menus[i],pici))) + if (SUCCEEDED(hres = IContextMenu_InvokeCommand(This->menus[i], pici))) return hres; } return E_FAIL; } - else - { - UINT id = (UINT_PTR)pici->lpVerb; - UINT index = CompositeCMenu_GetIndexForCommandId(This,id); - return IContextMenu_InvokeCommand(This->menus[index],pici); - } } static HRESULT WINAPI CompositeCMenu_QueryContextMenu(IContextMenu3 *iface, HMENU hmenu,UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 099f5bc..5c5ba1b 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -397,13 +397,13 @@ static HRESULT WINAPI ItemMenu_InvokeCommand( TRACE("(%p)->(invcom=%p verb=%p wnd=%p)\n",This,lpcmi,lpcmi->lpVerb, lpcmi->hwnd); - if( HIWORD(lpcmi->lpVerb)==0 && LOWORD(lpcmi->lpVerb) > FCIDM_SHVIEWLAST) + if (IS_INTRESOURCE(lpcmi->lpVerb) && LOWORD(lpcmi->lpVerb) > FCIDM_SHVIEWLAST) { - TRACE("Invalid Verb %x\n",LOWORD(lpcmi->lpVerb)); + TRACE("Invalid Verb %x\n", LOWORD(lpcmi->lpVerb)); return E_INVALIDARG; } - if (HIWORD(lpcmi->lpVerb) == 0) + if (IS_INTRESOURCE(lpcmi->lpVerb)) { switch(LOWORD(lpcmi->lpVerb)) {

1 0

Hugh McMaster : reg/tests: Remove un-needed tab characters from some keys in the key deletion tests.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 8834968d02f9b7c30264623dc4835f17fe934315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8834968d02f9b7c30264623dc… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 9 00:37:56 2017 +0000 reg/tests: Remove un-needed tab characters from some keys in the key deletion tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 58e003a..cc8dc10 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1676,7 +1676,7 @@ static void test_import(void) todo_wine verify_key_exist(hkey, "Subkey2a"); test_import_str("REGEDIT4\n\n" - "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b\t]\n", &r); + "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_key_exist(hkey, "Subkey2b"); @@ -2564,7 +2564,7 @@ static void test_import(void) todo_wine verify_key_exist(hkey, "Subkey2a"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" - "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b\t]\n", &r); + "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_key_exist(hkey, "Subkey2b");

1 0

Hugh McMaster : regedit/tests: Remove an un-needed tab character from a key in the key deletion tests.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 8096e2379883ad5f2caf2fdf3cd2088c76f863db URL: http://source.winehq.org/git/wine.git/?a=commit;h=8096e2379883ad5f2caf2fdf3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 9 00:38:04 2017 +0000 regedit/tests: Remove an un-needed tab character from a key in the key deletion tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 550c22b..b2e65a8 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1197,7 +1197,7 @@ static void test_key_creation_and_deletion(void) verify_key_exist(hkey, "Subkey2a"); exec_import_str("REGEDIT4\n\n" - "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b\t]\n"); + "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n"); verify_key_exist(hkey, "Subkey2b"); exec_import_str("REGEDIT4\n\n"

1 0

Andrey Gusev : shell32: Add IApplicationDestinations stub.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 8ea9c3382961fa28a84a60e56be22cbfa3571c70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ea9c3382961fa28a84a60e56… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jun 7 16:20:33 2017 +0300 shell32: Add IApplicationDestinations stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_classes.idl | 6 ++ dlls/shell32/shell32_main.h | 2 + dlls/shell32/shellole.c | 1 + dlls/shell32/shellpath.c | 119 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 128 insertions(+) diff --git a/dlls/shell32/shell32_classes.idl b/dlls/shell32/shell32_classes.idl index cc57b2b..6ed497f 100644 --- a/dlls/shell32/shell32_classes.idl +++ b/dlls/shell32/shell32_classes.idl @@ -69,6 +69,12 @@ coclass KnownFolderManager { interface IKnownFolderManager; } ] coclass ApplicationAssociationRegistration { interface IApplicationAssociationRegistration; } [ + helpstring("Application Destination List"), + threading(apartment), + uuid(86c14003-4d6b-4ef3-a7b4-0506663b2e68) +] coclass ApplicationDestinations { interface IApplicationDestinations; } + +[ helpstring("Shell Drag and Drop Helper"), threading(apartment), uuid(4657278a-411b-11d2-839a-00c04fd918d0) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index fc2a5ba..368c0e0 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -109,6 +109,8 @@ HRESULT WINAPI CPanel_ExtractIconW(LPITEMIDLIST pidl, LPCWSTR pszFile, UINT nIco HRESULT WINAPI IAutoComplete_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN; HRESULT WINAPI ApplicationAssociationRegistration_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +HRESULT WINAPI ApplicationDestinations_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; + HRESULT IShellLink_ConstructFromFile(IUnknown * pUnkOuter, REFIID riid, LPCITEMIDLIST pidl, IUnknown **ppv) DECLSPEC_HIDDEN; LPEXTRACTICONA IExtractIconA_Constructor(LPCITEMIDLIST) DECLSPEC_HIDDEN; diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index d3d972b..7b6ee92 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -67,6 +67,7 @@ static const struct { } InterfaceTable[] = { {&CLSID_ApplicationAssociationRegistration, ApplicationAssociationRegistration_Constructor}, + {&CLSID_ApplicationDestinations, ApplicationDestinations_Constructor}, {&CLSID_AutoComplete, IAutoComplete_Constructor}, {&CLSID_ControlPanel, IControlPanel_Constructor}, {&CLSID_DragDropHelper, IDropTargetHelper_Constructor}, diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 8569b53..d2ebc66 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -1021,6 +1021,125 @@ typedef enum _CSIDL_Type { typedef struct { + IApplicationDestinations IApplicationDestinations_iface; + LONG ref; +} IApplicationDestinationsImpl; + +static inline IApplicationDestinationsImpl *impl_from_IApplicationDestinations( IApplicationDestinations *iface ) +{ + return CONTAINING_RECORD(iface, IApplicationDestinationsImpl, IApplicationDestinations_iface); +} + +static HRESULT WINAPI ApplicationDestinations_QueryInterface(IApplicationDestinations *iface, REFIID riid, + LPVOID *ppv) +{ + IApplicationDestinationsImpl *This = impl_from_IApplicationDestinations(iface); + + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppv); + + if (ppv == NULL) + return E_POINTER; + + if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IApplicationDestinations, riid)) + { + *ppv = &This->IApplicationDestinations_iface; + IUnknown_AddRef((IUnknown*)*ppv); + + TRACE("Returning IApplicationDestinations: %p\n", *ppv); + return S_OK; + } + + *ppv = NULL; + FIXME("(%p)->(%s, %p) interface not supported.\n", This, debugstr_guid(riid), ppv); + + return E_NOINTERFACE; +} + +static ULONG WINAPI ApplicationDestinations_AddRef(IApplicationDestinations *iface) +{ + IApplicationDestinationsImpl *This = impl_from_IApplicationDestinations(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p), new refcount=%i\n", This, ref); + + return ref; +} + +static ULONG WINAPI ApplicationDestinations_Release(IApplicationDestinations *iface) +{ + IApplicationDestinationsImpl *This = impl_from_IApplicationDestinations(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p), new refcount=%i\n", This, ref); + + if (ref == 0) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI ApplicationDestinations_SetAppID(IApplicationDestinations *iface, const WCHAR *appid) +{ + IApplicationDestinationsImpl *This = impl_from_IApplicationDestinations(iface); + + FIXME("(%p, %s) stub!\n", This, debugstr_w(appid)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ApplicationDestinations_RemoveDestination(IApplicationDestinations *iface, IUnknown *punk) +{ + IApplicationDestinationsImpl *This = impl_from_IApplicationDestinations(iface); + + FIXME("(%p, %p) stub!\n", This, punk); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ApplicationDestinations_RemoveAllDestinations(IApplicationDestinations *iface) +{ + IApplicationDestinationsImpl *This = impl_from_IApplicationDestinations(iface); + + FIXME("(%p) stub!\n", This); + + return E_NOTIMPL; +} + +static const IApplicationDestinationsVtbl ApplicationDestinationsVtbl = +{ + ApplicationDestinations_QueryInterface, + ApplicationDestinations_AddRef, + ApplicationDestinations_Release, + ApplicationDestinations_SetAppID, + ApplicationDestinations_RemoveDestination, + ApplicationDestinations_RemoveAllDestinations +}; + +HRESULT WINAPI ApplicationDestinations_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) +{ + IApplicationDestinationsImpl *This; + HRESULT hr; + + TRACE("(%p, %s, %p)\n", outer, debugstr_guid(riid), ppv); + + if (outer) + return CLASS_E_NOAGGREGATION; + + if (!(This = SHAlloc(sizeof(*This)))) + return E_OUTOFMEMORY; + + This->IApplicationDestinations_iface.lpVtbl = &ApplicationDestinationsVtbl; + This->ref = 0; + + hr = IUnknown_QueryInterface(&This->IApplicationDestinations_iface, riid, ppv); + if (FAILED(hr)) + SHFree(This); + + return hr; +} + +typedef struct +{ const KNOWNFOLDERID *id; CSIDL_Type type; LPCWSTR szValueName;

1 0

Hugh McMaster : regedit/tests: Add tests for key creation and key deletion.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 247e611de553e6e8cf9fc64aff731dd048846fe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=247e611de553e6e8cf9fc64af… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 8 09:04:20 2017 +0000 regedit/tests: Add tests for key creation and key deletion. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 104 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index d145f0b..28e5c1d 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -163,6 +163,33 @@ static void r_verify_reg_nonexist(unsigned line, HKEY key, const char *value_nam value_name); } +#define verify_key_exist(k,s) verify_key_exist_(__LINE__,k,s) +static void verify_key_exist_(unsigned line, HKEY key_base, const char *subkey) +{ + HKEY hkey; + LONG lr; + + lr = RegOpenKeyExA(key_base, subkey, 0, KEY_READ, &hkey); + lok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: got %d\n", lr); + + if (hkey) + RegCloseKey(hkey); +} + +#define verify_key_nonexist(k,s) verify_key_nonexist_(__LINE__,k,s) +static void verify_key_nonexist_(unsigned line, HKEY key_base, const char *subkey) +{ + HKEY hkey; + LONG lr; + + lr = RegOpenKeyExA(key_base, subkey, 0, KEY_READ, &hkey); + lok(lr == ERROR_FILE_NOT_FOUND, "registry key '%s' shouldn't exist; got %d, expected 2\n", + subkey, lr); + + if (hkey) + RegCloseKey(hkey); +} + #define KEY_BASE "Software\\Wine\\regedit_test" static void test_basic_import(void) @@ -1110,6 +1137,82 @@ static void test_import_with_whitespace(void) ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); } +static void test_key_creation_and_deletion(void) +{ + HKEY hkey; + LONG lr; + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n"); + + lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); + ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: got %d, expected 0\n", lr); + + /* Test key creation */ + exec_import_str("REGEDIT4\n\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\\No_Opening_Bracket]\n"); + verify_key_nonexist(hkey, "No_Opening_Bracket"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\No_Closing_Bracket\n"); + todo_wine verify_key_nonexist(hkey, "No_Closing_Bracket"); + + exec_import_str("REGEDIT4\n\n" + "[ HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1a]\n"); + verify_key_nonexist(hkey, "Subkey1a"); + + exec_import_str("REGEDIT4\n\n" + "[\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1b]\n"); + verify_key_nonexist(hkey, "Subkey1b"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1c ]\n"); + verify_key_exist(hkey, "Subkey1c "); + lr = RegDeleteKeyA(hkey, "Subkey1c "); + ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1d\t]\n"); + verify_key_exist(hkey, "Subkey1d\t"); + lr = RegDeleteKeyA(hkey, "Subkey1d\t"); + ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); + + /* Test key deletion. We start by creating some registry keys. */ + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n\n"); + verify_key_exist(hkey, "Subkey2a"); + verify_key_exist(hkey, "Subkey2b"); + + exec_import_str("REGEDIT4\n\n" + "[ -HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n"); + verify_key_exist(hkey, "Subkey2a"); + + exec_import_str("REGEDIT4\n\n" + "[\t-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n"); + verify_key_exist(hkey, "Subkey2b"); + + exec_import_str("REGEDIT4\n\n" + "[- HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n"); + verify_key_exist(hkey, "Subkey2a"); + + exec_import_str("REGEDIT4\n\n" + "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b\t]\n"); + verify_key_exist(hkey, "Subkey2b"); + + exec_import_str("REGEDIT4\n\n" + "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" + "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n\n"); + verify_key_nonexist(hkey, "Subkey2a"); + verify_key_nonexist(hkey, "Subkey2b"); + + lr = RegCloseKey(hkey); + ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr); + + lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr); +} + START_TEST(regedit) { WCHAR wchar_test[] = {0xFEFF,'W','i','n','d','o','w','s',' ','R','e','g', @@ -1129,4 +1232,5 @@ START_TEST(regedit) test_invalid_import_31(); test_comments(); test_import_with_whitespace(); + test_key_creation_and_deletion(); }

1 0