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

Piotr Caban : mshtml: Added IHTMLPrivateWindow_GetAddressBarUrl implementation.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: 12b85befc0bc211d1af51b54eea6c13d24ec6171 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12b85befc0bc211d1af51b54e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 11 11:14:08 2011 +0100 mshtml: Added IHTMLPrivateWindow_GetAddressBarUrl implementation. --- dlls/mshtml/htmlwindow.c | 9 +++++++-- dlls/mshtml/tests/htmldoc.c | 14 ++++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 99d03b3..0e42021 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1777,8 +1777,13 @@ static HRESULT WINAPI HTMLPrivateWindow_FindWindowByName(IHTMLPrivateWindow *ifa static HRESULT WINAPI HTMLPrivateWindow_GetAddressBar(IHTMLPrivateWindow *iface, BSTR *url) { HTMLWindow *This = impl_from_IHTMLPrivateWindow(iface); - FIXME("(%p)->(%p)\n", This, url); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, url); + + if(!url) + return E_INVALIDARG; + + *url = SysAllocString(This->url); + return S_OK; } static const IHTMLPrivateWindowVtbl HTMLPrivateWindowVtbl = { diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index ab5e17b..11b2036 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -3533,7 +3533,6 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace) str2 = a2bstr(""); V_VT(&vempty) = VT_EMPTY; hres = IHTMLPrivateWindow_SuperNavigate(priv_window, str, str2, NULL, NULL, &vempty, &vempty, 0); - SysFreeString(str); SysFreeString(str2); ok(hres == S_OK, "SuperNavigate failed: %08x\n", hres); @@ -3548,9 +3547,20 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace) test_GetCurMoniker(doc_unk, doc_mon, NULL); doc_mon = NULL; } - IHTMLPrivateWindow_Release(priv_window); + hres = IHTMLPrivateWindow_GetAddressBarUrl(priv_window, &str2); + ok(hres == S_OK, "GetAddressBarUrl failed: %08x\n", hres); + ok(!strcmp_wa(str2, use_replace?"about:blank":"http://www.winehq.org/"), + "unexpected address bar url: %s\n", wine_dbgstr_w(str2)); + SysFreeString(str2); test_download(DWL_VERBDONE); + + hres = IHTMLPrivateWindow_GetAddressBarUrl(priv_window, &str2); + ok(hres == S_OK, "GetAddressBarUrl failed: %08x\n", hres); + ok(!lstrcmpW(str2, str), "unexpected address bar url: %s\n", wine_dbgstr_w(str2)); + SysFreeString(str2); + SysFreeString(str); + IHTMLPrivateWindow_Release(priv_window); } static void test_open_window(IHTMLDocument2 *doc)

1 0

Piotr Caban : mshtml: Execute IDocObject_FireDocumentComplete in handle_load function.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: 98281236c0293c490ce7b35c747aff3e49d71318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98281236c0293c490ce7b35c7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 11 11:14:18 2011 +0100 mshtml: Execute IDocObject_FireDocumentComplete in handle_load function. --- dlls/mshtml/mshtml_private.h | 4 ++++ dlls/mshtml/nsevents.c | 4 ++++ dlls/mshtml/oleobj.c | 28 ++++++++++++++++++++++++++-- 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 11ab878..84596fe 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -18,6 +18,7 @@ #include "wingdi.h" #include "docobj.h" +#include "docobjectservice.h" #include "comcat.h" #include "mshtml.h" #include "mshtmhst.h" @@ -424,6 +425,7 @@ struct HTMLDocumentObj { IOleInPlaceFrame *frame; IOleInPlaceUIWindow *ip_window; IAdviseSink *view_sink; + IDocObjectService *doc_object_service; DOCHOSTUIINFO hostinfo; @@ -882,6 +884,8 @@ DEFINE_GUID(CLSID_SysimageProtocol, 0x76E67A63, 0x06E9, 0x11D2, 0xA8,0x40, 0x00, DEFINE_GUID(CLSID_CMarkup,0x3050f4fb,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b); +DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); + /* memory allocation functions */ static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index f6a1ed6..957b892 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -254,6 +254,10 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event update_title(doc_obj); } + if(doc_obj && doc_obj->doc_object_service) + IDocObjectService_FireDocumentComplete(doc_obj->doc_object_service, + &doc->basedoc.window->IHTMLWindow2_iface, 0); + if(!doc->nsdoc) { ERR("NULL nsdoc\n"); return NS_ERROR_FAILURE; diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index f8a84ac..d80db20 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -28,17 +28,16 @@ #include "winuser.h" #include "ole2.h" #include "shlguid.h" +#include "shdeprecated.h" #include "mshtmdid.h" #include "idispids.h" #include "wine/debug.h" #include "mshtml_private.h" -#include "initguid.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); #define DOCHOST_DOCCANNAVIGATE 0 /********************************************************** @@ -99,6 +98,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite HTMLDocument *This = impl_from_IOleObject(iface); IOleCommandTarget *cmdtrg = NULL; IOleWindow *ole_window; + IServiceProvider *sp; BOOL hostui_setup; VARIANT silent; HWND hwnd; @@ -120,6 +120,11 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite This->doc_obj->hostui = NULL; } + if(This->doc_obj->doc_object_service) { + IDocObjectService_Release(This->doc_obj->doc_object_service); + This->doc_obj->doc_object_service = NULL; + } + memset(&This->doc_obj->hostinfo, 0, sizeof(DOCHOSTUIINFO)); if(!pClientSite) @@ -128,6 +133,25 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite IOleClientSite_AddRef(pClientSite); This->doc_obj->client = pClientSite; + hres = IOleClientSite_QueryInterface(pClientSite, &IID_IServiceProvider, (void**)&sp); + if(SUCCEEDED(hres)) { + IBrowserService *browser_service; + IDocObjectService *doc_object_service; + + hres = IServiceProvider_QueryService(sp, &IID_IShellBrowser, + &IID_IBrowserService, (void**)&browser_service); + if(SUCCEEDED(hres)) { + hres = IBrowserService_QueryInterface(browser_service, + &IID_IDocObjectService, (void**)&doc_object_service); + if(SUCCEEDED(hres)) + This->doc_obj->doc_object_service = doc_object_service; + + IBrowserService_Release(browser_service); + } + + IServiceProvider_Release(sp); + } + hostui_setup = This->doc_obj->hostui_setup; if(!This->doc_obj->hostui) {

1 0

Michael Stefaniuc : shdocvw: COM cleanup for the ITaskbarList iface.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: 4f382430f2176bc576c80e89c8324107278c0ed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f382430f2176bc576c80e89c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 11 11:39:07 2011 +0100 shdocvw: COM cleanup for the ITaskbarList iface. --- dlls/shdocvw/taskbarlist.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/shdocvw/taskbarlist.c b/dlls/shdocvw/taskbarlist.c index 2c38080..d853506 100644 --- a/dlls/shdocvw/taskbarlist.c +++ b/dlls/shdocvw/taskbarlist.c @@ -27,10 +27,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); struct taskbar_list { - const struct ITaskbarListVtbl *lpVtbl; + ITaskbarList ITaskbarList_iface; LONG refcount; }; +static inline struct taskbar_list *impl_from_ITaskbarList(ITaskbarList *iface) +{ + return CONTAINING_RECORD(iface, struct taskbar_list, ITaskbarList_iface); +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE taskbar_list_QueryInterface(ITaskbarList *iface, REFIID riid, void **object) @@ -53,7 +58,7 @@ static HRESULT STDMETHODCALLTYPE taskbar_list_QueryInterface(ITaskbarList *iface static ULONG STDMETHODCALLTYPE taskbar_list_AddRef(ITaskbarList *iface) { - struct taskbar_list *This = (struct taskbar_list *)iface; + struct taskbar_list *This = impl_from_ITaskbarList(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u\n", This, refcount); @@ -63,7 +68,7 @@ static ULONG STDMETHODCALLTYPE taskbar_list_AddRef(ITaskbarList *iface) static ULONG STDMETHODCALLTYPE taskbar_list_Release(ITaskbarList *iface) { - struct taskbar_list *This = (struct taskbar_list *)iface; + struct taskbar_list *This = impl_from_ITaskbarList(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -150,12 +155,12 @@ HRESULT TaskbarList_Create(IUnknown *outer, REFIID riid, void **taskbar_list) return E_OUTOFMEMORY; } - object->lpVtbl = &taskbar_list_vtbl; + object->ITaskbarList_iface.lpVtbl = &taskbar_list_vtbl; object->refcount = 0; TRACE("Created ITaskbarList %p\n", object); - hr = ITaskbarList_QueryInterface((ITaskbarList *)object, riid, taskbar_list); + hr = ITaskbarList_QueryInterface(&object->ITaskbarList_iface, riid, taskbar_list); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, object);

1 0

Huw Davies : fonts: Increase the version number so that we don' t use the Mac's version of symbol.ttf, which doesn' t contain a Microsoft Symbol charmap.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: 47dee8bda21de80077261cc11bba53adc02a9d19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47dee8bda21de80077261cc11… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 11 09:49:34 2011 +0000 fonts: Increase the version number so that we don't use the Mac's version of symbol.ttf, which doesn't contain a Microsoft Symbol charmap. --- fonts/symbol.sfd | 2 +- fonts/symbol.ttf | Bin 26040 -> 26040 bytes 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fonts/symbol.sfd b/fonts/symbol.sfd index bf34606..44b6302 100644 --- a/fonts/symbol.sfd +++ b/fonts/symbol.sfd @@ -4,7 +4,7 @@ FullName: Symbol FamilyName: Symbol Weight: Book Copyright: WineSymbol © (Jon Parshall for CodeWeavers). 2009. -Version: 0.001 February 3, 2009, initial release +Version: 1.1 February 3, 2009, initial release ItalicAngle: 0 UnderlinePosition: -173 UnderlineWidth: 100 diff --git a/fonts/symbol.ttf b/fonts/symbol.ttf index b0a3fc1..bb54fb8 100644 Binary files a/fonts/symbol.ttf and b/fonts/symbol.ttf differ

1 0

Alexandre Julliard : gdi32: Move all the metafile DC setting functions to mfdrv/dc.c
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: 7d1dd28d25e8d7dd2494022d17434eb5a9234549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d1dd28d25e8d7dd2494022d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 11 12:03:41 2011 +0100 gdi32: Move all the metafile DC setting functions to mfdrv/dc.c --- dlls/gdi32/Makefile.in | 1 - dlls/gdi32/mfdrv/dc.c | 64 +++++++++++++++++++++++-- dlls/gdi32/mfdrv/graphics.c | 22 --------- dlls/gdi32/mfdrv/mapping.c | 107 ------------------------------------------- 4 files changed, 58 insertions(+), 136 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 0de8477..45740b1 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -32,7 +32,6 @@ C_SRCS = \ mfdrv/dc.c \ mfdrv/graphics.c \ mfdrv/init.c \ - mfdrv/mapping.c \ mfdrv/objects.c \ mfdrv/text.c \ opengl.c \ diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index 4929f0d..fb66d2b 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -40,6 +40,16 @@ INT CDECL MFDRV_SetBkMode( PHYSDEV dev, INT mode ) return MFDRV_MetaParam1( dev, META_SETBKMODE, (WORD)mode) ? mode : 0; } +COLORREF CDECL MFDRV_SetBkColor( PHYSDEV dev, COLORREF color ) +{ + return MFDRV_MetaParam2(dev, META_SETBKCOLOR, HIWORD(color), LOWORD(color)) ? color : CLR_INVALID; +} + +COLORREF CDECL MFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) +{ + return MFDRV_MetaParam2(dev, META_SETTEXTCOLOR, HIWORD(color), LOWORD(color)) ? color : CLR_INVALID; +} + INT CDECL MFDRV_SetROP2( PHYSDEV dev, INT rop ) { return MFDRV_MetaParam1( dev, META_SETROP2, (WORD)rop) ? rop : 0; @@ -62,14 +72,12 @@ INT CDECL MFDRV_SetStretchBltMode( PHYSDEV dev, INT mode ) INT CDECL MFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { - return MFDRV_MetaParam4( dev, META_INTERSECTCLIPRECT, left, top, right, - bottom ); + return MFDRV_MetaParam4( dev, META_INTERSECTCLIPRECT, left, top, right, bottom ); } INT CDECL MFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { - return MFDRV_MetaParam4( dev, META_EXCLUDECLIPRECT, left, top, right, - bottom ); + return MFDRV_MetaParam4( dev, META_EXCLUDECLIPRECT, left, top, right, bottom ); } INT CDECL MFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) @@ -77,6 +85,51 @@ INT CDECL MFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) return MFDRV_MetaParam2( dev, META_OFFSETCLIPRGN, x, y ); } +INT CDECL MFDRV_SetMapMode( PHYSDEV dev, INT mode ) +{ + return MFDRV_MetaParam1( dev, META_SETMAPMODE, mode ); +} + +BOOL CDECL MFDRV_SetViewportExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) +{ + return MFDRV_MetaParam2( dev, META_SETVIEWPORTEXT, x, y ); +} + +BOOL CDECL MFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) +{ + return MFDRV_MetaParam2( dev, META_SETVIEWPORTORG, x, y ); +} + +BOOL CDECL MFDRV_SetWindowExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) +{ + return MFDRV_MetaParam2( dev, META_SETWINDOWEXT, x, y ); +} + +BOOL CDECL MFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) +{ + return MFDRV_MetaParam2( dev, META_SETWINDOWORG, x, y ); +} + +BOOL CDECL MFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) +{ + return MFDRV_MetaParam2( dev, META_OFFSETVIEWPORTORG, x, y ); +} + +BOOL CDECL MFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) +{ + return MFDRV_MetaParam2( dev, META_OFFSETWINDOWORG, x, y ); +} + +BOOL CDECL MFDRV_ScaleViewportExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) +{ + return MFDRV_MetaParam4( dev, META_SCALEVIEWPORTEXT, xNum, xDenom, yNum, yDenom ); +} + +BOOL CDECL MFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) +{ + return MFDRV_MetaParam4( dev, META_SCALEWINDOWEXT, xNum, xDenom, yNum, yDenom ); +} + BOOL CDECL MFDRV_SetTextJustification( PHYSDEV dev, INT extra, INT breaks ) { return MFDRV_MetaParam2( dev, META_SETTEXTJUSTIFICATION, extra, breaks ); @@ -89,8 +142,7 @@ INT CDECL MFDRV_SetTextCharacterExtra( PHYSDEV dev, INT extra ) DWORD CDECL MFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) { - return MFDRV_MetaParam2( dev, META_SETMAPPERFLAGS, HIWORD(flags), - LOWORD(flags) ) ? flags : GDI_ERROR; + return MFDRV_MetaParam2( dev, META_SETMAPPERFLAGS, HIWORD(flags), LOWORD(flags) ) ? flags : GDI_ERROR; } BOOL CDECL MFDRV_AbortPath( PHYSDEV dev ) diff --git a/dlls/gdi32/mfdrv/graphics.c b/dlls/gdi32/mfdrv/graphics.c index e2cc6eb..0ee1b0c 100644 --- a/dlls/gdi32/mfdrv/graphics.c +++ b/dlls/gdi32/mfdrv/graphics.c @@ -430,28 +430,6 @@ INT CDECL MFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode ) /********************************************************************** - * MFDRV_SetBkColor - */ -COLORREF CDECL -MFDRV_SetBkColor( PHYSDEV dev, COLORREF color ) -{ - return MFDRV_MetaParam2(dev, META_SETBKCOLOR, HIWORD(color), - LOWORD(color)) ? color : CLR_INVALID; -} - - -/********************************************************************** - * MFDRV_SetTextColor - */ -COLORREF CDECL -MFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) -{ - return MFDRV_MetaParam2(dev, META_SETTEXTCOLOR, HIWORD(color), - LOWORD(color)) ? color : CLR_INVALID; -} - - -/********************************************************************** * MFDRV_PolyBezier * Since MetaFiles don't record Beziers and they don't even record * approximations to them using lines, we need this stub function. diff --git a/dlls/gdi32/mfdrv/mapping.c b/dlls/gdi32/mfdrv/mapping.c deleted file mode 100644 index 0b88515..0000000 --- a/dlls/gdi32/mfdrv/mapping.c +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Metafile GDI mapping mode functions - * - * Copyright 1996 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "gdi_private.h" -#include "mfdrv/metafiledrv.h" - - -/*********************************************************************** - * MFDRV_SetMapMode - */ -INT CDECL MFDRV_SetMapMode( PHYSDEV dev, INT mode ) -{ - return MFDRV_MetaParam1( dev, META_SETMAPMODE, mode ); -} - - -/*********************************************************************** - * MFDRV_SetViewportExtEx - */ -BOOL CDECL MFDRV_SetViewportExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) -{ - return MFDRV_MetaParam2( dev, META_SETVIEWPORTEXT, x, y ); -} - - -/*********************************************************************** - * MFDRV_SetViewportOrgEx - */ -BOOL CDECL MFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) -{ - return MFDRV_MetaParam2( dev, META_SETVIEWPORTORG, x, y ); -} - - -/*********************************************************************** - * MFDRV_SetWindowExtEx - */ -BOOL CDECL MFDRV_SetWindowExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) -{ - return MFDRV_MetaParam2( dev, META_SETWINDOWEXT, x, y ); -} - - -/*********************************************************************** - * MFDRV_SetWindowOrgEx - */ -BOOL CDECL MFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) -{ - return MFDRV_MetaParam2( dev, META_SETWINDOWORG, x, y ); -} - - -/*********************************************************************** - * MFDRV_OffsetViewportOrgEx - */ -BOOL CDECL MFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) -{ - return MFDRV_MetaParam2( dev, META_OFFSETVIEWPORTORG, x, y ); -} - - -/*********************************************************************** - * MFDRV_OffsetWindowOrgEx - */ -BOOL CDECL MFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) -{ - return MFDRV_MetaParam2( dev, META_OFFSETWINDOWORG, x, y ); -} - - -/*********************************************************************** - * MFDRV_ScaleViewportExtEx - */ -BOOL CDECL MFDRV_ScaleViewportExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) -{ - return MFDRV_MetaParam4( dev, META_SCALEVIEWPORTEXT, xNum, xDenom, yNum, yDenom ); -} - - -/*********************************************************************** - * MFDRV_ScaleWindowExtEx - */ -BOOL CDECL MFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT yDenom, SIZE *size ) -{ - return MFDRV_MetaParam4( dev, META_SCALEWINDOWEXT, xNum, xDenom, yNum, yDenom ); -}

1 0

Alexandre Julliard : gdi32: Move all the enhanced metafile DC setting functions to enhmfdrv/dc.c
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: 8c3766c5e7bf63826a4c4f1064483c9821ee43e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c3766c5e7bf63826a4c4f106… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 11 12:03:41 2011 +0100 gdi32: Move all the enhanced metafile DC setting functions to enhmfdrv/dc.c --- dlls/gdi32/Makefile.in | 1 - dlls/gdi32/enhmfdrv/dc.c | 204 ++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/enhmfdrv/graphics.c | 50 ---------- dlls/gdi32/enhmfdrv/mapping.c | 188 ------------------------------------ 4 files changed, 204 insertions(+), 239 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c3766c5e7bf63826a4c4…

1 0

Alexandre Julliard : gdi32: Add null driver entry points for the device printer functions.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: d1db4c859c53f6e7f9789dd213874faa7312d8a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1db4c859c53f6e7f9789dd21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 11 12:15:38 2011 +0100 gdi32: Add null driver entry points for the device printer functions. --- dlls/gdi32/driver.c | 48 ++++++++++++++++++++++++++++++++++++------------ dlls/gdi32/gdiobj.c | 5 +++-- 2 files changed, 39 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 3d5f0e7..e1a9897 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -334,6 +334,12 @@ static BOOL CDECL nulldrv_DeleteObject( PHYSDEV dev, HGDIOBJ obj ) return TRUE; } +static DWORD CDECL nulldrv_DeviceCapabilities( LPSTR buffer, LPCSTR device, LPCSTR port, + WORD cap, LPSTR output, DEVMODEA *devmode ) +{ + return -1; +} + static BOOL CDECL nulldrv_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { return TRUE; @@ -349,11 +355,28 @@ static INT CDECL nulldrv_EndPage( PHYSDEV dev ) return 0; } +static INT CDECL nulldrv_ExtDeviceMode( LPSTR buffer, HWND hwnd, DEVMODEA *output, LPSTR device, + LPSTR port, DEVMODEA *input, LPSTR profile, DWORD mode ) +{ + return -1; +} + +static INT CDECL nulldrv_ExtEscape( PHYSDEV dev, INT escape, INT in_size, const void *in_data, + INT out_size, void *out_data ) +{ + return 0; +} + static BOOL CDECL nulldrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) { return TRUE; } +static BOOL CDECL nulldrv_GdiComment( PHYSDEV dev, UINT size, const BYTE *data ) +{ + return FALSE; +} + static COLORREF CDECL nulldrv_GetPixel( PHYSDEV dev, INT x, INT y ) { return 0; @@ -613,7 +636,7 @@ const DC_FUNCTIONS null_driver = NULL, /* pDeleteDC */ nulldrv_DeleteObject, /* pDeleteObject */ NULL, /* pDescribePixelFormat */ - NULL, /* pDeviceCapabilities */ + nulldrv_DeviceCapabilities, /* pDeviceCapabilities */ nulldrv_Ellipse, /* pEllipse */ nulldrv_EndDoc, /* pEndDoc */ nulldrv_EndPage, /* pEndPage */ @@ -621,8 +644,8 @@ const DC_FUNCTIONS null_driver = NULL, /* pEnumICMProfiles */ NULL, /* pEnumDeviceFonts */ nulldrv_ExcludeClipRect, /* pExcludeClipRect */ - NULL, /* pExtDeviceMode */ - NULL, /* pExtEscape */ + nulldrv_ExtDeviceMode, /* pExtDeviceMode */ + nulldrv_ExtEscape, /* pExtEscape */ nulldrv_ExtFloodFill, /* pExtFloodFill */ nulldrv_ExtSelectClipRgn, /* pExtSelectClipRgn */ NULL, /* pExtTextOut */ @@ -630,7 +653,7 @@ const DC_FUNCTIONS null_driver = nulldrv_FillRgn, /* pFillRgn */ NULL, /* pFlattenPath */ nulldrv_FrameRgn, /* pFrameRgn */ - NULL, /* pGdiComment */ + nulldrv_GdiComment, /* pGdiComment */ NULL, /* pGetBitmapBits */ NULL, /* pGetCharWidth */ NULL, /* pGetDIBits */ @@ -887,9 +910,9 @@ INT WINAPI GDI_CallExtDeviceMode16( HWND hwnd, if ((dc = get_dc_ptr( hdc ))) { - if (dc->funcs->pExtDeviceMode) - ret = dc->funcs->pExtDeviceMode( buf, hwnd, lpdmOutput, lpszDevice, lpszPort, - lpdmInput, lpszProfile, fwMode ); + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pExtDeviceMode ); + ret = physdev->funcs->pExtDeviceMode( buf, hwnd, lpdmOutput, lpszDevice, lpszPort, + lpdmInput, lpszProfile, fwMode ); release_dc_ptr( dc ); } DeleteDC( hdc ); @@ -941,9 +964,9 @@ DWORD WINAPI GDI_CallDeviceCapabilities16( LPCSTR lpszDevice, LPCSTR lpszPort, if ((dc = get_dc_ptr( hdc ))) { - if (dc->funcs->pDeviceCapabilities) - ret = dc->funcs->pDeviceCapabilities( buf, lpszDevice, lpszPort, - fwCapability, lpszOutput, lpdm ); + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pDeviceCapabilities ); + ret = physdev->funcs->pDeviceCapabilities( buf, lpszDevice, lpszPort, + fwCapability, lpszOutput, lpdm ); release_dc_ptr( dc ); } DeleteDC( hdc ); @@ -1069,10 +1092,11 @@ INT WINAPI ExtEscape( HDC hdc, INT nEscape, INT cbInput, LPCSTR lpszInData, { INT ret = 0; DC * dc = get_dc_ptr( hdc ); + if (dc) { - if (dc->funcs->pExtEscape) - ret = dc->funcs->pExtEscape( dc->physDev, nEscape, cbInput, lpszInData, cbOutput, lpszOutData ); + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pExtEscape ); + ret = physdev->funcs->pExtEscape( physdev, nEscape, cbInput, lpszInData, cbOutput, lpszOutData ); release_dc_ptr( dc ); } return ret; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 35b8068..4d84342 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -1278,10 +1278,11 @@ BOOL WINAPI GdiComment(HDC hdc, UINT cbSize, const BYTE *lpData) { DC *dc = get_dc_ptr(hdc); BOOL ret = FALSE; + if(dc) { - if (dc->funcs->pGdiComment) - ret = dc->funcs->pGdiComment( dc->physDev, cbSize, lpData ); + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGdiComment ); + ret = physdev->funcs->pGdiComment( physdev, cbSize, lpData ); release_dc_ptr( dc ); } return ret;

1 0

Alexandre Julliard : gdi32: Add null driver entry points for the pixel format functions.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: 806d0c4f86db654dc72a28cfd94b98233ef102fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=806d0c4f86db654dc72a28cfd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 11 12:26:25 2011 +0100 gdi32: Add null driver entry points for the pixel format functions. --- dlls/gdi32/driver.c | 36 +++++++++++++++++++++--- dlls/gdi32/painting.c | 70 +++++++++++++++++++++---------------------------- 2 files changed, 61 insertions(+), 45 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index e1a9897..61cbfe5 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -323,6 +323,11 @@ static BOOL CDECL nulldrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bo return TRUE; } +static INT CDECL nulldrv_ChoosePixelFormat( PHYSDEV dev, const PIXELFORMATDESCRIPTOR *descr ) +{ + return 0; +} + static BOOL CDECL nulldrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) { @@ -334,6 +339,12 @@ static BOOL CDECL nulldrv_DeleteObject( PHYSDEV dev, HGDIOBJ obj ) return TRUE; } +static INT CDECL nulldrv_DescribePixelFormat( PHYSDEV dev, INT format, + UINT size, PIXELFORMATDESCRIPTOR * descr ) +{ + return 0; +} + static DWORD CDECL nulldrv_DeviceCapabilities( LPSTR buffer, LPCSTR device, LPCSTR port, WORD cap, LPSTR output, DEVMODEA *devmode ) { @@ -382,6 +393,11 @@ static COLORREF CDECL nulldrv_GetPixel( PHYSDEV dev, INT x, INT y ) return 0; } +static INT CDECL nulldrv_GetPixelFormat( PHYSDEV dev ) +{ + return 0; +} + static BOOL CDECL nulldrv_LineTo( PHYSDEV dev, INT x, INT y ) { return TRUE; @@ -505,6 +521,11 @@ static COLORREF CDECL nulldrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF colo return color; } +static BOOL CDECL nulldrv_SetPixelFormat( PHYSDEV dev, INT format, const PIXELFORMATDESCRIPTOR *descr ) +{ + return FALSE; +} + static INT CDECL nulldrv_SetPolyFillMode( PHYSDEV dev, INT mode ) { return mode; @@ -555,6 +576,11 @@ static INT CDECL nulldrv_StartPage( PHYSDEV dev ) return 1; } +static BOOL CDECL nulldrv_SwapBuffers( PHYSDEV dev ) +{ + return TRUE; +} + static BOOL CDECL nulldrv_wglCopyContext( HGLRC ctx_src, HGLRC ctx_dst, UINT mask ) { return FALSE; @@ -626,7 +652,7 @@ const DC_FUNCTIONS null_driver = nulldrv_ArcTo, /* pArcTo */ NULL, /* pBeginPath */ NULL, /* pBitBlt */ - NULL, /* pChoosePixelFormat */ + nulldrv_ChoosePixelFormat, /* pChoosePixelFormat */ nulldrv_Chord, /* pChord */ NULL, /* pCloseFigure */ NULL, /* pCreateBitmap */ @@ -635,7 +661,7 @@ const DC_FUNCTIONS null_driver = NULL, /* pDeleteBitmap */ NULL, /* pDeleteDC */ nulldrv_DeleteObject, /* pDeleteObject */ - NULL, /* pDescribePixelFormat */ + nulldrv_DescribePixelFormat, /* pDescribePixelFormat */ nulldrv_DeviceCapabilities, /* pDeviceCapabilities */ nulldrv_Ellipse, /* pEllipse */ nulldrv_EndDoc, /* pEndDoc */ @@ -662,7 +688,7 @@ const DC_FUNCTIONS null_driver = NULL, /* pGetICMProfile */ NULL, /* pGetNearestColor */ nulldrv_GetPixel, /* pGetPixel */ - NULL, /* pGetPixelFormat */ + nulldrv_GetPixelFormat, /* pGetPixelFormat */ NULL, /* pGetSystemPaletteEntries */ NULL, /* pGetTextExtentExPoint */ NULL, /* pGetTextMetrics */ @@ -715,7 +741,7 @@ const DC_FUNCTIONS null_driver = nulldrv_SetMapMode, /* pSetMapMode */ nulldrv_SetMapperFlags, /* pSetMapperFlags */ nulldrv_SetPixel, /* pSetPixel */ - NULL, /* pSetPixelFormat */ + nulldrv_SetPixelFormat, /* pSetPixelFormat */ nulldrv_SetPolyFillMode, /* pSetPolyFillMode */ nulldrv_SetROP2, /* pSetROP2 */ nulldrv_SetRelAbs, /* pSetRelAbs */ @@ -735,7 +761,7 @@ const DC_FUNCTIONS null_driver = NULL, /* pStretchDIBits */ NULL, /* pStrokeAndFillPath */ NULL, /* pStrokePath */ - NULL, /* pSwapBuffers */ + nulldrv_SwapBuffers, /* pSwapBuffers */ NULL, /* pUnrealizePalette */ NULL, /* pWidenPath */ nulldrv_wglCopyContext, /* pwglCopyContext */ diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 8c788d5..22cc50c 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -545,12 +545,12 @@ INT WINAPI ChoosePixelFormat( HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd ) TRACE("(%p,%p)\n",hdc,ppfd); - if (!dc) return 0; - - if (!dc->funcs->pChoosePixelFormat) FIXME(" :stub\n"); - else ret = dc->funcs->pChoosePixelFormat(dc->physDev,ppfd); - - release_dc_ptr( dc ); + if (dc) + { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pChoosePixelFormat ); + ret = physdev->funcs->pChoosePixelFormat( physdev, ppfd ); + release_dc_ptr( dc ); + } return ret; } @@ -576,13 +576,13 @@ BOOL WINAPI SetPixelFormat( HDC hdc, INT iPixelFormat, TRACE("(%p,%d,%p)\n",hdc,iPixelFormat,ppfd); - if (!dc) return 0; - - update_dc( dc ); - if (!dc->funcs->pSetPixelFormat) FIXME(" :stub\n"); - else bRet = dc->funcs->pSetPixelFormat(dc->physDev,iPixelFormat,ppfd); - - release_dc_ptr( dc ); + if (dc) + { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetPixelFormat ); + update_dc( dc ); + bRet = physdev->funcs->pSetPixelFormat( physdev, iPixelFormat, ppfd ); + release_dc_ptr( dc ); + } return bRet; } @@ -605,13 +605,13 @@ INT WINAPI GetPixelFormat( HDC hdc ) TRACE("(%p)\n",hdc); - if (!dc) return 0; - - update_dc( dc ); - if (!dc->funcs->pGetPixelFormat) FIXME(" :stub\n"); - else ret = dc->funcs->pGetPixelFormat(dc->physDev); - - release_dc_ptr( dc ); + if (dc) + { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetPixelFormat ); + update_dc( dc ); + ret = physdev->funcs->pGetPixelFormat( physdev ); + release_dc_ptr( dc ); + } return ret; } @@ -638,19 +638,13 @@ INT WINAPI DescribePixelFormat( HDC hdc, INT iPixelFormat, UINT nBytes, TRACE("(%p,%d,%d,%p): stub\n",hdc,iPixelFormat,nBytes,ppfd); - if (!dc) return 0; - - update_dc( dc ); - if (!dc->funcs->pDescribePixelFormat) + if (dc) { - FIXME(" :stub\n"); - ppfd->nSize = nBytes; - ppfd->nVersion = 1; - ret = 3; + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pDescribePixelFormat ); + update_dc( dc ); + ret = physdev->funcs->pDescribePixelFormat( physdev, iPixelFormat, nBytes, ppfd ); + release_dc_ptr( dc ); } - else ret = dc->funcs->pDescribePixelFormat(dc->physDev,iPixelFormat,nBytes,ppfd); - - release_dc_ptr( dc ); return ret; } @@ -673,17 +667,13 @@ BOOL WINAPI SwapBuffers( HDC hdc ) TRACE("(%p)\n",hdc); - if (!dc) return TRUE; - - update_dc( dc ); - if (!dc->funcs->pSwapBuffers) + if (dc) { - FIXME(" :stub\n"); - bRet = TRUE; + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSwapBuffers ); + update_dc( dc ); + bRet = physdev->funcs->pSwapBuffers( physdev ); + release_dc_ptr( dc ); } - else bRet = dc->funcs->pSwapBuffers(dc->physDev); - - release_dc_ptr( dc ); return bRet; }

1 0

Alexandre Julliard : gdi32: Add null driver entry points for the color management functions.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: 0c33f1dd8957c19707ddd3a0439b4e8ce8a3cb31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c33f1dd8957c19707ddd3a04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 11 12:33:34 2011 +0100 gdi32: Add null driver entry points for the color management functions. --- dlls/gdi32/dc.c | 8 ++++---- dlls/gdi32/driver.c | 28 ++++++++++++++++++++++++---- dlls/gdi32/icm.c | 51 +++++++++++---------------------------------------- 3 files changed, 39 insertions(+), 48 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 98b6bf1..e7da659 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1509,8 +1509,8 @@ BOOL WINAPI GetDeviceGammaRamp(HDC hDC, LPVOID ptr) if( dc ) { - if (dc->funcs->pGetDeviceGammaRamp) - ret = dc->funcs->pGetDeviceGammaRamp(dc->physDev, ptr); + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetDeviceGammaRamp ); + ret = physdev->funcs->pGetDeviceGammaRamp( physdev, ptr ); release_dc_ptr( dc ); } return ret; @@ -1526,8 +1526,8 @@ BOOL WINAPI SetDeviceGammaRamp(HDC hDC, LPVOID ptr) if( dc ) { - if (dc->funcs->pSetDeviceGammaRamp) - ret = dc->funcs->pSetDeviceGammaRamp(dc->physDev, ptr); + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetDeviceGammaRamp ); + ret = physdev->funcs->pSetDeviceGammaRamp( physdev, ptr ); release_dc_ptr( dc ); } return ret; diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 61cbfe5..969d660 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -366,6 +366,11 @@ static INT CDECL nulldrv_EndPage( PHYSDEV dev ) return 0; } +static INT CDECL nulldrv_EnumICMProfiles( PHYSDEV dev, ICMENUMPROCW func, LPARAM lparam ) +{ + return -1; +} + static INT CDECL nulldrv_ExtDeviceMode( LPSTR buffer, HWND hwnd, DEVMODEA *output, LPSTR device, LPSTR port, DEVMODEA *input, LPSTR profile, DWORD mode ) { @@ -388,6 +393,16 @@ static BOOL CDECL nulldrv_GdiComment( PHYSDEV dev, UINT size, const BYTE *data ) return FALSE; } +static BOOL CDECL nulldrv_GetDeviceGammaRamp( PHYSDEV dev, void *ramp ) +{ + return FALSE; +} + +static BOOL CDECL nulldrv_GetICMProfile( PHYSDEV dev, LPDWORD size, LPWSTR filename ) +{ + return FALSE; +} + static COLORREF CDECL nulldrv_GetPixel( PHYSDEV dev, INT x, INT y ) { return 0; @@ -511,6 +526,11 @@ static DWORD CDECL nulldrv_SetLayout( PHYSDEV dev, DWORD layout ) return layout; } +static BOOL CDECL nulldrv_SetDeviceGammaRamp( PHYSDEV dev, void *ramp ) +{ + return FALSE; +} + static DWORD CDECL nulldrv_SetMapperFlags( PHYSDEV dev, DWORD flags ) { return flags; @@ -667,7 +687,7 @@ const DC_FUNCTIONS null_driver = nulldrv_EndDoc, /* pEndDoc */ nulldrv_EndPage, /* pEndPage */ NULL, /* pEndPath */ - NULL, /* pEnumICMProfiles */ + nulldrv_EnumICMProfiles, /* pEnumICMProfiles */ NULL, /* pEnumDeviceFonts */ nulldrv_ExcludeClipRect, /* pExcludeClipRect */ nulldrv_ExtDeviceMode, /* pExtDeviceMode */ @@ -684,8 +704,8 @@ const DC_FUNCTIONS null_driver = NULL, /* pGetCharWidth */ NULL, /* pGetDIBits */ NULL, /* pGetDeviceCaps */ - NULL, /* pGetDeviceGammaRamp */ - NULL, /* pGetICMProfile */ + nulldrv_GetDeviceGammaRamp, /* pGetDeviceGammaRamp */ + nulldrv_GetICMProfile, /* pGetICMProfile */ NULL, /* pGetNearestColor */ nulldrv_GetPixel, /* pGetPixel */ nulldrv_GetPixelFormat, /* pGetPixelFormat */ @@ -736,7 +756,7 @@ const DC_FUNCTIONS null_driver = NULL, /* pSetDIBits */ NULL, /* pSetDIBitsToDevice */ nulldrv_SetDeviceClipping, /* pSetDeviceClipping */ - NULL, /* pSetDeviceGammaRamp */ + nulldrv_SetDeviceGammaRamp, /* pSetDeviceGammaRamp */ nulldrv_SetLayout, /* pSetLayout */ nulldrv_SetMapMode, /* pSetMapMode */ nulldrv_SetMapperFlags, /* pSetMapperFlags */ diff --git a/dlls/gdi32/icm.c b/dlls/gdi32/icm.c index afbc0ee..d3a345d 100644 --- a/dlls/gdi32/icm.c +++ b/dlls/gdi32/icm.c @@ -40,30 +40,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(icm); struct enum_profiles { - BOOL unicode; - union - { - ICMENUMPROCA funcA; - ICMENUMPROCW funcW; - } callback; + ICMENUMPROCA funcA; LPARAM data; }; -INT CALLBACK enum_profiles_callback( LPWSTR filename, LPARAM lparam ) +static INT CALLBACK enum_profiles_callbackA( LPWSTR filename, LPARAM lparam ) { int len, ret = -1; struct enum_profiles *ep = (struct enum_profiles *)lparam; char *filenameA; - if (ep->unicode) - return ep->callback.funcW( filename, ep->data ); - len = WideCharToMultiByte( CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL ); filenameA = HeapAlloc( GetProcessHeap(), 0, len ); if (filenameA) { WideCharToMultiByte( CP_ACP, 0, filename, -1, filenameA, len, NULL, NULL ); - ret = ep->callback.funcA( filenameA, ep->data ); + ret = ep->funcA( filenameA, ep->data ); HeapFree( GetProcessHeap(), 0, filenameA ); } return ret; @@ -74,26 +66,12 @@ INT CALLBACK enum_profiles_callback( LPWSTR filename, LPARAM lparam ) */ INT WINAPI EnumICMProfilesA(HDC hdc, ICMENUMPROCA func, LPARAM lparam) { - DC *dc; - INT ret = -1; - - TRACE("%p, %p, 0x%08lx\n", hdc, func, lparam); + struct enum_profiles ep; if (!func) return -1; - if ((dc = get_dc_ptr(hdc))) - { - if (dc->funcs->pEnumICMProfiles) - { - struct enum_profiles ep; - - ep.unicode = FALSE; - ep.callback.funcA = func; - ep.data = lparam; - ret = dc->funcs->pEnumICMProfiles(dc->physDev, enum_profiles_callback, (LPARAM)&ep); - } - release_dc_ptr(dc); - } - return ret; + ep.funcA = func; + ep.data = lparam; + return EnumICMProfilesW( hdc, enum_profiles_callbackA, (LPARAM)&ep ); } /*********************************************************************** @@ -109,15 +87,8 @@ INT WINAPI EnumICMProfilesW(HDC hdc, ICMENUMPROCW func, LPARAM lparam) if (!func) return -1; if ((dc = get_dc_ptr(hdc))) { - if (dc->funcs->pEnumICMProfiles) - { - struct enum_profiles ep; - - ep.unicode = TRUE; - ep.callback.funcW = func; - ep.data = lparam; - ret = dc->funcs->pEnumICMProfiles(dc->physDev, enum_profiles_callback, (LPARAM)&ep); - } + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pEnumICMProfiles ); + ret = physdev->funcs->pEnumICMProfiles( physdev, func, lparam ); release_dc_ptr(dc); } return ret; @@ -173,8 +144,8 @@ BOOL WINAPI GetICMProfileW(HDC hdc, LPDWORD size, LPWSTR filename) if (dc) { - if (dc->funcs->pGetICMProfile) - ret = dc->funcs->pGetICMProfile(dc->physDev, size, filename); + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetICMProfile ); + ret = physdev->funcs->pGetICMProfile( physdev, size, filename ); release_dc_ptr(dc); } return ret;

1 0

Juan Lang : wininet: Reimplement IsUrlCacheEntryExpired.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: 819eb52866e69a3c4f73b9a74817bd046c94fbe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=819eb52866e69a3c4f73b9a74… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 8 10:39:37 2011 -0800 wininet: Reimplement IsUrlCacheEntryExpired. --- dlls/wininet/tests/urlcache.c | 112 +++++++++++++++++++++++++++++++++++++++++ dlls/wininet/urlcache.c | 106 ++++++++++++++++++++++++++------------ 2 files changed, 184 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=819eb52866e69a3c4f73b…

1 0