February 2011 - Wine-Commits

André Hentschel : advapi32: Add stub for EnableTraceEx .
by Alexandre Julliard Feb. 23, 2011

Feb. 23, 2011

Module: wine Branch: master Commit: 6e62dc8ece15f89f7647dc7a2e477c1a324fc4ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e62dc8ece15f89f7647dc7a2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 22 20:22:40 2011 +0100 advapi32: Add stub for EnableTraceEx. --- dlls/advapi32/advapi32.spec | 1 + dlls/advapi32/eventlog.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 9bf6eae..683e7ab 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -201,6 +201,7 @@ # @ stub ElfReportEventA @ stub ElfReportEventW @ stdcall EnableTrace(long long long ptr int64) +@ stdcall EnableTraceEx(ptr ptr int64 long long int64 int64 long ptr) @ stdcall EncryptFileA(str) @ stdcall EncryptFileW(wstr) # @ stub EncryptedFileKeyInfo diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 1428588..d76e0de 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -235,6 +235,21 @@ BOOL WINAPI DeregisterEventSource( HANDLE hEventLog ) } /****************************************************************************** + * EnableTraceEx [ADVAPI32.@] + */ +ULONG WINAPI EnableTraceEx( LPCGUID provider, LPCGUID source, TRACEHANDLE hSession, ULONG enable, + UCHAR level, ULONGLONG anykeyword, ULONGLONG allkeyword, ULONG enableprop, + PEVENT_FILTER_DESCRIPTOR filterdesc ) +{ + FIXME("(%s, %s, %s, %d, %c, %s, %s, %d, %p): stub\n", debugstr_guid(provider), + debugstr_guid(source), wine_dbgstr_longlong(hSession), enable, level, + wine_dbgstr_longlong(anykeyword), wine_dbgstr_longlong(allkeyword), + enableprop, filterdesc); + + return ERROR_SUCCESS; +} + +/****************************************************************************** * EnableTrace [ADVAPI32.@] */ ULONG WINAPI EnableTrace( ULONG enable, ULONG flag, ULONG level, LPCGUID guid, TRACEHANDLE hSession )

1 0

John Edmonds : gdi32: Fixed GetDIBits for top-down bitmaps.
by Alexandre Julliard Feb. 23, 2011

Feb. 23, 2011

Module: wine Branch: master Commit: 3c239fa0cd00a80cdccde9f7a19e9bbf862bac4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c239fa0cd00a80cdccde9f7a… Author: John Edmonds <pocketcookies2(a)gmail.com> Date: Sun Feb 20 22:31:26 2011 -0500 gdi32: Fixed GetDIBits for top-down bitmaps. --- dlls/gdi32/dib.c | 23 ++++++++++++++--------- dlls/gdi32/tests/bitmap.c | 10 +++++----- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 5067e49..0619304 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -871,18 +871,23 @@ INT WINAPI GetDIBits( if(bmp->dib && bmp->dib->dsBm.bmBitsPixel >= 15 && bpp >= 15) { /*FIXME: Only RGB dibs supported for now */ - unsigned int srcwidth = bmp->dib->dsBm.bmWidth, srcwidthb = bmp->dib->dsBm.bmWidthBytes; + unsigned int srcwidth = bmp->dib->dsBm.bmWidth; + int srcwidthb = bmp->dib->dsBm.bmWidthBytes; unsigned int dstwidth = width; - int dstwidthb = DIB_GetDIBWidthBytes( width, bpp ); + unsigned int dstwidthb = DIB_GetDIBWidthBytes( width, bpp ); LPBYTE dbits = bits, sbits = (LPBYTE) bmp->dib->dsBm.bmBits + (startscan * srcwidthb); unsigned int x, y, width, widthb; - if ((height < 0) ^ (bmp->dib->dsBmih.biHeight < 0)) + /* + * If copying from a top-down source bitmap, move the source + * pointer to the end of the source bitmap and negate the width + * so that we copy the bits upside-down. + */ + if (bmp->dib->dsBmih.biHeight < 0) { - dbits = (LPBYTE)bits + (dstwidthb * (lines-1)); - dstwidthb = -dstwidthb; + sbits += (srcwidthb * (abs(bmp->dib->dsBmih.biHeight) - 2 * startscan - 1)); + srcwidthb = -srcwidthb; } - switch( bpp ) { case 15: @@ -897,7 +902,7 @@ INT WINAPI GetDIBits( case 16: /* 16 bpp srcDIB -> 16 bpp dstDIB */ { - widthb = min(srcwidthb, abs(dstwidthb)); + widthb = min(abs(srcwidthb), dstwidthb); /* FIXME: BI_BITFIELDS not supported yet */ for (y = 0; y < lines; y++, dbits+=dstwidthb, sbits+=srcwidthb) memcpy(dbits, sbits, widthb); @@ -975,7 +980,7 @@ INT WINAPI GetDIBits( case 24: /* 24 bpp srcDIB -> 24 bpp dstDIB */ { - widthb = min(srcwidthb, abs(dstwidthb)); + widthb = min(abs(srcwidthb), dstwidthb); for (y = 0; y < lines; y++, dbits+=dstwidthb, sbits+=srcwidthb) memcpy(dbits, sbits, widthb); } @@ -1051,7 +1056,7 @@ INT WINAPI GetDIBits( case 32: /* 32 bpp srcDIB -> 32 bpp dstDIB */ { - widthb = min(srcwidthb, abs(dstwidthb)); + widthb = min(abs(srcwidthb), dstwidthb); /* FIXME: BI_BITFIELDS not supported yet */ for (y = 0; y < lines; y++, dbits+=dstwidthb, sbits+=srcwidthb) { memcpy(dbits, sbits, widthb); diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 4b54302..1a743c7 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -3116,27 +3116,27 @@ static void test_GetDIBits_single_pixel_destination(int bpp) ok((char)pixelOut == 0, "Bottom-up -> bottom-up: first pixel should be 0 but was %d.\n", (char)pixelOut); statusCode = GetDIBits(hdc, bmptb, 0, 1, &pixelOut, &bi, DIB_RGB_COLORS); ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); - todo_wine ok((char)pixelOut == 2, "Top-down -> bottom-up: first pixel should be 2 but was %d.\n", (char)pixelOut); + ok((char)pixelOut == 2, "Top-down -> bottom-up: first pixel should be 2 but was %d.\n", (char)pixelOut); /*Check second scanline.*/ statusCode = GetDIBits(hdc, bmptb, 1, 1, &pixelOut, &bi, DIB_RGB_COLORS); ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); - todo_wine ok((char)pixelOut == 0, "Top-down -> bottom-up: first pixel should be 0 but was %d.\n", (char)pixelOut); + ok((char)pixelOut == 0, "Top-down -> bottom-up: first pixel should be 0 but was %d.\n", (char)pixelOut); statusCode = GetDIBits(hdc, bmpbt, 1, 1, &pixelOut, &bi, DIB_RGB_COLORS); ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); ok((char)pixelOut == 2, "Top-down -> bottom-up: first pixel should be 2 but was %d.\n", (char)pixelOut); - /*Make destination bitmap top-down. Windows (and soon, Wine) will ignore this.*/ + /*Make destination bitmap top-down. This should be ignored by GetDIBits.*/ bi.bmiHeader.biHeight = -2; statusCode = GetDIBits(hdc, bmpbt, 0, 1, &pixelOut, &bi, DIB_RGB_COLORS); ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); ok((char)pixelOut == 0, "Bottom-up -> top-down: first pixel should be 0 but was %d.\n", (char)pixelOut); statusCode = GetDIBits(hdc, bmptb, 0, 1, &pixelOut, &bi, DIB_RGB_COLORS); ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); - todo_wine ok((char)pixelOut == 2, "Top-down -> top-down: first pixel should be 2 but was %d.\n", (char)pixelOut); + ok((char)pixelOut == 2, "Top-down -> top-down: first pixel should be 2 but was %d.\n", (char)pixelOut); /*Check second scanline.*/ statusCode = GetDIBits(hdc, bmptb, 1, 1, &pixelOut, &bi, DIB_RGB_COLORS); ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); - todo_wine ok((char)pixelOut == 0, "Top-down -> bottom-up: first pixel should be 0 but was %d.\n", (char)pixelOut); + ok((char)pixelOut == 0, "Top-down -> bottom-up: first pixel should be 0 but was %d.\n", (char)pixelOut); statusCode = GetDIBits(hdc, bmpbt, 1, 1, &pixelOut, &bi, DIB_RGB_COLORS); ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); ok((char)pixelOut == 2, "Top-down -> bottom-up: first pixel should be 2 but was %d.\n", (char)pixelOut);

1 0

Marcus Meissner : user32: Move functional code out of assert() (Coverity).
by Alexandre Julliard Feb. 23, 2011

Feb. 23, 2011

Module: wine Branch: master Commit: 89e662084f789e9dc5e9ad41dc3c5d26e7f3e051 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89e662084f789e9dc5e9ad41d… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Feb 23 17:33:20 2011 +0100 user32: Move functional code out of assert() (Coverity). --- dlls/user32/tests/win.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index cca222f..603e93e 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2897,6 +2897,7 @@ static void test_capture_4(void) HWND hwnd; WNDCLASSA wclass; HINSTANCE hInstance = GetModuleHandleA( NULL ); + ATOM aclass; if (!pGetGUIThreadInfo) { @@ -2913,10 +2914,11 @@ static void test_capture_4(void) wclass.lpszMenuName = 0; wclass.cbClsExtra = 0; wclass.cbWndExtra = 0; - assert (RegisterClassA( &wclass )); - assert (hwnd = CreateWindowA( wclass.lpszClassName, "MenuTest", - WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, - 400, 200, NULL, NULL, hInstance, NULL) ); + aclass = RegisterClassA( &wclass ); + ok( aclass, "RegisterClassA failed with error %d\n", GetLastError()); + hwnd = CreateWindowA( wclass.lpszClassName, "MenuTest", + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, + 400, 200, NULL, NULL, hInstance, NULL); ok(hwnd != NULL, "CreateWindowEx failed with error %d\n", GetLastError()); if (!hwnd) return; hmenu = CreatePopupMenu();

1 0

Marcus Meissner : regedit: fgetc() gets int, not char (Coverity).
by Alexandre Julliard Feb. 23, 2011

Feb. 23, 2011

Module: wine Branch: master Commit: 62f270e269517faf705228b3591ec6cdffa59830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62f270e269517faf705228b35… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Feb 23 17:20:43 2011 +0100 regedit: fgetc() gets int, not char (Coverity). --- programs/regedit/regproc.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index ff97970..f753947 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -664,8 +664,11 @@ static void processRegLinesA(FILE *in, char* first_chars) /* get a single line. note that `i' must be one past the last * meaningful character in `s' when this loop exits */ for(i = 0; i < size_to_get-1; ++i){ - s[i] = fgetc(in); - if(s[i] == EOF){ + int xchar; + + xchar = fgetc(in); + s[i] = xchar; + if(xchar == EOF){ if(ferror(in)){ perror("While reading input"); exit(IO_ERROR);

1 0

Marcus Meissner : user32: Remove side effect code out of asserts() ( Coverity).
by Alexandre Julliard Feb. 23, 2011

Feb. 23, 2011

Module: wine Branch: master Commit: a91b0e4544c3d173ed6f7d65006b8ef51a3aba31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a91b0e4544c3d173ed6f7d650… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Feb 23 17:38:23 2011 +0100 user32: Remove side effect code out of asserts() (Coverity). --- dlls/user32/tests/menu.c | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 0502672..c0c8b9e 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -2038,6 +2038,7 @@ static void test_menu_input(void) { HINSTANCE hInstance = GetModuleHandleA( NULL ); HANDLE hThread, hWnd; DWORD tid; + ATOM aclass; if (!pSendInput) { @@ -2055,11 +2056,14 @@ static void test_menu_input(void) { wclass.lpszMenuName = 0; wclass.cbClsExtra = 0; wclass.cbWndExtra = 0; - assert (RegisterClassA( &wclass )); - assert (hWnd = CreateWindowA( wclass.lpszClassName, "MenuTest", - WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, - 400, 200, NULL, NULL, hInstance, NULL) ); - + aclass = RegisterClassA( &wclass ); + ok (aclass, "MenuTest class not created\n"); + if (!aclass) return; + hWnd = CreateWindowA( wclass.lpszClassName, "MenuTest", + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, + 400, 200, NULL, NULL, hInstance, NULL); + ok (hWnd != NULL, "MenuTest window not created\n"); + if (!hWnd) return; /* fixed menus */ hMenus[3] = CreatePopupMenu(); AppendMenu(hMenus[3], MF_STRING, 0, "&Enabled"); @@ -2125,6 +2129,7 @@ static void test_menu_hilitemenuitem( void ) HMENU hMenu, hPopupMenu; WNDCLASSA wclass; HWND hWnd; + ATOM aclass; wclass.lpszClassName = "HiliteMenuTestClass"; wclass.style = CS_HREDRAW | CS_VREDRAW; @@ -2136,10 +2141,14 @@ static void test_menu_hilitemenuitem( void ) wclass.lpszMenuName = 0; wclass.cbClsExtra = 0; wclass.cbWndExtra = 0; - assert (RegisterClassA( &wclass )); - assert (hWnd = CreateWindowA( wclass.lpszClassName, "HiliteMenuTest", - WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, - 400, 200, NULL, NULL, wclass.hInstance, NULL) ); + aclass = RegisterClassA( &wclass ); + ok (aclass, "HiliteMenuTest class could not be created\n"); + if (!aclass) return; + hWnd = CreateWindowA( wclass.lpszClassName, "HiliteMenuTest", + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, + 400, 200, NULL, NULL, wclass.hInstance, NULL); + ok (hWnd != NULL, "HiliteMenuTest window could not be created\n"); + if (!hWnd) return; hMenu = CreateMenu(); hPopupMenu = CreatePopupMenu();

1 0

Nikolay Sivov : msxml3: Remove get_text() forward.
by Alexandre Julliard Feb. 23, 2011

Feb. 23, 2011

Module: wine Branch: master Commit: d0bff37cb2d16ff82bf5c2a0ac2061608175e7fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0bff37cb2d16ff82bf5c2a0a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 23 14:40:43 2011 +0300 msxml3: Remove get_text() forward. --- dlls/msxml3/attribute.c | 3 ++- dlls/msxml3/cdata.c | 3 ++- dlls/msxml3/comment.c | 3 ++- dlls/msxml3/docfrag.c | 3 ++- dlls/msxml3/domdoc.c | 5 +++-- dlls/msxml3/element.c | 3 ++- dlls/msxml3/entityref.c | 3 ++- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 24 +++++++++--------------- dlls/msxml3/pi.c | 3 ++- dlls/msxml3/text.c | 3 ++- 11 files changed, 29 insertions(+), 25 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 8fa24f1..03e0fc9 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -386,7 +386,8 @@ static HRESULT WINAPI domattr_get_text( BSTR* p) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_text( &This->node.IXMLDOMNode_iface, p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_text(&This->node, p); } static HRESULT WINAPI domattr_put_text( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 64185ca..1eb3597 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -397,7 +397,8 @@ static HRESULT WINAPI domcdata_get_text( BSTR* p) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_text( &This->node.IXMLDOMNode_iface, p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_text(&This->node, p); } static HRESULT WINAPI domcdata_put_text( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index bb0c488..e7d6ba1 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -390,7 +390,8 @@ static HRESULT WINAPI domcomment_get_text( BSTR* p) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_text( &This->node.IXMLDOMNode_iface, p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_text(&This->node, p); } static HRESULT WINAPI domcomment_put_text( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 8c7c8bf..9600176 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -394,7 +394,8 @@ static HRESULT WINAPI domfrag_get_text( BSTR* p) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_text( &This->node.IXMLDOMNode_iface, p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_text(&This->node, p); } static HRESULT WINAPI domfrag_put_text( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index f0938e4..d2ea36e 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1283,10 +1283,11 @@ static HRESULT WINAPI domdoc_get_nodeTypeString( static HRESULT WINAPI domdoc_get_text( IXMLDOMDocument3 *iface, - BSTR* text ) + BSTR *p) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - return IXMLDOMNode_get_text( &This->node.IXMLDOMNode_iface, text ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_text(&This->node, p); } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 7cf3afc..c1f3564 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -405,7 +405,8 @@ static HRESULT WINAPI domelem_get_text( BSTR* p) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_text( &This->node.IXMLDOMNode_iface, p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_text(&This->node, p); } static HRESULT WINAPI domelem_put_text( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index d8d1f21..4231c7e 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -388,7 +388,8 @@ static HRESULT WINAPI entityref_get_text( BSTR* p) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_text( &This->node.IXMLDOMNode_iface, p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_text(&This->node, p); } static HRESULT WINAPI entityref_put_text( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 499aecb..65e10bf 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -275,6 +275,7 @@ extern HRESULT node_get_namespaceURI(xmlnode*,BSTR*); extern HRESULT node_remove_child(xmlnode*,IXMLDOMNode*,IXMLDOMNode**); extern HRESULT node_has_childnodes(const xmlnode*,VARIANT_BOOL*); extern HRESULT node_get_owner_doc(const xmlnode*,IXMLDOMDocument**); +extern HRESULT node_get_text(const xmlnode*,BSTR*); extern HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index dc393f8..aa181a9 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -583,24 +583,18 @@ static xmlChar* do_get_text(xmlNodePtr node) return str; } -static HRESULT WINAPI xmlnode_get_text( - IXMLDOMNode *iface, - BSTR* text) +HRESULT node_get_text(const xmlnode *This, BSTR *text) { - xmlnode *This = impl_from_IXMLDOMNode( iface ); BSTR str = NULL; - xmlChar *pContent; - - TRACE("(%p, type %d)->(%p)\n", This, This->node->type, text); + xmlChar *content; - if ( !text ) - return E_INVALIDARG; + if (!text) return E_INVALIDARG; - pContent = do_get_text((xmlNodePtr)This->node); - if(pContent) + content = do_get_text(This->node); + if (content) { - str = bstr_from_xmlChar(pContent); - xmlFree(pContent); + str = bstr_from_xmlChar(content); + xmlFree(content); } /* Always return a string. */ @@ -1134,7 +1128,7 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl = NULL, NULL, NULL, - xmlnode_get_text, + NULL, NULL, NULL, NULL, @@ -1521,7 +1515,7 @@ static HRESULT WINAPI unknode_get_text( BSTR* p) { unknode *This = unknode_from_IXMLDOMNode( iface ); - return IXMLDOMNode_get_text( &This->node.IXMLDOMNode_iface, p ); + return node_get_text(&This->node, p); } static HRESULT WINAPI unknode_put_text( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 6b812a5..5e87e49 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -405,7 +405,8 @@ static HRESULT WINAPI dom_pi_get_text( BSTR* p) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_text( &This->node.IXMLDOMNode_iface, p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_text(&This->node, p); } static HRESULT WINAPI dom_pi_put_text( diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index c57428f..c8a0186 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -403,7 +403,8 @@ static HRESULT WINAPI domtext_get_text( BSTR* p) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_text( &This->node.IXMLDOMNode_iface, p ); + TRACE("(%p)->(%p)\n", This, p); + return node_get_text(&This->node, p); } static HRESULT WINAPI domtext_put_text(

1 0

Amine Khaldi : comdlg32: Add missing break (Coverity).
by Alexandre Julliard Feb. 23, 2011

Feb. 23, 2011

Module: wine Branch: master Commit: e9ab576c735f7469dbfaa9b84f2e10b7886d5dce URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9ab576c735f7469dbfaa9b84… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Wed Feb 23 17:30:33 2011 +0100 comdlg32: Add missing break (Coverity). --- dlls/comdlg32/fontdlg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 321bfc6..3bfa5ed 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -955,6 +955,7 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO } CFn_ReleaseDC(lpcf, hdc); } + break; case chx1: case chx2: case cmb2:

1 0

John Edmonds : gdi32/tests: Added tests for copying a single pixel from top down and bottom up bitmaps .
by Alexandre Julliard Feb. 23, 2011

Feb. 23, 2011

Module: wine Branch: master Commit: d2e1478db0ffd4b1acef2529abd0b51f7e1bb6f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2e1478db0ffd4b1acef2529a… Author: John Edmonds <pocketcookies2(a)gmail.com> Date: Sun Feb 20 22:30:29 2011 -0500 gdi32/tests: Added tests for copying a single pixel from top down and bottom up bitmaps. --- dlls/gdi32/tests/bitmap.c | 98 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 98 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index d0d7a9c..4b54302 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -3050,6 +3050,101 @@ static void test_32bit_bitmap_blt(void) DeleteDC(hdcScreen); } +/* + * Used by test_GetDIBits_single_pixel_destination to create the bitmap to test against. + */ +static void setup_picture(char *picture, int bpp) +{ + int i; + + switch(bpp) + { + case 16: + case 32: + /*Set the first byte in each pixel to the index of that pixel.*/ + for (i = 0; i < 4; i++) + picture[i * (bpp / 8)] = i; + break; + case 24: + picture[0] = 0; + picture[3] = 1; + /*Each scanline in a bitmap must be a multiple of 4 bytes long.*/ + picture[8] = 2; + picture[11] = 3; + break; + } +} + +static void test_GetDIBits_single_pixel_destination(int bpp) +{ + BITMAPINFO bi; + HBITMAP bmptb, bmpbt; + HDC hdc; + int pixelOut; + int *picture; + int statusCode; + + bi.bmiHeader.biSize=sizeof(bi.bmiHeader); + bi.bmiHeader.biWidth=2; + bi.bmiHeader.biHeight=2; + bi.bmiHeader.biPlanes=1; + bi.bmiHeader.biBitCount=bpp; + bi.bmiHeader.biCompression=BI_RGB; + + /*Get the device context for the screen.*/ + hdc = GetDC(NULL); + ok(hdc != NULL, "Could not get a handle to a device context.\n"); + + /*Create the bottom to top image (image's bottom scan line is at the top in memory).*/ + bmpbt = CreateDIBSection(hdc, &bi, DIB_RGB_COLORS, (void**)&picture, NULL, 0); + ok(bmpbt != NULL, "Could not create a DIB section.\n"); + /*Now that we have a pointer to the pixels, we write to them.*/ + setup_picture((char*)picture, bpp); + /*Create the top to bottom image (images' bottom scan line is at the bottom in memory).*/ + bi.bmiHeader.biHeight=-2; /*We specify that we want a top to bottom image by specifying a negative height.*/ + bmptb = CreateDIBSection(hdc, &bi, DIB_RGB_COLORS, (void**)&picture, NULL, 0); + ok(bmptb != NULL, "Could not create a DIB section.\n"); + /*Write to this top to bottom bitmap.*/ + setup_picture((char*)picture, bpp); + + bi.bmiHeader.biWidth = 1; + + bi.bmiHeader.biHeight = 2; + statusCode = GetDIBits(hdc, bmpbt, 0, 1, &pixelOut, &bi, DIB_RGB_COLORS); + ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); + /*Check the first byte of the pixel.*/ + ok((char)pixelOut == 0, "Bottom-up -> bottom-up: first pixel should be 0 but was %d.\n", (char)pixelOut); + statusCode = GetDIBits(hdc, bmptb, 0, 1, &pixelOut, &bi, DIB_RGB_COLORS); + ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); + todo_wine ok((char)pixelOut == 2, "Top-down -> bottom-up: first pixel should be 2 but was %d.\n", (char)pixelOut); + /*Check second scanline.*/ + statusCode = GetDIBits(hdc, bmptb, 1, 1, &pixelOut, &bi, DIB_RGB_COLORS); + ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); + todo_wine ok((char)pixelOut == 0, "Top-down -> bottom-up: first pixel should be 0 but was %d.\n", (char)pixelOut); + statusCode = GetDIBits(hdc, bmpbt, 1, 1, &pixelOut, &bi, DIB_RGB_COLORS); + ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); + ok((char)pixelOut == 2, "Top-down -> bottom-up: first pixel should be 2 but was %d.\n", (char)pixelOut); + + /*Make destination bitmap top-down. Windows (and soon, Wine) will ignore this.*/ + bi.bmiHeader.biHeight = -2; + statusCode = GetDIBits(hdc, bmpbt, 0, 1, &pixelOut, &bi, DIB_RGB_COLORS); + ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); + ok((char)pixelOut == 0, "Bottom-up -> top-down: first pixel should be 0 but was %d.\n", (char)pixelOut); + statusCode = GetDIBits(hdc, bmptb, 0, 1, &pixelOut, &bi, DIB_RGB_COLORS); + ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); + todo_wine ok((char)pixelOut == 2, "Top-down -> top-down: first pixel should be 2 but was %d.\n", (char)pixelOut); + /*Check second scanline.*/ + statusCode = GetDIBits(hdc, bmptb, 1, 1, &pixelOut, &bi, DIB_RGB_COLORS); + ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); + todo_wine ok((char)pixelOut == 0, "Top-down -> bottom-up: first pixel should be 0 but was %d.\n", (char)pixelOut); + statusCode = GetDIBits(hdc, bmpbt, 1, 1, &pixelOut, &bi, DIB_RGB_COLORS); + ok(statusCode, "Failed to call GetDIBits. Status code: %d.\n", statusCode); + ok((char)pixelOut == 2, "Top-down -> bottom-up: first pixel should be 2 but was %d.\n", (char)pixelOut); + + DeleteObject(bmpbt); + DeleteObject(bmptb); +} + START_TEST(bitmap) { HMODULE hdll; @@ -3080,4 +3175,7 @@ START_TEST(bitmap) test_bitmapinfoheadersize(); test_get16dibits(); test_clipping(); + test_GetDIBits_single_pixel_destination(16); + test_GetDIBits_single_pixel_destination(24); + test_GetDIBits_single_pixel_destination(32); }

1 0

Marcus Meissner : dbghelp: Fixed pasted size error (Coverity).
by Alexandre Julliard Feb. 23, 2011

Feb. 23, 2011

Module: wine Branch: master Commit: 0d198362aaf5eeafea7efbb73c353bf258e82911 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d198362aaf5eeafea7efbb73… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Feb 23 05:41:27 2011 +0100 dbghelp: Fixed pasted size error (Coverity). --- dlls/dbghelp/module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index ce5e63e..7f75cc2 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -193,7 +193,7 @@ struct module* module_new(struct process* pcs, const WCHAR* name, module->module.TimeDateStamp = stamp; module->module.CheckSum = checksum; - memset(module->module.LoadedPdbName, 0, sizeof(module->module.CVData)); + memset(module->module.LoadedPdbName, 0, sizeof(module->module.LoadedPdbName)); module->module.CVSig = 0; memset(module->module.CVData, 0, sizeof(module->module.CVData)); module->module.PdbSig = 0;

1 0

Nikolay Sivov : msxml3: Remove get_ownerDocument() forward.
by Alexandre Julliard Feb. 23, 2011

Feb. 23, 2011

Module: wine Branch: master Commit: 2e5a0dd63f6fbfe544ef7a50a5615d2effb9ba9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e5a0dd63f6fbfe544ef7a50a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 23 14:38:32 2011 +0300 msxml3: Remove get_ownerDocument() forward. --- dlls/msxml3/attribute.c | 5 +++-- dlls/msxml3/cdata.c | 5 +++-- dlls/msxml3/comment.c | 7 ++++--- dlls/msxml3/docfrag.c | 5 +++-- dlls/msxml3/domdoc.c | 11 ++++++----- dlls/msxml3/element.c | 7 ++++--- dlls/msxml3/entityref.c | 5 +++-- dlls/msxml3/msxml_private.h | 4 +++- dlls/msxml3/node.c | 14 ++++---------- dlls/msxml3/pi.c | 5 +++-- dlls/msxml3/schema.c | 2 +- dlls/msxml3/text.c | 5 +++-- 12 files changed, 40 insertions(+), 35 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 88eead1..8fa24f1 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -353,10 +353,11 @@ static HRESULT WINAPI domattr_hasChildNodes( static HRESULT WINAPI domattr_get_ownerDocument( IXMLDOMAttribute *iface, - IXMLDOMDocument** domDocument) + IXMLDOMDocument **doc) { domattr *This = impl_from_IXMLDOMAttribute( iface ); - return IXMLDOMNode_get_ownerDocument( &This->node.IXMLDOMNode_iface, domDocument ); + TRACE("(%p)->(%p)\n", This, doc); + return node_get_owner_doc(&This->node, doc); } static HRESULT WINAPI domattr_cloneNode( diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 977778d..64185ca 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -364,10 +364,11 @@ static HRESULT WINAPI domcdata_hasChildNodes( static HRESULT WINAPI domcdata_get_ownerDocument( IXMLDOMCDATASection *iface, - IXMLDOMDocument** domDocument) + IXMLDOMDocument **doc) { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); - return IXMLDOMNode_get_ownerDocument( &This->node.IXMLDOMNode_iface, domDocument ); + TRACE("(%p)->(%p)\n", This, doc); + return node_get_owner_doc(&This->node, doc); } static HRESULT WINAPI domcdata_cloneNode( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 8fabca5..bb0c488 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -356,11 +356,12 @@ static HRESULT WINAPI domcomment_hasChildNodes( } static HRESULT WINAPI domcomment_get_ownerDocument( - IXMLDOMComment *iface, - IXMLDOMDocument** domDocument) + IXMLDOMComment *iface, + IXMLDOMDocument **doc) { domcomment *This = impl_from_IXMLDOMComment( iface ); - return IXMLDOMNode_get_ownerDocument( &This->node.IXMLDOMNode_iface, domDocument ); + TRACE("(%p)->(%p)\n", This, doc); + return node_get_owner_doc(&This->node, doc); } static HRESULT WINAPI domcomment_cloneNode( diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 3e3a6f2..8c7c8bf 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -361,10 +361,11 @@ static HRESULT WINAPI domfrag_hasChildNodes( static HRESULT WINAPI domfrag_get_ownerDocument( IXMLDOMDocumentFragment *iface, - IXMLDOMDocument** domDocument) + IXMLDOMDocument **doc) { domfrag *This = impl_from_IXMLDOMDocumentFragment( iface ); - return IXMLDOMNode_get_ownerDocument( &This->node.IXMLDOMNode_iface, domDocument ); + TRACE("(%p)->(%p)\n", This, doc); + return node_get_owner_doc(&This->node, doc); } static HRESULT WINAPI domfrag_cloneNode( diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index cc8cc86..f0938e4 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1249,10 +1249,11 @@ static HRESULT WINAPI domdoc_hasChildNodes( static HRESULT WINAPI domdoc_get_ownerDocument( IXMLDOMDocument3 *iface, - IXMLDOMDocument** DOMDocument) + IXMLDOMDocument **doc) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - return IXMLDOMNode_get_ownerDocument( &This->node.IXMLDOMNode_iface, DOMDocument ); + TRACE("(%p)->(%p)\n", This, doc); + return node_get_owner_doc(&This->node, doc); } @@ -3423,7 +3424,7 @@ static dispex_static_data_t domdoc_dispex = { domdoc_iface_tids }; -HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document) +HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document) { domdoc *doc; @@ -3477,7 +3478,7 @@ HRESULT DOMDocument_create(const GUID *clsid, IUnknown *pUnkOuter, void **ppObj) xmldoc->_private = create_priv(); priv_from_xmlDocPtr(xmldoc)->properties = create_properties(clsid); - hr = DOMDocument_create_from_xmldoc(xmldoc, (IXMLDOMDocument3**)ppObj); + hr = get_domdoc_from_xmldoc(xmldoc, (IXMLDOMDocument3**)ppObj); if(FAILED(hr)) { free_properties(properties_from_xmlDocPtr(xmldoc)); @@ -3496,7 +3497,7 @@ IUnknown* create_domdoc( xmlNodePtr document ) TRACE("(%p)\n", document); - hr = DOMDocument_create_from_xmldoc((xmlDocPtr)document, (IXMLDOMDocument3**)&pObj); + hr = get_domdoc_from_xmldoc((xmlDocPtr)document, (IXMLDOMDocument3**)&pObj); if (FAILED(hr)) return NULL; diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 4954a71..7cf3afc 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -371,11 +371,12 @@ static HRESULT WINAPI domelem_hasChildNodes( } static HRESULT WINAPI domelem_get_ownerDocument( - IXMLDOMElement *iface, - IXMLDOMDocument** domDocument) + IXMLDOMElement *iface, + IXMLDOMDocument **doc) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IXMLDOMNode_get_ownerDocument( &This->node.IXMLDOMNode_iface, domDocument ); + TRACE("(%p)->(%p)\n", This, doc); + return node_get_owner_doc(&This->node, doc); } static HRESULT WINAPI domelem_cloneNode( diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 4f4ab25..d8d1f21 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -355,10 +355,11 @@ static HRESULT WINAPI entityref_hasChildNodes( static HRESULT WINAPI entityref_get_ownerDocument( IXMLDOMEntityReference *iface, - IXMLDOMDocument** domDocument) + IXMLDOMDocument **doc) { entityref *This = impl_from_IXMLDOMEntityReference( iface ); - return IXMLDOMNode_get_ownerDocument( &This->node.IXMLDOMNode_iface, domDocument ); + TRACE("(%p)->(%p)\n", This, doc); + return node_get_owner_doc(&This->node, doc); } static HRESULT WINAPI entityref_cloneNode( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 45a3902..499aecb 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -274,8 +274,10 @@ extern HRESULT node_get_base_name(xmlnode*,BSTR*); extern HRESULT node_get_namespaceURI(xmlnode*,BSTR*); extern HRESULT node_remove_child(xmlnode*,IXMLDOMNode*,IXMLDOMNode**); extern HRESULT node_has_childnodes(const xmlnode*,VARIANT_BOOL*); +extern HRESULT node_get_owner_doc(const xmlnode*,IXMLDOMDocument**); + +extern HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); -extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document); extern HRESULT SchemaCache_validate_tree(IXMLDOMSchemaCollection2* iface, xmlNodePtr tree); extern XDR_DT SchemaCache_get_node_dt(IXMLDOMSchemaCollection2* iface, xmlNodePtr node); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 214f1e6..dc393f8 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -463,15 +463,9 @@ HRESULT node_has_childnodes(const xmlnode *This, VARIANT_BOOL *ret) return S_OK; } -static HRESULT WINAPI xmlnode_get_ownerDocument( - IXMLDOMNode *iface, - IXMLDOMDocument** DOMDocument) +HRESULT node_get_owner_doc(const xmlnode *This, IXMLDOMDocument **doc) { - xmlnode *This = impl_from_IXMLDOMNode( iface ); - - TRACE("(%p)->(%p)\n", This, DOMDocument); - - return DOMDocument_create_from_xmldoc(This->node->doc, (IXMLDOMDocument3**)DOMDocument); + return get_domdoc_from_xmldoc(This->node->doc, (IXMLDOMDocument3**)doc); } HRESULT node_clone(xmlnode *This, VARIANT_BOOL deep, IXMLDOMNode **cloneNode) @@ -1137,7 +1131,7 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl = NULL, NULL, NULL, - xmlnode_get_ownerDocument, + NULL, NULL, NULL, xmlnode_get_text, @@ -1500,7 +1494,7 @@ static HRESULT WINAPI unknode_get_ownerDocument( IXMLDOMDocument** domDocument) { unknode *This = unknode_from_IXMLDOMNode( iface ); - return IXMLDOMNode_get_ownerDocument( &This->node.IXMLDOMNode_iface, domDocument ); + return node_get_owner_doc(&This->node, domDocument); } static HRESULT WINAPI unknode_cloneNode( diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index b0e0638..6b812a5 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -371,10 +371,11 @@ static HRESULT WINAPI dom_pi_hasChildNodes( static HRESULT WINAPI dom_pi_get_ownerDocument( IXMLDOMProcessingInstruction *iface, - IXMLDOMDocument** domDocument) + IXMLDOMDocument **doc) { dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); - return IXMLDOMNode_get_ownerDocument( &This->node.IXMLDOMNode_iface, domDocument ); + TRACE("(%p)->(%p)\n", This, doc); + return node_get_owner_doc(&This->node, doc); } static HRESULT WINAPI dom_pi_cloneNode( diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 2c20061..f782254 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -1163,7 +1163,7 @@ static HRESULT WINAPI schema_cache_get(IXMLDOMSchemaCollection2* iface, BSTR uri /* TODO: this should be read-only */ if (entry) - return DOMDocument_create_from_xmldoc(entry->doc, (IXMLDOMDocument3**)node); + return get_domdoc_from_xmldoc(entry->doc, (IXMLDOMDocument3**)node); *node = NULL; return S_OK; diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index e8db21b..c57428f 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -370,10 +370,11 @@ static HRESULT WINAPI domtext_hasChildNodes( static HRESULT WINAPI domtext_get_ownerDocument( IXMLDOMText *iface, - IXMLDOMDocument** domDocument) + IXMLDOMDocument **doc) { domtext *This = impl_from_IXMLDOMText( iface ); - return IXMLDOMNode_get_ownerDocument( &This->node.IXMLDOMNode_iface, domDocument ); + TRACE("(%p)->(%p)\n", This, doc); + return node_get_owner_doc(&This->node, doc); } static HRESULT WINAPI domtext_cloneNode(

1 0