February 2008 - Wine-Commits

Alexandre Julliard : winex11: Abstract the depth-> bpp conversion and use it in X11DRV_DIB_CreateDIBFromPixmap.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: 0d30daa8e4221a40a295c6714777b05959570af3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d30daa8e4221a40a295c6714… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 4 14:36:18 2008 +0100 winex11: Abstract the depth->bpp conversion and use it in X11DRV_DIB_CreateDIBFromPixmap. --- dlls/winex11.drv/dib.c | 2 +- dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/x11drv_main.c | 61 +++++++++++++++++++++------------------- 3 files changed, 35 insertions(+), 30 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 2f0bbc9..b05d904 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -4856,7 +4856,7 @@ HGLOBAL X11DRV_DIB_CreateDIBFromPixmap(Pixmap pixmap, HDC hdc) * Create an HBITMAP with the same dimensions and BPP as the pixmap, * and make it a container for the pixmap passed. */ - hBmp = CreateBitmap( width, height, 1, depth, NULL ); + if (!(hBmp = CreateBitmap( width, height, 1, depth_to_bpp(depth), NULL ))) return 0; /* force bitmap to be owned by a screen DC */ hdcMem = CreateCompatibleDC( hdc ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index ffd0469..7af082c 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -463,6 +463,8 @@ extern BOOL X11DRV_IsSolidColor(COLORREF color); extern COLORREF X11DRV_PALETTE_ToLogical(int pixel); extern int X11DRV_PALETTE_ToPhysical(X11DRV_PDEVICE *physDev, COLORREF color); +extern unsigned int depth_to_bpp( unsigned int depth ); + /* GDI escapes */ #define X11DRV_ESCAPE 6789 diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 8d822ef..6f682c2 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -278,6 +278,37 @@ void wine_tsx11_unlock(void) /*********************************************************************** + * depth_to_bpp + * + * Convert X11-reported depth to the BPP value that Windows apps expect to see. + */ +unsigned int depth_to_bpp( unsigned int depth ) +{ + switch (depth) + { + case 1: + case 8: + return depth; + case 15: + case 16: + return 16; + case 24: + /* This is not necessarily right. X11 always has 24 bits per pixel, but it can run + * with 24 bit framebuffers and 32 bit framebuffers. It doesn't make any difference + * for windowing, but gl applications can get visuals with alpha channels. So we + * should check the framebuffer and/or opengl formats available to find out what the + * framebuffer actually does + */ + case 32: + return 32; + default: + FIXME( "Unexpected X11 depth %d bpp, what to report to app?\n", depth ); + return depth; + } +} + + +/*********************************************************************** * get_config_key * * Get a config key from either the app-specific or the default config @@ -491,35 +522,7 @@ static BOOL process_attach(void) screen_depth = desktop_vi->depth; XFree(desktop_vi); } - - switch(screen_depth) { - case 8: - screen_bpp = 8; - break; - - case 15: - /* In GetDeviceCaps MSDN description explicitly states that - * in 15 bpp mode 16 is returned. - */ - /* fall through */ - case 16: - screen_bpp = 16; - break; - - case 24: - /* This is not necessarily right. X11 always has 24 bits per pixel, but it can run - * with 24 bit framebuffers and 32 bit framebuffers. It doesn't make any difference - * for windowing, but gl applications can get visuals with alpha channels. So we - * should check the framebuffer and/or opengl formats available to find out what the - * framebuffer actually does - */ - screen_bpp = 32; - break; - - default: - FIXME("Unexpected X11 depth %d bpp, what to report to app?\n", screen_depth); - screen_bpp = screen_depth; - } + screen_bpp = depth_to_bpp( screen_depth ); XInternAtoms( display, (char **)atom_names, NB_XATOMS - FIRST_XATOM, False, X11DRV_Atoms );

1 0

Alistair Leslie-Hughes : msxml3: Correct createElement return value for an invalid type.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: c9f5f2c6a29f674f90f8f94f4b5bbb3db0439dd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9f5f2c6a29f674f90f8f94f4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 1 21:25:37 2008 +1100 msxml3: Correct createElement return value for an invalid type. --- dlls/msxml3/tests/xmldoc.c | 4 ++-- dlls/msxml3/xmldoc.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index 1186c9b..89c73cf 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -270,8 +270,8 @@ static void test_createElement(void) V_I4(&vType) = -1; V_VT(&vName) = VT_NULL; hr = IXMLDocument_createElement(doc, vType, vName, &element); - ok(hr == S_OK, "Expected S_OK, got %d\n", hr); - ok(element != NULL, "Expected non-NULL element\n"); + ok(hr == E_NOTIMPL, "Expected S_OK, got %d\n", hr); + ok(element == NULL, "Expected NULL element\n"); if (element != NULL) { diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c index a4c0850..ee72d1b 100644 --- a/dlls/msxml3/xmldoc.c +++ b/dlls/msxml3/xmldoc.c @@ -453,6 +453,9 @@ static HRESULT WINAPI xmldoc_createElement(IXMLDocument *iface, VARIANT vType, if (V_VT(&vType) != VT_I4) return E_INVALIDARG; + if(type_msxml_to_libxml(V_I4(&vType)) == -1) + return E_NOTIMPL; + node = xmlNewNode(NULL, empty); node->type = type_msxml_to_libxml(V_I4(&vType));

1 0

Hans Leidekker : wininet: Make sure not to overwrite any caller supplied authorization header.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: b069ef4268e7056856ce6714714d929165f24fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b069ef4268e7056856ce67147… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Feb 1 14:40:15 2008 +0100 wininet: Make sure not to overwrite any caller supplied authorization header. --- dlls/wininet/http.c | 36 ++++++++++-------------------------- dlls/wininet/tests/http.c | 5 ++++- 2 files changed, 14 insertions(+), 27 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 65b86fb..a339c86 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1187,9 +1187,11 @@ static UINT HTTP_DecodeBase64( LPCWSTR base64, LPSTR bin ) * * Insert or delete the authorization field in the request header. */ -static BOOL HTTP_InsertAuthorizationForHeader( LPWININETHTTPREQW lpwhr, struct HttpAuthInfo *pAuthInfo, LPCWSTR header ) +static BOOL HTTP_InsertAuthorization( LPWININETHTTPREQW lpwhr, LPCWSTR header, BOOL first ) { WCHAR *authorization = NULL; + struct HttpAuthInfo *pAuthInfo = lpwhr->pAuthInfo; + DWORD flags; if (pAuthInfo && pAuthInfo->auth_data_len) { @@ -1222,35 +1224,17 @@ static BOOL HTTP_InsertAuthorizationForHeader( LPWININETHTTPREQW lpwhr, struct H TRACE("Inserting authorization: %s\n", debugstr_w(authorization)); - HTTP_ProcessHeader(lpwhr, header, authorization, - HTTP_ADDHDR_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); + /* make sure not to overwrite any caller supplied authorization header */ + flags = HTTP_ADDHDR_FLAG_REQ; + flags |= first ? HTTP_ADDHDR_FLAG_ADD_IF_NEW : HTTP_ADDHDR_FLAG_REPLACE; - HeapFree(GetProcessHeap(), 0, authorization); + HTTP_ProcessHeader(lpwhr, header, authorization, flags); + HeapFree(GetProcessHeap(), 0, authorization); return TRUE; } /*********************************************************************** - * HTTP_InsertAuthorization - * - * Insert the authorization field in the request header - */ -static BOOL HTTP_InsertAuthorization( LPWININETHTTPREQW lpwhr ) -{ - return HTTP_InsertAuthorizationForHeader(lpwhr, lpwhr->pAuthInfo, szAuthorization); -} - -/*********************************************************************** - * HTTP_InsertProxyAuthorization - * - * Insert the proxy authorization field in the request header - */ -static BOOL HTTP_InsertProxyAuthorization( LPWININETHTTPREQW lpwhr ) -{ - return HTTP_InsertAuthorizationForHeader(lpwhr, lpwhr->pProxyAuthInfo, szProxy_Authorization); -} - -/*********************************************************************** * HTTP_DealWithProxy */ static BOOL HTTP_DealWithProxy( LPWININETAPPINFOW hIC, @@ -2621,8 +2605,8 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, lpwhr->hdr.dwFlags & INTERNET_FLAG_KEEP_CONNECTION ? szKeepAlive : szClose, HTTP_ADDHDR_FLAG_REQ | HTTP_ADDHDR_FLAG_REPLACE); - HTTP_InsertAuthorization(lpwhr); - HTTP_InsertProxyAuthorization(lpwhr); + HTTP_InsertAuthorization(lpwhr, szAuthorization, !loop_next); + HTTP_InsertAuthorization(lpwhr, szProxy_Authorization, !loop_next); /* add the headers the caller supplied */ if( lpszHeaders && dwHeaderLength ) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 8bb7cca..88369cf 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1502,7 +1502,10 @@ static void test_header_handling_order(int port) request = HttpOpenRequest(connect, NULL, "/test3", NULL, NULL, types, INTERNET_FLAG_KEEP_CONNECTION, 0); ok(request != NULL, "HttpOpenRequest failed\n"); - ret = HttpSendRequest(request, authorization, ~0UL, NULL, 0); + ret = HttpAddRequestHeaders(request, authorization, ~0UL, HTTP_ADDREQ_FLAG_ADD); + ok(ret, "HttpAddRequestHeaders failed\n"); + + ret = HttpSendRequest(request, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed\n"); status = 0;

1 0

Hans Leidekker : wininet: Add zero value content length header to POST requests only.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: b0912d11511a19031cfe6ba12e4dd422a7b5d73c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0912d11511a19031cfe6ba12… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Feb 2 16:08:28 2008 +0100 wininet: Add zero value content length header to POST requests only. --- dlls/wininet/http.c | 9 ++++++--- dlls/wininet/tests/http.c | 23 ++++++++++++++--------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 015f663..71dcc51 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2565,6 +2565,7 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, BOOL loop_next; INTERNET_ASYNC_RESULT iar; static const WCHAR szClose[] = { 'C','l','o','s','e',0 }; + static const WCHAR szPost[] = { 'P','O','S','T',0 }; static const WCHAR szContentLength[] = { 'C','o','n','t','e','n','t','-','L','e','n','g','t','h',':',' ','%','l','i','\r','\n',0 }; WCHAR contentLengthStr[sizeof szContentLength/2 /* includes \r\n */ + 20 /* int */ ]; @@ -2577,9 +2578,11 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, INTERNET_SetLastError(0); HTTP_FixVerb(lpwhr); - - sprintfW(contentLengthStr, szContentLength, dwContentLength); - HTTP_HttpAddRequestHeadersW(lpwhr, contentLengthStr, -1L, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REPLACE); + if (dwContentLength || !strcmpW(lpwhr->lpszVerb, szPost)) + { + sprintfW(contentLengthStr, szContentLength, dwContentLength); + HTTP_HttpAddRequestHeadersW(lpwhr, contentLengthStr, -1L, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REPLACE); + } do { diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 88369cf..f48f61f 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1285,8 +1285,13 @@ static DWORD CALLBACK server_thread(LPVOID param) if (strstr(buffer, "GET /test1")) { - send(c, okmsg, sizeof okmsg-1, 0); - send(c, page1, sizeof page1-1, 0); + if (!strstr(buffer, "Content-Length: 0")) + { + send(c, okmsg, sizeof okmsg-1, 0); + send(c, page1, sizeof page1-1, 0); + } + else + send(c, notokmsg, sizeof notokmsg-1, 0); } if (strstr(buffer, "/test2")) @@ -1316,7 +1321,7 @@ static DWORD CALLBACK server_thread(LPVOID param) send(c, notokmsg, sizeof notokmsg-1, 0); } - if (strstr(buffer, "/test5")) + if (strstr(buffer, "POST /test5")) { if (strstr(buffer, "Content-Length: 0")) { @@ -1327,7 +1332,7 @@ static DWORD CALLBACK server_thread(LPVOID param) send(c, notokmsg, sizeof notokmsg-1, 0); } - if (strstr(buffer, "/quit")) + if (strstr(buffer, "GET /quit")) { send(c, okmsg, sizeof okmsg-1, 0); send(c, page1, sizeof page1-1, 0); @@ -1343,7 +1348,7 @@ static DWORD CALLBACK server_thread(LPVOID param) return 0; } -static void test_basic_request(int port, const char *url) +static void test_basic_request(int port, const char *verb, const char *url) { HINTERNET hi, hc, hr; DWORD r, count; @@ -1355,7 +1360,7 @@ static void test_basic_request(int port, const char *url) hc = InternetConnect(hi, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); ok(hc != NULL, "connect failed\n"); - hr = HttpOpenRequest(hc, NULL, url, NULL, NULL, NULL, 0, 0); + hr = HttpOpenRequest(hc, verb, url, NULL, NULL, NULL, 0, 0); ok(hr != NULL, "HttpOpenRequest failed\n"); r = HttpSendRequest(hr, NULL, 0, NULL, 0); @@ -1550,14 +1555,14 @@ static void test_http_connection(void) if (r != WAIT_OBJECT_0) return; - test_basic_request(si.port, "/test1"); + test_basic_request(si.port, "GET", "/test1"); test_proxy_indirect(si.port); test_proxy_direct(si.port); test_header_handling_order(si.port); - test_basic_request(si.port, "/test5"); + test_basic_request(si.port, "POST", "/test5"); /* send the basic request again to shutdown the server thread */ - test_basic_request(si.port, "/quit"); + test_basic_request(si.port, "GET", "/quit"); r = WaitForSingleObject(hThread, 3000); ok( r == WAIT_OBJECT_0, "thread wait failed\n");

1 0

Andre Wisplinghoff : winecfg: Enable add button when choosing lib from combobox (Libraries tabsheet).
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: 9bf3355a11ddbb21d39e9ca196c1df3d8acb3196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf3355a11ddbb21d39e9ca19… Author: Andre Wisplinghoff <andre(a)myhost.localdomain> Date: Thu Jan 31 18:08:32 2008 +0100 winecfg: Enable add button when choosing lib from combobox (Libraries tabsheet). --- programs/winecfg/libraries.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index 8e4e46b..aa0a161 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -408,10 +408,14 @@ static void init_libsheet(HWND dialog) static void on_add_combo_change(HWND dialog) { char buffer[1024]; + int sel, len; SendDlgItemMessage(dialog, IDC_DLLCOMBO, WM_GETTEXT, sizeof(buffer), (LPARAM) buffer); + /* if lib was chosen from combobox, we reveive an empty buffer, check manually */ + sel=SendDlgItemMessage(dialog, IDC_DLLCOMBO, CB_GETCURSEL, 0, 0); + len=SendDlgItemMessage(dialog, IDC_DLLCOMBO, CB_GETLBTEXTLEN, sel, 0); - if (strlen(buffer)) + if (strlen(buffer)>0 || len>0) enable(IDC_DLLS_ADDDLL) else disable(IDC_DLLS_ADDDLL);

1 0

Hans Leidekker : wininet: Send HTTP/1.1 requests by default.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: c132dd9360bdb40a45f7329a25324b10f8763091 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c132dd9360bdb40a45f7329a2… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Feb 1 14:40:42 2008 +0100 wininet: Send HTTP/1.1 requests by default. --- dlls/wininet/http.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a339c86..015f663 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -62,7 +62,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); -static const WCHAR g_szHttp1_0[] = {' ','H','T','T','P','/','1','.','0',0 }; static const WCHAR g_szHttp1_1[] = {' ','H','T','T','P','/','1','.','1',0 }; static const WCHAR g_szReferer[] = {'R','e','f','e','r','e','r',0}; static const WCHAR g_szAccept[] = {'A','c','c','e','p','t',0}; @@ -257,7 +256,7 @@ static void HTTP_FixURL( LPWININETHTTPREQW lpwhr) } } -static LPWSTR HTTP_BuildHeaderRequestString( LPWININETHTTPREQW lpwhr, LPCWSTR verb, LPCWSTR path, BOOL http1_1 ) +static LPWSTR HTTP_BuildHeaderRequestString( LPWININETHTTPREQW lpwhr, LPCWSTR verb, LPCWSTR path ) { LPWSTR requestString; DWORD len, n; @@ -279,7 +278,7 @@ static LPWSTR HTTP_BuildHeaderRequestString( LPWININETHTTPREQW lpwhr, LPCWSTR ve req[n++] = verb; req[n++] = szSpace; req[n++] = path; - req[n++] = http1_1 ? g_szHttp1_1 : g_szHttp1_0; + req[n++] = g_szHttp1_1; /* Append custom request headers */ for (i = 0; i < lpwhr->nCustHeaders; i++) @@ -1650,7 +1649,7 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD dwInfoLev BOOL ret; if (request_only) - headers = HTTP_BuildHeaderRequestString(lpwhr, lpwhr->lpszVerb, lpwhr->lpszPath, FALSE); + headers = HTTP_BuildHeaderRequestString(lpwhr, lpwhr->lpszVerb, lpwhr->lpszPath); else headers = lpwhr->lpszRawHeaders; @@ -2520,7 +2519,7 @@ static BOOL HTTP_SecureProxyConnect(LPWININETHTTPREQW lpwhr) lpszPath = HeapAlloc( GetProcessHeap(), 0, (lstrlenW( lpwhs->lpszHostName ) + 13)*sizeof(WCHAR) ); sprintfW( lpszPath, szFormat, lpwhs->lpszHostName, lpwhs->nHostPort ); - requestString = HTTP_BuildHeaderRequestString( lpwhr, szConnect, lpszPath, FALSE ); + requestString = HTTP_BuildHeaderRequestString( lpwhr, szConnect, lpszPath ); HeapFree( GetProcessHeap(), 0, lpszPath ); len = WideCharToMultiByte( CP_ACP, 0, requestString, -1, @@ -2615,7 +2614,7 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REPLACE); } - requestString = HTTP_BuildHeaderRequestString(lpwhr, lpwhr->lpszVerb, lpwhr->lpszPath, FALSE); + requestString = HTTP_BuildHeaderRequestString(lpwhr, lpwhr->lpszVerb, lpwhr->lpszPath); TRACE("Request header -> %s\n", debugstr_w(requestString) );

1 0

Bang Jun-young : riched20: Include wine/port.h for vsnprintf().
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: 8e57a41913244c987478fb821759cdd779b58062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e57a41913244c987478fb821… Author: Bang Jun-young <junyoung(a)mogua.com> Date: Fri Feb 1 15:29:44 2008 +0900 riched20: Include wine/port.h for vsnprintf(). --- dlls/riched20/writer.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 68088f7..ff3f5ee 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include "editor.h" #include "rtf.h"

1 0

Alistair Leslie-Hughes : msxml3: Validated attribute name.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: b7e6906c2d34679783ca0261f64be92d5967521e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7e6906c2d34679783ca0261f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 1 20:45:02 2008 +1100 msxml3: Validated attribute name. --- dlls/msxml3/element.c | 9 +++++++-- dlls/msxml3/tests/domdoc.c | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index ba01247..6ee8881 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -458,7 +458,7 @@ static HRESULT WINAPI domelem_getAttribute( { domelem *This = impl_from_IXMLDOMElement( iface ); xmlNodePtr element; - xmlChar *xml_name, *xml_value; + xmlChar *xml_name, *xml_value = NULL; HRESULT hr = S_FALSE; TRACE("(%p)->(%s,%p)\n", This, debugstr_w(name), value); @@ -474,7 +474,12 @@ static HRESULT WINAPI domelem_getAttribute( V_VT(value) = VT_NULL; xml_name = xmlChar_from_wchar( name ); - xml_value = xmlGetNsProp(element, xml_name, NULL); + + if(!xmlValidateNameValue(xml_name)) + hr = E_FAIL; + else + xml_value = xmlGetNsProp(element, xml_name, NULL); + HeapFree(GetProcessHeap(), 0, xml_name); if(xml_value) { diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 4507d08..e5dfbcc 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -719,7 +719,7 @@ static void test_domnode( void ) V_VT(&var) = VT_I4; V_I4(&var) = 0x1234; r = IXMLDOMElement_getAttribute( element, str, &var ); - ok( r == S_FALSE, "getAttribute ret %08x\n", r ); + ok( r == E_FAIL, "getAttribute ret %08x\n", r ); ok( V_VT(&var) == VT_NULL, "vt = %x\n", V_VT(&var)); VariantClear(&var); SysFreeString( str );

1 0

Bang Jun-young : user32: Fix EndMenu() to match the PSDK.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: 9fcebb0055407b389874d7a35468c8de7cd27059 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fcebb0055407b389874d7a35… Author: Bang Jun-young <junyoung(a)mogua.com> Date: Fri Feb 1 14:54:17 2008 +0900 user32: Fix EndMenu() to match the PSDK. --- dlls/user32/menu.c | 3 ++- include/winuser.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 99c4933..660c5d5 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4252,7 +4252,7 @@ END: * EndMenu (USER.187) * EndMenu (USER32.@) */ -void WINAPI EndMenu(void) +BOOL WINAPI EndMenu(void) { /* if we are in the menu code, and it is active */ if (!fEndMenu && top_popup) @@ -4266,6 +4266,7 @@ void WINAPI EndMenu(void) /* don't end up with an orphaned menu */ PostMessageW( top_popup, WM_CANCELMODE, 0, 0); } + return fEndMenu; } diff --git a/include/winuser.h b/include/winuser.h index aec4a83..6e61e10 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4482,7 +4482,7 @@ WINUSERAPI BOOL WINAPI EnableScrollBar(HWND,UINT,UINT); WINUSERAPI BOOL WINAPI EnableWindow(HWND,BOOL); WINUSERAPI BOOL WINAPI EndDeferWindowPos(HDWP); WINUSERAPI BOOL WINAPI EndDialog(HWND,INT_PTR); -WINUSERAPI VOID WINAPI EndMenu(void); +WINUSERAPI BOOL WINAPI EndMenu(void); WINUSERAPI BOOL WINAPI EndPaint(HWND,const PAINTSTRUCT*); WINUSERAPI BOOL WINAPI EnumChildWindows(HWND,WNDENUMPROC,LPARAM); WINUSERAPI UINT WINAPI EnumClipboardFormats(UINT);

1 0

Alistair Leslie-Hughes : msxml3: Corrected Entity Reference Test.
by Alexandre Julliard Feb. 4, 2008

Feb. 4, 2008

Module: wine Branch: master Commit: d4a4b12a43345b9f3eafedeec1c980fc357b41e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4a4b12a43345b9f3eafedeec… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 1 20:49:05 2008 +1100 msxml3: Corrected Entity Reference Test. --- dlls/msxml3/tests/domdoc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index e5dfbcc..6f4f7f2 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -156,7 +156,7 @@ static WCHAR szCDataXML[] = {'<','!','[','C','D','A','T','A','[','[','1',']','*' static WCHAR szCDataNodeText[] = {'#','c','d','a','t','a','-','s','e','c','t','i','o','n',0 }; static WCHAR szDocFragmentText[] = {'#','d','o','c','u','m','e','n','t','-','f','r','a','g','m','e','n','t',0 }; -static WCHAR szEntityRef[] = {'E','n','t','i','t','y','r','e','f',0 }; +static WCHAR szEntityRef[] = {'e','n','t','i','t','y','r','e','f',0 }; static WCHAR szEntityRefXML[] = {'&','e','n','t','i','t','y','r','e','f',';',0 }; #define expect_bstr_eq_and_free(bstr, expect) { \ @@ -2298,7 +2298,7 @@ static void test_xmlTypes(void) /* test get_xml*/ hr = IXMLDOMEntityReference_get_xml(pEntityRef, &str); ok(hr == S_OK, "ret %08x\n", hr ); - todo_wine ok( !lstrcmpW( str, szEntityRefXML ), "incorrect xml string\n"); + ok( !lstrcmpW( str, szEntityRefXML ), "incorrect xml string\n"); SysFreeString(str); IXMLDOMEntityReference_Release(pEntityRef);

1 0