April 2015 - Wine-commits - list.winehq.org

Matteo Bruni : wined3d: Store the directional light direction in the lightDirn field.
by Alexandre Julliard 28 Apr '15

28 Apr '15

Module: wine Branch: master Commit: 540130bfa9c0e53fa3c58a8f263fabbdc44f0534 URL: http://source.winehq.org/git/wine.git/?a=commit;h=540130bfa9c0e53fa3c58a8f2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Apr 27 17:39:10 2015 +0200 wined3d: Store the directional light direction in the lightDirn field. It's only an implementation detail that the direction needs to be passed to the fixed function GL pipeline as GL_POSITION. --- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/glsl_shader.c | 5 ++++- dlls/wined3d/state.c | 7 +++++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8572378..0ae29c7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1531,10 +1531,10 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, case WINED3D_LIGHT_DIRECTIONAL: /* Direction */ - object->lightPosn[0] = -light->direction.x; - object->lightPosn[1] = -light->direction.y; - object->lightPosn[2] = -light->direction.z; - object->lightPosn[3] = 0.0f; + object->lightDirn[0] = -light->direction.x; + object->lightDirn[1] = -light->direction.y; + object->lightDirn[2] = -light->direction.z; + object->lightDirn[3] = 0.0f; object->exponent = 0.0f; object->cutoff = 180.0f; break; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 851fc28..e49aff7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7529,7 +7529,10 @@ static void glsl_vertex_pipe_view(struct wined3d_context *context, const struct { if (!(light = state->lights[k])) continue; - gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + light->glIndex, GL_POSITION, light->lightPosn); + if (light->OriginalParms.type == WINED3D_LIGHT_DIRECTIONAL) + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + light->glIndex, GL_POSITION, light->lightDirn); + else + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + light->glIndex, GL_POSITION, light->lightPosn); checkGLcall("glLightfv posn"); gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + light->glIndex, GL_SPOT_DIRECTION, light->lightDirn); checkGLcall("glLightfv dirn"); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c938771..92c8547 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3973,7 +3973,10 @@ static void transform_view(struct wined3d_context *context, const struct wined3d { if (!(light = state->lights[k])) continue; - gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + light->glIndex, GL_POSITION, light->lightPosn); + if (light->OriginalParms.type == WINED3D_LIGHT_DIRECTIONAL) + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + light->glIndex, GL_POSITION, light->lightDirn); + else + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + light->glIndex, GL_POSITION, light->lightPosn); checkGLcall("glLightfv posn"); gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + light->glIndex, GL_SPOT_DIRECTION, light->lightDirn); checkGLcall("glLightfv dirn"); @@ -4800,7 +4803,7 @@ void light(struct wined3d_context *context, const struct wined3d_state *state, D case WINED3D_LIGHT_DIRECTIONAL: /* Direction */ /* Note GL uses w position of 0 for direction! */ - gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_POSITION, lightInfo->lightPosn); + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_POSITION, lightInfo->lightDirn); checkGLcall("glLightfv"); gl_info->gl_ops.gl.p_glLightf(GL_LIGHT0 + Index, GL_SPOT_CUTOFF, lightInfo->cutoff); checkGLcall("glLightf");

1 0

Matteo Bruni : wined3d: Use struct wined3d_vec4 to store the light position and direction.
by Alexandre Julliard 28 Apr '15

28 Apr '15

Module: wine Branch: master Commit: e226e7593abc92603eb27b6ed243271c2c2e3537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e226e7593abc92603eb27b6ed… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Apr 27 17:39:11 2015 +0200 wined3d: Use struct wined3d_vec4 to store the light position and direction. --- dlls/wined3d/device.c | 32 ++++++++++++++++---------------- dlls/wined3d/glsl_shader.c | 6 +++--- dlls/wined3d/state.c | 14 +++++++------- dlls/wined3d/wined3d_private.h | 8 ++++---- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0ae29c7..a3fbe25 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1521,36 +1521,36 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, { case WINED3D_LIGHT_POINT: /* Position */ - object->lightPosn[0] = light->position.x; - object->lightPosn[1] = light->position.y; - object->lightPosn[2] = light->position.z; - object->lightPosn[3] = 1.0f; + object->position.x = light->position.x; + object->position.y = light->position.y; + object->position.z = light->position.z; + object->position.w = 1.0f; object->cutoff = 180.0f; /* FIXME: Range */ break; case WINED3D_LIGHT_DIRECTIONAL: /* Direction */ - object->lightDirn[0] = -light->direction.x; - object->lightDirn[1] = -light->direction.y; - object->lightDirn[2] = -light->direction.z; - object->lightDirn[3] = 0.0f; + object->direction.x = -light->direction.x; + object->direction.y = -light->direction.y; + object->direction.z = -light->direction.z; + object->direction.w = 0.0f; object->exponent = 0.0f; object->cutoff = 180.0f; break; case WINED3D_LIGHT_SPOT: /* Position */ - object->lightPosn[0] = light->position.x; - object->lightPosn[1] = light->position.y; - object->lightPosn[2] = light->position.z; - object->lightPosn[3] = 1.0f; + object->position.x = light->position.x; + object->position.y = light->position.y; + object->position.z = light->position.z; + object->position.w = 1.0f; /* Direction */ - object->lightDirn[0] = light->direction.x; - object->lightDirn[1] = light->direction.y; - object->lightDirn[2] = light->direction.z; - object->lightDirn[3] = 0.0f; + object->direction.x = light->direction.x; + object->direction.y = light->direction.y; + object->direction.z = light->direction.z; + object->direction.w = 0.0f; /* opengl-ish and d3d-ish spot lights use too different models * for the light "intensity" as a function of the angle towards diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e49aff7..ae6bbf6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7530,11 +7530,11 @@ static void glsl_vertex_pipe_view(struct wined3d_context *context, const struct if (!(light = state->lights[k])) continue; if (light->OriginalParms.type == WINED3D_LIGHT_DIRECTIONAL) - gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + light->glIndex, GL_POSITION, light->lightDirn); + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + light->glIndex, GL_POSITION, &light->direction.x); else - gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + light->glIndex, GL_POSITION, light->lightPosn); + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + light->glIndex, GL_POSITION, &light->position.x); checkGLcall("glLightfv posn"); - gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + light->glIndex, GL_SPOT_DIRECTION, light->lightDirn); + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + light->glIndex, GL_SPOT_DIRECTION, &light->direction.x); checkGLcall("glLightfv dirn"); } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 92c8547..edaff95 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3974,11 +3974,11 @@ static void transform_view(struct wined3d_context *context, const struct wined3d if (!(light = state->lights[k])) continue; if (light->OriginalParms.type == WINED3D_LIGHT_DIRECTIONAL) - gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + light->glIndex, GL_POSITION, light->lightDirn); + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + light->glIndex, GL_POSITION, &light->direction.x); else - gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + light->glIndex, GL_POSITION, light->lightPosn); + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + light->glIndex, GL_POSITION, &light->position.x); checkGLcall("glLightfv posn"); - gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + light->glIndex, GL_SPOT_DIRECTION, light->lightDirn); + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + light->glIndex, GL_SPOT_DIRECTION, &light->direction.x); checkGLcall("glLightfv dirn"); } @@ -4759,7 +4759,7 @@ void light(struct wined3d_context *context, const struct wined3d_state *state, D { case WINED3D_LIGHT_POINT: /* Position */ - gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_POSITION, lightInfo->lightPosn); + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_POSITION, &lightInfo->position.x); checkGLcall("glLightfv"); gl_info->gl_ops.gl.p_glLightf(GL_LIGHT0 + Index, GL_SPOT_CUTOFF, lightInfo->cutoff); checkGLcall("glLightf"); @@ -4778,10 +4778,10 @@ void light(struct wined3d_context *context, const struct wined3d_state *state, D case WINED3D_LIGHT_SPOT: /* Position */ - gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_POSITION, lightInfo->lightPosn); + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_POSITION, &lightInfo->position.x); checkGLcall("glLightfv"); /* Direction */ - gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_SPOT_DIRECTION, lightInfo->lightDirn); + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_SPOT_DIRECTION, &lightInfo->direction.x); checkGLcall("glLightfv"); gl_info->gl_ops.gl.p_glLightf(GL_LIGHT0 + Index, GL_SPOT_EXPONENT, lightInfo->exponent); checkGLcall("glLightf"); @@ -4803,7 +4803,7 @@ void light(struct wined3d_context *context, const struct wined3d_state *state, D case WINED3D_LIGHT_DIRECTIONAL: /* Direction */ /* Note GL uses w position of 0 for direction! */ - gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_POSITION, lightInfo->lightDirn); + gl_info->gl_ops.gl.p_glLightfv(GL_LIGHT0 + Index, GL_POSITION, &lightInfo->direction.x); checkGLcall("glLightfv"); gl_info->gl_ops.gl.p_glLightf(GL_LIGHT0 + Index, GL_SPOT_CUTOFF, lightInfo->cutoff); checkGLcall("glLightf"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index eeb752a..2b721c0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1421,10 +1421,10 @@ struct wined3d_light_info BOOL enabled; /* Converted parms to speed up swapping lights */ - float lightPosn[4]; - float lightDirn[4]; - float exponent; - float cutoff; + struct wined3d_vec4 position; + struct wined3d_vec4 direction; + float exponent; + float cutoff; struct list entry; };

1 0

Matteo Bruni : wined3d: Don't use the builtin FFP uniforms for the lights.
by Alexandre Julliard 28 Apr '15

28 Apr '15

Module: wine Branch: master Commit: 28343db2083de7b4afe4079da090520f44b5544d URL: http://source.winehq.org/git/wine.git/?a=commit;h=28343db2083de7b4afe4079da… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Apr 27 17:39:12 2015 +0200 wined3d: Don't use the builtin FFP uniforms for the lights. While at it, use D3D-like uniforms for the light parameters and (consequently) implement range and proper D3D spotlights support. --- dlls/wined3d/glsl_shader.c | 255 +++++++++++++++++++++++++++++++---------- dlls/wined3d/state.c | 10 +- dlls/wined3d/wined3d_private.h | 15 +-- 3 files changed, 205 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=28343db2083de7b4afe40…

1 0

Nikolay Sivov : include: Use wellknown DISPID_* values.
by Alexandre Julliard 28 Apr '15

28 Apr '15

Module: wine Branch: master Commit: 4f228378db122789f450e0fb6c3151576f3fc096 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f228378db122789f450e0fb6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 28 13:10:28 2015 +0300 include: Use wellknown DISPID_* values. --- include/exdisp.idl | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/include/exdisp.idl b/include/exdisp.idl index 3791acb..7b5d921 100644 --- a/include/exdisp.idl +++ b/include/exdisp.idl @@ -229,7 +229,7 @@ interface IWebBrowserApp : IWebBrowser [id(301)] HRESULT ClientToWindow([in,out] int* pcx, [in,out] int* pcy); [id(302)] HRESULT PutProperty([in] BSTR Property, [in] VARIANT vtValue); [id(303)] HRESULT GetProperty([in] BSTR Property, [out, retval] VARIANT *pvtValue); - [id(0), propget] HRESULT Name([out, retval] BSTR* Name); + [id(DISPID_VALUE), propget] HRESULT Name([out, retval] BSTR* Name); [id(DISPID_HWND), propget] HRESULT HWND([out, retval] SHANDLE_PTR *pHWND); [id(400), propget] HRESULT FullName([out, retval] BSTR* FullName); [id(401), propget] HRESULT Path([out, retval] BSTR* Path); @@ -581,11 +581,13 @@ interface IShellWindows : IDispatch { [propget] HRESULT Count([out, retval] long *Count); - [id(0)] HRESULT Item( + [id(DISPID_VALUE)] + HRESULT Item( [in, optional] VARIANT index, [out, retval] IDispatch **Folder); - [id(-4)] HRESULT _NewEnum([out, retval] IUnknown **ppunk); + [id(DISPID_NEWENUM)] + HRESULT _NewEnum([out, retval] IUnknown **ppunk); [hidden] HRESULT Register( [in] IDispatch *pid, @@ -916,7 +918,8 @@ interface ISearches : IDispatch { [in, optional] VARIANT index, [out, retval] ISearch **ppid); - [id(-4)] HRESULT _NewEnum([out, retval] IUnknown **ppunk); + [id(DISPID_NEWENUM)] + HRESULT _NewEnum([out, retval] IUnknown **ppunk); } [

1 0

Nikolay Sivov : include: Added IShellFolderViewDual definition.
by Alexandre Julliard 28 Apr '15

28 Apr '15

Module: wine Branch: master Commit: d6802318aaff09540fb838ab110a3db1f7b788d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6802318aaff09540fb838ab1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 28 14:05:54 2015 +0300 include: Added IShellFolderViewDual definition. --- dlls/shell32/tests/shelldispatch.c | 22 +++++++ include/shldisp.idl | 114 +++++++++++++++++++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 804421a..75a06cc 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -364,6 +364,27 @@ static void test_service(void) IShellDispatch2_Release(sd); } +static void test_ShellFolderView(void) +{ + IShellFolderViewDual *viewdual; + IShellFolder *desktop; + IShellView *view; + HRESULT hr; + + /* IShellFolderViewDual is not an IShellView extension */ + hr = SHGetDesktopFolder(&desktop); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IShellFolder_CreateViewObject(desktop, NULL, &IID_IShellView, (void**)&view); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IShellView_QueryInterface(view, &IID_IShellFolderViewDual, (void**)&viewdual); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + IShellView_Release(view); + IShellFolder_Release(desktop); +} + START_TEST(shelldispatch) { HRESULT r; @@ -376,6 +397,7 @@ START_TEST(shelldispatch) init_function_pointers(); test_namespace(); test_service(); + test_ShellFolderView(); CoUninitialize(); } diff --git a/include/shldisp.idl b/include/shldisp.idl index 589c083..506c5d2 100644 --- a/include/shldisp.idl +++ b/include/shldisp.idl @@ -586,6 +586,120 @@ enum ShellSpecialFolderConstants { ssfPROGRAMFILESx86 = 0x30 } ShellSpecialFolderConstants; +/***************************************************************************** + * IShellFolderViewDual interface + */ +typedef +[ + uuid(742a99a0-c77e-11d0-a32c-00a0c91eedba) +] +enum ShellFolderViewOptions +{ + SFVVO_SHOWALLOBJECTS = 0x00000001, + SFVVO_SHOWEXTENSIONS = 0x00000002, + SFVVO_SHOWCOMPCOLOR = 0x00000008, + SFVVO_SHOWSYSFILES = 0x00000020, + SFVVO_WIN95CLASSIC = 0x00000040, + SFVVO_DOUBLECLICKINWEBVIEW = 0x00000080, + SFVVO_DESKTOPHTML = 0x00000200 +} ShellFolderViewOptions; + +[ + uuid(e7a1af80-4d96-11cf-960c-0080c7f4ee85), + oleautomation, + hidden, + dual +] +interface IShellFolderViewDual : IDispatch +{ + [propget] + HRESULT Application([out, retval] IDispatch **app); + + [propget] + HRESULT Parent([out, retval] IDispatch **parent); + + [propget] + HRESULT Folder([out, retval] Folder **folder); + + HRESULT SelectedItems([out, retval] FolderItems **items); + + [propget] + HRESULT FocusedItem([out, retval] FolderItem **item); + + HRESULT SelectItem([in] VARIANT *item, [in] int flags); + + HRESULT PopupItemMenu([in] FolderItem *item, + [in, optional] VARIANT vx, + [in, optional] VARIANT vy, + [out, retval] BSTR *command); + [propget] + HRESULT Script([out, retval] IDispatch **script); + + [propget] + HRESULT ViewOptions([out, retval] long *options); +} + +[ + uuid(31c147b6-0ade-4a3c-b514-ddf932ef6d17), + oleautomation, + hidden, + dual +] +interface IShellFolderViewDual2 : IShellFolderViewDual +{ + [propget] + HRESULT CurrentViewMode([out, retval] UINT *mode); + + [propput] + HRESULT CurrentViewMode([in] UINT mode); + + HRESULT SelectItemRelative([in] int relative); +} + +[ + uuid(29ec8e6c-46d3-411f-baaa-611a6c9cac66), + oleautomation, + hidden, + dual +] +interface IShellFolderViewDual3 : IShellFolderViewDual2 +{ + [propget] + HRESULT GroupBy([out, retval] BSTR *groupby); + + [propput] + HRESULT GroupBy([in] BSTR groupby); + + [propget] + HRESULT FolderFlags([out, retval] DWORD *flags); + + [propput] + HRESULT FolderFlags([in] DWORD flags); + + [propget] + HRESULT SortColumns([out, retval] BSTR *sortcolumns); + + [propput] + HRESULT SortColumns([in] BSTR sortcolumns); + + [propput] + HRESULT IconSize([in] int icon_size); + + [propget] + HRESULT IconSize([out, retval] int *icon_size); + + HRESULT FilterView([in, unique] BSTR filter_text); +} + +[ + uuid(62112aa1-ebe4-11cf-a5fb-0020afe7292d) +] +coclass ShellFolderView +{ + [default] interface IShellFolderViewDual3; + [default, source] dispinterface DShellFolderViewEvents; +} + } /* library Shell32 */ /*****************************************************************************

1 0

Huw Davies : comctl32: Move the style change code to the TB_SETSTYLE handler.
by Alexandre Julliard 28 Apr '15

28 Apr '15

Module: wine Branch: master Commit: e82b9dc32e90c5b38fb73352ce71d520c96afc53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e82b9dc32e90c5b38fb73352c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 28 11:32:00 2015 +0100 comctl32: Move the style change code to the TB_SETSTYLE handler. --- dlls/comctl32/toolbar.c | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 83cb674..695e450 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4922,7 +4922,28 @@ TOOLBAR_SetState (TOOLBAR_INFO *infoPtr, INT Id, LPARAM lParam) static LRESULT TOOLBAR_SetStyle (TOOLBAR_INFO *infoPtr, DWORD style) { + DWORD dwOldStyle = infoPtr->dwStyle; + + TRACE("new style 0x%08x\n", style); + + if (style & TBSTYLE_LIST) + infoPtr->dwDTFlags = DT_LEFT | DT_VCENTER | DT_SINGLELINE | DT_END_ELLIPSIS; + else + infoPtr->dwDTFlags = DT_CENTER | DT_END_ELLIPSIS; + infoPtr->dwStyle = style; + TOOLBAR_CheckStyle(infoPtr); + + if ((dwOldStyle ^ style) & (TBSTYLE_WRAPABLE | CCS_VERT)) + TOOLBAR_LayoutToolbar(infoPtr); + + /* only resize if one of the CCS_* styles was changed */ + if ((dwOldStyle ^ style) & COMMON_STYLES) + { + TOOLBAR_AutoSize(infoPtr); + InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); + } + return 0; } @@ -6337,30 +6358,7 @@ static LRESULT TOOLBAR_StyleChanged (TOOLBAR_INFO *infoPtr, INT nType, const STYLESTRUCT *lpStyle) { if (nType == GWL_STYLE) - { - DWORD dwOldStyle = infoPtr->dwStyle; - - if (lpStyle->styleNew & TBSTYLE_LIST) - infoPtr->dwDTFlags = DT_LEFT | DT_VCENTER | DT_SINGLELINE | DT_END_ELLIPSIS; - else - infoPtr->dwDTFlags = DT_CENTER | DT_END_ELLIPSIS; - - TRACE("new style 0x%08x\n", lpStyle->styleNew); - - infoPtr->dwStyle = lpStyle->styleNew; - TOOLBAR_CheckStyle (infoPtr); - - if ((dwOldStyle ^ lpStyle->styleNew) & (TBSTYLE_WRAPABLE | CCS_VERT)) - TOOLBAR_LayoutToolbar(infoPtr); - - /* only resize if one of the CCS_* styles was changed */ - if ((dwOldStyle ^ lpStyle->styleNew) & COMMON_STYLES) - { - TOOLBAR_AutoSize (infoPtr); - - InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); - } - } + return TOOLBAR_SetStyle(infoPtr, lpStyle->styleNew); return 0; }

1 0

Huw Davies : comctl32: A change in TBSTYLE_WRAPABLE should produce a recalc.
by Alexandre Julliard 28 Apr '15

28 Apr '15

Module: wine Branch: master Commit: abd673bde93b76a361ddf7342c538c2dd99af2bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=abd673bde93b76a361ddf7342… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 28 11:32:01 2015 +0100 comctl32: A change in TBSTYLE_WRAPABLE should produce a recalc. --- dlls/comctl32/tests/toolbar.c | 46 +++++++++++++++++++++++++++++++++++++++++-- dlls/comctl32/toolbar.c | 4 +++- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index d3088f9..365bfe2 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1388,12 +1388,12 @@ static void restore_recalc_state(HWND hToolbar) RECT rect; /* return to style with a 2px top margin */ SetWindowLongA(hToolbar, GWL_STYLE, - GetWindowLongA(hToolbar, GWL_STYLE) & ~TBSTYLE_FLAT); + SendMessageA(hToolbar, TB_GETSTYLE, 0, 0) & ~TBSTYLE_FLAT); /* recalc */ SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)&buttons3[3]); /* top margin will be 0px if a recalc occurs */ SetWindowLongA(hToolbar, GWL_STYLE, - GetWindowLongA(hToolbar, GWL_STYLE) | TBSTYLE_FLAT); + SendMessageA(hToolbar, TB_GETSTYLE, 0, 0) | TBSTYLE_FLAT); /* safety check */ SendMessageA(hToolbar, TB_GETITEMRECT, 1, (LPARAM)&rect); ok(rect.top == 2, "Test will make no sense because initial top is %d instead of 2\n", @@ -1408,6 +1408,7 @@ static void test_recalc(void) const int EX_STYLES_COUNT = 5; int i; BOOL recalc; + DWORD style; /* Like TB_ADDBUTTONSA tested in test_sized, inserting a button without text * results in a relayout, while adding one with text forces a recalc */ @@ -1468,6 +1469,47 @@ static void test_recalc(void) /* undocumented exstyle 0x2 seems to change the top margin, which * interferes with these tests */ + /* Show that a change in TBSTYLE_WRAPABLE causes a recalc */ + prepare_recalc_test(&hToolbar); + style = SendMessageA(hToolbar, TB_GETSTYLE, 0, 0); + SendMessageA(hToolbar, TB_SETSTYLE, 0, style); + recalc = did_recalc(hToolbar); + ok(!recalc, "recalc %d\n", recalc); + + SendMessageA(hToolbar, TB_SETSTYLE, 0, style | TBSTYLE_TOOLTIPS | TBSTYLE_TRANSPARENT | CCS_BOTTOM); + recalc = did_recalc(hToolbar); + ok(!recalc, "recalc %d\n", recalc); + + SendMessageA(hToolbar, TB_SETSTYLE, 0, style | TBSTYLE_WRAPABLE); + recalc = did_recalc(hToolbar); + ok(recalc, "recalc %d\n", recalc); + restore_recalc_state(hToolbar); + + SendMessageA(hToolbar, TB_SETSTYLE, 0, style | TBSTYLE_WRAPABLE); + recalc = did_recalc(hToolbar); + ok(!recalc, "recalc %d\n", recalc); + + SendMessageA(hToolbar, TB_SETSTYLE, 0, style); + recalc = did_recalc(hToolbar); + ok(recalc, "recalc %d\n", recalc); + restore_recalc_state(hToolbar); + + /* Changing CCS_VERT does not recalc */ + SendMessageA(hToolbar, TB_SETSTYLE, 0, style | CCS_VERT); + recalc = did_recalc(hToolbar); + ok(!recalc, "recalc %d\n", recalc); + restore_recalc_state(hToolbar); + + SendMessageA(hToolbar, TB_SETSTYLE, 0, style); + recalc = did_recalc(hToolbar); + ok(!recalc, "recalc %d\n", recalc); + restore_recalc_state(hToolbar); + + /* Setting the window's style directly also causes recalc */ + SetWindowLongA(hToolbar, GWL_STYLE, style | TBSTYLE_WRAPABLE); + recalc = did_recalc(hToolbar); + ok(recalc, "recalc %d\n", recalc); + DestroyWindow(hToolbar); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 695e450..b2f13c5 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4934,7 +4934,9 @@ TOOLBAR_SetStyle (TOOLBAR_INFO *infoPtr, DWORD style) infoPtr->dwStyle = style; TOOLBAR_CheckStyle(infoPtr); - if ((dwOldStyle ^ style) & (TBSTYLE_WRAPABLE | CCS_VERT)) + if ((dwOldStyle ^ style) & TBSTYLE_WRAPABLE) + TOOLBAR_CalcToolbar(infoPtr); + else if ((dwOldStyle ^ style) & CCS_VERT) TOOLBAR_LayoutToolbar(infoPtr); /* only resize if one of the CCS_* styles was changed */

1 0

Mark Harmstone : uxtheme: Stub out buffered painting functions.
by Alexandre Julliard 28 Apr '15

28 Apr '15

Module: wine Branch: master Commit: f9fe32939f8232064c0cee5ef2668e197d8e58eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9fe32939f8232064c0cee5ef… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Mon Apr 27 21:52:53 2015 +0100 uxtheme: Stub out buffered painting functions. --- dlls/uxtheme/buffer.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/uxtheme/uxtheme.spec | 6 ++++++ 2 files changed, 61 insertions(+) diff --git a/dlls/uxtheme/buffer.c b/dlls/uxtheme/buffer.c index f4d8229..8955a0d 100644 --- a/dlls/uxtheme/buffer.c +++ b/dlls/uxtheme/buffer.c @@ -81,3 +81,58 @@ HRESULT WINAPI EndBufferedPaint(HPAINTBUFFER hPaintBuffer, BOOL fUpdateTarget) FIXME("Stub (%p %d)\n", hPaintBuffer, fUpdateTarget); return S_OK; } + +/*********************************************************************** + * BufferedPaintClear (UXTHEME.@) + */ +HRESULT WINAPI BufferedPaintClear(HPAINTBUFFER hBufferedPaint, const RECT *prc) +{ + FIXME("Stub (%p %p)\n", hBufferedPaint, prc); + return E_NOTIMPL; +} + +/*********************************************************************** + * BufferedPaintSetAlpha (UXTHEME.@) + */ +HRESULT WINAPI BufferedPaintSetAlpha(HPAINTBUFFER hBufferedPaint, const RECT *prc, BYTE alpha) +{ + FIXME("Stub (%p %p %u)\n", hBufferedPaint, prc, alpha); + return E_NOTIMPL; +} + +/*********************************************************************** + * GetBufferedPaintBits (UXTHEME.@) + */ +HRESULT WINAPI GetBufferedPaintBits(HPAINTBUFFER hBufferedPaint, RGBQUAD **ppbBuffer, + int *pcxRow) +{ + FIXME("Stub (%p %p %p)\n", hBufferedPaint, ppbBuffer, pcxRow); + return E_NOTIMPL; +} + +/*********************************************************************** + * GetBufferedPaintDC (UXTHEME.@) + */ +HDC WINAPI GetBufferedPaintDC(HPAINTBUFFER hBufferedPaint) +{ + FIXME("Stub (%p)\n", hBufferedPaint); + return NULL; +} + +/*********************************************************************** + * GetBufferedPaintTargetDC (UXTHEME.@) + */ +HDC WINAPI GetBufferedPaintTargetDC(HPAINTBUFFER hBufferedPaint) +{ + FIXME("Stub (%p)\n", hBufferedPaint); + return NULL; +} + +/*********************************************************************** + * GetBufferedPaintTargetRect (UXTHEME.@) + */ +HRESULT WINAPI GetBufferedPaintTargetRect(HPAINTBUFFER hBufferedPaint, RECT *prc) +{ + FIXME("Stub (%p %p)\n", hBufferedPaint, prc); + return E_NOTIMPL; +} diff --git a/dlls/uxtheme/uxtheme.spec b/dlls/uxtheme/uxtheme.spec index 198957a..7d84faf 100644 --- a/dlls/uxtheme/uxtheme.spec +++ b/dlls/uxtheme/uxtheme.spec @@ -44,7 +44,9 @@ # Standard functions @ stdcall BeginBufferedPaint(ptr ptr long ptr ptr) +@ stdcall BufferedPaintClear(ptr ptr) @ stdcall BufferedPaintInit() +@ stdcall BufferedPaintSetAlpha(ptr ptr long) @ stdcall BufferedPaintUnInit() @ stdcall CloseThemeData(ptr) @ stdcall DrawThemeBackground(ptr ptr long long ptr ptr) @@ -56,6 +58,10 @@ @ stdcall EnableThemeDialogTexture(ptr long) @ stdcall EnableTheming(long) @ stdcall EndBufferedPaint(ptr long) +@ stdcall GetBufferedPaintBits(ptr ptr ptr) +@ stdcall GetBufferedPaintDC(ptr) +@ stdcall GetBufferedPaintTargetDC(ptr) +@ stdcall GetBufferedPaintTargetRect(ptr ptr) @ stdcall GetCurrentThemeName(wstr long wstr long wstr long) @ stdcall GetThemeAppProperties() @ stdcall GetThemeBackgroundContentRect(ptr ptr long long ptr ptr)

1 0

Michael Stefaniuc : dmloader: Use the generic DirectMusicObject implementation for DMContainer.
by Alexandre Julliard 28 Apr '15

28 Apr '15

Module: wine Branch: master Commit: ade8d0c158cbfbe80bb436dfb7f08cf5d9b7ead0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ade8d0c158cbfbe80bb436dfb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 28 00:09:45 2015 +0200 dmloader: Use the generic DirectMusicObject implementation for DMContainer. --- dlls/dmloader/Makefile.in | 1 + dlls/dmloader/container.c | 216 ++++++++++--------------------------------- dlls/dmloader/dmobject.c | 170 ++++++++++++++++++++++++++++++++++ dlls/dmloader/dmobject.h | 53 +++++++++++ dlls/dmloader/tests/loader.c | 2 +- 5 files changed, 276 insertions(+), 166 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ade8d0c158cbfbe80bb43…

1 0

Michael Stefaniuc : dmloader/tests: Add more DirectMusicCollection tests.
by Alexandre Julliard 28 Apr '15

28 Apr '15

Module: wine Branch: master Commit: d9e0c9fb8214f2fe6b751e767e76b2a0e1a0f6a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9e0c9fb8214f2fe6b751e767… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 28 00:12:52 2015 +0200 dmloader/tests: Add more DirectMusicCollection tests. --- dlls/dmloader/tests/loader.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 8886be7..b2ba8fe 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -222,7 +222,9 @@ static void test_COM_container(void) static void test_container(void) { IDirectMusicContainer *dmc; + IDirectMusicObject *dmo; IPersistStream *ps; + DMUS_OBJECTDESC desc; CLSID class = { 0 }; ULARGE_INTEGER size; HRESULT hr; @@ -231,6 +233,37 @@ static void test_container(void) &IID_IDirectMusicContainer, (void**)&dmc); ok(hr == S_OK, "DirectMusicContainer create failed: %08x, expected S_OK\n", hr); + /* IDirectMusicObject */ + hr = IDirectMusicContainer_QueryInterface(dmc, &IID_IDirectMusicObject, (void**)&dmo); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + hr = IDirectMusicObject_GetDescriptor(dmo, NULL); + ok(hr == E_POINTER, "IDirectMusicObject_GetDescriptor: expected E_POINTER, got %08x\n", hr); + hr = IDirectMusicObject_SetDescriptor(dmo, NULL); + ok(hr == E_POINTER, "IDirectMusicObject_SetDescriptor: expected E_POINTER, got %08x\n", hr); + ZeroMemory(&desc, sizeof(desc)); + hr = IDirectMusicObject_GetDescriptor(dmo, &desc); + ok(hr == S_OK, "IDirectMusicObject_GetDescriptor failed: %08x\n", hr); + ZeroMemory(&desc, sizeof(desc)); + desc.dwSize = 1; /* size is ignored */ + hr = IDirectMusicObject_GetDescriptor(dmo, &desc); + ok(hr == S_OK, "IDirectMusicObject_GetDescriptor failed: %08x\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, + "Fresh object has more valid data (%08x) than DMUS_OBJ_CLASS\n", desc.dwValidData); + /* DMUS_OBJ_CLASS is immutable */ + desc.dwValidData = DMUS_OBJ_CLASS; + desc.dwSize = 1; /* size is ignored */ + hr = IDirectMusicObject_SetDescriptor(dmo, &desc); + ok(hr == S_FALSE , "IDirectMusicObject_SetDescriptor failed: %08x\n", hr); + ok(!desc.dwValidData, "dwValidData wasn't cleared: %08x\n", desc.dwValidData); + desc.dwValidData = DMUS_OBJ_CLASS; + desc.guidClass = CLSID_DirectMusicSegment; + hr = IDirectMusicObject_SetDescriptor(dmo, &desc); + ok(hr == S_FALSE && !desc.dwValidData, "IDirectMusicObject_SetDescriptor failed: %08x\n", hr); + hr = IDirectMusicObject_GetDescriptor(dmo, &desc); + ok(hr == S_OK, "IDirectMusicObject_GetDescriptor failed: %08x\n", hr); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicContainer), + "guidClass changed, should be CLSID_DirectMusicContainer\n"); + /* IPersistStream */ hr = IDirectMusicContainer_QueryInterface(dmc, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr);

1 0