November 2012 - Wine-commits

Henri Verbeet : ddraw: Avoid LPDIRECT3DDEVICE7.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: a24d59a1dd619f8a7892fe00d75cc2ddde26bbbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a24d59a1dd619f8a7892fe00d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 13 21:24:20 2012 +0100 ddraw: Avoid LPDIRECT3DDEVICE7. --- dlls/ddraw/tests/d3d.c | 2 +- include/d3d.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 7968b09..73317a8 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -33,7 +33,7 @@ static IDirectDraw7 *lpDD; static LPDIRECT3D7 lpD3D = NULL; static IDirectDrawSurface7 *lpDDS; static IDirectDrawSurface7 *lpDDSdepth; -static LPDIRECT3DDEVICE7 lpD3DDevice = NULL; +static IDirect3DDevice7 *lpD3DDevice; static IDirect3DVertexBuffer7 *lpVBufSrc; static IDirectDraw *DirectDraw1 = NULL; diff --git a/include/d3d.h b/include/d3d.h index 7911497..9cab6f7 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -1517,8 +1517,9 @@ DECLARE_INTERFACE_(IDirect3DVertexBuffer7,IUnknown) IDirect3DVertexBuffer7 *src_buffer, DWORD src_idx, IDirect3DDevice7 *device, DWORD flags) PURE; STDMETHOD(GetVertexBufferDesc)(THIS_ LPD3DVERTEXBUFFERDESC lpD3DVertexBufferDesc) PURE; - STDMETHOD(Optimize)(THIS_ LPDIRECT3DDEVICE7 lpD3DDevice,DWORD dwFlags) PURE; - STDMETHOD(ProcessVerticesStrided)(THIS_ DWORD dwVertexOp,DWORD dwDestIndex,DWORD dwCount,LPD3DDRAWPRIMITIVESTRIDEDDATA lpStrideData,DWORD dwVertexTypeDesc,LPDIRECT3DDEVICE7 lpD3DDevice,DWORD dwFlags) PURE; + STDMETHOD(Optimize)(THIS_ IDirect3DDevice7 *device, DWORD flags) PURE; + STDMETHOD(ProcessVerticesStrided)(THIS_ DWORD vertex_op, DWORD dst_idx, DWORD count, + D3DDRAWPRIMITIVESTRIDEDDATA *data, DWORD fvf, IDirect3DDevice7 *device, DWORD flags) PURE; }; #undef INTERFACE

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3DDEVICE3.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: a0ee8b20bc6f3e7c9fec22923c6fbee2a294d11d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ee8b20bc6f3e7c9fec22923… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 13 21:24:21 2012 +0100 ddraw: Avoid LPDIRECT3DDEVICE3. --- include/d3d.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 9cab6f7..5a8f576 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -534,7 +534,7 @@ DECLARE_INTERFACE_(IDirect3DMaterial3,IUnknown) /*** IDirect3DMaterial3 methods ***/ STDMETHOD(SetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE; STDMETHOD(GetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE; - STDMETHOD(GetHandle)(THIS_ LPDIRECT3DDEVICE3 lpDirect3DDevice3, LPD3DMATERIALHANDLE lpHandle) PURE; + STDMETHOD(GetHandle)(THIS_ struct IDirect3DDevice3 *device, D3DMATERIALHANDLE *handle) PURE; }; #undef INTERFACE @@ -1472,7 +1472,7 @@ DECLARE_INTERFACE_(IDirect3DVertexBuffer,IUnknown) IDirect3DVertexBuffer *src_buffer, DWORD src_idx, IDirect3DDevice3 *device, DWORD flags) PURE; STDMETHOD(GetVertexBufferDesc)(THIS_ LPD3DVERTEXBUFFERDESC lpD3DVertexBufferDesc) PURE; - STDMETHOD(Optimize)(THIS_ LPDIRECT3DDEVICE3 lpD3DDevice,DWORD dwFlags) PURE; + STDMETHOD(Optimize)(THIS_ IDirect3DDevice3 *device, DWORD flags) PURE; }; #undef INTERFACE

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_GSSetShader().
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 9081f8afb1ce135e5de6dd29d2d1dbfccc8fcfca URL: http://source.winehq.org/git/wine.git/?a=commit;h=9081f8afb1ce135e5de6dd29d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 13 21:24:22 2012 +0100 d3d10core: Implement d3d10_device_GSSetShader(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/device.c | 8 ++++++-- dlls/d3d10core/shader.c | 9 +++++++++ dlls/wined3d/device.c | 19 +++++++++++++++++++ dlls/wined3d/state.c | 7 +++++++ dlls/wined3d/utils.c | 2 ++ dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 7 ++++++- include/wine/wined3d.h | 1 + 9 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 4297adf..a4e29e2 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -191,6 +191,7 @@ struct d3d10_geometry_shader HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct d3d10_device *device, const void *byte_code, SIZE_T byte_code_length) DECLSPEC_HIDDEN; +struct d3d10_geometry_shader *unsafe_impl_from_ID3D10GeometryShader(ID3D10GeometryShader *iface) DECLSPEC_HIDDEN; /* ID3D10PixelShader */ struct d3d10_pixel_shader diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 0889f3b..0f30a13 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -260,8 +260,12 @@ static void STDMETHODCALLTYPE d3d10_device_GSSetConstantBuffers(ID3D10Device *if static void STDMETHODCALLTYPE d3d10_device_GSSetShader(ID3D10Device *iface, ID3D10GeometryShader *shader) { - if (shader) FIXME("iface %p, shader %p stub!\n", iface, shader); - else WARN("iface %p, shader %p stub!\n", iface, shader); + struct d3d10_device *device = impl_from_ID3D10Device(iface); + struct d3d10_geometry_shader *gs = unsafe_impl_from_ID3D10GeometryShader(shader); + + TRACE("iface %p, shader %p.\n", iface, shader); + + wined3d_device_set_geometry_shader(device->wined3d_device, gs ? gs->wined3d_shader : NULL); } static void STDMETHODCALLTYPE d3d10_device_IASetPrimitiveTopology(ID3D10Device *iface, diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index c6803ed..4f189e9 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -420,6 +420,15 @@ HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct return S_OK; } +struct d3d10_geometry_shader *unsafe_impl_from_ID3D10GeometryShader(ID3D10GeometryShader *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d10_geometry_shader_vtbl); + + return impl_from_ID3D10GeometryShader(iface); +} + static inline struct d3d10_pixel_shader *impl_from_ID3D10PixelShader(ID3D10PixelShader *iface) { return CONTAINING_RECORD(iface, struct d3d10_pixel_shader, ID3D10PixelShader_iface); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e01048b..979a248 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2993,6 +2993,25 @@ HRESULT CDECL wined3d_device_get_ps_consts_f(const struct wined3d_device *device return WINED3D_OK; } +void CDECL wined3d_device_set_geometry_shader(struct wined3d_device *device, struct wined3d_shader *shader) +{ + struct wined3d_shader *prev = device->updateStateBlock->state.geometry_shader; + + TRACE("device %p, shader %p.\n", device, shader); + + if (shader) + wined3d_shader_incref(shader); + if (prev) + wined3d_shader_decref(prev); + + device->updateStateBlock->state.geometry_shader = shader; + + if (device->isRecordingState || shader == prev) + return; + + device_invalidate_state(device, STATE_GEOMETRY_SHADER); +} + /* Context activation is done by the caller. */ /* Do not call while under the GL lock. */ #define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c16fa2a..2376527 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3760,6 +3760,11 @@ void apply_pixelshader(struct wined3d_context *context, const struct wined3d_sta context->load_constants = 1; } +void state_geometry_shader(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +{ + context->select_shader = 1; +} + static void shader_bumpenvmat(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { DWORD stage = (state_id - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); @@ -5129,6 +5134,7 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_BASEVERTEXINDEX, { STATE_STREAMSRC, NULL, }, WINED3D_GL_EXT_NONE }, { STATE_FRAMEBUFFER, { STATE_FRAMEBUFFER, context_state_fb }, WINED3D_GL_EXT_NONE }, { STATE_PIXELSHADER, { STATE_PIXELSHADER, context_state_drawbuf},WINED3D_GL_EXT_NONE }, + { STATE_GEOMETRY_SHADER, { STATE_GEOMETRY_SHADER, state_geometry_shader}, WINED3D_GL_EXT_NONE }, {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, }; @@ -5789,6 +5795,7 @@ static void validate_state_table(struct StateEntry *state_table) STATE_VERTEXSHADERCONSTANT, STATE_PIXELSHADERCONSTANT, STATE_VSHADER, + STATE_GEOMETRY_SHADER, STATE_PIXELSHADER, STATE_VIEWPORT, STATE_SCISSORRECT, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0624694..9e008f8 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2335,6 +2335,8 @@ const char *debug_d3dstate(DWORD state) return "STATE_VDECL"; if (STATE_IS_VSHADER(state)) return "STATE_VSHADER"; + if (STATE_IS_GEOMETRY_SHADER(state)) + return "STATE_GEOMETRY_SHADER"; if (STATE_IS_VIEWPORT(state)) return "STATE_VIEWPORT"; if (STATE_IS_VERTEXSHADERCONSTANT(state)) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 2aaa9ce..3bfa239 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -111,6 +111,7 @@ @ cdecl wined3d_device_set_depth_stencil(ptr ptr) @ cdecl wined3d_device_set_dialog_box_mode(ptr long) @ cdecl wined3d_device_set_gamma_ramp(ptr long long ptr) +@ cdecl wined3d_device_set_geometry_shader(ptr ptr) @ cdecl wined3d_device_set_index_buffer(ptr ptr long) @ cdecl wined3d_device_set_light(ptr long ptr) @ cdecl wined3d_device_set_light_enable(ptr long long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 56d7f38..e525414 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -995,7 +995,10 @@ extern glMultiTexCoordFunc multi_texcoord_funcs[WINED3D_FFP_EMIT_COUNT] DECLSPEC #define STATE_VSHADER (STATE_VDECL + 1) #define STATE_IS_VSHADER(a) ((a) == STATE_VSHADER) -#define STATE_VIEWPORT (STATE_VSHADER + 1) +#define STATE_GEOMETRY_SHADER (STATE_VSHADER + 1) +#define STATE_IS_GEOMETRY_SHADER(a) ((a) == STATE_GEOMETRY_SHADER) + +#define STATE_VIEWPORT (STATE_GEOMETRY_SHADER + 1) #define STATE_IS_VIEWPORT(a) ((a) == STATE_VIEWPORT) #define STATE_VERTEXSHADERCONSTANT (STATE_VIEWPORT + 1) @@ -2296,6 +2299,8 @@ struct wined3d_state INT vs_consts_i[MAX_CONST_I * 4]; float *vs_consts_f; + struct wined3d_shader *geometry_shader; + struct wined3d_shader *pixel_shader; BOOL ps_consts_b[MAX_CONST_B]; INT ps_consts_i[MAX_CONST_I * 4]; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e201c2e..fff8bd9 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2198,6 +2198,7 @@ void __cdecl wined3d_device_set_depth_stencil(struct wined3d_device *device, str HRESULT __cdecl wined3d_device_set_dialog_box_mode(struct wined3d_device *device, BOOL enable_dialogs); void __cdecl wined3d_device_set_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, DWORD flags, const struct wined3d_gamma_ramp *ramp); +void __cdecl wined3d_device_set_geometry_shader(struct wined3d_device *device, struct wined3d_shader *shader); void __cdecl wined3d_device_set_index_buffer(struct wined3d_device *device, struct wined3d_buffer *index_buffer, enum wined3d_format_id format_id); HRESULT __cdecl wined3d_device_set_light(struct wined3d_device *device,

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_GSGetShader().
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 25c449247f40f2e637187a6066eadf17610fd015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25c449247f40f2e637187a606… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 13 21:24:23 2012 +0100 d3d10core: Implement d3d10_device_GSGetShader(). --- dlls/d3d10core/device.c | 16 +++++++++++++++- dlls/wined3d/device.c | 7 +++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 4 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 0f30a13..84fff72 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -546,7 +546,21 @@ static void STDMETHODCALLTYPE d3d10_device_GSGetConstantBuffers(ID3D10Device *if static void STDMETHODCALLTYPE d3d10_device_GSGetShader(ID3D10Device *iface, ID3D10GeometryShader **shader) { - FIXME("iface %p, shader %p stub!\n", iface, shader); + struct d3d10_device *device = impl_from_ID3D10Device(iface); + struct d3d10_geometry_shader *shader_impl; + struct wined3d_shader *wined3d_shader; + + TRACE("iface %p, shader %p.\n", iface, shader); + + if (!(wined3d_shader = wined3d_device_get_geometry_shader(device->wined3d_device))) + { + *shader = NULL; + return; + } + + shader_impl = wined3d_shader_get_parent(wined3d_shader); + *shader = &shader_impl->ID3D10GeometryShader_iface; + ID3D10GeometryShader_AddRef(*shader); } static void STDMETHODCALLTYPE d3d10_device_IAGetPrimitiveTopology(ID3D10Device *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 979a248..2242cc3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3012,6 +3012,13 @@ void CDECL wined3d_device_set_geometry_shader(struct wined3d_device *device, str device_invalidate_state(device, STATE_GEOMETRY_SHADER); } +struct wined3d_shader * CDECL wined3d_device_get_geometry_shader(const struct wined3d_device *device) +{ + TRACE("device %p.\n", device); + + return device->stateBlock->state.geometry_shader; +} + /* Context activation is done by the caller. */ /* Do not call while under the GL lock. */ #define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3bfa239..f8364e1 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -64,6 +64,7 @@ @ cdecl wined3d_device_get_display_mode(ptr long ptr ptr) @ cdecl wined3d_device_get_front_buffer_data(ptr long ptr) @ cdecl wined3d_device_get_gamma_ramp(ptr long ptr) +@ cdecl wined3d_device_get_geometry_shader(ptr) @ cdecl wined3d_device_get_index_buffer(ptr) @ cdecl wined3d_device_get_light(ptr long ptr) @ cdecl wined3d_device_get_light_enable(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index fff8bd9..7169a25 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2124,6 +2124,7 @@ HRESULT __cdecl wined3d_device_get_front_buffer_data(const struct wined3d_device UINT swapchain_idx, struct wined3d_surface *dst_surface); void __cdecl wined3d_device_get_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_gamma_ramp *ramp); +struct wined3d_shader * __cdecl wined3d_device_get_geometry_shader(const struct wined3d_device *device); struct wined3d_buffer * __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_light(const struct wined3d_device *device, UINT light_idx, struct wined3d_light *light);

1 0

Alexandre Julliard : user32: Add system parameter descriptors for user preference parameters.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 95d782779c92dfb3d07fcaf82deb1048b9ff2f41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95d782779c92dfb3d07fcaf82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 14 12:19:19 2012 +0100 user32: Add system parameter descriptors for user preference parameters. --- dlls/user32/sysparams.c | 270 ++++++++++++++++++++++++++++------------------- 1 files changed, 161 insertions(+), 109 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95d782779c92dfb3d07fc…

1 0

Alexandre Julliard : user32: Support more user preference system parameters .
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 270979dc9ee30cd018f8b1070a8a8bf8eb7f3e7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=270979dc9ee30cd018f8b1070… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 14 12:54:41 2012 +0100 user32: Support more user preference system parameters. --- dlls/user32/sysparams.c | 114 ++++++++++++++++++++++++++++++----------------- 1 files changed, 73 insertions(+), 41 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 66e12a3..5070469 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1264,7 +1264,7 @@ static BOOL set_binary_entry( union sysparam_all_entry *entry, UINT int_param, v static BOOL get_userpref_entry( union sysparam_all_entry *entry, UINT int_param, void *ptr_param ) { union sysparam_all_entry *parent_entry = (union sysparam_all_entry *)entry->pref.parent; - BYTE prefs[4]; + BYTE prefs[8]; if (!ptr_param) return FALSE; @@ -1277,7 +1277,7 @@ static BOOL get_userpref_entry( union sysparam_all_entry *entry, UINT int_param, static BOOL set_userpref_entry( union sysparam_all_entry *entry, UINT int_param, void *ptr_param, UINT flags ) { union sysparam_all_entry *parent_entry = (union sysparam_all_entry *)entry->pref.parent; - BYTE prefs[4]; + BYTE prefs[8]; parent_entry->hdr.loaded = FALSE; /* force loading it again */ if (!parent_entry->hdr.get( parent_entry, sizeof(prefs), prefs )) return FALSE; @@ -1404,26 +1404,33 @@ static DWORD_ENTRY( FOREGROUNDFLASHCOUNT, 3 ); static DWORD_ENTRY( FOREGROUNDLOCKTIMEOUT, 0 ); static DWORD_ENTRY( MOUSECLICKLOCKTIME, 1200 ); -static BYTE user_prefs[4]; +static BYTE user_prefs[8] = { 0x30, 0x00, 0x02, 0x80, 0x10, 0x00, 0x00, 0x00 }; static BINARY_ENTRY( USERPREFERENCESMASK, user_prefs ); static FONT_ENTRY( ICONTITLELOGFONT ); -static USERPREF_ENTRY( MENUANIMATION, 0, 0x02 ); -static USERPREF_ENTRY( COMBOBOXANIMATION, 0, 0x04 ); -static USERPREF_ENTRY( LISTBOXSMOOTHSCROLLING, 0, 0x08 ); -static USERPREF_ENTRY( GRADIENTCAPTIONS, 0, 0x10 ); -static USERPREF_ENTRY( KEYBOARDCUES, 0, 0x20 ); -static USERPREF_ENTRY( HOTTRACKING, 0, 0x80 ); -static USERPREF_ENTRY( SELECTIONFADE, 1, 0x04 ); -static USERPREF_ENTRY( TOOLTIPANIMATION, 1, 0x08 ); -static USERPREF_ENTRY( TOOLTIPFADE, 1, 0x10 ); -static USERPREF_ENTRY( CURSORSHADOW, 1, 0x20 ); -static USERPREF_ENTRY( MOUSEVANISH, 2, 0x01 ); -static USERPREF_ENTRY( FLATMENU, 2, 0x02 ); -static USERPREF_ENTRY( DROPSHADOW, 2, 0x04 ); -static USERPREF_ENTRY( UIEFFECTS, 3, 0x80 ); - +static USERPREF_ENTRY( MENUANIMATION, 0, 0x02 ); +static USERPREF_ENTRY( COMBOBOXANIMATION, 0, 0x04 ); +static USERPREF_ENTRY( LISTBOXSMOOTHSCROLLING, 0, 0x08 ); +static USERPREF_ENTRY( GRADIENTCAPTIONS, 0, 0x10 ); +static USERPREF_ENTRY( KEYBOARDCUES, 0, 0x20 ); +static USERPREF_ENTRY( ACTIVEWNDTRKZORDER, 0, 0x40 ); +static USERPREF_ENTRY( HOTTRACKING, 0, 0x80 ); +static USERPREF_ENTRY( MENUFADE, 1, 0x02 ); +static USERPREF_ENTRY( SELECTIONFADE, 1, 0x04 ); +static USERPREF_ENTRY( TOOLTIPANIMATION, 1, 0x08 ); +static USERPREF_ENTRY( TOOLTIPFADE, 1, 0x10 ); +static USERPREF_ENTRY( CURSORSHADOW, 1, 0x20 ); +static USERPREF_ENTRY( MOUSESONAR, 1, 0x40 ); +static USERPREF_ENTRY( MOUSECLICKLOCK, 1, 0x80 ); +static USERPREF_ENTRY( MOUSEVANISH, 2, 0x01 ); +static USERPREF_ENTRY( FLATMENU, 2, 0x02 ); +static USERPREF_ENTRY( DROPSHADOW, 2, 0x04 ); +static USERPREF_ENTRY( UIEFFECTS, 3, 0x80 ); +static USERPREF_ENTRY( DISABLEOVERLAPPEDCONTENT, 4, 0x01 ); +static USERPREF_ENTRY( CLIENTAREAANIMATION, 4, 0x02 ); +static USERPREF_ENTRY( CLEARTYPE, 4, 0x10 ); +static USERPREF_ENTRY( SPEECHRECOGNITION, 4, 0x20 ); /*********************************************************************** * SystemParametersInfoW (USER32.@) @@ -2201,18 +2208,24 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, case SPI_SETKEYBOARDCUES: ret = set_entry( &entry_KEYBOARDCUES, uiParam, pvParam, fWinIni ); break; - - WINE_SPI_FIXME(SPI_GETACTIVEWNDTRKZORDER); /* 0x100C _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_SETACTIVEWNDTRKZORDER); /* 0x100D _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + case SPI_GETACTIVEWNDTRKZORDER: + ret = get_entry( &entry_ACTIVEWNDTRKZORDER, uiParam, pvParam ); + break; + case SPI_SETACTIVEWNDTRKZORDER: + ret = set_entry( &entry_ACTIVEWNDTRKZORDER, uiParam, pvParam, fWinIni ); + break; case SPI_GETHOTTRACKING: ret = get_entry( &entry_HOTTRACKING, uiParam, pvParam ); break; case SPI_SETHOTTRACKING: ret = set_entry( &entry_HOTTRACKING, uiParam, pvParam, fWinIni ); break; - - WINE_SPI_FIXME(SPI_GETMENUFADE); /* 0x1012 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_SETMENUFADE); /* 0x1013 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + case SPI_GETMENUFADE: + ret = get_entry( &entry_MENUFADE, uiParam, pvParam ); + break; + case SPI_SETMENUFADE: + ret = set_entry( &entry_MENUFADE, uiParam, pvParam, fWinIni ); + break; case SPI_GETSELECTIONFADE: ret = get_entry( &entry_SELECTIONFADE, uiParam, pvParam ); break; @@ -2237,12 +2250,18 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, case SPI_SETCURSORSHADOW: ret = set_entry( &entry_CURSORSHADOW, uiParam, pvParam, fWinIni ); break; - - WINE_SPI_FIXME(SPI_GETMOUSESONAR); /* 0x101C _WIN32_WINNT >= 0x510 || _WIN32_WINDOW >= 0x490*/ - WINE_SPI_FIXME(SPI_SETMOUSESONAR); /* 0x101D _WIN32_WINNT >= 0x510 || _WIN32_WINDOW >= 0x490*/ - WINE_SPI_FIXME(SPI_GETMOUSECLICKLOCK); /* 0x101E _WIN32_WINNT >= 0x510 || _WIN32_WINDOW >= 0x490*/ - WINE_SPI_FIXME(SPI_SETMOUSECLICKLOCK); /* 0x101F _WIN32_WINNT >= 0x510 || _WIN32_WINDOW >= 0x490*/ - + case SPI_GETMOUSESONAR: + ret = get_entry( &entry_MOUSESONAR, uiParam, pvParam ); + break; + case SPI_SETMOUSESONAR: + ret = set_entry( &entry_MOUSESONAR, uiParam, pvParam, fWinIni ); + break; + case SPI_GETMOUSECLICKLOCK: + ret = get_entry( &entry_MOUSECLICKLOCK, uiParam, pvParam ); + break; + case SPI_SETMOUSECLICKLOCK: + ret = set_entry( &entry_MOUSECLICKLOCK, uiParam, pvParam, fWinIni ); + break; case SPI_GETMOUSEVANISH: ret = get_entry( &entry_MOUSEVANISH, uiParam, pvParam ); break; @@ -2274,17 +2293,30 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, /* FIXME: this probably should mask other UI effect values when unset */ ret = set_entry( &entry_UIEFFECTS, uiParam, pvParam, fWinIni ); break; - - /* _WIN32_WINNT >= 0x600 */ - WINE_SPI_FIXME(SPI_GETDISABLEOVERLAPPEDCONTENT); - WINE_SPI_FIXME(SPI_SETDISABLEOVERLAPPEDCONTENT); - WINE_SPI_FIXME(SPI_GETCLIENTAREAANIMATION); - WINE_SPI_FIXME(SPI_SETCLIENTAREAANIMATION); - WINE_SPI_FIXME(SPI_GETCLEARTYPE); - WINE_SPI_FIXME(SPI_SETCLEARTYPE); - WINE_SPI_FIXME(SPI_GETSPEECHRECOGNITION); - WINE_SPI_FIXME(SPI_SETSPEECHRECOGNITION); - + case SPI_GETDISABLEOVERLAPPEDCONTENT: + ret = get_entry( &entry_DISABLEOVERLAPPEDCONTENT, uiParam, pvParam ); + break; + case SPI_SETDISABLEOVERLAPPEDCONTENT: + ret = set_entry( &entry_DISABLEOVERLAPPEDCONTENT, uiParam, pvParam, fWinIni ); + break; + case SPI_GETCLIENTAREAANIMATION: + ret = get_entry( &entry_CLIENTAREAANIMATION, uiParam, pvParam ); + break; + case SPI_SETCLIENTAREAANIMATION: + ret = set_entry( &entry_CLIENTAREAANIMATION, uiParam, pvParam, fWinIni ); + break; + case SPI_GETCLEARTYPE: + ret = get_entry( &entry_CLEARTYPE, uiParam, pvParam ); + break; + case SPI_SETCLEARTYPE: + ret = set_entry( &entry_CLEARTYPE, uiParam, pvParam, fWinIni ); + break; + case SPI_GETSPEECHRECOGNITION: + ret = get_entry( &entry_SPEECHRECOGNITION, uiParam, pvParam ); + break; + case SPI_SETSPEECHRECOGNITION: + ret = set_entry( &entry_SPEECHRECOGNITION, uiParam, pvParam, fWinIni ); + break; case SPI_GETFOREGROUNDLOCKTIMEOUT: ret = get_entry( &entry_FOREGROUNDLOCKTIMEOUT, uiParam, pvParam ); break;

1 0

Alexandre Julliard : user32: Add helper functions for loading and saving system parameter registry entries .
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: fb1c533e94578f1fb21b6e53b999517ca29f987c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb1c533e94578f1fb21b6e53b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 14 13:22:25 2012 +0100 user32: Add helper functions for loading and saving system parameter registry entries. --- dlls/user32/sysparams.c | 79 +++++++++++++++++++++------------------------- 1 files changed, 36 insertions(+), 43 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 5070469..fa97815 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -606,7 +606,7 @@ static void SYSPARAMS_NotifyChange( UINT uiAction, UINT fWinIni ) /*********************************************************************** * Loads system parameter from user profile. */ -static BOOL SYSPARAMS_LoadRaw( LPCWSTR lpRegKey, LPCWSTR lpValName, void *lpBuf, DWORD count ) +static BOOL SYSPARAMS_Load( LPCWSTR lpRegKey, LPCWSTR lpValName, void *lpBuf, DWORD count ) { BOOL ret = FALSE; DWORD type; @@ -629,11 +629,6 @@ static BOOL SYSPARAMS_LoadRaw( LPCWSTR lpRegKey, LPCWSTR lpValName, void *lpBuf, return ret; } -static BOOL SYSPARAMS_Load( LPCWSTR lpRegKey, LPCWSTR lpValName, LPWSTR lpBuf, DWORD count ) -{ - return SYSPARAMS_LoadRaw( lpRegKey, lpValName, (LPBYTE)lpBuf, count ); -} - /*********************************************************************** * Saves system parameter to user profile. */ @@ -701,6 +696,28 @@ static BOOL SYSPARAMS_SaveLogFont( LPCWSTR lpRegKey, LPCWSTR lpValName, sizeof(LOGFONTW), REG_BINARY, fWinIni ); } +/* load a value to a registry entry */ +static BOOL load_entry( struct sysparam_entry *entry, void *data, DWORD size ) +{ + BOOL ret = SYSPARAMS_Load( entry->regkey, entry->regval, data, size ); + entry->loaded = TRUE; + return ret; +} + +/* save a value to a registry entry */ +static BOOL save_entry( const struct sysparam_entry *entry, const void *data, DWORD size, + DWORD type, UINT flags ) +{ + if (!SYSPARAMS_SaveRaw( entry->regkey, entry->regval, data, size, type, flags )) return FALSE; + if (entry->mirror) SYSPARAMS_SaveRaw( entry->mirror, entry->regval, data, size, type, flags ); + return TRUE; +} + +/* save a string value to a registry entry */ +static BOOL save_entry_string( const struct sysparam_entry *entry, const WCHAR *str, UINT flags ) +{ + return save_entry( entry, str, (strlenW(str) + 1) * sizeof(WCHAR), REG_SZ, flags ); +} static inline HDC get_display_dc(void) { @@ -1042,9 +1059,7 @@ static BOOL get_uint_entry( union sysparam_all_entry *entry, UINT int_param, voi { WCHAR buf[32]; - if (SYSPARAMS_Load( entry->hdr.regkey, entry->hdr.regval, buf, sizeof(buf) )) - entry->uint.val = atoiW( buf ); - entry->hdr.loaded = TRUE; + if (load_entry( &entry->hdr, buf, sizeof(buf) )) entry->uint.val = atoiW( buf ); } *(UINT *)ptr_param = entry->uint.val; return TRUE; @@ -1056,8 +1071,7 @@ static BOOL set_uint_entry( union sysparam_all_entry *entry, UINT int_param, voi WCHAR buf[32]; wsprintfW( buf, CSu, int_param ); - if (!SYSPARAMS_Save( entry->hdr.regkey, entry->hdr.regval, buf, flags )) return FALSE; - if (entry->hdr.mirror) SYSPARAMS_Save( entry->hdr.mirror, entry->hdr.regval, buf, flags ); + if (!save_entry_string( &entry->hdr, buf, flags )) return FALSE; entry->uint.val = int_param; entry->hdr.loaded = TRUE; return TRUE; @@ -1069,8 +1083,7 @@ static BOOL set_int_entry( union sysparam_all_entry *entry, UINT int_param, void WCHAR buf[32]; wsprintfW( buf, CSd, int_param ); - if (!SYSPARAMS_Save( entry->hdr.regkey, entry->hdr.regval, buf, flags )) return FALSE; - if (entry->hdr.mirror) SYSPARAMS_Save( entry->hdr.mirror, entry->hdr.regval, buf, flags ); + if (!save_entry_string( &entry->hdr, buf, flags )) return FALSE; entry->uint.val = int_param; entry->hdr.loaded = TRUE; return TRUE; @@ -1085,9 +1098,8 @@ static BOOL get_twips_entry( union sysparam_all_entry *entry, UINT int_param, vo { WCHAR buf[32]; - if (SYSPARAMS_Load( entry->hdr.regkey, entry->hdr.regval, buf, sizeof(buf) )) + if (load_entry( &entry->hdr, buf, sizeof(buf) )) entry->uint.val = SYSPARAMS_Twips2Pixels( atoiW(buf) ); - entry->hdr.loaded = TRUE; } *(UINT *)ptr_param = entry->uint.val; return TRUE; @@ -1102,9 +1114,7 @@ static BOOL get_bool_entry( union sysparam_all_entry *entry, UINT int_param, voi { WCHAR buf[32]; - if (SYSPARAMS_Load( entry->hdr.regkey, entry->hdr.regval, buf, sizeof(buf) )) - entry->bool.val = atoiW( buf ) != 0; - entry->hdr.loaded = TRUE; + if (load_entry( &entry->hdr, buf, sizeof(buf) )) entry->bool.val = atoiW( buf ) != 0; } *(UINT *)ptr_param = entry->bool.val; return TRUE; @@ -1116,8 +1126,7 @@ static BOOL set_bool_entry( union sysparam_all_entry *entry, UINT int_param, voi WCHAR buf[32]; wsprintfW( buf, CSu, int_param != 0 ); - if (!SYSPARAMS_Save( entry->hdr.regkey, entry->hdr.regval, buf, flags )) return FALSE; - if (entry->hdr.mirror) SYSPARAMS_Save( entry->hdr.mirror, entry->hdr.regval, buf, flags ); + if (!save_entry_string( &entry->hdr, buf, flags )) return FALSE; entry->bool.val = int_param != 0; entry->hdr.loaded = TRUE; return TRUE; @@ -1132,9 +1141,7 @@ static BOOL get_yesno_entry( union sysparam_all_entry *entry, UINT int_param, vo { WCHAR buf[32]; - if (SYSPARAMS_Load( entry->hdr.regkey, entry->hdr.regval, buf, sizeof(buf) )) - entry->bool.val = !lstrcmpiW( Yes, buf ); - entry->hdr.loaded = TRUE; + if (load_entry( &entry->hdr, buf, sizeof(buf) )) entry->bool.val = !lstrcmpiW( Yes, buf ); } *(UINT *)ptr_param = entry->bool.val; return TRUE; @@ -1145,8 +1152,7 @@ static BOOL set_yesno_entry( union sysparam_all_entry *entry, UINT int_param, vo { const WCHAR *str = int_param ? Yes : No; - if (!SYSPARAMS_Save( entry->hdr.regkey, entry->hdr.regval, str, flags )) return FALSE; - if (entry->hdr.mirror) SYSPARAMS_Save( entry->hdr.mirror, entry->hdr.regval, str, flags ); + if (!save_entry_string( &entry->hdr, str, flags )) return FALSE; entry->bool.val = int_param != 0; entry->hdr.loaded = TRUE; return TRUE; @@ -1161,9 +1167,7 @@ static BOOL get_dword_entry( union sysparam_all_entry *entry, UINT int_param, vo { DWORD val; - if (SYSPARAMS_LoadRaw( entry->hdr.regkey, entry->hdr.regval, &val, sizeof(val) )) - entry->dword.val = val; - entry->hdr.loaded = TRUE; + if (load_entry( &entry->hdr, &val, sizeof(val) )) entry->dword.val = val; } *(DWORD *)ptr_param = entry->bool.val; return TRUE; @@ -1174,10 +1178,7 @@ static BOOL set_dword_entry( union sysparam_all_entry *entry, UINT int_param, vo { DWORD val = PtrToUlong( ptr_param ); - if (!SYSPARAMS_SaveRaw( entry->hdr.regkey, entry->hdr.regval, &val, sizeof(val), REG_DWORD, flags )) - return FALSE; - if (entry->hdr.mirror) - SYSPARAMS_SaveRaw( entry->hdr.mirror, entry->hdr.regval, &val, sizeof(val), REG_DWORD, flags ); + if (!save_entry( &entry->hdr, &val, sizeof(val), REG_DWORD, flags )) return FALSE; entry->dword.val = val; entry->hdr.loaded = TRUE; return TRUE; @@ -1211,10 +1212,7 @@ static BOOL set_font_entry( union sysparam_all_entry *entry, UINT int_param, voi ptr = memchrW( font.lfFaceName, 0, LF_FACESIZE ); if (ptr) memset( ptr, 0, (font.lfFaceName + LF_FACESIZE - ptr) * sizeof(WCHAR) ); - if (!SYSPARAMS_SaveRaw( entry->hdr.regkey, entry->hdr.regval, &font, sizeof(font), REG_BINARY, flags )) - return FALSE; - if (entry->hdr.mirror) - SYSPARAMS_SaveRaw( entry->hdr.mirror, entry->hdr.regval, &font, sizeof(font), REG_BINARY, flags ); + if (!save_entry( &entry->hdr, &font, sizeof(font), REG_BINARY, flags )) return FALSE; entry->font.val = font; entry->hdr.loaded = TRUE; return TRUE; @@ -1229,9 +1227,8 @@ static BOOL get_binary_entry( union sysparam_all_entry *entry, UINT int_param, v { void *buffer = HeapAlloc( GetProcessHeap(), 0, entry->bin.size ); - if (SYSPARAMS_LoadRaw( entry->hdr.regkey, entry->hdr.regval, buffer, entry->bin.size )) + if (load_entry( &entry->hdr, buffer, entry->bin.size )) memcpy( entry->bin.ptr, buffer, entry->bin.size ); - entry->hdr.loaded = TRUE; HeapFree( GetProcessHeap(), 0, buffer ); } memcpy( ptr_param, entry->bin.ptr, min( int_param, entry->bin.size ) ); @@ -1246,13 +1243,9 @@ static BOOL set_binary_entry( union sysparam_all_entry *entry, UINT int_param, v memcpy( buffer, entry->bin.ptr, entry->bin.size ); memcpy( buffer, ptr_param, min( int_param, entry->bin.size )); - ret = SYSPARAMS_SaveRaw( entry->hdr.regkey, entry->hdr.regval, buffer, - entry->bin.size, REG_BINARY, flags ); + ret = save_entry( &entry->hdr, buffer, entry->bin.size, REG_BINARY, flags ); if (ret) { - if (entry->hdr.mirror) - SYSPARAMS_SaveRaw( entry->hdr.mirror, entry->hdr.regval, buffer, - entry->bin.size, REG_BINARY, flags ); memcpy( entry->bin.ptr, buffer, entry->bin.size ); entry->hdr.loaded = TRUE; }

1 0

Alexandre Julliard : user32: Properly set last error in MapWindowPoints.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 5dea6543170fd12928cf2196b55fec9c2fe82c75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dea6543170fd12928cf2196b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 14 16:26:13 2012 +0100 user32: Properly set last error in MapWindowPoints. --- dlls/user32/winpos.c | 36 ++++++++++++++++++++++++------------ 1 files changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index eda5b78..c620df9 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -422,11 +422,11 @@ HWND WINAPI ChildWindowFromPointEx( HWND hwndParent, POINT pt, UINT uFlags) * Calculate the offset between the origin of the two windows. Used * to implement MapWindowPoints. */ -static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored ) +static BOOL WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored, POINT *ret_offset ) { WND * wndPtr; POINT offset; - BOOL mirror_from, mirror_to; + BOOL mirror_from, mirror_to, ret; HWND hwnd; offset.x = offset.y = 0; @@ -435,7 +435,11 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored ) /* Translate source window origin to screen coords */ if (hwndFrom) { - if (!(wndPtr = WIN_GetPtr( hwndFrom ))) return offset; + if (!(wndPtr = WIN_GetPtr( hwndFrom ))) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return FALSE; + } if (wndPtr == WND_OTHER_PROCESS) goto other_process; if (wndPtr != WND_DESKTOP) { @@ -466,7 +470,11 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored ) /* Translate origin to destination window coords */ if (hwndTo) { - if (!(wndPtr = WIN_GetPtr( hwndTo ))) return offset; + if (!(wndPtr = WIN_GetPtr( hwndTo ))) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return FALSE; + } if (wndPtr == WND_OTHER_PROCESS) goto other_process; if (wndPtr != WND_DESKTOP) { @@ -496,35 +504,37 @@ static POINT WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored ) *mirrored = mirror_from ^ mirror_to; if (mirror_from) offset.x = -offset.x; - return offset; + *ret_offset = offset; + return TRUE; other_process: /* one of the parents may belong to another process, do it the hard way */ - offset.x = offset.y = 0; SERVER_START_REQ( get_windows_offset ) { req->from = wine_server_user_handle( hwndFrom ); req->to = wine_server_user_handle( hwndTo ); - if (!wine_server_call( req )) + if ((ret = !wine_server_call_err( req ))) { - offset.x = reply->x; - offset.y = reply->y; + ret_offset->x = reply->x; + ret_offset->y = reply->y; *mirrored = reply->mirror; } } SERVER_END_REQ; - return offset; + return ret; } /* map coordinates of a window region */ void map_window_region( HWND from, HWND to, HRGN hrgn ) { BOOL mirrored; - POINT offset = WINPOS_GetWinOffset( from, to, &mirrored ); + POINT offset; UINT i, size; RGNDATA *data; HRGN new_rgn; RECT *rect; + if (!WINPOS_GetWinOffset( from, to, &mirrored, &offset )) return; + if (!mirrored) { OffsetRgn( hrgn, offset.x, offset.y ); @@ -557,9 +567,11 @@ void map_window_region( HWND from, HWND to, HRGN hrgn ) INT WINAPI MapWindowPoints( HWND hwndFrom, HWND hwndTo, LPPOINT lppt, UINT count ) { BOOL mirrored; - POINT offset = WINPOS_GetWinOffset( hwndFrom, hwndTo, &mirrored ); + POINT offset; UINT i; + if (!WINPOS_GetWinOffset( hwndFrom, hwndTo, &mirrored, &offset )) return 0; + for (i = 0; i < count; i++) { lppt[i].x += offset.x;

1 0

Alexandre Julliard : user32: Add some error checking in ScreenToClient and ClientToScreen.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 7fc61f6fea27d207706f896dbf47285516ebe760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fc61f6fea27d207706f896db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 14 16:29:39 2012 +0100 user32: Add some error checking in ScreenToClient and ClientToScreen. --- dlls/user32/winpos.c | 62 +++++++++++++++++++++++++++++++++---------------- 1 files changed, 42 insertions(+), 20 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index c620df9..0ce3ddd 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -235,26 +235,6 @@ BOOL WINAPI GetClientRect( HWND hwnd, LPRECT rect ) } -/******************************************************************* - * ClientToScreen (USER32.@) - */ -BOOL WINAPI ClientToScreen( HWND hwnd, LPPOINT lppnt ) -{ - MapWindowPoints( hwnd, 0, lppnt, 1 ); - return TRUE; -} - - -/******************************************************************* - * ScreenToClient (USER32.@) - */ -BOOL WINAPI ScreenToClient( HWND hwnd, LPPOINT lppnt ) -{ - MapWindowPoints( 0, hwnd, lppnt, 1 ); - return TRUE; -} - - /*********************************************************************** * list_children_from_point * @@ -588,6 +568,48 @@ INT WINAPI MapWindowPoints( HWND hwndFrom, HWND hwndTo, LPPOINT lppt, UINT count } +/******************************************************************* + * ClientToScreen (USER32.@) + */ +BOOL WINAPI ClientToScreen( HWND hwnd, LPPOINT lppnt ) +{ + POINT offset; + BOOL mirrored; + + if (!hwnd) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return FALSE; + } + if (!WINPOS_GetWinOffset( hwnd, 0, &mirrored, &offset )) return FALSE; + lppnt->x += offset.x; + lppnt->y += offset.y; + if (mirrored) lppnt->x = -lppnt->x; + return TRUE; +} + + +/******************************************************************* + * ScreenToClient (USER32.@) + */ +BOOL WINAPI ScreenToClient( HWND hwnd, LPPOINT lppnt ) +{ + POINT offset; + BOOL mirrored; + + if (!hwnd) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return FALSE; + } + if (!WINPOS_GetWinOffset( 0, hwnd, &mirrored, &offset )) return FALSE; + lppnt->x += offset.x; + lppnt->y += offset.y; + if (mirrored) lppnt->x = -lppnt->x; + return TRUE; +} + + /*********************************************************************** * IsIconic (USER32.@) */

1 0

Christian Costa : user32: Add tests for MapWindowPoints, ClientToScreen and ScreenToClient.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 5267f8b7d99aed32fe15ee02b0bfdcf7b47edc53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5267f8b7d99aed32fe15ee02b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Nov 13 21:16:44 2012 +0100 user32: Add tests for MapWindowPoints, ClientToScreen and ScreenToClient. Based on a patch by Rico Schüller. --- dlls/user32/tests/win.c | 223 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 223 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5267f8b7d99aed32fe15e…

1 0