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

Piotr Caban : wininet: Get rid of rawHeaders field in request_t structure.
by Alexandre Julliard April 30, 2013

April 30, 2013

Module: wine Branch: master Commit: 422fb313d36952f181b54b1c5c9b29b2b5bcaba0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=422fb313d36952f181b54b1c5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 30 17:00:18 2013 +0200 wininet: Get rid of rawHeaders field in request_t structure. --- dlls/wininet/http.c | 71 ++++++---------------------------------------- dlls/wininet/internet.h | 1 - 2 files changed, 10 insertions(+), 62 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index aaf1c86..94b63c8 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -701,7 +701,7 @@ static WCHAR* build_response_header(http_request_t *request, BOOL use_cr) if(!req) return NULL; - if(request->rawHeaders) + if (request->status_code) { req[n++] = request->version; sprintfW(buf, status_fmt, request->status_code); @@ -1847,7 +1847,6 @@ static void HTTPREQ_Destroy(object_header_t *hdr) heap_free(request->path); heap_free(request->verb); - heap_free(request->rawHeaders); heap_free(request->version); heap_free(request->statusText); @@ -2179,7 +2178,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe if(req->proxy) flags |= INTERNET_REQFLAG_VIA_PROXY; - if(!req->rawHeaders) + if(!req->status_code) flags |= INTERNET_REQFLAG_NO_HEADERS; TRACE("INTERNET_OPTION_REQUEST_FLAGS returning %x\n", flags); @@ -5742,10 +5741,7 @@ static DWORD HTTP_GetResponseHeaders(http_request_t *request, INT *len) INT rc = 0; char bufferA[MAX_REPLY_LEN]; LPWSTR status_code = NULL, status_text = NULL; - DWORD res = ERROR_HTTP_INVALID_SERVER_RESPONSE, cchMaxRawHeaders = 1024; - LPWSTR lpszRawHeaders = NULL; - LPWSTR temp; - DWORD cchRawHeaders = 0; + DWORD res = ERROR_HTTP_INVALID_SERVER_RESPONSE; BOOL codeHundred = FALSE; TRACE("-->\n"); @@ -5802,9 +5798,6 @@ static DWORD HTTP_GetResponseHeaders(http_request_t *request, INT *len) request->version = heap_strdupW(g_szHttp1_0); request->statusText = heap_strdupW(szOK); - heap_free(request->rawHeaders); - request->rawHeaders = heap_strdupW(szDefaultHeader); - goto lend; } } while (codeHundred); @@ -5823,25 +5816,10 @@ static DWORD HTTP_GetResponseHeaders(http_request_t *request, INT *len) *(status_code-1) = ' '; *(status_text-1) = ' '; - /* regenerate raw headers */ - lpszRawHeaders = heap_alloc((cchMaxRawHeaders + 1) * sizeof(WCHAR)); - if (!lpszRawHeaders) goto lend; - - while (cchRawHeaders + buflen + strlenW(szCrLf) > cchMaxRawHeaders) - cchMaxRawHeaders *= 2; - temp = heap_realloc(lpszRawHeaders, (cchMaxRawHeaders+1)*sizeof(WCHAR)); - if (temp == NULL) goto lend; - lpszRawHeaders = temp; - memcpy(lpszRawHeaders+cchRawHeaders, buffer, (buflen-1)*sizeof(WCHAR)); - cchRawHeaders += (buflen-1); - memcpy(lpszRawHeaders+cchRawHeaders, szCrLf, sizeof(szCrLf)); - cchRawHeaders += sizeof(szCrLf)/sizeof(szCrLf[0])-1; - lpszRawHeaders[cchRawHeaders] = '\0'; - /* Parse each response line */ do { - buflen = MAX_REPLY_LEN; + buflen = MAX_REPLY_LEN; if (!read_line(request, bufferA, &buflen) && buflen) { LPWSTR * pFieldAndValue; @@ -5854,52 +5832,23 @@ static DWORD HTTP_GetResponseHeaders(http_request_t *request, INT *len) pFieldAndValue = HTTP_InterpretHttpHeader(buffer); if (pFieldAndValue) { - while (cchRawHeaders + buflen + strlenW(szCrLf) > cchMaxRawHeaders) - cchMaxRawHeaders *= 2; - temp = heap_realloc(lpszRawHeaders, (cchMaxRawHeaders+1)*sizeof(WCHAR)); - if (temp == NULL) goto lend; - lpszRawHeaders = temp; - memcpy(lpszRawHeaders+cchRawHeaders, buffer, (buflen-1)*sizeof(WCHAR)); - cchRawHeaders += (buflen-1); - memcpy(lpszRawHeaders+cchRawHeaders, szCrLf, sizeof(szCrLf)); - cchRawHeaders += sizeof(szCrLf)/sizeof(szCrLf[0])-1; - lpszRawHeaders[cchRawHeaders] = '\0'; - HTTP_ProcessHeader(request, pFieldAndValue[0], pFieldAndValue[1], HTTP_ADDREQ_FLAG_ADD ); - HTTP_FreeTokens(pFieldAndValue); } } - else - { - cbreaks++; - if (cbreaks >= 2) - break; - } + else + { + cbreaks++; + if (cbreaks >= 2) + break; + } }while(1); - /* make sure the response header is terminated with an empty line. Some apps really - truly care about that empty line being there for some reason. Just add it to the - header. */ - if (cchRawHeaders + strlenW(szCrLf) > cchMaxRawHeaders) - { - cchMaxRawHeaders = cchRawHeaders + strlenW(szCrLf); - temp = heap_realloc(lpszRawHeaders, (cchMaxRawHeaders + 1) * sizeof(WCHAR)); - if (temp == NULL) goto lend; - lpszRawHeaders = temp; - } - - memcpy(&lpszRawHeaders[cchRawHeaders], szCrLf, sizeof(szCrLf)); - - heap_free(request->rawHeaders); - request->rawHeaders = lpszRawHeaders; - TRACE("raw headers: %s\n", debugstr_w(lpszRawHeaders)); res = ERROR_SUCCESS; lend: - if (res) heap_free(lpszRawHeaders); *len = rc; TRACE("<--\n"); return res; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index b828f83..246eb95 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -343,7 +343,6 @@ typedef struct server_t *proxy; LPWSTR path; LPWSTR verb; - LPWSTR rawHeaders; netconn_t *netconn; DWORD security_flags; DWORD connect_timeout;

1 0

Alexandre Julliard : msxml3: Don' t unload external libraries on process shutdown.
by Alexandre Julliard April 30, 2013

April 30, 2013

Module: wine Branch: master Commit: 2710f05cef19a4bb07c63b9c03eb765cf81c6e06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2710f05cef19a4bb07c63b9c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 17:25:29 2013 +0200 msxml3: Don't unload external libraries on process shutdown. --- dlls/msxml3/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index da3969e..46742ef 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -209,7 +209,7 @@ static void init_libxslt(void) #endif } -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) { MSXML_hInstance = hInstDLL; @@ -235,12 +235,12 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) DisableThreadLibraryCalls(hInstDLL); break; case DLL_PROCESS_DETACH: + if (reserved) break; #ifdef SONAME_LIBXSLT if (libxslt_handle) { pxsltCleanupGlobals(); wine_dlclose(libxslt_handle, NULL, 0); - libxslt_handle = NULL; } #endif #ifdef HAVE_LIBXML2

1 0

Sam Edwards : gdi32: Prevent another possible buffer overflow in get_glyph_outline.
by Alexandre Julliard April 30, 2013

April 30, 2013

Module: wine Branch: master Commit: 53ec9b3291be1d7a5531aa2a04dbcf6b1fa83b9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=53ec9b3291be1d7a5531aa2a0… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Tue Apr 30 00:41:47 2013 -0600 gdi32: Prevent another possible buffer overflow in get_glyph_outline. --- dlls/gdi32/freetype.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index fec752a..5b3c138 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6362,9 +6362,10 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, y_shift = height - (src_height / vmul); dst += x_shift + y_shift * ( pitch / 4 ); - while ( src_height ) + height = min( height, src_height / vmul ); + while ( height-- ) { - for ( x = 0; x < src_width / hmul; x++ ) + for ( x = 0; x < width && x < src_width / hmul; x++ ) { if ( rgb ) {

1 0

Piotr Caban : wininet: Add current raw headers to cache.
by Alexandre Julliard April 30, 2013

April 30, 2013

Module: wine Branch: master Commit: 566b14479c2d5959a23dfb3d854bc569b336c9ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=566b14479c2d5959a23dfb3d8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 30 17:00:06 2013 +0200 wininet: Add current raw headers to cache. --- dlls/wininet/http.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 281fe66..aaf1c86 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2276,12 +2276,15 @@ static void commit_cache_entry(http_request_t *req) req->hCacheFile = NULL; if(HTTP_GetRequestURL(req, url)) { - DWORD headersLen; + WCHAR *header; + DWORD header_len; - headersLen = req->rawHeaders ? strlenW(req->rawHeaders) : 0; + header = build_response_header(req, TRUE); + header_len = (header ? strlenW(header) : 0); CommitUrlCacheEntryW(url, req->cacheFile, req->expires, req->last_modified, NORMAL_CACHE_ENTRY, - req->rawHeaders, headersLen, NULL, 0); + header, header_len, NULL, 0); + heap_free(header); } }

1 0

Alexandre Julliard : ctapi32: Don' t unload external libraries on process shutdown.
by Alexandre Julliard April 30, 2013

April 30, 2013

Module: wine Branch: master Commit: 6eca89efa7c0aa673a488833c3d20cfc260cfce4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eca89efa7c0aa673a488833c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 17:25:29 2013 +0200 ctapi32: Don't unload external libraries on process shutdown. --- dlls/ctapi32/ctapi32.c | 17 ++--------------- 1 files changed, 2 insertions(+), 15 deletions(-) diff --git a/dlls/ctapi32/ctapi32.c b/dlls/ctapi32/ctapi32.c index 7889e2a..089e0ab 100644 --- a/dlls/ctapi32/ctapi32.c +++ b/dlls/ctapi32/ctapi32.c @@ -92,16 +92,6 @@ LOAD_FUNCPTR(CT_close); return 0; } -static void unload_functions(void) -{ - pCT_close = NULL; - pCT_data = NULL; - pCT_init = NULL; - if (ctapi_handle) - wine_dlclose(ctapi_handle, NULL, 0); -} - - /* * ct-API specific functions */ @@ -137,18 +127,15 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { case DLL_PROCESS_ATTACH: - { DisableThreadLibraryCalls(hinstDLL); /* Try to load low-level library */ if (load_functions() != 0) return FALSE; /* error */ break; - } case DLL_PROCESS_DETACH: - { - unload_functions(); + if (lpvReserved) break; + if (ctapi_handle) wine_dlclose(ctapi_handle, NULL, 0); break; - } } return TRUE;

1 0

Piotr Caban : wininet: Add test of reading gzipped content from cache.
by Alexandre Julliard April 30, 2013

April 30, 2013

Module: wine Branch: master Commit: 8dfd89c2e00cfad8373b5f598111237ecf154030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dfd89c2e00cfad8373b5f598… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 30 17:00:36 2013 +0200 wininet: Add test of reading gzipped content from cache. --- dlls/wininet/tests/http.c | 140 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 140 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ceddde1..664fbbf 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1815,6 +1815,8 @@ struct server_info { int port; }; +static int test_cache_gzip; + static DWORD CALLBACK server_thread(LPVOID param) { struct server_info *si = param; @@ -2029,6 +2031,16 @@ static DWORD CALLBACK server_thread(LPVOID param) static const char no_cache_response[] = "HTTP/1.1 200 OK\r\nCache-Control: junk, \t No-StOrE\r\n\r\nsome content"; send(c, no_cache_response, sizeof(no_cache_response)-1, 0); } + if (strstr(buffer, "GET /test_cache_gzip")) + { + static const char gzip_response[] = "HTTP/1.1 200 OK\r\nContent-Encoding: gzip\r\nContent-Type: text/html\r\n\r\n" + "\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\x03\x4b\xaf\xca\x2c\x50\x28" + "\x49\x2d\x2e\xe1\x02\x00\x62\x92\xc7\x6c\x0a\x00\x00\x00"; + if(!test_cache_gzip++) + send(c, gzip_response, sizeof(gzip_response), 0); + else + send(c, notokmsg, sizeof(notokmsg)-1, 0); + } if (strstr(buffer, "GET /test_premature_disconnect")) trace("closing connection\n"); @@ -2765,6 +2777,133 @@ static void test_no_cache(int port) InternetCloseHandle(ses); } +static void test_cache_read_gzipped(int port) +{ + static const char cache_url_fmt[] = "http://localhost:%d%s"; + static const char get_gzip[] = "/test_cache_gzip"; + static const char content[] = "gzip test\n"; + static const char text_html[] = "text/html"; + static const char raw_header[] = "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n"; + + HINTERNET ses, con, req; + DWORD read, size; + char cache_url[256], buf[256]; + BOOL ret; + + trace("Testing reading compressed content from cache\n"); + + ses = InternetOpen("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL,"InternetOpen failed with error %u\n", GetLastError()); + + con = InternetConnect(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed with error %u\n", GetLastError()); + + req = HttpOpenRequest(con, NULL, get_gzip, NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = TRUE; + ret = InternetSetOption(req, INTERNET_OPTION_HTTP_DECODING, &ret, sizeof(ret)); + if(!ret && GetLastError()==ERROR_INTERNET_INVALID_OPTION) { + win_skip("INTERNET_OPTION_HTTP_DECODING not supported\n"); + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); + return; + } + ok(ret, "InternetSetOption(INTERNET_OPTION_HTTP_DECODING) failed: %d\n", GetLastError()); + + ret = HttpSendRequest(req, "Accept-Encoding: gzip", -1, NULL, 0); + ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + size = 0; + while(InternetReadFile(req, buf+size, sizeof(buf)-size, &read) && read) + size += read; + ok(size == 10, "read %d bytes of data\n", size); + buf[size] = 0; + ok(!strncmp(buf, content, size), "incorrect page content: %s\n", buf); + + size = sizeof(buf); + ret = HttpQueryInfoA(req, HTTP_QUERY_CONTENT_TYPE, buf, &size, 0); + ok(ret, "HttpQueryInfo(HTTP_QUERY_CONTENT_TYPE) failed: %d\n", GetLastError()); + buf[size] = 0; + ok(!strncmp(text_html, buf, size), "buf = %s\n", buf); + + size = sizeof(buf); + ret = HttpQueryInfoA(req, HTTP_QUERY_RAW_HEADERS_CRLF, buf, &size, 0); + ok(ret, "HttpQueryInfo(HTTP_QUERY_CONTENT_TYPE) failed: %d\n", GetLastError()); + buf[size] = 0; + ok(!strncmp(raw_header, buf, size), "buf = %s\n", buf); + InternetCloseHandle(req); + + req = HttpOpenRequest(con, NULL, get_gzip, NULL, NULL, NULL, INTERNET_FLAG_FROM_CACHE, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = TRUE; + ret = InternetSetOption(req, INTERNET_OPTION_HTTP_DECODING, &ret, sizeof(ret)); + ok(ret, "InternetSetOption(INTERNET_OPTION_HTTP_DECODING) failed: %d\n", GetLastError()); + + ret = HttpSendRequest(req, "Accept-Encoding: gzip", -1, NULL, 0); + ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + size = 0; + while(InternetReadFile(req, buf+size, sizeof(buf)-size, &read) && read) + size += read; + todo_wine ok(size == 10, "read %d bytes of data\n", size); + buf[size] = 0; + ok(!strncmp(buf, content, size), "incorrect page content: %s\n", buf); + + size = sizeof(buf); + ret = HttpQueryInfoA(req, HTTP_QUERY_CONTENT_ENCODING, buf, &size, 0); + ok(!ret && GetLastError()==ERROR_HTTP_HEADER_NOT_FOUND, + "HttpQueryInfo(HTTP_QUERY_CONTENT_ENCODING) returned %d, %d\n", + ret, GetLastError()); + + size = sizeof(buf); + ret = HttpQueryInfoA(req, HTTP_QUERY_CONTENT_TYPE, buf, &size, 0); + todo_wine ok(ret, "HttpQueryInfo(HTTP_QUERY_CONTENT_TYPE) failed: %d\n", GetLastError()); + buf[size] = 0; + todo_wine ok(!strncmp(text_html, buf, size), "buf = %s\n", buf); + InternetCloseHandle(req); + + /* Decompression doesn't work while reading from cache */ + test_cache_gzip = 0; + sprintf(cache_url, cache_url_fmt, port, get_gzip); + DeleteUrlCacheEntry(cache_url); + + req = HttpOpenRequest(con, NULL, get_gzip, NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequest(req, "Accept-Encoding: gzip", -1, NULL, 0); + ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + size = 0; + while(InternetReadFile(req, buf+size, sizeof(buf)-size, &read) && read) + size += read; + ok(size == 31, "read %d bytes of data\n", size); + InternetCloseHandle(req); + + req = HttpOpenRequest(con, NULL, get_gzip, NULL, NULL, NULL, INTERNET_FLAG_FROM_CACHE, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = TRUE; + ret = InternetSetOption(req, INTERNET_OPTION_HTTP_DECODING, &ret, sizeof(ret)); + ok(ret, "InternetSetOption(INTERNET_OPTION_HTTP_DECODING) failed: %d\n", GetLastError()); + + ret = HttpSendRequest(req, "Accept-Encoding: gzip", -1, NULL, 0); + ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + size = 0; + while(InternetReadFile(req, buf+size, sizeof(buf)-size, &read) && read) + size += read; + todo_wine ok(size == 31, "read %d bytes of data\n", size); + + size = sizeof(buf); + ret = HttpQueryInfoA(req, HTTP_QUERY_CONTENT_ENCODING, buf, &size, 0); + todo_wine ok(ret, "HttpQueryInfo(HTTP_QUERY_CONTENT_ENCODING) failed: %d\n", GetLastError()); + InternetCloseHandle(req); + + InternetCloseHandle(con); + InternetCloseHandle(ses); + + DeleteUrlCacheEntry(cache_url); +} + static void test_HttpSendRequestW(int port) { static const WCHAR header[] = {'U','A','-','C','P','U',':',' ','x','8','6',0}; @@ -3269,6 +3408,7 @@ static void test_http_connection(void) test_no_content(si.port); test_conn_close(si.port); test_no_cache(si.port); + test_cache_read_gzipped(si.port); test_premature_disconnect(si.port); /* send the basic request again to shutdown the server thread */

1 0

Piotr Caban : msvcrt: Added _mbstok_s_l implementation.
by Alexandre Julliard April 30, 2013

April 30, 2013

Module: wine Branch: master Commit: ff7388ca3fe27d5910c161e7074ca89dbdeff54a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff7388ca3fe27d5910c161e70… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 30 14:29:11 2013 +0200 msvcrt: Added _mbstok_s_l implementation. --- dlls/msvcr100/msvcr100.spec | 6 +- dlls/msvcr110/msvcr110.spec | 6 +- dlls/msvcr80/msvcr80.spec | 6 +- dlls/msvcr90/msvcr90.spec | 6 +- dlls/msvcrt/mbcs.c | 94 ++++++++++++++++++++++++++++--------------- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 6 +- 7 files changed, 77 insertions(+), 48 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 52835cb..e60e0fb 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1183,9 +1183,9 @@ @ cdecl _mbsstr(str str) msvcrt._mbsstr @ stub _mbsstr_l @ cdecl _mbstok(str str) msvcrt._mbstok -@ stub _mbstok_l -@ stub _mbstok_s -@ stub _mbstok_s_l +@ cdecl _mbstok_l(str str ptr) msvcrt._mbstok_l +@ cdecl _mbstok_s(str str ptr) msvcrt._mbstok_s +@ cdecl _mbstok_s_l(str str ptr ptr) msvcrt._mbstok_s_l @ cdecl _mbstowcs_l(ptr str long ptr) msvcrt._mbstowcs_l @ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) msvcrt._mbstowcs_s_l @ cdecl _mbstrlen(str) msvcrt._mbstrlen diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 171bf37..9f36dad 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1545,9 +1545,9 @@ @ cdecl _mbsstr(str str) msvcrt._mbsstr @ stub _mbsstr_l @ cdecl _mbstok(str str) msvcrt._mbstok -@ stub _mbstok_l -@ stub _mbstok_s -@ stub _mbstok_s_l +@ cdecl _mbstok_l(str str ptr) msvcrt._mbstok_l +@ cdecl _mbstok_s(str str ptr) msvcrt._mbstok_s +@ cdecl _mbstok_s_l(str str ptr ptr) msvcrt._mbstok_s_l @ cdecl _mbstowcs_l(ptr str long ptr) msvcrt._mbstowcs_l @ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) msvcrt._mbstowcs_s_l @ cdecl _mbstrlen(str) msvcrt._mbstrlen diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index f45095e..a8490e1 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -854,9 +854,9 @@ @ cdecl _mbsstr(str str) msvcrt._mbsstr @ stub _mbsstr_l @ cdecl _mbstok(str str) msvcrt._mbstok -@ stub _mbstok_l -@ stub _mbstok_s -@ stub _mbstok_s_l +@ cdecl _mbstok_l(str str ptr) msvcrt._mbstok_l +@ cdecl _mbstok_s(str str ptr) msvcrt._mbstok_s +@ cdecl _mbstok_s_l(str str ptr ptr) msvcrt._mbstok_s_l @ cdecl _mbstowcs_l(ptr str long ptr) msvcrt._mbstowcs_l @ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) msvcrt._mbstowcs_s_l @ cdecl _mbstrlen(str) msvcrt._mbstrlen diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 140797d..9783c2f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -832,9 +832,9 @@ @ cdecl _mbsstr(str str) msvcrt._mbsstr @ stub _mbsstr_l @ cdecl _mbstok(str str) msvcrt._mbstok -@ stub _mbstok_l -@ stub _mbstok_s -@ stub _mbstok_s_l +@ cdecl _mbstok_l(str str ptr) msvcrt._mbstok_l +@ cdecl _mbstok_s(str str ptr) msvcrt._mbstok_s +@ cdecl _mbstok_s_l(str str ptr ptr) msvcrt._mbstok_s_l @ cdecl _mbstowcs_l(ptr str long ptr) msvcrt._mbstowcs_l @ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) msvcrt._mbstowcs_s_l @ cdecl _mbstrlen(str) msvcrt._mbstrlen diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 3d50d6c..b70ffa0 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -145,11 +145,6 @@ static inline unsigned char *u_strrchr( const unsigned char *s, unsigned char x return (unsigned char*) strrchr( (const char*)s, x ); } -static inline unsigned char *u_strtok( unsigned char *s, const unsigned char *delim ) -{ - return (unsigned char*) strtok( (char*)s, (const char*)delim ); -} - static inline unsigned char *u__strset( unsigned char *s, unsigned char c ) { return (unsigned char*) _strset( (char*)s, c); @@ -1090,38 +1085,71 @@ unsigned char* CDECL _mbsrchr(const unsigned char* s, unsigned int x) } /********************************************************************* - * _mbstok(MSVCRT.@) - * - * Find and extract tokens from strings + * _mbstok_s_l(MSVCRT.@) */ -unsigned char* CDECL _mbstok(unsigned char *str, const unsigned char *delim) +unsigned char* CDECL _mbstok_s_l(unsigned char *str, const unsigned char *delim, + unsigned char **ctx, MSVCRT__locale_t locale) { - thread_data_t *data = msvcrt_get_thread_data(); - unsigned char *ret; + MSVCRT_pthreadmbcinfo mbcinfo; + unsigned int c; - if(get_mbcinfo()->ismbcodepage) - { - unsigned int c; + if(!MSVCRT_CHECK_PMT(delim != NULL)) return NULL; + if(!MSVCRT_CHECK_PMT(ctx != NULL)) return NULL; + if(!MSVCRT_CHECK_PMT(str || *ctx)) return NULL; + + if(locale) + mbcinfo = locale->mbcinfo; + else + mbcinfo = get_mbcinfo(); - if (!str) - if (!(str = data->mbstok_next)) return NULL; + if(!mbcinfo->ismbcodepage) + return (unsigned char*)MSVCRT_strtok_s((char*)str, (const char*)delim, (char**)ctx); - while ((c = _mbsnextc(str)) && _mbschr(delim, c)) { - str += c > 255 ? 2 : 1; - } - if (!*str) return NULL; - ret = str++; - while ((c = _mbsnextc(str)) && !_mbschr(delim, c)) { - str += c > 255 ? 2 : 1; - } - if (*str) { - *str++ = 0; - if (c > 255) *str++ = 0; - } - data->mbstok_next = str; - return ret; + if(!str) + str = *ctx; + + while((c=_mbsnextc(str)) && _mbschr(delim, c)) + str += c>255 ? 2 : 1; + if(!*str) + return NULL; + + *ctx = str + (c>255 ? 2 : 1); + while((c=_mbsnextc(*ctx)) && !_mbschr(delim, c)) + *ctx += c>255 ? 2 : 1; + if (**ctx) { + *(*ctx)++ = 0; + if(c > 255) + *(*ctx)++ = 0; } - return u_strtok(str, delim); /* ASCII CP */ + + return str; +} + + +/********************************************************************* + * _mbstok_s(MSVCRT.@) + */ +unsigned char* CDECL _mbstok_s(unsigned char *str, + const unsigned char *delim, unsigned char **ctx) +{ + return _mbstok_s_l(str, delim, ctx, NULL); +} + +/********************************************************************* + * _mbstok_l(MSVCRT.@) + */ +unsigned char* CDECL _mbstok_l(unsigned char *str, + const unsigned char *delim, MSVCRT__locale_t locale) +{ + return _mbstok_s_l(str, delim, &msvcrt_get_thread_data()->mbstok_next, locale); +} + +/********************************************************************* + * _mbstok(MSVCRT.@) + */ +unsigned char* CDECL _mbstok(unsigned char *str, const unsigned char *delim) +{ + return _mbstok_s_l(str, delim, &msvcrt_get_thread_data()->mbstok_next, NULL); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index b51ff81..35e9c7d 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -989,6 +989,7 @@ int __cdecl MSVCRT__tolower_l(int,MSVCRT__locale_t); int __cdecl MSVCRT__strnicoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); int __cdecl MSVCRT__strncoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); unsigned int __cdecl _get_output_format(void); +char* __cdecl MSVCRT_strtok_s(char*, const char*, char**); /* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd) * #define MSVCRT_INVALID_PMT(x) MSVCRT_call_invalid_parameter_handler(x, __FUNCTION__, __FILE__, __LINE__, 0) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 0af2423..43d3c45 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -808,9 +808,9 @@ @ cdecl _mbsstr(str str) # stub _mbsstr_l(str str ptr) @ cdecl _mbstok(str str) -# stub _mbstok_l(str str ptr) -# stub _mbstok_s(str str ptr) -# stub _mbstok_s_l(str str ptr ptr) +@ cdecl _mbstok_l(str str ptr) +@ cdecl _mbstok_s(str str ptr) +@ cdecl _mbstok_s_l(str str ptr ptr) @ cdecl _mbstowcs_l(ptr str long ptr) MSVCRT__mbstowcs_l @ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) MSVCRT__mbstowcs_s_l @ cdecl _mbstrlen(str)

1 0

Piotr Caban : msvcr100: Added _vscwprintf_p implementation.
by Alexandre Julliard April 30, 2013

April 30, 2013

Module: wine Branch: master Commit: a5f525276f6459fe5ab269a5632e7141a2c70607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5f525276f6459fe5ab269a56… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 30 14:28:34 2013 +0200 msvcr100: Added _vscwprintf_p implementation. --- dlls/msvcr100/msvcr100.c | 8 ++++++++ dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- include/msvcrt/stdio.h | 1 + include/msvcrt/wchar.h | 1 + 7 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.c b/dlls/msvcr100/msvcr100.c index d43cbbf..4449310 100644 --- a/dlls/msvcr100/msvcr100.c +++ b/dlls/msvcr100/msvcr100.c @@ -423,6 +423,14 @@ int CDECL _vswprintf_p(wchar_t *buffer, size_t length, const wchar_t *format, __ } /********************************************************************* + * _vscwprintf_p (MSVCR100.@) + */ +int CDECL _vscwprintf_p(const wchar_t *format, __ms_va_list args) +{ + return _vscwprintf_p_l(format, NULL, args); +} + +/********************************************************************* * _byteswap_ushort (MSVCR100.@) */ unsigned short CDECL _byteswap_ushort(unsigned short s) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 197a414..52835cb 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1442,7 +1442,7 @@ @ stub _vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) msvcrt._vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) msvcrt._vscwprintf_l -@ stub _vscwprintf_p +@ cdecl _vscwprintf_p(wstr ptr) @ cdecl _vscwprintf_p_l(wstr ptr ptr) msvcrt._vscwprintf_p_l @ cdecl _vsnprintf(ptr long str ptr) msvcrt._vsnprintf @ cdecl _vsnprintf_c(ptr long str ptr) msvcrt._vsnprintf_c diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index d00f1a9..171bf37 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1804,7 +1804,7 @@ @ stub _vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) msvcrt._vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) msvcrt._vscwprintf_l -@ stub _vscwprintf_p +@ cdecl _vscwprintf_p(wstr ptr) msvcr100._vscwprintf_p @ cdecl _vscwprintf_p_l(wstr ptr ptr) msvcrt._vscwprintf_p_l @ cdecl _vsnprintf(ptr long str ptr) msvcrt._vsnprintf @ cdecl _vsnprintf_c(ptr long str ptr) msvcrt._vsnprintf_c diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 860383a..f45095e 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1120,7 +1120,7 @@ @ stub _vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) msvcrt._vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) msvcrt._vscwprintf_l -@ stub _vscwprintf_p +@ cdecl _vscwprintf_p(wstr ptr) msvcr100._vscwprintf_p @ cdecl _vscwprintf_p_l(wstr ptr ptr) msvcrt._vscwprintf_p_l @ cdecl _vsnprintf(ptr long str ptr) msvcrt._vsnprintf @ cdecl _vsnprintf_c(ptr long str ptr) msvcrt._vsnprintf_c diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ab9cea6..140797d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1096,7 +1096,7 @@ @ stub _vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) msvcrt._vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) msvcrt._vscwprintf_l -@ stub _vscwprintf_p +@ cdecl _vscwprintf_p(wstr ptr) msvcr100._vscwprintf_p @ cdecl _vscwprintf_p_l(wstr ptr ptr) msvcrt._vscwprintf_p_l @ cdecl _vsnprintf(ptr long str ptr) msvcrt._vsnprintf @ cdecl _vsnprintf_c(ptr long str ptr) msvcrt._vsnprintf_c diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index a01859e..737003d 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -194,6 +194,7 @@ int __cdecl _snwprintf(wchar_t*,size_t,const wchar_t*,...); int __cdecl _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...); int __cdecl _scwprintf(const wchar_t*,...); int __cdecl _vscwprintf(const wchar_t*,__ms_va_list); +int __cdecl _vscwprintf_p_l(const wchar_t*,_locale_t,__ms_va_list); int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list); int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,__ms_va_list); int __cdecl _vswprintf_p_l(wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 27f673c..d936dc3 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -320,6 +320,7 @@ int __cdecl _putws(const wchar_t*); int __cdecl _snwprintf(wchar_t*,size_t,const wchar_t*,...); int __cdecl _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...); int __cdecl _vscwprintf(const wchar_t*,__ms_va_list); +int __cdecl _vscwprintf_p_l(const wchar_t*,_locale_t,__ms_va_list); int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list); int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,__ms_va_list); int __cdecl _vswprintf_p_l(wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list);

1 0

Alexandre Julliard : sane.ds: Don' t unload external libraries on process shutdown.
by Alexandre Julliard April 30, 2013

April 30, 2013

Module: wine Branch: master Commit: dc345305b0d37ce2342d7528a4cceab318e5ba4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc345305b0d37ce2342d7528a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 17:25:29 2013 +0200 sane.ds: Don't unload external libraries on process shutdown. --- dlls/sane.ds/sane_main.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index 1c73252..c01baeb 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -102,14 +102,12 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) break; } case DLL_PROCESS_DETACH: + if (lpvReserved) break; #ifdef SONAME_LIBSANE TRACE("calling sane_exit()\n"); psane_exit (); - close_libsane(libsane_handle); - libsane_handle = NULL; -#endif - SANE_instance = NULL; +#endif break; }

1 0

Alexandre Julliard : odbc32: Don' t unload external libraries on process shutdown.
by Alexandre Julliard April 30, 2013

April 30, 2013

Module: wine Branch: master Commit: 21bfa0812eb45fe1ca048ace0e63d5b7071bf2f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21bfa0812eb45fe1ca048ace0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 17:25:29 2013 +0200 odbc32: Don't unload external libraries on process shutdown. --- dlls/odbc32/proxyodbc.c | 32 +++++++++----------------------- 1 files changed, 9 insertions(+), 23 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index c7a5038..85b3dfe 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -465,39 +465,25 @@ static void ODBC_ReplicateToRegistry (void) /*********************************************************************** * DllMain [Internal] Initializes the internal 'ODBC32.DLL'. - * - * PARAMS - * hinstDLL [I] handle to the DLL's instance - * fdwReason [I] - * lpvReserved [I] reserved, must be NULL - * - * RETURNS - * Success: TRUE - * Failure: FALSE */ - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) { - TRACE("Initializing or Finalizing proxy ODBC: %p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); + TRACE("proxy ODBC: %p,%x,%p\n", hinstDLL, reason, reserved); - if (fdwReason == DLL_PROCESS_ATTACH) + switch (reason) { - TRACE("Loading ODBC...\n"); + case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); if (ODBC_LoadDriverManager()) { ODBC_LoadDMFunctions(); ODBC_ReplicateToRegistry(); } - } - else if (fdwReason == DLL_PROCESS_DETACH) - { - TRACE("Unloading ODBC...\n"); - if (dmHandle) - { - wine_dlclose(dmHandle,NULL,0); - dmHandle = NULL; - } + break; + + case DLL_PROCESS_DETACH: + if (reserved) break; + if (dmHandle) wine_dlclose(dmHandle,NULL,0); } return TRUE;

1 0