wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

Vincent Povirk : windowscodecs: Fix 32bppGrayFloat to 8bppGray conversion.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 0491ab2f1281bee645c656109e9415b6923d1b1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0491ab2f1281bee645c65610… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 14 14:58:59 2017 -0500 windowscodecs: Fix 32bppGrayFloat to 8bppGray conversion. Based on Dmitry Timoshkov's patch. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8bae21302f88bd6b3360334355d9d7a5c6a1ad38) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/windowscodecs/converter.c | 37 ++++++++++++++++++++++++++++++++++++ dlls/windowscodecs/tests/converter.c | 1 + 2 files changed, 38 insertions(+) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index e5d61e1..42ba260 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -1149,6 +1149,43 @@ static HRESULT copypixels_to_8bppGray(struct FormatConverter *This, const WICRec return S_OK; } + if (source_format == format_32bppGrayFloat) + { + hr = S_OK; + + if (prc) + { + srcstride = 4 * prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + hr = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + if (SUCCEEDED(hr)) + { + INT x, y; + BYTE *src = srcdata, *dst = pbBuffer; + + for (y=0; y < prc->Height; y++) + { + float *srcpixel = (float*)src; + BYTE *dstpixel = dst; + + for (x=0; x < prc->Width; x++) + *dstpixel++ = (BYTE)floorf(to_sRGB_component(*srcpixel++) * 255.0f + 0.51f); + + src += srcstride; + dst += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + } + + return hr; + } + srcstride = 3 * prc->Width; srcdatasize = srcstride * prc->Height; diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 2af9857..e88810d 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -804,6 +804,7 @@ START_TEST(converter) test_conversion(&testdata_24bppBGR, &testdata_8bppGray, "24bppBGR -> 8bppGray", FALSE); test_conversion(&testdata_32bppBGR, &testdata_8bppGray, "32bppBGR -> 8bppGray", FALSE); test_conversion(&testdata_32bppGrayFloat, &testdata_24bppBGR_gray, "32bppGrayFloat -> 24bppBGR gray", FALSE); + test_conversion(&testdata_32bppGrayFloat, &testdata_8bppGray, "32bppGrayFloat -> 8bppGray", FALSE); test_invalid_conversion(); test_default_converter();

1 0

Sebastian Lackner : user32: Globally invalidate key state on changes in other threads.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: cacd11edc1e20011f3641681f28044a82d693669 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cacd11edc1e20011f3641681… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Dec 18 16:20:58 2017 +0100 user32: Globally invalidate key state on changes in other threads. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 059d5ece23265e003ab413aa711e963da9c0564e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/input.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 44b7e70..bc62f87 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -371,6 +371,7 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) { struct user_key_state_info *key_state_info = get_user_thread_info()->key_state; INT counter = global_key_state_counter; + BYTE prev_key_state; SHORT ret; if (key < 0 || key >= 256) return 0; @@ -398,14 +399,23 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState( INT key ) { req->tid = 0; req->key = key; - if (key_state_info) wine_server_set_reply( req, key_state_info->state, - sizeof(key_state_info->state) ); + if (key_state_info) + { + prev_key_state = key_state_info->state[key]; + wine_server_set_reply( req, key_state_info->state, sizeof(key_state_info->state) ); + } if (!wine_server_call( req )) { if (reply->state & 0x40) ret |= 0x0001; if (reply->state & 0x80) ret |= 0x8000; if (key_state_info) { + /* force refreshing the key state cache - some multithreaded programs + * (like Adobe Photoshop CS5) expect that changes to the async key state + * are also immediately available in other threads. */ + if (prev_key_state != key_state_info->state[key]) + counter = interlocked_xchg_add( &global_key_state_counter, 1 ) + 1; + key_state_info->time = GetTickCount(); key_state_info->counter = counter; }

1 0

Nikolay Sivov : comctl32/updown: Reset control width conditionally on UDM_SETBUDDY with NULL buddy handle.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 46a46bde32f8113cf73caa25ba7d75c632c1207a URL: https://source.winehq.org/git/wine.git/?a=commit;h=46a46bde32f8113cf73caa25… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 21 12:14:45 2017 +0300 comctl32/updown: Reset control width conditionally on UDM_SETBUDDY with NULL buddy handle. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 030488bc76156248170c4cc030bc8049e81a52d2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/updown.c | 77 +++++++++++++++++++++++++++++++++++++++++++- dlls/comctl32/updown.c | 11 ++++--- 2 files changed, 82 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index cc06f65..449a8b7 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -518,6 +518,7 @@ static void test_updown_pos32(void) static void test_updown_buddy(void) { HWND updown, buddyReturn, buddy; + RECT rect, rect2; WNDPROC proc; DWORD style; @@ -564,8 +565,82 @@ static void test_updown_buddy(void) } DestroyWindow(updown); - DestroyWindow(buddy); + + /* Create with buddy and UDS_HORZ, reset buddy. */ + updown = create_updown_control(UDS_HORZ, g_edit); + + buddyReturn = (HWND)SendMessageA(updown, UDM_GETBUDDY, 0, 0); + ok(buddyReturn == g_edit, "Unexpected buddy window.\n"); + + GetClientRect(updown, &rect); + + buddyReturn = (HWND)SendMessageA(updown, UDM_SETBUDDY, 0, 0); + ok(buddyReturn == g_edit, "Unexpected buddy window.\n"); + + GetClientRect(updown, &rect2); + ok(EqualRect(&rect, &rect2), "Unexpected window rect.\n"); + + /* Remove UDS_HORZ, reset buddy again. */ + style = GetWindowLongA(updown, GWL_STYLE); + SetWindowLongA(updown, GWL_STYLE, style & ~UDS_HORZ); + style = GetWindowLongA(updown, GWL_STYLE); + ok(!(style & UDS_HORZ), "Unexpected style.\n"); + + buddyReturn = (HWND)SendMessageA(updown, UDM_SETBUDDY, 0, 0); + ok(buddyReturn == NULL, "Unexpected buddy window.\n"); + + GetClientRect(updown, &rect2); + ok(EqualRect(&rect, &rect2), "Unexpected window rect.\n"); + + DestroyWindow(updown); + + /* Without UDS_HORZ. */ + updown = create_updown_control(0, g_edit); + + buddyReturn = (HWND)SendMessageA(updown, UDM_GETBUDDY, 0, 0); + ok(buddyReturn == g_edit, "Unexpected buddy window.\n"); + + GetClientRect(updown, &rect); + + buddyReturn = (HWND)SendMessageA(updown, UDM_SETBUDDY, 0, 0); + ok(buddyReturn == g_edit, "Unexpected buddy window.\n"); + + GetClientRect(updown, &rect2); + ok(EqualRect(&rect, &rect2), "Unexpected window rect.\n"); + + DestroyWindow(updown); + + /* Create without buddy. */ + GetClientRect(parent_wnd, &rect); + updown = CreateWindowExA(0, UPDOWN_CLASSA, NULL, WS_CHILD | WS_BORDER | WS_VISIBLE | UDS_HORZ, + 0, 0, rect.right, rect.bottom, parent_wnd, (HMENU)1, GetModuleHandleA(NULL), NULL); + ok(updown != NULL, "Failed to create UpDown control.\n"); + + GetClientRect(updown, &rect); + buddyReturn = (HWND)SendMessageA(updown, UDM_SETBUDDY, 0, 0); + ok(buddyReturn == NULL, "Unexpected buddy window.\n"); + GetClientRect(updown, &rect2); + + ok(EqualRect(&rect, &rect2), "Unexpected window rect.\n"); + + style = GetWindowLongA(updown, GWL_STYLE); + SetWindowLongA(updown, GWL_STYLE, style & ~UDS_HORZ); + + GetClientRect(updown, &rect2); + ok(EqualRect(&rect, &rect2), "Unexpected window rect.\n"); + + buddyReturn = (HWND)SendMessageA(updown, UDM_SETBUDDY, (WPARAM)g_edit, 0); + ok(buddyReturn == NULL, "Unexpected buddy window.\n"); + GetClientRect(updown, &rect); + + buddyReturn = (HWND)SendMessageA(updown, UDM_SETBUDDY, 0, 0); + ok(buddyReturn == g_edit, "Unexpected buddy window.\n"); + GetClientRect(updown, &rect2); +todo_wine + ok(EqualRect(&rect, &rect2), "Unexpected window rect.\n"); + + DestroyWindow(updown); } static void test_updown_base(void) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index d188408..4f44b90 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -622,11 +622,11 @@ static HWND UPDOWN_SetBuddy (UPDOWN_INFO* infoPtr, HWND bud) RECT budRect; /* new coord for the buddy */ int x, width; /* new x position and width for the up-down */ WCHAR buddyClass[40]; - HWND ret; + HWND old_buddy; TRACE("(hwnd=%p, bud=%p)\n", infoPtr->Self, bud); - ret = infoPtr->Buddy; + old_buddy = infoPtr->Buddy; /* there is already a buddy assigned */ if (infoPtr->Buddy) RemoveWindowSubclass(infoPtr->Buddy, UPDOWN_Buddy_SubclassProc, @@ -663,7 +663,7 @@ static HWND UPDOWN_SetBuddy (UPDOWN_INFO* infoPtr, HWND bud) x = budRect.right+DEFAULT_XSEP; } else { /* nothing to do */ - return ret; + return old_buddy; } /* first adjust the buddy to accommodate the up/down */ @@ -692,14 +692,15 @@ static HWND UPDOWN_SetBuddy (UPDOWN_INFO* infoPtr, HWND bud) budRect.top - DEFAULT_ADDTOP, width, budRect.bottom - budRect.top + DEFAULT_ADDTOP + DEFAULT_ADDBOT, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOZORDER); - } else { + } else if (!(infoPtr->dwStyle & UDS_HORZ) && old_buddy != NULL) { RECT rect; GetWindowRect(infoPtr->Self, &rect); MapWindowPoints(HWND_DESKTOP, GetParent(infoPtr->Self), (POINT *)&rect, 2); SetWindowPos(infoPtr->Self, 0, rect.left, rect.top, DEFAULT_WIDTH, rect.bottom - rect.top, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOZORDER); } - return ret; + + return old_buddy; } /***********************************************************************

1 0

Nikolay Sivov : comctl32/tooltips: Remove window subclass right before window is destroyed.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 0f53cac352f287a86615431564430a07d2f84595 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f53cac352f287a866154315… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 20 01:21:44 2017 +0300 comctl32/tooltips: Remove window subclass right before window is destroyed. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b68dbf4ea1294a98ca653f32e88b07be632a5bae) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tooltips.c | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 56dc743..e26964d 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1921,16 +1921,12 @@ TOOLTIPS_Destroy (TOOLTIPS_INFO *infoPtr) } } - /* remove subclassing */ - if (toolPtr->uInternalFlags & TTF_SUBCLASS) { - if (toolPtr->uInternalFlags & TTF_IDISHWND) { - RemoveWindowSubclass((HWND)toolPtr->uId, TOOLTIPS_SubclassProc, 1); - } - else { - RemoveWindowSubclass(toolPtr->hwnd, TOOLTIPS_SubclassProc, 1); - } + /* Reset subclassing data. */ + if (toolPtr->uInternalFlags & TTF_SUBCLASS) + SetWindowSubclass(toolPtr->uInternalFlags & TTF_IDISHWND ? (HWND)toolPtr->uId : toolPtr->hwnd, + TOOLTIPS_SubclassProc, 1, 0); } - } + Free (infoPtr->tools); } @@ -2151,12 +2147,13 @@ TOOLTIPS_WinIniChange (TOOLTIPS_INFO *infoPtr) static LRESULT CALLBACK -TOOLTIPS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uID, DWORD_PTR dwRef) +TOOLTIPS_SubclassProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, UINT_PTR uID, DWORD_PTR dwRef) { TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr ((HWND)dwRef); MSG msg; - switch(uMsg) { + switch (message) + { case WM_MOUSEMOVE: case WM_LBUTTONDOWN: case WM_LBUTTONUP: @@ -2164,17 +2161,23 @@ TOOLTIPS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_ case WM_MBUTTONUP: case WM_RBUTTONDOWN: case WM_RBUTTONUP: - msg.hwnd = hwnd; - msg.message = uMsg; - msg.wParam = wParam; - msg.lParam = lParam; - TOOLTIPS_RelayEvent(infoPtr, &msg); - break; - + if (infoPtr) + { + msg.hwnd = hwnd; + msg.message = message; + msg.wParam = wParam; + msg.lParam = lParam; + TOOLTIPS_RelayEvent(infoPtr, &msg); + } + break; + case WM_NCDESTROY: + RemoveWindowSubclass(hwnd, TOOLTIPS_SubclassProc, 1); + break; default: break; } - return DefSubclassProc(hwnd, uMsg, wParam, lParam); + + return DefSubclassProc(hwnd, message, wParam, lParam); }

1 0

Hugh McMaster : setupapi: Recursively remove any subkeys before calling NtDeleteKey().
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 54612205b446ae8dc84177e1907b2a9da2008364 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54612205b446ae8dc84177e1… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Sep 12 06:08:13 2017 +0000 setupapi: Recursively remove any subkeys before calling NtDeleteKey(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c9308b8d6b1e2f4dd39b19a6890423cd42fd4620) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/setupapi/install.c | 6 +++++- dlls/setupapi/tests/install.c | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index a8d38aa..0593df8 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -320,7 +320,11 @@ static BOOL do_reg_operation( HKEY hkey, const WCHAR *value, INFCONTEXT *context } else RegDeleteValueW( hkey, value ); } - else NtDeleteKey( hkey ); + else + { + RegDeleteTreeW( hkey, NULL ); + NtDeleteKey( hkey ); + } return TRUE; } diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 558453c..3ca7f26 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -174,7 +174,6 @@ static void test_registry(void) /* Check if the registry key is recursively deleted */ res = RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest", &key); - todo_wine ok(res == ERROR_FILE_NOT_FOUND, "Didn't expect the registry key to exist\n"); /* Just in case */ if (res == ERROR_SUCCESS)

1 0

Matteo Bruni : d3dx9: Implement D3DXGetShader{Input|Output}Semantics().
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 300a23fa50bf361e31096b3cf0bc43467b078bee URL: https://source.winehq.org/git/wine.git/?a=commit;h=300a23fa50bf361e31096b3c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Dec 7 22:56:15 2017 +0100 d3dx9: Implement D3DXGetShader{Input|Output}Semantics(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 50734ad54f4212b8e522d0acf7c616e51df19644) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_24/d3dx9_24.spec | 4 +- dlls/d3dx9_25/d3dx9_25.spec | 4 +- dlls/d3dx9_26/d3dx9_26.spec | 4 +- dlls/d3dx9_27/d3dx9_27.spec | 4 +- dlls/d3dx9_28/d3dx9_28.spec | 4 +- dlls/d3dx9_29/d3dx9_29.spec | 4 +- dlls/d3dx9_30/d3dx9_30.spec | 4 +- dlls/d3dx9_31/d3dx9_31.spec | 4 +- dlls/d3dx9_32/d3dx9_32.spec | 4 +- dlls/d3dx9_33/d3dx9_33.spec | 4 +- dlls/d3dx9_34/d3dx9_34.spec | 4 +- dlls/d3dx9_35/d3dx9_35.spec | 4 +- dlls/d3dx9_36/d3dx9_36.spec | 4 +- dlls/d3dx9_36/shader.c | 246 ++++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_37/d3dx9_37.spec | 4 +- dlls/d3dx9_38/d3dx9_38.spec | 4 +- dlls/d3dx9_39/d3dx9_39.spec | 4 +- dlls/d3dx9_40/d3dx9_40.spec | 4 +- dlls/d3dx9_41/d3dx9_41.spec | 4 +- dlls/d3dx9_42/d3dx9_42.spec | 4 +- dlls/d3dx9_43/d3dx9_43.spec | 4 +- 21 files changed, 286 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=300a23fa50bf361e3109…

1 0

Joel Holdsworth : urlmon: Support [Add.Code] sections in ActiveX INF files.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 5575c1e9f01c7a3df41a1f4cd467ad5e4e80340d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5575c1e9f01c7a3df41a1f4c… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Wed Dec 13 13:32:22 2017 -0700 urlmon: Support [Add.Code] sections in ActiveX INF files. Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 185bcc4523c5827a78a56c63735f1a5f502e999b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/urlmon/axinstall.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/axinstall.c b/dlls/urlmon/axinstall.c index 7ee7d94..d2cf7e6 100644 --- a/dlls/urlmon/axinstall.c +++ b/dlls/urlmon/axinstall.c @@ -251,12 +251,25 @@ static HRESULT install_inf_file(install_ctx_t *ctx) len = GetPrivateProfileStringW(add_codeW, NULL, NULL, buf, sizeof(buf)/sizeof(*buf), ctx->install_file); if(len) { - FIXME("[Add.Code] section not supported\n"); + default_install = FALSE; - /* Don't throw an error if we successfully ran setup hooks; - installation is likely to be complete enough */ - if(default_install) - return E_NOTIMPL; + for(key = buf; *key; key += strlenW(key)+1) { + TRACE("[Add.Code] key: %s\n", debugstr_w(key)); + + len = GetPrivateProfileStringW(add_codeW, key, NULL, sect_name, sizeof(sect_name)/sizeof(*sect_name), + ctx->install_file); + if(!len) { + WARN("Could not get key value\n"); + return E_FAIL; + } + + hres = RunSetupCommandW(ctx->hwnd, ctx->install_file, sect_name, + ctx->tmp_dir, NULL, NULL, RSC_FLAG_INF, NULL); + if(FAILED(hres)) { + WARN("RunSetupCommandW failed: %08x\n", hres); + return hres; + } + } } if(default_install) {

1 0

Alexandre Julliard : explorer: Fix parsing command line that contains spaces.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: b6c0b0aa9da6caaff6485746080f61b94c8c8825 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6c0b0aa9da6caaff6485746… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 12 09:33:32 2017 +0100 explorer: Fix parsing command line that contains spaces. Reported by Alistair Leslie-Hughes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ff53db7e6396337692ed2966ef3bf49a4737e3a6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/explorer/explorer.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 0116d53..76bbd03 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -620,7 +620,7 @@ static IShellFolder* get_starting_shell_folder(parameters_struct* params) return folder; } -static int copy_path_string(LPWSTR target, LPWSTR source) +static WCHAR *copy_path_string(WCHAR *target, WCHAR *source) { INT i = 0; @@ -629,10 +629,9 @@ static int copy_path_string(LPWSTR target, LPWSTR source) if (*source == '\"') { source ++; - while (*source != '\"') target[i++] = *source++; + while (*source && *source != '\"') target[i++] = *source++; target[i] = 0; - source ++; - i+=2; + if (*source) source++; } else { @@ -640,7 +639,7 @@ static int copy_path_string(LPWSTR target, LPWSTR source) target[i] = 0; } PathRemoveBackslashW(target); - return i; + return source; } @@ -703,12 +702,12 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) else if (strncmpW(p, arg_root, sizeof(arg_root)/sizeof(WCHAR))==0) { p += sizeof(arg_root)/sizeof(WCHAR); - p+=copy_path_string(parameters->root,p); + p = copy_path_string(parameters->root,p); } else if (strncmpW(p, arg_select, sizeof(arg_select)/sizeof(WCHAR))==0) { p += sizeof(arg_select)/sizeof(WCHAR); - p+=copy_path_string(parameters->selection,p); + p = copy_path_string(parameters->selection,p); if (!parameters->root[0]) copy_path_root(parameters->root, parameters->selection);

1 0

Alexandre Julliard : comctl32/imagelist: Use the correct allocation size for the image mask.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 0518bbb166d72e6195acc672b20e9a22ff60d5c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0518bbb166d72e6195acc672… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 11 19:55:01 2017 +0100 comctl32/imagelist: Use the correct allocation size for the image mask. Reported by Petru Florin Mihancea. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5dd9a1f00e7cbc30b306b8290c18b781f27e6af2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/imagelist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 70457c7..71145ed 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -296,7 +296,7 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, mask_info->bmiHeader = info->bmiHeader; mask_info->bmiHeader.biBitCount = 1; mask_info->bmiHeader.biSizeImage = mask_width * height; - if (!(mask_bits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, info->bmiHeader.biSizeImage ))) + if (!(mask_bits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mask_info->bmiHeader.biSizeImage ))) goto done; if (!GetDIBits( hdc, hbmMask, 0, height, mask_bits, mask_info, DIB_RGB_COLORS )) goto done; }

1 0

Nikolay Sivov : user32/edit: Allow buffer access after EM_GETHANDLE.
by Alexandre Julliard 18 Mar '18

18 Mar '18

Module: wine Branch: oldstable Commit: 8de00682805109b886417fd16e7f12e8e1648657 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8de00682805109b886417fd1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 5 15:09:03 2017 +0300 user32/edit: Allow buffer access after EM_GETHANDLE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f62d8dc58fb3fb5f11a8ab55620ab9b2fbdaf967) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/edit.c | 8 ++------ dlls/user32/tests/edit.c | 21 ++++++++++++++++----- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 78d78ea..7746c1b 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -1263,8 +1263,6 @@ static inline void text_buffer_changed(EDITSTATE *es) */ static void EDIT_LockBuffer(EDITSTATE *es) { - if (es->hlocapp) return; - if (!es->text) { if(!es->hloc32W) return; @@ -1305,8 +1303,6 @@ static void EDIT_LockBuffer(EDITSTATE *es) */ static void EDIT_UnlockBuffer(EDITSTATE *es, BOOL force) { - if (es->hlocapp) return; - /* Edit window might be already destroyed */ if(!IsWindow(es->hwndSelf)) { @@ -1322,7 +1318,6 @@ static void EDIT_UnlockBuffer(EDITSTATE *es, BOOL force) ERR("es->text == 0 ... please report\n"); return; } - if (force || (es->lock_count == 1)) { if (es->hloc32W) { UINT countA = 0; @@ -5202,7 +5197,8 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B break; } - if (IsWindow(hwnd) && es) EDIT_UnlockBuffer(es, FALSE); + if (IsWindow(hwnd) && es && msg != EM_GETHANDLE) + EDIT_UnlockBuffer(es, FALSE); TRACE("hwnd=%p msg=%x (%s) -- 0x%08lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), result); diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index d745023..031d875 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2773,12 +2773,10 @@ static void test_EM_GETHANDLE(void) /* See if WM_GETTEXTLENGTH/WM_GETTEXT still work. */ len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); -todo_wine ok(len == lstrlenA(str1), "Unexpected text length %d.\n", len); lstrcpyA(current, str0); r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); -todo_wine ok((r == lstrlenA(str1)) && !lstrcmpA(current, str1), "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1), str1); @@ -2789,15 +2787,28 @@ todo_wine LocalUnlock(hmem); len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); -todo_wine - ok(len == lstrlenA(str1), "Unexpected text length %d.\n", len); + ok(len == lstrlenA(str1_1), "Unexpected text length %d.\n", len); lstrcpyA(current, str0); r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); -todo_wine ok((r == lstrlenA(str1_1)) && !lstrcmpA(current, str1_1), "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1_1), str1_1); + /* See if WM_SETTEXT/EM_REPLACESEL work. */ + r = SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)str1); + ok(r, "Failed to set text.\n"); + + buffer = LocalLock(hmem); + ok(buffer != NULL && buffer[0] == '1', "Unexpected buffer contents\n"); + LocalUnlock(hmem); + + r = SendMessageA(hEdit, EM_REPLACESEL, 0, (LPARAM)str1_1); + ok(r, "Failed to replace selection.\n"); + + buffer = LocalLock(hmem); + ok(buffer != NULL && buffer[0] == '2', "Unexpected buffer contents\n"); + LocalUnlock(hmem); + /* use LocalAlloc first to get a different handle */ halloc = LocalAlloc(LMEM_MOVEABLE, 42); ok(halloc != NULL, "got %p (expected != NULL)\n", halloc);

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
79
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 March 2018