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

Alexandre Julliard : gdi32: Remove the function table pointer from the DC structure.
by Alexandre Julliard 18 Mar '11

18 Mar '11

Module: wine Branch: master Commit: ded15757a0fcc45709876e63ed77e60779cb63e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ded15757a0fcc45709876e63e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 18 13:00:54 2011 +0100 gdi32: Remove the function table pointer from the DC structure. --- dlls/gdi32/dc.c | 3 --- dlls/gdi32/gdi_private.h | 1 - 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 465349c..064c9ee 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -77,7 +77,6 @@ DC *alloc_dc_ptr( WORD magic ) if (!(dc = HeapAlloc( GetProcessHeap(), 0, sizeof(*dc) ))) return NULL; - dc->funcs = &null_driver; dc->nulldrv.funcs = &null_driver; dc->nulldrv.next = NULL; dc->physDev = &dc->nulldrv; @@ -252,7 +251,6 @@ void push_dc_driver( DC * dc, PHYSDEV physdev, const DC_FUNCTIONS *funcs ) physdev->next = dc->physDev; physdev->hdc = dc->hSelf; dc->physDev = physdev; - dc->funcs = physdev->funcs; } @@ -266,7 +264,6 @@ void pop_dc_driver( DC * dc, PHYSDEV physdev ) assert( physdev == dc->physDev ); assert( physdev != &dc->nulldrv ); dc->physDev = physdev->next; - dc->funcs = dc->physDev->funcs; physdev->funcs->pDeleteDC( physdev ); } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 5fff65c..abb9588 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -246,7 +246,6 @@ typedef struct tagDC GDIOBJHDR header; HDC hSelf; /* Handle to this DC */ struct gdi_physdev nulldrv; /* physdev for the null driver */ - const struct tagDC_FUNCS *funcs; /* DC function table */ PHYSDEV physDev; /* Physical device (driver-specific) */ DWORD thread; /* thread owning the DC */ LONG refcount; /* thread refcount */

1 0

Marcus Meissner : jscript: Mark up fallthrough switch cases (Coverity).
by Alexandre Julliard 18 Mar '11

18 Mar '11

Module: wine Branch: master Commit: 7e7b44882c4b1aa1ca50cc0c4e405dc35889afec URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e7b44882c4b1aa1ca50cc0c4… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Mar 18 01:50:23 2011 +0100 jscript: Mark up fallthrough switch cases (Coverity). --- dlls/jscript/jscript.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index a69b293..641c192 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -164,7 +164,7 @@ static void decrease_state(JScript *This, SCRIPTSTATE state) change_state(This, SCRIPTSTATE_DISCONNECTED); if(state == SCRIPTSTATE_DISCONNECTED) return; - + /* FALLTHROUGH */ case SCRIPTSTATE_STARTED: case SCRIPTSTATE_DISCONNECTED: clear_script_queue(This); @@ -173,7 +173,7 @@ static void decrease_state(JScript *This, SCRIPTSTATE state) change_state(This, SCRIPTSTATE_INITIALIZED); if(state == SCRIPTSTATE_INITIALIZED) return; - + /* FALLTHROUGH */ case SCRIPTSTATE_INITIALIZED: if(This->ctx->host_global) { IDispatch_Release(This->ctx->host_global); @@ -211,7 +211,7 @@ static void decrease_state(JScript *This, SCRIPTSTATE state) jsdisp_release(This->ctx->global); This->ctx->global = NULL; } - + /* FALLTHROUGH */ case SCRIPTSTATE_UNINITIALIZED: change_state(This, state); break;

1 0

Łukasz Wojniłowicz : inetcpl: Update Polish translation.
by Alexandre Julliard 18 Mar '11

18 Mar '11

Module: wine Branch: master Commit: 3e0053b49d5e3353676cd54596ea3c335e8e8aaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e0053b49d5e3353676cd5459… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Thu Mar 17 20:12:03 2011 +0100 inetcpl: Update Polish translation. --- dlls/inetcpl.cpl/cpl_Pl.rc | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_Pl.rc b/dlls/inetcpl.cpl/cpl_Pl.rc index 78fd221..42f4f38 100644 --- a/dlls/inetcpl.cpl/cpl_Pl.rc +++ b/dlls/inetcpl.cpl/cpl_Pl.rc @@ -41,7 +41,29 @@ BEGIN LTEXT "Mo�esz usun�� przechowywane strony, ciasteczka i inne dane.", IDC_STATIC, 58, 72, 252, 10 PUSHBUTTON "&Usu� pliki...", IDC_HISTORY_DELETE, 144, 86, 80, 14 - PUSHBUTTON "Usta&wienia...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 + PUSHBUTTON "Ustawie&nia...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 + +END + +/* "Delete browsing history" dialog */ +IDD_DELETE_HISTORY DIALOG 0, 0, 250, 250 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Usuwanie historii przegl�dania" +BEGIN + + AUTOCHECKBOX "Tymczasowe pliki internetowe\nKopie stron sieci Web, obraz�w i certyfikat�w.", + IDC_DELETE_TEMP_FILES, 10, 8, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Pliki cookies\nPliki przechowywane na komputerze przez witryny sieci Web w celu zapisania preferencji takich jak informacje logowania.", + IDC_DELETE_COOKIES, 10, 38, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Historia\nLista odwiedzonych witryn sieci Web.", + IDC_DELETE_HISTORY, 10, 68, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Dane formularzy\nZapisane informacje, kt�re zosta�y wpisane w formularzach.", + IDC_DELETE_FORM_DATA, 10, 98, 230, 30, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "Has�a\nHas�a uzupe�niane automatycznie po zalogowaniu si� do wcze�niej odwiedzonej witryny Web.", + IDC_DELETE_PASSWORDS, 10, 128, 230, 30, BS_TOP | BS_MULTILINE + DEFPUSHBUTTON "Anuluj", IDCANCEL, 185, 230, 60, 15, WS_GROUP + PUSHBUTTON "Usu�", IDOK, 120, 230, 60, 15, WS_GROUP END

1 0

Thomas Faber : mshtml: Initialize OLEINPLACEFRAMEINFO. cb for IOleInPlaceSite::GetWindowContext.
by Alexandre Julliard 18 Mar '11

18 Mar '11

Module: wine Branch: master Commit: a105f22e17c6b6e6f7af5e39dbe32a389c1b51ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=a105f22e17c6b6e6f7af5e39d… Author: Thomas Faber <thfabba(a)gmx.de> Date: Wed Mar 16 15:14:19 2011 +0100 mshtml: Initialize OLEINPLACEFRAMEINFO.cb for IOleInPlaceSite::GetWindowContext. --- dlls/mshtml/tests/activex.c | 2 +- dlls/mshtml/tests/events.c | 2 +- dlls/mshtml/tests/htmldoc.c | 2 +- dlls/mshtml/tests/script.c | 2 +- dlls/mshtml/view.c | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 486acce..c056e8b 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -889,6 +889,7 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpms ip_frame = NULL; ip_uiwindow = NULL; + frame_info.cb = sizeof(OLEINPLACEFRAMEINFO); hres = IOleInPlaceSiteEx_GetWindowContext(ip_site, &ip_frame, &ip_uiwindow, &pos_rect, &clip_rect, &frame_info); ok(hres == S_OK, "GetWindowContext failed: %08x\n", hres); ok(ip_frame != NULL, "ip_frame == NULL\n"); @@ -1534,7 +1535,6 @@ static HRESULT WINAPI InPlaceSite_GetWindowContext(IOleInPlaceSite *iface, *lprcPosRect = rect; *lprcClipRect = rect; - lpFrameInfo->cb = sizeof(*lpFrameInfo); lpFrameInfo->fMDIApp = FALSE; lpFrameInfo->hwndFrame = container_hwnd; lpFrameInfo->haccel = NULL; diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index a670532..6ed9f97 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1969,7 +1969,7 @@ static HRESULT WINAPI InPlaceSite_GetWindowContext(IOleInPlaceSite *iface, *lprcPosRect = rect; *lprcClipRect = rect; - lpFrameInfo->cb = sizeof(*lpFrameInfo); + ok(lpFrameInfo->cb == sizeof(*lpFrameInfo), "lpFrameInfo->cb = %u, expected %u\n", lpFrameInfo->cb, (unsigned)sizeof(*lpFrameInfo)); lpFrameInfo->fMDIApp = FALSE; lpFrameInfo->hwndFrame = container_hwnd; lpFrameInfo->haccel = NULL; diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 11b2036..d45eefb 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -1701,7 +1701,7 @@ static HRESULT WINAPI InPlaceSiteWindowless_GetWindowContext( memcpy(lprcClipRect, &rect, sizeof(RECT)); ok(lpFrameInfo != NULL, "lpFrameInfo = NULL\n"); if(lpFrameInfo) { - lpFrameInfo->cb = sizeof(*lpFrameInfo); + ok(lpFrameInfo->cb == sizeof(*lpFrameInfo), "lpFrameInfo->cb = %u, expected %u\n", lpFrameInfo->cb, (unsigned)sizeof(*lpFrameInfo)); lpFrameInfo->fMDIApp = FALSE; lpFrameInfo->hwndFrame = container_hwnd; lpFrameInfo->haccel = NULL; diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 35e6a9c..092d4a7 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -883,7 +883,7 @@ static HRESULT WINAPI InPlaceSite_GetWindowContext(IOleInPlaceSite *iface, *lprcPosRect = rect; *lprcClipRect = rect; - lpFrameInfo->cb = sizeof(*lpFrameInfo); + ok(lpFrameInfo->cb == sizeof(*lpFrameInfo), "lpFrameInfo->cb = %u, expected %u\n", lpFrameInfo->cb, (unsigned)sizeof(*lpFrameInfo)); lpFrameInfo->fMDIApp = FALSE; lpFrameInfo->hwndFrame = container_hwnd; lpFrameInfo->haccel = NULL; diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index fccbde8..3852046 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -259,6 +259,7 @@ static HRESULT activate_window(HTMLDocumentObj *This) return FAILED(hres) ? hres : E_FAIL; } + frameinfo.cb = sizeof(OLEINPLACEFRAMEINFO); hres = IOleInPlaceSite_GetWindowContext(This->ipsite, &pIPFrame, &This->ip_window, &posrect, &cliprect, &frameinfo); if(FAILED(hres)) {

1 0

Thomas Faber : shdocvw: Initialize OLEINPLACEFRAMEINFO. cb for IOleInPlaceSite::GetWindowContext.
by Alexandre Julliard 18 Mar '11

18 Mar '11

Module: wine Branch: master Commit: a48ed33609f68ad6bd6c706f0fb716b4069b4eb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a48ed33609f68ad6bd6c706f0… Author: Thomas Faber <thfabba(a)gmx.de> Date: Wed Mar 16 15:14:19 2011 +0100 shdocvw: Initialize OLEINPLACEFRAMEINFO.cb for IOleInPlaceSite::GetWindowContext. --- dlls/shdocvw/client.c | 1 - dlls/shdocvw/oleobject.c | 1 + dlls/shdocvw/tests/webbrowser.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/client.c b/dlls/shdocvw/client.c index 3443170..729669b 100644 --- a/dlls/shdocvw/client.c +++ b/dlls/shdocvw/client.c @@ -230,7 +230,6 @@ static HRESULT WINAPI InPlaceSite_GetWindowContext(IOleInPlaceSite *iface, GetClientRect(This->hwnd, lprcPosRect); *lprcClipRect = *lprcPosRect; - lpFrameInfo->cb = sizeof(*lpFrameInfo); lpFrameInfo->fMDIApp = FALSE; lpFrameInfo->hwndFrame = This->frame_hwnd; lpFrameInfo->haccel = NULL; diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index 97fbfaa..df06028 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -141,6 +141,7 @@ static HRESULT activate_inplace(WebBrowser *This, IOleClientSite *active_site) IOleInPlaceSite_OnInPlaceActivate(This->inplace); + This->frameinfo.cb = sizeof(OLEINPLACEFRAMEINFO); IOleInPlaceSite_GetWindowContext(This->inplace, &This->doc_host.frame, &This->uiwindow, &This->pos_rect, &This->clip_rect, &This->frameinfo); diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index e433b13..06d0ded 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -1275,7 +1275,7 @@ static HRESULT WINAPI InPlaceSite_GetWindowContext(IOleInPlaceSiteEx *iface, ok(lpFrameInfo != NULL, "lpFrameInfo = NULL\n"); if(lpFrameInfo) { - lpFrameInfo->cb = sizeof(*lpFrameInfo); + ok(lpFrameInfo->cb == sizeof(*lpFrameInfo), "lpFrameInfo->cb = %u, expected %u\n", lpFrameInfo->cb, (unsigned)sizeof(*lpFrameInfo)); lpFrameInfo->fMDIApp = FALSE; lpFrameInfo->hwndFrame = container_hwnd; lpFrameInfo->haccel = NULL;

1 0

Vincent Povirk : gdiplus: Select the font into the appropriate hdc in GdipMeasureString.
by Alexandre Julliard 18 Mar '11

18 Mar '11

Module: wine Branch: master Commit: 314ec7178d8ef68e75670096b1cbd0fa3733c3aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=314ec7178d8ef68e75670096b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Mar 18 09:47:58 2011 -0500 gdiplus: Select the font into the appropriate hdc in GdipMeasureString. --- dlls/gdiplus/graphics.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 479f26e..7d2dbcd 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4427,7 +4427,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, { HFONT oldfont; struct measure_string_args args; - HDC temp_hdc=NULL; + HDC temp_hdc=NULL, hdc; TRACE("(%p, %s, %i, %p, %s, %p, %p, %p, %p)\n", graphics, debugstr_wn(string, length), length, font, debugstr_rectf(rect), format, @@ -4438,9 +4438,11 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, if(!graphics->hdc) { - temp_hdc = CreateCompatibleDC(0); + hdc = temp_hdc = CreateCompatibleDC(0); if (!temp_hdc) return OutOfMemory; } + else + hdc = graphics->hdc; if(linesfilled) *linesfilled = 0; if(codepointsfitted) *codepointsfitted = 0; @@ -4448,7 +4450,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, if(format) TRACE("may be ignoring some format flags: attr %x\n", format->attr); - oldfont = SelectObject(graphics->hdc, CreateFontIndirectW(&font->lfw)); + oldfont = SelectObject(hdc, CreateFontIndirectW(&font->lfw)); bounds->X = rect->X; bounds->Y = rect->Y; @@ -4459,10 +4461,10 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, args.codepointsfitted = codepointsfitted; args.linesfilled = linesfilled; - gdip_format_string(graphics->hdc ? graphics->hdc : temp_hdc, string, length, font, rect, format, + gdip_format_string(hdc, string, length, font, rect, format, measure_string_callback, &args); - DeleteObject(SelectObject(graphics->hdc, oldfont)); + DeleteObject(SelectObject(hdc, oldfont)); if (temp_hdc) DeleteDC(temp_hdc);

1 0

Henri Verbeet : wined3d: Merge the texture cleanup functions.
by Alexandre Julliard 18 Mar '11

18 Mar '11

Module: wine Branch: master Commit: 96a8417a21e54ce6e7b877babc6d279bdad3f22f URL: http://source.winehq.org/git/wine.git/?a=commit;h=96a8417a21e54ce6e7b877bab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 17 23:15:12 2011 +0100 wined3d: Merge the texture cleanup functions. --- dlls/wined3d/basetexture.c | 13 +++++++++++ dlls/wined3d/cubetexture.c | 45 ++++++++++++++------------------------- dlls/wined3d/texture.c | 46 ++++++++++++++-------------------------- dlls/wined3d/volumetexture.c | 40 ++++++++++------------------------ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 58 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96a8417a21e54ce6e7b87…

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLDOMNode previousSibling.
by Alexandre Julliard 18 Mar '11

18 Mar '11

Module: wine Branch: master Commit: b701be3c9dd96be2766b1ec3d657e4593b32946e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b701be3c9dd96be2766b1ec3d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Mar 8 20:39:08 2011 +1100 mshtml: Implement IHTMLDOMNode previousSibling. --- dlls/mshtml/htmlnode.c | 22 ++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 21 +++++++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 1dc50ab..d297d5b 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -782,8 +782,26 @@ static HRESULT WINAPI HTMLDOMNode_get_lastChild(IHTMLDOMNode *iface, IHTMLDOMNod static HRESULT WINAPI HTMLDOMNode_get_previousSibling(IHTMLDOMNode *iface, IHTMLDOMNode **p) { HTMLDOMNode *This = impl_from_IHTMLDOMNode(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMNode *nschild = NULL; + HTMLDOMNode *node; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + nsIDOMNode_GetPreviousSibling(This->nsnode, &nschild); + if(!nschild) { + *p = NULL; + return S_OK; + } + + hres = get_node(This->doc, nschild, TRUE, &node); + nsIDOMNode_Release(nschild); + if(FAILED(hres)) + return hres; + + *p = &node->IHTMLDOMNode_iface; + IHTMLDOMNode_AddRef(*p); + return S_OK; } static HRESULT WINAPI HTMLDOMNode_get_nextSibling(IHTMLDOMNode *iface, IHTMLDOMNode **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 64e0cf2..8029381 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1989,6 +1989,20 @@ static IHTMLDOMNode *_node_get_next(unsigned line, IUnknown *unk) return next; } +#define node_get_prev(u) _node_get_prev(__LINE__,u) +static IHTMLDOMNode *_node_get_prev(unsigned line, IUnknown *unk) +{ + IHTMLDOMNode *node = _get_node_iface(line, unk); + IHTMLDOMNode *prev; + HRESULT hres; + + hres = IHTMLDOMNode_get_previousSibling(node, &prev); + IHTMLDOMNode_Release(node); + ok_(__FILE__,line) (hres == S_OK, "get_previousSibling failed: %08x\n", hres); + + return prev; +} + #define test_elem_get_parent(u) _test_elem_get_parent(__LINE__,u) static IHTMLElement *_test_elem_get_parent(unsigned line, IUnknown *unk) { @@ -6681,9 +6695,16 @@ static void test_elems(IHTMLDocument2 *doc) node = get_child_item(child_col, 0); ok(node != NULL, "node == NULL\n"); if(node) { + IHTMLDOMNode *prev; + type = get_node_type((IUnknown*)node); ok(type == 3, "type=%d\n", type); node2 = node_get_next((IUnknown*)node); + + prev = node_get_prev((IUnknown*)node2); + ok(iface_cmp((IUnknown*)node, (IUnknown*)prev), "node != prev\n"); + IHTMLDOMNode_Release(prev); + IHTMLDOMNode_Release(node); }

1 0

Alexandre Julliard : gdi32: Find the original driver by checking the CreateDC entry point in CreateCompatibleDC .
by Alexandre Julliard 18 Mar '11

18 Mar '11

Module: wine Branch: master Commit: 1a34f9801715c6658d2021c3fd8545fe065b4f4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a34f9801715c6658d2021c3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 18 11:47:41 2011 +0100 gdi32: Find the original driver by checking the CreateDC entry point in CreateCompatibleDC. --- dlls/gdi32/dc.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 48b2f78..465349c 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -752,11 +752,9 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) if (hdc) { if (!(origDC = get_dc_ptr( hdc ))) return 0; - if (GetObjectType( hdc ) == OBJ_DC) - { - physDev = origDC->physDev; - funcs = physDev->funcs; - } + physDev = GET_DC_PHYSDEV( origDC, pCreateDC ); + if (physDev != &origDC->nulldrv) funcs = physDev->funcs; + else physDev = NULL; release_dc_ptr( origDC ); }

1 0

Alexandre Julliard : gdi32: Add a null driver entry point for StretchDIBits .
by Alexandre Julliard 18 Mar '11

18 Mar '11

Module: wine Branch: master Commit: 5ffbce6d3c243bb4d93225917fa49c4f34927922 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ffbce6d3c243bb4d93225917… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 18 12:42:56 2011 +0100 gdi32: Add a null driver entry point for StretchDIBits. --- dlls/gdi32/dib.c | 195 ++++++++++++++++++---------------------------- dlls/gdi32/driver.c | 2 +- dlls/gdi32/gdi_private.h | 3 + 3 files changed, 79 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5ffbce6d3c243bb4d9322…

1 0