February 2017 - Wine-commits

Vincent Povirk : kernel32/tests: Avoid testing for a hard-coded timezone name.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: 6758a8ec7f63cb6ea964a3fa22ac92b445c00459 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6758a8ec7f63cb6ea964a3fa2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 11 11:36:44 2016 -0600 kernel32/tests: Avoid testing for a hard-coded timezone name. It turns out timezone names are localized, so this breaks on non-English Windows 8 and 10 systems. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 82a55e7bf8c8fb15950c29b108e336e0b686739b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/tests/time.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index 53af39c..e6e779c 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -913,7 +913,7 @@ static void test_GetTimeZoneInformationForYear(void) { BOOL ret; SYSTEMTIME systemtime; - TIME_ZONE_INFORMATION local_tzinfo, tzinfo; + TIME_ZONE_INFORMATION local_tzinfo, tzinfo, tzinfo2; DYNAMIC_TIME_ZONE_INFORMATION dyn_tzinfo; static const WCHAR std_tzname[] = {'G','r','e','e','n','l','a','n','d',' ','S','t','a','n','d','a','r','d',' ','T','i','m','e',0}; static const WCHAR dlt_tzname[] = {'G','r','e','e','n','l','a','n','d',' ','D','a','y','l','i','g','h','t',' ','T','i','m','e',0}; @@ -962,21 +962,24 @@ static void test_GetTimeZoneInformationForYear(void) ret = pGetTimeZoneInformationForYear(2015, &dyn_tzinfo, &tzinfo); ok(ret == TRUE, "GetTimeZoneInformationForYear failed, err %u\n", GetLastError()); ok(tzinfo.Bias == 180, "Expected Bias 180, got %d\n", tzinfo.Bias); - ok(!lstrcmpW(tzinfo.StandardName, std_tzname) || broken(!tzinfo.StandardName[0]) /* vista,7 */, - "Expected StandardName %s, got %s\n", - wine_dbgstr_w(std_tzname), wine_dbgstr_w(tzinfo.StandardName)); ok(tzinfo.StandardDate.wMonth == 10, "Expected standard month 10, got %d\n", tzinfo.StandardDate.wMonth); std_day = day_of_month(&tzinfo.StandardDate, 2015); ok(std_day == 24, "Expected standard day 24, got %d\n", std_day); ok(tzinfo.StandardBias == 0, "Expected StandardBias 0, got %d\n", tzinfo.StandardBias); - ok(!lstrcmpW(tzinfo.DaylightName, dlt_tzname) || broken(!tzinfo.DaylightName[0]) /* vista,7 */, - "Expected DaylightName %s, got %s\n", - wine_dbgstr_w(dlt_tzname), wine_dbgstr_w(tzinfo.DaylightName)); ok(tzinfo.DaylightDate.wMonth == 3, "Expected daylight month 3, got %d\n", tzinfo.DaylightDate.wMonth); dlt_day = day_of_month(&tzinfo.DaylightDate, 2015); ok(dlt_day == 28, "Expected daylight day 28, got %d\n", dlt_day); ok(tzinfo.DaylightBias == -60, "Expected DaylightBias -60, got %d\n", tzinfo.DaylightBias); + ret = pGetTimeZoneInformationForYear(2016, &dyn_tzinfo, &tzinfo2); + ok(ret == TRUE, "GetTimeZoneInformationForYear failed, err %u\n", GetLastError()); + ok(!lstrcmpW(tzinfo.StandardName, tzinfo2.StandardName), + "Got differing StandardName values %s and %s\n", + wine_dbgstr_w(tzinfo.StandardName), wine_dbgstr_w(tzinfo2.StandardName)); + ok(!lstrcmpW(tzinfo.DaylightName, tzinfo2.DaylightName), + "Got differing DaylightName values %s and %s\n", + wine_dbgstr_w(tzinfo.DaylightName), wine_dbgstr_w(tzinfo2.DaylightName)); + memset(&dyn_tzinfo, 0xaa, sizeof(dyn_tzinfo)); lstrcpyW(dyn_tzinfo.TimeZoneKeyName, dlt_tzname);

1 0

Henri Verbeet : wine.inf: Add Dynamic DST data for Asia/Tehran.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: 4220f8daa72fe1a60ab13455010c921fa05f10b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4220f8daa72fe1a60ab134550… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 12 19:37:35 2017 +0330 wine.inf: Add Dynamic DST data for Asia/Tehran. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 19ce2b77bdf39cdf2ae15268e3e55996da194925) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.inf.in | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4220f8daa72fe1a60ab13…

1 0

Can Taşan : documentation: Update Turkish translation.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: d0ae2eb217fcef86f0cab7c60097990d021165c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0ae2eb217fcef86f0cab7c60… Author: Can Taşan <betax34(a)hotmail.com> Date: Tue Jan 24 20:05:46 2017 +0100 documentation: Update Turkish translation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6dcb6a8bfc349e15197f57471c09fbc4bf0f74cb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- documentation/README.tr | 196 +++++++++++++++++++----------------------------- 1 file changed, 77 insertions(+), 119 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d0ae2eb217fcef86f0cab…

1 0

Can Taşan : documentation: Update Turkish translation.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: b29c44d58adfe1881c9f08f8eafd10cf8ed4a535 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b29c44d58adfe1881c9f08f8e… Author: Can Taşan <betax34(a)hotmail.com> Date: Mon Feb 6 17:55:03 2017 +0100 documentation: Update Turkish translation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fd9e7d0f8c3de265ab7a64545418a67d28e0766b) Conflicts: po/tr.po Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- documentation/README.tr | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/documentation/README.tr b/documentation/README.tr index aa11353..1ddce37 100644 --- a/documentation/README.tr +++ b/documentation/README.tr @@ -124,7 +124,7 @@ bir dosya adı belirtebilirsiniz. Örneğin: Not Defteri'ni çalıştırmak için: wine notepad (dosyaları konumlandırmak için config - wine notepad.exe (dosyasındaki Path arama yolunu kullanarak) + wine notepad.exe dosyasındaki Path arama yolunu kullanarak) wine c:\\windows\\notepad.exe (DOS dosya adı sözdizimi ile) @@ -145,17 +145,18 @@ WWW: Wine hakkında geniş bilgiyi WineHQ sitesine http://www.winehq.org/ başlangıç noktasıdır. SSS: Wine hakkında sıkça sorulan sorulara buradan ulaşabilirsiniz: + http://www.winehq.org/FAQ Hatalar: - Hatalarınızı http://bugs.winehq.org adresinden Wine Bugzilla - ile bildirebilirsiniz. Lütfen bir hata bildirmeden önce - hatanın önceden girilip girilmediğini öğrenmek için bugzilla'da + Karşılaştığınız hataları http://bugs.winehq.org adresinden Wine + Bugzilla ile bildirebilirsiniz. Lütfen bir hata bildirmeden önce + hatanın önceden girilip girilmediğini öğrenmek için Bugzilla'da arama yapınız. IRC: irc.freenode.net sunucusundan #WineHQ kanalı ile çevrimiçi yardım alabilirsiniz. -Git: Geçerli Wine geliştirme ağacına Git üzerinden erişilebilir. +Git: Geçerli Wine geliştirme ağacına Git üzerinden erişim sağlanabilir. Daha fazla bilgi için http://www.winehq.org/git adresine gidiniz. E-posta listeleri: @@ -163,8 +164,8 @@ E-posta listeleri: Daha fazla bilgi için http://www.winehq.org/forums adresine gidiniz. Eğer bir şey eklemek veya hata düzeltmek istiyorsanız, lütfen sonraki -sürümde içerilmesi için wine-patches(a)winehq.org e-posta listesine bir yama -('diff -u' biçiminde) gönderiniz. +sürümde yer alabilmesii için wine-patches(a)winehq.org e-posta listesine bir +yama ('diff -u' biçiminde) gönderiniz. -- Alexandre Julliard

1 0

Matteo Bruni : wined3d: Swizzle D3DCOLOR attributes in the GLSL FFP replacement when necessary.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: 50909566f3be7bdc78d8331b5b14d75bac264765 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50909566f3be7bdc78d8331b5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sat Jul 30 19:56:55 2016 +0200 wined3d: Swizzle D3DCOLOR attributes in the GLSL FFP replacement when necessary. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b62f4139eda58e8e25cbc58864fcea2599a20e97) Conflicts: dlls/wined3d/buffer.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/buffer.c | 8 +++----- dlls/wined3d/context.c | 2 +- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/utils.c | 4 ++++ dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 9b7f1c5..6e50458 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -721,9 +721,9 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte const struct wined3d_state *state) { DWORD flags = buffer->flags & (WINED3D_BUFFER_SYNC | WINED3D_BUFFER_DISCARD); + const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_device *device = buffer->resource.device; UINT start = 0, end = 0, len = 0, vertices; - const struct wined3d_gl_info *gl_info; BOOL decl_changed = FALSE; unsigned int i, j; BYTE *data; @@ -761,7 +761,7 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte if (!use_vs(state)) { - if (!context->gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) + if (!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] && !context->d3d_info->ffp_generic_attributes) fixup_flags |= WINED3D_BUFFER_FIXUP_D3DCOLOR; if (!context->d3d_info->xyzrhw) fixup_flags |= WINED3D_BUFFER_FIXUP_XYZRHW; @@ -863,13 +863,11 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte return; } - buffer_direct_upload(buffer, context->gl_info, flags); + buffer_direct_upload(buffer, gl_info, flags); return; } - gl_info = context->gl_info; - if(!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) { buffer_get_sysmem(buffer, context); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f6b16a5..414c1e2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2983,7 +2983,7 @@ static void context_update_stream_info(struct wined3d_context *context, const st else { WORD slow_mask = -!d3d_info->ffp_generic_attributes & (1u << WINED3D_FFP_PSIZE); - slow_mask |= -!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] + slow_mask |= -(!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] && !d3d_info->ffp_generic_attributes) & ((1u << WINED3D_FFP_DIFFUSE) | (1u << WINED3D_FFP_SPECULAR) | (1u << WINED3D_FFP_BLENDWEIGHT)); if (((stream_info->position_transformed && !d3d_info->xyzrhw) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a980c5b..abe12b1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5862,8 +5862,8 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr for (i = 0; i < ARRAY_SIZE(attrib_info); ++i) { if (attrib_info[i].name[0]) - shader_addline(buffer, "%s %s = vs_in%u;\n", - attrib_info[i].type, attrib_info[i].name, i); + shader_addline(buffer, "%s %s = vs_in%u%s;\n", attrib_info[i].type, attrib_info[i].name, + i, settings->swizzle_map & (1u << i) ? ".zyxw" : ""); } for (i = 0; i < MAX_TEXTURES; ++i) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 47ad93c..7159f96 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4804,6 +4804,8 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, else settings->flatshading = FALSE; + settings->swizzle_map = si->swizzle_map; + return; } @@ -4889,6 +4891,8 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, else settings->flatshading = FALSE; + settings->swizzle_map = si->swizzle_map; + settings->padding = 0; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a8b2aff..316b6ea 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2010,6 +2010,8 @@ struct wined3d_ffp_vs_settings DWORD padding : 10; DWORD texgen[MAX_TEXTURES]; + + WORD swizzle_map; /* MAX_ATTRIBS, 16 */ }; struct wined3d_ffp_vs_desc

1 0

Nikolay Sivov : shell32: Don't access uninitialized buffer (Coverity).
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: fc49f58d0809bf89436f652a96787daf700c5ef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc49f58d0809bf89436f652a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 14 22:16:11 2016 +0300 shell32: Don't access uninitialized buffer (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3c6cbc2f910ae1ee905e385ea06bb537cc3d901d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shellpath.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 1c3ab59..d06ba2f 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4735,6 +4735,7 @@ HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE t hr = E_INVALIDARG; break; case CSIDL_Type_NonExistent: + *tempW = 0; hr = S_FALSE; break; case CSIDL_Type_WindowsPath: @@ -4785,15 +4786,19 @@ HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE t break; } + if (FAILED(hr)) + goto failed; + /* Expand environment strings if necessary */ if (*tempW == '%') + { hr = _SHExpandEnvironmentStrings(tempW, pathW); + if (FAILED(hr)) + goto failed; + } else strcpyW(pathW, tempW); - if (FAILED(hr)) - goto failed; - /* if we don't care about existing directories we are ready */ if (flags & KF_FLAG_DONT_VERIFY) goto done;

1 0

Alexandre Julliard : winex11: Also ignore BadWindow errors caused by XSendEvent.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: 54fb8dddfb0c2eac08df72640461f6beea172635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54fb8dddfb0c2eac08df72640… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 20 17:08:28 2016 +0100 winex11: Also ignore BadWindow errors caused by XSendEvent. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit adc349c38edd82902571fb7100014241205b3731) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/x11drv_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index d4f5c84..89664a0 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -208,8 +208,11 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = */ static inline BOOL ignore_error( Display *display, XErrorEvent *event ) { - if ((event->request_code == X_SetInputFocus || event->request_code == X_ChangeWindowAttributes) && - (event->error_code == BadMatch || event->error_code == BadWindow)) return TRUE; + if ((event->request_code == X_SetInputFocus || + event->request_code == X_ChangeWindowAttributes || + event->request_code == X_SendEvent) && + (event->error_code == BadMatch || + event->error_code == BadWindow)) return TRUE; /* ignore a number of errors on gdi display caused by creating/destroying windows */ if (display == gdi_display)

1 0

Hugh McMaster : kernel32: Check for a valid pointer before yanking the line.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: bde2d0a8495ed734bc8ca4df06e568de6232cdfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bde2d0a8495ed734bc8ca4df0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Dec 13 12:00:03 2016 +0000 kernel32: Check for a valid pointer before yanking the line. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8cacba5ff942ee91124895bb10fec026556cdf6f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/editline.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 78ea789..6d2ad17 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -635,7 +635,8 @@ static void WCEL_CapitalizeWord(WCEL_Context* ctx) static void WCEL_Yank(WCEL_Context* ctx) { - WCEL_InsertString(ctx, ctx->yanked); + if (ctx->yanked) + WCEL_InsertString(ctx, ctx->yanked); } static void WCEL_KillToEndOfLine(WCEL_Context* ctx)

1 0

Hugh McMaster : kernel32: Use Emacs keymap mode immediately after wineconsole configuration change.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: 577b41b1560ff0f3696e27ea78dfca83fc36ec6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=577b41b1560ff0f3696e27ea7… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Dec 13 11:09:23 2016 +0000 kernel32: Use Emacs keymap mode immediately after wineconsole configuration change. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6a3ffc4f3fa4c3b11658dce4a941e9ffcbf34317) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/editline.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 6d2ad17..9eda65f 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -984,6 +984,8 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) } } + CONSOLE_GetEditionMode(hConsoleIn, &use_emacs); + GetConsoleMode(hConsoleIn, &mode); if (input_mode != mode) {

1 0

Hugh McMaster : appwiz.cpl: Remove list entries left over from an earlier uninstall.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: 64d37d9482c259a9b0e8bb062aec741e8914b014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64d37d9482c259a9b0e8bb062… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Dec 16 12:20:40 2016 +0000 appwiz.cpl: Remove list entries left over from an earlier uninstall. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 537768b67520408d97ab032cd4bcc6c6d39105b1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/appwiz.cpl/appwiz.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 9d53e79..dd84827 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -298,7 +298,7 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) } /* registry key */ - info->regroot = root; + RegOpenKeyExW(root, NULL, 0, KEY_READ, &info->regroot); lstrcpyW(info->regkey, subKeyName); info->path = command; @@ -497,7 +497,6 @@ static void UninstallProgram(int id, DWORD button) PROCESS_INFORMATION info; WCHAR errormsg[MAX_STRING_LEN]; WCHAR sUninstallFailed[MAX_STRING_LEN]; - HKEY hkey; BOOL res; LoadStringW(hInst, IDS_UNINSTALL_FAILED, sUninstallFailed, @@ -533,9 +532,8 @@ static void UninstallProgram(int id, DWORD button) MB_ICONQUESTION) == IDYES) { /* delete the application's uninstall entry */ - RegOpenKeyExW(iter->regroot, PathUninstallW, 0, KEY_READ, &hkey); - RegDeleteKeyW(hkey, iter->regkey); - RegCloseKey(hkey); + RegDeleteKeyW(iter->regroot, iter->regkey); + RegCloseKey(iter->regroot); } }

1 0