December 2009 - Wine-commits

James Hawkins : msi: Refactor the Installer. SummaryInformation method to InstallerImpl_SummaryInformation.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 18ba830ff8f16395ad43da996b995d6ea8113bf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18ba830ff8f16395ad43da996… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 10 17:02:16 2009 -0800 msi: Refactor the Installer.SummaryInformation method to InstallerImpl_SummaryInformation. --- dlls/msi/automation.c | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 30cdc54..0d42382 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1696,6 +1696,21 @@ done: return hr; } +static HRESULT InstallerImpl_SummaryInformation(WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + if (!(wFlags & DISPATCH_METHOD)) + return DISP_E_MEMBERNOTFOUND; + + FIXME("\n"); + + VariantInit(pVarResult); + return S_OK; +} + static HRESULT WINAPI InstallerImpl_Invoke( AutomationObject* This, DISPID dispIdMember, @@ -1738,13 +1753,9 @@ static HRESULT WINAPI InstallerImpl_Invoke( pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_SUMMARYINFORMATION: - if (wFlags & DISPATCH_METHOD) - { - VariantInit(pVarResult); - FIXME("Unhandled method: SummaryInformation"); - } - else return DISP_E_MEMBERNOTFOUND; - break; + return InstallerImpl_SummaryInformation(wFlags, pDispParams, + pVarResult, pExcepInfo, + puArgErr); case DISPID_INSTALLER_UILEVEL: if (wFlags & DISPATCH_PROPERTYPUT)

1 0

James Hawkins : msi: Refactor the Installer. UILevel method into InstallerImpl_UILevel.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: dc0889752ae6a08303bfcb7c4d2013635e870f79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc0889752ae6a08303bfcb7c4… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 10 17:02:24 2009 -0800 msi: Refactor the Installer.UILevel method into InstallerImpl_UILevel. --- dlls/msi/automation.c | 63 ++++++++++++++++++++++++++++++------------------ 1 files changed, 39 insertions(+), 24 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 0d42382..674bd8d 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1711,6 +1711,43 @@ static HRESULT InstallerImpl_SummaryInformation(WORD wFlags, return S_OK; } +static HRESULT InstallerImpl_UILevel(WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + HRESULT hr; + VARIANTARG varg0; + INSTALLUILEVEL ui; + + if (!(wFlags & DISPATCH_PROPERTYPUT) && !(wFlags & DISPATCH_PROPERTYGET)) + return DISP_E_MEMBERNOTFOUND; + + if (wFlags & DISPATCH_PROPERTYPUT) + { + VariantInit(&varg0); + hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); + if (FAILED(hr)) + return hr; + + ui = MsiSetInternalUI(V_I4(&varg0), NULL); + if (ui == INSTALLUILEVEL_NOCHANGE) + return DISP_E_EXCEPTION; + } + else if (wFlags & DISPATCH_PROPERTYGET) + { + ui = MsiSetInternalUI(INSTALLUILEVEL_NOCHANGE, NULL); + if (ui == INSTALLUILEVEL_NOCHANGE) + return DISP_E_EXCEPTION; + + V_VT(pVarResult) = VT_I4; + V_I4(pVarResult) = ui; + } + + return S_OK; +} + static HRESULT WINAPI InstallerImpl_Invoke( AutomationObject* This, DISPID dispIdMember, @@ -1728,7 +1765,6 @@ static HRESULT WINAPI InstallerImpl_Invoke( HRESULT hr; LPWSTR szString = NULL; DWORD dwSize = 0; - INSTALLUILEVEL ui; VariantInit(&varg0); VariantInit(&varg1); @@ -1758,29 +1794,8 @@ static HRESULT WINAPI InstallerImpl_Invoke( puArgErr); case DISPID_INSTALLER_UILEVEL: - if (wFlags & DISPATCH_PROPERTYPUT) - { - hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); - if (FAILED(hr)) return hr; - if ((ui = MsiSetInternalUI(V_I4(&varg0), NULL) == INSTALLUILEVEL_NOCHANGE)) - { - ERR("MsiSetInternalUI failed\n"); - return DISP_E_EXCEPTION; - } - } - else if (wFlags & DISPATCH_PROPERTYGET) - { - if ((ui = MsiSetInternalUI(INSTALLUILEVEL_NOCHANGE, NULL) == INSTALLUILEVEL_NOCHANGE)) - { - ERR("MsiSetInternalUI failed\n"); - return DISP_E_EXCEPTION; - } - - V_VT(pVarResult) = VT_I4; - V_I4(pVarResult) = ui; - } - else return DISP_E_MEMBERNOTFOUND; - break; + return InstallerImpl_UILevel(wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_ENABLELOG: if (wFlags & DISPATCH_METHOD)

1 0

James Hawkins : msi: Refactor the remaining Installer object stub methods into respective functions .
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 851e4779be4c76f46b5eec4eed2e7bc2ee6c2230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=851e4779be4c76f46b5eec4ee… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 10 17:02:32 2009 -0800 msi: Refactor the remaining Installer object stub methods into respective functions. --- dlls/msi/automation.c | 146 +++++++++++++++++++++++++++++++++++-------------- 1 files changed, 104 insertions(+), 42 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 674bd8d..1e25ec9 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1748,6 +1748,96 @@ static HRESULT InstallerImpl_UILevel(WORD wFlags, return S_OK; } +static HRESULT InstallerImpl_EnableLog(WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + if (!(wFlags & DISPATCH_METHOD)) + return DISP_E_MEMBERNOTFOUND; + + FIXME("\n"); + + VariantInit(pVarResult); + return S_OK; +} + +static HRESULT InstallerImpl_LastErrorRecord(WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + if (!(wFlags & DISPATCH_METHOD)) + return DISP_E_MEMBERNOTFOUND; + + FIXME("\n"); + + VariantInit(pVarResult); + return S_OK; +} + +static HRESULT InstallerImpl_Environment(WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + if (!(wFlags & DISPATCH_METHOD)) + return DISP_E_MEMBERNOTFOUND; + + FIXME("\n"); + + VariantInit(pVarResult); + return S_OK; +} + +static HRESULT InstallerImpl_FileAttributes(WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + if (!(wFlags & DISPATCH_METHOD)) + return DISP_E_MEMBERNOTFOUND; + + FIXME("\n"); + + VariantInit(pVarResult); + return S_OK; +} + +static HRESULT InstallerImpl_FileSize(WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + if (!(wFlags & DISPATCH_METHOD)) + return DISP_E_MEMBERNOTFOUND; + + FIXME("\n"); + + VariantInit(pVarResult); + return S_OK; +} + +static HRESULT InstallerImpl_FileVersion(WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + if (!(wFlags & DISPATCH_METHOD)) + return DISP_E_MEMBERNOTFOUND; + + FIXME("\n"); + + VariantInit(pVarResult); + return S_OK; +} + static HRESULT WINAPI InstallerImpl_Invoke( AutomationObject* This, DISPID dispIdMember, @@ -1798,13 +1888,8 @@ static HRESULT WINAPI InstallerImpl_Invoke( pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_ENABLELOG: - if (wFlags & DISPATCH_METHOD) - { - VariantInit(pVarResult); - FIXME("Unhandled method: EnableLog"); - } - else return DISP_E_MEMBERNOTFOUND; - break; + return InstallerImpl_EnableLog(wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_INSTALLPRODUCT: if (wFlags & DISPATCH_METHOD) @@ -1849,13 +1934,9 @@ static HRESULT WINAPI InstallerImpl_Invoke( break; case DISPID_INSTALLER_LASTERRORRECORD: - if (wFlags & DISPATCH_METHOD) - { - VariantInit(pVarResult); - FIXME("Unhandled method: LastErrorRecord"); - } - else return DISP_E_MEMBERNOTFOUND; - break; + return InstallerImpl_LastErrorRecord(wFlags, pDispParams, + pVarResult, pExcepInfo, + puArgErr); case DISPID_INSTALLER_REGISTRYVALUE: if (wFlags & DISPATCH_METHOD) { @@ -1952,40 +2033,21 @@ static HRESULT WINAPI InstallerImpl_Invoke( break; case DISPID_INSTALLER_ENVIRONMENT: - if (wFlags & DISPATCH_PROPERTYGET || wFlags & DISPATCH_PROPERTYPUT) - { - VariantInit(pVarResult); - FIXME("Unhandled property: Environment"); - } - else return DISP_E_MEMBERNOTFOUND; - break; + return InstallerImpl_Environment(wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_FILEATTRIBUTES: - if (wFlags & DISPATCH_METHOD) - { - VariantInit(pVarResult); - FIXME("Unhandled method: FileAttributes"); - } - else return DISP_E_MEMBERNOTFOUND; - break; + return InstallerImpl_FileAttributes(wFlags, pDispParams, + pVarResult, pExcepInfo, + puArgErr); case DISPID_INSTALLER_FILESIZE: - if (wFlags & DISPATCH_METHOD) - { - VariantInit(pVarResult); - FIXME("Unhandled method: FileSize"); - } - else return DISP_E_MEMBERNOTFOUND; - break; + return InstallerImpl_FileSize(wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_FILEVERSION: - if (wFlags & DISPATCH_METHOD) - { - VariantInit(pVarResult); - FIXME("Unhandled method: FileVersion"); - } - else return DISP_E_MEMBERNOTFOUND; - break; + return InstallerImpl_FileVersion(wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_PRODUCTSTATE: if (wFlags & DISPATCH_PROPERTYGET) {

1 0

James Hawkins : msi: Refactor the Installer. InstallProduct method into InstallerImpl_InstallProduct.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 96c480b880fe9c696791a074286d47fded32eeee URL: http://source.winehq.org/git/wine.git/?a=commit;h=96c480b880fe9c696791a0742… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 10 17:02:39 2009 -0800 msi: Refactor the Installer.InstallProduct method into InstallerImpl_InstallProduct. --- dlls/msi/automation.c | 59 ++++++++++++++++++++++++++++++++---------------- 1 files changed, 39 insertions(+), 20 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 1e25ec9..031b11e 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1763,6 +1763,42 @@ static HRESULT InstallerImpl_EnableLog(WORD wFlags, return S_OK; } +static HRESULT InstallerImpl_InstallProduct(WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + UINT ret; + HRESULT hr; + VARIANTARG varg0, varg1; + + if (!(wFlags & DISPATCH_METHOD)) + return DISP_E_MEMBERNOTFOUND; + + VariantInit(&varg0); + hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); + if (FAILED(hr)) + return hr; + + VariantInit(&varg1); + hr = DispGetParam(pDispParams, 1, VT_BSTR, &varg1, puArgErr); + if (FAILED(hr)) + goto done; + + ret = MsiInstallProductW(V_BSTR(&varg0), V_BSTR(&varg1)); + if (ret != ERROR_SUCCESS) + { + hr = DISP_E_EXCEPTION; + goto done; + } + +done: + VariantClear(&varg0); + VariantClear(&varg1); + return hr; +} + static HRESULT InstallerImpl_LastErrorRecord(WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pVarResult, @@ -1892,26 +1928,9 @@ static HRESULT WINAPI InstallerImpl_Invoke( pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_INSTALLPRODUCT: - if (wFlags & DISPATCH_METHOD) - { - hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); - if (FAILED(hr)) return hr; - hr = DispGetParam(pDispParams, 1, VT_BSTR, &varg1, puArgErr); - if (FAILED(hr)) - { - VariantClear(&varg0); - return hr; - } - if ((ret = MsiInstallProductW(V_BSTR(&varg0), V_BSTR(&varg1))) != ERROR_SUCCESS) - { - VariantClear(&varg1); - VariantClear(&varg0); - ERR("MsiInstallProduct returned %d\n", ret); - return DISP_E_EXCEPTION; - } - } - else return DISP_E_MEMBERNOTFOUND; - break; + return InstallerImpl_InstallProduct(wFlags, pDispParams, + pVarResult, pExcepInfo, + puArgErr); case DISPID_INSTALLER_VERSION: if (wFlags & DISPATCH_PROPERTYGET) {

1 0

Henri Verbeet : wined3d: Correctly calculate the extended style in IWineD3DDeviceImpl_RestoreWindow ().
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 75ef50e4354e764bf9b7ab6bcd8eccfe4354f4a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75ef50e4354e764bf9b7ab6bc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 10 21:41:53 2009 +0100 wined3d: Correctly calculate the extended style in IWineD3DDeviceImpl_RestoreWindow(). --- dlls/wined3d/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c04f32b..029884c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1014,8 +1014,8 @@ static void IWineD3DDeviceImpl_RestoreWindow(IWineD3DDevice *iface, HWND window) * Some applications change it before calling Reset() when switching between windowed and * fullscreen modes(HL2), some depend on the original style(Eve Online) */ - if(style == fullscreen_style(This->style) && - exStyle == fullscreen_style(This->exStyle)) { + if (style == fullscreen_style(This->style) && exStyle == fullscreen_exStyle(This->exStyle)) + { SetWindowLongW(window, GWL_STYLE, This->style); SetWindowLongW(window, GWL_EXSTYLE, This->exStyle); }

1 0

Henri Verbeet : wined3d: Add a separate function for swapchain initialization.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: a9f2613d13a70c9152f1d72bce02287ccd8147f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9f2613d13a70c9152f1d72bc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 10 21:41:54 2009 +0100 wined3d: Add a separate function for swapchain initialization. --- dlls/wined3d/device.c | 325 +++------------------------------------- dlls/wined3d/swapchain.c | 278 ++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 5 +- 3 files changed, 303 insertions(+), 305 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a9f2613d13a70c9152f1d…

1 0

Henri Verbeet : wined3d: Move IWineD3DDeviceImpl_SetupFullscreenWindow() to swapchain.c.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 542590cfc9b376bcf97dca54cbe56a615a15a874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=542590cfc9b376bcf97dca54c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 10 21:41:55 2009 +0100 wined3d: Move IWineD3DDeviceImpl_SetupFullscreenWindow() to swapchain.c. --- dlls/wined3d/device.c | 51 +++------------------------------------ dlls/wined3d/swapchain.c | 47 ++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 51 insertions(+), 49 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c49f70f..b871474 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -919,17 +919,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateQuery(IWineD3DDevice *iface, WINE return WINED3D_OK; } -/***************************************************************************** - * IWineD3DDeviceImpl_SetupFullscreenWindow - * - * Helper function that modifies a HWND's Style and ExStyle for proper - * fullscreen use. - * - * Params: - * iface: Pointer to the IWineD3DDevice interface - * window: Window to setup - * - *****************************************************************************/ static LONG fullscreen_style(LONG orig_style) { LONG style = orig_style; style &= ~WS_CAPTION; @@ -951,38 +940,6 @@ static LONG fullscreen_exStyle(LONG orig_exStyle) { return exStyle; } -void IWineD3DDeviceImpl_SetupFullscreenWindow(IWineD3DDeviceImpl *This, HWND window, UINT w, UINT h) -{ - LONG style, exStyle; - /* Don't do anything if an original style is stored. - * That shouldn't happen - */ - TRACE("(%p): Setting up window %p for exclusive mode\n", This, window); - if (This->style || This->exStyle) { - ERR("(%p): Want to change the window parameters of HWND %p, but " - "another style is stored for restoration afterwards\n", This, window); - } - - /* Get the parameters and save them */ - style = GetWindowLongW(window, GWL_STYLE); - exStyle = GetWindowLongW(window, GWL_EXSTYLE); - This->style = style; - This->exStyle = exStyle; - - style = fullscreen_style(style); - exStyle = fullscreen_exStyle(exStyle); - - TRACE("Old style was %08x,%08x, setting to %08x,%08x\n", - This->style, This->exStyle, style, exStyle); - - SetWindowLongW(window, GWL_STYLE, style); - SetWindowLongW(window, GWL_EXSTYLE, exStyle); - - /* Inform the window about the update. */ - SetWindowPos(window, HWND_TOP, 0, 0, - w, h, SWP_FRAMECHANGED | SWP_SHOWWINDOW); -} - /***************************************************************************** * IWineD3DDeviceImpl_RestoreWindow * @@ -6601,8 +6558,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE if(swapchain->win_handle && !pPresentationParameters->Windowed) { if(swapchain->presentParms.Windowed) { /* switch from windowed to fs */ - IWineD3DDeviceImpl_SetupFullscreenWindow(This, swapchain->win_handle, - pPresentationParameters->BackBufferWidth, pPresentationParameters->BackBufferHeight); + swapchain_setup_fullscreen_window(swapchain, pPresentationParameters->BackBufferWidth, + pPresentationParameters->BackBufferHeight); } else { /* Fullscreen -> fullscreen mode change */ MoveWindow(swapchain->win_handle, 0, 0, @@ -6622,8 +6579,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE */ This->style = 0; This->exStyle = 0; - IWineD3DDeviceImpl_SetupFullscreenWindow(This, swapchain->win_handle, - pPresentationParameters->BackBufferWidth, pPresentationParameters->BackBufferHeight); + swapchain_setup_fullscreen_window(swapchain, pPresentationParameters->BackBufferWidth, + pPresentationParameters->BackBufferHeight); This->style = style; This->exStyle = exStyle; } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 51ee607..543c9aa 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -557,6 +557,51 @@ static const IWineD3DSwapChainVtbl IWineD3DSwapChain_Vtbl = IWineD3DBaseSwapChainImpl_GetGammaRamp }; +static LONG fullscreen_style(LONG style) +{ + /* Make sure the window is managed, otherwise we won't get keyboard input. */ + style |= WS_POPUP | WS_SYSMENU; + style &= ~(WS_CAPTION | WS_THICKFRAME); + + return style; +} + +static LONG fullscreen_exstyle(LONG exstyle) +{ + /* Filter out window decorations. */ + exstyle &= ~(WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE); + + return exstyle; +} + +void swapchain_setup_fullscreen_window(IWineD3DSwapChainImpl *swapchain, UINT w, UINT h) +{ + IWineD3DDeviceImpl *device = swapchain->device; + HWND window = swapchain->win_handle; + LONG style, exstyle; + + TRACE("Setting up window %p for fullscreen mode.\n", window); + + if (device->style || device->exStyle) + { + ERR("Changing the window style for window %p, but another style (%08x, %08x) is already stored.\n", + window, device->style, device->exStyle); + } + + device->style = GetWindowLongW(window, GWL_STYLE); + device->exStyle = GetWindowLongW(window, GWL_EXSTYLE); + + style = fullscreen_style(device->style); + exstyle = fullscreen_exstyle(device->exStyle); + + TRACE("Old style was %08x, %08x, setting to %08x, %08x.\n", + device->style, device->exStyle, style, exstyle); + + SetWindowLongW(window, GWL_STYLE, style); + SetWindowLongW(window, GWL_EXSTYLE, exstyle); + SetWindowPos(window, HWND_TOP, 0, 0, w, h, SWP_FRAMECHANGED | SWP_SHOWWINDOW); +} + HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface_type, IWineD3DDeviceImpl *device, WINED3DPRESENT_PARAMETERS *present_parameters, IUnknown *parent) { @@ -606,7 +651,7 @@ HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface if (!present_parameters->Windowed && window) { - IWineD3DDeviceImpl_SetupFullscreenWindow(device, window, present_parameters->BackBufferWidth, + swapchain_setup_fullscreen_window(swapchain, present_parameters->BackBufferWidth, present_parameters->BackBufferHeight); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 65e6e18..0d111c4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1598,7 +1598,6 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac const WINED3DRECT *pRects, DWORD Flags, WINED3DCOLOR Color, float Z, DWORD Stencil) DECLSPEC_HIDDEN; void IWineD3DDeviceImpl_FindTexUnitMap(IWineD3DDeviceImpl *This) DECLSPEC_HIDDEN; void IWineD3DDeviceImpl_MarkStateDirty(IWineD3DDeviceImpl *This, DWORD state) DECLSPEC_HIDDEN; -void IWineD3DDeviceImpl_SetupFullscreenWindow(IWineD3DDeviceImpl *This, HWND window, UINT w, UINT h) DECLSPEC_HIDDEN; static inline BOOL isStateDirty(struct wined3d_context *context, DWORD state) { @@ -2453,6 +2452,7 @@ HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetGammaRamp(IWineD3DSwapChain *iface, struct wined3d_context *swapchain_create_context_for_thread(IWineD3DSwapChain *iface) DECLSPEC_HIDDEN; HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface_type, IWineD3DDeviceImpl *device, WINED3DPRESENT_PARAMETERS *present_parameters, IUnknown *parent) DECLSPEC_HIDDEN; +void swapchain_setup_fullscreen_window(IWineD3DSwapChainImpl *swapchain, UINT w, UINT h) DECLSPEC_HIDDEN; #define DEFAULT_REFRESH_RATE 0

1 0

Henri Verbeet : wined3d: Move IWineD3DDeviceImpl_RestoreWindow() to swapchain.c.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: cb076db8ccbcb0522f834189ffab5c41980ed56a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb076db8ccbcb0522f834189f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 10 21:41:56 2009 +0100 wined3d: Move IWineD3DDeviceImpl_RestoreWindow() to swapchain.c. --- dlls/wined3d/device.c | 69 +--------------------------------------- dlls/wined3d/swapchain.c | 32 ++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 34 insertions(+), 68 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b871474..6529b23 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -919,73 +919,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateQuery(IWineD3DDevice *iface, WINE return WINED3D_OK; } -static LONG fullscreen_style(LONG orig_style) { - LONG style = orig_style; - style &= ~WS_CAPTION; - style &= ~WS_THICKFRAME; - - /* Make sure the window is managed, otherwise we won't get keyboard input */ - style |= WS_POPUP | WS_SYSMENU; - - return style; -} - -static LONG fullscreen_exStyle(LONG orig_exStyle) { - LONG exStyle = orig_exStyle; - - /* Filter out window decorations */ - exStyle &= ~WS_EX_WINDOWEDGE; - exStyle &= ~WS_EX_CLIENTEDGE; - - return exStyle; -} - -/***************************************************************************** - * IWineD3DDeviceImpl_RestoreWindow - * - * Helper function that restores a windows' properties when taking it out - * of fullscreen mode - * - * Params: - * iface: Pointer to the IWineD3DDevice interface - * window: Window to setup - * - *****************************************************************************/ -static void IWineD3DDeviceImpl_RestoreWindow(IWineD3DDevice *iface, HWND window) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - LONG style, exStyle; - - /* This could be a DDSCL_NORMAL -> DDSCL_NORMAL - * switch, do nothing - */ - if (!This->style && !This->exStyle) return; - - TRACE("(%p): Restoring window settings of window %p to %08x, %08x\n", - This, window, This->style, This->exStyle); - - style = GetWindowLongW(window, GWL_STYLE); - exStyle = GetWindowLongW(window, GWL_EXSTYLE); - - /* Only restore the style if the application didn't modify it during the fullscreen phase. - * Some applications change it before calling Reset() when switching between windowed and - * fullscreen modes(HL2), some depend on the original style(Eve Online) - */ - if (style == fullscreen_style(This->style) && exStyle == fullscreen_exStyle(This->exStyle)) - { - SetWindowLongW(window, GWL_STYLE, This->style); - SetWindowLongW(window, GWL_EXSTYLE, This->exStyle); - } - - /* Delete the old values */ - This->style = 0; - This->exStyle = 0; - - /* Inform the window about the update */ - SetWindowPos(window, 0 /* InsertAfter, ignored */, - 0, 0, 0, 0, /* Pos, Size, ignored */ - SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER); -} - static HRESULT WINAPI IWineD3DDeviceImpl_CreateSwapChain(IWineD3DDevice *iface, WINED3DPRESENT_PARAMETERS *present_parameters, IWineD3DSwapChain **swapchain, IUnknown *parent, WINED3DSURFTYPE surface_type) @@ -6568,7 +6501,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE } } else if(swapchain->win_handle && !swapchain->presentParms.Windowed) { /* Fullscreen -> windowed switch */ - IWineD3DDeviceImpl_RestoreWindow(iface, swapchain->win_handle); + swapchain_restore_fullscreen_window(swapchain); } swapchain->presentParms.Windowed = pPresentationParameters->Windowed; } else if(!pPresentationParameters->Windowed) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 543c9aa..3e4da78 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -602,6 +602,38 @@ void swapchain_setup_fullscreen_window(IWineD3DSwapChainImpl *swapchain, UINT w, SetWindowPos(window, HWND_TOP, 0, 0, w, h, SWP_FRAMECHANGED | SWP_SHOWWINDOW); } +void swapchain_restore_fullscreen_window(IWineD3DSwapChainImpl *swapchain) +{ + IWineD3DDeviceImpl *device = swapchain->device; + HWND window = swapchain->win_handle; + LONG style, exstyle; + + if (!device->style && !device->exStyle) return; + + TRACE("Restoring window style of window %p to %08x, %08x.\n", + window, device->style, device->exStyle); + + style = GetWindowLongW(window, GWL_STYLE); + exstyle = GetWindowLongW(window, GWL_EXSTYLE); + + /* Only restore the style if the application didn't modify it during the + * fullscreen phase. Some applications change it before calling Reset() + * when switching between windowed and fullscreen modes (HL2), some + * depend on the original style (Eve Online). */ + if (style == fullscreen_style(device->style) && exstyle == fullscreen_exstyle(device->exStyle)) + { + SetWindowLongW(window, GWL_STYLE, device->style); + SetWindowLongW(window, GWL_EXSTYLE, device->exStyle); + } + + /* Delete the old values. */ + device->style = 0; + device->exStyle = 0; + + SetWindowPos(window, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER); +} + + HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface_type, IWineD3DDeviceImpl *device, WINED3DPRESENT_PARAMETERS *present_parameters, IUnknown *parent) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0d111c4..e0b4ab1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2453,6 +2453,7 @@ struct wined3d_context *swapchain_create_context_for_thread(IWineD3DSwapChain *i HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface_type, IWineD3DDeviceImpl *device, WINED3DPRESENT_PARAMETERS *present_parameters, IUnknown *parent) DECLSPEC_HIDDEN; void swapchain_setup_fullscreen_window(IWineD3DSwapChainImpl *swapchain, UINT w, UINT h) DECLSPEC_HIDDEN; +void swapchain_restore_fullscreen_window(IWineD3DSwapChainImpl *swapchain) DECLSPEC_HIDDEN; #define DEFAULT_REFRESH_RATE 0

1 0

Vincent Povirk : ole32: Create internal storage objects with a refcount of 1.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 75fe621192c07de5e54fee3e566c3f798e9f1d29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75fe621192c07de5e54fee3e5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Dec 2 11:03:36 2009 -0600 ole32: Create internal storage objects with a refcount of 1. For consistency with StorageImpl_Construct. --- dlls/ole32/storage32.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index eaddcbf..f9f8e87 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -595,8 +595,6 @@ static HRESULT WINAPI StorageBaseImpl_OpenStorage( { *ppstg = (IStorage*)newStorage; - StorageBaseImpl_AddRef(*ppstg); - list_add_tail(&This->storageHead, &newStorage->ParentListEntry); res = S_OK; @@ -4382,6 +4380,8 @@ static StorageInternalImpl* StorageInternalImpl_Construct( newStorage->base.reverted = 0; + newStorage->base.ref = 1; + newStorage->parentStorage = parentStorage; /*

1 0

Vincent Povirk : ole32: Add Invalidate to the storage vtable.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 42142200d531e1563d73539e14fde6df9c72bf67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42142200d531e1563d73539e1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 4 15:49:31 2009 -0600 ole32: Add Invalidate to the storage vtable. --- dlls/ole32/storage32.c | 25 +++++++++++++++++++------ dlls/ole32/storage32.h | 6 ++++++ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index f9f8e87..e16b9f8 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -91,6 +91,7 @@ typedef struct StorageInternalImpl StorageInternalImpl; static StorageInternalImpl* StorageInternalImpl_Construct(StorageBaseImpl* parentStorage, DWORD openFlags, DirRef storageDirEntry); static void StorageImpl_Destroy(StorageBaseImpl* iface); +static void StorageImpl_Invalidate(StorageBaseImpl* iface); static BOOL StorageImpl_ReadBigBlock(StorageImpl* This, ULONG blockIndex, void* buffer); static BOOL StorageImpl_WriteBigBlock(StorageImpl* This, ULONG blockIndex, const void* buffer); static void StorageImpl_SetNextBlockInChain(StorageImpl* This, ULONG blockIndex, ULONG nextBlock); @@ -116,7 +117,6 @@ static BOOL StorageImpl_ReadDWordFromBigBlock( StorageImpl* This, static BOOL StorageBaseImpl_IsStreamOpen(StorageBaseImpl * stg, DirRef streamEntry); static BOOL StorageBaseImpl_IsStorageOpen(StorageBaseImpl * stg, DirRef storageEntry); -static void StorageInternalImpl_Invalidate( StorageInternalImpl *This ); /* OLESTREAM memory structure to use for Get and Put Routines */ /* Used for OleConvertIStorageToOLESTREAM and OleConvertOLESTREAMToIStorage */ @@ -1884,7 +1884,7 @@ static void StorageBaseImpl_DeleteAll(StorageBaseImpl * stg) LIST_FOR_EACH_SAFE(cur, cur2, &stg->storageHead) { childstg = LIST_ENTRY(cur,StorageInternalImpl,ParentListEntry); - StorageInternalImpl_Invalidate( childstg ); + StorageBaseImpl_Invalidate( &childstg->base ); } } @@ -1913,7 +1913,7 @@ static HRESULT deleteStorageContents( { if (stg->base.storageDirEntry == indexToDelete) { - StorageInternalImpl_Invalidate(stg); + StorageBaseImpl_Invalidate(&stg->base); } } @@ -2413,6 +2413,7 @@ static const IStorageVtbl Storage32Impl_Vtbl = static const StorageBaseImplVtbl StorageImpl_BaseVtbl = { StorageImpl_Destroy, + StorageImpl_Invalidate, StorageImpl_CreateDirEntry, StorageImpl_BaseWriteDirEntry, StorageImpl_BaseReadDirEntry, @@ -2652,12 +2653,21 @@ end: return hr; } +static void StorageImpl_Invalidate(StorageBaseImpl* iface) +{ + StorageImpl *This = (StorageImpl*) iface; + + StorageBaseImpl_DeleteAll(&This->base); + + This->base.reverted = 1; +} + static void StorageImpl_Destroy(StorageBaseImpl* iface) { StorageImpl *This = (StorageImpl*) iface; TRACE("(%p)\n", This); - StorageBaseImpl_DeleteAll(&This->base); + StorageImpl_Invalidate(iface); HeapFree(GetProcessHeap(), 0, This->pwcsName); @@ -3812,8 +3822,10 @@ SmallBlockChainStream* Storage32Impl_BigBlocksToSmallBlocks( return SmallBlockChainStream_Construct(This, NULL, streamEntryRef); } -static void StorageInternalImpl_Invalidate( StorageInternalImpl *This ) +static void StorageInternalImpl_Invalidate( StorageBaseImpl *base ) { + StorageInternalImpl* This = (StorageInternalImpl*) base; + if (!This->base.reverted) { TRACE("Storage invalidated (stg=%p)\n", This); @@ -3832,7 +3844,7 @@ static void StorageInternalImpl_Destroy( StorageBaseImpl *iface) { StorageInternalImpl* This = (StorageInternalImpl*) iface; - StorageInternalImpl_Invalidate(This); + StorageInternalImpl_Invalidate(&This->base); HeapFree(GetProcessHeap(), 0, This); } @@ -4343,6 +4355,7 @@ static const IStorageVtbl Storage32InternalImpl_Vtbl = static const StorageBaseImplVtbl StorageInternalImpl_BaseVtbl = { StorageInternalImpl_Destroy, + StorageInternalImpl_Invalidate, StorageInternalImpl_CreateDirEntry, StorageInternalImpl_WriteDirEntry, StorageInternalImpl_ReadDirEntry, diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index c68c6ea..dcd460c 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -248,6 +248,7 @@ struct StorageBaseImpl /* virtual methods for StorageBaseImpl objects */ struct StorageBaseImplVtbl { void (*Destroy)(StorageBaseImpl*); + void (*Invalidate)(StorageBaseImpl*); HRESULT (*CreateDirEntry)(StorageBaseImpl*,const DirEntry*,DirRef*); HRESULT (*WriteDirEntry)(StorageBaseImpl*,DirRef,const DirEntry*); HRESULT (*ReadDirEntry)(StorageBaseImpl*,DirRef,DirEntry*); @@ -262,6 +263,11 @@ static inline void StorageBaseImpl_Destroy(StorageBaseImpl *This) This->baseVtbl->Destroy(This); } +static inline void StorageBaseImpl_Invalidate(StorageBaseImpl *This) +{ + This->baseVtbl->Invalidate(This); +} + static inline HRESULT StorageBaseImpl_CreateDirEntry(StorageBaseImpl *This, const DirEntry *newData, DirRef *index) {

1 0