August 2013 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Keep GL_UNPACK_CLIENT_STORAGE_APPLE off by default.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: a4f009d847671c5d5cd5fe07cfeb5348d75befb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4f009d847671c5d5cd5fe07c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 19 10:52:31 2013 +0200 wined3d: Keep GL_UNPACK_CLIENT_STORAGE_APPLE off by default. This is cleaner than the other way around and avoids side effects in code that wasn't written with client storage in mind. Contrary to the original intention, it also means fewer client storage toggle calls. --- dlls/wined3d/arb_program_shader.c | 12 ------------ dlls/wined3d/context.c | 7 ------- dlls/wined3d/device.c | 26 -------------------------- dlls/wined3d/surface.c | 17 ++++++++--------- dlls/wined3d/volume.c | 6 ------ 5 files changed, 8 insertions(+), 60 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 84c24cc..032ff14 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7102,12 +7102,6 @@ static void upload_palette(const struct wined3d_surface *surface, struct wined3d d3dfmt_p8_init_palette(surface, table, colorkey); - if (gl_info->supported[APPLE_CLIENT_STORAGE]) - { - gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE); - checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE)"); - } - if (!priv->palette_texture) gl_info->gl_ops.gl.p_glGenTextures(1, &priv->palette_texture); @@ -7124,12 +7118,6 @@ static void upload_palette(const struct wined3d_surface *surface, struct wined3d /* TODO: avoid unneeded uploads in the future by adding some SFLAG_PALETTE_DIRTY mechanism */ gl_info->gl_ops.gl.p_glTexImage1D(GL_TEXTURE_1D, 0, GL_RGBA, 256, 0, GL_RGBA, GL_UNSIGNED_BYTE, table); - if (gl_info->supported[APPLE_CLIENT_STORAGE]) - { - gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE); - checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE)"); - } - /* Switch back to unit 0 in which the 2D texture will be stored. */ context_active_texture(context, gl_info, 0); } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f09f1f7..123e9b1 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1564,13 +1564,6 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ALIGNMENT, device->surface_alignment); checkGLcall("glPixelStorei(GL_UNPACK_ALIGNMENT, device->surface_alignment);"); - if (gl_info->supported[APPLE_CLIENT_STORAGE]) - { - /* Most textures will use client storage if supported. Exceptions are - * non-native power of 2 textures and textures in DIB sections. */ - gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE); - checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE)"); - } if (gl_info->supported[ARB_VERTEX_BLEND]) { /* Direct3D always uses n-1 weights for n world matrices and uses diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7d532dd..1db04b4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -871,13 +871,6 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ * We emulate this by creating dummy textures and binding them * to each texture stage when the currently set D3D texture is NULL. */ - if (gl_info->supported[APPLE_CLIENT_STORAGE]) - { - /* The dummy texture does not have client storage backing */ - gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE); - checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE)"); - } - count = min(MAX_COMBINED_SAMPLERS, gl_info->limits.combined_samplers); for (i = 0; i < count; ++i) { @@ -941,13 +934,6 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ } } } - - if (gl_info->supported[APPLE_CLIENT_STORAGE]) - { - /* Re-enable because if supported it is enabled by default */ - gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE); - checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE)"); - } } /* Context activation is done by the caller. */ @@ -4648,12 +4634,6 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device context = context_acquire(device, NULL); - if (gl_info->supported[APPLE_CLIENT_STORAGE]) - { - gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE); - checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE)"); - } - invalidate_active_texture(device, context); /* Create a new cursor texture */ gl_info->gl_ops.gl.p_glGenTextures(1, &device->cursorTexture); @@ -4664,12 +4644,6 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device checkGLcall("glTexImage2D"); HeapFree(GetProcessHeap(), 0, mem); - if (gl_info->supported[APPLE_CLIENT_STORAGE]) - { - gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE); - checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE)"); - } - context_release(context); } else diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 83ff41f..c5dd301 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -694,7 +694,6 @@ static void surface_release_client_storage(struct wined3d_surface *surface) struct wined3d_context *context = context_acquire(surface->resource.device, NULL); const struct wined3d_gl_info *gl_info = context->gl_info; - gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE); if (surface->texture_name) { surface_bind_and_dirtify(surface, context, FALSE); @@ -707,7 +706,6 @@ static void surface_release_client_storage(struct wined3d_surface *surface) gl_info->gl_ops.gl.p_glTexImage2D(surface->texture_target, surface->texture_level, GL_RGB, 1, 1, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL); } - gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE); context_release(context); @@ -2642,7 +2640,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P static void surface_allocate_surface(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, BOOL srgb) { - BOOL enable_client_storage = FALSE; + BOOL disable_client_storage = FALSE; GLsizei width = surface->pow2Width; GLsizei height = surface->pow2Height; const BYTE *mem = NULL; @@ -2685,10 +2683,7 @@ static void surface_allocate_surface(struct wined3d_surface *surface, const stru * SFLAG_CONVERTED: The conversion destination memory is freed after loading the surface * allocatedMemory == NULL: Not defined in the extension. Seems to disable client storage effectively */ - gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE); - checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE)"); surface->flags &= ~SFLAG_CLIENT; - enable_client_storage = TRUE; } else { @@ -2699,6 +2694,10 @@ static void surface_allocate_surface(struct wined3d_surface *surface, const stru * PBO. Instead use heapMemory, but get the alignment right. */ mem = (BYTE *)(((ULONG_PTR)surface->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); + + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE); + checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE)"); + disable_client_storage = TRUE; } } @@ -2715,10 +2714,10 @@ static void surface_allocate_surface(struct wined3d_surface *surface, const stru checkGLcall("glTexImage2D"); } - if (enable_client_storage) + if (disable_client_storage) { - gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE); - checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE)"); + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE); + checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE)"); } } diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index a9cbafe..b4a8c64 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -92,12 +92,6 @@ void volume_load(const struct wined3d_volume *volume, struct wined3d_context *co volume->resource.width, volume->resource.height, volume->resource.depth, 0, format->glFormat, format->glType, volume->resource.allocatedMemory)); checkGLcall("glTexImage3D"); - - /* When adding code releasing volume->resource.allocatedMemory to save - * data keep in mind that GL_UNPACK_CLIENT_STORAGE_APPLE is enabled by - * default if supported(GL_APPLE_client_storage). Thus do not release - * volume->resource.allocatedMemory if GL_APPLE_client_storage is - * supported. */ } /* Do not call while under the GL lock. */

1 0

Alexandre Julliard : libwine: Add support for defining round-trip mappings using the Unicode private range .
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: 4f718ca07de5d3fd45ca97b438d3241488333128 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f718ca07de5d3fd45ca97b43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 19 18:59:40 2013 +0200 libwine: Add support for defining round-trip mappings using the Unicode private range. --- libs/wine/c_10003.c | 14 +++--- libs/wine/c_10081.c | 100 +++++++++++++++++++++++++-------------- libs/wine/c_28593.c | 121 ++++++++++++++++++++++++++++++----------------- libs/wine/c_28596.c | 132 +++++++++++++++++++++++++++++++------------------- libs/wine/c_28597.c | 106 ++++++++++++++++++++++++++--------------- libs/wine/c_28598.c | 132 +++++++++++++++++++++++++++++++-------------------- libs/wine/c_857.c | 110 ++++++++++++++++++++++++++---------------- libs/wine/c_864.c | 110 ++++++++++++++++++++++++++---------------- tools/make_unicode | 69 +++++++++++++++++---------- 9 files changed, 559 insertions(+), 335 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f718ca07de5d3fd45ca9…

1 0

Alexandre Julliard : libwine: Add support for codepage 10004 (Mac Arabic).
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: 23ddde8850010c54b57c3597d894b02a41dfdfbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=23ddde8850010c54b57c3597d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 19 19:00:55 2013 +0200 libwine: Add support for codepage 10004 (Mac Arabic). --- libs/wine/Makefile.in | 1 + libs/wine/c_10004.c | 770 +++++++++++++++++++++++++++++++++++++++++++++++++ libs/wine/cptable.c | 4 +- tools/make_unicode | 10 +- 4 files changed, 783 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=23ddde8850010c54b57c3…

1 0

Alexandre Julliard : libwine: Add support for codepage 10005 (Mac Hebrew).
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: 4be4ad827843ab8f0b1bddce6b660cc991d00308 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4be4ad827843ab8f0b1bddce6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 19 19:02:01 2013 +0200 libwine: Add support for codepage 10005 (Mac Hebrew). --- libs/wine/Makefile.in | 1 + libs/wine/c_10005.c | 787 +++++++++++++++++++++++++++++++++++++++++++++++++ libs/wine/cptable.c | 4 +- tools/make_unicode | 1 + 4 files changed, 792 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4be4ad827843ab8f0b1bd…

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStorage GetTypeInfoCount.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: cdcea0e8affa78f1c44bdab55076206324e26b8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdcea0e8affa78f1c44bdab55… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Aug 19 09:18:14 2013 +1000 mshtml: Implement IHTMLStorage GetTypeInfoCount. --- dlls/mshtml/htmlstorage.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index e0c4a53..544ab8a 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -95,8 +95,7 @@ static ULONG WINAPI HTMLStorage_Release(IHTMLStorage *iface) static HRESULT WINAPI HTMLStorage_GetTypeInfoCount(IHTMLStorage *iface, UINT *pctinfo) { HTMLStorage *This = impl_from_IHTMLStorage(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI HTMLStorage_GetTypeInfo(IHTMLStorage *iface, UINT iTInfo,

1 0

Alistair Leslie-Hughes : oledb32: Implement DataConvert DBTYPE_I2 -> VARIANT.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: 368cff7a5909b7a7bb65b42dc91b5caf0aeedf58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=368cff7a5909b7a7bb65b42dc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Aug 19 09:22:57 2013 +1000 oledb32: Implement DataConvert DBTYPE_I2 -> VARIANT. --- dlls/oledb32/convert.c | 5 +++++ dlls/oledb32/tests/convert.c | 12 ++++++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index fba9025..36448d3 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -878,6 +878,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, V_BOOL(v) = *(VARIANT_BOOL*)src; hr = S_OK; break; + case DBTYPE_I2: + V_VT(v) = VT_I2; + V_I2(v) = *(signed short*)src; + hr = S_OK; + break; case DBTYPE_I4: V_VT(v) = VT_I4; V_I4(v) = *(signed int*)src; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 61607a9..b42b4df 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2666,6 +2666,7 @@ static void test_converttovar(void) CY cy, cy2; DATE date; INT i4; + signed short i2; LARGE_INTEGER i8; VARIANT_BOOL boolean = VARIANT_TRUE; FLOAT fvalue = 543.21f; @@ -2746,6 +2747,17 @@ static void test_converttovar(void) V_VT(&dst) = VT_EMPTY; dst_len = 0; dst_status = DBSTATUS_S_DEFAULT; + i2 = 123; + hr = IDataConvert_DataConvert(convert, DBTYPE_I2, DBTYPE_VARIANT, sizeof(i2), &dst_len, &i2, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(V_VT(&dst) == VT_I2, "got %d\n", V_VT(&dst)); + ok(V_I2(&dst) == 123, "got %d\n", V_I2(&dst)); + + V_VT(&dst) = VT_EMPTY; + dst_len = 0; + dst_status = DBSTATUS_S_DEFAULT; date = 123.123; hr = IDataConvert_DataConvert(convert, DBTYPE_DATE, DBTYPE_VARIANT, sizeof(date), &dst_len, &date, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == S_OK, "got %08x\n", hr);

1 0

Hans Leidekker : winhttp: Allow setting NULL username and password for NTLM , Passport and Negotiate.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: 78fc21cdb5773724735e1d48af2eaf52ea6c7ef1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78fc21cdb5773724735e1d48a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Aug 19 15:52:25 2013 +0200 winhttp: Allow setting NULL username and password for NTLM, Passport and Negotiate. --- dlls/winhttp/request.c | 17 ++++++++++++----- dlls/winhttp/tests/winhttp.c | 21 +++++++++++++++++++++ 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 3b91c75..00c2238 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1668,7 +1668,8 @@ static BOOL do_authorization( request_t *request, DWORD target, DWORD scheme_fla static BOOL set_credentials( request_t *request, DWORD target, DWORD scheme, const WCHAR *username, const WCHAR *password ) { - if (!username || !password) + if ((scheme == WINHTTP_AUTH_SCHEME_BASIC || scheme == WINHTTP_AUTH_SCHEME_DIGEST) && + (!username || !password)) { set_last_error( ERROR_INVALID_PARAMETER ); return FALSE; @@ -1678,17 +1679,23 @@ static BOOL set_credentials( request_t *request, DWORD target, DWORD scheme, con case WINHTTP_AUTH_TARGET_SERVER: { heap_free( request->connect->username ); - if (!(request->connect->username = strdupW( username ))) return FALSE; + if (!username) request->connect->username = NULL; + else if (!(request->connect->username = strdupW( username ))) return FALSE; + heap_free( request->connect->password ); - if (!(request->connect->password = strdupW( password ))) return FALSE; + if (!password) request->connect->password = NULL; + else if (!(request->connect->password = strdupW( password ))) return FALSE; break; } case WINHTTP_AUTH_TARGET_PROXY: { heap_free( request->connect->session->proxy_username ); - if (!(request->connect->session->proxy_username = strdupW( username ))) return FALSE; + if (!username) request->connect->session->proxy_username = NULL; + else if (!(request->connect->session->proxy_username = strdupW( username ))) return FALSE; + heap_free( request->connect->session->proxy_password ); - if (!(request->connect->session->proxy_password = strdupW( password ))) return FALSE; + if (!password) request->connect->session->proxy_password = NULL; + else if (!(request->connect->session->proxy_password = strdupW( password ))) return FALSE; break; } default: diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 6b946a9..87ddcb0 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1959,6 +1959,27 @@ static void test_basic_authentication(int port) ok(ret, "failed to query status code %u\n", GetLastError()); ok(status == 401, "request failed unexpectedly %u\n", status); + ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_NTLM, NULL, NULL, NULL); + ok(ret, "failed to set credentials %u\n", GetLastError()); + + ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_PASSPORT, NULL, NULL, NULL); + ok(ret, "failed to set credentials %u\n", GetLastError()); + + ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_NEGOTIATE, NULL, NULL, NULL); + ok(ret, "failed to set credentials %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_DIGEST, NULL, NULL, NULL); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + + SetLastError(0xdeadbeef); + ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, NULL, NULL, NULL); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + SetLastError(0xdeadbeef); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, userW, NULL, NULL); error = GetLastError();

1 0

Hans Leidekker : winhttp: Fix invalid parameter handling in WinHttpQueryAuthSchemes.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: fe678927dd12ba597d4886418cd72f194954f7fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe678927dd12ba597d4886418… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Aug 19 15:52:44 2013 +0200 winhttp: Fix invalid parameter handling in WinHttpQueryAuthSchemes. --- dlls/winhttp/request.c | 11 ++++++- dlls/winhttp/tests/winhttp.c | 72 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 72 insertions(+), 11 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 00c2238..35a0deb 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1270,12 +1270,14 @@ static BOOL query_auth_schemes( request_t *request, DWORD level, LPDWORD support return FALSE; } scheme = auth_scheme_from_header( buffer ); + heap_free( buffer ); + if (!scheme) break; + if (first && index == 1) *first = *supported = scheme; else *supported |= scheme; - heap_free( buffer ); ret = TRUE; } return ret; @@ -1302,6 +1304,13 @@ BOOL WINAPI WinHttpQueryAuthSchemes( HINTERNET hrequest, LPDWORD supported, LPDW set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_TYPE ); return FALSE; } + if (!supported || !first || !target) + { + release_object( &request->hdr ); + set_last_error( ERROR_INVALID_PARAMETER ); + return FALSE; + + } if (query_auth_schemes( request, WINHTTP_QUERY_WWW_AUTHENTICATE, supported, first )) { diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 87ddcb0..3157a44 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1881,7 +1881,7 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) { HINTERNET ses, con, req; char buffer[0x100]; - DWORD count, status, size, supported, first, target; + DWORD count, status, size, error, supported, first, target; BOOL ret; ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); @@ -1904,12 +1904,15 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) ok(ret, "failed to query status code %u\n", GetLastError()); ok(status == 200, "request failed unexpectedly %u\n", status); - supported = first = target = 0xffff; + supported = first = target = 0xdeadbeef; + SetLastError(0xdeadbeef); ret = WinHttpQueryAuthSchemes(req, &supported, &first, &target); + error = GetLastError(); ok(!ret, "unexpected success\n"); - ok(supported == 0xffff, "got %x\n", supported); - ok(first == 0xffff, "got %x\n", first); - ok(target == 0xffff, "got %x\n", target); + todo_wine ok(error == ERROR_INVALID_OPERATION, "expected ERROR_INVALID_OPERATION, got %u\n", error); + ok(supported == 0xdeadbeef, "got %x\n", supported); + ok(first == 0xdeadbeef, "got %x\n", first); + ok(target == 0xdeadbeef, "got %x\n", target); count = 0; memset(buffer, 0, sizeof(buffer)); @@ -1941,12 +1944,54 @@ static void test_basic_authentication(int port) req = WinHttpOpenRequest(con, NULL, authW, NULL, NULL, NULL, 0); ok(req != NULL, "failed to open a request %u\n", GetLastError()); - supported = first = target = 0xffff; + SetLastError(0xdeadbeef); + ret = WinHttpQueryAuthSchemes(NULL, NULL, NULL, NULL); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %u\n", error); + + SetLastError(0xdeadbeef); + ret = WinHttpQueryAuthSchemes(req, NULL, NULL, NULL); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_INVALID_PARAMETER || error == ERROR_INVALID_OPERATION, "got %u\n", error); + + supported = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = WinHttpQueryAuthSchemes(req, &supported, NULL, NULL); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_INVALID_PARAMETER || error == ERROR_INVALID_OPERATION, "got %u\n", error); + ok(supported == 0xdeadbeef, "got %x\n", supported); + + supported = first = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = WinHttpQueryAuthSchemes(req, &supported, &first, NULL); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_INVALID_PARAMETER || error == ERROR_INVALID_OPERATION, "got %u\n", error); + ok(supported == 0xdeadbeef, "got %x\n", supported); + ok(first == 0xdeadbeef, "got %x\n", first); + + supported = first = target = 0xdeadbeef; + SetLastError(0xdeadbeef); ret = WinHttpQueryAuthSchemes(req, &supported, &first, &target); - ok(!ret, "unexpected success\n"); - ok(supported == 0xffff, "got %x\n", supported); - ok(first == 0xffff, "got %x\n", first); - ok(target == 0xffff, "got %x\n", target); + error = GetLastError(); + ok(!ret, "expected failure\n"); + todo_wine ok(error == ERROR_INVALID_OPERATION, "expected ERROR_INVALID_OPERATION, got %u\n", error); + ok(supported == 0xdeadbeef, "got %x\n", supported); + ok(first == 0xdeadbeef, "got %x\n", first); + ok(target == 0xdeadbeef, "got %x\n", target); + + supported = first = target = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = WinHttpQueryAuthSchemes(NULL, &supported, &first, &target); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %u\n", error); + ok(supported == 0xdeadbeef, "got %x\n", supported); + ok(first == 0xdeadbeef, "got %x\n", first); + ok(target == 0xdeadbeef, "got %x\n", target); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); ok(ret, "failed to send request %u\n", GetLastError()); @@ -1959,6 +2004,13 @@ static void test_basic_authentication(int port) ok(ret, "failed to query status code %u\n", GetLastError()); ok(status == 401, "request failed unexpectedly %u\n", status); + supported = first = target = 0xdeadbeef; + ret = WinHttpQueryAuthSchemes(req, &supported, &first, &target); + ok(ret, "failed to query authentication schemes %u\n", GetLastError()); + ok(supported == WINHTTP_AUTH_SCHEME_BASIC, "got %x\n", supported); + ok(first == WINHTTP_AUTH_SCHEME_BASIC, "got %x\n", first); + ok(target == WINHTTP_AUTH_TARGET_SERVER, "got %x\n", target); + ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_NTLM, NULL, NULL, NULL); ok(ret, "failed to set credentials %u\n", GetLastError());

1 0

Jacek Caban : evcode.h: Added some missing defines.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: c52282fe7b36a2c168bdc36097b27ef1d756c5fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c52282fe7b36a2c168bdc3609… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 19 13:14:50 2013 +0200 evcode.h: Added some missing defines. --- include/evcode.h | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/include/evcode.h b/include/evcode.h index 3cbdd9d..b62ff6a 100644 --- a/include/evcode.h +++ b/include/evcode.h @@ -35,6 +35,7 @@ #define EC_QUALITY_CHANGE 0x0B #define EC_SHUTTING_DOWN 0x0C #define EC_CLOCK_CHANGED 0x0D +#define EC_PAUSED 0x0E #define EC_OPENING_FILE 0x10 #define EC_BUFFERING_DATA 0x11 #define EC_FULLSCREEN_LOST 0x12 @@ -50,5 +51,44 @@ #define EC_END_OF_SEGMENT 0x1C #define EC_SEGMENT_STARTED 0x1D #define EC_LENGTH_CHANGED 0x1E +#define EC_DEVICE_LOST 0x1F +#define EC_SAMPLE_NEEDED 0x20 +#define EC_PROCESSING_LATENCY 0x21 +#define EC_SAMPLE_LATENCY 0x22 +#define EC_SCRUB_TIME 0x23 +#define EC_STEP_COMPLETE 0x24 + +#define EC_NEW_PIN 0x20 +#define EC_RENDER_FINISHED 0x21 + +#define EC_TIMECODE_AVAILABLE 0x30 +#define EC_EXTDEVICE_MODE_CHANGE 0x31 +#define EC_STATE_CHANGE 0x32 + +#define EC_PLEASE_REOPEN 0x40 +#define EC_STATUS 0x41 +#define EC_MARKER_HIT 0x42 +#define EC_LOADSTATUS 0x43 +#define EC_FILE_CLOSED 0x44 +#define EC_ERRORABORTEX 0x45 +#define EC_EOS_SOON 0x46 +#define EC_CONTENTPROPERTY_CHANGED 0x47 +#define EC_BANDWIDTHCHANGE 0x48 +#define EC_VIDEOFRAMEREADY 0x49 +#define EC_GRAPH_CHANGED 0x50 +#define EC_CLOCK_UNSET 0x51 + +#define EC_VMR_RENDERDEVICE_SET 0x53 +#define EC_VMR_SURFACE_FLIPPED 0x54 +#define EC_VMR_RECONNECTION_FAILED 0x55 +#define EC_PREPROCESS_COMPLETE 0x56 +#define EC_CODECAPI_EVENT 0x57 + +#define EC_BUILT 0x300 +#define EC_UNBUILT 0x301 + +#define EC_WMT_EVENT_BASE 0x0251 +#define EC_WMT_INDEX_EVENT EC_WMT_EVENT_BASE +#define EC_WMT_EVENT EC_WMT_EVENT_BASE+1 #endif /* __WINE_EVCODE_H */

1 0

Jacek Caban : rpcndr.h: Added EXTERN_GUID define.
by Alexandre Julliard 19 Aug '13

19 Aug '13

Module: wine Branch: master Commit: 6261ab2686434426874a6b804f920abb24df9fbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=6261ab2686434426874a6b804… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 19 16:47:36 2013 +0200 rpcndr.h: Added EXTERN_GUID define. --- include/rpcndr.h | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/rpcndr.h b/include/rpcndr.h index 514f1ce..bc895a5 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -37,6 +37,18 @@ extern "C" { # define CONST_VTBL #endif +#ifdef __cplusplus +#define EXTERN_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + EXTERN_C const GUID DECLSPEC_SELECTANY name DECLSPEC_HIDDEN; \ + EXTERN_C const GUID DECLSPEC_SELECTANY name = \ + { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } +#else +#define EXTERN_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + const GUID DECLSPEC_SELECTANY name DECLSPEC_HIDDEN; \ + const GUID DECLSPEC_SELECTANY name = \ + { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } +#endif + /* stupid #if can't handle casts... this __stupidity is just a workaround for that limitation */

1 0