March 2011 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Don' t assume that HTMLWindow_Create sets ret val before succeeding.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: 1913ff3a42d2f26460cd39ac749435abfe9e3d62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1913ff3a42d2f26460cd39ac7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 8 18:45:45 2011 +0100 mshtml: Don't assume that HTMLWindow_Create sets ret val before succeeding. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlwindow.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 0d42d4f..6842b23 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2019,7 +2019,7 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob if(!doc) return E_OUTOFMEMORY; - if(window == doc_obj->basedoc.window) + if(!doc_obj->basedoc.window || window == doc_obj->basedoc.window) doc->basedoc.cp_container.forward_container = &doc_obj->basedoc.cp_container; nsIDOMHTMLDocument_AddRef(nsdoc); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index a4fa1be..99d03b3 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2247,7 +2247,6 @@ HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTML list_init(&window->script_hosts); window->task_magic = get_task_target_magic(); - *ret = window; update_window_doc(window); list_init(&window->children); @@ -2260,6 +2259,7 @@ HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTML list_add_tail(&parent->children, &window->sibling_entry); } + *ret = window; return S_OK; }

1 0

Juan Lang : wininet: Set last access time when retrieving a URL cache entry .
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: 47970d050464fc711e91a2ce8f46065a2099e836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47970d050464fc711e91a2ce8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 13:42:08 2011 -0800 wininet: Set last access time when retrieving a URL cache entry. --- dlls/wininet/urlcache.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 639e135..6ec08de 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1896,6 +1896,7 @@ BOOL WINAPI RetrieveUrlCacheEntryFileA( pUrlEntry->dwHitRate++; pUrlEntry->dwUseCount++; + GetSystemTimeAsFileTime(&pUrlEntry->LastAccessTime); URLCache_HashEntrySetUse(pHashEntry, pUrlEntry->dwUseCount); error = URLCache_CopyEntry(pContainer, pHeader, lpCacheEntryInfo, @@ -1992,6 +1993,7 @@ BOOL WINAPI RetrieveUrlCacheEntryFileW( pUrlEntry->dwHitRate++; pUrlEntry->dwUseCount++; + GetSystemTimeAsFileTime(&pUrlEntry->LastAccessTime); URLCache_HashEntrySetUse(pHashEntry, pUrlEntry->dwUseCount); error = URLCache_CopyEntry(

1 0

Juan Lang : kernel32: Add some parameter checking to FileTimeToDosDateTime.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: 2ca58402e71b29aa06b4ef94b70ade8124ddd883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ca58402e71b29aa06b4ef94b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Mar 7 15:55:35 2011 -0800 kernel32: Add some parameter checking to FileTimeToDosDateTime. --- dlls/kernel32/tests/time.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/kernel32/time.c | 11 ++++++++++- 2 files changed, 48 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index 36dcbdf..b0d8a46 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -600,6 +600,43 @@ static void test_TzSpecificLocalTimeToSystemTime(void) } } +static void test_FileTimeToDosDateTime(void) +{ + FILETIME ft = { 0 }; + WORD fatdate, fattime; + BOOL ret; + + if (0) + { + /* Crashes */ + FileTimeToDosDateTime(NULL, NULL, NULL); + } + /* Parameter checking */ + SetLastError(0xdeadbeef); + ret = FileTimeToDosDateTime(&ft, NULL, NULL); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = FileTimeToDosDateTime(&ft, &fatdate, NULL); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = FileTimeToDosDateTime(&ft, NULL, &fattime); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = FileTimeToDosDateTime(&ft, &fatdate, &fattime); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); +} + START_TEST(time) { HMODULE hKernel = GetModuleHandle("kernel32"); @@ -612,4 +649,5 @@ START_TEST(time) test_FileTimeToSystemTime(); test_FileTimeToLocalFileTime(); test_TzSpecificLocalTimeToSystemTime(); + test_FileTimeToDosDateTime(); } diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 2b7bd6c..5dff796 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1000,9 +1000,18 @@ BOOL WINAPI FileTimeToDosDateTime( const FILETIME *ft, LPWORD fatdate, time_t unixtime; struct tm* tm; + if (!fatdate || !fattime) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } li.u.LowPart = ft->dwLowDateTime; li.u.HighPart = ft->dwHighDateTime; - RtlTimeToSecondsSince1970( &li, &t ); + if (!RtlTimeToSecondsSince1970( &li, &t )) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } unixtime = t; tm = gmtime( &unixtime ); if (fattime)

1 0

Henri Verbeet : wined3d: Move the GetLevelDesc() functions to the IWineD3DBaseTexture interface.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: 63b72d789daec35d10bb8b0aba6a47eb5efcaba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63b72d789daec35d10bb8b0ab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 8 19:41:06 2011 +0100 wined3d: Move the GetLevelDesc() functions to the IWineD3DBaseTexture interface. --- dlls/d3d8/cubetexture.c | 2 +- dlls/d3d8/texture.c | 2 +- dlls/d3d8/volumetexture.c | 2 +- dlls/d3d9/cubetexture.c | 2 +- dlls/d3d9/texture.c | 2 +- dlls/d3d9/volumetexture.c | 2 +- dlls/ddraw/device.c | 6 +++--- dlls/wined3d/cubetexture.c | 4 ++-- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/volumetexture.c | 5 ++--- include/wine/wined3d.idl | 16 ++++------------ 11 files changed, 19 insertions(+), 28 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 6c70afb..298988d 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -260,7 +260,7 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetLevelDesc(IDirect3DCubeTextur TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); wined3d_mutex_lock(); - hr = IWineD3DCubeTexture_GetLevelDesc(This->wineD3DCubeTexture, level, &wined3d_desc); + hr = IWineD3DCubeTexture_GetSubResourceDesc(This->wineD3DCubeTexture, level, &wined3d_desc); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index c358ed0..c7bc4bd 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -257,7 +257,7 @@ static HRESULT WINAPI IDirect3DTexture8Impl_GetLevelDesc(IDirect3DTexture8 *ifac TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); wined3d_mutex_lock(); - hr = IWineD3DTexture_GetLevelDesc(This->wineD3DTexture, level, &wined3d_desc); + hr = IWineD3DTexture_GetSubResourceDesc(This->wineD3DTexture, level, &wined3d_desc); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index 3e2ee58..6b4ce3a 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -234,7 +234,7 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetLevelDesc(IDirect3DVolumeTe TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); wined3d_mutex_lock(); - hr = IWineD3DVolumeTexture_GetLevelDesc(This->wineD3DVolumeTexture, level, &wined3d_desc); + hr = IWineD3DVolumeTexture_GetSubResourceDesc(This->wineD3DVolumeTexture, level, &wined3d_desc); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c index 583efb1..eacc61e 100644 --- a/dlls/d3d9/cubetexture.c +++ b/dlls/d3d9/cubetexture.c @@ -276,7 +276,7 @@ static HRESULT WINAPI IDirect3DCubeTexture9Impl_GetLevelDesc(IDirect3DCubeTextur TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); wined3d_mutex_lock(); - hr = IWineD3DCubeTexture_GetLevelDesc(This->wineD3DCubeTexture, level, &wined3d_desc); + hr = IWineD3DCubeTexture_GetSubResourceDesc(This->wineD3DCubeTexture, level, &wined3d_desc); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index c7696a3..e94a172 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -272,7 +272,7 @@ static HRESULT WINAPI IDirect3DTexture9Impl_GetLevelDesc(IDirect3DTexture9 *ifac TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); wined3d_mutex_lock(); - hr = IWineD3DTexture_GetLevelDesc(This->wineD3DTexture, level, &wined3d_desc); + hr = IWineD3DTexture_GetSubResourceDesc(This->wineD3DTexture, level, &wined3d_desc); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index b1b43a9..c976e87 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -298,7 +298,7 @@ static HRESULT WINAPI IDirect3DVolumeTexture9Impl_GetLevelDesc(IDirect3DVolumeTe wined3d_mutex_lock(); - hr = IWineD3DVolumeTexture_GetLevelDesc(This->wineD3DVolumeTexture, level, &wined3d_desc); + hr = IWineD3DVolumeTexture_GetSubResourceDesc(This->wineD3DVolumeTexture, level, &wined3d_desc); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 9632947..b55994d 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2506,7 +2506,7 @@ IDirect3DDeviceImpl_3_GetRenderState(IDirect3DDevice3 *iface, if(hr == WINED3D_OK && tex) { - hr = IWineD3DTexture_GetLevelDesc((IWineD3DTexture*) tex, 0, &desc); + hr = IWineD3DBaseTexture_GetSubResourceDesc(tex, 0, &desc); if (SUCCEEDED(hr)) { ddfmt.dwSize = sizeof(ddfmt); @@ -2815,7 +2815,7 @@ IDirect3DDeviceImpl_3_SetRenderState(IDirect3DDevice3 *iface, if(hr == WINED3D_OK && tex) { memset(&desc, 0, sizeof(desc)); - hr = IWineD3DTexture_GetLevelDesc((IWineD3DTexture*) tex, 0, &desc); + hr = IWineD3DBaseTexture_GetSubResourceDesc(tex, 0, &desc); if (SUCCEEDED(hr)) { ddfmt.dwSize = sizeof(ddfmt); @@ -4588,7 +4588,7 @@ IDirect3DDeviceImpl_3_SetTexture(IDirect3DDevice3 *iface, if(result == WINED3D_OK && tex) { memset(&desc, 0, sizeof(desc)); - result = IWineD3DTexture_GetLevelDesc((IWineD3DTexture*) tex, 0, &desc); + result = IWineD3DBaseTexture_GetSubResourceDesc(tex, 0, &desc); if (SUCCEEDED(result)) { ddfmt.dwSize = sizeof(ddfmt); diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 5df720c..d4e5d21 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -326,7 +326,7 @@ static BOOL WINAPI IWineD3DCubeTextureImpl_IsCondNP2(IWineD3DCubeTexture *iface) return FALSE; } -static HRESULT WINAPI IWineD3DCubeTextureImpl_GetLevelDesc(IWineD3DCubeTexture *iface, +static HRESULT WINAPI IWineD3DCubeTextureImpl_GetSubResourceDesc(IWineD3DCubeTexture *iface, UINT sub_resource_idx, struct wined3d_resource_desc *desc) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; @@ -450,8 +450,8 @@ static const IWineD3DCubeTextureVtbl IWineD3DCubeTexture_Vtbl = IWineD3DCubeTextureImpl_GetAutoGenFilterType, IWineD3DCubeTextureImpl_GenerateMipSubLevels, IWineD3DCubeTextureImpl_IsCondNP2, + IWineD3DCubeTextureImpl_GetSubResourceDesc, /* IWineD3DCubeTexture */ - IWineD3DCubeTextureImpl_GetLevelDesc, IWineD3DCubeTextureImpl_GetCubeMapSurface, IWineD3DCubeTextureImpl_Map, IWineD3DCubeTextureImpl_Unmap, diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1af3412..7a78ad8 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -351,7 +351,7 @@ static BOOL WINAPI IWineD3DTextureImpl_IsCondNP2(IWineD3DTexture *iface) { return This->cond_np2; } -static HRESULT WINAPI IWineD3DTextureImpl_GetLevelDesc(IWineD3DTexture *iface, +static HRESULT WINAPI IWineD3DTextureImpl_GetSubResourceDesc(IWineD3DTexture *iface, UINT sub_resource_idx, struct wined3d_resource_desc *desc) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; @@ -468,8 +468,8 @@ static const IWineD3DTextureVtbl IWineD3DTexture_Vtbl = IWineD3DTextureImpl_GetAutoGenFilterType, IWineD3DTextureImpl_GenerateMipSubLevels, IWineD3DTextureImpl_IsCondNP2, + IWineD3DTextureImpl_GetSubResourceDesc, /* IWineD3DTexture */ - IWineD3DTextureImpl_GetLevelDesc, IWineD3DTextureImpl_GetSurfaceLevel, IWineD3DTextureImpl_Map, IWineD3DTextureImpl_Unmap, diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 9c6b57d..78ded41 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -263,7 +263,7 @@ static BOOL WINAPI IWineD3DVolumeTextureImpl_IsCondNP2(IWineD3DVolumeTexture *if return FALSE; } -static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetLevelDesc(IWineD3DVolumeTexture *iface, +static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetSubResourceDesc(IWineD3DVolumeTexture *iface, UINT sub_resource_idx, struct wined3d_resource_desc *desc) { IWineD3DBaseTextureImpl *texture = (IWineD3DBaseTextureImpl *)iface; @@ -380,10 +380,9 @@ static const IWineD3DVolumeTextureVtbl IWineD3DVolumeTexture_Vtbl = IWineD3DVolumeTextureImpl_SetAutoGenFilterType, IWineD3DVolumeTextureImpl_GetAutoGenFilterType, IWineD3DVolumeTextureImpl_GenerateMipSubLevels, - /* not in d3d */ IWineD3DVolumeTextureImpl_IsCondNP2, + IWineD3DVolumeTextureImpl_GetSubResourceDesc, /* volume texture */ - IWineD3DVolumeTextureImpl_GetLevelDesc, IWineD3DVolumeTextureImpl_GetVolumeLevel, IWineD3DVolumeTextureImpl_Map, IWineD3DVolumeTextureImpl_Unmap, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 36addd6..8acc0bb 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2362,6 +2362,10 @@ interface IWineD3DBaseTexture : IWineD3DResource ); BOOL IsCondNP2( ); + HRESULT GetSubResourceDesc( + [in] UINT sub_resource_idx, + [out] struct wined3d_resource_desc *desc + ); } [ @@ -2371,10 +2375,6 @@ interface IWineD3DBaseTexture : IWineD3DResource ] interface IWineD3DTexture : IWineD3DBaseTexture { - HRESULT GetLevelDesc( - [in] UINT sub_resource_idx, - [out] struct wined3d_resource_desc *desc - ); HRESULT GetSurfaceLevel( [in] UINT sub_resource_idx, [out] IWineD3DSurface **surface @@ -2400,10 +2400,6 @@ interface IWineD3DTexture : IWineD3DBaseTexture ] interface IWineD3DCubeTexture : IWineD3DBaseTexture { - HRESULT GetLevelDesc( - [in] UINT sub_resource_idx, - [out] struct wined3d_resource_desc *desc - ); HRESULT GetCubeMapSurface( [in] UINT sub_resource_idx, [out] IWineD3DSurface **surface @@ -2430,10 +2426,6 @@ interface IWineD3DCubeTexture : IWineD3DBaseTexture ] interface IWineD3DVolumeTexture : IWineD3DBaseTexture { - HRESULT GetLevelDesc( - [in] UINT sub_resource_idx, - [out] struct wined3d_resource_desc *desc - ); HRESULT GetVolumeLevel( [in] UINT sub_resource_idx, [out] IWineD3DVolume **volume

1 0

Alexandre Julliard : gdi32: Add a common header to the physdev structure.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: 5f5c7020f398b2017a6f0d964f8151741787971d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f5c7020f398b2017a6f0d964… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 8 19:25:09 2011 +0100 gdi32: Add a common header to the physdev structure. --- dlls/gdi32/dc.c | 4 ++++ dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 + dlls/gdi32/enhmfdrv/init.c | 2 ++ dlls/gdi32/gdi_private.h | 6 +++++- dlls/gdi32/mfdrv/init.c | 2 ++ dlls/gdi32/mfdrv/metafiledrv.h | 1 + dlls/wineps.drv/psdrv.h | 4 +++- dlls/winex11.drv/x11drv.h | 1 + 8 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 04f02be..4388deb 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -667,6 +667,8 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, goto error; } + dc->physDev->funcs = funcs; + dc->physDev->hdc = hdc; dc->vis_rect.left = 0; dc->vis_rect.top = 0; dc->vis_rect.right = GetDeviceCaps( hdc, DESKTOPHORZRES ); @@ -791,6 +793,8 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) goto error; } + dc->physDev->funcs = funcs; + dc->physDev->hdc = hdc; DC_InitDC( dc ); release_dc_ptr( dc ); return ret; diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 9a0f556..7a33237 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -32,6 +32,7 @@ typedef struct { + struct gdi_physdev dev; HDC hdc; ENHMETAHEADER *emh; /* Pointer to enhanced metafile header */ UINT handles_size, cur_handles; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index db04f50..efa91ee 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -320,6 +320,8 @@ HDC WINAPI CreateEnhMetaFileW( return 0; } dc->physDev = (PHYSDEV)physDev; + physDev->dev.funcs = &EMFDRV_Funcs; + physDev->dev.hdc = dc->hSelf; physDev->hdc = dc->hSelf; if(description) { /* App name\0Title\0\0 */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 015660f..5b241cd 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -72,7 +72,11 @@ typedef struct tagGDIOBJHDR /* Device functions for the Wine driver interface */ -typedef struct { int opaque; } *PHYSDEV; /* PHYSDEV is an opaque pointer */ +typedef struct gdi_physdev +{ + const struct tagDC_FUNCS *funcs; + HDC hdc; +} *PHYSDEV; typedef struct tagDC_FUNCS { diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 436d8ec..4659e73 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -172,6 +172,8 @@ static DC *MFDRV_AllocMetaFile(void) return NULL; } dc->physDev = (PHYSDEV)physDev; + physDev->dev.funcs = &MFDRV_Funcs; + physDev->dev.hdc = dc->hSelf; physDev->hdc = dc->hSelf; if (!(physDev->mh = HeapAlloc( GetProcessHeap(), 0, sizeof(*physDev->mh) ))) diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index b15864c..326192d 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -32,6 +32,7 @@ typedef struct { + struct gdi_physdev dev; HDC hdc; METAHEADER *mh; /* Pointer to metafile header */ UINT handles_size, cur_handles; diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 4ca6e70..62f9ccc 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -351,7 +351,9 @@ typedef struct { BOOL had_passthrough_rect; /* See the comment in PSDRV_Rectangle */ } JOB; -typedef struct { +typedef struct +{ + void *reserved[2]; /* reserved for gdi */ HDC hdc; PSFONT font; /* Current PS font */ DOWNLOAD *downloaded_fonts; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index c973675..da59d7e 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -144,6 +144,7 @@ struct xrender_info; /* X physical device */ typedef struct { + void *reserved[2]; /* reserved for gdi */ HDC hdc; GC gc; /* X Window GC */ Drawable drawable;

1 0

Alexandre Julliard : gdi32: Add null driver entry points for painting functions that have a fallback implementation .
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: 7e3a871497d05e747287f867fcd743190418278d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e3a871497d05e747287f867f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 8 21:15:59 2011 +0100 gdi32: Add null driver entry points for painting functions that have a fallback implementation. --- dlls/gdi32/driver.c | 18 +- dlls/gdi32/gdi_private.h | 11 ++ dlls/gdi32/painting.c | 436 ++++++++++++++++++++++++---------------------- 3 files changed, 252 insertions(+), 213 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e3a871497d05e747287f…

1 0

Alexandre Julliard : wininet: Convert file size in cache entry to a large integer.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: d790688afa9487007a255208865caf8aeb6dc52f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d790688afa9487007a2552088… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 9 12:23:05 2011 +0100 wininet: Convert file size in cache entry to a large integer. --- dlls/wininet/urlcache.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 10b518b..f099fa5 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -96,8 +96,7 @@ typedef struct _URL_CACHEFILE_ENTRY WORD wExpiredDate; /* expire date in dos format */ WORD wExpiredTime; /* expire time in dos format */ DWORD dwUnknown1; /* usually zero */ - DWORD dwSizeLow; /* see INTERNET_CACHE_ENTRY_INFO::dwSizeLow */ - DWORD dwSizeHigh; /* see INTERNET_CACHE_ENTRY_INFO::dwSizeHigh */ + ULARGE_INTEGER size; /* see INTERNET_CACHE_ENTRY_INFO::dwSizeLow/High */ DWORD dwUnknown2; /* usually zero */ DWORD dwExemptDelta; /* see INTERNET_CACHE_ENTRY_INFO::dwExemptDelta */ DWORD dwUnknown3; /* usually 0x60 */ @@ -959,8 +958,8 @@ static DWORD URLCache_CopyEntry( lpCacheEntryInfo->u.dwExemptDelta = pUrlEntry->dwExemptDelta; lpCacheEntryInfo->dwHeaderInfoSize = pUrlEntry->dwHeaderInfoSize; lpCacheEntryInfo->dwHitRate = pUrlEntry->dwHitRate; - lpCacheEntryInfo->dwSizeHigh = pUrlEntry->dwSizeHigh; - lpCacheEntryInfo->dwSizeLow = pUrlEntry->dwSizeLow; + lpCacheEntryInfo->dwSizeHigh = pUrlEntry->size.u.HighPart; + lpCacheEntryInfo->dwSizeLow = pUrlEntry->size.u.LowPart; lpCacheEntryInfo->dwStructSize = sizeof(*lpCacheEntryInfo); lpCacheEntryInfo->dwUseCount = pUrlEntry->dwUseCount; DosDateTimeToFileTime(pUrlEntry->wExpiredDate, pUrlEntry->wExpiredTime, &lpCacheEntryInfo->ExpireTime); @@ -2432,8 +2431,7 @@ static BOOL CommitUrlCacheEntryInternal( DWORD dwOffsetLocalFileName = 0; DWORD dwOffsetHeader = 0; DWORD dwOffsetFileExtension = 0; - DWORD dwFileSizeLow = 0; - DWORD dwFileSizeHigh = 0; + LARGE_INTEGER file_size; BYTE cDirectory = 0; char achFile[MAX_PATH]; LPSTR lpszUrlNameA = NULL; @@ -2452,7 +2450,8 @@ static BOOL CommitUrlCacheEntryInternal( if (lpszOriginalUrl) WARN(": lpszOriginalUrl ignored\n"); - + + file_size.QuadPart = 0; if (lpszLocalFileName) { HANDLE hFile; @@ -2465,8 +2464,7 @@ static BOOL CommitUrlCacheEntryInternal( } /* Get file size */ - dwFileSizeLow = GetFileSize(hFile, &dwFileSizeHigh); - if ((dwFileSizeLow == INVALID_FILE_SIZE) && (GetLastError() != NO_ERROR)) + if (!GetFileSizeEx(hFile, &file_size)) { ERR("couldn't get file size (error is %d)\n", GetLastError()); CloseHandle(hFile); @@ -2595,9 +2593,7 @@ static BOOL CommitUrlCacheEntryInternal( pUrlEntry->dwOffsetHeaderInfo = dwOffsetHeader; pUrlEntry->dwOffsetLocalName = dwOffsetLocalFileName; pUrlEntry->dwOffsetUrl = DWORD_ALIGN(sizeof(*pUrlEntry)); - pUrlEntry->dwSizeHigh = 0; - pUrlEntry->dwSizeLow = dwFileSizeLow; - pUrlEntry->dwSizeHigh = dwFileSizeHigh; + pUrlEntry->size.QuadPart = file_size.QuadPart; pUrlEntry->dwUseCount = 0; GetSystemTimeAsFileTime(&pUrlEntry->LastAccessTime); pUrlEntry->LastModifiedTime = LastModifiedTime;

1 0

Alexandre Julliard : gdi32: Add null driver entry points for the print spooler functions.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: 22f920df8e02e911411b8800ab7e1890ce1d7a12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22f920df8e02e911411b8800a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 8 21:36:52 2011 +0100 gdi32: Add null driver entry points for the print spooler functions. --- dlls/gdi32/driver.c | 35 +++++++++++++++++++++++++---- dlls/gdi32/printdrv.c | 58 +++++++++++++++++++++++++++--------------------- 2 files changed, 63 insertions(+), 30 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 114226b..acd8f6e 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -312,6 +312,11 @@ done: } +static INT CDECL nulldrv_AbortDoc( PHYSDEV dev ) +{ + return 0; +} + static BOOL CDECL nulldrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) { @@ -329,6 +334,16 @@ static BOOL CDECL nulldrv_Ellipse( PHYSDEV dev, INT left, INT top, INT right, IN return TRUE; } +static INT CDECL nulldrv_EndDoc( PHYSDEV dev ) +{ + return 0; +} + +static INT CDECL nulldrv_EndPage( PHYSDEV dev ) +{ + return 0; +} + static BOOL CDECL nulldrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) { return TRUE; @@ -398,9 +413,19 @@ static COLORREF CDECL nulldrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF colo return color; } +static INT CDECL nulldrv_StartDoc( PHYSDEV dev, const DOCINFOW *info ) +{ + return 0; +} + +static INT CDECL nulldrv_StartPage( PHYSDEV dev ) +{ + return 1; +} + const DC_FUNCTIONS null_driver = { - NULL, /* pAbortDoc */ + nulldrv_AbortDoc, /* pAbortDoc */ NULL, /* pAbortPath */ NULL, /* pAlphaBlend */ nulldrv_AngleArc, /* pAngleArc */ @@ -420,8 +445,8 @@ const DC_FUNCTIONS null_driver = NULL, /* pDescribePixelFormat */ NULL, /* pDeviceCapabilities */ nulldrv_Ellipse, /* pEllipse */ - NULL, /* pEndDoc */ - NULL, /* pEndPage */ + nulldrv_EndDoc, /* pEndDoc */ + nulldrv_EndPage, /* pEndPage */ NULL, /* pEndPath */ NULL, /* pEnumICMProfiles */ NULL, /* pEnumDeviceFonts */ @@ -510,8 +535,8 @@ const DC_FUNCTIONS null_driver = NULL, /* pSetWindowExt */ NULL, /* pSetWindowOrg */ NULL, /* pSetWorldTransform */ - NULL, /* pStartDoc */ - NULL, /* pStartPage */ + nulldrv_StartDoc, /* pStartDoc */ + nulldrv_StartPage, /* pStartPage */ NULL, /* pStretchBlt */ NULL, /* pStretchDIBits */ NULL, /* pStrokeAndFillPath */ diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c index cc1e61f..3cfdc47 100644 --- a/dlls/gdi32/printdrv.c +++ b/dlls/gdi32/printdrv.c @@ -69,7 +69,7 @@ DWORD WINAPI GdiInitSpool(void) */ INT WINAPI StartDocW(HDC hdc, const DOCINFOW* doc) { - INT ret = 0; + INT ret; DC *dc = get_dc_ptr( hdc ); TRACE("DocName = %s Output = %s Datatype = %s\n", @@ -78,13 +78,12 @@ INT WINAPI StartDocW(HDC hdc, const DOCINFOW* doc) if(!dc) return SP_ERROR; - if (dc->pAbortProc && !dc->pAbortProc( hdc, 0 )) + if (dc->pAbortProc && !dc->pAbortProc( hdc, 0 )) ret = 0; + else { - release_dc_ptr( dc ); - return ret; + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pStartDoc ); + ret = physdev->funcs->pStartDoc( physdev, doc ); } - - if (dc->funcs->pStartDoc) ret = dc->funcs->pStartDoc( dc->physDev, doc ); release_dc_ptr( dc ); return ret; } @@ -140,12 +139,15 @@ INT WINAPI StartDocA(HDC hdc, const DOCINFOA* doc) */ INT WINAPI EndDoc(HDC hdc) { - INT ret = 0; + INT ret = SP_ERROR; DC *dc = get_dc_ptr( hdc ); - if(!dc) return SP_ERROR; - if (dc->funcs->pEndDoc) ret = dc->funcs->pEndDoc( dc->physDev ); - release_dc_ptr( dc ); + if (dc) + { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pEndDoc ); + ret = physdev->funcs->pEndDoc( physdev ); + release_dc_ptr( dc ); + } return ret; } @@ -156,15 +158,15 @@ INT WINAPI EndDoc(HDC hdc) */ INT WINAPI StartPage(HDC hdc) { - INT ret = 1; + INT ret = SP_ERROR; DC *dc = get_dc_ptr( hdc ); - if(!dc) return SP_ERROR; - if(dc->funcs->pStartPage) - ret = dc->funcs->pStartPage( dc->physDev ); - else - FIXME("stub\n"); - release_dc_ptr( dc ); + if (dc) + { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pStartPage ); + ret = physdev->funcs->pStartPage( physdev ); + release_dc_ptr( dc ); + } return ret; } @@ -175,12 +177,15 @@ INT WINAPI StartPage(HDC hdc) */ INT WINAPI EndPage(HDC hdc) { - INT ret = 0; + INT ret = SP_ERROR; DC *dc = get_dc_ptr( hdc ); - if(!dc) return SP_ERROR; - if (dc->funcs->pEndPage) ret = dc->funcs->pEndPage( dc->physDev ); - release_dc_ptr( dc ); + if (dc) + { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pEndPage ); + ret = physdev->funcs->pEndPage( physdev ); + release_dc_ptr( dc ); + } return ret; } @@ -190,12 +195,15 @@ INT WINAPI EndPage(HDC hdc) */ INT WINAPI AbortDoc(HDC hdc) { - INT ret = 0; + INT ret = SP_ERROR; DC *dc = get_dc_ptr( hdc ); - if(!dc) return SP_ERROR; - if (dc->funcs->pAbortDoc) ret = dc->funcs->pAbortDoc( dc->physDev ); - release_dc_ptr( dc ); + if (dc) + { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pAbortDoc ); + ret = physdev->funcs->pAbortDoc( physdev ); + release_dc_ptr( dc ); + } return ret; }

1 0

Juan Lang : wininet: Change type of cache limit and usage to large integers .
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: f0cd3de5c1d5d49f45b9594d7211a348f102b69a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0cd3de5c1d5d49f45b9594d7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 8 07:54:19 2011 -0800 wininet: Change type of cache limit and usage to large integers. --- dlls/wininet/urlcache.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index ca7f880..10b518b 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -154,12 +154,9 @@ typedef struct _URLCACHE_HEADER DWORD dwIndexCapacityInBlocks; DWORD dwBlocksInUse; DWORD dwUnknown1; - DWORD dwCacheLimitLow; - DWORD dwCacheLimitHigh; - DWORD dwCacheUsageLow; - DWORD dwCacheUsageHigh; - DWORD dwExemptUsageLow; - DWORD dwExemptUsageHigh; + ULARGE_INTEGER CacheLimit; + ULARGE_INTEGER CacheUsage; + ULARGE_INTEGER ExemptUsage; DWORD DirectoryCount; /* number of directory_data's */ DIRECTORY_DATA directory_data[1]; /* first directory entry */ } URLCACHE_HEADER, *LPURLCACHE_HEADER; @@ -312,8 +309,7 @@ static DWORD URLCacheContainer_OpenIndex(URLCACHECONTAINER * pContainer) pHeader->dwFileSize = dwFileSize; pHeader->dwIndexCapacityInBlocks = NEWFILE_NUM_BLOCKS; /* 127MB - taken from default for Windows 2000 */ - pHeader->dwCacheLimitHigh = 0; - pHeader->dwCacheLimitLow = 0x07ff5400; + pHeader->CacheLimit.QuadPart = 0x07ff5400; /* Copied from a Windows 2000 cache index */ pHeader->DirectoryCount = 4; @@ -328,8 +324,7 @@ static DWORD URLCacheContainer_OpenIndex(URLCACHECONTAINER * pContainer) (BYTE *) &dw, &len) == ERROR_SUCCESS && keytype == REG_DWORD) { - pHeader->dwCacheLimitHigh = (dw >> 22); - pHeader->dwCacheLimitLow = dw << 10; + pHeader->CacheLimit.QuadPart = (ULONGLONG)dw * 1024; } RegCloseKey(key); }

1 0

Alexandre Julliard : gdi32: Add null driver entry points for a number of simple painting functions.
by Alexandre Julliard March 9, 2011

March 9, 2011

Module: wine Branch: master Commit: 1f6f82782cd8b214734173f548480f1fc9aeca47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f6f82782cd8b214734173f54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 8 20:30:03 2011 +0100 gdi32: Add null driver entry points for a number of simple painting functions. --- dlls/gdi32/driver.c | 118 ++++++++++++++++++++++++++++++++++++++++++------- dlls/gdi32/painting.c | 100 +++++++++++++++++++++++++++++------------ 2 files changed, 173 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f6f82782cd8b21473417…

1 0