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

Francois Gouget : include: Fix the name of a Wininet error code.
by Alexandre Julliard Aug. 23, 2018

Aug. 23, 2018

Module: wine Branch: master Commit: d5f4e0402d5bd98d5cbe65a32697f2bf9605da67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5f4e0402d5bd98d5cbe65a3… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 23 16:44:27 2018 +0200 include: Fix the name of a Wininet error code. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winerror.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winerror.h b/include/winerror.h index 886182f..6193c24 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -3042,7 +3042,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define WININET_E_CONNECTION_ABORTED _HRESULT_TYPEDEF_(0x80072efe) #define WININET_E_CONNECTION_RESET _HRESULT_TYPEDEF_(0x80072eff) #define WININET_E_FORCE_RETRY _HRESULT_TYPEDEF_(0x80072f00) -#define WININET_E_INVALID_PROXY_REQUREST _HRESULT_TYPEDEF_(0x80072f01) +#define WININET_E_INVALID_PROXY_REQUEST _HRESULT_TYPEDEF_(0x80072f01) #define WININET_E_NEED_UI _HRESULT_TYPEDEF_(0x80072f02) #define WININET_E_HANDLE_EXISTS _HRESULT_TYPEDEF_(0x80072f04) #define WININET_E_SEC_CERT_DATE_INVALID _HRESULT_TYPEDEF_(0x80072f05)

1 0

Józef Kucia : wined3d: Pass wined3d_adapter to wined3d_get_format().
by Alexandre Julliard Aug. 23, 2018

Aug. 23, 2018

Module: wine Branch: master Commit: 93204241051078c1d43b02f72b8589619cd6f1e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93204241051078c1d43b02f7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 23 14:34:03 2018 +0200 wined3d: Pass wined3d_adapter to wined3d_get_format(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/context.c | 10 +++++----- dlls/wined3d/directx.c | 33 ++++++++++++++++++--------------- dlls/wined3d/resource.c | 10 +++++----- dlls/wined3d/surface.c | 2 +- dlls/wined3d/swapchain.c | 12 +++++++----- dlls/wined3d/texture.c | 27 +++++++++++++++------------ dlls/wined3d/utils.c | 3 ++- dlls/wined3d/vertexdeclaration.c | 22 ++++++++++++---------- dlls/wined3d/view.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 6 +++--- 11 files changed, 73 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=93204241051078c1d43b…

1 0

Nikolay Sivov : d2d1/tests: Check implicit target bitmap options.
by Alexandre Julliard Aug. 23, 2018

Aug. 23, 2018

Module: wine Branch: master Commit: 68075cf7fb0cd13e74b85fc22e8986978d3776ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=68075cf7fb0cd13e74b85fc2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 23 19:50:13 2018 +0300 d2d1/tests: Check implicit target bitmap options. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 20478e5..8e58eef 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -6767,6 +6767,7 @@ static void test_device_context(void) ID2D1DeviceContext *device_context; IDXGISurface *surface, *surface2; ID2D1Device *device, *device2; + D2D1_BITMAP_OPTIONS options; ID2D1DCRenderTarget *dc_rt; ID3D10Device1 *d3d_device; IDXGISwapChain *swapchain; @@ -6834,6 +6835,9 @@ if (SUCCEEDED(hr)) hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&device_context); ok(SUCCEEDED(hr), "Failed to get device context interface, hr %#x.\n", hr); ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); + options = ID2D1Bitmap1_GetOptions(bitmap); + ok(options == (D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW), + "Unexpected bitmap options %#x.\n", options); hr = ID2D1Bitmap1_GetSurface(bitmap, &surface2); ok(SUCCEEDED(hr), "Failed to get bitmap surface, hr %#x.\n", hr); ok(surface2 == surface, "Unexpected surface instance.\n"); @@ -6880,8 +6884,11 @@ if (SUCCEEDED(hr)) hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&device_context); ok(SUCCEEDED(hr), "Failed to get device context interface, hr %#x.\n", hr); ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); + options = ID2D1Bitmap1_GetOptions(bitmap); + ok(options == (D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW), + "Unexpected bitmap options %#x.\n", options); hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); - ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); ID2D1Bitmap1_Release(bitmap); ID2D1DeviceContext_SetTarget(device_context, NULL); @@ -6907,8 +6914,11 @@ if (SUCCEEDED(hr)) hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&device_context); ok(SUCCEEDED(hr), "Failed to get device context interface, hr %#x.\n", hr); ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); + options = ID2D1Bitmap1_GetOptions(bitmap); + ok(options == (D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW), + "Unexpected bitmap options %#x.\n", options); hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); - ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + ok(hr == D2DERR_INVALID_CALL, "Unexpected hr %#x.\n", hr); ID2D1Bitmap1_Release(bitmap); ID2D1DeviceContext_SetTarget(device_context, NULL); @@ -6938,8 +6948,11 @@ if (SUCCEEDED(hr)) ok(SUCCEEDED(hr), "BindDC() failed, hr %#x.\n", hr); ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); + options = ID2D1Bitmap1_GetOptions(bitmap); + ok(options == (D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE), + "Unexpected bitmap options %#x.\n", options); hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); - ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + ok(hr == D2DERR_INVALID_CALL, "Unexpected hr %#x.\n", hr); ID2D1Bitmap1_Release(bitmap); ID2D1DeviceContext_SetTarget(device_context, NULL);

1 0

Francois Gouget : ntdll/tests: Spelling fixes in comments.
by Alexandre Julliard Aug. 23, 2018

Aug. 23, 2018

Module: wine Branch: master Commit: f466fb4e53770dc03310669de2b529463daee96e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f466fb4e53770dc03310669d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 23 16:44:20 2018 +0200 ntdll/tests: Spelling fixes in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 07fa1cd..5fe72ec 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -1458,9 +1458,9 @@ static const struct NTSTATUS res; int terminator_offset; int ip[8]; - /* win_broken: older versions of windows do not handle this correct + /* win_broken: older versions of windows do not handle this correctly ex_fail: Ex function does need the string to be terminated, non-Ex does not. - ex_skip: test doesnt make sense for Ex (f.e. it's invalid for non-Ex but valid for Ex) */ + ex_skip: test doesn't make sense for Ex (f.e. it's invalid for non-Ex but valid for Ex) */ enum { normal_6, win_broken_6 = 1, ex_fail_6 = 2, ex_skip_6 = 4 } flags; } ipv6_tests[] = { @@ -2284,7 +2284,7 @@ static void test_RtlIpv6StringToAddressEx(void) /* sanity check */ ok(sizeof(ip) == sizeof(USHORT)* 8, "sizeof(ip)\n"); - /* first we run all ip related tests, to make sure someone didnt accidentally reimplement instead of re-use. */ + /* first we run all ip related tests, to make sure someone didn't accidentally reimplement instead of re-use. */ for (i = 0; i < ARRAY_SIZE(ipv6_tests); i++) { ULONG scope = 0xbadf00d;

1 0

Alexandre Julliard : winex11: Simplify the EnumDisplayMonitors driver entry point.
by Alexandre Julliard Aug. 23, 2018

Aug. 23, 2018

Module: wine Branch: master Commit: 341192289b0c22bcdfd70af827b9a11cff555836 URL: https://source.winehq.org/git/wine.git/?a=commit;h=341192289b0c22bcdfd70af8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 23 10:53:27 2018 +0200 winex11: Simplify the EnumDisplayMonitors driver entry point. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xinerama.c | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 0419535..739b139 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -267,34 +267,8 @@ BOOL CDECL X11DRV_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC pro { int i; - if (hdc) - { - POINT origin; - RECT limit; - - if (!GetDCOrgEx( hdc, &origin )) return FALSE; - if (GetClipBox( hdc, &limit ) == ERROR) return FALSE; - - if (rect && !IntersectRect( &limit, &limit, rect )) return TRUE; + for (i = 0; i < nb_monitors; i++) + if (!proc( index_to_monitor(i), 0, &monitors[i].rcMonitor, lp )) return FALSE; - for (i = 0; i < nb_monitors; i++) - { - RECT monrect = monitors[i].rcMonitor; - OffsetRect( &monrect, -origin.x, -origin.y ); - if (IntersectRect( &monrect, &monrect, &limit )) - if (!proc( index_to_monitor(i), hdc, &monrect, lp )) - return FALSE; - } - } - else - { - for (i = 0; i < nb_monitors; i++) - { - RECT unused; - if (!rect || IntersectRect( &unused, &monitors[i].rcMonitor, rect )) - if (!proc( index_to_monitor(i), 0, &monitors[i].rcMonitor, lp )) - return FALSE; - } - } return TRUE; }

1 0

Alexandre Julliard : wineandroid: Handle sizing and mouse events in physical coordinates.
by Alexandre Julliard Aug. 23, 2018

Aug. 23, 2018

Module: wine Branch: master Commit: 240edd3fa3c341e280dbcd09c7d87df57440f390 URL: https://source.winehq.org/git/wine.git/?a=commit;h=240edd3fa3c341e280dbcd09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 23 11:10:32 2018 +0200 wineandroid: Handle sizing and mouse events in physical coordinates. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/window.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index aff687b..23b9c25 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -408,6 +408,7 @@ static void pull_events(void) */ static int process_events( DWORD mask ) { + DPI_AWARENESS_CONTEXT context; struct java_event *event, *next, *previous; unsigned int count = 0; @@ -448,11 +449,13 @@ static int process_events( DWORD mask ) { case DESKTOP_CHANGED: TRACE( "DESKTOP_CHANGED %ux%u\n", event->data.desktop.width, event->data.desktop.height ); + context = SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); screen_width = event->data.desktop.width; screen_height = event->data.desktop.height; init_monitors( screen_width, screen_height ); SetWindowPos( GetDesktopWindow(), 0, 0, 0, screen_width, screen_height, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW ); + SetThreadDpiAwarenessContext( context ); break; case CONFIG_CHANGED: @@ -472,6 +475,7 @@ static int process_events( DWORD mask ) { HWND capture = get_capture_window(); + context = SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); if (event->data.motion.input.u.mi.dwFlags & (MOUSEEVENTF_LEFTDOWN|MOUSEEVENTF_RIGHTDOWN|MOUSEEVENTF_MIDDLEDOWN)) TRACE( "BUTTONDOWN pos %d,%d hwnd %p flags %x\n", event->data.motion.input.u.mi.dx, event->data.motion.input.u.mi.dy, @@ -503,6 +507,7 @@ static int process_events( DWORD mask ) SERVER_END_REQ; } __wine_send_input( capture ? capture : event->data.motion.hwnd, &event->data.motion.input ); + SetThreadDpiAwarenessContext( context ); } break;

1 0

Alexandre Julliard : user32: Scale window dimensions in DeferWindowPos() based on DPI awareness.
by Alexandre Julliard Aug. 23, 2018

Aug. 23, 2018

Module: wine Branch: master Commit: 7068a856042b53d9f0aad51e5a0ad6af0b7159bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=7068a856042b53d9f0aad51e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 23 12:17:06 2018 +0200 user32: Scale window dimensions in DeferWindowPos() based on DPI awareness. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 04c1c0c..e26dc6e 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2435,17 +2435,26 @@ HDWP WINAPI DeferWindowPos( HDWP hdwp, HWND hwnd, HWND hwndAfter, DWP *pDWP; int i; HDWP retvalue = hdwp; + WINDOWPOS winpos; TRACE("hdwp %p, hwnd %p, after %p, %d,%d (%dx%d), flags %08x\n", hdwp, hwnd, hwndAfter, x, y, cx, cy, flags); - hwnd = WIN_GetFullHandle( hwnd ); - if (is_desktop_window( hwnd ) || !IsWindow( hwnd )) + winpos.hwnd = WIN_GetFullHandle( hwnd ); + if (is_desktop_window( winpos.hwnd ) || !IsWindow( winpos.hwnd )) { SetLastError( ERROR_INVALID_WINDOW_HANDLE ); return 0; } + winpos.hwndInsertAfter = WIN_GetFullHandle(hwndAfter); + winpos.flags = flags; + winpos.x = x; + winpos.y = y; + winpos.cx = cx; + winpos.cy = cy; + map_dpi_winpos( &winpos ); + if (!(pDWP = get_user_handle_ptr( hdwp, USER_DWP ))) return 0; if (pDWP == OBJ_OTHER_PROCESS) { @@ -2455,22 +2464,22 @@ HDWP WINAPI DeferWindowPos( HDWP hdwp, HWND hwnd, HWND hwndAfter, for (i = 0; i < pDWP->actualCount; i++) { - if (pDWP->winPos[i].hwnd == hwnd) + if (pDWP->winPos[i].hwnd == winpos.hwnd) { /* Merge with the other changes */ if (!(flags & SWP_NOZORDER)) { - pDWP->winPos[i].hwndInsertAfter = WIN_GetFullHandle(hwndAfter); + pDWP->winPos[i].hwndInsertAfter = winpos.hwndInsertAfter; } if (!(flags & SWP_NOMOVE)) { - pDWP->winPos[i].x = x; - pDWP->winPos[i].y = y; + pDWP->winPos[i].x = winpos.x; + pDWP->winPos[i].y = winpos.y; } if (!(flags & SWP_NOSIZE)) { - pDWP->winPos[i].cx = cx; - pDWP->winPos[i].cy = cy; + pDWP->winPos[i].cx = winpos.cx; + pDWP->winPos[i].cy = winpos.cy; } pDWP->winPos[i].flags &= flags | ~(SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW | @@ -2493,14 +2502,7 @@ HDWP WINAPI DeferWindowPos( HDWP hdwp, HWND hwnd, HWND hwndAfter, pDWP->suggestedCount *= 2; pDWP->winPos = newpos; } - pDWP->winPos[pDWP->actualCount].hwnd = hwnd; - pDWP->winPos[pDWP->actualCount].hwndInsertAfter = hwndAfter; - pDWP->winPos[pDWP->actualCount].x = x; - pDWP->winPos[pDWP->actualCount].y = y; - pDWP->winPos[pDWP->actualCount].cx = cx; - pDWP->winPos[pDWP->actualCount].cy = cy; - pDWP->winPos[pDWP->actualCount].flags = flags; - pDWP->actualCount++; + pDWP->winPos[pDWP->actualCount++] = winpos; END: release_user_handle_ptr( pDWP ); return retvalue;

1 0

Alexandre Julliard : user32: Scale monitor rectangles based on DPI awareness.
by Alexandre Julliard Aug. 23, 2018

Aug. 23, 2018

Module: wine Branch: master Commit: 92f5c6e410fe0dbcbfa4aae708e7afd9564efb21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92f5c6e410fe0dbcbfa4aae7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 23 12:23:47 2018 +0200 user32: Scale monitor rectangles based on DPI awareness. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 26 +++++++++++++++++++++++++- dlls/user32/win.h | 1 + 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 10f90a2..b6679c5 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3222,6 +3222,21 @@ UINT get_thread_dpi(void) } /********************************************************************** + * map_dpi_rect + */ +RECT map_dpi_rect( RECT rect, UINT dpi_from, UINT dpi_to ) +{ + if (dpi_from && dpi_to && dpi_from != dpi_to) + { + rect.left = MulDiv( rect.left, dpi_to, dpi_from ); + rect.top = MulDiv( rect.top, dpi_to, dpi_from ); + rect.right = MulDiv( rect.right, dpi_to, dpi_from ); + rect.bottom = MulDiv( rect.bottom, dpi_to, dpi_from ); + } + return rect; +} + +/********************************************************************** * SetProcessDpiAwarenessContext (USER32.@) */ BOOL WINAPI SetProcessDpiAwarenessContext( DPI_AWARENESS_CONTEXT context ) @@ -3586,13 +3601,22 @@ BOOL WINAPI GetMonitorInfoA( HMONITOR monitor, LPMONITORINFO info ) BOOL WINAPI GetMonitorInfoW( HMONITOR monitor, LPMONITORINFO info ) { BOOL ret; + UINT dpi_from, dpi_to; if (info->cbSize != sizeof(MONITORINFOEXW) && info->cbSize != sizeof(MONITORINFO)) return FALSE; ret = USER_Driver->pGetMonitorInfo( monitor, info ); if (ret) + { + if ((dpi_to = get_thread_dpi())) + { + dpi_from = get_monitor_dpi( monitor ); + info->rcMonitor = map_dpi_rect( info->rcMonitor, dpi_from, dpi_to ); + info->rcWork = map_dpi_rect( info->rcWork, dpi_from, dpi_to ); + } TRACE( "flags %04x, monitor %s, work %s\n", info->dwFlags, wine_dbgstr_rect(&info->rcMonitor), wine_dbgstr_rect(&info->rcWork)); + } return ret; } @@ -3634,7 +3658,7 @@ __ASM_GLOBAL_FUNC( enum_mon_callback_wrapper, static BOOL CALLBACK enum_mon_callback( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) { struct enum_mon_data *data = (struct enum_mon_data *)lp; - RECT monrect = *rect; + RECT monrect = map_dpi_rect( *rect, get_monitor_dpi( monitor ), get_thread_dpi() ); OffsetRect( &monrect, -data->origin.x, -data->origin.y ); if (!IntersectRect( &monrect, &monrect, &data->limit )) return TRUE; diff --git a/dlls/user32/win.h b/dlls/user32/win.h index f9e11ff..226e3e9 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -131,6 +131,7 @@ extern void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) DECLSPEC_HIDDE extern UINT get_monitor_dpi( HMONITOR monitor ) DECLSPEC_HIDDEN; extern UINT get_win_monitor_dpi( HWND hwnd ) DECLSPEC_HIDDEN; extern UINT get_thread_dpi(void) DECLSPEC_HIDDEN; +extern RECT map_dpi_rect( RECT rect, UINT dpi_from, UINT dpi_to ) DECLSPEC_HIDDEN; extern BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, const RECT *window_rect, const RECT *client_rect, const RECT *valid_rects ) DECLSPEC_HIDDEN;

1 0

Gabriel Ivăncescu : comctl32/edit: Move common calls outside the blocks.
by Alexandre Julliard Aug. 23, 2018

Aug. 23, 2018

Module: wine Branch: master Commit: 69ae3898c94b394ffb977fbc0468da382b453d89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69ae3898c94b394ffb977fbc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Aug 23 13:55:03 2018 +0300 comctl32/edit: Move common calls outside the blocks. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 10ff5fb..f0180ad 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -3308,22 +3308,17 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) else EDIT_WM_Clear(es); } else { - if (shift) { + EDIT_EM_SetSel(es, ~0u, 0, FALSE); + if (shift) /* delete character left of caret */ - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); EDIT_MoveBackward(es, TRUE); - EDIT_WM_Clear(es); - } else if (control) { + else if (control) /* delete to end of line */ - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); EDIT_MoveEnd(es, TRUE, FALSE); - EDIT_WM_Clear(es); - } else { + else /* delete character right of caret */ - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); EDIT_MoveForward(es, TRUE); - EDIT_WM_Clear(es); - } + EDIT_WM_Clear(es); } } break;

1 0

Alexandre Julliard : shell32: Fix some resources ids.
by Alexandre Julliard Aug. 23, 2018

Aug. 23, 2018

Module: wine Branch: master Commit: 86825b92c2c8f9535d2aedfe9afb6bd766ddfa6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=86825b92c2c8f9535d2aedfe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 23 12:41:55 2018 +0200 shell32: Fix some resources ids. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 86ae802..28d18ec 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -518,7 +518,7 @@ IDI_SHELL_FULL_RECYCLE_BIN ICON resources/trash_full.ico /* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ -IDI_MODEM_FOLDER ICON resources/folder.ico +IDI_SHELL_MODEM_FOLDER ICON resources/folder.ico /* @makedep: resources/desktop.ico */ IDI_SHELL_DESKTOP ICON resources/desktop.ico @@ -528,15 +528,15 @@ IDI_SHELL_CONTROL_PANEL ICON resources/control.ico /* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ -IDI_APP_FOLDER ICON resources/folder.ico +IDI_SHELL_APP_FOLDER ICON resources/folder.ico /* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ -IDI_PRINTERS_FOLDER ICON resources/folder.ico +IDI_SHELL_PRINTERS_FOLDER ICON resources/folder.ico /* FIXME: Following resource is not yet added */ /* @makedep: resources/folder.ico */ -IDI_FONTS_FOLDER ICON resources/folder.ico +IDI_SHELL_FONTS_FOLDER ICON resources/folder.ico /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico

1 0