wine-commits June 2016

wine-commits@winehq.org

2 participants
592 discussions

Grazvydas Ignotas : wined3d: Add some more Intel GPUs.
by Alexandre Julliard 06 Jun '16

06 Jun '16

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

Grazvydas Ignotas : wined3d: Use Intel data returned by Windows driver.
by Alexandre Julliard 06 Jun '16

06 Jun '16

Module: wine Branch: master Commit: 898e477e6a103ec5aa533758a44b944a0de57e7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=898e477e6a103ec5aa533758a… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Sat Jun 4 23:07:00 2016 +0300 wined3d: Use Intel data returned by Windows driver. The returned VRAM size seems to vary between 1600-1800 MB, probably depends on the system, I chose 1536 (1024+512) just to be safe. 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 | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2472c67..c2a83fe 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -49,6 +49,7 @@ enum wined3d_display_driver DRIVER_INTEL_GMA900, DRIVER_INTEL_GMA950, DRIVER_INTEL_GMA3000, + DRIVER_INTEL_HD4000, DRIVER_NVIDIA_TNT, DRIVER_NVIDIA_GEFORCE2MX, DRIVER_NVIDIA_GEFORCEFX, @@ -1162,6 +1163,7 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_INTEL_GMA3000, DRIVER_MODEL_NT5X, "igxprd32.dll", 14, 10, 5218}, {DRIVER_INTEL_GMA950, DRIVER_MODEL_NT6X, "igdumd32.dll", 14, 10, 1504}, {DRIVER_INTEL_GMA3000, DRIVER_MODEL_NT6X, "igdumd32.dll", 15, 10, 1666}, + {DRIVER_INTEL_HD4000, DRIVER_MODEL_NT6X, "igdumdim32.dll", 19, 15, 4352}, /* Nvidia * - Geforce8 and newer is supported by the current 340.52 driver on XP-Win8 @@ -1378,15 +1380,15 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_Q45, "Intel(R) Q45/Q43", DRIVER_INTEL_GMA3000, 512}, {HW_VENDOR_INTEL, CARD_INTEL_G41, "Intel(R) G41", DRIVER_INTEL_GMA3000, 512}, {HW_VENDOR_INTEL, CARD_INTEL_B43, "Intel(R) B43", DRIVER_INTEL_GMA3000, 512}, - {HW_VENDOR_INTEL, CARD_INTEL_ILKD, "Intel(R) Ironlake Desktop", DRIVER_INTEL_GMA3000, 1024}, - {HW_VENDOR_INTEL, CARD_INTEL_ILKM, "Intel(R) Ironlake Mobile", DRIVER_INTEL_GMA3000, 1024}, - {HW_VENDOR_INTEL, CARD_INTEL_SNBD, "Intel(R) Sandybridge Desktop", DRIVER_INTEL_GMA3000, 1024}, - {HW_VENDOR_INTEL, CARD_INTEL_SNBM, "Intel(R) Sandybridge Mobile", DRIVER_INTEL_GMA3000, 1024}, - {HW_VENDOR_INTEL, CARD_INTEL_SNBS, "Intel(R) Sandybridge Server", DRIVER_INTEL_GMA3000, 1024}, - {HW_VENDOR_INTEL, CARD_INTEL_IVBD, "Intel(R) Ivybridge Desktop", DRIVER_INTEL_GMA3000, 1024}, - {HW_VENDOR_INTEL, CARD_INTEL_IVBM, "Intel(R) Ivybridge Mobile", DRIVER_INTEL_GMA3000, 1024}, - {HW_VENDOR_INTEL, CARD_INTEL_IVBS, "Intel(R) Ivybridge Server", DRIVER_INTEL_GMA3000, 1024}, - {HW_VENDOR_INTEL, CARD_INTEL_HWM, "Intel(R) Haswell Mobile", DRIVER_INTEL_GMA3000, 1024}, + {HW_VENDOR_INTEL, CARD_INTEL_ILKD, "Intel(R) HD Graphics", DRIVER_INTEL_GMA3000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_ILKM, "Intel(R) HD Graphics", DRIVER_INTEL_GMA3000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_SNBD, "Intel(R) HD Graphics 3000", DRIVER_INTEL_GMA3000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_SNBM, "Intel(R) HD Graphics 3000", DRIVER_INTEL_GMA3000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_SNBS, "Intel(R) HD Graphics Family", DRIVER_INTEL_GMA3000, 1536}, + {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_HWM, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, }; static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver,

1 0

Nikolay Sivov : dsound: Remove redundant null pointer check (Coverity).
by Alexandre Julliard 06 Jun '16

06 Jun '16

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

Andrey Gusev : mshtml: Fix a typo in WARN() message.
by Alexandre Julliard 06 Jun '16

06 Jun '16

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/tests: Add initial tests for 'reg import'.
by Alexandre Julliard 06 Jun '16

06 Jun '16

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: Move duplicate /v, /ve and / va combination checks to wmain.
by Alexandre Julliard 06 Jun '16

06 Jun '16

Module: wine Branch: master Commit: 17d606a3b9f393fdf40ba69d6b591dea25656c4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=17d606a3b9f393fdf40ba69d6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 6 05:32:16 2016 +0000 reg: Move duplicate /v, /ve and /va combination checks to wmain. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index ea77426..84818da 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -350,12 +350,6 @@ static int reg_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, { HKEY key; - if (value_name && value_empty) - { - output_message(STRING_INVALID_CMDLINE); - return 1; - } - if (RegCreateKeyW(root, path, &key) != ERROR_SUCCESS) { output_message(STRING_INVALID_KEY); @@ -416,12 +410,6 @@ static int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name { HKEY key; - if ((value_name && value_empty) || (value_name && value_all) || (value_empty && value_all)) - { - output_message(STRING_INVALID_CMDLINE); - return 1; - } - if (!force) { BOOL ret; @@ -808,12 +796,6 @@ static int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, WCHAR newlineW[] = {'\n',0}; int ret; - if (value_name && value_empty) - { - output_message(STRING_INVALID_CMDLINE); - return 1; - } - if (RegOpenKeyExW(root, path, 0, KEY_READ, &key) != ERROR_SUCCESS) { output_message(STRING_CANNOT_FIND); @@ -990,6 +972,12 @@ int wmain(int argc, WCHAR *argvW[]) force = TRUE; } + if ((value_name && value_empty) || (value_name && value_all) || (value_empty && value_all)) + { + output_message(STRING_INVALID_CMDLINE); + return 1; + } + if (op == REG_ADD) ret = reg_add(root, path, value_name, value_empty, type, separator, data, force); else if (op == REG_DELETE)

1 0

Hugh McMaster : reg: Remove an unreachable 'else' pathway from wmain.
by Alexandre Julliard 06 Jun '16

06 Jun '16

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

Hugh McMaster : reg: Combine duplicate 'for' loops in wmain and parse all remaining arguments.
by Alexandre Julliard 06 Jun '16

06 Jun '16

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

Hugh McMaster : reg: Move duplicate strchrW() calls to wmain.
by Alexandre Julliard 06 Jun '16

06 Jun '16

Module: wine Branch: master Commit: f1bf0bfbc39a4503905b966b695ee8dc7008ce7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1bf0bfbc39a4503905b966b6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 6 05:31:45 2016 +0000 reg: Move duplicate strchrW() calls to wmain. 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, 16 insertions(+), 24 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index b7ed312..6b4ad50 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -345,22 +345,18 @@ static BOOL sane_path(const WCHAR *key) return TRUE; } -static int reg_add(HKEY root, WCHAR *key_name, WCHAR *value_name, BOOL value_empty, +static int reg_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, WCHAR *type, WCHAR separator, WCHAR *data, BOOL force) { - LPWSTR p; HKEY key; - p = strchrW(key_name,'\\'); - if (p) p++; - if (value_name && value_empty) { output_message(STRING_INVALID_CMDLINE); return 1; } - if (RegCreateKeyW(root, p, &key) != ERROR_SUCCESS) + if (RegCreateKeyW(root, path, &key) != ERROR_SUCCESS) { output_message(STRING_INVALID_KEY); return 1; @@ -415,15 +411,11 @@ static int reg_add(HKEY root, WCHAR *key_name, WCHAR *value_name, BOOL value_emp return 0; } -static int reg_delete(HKEY root, WCHAR *key_name, WCHAR *value_name, BOOL value_empty, - BOOL value_all, BOOL force) +static int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, + BOOL value_empty, BOOL value_all, BOOL force) { - LPWSTR p; HKEY key; - p = strchrW(key_name,'\\'); - if (p) p++; - if ((value_name && value_empty) || (value_name && value_all) || (value_empty && value_all)) { output_message(STRING_INVALID_CMDLINE); @@ -451,7 +443,7 @@ static int reg_delete(HKEY root, WCHAR *key_name, WCHAR *value_name, BOOL value_ /* Delete subtree only if no /v* option is given */ if (!value_name && !value_empty && !value_all) { - if (RegDeleteTreeW(root,p)!=ERROR_SUCCESS) + if (RegDeleteTreeW(root, path) != ERROR_SUCCESS) { output_message(STRING_CANNOT_FIND); return 1; @@ -460,7 +452,7 @@ static int reg_delete(HKEY root, WCHAR *key_name, WCHAR *value_name, BOOL value_ return 0; } - if (RegOpenKeyW(root, p, &key) != ERROR_SUCCESS) + if (RegOpenKeyW(root, path, &key) != ERROR_SUCCESS) { output_message(STRING_CANNOT_FIND); return 1; @@ -809,9 +801,9 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) return 0; } -static int reg_query(HKEY root, WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL recurse) +static int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, + BOOL value_empty, BOOL recurse) { - WCHAR *p; HKEY key; WCHAR newlineW[] = {'\n',0}; int ret; @@ -822,10 +814,7 @@ static int reg_query(HKEY root, WCHAR *key_name, WCHAR *value_name, BOOL value_e return 1; } - p = strchrW(key_name, '\\'); - if (p) p++; - - if (RegOpenKeyExW(root, p, 0, KEY_READ, &key) != ERROR_SUCCESS) + if (RegOpenKeyExW(root, path, 0, KEY_READ, &key) != ERROR_SUCCESS) { output_message(STRING_CANNOT_FIND); return 1; @@ -887,7 +876,7 @@ int wmain(int argc, WCHAR *argvW[]) { int i, op; BOOL show_op_help = FALSE; - WCHAR *key_name; + WCHAR *key_name, *path; HKEY root; static const WCHAR slashDW[] = {'/','d',0}; static const WCHAR slashFW[] = {'/','f',0}; @@ -951,6 +940,9 @@ int wmain(int argc, WCHAR *argvW[]) return 1; } + path = strchrW(key_name, '\\'); + if (path) path++; + if (op == REG_ADD) { WCHAR *value_name = NULL, *type = NULL, separator = '\0', *data = NULL; @@ -992,7 +984,7 @@ int wmain(int argc, WCHAR *argvW[]) else if (!lstrcmpiW(argvW[i], slashFW)) force = TRUE; } - return reg_add(root, key_name, value_name, value_empty, type, separator, data, force); + return reg_add(root, path, value_name, value_empty, type, separator, data, force); } else if (op == REG_DELETE) { @@ -1016,7 +1008,7 @@ int wmain(int argc, WCHAR *argvW[]) else if (!lstrcmpiW(argvW[i], slashFW)) force = TRUE; } - return reg_delete(root, key_name, value_name, value_empty, value_all, force); + return reg_delete(root, path, key_name, value_name, value_empty, value_all, force); } else if (op == REG_QUERY) { @@ -1038,7 +1030,7 @@ int wmain(int argc, WCHAR *argvW[]) else if (!lstrcmpiW(argvW[i], slashSW)) recurse = TRUE; } - return reg_query(root, key_name, value_name, value_empty, recurse); + return reg_query(root, path, key_name, value_name, value_empty, recurse); } else {

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

← Newer
1
...
48
49
50
51
52
53
54
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2016