December 2009 - Wine-Commits

James Hawkins : msi: Refactor Installer.OpenProduct and Installer. OpenDatabase into respective functions.
by Alexandre Julliard Dec. 11, 2009

Dec. 11, 2009

Module: wine Branch: master Commit: 554e1318c046d079ad4a866082ce0814ea19d58e URL: http://source.winehq.org/git/wine.git/?a=commit;h=554e1318c046d079ad4a86608… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 10 17:02:08 2009 -0800 msi: Refactor Installer.OpenProduct and Installer.OpenDatabase into respective functions. --- dlls/msi/automation.c | 114 ++++++++++++++++++++++++++++++++----------------- 1 files changed, 74 insertions(+), 40 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 61c6221..30cdc54 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1626,6 +1626,76 @@ done: return hr; } +static HRESULT InstallerImpl_OpenProduct(WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + HRESULT hr; + VARIANTARG varg0; + + if (!(wFlags & DISPATCH_METHOD)) + return DISP_E_MEMBERNOTFOUND; + + VariantInit(&varg0); + hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); + if (FAILED(hr)) + return hr; + + FIXME("%s\n", debugstr_w(V_BSTR(&varg0))); + + VariantInit(pVarResult); + + VariantClear(&varg0); + return S_OK; +} + +static HRESULT InstallerImpl_OpenDatabase(WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + UINT ret; + HRESULT hr; + MSIHANDLE hdb; + IDispatch* dispatch; + 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; + + V_VT(pVarResult) = VT_DISPATCH; + + ret = MsiOpenDatabaseW(V_BSTR(&varg0), V_BSTR(&varg1), &hdb); + if (ret != ERROR_SUCCESS) + { + hr = DISP_E_EXCEPTION; + goto done; + } + + hr = create_automation_object(hdb, NULL, (LPVOID *)&dispatch, + &DIID_Database, DatabaseImpl_Invoke, NULL, 0); + if (SUCCEEDED(hr)) + V_DISPATCH(pVarResult) = dispatch; + +done: + VariantClear(&varg0); + VariantClear(&varg1); + return hr; +} + static HRESULT WINAPI InstallerImpl_Invoke( AutomationObject* This, DISPID dispIdMember, @@ -1637,7 +1707,6 @@ static HRESULT WINAPI InstallerImpl_Invoke( EXCEPINFO* pExcepInfo, UINT* puArgErr) { - MSIHANDLE msiHandle; IDispatch *pDispatch = NULL; UINT ret; VARIANTARG varg0, varg1, varg2; @@ -1661,47 +1730,12 @@ static HRESULT WINAPI InstallerImpl_Invoke( pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_OPENPRODUCT: - if (wFlags & DISPATCH_METHOD) - { - VariantInit(pVarResult); - FIXME("Unhandled method: OpenProduct"); - } - else return DISP_E_MEMBERNOTFOUND; - break; + return InstallerImpl_OpenProduct(wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_OPENDATABASE: - 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; - } - - V_VT(pVarResult) = VT_DISPATCH; - if ((ret = MsiOpenDatabaseW(V_BSTR(&varg0), V_BSTR(&varg1), &msiHandle)) == ERROR_SUCCESS) - { - hr = create_automation_object(msiHandle, NULL, (LPVOID *)&pDispatch, - &DIID_Database, DatabaseImpl_Invoke, NULL, 0); - if (SUCCEEDED(hr)) - V_DISPATCH(pVarResult) = pDispatch; - else - ERR("Failed to create Database object: 0x%08x\n", hr); - } - else - { - VariantClear(&varg0); - VariantClear(&varg1); - ERR("MsiOpenDatabase returned %d\n", ret); - return DISP_E_EXCEPTION; - } - } - else return DISP_E_MEMBERNOTFOUND; - break; + return InstallerImpl_OpenDatabase(wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_SUMMARYINFORMATION: if (wFlags & DISPATCH_METHOD)

1 0

James Hawkins : msi: Refactor the Installer. OpenPackage method into InstallerImpl_OpenPackage.
by Alexandre Julliard Dec. 11, 2009

Dec. 11, 2009

Module: wine Branch: master Commit: b33d47e773958207465007f74ea89b3fc7e0bee9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b33d47e773958207465007f74… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 10 17:01:58 2009 -0800 msi: Refactor the Installer.OpenPackage method into InstallerImpl_OpenPackage. --- dlls/msi/automation.c | 101 +++++++++++++++++++++++++++++------------------- 1 files changed, 61 insertions(+), 40 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 83f5f79..61c6221 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1567,6 +1567,65 @@ static HRESULT InstallerImpl_CreateRecord(WORD wFlags, return hr; } +static HRESULT InstallerImpl_OpenPackage(AutomationObject* This, + WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + UINT ret; + HRESULT hr; + MSIHANDLE hpkg; + IDispatch* dispatch; + VARIANTARG varg0, varg1; + + if (!(wFlags & DISPATCH_METHOD)) + return DISP_E_MEMBERNOTFOUND; + + if (pDispParams->cArgs == 0) + return DISP_E_TYPEMISMATCH; + + if (V_VT(&pDispParams->rgvarg[pDispParams->cArgs - 1]) != VT_BSTR) + return DISP_E_TYPEMISMATCH; + + VariantInit(&varg0); + hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); + if (FAILED(hr)) + return hr; + + VariantInit(&varg1); + if (pDispParams->cArgs == 2) + { + hr = DispGetParam(pDispParams, 1, VT_I4, &varg1, puArgErr); + if (FAILED(hr)) + goto done; + } + else + { + V_VT(&varg1) = VT_I4; + V_I4(&varg1) = 0; + } + + V_VT(pVarResult) = VT_DISPATCH; + + ret = MsiOpenPackageExW(V_BSTR(&varg0), V_I4(&varg1), &hpkg); + if (ret != ERROR_SUCCESS) + { + hr = DISP_E_EXCEPTION; + goto done; + } + + hr = create_session(hpkg, (IDispatch *)This, &dispatch); + if (SUCCEEDED(hr)) + V_DISPATCH(pVarResult) = dispatch; + +done: + VariantClear(&varg0); + VariantClear(&varg1); + return hr; +} + static HRESULT WINAPI InstallerImpl_Invoke( AutomationObject* This, DISPID dispIdMember, @@ -1598,46 +1657,8 @@ static HRESULT WINAPI InstallerImpl_Invoke( pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_OPENPACKAGE: - if (wFlags & DISPATCH_METHOD) - { - if (pDispParams->cArgs == 0) - return DISP_E_TYPEMISMATCH; - if (V_VT(&pDispParams->rgvarg[pDispParams->cArgs - 1]) != VT_BSTR) - return DISP_E_TYPEMISMATCH; - hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); - if (FAILED(hr)) return hr; - if (pDispParams->cArgs == 2) - { - hr = DispGetParam(pDispParams, 1, VT_I4, &varg1, puArgErr); - if (FAILED(hr)) - { - VariantClear(&varg0); - return hr; - } - } - else - { - VariantInit(&varg1); - V_VT(&varg1) = VT_I4; - V_I4(&varg1) = 0; - } - V_VT(pVarResult) = VT_DISPATCH; - if ((ret = MsiOpenPackageExW(V_BSTR(&varg0), V_I4(&varg1), &msiHandle)) == ERROR_SUCCESS) - { - if (SUCCEEDED(hr = create_session(msiHandle, (IDispatch *)This, &pDispatch))) - V_DISPATCH(pVarResult) = pDispatch; - else - ERR("Failed to create Session object, hresult 0x%08x\n", hr); - } - else - { - VariantClear(&varg0); - ERR("MsiOpenPackageEx returned %d\n", ret); - return DISP_E_EXCEPTION; - } - } - else return DISP_E_MEMBERNOTFOUND; - break; + return InstallerImpl_OpenPackage(This, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_OPENPRODUCT: if (wFlags & DISPATCH_METHOD)

1 0

Marcus Meissner : dmloader: pObject NULL checks are not necessary (Coverity ).
by Alexandre Julliard Dec. 11, 2009

Dec. 11, 2009

Module: wine Branch: master Commit: 6891b963645b01909bdcec9830cf5f43004fffe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6891b963645b01909bdcec983… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Dec 11 00:10:02 2009 +0100 dmloader: pObject NULL checks are not necessary (Coverity). --- dlls/dmloader/loader.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 17a8eb2..393b6b9 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -333,18 +333,14 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_GetObject (LPDIR if (!pObjectEntry) { pObjectEntry = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(WINE_LOADER_ENTRY)); DM_STRUCT_INIT(&pObjectEntry->Desc); - if (pObject) { - DMUSIC_CopyDescriptor (&pObjectEntry->Desc, &GotDesc); - pObjectEntry->pObject = pObject; - pObjectEntry->bInvalidDefaultDLS = FALSE; - } + DMUSIC_CopyDescriptor (&pObjectEntry->Desc, &GotDesc); + pObjectEntry->pObject = pObject; + pObjectEntry->bInvalidDefaultDLS = FALSE; list_add_head (This->pObjects, &pObjectEntry->entry); } else { - if (pObject) { - DMUSIC_CopyDescriptor (&pObjectEntry->Desc, &GotDesc); - pObjectEntry->pObject = pObject; - pObjectEntry->bInvalidDefaultDLS = FALSE; - } + DMUSIC_CopyDescriptor (&pObjectEntry->Desc, &GotDesc); + pObjectEntry->pObject = pObject; + pObjectEntry->bInvalidDefaultDLS = FALSE; } TRACE(": filled in cache entry\n"); } else TRACE(": caching disabled\n");

1 0

James Hawkins : msi: Close the original record before copying new data into it.
by Alexandre Julliard Dec. 11, 2009

Dec. 11, 2009

Module: wine Branch: master Commit: 9ab7d9e21a0e6af8159902835f17b2d82a9d0380 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ab7d9e21a0e6af8159902835… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 10 17:01:12 2009 -0800 msi: Close the original record before copying new data into it. --- dlls/msi/msipriv.h | 1 + dlls/msi/record.c | 2 +- dlls/msi/table.c | 3 +++ 3 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 5b23f55..0e1a23b 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -698,6 +698,7 @@ extern UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine, BOOL preserve_case ); /* record internals */ +extern void MSI_CloseRecord( MSIOBJECTHDR * ); extern UINT MSI_RecordSetIStream( MSIRECORD *, UINT, IStream *); extern UINT MSI_RecordGetIStream( MSIRECORD *, UINT, IStream **); extern const WCHAR *MSI_RecordGetString( const MSIRECORD *, UINT ); diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 68eab69..45adbac 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -64,7 +64,7 @@ static void MSI_FreeField( MSIFIELD *field ) } } -static void MSI_CloseRecord( MSIOBJECTHDR *arg ) +void MSI_CloseRecord( MSIOBJECTHDR *arg ) { MSIRECORD *rec = (MSIRECORD *) arg; UINT i; diff --git a/dlls/msi/table.c b/dlls/msi/table.c index d2b9a00..7c341a7 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1835,6 +1835,9 @@ static UINT msi_refresh_record( struct tagMSIVIEW *view, MSIRECORD *rec, UINT ro if (r != ERROR_SUCCESS) return r; + /* Close the original record */ + MSI_CloseRecord(&rec->hdr); + count = MSI_RecordGetFieldCount(rec); for (i = 0; i < count; i++) MSI_RecordCopyField(curr, i + 1, rec, i + 1);

1 0

Marcus Meissner : jscript: Fixed uninitialized usage of i (Coverity).
by Alexandre Julliard Dec. 11, 2009

Dec. 11, 2009

Module: wine Branch: master Commit: aaff57da2276083086ea5d84e09ea6e4370db2e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaff57da2276083086ea5d84e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Dec 10 23:56:21 2009 +0100 jscript: Fixed uninitialized usage of i (Coverity). --- dlls/jscript/function.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 7819bc4..4f4a87f 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -669,7 +669,7 @@ static HRESULT construct_function(script_ctx_t *ctx, DISPPARAMS *dp, jsexcept_t parser_ctx_t *parser; DispatchEx *function; BSTR *params = NULL; - int i, j=0; + int i=0, j=0; HRESULT hres = S_OK; static const WCHAR function_anonymousW[] = {'f','u','n','c','t','i','o','n',' ','a','n','o','n','y','m','o','u','s','('};

1 0

Vincent Povirk : ole32: Implement Revert for transacted storage objects.
by Alexandre Julliard Dec. 11, 2009

Dec. 11, 2009

Module: wine Branch: master Commit: 3ff33e9303df1696c1d87c21a95fe06159dc9c87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ff33e9303df1696c1d87c21a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 4 18:02:59 2009 -0600 ole32: Implement Revert for transacted storage objects. --- dlls/ole32/storage32.c | 18 +++++++++++++++++- dlls/ole32/tests/storage32.c | 12 +++--------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index bd755e9..479c2a5 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -4044,7 +4044,23 @@ static HRESULT WINAPI TransactedSnapshotImpl_Commit( static HRESULT WINAPI TransactedSnapshotImpl_Revert( IStorage* iface) { - FIXME("(%p): stub\n", iface); + TransactedSnapshotImpl* This = (TransactedSnapshotImpl*) iface; + StorageBaseImpl *newSnapshot; + HRESULT hr; + + TRACE("(%p)\n", iface); + + /* Create a new copy of the parent data. */ + hr = CreateSnapshotFile(This->transactedParent, &newSnapshot); + if (FAILED(hr)) return hr; + + /* Destroy the open objects. */ + StorageBaseImpl_DeleteAll(&This->base); + + /* Replace our current snapshot. */ + IStorage_Release((IStorage*)This->snapshot); + This->snapshot = newSnapshot; + return S_OK; } diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 0494369..f89a787 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1195,7 +1195,6 @@ static void test_revert(void) r = IStorage_Revert(stg); /* all open objects become invalid */ - todo_wine { r = IStream_Write(stm, "this shouldn't work\n", 20, NULL); ok(r==STG_E_REVERTED, "IStream_Write should fail %08x\n", r); @@ -1207,7 +1206,6 @@ static void test_revert(void) r = IStorage_Stat(stg3, &statstg, STATFLAG_NONAME); ok(r==STG_E_REVERTED, "IStorage_Stat should fail %08x\n", r); - } IStream_Release(stm); IStream_Release(stm2); @@ -1226,17 +1224,13 @@ static void test_revert(void) r = IStorage_OpenStorage(stg, stmname, NULL, STGM_TRANSACTED|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg2 ); ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream failed %08x\n", r); - todo_wine { r = IStorage_OpenStream(stg, stmname, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream should fail %08x\n", r); - } if (r == S_OK) IStream_Release(stm); - todo_wine { r = IStorage_OpenStorage(stg, stgname2, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg2 ); ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStorage should fail %08x\n", r); - } if (r == S_OK) IStorage_Release(stg2); @@ -1258,7 +1252,7 @@ static void test_revert(void) IStorage_Release(stg3); r = IStorage_OpenStorage(stg2, stgname2, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg3 ); - todo_wine ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStorage should fail %08x\n", r); + ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStorage should fail %08x\n", r); if (r == S_OK) IStorage_Release(stg3); @@ -1398,7 +1392,7 @@ static void test_nonroot_transacted(void) IStream_Release(stm); r = IStorage_OpenStream(stg2, stmname2, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); - todo_wine ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream should fail %08x\n", r); + ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream should fail %08x\n", r); if (r == S_OK) IStream_Release(stm); @@ -1460,7 +1454,7 @@ static void test_nonroot_transacted(void) IStream_Release(stm); r = IStorage_OpenStream(stg2, stmname2, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); - todo_wine ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream should fail %08x\n", r); + ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream should fail %08x\n", r); if (r == S_OK) IStream_Release(stm);

1 0

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

Dec. 11, 2009

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 Dec. 11, 2009

Dec. 11, 2009

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 Dec. 11, 2009

Dec. 11, 2009

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: Add Invalidate to the storage vtable.
by Alexandre Julliard Dec. 11, 2009

Dec. 11, 2009

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