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

Piotr Caban : kernel32/tests: Added IdnToAscii tests.
by Alexandre Julliard April 30, 2012

April 30, 2012

Module: wine Branch: master Commit: 03b58f580c537f189ef0226801fbab2adac5caf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03b58f580c537f189ef022680… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 30 17:27:56 2012 +0200 kernel32/tests: Added IdnToAscii tests. --- dlls/kernel32/locale.c | 5 ++- dlls/kernel32/tests/locale.c | 68 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 73eebd4..fbc3ae2 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3938,7 +3938,8 @@ INT WINAPI IdnToAscii(DWORD dwFlags, LPCWSTR lpUnicodeCharStr, INT cchUnicodeCha INT delta = 0, b = 0, h; out_label = out; - for(i=label_start; i<norm_len && norm_str[i]!='.' && norm_str[i]!='\0'; i++) + for(i=label_start; i<norm_len && norm_str[i]!='.' && + norm_str[i]!=0x3002 && norm_str[i]!='\0'; i++) if(norm_str[i] < 0x80) b++; label_end = i; @@ -4027,7 +4028,7 @@ INT WINAPI IdnToAscii(DWORD dwFlags, LPCWSTR lpUnicodeCharStr, INT cchUnicodeCha if(!lpASCIICharStr) { out++; }else if(out+1 <= cchASCIIChar) { - lpASCIICharStr[out++] = norm_str[label_end]; + lpASCIICharStr[out++] = norm_str[label_end] ? '.' : 0; }else { HeapFree(GetProcessHeap(), 0, norm_str); SetLastError(ERROR_INSUFFICIENT_BUFFER); diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index bec24fa..033da36 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -77,6 +77,7 @@ static INT (WINAPI *pFoldStringA)(DWORD, LPCSTR, INT, LPSTR, INT); static INT (WINAPI *pFoldStringW)(DWORD, LPCWSTR, INT, LPWSTR, INT); static BOOL (WINAPI *pIsValidLanguageGroup)(LGRPID, DWORD); static INT (WINAPI *pIdnToNameprepUnicode)(DWORD, LPCWSTR, INT, LPWSTR, INT); +static INT (WINAPI *pIdnToAscii)(DWORD, LPCWSTR, INT, LPWSTR, INT); static void InitFunctionPointers(void) { @@ -91,6 +92,7 @@ static void InitFunctionPointers(void) pEnumUILanguagesA = (void*)GetProcAddress(hKernel32, "EnumUILanguagesA"); pEnumSystemLocalesEx = (void*)GetProcAddress(hKernel32, "EnumSystemLocalesEx"); pIdnToNameprepUnicode = (void*)GetProcAddress(hKernel32, "IdnToNameprepUnicode"); + pIdnToAscii = (void*)GetProcAddress(hKernel32, "IdnToAscii"); } #define eq(received, expected, label, type) \ @@ -2991,6 +2993,71 @@ static void test_IdnToNameprepUnicode(void) } } +static void test_IdnToAscii(void) +{ + struct { + DWORD in_len; + const WCHAR in[64]; + DWORD ret; + const WCHAR out[64]; + DWORD flags; + DWORD err; + } test_data[] = { + { + 5, {'T','e','s','t',0}, + 5, {'T','e','s','t',0}, + 0, 0xdeadbeef + }, + { + 5, {'T','e',0x017c,'s','t',0}, + 12, {'x','n','-','-','t','e','s','t','-','c','b','b',0}, + 0, 0xdeadbeef + }, + { + 12, {'t','e',0x0105,'s','t','.','t','e',0x017c,'s','t',0}, + 26, {'x','n','-','-','t','e','s','t','-','c','t','a','.','x','n','-','-','t','e','s','t','-','c','b','b',0}, + 0, 0xdeadbeef + }, + { + 3, {0x0105,'.',0}, + 9, {'x','n','-','-','2','d','a','.',0}, + 0, 0xdeadbeef + }, + { + 10, {'h','t','t','p',':','/','/','t',0x0106,0}, + 17, {'x','n','-','-','h','t','t','p',':','/','/','t','-','7','8','a',0}, + 0, 0xdeadbeef + }, + { + 10, {0x4e3a,0x8bf4,0x4e0d,0x4ed6,0x5011,0x10d,0x11b,0x305c,0x306a,0}, + 35, {'x','n','-','-','b','e','a','2','a','1','6','3','1','a','v','b','a', + 'v','4','4','t','y','h','a','3','2','b','9','1','e','g','s','2','t',0}, + 0, 0xdeadbeef + } + }; + + WCHAR buf[1024]; + DWORD i, ret, err; + + if (!pIdnToAscii) + { + win_skip("IdnToAscii is not available\n"); + return; + } + + for (i=0; i<sizeof(test_data)/sizeof(*test_data); i++) + { + SetLastError(0xdeadbeef); + ret = pIdnToAscii(test_data[i].flags, test_data[i].in, + test_data[i].in_len, buf, sizeof(buf)); + err = GetLastError(); + ok(ret == test_data[i].ret, "%d) ret = %d\n", i, ret); + ok(err == test_data[i].err, "%d) err = %d\n", i, err); + ok(!memcmp(test_data[i].out, buf, ret*sizeof(WCHAR)), + "%d) buf = %s\n", i, wine_dbgstr_wn(buf, ret)); + } +} + START_TEST(locale) { InitFunctionPointers(); @@ -3019,6 +3086,7 @@ START_TEST(locale) test_GetCPInfo(); test_GetStringTypeW(); test_IdnToNameprepUnicode(); + test_IdnToAscii(); /* this requires collation table patch to make it MS compatible */ if (0) test_sorting(); }

1 0

Piotr Caban : kernel32: Added IdnToAscii implementation.
by Alexandre Julliard April 30, 2012

April 30, 2012

Module: wine Branch: master Commit: 04ad71ee05a76507906b5e4f064bf9e0d2b0bb62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04ad71ee05a76507906b5e4f0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 30 17:27:46 2012 +0200 kernel32: Added IdnToAscii implementation. --- dlls/kernel32/locale.c | 154 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 151 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index e546000..73eebd4 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3881,16 +3881,164 @@ BOOL WINAPI IsNormalizedString(NORM_FORM NormForm, LPCWSTR lpString, INT cwLengt return FALSE; } +enum { + BASE = 36, + TMIN = 1, + TMAX = 26, + SKEW = 38, + DAMP = 700, + INIT_BIAS = 72, + INIT_N = 128 +}; + +static inline INT adapt(INT delta, INT numpoints, BOOL firsttime) +{ + INT k; + + delta /= (firsttime ? DAMP : 2); + delta += delta/numpoints; + + for(k=0; delta>((BASE-TMIN)*TMAX)/2; k+=BASE) + delta /= BASE-TMIN; + return k+((BASE-TMIN+1)*delta)/(delta+SKEW); +} + /****************************************************************************** * IdnToAscii (KERNEL32.@) + * Implementation of Punycode based on RFC 3492. */ INT WINAPI IdnToAscii(DWORD dwFlags, LPCWSTR lpUnicodeCharStr, INT cchUnicodeChar, LPWSTR lpASCIICharStr, INT cchASCIIChar) { - FIXME("%x %p %d %p %d\n", dwFlags, lpUnicodeCharStr, cchUnicodeChar, + static const WCHAR prefixW[] = {'x','n','-','-'}; + + WCHAR *norm_str; + INT i, label_start, label_end, norm_len, out_label, out = 0; + + TRACE("%x %p %d %p %d\n", dwFlags, lpUnicodeCharStr, cchUnicodeChar, lpASCIICharStr, cchASCIIChar); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + + norm_len = IdnToNameprepUnicode(dwFlags, lpUnicodeCharStr, cchUnicodeChar, NULL, 0); + if(!norm_len) + return 0; + norm_str = HeapAlloc(GetProcessHeap(), 0, norm_len*sizeof(WCHAR)); + if(!norm_str) { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + norm_len = IdnToNameprepUnicode(dwFlags, lpUnicodeCharStr, + cchUnicodeChar, norm_str, norm_len); + if(!norm_len) { + HeapFree(GetProcessHeap(), 0, norm_str); + return 0; + } + + for(label_start=0; label_start<norm_len;) { + INT n = INIT_N, bias = INIT_BIAS; + INT delta = 0, b = 0, h; + + out_label = out; + for(i=label_start; i<norm_len && norm_str[i]!='.' && norm_str[i]!='\0'; i++) + if(norm_str[i] < 0x80) + b++; + label_end = i; + + if(b == label_end-label_start) { + if(label_end < norm_len) + b++; + if(!lpASCIICharStr) { + out += b; + }else if(out+b <= cchASCIIChar) { + memcpy(lpASCIICharStr+out, norm_str+label_start, b*sizeof(WCHAR)); + out += b; + }else { + HeapFree(GetProcessHeap(), 0, norm_str); + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + label_start = label_end+1; + continue; + } + + if(!lpASCIICharStr) { + out += 5+b; /* strlen(xn--...-) */ + }else if(out+5+b <= cchASCIIChar) { + memcpy(lpASCIICharStr+out, prefixW, sizeof(prefixW)); + out += 4; + for(i=label_start; i<label_end; i++) + if(norm_str[i] < 0x80) + lpASCIICharStr[out++] = norm_str[i]; + lpASCIICharStr[out++] = '-'; + }else { + HeapFree(GetProcessHeap(), 0, norm_str); + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + if(!b) + out--; + + for(h=b; h<label_end-label_start;) { + INT m = 0xffff, q, k; + + for(i=label_start; i<label_end; i++) { + if(norm_str[i]>=n && m>norm_str[i]) + m = norm_str[i]; + } + delta += (m-n)*(h+1); + n = m; + + for(i=label_start; i<label_end; i++) { + if(norm_str[i] < n) { + delta++; + }else if(norm_str[i] == n) { + for(q=delta, k=BASE; ; k+=BASE) { + INT t = k<=bias ? TMIN : k>=bias+TMAX ? TMAX : k-bias; + INT disp = q<t ? q : t+(q-t)%(BASE-t); + if(!lpASCIICharStr) { + out++; + }else if(out+1 <= cchASCIIChar) { + lpASCIICharStr[out++] = disp<='z'-'a' ? + 'a'+disp : '0'+disp-'z'+'a'-1; + }else { + HeapFree(GetProcessHeap(), 0, norm_str); + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + if(q < t) + break; + q = (q-t)/(BASE-t); + } + bias = adapt(delta, h+1, h==b); + delta = 0; + h++; + } + } + delta++; + n++; + } + + if(out-out_label > 63) { + HeapFree(GetProcessHeap(), 0, norm_str); + SetLastError(ERROR_INVALID_NAME); + return 0; + } + + if(label_end < norm_len) { + if(!lpASCIICharStr) { + out++; + }else if(out+1 <= cchASCIIChar) { + lpASCIICharStr[out++] = norm_str[label_end]; + }else { + HeapFree(GetProcessHeap(), 0, norm_str); + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + } + label_start = label_end+1; + } + + HeapFree(GetProcessHeap(), 0, norm_str); + return out; } /******************************************************************************

1 0

André Hentschel : winebuild: Expect a Thumb mode toolchain on ARM.
by Alexandre Julliard April 30, 2012

April 30, 2012

Module: wine Branch: master Commit: 833b655ae62ef7c6e2bd9b5713e0063a0000988b URL: http://source.winehq.org/git/wine.git/?a=commit;h=833b655ae62ef7c6e2bd9b571… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 29 21:43:14 2012 +0200 winebuild: Expect a Thumb mode toolchain on ARM. --- tools/winebuild/spec32.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 1e5c694..7743acc 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -415,6 +415,9 @@ static void output_asm_constructor( const char *constructor ) output( "\tnop\n" ); break; case CPU_ARM: + output( "\tblx %s\n", asm_name(constructor) ); + output( "\t.arm\n" ); + break; case CPU_POWERPC: output( "\tbl %s\n", asm_name(constructor) ); break; @@ -458,6 +461,10 @@ void output_module( DLLSPEC *spec ) output( "\tjmp 1f\n" ); break; case CPU_ARM: + output( "\n\t.syntax unified\n" ); + output( "\n\t.thumb\n" ); + output( "\tb.w 1f\n" ); + break; case CPU_POWERPC: output( "\tb 1f\n" ); break;

1 0

Christian Costa : dmsynth: Add some clock tests.
by Alexandre Julliard April 30, 2012

April 30, 2012

Module: wine Branch: master Commit: 01e4ee0ac0515b9c9e2fb409bdcee355f54e0d86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01e4ee0ac0515b9c9e2fb409b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Apr 30 11:43:26 2012 +0200 dmsynth: Add some clock tests. --- dlls/dmsynth/tests/dmsynth.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index b341935..161018e 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -33,6 +33,8 @@ static void test_dmsynth(void) { IDirectMusicSynth *dmsynth = NULL; IDirectMusicSynthSink *dmsynth_sink = NULL; + IReferenceClock* clock = NULL; + IReferenceClock* clock_sink = NULL; HRESULT hr; hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth, (LPVOID*)&dmsynth); @@ -45,6 +47,25 @@ static void test_dmsynth(void) hr = CoCreateInstance(&CLSID_DirectMusicSynthSink, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynthSink, (LPVOID*)&dmsynth_sink); ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); + /* Synth has no default clock */ + hr = IDirectMusicSynth_GetLatencyClock(dmsynth, &clock); + todo_wine ok(hr == DMUS_E_NOSYNTHSINK, "IDirectMusicSynth_GetLatencyClock returned: %x\n", hr); + + /* SynthSink has a default clock */ + hr = IDirectMusicSynthSink_GetLatencyClock(dmsynth_sink, &clock_sink); + ok(hr == S_OK, "IDirectMusicSynth_GetLatencyClock returned: %x\n", hr); + todo_wine ok(clock_sink != NULL, "No clock returned\n"); + + /* This will set clock to Synth */ + hr = IDirectMusicSynth_SetSynthSink(dmsynth, dmsynth_sink); + ok(hr == S_OK, "IDirectMusicSynth_SetSynthSink returned: %x\n", hr); + + /* Check clocks are the same */ + hr = IDirectMusicSynth_GetLatencyClock(dmsynth, &clock); + ok(hr == S_OK, "IDirectMusicSynth_GetLatencyClock returned: %x\n", hr); + todo_wine ok(clock != NULL, "No clock returned\n"); + ok(clock == clock_sink, "Synth and SynthSink clocks are not the same\n"); + if (dmsynth_sink) IDirectMusicSynthSink_Release(dmsynth_sink); IDirectMusicSynth_Release(dmsynth);

1 0

Christian Costa : dmsynth: COM cleanup of IDirectMusicSynth8. Rename parameters.
by Alexandre Julliard April 30, 2012

April 30, 2012

Module: wine Branch: master Commit: ecc369a0024825213ec741c73b78dfc0c1d92c5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecc369a0024825213ec741c73… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Apr 30 11:43:17 2012 +0200 dmsynth: COM cleanup of IDirectMusicSynth8. Rename parameters. --- dlls/dmsynth/dmsynth_private.h | 2 +- dlls/dmsynth/synth.c | 284 +++++++++++++++++++++++++-------------- 2 files changed, 183 insertions(+), 103 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ecc369a0024825213ec74…

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard April 30, 2012

April 30, 2012

Module: wine Branch: master Commit: 95abff7bc591f05d6e20a8f669f2d23ac16484da URL: http://source.winehq.org/git/wine.git/?a=commit;h=95abff7bc591f05d6e20a8f66… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Apr 30 10:44:04 2012 +0200 po: Update French translation. --- po/fr.po | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/po/fr.po b/po/fr.po index 3e74166..565bde4 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3554,16 +3554,12 @@ msgid "URI to be decoded is incorrect" msgstr "L'URI à décoder est incorrecte" #: jscript.rc:57 -#, fuzzy -#| msgid "Enumeration value out of range.\n" msgid "Number of fraction digits is out of range" -msgstr "Valeur d'énumération hors plage.\n" +msgstr "Nombre de décimales hors plage" #: jscript.rc:58 -#, fuzzy -#| msgid "Subscript out of range" msgid "Precision is out of range" -msgstr "Indice hors limites" +msgstr "Précision hors limites" #: jscript.rc:59 msgid "Array length must be a finite positive integer"

1 0

Jacek Caban : wininet: Use hostname stored in server_t in NETCON_secure_connect.
by Alexandre Julliard April 30, 2012

April 30, 2012

Module: wine Branch: master Commit: 905ede6c6d3366aa10098f83d8d248b7ce4e0c8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=905ede6c6d3366aa10098f83d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 30 14:49:41 2012 +0200 wininet: Use hostname stored in server_t in NETCON_secure_connect. --- dlls/wininet/http.c | 2 +- dlls/wininet/internet.h | 2 +- dlls/wininet/netconnection.c | 20 ++------------------ 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 69068bf..54db118 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4616,7 +4616,7 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) if(session->appInfo->proxy) res = HTTP_SecureProxyConnect(request); if(res == ERROR_SUCCESS) - res = NETCON_secure_connect(request->netconn, session->hostName); + res = NETCON_secure_connect(request->netconn); if(res != ERROR_SUCCESS) { WARN("Couldn't connect securely to host\n"); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 720b330..6cf1f38 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -525,7 +525,7 @@ BOOL INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto, WCHAR *foundP DWORD create_netconn(BOOL, server_t *, DWORD, DWORD, netconn_t **) DECLSPEC_HIDDEN; void free_netconn(netconn_t*) DECLSPEC_HIDDEN; void NETCON_unload(void) DECLSPEC_HIDDEN; -DWORD NETCON_secure_connect(netconn_t *connection, LPWSTR hostname) DECLSPEC_HIDDEN; +DWORD NETCON_secure_connect(netconn_t *connection) DECLSPEC_HIDDEN; DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, int *sent /* out */) DECLSPEC_HIDDEN; DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, int flags, diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 870b317..4d3e13f 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -114,7 +114,6 @@ static const SSL_METHOD *meth; static SSL_METHOD *meth; #endif static SSL_CTX *ctx; -static int hostname_idx; static int error_idx; static int conn_idx; @@ -309,7 +308,6 @@ static DWORD netconn_verify_cert(PCCERT_CONTEXT cert, HCERTSTORE store, static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) { SSL *ssl; - WCHAR *server; BOOL ret = FALSE; HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); @@ -317,7 +315,6 @@ static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) ssl = pX509_STORE_CTX_get_ex_data(ctx, pSSL_get_ex_data_X509_STORE_CTX_idx()); - server = pSSL_get_ex_data(ssl, hostname_idx); conn = pSSL_get_ex_data(ssl, conn_idx); if (store) { @@ -342,7 +339,7 @@ static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) if (!endCert) ret = FALSE; if (ret) { - DWORD_PTR err = netconn_verify_cert(endCert, store, server, + DWORD_PTR err = netconn_verify_cert(endCert, store, conn->server->name, conn->security_flags); if (err) @@ -457,12 +454,6 @@ static DWORD init_openssl(void) return ERROR_OUTOFMEMORY; } - hostname_idx = pSSL_get_ex_new_index(0, (void *)"hostname index", NULL, NULL, NULL); - if(hostname_idx == -1) { - ERR("SSL_get_ex_new_index failed; %s\n", pERR_error_string(pERR_get_error(), 0)); - return ERROR_OUTOFMEMORY; - } - error_idx = pSSL_get_ex_new_index(0, (void *)"error index", NULL, NULL, NULL); if(error_idx == -1) { ERR("SSL_get_ex_new_index failed; %s\n", pERR_error_string(pERR_get_error(), 0)); @@ -692,7 +683,7 @@ int sock_get_error( int err ) * NETCON_secure_connect * Initiates a secure connection over an existing plaintext connection. */ -DWORD NETCON_secure_connect(netconn_t *connection, LPWSTR hostname) +DWORD NETCON_secure_connect(netconn_t *connection) { DWORD res = ERROR_NOT_SUPPORTED; #ifdef SONAME_LIBSSL @@ -721,13 +712,6 @@ DWORD NETCON_secure_connect(netconn_t *connection, LPWSTR hostname) goto fail; } - if (!pSSL_set_ex_data(ssl_s, hostname_idx, hostname)) - { - ERR("SSL_set_ex_data failed: %s\n", - pERR_error_string(pERR_get_error(), 0)); - res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; - goto fail; - } if (!pSSL_set_ex_data(ssl_s, conn_idx, connection)) { ERR("SSL_set_ex_data failed: %s\n",

1 0

Alexandre Julliard : kernel32: Fix buffer overflows in K32GetModuleFileNameExA/W.
by Alexandre Julliard April 30, 2012

April 30, 2012

Module: wine Branch: master Commit: d08f34cd8ecd883a0f0c6bd9b150d92407f0f7c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d08f34cd8ecd883a0f0c6bd9b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 30 14:19:57 2012 +0200 kernel32: Fix buffer overflows in K32GetModuleFileNameExA/W. --- dlls/kernel32/module.c | 31 ++++++++++++++++++++++++----- dlls/psapi/tests/psapi_main.c | 42 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 63 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 6b91a4c..57a24ba 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1247,17 +1247,26 @@ DWORD WINAPI K32GetModuleFileNameExW(HANDLE process, HMODULE module, LPWSTR file_name, DWORD size) { LDR_MODULE ldr_module; + DWORD len; + + if (!size) return 0; if(!get_ldr_module(process, module, &ldr_module)) return 0; - size = min(ldr_module.FullDllName.Length / sizeof(WCHAR), size); + len = ldr_module.FullDllName.Length / sizeof(WCHAR); + if (size <= len) + { + len = size; + size--; + } + if (!ReadProcessMemory(process, ldr_module.FullDllName.Buffer, file_name, size * sizeof(WCHAR), NULL)) return 0; file_name[size] = 0; - return size; + return len; } /*********************************************************************** @@ -1267,32 +1276,42 @@ DWORD WINAPI K32GetModuleFileNameExA(HANDLE process, HMODULE module, LPSTR file_name, DWORD size) { WCHAR *ptr; + DWORD len; TRACE("(hProcess=%p, hModule=%p, %p, %d)\n", process, module, file_name, size); - if (!file_name || !size) return 0; + if (!file_name || !size) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } if ( process == GetCurrentProcess() ) { - DWORD len = GetModuleFileNameA( module, file_name, size ); + len = GetModuleFileNameA( module, file_name, size ); if (size) file_name[size - 1] = '\0'; return len; } if (!(ptr = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)))) return 0; - if (!K32GetModuleFileNameExW(process, module, ptr, size)) + len = K32GetModuleFileNameExW(process, module, ptr, size); + if (!len) { file_name[0] = '\0'; } else { if (!WideCharToMultiByte( CP_ACP, 0, ptr, -1, file_name, size, NULL, NULL )) + { file_name[size - 1] = 0; + len = size; + } + else if (len < size) len = strlen( file_name ); } HeapFree(GetProcessHeap(), 0, ptr); - return strlen(file_name); + return len; } /*********************************************************************** diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 1944065..8db695e 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -49,6 +49,7 @@ static BOOL (WINAPI *pEnumProcesses)(DWORD*, DWORD, DWORD*); static BOOL (WINAPI *pEnumProcessModules)(HANDLE, HMODULE*, DWORD, LPDWORD); static DWORD (WINAPI *pGetModuleBaseNameA)(HANDLE, HMODULE, LPSTR, DWORD); static DWORD (WINAPI *pGetModuleFileNameExA)(HANDLE, HMODULE, LPSTR, DWORD); +static DWORD (WINAPI *pGetModuleFileNameExW)(HANDLE, HMODULE, LPWSTR, DWORD); static BOOL (WINAPI *pGetModuleInformation)(HANDLE, HMODULE, LPMODULEINFO, DWORD); static DWORD (WINAPI *pGetMappedFileNameA)(HANDLE, LPVOID, LPSTR, DWORD); static DWORD (WINAPI *pGetMappedFileNameW)(HANDLE, LPVOID, LPWSTR, DWORD); @@ -67,6 +68,7 @@ static BOOL InitFunctionPtrs(HMODULE hpsapi) PSAPI_GET_PROC(EnumProcesses); PSAPI_GET_PROC(GetModuleBaseNameA); PSAPI_GET_PROC(GetModuleFileNameExA); + PSAPI_GET_PROC(GetModuleFileNameExW); PSAPI_GET_PROC(GetModuleInformation); PSAPI_GET_PROC(GetMappedFileNameA); PSAPI_GET_PROC(GetMappedFileNameW); @@ -471,18 +473,22 @@ static void test_GetModuleFileNameEx(void) { HMODULE hMod = GetModuleHandle(NULL); char szModExPath[MAX_PATH+1], szModPath[MAX_PATH+1]; + WCHAR buffer[MAX_PATH]; DWORD ret; - + SetLastError(0xdeadbeef); - pGetModuleFileNameExA(NULL, hMod, szModExPath, sizeof(szModExPath)); + ret = pGetModuleFileNameExA(NULL, hMod, szModExPath, sizeof(szModExPath)); + ok( !ret, "GetModuleFileNameExA succeeded\n" ); ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - pGetModuleFileNameExA(hpQI, hMod, szModExPath, sizeof(szModExPath)); + ret = pGetModuleFileNameExA(hpQI, hMod, szModExPath, sizeof(szModExPath)); + ok( !ret, "GetModuleFileNameExA succeeded\n" ); ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - pGetModuleFileNameExA(hpQV, hBad, szModExPath, sizeof(szModExPath)); + ret = pGetModuleFileNameExA(hpQV, hBad, szModExPath, sizeof(szModExPath)); + ok( !ret, "GetModuleFileNameExA succeeded\n" ); ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); ret = pGetModuleFileNameExA(hpQV, NULL, szModExPath, sizeof(szModExPath)); @@ -492,6 +498,34 @@ static void test_GetModuleFileNameEx(void) GetModuleFileNameA(NULL, szModPath, sizeof(szModPath)); ok(!strncmp(szModExPath, szModPath, MAX_PATH), "szModExPath=\"%s\" szModPath=\"%s\"\n", szModExPath, szModPath); + + SetLastError(0xdeadbeef); + memset( szModExPath, 0xcc, sizeof(szModExPath) ); + ret = pGetModuleFileNameExA(hpQV, NULL, szModExPath, 4 ); + ok( ret == 4, "wrong length %u\n", ret ); + ok( broken(szModExPath[3]) /*w2kpro*/ || strlen(szModExPath) == 3, + "szModExPath=\"%s\" ret=%d\n", szModExPath, ret ); + ok(GetLastError() == 0xdeadbeef, "got error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetModuleFileNameExA(hpQV, NULL, szModExPath, 0 ); + ok( ret == 0, "wrong length %u\n", ret ); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + memset( buffer, 0xcc, sizeof(buffer) ); + ret = pGetModuleFileNameExW(hpQV, NULL, buffer, 4 ); + ok( ret == 4, "wrong length %u\n", ret ); + ok( broken(buffer[3]) /*w2kpro*/ || lstrlenW(buffer) == 3, + "buffer=%s ret=%d\n", wine_dbgstr_w(buffer), ret ); + ok(GetLastError() == 0xdeadbeef, "got error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + buffer[0] = 0xcc; + ret = pGetModuleFileNameExW(hpQV, NULL, buffer, 0 ); + ok( ret == 0, "wrong length %u\n", ret ); + ok(GetLastError() == 0xdeadbeef, "got error %d\n", GetLastError()); + ok( buffer[0] == 0xcc, "buffer modified %s\n", wine_dbgstr_w(buffer) ); } static void test_GetModuleBaseName(void)

1 0

Hans Leidekker : msi: Add support for uninstalling global assemblies.
by Alexandre Julliard April 30, 2012

April 30, 2012

Module: wine Branch: master Commit: 605e0b7b4176bf5e5cf5888073103016e56b8a2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=605e0b7b4176bf5e5cf588807… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 30 09:35:25 2012 +0200 msi: Add support for uninstalling global assemblies. --- dlls/msi/assembly.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msi/files.c | 16 ++++++++++------ dlls/msi/msipriv.h | 1 + 3 files changed, 50 insertions(+), 6 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index af23c4a..712bb23 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -425,6 +425,45 @@ UINT msi_install_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) return ERROR_SUCCESS; } +UINT msi_uninstall_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) +{ + HRESULT hr; + IAssemblyCache *cache; + MSIASSEMBLY *assembly = comp->assembly; + MSIFEATURE *feature = NULL; + + if (comp->assembly->feature) + feature = msi_get_loaded_feature( package, comp->assembly->feature ); + + if (assembly->application) + { + if (feature) feature->Action = INSTALLSTATE_ABSENT; + return ERROR_SUCCESS; + } + TRACE("removing %s\n", debugstr_w(assembly->display_name)); + + if (assembly->attributes == msidbAssemblyAttributesWin32) + { + cache = package->cache_sxs; + hr = IAssemblyCache_UninstallAssembly( cache, 0, assembly->display_name, NULL, NULL ); + if (FAILED( hr )) WARN("failed to uninstall assembly 0x%08x\n", hr); + } + else + { + unsigned int i; + for (i = 0; i < CLR_VERSION_MAX; i++) + { + if (!assembly->clr_version[i]) continue; + cache = package->cache_net[i]; + hr = IAssemblyCache_UninstallAssembly( cache, 0, assembly->display_name, NULL, NULL ); + if (FAILED( hr )) WARN("failed to uninstall assembly 0x%08x\n", hr); + } + } + if (feature) feature->Action = INSTALLSTATE_ABSENT; + assembly->installed = FALSE; + return ERROR_SUCCESS; +} + static WCHAR *build_local_assembly_path( const WCHAR *filename ) { UINT i; diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 6edf781..fe72c24 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -1308,22 +1308,26 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) msi_ui_actiondata( package, szRemoveFiles, uirow ); msiobj_release( &uirow->hdr ); } + + msi_init_assembly_caches( package ); LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) { - MSIFOLDER *folder; - comp->Action = msi_get_component_action( package, comp ); if (comp->Action != INSTALLSTATE_ABSENT) continue; - if (comp->assembly && !comp->assembly->application) continue; - if (comp->Attributes & msidbComponentAttributesPermanent) { TRACE("permanent component, not removing directory\n"); continue; } - folder = msi_get_loaded_folder( package, comp->Directory ); - remove_folder( folder ); + if (comp->assembly && !comp->assembly->application) + msi_uninstall_assembly( package, comp ); + else + { + MSIFOLDER *folder = msi_get_loaded_folder( package, comp->Directory ); + remove_folder( folder ); + } } + msi_destroy_assembly_caches( package ); return ERROR_SUCCESS; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index bdce06b..80f5414 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1027,6 +1027,7 @@ extern UINT msi_create_empty_local_file(LPWSTR path, LPCWSTR suffix) DECLSPEC_HI extern UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace) DECLSPEC_HIDDEN; extern MSIASSEMBLY *msi_load_assembly(MSIPACKAGE *, MSICOMPONENT *) DECLSPEC_HIDDEN; extern UINT msi_install_assembly(MSIPACKAGE *, MSICOMPONENT *) DECLSPEC_HIDDEN; +extern UINT msi_uninstall_assembly(MSIPACKAGE *, MSICOMPONENT *) DECLSPEC_HIDDEN; extern BOOL msi_init_assembly_caches(MSIPACKAGE *) DECLSPEC_HIDDEN; extern void msi_destroy_assembly_caches(MSIPACKAGE *) DECLSPEC_HIDDEN; extern WCHAR *msi_font_version_from_file(const WCHAR *) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : sxs: Add locking around operations on the assembly cache.
by Alexandre Julliard April 30, 2012

April 30, 2012

Module: wine Branch: master Commit: 9790edd2192bfdb2009a9e06fe6bede025b77b1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9790edd2192bfdb2009a9e06f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 30 09:35:10 2012 +0200 sxs: Add locking around operations on the assembly cache. --- dlls/sxs/cache.c | 32 +++++++++++++++++++++++++++++++- 1 files changed, 31 insertions(+), 1 deletions(-) diff --git a/dlls/sxs/cache.c b/dlls/sxs/cache.c index e0ec0d0..46686e5 100644 --- a/dlls/sxs/cache.c +++ b/dlls/sxs/cache.c @@ -36,6 +36,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(sxs); +static const WCHAR cache_mutex_nameW[] = + {'_','_','W','I','N','E','_','S','X','S','_','C','A','C','H','E','_','M','U','T','E','X','_','_',0}; + static const WCHAR win32W[] = {'w','i','n','3','2',0}; static const WCHAR win32_policyW[] = {'w','i','n','3','2','-','p','o','l','i','c','y',0}; static const WCHAR backslashW[] = {'\\',0}; @@ -44,6 +47,7 @@ struct cache { IAssemblyCache IAssemblyCache_iface; LONG refs; + HANDLE lock; }; static inline struct cache *impl_from_IAssemblyCache(IAssemblyCache *iface) @@ -87,6 +91,7 @@ static ULONG WINAPI cache_Release( IAssemblyCache *iface ) if (!refs) { TRACE("destroying %p\n", cache); + CloseHandle( cache->lock ); HeapFree( GetProcessHeap(), 0, cache ); } return refs; @@ -179,6 +184,16 @@ static WCHAR *build_policy_path( const WCHAR *arch, const WCHAR *name, const WCH return ret; } +static void cache_lock( struct cache *cache ) +{ + WaitForSingleObject( cache->lock, INFINITE ); +} + +static void cache_unlock( struct cache *cache ) +{ + ReleaseMutex( cache->lock ); +} + #define ASSEMBLYINFO_FLAG_INSTALLED 1 static HRESULT WINAPI cache_QueryAssemblyInfo( @@ -187,6 +202,7 @@ static HRESULT WINAPI cache_QueryAssemblyInfo( LPCWSTR assembly_name, ASSEMBLY_INFO *info ) { + struct cache *cache = impl_from_IAssemblyCache( iface ); IAssemblyName *name_obj; const WCHAR *arch, *name, *token, *type, *version; WCHAR *p, *path = NULL; @@ -217,6 +233,8 @@ static HRESULT WINAPI cache_QueryAssemblyInfo( IAssemblyName_Release( name_obj ); return S_OK; } + cache_lock( cache ); + if (!strcmpW( type, win32W )) path = build_manifest_path( arch, name, token, version ); else if (!strcmpW( type, win32_policyW )) path = build_policy_path( arch, name, token, version ); else @@ -250,6 +268,7 @@ static HRESULT WINAPI cache_QueryAssemblyInfo( done: HeapFree( GetProcessHeap(), 0, path ); IAssemblyName_Release( name_obj ); + cache_unlock( cache ); return hr; } @@ -657,12 +676,14 @@ static HRESULT WINAPI cache_InstallAssembly( LPCWSTR path, LPCFUSION_INSTALL_REFERENCE ref ) { + struct cache *cache = impl_from_IAssemblyCache( iface ); HRESULT hr, init; IXMLDOMDocument *doc = NULL; struct assembly *assembly = NULL; TRACE("%p, 0x%08x, %s, %p\n", iface, flags, debugstr_w(path), ref); + cache_lock( cache ); init = CoInitialize( NULL ); hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void **)&doc ); @@ -683,6 +704,7 @@ done: free_assembly( assembly ); if (doc) IXMLDOMDocument_Release( doc ); if (SUCCEEDED(init)) CoUninitialize(); + cache_unlock( cache ); return hr; } @@ -728,6 +750,7 @@ static HRESULT WINAPI cache_UninstallAssembly( LPCFUSION_INSTALL_REFERENCE ref, ULONG *disp ) { + struct cache *cache = impl_from_IAssemblyCache( iface ); HRESULT hr, init; IXMLDOMDocument *doc = NULL; struct assembly *assembly = NULL; @@ -742,6 +765,7 @@ static HRESULT WINAPI cache_UninstallAssembly( FIXME("application reference not supported\n"); return E_NOTIMPL; } + cache_lock( cache ); init = CoInitialize( NULL ); hr = CreateAssemblyNameObject( &name_obj, assembly_name, CANOF_PARSE_DISPLAY_NAME, NULL ); @@ -787,6 +811,7 @@ done: free_assembly( assembly ); if (doc) IXMLDOMDocument_Release( doc ); if (SUCCEEDED(init)) CoUninitialize(); + cache_unlock( cache ); return hr; } @@ -822,7 +847,12 @@ HRESULT WINAPI CreateAssemblyCache( IAssemblyCache **obj, DWORD reserved ) cache->IAssemblyCache_iface.lpVtbl = &cache_vtbl; cache->refs = 1; - + cache->lock = CreateMutexW( NULL, FALSE, cache_mutex_nameW ); + if (!cache->lock) + { + HeapFree( GetProcessHeap(), 0, cache ); + return HRESULT_FROM_WIN32( GetLastError() ); + } *obj = &cache->IAssemblyCache_iface; return S_OK; }

1 0