November 2009 - Wine-commits

Paul Vriens : advapi32/tests: Add some extra info to an ok() call.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 6befd9f54ccaf61f3dedbfa7a7620de11f84beaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=6befd9f54ccaf61f3dedbfa7a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 17 13:51:44 2009 +0100 advapi32/tests: Add some extra info to an ok() call. --- dlls/advapi32/tests/eventlog.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index ba9a897..0186f2b 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -1000,7 +1000,8 @@ static void test_autocreation(void) } lstrcpyA(p, eventlogname); - ok(!memcmp(sources, sources_verify, size), "Expected a correct 'Sources' value\n"); + ok(!memcmp(sources, sources_verify, size), + "Expected a correct 'Sources' value (size : %d)\n", size); } RegCloseKey(eventkey);

1 0

Andrew Eikum : jscript: Implement decodeURIComponent.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: d4b670ad6a31c92dbf2f416faa1168be9e8d5060 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4b670ad6a31c92dbf2f416fa… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Nov 16 15:39:08 2009 -0600 jscript: Implement decodeURIComponent. --- dlls/jscript/global.c | 120 ++++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/api.js | 20 ++++++++ 2 files changed, 138 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 8f6080d..501da79 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -930,11 +930,127 @@ static HRESULT JSGlobal_encodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W return S_OK; } +/* ECMA-262 3rd Edition 15.1.3.2 */ static HRESULT JSGlobal_decodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + BSTR str, ret; + const WCHAR *ptr; + WCHAR *out_ptr; + DWORD len = 0; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) { + ret = SysAllocString(undefinedW); + if(!ret) + return E_OUTOFMEMORY; + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = ret; + } + + return S_OK; + } + + hres = to_string(ctx, get_arg(dp, 0), ei, &str); + if(FAILED(hres)) + return hres; + + ptr = str; + while(*ptr) { + if(*ptr == '%') { + char octets[4]; + unsigned char mask = 0x80; + int i, size, num_bytes = 0; + if(hex_to_int(*(ptr+1)) < 0 || hex_to_int(*(ptr+2)) < 0) { + FIXME("Throw URIError: Invalid hex sequence\n"); + SysFreeString(str); + return E_FAIL; + } + octets[0] = (hex_to_int(*(ptr+1)) << 4) + hex_to_int(*(ptr+2)); + ptr += 3; + while(octets[0] & mask) { + mask = mask >> 1; + ++num_bytes; + } + if(num_bytes == 1 || num_bytes > 4) { + FIXME("Throw URIError: Invalid initial UTF character\n"); + SysFreeString(str); + return E_FAIL; + } + for(i = 1; i < num_bytes; ++i) { + if(*ptr != '%'){ + FIXME("Throw URIError: Incomplete UTF sequence\n"); + SysFreeString(str); + return E_FAIL; + } + if(hex_to_int(*(ptr+1)) < 0 || hex_to_int(*(ptr+2)) < 0) { + FIXME("Throw URIError: Invalid hex sequence\n"); + SysFreeString(str); + return E_FAIL; + } + octets[i] = (hex_to_int(*(ptr+1)) << 4) + hex_to_int(*(ptr+2)); + ptr += 3; + } + size = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, octets, + num_bytes ? num_bytes : 1, NULL, 0); + if(size == 0) { + FIXME("Throw URIError: Invalid UTF sequence\n"); + SysFreeString(str); + return E_FAIL; + } + len += size; + }else { + ++ptr; + ++len; + } + } + + out_ptr = ret = SysAllocStringLen(NULL, len); + if(!ret) { + SysFreeString(str); + return E_OUTOFMEMORY; + } + + ptr = str; + while(*ptr) { + if(*ptr == '%') { + char octets[4]; + unsigned char mask = 0x80; + int i, size, num_bytes = 0; + octets[0] = (hex_to_int(*(ptr+1)) << 4) + hex_to_int(*(ptr+2)); + ptr += 3; + while(octets[0] & mask) { + mask = mask >> 1; + ++num_bytes; + } + for(i = 1; i < num_bytes; ++i) { + octets[i] = (hex_to_int(*(ptr+1)) << 4) + hex_to_int(*(ptr+2)); + ptr += 3; + } + size = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, octets, + num_bytes ? num_bytes : 1, out_ptr, len); + len -= size; + out_ptr += size; + }else { + *out_ptr++ = *ptr++; + --len; + } + } + + SysFreeString(str); + + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = ret; + }else { + SysFreeString(ret); + } + + return S_OK; } static const builtin_prop_t JSGlobal_props[] = { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 1fb2f6d..42a79e8 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -60,24 +60,44 @@ ok(tmp === "abc", "encodeURI('abc') = " + tmp); tmp = encodeURIComponent("abc"); ok(tmp === "abc", "encodeURIComponent('abc') = " + tmp); +dec = decodeURIComponent(tmp); +ok(dec === "abc", "decodeURIComponent('" + tmp + "') = " + dec); tmp = encodeURIComponent("{abc}"); ok(tmp === "%7Babc%7D", "encodeURIComponent('{abc}') = " + tmp); +dec = decodeURIComponent(tmp); +ok(dec === "{abc}", "decodeURIComponent('" + tmp + "') = " + dec); tmp = encodeURIComponent(""); ok(tmp === "", "encodeURIComponent('') = " + tmp); +dec = decodeURIComponent(tmp); +ok(dec === "", "decodeURIComponent('" + tmp + "') = " + dec); tmp = encodeURIComponent("\01\02\03\04"); ok(tmp === "%01%02%03%04", "encodeURIComponent('\\01\\02\\03\\04') = " + tmp); +dec = decodeURIComponent(tmp); +ok(dec === "\01\02\03\04", "decodeURIComponent('" + tmp + "') = " + dec); tmp = encodeURIComponent("{#@}"); ok(tmp === "%7B%23%40%7D", "encodeURIComponent('{#@}') = " + tmp); +dec = decodeURIComponent(tmp); +ok(dec === "{#@}", "decodeURIComponent('" + tmp + "') = " + dec); tmp = encodeURIComponent("\xa1 "); ok(tmp === "%C2%A1%20", "encodeURIComponent(\\xa1 ) = " + tmp); +dec = decodeURIComponent(tmp); +ok(dec === "\xa1 ", "decodeURIComponent('" + tmp + "') = " + dec); tmp = encodeURIComponent("\xffff"); ok(tmp.length === 8, "encodeURIComponent('\\xffff').length = " + tmp.length); +dec = decodeURIComponent(tmp); +ok(dec === "\xffff", "decodeURIComponent('" + tmp + "') = " + dec); tmp = encodeURIComponent("abcABC123;/?:@&=+$,-_.!~*'()"); ok(tmp === "abcABC123%3B%2F%3F%3A%40%26%3D%2B%24%2C-_.!~*'()", "encodeURIComponent('abcABC123;/?:@&=+$,-_.!~*'()') = " + tmp); +dec = decodeURIComponent(tmp); +ok(dec === "abcABC123;/?:@&=+$,-_.!~*'()", "decodeURIComponent('" + tmp + "') = " + dec); tmp = encodeURIComponent(); ok(tmp === "undefined", "encodeURIComponent() = " + tmp); tmp = encodeURIComponent("abc", "test"); ok(tmp === "abc", "encodeURIComponent('abc') = " + tmp); +dec = decodeURIComponent(); +ok(dec === "undefined", "decodeURIComponent() = " + dec); +dec = decodeURIComponent("abc", "test"); +ok(dec === "abc", "decodeURIComponent('abc') = " + dec); tmp = escape("abc"); ok(tmp === "abc", "escape('abc') = " + tmp);

1 0

Austin Lund : ddraw/tests: Fix test failure for D3DFMT_A2R10G10B10 pixel format in GetDC tests.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 38d44e0a5295a43ab8b997c9459b79662389fed5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38d44e0a5295a43ab8b997c94… Author: Austin Lund <austin.lund(a)gmail.com> Date: Tue Nov 17 19:33:51 2009 +1000 ddraw/tests: Fix test failure for D3DFMT_A2R10G10B10 pixel format in GetDC tests. --- dlls/ddraw/tests/dsurface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index e05c967..f6f1258 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -3136,7 +3136,7 @@ static void GetDCFormatTest(void) sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, {32}, {0xC0000000}, {0x3FF00000}, {0x000FFC00}, {0x000003FF} }, - FALSE + TRUE }, /* * GetDC on a P8 surface fails unless the display mode is 8 bpp. This is not

1 0

Andrew Eikum : mshtml: Implement IHTMLWindow2::get_top.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 3f63a2968da6bdb56459ae5c46dcae92ba4e52f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f63a2968da6bdb56459ae5c4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Nov 16 17:28:54 2009 -0600 mshtml: Implement IHTMLWindow2::get_top. --- dlls/mshtml/htmlwindow.c | 13 ++++++++++--- dlls/mshtml/tests/dom.c | 32 +++++++++++++++++++++++++++----- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 073a5ae..17d2bfe 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -730,9 +730,16 @@ static HRESULT WINAPI HTMLWindow2_get_self(IHTMLWindow2 *iface, IHTMLWindow2 **p static HRESULT WINAPI HTMLWindow2_get_top(IHTMLWindow2 *iface, IHTMLWindow2 **p) { - HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + HTMLWindow *This = HTMLWINDOW2_THIS(iface), *curr; + TRACE("(%p)->(%p)\n", This, p); + + curr = This; + while(curr->parent) + curr = curr->parent; + *p = HTMLWINDOW2(curr); + IHTMLWindow2_AddRef(*p); + + return S_OK; } static HRESULT WINAPI HTMLWindow2_get_window(IHTMLWindow2 *iface, IHTMLWindow2 **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c965c79..00c67a8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5601,8 +5601,8 @@ static void test_cond_comment(IHTMLDocument2 *doc) static void test_frame(IDispatch *disp, const char *exp_id) { - IHTMLWindow2 *frame2, *parent; - IHTMLDocument2 *parent_doc; + IHTMLWindow2 *frame2, *parent, *top; + IHTMLDocument2 *parent_doc, *top_doc; IHTMLWindow4 *frame; IHTMLFrameBase *frame_elem; IHTMLElement *html_elem; @@ -5639,21 +5639,43 @@ static void test_frame(IDispatch *disp, const char *exp_id) hres = IHTMLWindow2_get_parent(frame2, &parent); ok(hres == S_OK, "IHTMLWindow2_get_parent failed: 0x%08x\n", hres); - IHTMLWindow2_Release(frame2); - if(FAILED(hres)) + if(FAILED(hres)){ + IHTMLWindow2_Release(frame2); return; + } hres = IHTMLWindow2_get_document(parent, &parent_doc); ok(hres == S_OK, "IHTMLWindow2_get_document failed: 0x%08x\n", hres); IHTMLWindow2_Release(parent); - if(FAILED(hres)) + if(FAILED(hres)){ + IHTMLWindow2_Release(frame2); return; + } hres = IHTMLDocument2_get_title(parent_doc, &bstr); ok(hres == S_OK, "IHTMLDocument2_get_title failed: 0x%08x\n", hres); ok(!strcmp_wa(bstr, "frameset test"), "Did not get the right parent. Expected \"frameset test\", found %s\n", wine_dbgstr_w(bstr)); IHTMLDocument2_Release(parent_doc); SysFreeString(bstr); + + /* test get_top */ + hres = IHTMLWindow2_get_top(frame2, &top); + ok(hres == S_OK, "IHTMLWindow2_get_top failed: 0x%08x\n", hres); + IHTMLWindow2_Release(frame2); + if(FAILED(hres)) + return; + + hres = IHTMLWindow2_get_document(top, &top_doc); + ok(hres == S_OK, "IHTMLWindow2_get_document failed: 0x%08x\n", hres); + IHTMLWindow2_Release(top); + if(FAILED(hres)) + return; + + hres = IHTMLDocument2_get_title(top_doc, &bstr); + ok(hres == S_OK, "IHTMLDocument2_get_title failed: 0x%08x\n", hres); + ok(!strcmp_wa(bstr, "frameset test"), "Did not get the right parent. Expected \"frameset test\", found %s\n", wine_dbgstr_w(bstr)); + IHTMLDocument2_Release(top_doc); + SysFreeString(bstr); } static void test_frameset(IHTMLDocument2 *doc)

1 0

André Hentschel : gdi32: Don't strip font suffix.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: e4beddb664a27208b69cc734b33c0b15cd42e6e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4beddb664a27208b69cc734b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 16 21:33:43 2009 +0100 gdi32: Don't strip font suffix. --- dlls/gdi32/font.c | 22 ---------------------- dlls/gdi32/tests/font.c | 6 ------ 2 files changed, 0 insertions(+), 28 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index ed64166..7f8f6f6 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -306,10 +306,6 @@ HFONT WINAPI CreateFontIndirectA( const LOGFONTA *plfA ) */ HFONT WINAPI CreateFontIndirectW( const LOGFONTW *plf ) { - static const WCHAR ItalicW[] = {' ','I','t','a','l','i','c','\0'}; - static const WCHAR BoldW[] = {' ','B','o','l','d','\0'}; - WCHAR *pFaceNameItalicSuffix, *pFaceNameBoldSuffix; - WCHAR *pFaceNameSuffix = NULL; HFONT hFont; FONTOBJ *fontPtr; @@ -328,24 +324,6 @@ HFONT WINAPI CreateFontIndirectW( const LOGFONTW *plf ) plf->lfOrientation/10., plf->lfEscapement/10., fontPtr); } - pFaceNameItalicSuffix = strstrW(fontPtr->logfont.lfFaceName, ItalicW); - if (pFaceNameItalicSuffix) - { - fontPtr->logfont.lfItalic = TRUE; - pFaceNameSuffix = pFaceNameItalicSuffix; - } - - pFaceNameBoldSuffix = strstrW(fontPtr->logfont.lfFaceName, BoldW); - if (pFaceNameBoldSuffix) - { - if (fontPtr->logfont.lfWeight < FW_BOLD) - fontPtr->logfont.lfWeight = FW_BOLD; - if (!pFaceNameSuffix || (pFaceNameBoldSuffix < pFaceNameSuffix)) - pFaceNameSuffix = pFaceNameBoldSuffix; - } - - if (pFaceNameSuffix) *pFaceNameSuffix = 0; - if (!(hFont = alloc_gdi_handle( &fontPtr->header, OBJ_FONT, &font_funcs ))) { HeapFree( GetProcessHeap(), 0, fontPtr ); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 6d76abe..4ad418f 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3013,15 +3013,12 @@ void test_CreateFontIndirect(void) ok(hfont != 0, "CreateFontIndirectA failed\n"); ret = GetObject(hfont, sizeof(getobj_lf), &getobj_lf); ok(lf.lfItalic == getobj_lf.lfItalic, "lfItalic: expect %02x got %02x\n", lf.lfItalic, getobj_lf.lfItalic); - todo_wine - { ok(lf.lfWeight == getobj_lf.lfWeight || broken((SHORT)lf.lfWeight == getobj_lf.lfWeight), /* win9x */ "lfWeight: expect %08x got %08x\n", lf.lfWeight, getobj_lf.lfWeight); ok(!lstrcmpA(lf.lfFaceName, getobj_lf.lfFaceName) || broken(!memcmp(lf.lfFaceName, getobj_lf.lfFaceName, LF_FACESIZE-1)), /* win9x doesn't ensure '\0' termination */ "font names don't match: %s != %s\n", lf.lfFaceName, getobj_lf.lfFaceName); - } DeleteObject(hfont); lf.lfItalic = FALSE; @@ -3033,13 +3030,10 @@ void test_CreateFontIndirect(void) ok(lf.lfWeight == getobj_lf.lfWeight || broken((SHORT)lf.lfWeight == getobj_lf.lfWeight), /* win9x */ "lfWeight: expect %08x got %08x\n", lf.lfWeight, getobj_lf.lfWeight); - todo_wine - { ok(lf.lfItalic == getobj_lf.lfItalic, "lfItalic: expect %02x got %02x\n", lf.lfItalic, getobj_lf.lfItalic); ok(!lstrcmpA(lf.lfFaceName, getobj_lf.lfFaceName) || broken(!memcmp(lf.lfFaceName, getobj_lf.lfFaceName, LF_FACESIZE-1)), /* win9x doesn't ensure '\0' termination */ "font names don't match: %s != %s\n", lf.lfFaceName, getobj_lf.lfFaceName); - } DeleteObject(hfont); }

1 0

Alexandre Julliard : gdi32: Return copies of the region in InquireVisRgn16 and GetClipRgn16.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 61925b7e89f51c35b4d52c5b7050b210c9ac7186 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61925b7e89f51c35b4d52c5b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 12:26:04 2009 +0100 gdi32: Return copies of the region in InquireVisRgn16 and GetClipRgn16. --- dlls/gdi32/gdi16.c | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index 8c4f79b..bd535d1 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -3659,14 +3659,11 @@ DWORD WINAPI SetDCOrg16( HDC16 hdc16, INT16 x, INT16 y ) */ HRGN16 WINAPI InquireVisRgn16( HDC16 hdc ) { - HRGN16 ret = 0; - DC * dc = get_dc_ptr( HDC_32(hdc) ); - if (dc) - { - ret = HRGN_16(dc->hVisRgn); - release_dc_ptr( dc ); - } - return ret; + static HRGN hrgn; + + if (!hrgn) hrgn = CreateRectRgn( 0, 0, 0, 0 ); + GetRandomRgn( HDC_32(hdc), hrgn, SYSRGN ); + return HRGN_16(hrgn); } @@ -3760,14 +3757,11 @@ INT16 WINAPI RestoreVisRgn16( HDC16 hdc16 ) */ HRGN16 WINAPI GetClipRgn16( HDC16 hdc ) { - HRGN16 ret = 0; - DC * dc = get_dc_ptr( HDC_32(hdc) ); - if (dc) - { - ret = HRGN_16(dc->hClipRgn); - release_dc_ptr( dc ); - } - return ret; + static HRGN hrgn; + + if (!hrgn) hrgn = CreateRectRgn( 0, 0, 0, 0 ); + GetClipRgn( HDC_32(hdc), hrgn ); + return HRGN_16(hrgn); }

1 0

Alexandre Julliard : gdi32: Reimplement SaveVisRgn16/ RestoreVisRgn16 to avoid accessing the DC internals.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 16da76923d90291b2e6dc24e8e886aeb84f398ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=16da76923d90291b2e6dc24e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 12:28:44 2009 +0100 gdi32: Reimplement SaveVisRgn16/RestoreVisRgn16 to avoid accessing the DC internals. --- dlls/gdi32/dc.c | 10 ------- dlls/gdi32/gdi16.c | 66 ++++++++++++++++++++++++++------------------- dlls/gdi32/gdi_private.h | 8 ----- 3 files changed, 38 insertions(+), 46 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index f7b295a..fdfc100 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -144,7 +144,6 @@ DC *alloc_dc_ptr( const DC_FUNCTIONS *funcs, WORD magic ) dc->BoundsRect.top = 0; dc->BoundsRect.right = 0; dc->BoundsRect.bottom = 0; - dc->saved_visrgn = NULL; PATH_InitGdiPath(&dc->path); if (!(dc->hSelf = alloc_gdi_handle( &dc->header, magic, &dc_funcs ))) @@ -403,7 +402,6 @@ INT save_dc_state( HDC hdc ) newdc->pAbortProc = NULL; newdc->hookProc = NULL; - newdc->saved_visrgn = NULL; if (!(newdc->hSelf = alloc_gdi_handle( &newdc->header, dc->header.type, &dc_funcs ))) { @@ -845,14 +843,6 @@ BOOL WINAPI DeleteDC( HDC hdc ) dc->physDev = NULL; } - while (dc->saved_visrgn) - { - struct saved_visrgn *next = dc->saved_visrgn->next; - DeleteObject( dc->saved_visrgn->hrgn ); - HeapFree( GetProcessHeap(), 0, dc->saved_visrgn ); - dc->saved_visrgn = next; - } - free_dc_ptr( dc ); if (funcs) DRIVER_release_driver( funcs ); /* do that after releasing the GDI lock */ return TRUE; diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index bd535d1..0712f40 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -34,6 +34,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); #define HGDIOBJ_32(handle16) ((HGDIOBJ)(ULONG_PTR)(handle16)) #define HGDIOBJ_16(handle32) ((HGDIOBJ16)(ULONG_PTR)(handle32)) +struct saved_visrgn +{ + struct list entry; + HDC hdc; + HRGN hrgn; +}; + +static struct list saved_regions = LIST_INIT( saved_regions ); + /* * ############################################################################ */ @@ -1312,9 +1321,18 @@ BOOL16 WINAPI DeleteDC16( HDC16 hdc ) { if (DeleteDC( HDC_32(hdc) )) { + struct saved_visrgn *saved, *next; struct gdi_thunk* thunk; - if ((thunk = GDI_FindThunk(hdc))) - GDI_DeleteThunk(thunk); + + if ((thunk = GDI_FindThunk(hdc))) GDI_DeleteThunk(thunk); + + LIST_FOR_EACH_ENTRY_SAFE( saved, next, &saved_regions, struct saved_visrgn, entry ) + { + if (saved->hdc != HDC_32(hdc)) continue; + list_remove( &saved->entry ); + DeleteObject( saved->hrgn ); + HeapFree( GetProcessHeap(), 0, saved ); + } return TRUE; } return FALSE; @@ -3704,24 +3722,19 @@ HRGN16 WINAPI SaveVisRgn16( HDC16 hdc16 ) { struct saved_visrgn *saved; HDC hdc = HDC_32( hdc16 ); - DC *dc = get_dc_ptr( hdc ); - if (!dc) return 0; TRACE("%p\n", hdc ); - update_dc( dc ); - if (!(saved = HeapAlloc( GetProcessHeap(), 0, sizeof(*saved) ))) goto error; - if (!(saved->hrgn = CreateRectRgn( 0, 0, 0, 0 ))) goto error; - CombineRgn( saved->hrgn, dc->hVisRgn, 0, RGN_COPY ); - saved->next = dc->saved_visrgn; - dc->saved_visrgn = saved; - release_dc_ptr( dc ); + if (!(saved = HeapAlloc( GetProcessHeap(), 0, sizeof(*saved) ))) return 0; + if (!(saved->hrgn = CreateRectRgn( 0, 0, 0, 0 ))) + { + HeapFree( GetProcessHeap(), 0, saved ); + return 0; + } + saved->hdc = hdc; + GetRandomRgn( hdc, saved->hrgn, SYSRGN ); + list_add_head( &saved_regions, &saved->entry ); return HRGN_16(saved->hrgn); - -error: - release_dc_ptr( dc ); - HeapFree( GetProcessHeap(), 0, saved ); - return 0; } @@ -3732,22 +3745,19 @@ INT16 WINAPI RestoreVisRgn16( HDC16 hdc16 ) { struct saved_visrgn *saved; HDC hdc = HDC_32( hdc16 ); - DC *dc = get_dc_ptr( hdc ); INT16 ret = ERROR; - if (!dc) return ERROR; - TRACE("%p\n", hdc ); - if (!(saved = dc->saved_visrgn)) goto done; - - ret = CombineRgn( dc->hVisRgn, saved->hrgn, 0, RGN_COPY ); - dc->saved_visrgn = saved->next; - DeleteObject( saved->hrgn ); - HeapFree( GetProcessHeap(), 0, saved ); - CLIPPING_UpdateGCRegion( dc ); - done: - release_dc_ptr( dc ); + LIST_FOR_EACH_ENTRY( saved, &saved_regions, struct saved_visrgn, entry ) + { + if (saved->hdc != hdc) continue; + ret = SelectVisRgn( hdc, saved->hrgn ); + list_remove( &saved->entry ); + DeleteObject( saved->hrgn ); + HeapFree( GetProcessHeap(), 0, saved ); + break; + } return ret; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index ad57b1b..bc2d9a7 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -234,12 +234,6 @@ typedef struct tagGdiPath typedef struct tagGdiFont GdiFont; -struct saved_visrgn -{ - struct saved_visrgn *next; - HRGN hrgn; -}; - typedef struct tagDC { GDIOBJHDR header; @@ -310,8 +304,6 @@ typedef struct tagDC XFORM xformVport2World; /* Inverse of the above transformation */ BOOL vport2WorldValid; /* Is xformVport2World valid? */ RECT BoundsRect; /* Current bounding rect */ - - struct saved_visrgn *saved_visrgn; } DC; /* DC flags */

1 0

Alexandre Julliard : gdi32: Disable SetDCOrg16.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 1fd7159cae735a83b5ea5e8f3646d449be902291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fd7159cae735a83b5ea5e8f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 12:42:16 2009 +0100 gdi32: Disable SetDCOrg16. --- dlls/gdi32/gdi16.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index 0712f40..a8644da 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -3662,13 +3662,8 @@ void WINAPI SetDCState16( HDC16 hdc, HDC16 hdcs ) */ DWORD WINAPI SetDCOrg16( HDC16 hdc16, INT16 x, INT16 y ) { - DWORD prevOrg = 0; - HDC hdc = HDC_32( hdc16 ); - DC *dc = get_dc_ptr( hdc ); - if (!dc) return 0; - if (dc->funcs->pSetDCOrg) prevOrg = dc->funcs->pSetDCOrg( dc->physDev, x, y ); - release_dc_ptr( dc ); - return prevOrg; + FIXME( "%04x %d,%d no longer supported\n", hdc16, x, y ); + return 0; }

1 0

Alexandre Julliard : gdi32: Get rid of the SetDCOrg driver entry point.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 1c67717876d07240f7807a4a1be143bf6b5181ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c67717876d07240f7807a4a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 12:43:43 2009 +0100 gdi32: Get rid of the SetDCOrg driver entry point. --- dlls/gdi32/driver.c | 1 - dlls/gdi32/enhmfdrv/init.c | 1 - dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/mfdrv/init.c | 1 - 4 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index ec5de20..73c594f 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -163,7 +163,6 @@ static struct graphics_driver *create_driver( HMODULE module ) GET_FUNC(SetBkColor); GET_FUNC(SetBkMode); GET_FUNC(SetDCBrushColor); - GET_FUNC(SetDCOrg); GET_FUNC(SetDCPenColor); GET_FUNC(SetDIBColorTable); GET_FUNC(SetDIBits); diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index dd0b89e..bc53493 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -121,7 +121,6 @@ static const DC_FUNCTIONS EMFDRV_Funcs = EMFDRV_SetBkColor, /* pSetBkColor */ EMFDRV_SetBkMode, /* pSetBkMode */ NULL, /* pSetDCBrushColor */ - NULL, /* pSetDCOrg */ NULL, /* pSetDCPenColor */ NULL, /* pSetDIBColorTable */ NULL, /* pSetDIBits */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index bc2d9a7..ab4cd03 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -161,7 +161,6 @@ typedef struct tagDC_FUNCS COLORREF (CDECL *pSetBkColor)(PHYSDEV,COLORREF); INT (CDECL *pSetBkMode)(PHYSDEV,INT); COLORREF (CDECL *pSetDCBrushColor)(PHYSDEV, COLORREF); - DWORD (CDECL *pSetDCOrg)(PHYSDEV,INT,INT); COLORREF (CDECL *pSetDCPenColor)(PHYSDEV, COLORREF); UINT (CDECL *pSetDIBColorTable)(PHYSDEV,UINT,UINT,const RGBQUAD*); INT (CDECL *pSetDIBits)(PHYSDEV,HBITMAP,UINT,UINT,LPCVOID,const BITMAPINFO*,UINT); diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 59c973a..4c88ac6 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -119,7 +119,6 @@ static const DC_FUNCTIONS MFDRV_Funcs = MFDRV_SetBkColor, /* pSetBkColor */ MFDRV_SetBkMode, /* pSetBkMode */ NULL, /* pSetDCBrushColor*/ - NULL, /* pSetDCOrg */ NULL, /* pSetDCPenColor*/ NULL, /* pSetDIBColorTable */ NULL, /* pSetDIBits */

1 0

Alexandre Julliard : winex11: Get rid of the SetDCOrg entry point.
by Alexandre Julliard 17 Nov '09

17 Nov '09

Module: wine Branch: master Commit: 184f1fe33178eaff2f21764779521526ae53f879 URL: http://source.winehq.org/git/wine.git/?a=commit;h=184f1fe33178eaff2f2176477… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 12:43:53 2009 +0100 winex11: Get rid of the SetDCOrg entry point. --- dlls/winex11.drv/graphics.c | 12 ------------ dlls/winex11.drv/winex11.drv.spec | 1 - 2 files changed, 0 insertions(+), 13 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index e6cedfb..bc00e85 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1476,18 +1476,6 @@ BOOL CDECL X11DRV_GetDCOrgEx( X11DRV_PDEVICE *physDev, LPPOINT lpp ) } -/*********************************************************************** - * SetDCOrg (X11DRV.@) - */ -DWORD CDECL X11DRV_SetDCOrg( X11DRV_PDEVICE *physDev, INT x, INT y ) -{ - DWORD ret = MAKELONG( physDev->dc_rect.left + physDev->drawable_rect.left, - physDev->dc_rect.top + physDev->drawable_rect.top ); - physDev->dc_rect.left = x - physDev->drawable_rect.left; - physDev->dc_rect.top = y - physDev->drawable_rect.top; - return ret; -} - static unsigned char *get_icm_profile( unsigned long *size ) { Atom type; diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 6fd8831..4993d9a 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -46,7 +46,6 @@ @ cdecl SetBitmapBits(long ptr long) X11DRV_SetBitmapBits @ cdecl SetBkColor(ptr long) X11DRV_SetBkColor @ cdecl SetDCBrushColor(ptr long) X11DRV_SetDCBrushColor -@ cdecl SetDCOrg(ptr long long) X11DRV_SetDCOrg @ cdecl SetDCPenColor(ptr long) X11DRV_SetDCPenColor @ cdecl SetDIBColorTable(ptr long long ptr) X11DRV_SetDIBColorTable @ cdecl SetDIBits(ptr long long long ptr ptr long) X11DRV_SetDIBits

1 0