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

Grazvydas Ignotas : wined3d: Add some more Intel GPUs.
by Alexandre Julliard June 6, 2016

June 6, 2016

Module: wine Branch: master Commit: ed59d4a9d9b565e253cf75f2dd7129fa43f25ee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed59d4a9d9b565e253cf75f2d… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Sat Jun 4 23:07:01 2016 +0300 wined3d: Add some more Intel GPUs. For HD Graphics 520 or newer, the whole system RAM seems to be reported as VRAM. For now I've chosen 2048MB based on assumption that systems as new as this will have at least 2GB of RAM. Signed-off-by: Grazvydas Ignotas <notasas(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 5 +++++ dlls/wined3d/wined3d_private.h | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c2a83fe..5d9d4e5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1388,7 +1388,12 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IVBD, "Intel(R) HD Graphics 4000", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_IVBM, "Intel(R) HD Graphics 4000", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_IVBS, "Intel(R) HD Graphics Family", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_HWD, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_HWM, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_HD520, "Intel(R) HD Graphics 520", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD530_1, "Intel(R) HD Graphics 530", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD530_2, "Intel(R) HD Graphics 530", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD540, "Intel(R) Iris(TM) Graphics 540", DRIVER_INTEL_HD4000, 2048}, }; static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f9a8ffa..c31b41d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1884,7 +1884,12 @@ enum wined3d_pci_device CARD_INTEL_IVBD = 0x0162, CARD_INTEL_IVBM = 0x0166, CARD_INTEL_IVBS = 0x015a, + CARD_INTEL_HWD = 0x0412, CARD_INTEL_HWM = 0x0416, + CARD_INTEL_HD520 = 0x1916, + CARD_INTEL_HD530_1 = 0x1912, + CARD_INTEL_HD530_2 = 0x191b, + CARD_INTEL_HD540 = 0x1926, }; struct wined3d_fbo_ops

1 0

Nikolay Sivov : dsound: Remove redundant null pointer check (Coverity).
by Alexandre Julliard June 6, 2016

June 6, 2016

Module: wine Branch: master Commit: d597ea8f03027483ca08bb191d9929656992e590 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d597ea8f03027483ca08bb191… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 6 11:14:38 2016 +0300 dsound: Remove redundant null pointer check (Coverity). IAudioClient instance could be expected to be valid at this point. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/primary.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index b14bff7..830764a 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -387,8 +387,7 @@ err: IAudioStreamVolume_Release(volume); if (render) IAudioRenderClient_Release(render); - if (client) - IAudioClient_Release(client); + IAudioClient_Release(client); HeapFree(GetProcessHeap(), 0, wfx); return hres; }

1 0

Hugh McMaster : reg/tests: Add initial tests for 'reg import'.
by Alexandre Julliard June 6, 2016

June 6, 2016

Module: wine Branch: master Commit: 1148e9e050811b4c4bf3682d92cf89979251468e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1148e9e050811b4c4bf3682d9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 6 05:57:19 2016 +0000 reg/tests: Add initial tests for 'reg import'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index c59f08f..f7d8b11 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -654,6 +654,20 @@ static void test_v_flags(void) ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); } +static void test_import(void) +{ + DWORD r; + + run_reg_exe("reg import", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg import /?", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg import missing.reg", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); +} + START_TEST(reg) { DWORD r; @@ -666,4 +680,5 @@ START_TEST(reg) test_delete(); test_query(); test_v_flags(); + test_import(); }

1 0

Hugh McMaster : reg: Combine duplicate 'for' loops in wmain and parse all remaining arguments.
by Alexandre Julliard June 6, 2016

June 6, 2016

Module: wine Branch: master Commit: 7484c5eba3d4af440ae318a2c70be7227c6860e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7484c5eba3d4af440ae318a2c… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 6 05:31:55 2016 +0000 reg: Combine duplicate 'for' loops in wmain and parse all remaining arguments. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 114 ++++++++++++++++++----------------------------------- 1 file changed, 39 insertions(+), 75 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 6b4ad50..0df82e6 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -876,7 +876,8 @@ int wmain(int argc, WCHAR *argvW[]) { int i, op; BOOL show_op_help = FALSE; - WCHAR *key_name, *path; + WCHAR *key_name, *path, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0'; + BOOL value_empty = FALSE, value_all = FALSE, recurse = FALSE, force = FALSE; HKEY root; static const WCHAR slashDW[] = {'/','d',0}; static const WCHAR slashFW[] = {'/','f',0}; @@ -943,95 +944,58 @@ int wmain(int argc, WCHAR *argvW[]) path = strchrW(key_name, '\\'); if (path) path++; - if (op == REG_ADD) + for (i = 3; i < argc; i++) { - WCHAR *value_name = NULL, *type = NULL, separator = '\0', *data = NULL; - BOOL value_empty = FALSE, force = FALSE; - - for (i = 1; i < argc; i++) + if (!lstrcmpiW(argvW[i], slashVW)) { - if (!lstrcmpiW(argvW[i], slashVW)) - { - if (value_name || !(value_name = argvW[++i])) - { - output_message(STRING_INVALID_CMDLINE); - return 1; - } - } - else if (!lstrcmpiW(argvW[i], slashVEW)) - value_empty = TRUE; - else if (!lstrcmpiW(argvW[i], slashTW)) - type = argvW[++i]; - else if (!lstrcmpiW(argvW[i], slashSW)) + if (value_name || !(value_name = argvW[++i])) { - WCHAR *ptr = argvW[++i]; - - if (!ptr || strlenW(ptr) != 1) - { - output_message(STRING_INVALID_CMDLINE); - return 1; - } - separator = ptr[0]; + output_message(STRING_INVALID_CMDLINE); + return 1; } - else if (!lstrcmpiW(argvW[i], slashDW)) + } + else if (!lstrcmpiW(argvW[i], slashVEW)) + value_empty = TRUE; + else if (!lstrcmpiW(argvW[i], slashVAW)) + value_all = TRUE; + else if (!lstrcmpiW(argvW[i], slashTW)) + type = argvW[++i]; + else if (!lstrcmpiW(argvW[i], slashDW)) + { + if (!(data = argvW[++i])) { - if (!(data = argvW[++i])) - { - output_message(STRING_INVALID_CMDLINE); - return 1; - } + output_message(STRING_INVALID_CMDLINE); + return 1; } - else if (!lstrcmpiW(argvW[i], slashFW)) - force = TRUE; } - return reg_add(root, path, value_name, value_empty, type, separator, data, force); - } - else if (op == REG_DELETE) - { - WCHAR *value_name = NULL; - BOOL value_empty = FALSE, value_all = FALSE, force = FALSE; - - for (i = 1; i < argc; i++) + else if (!lstrcmpiW(argvW[i], slashSW)) { - if (!lstrcmpiW(argvW[i], slashVW)) + WCHAR *ptr; + + if (op == REG_QUERY) { - if (value_name || !(value_name = argvW[++i])) - { - output_message(STRING_INVALID_CMDLINE); - return 1; - } + recurse = TRUE; + continue; } - else if (!lstrcmpiW(argvW[i], slashVEW)) - value_empty = TRUE; - else if (!lstrcmpiW(argvW[i], slashVAW)) - value_all = TRUE; - else if (!lstrcmpiW(argvW[i], slashFW)) - force = TRUE; - } - return reg_delete(root, path, key_name, value_name, value_empty, value_all, force); - } - else if (op == REG_QUERY) - { - WCHAR *value_name = NULL; - BOOL value_empty = FALSE, recurse = FALSE; - for (i = 1; i < argc; i++) - { - if (!lstrcmpiW(argvW[i], slashVW)) + ptr = argvW[++i]; + if (!ptr || strlenW(ptr) != 1) { - if (value_name || !(value_name = argvW[++i])) - { - output_message(STRING_INVALID_CMDLINE); - return 1; - } + output_message(STRING_INVALID_CMDLINE); + return 1; } - else if (!lstrcmpiW(argvW[i], slashVEW)) - value_empty = TRUE; - else if (!lstrcmpiW(argvW[i], slashSW)) - recurse = TRUE; + separator = ptr[0]; } - return reg_query(root, path, key_name, value_name, value_empty, recurse); + else if (!lstrcmpiW(argvW[i], slashFW)) + force = TRUE; } + + if (op == REG_ADD) + return reg_add(root, path, value_name, value_empty, type, separator, data, force); + else if (op == REG_DELETE) + return reg_delete(root, path, key_name, value_name, value_empty, value_all, force); + else if (op == REG_QUERY) + return reg_query(root, path, key_name, value_name, value_empty, recurse); else { output_message(STRING_INVALID_OPTION, argvW[1]);

1 0

Michael Stefaniuc : wordpad: Use OffsetRect() instead of open coding it.
by Alexandre Julliard June 6, 2016

June 6, 2016

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

Andrey Gusev : mmdevapi/tests: Fix a typo in ok() messages.
by Alexandre Julliard June 6, 2016

June 6, 2016

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

Luis Sahagun : winevdm: Tell dosbox to read the current user's config.
by Alexandre Julliard June 6, 2016

June 6, 2016

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

Hugh McMaster : reg: Remove an unreachable 'else' pathway from wmain.
by Alexandre Julliard June 6, 2016

June 6, 2016

Module: wine Branch: master Commit: 0f7bdf7d576e1e13e6eb649ebfbd753f7247856e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f7bdf7d576e1e13e6eb649eb… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 6 05:32:05 2016 +0000 reg: Remove an unreachable 'else' pathway from wmain. Invalid operations are handled earlier in wmain. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 0df82e6..ea77426 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -874,7 +874,7 @@ static enum operations get_operation(const WCHAR *str) int wmain(int argc, WCHAR *argvW[]) { - int i, op; + int i, op, ret; BOOL show_op_help = FALSE; WCHAR *key_name, *path, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0'; BOOL value_empty = FALSE, value_all = FALSE, recurse = FALSE, force = FALSE; @@ -991,15 +991,10 @@ int wmain(int argc, WCHAR *argvW[]) } if (op == REG_ADD) - return reg_add(root, path, value_name, value_empty, type, separator, data, force); + ret = reg_add(root, path, value_name, value_empty, type, separator, data, force); else if (op == REG_DELETE) - return reg_delete(root, path, key_name, value_name, value_empty, value_all, force); + ret = reg_delete(root, path, key_name, value_name, value_empty, value_all, force); else if (op == REG_QUERY) - return reg_query(root, path, key_name, value_name, value_empty, recurse); - else - { - output_message(STRING_INVALID_OPTION, argvW[1]); - output_message(STRING_REG_HELP); - return 1; - } + ret = reg_query(root, path, key_name, value_name, value_empty, recurse); + return ret; }

1 0

Andrey Gusev : mshtml: Fix a typo in WARN() message.
by Alexandre Julliard June 6, 2016

June 6, 2016

Module: wine Branch: master Commit: 15616e65809f99e6916d00cc7c4646077f6f5aeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=15616e65809f99e6916d00cc7… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 2 23:52:14 2016 +0300 mshtml: Fix a typo in WARN() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/persist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 5806e4d..a4a190c 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -162,7 +162,7 @@ void set_current_mon(HTMLOuterWindow *This, IMoniker *mon, DWORD flags) if(SUCCEEDED(hres)) { hres = create_uri(url, 0, &uri); if(FAILED(hres)) { - WARN("CrateUri failed: %08x\n", hres); + WARN("CreateUri failed: %08x\n", hres); set_current_uri(This, NULL); This->url = SysAllocString(url); CoTaskMemFree(url);

1 0

Hugh McMaster : reg: Rename HKEY 'subkey' to 'key' in reg_add() and reg_delete().
by Alexandre Julliard June 6, 2016

June 6, 2016

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