August 2018 - Wine-Commits - list.winehq.org

Alex Henrie : shell32: Add download icons.
by Alexandre Julliard Aug. 30, 2018

Aug. 30, 2018

Module: wine Branch: master Commit: 042b9cc23f64e023b8d0f415f73e179dc39015e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=042b9cc23f64e023b8d0f415… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:47 2018 -0600 shell32: Add download icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 8 ++++++++ dlls/shell32/shresdef.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 251d1f0..e28d51c 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -822,6 +822,14 @@ IDI_SHELL_CARD_READER ICON resources/disk_drive.ico /* @makedep: resources/disk_drive.ico */ IDI_SHELL_ZIP_DRIVE ICON resources/disk_drive.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/blank.ico */ +IDI_SHELL_DOWNLOAD ICON resources/blank.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/blank.ico */ +IDI_SHELL_DOWNLOAD_EMBLEM ICON resources/blank.ico + /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index cf18347..6bf9b99 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -298,6 +298,8 @@ #define IDI_SHELL_MUSIC_CD_95 228 #define IDI_SHELL_CARD_READER 229 #define IDI_SHELL_ZIP_DRIVE 230 +#define IDI_SHELL_DOWNLOAD 231 +#define IDI_SHELL_DOWNLOAD_EMBLEM 232 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_MY_PICTURES 236 #define IDI_SHELL_MY_MUSIC 237

1 0

Alex Henrie : shell32: Add zip drive icon.
by Alexandre Julliard Aug. 30, 2018

Aug. 30, 2018

Module: wine Branch: master Commit: a2e2b5ba1da2277053aef9cf9f9e996223012805 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2e2b5ba1da2277053aef9cf… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:46 2018 -0600 shell32: Add zip drive icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 8 ++++++++ dlls/shell32/shresdef.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 69465da..251d1f0 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -818,6 +818,10 @@ IDI_SHELL_MUSIC_CD_95 ICON resources/optical_disc.ico /* @makedep: resources/disk_drive.ico */ IDI_SHELL_CARD_READER ICON resources/disk_drive.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/disk_drive.ico */ +IDI_SHELL_ZIP_DRIVE ICON resources/disk_drive.ico + /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico @@ -918,6 +922,10 @@ IDI_SHELL_OPTICAL_DISC ICON resources/optical_disc.ico IDI_SHELL_DVD_ROM ICON resources/optical_disc.ico /* FIXME: Following resource is not yet added */ +/* @makedep: resources/disk_drive.ico */ +IDI_SHELL_ZIP_DRIVE2 ICON resources/disk_drive.ico + +/* FIXME: Following resource is not yet added */ /* @makedep: resources/optical_disc.ico */ IDI_SHELL_DVD_RW ICON resources/optical_disc.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index c21d849..cf18347 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -297,6 +297,7 @@ #define IDI_SHELL_AUDIO_FILE 225 #define IDI_SHELL_MUSIC_CD_95 228 #define IDI_SHELL_CARD_READER 229 +#define IDI_SHELL_ZIP_DRIVE 230 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_MY_PICTURES 236 #define IDI_SHELL_MY_MUSIC 237 @@ -323,6 +324,7 @@ #define IDI_SHELL_DVD_R 298 #define IDI_SHELL_OPTICAL_DISC 302 #define IDI_SHELL_DVD_ROM 304 +#define IDI_SHELL_ZIP_DRIVE2 313 #define IDI_SHELL_DVD_RW 318 #define IDI_SHELL_NEW_FOLDER 319 #define IDI_SHELL_BURN_DISC2 320

1 0

Alex Henrie : shell32: Add audio file icon.
by Alexandre Julliard Aug. 30, 2018

Aug. 30, 2018

Module: wine Branch: master Commit: 47c35b2ef1d450361e388ec855a2927d7648ef2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=47c35b2ef1d450361e388ec8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:41 2018 -0600 shell32: Add audio file icon. Adapted from audio-x-generic in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/audio.ico | Bin 0 -> 48131 bytes dlls/shell32/resources/audio.svg | 679 +++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 684 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=47c35b2ef1d450361e38…

1 0

Gabriel Ivăncescu : shell32/tests: Add a test for binding a different AutoComplete object to the same edit control.
by Alexandre Julliard Aug. 30, 2018

Aug. 30, 2018

Module: wine Branch: master Commit: 6f3e83f7fc66fa3a66a0acdc990aaab572a8d283 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f3e83f7fc66fa3a66a0acdc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Aug 27 20:10:47 2018 +0300 shell32/tests: Add a test for binding a different AutoComplete object to the same edit control. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/autocomplete.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index 1c51e51..3c8de88 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -141,7 +141,7 @@ if (0) static IAutoComplete *test_init(void) { HRESULT r; - IAutoComplete *ac; + IAutoComplete *ac, *ac2; IUnknown *acSource; LONG_PTR user_data; @@ -176,6 +176,15 @@ static IAutoComplete *test_init(void) user_data = GetWindowLongPtrA(hEdit, GWLP_USERDATA); ok(user_data == 0, "Expected the edit control user data to be zero\n"); + /* bind a different object to the same edit control */ + r = CoCreateInstance(&CLSID_AutoComplete, NULL, CLSCTX_INPROC_SERVER, + &IID_IAutoComplete, (LPVOID*)&ac2); + ok(r == S_OK, "no IID_IAutoComplete (0x%08x)\n", r); + + r = IAutoComplete_Init(ac2, hEdit, acSource, NULL, NULL); + ok(r == S_OK, "Init returned 0x%08x\n", r); + IAutoComplete_Release(ac2); + IUnknown_Release(acSource); return ac;

1 0

Piotr Caban : jsproxy: Fix parameters validation in InternetInitializeAutoProxyDll.
by Alexandre Julliard Aug. 30, 2018

Aug. 30, 2018

Module: wine Branch: master Commit: 36649d083f6c85ecb5d2d79023893d1c8be93e51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36649d083f6c85ecb5d2d790… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 29 15:59:48 2018 +0200 jsproxy: Fix parameters validation in InternetInitializeAutoProxyDll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jsproxy/main.c | 11 +++-------- dlls/jsproxy/tests/jsproxy.c | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index d1ac903..26f43c5 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -179,20 +179,15 @@ BOOL WINAPI JSPROXY_InternetInitializeAutoProxyDll( DWORD version, LPSTR tmpfile if (buffer && buffer->dwStructSize == sizeof(*buffer) && buffer->lpszScriptBuffer) { - DWORD i, len = 0; - for (i = 0; i < buffer->dwScriptBufferSize; i++) - { - if (!buffer->lpszScriptBuffer[i]) break; - len++; - } - if (len == buffer->dwScriptBufferSize) + if (!buffer->dwScriptBufferSize) { SetLastError( ERROR_INVALID_PARAMETER ); LeaveCriticalSection( &cs_jsproxy ); return FALSE; } heap_free( global_script->text ); - if ((global_script->text = strdupAW( buffer->lpszScriptBuffer, len ))) ret = TRUE; + if ((global_script->text = strdupAW( buffer->lpszScriptBuffer, + buffer->dwScriptBufferSize ))) ret = TRUE; } else { diff --git a/dlls/jsproxy/tests/jsproxy.c b/dlls/jsproxy/tests/jsproxy.c index 67a2988..d1c905c 100644 --- a/dlls/jsproxy/tests/jsproxy.c +++ b/dlls/jsproxy/tests/jsproxy.c @@ -24,6 +24,8 @@ #include "wine/test.h" +static BOOL old_jsproxy; + static BOOL (WINAPI *pInternetInitializeAutoProxyDll) (DWORD, LPSTR, LPSTR, AutoProxyHelperFunctions *, AUTO_PROXY_SCRIPT_BUFFER *); static BOOL (WINAPI *pInternetDeInitializeAutoProxyDll)(LPSTR, DWORD); @@ -34,6 +36,7 @@ static void test_InternetInitializeAutoProxyDll(void) const char url[] = "http://localhost"; char script[] = "function FindProxyForURL(url, host) {return \"DIRECT\";}\0test"; char script2[] = "function FindProxyForURL(url, host) {return \"PROXY 10.0.0.1:8080\";}\0test"; + char script3[] = "function FindProxyForURL(url, host) {return \"DIRECT\";}"; char *proxy, host[] = "localhost"; AUTO_PROXY_SCRIPT_BUFFER buf; DWORD err, len; @@ -76,6 +79,16 @@ static void test_InternetInitializeAutoProxyDll(void) ok( !strcmp( proxy, "PROXY 10.0.0.1:8080" ), "got \"%s\"\n", proxy ); GlobalFree( proxy ); + buf.lpszScriptBuffer = script3; + buf.dwScriptBufferSize = strlen(script3); + ret = pInternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buf ); + ok( ret || broken(old_jsproxy && !ret), "got %u\n", GetLastError() ); + + buf.dwScriptBufferSize = 1; + script3[0] = 0; + ret = pInternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buf ); + ok( ret, "got %u\n", GetLastError() ); + ret = pInternetDeInitializeAutoProxyDll( NULL, 0 ); ok( ret, "got %u\n", GetLastError() ); } @@ -150,6 +163,10 @@ START_TEST(jsproxy) return; } + old_jsproxy = !GetProcAddress( module, "InternetGetProxyInfoEx" ); + if (old_jsproxy) + trace( "InternetGetProxyInfoEx not available\n" ); + test_InternetInitializeAutoProxyDll(); test_InternetGetProxyInfo(); }

1 0

Józef Kucia : vulkan-1/tests: Add a test for destroying a command pool.
by Alexandre Julliard Aug. 30, 2018

Aug. 30, 2018

Module: wine Branch: master Commit: 29d49fb8a3ee8a72310c0b4d1f314a11dc39efc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29d49fb8a3ee8a72310c0b4d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 30 12:22:33 2018 +0200 vulkan-1/tests: Add a test for destroying a command pool. The Vulkan spec says: "When a pool is destroyed, all command buffers allocated from the pool are implicitly freed and become invalid. Command buffers allocated from a given pool do not need to be freed before destroying that command pool." Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/tests/vulkan.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 1d2f66f..20a2452 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -232,6 +232,45 @@ static void test_physical_device_groups(void) vkDestroyInstance(vk_instance, NULL); } +static void test_destroy_command_pool(VkPhysicalDevice vk_physical_device) +{ + VkCommandBufferAllocateInfo allocate_info; + VkCommandPoolCreateInfo pool_info; + VkCommandBuffer vk_cmd_buffers[4]; + uint32_t queue_family_index; + VkCommandPool vk_cmd_pool; + VkDevice vk_device; + VkResult vr; + + if ((vr = create_device(vk_physical_device, 0, NULL, NULL, &vk_device)) < 0) + { + skip("Failed to create device, vr %d.\n", vr); + return; + } + + find_queue_family(vk_physical_device, VK_QUEUE_GRAPHICS_BIT, &queue_family_index); + + pool_info.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO; + pool_info.pNext = NULL; + pool_info.flags = 0; + pool_info.queueFamilyIndex = queue_family_index; + vr = vkCreateCommandPool(vk_device, &pool_info, NULL, &vk_cmd_pool); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + allocate_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; + allocate_info.pNext = NULL; + allocate_info.commandPool = vk_cmd_pool; + allocate_info.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY; + allocate_info.commandBufferCount = ARRAY_SIZE(vk_cmd_buffers); + vr = vkAllocateCommandBuffers(vk_device, &allocate_info, vk_cmd_buffers); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + vkDestroyCommandPool(vk_device, vk_cmd_pool, NULL); + vkDestroyCommandPool(vk_device, VK_NULL_HANDLE, NULL); + + vkDestroyDevice(vk_device, NULL); +} + static void for_each_device(void (*test_func)(VkPhysicalDevice)) { VkPhysicalDevice *vk_physical_devices; @@ -272,4 +311,5 @@ START_TEST(vulkan) for_each_device(enumerate_physical_device); for_each_device(enumerate_device_queues); test_physical_device_groups(); + for_each_device(test_destroy_command_pool); }

1 0

Alex Henrie : shell32: Rename floppy.svg to disk_drive.svg.
by Alexandre Julliard Aug. 30, 2018

Aug. 30, 2018

Module: wine Branch: master Commit: 336ced48faa3122a80a5225ac02582d5a7285e05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=336ced48faa3122a80a5225a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:44 2018 -0600 shell32: Rename floppy.svg to disk_drive.svg. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 2 +- dlls/shell32/resources/{floppy.ico => disk_drive.ico} | Bin dlls/shell32/resources/{floppy.svg => disk_drive.svg} | 0 dlls/shell32/shell32.rc | 12 ++++++------ 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 7f549ca..a61775e 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -68,11 +68,11 @@ SVG_SRCS = \ resources/copy.svg \ resources/delete.svg \ resources/desktop.svg \ + resources/disk_drive.svg \ resources/document.svg \ resources/drive.svg \ resources/eject.svg \ resources/favorites.svg \ - resources/floppy.svg \ resources/folder.svg \ resources/folder_open.svg \ resources/help.svg \ diff --git a/dlls/shell32/resources/floppy.ico b/dlls/shell32/resources/disk_drive.ico similarity index 100% rename from dlls/shell32/resources/floppy.ico rename to dlls/shell32/resources/disk_drive.ico diff --git a/dlls/shell32/resources/floppy.svg b/dlls/shell32/resources/disk_drive.svg similarity index 100% rename from dlls/shell32/resources/floppy.svg rename to dlls/shell32/resources/disk_drive.svg diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index f086aa4..f6defb2 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -443,15 +443,15 @@ IDI_SHELL_FOLDER_OPEN_LARGE ICON resources/folder_open.ico IDI_SHELL_FOLDER_SMALL_XP ICON resources/folder_open.ico /* FIXME: Following resource is not yet added */ -/* @makedep: resources/floppy.ico */ -IDI_SHELL_5_12_FLOPPY ICON resources/floppy.ico +/* @makedep: resources/disk_drive.ico */ +IDI_SHELL_5_12_FLOPPY ICON resources/disk_drive.ico /* FIXME: Following resource is not yet added */ -/* @makedep: resources/floppy.ico */ -IDI_SHELL_3_14_FLOPPY ICON resources/floppy.ico +/* @makedep: resources/disk_drive.ico */ +IDI_SHELL_3_14_FLOPPY ICON resources/disk_drive.ico -/* @makedep: resources/floppy.ico */ -IDI_SHELL_FLOPPY ICON resources/floppy.ico +/* @makedep: resources/disk_drive.ico */ +IDI_SHELL_FLOPPY ICON resources/disk_drive.ico /* @makedep: resources/drive.ico */ IDI_SHELL_DRIVE ICON resources/drive.ico

1 0

Alex Henrie : shell32: Add card reader icon.
by Alexandre Julliard Aug. 30, 2018

Aug. 30, 2018

Module: wine Branch: master Commit: c34a39e37a6fece2600659f9b11ce306a1b98a77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c34a39e37a6fece2600659f9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:45 2018 -0600 shell32: Add card reader icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index f6defb2..69465da 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -814,6 +814,10 @@ IDI_SHELL_AUDIO_FILE ICON resources/audio.ico /* @makedep: resources/optical_disc.ico */ IDI_SHELL_MUSIC_CD_95 ICON resources/optical_disc.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/disk_drive.ico */ +IDI_SHELL_CARD_READER ICON resources/disk_drive.ico + /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 19a5850..c21d849 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -296,6 +296,7 @@ #define IDI_SHELL_VIDEO_FILE 224 #define IDI_SHELL_AUDIO_FILE 225 #define IDI_SHELL_MUSIC_CD_95 228 +#define IDI_SHELL_CARD_READER 229 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_MY_PICTURES 236 #define IDI_SHELL_MY_MUSIC 237

1 0

Alex Henrie : shell32: Add video file icon.
by Alexandre Julliard Aug. 30, 2018

Aug. 30, 2018

Module: wine Branch: master Commit: 627c34fff765abfb055b0c8fd8a3c3f21d8835c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=627c34fff765abfb055b0c8f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 29 23:37:40 2018 -0600 shell32: Add video file icon. Adapted from video-x-generic in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/video.ico | Bin 0 -> 64272 bytes dlls/shell32/resources/video.svg | 783 +++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 788 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=627c34fff765abfb055b…

1 0

Gabriel Ivăncescu : shell32/autocomplete: Don' t crash when there's another AutoComplete object on the same edit control.
by Alexandre Julliard Aug. 30, 2018

Aug. 30, 2018

Module: wine Branch: master Commit: 9c2217216cbf9a56a5090c848119d84fac9b65ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c2217216cbf9a56a5090c84… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Aug 27 20:10:46 2018 +0300 shell32/autocomplete: Don't crash when there's another AutoComplete object on the same edit control. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22333 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 99ce23d..cf8da50 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -93,6 +93,14 @@ static inline IAutoCompleteImpl *impl_from_IAutoCompleteDropDown(IAutoCompleteDr return CONTAINING_RECORD(iface, IAutoCompleteImpl, IAutoCompleteDropDown_iface); } +static void destroy_autocomplete_object(IAutoCompleteImpl *ac) +{ + ac->hwndEdit = NULL; + if (ac->hwndListBox) + DestroyWindow(ac->hwndListBox); + IAutoComplete2_Release(&ac->IAutoComplete2_iface); +} + /* Window procedure for autocompletion */ @@ -276,10 +284,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, RemovePropW(hwnd, autocomplete_propertyW); SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)proc); - This->hwndEdit = NULL; - if (This->hwndListBox) - DestroyWindow(This->hwndListBox); - IAutoComplete2_Release(&This->IAutoComplete2_iface); + destroy_autocomplete_object(This); return CallWindowProcW(proc, hwnd, uMsg, wParam, lParam); } default: @@ -434,7 +439,7 @@ static HRESULT WINAPI IAutoComplete2_fnInit( LPCOLESTR pwzsRegKeyPath, LPCOLESTR pwszQuickComplete) { - IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); + IAutoCompleteImpl *prev, *This = impl_from_IAutoComplete2(iface); TRACE("(%p)->(%p, %p, %s, %s)\n", This, hwndEdit, punkACL, debugstr_w(pwzsRegKeyPath), debugstr_w(pwszQuickComplete)); @@ -461,10 +466,22 @@ static HRESULT WINAPI IAutoComplete2_fnInit( This->initialized = TRUE; This->hwndEdit = hwndEdit; - This->wpOrigEditProc = (WNDPROC) SetWindowLongPtrW( hwndEdit, GWLP_WNDPROC, (LONG_PTR) ACEditSubclassProc); - /* Keep at least one reference to the object until the edit window is destroyed. */ + + /* If another AutoComplete object was previously assigned to this edit control, + release it but keep the same callback on the control, to avoid an infinite + recursive loop in ACEditSubclassProc while the property is set to this object */ + prev = GetPropW(hwndEdit, autocomplete_propertyW); + SetPropW(hwndEdit, autocomplete_propertyW, This); + + if (prev && prev->initialized) { + This->wpOrigEditProc = prev->wpOrigEditProc; + destroy_autocomplete_object(prev); + } + else + This->wpOrigEditProc = (WNDPROC) SetWindowLongPtrW(hwndEdit, GWLP_WNDPROC, (LONG_PTR) ACEditSubclassProc); + + /* Keep at least one reference to the object until the edit window is destroyed */ IAutoComplete2_AddRef(&This->IAutoComplete2_iface); - SetPropW( hwndEdit, autocomplete_propertyW, This ); if (This->options & ACO_AUTOSUGGEST) create_listbox(This);

1 0