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

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

23 Aug '18

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

Józef Kucia : wined3d: Store max point size in d3d_info.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: 95a051b333777ecbb27d38caa94f8d2bdc041a10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95a051b333777ecbb27d38ca… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 23 14:34:04 2018 +0200 wined3d: Store max point size in d3d_info. 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/adapter_gl.c | 2 ++ dlls/wined3d/cs.c | 8 +++----- dlls/wined3d/device.c | 6 ++---- dlls/wined3d/directx.c | 2 +- dlls/wined3d/stateblock.c | 16 ++++++++-------- dlls/wined3d/wined3d_private.h | 5 +++-- 6 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 3a7270f..8c1cce4 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3657,6 +3657,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, adapter->vertex_pipe = select_vertex_implementation(gl_info, adapter->shader_backend); adapter->fragment_pipe = select_fragment_implementation(gl_info, adapter->shader_backend); + d3d_info->limits.pointsize_max = gl_info->limits.pointsize_max; + adapter->shader_backend->shader_get_caps(gl_info, &shader_caps); d3d_info->vs_clipping = shader_caps.wined3d_caps & WINED3D_SHADER_CAP_VS_CLIPPING; d3d_info->limits.vs_version = shader_caps.vs_version; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index d6bc739..7bd51f4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1928,8 +1928,7 @@ static void wined3d_cs_exec_reset_state(struct wined3d_cs *cs, const void *data) state_cleanup(&cs->state); memset(&cs->state, 0, sizeof(cs->state)); - state_init(&cs->state, &cs->fb, &adapter->gl_info, &adapter->d3d_info, - WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); + state_init(&cs->state, &cs->fb, &adapter->d3d_info, WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); } void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) @@ -2795,7 +2794,7 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) { - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; struct wined3d_cs *cs; if (!(cs = heap_alloc_zero(sizeof(*cs)))) @@ -2804,8 +2803,7 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) cs->ops = &wined3d_cs_st_ops; cs->device = device; - state_init(&cs->state, &cs->fb, gl_info, &device->adapter->d3d_info, - WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); + state_init(&cs->state, &cs->fb, d3d_info, WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); cs->data_size = WINED3D_INITIAL_CS_SIZE; if (!(cs->data = heap_alloc(cs->data_size))) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e6e788b..ab67a96 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4922,8 +4922,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_device_delete_opengl_contexts(device); memset(&device->state, 0, sizeof(device->state)); - state_init(&device->state, &device->fb, &device->adapter->gl_info, - &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); + state_init(&device->state, &device->fb, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); device->update_state = &device->state; device_init_swapchain_state(device, swapchain); @@ -5163,8 +5162,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, return hr; } - state_init(&device->state, &device->fb, &adapter->gl_info, - &adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); + state_init(&device->state, &device->fb, &adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); device->update_state = &device->state; device->max_frame_latency = 3; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 984cdbb..774cd48 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2186,7 +2186,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte } caps->MaxAnisotropy = gl_info->limits.anisotropy; - caps->MaxPointSize = gl_info->limits.pointsize_max; + caps->MaxPointSize = d3d_info->limits.pointsize_max; caps->MaxPrimitiveCount = 0x555555; /* Taken from an AMD Radeon HD 5700 (Evergreen) GPU. */ caps->MaxVertexIndex = 0xffffff; /* Taken from an AMD Radeon HD 5700 (Evergreen) GPU. */ diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index b4d1751..45a4008 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1113,21 +1113,22 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) TRACE("Applied stateblock %p.\n", stateblock); } -static void state_init_default(struct wined3d_state *state, const struct wined3d_gl_info *gl_info) +static void state_init_default(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info) { union { struct wined3d_line_pattern lp; DWORD d; } lp; - union { + union + { float f; DWORD d; } tmpfloat; unsigned int i; struct wined3d_matrix identity; - TRACE("state %p, gl_info %p.\n", state, gl_info); + TRACE("state %p, d3d_info %p.\n", state, d3d_info); get_identity_matrix(&identity); state->gl_primitive_type = ~0u; @@ -1222,7 +1223,7 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d tmpfloat.f = 1.0f; state->render_states[WINED3D_RS_PATCHSEGMENTS] = tmpfloat.d; state->render_states[WINED3D_RS_DEBUGMONITORTOKEN] = 0xbaadcafe; - tmpfloat.f = gl_info->limits.pointsize_max; + tmpfloat.f = d3d_info->limits.pointsize_max; state->render_states[WINED3D_RS_POINTSIZE_MAX] = tmpfloat.d; state->render_states[WINED3D_RS_INDEXEDVERTEXBLENDENABLE] = FALSE; state->render_states[WINED3D_RS_COLORWRITEENABLE] = 0x0000000f; @@ -1316,8 +1317,7 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d } void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, - const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, - DWORD flags) + const struct wined3d_d3d_info *d3d_info, DWORD flags) { unsigned int i; @@ -1330,7 +1330,7 @@ void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, } if (flags & WINED3D_STATE_INIT_DEFAULT) - state_init_default(state, gl_info); + state_init_default(state, d3d_info); } static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, @@ -1340,7 +1340,7 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, stateblock->ref = 1; stateblock->device = device; - state_init(&stateblock->state, NULL, &device->adapter->gl_info, d3d_info, 0); + state_init(&stateblock->state, NULL, d3d_info, 0); if (type == WINED3D_SBT_RECORDED) return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f6693a8..de0b486 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -163,6 +163,8 @@ struct wined3d_d3d_limits unsigned int ffp_blend_stages; unsigned int ffp_vertex_blend_matrices; unsigned int active_light_count; + + float pointsize_max; }; typedef void (WINE_GLAPI *wined3d_ffp_attrib_func)(const void *data); @@ -3537,8 +3539,7 @@ void wined3d_state_enable_light(struct wined3d_state *state, const struct wined3 struct wined3d_light_info *wined3d_state_get_light(const struct wined3d_state *state, unsigned int idx) DECLSPEC_HIDDEN; void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, - const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, - DWORD flags) DECLSPEC_HIDDEN; + const struct wined3d_d3d_info *d3d_info, DWORD flags) DECLSPEC_HIDDEN; void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN; enum wined3d_cs_queue_id

1 0

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

23 Aug '18

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

Ken Thomases : winemac: Use fallback implementation for screen dimensions in GetDeviceCaps().
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: f0ad5b5c546d17b281aef13fde996cda08d0c14e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0ad5b5c546d17b281aef13f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Aug 23 14:34:15 2018 -0500 winemac: Use fallback implementation for screen dimensions in GetDeviceCaps(). Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/gdi.c | 39 ++++++--------------------------------- 1 file changed, 6 insertions(+), 33 deletions(-) diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 79dc348..40478fd 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -42,10 +42,6 @@ static inline MACDRV_PDEVICE *get_macdrv_dev(PHYSDEV dev) static CGRect desktop_rect; /* virtual desktop rectangle */ static int horz_size; /* horz. size of screen in millimeters */ static int vert_size; /* vert. size of screen in millimeters */ -static int horz_res; /* width in pixels of screen */ -static int vert_res; /* height in pixels of screen */ -static int desktop_horz_res; /* width in pixels of virtual desktop */ -static int desktop_vert_res; /* height in pixels of virtual desktop */ static int bits_per_pixel; /* pixel depth of screen */ static int device_data_valid; /* do the above variables have up-to-date values? */ @@ -133,9 +129,6 @@ static void device_init(void) { CFStringRef pixelEncoding = CGDisplayModeCopyPixelEncoding(mode); - horz_res = CGDisplayModeGetWidth(mode); - vert_res = CGDisplayModeGetHeight(mode); - if (pixelEncoding) { if (CFEqual(pixelEncoding, CFSTR(IO32BitDirectPixels))) @@ -149,21 +142,8 @@ static void device_init(void) CGDisplayModeRelease(mode); } - else - { - horz_res = CGDisplayPixelsWide(mainDisplay); - vert_res = CGDisplayPixelsHigh(mainDisplay); - } - - if (retina_on) - { - horz_res *= 2; - vert_res *= 2; - } compute_desktop_rect(); - desktop_horz_res = desktop_rect.size.width; - desktop_vert_res = desktop_rect.size.height; device_data_valid = TRUE; } @@ -260,25 +240,18 @@ static INT macdrv_GetDeviceCaps(PHYSDEV dev, INT cap) case VERTSIZE: ret = vert_size; break; - case HORZRES: - ret = horz_res; - break; - case VERTRES: - ret = vert_res; - break; - case DESKTOPHORZRES: - ret = desktop_horz_res; - break; - case DESKTOPVERTRES: - ret = desktop_vert_res; - break; case BITSPIXEL: ret = bits_per_pixel; break; + case HORZRES: + case VERTRES: default: LeaveCriticalSection(&device_data_section); dev = GET_NEXT_PHYSDEV( dev, pGetDeviceCaps ); - return dev->funcs->pGetDeviceCaps( dev, cap ); + ret = dev->funcs->pGetDeviceCaps( dev, cap ); + if ((cap == HORZRES || cap == VERTRES) && retina_on) + ret *= 2; + return ret; } TRACE("cap %d -> %d\n", cap, ret);

1 0

Alexandre Julliard : winex11: Simplify the EnumDisplayMonitors driver entry point.
by Alexandre Julliard 23 Aug '18

23 Aug '18

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 : winex11: Use the stored coordinates to convert back from X11 to window rectangle.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: d7cd441373dfa58073d8eea29eea84af8bbc0b79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7cd441373dfa58073d8eea2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 23 10:50:47 2018 +0200 winex11: Use the stored coordinates to convert back from X11 to window rectangle. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 31 ++++++++------------ dlls/winex11.drv/window.c | 73 ++++++++++++++++------------------------------- dlls/winex11.drv/x11drv.h | 2 +- 3 files changed, 37 insertions(+), 69 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 8fe6b36..606fa69 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1077,17 +1077,13 @@ static BOOL X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) } else pos = root_to_virtual_screen( x, y ); - rect.left = pos.x; - rect.top = pos.y; - rect.right = pos.x + event->width; - rect.bottom = pos.y + event->height; + X11DRV_X_to_window_rect( data, &rect, pos.x, pos.y, event->width, event->height ); + if (root_coords) MapWindowPoints( 0, parent, (POINT *)&rect, 2 ); + TRACE( "win %p/%lx new X rect %d,%d,%dx%d (event %d,%d,%dx%d)\n", hwnd, data->whole_window, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, event->x, event->y, event->width, event->height ); - X11DRV_X_to_window_rect( data, &rect ); - if (root_coords) MapWindowPoints( 0, parent, (POINT *)&rect, 2 ); - /* Compare what has changed */ x = rect.left; @@ -1155,7 +1151,8 @@ static BOOL X11DRV_GravityNotify( HWND hwnd, XEvent *xev ) { XGravityEvent *event = &xev->xgravity; struct x11drv_win_data *data = get_win_data( hwnd ); - RECT rect, window_rect; + RECT window_rect; + int x, y; if (!data) return FALSE; @@ -1165,22 +1162,18 @@ static BOOL X11DRV_GravityNotify( HWND hwnd, XEvent *xev ) return FALSE; } - rect.left = event->x; - rect.top = event->y; - rect.right = rect.left + data->whole_rect.right - data->whole_rect.left; - rect.bottom = rect.top + data->whole_rect.bottom - data->whole_rect.top; + x = event->x + data->window_rect.left - data->whole_rect.left; + y = event->y + data->window_rect.top - data->whole_rect.top; - TRACE( "win %p/%lx new X rect %d,%d,%dx%d (event %d,%d)\n", - hwnd, data->whole_window, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, - event->x, event->y ); + TRACE( "win %p/%lx new X pos %d,%d (event %d,%d)\n", + hwnd, data->whole_window, x, y, event->x, event->y ); - X11DRV_X_to_window_rect( data, &rect ); window_rect = data->window_rect; release_win_data( data ); - if (window_rect.left != rect.left || window_rect.top != rect.top) - SetWindowPos( hwnd, 0, rect.left, rect.top, 0, 0, - SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOCOPYBITS ); + if (window_rect.left != x || window_rect.top != y) + SetWindowPos( hwnd, 0, x, y, 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOCOPYBITS ); + return TRUE; } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 24c9429..0a4f118 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -306,33 +306,6 @@ static unsigned long get_mwm_decorations( struct x11drv_win_data *data, /*********************************************************************** - * get_x11_rect_offset - * - * Helper for X11DRV_window_to_X_rect and X11DRV_X_to_window_rect. - */ -static void get_x11_rect_offset( struct x11drv_win_data *data, RECT *rect ) -{ - DWORD style, ex_style, style_mask = 0, ex_style_mask = 0; - unsigned long decor; - - rect->top = rect->bottom = rect->left = rect->right = 0; - - style = GetWindowLongW( data->hwnd, GWL_STYLE ); - ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); - decor = get_mwm_decorations( data, style, ex_style ); - - if (decor & MWM_DECOR_TITLE) style_mask |= WS_CAPTION; - if (decor & MWM_DECOR_BORDER) - { - style_mask |= WS_DLGFRAME | WS_THICKFRAME; - ex_style_mask |= WS_EX_DLGMODALFRAME; - } - - AdjustWindowRectEx( rect, style & style_mask, FALSE, ex_style & ex_style_mask ); -} - - -/*********************************************************************** * get_window_attributes * * Fill the window attributes structure for an X window. @@ -1185,12 +1158,26 @@ void make_window_embedded( struct x11drv_win_data *data ) */ static void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect ) { + DWORD style, ex_style, style_mask = 0, ex_style_mask = 0; + unsigned long decor; RECT rc; if (!data->managed) return; if (IsRectEmpty( rect )) return; - get_x11_rect_offset( data, &rc ); + style = GetWindowLongW( data->hwnd, GWL_STYLE ); + ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); + decor = get_mwm_decorations( data, style, ex_style ); + + if (decor & MWM_DECOR_TITLE) style_mask |= WS_CAPTION; + if (decor & MWM_DECOR_BORDER) + { + style_mask |= WS_DLGFRAME | WS_THICKFRAME; + ex_style_mask |= WS_EX_DLGMODALFRAME; + } + + SetRectEmpty( &rc ); + AdjustWindowRectEx( &rc, style & style_mask, FALSE, ex_style & ex_style_mask ); rect->left -= rc.left; rect->right -= rc.right; @@ -1206,21 +1193,15 @@ static void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect ) * * Opposite of X11DRV_window_to_X_rect */ -void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect ) +void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect, int x, int y, int cx, int cy ) { - RECT rc; - - if (!data->managed) return; - if (IsRectEmpty( rect )) return; - - get_x11_rect_offset( data, &rc ); - - rect->left += rc.left; - rect->right += rc.right; - rect->top += rc.top; - rect->bottom += rc.bottom; - if (rect->top >= rect->bottom) rect->bottom = rect->top + 1; - if (rect->left >= rect->right) rect->right = rect->left + 1; + x += data->window_rect.left - data->whole_rect.left; + y += data->window_rect.top - data->whole_rect.top; + cx += (data->window_rect.right - data->window_rect.left) - + (data->whole_rect.right - data->whole_rect.left); + cy += (data->window_rect.bottom - data->window_rect.top) - + (data->whole_rect.bottom - data->whole_rect.top); + SetRect( rect, x, y, x + cx, y + cy ); } @@ -1531,8 +1512,6 @@ static void create_whole_window( struct x11drv_win_data *data ) mask = get_window_attributes( data, &attr ); - data->whole_rect = data->window_rect; - X11DRV_window_to_X_rect( data, &data->whole_rect ); if (!(cx = data->whole_rect.right - data->whole_rect.left)) cx = 1; else if (cx > 65535) cx = 65535; if (!(cy = data->whole_rect.bottom - data->whole_rect.top)) cy = 1; @@ -2517,11 +2496,7 @@ UINT CDECL X11DRV_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) &root, &x, &y, &width, &height, &border, &depth ); XTranslateCoordinates( thread_data->display, data->whole_window, root, 0, 0, &x, &y, &top ); pos = root_to_virtual_screen( x, y ); - rect->left = pos.x; - rect->top = pos.y; - rect->right = pos.x + width; - rect->bottom = pos.y + height; - X11DRV_X_to_window_rect( data, rect ); + X11DRV_X_to_window_rect( data, rect, pos.x, pos.y, width, height ); swp &= ~(SWP_NOMOVE | SWP_NOCLIENTMOVE | SWP_NOSIZE | SWP_NOCLIENTSIZE); done: diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 939c2e7..a0308b0 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -633,7 +633,7 @@ typedef int (*x11drv_error_callback)( Display *display, XErrorEvent *event, void extern void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void *arg ) DECLSPEC_HIDDEN; extern int X11DRV_check_error(void) DECLSPEC_HIDDEN; -extern void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect ) DECLSPEC_HIDDEN; +extern void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect, int x, int y, int cx, int cy ) DECLSPEC_HIDDEN; extern POINT virtual_screen_to_root( INT x, INT y ) DECLSPEC_HIDDEN; extern POINT root_to_virtual_screen( INT x, INT y ) DECLSPEC_HIDDEN; extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN;

1 0

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

23 Aug '18

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 : wineandroid: Add support for scaling window contents based on DPI.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: e658c73aed7e904dfae932a1bde7f2c41f312bfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e658c73aed7e904dfae932a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 23 11:11:30 2018 +0200 wineandroid: Add support for scaling window contents based on DPI. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 43 ++++++++++++++++++++++++---------- dlls/wineandroid.drv/android.h | 4 ++-- dlls/wineandroid.drv/device.c | 16 ++++++++----- dlls/wineandroid.drv/opengl.c | 2 +- dlls/wineandroid.drv/window.c | 20 ++++++++++++++-- 5 files changed, 62 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e658c73aed7e904dfae9…

1 0

Alexandre Julliard : user32: Scale initial window dimensions in CreateWindow() based on DPI awareness.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: 110443acef21dcc4639eb34ae5738444fb271562 URL: https://source.winehq.org/git/wine.git/?a=commit;h=110443acef21dcc4639eb34a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 23 12:13:02 2018 +0200 user32: Scale initial window dimensions in CreateWindow() based on DPI awareness. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 13 +++++++++++++ dlls/user32/win.c | 44 +++++++++++++++++++++++++++++++++++++++----- dlls/user32/win.h | 1 + 3 files changed, 53 insertions(+), 5 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 149b483..10f90a2 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3209,6 +3209,19 @@ UINT get_win_monitor_dpi( HWND hwnd ) } /********************************************************************** + * get_thread_dpi + */ +UINT get_thread_dpi(void) +{ + switch (GetAwarenessFromDpiAwarenessContext( GetThreadDpiAwarenessContext() )) + { + case DPI_AWARENESS_UNAWARE: return USER_DEFAULT_SCREEN_DPI; + case DPI_AWARENESS_SYSTEM_AWARE: return system_dpi; + default: return 0; /* no scaling */ + } +} + +/********************************************************************** * SetProcessDpiAwarenessContext (USER32.@) */ BOOL WINAPI SetProcessDpiAwarenessContext( DPI_AWARENESS_CONTEXT context ) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index cbfd8bb..c7a3b06 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1305,6 +1305,25 @@ static void dump_window_styles( DWORD style, DWORD exstyle ) #undef DUMPED_EX_STYLES } +/*********************************************************************** + * map_dpi_create_struct + */ +static void map_dpi_create_struct( CREATESTRUCTW *cs, UINT dpi_from, UINT dpi_to ) +{ + if (!dpi_from && !dpi_to) return; + if (!dpi_from || !dpi_to) + { + POINT pt = { cs->x, cs->y }; + UINT mon_dpi = get_monitor_dpi( MonitorFromPoint( pt, MONITOR_DEFAULTTONEAREST )); + if (!dpi_from) dpi_from = mon_dpi; + else dpi_to = mon_dpi; + } + if (dpi_from == dpi_to) return; + cs->x = MulDiv( cs->x, dpi_to, dpi_from ); + cs->y = MulDiv( cs->y, dpi_to, dpi_from ); + cs->cx = MulDiv( cs->cx, dpi_to, dpi_from ); + cs->cy = MulDiv( cs->cy, dpi_to, dpi_from ); +} /*********************************************************************** * WIN_CreateWindowEx @@ -1319,6 +1338,8 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, WND *wndPtr; HWND hwnd, parent, owner, top_child = 0; const WCHAR *p = className; + UINT win_dpi, thread_dpi = get_thread_dpi(); + DPI_AWARENESS_CONTEXT context; MDICREATESTRUCTW mdi_cs; CBT_CREATEWNDW cbtc; CREATESTRUCTW cbcs; @@ -1550,6 +1571,14 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, } else SetWindowLongPtrW( hwnd, GWLP_ID, (ULONG_PTR)cs->hMenu ); + style = wndPtr->dwStyle; + win_dpi = wndPtr->dpi; + WIN_ReleasePtr( wndPtr ); + + if (parent) map_dpi_create_struct( cs, thread_dpi, win_dpi ); + + context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); + /* call the WH_CBT hook */ /* the window style passed to the hook must be the real window style, @@ -1557,10 +1586,9 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, * passed in, so we have to copy the original CREATESTRUCT and get the * the real style. */ cbcs = *cs; - cbcs.style = wndPtr->dwStyle; + cbcs.style = style; cbtc.lpcs = &cbcs; cbtc.hwndInsertAfter = HWND_TOP; - WIN_ReleasePtr( wndPtr ); if (HOOK_CallHooks( WH_CBT, HCBT_CREATEWND, (WPARAM)hwnd, (LPARAM)&cbtc, unicode )) goto failed; /* send the WM_GETMINMAXINFO message and fix the size if needed */ @@ -1584,7 +1612,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, /* send WM_NCCREATE */ - TRACE( "hwnd %p cs %d,%d %dx%d\n", hwnd, cs->x, cs->y, cx, cy ); + TRACE( "hwnd %p cs %d,%d %dx%d %s\n", hwnd, cs->x, cs->y, cs->cx, cs->cy, wine_dbgstr_rect(&rect) ); if (unicode) result = SendMessageW( hwnd, WM_NCCREATE, 0, (LPARAM)cs ); else @@ -1618,7 +1646,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, MapWindowPoints( 0, parent, (POINT *)&client_rect, 2 ); set_window_pos( hwnd, insert_after, SWP_NOACTIVATE, &rect, &client_rect, NULL ); } - else return 0; + else goto failed; /* send WM_CREATE */ @@ -1662,7 +1690,11 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, /* Notify the parent window only */ send_parent_notify( hwnd, WM_CREATE ); - if (!IsWindow( hwnd )) return 0; + if (!IsWindow( hwnd )) + { + SetThreadDpiAwarenessContext( context ); + return 0; + } if (parent == GetDesktopWindow()) PostMessageW( parent, WM_PARENTNOTIFY, WM_CREATE, (LPARAM)hwnd ); @@ -1689,10 +1721,12 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, HOOK_CallHooks( WH_SHELL, HSHELL_WINDOWCREATED, (WPARAM)hwnd, 0, TRUE ); TRACE("created window %p\n", hwnd); + SetThreadDpiAwarenessContext( context ); return hwnd; failed: WIN_DestroyWindow( hwnd ); + SetThreadDpiAwarenessContext( context ); return 0; } diff --git a/dlls/user32/win.h b/dlls/user32/win.h index b6c162a..f9e11ff 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -130,6 +130,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 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

Alexandre Julliard : user32: Scale window dimensions in SetWindowPos() based on DPI awareness.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: 4233caa7b89014ef20baf4667c1f8c5ee5273c21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4233caa7b89014ef20baf466… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 23 12:16:48 2018 +0200 user32: Scale window dimensions in SetWindowPos() based on DPI awareness. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 44 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index ed3c105..04c1c0c 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1643,6 +1643,23 @@ static void dump_winpos_flags(UINT flags) TRACE("\n"); } + +/*********************************************************************** + * map_dpi_winpos + */ +static void map_dpi_winpos( WINDOWPOS *winpos ) +{ + UINT dpi_from = get_thread_dpi(); + UINT dpi_to = GetDpiForWindow( winpos->hwnd ); + + if (!dpi_from) dpi_from = get_win_monitor_dpi( winpos->hwnd ); + if (dpi_from == dpi_to) return; + winpos->x = MulDiv( winpos->x, dpi_to, dpi_from ); + winpos->y = MulDiv( winpos->y, dpi_to, dpi_from ); + winpos->cx = MulDiv( winpos->cx, dpi_to, dpi_from ); + winpos->cy = MulDiv( winpos->cy, dpi_to, dpi_from ); +} + /*********************************************************************** * SWP_DoWinPosChanging */ @@ -1691,10 +1708,9 @@ static BOOL SWP_DoWinPosChanging( WINDOWPOS *pWinpos, RECT *old_window_rect, REC } pWinpos->flags |= SWP_NOCLIENTMOVE | SWP_NOCLIENTSIZE; - TRACE( "hwnd %p, after %p, swp %d,%d %dx%d flags %08x\n", + TRACE( "hwnd %p, after %p, swp %d,%d %dx%d flags %08x current %s style %08x new %s\n", pWinpos->hwnd, pWinpos->hwndInsertAfter, pWinpos->x, pWinpos->y, - pWinpos->cx, pWinpos->cy, pWinpos->flags ); - TRACE( "current %s style %08x new %s\n", + pWinpos->cx, pWinpos->cy, pWinpos->flags, wine_dbgstr_rect( old_window_rect ), wndPtr->dwStyle, wine_dbgstr_rect( new_window_rect )); @@ -2216,7 +2232,9 @@ BOOL USER_SetWindowPos( WINDOWPOS * winpos, int parent_x, int parent_y ) { RECT old_window_rect, old_client_rect, new_window_rect, new_client_rect, valid_rects[2]; UINT orig_flags; - + BOOL ret = FALSE; + DPI_AWARENESS_CONTEXT context; + orig_flags = winpos->flags; /* First, check z-order arguments. */ @@ -2256,11 +2274,13 @@ BOOL USER_SetWindowPos( WINDOWPOS * winpos, int parent_x, int parent_y ) else if (winpos->cy > 32767) winpos->cy = 32767; } + context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( winpos->hwnd )); + if (!SWP_DoWinPosChanging( winpos, &old_window_rect, &old_client_rect, - &new_window_rect, &new_client_rect )) return FALSE; + &new_window_rect, &new_client_rect )) goto done; /* Fix redundant flags */ - if (!fixup_flags( winpos, &old_window_rect, parent_x, parent_y )) return FALSE; + if (!fixup_flags( winpos, &old_window_rect, parent_x, parent_y )) goto done; if((winpos->flags & (SWP_NOZORDER | SWP_HIDEWINDOW | SWP_SHOWWINDOW)) != SWP_NOZORDER) { @@ -2275,8 +2295,7 @@ BOOL USER_SetWindowPos( WINDOWPOS * winpos, int parent_x, int parent_y ) if (!set_window_pos( winpos->hwnd, winpos->hwndInsertAfter, winpos->flags, &new_window_rect, &new_client_rect, valid_rects )) - return FALSE; - + goto done; if( winpos->flags & SWP_HIDEWINDOW ) @@ -2329,7 +2348,10 @@ BOOL USER_SetWindowPos( WINDOWPOS * winpos, int parent_x, int parent_y ) winpos->cy = new_window_rect.bottom - new_window_rect.top; SendMessageW( winpos->hwnd, WM_WINDOWPOSCHANGED, 0, (LPARAM)winpos ); } - return TRUE; + ret = TRUE; +done: + SetThreadDpiAwarenessContext( context ); + return ret; } /*********************************************************************** @@ -2357,7 +2379,9 @@ BOOL WINAPI SetWindowPos( HWND hwnd, HWND hwndInsertAfter, winpos.cx = cx; winpos.cy = cy; winpos.flags = flags; - + + map_dpi_winpos( &winpos ); + if (WIN_IsCurrentThread( hwnd )) return USER_SetWindowPos( &winpos, 0, 0 );

1 0