December 2006 - Wine-commits

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 05 Dec '06

05 Dec '06

Module: wine Branch: master Commit: bb8e625b5b06f0b873e22bf445b5028b2b685190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb8e625b5b06f0b873e22bf44… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 4 19:55:35 2006 +0100 Assorted spelling fixes. --- README | 4 ++-- dlls/gdi32/gdi_private.h | 2 +- dlls/iphlpapi/ifenum.c | 2 +- dlls/kernel32/cpu.c | 4 ++-- dlls/kernel32/instr.c | 4 ++-- dlls/kernel32/process.c | 2 +- dlls/kernel32/selector.c | 2 +- dlls/msvcrt/tests/headers.c | 2 +- dlls/ole32/storage32.h | 2 +- dlls/oleaut32/typelib.h | 4 ++-- dlls/rpcrt4/ndr_stubless.c | 2 +- dlls/shell32/shell32_main.c | 4 ++-- dlls/user32/mdi.c | 2 +- include/msvcrt/process.h | 2 +- include/windef.h | 4 ++-- libs/wine/mmap.c | 2 +- tools/widl/typelib_struct.h | 4 ++-- tools/winedump/le.c | 2 +- tools/winedump/msc.c | 2 +- tools/winegcc/winegcc.c | 2 +- 20 files changed, 27 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bb8e625b5b06f0b873e22…

1 0

Francois Gouget : Consistently use SUBLANG_NEUTRAL for Italian resources.
by Alexandre Julliard 05 Dec '06

05 Dec '06

Module: wine Branch: master Commit: c66628b73f49b338f63b4e929d6565de42b29282 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c66628b73f49b338f63b4e929… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 4 20:12:07 2006 +0100 Consistently use SUBLANG_NEUTRAL for Italian resources. --- dlls/avifil32/avifile_It.rc | 2 +- dlls/comctl32/comctl_It.rc | 2 +- dlls/comdlg32/cdlg_It.rc | 2 +- dlls/mpr/mpr_It.rc | 2 +- dlls/msacm32/msacm_It.rc | 2 +- dlls/msi/msi_It.rc | 2 +- dlls/msrle32/msrle_It.rc | 2 +- dlls/oleaut32/oleaut32_It.rc | 2 +- dlls/oledlg/oledlg_It.rc | 2 +- dlls/serialui/It.rc | 2 +- dlls/setupapi/It.rc | 2 +- dlls/shell32/shell32_It.rc | 2 +- dlls/shlwapi/shlwapi_It.rc | 2 +- dlls/user32/resources/user32_It.rc | 2 +- dlls/wineps.drv/wps_It.rc | 2 +- dlls/wininet/wininet_It.rc | 2 +- dlls/winspool.drv/It.rc | 2 +- programs/clock/It.rc | 2 +- programs/cmdlgtst/It.rc | 2 +- programs/notepad/It.rc | 2 +- programs/progman/It.rc | 18 +++++++++--------- programs/regedit/It.rc | 2 +- programs/start/It.rc | 4 ++-- programs/view/It.rc | 2 +- programs/winecfg/It.rc | 2 +- programs/wineconsole/wineconsole_It.rc | 2 +- programs/winemine/It.rc | 2 +- programs/winhelp/It.rc | 4 ++-- 28 files changed, 38 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c66628b73f49b338f63b4…

1 0

Andrew Talbot : atl: Change storage class of dll_count to static.
by Alexandre Julliard 05 Dec '06

05 Dec '06

Module: wine Branch: master Commit: f6c09a2bc67a480fe634c5ff7f90e96d77f12a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6c09a2bc67a480fe634c5ff7… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Dec 4 18:41:28 2006 +0000 atl: Change storage class of dll_count to static. --- dlls/atl/registrar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 11d266f..2869e49 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(atl); -LONG dll_count = 0; +static LONG dll_count; /************************************************************** * ATLRegistrar implementation

1 0

Francois Gouget : vmm.vxd: PC_WRITABLE spelling fix.
by Alexandre Julliard 05 Dec '06

05 Dec '06

Module: wine Branch: master Commit: ff3fbfff57b308103836f9cb862736eb3be2e867 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff3fbfff57b308103836f9cb8… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 4 19:56:31 2006 +0100 vmm.vxd: PC_WRITABLE spelling fix. --- dlls/vmm.vxd/vmm.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/vmm.vxd/vmm.c b/dlls/vmm.vxd/vmm.c index 24de4d7..77c81b0 100644 --- a/dlls/vmm.vxd/vmm.c +++ b/dlls/vmm.vxd/vmm.c @@ -106,7 +106,7 @@ static const char * const VMM_Service_Na #define PC_FIXED 0x00000008 /* pages are permanently locked */ #define PC_LOCKED 0x00000080 /* pages are made present and locked */ #define PC_LOCKEDIFDP 0x00000100 /* pages are locked if swap via DOS */ -#define PC_WRITEABLE 0x00020000 /* make the pages writeable */ +#define PC_WRITABLE 0x00020000 /* make the pages writable */ #define PC_USER 0x00040000 /* make the pages ring 3 accessible */ #define PC_INCR 0x40000000 /* increment "pagerdata" each page */ #define PC_PRESENT 0x80000000 /* make pages initially present */ @@ -185,7 +185,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, page, npages, hpd, pagerdata, flags ); if ( flags & PC_USER ) - if ( flags & PC_WRITEABLE ) + if ( flags & PC_WRITABLE ) virt_perm = PAGE_EXECUTE_READWRITE; else virt_perm = PAGE_EXECUTE_READ; @@ -247,7 +247,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, case PAGE_WRITECOPY: case PAGE_EXECUTE_READWRITE: case PAGE_EXECUTE_WRITECOPY: - pg_old_perm = PC_USER | PC_WRITEABLE; + pg_old_perm = PC_USER | PC_WRITABLE; break; case PAGE_NOACCESS: default: @@ -261,7 +261,7 @@ DWORD WINAPI VMM_VxDCall( DWORD service, virt_new_perm = ( virt_old_perm ) & ~0xff; if ( pg_new_perm & PC_USER ) { - if ( pg_new_perm & PC_WRITEABLE ) + if ( pg_new_perm & PC_WRITABLE ) virt_new_perm |= PAGE_EXECUTE_READWRITE; else virt_new_perm |= PAGE_EXECUTE_READ;

1 0

Francois Gouget : msxml3: Add '\n' to Wine trace.
by Alexandre Julliard 05 Dec '06

05 Dec '06

Module: wine Branch: master Commit: 9c297ffed247676a8052324f7e7c8208d27eecd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c297ffed247676a8052324f7… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 4 19:56:48 2006 +0100 msxml3: Add '\n' to Wine trace. --- dlls/msxml3/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index c2fa232..bb7da60 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -780,7 +780,7 @@ static HRESULT WINAPI domdoc_createProce return S_OK; #else - FIXME("Libxml 2.6.15 or greater required."); + FIXME("Libxml 2.6.15 or greater required.\n"); return E_NOTIMPL; #endif }

1 0

Francois Gouget : mshtml: Add '\n' to Wine trace.
by Alexandre Julliard 05 Dec '06

05 Dec '06

Module: wine Branch: master Commit: bf9865d30264b06f9eccb6f2e04aea1ccb628ac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf9865d30264b06f9eccb6f2e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Dec 4 19:56:58 2006 +0100 mshtml: Add '\n' to Wine trace. --- dlls/mshtml/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index fb0e6b3..0a444bf 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -425,7 +425,7 @@ void handle_edit_event(HTMLDocument *Thi switch(code) { case DOM_VK_LEFT: - TRACE("left"); + TRACE("left\n"); collapse_next_char(This, key_event, FALSE); break; case DOM_VK_RIGHT:

1 0

Rob Shearman : ole32: Implement the GetData function of the data cache to using the
by Alexandre Julliard 05 Dec '06

05 Dec '06

Module: wine Branch: master Commit: 878d5e9cec42408e36b0fac05d7ee2b6d6d48196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=878d5e9cec42408e36b0fac05… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Dec 4 15:51:20 2006 +0000 ole32: Implement the GetData function of the data cache to using the existing LoadData function and fix GetData to also return data that has been set, rather than loaded. --- dlls/ole32/datacache.c | 110 +++++++++-------------------------------------- 1 files changed, 21 insertions(+), 89 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 0e7666a..301be87 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -732,6 +732,20 @@ static HRESULT DataCacheEntry_SetData(Da &This->stgmedium, stgmedium); } +static HRESULT DataCacheEntry_GetData(DataCacheEntry *This, + STGMEDIUM *stgmedium) +{ + if (stgmedium->tymed == TYMED_NULL && This->storage) + { + HRESULT hr = DataCacheEntry_LoadData(This); + if (FAILED(hr)) + return hr; + } + if (stgmedium->tymed == TYMED_NULL) + return OLE_E_BLANK; + return copy_stg_medium(This->data_cf, stgmedium, &This->stgmedium); +} + static inline HRESULT DataCacheEntry_DiscardData(DataCacheEntry *This) { ReleaseStgMedium(&This->stgmedium); @@ -921,104 +935,22 @@ static ULONG WINAPI DataCache_IDataObjec * * Get Data from a source dataobject using format pformatetcIn->cfFormat * See Windows documentation for more details on GetData. - * TODO: Currently only CF_METAFILEPICT is implemented */ static HRESULT WINAPI DataCache_GetData( IDataObject* iface, LPFORMATETC pformatetcIn, STGMEDIUM* pmedium) { - HRESULT hr = 0; - HRESULT hrRet = E_UNEXPECTED; - IPersistStorage *pPersistStorage = 0; - IStorage *pStorage = 0; - IStream *pStream = 0; - OLECHAR name[]={ 2, 'O', 'l', 'e', 'P', 'r', 'e', 's', '0', '0', '0', 0}; - HGLOBAL hGlobalMF = 0; - void *mfBits = 0; - PresentationDataHeader pdh; - METAFILEPICT *mfPict; - HMETAFILE hMetaFile = 0; - - if (pformatetcIn->cfFormat == CF_METAFILEPICT) - { - /* Get the Persist Storage */ - - hr = IDataObject_QueryInterface(iface, &IID_IPersistStorage, (void**)&pPersistStorage); - - if (hr != S_OK) - goto cleanup; - - /* Create a doc file to copy the doc to a storage */ - - hr = StgCreateDocfile(NULL, STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &pStorage); - - if (hr != S_OK) - goto cleanup; - - /* Save it to storage */ - - hr = OleSave(pPersistStorage, pStorage, FALSE); - - if (hr != S_OK) - goto cleanup; - - /* Open the Presentation data srteam */ - - hr = IStorage_OpenStream(pStorage, name, 0, STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &pStream); - - if (hr != S_OK) - goto cleanup; - - /* Read the presentation header */ - - hr = IStream_Read(pStream, &pdh, sizeof(PresentationDataHeader), NULL); - - if (hr != S_OK) - goto cleanup; - - mfBits = HeapAlloc(GetProcessHeap(), 0, pdh.dwSize); - - /* Read the Metafile bits */ - - hr = IStream_Read(pStream, mfBits, pdh.dwSize, NULL); - - if (hr != S_OK) - goto cleanup; - - /* Create the metafile and place it in the STGMEDIUM structure */ - - hMetaFile = SetMetaFileBitsEx(pdh.dwSize, mfBits); - - hGlobalMF = GlobalAlloc(GMEM_SHARE|GMEM_MOVEABLE, sizeof(METAFILEPICT)); - mfPict = (METAFILEPICT *)GlobalLock(hGlobalMF); - mfPict->hMF = hMetaFile; - - GlobalUnlock(hGlobalMF); - - pmedium->u.hGlobal = hGlobalMF; - pmedium->tymed = TYMED_MFPICT; - hrRet = S_OK; - -cleanup: - - HeapFree(GetProcessHeap(), 0, mfBits); - - if (pStream) - IStream_Release(pStream); - - if (pStorage) - IStorage_Release(pStorage); - - if (pPersistStorage) - IPersistStorage_Release(pPersistStorage); + DataCache *This = impl_from_IDataObject(iface); + DataCacheEntry *cache_entry; - return hrRet; - } + memset(pmedium, 0, sizeof(*pmedium)); - /* TODO: Other formats are not implemented */ + cache_entry = DataCache_GetEntryForFormatEtc(This, pformatetcIn); + if (!cache_entry) + return OLE_E_BLANK; - return E_NOTIMPL; + return DataCacheEntry_GetData(cache_entry, pmedium); } static HRESULT WINAPI DataCache_GetDataHere(

1 0

Rob Shearman : ole32: Implement the DiscardCache function in the data cache .
by Alexandre Julliard 05 Dec '06

05 Dec '06

Module: wine Branch: master Commit: 6235ac9f583ffa778d91d5e3189ba4e8a12c862d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6235ac9f583ffa778d91d5e31… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Dec 4 15:51:05 2006 +0000 ole32: Implement the DiscardCache function in the data cache. --- dlls/ole32/datacache.c | 31 +++++++++++++++++++++++++++---- dlls/ole32/tests/ole2.c | 4 +--- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 5dd6bd6..54d25ea 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -732,6 +732,13 @@ static HRESULT DataCacheEntry_SetData(Da &This->stgmedium, stgmedium); } +static inline HRESULT DataCacheEntry_DiscardData(DataCacheEntry *This) +{ + ReleaseStgMedium(&This->stgmedium); + This->data_cf = This->fmtetc.cfFormat; + return S_OK; +} + /********************************************************* * Method implementation for the non delegating IUnknown * part of the DataCache class. @@ -1327,7 +1334,7 @@ static HRESULT WINAPI DataCache_Load( hr = DataCache_CreateEntry(This, &fmtetc, &cache_entry); if (SUCCEEDED(hr)) { - ReleaseStgMedium(&cache_entry->stgmedium); + DataCacheEntry_DiscardData(cache_entry); if (cache_entry->storage) IStorage_Release(cache_entry->storage); cache_entry->storage = pStg; IStorage_AddRef(pStg); @@ -2016,7 +2023,7 @@ static HRESULT WINAPI DataCache_UpdateCa DWORD grfUpdf, LPVOID pReserved) { - FIXME("stub\n"); + FIXME("(%p, 0x%x, %p): stub\n", pDataObject, grfUpdf, pReserved); return E_NOTIMPL; } @@ -2024,8 +2031,24 @@ static HRESULT WINAPI DataCache_DiscardC IOleCache2* iface, DWORD dwDiscardOptions) { - FIXME("stub\n"); - return E_NOTIMPL; + DataCache *This = impl_from_IOleCache2(iface); + DataCacheEntry *cache_entry; + HRESULT hr = S_OK; + + TRACE("(%d)\n", dwDiscardOptions); + + if (dwDiscardOptions == DISCARDCACHE_SAVEIFDIRTY) + hr = DataCache_Save((IPersistStorage *)&This->lpvtblIPersistStorage, + This->presentationStorage, TRUE); + + LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry) + { + hr = DataCacheEntry_DiscardData(cache_entry); + if (FAILED(hr)) + break; + } + + return hr; } diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 36341d5..24e981a 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1261,9 +1261,7 @@ static void test_data_cache(void) /* unload the cached storage object, causing it to be reloaded */ hr = IOleCache2_DiscardCache(pOleCache, DISCARDCACHE_NOSAVE); - todo_wine { ok_ole_success(hr, "IOleCache2_DiscardCache"); - } hr = IViewObject_Draw(pViewObject, DVASPECT_ICON, -1, NULL, NULL, NULL, hdcMem, &rcBounds, NULL, draw_continue, 0xdeadbeef); ok_ole_success(hr, "IViewObject_Draw"); @@ -1272,10 +1270,10 @@ static void test_data_cache(void) ok_ole_success(hr, "IPersistStorage_HandsOffStorage"); hr = IViewObject_Draw(pViewObject, DVASPECT_ICON, -1, NULL, NULL, NULL, hdcMem, &rcBounds, NULL, draw_continue, 0xdeadbeef); ok_ole_success(hr, "IViewObject_Draw"); - todo_wine { hr = IOleCache2_DiscardCache(pOleCache, DISCARDCACHE_NOSAVE); ok_ole_success(hr, "IOleCache2_DiscardCache"); hr = IViewObject_Draw(pViewObject, DVASPECT_ICON, -1, NULL, NULL, NULL, hdcMem, &rcBounds, NULL, draw_continue, 0xdeadbeef); + todo_wine { ok(hr == OLE_E_BLANK, "IViewObject_Draw with uncached aspect should have returned OLE_E_BLANK instead of 0x%08x\n", hr); }

1 0

Rob Shearman : ole32: Fix HandsOffStorage in the data cache.
by Alexandre Julliard 05 Dec '06

05 Dec '06

Module: wine Branch: master Commit: 1b244baf4811240ed36fe277cf81927d4bb32a4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b244baf4811240ed36fe277c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Dec 4 15:51:25 2006 +0000 ole32: Fix HandsOffStorage in the data cache. --- dlls/ole32/datacache.c | 13 +++++++++++++ dlls/ole32/tests/ole2.c | 2 -- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 54d25ea..0e7666a 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -739,6 +739,15 @@ static inline HRESULT DataCacheEntry_Dis return S_OK; } +static inline void DataCacheEntry_HandsOffStorage(DataCacheEntry *This) +{ + if (This->storage) + { + IStorage_Release(This->storage); + This->storage = NULL; + } +} + /********************************************************* * Method implementation for the non delegating IUnknown * part of the DataCache class. @@ -1469,6 +1478,7 @@ static HRESULT WINAPI DataCache_HandsOff IPersistStorage* iface) { DataCache *this = impl_from_IPersistStorage(iface); + DataCacheEntry *cache_entry; TRACE("(%p)\n", iface); @@ -1478,6 +1488,9 @@ static HRESULT WINAPI DataCache_HandsOff this->presentationStorage = NULL; } + LIST_FOR_EACH_ENTRY(cache_entry, &this->cache_list, DataCacheEntry, entry) + DataCacheEntry_HandsOffStorage(cache_entry); + return S_OK; } diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 24e981a..a2f61c8 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1273,9 +1273,7 @@ static void test_data_cache(void) hr = IOleCache2_DiscardCache(pOleCache, DISCARDCACHE_NOSAVE); ok_ole_success(hr, "IOleCache2_DiscardCache"); hr = IViewObject_Draw(pViewObject, DVASPECT_ICON, -1, NULL, NULL, NULL, hdcMem, &rcBounds, NULL, draw_continue, 0xdeadbeef); - todo_wine { ok(hr == OLE_E_BLANK, "IViewObject_Draw with uncached aspect should have returned OLE_E_BLANK instead of 0x%08x\n", hr); - } DeleteDC(hdcMem);

1 0

Jan Zerebecki : wined3d: Add err for failure case in CheckDepthStencilMatch .
by Alexandre Julliard 05 Dec '06

05 Dec '06

Module: wine Branch: master Commit: 9c58bce158f21fd8211e561c05c5bf7b680ea71c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c58bce158f21fd8211e561c0… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Thu Nov 23 19:59:30 2006 +0100 wined3d: Add err for failure case in CheckDepthStencilMatch. --- dlls/wined3d/directx.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7d7782a..dd50ecf 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1510,9 +1510,8 @@ static HRESULT WINAPI IWineD3DImpl_Check } } XFree(cfgs); - cfgs = NULL; } else { - /* If there's a current context then we cannot create a fake one so pass everything */ + ERR_(d3d_caps)("returning WINED3D_OK even so CreateFakeGLContext or glXGetFBConfigs failed\n"); hr = WINED3D_OK; }

1 0