wine-commits April 2015

wine-commits@winehq.org

2 participants
451 discussions

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/… [View More]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; } [View Less]

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/… [View More]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 */ /***************************************************************************** [View Less]

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 +… [View More]

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 ++++++++… [View More]

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 +++++++---… [View More]---- 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; }; [View Less]

1 0

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 ++++---- … [View More]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"); [View Less]

1 0

Matteo Bruni : wined3d: Set spotlight direction .w component to 0.0f.
by Alexandre Julliard 28 Apr '15

28 Apr '15

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(… [View More]

1 0

Alexandre Julliard : riched20: Update rectangle on WM_WINDOWPOSCHANGED instead of WM_SIZE.
by Alexandre Julliard 28 Apr '15

28 Apr '15

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/… [View More]

1 0

Nikolay Sivov : dmime: Don't expose IDirectMusicAudioPath impl details.
by Alexandre Julliard 28 Apr '15

28 Apr '15

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 +++++++++++++++-… [View More]----------------------- 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; [View Less]

1 0

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

28 Apr '15

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/… [View More]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 [View Less]

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2015