April 2011 - Wine-Commits - list.winehq.org

Jacek Caban : wininet: Rename WININET_NETCONNECTION to netconn_t.
by Alexandre Julliard April 28, 2011

April 28, 2011

Module: wine Branch: master Commit: 12bf3472dd56876fe3ad822e6b13b94dd48ba276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12bf3472dd56876fe3ad822e6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 28 18:29:04 2011 +0200 wininet: Rename WININET_NETCONNECTION to netconn_t. --- dlls/wininet/internet.h | 28 ++++++++++++++-------------- dlls/wininet/netconnection.c | 26 +++++++++++++------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index c760e83..1ef0dd6 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -56,7 +56,7 @@ typedef struct int socketFD; void *ssl_s; DWORD security_flags; -} WININET_NETCONNECTION; +} netconn_t; static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) { @@ -279,7 +279,7 @@ typedef struct LPWSTR path; LPWSTR verb; LPWSTR rawHeaders; - WININET_NETCONNECTION netConnection; + netconn_t netConnection; LPWSTR version; LPWSTR statusText; DWORD bytesToWrite; @@ -487,23 +487,23 @@ VOID INTERNET_SendCallback(object_header_t *hdr, DWORD_PTR dwContext, DWORD dwStatusInfoLength) DECLSPEC_HIDDEN; BOOL INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto, WCHAR *foundProxy, DWORD *foundProxyLen) DECLSPEC_HIDDEN; -BOOL NETCON_connected(WININET_NETCONNECTION *connection) DECLSPEC_HIDDEN; -DWORD NETCON_init(WININET_NETCONNECTION *connnection, BOOL useSSL) DECLSPEC_HIDDEN; +BOOL NETCON_connected(netconn_t *connection) DECLSPEC_HIDDEN; +DWORD NETCON_init(netconn_t *connnection, BOOL useSSL) DECLSPEC_HIDDEN; void NETCON_unload(void) DECLSPEC_HIDDEN; -DWORD NETCON_create(WININET_NETCONNECTION *connection, int domain, +DWORD NETCON_create(netconn_t *connection, int domain, int type, int protocol) DECLSPEC_HIDDEN; -DWORD NETCON_close(WININET_NETCONNECTION *connection) DECLSPEC_HIDDEN; -DWORD NETCON_connect(WININET_NETCONNECTION *connection, const struct sockaddr *serv_addr, +DWORD NETCON_close(netconn_t *connection) DECLSPEC_HIDDEN; +DWORD NETCON_connect(netconn_t *connection, const struct sockaddr *serv_addr, unsigned int addrlen) DECLSPEC_HIDDEN; -DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPWSTR hostname) DECLSPEC_HIDDEN; -DWORD NETCON_send(WININET_NETCONNECTION *connection, const void *msg, size_t len, int flags, +DWORD NETCON_secure_connect(netconn_t *connection, LPWSTR hostname) DECLSPEC_HIDDEN; +DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, int *sent /* out */) DECLSPEC_HIDDEN; -DWORD NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int flags, +DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, int flags, int *recvd /* out */) DECLSPEC_HIDDEN; -BOOL NETCON_query_data_available(WININET_NETCONNECTION *connection, DWORD *available) DECLSPEC_HIDDEN; -LPCVOID NETCON_GetCert(WININET_NETCONNECTION *connection) DECLSPEC_HIDDEN; -int NETCON_GetCipherStrength(WININET_NETCONNECTION *connection) DECLSPEC_HIDDEN; -DWORD NETCON_set_timeout(WININET_NETCONNECTION *connection, BOOL send, int value) DECLSPEC_HIDDEN; +BOOL NETCON_query_data_available(netconn_t *connection, DWORD *available) DECLSPEC_HIDDEN; +LPCVOID NETCON_GetCert(netconn_t *connection) DECLSPEC_HIDDEN; +int NETCON_GetCipherStrength(netconn_t*) DECLSPEC_HIDDEN; +DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, int value) DECLSPEC_HIDDEN; int sock_get_error(int) DECLSPEC_HIDDEN; extern void URLCacheContainers_CreateDefaults(void) DECLSPEC_HIDDEN; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index add3b49..e295b6c 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -318,7 +318,7 @@ static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) BOOL ret = FALSE; HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); - WININET_NETCONNECTION *conn; + netconn_t *conn; ssl = pX509_STORE_CTX_get_ex_data(ctx, pSSL_get_ex_data_X509_STORE_CTX_idx()); @@ -368,7 +368,7 @@ static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) #endif -DWORD NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) +DWORD NETCON_init(netconn_t *connection, BOOL useSSL) { connection->useSSL = useSSL; connection->socketFD = -1; @@ -545,7 +545,7 @@ void NETCON_unload(void) #endif } -BOOL NETCON_connected(WININET_NETCONNECTION *connection) +BOOL NETCON_connected(netconn_t *connection) { return connection->socketFD != -1; } @@ -621,7 +621,7 @@ int sock_get_error( int err ) * NETCON_create * Basically calls 'socket()' */ -DWORD NETCON_create(WININET_NETCONNECTION *connection, int domain, +DWORD NETCON_create(netconn_t *connection, int domain, int type, int protocol) { #ifdef SONAME_LIBSSL @@ -640,7 +640,7 @@ DWORD NETCON_create(WININET_NETCONNECTION *connection, int domain, * NETCON_close * Basically calls 'close()' unless we should use SSL */ -DWORD NETCON_close(WININET_NETCONNECTION *connection) +DWORD NETCON_close(netconn_t *connection) { int result; @@ -667,7 +667,7 @@ DWORD NETCON_close(WININET_NETCONNECTION *connection) * NETCON_secure_connect * Initiates a secure connection over an existing plaintext connection. */ -DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPWSTR hostname) +DWORD NETCON_secure_connect(netconn_t *connection, LPWSTR hostname) { void *ssl_s; DWORD res = ERROR_NOT_SUPPORTED; @@ -736,7 +736,7 @@ fail: * NETCON_connect * Connects to the specified address. */ -DWORD NETCON_connect(WININET_NETCONNECTION *connection, const struct sockaddr *serv_addr, +DWORD NETCON_connect(netconn_t *connection, const struct sockaddr *serv_addr, unsigned int addrlen) { int result; @@ -759,7 +759,7 @@ DWORD NETCON_connect(WININET_NETCONNECTION *connection, const struct sockaddr *s * Basically calls 'send()' unless we should use SSL * number of chars send is put in *sent */ -DWORD NETCON_send(WININET_NETCONNECTION *connection, const void *msg, size_t len, int flags, +DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, int *sent /* out */) { if (!NETCON_connected(connection)) return ERROR_INTERNET_CONNECTION_ABORTED; @@ -794,7 +794,7 @@ DWORD NETCON_send(WININET_NETCONNECTION *connection, const void *msg, size_t len * Basically calls 'recv()' unless we should use SSL * number of chars received is put in *recvd */ -DWORD NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int flags, +DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, int flags, int *recvd /* out */) { *recvd = 0; @@ -836,7 +836,7 @@ DWORD NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int * Returns the number of bytes of peeked data plus the number of bytes of * queued, but unread data. */ -BOOL NETCON_query_data_available(WININET_NETCONNECTION *connection, DWORD *available) +BOOL NETCON_query_data_available(netconn_t *connection, DWORD *available) { *available = 0; if (!NETCON_connected(connection)) @@ -863,7 +863,7 @@ BOOL NETCON_query_data_available(WININET_NETCONNECTION *connection, DWORD *avail return TRUE; } -LPCVOID NETCON_GetCert(WININET_NETCONNECTION *connection) +LPCVOID NETCON_GetCert(netconn_t *connection) { #ifdef SONAME_LIBSSL X509* cert; @@ -880,7 +880,7 @@ LPCVOID NETCON_GetCert(WININET_NETCONNECTION *connection) #endif } -int NETCON_GetCipherStrength(WININET_NETCONNECTION *connection) +int NETCON_GetCipherStrength(netconn_t *connection) { #ifdef SONAME_LIBSSL #if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x0090707f) @@ -902,7 +902,7 @@ int NETCON_GetCipherStrength(WININET_NETCONNECTION *connection) #endif } -DWORD NETCON_set_timeout(WININET_NETCONNECTION *connection, BOOL send, int value) +DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, int value) { int result; struct timeval tv;

1 0

Piotr Caban : msvcrt: Updated spec file.
by Alexandre Julliard April 28, 2011

April 28, 2011

Module: wine Branch: master Commit: b27a49c42551c503c4e4b105af331c4fdb3adf4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b27a49c42551c503c4e4b105a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 28 13:12:38 2011 +0200 msvcrt: Updated spec file. --- dlls/msvcrt/msvcrt.spec | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 8baa37e..a4a16ae 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -325,6 +325,7 @@ @ cdecl _chdir(str) MSVCRT__chdir @ cdecl _chdrive(long) @ cdecl _chgsign( double ) +# stub -arch=win64 _chgsignf @ cdecl -i386 -norelay _chkesp() @ cdecl _chmod(str long) MSVCRT__chmod @ cdecl _chsize(long long) MSVCRT__chsize @@ -339,6 +340,7 @@ @ cdecl _controlfp(long long) @ cdecl _controlfp_s(ptr long long) @ cdecl _copysign( double double ) +# stub -arch=win64 _copysignf @ varargs _cprintf(str) # stub _cprintf_l # stub _cprintf_p @@ -421,10 +423,12 @@ @ cdecl _findnext64i32(long ptr) MSVCRT__findnext64i32 @ cdecl _findnexti64(long ptr) MSVCRT__findnexti64 @ cdecl _finite( double ) +# stub -arch=win64 _finitef @ cdecl _flsbuf(long ptr) MSVCRT__flsbuf @ cdecl _flushall() @ extern _fmode MSVCRT__fmode @ cdecl _fpclass(double) +# stub -arch=win64 _fpclassf @ stub _fpieee_flt #(long ptr ptr) @ cdecl _fpreset() # stub _fprintf_l @@ -595,6 +599,7 @@ @ cdecl _ismbstrail(ptr ptr) # stub _ismbstrail_l @ cdecl _isnan( double ) +# stub -arch=win64 _isnanf # stub _isprint_l # stub _isspace_l # stub _isupper_l @@ -622,6 +627,7 @@ @ cdecl _lfind(ptr ptr ptr long ptr) # stub _lfind_s @ cdecl _loaddll(str) +# stub -arch=x86_64 _local_unwind @ cdecl -i386 _local_unwind2(ptr long) @ cdecl -i386 _local_unwind4(ptr ptr long) @ cdecl _localtime32(ptr) MSVCRT__localtime32 @@ -632,6 +638,7 @@ @ cdecl _lock_file(ptr) MSVCRT__lock_file @ cdecl _locking(long long long) MSVCRT__locking @ cdecl _logb( double ) +# stub _logbf @ cdecl -i386 _longjmpex(ptr long) MSVCRT_longjmp @ cdecl _lrotl(long long) MSVCRT__lrotl @ cdecl _lrotr(long long) MSVCRT__lrotr @@ -799,7 +806,9 @@ @ cdecl _mktime64(ptr) MSVCRT__mktime64 @ cdecl _msize(ptr) # stub _msize_debug +# stub -arch=win64 _msize_dbg @ cdecl _nextafter(double double) +# stub -arch=win64 _nextafterf @ cdecl _onexit(ptr) MSVCRT__onexit @ varargs _open(str long) MSVCRT__open @ cdecl _open_osfhandle(long long)

1 0

Alistair Leslie-Hughes : mscoree: Implemented GetRequestedRuntimeVersion.
by Alexandre Julliard April 28, 2011

April 28, 2011

Module: wine Branch: master Commit: 01c4adf477fbce5bbd9f85a3dc8a7d8b9f83026d URL: http://source.winehq.org/git/wine.git/?a=commit;h=01c4adf477fbce5bbd9f85a3d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 28 20:22:45 2011 +1000 mscoree: Implemented GetRequestedRuntimeVersion. --- dlls/mscoree/mscoree.spec | 2 +- dlls/mscoree/mscoree_main.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 452f6bd..b944c34 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -59,7 +59,7 @@ @ stub GetProcessExecutableHeap @ stdcall GetRealProcAddress(str ptr) @ stdcall GetRequestedRuntimeInfo(wstr wstr wstr long long ptr long ptr ptr long ptr) -@ stub GetRequestedRuntimeVersion +@ stdcall GetRequestedRuntimeVersion(wstr ptr long ptr) @ stub GetRequestedRuntimeVersionForCLSID @ stub GetStartupFlags @ stub GetTargetForVTableEntry diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 6701ef5..6fe32d2 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -249,6 +249,16 @@ HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR pExe, LPCWSTR pwszVersion, LPCWST return ret; } +HRESULT WINAPI GetRequestedRuntimeVersion(LPWSTR pExe, LPWSTR pVersion, DWORD cchBuffer, DWORD *dwlength) +{ + TRACE("(%s, %p, %d, %p)\n", debugstr_w(pExe), debugstr_w(pExe), cchBuffer, dwlength); + + if(!dwlength) + return E_POINTER; + + return GetRequestedRuntimeInfo(pExe, NULL, NULL, 0, 0, NULL, 0, NULL, pVersion, cchBuffer, dwlength); +} + HRESULT WINAPI GetRealProcAddress(LPCSTR procname, void **ppv) { FIXME("(%s, %p)\n", debugstr_a(procname), ppv);

1 0

Alistair Leslie-Hughes : mscoree: Add stub CreateDebuggingInterfaceFromVersion.
by Alexandre Julliard April 28, 2011

April 28, 2011

Module: wine Branch: master Commit: 7c0cfc964bbe52d92eb02871bfe41a90ae4930e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c0cfc964bbe52d92eb02871b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 28 20:03:49 2011 +1000 mscoree: Add stub CreateDebuggingInterfaceFromVersion. --- dlls/mscoree/mscoree.spec | 2 +- dlls/mscoree/mscoree_main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 99b3efb..452f6bd 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -29,7 +29,7 @@ @ stub CorMarkThreadInThreadPool @ stub CorTickleSvc @ stdcall CreateConfigStream(wstr ptr) -@ stub CreateDebuggingInterfaceFromVersion +@ stdcall CreateDebuggingInterfaceFromVersion(long wstr ptr) @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 49c802e..6701ef5 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -434,6 +434,12 @@ HRESULT WINAPI CreateConfigStream(LPCWSTR filename, IStream **stream) return E_NOTIMPL; } +HRESULT WINAPI CreateDebuggingInterfaceFromVersion(int nDebugVersion, LPCWSTR version, IUnknown **ppIUnk) +{ + FIXME("(%d %s, %p): stub\n", nDebugVersion, debugstr_w(version), ppIUnk); + return E_NOTIMPL; +} + HRESULT WINAPI CLRCreateInstance(REFCLSID clsid, REFIID riid, LPVOID *ppInterface) { TRACE("(%s,%s,%p)\n", debugstr_guid(clsid), debugstr_guid(riid), ppInterface);

1 0

David Hedberg : oleaut32: Fix CLSIDToString behaviour when passed an invalid CLSID-string.
by Alexandre Julliard April 28, 2011

April 28, 2011

Module: wine Branch: master Commit: ea14a6b2e7d6382a4810d616fe2e250091e8ff07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea14a6b2e7d6382a4810d616f… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Thu Apr 28 15:11:03 2011 +0200 oleaut32: Fix CLSIDToString behaviour when passed an invalid CLSID-string. In some cases, Excel 2007 apparently relies on CLSIDToString properly parsing an "invalid" CLSID string where extra bytes are appended. --- dlls/ole32/compobj.c | 82 ++++++++++++++++++++++++++----------------- dlls/ole32/tests/compobj.c | 57 ++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+), 33 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index a637439..0aa3aee 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1490,6 +1490,15 @@ HRESULT WINAPI CoCreateGuid(GUID *pguid) return HRESULT_FROM_WIN32( status ); } +static inline BOOL is_valid_hex(WCHAR c) +{ + if (!(((c >= '0') && (c <= '9')) || + ((c >= 'a') && (c <= 'f')) || + ((c >= 'A') && (c <= 'F')))) + return FALSE; + return TRUE; +} + /****************************************************************************** * CLSIDFromString [OLE32.@] * IIDFromString [OLE32.@] @@ -1513,24 +1522,10 @@ static HRESULT __CLSIDFromString(LPCWSTR s, LPCLSID id) int i; BYTE table[256]; - if (!s) { + if (!s || s[0]!='{') { memset( id, 0, sizeof (CLSID) ); - return S_OK; - } - - /* validate the CLSID string */ - if (strlenW(s) != 38) - return CO_E_CLASSSTRING; - - if ((s[0]!='{') || (s[9]!='-') || (s[14]!='-') || (s[19]!='-') || (s[24]!='-') || (s[37]!='}')) + if(!s) return S_OK; return CO_E_CLASSSTRING; - - for (i=1; i<37; i++) { - if ((i == 9)||(i == 14)||(i == 19)||(i == 24)) continue; - if (!(((s[i] >= '0') && (s[i] <= '9')) || - ((s[i] >= 'a') && (s[i] <= 'f')) || - ((s[i] >= 'A') && (s[i] <= 'F')))) - return CO_E_CLASSSTRING; } TRACE("%s -> %p\n", debugstr_w(s), id); @@ -1548,22 +1543,40 @@ static HRESULT __CLSIDFromString(LPCWSTR s, LPCLSID id) /* in form {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} */ - id->Data1 = (table[s[1]] << 28 | table[s[2]] << 24 | table[s[3]] << 20 | table[s[4]] << 16 | - table[s[5]] << 12 | table[s[6]] << 8 | table[s[7]] << 4 | table[s[8]]); - id->Data2 = table[s[10]] << 12 | table[s[11]] << 8 | table[s[12]] << 4 | table[s[13]]; - id->Data3 = table[s[15]] << 12 | table[s[16]] << 8 | table[s[17]] << 4 | table[s[18]]; - - /* these are just sequential bytes */ - id->Data4[0] = table[s[20]] << 4 | table[s[21]]; - id->Data4[1] = table[s[22]] << 4 | table[s[23]]; - id->Data4[2] = table[s[25]] << 4 | table[s[26]]; - id->Data4[3] = table[s[27]] << 4 | table[s[28]]; - id->Data4[4] = table[s[29]] << 4 | table[s[30]]; - id->Data4[5] = table[s[31]] << 4 | table[s[32]]; - id->Data4[6] = table[s[33]] << 4 | table[s[34]]; - id->Data4[7] = table[s[35]] << 4 | table[s[36]]; + id->Data1 = 0; + for (i = 1; i < 9; i++) { + if (!is_valid_hex(s[i])) return CO_E_CLASSSTRING; + id->Data1 = (id->Data1 << 4) | table[s[i]]; + } + if (s[9]!='-') return CO_E_CLASSSTRING; - return S_OK; + id->Data2 = 0; + for (i = 10; i < 14; i++) { + if (!is_valid_hex(s[i])) return CO_E_CLASSSTRING; + id->Data2 = (id->Data2 << 4) | table[s[i]]; + } + if (s[14]!='-') return CO_E_CLASSSTRING; + + id->Data3 = 0; + for (i = 15; i < 19; i++) { + if (!is_valid_hex(s[i])) return CO_E_CLASSSTRING; + id->Data3 = (id->Data3 << 4) | table[s[i]]; + } + if (s[19]!='-') return CO_E_CLASSSTRING; + + for (i = 20; i < 37; i+=2) { + if (i == 24) { + if (s[i]!='-') return CO_E_CLASSSTRING; + i++; + } + if (!is_valid_hex(s[i]) || !is_valid_hex(s[i+1])) return CO_E_CLASSSTRING; + id->Data4[(i-20)/2] = table[s[i]] << 4 | table[s[i+1]]; + } + + if (s[37] == '}' && s[38] == '\0') + return S_OK; + + return CO_E_CLASSSTRING; } /*****************************************************************************/ @@ -1577,7 +1590,10 @@ HRESULT WINAPI CLSIDFromString(LPCOLESTR idstr, LPCLSID id ) ret = __CLSIDFromString(idstr, id); if(ret != S_OK) { /* It appears a ProgID is also valid */ - ret = CLSIDFromProgID(idstr, id); + CLSID tmp_id; + ret = CLSIDFromProgID(idstr, &tmp_id); + if(SUCCEEDED(ret)) + *id = tmp_id; } return ret; } diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 3c35fab..53a838e 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -190,6 +190,9 @@ static void test_CLSIDFromProgID(void) static void test_CLSIDFromString(void) { CLSID clsid; + WCHAR wszCLSID_Broken[50]; + UINT i; + HRESULT hr = CLSIDFromString(wszCLSID_StdFont, &clsid); ok_ole_success(hr, "CLSIDFromString"); ok(IsEqualCLSID(&clsid, &CLSID_StdFont), "clsid wasn't equal to CLSID_StdFont\n"); @@ -197,6 +200,60 @@ static void test_CLSIDFromString(void) hr = CLSIDFromString(NULL, &clsid); ok_ole_success(hr, "CLSIDFromString"); ok(IsEqualCLSID(&clsid, &CLSID_NULL), "clsid wasn't equal to CLSID_NULL\n"); + + lstrcpyW(wszCLSID_Broken, wszCLSID_StdFont); + for(i = lstrlenW(wszCLSID_StdFont); i < 49; i++) + wszCLSID_Broken[i] = 'A'; + wszCLSID_Broken[i] = '\0'; + + memset(&clsid, 0, sizeof(CLSID)); + hr = CLSIDFromString(wszCLSID_Broken, &clsid); + ok(hr == CO_E_CLASSSTRING, "Got %08x\n", hr); + ok(IsEqualCLSID(&clsid, &CLSID_StdFont), "clsid wasn't equal to CLSID_StdFont\n"); + + wszCLSID_Broken[lstrlenW(wszCLSID_StdFont)-1] = 'A'; + memset(&clsid, 0, sizeof(CLSID)); + hr = CLSIDFromString(wszCLSID_Broken, &clsid); + ok(hr == CO_E_CLASSSTRING, "Got %08x\n", hr); + ok(IsEqualCLSID(&clsid, &CLSID_StdFont), "clsid wasn't equal to CLSID_StdFont\n"); + + wszCLSID_Broken[lstrlenW(wszCLSID_StdFont)] = '\0'; + memset(&clsid, 0, sizeof(CLSID)); + hr = CLSIDFromString(wszCLSID_Broken, &clsid); + ok(hr == CO_E_CLASSSTRING, "Got %08x\n", hr); + ok(IsEqualCLSID(&clsid, &CLSID_StdFont), "clsid wasn't equal to CLSID_StdFont\n"); + + wszCLSID_Broken[lstrlenW(wszCLSID_StdFont)-1] = '\0'; + memset(&clsid, 0, sizeof(CLSID)); + hr = CLSIDFromString(wszCLSID_Broken, &clsid); + ok(hr == CO_E_CLASSSTRING, "Got %08x\n", hr); + ok(IsEqualCLSID(&clsid, &CLSID_StdFont), "clsid wasn't equal to CLSID_StdFont\n"); + + memset(&clsid, 0xcc, sizeof(CLSID)); + hr = CLSIDFromString(wszCLSID_Broken+1, &clsid); + ok(hr == CO_E_CLASSSTRING, "Got %08x\n", hr); + ok(IsEqualCLSID(&clsid, &CLSID_NULL), "clsid wasn't equal to CLSID_NULL\n"); + + wszCLSID_Broken[9] = '*'; + memset(&clsid, 0xcc, sizeof(CLSID)); + hr = CLSIDFromString(wszCLSID_Broken, &clsid); + ok(hr == CO_E_CLASSSTRING, "Got %08x\n", hr); + ok(clsid.Data1 == CLSID_StdFont.Data1, "Got %08x\n", clsid.Data1); + ok(clsid.Data2 == 0xcccc, "Got %04x\n", clsid.Data2); + + wszCLSID_Broken[3] = '*'; + memset(&clsid, 0xcc, sizeof(CLSID)); + hr = CLSIDFromString(wszCLSID_Broken, &clsid); + ok(hr == CO_E_CLASSSTRING, "Got %08x\n", hr); + ok(clsid.Data1 == 0xb, "Got %08x\n", clsid.Data1); + ok(clsid.Data2 == 0xcccc, "Got %04x\n", clsid.Data2); + + wszCLSID_Broken[3] = '\0'; + memset(&clsid, 0xcc, sizeof(CLSID)); + hr = CLSIDFromString(wszCLSID_Broken, &clsid); + ok(hr == CO_E_CLASSSTRING, "Got %08x\n", hr); + ok(clsid.Data1 == 0xb, "Got %08x\n", clsid.Data1); + ok(clsid.Data2 == 0xcccc, "Got %04x\n", clsid.Data2); } static void test_StringFromGUID2(void)

1 0

Huw Davies : gdi32: Now that we have our own Bresenham routine, we don' t need the LPARAM cast.
by Alexandre Julliard April 28, 2011

April 28, 2011

Module: wine Branch: master Commit: d3e91603ceca9cbc7f73f4ce3ad050184161877d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3e91603ceca9cbc7f73f4ce3… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 28 09:57:05 2011 +0100 gdi32: Now that we have our own Bresenham routine, we don't need the LPARAM cast. --- dlls/gdi32/dibdrv/objects.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index a35ba88..50b2996 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -157,9 +157,8 @@ static inline DWORD get_octant_mask(int dx, int dy) return 1 << (get_octant_number(dx, dy) - 1); } -static void solid_pen_line_callback(INT x, INT y, LPARAM lparam) +static void solid_pen_line_callback(dibdrv_physdev *pdev, INT x, INT y) { - dibdrv_physdev *pdev = (dibdrv_physdev *)lparam; RECT rect; rect.left = x; @@ -397,7 +396,7 @@ static int clip_line(const POINT *start, const POINT *end, const RECT *clip, } static void bres_line_with_bias(INT x1, INT y1, INT x2, INT y2, const bres_params *params, INT err, - BOOL last_pt, void (* callback)(INT,INT,LPARAM), LPARAM lParam) + BOOL last_pt, void (* callback)(dibdrv_physdev*,INT,INT), dibdrv_physdev *pdev) { const int xadd = is_x_increasing(params->octant) ? 1 : -1; const int yadd = is_y_increasing(params->octant) ? 1 : -1; @@ -408,7 +407,7 @@ static void bres_line_with_bias(INT x1, INT y1, INT x2, INT y2, const bres_param erradd = 2*params->dy - 2*params->dx; while(x1 != x2) { - callback(x1, y1, lParam); + callback(pdev, x1, y1); if (err + params->bias > 0) { y1 += yadd; @@ -417,14 +416,14 @@ static void bres_line_with_bias(INT x1, INT y1, INT x2, INT y2, const bres_param else err += 2*params->dy; x1 += xadd; } - if(last_pt) callback(x1, y1, lParam); + if(last_pt) callback(pdev, x1, y1); } else /* line is "more vertical" */ { erradd = 2*params->dx - 2*params->dy; while(y1 != y2) { - callback(x1, y1, lParam); + callback(pdev, x1, y1); if (err + params->bias > 0) { x1 += xadd; @@ -433,7 +432,7 @@ static void bres_line_with_bias(INT x1, INT y1, INT x2, INT y2, const bres_param else err += 2*params->dx; y1 += yadd; } - if(last_pt) callback(x1, y1, lParam); + if(last_pt) callback(pdev, x1, y1); } } @@ -534,7 +533,7 @@ static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) if(clip_status == 1 && (end->x != clipped_end.x || end->y != clipped_end.y)) last_pt = TRUE; bres_line_with_bias(clipped_start.x, clipped_start.y, clipped_end.x, clipped_end.y, &params, - err, last_pt, solid_pen_line_callback, (LPARAM)pdev); + err, last_pt, solid_pen_line_callback, pdev); if(clip_status == 2) break; /* completely unclipped, so we can finish */ }

1 0

Marcus Meissner : inetcomm: Mark internal symbols as hidden.
by Alexandre Julliard April 28, 2011

April 28, 2011

Module: wine Branch: master Commit: 9a2f5a6df2b1f7ef822ded2257941e24fd9fb2c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a2f5a6df2b1f7ef822ded225… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Apr 28 13:30:36 2011 +0200 inetcomm: Mark internal symbols as hidden. --- dlls/inetcomm/inetcomm_private.h | 44 +++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/inetcomm/inetcomm_private.h b/dlls/inetcomm/inetcomm_private.h index 533c926..55aaf47 100644 --- a/dlls/inetcomm/inetcomm_private.h +++ b/dlls/inetcomm/inetcomm_private.h @@ -50,35 +50,35 @@ struct InternetTransport HWND hwnd; }; -HRESULT InternetTransport_Init(InternetTransport *This); -HRESULT InternetTransport_GetServerInfo(InternetTransport *This, LPINETSERVER pInetServer); +HRESULT InternetTransport_Init(InternetTransport *This) DECLSPEC_HIDDEN; +HRESULT InternetTransport_GetServerInfo(InternetTransport *This, LPINETSERVER pInetServer) DECLSPEC_HIDDEN; HRESULT InternetTransport_InetServerFromAccount(InternetTransport *This, - IImnAccount *pAccount, LPINETSERVER pInetServer); + IImnAccount *pAccount, LPINETSERVER pInetServer) DECLSPEC_HIDDEN; HRESULT InternetTransport_Connect(InternetTransport *This, - LPINETSERVER pInetServer, boolean fAuthenticate, boolean fCommandLogging); -HRESULT InternetTransport_HandsOffCallback(InternetTransport *This); -HRESULT InternetTransport_DropConnection(InternetTransport *This); + LPINETSERVER pInetServer, boolean fAuthenticate, boolean fCommandLogging) DECLSPEC_HIDDEN; +HRESULT InternetTransport_HandsOffCallback(InternetTransport *This) DECLSPEC_HIDDEN; +HRESULT InternetTransport_DropConnection(InternetTransport *This) DECLSPEC_HIDDEN; HRESULT InternetTransport_GetStatus(InternetTransport *This, - IXPSTATUS *pCurrentStatus); -HRESULT InternetTransport_ChangeStatus(InternetTransport *This, IXPSTATUS Status); + IXPSTATUS *pCurrentStatus) DECLSPEC_HIDDEN; +HRESULT InternetTransport_ChangeStatus(InternetTransport *This, IXPSTATUS Status) DECLSPEC_HIDDEN; HRESULT InternetTransport_ReadLine(InternetTransport *This, - INETXPORT_COMPLETION_FUNCTION fnCompletion); + INETXPORT_COMPLETION_FUNCTION fnCompletion) DECLSPEC_HIDDEN; HRESULT InternetTransport_Write(InternetTransport *This, const char *pvData, - int cbSize, INETXPORT_COMPLETION_FUNCTION fnCompletion); + int cbSize, INETXPORT_COMPLETION_FUNCTION fnCompletion) DECLSPEC_HIDDEN; HRESULT InternetTransport_DoCommand(InternetTransport *This, - LPCSTR pszCommand, INETXPORT_COMPLETION_FUNCTION fnCompletion); + LPCSTR pszCommand, INETXPORT_COMPLETION_FUNCTION fnCompletion) DECLSPEC_HIDDEN; -BOOL InternetTransport_RegisterClass(HINSTANCE hInstance); -void InternetTransport_UnregisterClass(HINSTANCE hInstance); +BOOL InternetTransport_RegisterClass(HINSTANCE hInstance) DECLSPEC_HIDDEN; +void InternetTransport_UnregisterClass(HINSTANCE hInstance) DECLSPEC_HIDDEN; -HRESULT MimeBody_create(IUnknown *outer, void **obj); -HRESULT MimeAllocator_create(IUnknown *outer, void **obj); -HRESULT MimeMessage_create(IUnknown *outer, void **obj); -HRESULT MimeSecurity_create(IUnknown *outer, void **obj); -HRESULT VirtualStream_create(IUnknown *outer, void **obj); +HRESULT MimeBody_create(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; +HRESULT MimeAllocator_create(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; +HRESULT MimeMessage_create(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; +HRESULT MimeSecurity_create(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; +HRESULT VirtualStream_create(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; -HRESULT MimeInternational_Construct(IMimeInternational **internat); +HRESULT MimeInternational_Construct(IMimeInternational **internat) DECLSPEC_HIDDEN; -HRESULT SMTPTransportCF_Create(REFIID riid, LPVOID *ppv); -HRESULT IMAPTransportCF_Create(REFIID riid, LPVOID *ppv); -HRESULT POP3TransportCF_Create(REFIID riid, LPVOID *ppv); +HRESULT SMTPTransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +HRESULT IMAPTransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +HRESULT POP3TransportCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN;

1 0

Marcus Meissner : dbghelp: Mark internal symbols as hidden.
by Alexandre Julliard April 28, 2011

April 28, 2011

Module: wine Branch: master Commit: b858b53991ff0e764b0c9d5d71ee3aea0c6958b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b858b53991ff0e764b0c9d5d7… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Apr 28 13:46:11 2011 +0200 dbghelp: Mark internal symbols as hidden. --- dlls/dbghelp/coff.c | 2 +- dlls/dbghelp/cpu_arm.c | 2 +- dlls/dbghelp/cpu_i386.c | 2 +- dlls/dbghelp/cpu_ppc.c | 2 +- dlls/dbghelp/cpu_sparc.c | 2 +- dlls/dbghelp/cpu_x86_64.c | 2 +- dlls/dbghelp/dbghelp_private.h | 218 ++++++++++++++++++++-------------------- dlls/dbghelp/image_private.h | 20 ++-- 8 files changed, 125 insertions(+), 125 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b858b53991ff0e764b0c9…

1 0

Marcus Meissner : shlwapi: Mark internal symbols as hidden.
by Alexandre Julliard April 28, 2011

April 28, 2011

Module: wine Branch: master Commit: f5ae978902ef8c19509bf97fe90624c9832cdc3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5ae978902ef8c19509bf97fe… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Apr 28 13:32:20 2011 +0200 shlwapi: Mark internal symbols as hidden. --- dlls/shlwapi/shlwapi_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/shlwapi_main.c b/dlls/shlwapi/shlwapi_main.c index e595d5f..b51d3d6 100644 --- a/dlls/shlwapi/shlwapi_main.c +++ b/dlls/shlwapi/shlwapi_main.c @@ -30,8 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); -HINSTANCE shlwapi_hInstance = 0; -DWORD SHLWAPI_ThreadRef_index = TLS_OUT_OF_INDEXES; +DECLSPEC_HIDDEN HINSTANCE shlwapi_hInstance = 0; +DECLSPEC_HIDDEN DWORD SHLWAPI_ThreadRef_index = TLS_OUT_OF_INDEXES; /************************************************************************* * SHLWAPI {SHLWAPI}

1 0

Marcus Meissner : d3dxof: Mark internal symbols as hidden.
by Alexandre Julliard April 28, 2011

April 28, 2011

Module: wine Branch: master Commit: 0bbba71c645737d38d97ea1a2e1ef06ff19d77b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bbba71c645737d38d97ea1a2… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Apr 28 13:28:49 2011 +0200 d3dxof: Mark internal symbols as hidden. --- dlls/d3dxof/d3dxof_private.h | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 1bd2a6d..fb5ae77 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -164,16 +164,16 @@ typedef struct { LONG ref; } IDirectXFileSaveObjectImpl; -HRESULT IDirectXFileImpl_Create(IUnknown *pUnkOuter, LPVOID *ppObj); -HRESULT IDirectXFileFileObjectImpl_Create(IDirectXFileObjectImpl** ppObj); -HRESULT IDirectXFileFileSaveObjectImpl_Create(IDirectXFileSaveObjectImpl** ppObj); +HRESULT IDirectXFileImpl_Create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; +HRESULT IDirectXFileFileObjectImpl_Create(IDirectXFileObjectImpl** ppObj) DECLSPEC_HIDDEN; +HRESULT IDirectXFileFileSaveObjectImpl_Create(IDirectXFileSaveObjectImpl** ppObj) DECLSPEC_HIDDEN; -BOOL read_bytes(parse_buffer * buf, LPVOID data, DWORD size); -BOOL parse_template(parse_buffer * buf); -void dump_template(xtemplate* templates_array, xtemplate* ptemplate); -BOOL is_template_available(parse_buffer * buf); -BOOL parse_object(parse_buffer * buf); +BOOL read_bytes(parse_buffer * buf, LPVOID data, DWORD size) DECLSPEC_HIDDEN; +BOOL parse_template(parse_buffer * buf) DECLSPEC_HIDDEN; +void dump_template(xtemplate* templates_array, xtemplate* ptemplate) DECLSPEC_HIDDEN; +BOOL is_template_available(parse_buffer * buf) DECLSPEC_HIDDEN; +BOOL parse_object(parse_buffer * buf) DECLSPEC_HIDDEN; -int mszip_decompress(int inlen, int outlen, char* inbuffer, char* outbuffer); +int mszip_decompress(int inlen, int outlen, char* inbuffer, char* outbuffer) DECLSPEC_HIDDEN; #endif /* __D3DXOF_PRIVATE_INCLUDED__ */

1 0