February 2008 - Wine-commits

Stefan Dösinger : wined3d: Do not change the texture unit when binding surfaces.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: d49c9bbcbe5b2461ca685f45da740b8f0ff400c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d49c9bbcbe5b2461ca685f45d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 11 01:18:06 2008 +0100 wined3d: Do not change the texture unit when binding surfaces. Changing the texture unit when binding a surface for loading can break the state manager in the way that it changes the currently active texture unit while it is setting up a texture that has to be loaded. Instead find out the current unit to dirtify the correct sampler. --- dlls/wined3d/surface.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5f8fd93..be464eb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -38,13 +38,21 @@ static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4] static inline void clear_unused_channels(IWineD3DSurfaceImpl *This); static void surface_bind_and_dirtify(IWineD3DSurfaceImpl *This) { - /* Make sure that a proper texture unit is selected, bind the texture - * and dirtify the sampler to restore the texture on the next draw. */ + GLint active_texture; + + /* We don't need a specific texture unit, but after binding the texture the current unit is dirty. + * Read the unit back instead of switching to 0, this avoids messing around with the state manager's + * gl states. The current texture unit should always be a valid one. + * + * TODO: Track the current active texture per GL context instead of using glGet + */ if (GL_SUPPORT(ARB_MULTITEXTURE)) { - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB)); - checkGLcall("glActiveTextureARB"); + glGetIntegerv(GL_ACTIVE_TEXTURE, &active_texture); + active_texture -= GL_TEXTURE0_ARB; + } else { + active_texture = 0; } - IWineD3DDeviceImpl_MarkStateDirty(This->resource.wineD3DDevice, STATE_SAMPLER(0)); + IWineD3DDeviceImpl_MarkStateDirty(This->resource.wineD3DDevice, STATE_SAMPLER(active_texture)); IWineD3DSurface_BindTexture((IWineD3DSurface *)This); }

1 0

Stefan Dösinger : wined3d: Add a test for fixed function bump mapping.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: c2d97b232903d5b44bbba84ec52b661f670ef383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2d97b232903d5b44bbba84ec… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Feb 17 23:30:24 2008 +0100 wined3d: Add a test for fixed function bump mapping. --- dlls/d3d9/tests/visual.c | 250 ++++++++++++++++++++++++++++++++++++--------- dlls/wined3d/state.c | 21 +++- 2 files changed, 215 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c2d97b232903d5b44bbba…

1 0

Hans Leidekker : wininet: Honour the version override in HttpOpenRequest.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: d0033dbaed68b22f6a438365e27c54bb65ba1071 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0033dbaed68b22f6a438365e… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Feb 17 20:41:42 2008 +0100 wininet: Honour the version override in HttpOpenRequest. --- dlls/wininet/http.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 083eda6..8f932c3 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -62,7 +62,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); -static const WCHAR g_szHttp1_1[] = {' ','H','T','T','P','/','1','.','1',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}; static const WCHAR g_szUserAgent[] = {'U','s','e','r','-','A','g','e','n','t',0}; @@ -247,7 +247,7 @@ static void HTTP_FixURL( LPWININETHTTPREQW lpwhr) } } -static LPWSTR HTTP_BuildHeaderRequestString( LPWININETHTTPREQW lpwhr, LPCWSTR verb, LPCWSTR path ) +static LPWSTR HTTP_BuildHeaderRequestString( LPWININETHTTPREQW lpwhr, LPCWSTR verb, LPCWSTR path, LPCWSTR version ) { LPWSTR requestString; DWORD len, n; @@ -261,7 +261,7 @@ static LPWSTR HTTP_BuildHeaderRequestString( LPWININETHTTPREQW lpwhr, LPCWSTR ve static const WCHAR sztwocrlf[] = {'\r','\n','\r','\n', 0}; /* allocate space for an array of all the string pointers to be added */ - len = (lpwhr->nCustHeaders)*4 + 9; + len = (lpwhr->nCustHeaders)*4 + 10; req = HeapAlloc( GetProcessHeap(), 0, len*sizeof(LPCWSTR) ); /* add the verb, path and HTTP version string */ @@ -269,7 +269,8 @@ static LPWSTR HTTP_BuildHeaderRequestString( LPWININETHTTPREQW lpwhr, LPCWSTR ve req[n++] = verb; req[n++] = szSpace; req[n++] = path; - req[n++] = g_szHttp1_1; + req[n++] = szSpace; + req[n++] = version; /* Append custom request headers */ for (i = 0; i < lpwhr->nCustHeaders; i++) @@ -1404,6 +1405,11 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs, lpwhr->lpszVerb = WININET_strdupW(lpszVerb && *lpszVerb ? lpszVerb : szGET); + if (lpszVersion) + lpwhr->lpszVersion = WININET_strdupW(lpszVersion); + else + lpwhr->lpszVersion = WININET_strdupW(g_szHttp1_1); + HTTP_ProcessHeader(lpwhr, szHost, lpwhs->lpszHostName, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ); if (lpwhs->nServerPort == INTERNET_INVALID_PORT_NUMBER) @@ -1633,7 +1639,7 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD dwInfoLev BOOL ret; if (request_only) - headers = HTTP_BuildHeaderRequestString(lpwhr, lpwhr->lpszVerb, lpwhr->lpszPath); + headers = HTTP_BuildHeaderRequestString(lpwhr, lpwhr->lpszVerb, lpwhr->lpszPath, lpwhr->lpszVersion); else headers = lpwhr->lpszRawHeaders; @@ -2518,7 +2524,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 ); + requestString = HTTP_BuildHeaderRequestString( lpwhr, szConnect, lpszPath, g_szHttp1_1 ); HeapFree( GetProcessHeap(), 0, lpszPath ); len = WideCharToMultiByte( CP_ACP, 0, requestString, -1, @@ -2619,7 +2625,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); + requestString = HTTP_BuildHeaderRequestString(lpwhr, lpwhr->lpszVerb, lpwhr->lpszPath, lpwhr->lpszVersion); TRACE("Request header -> %s\n", debugstr_w(requestString) );

1 0

Hans Leidekker : wininet: Handle the "100 Continue" response by ignoring it .
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 2617fb6dea8e114ef2ade1c0167147b531194e31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2617fb6dea8e114ef2ade1c01… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Feb 17 20:41:56 2008 +0100 wininet: Handle the "100 Continue" response by ignoring it. --- dlls/wininet/http.c | 58 ++++++++++++++++++++++++--------------------- dlls/wininet/tests/http.c | 18 +++++++++++-- 2 files changed, 46 insertions(+), 30 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 8f932c3..63491d0 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3020,6 +3020,7 @@ static INT HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr) BOOL bSuccess = FALSE; INT rc = 0; static const WCHAR szCrLf[] = {'\r','\n',0}; + static const WCHAR szHundred[] = {'1','0','0',0}; char bufferA[MAX_REPLY_LEN]; LPWSTR status_code, status_text; DWORD cchMaxRawHeaders = 1024; @@ -3034,19 +3035,37 @@ static INT HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr) if (!NETCON_connected(&lpwhr->netConnection)) goto lend; - /* - * HACK peek at the buffer - */ - NETCON_recv(&lpwhr->netConnection, buffer, buflen, MSG_PEEK, &rc); + do { + /* + * HACK peek at the buffer + */ + buflen = MAX_REPLY_LEN; + NETCON_recv(&lpwhr->netConnection, buffer, buflen, MSG_PEEK, &rc); - /* - * We should first receive 'HTTP/1.x nnn OK' where nnn is the status code. - */ - buflen = MAX_REPLY_LEN; - memset(buffer, 0, MAX_REPLY_LEN); - if (!NETCON_getNextLine(&lpwhr->netConnection, bufferA, &buflen)) - goto lend; - MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer, MAX_REPLY_LEN ); + /* + * We should first receive 'HTTP/1.x nnn OK' where nnn is the status code. + */ + memset(buffer, 0, MAX_REPLY_LEN); + if (!NETCON_getNextLine(&lpwhr->netConnection, bufferA, &buflen)) + goto lend; + MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer, MAX_REPLY_LEN ); + + /* split the version from the status code */ + status_code = strchrW( buffer, ' ' ); + if( !status_code ) + goto lend; + *status_code++=0; + + /* split the status code from the status text */ + status_text = strchrW( status_code, ' ' ); + if( !status_text ) + goto lend; + *status_text++=0; + + TRACE("version [%s] status code [%s] status text [%s]\n", + debugstr_w(buffer), debugstr_w(status_code), debugstr_w(status_text) ); + + } while (!strcmpW(status_code, szHundred)); /* ignore "100 Continue" responses */ /* regenerate raw headers */ while (cchRawHeaders + buflen + strlenW(szCrLf) > cchMaxRawHeaders) @@ -3060,21 +3079,6 @@ static INT HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr) cchRawHeaders += sizeof(szCrLf)/sizeof(szCrLf[0])-1; lpszRawHeaders[cchRawHeaders] = '\0'; - /* split the version from the status code */ - status_code = strchrW( buffer, ' ' ); - if( !status_code ) - goto lend; - *status_code++=0; - - /* split the status code from the status text */ - status_text = strchrW( status_code, ' ' ); - if( !status_text ) - goto lend; - *status_text++=0; - - TRACE("version [%s] status code [%s] status text [%s]\n", - debugstr_w(buffer), debugstr_w(status_code), debugstr_w(status_text) ); - HTTP_ProcessHeader(lpwhr, szStatus, status_code, HTTP_ADDHDR_FLAG_REPLACE); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 910771d..4aed85d 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1305,18 +1305,21 @@ done: ok(InternetCloseHandle(hSession), "Close session handle failed\n"); } +static const char contmsg[] = +"HTTP/1.1 100 Continue\r\n"; + static const char okmsg[] = -"HTTP/1.0 200 OK\r\n" +"HTTP/1.1 200 OK\r\n" "Server: winetest\r\n" "\r\n"; static const char notokmsg[] = -"HTTP/1.0 400 Bad Request\r\n" +"HTTP/1.1 400 Bad Request\r\n" "Server: winetest\r\n" "\r\n"; static const char noauthmsg[] = -"HTTP/1.0 401 Unauthorized\r\n" +"HTTP/1.1 401 Unauthorized\r\n" "Server: winetest\r\n" "\r\n"; @@ -1435,6 +1438,14 @@ static DWORD CALLBACK server_thread(LPVOID param) send(c, notokmsg, sizeof notokmsg-1, 0); } + if (strstr(buffer, "GET /test6")) + { + send(c, contmsg, sizeof contmsg-1, 0); + send(c, contmsg, sizeof contmsg-1, 0); + send(c, okmsg, sizeof okmsg-1, 0); + send(c, page1, sizeof page1-1, 0); + } + if (strstr(buffer, "GET /quit")) { send(c, okmsg, sizeof okmsg-1, 0); @@ -1663,6 +1674,7 @@ static void test_http_connection(void) test_proxy_direct(si.port); test_header_handling_order(si.port); test_basic_request(si.port, "POST", "/test5"); + test_basic_request(si.port, "GET", "/test6"); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Hans Leidekker : wininet: Rename a function to better match what it does.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 9717113fcb337dc2bbd5dbacf74115babe0c216c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9717113fcb337dc2bbd5dbacf… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Feb 17 21:29:45 2008 +0100 wininet: Rename a function to better match what it does. --- dlls/wininet/http.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 63491d0..9e02d69 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -307,7 +307,7 @@ static LPWSTR HTTP_BuildHeaderRequestString( LPWININETHTTPREQW lpwhr, LPCWSTR ve return requestString; } -static void HTTP_ProcessHeaders( LPWININETHTTPREQW lpwhr ) +static void HTTP_ProcessCookies( LPWININETHTTPREQW lpwhr ) { static const WCHAR szSet_Cookie[] = { 'S','e','t','-','C','o','o','k','i','e',0 }; int HeaderIndex; @@ -842,8 +842,8 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hRequest, SendAsyncCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_RESPONSE_RECEIVED, &responseLen, sizeof(DWORD)); - /* process headers here. Is this right? */ - HTTP_ProcessHeaders(lpwhr); + /* process cookies here. Is this right? */ + HTTP_ProcessCookies(lpwhr); dwBufferSize = sizeof(lpwhr->dwContentLength); if (!HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH, @@ -2676,7 +2676,7 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, INTERNET_STATUS_RESPONSE_RECEIVED, &responseLen, sizeof(DWORD)); - HTTP_ProcessHeaders(lpwhr); + HTTP_ProcessCookies(lpwhr); dwBufferSize = sizeof(lpwhr->dwContentLength); if (!HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH,

1 0

Stefan Dösinger : wined3d: Extend out anti-spam database a bit.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: b1e1df5117a9f60884bfea3e28d53dc37f117ec8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1e1df5117a9f60884bfea3e2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Feb 10 16:43:24 2008 +0100 wined3d: Extend out anti-spam database a bit. --- dlls/wined3d/glsl_shader.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0290e46..b15d9b2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -62,7 +62,10 @@ void print_glsl_info_log(WineD3D_GL_Info *gl_info, GLhandleARB obj) { const char *spam[] = { "Vertex shader was successfully compiled to run on hardware.\n", /* fglrx */ "Fragment shader was successfully compiled to run on hardware.\n", /* fglrx */ - "Fragment shader(s) linked, vertex shader(s) linked." /* fglrx, no \n */ + "Fragment shader(s) linked, vertex shader(s) linked.", /* fglrx, no \n */ + "Vertex shader(s) linked, no fragment shader(s) defined.", /* fglrx, no \n */ + "Fragment shader was successfully compiled to run on hardware.\nWARNING: 0:1: extension 'GL_ARB_draw_buffers' is not supported", + "Fragment shader(s) linked, no vertex shader(s) defined." /* fglrx, no \n */ }; GL_EXTCALL(glGetObjectParameterivARB(obj, @@ -73,7 +76,10 @@ void print_glsl_info_log(WineD3D_GL_Info *gl_info, GLhandleARB obj) { * that if there are errors. */ if (infologLength > 1) { - infoLog = HeapAlloc(GetProcessHeap(), 0, infologLength); + /* Fglrx doesn't terminate the string properly, but it tells us the proper length. + * So use HEAP_ZERO_MEMORY to avoid uninitialized bytes + */ + infoLog = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, infologLength); GL_EXTCALL(glGetInfoLogARB(obj, infologLength, NULL, infoLog)); is_spam = FALSE;

1 0

Rob Shearman : advapi32: Document that the cbData parameter of RegSetValueA /W is ignored.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 628183c2f9e3e82462e0625407877898636726df URL: http://source.winehq.org/git/wine.git/?a=commit;h=628183c2f9e3e82462e062540… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Feb 16 15:36:13 2008 +0000 advapi32: Document that the cbData parameter of RegSetValueA/W is ignored. --- dlls/advapi32/registry.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index dbc7723..40994fc 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1065,7 +1065,7 @@ LSTATUS WINAPI RegSetValueExA( HKEY hkey, LPCSTR name, DWORD reserved, DWORD typ * lpSubKey [I] Name of a subkey of hKey. * dwType [I] Type of information to store. * lpData [I] String that contains the data to set for the default value. - * cbData [I] Size of lpData. + * cbData [I] Ignored. * * RETURNS * Success: ERROR_SUCCESS

1 0

Rob Shearman : advapi32: Add tests for the off-by-one fixing behaviour of RegSetValueExA and RegSetValueExW .
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: cca635b472cdf3072ac81599a519208c21d4d27b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cca635b472cdf3072ac81599a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Feb 16 15:36:18 2008 +0000 advapi32: Add tests for the off-by-one fixing behaviour of RegSetValueExA and RegSetValueExW. --- dlls/advapi32/tests/registry.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index c3f4b2b..4122326 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -349,6 +349,12 @@ static void test_set_value(void) test_hkey_main_Value_A(name1A, emptyA, sizeof(emptyA)); test_hkey_main_Value_W(name1W, emptyW, sizeof(emptyW)); + /* test RegSetValueExA with off-by-one size */ + ret = RegSetValueExA(hkey_main, name1A, 0, REG_SZ, (const BYTE *)string1A, sizeof(string1A)-sizeof(string1A[0])); + ok(ret == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%d\n", ret, GetLastError()); + test_hkey_main_Value_A(name1A, string1A, sizeof(string1A)); + test_hkey_main_Value_W(name1W, string1W, sizeof(string1W)); + /* test RegSetValueExA with normal string */ ret = RegSetValueExA(hkey_main, name1A, 0, REG_SZ, (const BYTE *)string1A, sizeof(string1A)); ok(ret == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%d\n", ret, GetLastError()); @@ -393,6 +399,12 @@ static void test_set_value(void) ret = RegSetValueW(hkey_main, NULL, REG_MULTI_SZ, string2W, sizeof(string2W)); ok(ret == ERROR_INVALID_PARAMETER, "RegSetValueW should have returned ERROR_INVALID_PARAMETER instead of %d\n", ret); + /* test RegSetValueExW with off-by-one size */ + ret = RegSetValueExW(hkey_main, name1W, 0, REG_SZ, (const BYTE *)string1W, sizeof(string1W)-sizeof(string1W[0])); + ok(ret == ERROR_SUCCESS, "RegSetValueExW failed: %d, GLE=%d\n", ret, GetLastError()); + test_hkey_main_Value_A(name1A, string1A, sizeof(string1A)); + test_hkey_main_Value_W(name1W, string1W, sizeof(string1W)); + /* test RegSetValueExW with normal string */ ret = RegSetValueExW(hkey_main, name1W, 0, REG_SZ, (const BYTE *)string1W, sizeof(string1W)); ok(ret == ERROR_SUCCESS, "RegSetValueExW failed: %d, GLE=%d\n", ret, GetLastError());

1 0

Jacek Caban : mshtml: Don't mix nsresult with HRESULT.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 45b862d5ca562a52655e08f4620ad2f38d83d6fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=45b862d5ca562a52655e08f46… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 18 01:07:24 2008 +0100 mshtml: Don't mix nsresult with HRESULT. --- dlls/mshtml/editor.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 542bf55..057ac24 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -1163,6 +1163,7 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, nsISelection *nsselection; nsIDOMDocument *nsdoc; nsresult nsres; + HRESULT hres = E_FAIL; TRACE("%p, 0x%x, %p, %p\n", This, cmdexecopt, in, out); @@ -1242,9 +1243,9 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, nsIDOMElement_Release(anchor_elem); nsIDOMDocument_Release(nsdoc); + + hres = NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; } - else - nsres = E_FAIL; nsISelection_Release(nsselection); @@ -1252,7 +1253,7 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, SysFreeString(url); TRACE("-- 0x%08x\n", nsres); - return nsres; + return hres; } static HRESULT query_selall_status(HTMLDocument *This, OLECMD *cmd)

1 0

Rob Shearman : advapi32: Add tests for RegSetValueA/W.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 121be51f1df5ef940a05b79c317258097a6e59fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=121be51f1df5ef940a05b79c3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Feb 16 15:36:00 2008 +0000 advapi32: Add tests for RegSetValueA/W. Fix RegSetValueA/W to return ERROR_INVALID_PARAMETER if NULL data is passed in. --- dlls/advapi32/registry.c | 4 +- dlls/advapi32/tests/registry.c | 59 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 1931ece..dbc7723 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1078,7 +1078,7 @@ LSTATUS WINAPI RegSetValueW( HKEY hkey, LPCWSTR name, DWORD type, LPCWSTR data, TRACE("(%p,%s,%d,%s,%d)\n", hkey, debugstr_w(name), type, debugstr_w(data), count ); - if (type != REG_SZ) return ERROR_INVALID_PARAMETER; + if (type != REG_SZ || !data) return ERROR_INVALID_PARAMETER; if (name && name[0]) /* need to create the subkey */ { @@ -1104,7 +1104,7 @@ LSTATUS WINAPI RegSetValueA( HKEY hkey, LPCSTR name, DWORD type, LPCSTR data, DW TRACE("(%p,%s,%d,%s,%d)\n", hkey, debugstr_a(name), type, debugstr_a(data), count ); - if (type != REG_SZ) return ERROR_INVALID_PARAMETER; + if (type != REG_SZ || !data) return ERROR_INVALID_PARAMETER; if (name && name[0]) /* need to create the subkey */ { diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 562ebaa..c3f4b2b 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -295,12 +295,42 @@ static void test_set_value(void) static const WCHAR emptyW[] = {0}; static const WCHAR string1W[] = {'T','h','i','s','N','e','v','e','r','B','r','e','a','k','s', 0}; static const WCHAR string2W[] = {'T','h','i','s', 0 ,'B','r','e','a','k','s', 0 , 0 ,'A', 0 , 0 , 0 , 'L','o','t', 0 , 0 , 0 , 0, 0}; + static const WCHAR substring2W[] = {'T','h','i','s',0}; static const char name1A[] = "CleanSingleString"; static const char name2A[] = "SomeIntraZeroedString"; static const char emptyA[] = ""; static const char string1A[] = "ThisNeverBreaks"; static const char string2A[] = "This\0Breaks\0\0A\0\0\0Lot\0\0\0\0"; + static const char substring2A[] = "This"; + + ret = RegSetValueA(hkey_main, NULL, REG_SZ, NULL, 0); + ok(ret == ERROR_INVALID_PARAMETER, "RegSetValueA should have failed with ERROR_INVALID_PARAMETER instead of %d\n", ret); + + ret = RegSetValueA(hkey_main, NULL, REG_SZ, string1A, sizeof(string1A)); + ok(ret == ERROR_SUCCESS, "RegSetValueA failed: %d, GLE=%d\n", ret, GetLastError()); + test_hkey_main_Value_A(NULL, string1A, sizeof(string1A)); + test_hkey_main_Value_W(NULL, string1W, sizeof(string1W)); + + /* RegSetValueA ignores the size passed in */ + ret = RegSetValueA(hkey_main, NULL, REG_SZ, string1A, 4); + ok(ret == ERROR_SUCCESS, "RegSetValueA failed: %d, GLE=%d\n", ret, GetLastError()); + test_hkey_main_Value_A(NULL, string1A, sizeof(string1A)); + test_hkey_main_Value_W(NULL, string1W, sizeof(string1W)); + + /* stops at first null */ + ret = RegSetValueA(hkey_main, NULL, REG_SZ, string2A, sizeof(string2A)); + ok(ret == ERROR_SUCCESS, "RegSetValueA failed: %d, GLE=%d\n", ret, GetLastError()); + test_hkey_main_Value_A(NULL, substring2A, sizeof(substring2A)); + test_hkey_main_Value_W(NULL, substring2W, sizeof(substring2W)); + + /* only REG_SZ is supported */ + ret = RegSetValueA(hkey_main, NULL, REG_BINARY, string2A, sizeof(string2A)); + ok(ret == ERROR_INVALID_PARAMETER, "RegSetValueA should have returned ERROR_INVALID_PARAMETER instead of %d\n", ret); + ret = RegSetValueA(hkey_main, NULL, REG_EXPAND_SZ, string2A, sizeof(string2A)); + ok(ret == ERROR_INVALID_PARAMETER, "RegSetValueA should have returned ERROR_INVALID_PARAMETER instead of %d\n", ret); + ret = RegSetValueA(hkey_main, NULL, REG_MULTI_SZ, string2A, sizeof(string2A)); + ok(ret == ERROR_INVALID_PARAMETER, "RegSetValueA should have returned ERROR_INVALID_PARAMETER instead of %d\n", ret); /* Test RegSetValueExA with a 'zero-byte' string (as Office 2003 does). * Surprisingly enough we're supposed to get zero bytes out of it. @@ -334,6 +364,35 @@ static void test_set_value(void) /* 9x doesn't support W-calls, so don't test them then */ if(GLE == ERROR_CALL_NOT_IMPLEMENTED) return; + + ret = RegSetValueW(hkey_main, NULL, REG_SZ, NULL, 0); + ok(ret == ERROR_INVALID_PARAMETER, "RegSetValueW should have failed with ERROR_INVALID_PARAMETER instead of %d\n", ret); + + ret = RegSetValueW(hkey_main, NULL, REG_SZ, string1W, sizeof(string1W)); + ok(ret == ERROR_SUCCESS, "RegSetValueW failed: %d, GLE=%d\n", ret, GetLastError()); + test_hkey_main_Value_A(NULL, string1A, sizeof(string1A)); + test_hkey_main_Value_W(NULL, string1W, sizeof(string1W)); + + /* RegSetValueA ignores the size passed in */ + ret = RegSetValueW(hkey_main, NULL, REG_SZ, string1W, 4 * sizeof(string1W[0])); + ok(ret == ERROR_SUCCESS, "RegSetValueW failed: %d, GLE=%d\n", ret, GetLastError()); + test_hkey_main_Value_A(NULL, string1A, sizeof(string1A)); + test_hkey_main_Value_W(NULL, string1W, sizeof(string1W)); + + /* stops at first null */ + ret = RegSetValueW(hkey_main, NULL, REG_SZ, string2W, sizeof(string2W)); + ok(ret == ERROR_SUCCESS, "RegSetValueW failed: %d, GLE=%d\n", ret, GetLastError()); + test_hkey_main_Value_A(NULL, substring2A, sizeof(substring2A)); + test_hkey_main_Value_W(NULL, substring2W, sizeof(substring2W)); + + /* only REG_SZ is supported */ + ret = RegSetValueW(hkey_main, NULL, REG_BINARY, string2W, sizeof(string2W)); + ok(ret == ERROR_INVALID_PARAMETER, "RegSetValueW should have returned ERROR_INVALID_PARAMETER instead of %d\n", ret); + ret = RegSetValueW(hkey_main, NULL, REG_EXPAND_SZ, string2W, sizeof(string2W)); + ok(ret == ERROR_INVALID_PARAMETER, "RegSetValueW should have returned ERROR_INVALID_PARAMETER instead of %d\n", ret); + ret = RegSetValueW(hkey_main, NULL, REG_MULTI_SZ, string2W, sizeof(string2W)); + ok(ret == ERROR_INVALID_PARAMETER, "RegSetValueW should have returned ERROR_INVALID_PARAMETER instead of %d\n", ret); + /* test RegSetValueExW with normal string */ ret = RegSetValueExW(hkey_main, name1W, 0, REG_SZ, (const BYTE *)string1W, sizeof(string1W)); ok(ret == ERROR_SUCCESS, "RegSetValueExW failed: %d, GLE=%d\n", ret, GetLastError());

1 0