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

Luis Sahagun : winevdm: Tell dosbox to read the current user's config.
by Alexandre Julliard 06 Jun '16

06 Jun '16

Module: wine Branch: master Commit: 6a05abed484cdfbb75956508a5837dbf58424f88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a05abed484cdfbb75956508a… Author: Luis Sahagun <shankao(a)gmail.com> Date: Thu Jun 2 17:48:38 2016 +0800 winevdm: Tell dosbox to read the current user's config. Signed-off-by: Luis Sahagun <shankao(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winevdm/winevdm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index 290ad25..08bfcfe 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -192,12 +192,13 @@ static void start_dosbox( const char *appname, const char *args ) p += sprintf( p, "exit\n" ); if (WriteFile( file, buffer, strlen(buffer), &written, NULL ) && written == strlen(buffer)) { - const char *args[4]; + const char *args[5]; char *config_file = wine_get_unix_file_name( config ); args[0] = dosbox; - args[1] = "-conf"; - args[2] = config_file; - args[3] = NULL; + args[1] = "-userconf"; + args[2] = "-conf"; + args[3] = config_file; + args[4] = NULL; ret = _spawnvp( _P_WAIT, args[0], args ); } CloseHandle( file );

1 0

Andrey Gusev : mmdevapi/tests: Fix a typo in ok() messages.
by Alexandre Julliard 06 Jun '16

06 Jun '16

Module: wine Branch: master Commit: de030f4028b6875efb0e24e8bd2b2632f0f03e40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de030f4028b6875efb0e24e8b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jun 3 18:04:07 2016 +0300 mmdevapi/tests: Fix a typo in ok() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/capture.c | 2 +- dlls/mmdevapi/tests/render.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 865859b..2bb1e5a 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -920,7 +920,7 @@ static void test_volume_dependence(void) ok(hr == S_OK, "GetService (SimpleAudioVolume) failed: %08x\n", hr); hr = IAudioClient_GetService(ac, &IID_IChannelAudioVolume, (void**)&cav); - ok(hr == S_OK, "GetService (ChannelAudioVolme) failed: %08x\n", hr); + ok(hr == S_OK, "GetService (ChannelAudioVolume) failed: %08x\n", hr); hr = IAudioClient_GetService(ac, &IID_IAudioStreamVolume, (void**)&asv); ok(hr == S_OK, "GetService (AudioStreamVolume) failed: %08x\n", hr); diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 9c42f3a..5497681 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -1854,7 +1854,7 @@ static void test_volume_dependence(void) } hr = IAudioClient_GetService(ac, &IID_IChannelAudioVolume, (void**)&cav); - ok(hr == S_OK, "GetService (ChannelAudioVolme) failed: %08x\n", hr); + ok(hr == S_OK, "GetService (ChannelAudioVolume) failed: %08x\n", hr); hr = IAudioClient_GetService(ac, &IID_IAudioStreamVolume, (void**)&asv); ok(hr == S_OK, "GetService (AudioStreamVolume) failed: %08x\n", hr);

1 0

Andrey Gusev : gdiplus: Fix a typo in struct GpAdjustableArrowCap.
by Alexandre Julliard 06 Jun '16

06 Jun '16

Module: wine Branch: master Commit: bddba301bee3ba2264921736de8bbda1266bab80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bddba301bee3ba2264921736d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jun 3 18:11:53 2016 +0300 gdiplus: Fix a typo in struct GpAdjustableArrowCap. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 10092f1..9b29d88 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -314,7 +314,7 @@ struct GpCustomLineCap{ REAL scale; }; -struct GpAdustableArrowCap{ +struct GpAdjustableArrowCap{ GpCustomLineCap cap; };

1 0

Andrey Gusev : include: Fix a typo in IWMReaderAdvanced interface.
by Alexandre Julliard 06 Jun '16

06 Jun '16

Module: wine Branch: master Commit: 7f548e3f500cf98cfb6c398bd7197e4a42edd74e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f548e3f500cf98cfb6c398bd… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jun 3 18:15:26 2016 +0300 include: Fix a typo in IWMReaderAdvanced interface. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmsdkidl.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index ddfd12b..0606be1 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -549,7 +549,7 @@ interface IWMReaderAdvanced : IUnknown [in] BOOL fAllocate); HRESULT GetAllocateForStream( - [in] WORD dwSreamNum, + [in] WORD dwStreamNum, [out] BOOL *pfAllocate); HRESULT GetStatistics(

1 0

Michael Stefaniuc : comctl32/tests: Use EqualRect() instead of open coding it.
by Alexandre Julliard 06 Jun '16

06 Jun '16

Module: wine Branch: master Commit: fe9f23a2cb0a507917197db86c9f9be7142338da URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe9f23a2cb0a507917197db86… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 6 11:14:05 2016 +0200 comctl32/tests: Use EqualRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/rebar.c | 4 ++-- dlls/comctl32/tests/toolbar.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index a016298..0c3e2dd 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -35,8 +35,8 @@ static HWND hMainWnd; static int system_font_height; -#define check_rect(name, val, exp) ok(val.top == exp.top && val.bottom == exp.bottom && \ - val.left == exp.left && val.right == exp.right, "invalid rect (" name ") (%d,%d) (%d,%d) - expected (%d,%d) (%d,%d)\n", \ +#define check_rect(name, val, exp) ok(EqualRect(&val, &exp), \ + "invalid rect (" name ") (%d,%d) (%d,%d) - expected (%d,%d) (%d,%d)\n", \ val.left, val.top, val.right, val.bottom, exp.left, exp.top, exp.right, exp.bottom); #define check_rect_no_top(name, val, exp) { \ diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 5e18126..01c4214 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -108,8 +108,8 @@ static const struct message restore_parent_seq[] = { #define expect(EXPECTED,GOT) ok((GOT)==(EXPECTED), "Expected %d, got %d\n", (EXPECTED), (GOT)) -#define check_rect(name, val, exp, ...) ok(val.top == exp.top && val.bottom == exp.bottom && \ - val.left == exp.left && val.right == exp.right, "invalid rect (%d,%d) (%d,%d) - expected (%d,%d) (%d,%d) - (" name ")\n", \ +#define check_rect(name, val, exp, ...) ok(EqualRect(&val, &exp), \ + "invalid rect (%d,%d) (%d,%d) - expected (%d,%d) (%d,%d) - (" name ")\n", \ val.left, val.top, val.right, val.bottom, exp.left, exp.top, exp.right, exp.bottom, __VA_ARGS__); #define compare(val, exp, format) ok((val) == (exp), #val " value " format " expected " format "\n", (val), (exp));

1 0

Michael Stefaniuc : user32/tests: Use EqualRect() instead of open coding it.
by Alexandre Julliard 06 Jun '16

06 Jun '16

Module: wine Branch: master Commit: 4b26eef83c8f5742fb19840391ab5d415ed5a7d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b26eef83c8f5742fb1984039… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 6 11:15:14 2016 +0200 user32/tests: Use EqualRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/menu.c | 4 +--- dlls/user32/tests/msg.c | 3 +-- dlls/user32/tests/win.c | 16 ++++------------ 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index e56cdc3..250cba5 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -393,9 +393,7 @@ static void test_getmenubarinfo(void) ok(ret, "GetMenuBarInfo failed with error %d\n", GetLastError()); ret = GetMenuItemRect(hwnd, hmenu, 1, &rci); ok(ret, "GetMenuItemRect failed.\n"); - ok(mbi.rcBar.left == rci.left && mbi.rcBar.top == rci.top && - mbi.rcBar.bottom == rci.bottom && mbi.rcBar.right == rci.right, - "rcBar: Got %d,%d-%d,%d instead of %d,%d-%d,%d\n", + ok(EqualRect(&mbi.rcBar, &rci), "rcBar: Got %d,%d-%d,%d instead of %d,%d-%d,%d\n", mbi.rcBar.left, mbi.rcBar.top, mbi.rcBar.right, mbi.rcBar.bottom, rci.left, rci.top, rci.right, rci.bottom); ok(mbi.hMenu == hmenu, "hMenu: Got %p instead of %p\n", mbi.hMenu, hmenu); diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 52cf901..5ab639b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6499,8 +6499,7 @@ static void check_update_rgn( HWND hwnd, HRGN hrgn ) } GetRgnBox( update, &r1 ); GetUpdateRect( hwnd, &r2, FALSE ); - ok( r1.left == r2.left && r1.top == r2.top && r1.right == r2.right && r1.bottom == r2.bottom, - "Rectangles are different: %d,%d-%d,%d / %d,%d-%d,%d\n", + ok( EqualRect( &r1, &r2 ), "Rectangles are different: %d,%d-%d,%d / %d,%d-%d,%d\n", r1.left, r1.top, r1.right, r1.bottom, r2.left, r2.top, r2.right, r2.bottom ); DeleteObject( tmp ); diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 138a6f1..40685dc 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2461,9 +2461,7 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) ret = SetWindowPos(hwnd_child, hwnd2 , 1, 2, 3, 4, 0); ok(ret, "Got %d\n", ret); GetWindowRect(hwnd_child, &rc2); - ok(rc1.left == rc2.left && rc1.top == rc2.top && - rc1.right == rc2.right && rc1.bottom == rc2.bottom, - "(%d, %d, %d, %d) != (%d, %d, %d, %d)\n", + ok(EqualRect(&rc1, &rc2), "(%d, %d, %d, %d) != (%d, %d, %d, %d)\n", rc1.left, rc1.top, rc1.right, rc1.bottom, rc2.left, rc2.top, rc2.right, rc2.bottom); check_active_state(hwnd2, hwnd2, hwnd2); @@ -2472,9 +2470,7 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) ret = SetWindowPos(hwnd2, hwnd_child, 1, 2, 3, 4, 0); ok(ret, "Got %d\n", ret); GetWindowRect(hwnd2, &rc2); - ok(rc1.left == rc2.left && rc1.top == rc2.top && - rc1.right == rc2.right && rc1.bottom == rc2.bottom, - "(%d, %d, %d, %d) != (%d, %d, %d, %d)\n", + ok(EqualRect(&rc1, &rc2), "(%d, %d, %d, %d) != (%d, %d, %d, %d)\n", rc1.left, rc1.top, rc1.right, rc1.bottom, rc2.left, rc2.top, rc2.right, rc2.bottom); check_active_state(hwnd2, hwnd2, hwnd2); @@ -2483,9 +2479,7 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) ret = SetWindowPos(hwnd_grandchild, hwnd_child2, 1, 2, 3, 4, 0); ok(ret, "Got %d\n", ret); GetWindowRect(hwnd_grandchild, &rc2); - ok(rc1.left == rc2.left && rc1.top == rc2.top && - rc1.right == rc2.right && rc1.bottom == rc2.bottom, - "(%d, %d, %d, %d) != (%d, %d, %d, %d)\n", + ok(EqualRect(&rc1, &rc2), "(%d, %d, %d, %d) != (%d, %d, %d, %d)\n", rc1.left, rc1.top, rc1.right, rc1.bottom, rc2.left, rc2.top, rc2.right, rc2.bottom); check_active_state(hwnd2, hwnd2, hwnd2); @@ -2520,9 +2514,7 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) ret = SetWindowPos(hwnd_child, hwnd_desktop, 0, 0, 0, 0, 0); ok(!ret, "Got %d\n", ret); GetWindowRect(hwnd_child, &rc2); - ok(rc1.top == rc2.top && rc1.left == rc2.left && - rc1.bottom == rc2.bottom && rc1.right == rc2.right, - "(%d, %d, %d, %d) != (%d, %d, %d, %d)\n", + ok(EqualRect(&rc1, &rc2), "(%d, %d, %d, %d) != (%d, %d, %d, %d)\n", rc1.top, rc1.left, rc1.bottom, rc1.right, rc2.top, rc2.left, rc2.bottom, rc2.right); check_active_state(hwnd2, hwnd2, hwnd2);

1 0

Michael Stefaniuc : wordpad: Use OffsetRect() instead of open coding it.
by Alexandre Julliard 06 Jun '16

06 Jun '16

Module: wine Branch: master Commit: dc525e8c40f23383252af7d77125ca64f42e8bd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc525e8c40f23383252af7d77… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 6 11:16:40 2016 +0200 wordpad: Use OffsetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/print.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index 9021989..b3ee579 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -723,10 +723,7 @@ static void draw_margin_lines(HDC hdc, int x, int y, float ratio) page_margin.bottom = (int)((float)twips_to_pixels(page_margin.bottom, dpi.cy) * ratio); page_margin.right = (int)((float)twips_to_pixels(page_margin.right, dpi.cx) * ratio); - page_margin.left += x; - page_margin.top += y; - page_margin.bottom += y; - page_margin.right += x; + OffsetRect(&page_margin, x, y); hPen = CreatePen(PS_DOT, 1, RGB(0,0,0)); oldPen = SelectObject(hdc, hPen);

1 0

Michael Stefaniuc : user32: Use InflateRect() instead of open coding it.
by Alexandre Julliard 06 Jun '16

06 Jun '16

Module: wine Branch: master Commit: 9ed915083f2749a47a70c7c6cfe48d9955d317fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ed915083f2749a47a70c7c6c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 6 11:16:11 2016 +0200 user32: Use InflateRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/scroll.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index a210962..4b572e5 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -360,18 +360,12 @@ static BOOL SCROLL_PtInRectEx( LPRECT lpRect, POINT pt, BOOL vertical ) if (vertical) { scrollbarWidth = lpRect->right - lpRect->left; - rect.left -= scrollbarWidth*8; - rect.right += scrollbarWidth*8; - rect.top -= scrollbarWidth*2; - rect.bottom += scrollbarWidth*2; + InflateRect(&rect, scrollbarWidth * 8, scrollbarWidth * 2); } else { scrollbarWidth = lpRect->bottom - lpRect->top; - rect.left -= scrollbarWidth*2; - rect.right += scrollbarWidth*2; - rect.top -= scrollbarWidth*8; - rect.bottom += scrollbarWidth*8; + InflateRect(&rect, scrollbarWidth * 2, scrollbarWidth * 8); } return PtInRect( &rect, pt ); }

1 0

Nikolay Sivov : msscript: Added IOleObject stub.
by Alexandre Julliard 06 Jun '16

06 Jun '16

Module: wine Branch: master Commit: b4800237522c9553c23f420531990428d921b924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4800237522c9553c23f42053… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 6 12:45:54 2016 +0300 msscript: Added IOleObject stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/msscript.ocx/msscript.c | 246 ++++++++++++++++++++++++++++ dlls/msscript.ocx/tests/Makefile.in | 7 + dlls/msscript.ocx/tests/msscript.c | 58 +++++++ dlls/msscript.ocx/tests/msscript.idl | 306 +++++++++++++++++++++++++++++++++++ 6 files changed, 619 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b4800237522c9553c23f4…

1 0

Hugh McMaster : reg: Rename HKEY 'subkey' to 'key' in reg_add() and reg_delete().
by Alexandre Julliard 06 Jun '16

06 Jun '16

Module: wine Branch: master Commit: c0d990855881849afb4a4b8a5898f1d632a144e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0d990855881849afb4a4b8a5… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 6 05:31:35 2016 +0000 reg: Rename HKEY 'subkey' to 'key' in reg_add() and reg_delete(). This better reflects the purpose of the HKEY. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 9cf094e..b7ed312 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -349,7 +349,7 @@ static int reg_add(HKEY root, WCHAR *key_name, WCHAR *value_name, BOOL value_emp WCHAR *type, WCHAR separator, WCHAR *data, BOOL force) { LPWSTR p; - HKEY subkey; + HKEY key; p = strchrW(key_name,'\\'); if (p) p++; @@ -360,7 +360,7 @@ static int reg_add(HKEY root, WCHAR *key_name, WCHAR *value_name, BOOL value_emp return 1; } - if(RegCreateKeyW(root,p,&subkey)!=ERROR_SUCCESS) + if (RegCreateKeyW(root, p, &key) != ERROR_SUCCESS) { output_message(STRING_INVALID_KEY); return 1; @@ -374,11 +374,11 @@ static int reg_add(HKEY root, WCHAR *key_name, WCHAR *value_name, BOOL value_emp if (!force) { - if (RegQueryValueExW(subkey, value_name, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + if (RegQueryValueExW(key, value_name, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) { if (!ask_confirm(STRING_OVERWRITE_VALUE, value_name)) { - RegCloseKey(subkey); + RegCloseKey(key); output_message(STRING_CANCELLED); return 0; } @@ -388,28 +388,28 @@ static int reg_add(HKEY root, WCHAR *key_name, WCHAR *value_name, BOOL value_emp reg_type = wchar_get_type(type); if (reg_type == ~0u) { - RegCloseKey(subkey); + RegCloseKey(key); output_message(STRING_UNSUPPORTED_TYPE, type); return 1; } if ((reg_type == REG_DWORD || reg_type == REG_DWORD_BIG_ENDIAN) && !data) { - RegCloseKey(subkey); + RegCloseKey(key); output_message(STRING_INVALID_CMDLINE); return 1; } if (!(reg_data = get_regdata(data, reg_type, separator, &reg_count))) { - RegCloseKey(subkey); + RegCloseKey(key); return 1; } - RegSetValueExW(subkey,value_name,0,reg_type,reg_data,reg_count); + RegSetValueExW(key, value_name, 0, reg_type, reg_data, reg_count); HeapFree(GetProcessHeap(),0,reg_data); } - RegCloseKey(subkey); + RegCloseKey(key); output_message(STRING_SUCCESS); return 0; @@ -419,7 +419,7 @@ static int reg_delete(HKEY root, WCHAR *key_name, WCHAR *value_name, BOOL value_ BOOL value_all, BOOL force) { LPWSTR p; - HKEY subkey; + HKEY key; p = strchrW(key_name,'\\'); if (p) p++; @@ -460,7 +460,7 @@ static int reg_delete(HKEY root, WCHAR *key_name, WCHAR *value_name, BOOL value_ return 0; } - if(RegOpenKeyW(root,p,&subkey)!=ERROR_SUCCESS) + if (RegOpenKeyW(root, p, &key) != ERROR_SUCCESS) { output_message(STRING_CANNOT_FIND); return 1; @@ -473,11 +473,11 @@ static int reg_delete(HKEY root, WCHAR *key_name, WCHAR *value_name, BOOL value_ DWORD count; LONG rc; - rc = RegQueryInfoKeyW(subkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - &maxValue, NULL, NULL, NULL); + rc = RegQueryInfoKeyW(key, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, &maxValue, NULL, NULL, NULL); if (rc != ERROR_SUCCESS) { - RegCloseKey(subkey); + RegCloseKey(key); output_message(STRING_GENERAL_FAILURE); return 1; } @@ -487,14 +487,14 @@ static int reg_delete(HKEY root, WCHAR *key_name, WCHAR *value_name, BOOL value_ while (1) { count = maxValue; - rc = RegEnumValueW(subkey, 0, szValue, &count, NULL, NULL, NULL, NULL); + rc = RegEnumValueW(key, 0, szValue, &count, NULL, NULL, NULL, NULL); if (rc == ERROR_SUCCESS) { - rc = RegDeleteValueW(subkey, szValue); + rc = RegDeleteValueW(key, szValue); if (rc != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, szValue); - RegCloseKey(subkey); + RegCloseKey(key); output_message(STRING_VALUEALL_FAILED, key_name); return 1; } @@ -504,15 +504,15 @@ static int reg_delete(HKEY root, WCHAR *key_name, WCHAR *value_name, BOOL value_ } else if (value_name || value_empty) { - if (RegDeleteValueW(subkey, value_empty ? NULL : value_name) != ERROR_SUCCESS) + if (RegDeleteValueW(key, value_empty ? NULL : value_name) != ERROR_SUCCESS) { - RegCloseKey(subkey); + RegCloseKey(key); output_message(STRING_CANNOT_FIND); return 1; } } - RegCloseKey(subkey); + RegCloseKey(key); output_message(STRING_SUCCESS); return 0; }

1 0