January 2007 - Wine-commits

Rob Shearman : wininet: HTTP_HttpQueryInfoW deals with bytes, not characters so update the callers that have this wrong assumption.
by Alexandre Julliard 15 Jan '07

15 Jan '07

Module: wine Branch: master Commit: 9efe083ec52ebe362ee54dfb35e8d7c8915c301e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9efe083ec52ebe362ee54dfb3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Jan 12 19:19:18 2007 -0600 wininet: HTTP_HttpQueryInfoW deals with bytes, not characters so update the callers that have this wrong assumption. --- dlls/wininet/http.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 9a2e739..c4c8fe4 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -665,7 +665,7 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hR (dwCode==302 || dwCode==301)) { WCHAR szNewLocation[2048]; - dwBufferSize=2048; + dwBufferSize=sizeof(szNewLocation); if(HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,NULL)) { static const WCHAR szGET[] = { 'G','E','T', 0 }; @@ -2373,7 +2373,7 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWINI { DWORD dwCode,dwCodeLength=sizeof(DWORD); WCHAR szNewLocation[2048]; - dwBufferSize=2048; + dwBufferSize=sizeof(szNewLocation); if (HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_STATUS_CODE,&dwCode,&dwCodeLength,NULL) && (dwCode==HTTP_STATUS_REDIRECT || dwCode==HTTP_STATUS_MOVED) && HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,NULL)) @@ -2988,7 +2988,7 @@ static VOID HTTP_CloseConnection(LPWININ BOOL HTTP_FinishedReading(LPWININETHTTPREQW lpwhr) { WCHAR szConnectionResponse[20]; - DWORD dwBufferSize = sizeof(szConnectionResponse)/sizeof(szConnectionResponse[0]); + DWORD dwBufferSize = sizeof(szConnectionResponse); TRACE("\n");

1 0

Rob Shearman : wininet: Change HTTP_EncodeBase64 to operate on a series of bytes, instead of text .
by Alexandre Julliard 15 Jan '07

15 Jan '07

Module: wine Branch: master Commit: a9ebc706e353c06391cc80b8c813e1dd661268de URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9ebc706e353c06391cc80b8c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Jan 12 19:17:20 2007 -0600 wininet: Change HTTP_EncodeBase64 to operate on a series of bytes, instead of text. Change HTTP_EncodeBasicAuth to convert the username and password into utf8 before base64 encoding. --- dlls/wininet/http.c | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c4c8fe4..dd56560 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -846,22 +846,22 @@ end: } /*********************************************************************** - * HTTP_DecodeBase64 + * HTTP_EncodeBase64 */ -static UINT HTTP_EncodeBase64( LPCWSTR bin, LPWSTR base64 ) +static UINT HTTP_EncodeBase64( LPCSTR bin, unsigned int len, LPWSTR base64 ) { UINT n = 0, x; static LPCSTR HTTP_Base64Enc = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - while( bin[0] ) + while( len > 0 ) { /* first 6 bits, all from bin[0] */ base64[n++] = HTTP_Base64Enc[(bin[0] & 0xfc) >> 2]; x = (bin[0] & 3) << 4; /* next 6 bits, 2 from bin[0] and 4 from bin[1] */ - if( !bin[1] ) + if( len == 1 ) { base64[n++] = HTTP_Base64Enc[x]; base64[n++] = '='; @@ -872,7 +872,7 @@ static UINT HTTP_EncodeBase64( LPCWSTR b x = ( bin[1] & 0x0f ) << 2; /* next 6 bits 4 from bin[1] and 2 from bin[2] */ - if( !bin[2] ) + if( len == 2 ) { base64[n++] = HTTP_Base64Enc[x]; base64[n++] = '='; @@ -883,6 +883,7 @@ static UINT HTTP_EncodeBase64( LPCWSTR b /* last 6 bits, all from bin [2] */ base64[n++] = HTTP_Base64Enc[ bin[2] & 0x3f ]; bin += 3; + len -= 3; } base64[n] = 0; return n; @@ -896,12 +897,13 @@ static UINT HTTP_EncodeBase64( LPCWSTR b static LPWSTR HTTP_EncodeBasicAuth( LPCWSTR username, LPCWSTR password) { UINT len; - LPWSTR in, out; + char *in; + LPWSTR out; static const WCHAR szBasic[] = {'B','a','s','i','c',' ',0}; - static const WCHAR szColon[] = {':',0}; - len = lstrlenW( username ) + 1 + lstrlenW ( password ) + 1; - in = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + len = WideCharToMultiByte(CP_UTF8, 0, username, lstrlenW(username), NULL, 0, NULL, NULL) + + 1 + WideCharToMultiByte(CP_UTF8, 0, password, lstrlenW(password), NULL, 0, NULL, NULL); + in = HeapAlloc( GetProcessHeap(), 0, (len+1)*sizeof(CHAR) ); if( !in ) return NULL; @@ -910,11 +912,11 @@ static LPWSTR HTTP_EncodeBasicAuth( LPCW out = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); if( out ) { - lstrcpyW( in, username ); - lstrcatW( in, szColon ); - lstrcatW( in, password ); + WideCharToMultiByte(CP_UTF8, 0, username, -1, NULL, 0, NULL, NULL); + strcat(in, ":"); + WideCharToMultiByte(CP_UTF8, 0, password, -1, NULL, 0, NULL, NULL); lstrcpyW( out, szBasic ); - HTTP_EncodeBase64( in, &out[strlenW(out)] ); + HTTP_EncodeBase64( in, len, &out[strlenW(out)] ); } HeapFree( GetProcessHeap(), 0, in );

1 0

Alexandre Julliard : server: Set the specified in/ out buffer sizes on named pipes using SO_SND/RCVBUF.
by Alexandre Julliard 15 Jan '07

15 Jan '07

Module: wine Branch: master Commit: 1db223954fa96abbc04e5ff6766eafa9603e669b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1db223954fa96abbc04e5ff67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 12 20:59:22 2007 +0100 server: Set the specified in/out buffer sizes on named pipes using SO_SND/RCVBUF. --- dlls/kernel32/tests/pipe.c | 22 ++++++++++++++++++++++ server/named_pipe.c | 11 +++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index c0d0abe..6da65a0 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -754,6 +754,8 @@ static void test_CreatePipe(void) HANDLE piperead, pipewrite; DWORD written; DWORD read; + DWORD i, size; + BYTE *buffer; char readbuf[32]; pipe_attr.nLength = sizeof(SECURITY_ATTRIBUTES); @@ -764,6 +766,8 @@ static void test_CreatePipe(void) ok(written == sizeof(PIPENAME), "Write to anonymous pipe wrote %d bytes\n", written); ok(ReadFile(piperead,readbuf,sizeof(readbuf),&read, NULL), "Read from non empty pipe failed\n"); ok(read == sizeof(PIPENAME), "Read from anonymous pipe got %d bytes\n", read); + ok(CloseHandle(pipewrite), "CloseHandle for the write pipe failed\n"); + ok(CloseHandle(piperead), "CloseHandle for the read pipe failed\n"); /* Now write another chunk*/ ok(CreatePipe(&piperead, &pipewrite, &pipe_attr, 0) != 0, "CreatePipe failed\n"); @@ -775,6 +779,24 @@ static void test_CreatePipe(void) ok(read == sizeof(PIPENAME), "Read from anonymous pipe got %d bytes\n", read); /* But now we need to get informed that the pipe is closed */ ok(ReadFile(piperead,readbuf,sizeof(readbuf),&read, NULL) == 0, "Broken pipe not detected\n"); + ok(CloseHandle(piperead), "CloseHandle for the read pipe failed\n"); + + /* Try bigger chunks */ + size = 32768; + buffer = HeapAlloc( GetProcessHeap(), 0, size ); + for (i = 0; i < size; i++) buffer[i] = i; + ok(CreatePipe(&piperead, &pipewrite, &pipe_attr, size) != 0, "CreatePipe failed\n"); + ok(WriteFile(pipewrite, buffer, size, &written, NULL), "Write to anonymous pipe failed\n"); + ok(written == size, "Write to anonymous pipe wrote %d bytes\n", written); + /* and close the write end, read should still succeed*/ + ok(CloseHandle(pipewrite), "CloseHandle for the Write Pipe failed\n"); + memset( buffer, 0, size ); + ok(ReadFile(piperead, buffer, size, &read, NULL), "Read from broken pipe withe with pending data failed\n"); + ok(read == size, "Read from anonymous pipe got %d bytes\n", read); + for (i = 0; i < size; i++) ok( buffer[i] == (BYTE)i, "invalid data %x at %x\n", buffer[i], i ); + /* But now we need to get informed that the pipe is closed */ + ok(ReadFile(piperead,readbuf,sizeof(readbuf),&read, NULL) == 0, "Broken pipe not detected\n"); + ok(CloseHandle(piperead), "CloseHandle for the read pipe failed\n"); } START_TEST(pipe) diff --git a/server/named_pipe.c b/server/named_pipe.c index 9077c58..173290f 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -776,6 +776,17 @@ DECL_HANDLER(open_named_pipe) if ((res != -1) && is_overlapped( server->options )) res = fcntl( fds[0], F_SETFL, O_NONBLOCK ); + if (pipe->insize) + { + setsockopt( fds[0], SOL_SOCKET, SO_RCVBUF, &pipe->insize, sizeof(pipe->insize) ); + setsockopt( fds[1], SOL_SOCKET, SO_RCVBUF, &pipe->insize, sizeof(pipe->insize) ); + } + if (pipe->outsize) + { + setsockopt( fds[0], SOL_SOCKET, SO_SNDBUF, &pipe->outsize, sizeof(pipe->outsize) ); + setsockopt( fds[1], SOL_SOCKET, SO_SNDBUF, &pipe->outsize, sizeof(pipe->outsize) ); + } + client->fd = create_anonymous_fd( &pipe_client_fd_ops, fds[1], &client->obj ); server->fd = create_anonymous_fd( &pipe_server_fd_ops,

1 0

Bill Medland : odbccp32: Implement SQLGet/SetConfigMode.
by Alexandre Julliard 15 Jan '07

15 Jan '07

Module: wine Branch: master Commit: c4a7c821f1c0eda8304c0287af52c18d42747046 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4a7c821f1c0eda8304c0287a… Author: Bill Medland <billmedland(a)shaw.ca> Date: Fri Jan 12 12:48:17 2007 -0800 odbccp32: Implement SQLGet/SetConfigMode. --- dlls/odbccp32/odbccp32.c | 28 +++++++++++++++++++++------- dlls/odbccp32/tests/misc.c | 28 ++++++++++++++++++++++++++++ include/odbcinst.h | 5 +++++ 3 files changed, 54 insertions(+), 7 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index eab71cc..44957a2 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -36,9 +36,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(odbc); -/* Registry key namess */ +/* Registry key names */ static const WCHAR drivers_key[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','O','D','B','C','I','N','S','T','.','I','N','I','\\','O','D','B','C',' ','D','r','i','v','e','r','s',0}; +/* This config mode is known to be process-wide. + * MSDN documentation suggests that the value is hidden somewhere in the registry but I haven't found it yet. + * Although both the registry and the ODBC.ini files appear to be maintained together they are not maintained automatically through the registry's IniFileMapping. + */ +static UWORD config_mode = ODBC_BOTH_DSN; + /* MSDN documentation suggests that the error subsystem handles errors 1 to 8 * only and experimentation (Windows 2000) shows that the errors are process- * wide so go for the simple solution; static arrays. @@ -50,6 +56,7 @@ static const WCHAR odbc_error_general_er static const WCHAR odbc_error_invalid_buff_len[] = {'I','n','v','a','l','i','d',' ','b','u','f','f','e','r',' ','l','e','n','g','t','h',0}; static const WCHAR odbc_error_component_not_found[] = {'C','o','m','p','o','n','e','n','t',' ','n','o','t',' ','f','o','u','n','d',0}; static const WCHAR odbc_error_out_of_mem[] = {'O','u','t',' ','o','f',' ','m','e','m','o','r','y',0}; +static const WCHAR odbc_error_invalid_param_sequence[] = {'I','n','v','a','l','i','d',' ','p','a','r','a','m','e','t','e','r',' ','s','e','q','u','e','n','c','e',0}; /* Push an error onto the error stack, taking care of ranges etc. */ static void push_error(int code, LPCWSTR msg) @@ -264,9 +271,9 @@ BOOL WINAPI SQLGetAvailableDrivers(LPCST BOOL WINAPI SQLGetConfigMode(UWORD *pwConfigMode) { clear_errors(); - FIXME("\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + if (pwConfigMode) + *pwConfigMode = config_mode; + return TRUE; } /* This is implemented sensibly rather than according to exact conformance to Microsoft's buggy implementations @@ -886,9 +893,16 @@ BOOL WINAPI SQLRemoveTranslator(LPCSTR l BOOL WINAPI SQLSetConfigMode(UWORD wConfigMode) { clear_errors(); - FIXME("\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + if (wConfigMode > ODBC_SYSTEM_DSN) + { + push_error(ODBC_ERROR_INVALID_PARAM_SEQUENCE, odbc_error_invalid_param_sequence); + return FALSE; + } + else + { + config_mode = wConfigMode; + return TRUE; + } } BOOL WINAPI SQLValidDSNW(LPCWSTR lpszDSN) diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index 0a949a6..20ba1cc 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -23,6 +23,33 @@ #include "winbase.h" #include "odbcinst.h" +static void test_SQLConfigMode(void) +{ + BOOL bool_ret; + DWORD error_code; + RETCODE sql_ret; + UWORD config_mode; + int i; + + ok(SQLGetConfigMode(NULL), "SQLGetConfigMode(NULL) should succeed\n"); + + bool_ret = SQLGetConfigMode(&config_mode); + ok(bool_ret && config_mode == ODBC_BOTH_DSN, "Failed to get the initial SQLGetConfigMode or it was not both\n"); + + bool_ret = SQLSetConfigMode(3); + sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); + ok(!bool_ret && sql_ret == SQL_SUCCESS_WITH_INFO && error_code == ODBC_ERROR_INVALID_PARAM_SEQUENCE, "SQLSetConfigMode with invalid argument did not fail correctly"); + + ok (ODBC_SYSTEM_DSN == 2 && ODBC_USER_DSN == 1 && ODBC_BOTH_DSN == 0, "SQLSetConfigMode modes not as expected\n"); + for (i = ODBC_SYSTEM_DSN; i >= ODBC_BOTH_DSN; --i) + { + ok(SQLSetConfigMode((UWORD)i), "SQLSetConfigMode Failed to set config mode\n"); + bool_ret = SQLGetConfigMode(&config_mode); + ok(bool_ret && config_mode == i, "Failed to confirm SQLSetConfigMode.\n"); + } + /* And that leaves it correctly on BOTH */ +} + static void test_SQLInstallerError(void) { RETCODE sql_ret; @@ -49,5 +76,6 @@ static void test_SQLInstallerError(void) START_TEST(misc) { + test_SQLConfigMode(); test_SQLInstallerError(); } diff --git a/include/odbcinst.h b/include/odbcinst.h index 430f83c..f377197 100644 --- a/include/odbcinst.h +++ b/include/odbcinst.h @@ -34,6 +34,11 @@ extern "C" { #define ODBC_CONFIG_DRIVER 3 #define ODBC_CONFIG_DRIVER_MAX 100 +/* Mode values for SQLSetConfigMode/SQLGetConfigMode */ +#define ODBC_BOTH_DSN 0 +#define ODBC_USER_DSN 1 +#define ODBC_SYSTEM_DSN 2 + /* error values */ #define ODBC_ERROR_GENERAL_ERR 1 #define ODBC_ERROR_INVALID_BUFF_LEN 2

1 0

Jacek Caban : urlmon: Added mk protocol implementation.
by Alexandre Julliard 15 Jan '07

15 Jan '07

Module: wine Branch: master Commit: 6ea7a445ce044f458449924ac9b85e59117c3dbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ea7a445ce044f458449924ac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jan 13 12:46:06 2007 +0100 urlmon: Added mk protocol implementation. --- dlls/urlmon/mk.c | 137 ++++++++++++++++++++++++++++++++++++++--- dlls/urlmon/tests/protocol.c | 30 +++++++++- 2 files changed, 156 insertions(+), 11 deletions(-) diff --git a/dlls/urlmon/mk.c b/dlls/urlmon/mk.c index a11e40f..3ee4329 100644 --- a/dlls/urlmon/mk.c +++ b/dlls/urlmon/mk.c @@ -28,12 +28,16 @@ #include "urlmon_main.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { const IInternetProtocolVtbl *lpInternetProtocolVtbl; + LONG ref; + + IStream *stream; } MkProtocol; #define PROTOCOL_THIS(iface) DEFINE_THIS(MkProtocol, InternetProtocol, iface) @@ -81,6 +85,9 @@ static ULONG WINAPI MkProtocol_Release(I TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + if(This->stream) + IStream_Release(This->stream); + HeapFree(GetProcessHeap(), 0, This); URLMON_UnlockModule(); @@ -89,14 +96,112 @@ static ULONG WINAPI MkProtocol_Release(I return ref; } +static HRESULT report_result(IInternetProtocolSink *sink, HRESULT hres, DWORD dwError) +{ + IInternetProtocolSink_ReportResult(sink, hres, dwError, NULL); + return hres; +} + static HRESULT WINAPI MkProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, IInternetProtocolSink *pOIProtSink, IInternetBindInfo *pOIBindInfo, DWORD grfPI, DWORD dwReserved) { MkProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink, + IParseDisplayName *pdn; + IMoniker *mon; + LPWSTR mime, progid, display_name; + LPCWSTR ptr, ptr2; + BINDINFO bindinfo; + STATSTG statstg; + DWORD bindf=0, eaten=0, len; + CLSID clsid; + HRESULT hres; + + static const WCHAR wszMK[] = {'m','k',':'}; + + TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); - return E_NOTIMPL; + + memset(&bindinfo, 0, sizeof(bindinfo)); + bindinfo.cbSize = sizeof(BINDINFO); + hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &bindf, &bindinfo); + if(FAILED(hres)) { + WARN("GetBindInfo failed: %08x\n", hres); + return hres; + } + + ReleaseBindInfo(&bindinfo); + + if(strncmpiW(szUrl, wszMK, sizeof(wszMK)/sizeof(WCHAR))) + return MK_E_SYNTAX; + + IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_DIRECTBIND, NULL); + IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_SENDINGREQUEST, NULL); + + hres = FindMimeFromData(NULL, szUrl, NULL, 0, NULL, 0, &mime, 0); + if(SUCCEEDED(hres)) { + IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_MIMETYPEAVAILABLE, mime); + CoTaskMemFree(mime); + } + + ptr2 = szUrl + sizeof(wszMK)/sizeof(WCHAR); + if(*ptr2 != '@') + return report_result(pOIProtSink, INET_E_RESOURCE_NOT_FOUND, ERROR_INVALID_PARAMETER); + ptr2++; + + ptr = strchrW(ptr2, ':'); + if(!ptr) + return report_result(pOIProtSink, INET_E_RESOURCE_NOT_FOUND, ERROR_INVALID_PARAMETER); + + progid = HeapAlloc(GetProcessHeap(), 0, (ptr-ptr2+1)*sizeof(WCHAR)); + memcpy(progid, ptr2, (ptr-ptr2)*sizeof(WCHAR)); + progid[ptr-ptr2] = 0; + hres = CLSIDFromProgID(progid, &clsid); + HeapFree(GetProcessHeap(), 0, progid); + if(FAILED(hres)) + return report_result(pOIProtSink, INET_E_RESOURCE_NOT_FOUND, ERROR_INVALID_PARAMETER); + + hres = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IParseDisplayName, (void**)&pdn); + if(FAILED(hres)) { + WARN("Could not create object %s\n", debugstr_guid(&clsid)); + return report_result(pOIProtSink, hres, ERROR_INVALID_PARAMETER); + } + + len = strlenW(--ptr2); + display_name = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR)); + memcpy(display_name, ptr2, (len+1)*sizeof(WCHAR)); + hres = IParseDisplayName_ParseDisplayName(pdn, NULL /* FIXME */, display_name, &eaten, &mon); + HeapFree(GetProcessHeap(), 0, display_name); + IParseDisplayName_Release(pdn); + if(FAILED(hres)) { + WARN("ParseDisplayName failed: %08x\n", hres); + return report_result(pOIProtSink, hres, ERROR_INVALID_PARAMETER); + } + + if(This->stream) { + IStream_Release(This->stream); + This->stream = NULL; + } + + hres = IMoniker_BindToStorage(mon, NULL /* FIXME */, NULL, &IID_IStream, (void**)&This->stream); + IMoniker_Release(mon); + if(FAILED(hres)) { + WARN("BindToStorage failed: %08x\n", hres); + return report_result(pOIProtSink, hres, ERROR_INVALID_PARAMETER); + } + + hres = IStream_Stat(This->stream, &statstg, STATFLAG_NONAME); + if(FAILED(hres)) { + WARN("Stat failed: %08x\n", hres); + return report_result(pOIProtSink, hres, ERROR_INVALID_PARAMETER); + } + + IInternetProtocolSink_ReportData(pOIProtSink, + BSCF_FIRSTDATANOTIFICATION | BSCF_LASTDATANOTIFICATION, + statstg.cbSize.u.LowPart, statstg.cbSize.u.LowPart); + + return report_result(pOIProtSink, S_OK, ERROR_SUCCESS); } static HRESULT WINAPI MkProtocol_Continue(IInternetProtocol *iface, PROTOCOLDATA *pProtocolData) @@ -117,8 +222,10 @@ static HRESULT WINAPI MkProtocol_Abort(I static HRESULT WINAPI MkProtocol_Terminate(IInternetProtocol *iface, DWORD dwOptions) { MkProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)->(%08x)\n", This, dwOptions); - return E_NOTIMPL; + + TRACE("(%p)->(%08x)\n", This, dwOptions); + + return S_OK; } static HRESULT WINAPI MkProtocol_Suspend(IInternetProtocol *iface) @@ -139,8 +246,13 @@ static HRESULT WINAPI MkProtocol_Read(II ULONG cb, ULONG *pcbRead) { MkProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); - return E_NOTIMPL; + + TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); + + if(!This->stream) + return E_FAIL; + + return IStream_Read(This->stream, pv, cb, pcbRead); } static HRESULT WINAPI MkProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER dlibMove, @@ -154,15 +266,19 @@ static HRESULT WINAPI MkProtocol_Seek(II static HRESULT WINAPI MkProtocol_LockRequest(IInternetProtocol *iface, DWORD dwOptions) { MkProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)->(%08x)\n", This, dwOptions); - return E_NOTIMPL; + + TRACE("(%p)->(%08x)\n", This, dwOptions); + + return S_OK; } static HRESULT WINAPI MkProtocol_UnlockRequest(IInternetProtocol *iface) { MkProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + return S_OK; } #undef PROTOCOL_THIS @@ -195,6 +311,7 @@ HRESULT MkProtocol_Construct(IUnknown *p ret->lpInternetProtocolVtbl = &MkProtocolVtbl; ret->ref = 1; + ret->stream = NULL; /* NOTE: * Native returns NULL ppobj and S_OK in CreateInstance if called with IID_IUnknown riid. diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 221df9c..4551a89 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -86,7 +86,8 @@ static DWORD bindf = 0; static enum { FILE_TEST, - HTTP_TEST + HTTP_TEST, + MK_TEST } tested_protocol; static HRESULT WINAPI HttpNegotiate_QueryInterface(IHttpNegotiate2 *iface, REFIID riid, void **ppv) @@ -926,6 +927,12 @@ static void test_mk_protocol(void) IUnknown *unk; HRESULT hres; + static const WCHAR wrong_url1[] = {'t','e','s','t',':','@','M','S','I','T','S','t','o','r','e', + ':',':','/','t','e','s','t','.','h','t','m','l',0}; + static const WCHAR wrong_url2[] = {'m','k',':','/','t','e','s','t','.','h','t','m','l',0}; + + tested_protocol = MK_TEST; + hres = CoGetClassObject(&CLSID_MkProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); @@ -946,6 +953,27 @@ static void test_mk_protocol(void) IClassFactory_Release(factory); ok(hres == S_OK, "Could not get IInternetProtocol: %08x\n", hres); + SET_EXPECT(GetBindInfo); + hres = IInternetProtocol_Start(protocol, wrong_url1, &protocol_sink, &bind_info, 0, 0); + ok(hres == MK_E_SYNTAX, "Start failed: %08x, expected MK_E_SYNTAX\n", hres); + CHECK_CALLED(GetBindInfo); + + SET_EXPECT(GetBindInfo); + SET_EXPECT(ReportProgress_DIRECTBIND); + SET_EXPECT(ReportProgress_SENDINGREQUEST); + SET_EXPECT(ReportProgress_MIMETYPEAVAILABLE); + SET_EXPECT(ReportResult); + expect_hrResult = INET_E_RESOURCE_NOT_FOUND; + + hres = IInternetProtocol_Start(protocol, wrong_url2, &protocol_sink, &bind_info, 0, 0); + ok(hres == INET_E_RESOURCE_NOT_FOUND, "Start failed: %08x, expected INET_E_RESOURCE_NOT_FOUND\n", hres); + + CHECK_CALLED(GetBindInfo); + CHECK_CALLED(ReportProgress_DIRECTBIND); + CHECK_CALLED(ReportProgress_SENDINGREQUEST); + CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); + CHECK_CALLED(ReportResult); + IInternetProtocol_Release(protocol); }

1 0

Jacek Caban : itss: Return S_FALSE in IStream:: Read if there is no more data to read.
by Alexandre Julliard 15 Jan '07

15 Jan '07

Module: wine Branch: master Commit: f925e0c0d1c5fe4be0511e1f9e7a8b9137d2cbf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f925e0c0d1c5fe4be0511e1f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jan 13 12:46:29 2007 +0100 itss: Return S_FALSE in IStream::Read if there is no more data to read. --- dlls/itss/storage.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/itss/storage.c b/dlls/itss/storage.c index d2e346c..9d1b343 100644 --- a/dlls/itss/storage.c +++ b/dlls/itss/storage.c @@ -660,7 +660,7 @@ static HRESULT WINAPI ITSS_IStream_Read( if( pcbRead ) *pcbRead = count; - return S_OK; + return count ? S_OK : S_FALSE; } static HRESULT WINAPI ITSS_IStream_Write(

1 0

Andrew Talbot : msi: Declare some functions static.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: 020bda7ee277086eb8a228f88e3ef54a08c33d05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=020bda7ee277086eb8a228f88… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Jan 12 16:47:57 2007 +0000 msi: Declare some functions static. --- dlls/msi/action.c | 4 ++-- dlls/msi/events.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a90a81a..83ba416 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1931,7 +1931,7 @@ static UINT ITERATE_CostFinalizeConditio return ERROR_SUCCESS; } -LPWSTR msi_get_disk_file_version( LPCWSTR filename ) +static LPWSTR msi_get_disk_file_version( LPCWSTR filename ) { static const WCHAR name_fmt[] = {'%','u','.','%','u','.','%','u','.','%','u',0}; @@ -3869,7 +3869,7 @@ static UINT ACTION_ForceReboot(MSIPACKAG return ERROR_INSTALL_SUSPEND; } -UINT msi_set_sourcedir_props(MSIPACKAGE *package) +static UINT msi_set_sourcedir_props(MSIPACKAGE *package) { LPWSTR p, source; DWORD len; diff --git a/dlls/msi/events.c b/dlls/msi/events.c index c946512..4ddab41 100644 --- a/dlls/msi/events.c +++ b/dlls/msi/events.c @@ -53,7 +53,7 @@ struct subscriber { LPWSTR attribute; }; -UINT ControlEvent_HandleControlEvent(MSIPACKAGE *, LPCWSTR, LPCWSTR, msi_dialog*); +static UINT ControlEvent_HandleControlEvent(MSIPACKAGE *, LPCWSTR, LPCWSTR, msi_dialog*); static VOID ControlEvent_CleanupDialogSubscriptions(MSIPACKAGE *package, LPWSTR dialog); /*

1 0

Andrew Talbot : msrle32: Declare some functions static.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: ba313be7b286fcc115bf821b1ec4ccbe207f35f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba313be7b286fcc115bf821b1… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Jan 12 17:25:44 2007 +0000 msrle32: Declare some functions static. --- dlls/msrle32/msrle32.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 96a0807..5decd74 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -38,12 +38,12 @@ static HINSTANCE MSRLE32_hModule = 0; #define SQR(a) ((a) * (a)) #define QUALITY_to_DIST(q) (ICQUALITY_HIGH - q) -inline WORD ColorCmp(WORD clr1, WORD clr2) +static inline WORD ColorCmp(WORD clr1, WORD clr2) { register UINT a = (clr1-clr2); return SQR(a); } -inline WORD Intensity(RGBQUAD clr) +static inline WORD Intensity(RGBQUAD clr) { return (30 * clr.rgbRed + 59 * clr.rgbGreen + 11 * clr.rgbBlue)/4; }

1 0

Andrew Talbot : msi: Remove unused variables.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: e5938d6fbb0baf8a9b9d37017a262d57e4270426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5938d6fbb0baf8a9b9d37017… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Jan 12 16:47:21 2007 +0000 msi: Remove unused variables. --- dlls/msi/registry.c | 22 ---------------------- dlls/msi/table.c | 1 - dlls/msi/tokenize.c | 9 --------- 3 files changed, 0 insertions(+), 32 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index bb50ae0..1aa1303 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -107,14 +107,6 @@ static const WCHAR szUserProduct_fmt[] = 'P','r','o','d','u','c','t','s','\\', '%','s',0}; -static const WCHAR szInstaller_Products[] = { -'S','o','f','t','w','a','r','e','\\', -'M','i','c','r','o','s','o','f','t','\\', -'W','i','n','d','o','w','s','\\', -'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', -'I','n','s','t','a','l','l','e','r','\\', -'P','r','o','d','u','c','t','s',0}; - static const WCHAR szInstaller_Products_fmt[] = { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', @@ -124,14 +116,6 @@ static const WCHAR szInstaller_Products_ 'P','r','o','d','u','c','t','s','\\', '%','s',0}; -static const WCHAR szInstaller_UpgradeCodes[] = { -'S','o','f','t','w','a','r','e','\\', -'M','i','c','r','o','s','o','f','t','\\', -'W','i','n','d','o','w','s','\\', -'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', -'I','n','s','t','a','l','l','e','r','\\', -'U','p','g','r','a','d','e','C','o','d','e','s',0}; - static const WCHAR szInstaller_UpgradeCodes_fmt[] = { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', @@ -141,12 +125,6 @@ static const WCHAR szInstaller_UpgradeCo 'U','p','g','r','a','d','e','C','o','d','e','s','\\', '%','s',0}; -static const WCHAR szInstaller_UserUpgradeCodes[] = { -'S','o','f','t','w','a','r','e','\\', -'M','i','c','r','o','s','o','f','t','\\', -'I','n','s','t','a','l','l','e','r','\\', -'U','p','g','r','a','d','e','C','o','d','e','s',0}; - static const WCHAR szInstaller_UserUpgradeCodes_fmt[] = { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 014c453..dd611d2 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -860,7 +860,6 @@ static const WCHAR szTables[] = { '_',' static const WCHAR szTable[] = { 'T','a','b','l','e',0 }; static const WCHAR szName[] = { 'N','a','m','e',0 }; static const WCHAR szColumns[] = { '_','C','o','l','u','m','n','s',0 }; -static const WCHAR szColumn[] = { 'C','o','l','u','m','n',0 }; static const WCHAR szNumber[] = { 'N','u','m','b','e','r',0 }; static const WCHAR szType[] = { 'T','y','p','e',0 }; diff --git a/dlls/msi/tokenize.c b/dlls/msi/tokenize.c index 5a5172b..14bcaf2 100644 --- a/dlls/msi/tokenize.c +++ b/dlls/msi/tokenize.c @@ -44,40 +44,31 @@ static const WCHAR BY_W[] = { 'B','Y',0 static const WCHAR CHAR_W[] = { 'C','H','A','R',0 }; static const WCHAR CHARACTER_W[] = { 'C','H','A','R','A','C','T','E','R',0 }; static const WCHAR CREATE_W[] = { 'C','R','E','A','T','E',0 }; -static const WCHAR CROSS_W[] = { 'C','R','O','S','S',0 }; static const WCHAR DELETE_W[] = { 'D','E','L','E','T','E',0 }; static const WCHAR DISTINCT_W[] = { 'D','I','S','T','I','N','C','T',0 }; static const WCHAR FREE_W[] = { 'F','R','E','E',0 }; static const WCHAR FROM_W[] = { 'F','R','O','M',0 }; -static const WCHAR FULL_W[] = { 'F','U','L','L',0 }; static const WCHAR HOLD_W[] = { 'H','O','L','D',0 }; -static const WCHAR INNER_W[] = { 'I','N','N','E','R',0 }; static const WCHAR INSERT_W[] = { 'I','N','S','E','R','T',0 }; static const WCHAR INT_W[] = { 'I','N','T',0 }; static const WCHAR INTEGER_W[] = { 'I','N','T','E','G','E','R',0 }; static const WCHAR INTO_W[] = { 'I','N','T','O',0 }; static const WCHAR IS_W[] = { 'I','S',0 }; -static const WCHAR JOIN_W[] = { 'J','O','I','N',0 }; static const WCHAR KEY_W[] = { 'K','E','Y',0 }; -static const WCHAR LEFT_W[] = { 'L','E','F','T',0 }; static const WCHAR LIKE_W[] = { 'L','I','K','E',0 }; static const WCHAR LOCALIZABLE_W[] = { 'L','O','C','A','L','I','Z','A','B','L','E',0 }; static const WCHAR LONG_W[] = { 'L','O','N','G',0 }; static const WCHAR LONGCHAR_W[] = { 'L','O','N','G','C','H','A','R',0 }; -static const WCHAR NATURAL_W[] = { 'N','A','T','U','R','A','L',0 }; static const WCHAR NOT_W[] = { 'N','O','T',0 }; static const WCHAR NULL_W[] = { 'N','U','L','L',0 }; static const WCHAR OBJECT_W[] = { 'O','B','J','E','C','T',0 }; static const WCHAR OR_W[] = { 'O','R',0 }; static const WCHAR ORDER_W[] = { 'O','R','D','E','R',0 }; -static const WCHAR OUTER_W[] = { 'O','U','T','E','R',0 }; static const WCHAR PRIMARY_W[] = { 'P','R','I','M','A','R','Y',0 }; -static const WCHAR RIGHT_W[] = { 'R','I','G','H','T',0 }; static const WCHAR SELECT_W[] = { 'S','E','L','E','C','T',0 }; static const WCHAR SET_W[] = { 'S','E','T',0 }; static const WCHAR SHORT_W[] = { 'S','H','O','R','T',0 }; static const WCHAR TABLE_W[] = { 'T','A','B','L','E',0 }; -static const WCHAR TEMP_W[] = { 'T','E','M','P',0 }; static const WCHAR TEMPORARY_W[] = { 'T','E','M','P','O','R','A','R','Y',0 }; static const WCHAR UPDATE_W[] = { 'U','P','D','A','T','E',0 }; static const WCHAR VALUES_W[] = { 'V','A','L','U','E','S',0 };

1 0

Paul Vriens : rpcrt4/tests: Cast-qual warning fixes.
by Alexandre Julliard 12 Jan '07

12 Jan '07

Module: wine Branch: master Commit: c21d65cfb224ddbba52da093d64804af53b08a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c21d65cfb224ddbba52da093d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jan 12 14:09:59 2007 +0100 rpcrt4/tests: Cast-qual warning fixes. --- dlls/rpcrt4/tests/rpc.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 36bf4ef..023741f 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -178,11 +178,13 @@ static void TestDceErrorInqText (void) static void test_rpc_ncacn_ip_tcp(void) { RPC_STATUS status; + static unsigned char foo[] = "foo"; + static unsigned char ncacn_ip_tcp[] = "ncacn_ip_tcp"; - status = RpcNetworkIsProtseqValid((unsigned char*)"foo"); + status = RpcNetworkIsProtseqValid(foo); ok(status == RPC_S_INVALID_RPC_PROTSEQ, "return wrong\n"); - status = RpcNetworkIsProtseqValid((unsigned char*)"ncacn_ip_tcp"); + status = RpcNetworkIsProtseqValid(ncacn_ip_tcp); ok(status == RPC_S_OK, "return wrong\n"); }

1 0