wine-commits November 2013

wine-commits@winehq.org

2 participants
566 discussions

Henri Verbeet : ddraw: Don' t bother unsetting DDSCAPS2_MIPMAPSUBLEVEL in CreateSurface().
by Alexandre Julliard 26 Nov '13

26 Nov '13

Module: wine Branch: master Commit: 659cd984d5e4f128381c2aba5c0d4dc489f17a1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=659cd984d5e4f128381c2aba5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 26 10:41:48 2013 +0100 ddraw: Don't bother unsetting DDSCAPS2_MIPMAPSUBLEVEL in CreateSurface(). This is already handled in ddraw_surface_create_texture(). --- dlls/ddraw/ddraw.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d81851c..88e220e 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2918,10 +2918,6 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, } } - /* According to the msdn this flag is ignored by CreateSurface */ - if (DDSD->dwSize >= sizeof(DDSURFACEDESC2)) - DDSD->ddsCaps.dwCaps2 &= ~DDSCAPS2_MIPMAPSUBLEVEL; - /* Modify some flags */ copy_to_surfacedesc2(&desc2, DDSD);

1 0

Henri Verbeet : ddraw: Don't set the pixelformat' s dwSize field in CreateSurface().
by Alexandre Julliard 26 Nov '13

26 Nov '13

Module: wine Branch: master Commit: 0261c465eba1a7afec52e69643a0bb5287429038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0261c465eba1a7afec52e6964… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 26 10:41:47 2013 +0100 ddraw: Don't set the pixelformat's dwSize field in CreateSurface(). This should be unnecessary. --- dlls/ddraw/ddraw.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 99f0c3b..d81851c 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2924,7 +2924,6 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, /* Modify some flags */ copy_to_surfacedesc2(&desc2, DDSD); - desc2.u4.ddpfPixelFormat.dwSize=sizeof(DDPIXELFORMAT); /* Just to be sure */ /* The first surface is a front buffer, the back buffer is created afterwards */ if (desc2.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)

1 0

Nikolay Sivov : qmgr: Added missing argument tracing, method naming made more compact.
by Alexandre Julliard 26 Nov '13

26 Nov '13

Module: wine Branch: master Commit: a124e927fae26c9071cd8c3e23763533e8c6f2e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a124e927fae26c9071cd8c3e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 26 13:22:09 2013 +0400 qmgr: Added missing argument tracing, method naming made more compact. --- dlls/qmgr/enum_files.c | 55 ++++++++++++++++++++++++++++----------------- dlls/qmgr/enum_jobs.c | 57 +++++++++++++++++++++++++++++------------------ dlls/qmgr/file.c | 30 +++++++++++++----------- 3 files changed, 85 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a124e927fae26c9071cd8…

1 0

Nikolay Sivov : qmgr: Use helper to return string value for File.
by Alexandre Julliard 26 Nov '13

26 Nov '13

Module: wine Branch: master Commit: c132ed8d5bd9cd92cb85800db33c4b79c5d6b801 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c132ed8d5bd9cd92cb85800db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 26 13:21:43 2013 +0400 qmgr: Use helper to return string value for File. --- dlls/qmgr/file.c | 16 ++++------------ dlls/qmgr/job.c | 18 ------------------ dlls/qmgr/qmgr.h | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 30 deletions(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index ccba81b..0e415a9 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -94,14 +94,10 @@ static HRESULT WINAPI BITS_IBackgroundCopyFile_GetRemoteName( LPWSTR *pVal) { BackgroundCopyFileImpl *This = impl_from_IBackgroundCopyFile(iface); - int n = (lstrlenW(This->info.RemoteName) + 1) * sizeof(WCHAR); - *pVal = CoTaskMemAlloc(n); - if (!*pVal) - return E_OUTOFMEMORY; + TRACE("(%p)->(%p)\n", This, pVal); - memcpy(*pVal, This->info.RemoteName, n); - return S_OK; + return return_strval(This->info.RemoteName, pVal); } static HRESULT WINAPI BITS_IBackgroundCopyFile_GetLocalName( @@ -109,14 +105,10 @@ static HRESULT WINAPI BITS_IBackgroundCopyFile_GetLocalName( LPWSTR *pVal) { BackgroundCopyFileImpl *This = impl_from_IBackgroundCopyFile(iface); - int n = (lstrlenW(This->info.LocalName) + 1) * sizeof(WCHAR); - *pVal = CoTaskMemAlloc(n); - if (!*pVal) - return E_OUTOFMEMORY; + TRACE("(%p)->(%p)\n", This, pVal); - memcpy(*pVal, This->info.LocalName, n); - return S_OK; + return return_strval(This->info.LocalName, pVal); } static HRESULT WINAPI BITS_IBackgroundCopyFile_GetProgress( diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 5be1676..ac7deaf 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -25,7 +25,6 @@ #include "qmgr.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(qmgr); @@ -34,23 +33,6 @@ static inline BOOL is_job_done(const BackgroundCopyJobImpl *job) return job->state == BG_JOB_STATE_CANCELLED || job->state == BG_JOB_STATE_ACKNOWLEDGED; } -static HRESULT return_strval(const WCHAR *str, WCHAR **ret) -{ - int len; - - if (!ret) return E_INVALIDARG; - - len = strlenW(str); - *ret = CoTaskMemAlloc((len+1)*sizeof(WCHAR)); - if (!*ret) return E_OUTOFMEMORY; - - if (len) - strcpyW(*ret, str); - else - **ret = 0; - return S_OK; -} - static inline BackgroundCopyJobImpl *impl_from_IBackgroundCopyJob2(IBackgroundCopyJob2 *iface) { return CONTAINING_RECORD(iface, BackgroundCopyJobImpl, IBackgroundCopyJob2_iface); diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index 1f64d41..63d9f91 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -29,6 +29,7 @@ #include <string.h> #include "wine/list.h" +#include "wine/unicode.h" /* Background copy job vtbl and related data */ typedef struct @@ -100,6 +101,19 @@ qmgr_strdup(const char *s) return d ? memcpy(d, s, n) : NULL; } +static inline HRESULT return_strval(const WCHAR *str, WCHAR **ret) +{ + int len; + + if (!ret) return E_INVALIDARG; + + len = strlenW(str); + *ret = CoTaskMemAlloc((len+1)*sizeof(WCHAR)); + if (!*ret) return E_OUTOFMEMORY; + strcpyW(*ret, str); + return S_OK; +} + static inline BOOL transitionJobState(BackgroundCopyJobImpl *job, BG_JOB_STATE fromState, BG_JOB_STATE toState)

1 0

Ričardas Barkauskas : wininet/tests: Mark successful query of status before sending request as broken.
by Alexandre Julliard 26 Nov '13

26 Nov '13

Module: wine Branch: master Commit: 05396f18e4a0e95e4db12a04f0dbc67fcf557ef1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05396f18e4a0e95e4db12a04f… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Tue Nov 26 01:13:40 2013 +0200 wininet/tests: Mark successful query of status before sending request as broken. --- dlls/wininet/tests/http.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 4793bc6..40e1821 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -3597,7 +3597,7 @@ static void test_response_without_headers(int port) static void test_HttpQueryInfo(int port) { HINTERNET hi, hc, hr; - DWORD size, index; + DWORD size, index, error; char buffer[1024]; BOOL ret; @@ -3612,7 +3612,9 @@ static void test_HttpQueryInfo(int port) size = sizeof(buffer); ret = HttpQueryInfoA(hr, HTTP_QUERY_STATUS_TEXT, buffer, &size, &index); - ok(!ret && GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "HttpQueryInfo failed %u\n", GetLastError()); + error = GetLastError(); + ok(!ret || broken(ret), "HttpQueryInfo succeeded\n"); + if (!ret) ok(error == ERROR_HTTP_HEADER_NOT_FOUND, "got %u expected ERROR_HTTP_HEADER_NOT_FOUND\n", error); ret = HttpSendRequestA(hr, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed\n");

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

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/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

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

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

← Newer
1
2
3
4
5
6
7
8
9
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2013