November 2013 - Wine-commits

Nikolay Sivov : qmgr/tests: Do an early check to skip all tests.
by Alexandre Julliard 27 Nov '13

27 Nov '13

Module: wine Branch: master Commit: 2245acf75a438d5605b23c7bb8e717e44e72effe URL: http://source.winehq.org/git/wine.git/?a=commit;h=2245acf75a438d5605b23c7bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 27 16:50:30 2013 +0400 qmgr/tests: Do an early check to skip all tests. --- dlls/qmgr/tests/enum_files.c | 35 +---------------- dlls/qmgr/tests/enum_jobs.c | 52 +------------------------ dlls/qmgr/tests/file.c | 48 +++++++++++++++-------- dlls/qmgr/tests/job.c | 29 ++++++++++++++- dlls/qmgr/tests/qmgr.c | 84 +++++++++++++----------------------------- 5 files changed, 91 insertions(+), 157 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2245acf75a438d5605b23…

1 0

Hans Leidekker : advapi32: Perform a case-insensitive match on the credential target name.
by Alexandre Julliard 27 Nov '13

27 Nov '13

Module: wine Branch: master Commit: 0c56639a6aff582689f66e0273cecabd00212715 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c56639a6aff582689f66e027… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 27 14:35:38 2013 +0100 advapi32: Perform a case-insensitive match on the credential target name. --- dlls/advapi32/cred.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index e17dfb6..58dd72d 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -746,7 +746,7 @@ static BOOL registry_credential_matches_filter(HKEY hkeyCred, LPCWSTR filter) debugstr_w(target_name)); p = strchrW(filter, '*'); - ret = CompareStringW(GetThreadLocale(), 0, filter, + ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, filter, (p && !p[1] ? p - filter : -1), target_name, (p && !p[1] ? p - filter : -1)) == CSTR_EQUAL; @@ -818,7 +818,7 @@ static BOOL mac_credential_matches_filter(void *data, UInt32 data_len, const WCH TRACE("comparing filter %s to target name %s\n", debugstr_w(filter), debugstr_w(target_name)); p = strchrW(filter, '*'); - ret = CompareStringW(GetThreadLocale(), 0, filter, + ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, filter, (p && !p[1] ? p - filter : -1), target_name, (p && !p[1] ? p - filter : -1)) == CSTR_EQUAL; HeapFree(GetProcessHeap(), 0, target_name);

1 0

Stefan Dösinger : wined3d: Don' t store PBO pointers in allocatedMemory.
by Alexandre Julliard 27 Nov '13

27 Nov '13

Module: wine Branch: master Commit: 6d0d018bfa0a1d27c2d540fb688b29f0e5b6e21a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d0d018bfa0a1d27c2d540fb6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 27 00:26:36 2013 +0100 wined3d: Don't store PBO pointers in allocatedMemory. --- dlls/wined3d/surface.c | 28 ++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bea4ce4..ac168dd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -767,7 +767,7 @@ static void surface_realize_palette(struct wined3d_surface *surface) surface_load_location(surface, surface->draw_binding); } -static void surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD flags) +static BYTE *surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD flags) { struct wined3d_device *device = surface->resource.device; @@ -793,6 +793,7 @@ static void surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD if (surface->flags & SFLAG_PBO) { + BYTE *ret; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; @@ -802,12 +803,7 @@ static void surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); checkGLcall("glBindBufferARB"); - /* This shouldn't happen but could occur if some other function - * didn't handle the PBO properly. */ - if (surface->resource.allocatedMemory) - ERR("The surface already has PBO memory allocated.\n"); - - surface->resource.allocatedMemory = GL_EXTCALL(glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, GL_READ_WRITE_ARB)); + ret = GL_EXTCALL(glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, GL_READ_WRITE_ARB)); checkGLcall("glMapBufferARB"); /* Make sure the PBO isn't set anymore in order not to break non-PBO @@ -816,7 +812,10 @@ static void surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD checkGLcall("glBindBufferARB"); context_release(context); + return ret; } + + return surface->resource.allocatedMemory; } static void surface_unmap(struct wined3d_surface *surface) @@ -842,8 +841,6 @@ static void surface_unmap(struct wined3d_surface *surface) GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); checkGLcall("glUnmapBufferARB"); context_release(context); - - surface->resource.allocatedMemory = NULL; } TRACE("dirtyfied %u.\n", surface->flags & (SFLAG_INDRAWABLE | SFLAG_INTEXTURE) ? 0 : 1); @@ -1473,10 +1470,12 @@ static void gdi_surface_realize_palette(struct wined3d_surface *surface) x11_copy_to_screen(surface->swapchain, NULL); } -static void gdi_surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD flags) +static BYTE *gdi_surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD flags) { TRACE("surface %p, rect %s, flags %#x.\n", surface, wine_dbgstr_rect(rect), flags); + + return surface->resource.allocatedMemory; } static void gdi_surface_unmap(struct wined3d_surface *surface) @@ -3195,6 +3194,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_desc *map_desc, const RECT *rect, DWORD flags) { const struct wined3d_format *format = surface->resource.format; + BYTE *base_memory; TRACE("surface %p, map_desc %p, rect %s, flags %#x.\n", surface, map_desc, wine_dbgstr_rect(rect), flags); @@ -3233,7 +3233,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, } } - surface->surface_ops->surface_map(surface, rect, flags); + base_memory = surface->surface_ops->surface_map(surface, rect, flags); if (format->flags & WINED3DFMT_FLAG_BROKEN_PITCH) map_desc->row_pitch = surface->resource.width * format->byte_count; @@ -3243,7 +3243,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, if (!rect) { - map_desc->data = surface->resource.allocatedMemory; + map_desc->data = base_memory; surface->lockedRect.left = 0; surface->lockedRect.top = 0; surface->lockedRect.right = surface->resource.width; @@ -3255,13 +3255,13 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, { /* Compressed textures are block based, so calculate the offset of * the block that contains the top-left pixel of the locked rectangle. */ - map_desc->data = surface->resource.allocatedMemory + map_desc->data = base_memory + ((rect->top / format->block_height) * map_desc->row_pitch) + ((rect->left / format->block_width) * format->block_byte_count); } else { - map_desc->data = surface->resource.allocatedMemory + map_desc->data = base_memory + (map_desc->row_pitch * rect->top) + (rect->left * format->byte_count); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5b5d01a..cb685e2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2169,7 +2169,7 @@ struct wined3d_surface_ops { HRESULT (*surface_private_setup)(struct wined3d_surface *surface); void (*surface_realize_palette)(struct wined3d_surface *surface); - void (*surface_map)(struct wined3d_surface *surface, const RECT *rect, DWORD flags); + BYTE *(*surface_map)(struct wined3d_surface *surface, const RECT *rect, DWORD flags); void (*surface_unmap)(struct wined3d_surface *surface); };

1 0

André Hentschel : ole32/tests: Don' t crash when StgOpenStorage fails.
by Alexandre Julliard 27 Nov '13

27 Nov '13

Module: wine Branch: master Commit: 04f5160c93af4fbb509993f955482a909940fd44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04f5160c93af4fbb509993f95… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 26 23:48:59 2013 +0100 ole32/tests: Don't crash when StgOpenStorage fails. --- dlls/ole32/tests/storage32.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 61744a9..06d2fa4 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -3082,19 +3082,21 @@ if (hr == S_OK) { /* writer mode */ hr = StgOpenStorage(fileW, NULL, STGM_DIRECT_SWMR | STGM_READWRITE | STGM_SHARE_DENY_WRITE, NULL, 0, &stg); ok(hr == S_OK, "got %08x\n", hr); + if(hr == S_OK) + { + ref = IStorage_AddRef(stg); + IStorage_Release(stg); - ref = IStorage_AddRef(stg); - IStorage_Release(stg); - - hr = IStorage_QueryInterface(stg, &IID_IDirectWriterLock, (void**)&dwlock); - ok(hr == S_OK, "got %08x\n", hr); + hr = IStorage_QueryInterface(stg, &IID_IDirectWriterLock, (void**)&dwlock); + ok(hr == S_OK, "got %08x\n", hr); - ref2 = IStorage_AddRef(stg); - IStorage_Release(stg); - ok(ref2 == ref + 1, "got %u\n", ref2); + ref2 = IStorage_AddRef(stg); + IStorage_Release(stg); + ok(ref2 == ref + 1, "got %u\n", ref2); - IDirectWriterLock_Release(dwlock); - IStorage_Release(stg); + IDirectWriterLock_Release(dwlock); + IStorage_Release(stg); + } DeleteFileW(fileW); }

1 0

André Hentschel : ddrawex/tests: Don' t crash when IDirectDraw4 query fails.
by Alexandre Julliard 27 Nov '13

27 Nov '13

Module: wine Branch: master Commit: ef6cc1a282ae378009b944792b11aca66bd37122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef6cc1a282ae378009b944792… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 26 23:49:03 2013 +0100 ddrawex/tests: Don't crash when IDirectDraw4 query fails. --- dlls/ddrawex/tests/ddrawex.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ddrawex/tests/ddrawex.c b/dlls/ddrawex/tests/ddrawex.c index aa31b2f..7134a04 100644 --- a/dlls/ddrawex/tests/ddrawex.c +++ b/dlls/ddrawex/tests/ddrawex.c @@ -50,6 +50,7 @@ static void RefCountTest(void) IDirectDraw2 *dd2; IDirectDraw3 *dd3; IDirectDraw4 *dd4; + HRESULT hr; ULONG ref; ref = get_ref((IUnknown *) dd1); @@ -76,7 +77,15 @@ static void RefCountTest(void) ref = get_ref((IUnknown *) dd3); ok(ref == 3, "IDirectDraw3 refcount is %u, expected 3\n", ref); - IDirectDraw_QueryInterface(dd1, &IID_IDirectDraw4, (void **) &dd4); + hr = IDirectDraw_QueryInterface(dd1, &IID_IDirectDraw4, (void **) &dd4); + if (FAILED(hr)) + { + win_skip("Failed to query IDirectDraw4\n"); + IDirectDraw_Release(dd1); + IDirectDraw2_Release(dd2); + IDirectDraw3_Release(dd3); + return; + } ref = get_ref((IUnknown *) dd4); ok(ref == 4, "IDirectDraw4 refcount is %u, expected 4\n", ref);

1 0

Frédéric Delanoy : winhttp/tests: Use BOOL type where appropriate.
by Alexandre Julliard 27 Nov '13

27 Nov '13

Module: wine Branch: master Commit: 4bb0d0eac9650dd0bfea79c510628d1df6693803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bb0d0eac9650dd0bfea79c51… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 27 08:51:57 2013 +0100 winhttp/tests: Use BOOL type where appropriate. --- dlls/winhttp/tests/notification.c | 64 ++++++++++++++++++------------------ 1 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 4643193..9fcc64c 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -44,9 +44,9 @@ struct notification { enum api function; /* api responsible for notification */ unsigned int status; /* status received */ - int todo; - int ignore; - int skipped_for_proxy; + BOOL todo; + BOOL ignore; + BOOL skipped_for_proxy; }; struct info @@ -132,9 +132,9 @@ static const struct notification cache_test[] = { winhttp_send_request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 0, 1 }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, FALSE, TRUE }, { winhttp_open_request, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER }, { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER }, @@ -142,11 +142,11 @@ static const struct notification cache_test[] = { winhttp_send_request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1, 1 } + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, TRUE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, TRUE, TRUE } }; static void setup_test( struct info *info, enum api function, unsigned int line ) @@ -309,19 +309,19 @@ static const struct notification redirect_test[] = { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REDIRECT }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, 0, 0, 1 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, 0, 0, 1 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, 0, 0, 1 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, 0, 0, 1 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, FALSE, FALSE, TRUE }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, FALSE, FALSE, TRUE }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, FALSE, FALSE, TRUE }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, FALSE, FALSE, TRUE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REQUEST_SENT }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1, 1 } + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, TRUE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, TRUE, TRUE } }; static void test_redirect( void ) @@ -387,24 +387,24 @@ static const struct notification async_test[] = { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REDIRECT }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, 0, 0, 1 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, 0, 0, 1 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, 0, 0, 1 }, - { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, 0, 0, 1 }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, FALSE, FALSE, TRUE }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, FALSE, FALSE, TRUE }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, FALSE, FALSE, TRUE }, + { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, FALSE, FALSE, TRUE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_REQUEST_SENT }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE }, { winhttp_query_data, WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE }, - { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, 0, 1 }, - { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, 0, 1 }, - { winhttp_read_data, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 0, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1, 1 }, - { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 1, 1 } + { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, FALSE, TRUE }, + { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, FALSE, TRUE }, + { winhttp_read_data, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, FALSE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, TRUE, TRUE }, + { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, TRUE, TRUE } }; static void test_async( void )

1 0

Frédéric Delanoy : wininet: Use BOOL type where appropriate.
by Alexandre Julliard 27 Nov '13

27 Nov '13

Module: wine Branch: master Commit: 21618deb400f1eb1ce5ba0fd866fe0312c843407 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21618deb400f1eb1ce5ba0fd8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 27 08:51:58 2013 +0100 wininet: Use BOOL type where appropriate. --- dlls/wininet/internet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 73fdfe4..a49026c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -4631,7 +4631,7 @@ BOOL WINAPI ResumeSuspendedDownload( HINTERNET hInternet, DWORD dwError ) BOOL WINAPI InternetQueryFortezzaStatus(DWORD *a, DWORD_PTR b) { FIXME("(%p, %08lx) stub\n", a, b); - return 0; + return FALSE; } DWORD WINAPI ShowClientAuthCerts(HWND parent)

1 0

Frédéric Delanoy : wininet/tests: Use BOOL type where appropriate.
by Alexandre Julliard 27 Nov '13

27 Nov '13

Module: wine Branch: master Commit: 0940037301b2abdf308e147fdc8d065cefbd9f07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0940037301b2abdf308e147fd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 27 08:51:59 2013 +0100 wininet/tests: Use BOOL type where appropriate. --- dlls/wininet/tests/http.c | 128 ++++++++++++++++++++++---------------------- 1 files changed, 64 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0940037301b2abdf308e1…

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

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