November 2013 - Wine-commits

André Hentschel : winedbg: Update minidump output.
by Alexandre Julliard 26 Nov '13

26 Nov '13

Module: wine Branch: master Commit: 74046af7eb0497a873504eee4fd0634adbb2d671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74046af7eb0497a873504eee4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 26 01:08:26 2013 +0100 winedbg: Update minidump output. --- programs/winedbg/tgt_minidump.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index b374f42..50801c7 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -289,6 +289,12 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) case PROCESSOR_ARCHITECTURE_ARM: str = "ARM"; break; + case PROCESSOR_ARCHITECTURE_MSIL: + str = "MSIL"; + break; + case PROCESSOR_ARCHITECTURE_NEUTRAL: + str = "Neutral"; + break; default: str = "???"; break; @@ -311,7 +317,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) case 0: str = (msi->PlatformId == VER_PLATFORM_WIN32_NT) ? "NT 4.0" : "95"; break; case 10: str = "98"; break; case 90: str = "ME"; break; - default: str = "5-????"; break; + default: str = "4-????"; break; } break; case 5: @@ -319,10 +325,30 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) { case 0: str = "2000"; break; case 1: str = "XP"; break; - case 2: str = "Server 2003"; break; + case 2: + if (msi->u.s.ProductType == 1) str = "XP"; + else if (msi->u.s.ProductType == 3) str = "Server 2003"; + else str = "5-????"; + break; default: str = "5-????"; break; } break; + case 6: + switch (msi->MinorVersion) + { + case 0: + if (msi->u.s.ProductType == 1) str = "Vista"; + else if (msi->u.s.ProductType == 3) str = "Server 2008"; + else str = "6-????"; + break; + case 1: + if (msi->u.s.ProductType == 1) str = "Win7"; + else if (msi->u.s.ProductType == 3) str = "Server 2008"; + else str = "6-????"; + case 2: str = "Win8"; break; + default: str = "6-????"; break; + } + break; default: str = "???"; break; } dbg_printf(" on Windows %s (%u)\n", str, msi->BuildNumber);

1 0

André Hentschel : wininet/tests: Fix boolean checks.
by Alexandre Julliard 26 Nov '13

26 Nov '13

Module: wine Branch: master Commit: f34ba03277ba307ff789dd398e10ce4a0d94ebb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f34ba03277ba307ff789dd398… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 26 00:17:25 2013 +0100 wininet/tests: Fix boolean checks. --- dlls/wininet/tests/urlcache.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index e093d4b..07800e0 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -217,16 +217,16 @@ static void test_IsUrlCacheEntryExpiredA(void) * is NULL. */ ret = IsUrlCacheEntryExpiredA(NULL, 0, NULL); - ok(ret == !ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); + ok(!ret == ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); ft.dwLowDateTime = 0xdeadbeef; ft.dwHighDateTime = 0xbaadf00d; ret = IsUrlCacheEntryExpiredA(NULL, 0, &ft); - ok(ret == !ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); + ok(!ret == ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); ok(ft.dwLowDateTime == 0xdeadbeef && ft.dwHighDateTime == 0xbaadf00d, "expected time to be unchanged, got (%u,%u)\n", ft.dwLowDateTime, ft.dwHighDateTime); ret = IsUrlCacheEntryExpiredA(test_url, 0, NULL); - ok(ret == !ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); + ok(!ret == ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); /* The return value should indicate whether the URL is expired, * and the filetime indicates the last modified time, but a cache entry @@ -309,7 +309,7 @@ static void test_IsUrlCacheEntryExpiredA(void) ft.dwLowDateTime = 0xdeadbeef; ft.dwHighDateTime = 0xbaadf00d; ret = IsUrlCacheEntryExpiredA(uncached_url, 0, &ft); - ok(ret == !ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); + ok(!ret == ie10_cache, "IsUrlCacheEntryExpiredA returned %x\n", ret); ok(!ft.dwLowDateTime && !ft.dwHighDateTime, "expected time (0,0), got (%u,%u)\n", ft.dwLowDateTime, ft.dwHighDateTime);

1 0

Ričardas Barkauskas : wininet/tests: Test successive HttpSendRequest calls.
by Alexandre Julliard 26 Nov '13

26 Nov '13

Module: wine Branch: master Commit: 920a261d35710a2da34becbd713ee69f7415971d URL: http://source.winehq.org/git/wine.git/?a=commit;h=920a261d35710a2da34becbd7… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Tue Nov 26 01:12:04 2013 +0200 wininet/tests: Test successive HttpSendRequest calls. --- dlls/wininet/tests/http.c | 99 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 95 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ffb5fdf..3bad0e3 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1927,14 +1927,14 @@ static const char page1[] = static const char ok_with_length[] = "HTTP/1.1 200 OK\r\n" "Connection: Keep-Alive\r\n" -"Content-Length: 23\r\n\r\n" -"abc\r\nHTTP/1.1 211 OK\r\n\r\n"; +"Content-Length: 18\r\n\r\n" +"HTTP/1.1 211 OK\r\n\r\n"; static const char ok_with_length2[] = "HTTP/1.1 210 OK\r\n" "Connection: Keep-Alive\r\n" -"Content-Length: 24\r\n\r\n" -"abc\r\nHTTP/1.1 211 OK\r\n\r\n"; +"Content-Length: 19\r\n\r\n" +"HTTP/1.1 211 OK\r\n\r\n"; struct server_info { HANDLE hEvent; @@ -2147,6 +2147,12 @@ static DWORD CALLBACK server_thread(LPVOID param) count = 0; } } + if (strstr(buffer, "GET /testH")) + { + send(c, ok_with_length2, sizeof(ok_with_length2)-1, 0); + recvfrom(c, buffer, sizeof(buffer), 0, NULL, NULL); + send(c, ok_with_length, sizeof(ok_with_length)-1, 0); + } if (strstr(buffer, "GET /test_no_content")) { @@ -2937,6 +2943,90 @@ static void test_connection_closing(int port) CloseHandle(hCompleteEvent); } +static void test_successive_HttpSendRequest(int port) +{ + HINTERNET session, connection, req; + DWORD res; + + hCompleteEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + + session = InternetOpenA("", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, INTERNET_FLAG_ASYNC); + ok(session != NULL,"InternetOpen failed with error %u\n", GetLastError()); + + pInternetSetStatusCallbackA(session, callback); + + SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); + connection = InternetConnectA(session, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0x0, 0xdeadbeef); + ok(connection != NULL,"InternetConnect failed with error %u\n", GetLastError()); + CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); + + SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); + req = HttpOpenRequestA(connection, "GET", "/testH", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0xdeadbeaf); + ok(req != NULL, "HttpOpenRequest failed: %u\n", GetLastError()); + CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); + + SET_OPTIONAL(INTERNET_STATUS_COOKIE_SENT); + SET_OPTIONAL(INTERNET_STATUS_DETECTING_PROXY); + SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); + SET_EXPECT(INTERNET_STATUS_CONNECTED_TO_SERVER); + SET_EXPECT(INTERNET_STATUS_SENDING_REQUEST); + SET_EXPECT(INTERNET_STATUS_REQUEST_SENT); + SET_EXPECT(INTERNET_STATUS_RECEIVING_RESPONSE); + SET_EXPECT(INTERNET_STATUS_RESPONSE_RECEIVED); + SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + + res = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(!res && (GetLastError() == ERROR_IO_PENDING), + "Asynchronous HttpSendRequest NOT returning 0 with error ERROR_IO_PENDING\n"); + WaitForSingleObject(hCompleteEvent, INFINITE); + ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); + + CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); + CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); + CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_SENT); + CHECK_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); + CHECK_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + + test_status_code(req, 210); + + SET_OPTIONAL(INTERNET_STATUS_COOKIE_SENT); + SET_OPTIONAL(INTERNET_STATUS_DETECTING_PROXY); + SET_EXPECT(INTERNET_STATUS_SENDING_REQUEST); + SET_EXPECT(INTERNET_STATUS_REQUEST_SENT); + SET_EXPECT(INTERNET_STATUS_RECEIVING_RESPONSE); + SET_EXPECT(INTERNET_STATUS_RESPONSE_RECEIVED); + SET_OPTIONAL(INTERNET_STATUS_CLOSING_CONNECTION); + SET_OPTIONAL(INTERNET_STATUS_CONNECTION_CLOSED); + SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + + res = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(!res && (GetLastError() == ERROR_IO_PENDING), + "Asynchronous HttpSendRequest NOT returning 0 with error ERROR_IO_PENDING\n"); + WaitForSingleObject(hCompleteEvent, INFINITE); + ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); + + CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); + CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); + CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_SENT); + CHECK_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); + CHECK_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); + CLEAR_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); + CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + + test_status_code_todo(req, 200); + + SET_WINE_ALLOW(INTERNET_STATUS_CLOSING_CONNECTION); + SET_WINE_ALLOW(INTERNET_STATUS_CONNECTION_CLOSED); + + close_async_handle(session, hCompleteEvent, 2); + CloseHandle(hCompleteEvent); +} static void test_no_content(int port) { @@ -3912,6 +4002,7 @@ static void test_http_connection(void) test_premature_disconnect(si.port); test_connection_closing(si.port); test_cache_control_verb(si.port); + test_successive_HttpSendRequest(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Ričardas Barkauskas : wininet: Reset data stream for existing request connections.
by Alexandre Julliard 26 Nov '13

26 Nov '13

Module: wine Branch: master Commit: 992c2bd3e5e3383fe2f39d585fcc1c666a9b7773 URL: http://source.winehq.org/git/wine.git/?a=commit;h=992c2bd3e5e3383fe2f39d585… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Tue Nov 26 01:12:34 2013 +0200 wininet: Reset data stream for existing request connections. --- dlls/wininet/http.c | 13 ++++++++++--- dlls/wininet/tests/http.c | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 52b64f8..bca1101 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4936,10 +4936,17 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, loop_next = FALSE; - if (request->netconn && !NETCON_is_alive(request->netconn)) + if (request->netconn) { - free_netconn(request->netconn); - request->netconn = NULL; + if (!NETCON_is_alive(request->netconn)) + { + free_netconn(request->netconn); + request->netconn = NULL; + } + else + { + reset_data_stream(request); + } } reusing_connection = request->netconn != NULL; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 3bad0e3..4793bc6 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -3019,7 +3019,7 @@ static void test_successive_HttpSendRequest(int port) CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); - test_status_code_todo(req, 200); + test_status_code(req, 200); SET_WINE_ALLOW(INTERNET_STATUS_CLOSING_CONNECTION); SET_WINE_ALLOW(INTERNET_STATUS_CONNECTION_CLOSED);

1 0

Ričardas Barkauskas : wininet: Move handling of existing request connections to open_http_connection.
by Alexandre Julliard 26 Nov '13

26 Nov '13

Module: wine Branch: master Commit: 12e6c14e7c2db8185d770b1ba7c07b2dadb4ce7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=12e6c14e7c2db8185d770b1ba… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Tue Nov 26 01:12:49 2013 +0200 wininet: Move handling of existing request connections to open_http_connection. --- dlls/wininet/http.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index bca1101..09a43f8 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4786,9 +4786,22 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) netconn_t *netconn = NULL; DWORD res; - assert(!request->netconn); reset_data_stream(request); + if (request->netconn) + { + if (NETCON_is_alive(request->netconn)) + { + *reusing = TRUE; + return ERROR_SUCCESS; + } + else + { + free_netconn(request->netconn); + request->netconn = NULL; + } + } + res = HTTP_ResolveName(request); if(res != ERROR_SUCCESS) return res; @@ -4936,20 +4949,6 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, loop_next = FALSE; - if (request->netconn) - { - if (!NETCON_is_alive(request->netconn)) - { - free_netconn(request->netconn); - request->netconn = NULL; - } - else - { - reset_data_stream(request); - } - } - reusing_connection = request->netconn != NULL; - if(redirected) { request->contentLength = ~0u; request->bytesToWrite = 0; @@ -4984,7 +4983,8 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, TRACE("Request header -> %s\n", debugstr_w(requestString) ); - if (!reusing_connection && (res = open_http_connection(request, &reusing_connection)) != ERROR_SUCCESS) + res = open_http_connection(request, &reusing_connection); + if (res != ERROR_SUCCESS) break; /* send the request as ASCII, tack on the optional data */

1 0

Viktor Zozulyak : Updated Ukrainian translation of Download page
by Jeremy Newman 25 Nov '13

25 Nov '13

Module: website Branch: master Commit: fb36fa55f3cbf884bd5b1fa18aa3aafeb4225ad6 URL: http://source.winehq.org/git/website.git/?a=commit;h=fb36fa55f3cbf884bd5b1f… Author: Viktor Zozulyak <zozulyakviktor(a)gmail.com> Date: Mon Nov 25 23:34:18 2013 +0200 Updated Ukrainian translation of Download page Recently installed wine on Ubuntu 12.04 and realized that there is some white spots and mistakes in Ukrainian translations. Made some updates and corrections. --- templates/uk/download.template | 61 +++++++++++++++++++++------------------- 1 files changed, 32 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=fb36fa55f3cbf884bd…

1 0

Viktor Zozulyak : Updated Ukrainian translation of Download->Debian page
by Jeremy Newman 25 Nov '13

25 Nov '13

Module: website Branch: master Commit: e9064becf572bebf117b22e54ac103cd8d0f0419 URL: http://source.winehq.org/git/website.git/?a=commit;h=e9064becf572bebf117b22… Author: Viktor Zozulyak <zozulyakviktor(a)gmail.com> Date: Mon Nov 25 23:35:03 2013 +0200 Updated Ukrainian translation of Download->Debian page Recently installed wine on Ubuntu 12.04 and realized that there is some white spots and mistakes in Ukrainian translations. Made some updates and corrections. --- templates/uk/download/debian.template | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/uk/download/debian.template b/templates/uk/download/debian.template index 34f10fb..9fdeb40 100644 --- a/templates/uk/download/debian.template +++ b/templates/uk/download/debian.template @@ -5,14 +5,14 @@ Wine для Debian <a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a></h1> -Дистрибутиви сімейства Debian використовують спеціальний інструмент для управління пакунками, відомий як APT. APT здатний автоматично встановити всі необхідні залежності для пакету, а також слідкувати за оновленнями для надання актуальності. Дистрибутиви сімейства Debian мають власні репозиторії програмного забезпечення в яких є Wine, але попри це, ми все ж таки маємо свій власний репозиторій для розробницьких пакунків. +Дистрибутиви сімейства Debian використовують спеціальний інструмент для управління пакунками, відомий як APT. APT здатний автоматично встановити всі необхідні залежності для пакету, а також слідкувати за оновленнями для підтримання актуальності. Дистрибутиви сімейства Debian мають власні репозиторії програмного забезпечення в яких є Wine, але попри це, ми все ж таки маємо свій власний репозиторій для розробницьких пакунків. Попередження: Розробницькі пакунки Це означає, що вони періодично можуть містити <a href="http://wiki.winehq.org/Regression">регресії</a> і в разі оновлень може постраждати функціональність. Якщо останній стабільний реліз Wine (поточний Wine {$config_stable_release}) добре працює, тоді ви можете не використовувати ці розробницькі пакунки. Цей веб-сайт має пакунки для i386 та amd64 архітектур. -Щоб встановити пакунки, ви повинні завантажити файли .deb та встановити іх вручну. Для більш подробних деталей дивіться сторінку. +Щоб встановити пакунки, ви повинні завантажити файли .deb та встановити іх вручну. За більш детальною інформацією зверніться до сторінки нижче. Домашня сторінка: <a href="http://dev.carbon-project.org/debian/wine-unstable/" target="_blank">http://dev.carbon-project.org/debian/wine-unstable/</a>

1 0

Alexandre Julliard : msvcp71: Use thiscall where appropriate in the header file.
by Alexandre Julliard 25 Nov '13

25 Nov '13

Module: wine Branch: master Commit: 78056ca0d3b4d412bff48a83be09c5e3bf601e15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78056ca0d3b4d412bff48a83b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 13:22:15 2013 +0100 msvcp71: Use thiscall where appropriate in the header file. --- dlls/msvcp71/msvcp.h | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/msvcp71/msvcp.h b/dlls/msvcp71/msvcp.h index bf72081..1eccdc5 100644 --- a/dlls/msvcp71/msvcp.h +++ b/dlls/msvcp71/msvcp.h @@ -47,11 +47,11 @@ typedef struct } basic_string_char; basic_string_char* __thiscall MSVCP_basic_string_char_ctor(basic_string_char*); -basic_string_char* __stdcall MSVCP_basic_string_char_ctor_cstr(basic_string_char*, const char*); +basic_string_char* __thiscall MSVCP_basic_string_char_ctor_cstr(basic_string_char*, const char*); basic_string_char* __thiscall MSVCP_basic_string_char_ctor_cstr_len(basic_string_char*, const char*, MSVCP_size_t); -basic_string_char* __stdcall MSVCP_basic_string_char_copy_ctor(basic_string_char*, const basic_string_char*); -void __stdcall MSVCP_basic_string_char_dtor(basic_string_char*); -const char* __stdcall MSVCP_basic_string_char_c_str(const basic_string_char*); +basic_string_char* __thiscall MSVCP_basic_string_char_copy_ctor(basic_string_char*, const basic_string_char*); +void __thiscall MSVCP_basic_string_char_dtor(basic_string_char*); +const char* __thiscall MSVCP_basic_string_char_c_str(const basic_string_char*); void __thiscall MSVCP_basic_string_char_clear(basic_string_char*); basic_string_char* __thiscall MSVCP_basic_string_char_append_ch(basic_string_char*, char); MSVCP_size_t __thiscall MSVCP_basic_string_char_length(const basic_string_char*); @@ -70,7 +70,7 @@ typedef struct } basic_string_wchar; basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor(basic_string_wchar*); -basic_string_wchar* __stdcall MSVCP_basic_string_wchar_ctor_cstr(basic_string_wchar*, const wchar_t*); +basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_cstr(basic_string_wchar*, const wchar_t*); basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_cstr_len(basic_string_wchar*, const wchar_t*, MSVCP_size_t); void __thiscall MSVCP_basic_string_wchar_dtor(basic_string_wchar*); const wchar_t* __thiscall MSVCP_basic_string_wchar_c_str(const basic_string_wchar*); @@ -78,12 +78,12 @@ void __thiscall MSVCP_basic_string_wchar_clear(basic_string_wchar*); basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_ch(basic_string_wchar*, wchar_t); MSVCP_size_t __thiscall MSVCP_basic_string_wchar_length(const basic_string_wchar*); -char* MSVCP_allocator_char_allocate(void*, MSVCP_size_t); -void MSVCP_allocator_char_deallocate(void*, char*, MSVCP_size_t); -MSVCP_size_t MSVCP_allocator_char_max_size(void*); -wchar_t* MSVCP_allocator_wchar_allocate(void*, MSVCP_size_t); -void MSVCP_allocator_wchar_deallocate(void*, wchar_t*, MSVCP_size_t); -MSVCP_size_t MSVCP_allocator_wchar_max_size(void*); +char* __thiscall MSVCP_allocator_char_allocate(void*, MSVCP_size_t); +void __thiscall MSVCP_allocator_char_deallocate(void*, char*, MSVCP_size_t); +MSVCP_size_t __thiscall MSVCP_allocator_char_max_size(void*); +wchar_t* __thiscall MSVCP_allocator_wchar_allocate(void*, MSVCP_size_t); +void __thiscall MSVCP_allocator_wchar_deallocate(void*, wchar_t*, MSVCP_size_t); +MSVCP_size_t __thiscall MSVCP_allocator_wchar_max_size(void*); /* class locale::facet */ typedef struct {

1 0

Alexandre Julliard : msvcp90: Use thiscall where appropriate in the header file.
by Alexandre Julliard 25 Nov '13

25 Nov '13

Module: wine Branch: master Commit: a4303e7246b52db3abc08eabe0ddaec906de3a85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4303e7246b52db3abc08eabe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 13:22:34 2013 +0100 msvcp90: Use thiscall where appropriate in the header file. --- dlls/msvcp90/msvcp90.h | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 59f8544..1eccdc5 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -47,11 +47,11 @@ typedef struct } basic_string_char; basic_string_char* __thiscall MSVCP_basic_string_char_ctor(basic_string_char*); -basic_string_char* __stdcall MSVCP_basic_string_char_ctor_cstr(basic_string_char*, const char*); +basic_string_char* __thiscall MSVCP_basic_string_char_ctor_cstr(basic_string_char*, const char*); basic_string_char* __thiscall MSVCP_basic_string_char_ctor_cstr_len(basic_string_char*, const char*, MSVCP_size_t); -basic_string_char* __stdcall MSVCP_basic_string_char_copy_ctor(basic_string_char*, const basic_string_char*); -void __stdcall MSVCP_basic_string_char_dtor(basic_string_char*); -const char* __stdcall MSVCP_basic_string_char_c_str(const basic_string_char*); +basic_string_char* __thiscall MSVCP_basic_string_char_copy_ctor(basic_string_char*, const basic_string_char*); +void __thiscall MSVCP_basic_string_char_dtor(basic_string_char*); +const char* __thiscall MSVCP_basic_string_char_c_str(const basic_string_char*); void __thiscall MSVCP_basic_string_char_clear(basic_string_char*); basic_string_char* __thiscall MSVCP_basic_string_char_append_ch(basic_string_char*, char); MSVCP_size_t __thiscall MSVCP_basic_string_char_length(const basic_string_char*); @@ -70,7 +70,7 @@ typedef struct } basic_string_wchar; basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor(basic_string_wchar*); -basic_string_wchar* __stdcall MSVCP_basic_string_wchar_ctor_cstr(basic_string_wchar*, const wchar_t*); +basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_cstr(basic_string_wchar*, const wchar_t*); basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_cstr_len(basic_string_wchar*, const wchar_t*, MSVCP_size_t); void __thiscall MSVCP_basic_string_wchar_dtor(basic_string_wchar*); const wchar_t* __thiscall MSVCP_basic_string_wchar_c_str(const basic_string_wchar*); @@ -78,12 +78,12 @@ void __thiscall MSVCP_basic_string_wchar_clear(basic_string_wchar*); basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_ch(basic_string_wchar*, wchar_t); MSVCP_size_t __thiscall MSVCP_basic_string_wchar_length(const basic_string_wchar*); -char* __stdcall MSVCP_allocator_char_allocate(void*, MSVCP_size_t); -void __stdcall MSVCP_allocator_char_deallocate(void*, char*, MSVCP_size_t); -MSVCP_size_t __stdcall MSVCP_allocator_char_max_size(void*); -wchar_t* __stdcall MSVCP_allocator_wchar_allocate(void*, MSVCP_size_t); -void __stdcall MSVCP_allocator_wchar_deallocate(void*, wchar_t*, MSVCP_size_t); -MSVCP_size_t __stdcall MSVCP_allocator_wchar_max_size(void*); +char* __thiscall MSVCP_allocator_char_allocate(void*, MSVCP_size_t); +void __thiscall MSVCP_allocator_char_deallocate(void*, char*, MSVCP_size_t); +MSVCP_size_t __thiscall MSVCP_allocator_char_max_size(void*); +wchar_t* __thiscall MSVCP_allocator_wchar_allocate(void*, MSVCP_size_t); +void __thiscall MSVCP_allocator_wchar_deallocate(void*, wchar_t*, MSVCP_size_t); +MSVCP_size_t __thiscall MSVCP_allocator_wchar_max_size(void*); /* class locale::facet */ typedef struct {

1 0

Alexandre Julliard : msxml3/tests: Avoid including xmldom.h.
by Alexandre Julliard 25 Nov '13

25 Nov '13

Module: wine Branch: master Commit: 6bb1bda555c4dca47d3e4ef1c1e2e22cd6fa0a01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bb1bda555c4dca47d3e4ef1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 14:57:51 2013 +0100 msxml3/tests: Avoid including xmldom.h. --- dlls/msxml3/tests/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 1621470..40b9322 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -30,7 +30,7 @@ #include "windows.h" -#include "xmldom.h" +#include "msxml.h" #include "msxml2.h" #include "msxml2did.h" #include "ole2.h"

1 0