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

Matteo Bruni : wined3d: Set spotlight direction .w component to 0.0f.
by Alexandre Julliard April 28, 2015

April 28, 2015

Module: wine Branch: master Commit: b5affa6d3c7da3bc7991ea2f2a09167e8a397788 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5affa6d3c7da3bc7991ea2f2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Apr 27 17:39:09 2015 +0200 wined3d: Set spotlight direction .w component to 0.0f. It's a direction so we don't want to get translations applied to it. The variable is only used internally. --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0822f61..8572378 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1550,7 +1550,7 @@ HRESULT CDECL wined3d_device_set_light(struct wined3d_device *device, object->lightDirn[0] = light->direction.x; object->lightDirn[1] = light->direction.y; object->lightDirn[2] = light->direction.z; - object->lightDirn[3] = 1.0f; + object->lightDirn[3] = 0.0f; /* opengl-ish and d3d-ish spot lights use too different models * for the light "intensity" as a function of the angle towards

1 0

Nikolay Sivov : include: Added IShellFolderViewDual definition.
by Alexandre Julliard April 28, 2015

April 28, 2015

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

Nikolay Sivov : include: Use wellknown DISPID_* values.
by Alexandre Julliard April 28, 2015

April 28, 2015

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

Matteo Bruni : wined3d: Use struct wined3d_vec4 to store the light position and direction.
by Alexandre Julliard April 28, 2015

April 28, 2015

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: Store the directional light direction in the lightDirn field.
by Alexandre Julliard April 28, 2015

April 28, 2015

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

Huw Davies : comctl32: Move the style change code to the TB_SETSTYLE handler.
by Alexandre Julliard April 28, 2015

April 28, 2015

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

Matteo Bruni : wined3d: Don't use the builtin FFP uniforms for the lights.
by Alexandre Julliard April 28, 2015

April 28, 2015

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

Alexandre Julliard : riched20: Update rectangle on WM_WINDOWPOSCHANGED instead of WM_SIZE.
by Alexandre Julliard April 28, 2015

April 28, 2015

Module: wine Branch: master Commit: 50009c4a95e10e0d4e0a3a1aff96b1848422a89e URL: http://source.winehq.org/git/wine.git/?a=commit;h=50009c4a95e10e0d4e0a3a1af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 28 19:57:37 2015 +0900 riched20: Update rectangle on WM_WINDOWPOSCHANGED instead of WM_SIZE. Some applications don't forward WM_SIZE to the window proc. --- dlls/riched20/editor.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a4403ca..f355f33 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4409,10 +4409,12 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, return 0; case WM_SETREDRAW: goto do_default; - case WM_SIZE: + case WM_WINDOWPOSCHANGED: { RECT clientRect; + WINDOWPOS *winpos = (WINDOWPOS *)lParam; + if (winpos->flags & SWP_NOCLIENTSIZE) goto do_default; ITextHost_TxGetClientRect(editor->texthost, &clientRect); if (editor->bDefaultFormatRect) { ME_SetDefaultFormatRect(editor);

1 0

Sebastian Lackner : wine.inf: Fix timezone for America/Tijuana.
by Alexandre Julliard April 28, 2015

April 28, 2015

Module: wine Branch: master Commit: 78e7eac8f6aa2625e01f40403140618b61f83d72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78e7eac8f6aa2625e01f40403… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 28 02:45:41 2015 +0200 wine.inf: Fix timezone for America/Tijuana. The dates were changed some time ago. DST starts now on the second Sunday in March and ends on the first Sunday in November. --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index ca71aef..1e4de94 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2843,7 +2843,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time,"TZI",1,e0,01,00,00,00, HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Display",,"America/Tijuana" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Dlt",,"Pacific Daylight Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Std",,"Pacific Standard Time (Mexico)" -HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"TZI",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,02,00,00,00,00,00,00,00,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"TZI",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Romance Standard Time,"Display",,"Europe/Paris" HKLM,%CurrentVersionNT%\Time Zones\Romance Standard Time,"Dlt",,"Romance Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Romance Standard Time,"Std",,"Romance Standard Time"

1 0

Sebastian Lackner : wine.inf: Remove deprecated daylight saving time information for various timezones.
by Alexandre Julliard April 28, 2015

April 28, 2015

Module: wine Branch: master Commit: 5184155dfadbdcde9ff95558fd4eba1314f32bfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=5184155dfadbdcde9ff95558f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 28 02:12:21 2015 +0200 wine.inf: Remove deprecated daylight saving time information for various timezones. The following timezones do not have daylight saving time anymore. Asia/Baghdad - last DST in 2007 Asia/Yerevan - last DST in 2011 Europe/Minsk - last DST in 2011 Asia/Yekaterinburg - last DST in 2011 Asia/Novosibirsk - last DST in 2011 Asia/Irkutsk - last DST in 2011 Asia/Krasnoyarsk - last DST in 2011 Europe/Moscow - last DST in 2011, changed in 2014 Asia/Vladivostok - last DST in 2011 Australia/Perth - last DST in 2009 Asia/Yakutsk - last DST in 2011 --- loader/wine.inf.in | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5184155dfadbdcde9ff95…

1 0

Sebastian Lackner : d3d9/tests: Fix compile error with gcc 4.9.
by Alexandre Julliard April 28, 2015

April 28, 2015

Module: wine Branch: master Commit: cf9c3fed1886ccc04784d708e0f1b839d1f9debf URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf9c3fed1886ccc04784d708e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 24 17:03:19 2015 +0200 d3d9/tests: Fix compile error with gcc 4.9. --- dlls/d3d9/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 08362e1..14b80d5 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -540,7 +540,7 @@ done: static void test_specular_lighting(void) { static const unsigned int vertices_side = 5; - static const unsigned int indices_count = (vertices_side - 1) * (vertices_side - 1) * 2 * 3; + const unsigned int indices_count = (vertices_side - 1) * (vertices_side - 1) * 2 * 3; static const DWORD fvf = D3DFVF_XYZ | D3DFVF_NORMAL; static const D3DMATRIX mat = {{{

1 0

Michael Stefaniuc : dmloader: Add and use a generic IPersistStream_GetClassID.
by Alexandre Julliard April 28, 2015

April 28, 2015

Module: wine Branch: master Commit: 8c6c7f6b49bc5b611784695a40410a81a74975c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c6c7f6b49bc5b611784695a4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 28 00:13:38 2015 +0200 dmloader: Add and use a generic IPersistStream_GetClassID. --- dlls/dmloader/container.c | 15 +-------------- dlls/dmloader/dmobject.c | 15 +++++++++++++++ dlls/dmloader/dmobject.h | 2 ++ dlls/dmloader/tests/loader.c | 2 ++ dlls/dmusic/dmobject.c | 15 +++++++++++++++ dlls/dmusic/dmobject.h | 2 ++ 6 files changed, 37 insertions(+), 14 deletions(-) diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index 7356bc8..2e15a71 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -368,19 +368,6 @@ static inline IDirectMusicContainerImpl *impl_from_IPersistStream(IPersistStream return CONTAINING_RECORD(iface, IDirectMusicContainerImpl, dmobj.IPersistStream_iface); } -static HRESULT WINAPI IDirectMusicContainerImpl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { - IDirectMusicContainerImpl *This = impl_from_IPersistStream(iface); - - TRACE("(%p, %p)\n", This, pClassID); - if (IsBadWritePtr (pClassID, sizeof(CLSID))) { - ERR(": pClassID bad write pointer\n"); - return E_POINTER; - } - - *pClassID = CLSID_DirectMusicContainer; - return S_OK; -} - static HRESULT WINAPI IDirectMusicContainerImpl_IPersistStream_Load (LPPERSISTSTREAM iface, IStream* pStm) { IDirectMusicContainerImpl *This = impl_from_IPersistStream(iface); WINE_CHUNK Chunk; @@ -803,7 +790,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_QueryInterface, dmobj_IPersistStream_AddRef, dmobj_IPersistStream_Release, - IDirectMusicContainerImpl_IPersistStream_GetClassID, + dmobj_IPersistStream_GetClassID, unimpl_IPersistStream_IsDirty, IDirectMusicContainerImpl_IPersistStream_Load, unimpl_IPersistStream_Save, diff --git a/dlls/dmloader/dmobject.c b/dlls/dmloader/dmobject.c index 4afd5b9..cabb6f7 100644 --- a/dlls/dmloader/dmobject.c +++ b/dlls/dmloader/dmobject.c @@ -1,5 +1,6 @@ /* * Base IDirectMusicObject Implementation + * Keep in sync with the master in dlls/dmusic/dmobject.c * * Copyright (C) 2003-2004 Rok Mandeljc * Copyright (C) 2014 Michael Stefaniuc @@ -134,6 +135,20 @@ ULONG WINAPI dmobj_IPersistStream_Release(IPersistStream *iface) return IUnknown_Release(This->outer_unk); } +HRESULT WINAPI dmobj_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class) +{ + struct dmobject *This = impl_from_IPersistStream(iface); + + TRACE("(%p, %p)\n", This, class); + + if (!class) + return E_POINTER; + + *class = This->desc.guidClass; + + return S_OK; +} + /* IPersistStream methods not implemented in native */ HRESULT WINAPI unimpl_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class) { diff --git a/dlls/dmloader/dmobject.h b/dlls/dmloader/dmobject.h index 3574939..ad6bf6d 100644 --- a/dlls/dmloader/dmobject.h +++ b/dlls/dmloader/dmobject.h @@ -1,5 +1,6 @@ /* * Base IDirectMusicObject Implementation + * Keep in sync with the master in dlls/dmusic/dmobject.h * * Copyright (C) 2014 Michael Stefaniuc * @@ -42,6 +43,7 @@ HRESULT WINAPI dmobj_IPersistStream_QueryInterface(IPersistStream *iface, REFIID void **ret_iface) DECLSPEC_HIDDEN; ULONG WINAPI dmobj_IPersistStream_AddRef(IPersistStream *iface) DECLSPEC_HIDDEN; ULONG WINAPI dmobj_IPersistStream_Release(IPersistStream *iface) DECLSPEC_HIDDEN; +HRESULT WINAPI dmobj_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class) DECLSPEC_HIDDEN; /* IPersistStream methods not implemented in native */ HRESULT WINAPI unimpl_IPersistStream_GetClassID(IPersistStream *iface, diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index b2ba8fe..4b141f3 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -267,6 +267,8 @@ static void test_container(void) /* IPersistStream */ hr = IDirectMusicContainer_QueryInterface(dmc, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, NULL); + ok(hr == E_POINTER, "IPersistStream_GetClassID failed: %08x\n", hr); hr = IPersistStream_GetClassID(ps, &class); ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); ok(IsEqualGUID(&class, &CLSID_DirectMusicContainer), diff --git a/dlls/dmusic/dmobject.c b/dlls/dmusic/dmobject.c index 4afd5b9..cabb6f7 100644 --- a/dlls/dmusic/dmobject.c +++ b/dlls/dmusic/dmobject.c @@ -1,5 +1,6 @@ /* * Base IDirectMusicObject Implementation + * Keep in sync with the master in dlls/dmusic/dmobject.c * * Copyright (C) 2003-2004 Rok Mandeljc * Copyright (C) 2014 Michael Stefaniuc @@ -134,6 +135,20 @@ ULONG WINAPI dmobj_IPersistStream_Release(IPersistStream *iface) return IUnknown_Release(This->outer_unk); } +HRESULT WINAPI dmobj_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class) +{ + struct dmobject *This = impl_from_IPersistStream(iface); + + TRACE("(%p, %p)\n", This, class); + + if (!class) + return E_POINTER; + + *class = This->desc.guidClass; + + return S_OK; +} + /* IPersistStream methods not implemented in native */ HRESULT WINAPI unimpl_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class) { diff --git a/dlls/dmusic/dmobject.h b/dlls/dmusic/dmobject.h index 3574939..ad6bf6d 100644 --- a/dlls/dmusic/dmobject.h +++ b/dlls/dmusic/dmobject.h @@ -1,5 +1,6 @@ /* * Base IDirectMusicObject Implementation + * Keep in sync with the master in dlls/dmusic/dmobject.h * * Copyright (C) 2014 Michael Stefaniuc * @@ -42,6 +43,7 @@ HRESULT WINAPI dmobj_IPersistStream_QueryInterface(IPersistStream *iface, REFIID void **ret_iface) DECLSPEC_HIDDEN; ULONG WINAPI dmobj_IPersistStream_AddRef(IPersistStream *iface) DECLSPEC_HIDDEN; ULONG WINAPI dmobj_IPersistStream_Release(IPersistStream *iface) DECLSPEC_HIDDEN; +HRESULT WINAPI dmobj_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class) DECLSPEC_HIDDEN; /* IPersistStream methods not implemented in native */ HRESULT WINAPI unimpl_IPersistStream_GetClassID(IPersistStream *iface,

1 0

Michael Stefaniuc : dmloader: Use the generic DirectMusicObject implementation for DMContainer.
by Alexandre Julliard April 28, 2015

April 28, 2015

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

Sebastian Lackner : wine.inf: Fix timezone for Africa/Windhoek.
by Alexandre Julliard April 28, 2015

April 28, 2015

Module: wine Branch: master Commit: ca0ad57f34eb95627c541be2a3d25c7b32c9c319 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca0ad57f34eb95627c541be2a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 28 02:44:30 2015 +0200 wine.inf: Fix timezone for Africa/Windhoek. According to the publicly available information, DST should start on the first Sunday in September, not the second. --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index fc14f4d..c7ab3c5 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2811,7 +2811,7 @@ HKLM,%CurrentVersionNT%\Time Zones\N. Central Asia Standard Time,"TZI",1,98,fe,f HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time,"Display",,"Africa/Windhoek" HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time,"Dlt",,"Namibia Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time,"Std",,"Namibia Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time,"TZI",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Namibia Standard Time,"TZI",1,c4,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,04,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,09,00,00,00,01,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Nepal Standard Time,"Display",,"Asia/Katmandu" HKLM,%CurrentVersionNT%\Time Zones\Nepal Standard Time,"Dlt",,"Nepal Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Nepal Standard Time,"Std",,"Nepal Standard Time"

1 0

Michael Stefaniuc : dmscript: Get rid of the extra pointer to a DMUS_OBJECTDESC.
by Alexandre Julliard April 28, 2015

April 28, 2015

Module: wine Branch: master Commit: 26623d30f4d51a9925ae858cffefef3b4b3e1158 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26623d30f4d51a9925ae858cf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 28 00:17:31 2015 +0200 dmscript: Get rid of the extra pointer to a DMUS_OBJECTDESC. --- dlls/dmscript/script.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index 78273c6..98b9759 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -40,7 +40,6 @@ typedef struct IDirectMusicScriptImpl { struct dmobject dmobj; LONG ref; IDirectMusicPerformance *pPerformance; - DMUS_OBJECTDESC *pDesc; DMUS_IO_SCRIPT_HEADER *pHeader; DMUS_IO_VERSION *pVersion; WCHAR *pwzLanguage; @@ -98,7 +97,6 @@ static ULONG WINAPI IDirectMusicScriptImpl_Release(IDirectMusicScript *iface) HeapFree(GetProcessHeap(), 0, This->pVersion); HeapFree(GetProcessHeap(), 0, This->pwzLanguage); HeapFree(GetProcessHeap(), 0, This->pwzSource); - HeapFree(GetProcessHeap(), 0, This->pDesc); HeapFree(GetProcessHeap(), 0, This); DMSCRIPT_UnlockModule(); } @@ -439,20 +437,20 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS } case DMUS_FOURCC_GUID_CHUNK: { TRACE_(dmfile)(": GUID chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_OBJECT; - IStream_Read (pStm, &This->pDesc->guidObject, Chunk.dwSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_OBJECT; + IStream_Read (pStm, &This->dmobj.desc.guidObject, Chunk.dwSize, NULL); break; } case DMUS_FOURCC_VERSION_CHUNK: { TRACE_(dmfile)(": version chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_VERSION; - IStream_Read (pStm, &This->pDesc->vVersion, Chunk.dwSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_VERSION; + IStream_Read (pStm, &This->dmobj.desc.vVersion, Chunk.dwSize, NULL); break; } case DMUS_FOURCC_CATEGORY_CHUNK: { TRACE_(dmfile)(": category chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_CATEGORY; - IStream_Read (pStm, This->pDesc->wszCategory, Chunk.dwSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_CATEGORY; + IStream_Read (pStm, This->dmobj.desc.wszCategory, Chunk.dwSize, NULL); break; } case FOURCC_RIFF: { @@ -520,8 +518,8 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS case mmioFOURCC('I','N','A','M'): case DMUS_FOURCC_UNAM_CHUNK: { TRACE_(dmfile)(": name chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_NAME; - IStream_Read (pStm, This->pDesc->wszName, Chunk.dwSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_NAME; + IStream_Read (pStm, This->dmobj.desc.wszName, Chunk.dwSize, NULL); break; } case mmioFOURCC('I','A','R','T'): @@ -635,7 +633,6 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl(REFIID lpcGUID, void **ppobj, dmobject_init(&obj->dmobj, &CLSID_DirectMusicScript, (IUnknown*)&obj->IDirectMusicScript_iface); obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl; obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - obj->pDesc = &obj->dmobj.desc; DMSCRIPT_LockModule(); hr = IDirectMusicScript_QueryInterface(&obj->IDirectMusicScript_iface, lpcGUID, ppobj);

1 0

Michael Stefaniuc : dmloader: Remove superfluous "IDirectMusicContainer" from method names.
by Alexandre Julliard April 28, 2015

April 28, 2015

Module: wine Branch: master Commit: 149859b00290f229242ac28c61b245283b9c3f85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=149859b00290f229242ac28c6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 28 00:14:10 2015 +0200 dmloader: Remove superfluous "IDirectMusicContainer" from method names. --- dlls/dmloader/container.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index 2e15a71..ab43c6b 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -184,7 +184,9 @@ static inline IDirectMusicContainerImpl *impl_from_IDirectMusicObject(IDirectMus return CONTAINING_RECORD(iface, IDirectMusicContainerImpl, dmobj.IDirectMusicObject_iface); } -static HRESULT WINAPI IDirectMusicContainerImpl_IDirectMusicObject_ParseDescriptor (LPDIRECTMUSICOBJECT iface, LPSTREAM pStream, LPDMUS_OBJECTDESC pDesc) { +static HRESULT WINAPI IDirectMusicObjectImpl_ParseDescriptor(IDirectMusicObject *iface, + IStream *pStream, DMUS_OBJECTDESC *pDesc) +{ IDirectMusicContainerImpl *This = impl_from_IDirectMusicObject(iface); WINE_CHUNK Chunk; DWORD StreamSize, StreamCount, ListSize[1], ListCount[1]; @@ -359,7 +361,7 @@ static const IDirectMusicObjectVtbl dmobject_vtbl = { dmobj_IDirectMusicObject_Release, dmobj_IDirectMusicObject_GetDescriptor, dmobj_IDirectMusicObject_SetDescriptor, - IDirectMusicContainerImpl_IDirectMusicObject_ParseDescriptor + IDirectMusicObjectImpl_ParseDescriptor }; /* IPersistStream part: */ @@ -368,7 +370,8 @@ static inline IDirectMusicContainerImpl *impl_from_IPersistStream(IPersistStream return CONTAINING_RECORD(iface, IDirectMusicContainerImpl, dmobj.IPersistStream_iface); } -static HRESULT WINAPI IDirectMusicContainerImpl_IPersistStream_Load (LPPERSISTSTREAM iface, IStream* pStm) { +static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm) +{ IDirectMusicContainerImpl *This = impl_from_IPersistStream(iface); WINE_CHUNK Chunk; DWORD StreamSize, StreamCount, ListSize[3], ListCount[3]; @@ -792,7 +795,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_Release, dmobj_IPersistStream_GetClassID, unimpl_IPersistStream_IsDirty, - IDirectMusicContainerImpl_IPersistStream_Load, + IPersistStreamImpl_Load, unimpl_IPersistStream_Save, unimpl_IPersistStream_GetSizeMax };

1 0

Mark Harmstone : uxtheme: Stub out buffered painting functions.
by Alexandre Julliard April 28, 2015

April 28, 2015

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 : dmscript: Use the generic DirectMusicObject implementation for DMScript.
by Alexandre Julliard April 28, 2015

April 28, 2015

Module: wine Branch: master Commit: 71b28e2e1c80fa9a12e98179ed36ba77a8cb234e URL: http://source.winehq.org/git/wine.git/?a=commit;h=71b28e2e1c80fa9a12e98179e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 28 00:15:18 2015 +0200 dmscript: Use the generic DirectMusicObject implementation for DMScript. --- dlls/dmscript/Makefile.in | 1 + dlls/dmscript/dmobject.c | 185 +++++++++++++++++++++++++++++++++++++++ dlls/dmscript/dmobject.h | 55 ++++++++++++ dlls/dmscript/dmscript_private.h | 9 -- dlls/dmscript/script.c | 154 ++++++++------------------------ 5 files changed, 278 insertions(+), 126 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71b28e2e1c80fa9a12e98…

1 0

Sebastian Lackner : wine.inf: Fix timezone for America/St_Johns.
by Alexandre Julliard April 28, 2015

April 28, 2015

Module: wine Branch: master Commit: 39431ecedfa8a336d6ca1fa6827374beeb81944c URL: http://source.winehq.org/git/wine.git/?a=commit;h=39431ecedfa8a336d6ca1fa68… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 28 02:45:03 2015 +0200 wine.inf: Fix timezone for America/St_Johns. Clocks are changed at 02:00 and not 00:01. --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index c7ab3c5..ca71aef 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2823,7 +2823,7 @@ HKLM,%CurrentVersionNT%\Time Zones\New Zealand Standard Time,"TZI",1,30,fd,ff,ff HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time,"Display",,"America/St_Johns" HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time,"Dlt",,"Newfoundland Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time,"Std",,"Newfoundland Standard Time" -HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time,"TZI",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,00,00,01,00,00,00,00,00,00,00,03,00,00,00,02,00,00,00,01,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Newfoundland Standard Time,"TZI",1,d2,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time,"Display",,"Asia/Irkutsk" HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time,"Dlt",,"North Asia East Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\North Asia East Standard Time,"Std",,"North Asia East Standard Time"

1 0

Michael Stefaniuc : dmloader/tests: Add more DirectMusicCollection tests.
by Alexandre Julliard April 28, 2015

April 28, 2015

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

Nikolay Sivov : dmime: Don't expose IDirectMusicAudioPath impl details.
by Alexandre Julliard April 28, 2015

April 28, 2015

Module: wine Branch: master Commit: b3d1b1f239a5b534cd1b9a50fbfef32733b1911f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3d1b1f239a5b534cd1b9a50f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 27 01:49:04 2015 +0300 dmime: Don't expose IDirectMusicAudioPath impl details. --- dlls/dmime/audiopath.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/dmime/dmime_private.h | 25 +++---------------------- dlls/dmime/performance.c | 39 +++++++++++++++------------------------ 3 files changed, 56 insertions(+), 46 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index 66e218c..bd789c2 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -22,6 +22,43 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); WINE_DECLARE_DEBUG_CHANNEL(dmfile); +struct IDirectMusicAudioPathImpl { + /* IUnknown fields */ + const IUnknownVtbl *UnknownVtbl; + const IDirectMusicAudioPathVtbl *AudioPathVtbl; + const IDirectMusicObjectVtbl *ObjectVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + + /* IDirectMusicAudioPathImpl fields */ + LPDMUS_OBJECTDESC pDesc; + + IDirectMusicPerformance8* pPerf; + IDirectMusicGraph* pToolGraph; + IDirectSoundBuffer* pDSBuffer; + IDirectSoundBuffer* pPrimary; + + BOOL fActive; +}; + +void set_audiopath_perf_pointer(IDirectMusicAudioPath *iface, IDirectMusicPerformance8 *performance) +{ + ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, AudioPathVtbl, iface); + This->pPerf = performance; +} + +void set_audiopath_dsound_buffer(IDirectMusicAudioPath *iface, IDirectSoundBuffer *buffer) +{ + ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, AudioPathVtbl, iface); + This->pDSBuffer = buffer; +} + +void set_audiopath_primary_dsound_buffer(IDirectMusicAudioPath *iface, IDirectSoundBuffer *buffer) +{ + ICOM_THIS_MULTI(IDirectMusicAudioPathImpl, AudioPathVtbl, iface); + This->pPrimary = buffer; +} + /***************************************************************************** * IDirectMusicAudioPathImpl implementation */ @@ -72,6 +109,7 @@ static ULONG WINAPI IDirectMusicAudioPathImpl_IUnknown_Release (LPUNKNOWN iface) if (This->pDSBuffer) { IDirectSoundBuffer8_Release(This->pDSBuffer); } + This->pPerf = NULL; HeapFree(GetProcessHeap(), 0, This); } diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index 35b51a2..fa44a4d 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -78,6 +78,9 @@ extern HRESULT WINAPI create_dmtempotrack(REFIID riid, void **ret_iface) DECLSPE extern HRESULT WINAPI create_dmtimesigtrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; extern HRESULT WINAPI create_dmwavetrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern void set_audiopath_perf_pointer(IDirectMusicAudioPath*,IDirectMusicPerformance8*) DECLSPEC_HIDDEN; +extern void set_audiopath_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*) DECLSPEC_HIDDEN; +extern void set_audiopath_primary_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*) DECLSPEC_HIDDEN; /***************************************************************************** * Auxiliary definitions @@ -121,28 +124,6 @@ typedef struct DMUSIC_PRIVATE_PCHANNEL_ { } DMUSIC_PRIVATE_PCHANNEL, *LPDMUSIC_PRIVATE_PCHANNEL; /***************************************************************************** - * IDirectMusicAudioPathImpl implementation structure - */ -struct IDirectMusicAudioPathImpl { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicAudioPathVtbl *AudioPathVtbl; - const IDirectMusicObjectVtbl *ObjectVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicAudioPathImpl fields */ - LPDMUS_OBJECTDESC pDesc; - - IDirectMusicPerformance8* pPerf; - IDirectMusicGraph* pToolGraph; - IDirectSoundBuffer* pDSBuffer; - IDirectSoundBuffer* pPrimary; - - BOOL fActive; -}; - -/***************************************************************************** * IDirectMusicLyricsTrack implementation structure */ struct IDirectMusicLyricsTrack diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 25e86f9..b8c37b0 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -987,7 +987,6 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateAudioPath(IDirectMusicP IUnknown *pSourceConfig, BOOL fActivate, IDirectMusicAudioPath **ppNewPath) { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - IDirectMusicAudioPathImpl *default_path; IDirectMusicAudioPath *pPath; FIXME("(%p, %p, %d, %p): stub\n", This, pSourceConfig, fActivate, ppNewPath); @@ -997,8 +996,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateAudioPath(IDirectMusicP } create_dmaudiopath(&IID_IDirectMusicAudioPath, (void**)&pPath); - default_path = (IDirectMusicAudioPathImpl*)((char*)(pPath) - offsetof(IDirectMusicAudioPathImpl,AudioPathVtbl)); - default_path->pPerf = &This->IDirectMusicPerformance8_iface; + set_audiopath_perf_pointer(pPath, iface); /** TODO */ @@ -1011,11 +1009,10 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire DWORD dwType, DWORD dwPChannelCount, BOOL fActivate, IDirectMusicAudioPath **ppNewPath) { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - IDirectMusicAudioPathImpl *default_path; IDirectMusicAudioPath *pPath; DSBUFFERDESC desc; WAVEFORMATEX format; - LPDIRECTSOUNDBUFFER buffer; + IDirectSoundBuffer *buffer, *primary_buffer; HRESULT hr = S_OK; FIXME("(%p)->(%d, %d, %d, %p): semi-stub\n", This, dwType, dwPChannelCount, fActivate, ppNewPath); @@ -1024,9 +1021,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire return E_POINTER; } - create_dmaudiopath(&IID_IDirectMusicAudioPath, (void**)&pPath); - default_path = (IDirectMusicAudioPathImpl*)((char*)(pPath) - offsetof(IDirectMusicAudioPathImpl,AudioPathVtbl)); - default_path->pPerf = &This->IDirectMusicPerformance8_iface; + *ppNewPath = NULL; /* Secondary buffer description */ memset(&format, 0, sizeof(format)); @@ -1064,33 +1059,29 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire format.nAvgBytesPerSec *=2; break; default: - HeapFree(GetProcessHeap(), 0, default_path); - *ppNewPath = NULL; return E_INVALIDARG; } /* FIXME: Should we create one secondary buffer for each PChannel? */ hr = IDirectSound8_CreateSoundBuffer ((LPDIRECTSOUND8) This->pDirectSound, &desc, &buffer, NULL); - if (FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, default_path); - *ppNewPath = NULL; + if (FAILED(hr)) return DSERR_BUFFERLOST; - } - default_path->pDSBuffer = buffer; /* Update description for creating primary buffer */ desc.dwFlags |= DSBCAPS_PRIMARYBUFFER; desc.dwBufferBytes = 0; desc.lpwfxFormat = NULL; - hr = IDirectSound8_CreateSoundBuffer ((LPDIRECTSOUND8) This->pDirectSound, &desc, &buffer, NULL); + hr = IDirectSound8_CreateSoundBuffer ((LPDIRECTSOUND8) This->pDirectSound, &desc, &primary_buffer, NULL); if (FAILED(hr)) { - IDirectSoundBuffer_Release(default_path->pDSBuffer); - HeapFree(GetProcessHeap(), 0, default_path); - *ppNewPath = NULL; + IDirectSoundBuffer_Release(buffer); return DSERR_BUFFERLOST; } - default_path->pPrimary = buffer; + + create_dmaudiopath(&IID_IDirectMusicAudioPath, (void**)&pPath); + set_audiopath_perf_pointer(pPath, iface); + set_audiopath_dsound_buffer(pPath, buffer); + set_audiopath_primary_dsound_buffer(pPath, buffer); *ppNewPath = pPath; @@ -1105,15 +1096,15 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_SetDefaultAudioPath(IDirectMu IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); FIXME("(%p, %p): semi-stub\n", This, pAudioPath); - if (NULL != This->pDefaultPath) { + + if (This->pDefaultPath) { IDirectMusicAudioPath_Release(This->pDefaultPath); - ((IDirectMusicAudioPathImpl*) This->pDefaultPath)->pPerf = NULL; This->pDefaultPath = NULL; } This->pDefaultPath = pAudioPath; - if (NULL != This->pDefaultPath) { + if (This->pDefaultPath) { IDirectMusicAudioPath_AddRef(This->pDefaultPath); - ((IDirectMusicAudioPathImpl*)This->pDefaultPath)->pPerf = &This->IDirectMusicPerformance8_iface; + set_audiopath_perf_pointer(This->pDefaultPath, iface); } return S_OK;

1 0

Michael Müller : ntdll: Add support for Dynamic DST ( daylight saving time) information in registry.
by Alexandre Julliard April 28, 2015

April 28, 2015

Module: wine Branch: master Commit: 7567db85be228f6a88de070d8ce4fa802581cd67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7567db85be228f6a88de070d8… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Jul 24 01:27:16 2014 +0200 ntdll: Add support for Dynamic DST (daylight saving time) information in registry. --- dlls/ntdll/time.c | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 69bd736..65bd2b6 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -592,11 +592,23 @@ static void find_reg_tz_info(RTL_TIME_ZONE_INFORMATION *tzi) 'W','i','n','d','o','w','s',' ','N','T','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'T','i','m','e',' ','Z','o','n','e','s',0 }; + static const WCHAR Dynamic_DstW[] = { 'D','y','n','a','m','i','c',' ','D','S','T',0 }; + static const WCHAR fmtW[] = { '%','d',0 }; HANDLE hkey; ULONG idx; - OBJECT_ATTRIBUTES attr; - UNICODE_STRING nameW; - WCHAR buf[128]; + OBJECT_ATTRIBUTES attr, attrDynamic; + UNICODE_STRING nameW, nameDynamicW; + WCHAR buf[128], yearW[16]; + + sprintfW(yearW, fmtW, tzi->DaylightDate.wYear); + + attrDynamic.Length = sizeof(attrDynamic); + attrDynamic.RootDirectory = 0; /* will be replaced later */ + attrDynamic.ObjectName = &nameDynamicW; + attrDynamic.Attributes = 0; + attrDynamic.SecurityDescriptor = NULL; + attrDynamic.SecurityQualityOfService = NULL; + RtlInitUnicodeString(&nameDynamicW, Dynamic_DstW); attr.Length = sizeof(attr); attr.RootDirectory = 0; @@ -622,7 +634,9 @@ static void find_reg_tz_info(RTL_TIME_ZONE_INFORMATION *tzi) static const WCHAR dltW[] = { 'D','l','t',0 }; static const WCHAR tziW[] = { 'T','Z','I',0 }; RTL_TIME_ZONE_INFORMATION reg_tzi; - HANDLE hSubkey; + HANDLE hSubkey, hSubkeyDynamicDST; + BOOL is_dynamic = FALSE; + struct tz_reg_data { LONG bias; @@ -654,7 +668,17 @@ static void find_reg_tz_info(RTL_TIME_ZONE_INFORMATION *tzi) get_value(hSubkey, stdW, REG_SZ, reg_tzi.StandardName, sizeof(reg_tzi.StandardName)); get_value(hSubkey, dltW, REG_SZ, reg_tzi.DaylightName, sizeof(reg_tzi.DaylightName)); - get_value(hSubkey, tziW, REG_BINARY, &tz_data, sizeof(tz_data)); + + /* Check for Dynamic DST entry first */ + attrDynamic.RootDirectory = hSubkey; + if (!NtOpenKey(&hSubkeyDynamicDST, KEY_READ, &attrDynamic)) + { + is_dynamic = reg_query_value(hSubkeyDynamicDST, yearW, REG_BINARY, &tz_data, sizeof(tz_data)); + NtClose(hSubkeyDynamicDST); + } + + if (!is_dynamic) + get_value(hSubkey, tziW, REG_BINARY, &tz_data, sizeof(tz_data)); #undef get_value

1 0

Henri Verbeet : wined3d: Cleanup the sampler map in shader_cleanup() ( Valgrind).
by Alexandre Julliard April 28, 2015

April 28, 2015

Module: wine Branch: master Commit: f09288cfc48a7f14689e6cbb142d07fd31bfcdd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f09288cfc48a7f14689e6cbb1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 27 16:39:36 2015 +0200 wined3d: Cleanup the sampler map in shader_cleanup() (Valgrind). --- dlls/wined3d/shader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d9ff768..87a22c2 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1866,6 +1866,7 @@ static void shader_cleanup(struct wined3d_shader *shader) HeapFree(GetProcessHeap(), 0, shader->signature_strings); shader->device->shader_backend->shader_destroy(shader); HeapFree(GetProcessHeap(), 0, shader->reg_maps.constf); + HeapFree(GetProcessHeap(), 0, shader->reg_maps.sampler_map.entries); HeapFree(GetProcessHeap(), 0, shader->function); shader_delete_constant_list(&shader->constantsF); shader_delete_constant_list(&shader->constantsB);

1 0

Jacek Caban : ws2_32: Avoid overflows in get_rcvsnd_timeo.
by Alexandre Julliard April 28, 2015

April 28, 2015

Module: wine Branch: master Commit: 9e3a3f46fae62e758d75c8eca46c7b79f7930de7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e3a3f46fae62e758d75c8eca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 27 16:00:37 2015 +0200 ws2_32: Avoid overflows in get_rcvsnd_timeo. --- dlls/ws2_32/socket.c | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 95ea83c..d6bfa94 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1251,30 +1251,28 @@ static char *strdup_lower(const char *str) /* Utility: get the SO_RCVTIMEO or SO_SNDTIMEO socket option * from an fd and return the value converted to milli seconds - * or -1 if there is an infinite time out */ -static inline int get_rcvsnd_timeo( int fd, int optname) + * or 0 if there is an infinite time out */ +static inline INT64 get_rcvsnd_timeo( int fd, int optname) { struct timeval tv; socklen_t len = sizeof(tv); - int ret = getsockopt(fd, SOL_SOCKET, optname, &tv, &len); - if( ret >= 0) - ret = tv.tv_sec * 1000 + tv.tv_usec / 1000; - if( ret <= 0 ) /* tv == {0,0} means infinite time out */ - return -1; - return ret; + int res = getsockopt(fd, SOL_SOCKET, optname, &tv, &len); + if (res < 0) + return 0; + return (UINT64)tv.tv_sec * 1000 + tv.tv_usec / 1000; } /* macro wrappers for portability */ #ifdef SO_RCVTIMEO #define GET_RCVTIMEO(fd) get_rcvsnd_timeo( (fd), SO_RCVTIMEO) #else -#define GET_RCVTIMEO(fd) (-1) +#define GET_RCVTIMEO(fd) (0) #endif #ifdef SO_SNDTIMEO #define GET_SNDTIMEO(fd) get_rcvsnd_timeo( (fd), SO_SNDTIMEO) #else -#define GET_SNDTIMEO(fd) (-1) +#define GET_SNDTIMEO(fd) (0) #endif /* utility: given an fd, will block until one of the events occurs */ @@ -5076,18 +5074,20 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, while (wsa->first_iovec < wsa->n_iovecs) { struct pollfd pfd; - int timeout = GET_SNDTIMEO(fd); + int poll_timeout = -1; + INT64 timeout = GET_SNDTIMEO(fd); - if (timeout != -1) + if (timeout) { timeout -= GetTickCount() - timeout_start; - if (timeout < 0) timeout = 0; + if (timeout < 0) poll_timeout = 0; + else poll_timeout = timeout <= INT_MAX ? timeout : INT_MAX; } pfd.fd = fd; pfd.events = POLLOUT; - if (!timeout || !poll( &pfd, 1, timeout )) + if (!poll_timeout || !poll( &pfd, 1, poll_timeout )) { err = WSAETIMEDOUT; goto error; /* msdn says a timeout in send is fatal */ @@ -7130,18 +7130,21 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, if ( is_blocking ) { struct pollfd pfd; - int timeout = GET_RCVTIMEO(fd); - if (timeout != -1) + int poll_timeout = -1; + INT64 timeout = GET_RCVTIMEO(fd); + + if (timeout) { timeout -= GetTickCount() - timeout_start; - if (timeout < 0) timeout = 0; + if (timeout < 0) poll_timeout = 0; + else poll_timeout = timeout <= INT_MAX ? timeout : INT_MAX; } pfd.fd = fd; pfd.events = POLLIN; if (*lpFlags & WS_MSG_OOB) pfd.events |= POLLPRI; - if (!timeout || !poll( &pfd, 1, timeout )) + if (!poll_timeout || !poll( &pfd, 1, poll_timeout )) { err = WSAETIMEDOUT; /* a timeout is not fatal */

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_brush_SetExtendModeY().
by Alexandre Julliard April 28, 2015

April 28, 2015

Module: wine Branch: master Commit: 0a02f346f64a88b3331056ded3c519752cd36377 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a02f346f64a88b3331056ded… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 27 16:39:34 2015 +0200 d2d1: Implement d2d_bitmap_brush_SetExtendModeY(). --- dlls/d2d1/brush.c | 15 +++++++++++++-- dlls/d2d1/d2d1_private.h | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 575675e..309d234 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -569,7 +569,16 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_SetExtendModeX(ID2D1BitmapBrush * static void STDMETHODCALLTYPE d2d_bitmap_brush_SetExtendModeY(ID2D1BitmapBrush *iface, D2D1_EXTEND_MODE mode) { - FIXME("iface %p, mode %#x stub!\n", iface, mode); + struct d2d_brush *brush = impl_from_ID2D1BitmapBrush(iface); + + TRACE("iface %p, mode %#x.\n", iface, mode); + + brush->u.bitmap.extend_mode_y = mode; + if (brush->u.bitmap.sampler_state) + { + ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); + brush->u.bitmap.sampler_state = NULL; + } } static void STDMETHODCALLTYPE d2d_bitmap_brush_SetInterpolationMode(ID2D1BitmapBrush *iface, @@ -659,11 +668,13 @@ HRESULT d2d_bitmap_brush_init(struct d2d_brush *brush, struct d2d_d3d_render_tar if (bitmap_brush_desc) { brush->u.bitmap.extend_mode_x = bitmap_brush_desc->extendModeX; + brush->u.bitmap.extend_mode_y = bitmap_brush_desc->extendModeY; brush->u.bitmap.interpolation_mode = bitmap_brush_desc->interpolationMode; } else { brush->u.bitmap.extend_mode_x = D2D1_EXTEND_MODE_CLAMP; + brush->u.bitmap.extend_mode_y = D2D1_EXTEND_MODE_CLAMP; brush->u.bitmap.interpolation_mode = D2D1_BITMAP_INTERPOLATION_MODE_LINEAR; } @@ -712,7 +723,7 @@ void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device) else sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_LINEAR; sampler_desc.AddressU = texture_addres_mode_from_extend_mode(brush->u.bitmap.extend_mode_x); - sampler_desc.AddressV = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressV = texture_addres_mode_from_extend_mode(brush->u.bitmap.extend_mode_y); sampler_desc.AddressW = D3D10_TEXTURE_ADDRESS_CLAMP; sampler_desc.MipLODBias = 0.0f; sampler_desc.MaxAnisotropy = 0; diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index b5820d0..447a136 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -126,6 +126,7 @@ struct d2d_brush { struct d2d_bitmap *bitmap; D2D1_EXTEND_MODE extend_mode_x; + D2D1_EXTEND_MODE extend_mode_y; D2D1_BITMAP_INTERPOLATION_MODE interpolation_mode; ID3D10SamplerState *sampler_state; } bitmap;

1 0