wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

Piotr Caban : msvcrt: Fix parameters conversion in wcsftime function.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: 7dfb21a9db18555666b24e5b1ad9324581c75af6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dfb21a9db18555666b24e5b1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 10 17:18:02 2016 +0200 msvcrt: Fix parameters conversion in wcsftime function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 50a27ec..e6e3eee 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1254,15 +1254,14 @@ MSVCRT_size_t CDECL MSVCRT_wcsftime( MSVCRT_wchar_t *str, MSVCRT_size_t max, TRACE("%p %ld %s %p\n", str, max, debugstr_w(format), mstm ); - len = WideCharToMultiByte( CP_UNIXCP, 0, format, -1, NULL, 0, NULL, NULL ); + len = MSVCRT_wcstombs( NULL, format, 0 ) + 1; if (!(fmt = MSVCRT_malloc( len ))) return 0; - WideCharToMultiByte( CP_UNIXCP, 0, format, -1, fmt, len, NULL, NULL ); + MSVCRT_wcstombs(fmt, format, len); if ((s = MSVCRT_malloc( max*4 ))) { if (!MSVCRT_strftime( s, max*4, fmt, mstm )) s[0] = 0; - len = MultiByteToWideChar( CP_UNIXCP, 0, s, -1, str, max ); - if (len) len--; + len = MSVCRT_mbstowcs( str, s, max ); MSVCRT_free( s ); } else len = 0;

1 0

Iván Matellanes : include/msvcrt: Ensure integer limits are given the correct type.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: 4f71f42910e705ba4d5a59d58bb33f8bdc8ffce0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f71f42910e705ba4d5a59d58… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Aug 10 15:56:06 2016 +0100 include/msvcrt: Ensure integer limits are given the correct type. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/limits.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/msvcrt/limits.h b/include/msvcrt/limits.h index ece8c68..1eb1561 100644 --- a/include/msvcrt/limits.h +++ b/include/msvcrt/limits.h @@ -22,11 +22,11 @@ #define SHRT_MAX 0x7fff #define USHRT_MAX 0xffff -#define INT_MIN (-0x80000000) +#define INT_MIN (-0x7fffffff - 1) #define INT_MAX 0x7fffffff -#define UINT_MAX 0xffffffff +#define UINT_MAX 0xffffffffU -#define LONG_MIN (-0x80000000L) +#define LONG_MIN (-0x7fffffffL - 1L) #define LONG_MAX 0x7fffffffL #define ULONG_MAX 0xffffffffUL

1 0

Piotr Caban : msvcrt: Don't set frame to 0 in x86_64 _setjmp.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: 882980c17a9a033fa8e49a4c116af9583698d218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=882980c17a9a033fa8e49a4c1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 10 15:17:16 2016 +0200 msvcrt: Don't set frame to 0 in x86_64 _setjmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index d6d4b04..69daf2e 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -613,7 +613,6 @@ unsigned int CDECL __CxxQueryExceptionSize(void) * _setjmp (MSVCRT.@) */ __ASM_GLOBAL_FUNC( MSVCRT__setjmp, - "xorq %rdx,%rdx\n\t" /* frame */ "jmp " __ASM_NAME("MSVCRT__setjmpex") ); /*******************************************************************

1 0

Józef Kucia : wined3d: Do not enable blending for edge/line antialiasing.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: eaa20836d245782d60b944a765cdbd966eccd281 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaa20836d245782d60b944a76… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 10 11:38:42 2016 +0200 wined3d: Do not enable blending for edge/line antialiasing. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 4 +-- dlls/d3d11/tests/d3d11.c | 4 +-- dlls/d3d8/tests/visual.c | 4 +-- dlls/d3d9/tests/visual.c | 4 +-- dlls/ddraw/tests/ddraw2.c | 4 +-- dlls/ddraw/tests/ddraw4.c | 4 +-- dlls/ddraw/tests/ddraw7.c | 4 +-- dlls/wined3d/state.c | 67 +++++++++++++++++++++---------------------- 8 files changed, 46 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eaa20836d245782d60b94…

1 0

Józef Kucia : ddraw/tests: Add tests for edge antialiasing blending.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: b808b0758db3b26506a80ac4bd8822cf3a7a6709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b808b0758db3b26506a80ac4b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 10 11:38:41 2016 +0200 ddraw/tests: Add tests for edge antialiasing blending. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 210 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 226 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 206 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 642 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b808b0758db3b26506a80…

1 0

Alistair Leslie-Hughes : d3dx11: Add D3DX11CompileFromFileA/W stub.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: 2bee102353aab551a5e274624acb32358f0b72c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bee102353aab551a5e274624… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 10 04:40:39 2016 +0000 d3dx11: Add D3DX11CompileFromFileA/W stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_42/d3dx11_42.spec | 4 ++-- dlls/d3dx11_43/async.c | 24 ++++++++++++++++++++++++ dlls/d3dx11_43/d3dx11_43.spec | 4 ++-- include/d3dx11async.h | 8 ++++++++ 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index 632e201..cb02a95 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -1,6 +1,6 @@ @ stdcall D3DX11CheckVersion(long long) -@ stub D3DX11CompileFromFileA -@ stub D3DX11CompileFromFileW +@ stdcall D3DX11CompileFromFileA(str ptr ptr str str long long ptr ptr ptr ptr) +@ stdcall D3DX11CompileFromFileW(wstr ptr ptr str str long long ptr ptr ptr ptr) @ stdcall D3DX11CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr) @ stub D3DX11CompileFromResourceA @ stub D3DX11CompileFromResourceW diff --git a/dlls/d3dx11_43/async.c b/dlls/d3dx11_43/async.c index 2c17ffb..b33c235 100644 --- a/dlls/d3dx11_43/async.c +++ b/dlls/d3dx11_43/async.c @@ -41,3 +41,27 @@ HRESULT WINAPI D3DX11CompileFromMemory(const char *data, SIZE_T data_size, const return D3DCompile(data, data_size, filename, defines, include, entry_point, target, sflags, eflags, shader, error_messages); } + +HRESULT WINAPI D3DX11CompileFromFileA(const char *filename, const D3D10_SHADER_MACRO *defines, + ID3D10Include *include, const char *entry_point, const char *target, UINT sflags, UINT eflags, + ID3DX11ThreadPump *pump, ID3D10Blob **shader, ID3D10Blob **error_messages, HRESULT *hresult) +{ + FIXME("filename %s, defines %p, include %p, entry_point %s, target %s, sflags %#x, " + "eflags %#x, pump %p, shader %p, error_messages %p, hresult %p stub.\n", + debugstr_a(filename), defines, include, debugstr_a(entry_point), debugstr_a(target), + sflags, eflags, pump, shader, error_messages, hresult); + + return E_NOTIMPL; +} + +HRESULT WINAPI D3DX11CompileFromFileW(const WCHAR *filename, const D3D10_SHADER_MACRO *defines, + ID3D10Include *include, const char *entry_point, const char *target, UINT sflags, UINT eflags, + ID3DX11ThreadPump *pump, ID3D10Blob **shader, ID3D10Blob **error_messages, HRESULT *hresult) +{ + FIXME("filename %s, defines %p, include %p, entry_point %s, target %s, sflags %#x, " + "eflags %#x, pump %p, shader %p, error_messages %p, hresult %p stub.\n", + debugstr_w(filename), defines, include, debugstr_a(entry_point), debugstr_a(target), + sflags, eflags, pump, shader, error_messages, hresult); + + return E_NOTIMPL; +} diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec index cb76d5f..69c12fb 100644 --- a/dlls/d3dx11_43/d3dx11_43.spec +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -1,6 +1,6 @@ @ stdcall D3DX11CheckVersion(long long) -@ stub D3DX11CompileFromFileA -@ stub D3DX11CompileFromFileW +@ stdcall D3DX11CompileFromFileA(str ptr ptr str str long long ptr ptr ptr ptr) +@ stdcall D3DX11CompileFromFileW(wstr ptr ptr str str long long ptr ptr ptr ptr) @ stdcall D3DX11CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr) @ stub D3DX11CompileFromResourceA @ stub D3DX11CompileFromResourceW diff --git a/include/d3dx11async.h b/include/d3dx11async.h index 210067b..ab4b507 100644 --- a/include/d3dx11async.h +++ b/include/d3dx11async.h @@ -30,6 +30,14 @@ HRESULT WINAPI D3DX11CompileFromMemory(const char *data, SIZE_T data_size, const const char *target, UINT sflags, UINT eflags, ID3DX11ThreadPump *pump, ID3D10Blob **shader, ID3D10Blob **error_messages, HRESULT *hresult); +HRESULT WINAPI D3DX11CompileFromFileA(const char *filename, const D3D10_SHADER_MACRO *defines, + ID3D10Include *include, const char *entry_point, const char *target, UINT sflags, UINT eflags, + ID3DX11ThreadPump *pump, ID3D10Blob **shader, ID3D10Blob **error_messages, HRESULT *hresult); + +HRESULT WINAPI D3DX11CompileFromFileW(const WCHAR *filename, const D3D10_SHADER_MACRO *defines, + ID3D10Include *include, const char *entry_point, const char *target, UINT sflags, UINT eflags, + ID3DX11ThreadPump *pump, ID3D10Blob **shader, ID3D10Blob **error_messages, HRESULT *hresult); + #ifdef __cplusplus } #endif

1 0

Andrey Gusev : d3dx10: Add D3DX10CreateEffectPoolFromFileA/W stubs.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: 2d16a9d01af458ba263c04d8b1a45f7bab4ecb87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d16a9d01af458ba263c04d8b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun Aug 7 23:40:25 2016 +0300 d3dx10: Add D3DX10CreateEffectPoolFromFileA/W stubs. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/async.c | 24 ++++++++++++++++++++++++ dlls/d3dx10_43/d3dx10_43.spec | 4 ++-- include/d3dx10async.h | 8 ++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index f70b0c1..36110d2 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -43,3 +43,27 @@ HRESULT WINAPI D3DX10CompileFromMemory(const char *data, SIZE_T data_size, const return D3DCompile(data, data_size, filename, defines, include, entry_point, target, sflags, eflags, shader, error_messages); } + +HRESULT WINAPI D3DX10CreateEffectPoolFromFileA(const char *filename, const D3D10_SHADER_MACRO *defines, + ID3D10Include *include, const char *profile, UINT hlslflags, UINT fxflags, ID3D10Device *device, + ID3DX10ThreadPump *pump, ID3D10EffectPool **effectpool, ID3D10Blob **errors, HRESULT *hresult) +{ + FIXME("filename %s, defines %p, include %p, profile %s, hlslflags %#x, fxflags %#x, device %p, " + "pump %p, effectpool %p, errors %p, hresult %p, stub!\n", + debugstr_a(filename), defines, include, debugstr_a(profile), hlslflags, fxflags, device, + pump, effectpool, errors, hresult); + + return E_NOTIMPL; +} + +HRESULT WINAPI D3DX10CreateEffectPoolFromFileW(const WCHAR *filename, const D3D10_SHADER_MACRO *defines, + ID3D10Include *include, const char *profile, UINT hlslflags, UINT fxflags, ID3D10Device *device, + ID3DX10ThreadPump *pump, ID3D10EffectPool **effectpool, ID3D10Blob **errors, HRESULT *hresult) +{ + FIXME("filename %s, defines %p, include %p, profile %s, hlslflags %#x, fxflags %#x, device %p, " + "pump %p, effectpool %p, errors %p, hresult %p, stub!\n", + debugstr_w(filename), defines, include, debugstr_a(profile), hlslflags, fxflags, device, + pump, effectpool, errors, hresult); + + return E_NOTIMPL; +} diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 7795cc8..61f16fe 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -25,8 +25,8 @@ @ stdcall D3DX10CreateEffectFromMemory(ptr long str ptr ptr str long long ptr ptr ptr ptr ptr ptr) @ stub D3DX10CreateEffectFromResourceA(long str str ptr ptr str long long ptr ptr ptr ptr ptr ptr) @ stub D3DX10CreateEffectFromResourceW(long wstr wstr ptr ptr str long long ptr ptr ptr ptr ptr ptr) -@ stub D3DX10CreateEffectPoolFromFileA(str ptr ptr str long long ptr ptr ptr ptr ptr) -@ stub D3DX10CreateEffectPoolFromFileW(wstr ptr ptr str long long ptr ptr ptr ptr ptr) +@ stdcall D3DX10CreateEffectPoolFromFileA(str ptr ptr str long long ptr ptr ptr ptr ptr) +@ stdcall D3DX10CreateEffectPoolFromFileW(wstr ptr ptr str long long ptr ptr ptr ptr ptr) @ stdcall D3DX10CreateEffectPoolFromMemory(ptr long str ptr ptr str long long ptr ptr ptr ptr ptr) @ stub D3DX10CreateEffectPoolFromResourceA(long str str ptr ptr str long long ptr ptr ptr ptr ptr) @ stub D3DX10CreateEffectPoolFromResourceW(long wstr wstr ptr ptr str long long ptr ptr ptr ptr ptr) diff --git a/include/d3dx10async.h b/include/d3dx10async.h index d195d3a..364ad12 100644 --- a/include/d3dx10async.h +++ b/include/d3dx10async.h @@ -41,6 +41,14 @@ HRESULT WINAPI D3DX10CreateEffectFromMemory(const void *data, SIZE_T datasize, c UINT fxflags, ID3D10Device *device, ID3D10EffectPool *effectpool, ID3DX10ThreadPump *pump, ID3D10Effect **effect, ID3D10Blob **errors, HRESULT *hresult); +HRESULT WINAPI D3DX10CreateEffectPoolFromFileA(const char *filename, const D3D10_SHADER_MACRO *defines, + ID3D10Include *include, const char *profile, UINT hlslflags, UINT fxflags, ID3D10Device *device, + ID3DX10ThreadPump *pump, ID3D10EffectPool **effectpool, ID3D10Blob **errors, HRESULT *hresult); + +HRESULT WINAPI D3DX10CreateEffectPoolFromFileW(const WCHAR *filename, const D3D10_SHADER_MACRO *defines, + ID3D10Include *include, const char *profile, UINT hlslflags, UINT fxflags, ID3D10Device *device, + ID3DX10ThreadPump *pump, ID3D10EffectPool **effectpool, ID3D10Blob **errors, HRESULT *hresult); + HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(const void *data, SIZE_T datasize, const char *filename, const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *profile, UINT hlslflags, UINT fxflags, ID3D10Device *device, ID3DX10ThreadPump *pump, ID3D10EffectPool **effectpool,

1 0

Sebastian Lackner : services: Fix handling of user defined service controls.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: cbc5de1c5fb6504c3d52635043268b5306aa9d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbc5de1c5fb6504c3d5263504… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 10 10:42:35 2016 +0200 services: Fix handling of user defined service controls. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 3 +++ programs/services/tests/service.c | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 17900cc..4036f7d 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -941,6 +941,9 @@ static BOOL service_accepts_control(const struct service_entry *service, DWORD d { DWORD a = service->status.dwControlsAccepted; + if (dwControl >= 128 && dwControl <= 255) + return TRUE; + switch (dwControl) { case SERVICE_CONTROL_INTERROGATE: diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index 85b8e86..fea6363 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -83,6 +83,9 @@ static DWORD WINAPI service_handler(DWORD ctrl, DWORD event_type, void *event_da SetServiceStatus(service_handle, &status); SetEvent(service_stop_event); return NO_ERROR; + case 128: + service_event("CUSTOM"); + return 0xdeadbeef; default: status.dwCurrentState = SERVICE_RUNNING; SetServiceStatus( service_handle, &status ); @@ -346,6 +349,10 @@ static void test_service(void) ok(status.dwCheckPoint == 0, "status.dwCheckPoint = %d\n", status.dwCheckPoint); todo_wine ok(status.dwWaitHint == 0, "status.dwWaitHint = %d\n", status.dwWaitHint); + res = ControlService(service_handle, 128, &status); + ok(res, "ControlService failed: %u\n", GetLastError()); + expect_event("CUSTOM"); + res = ControlService(service_handle, SERVICE_CONTROL_STOP, &status); ok(res, "ControlService failed: %u\n", GetLastError()); expect_event("STOP");

1 0

Hans Leidekker : webservices/tests: Add tests for WsSetHeader.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: 31d8d19890ddb98c6459cdf42dcd86175257bb8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=31d8d19890ddb98c6459cdf42… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 10 13:13:57 2016 +0200 webservices/tests: Add tests for WsSetHeader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/msg.c | 69 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index 24ec0bd..ea44c07 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -523,6 +523,74 @@ static void test_WsWriteBody(void) WsFreeWriter( writer ); } +static void test_WsSetHeader(void) +{ + static const char expected[] = + "<s:Envelope xmlns:a=\"http://www.w3.org/2005/08/addressing\" " + "xmlns:s=\"http://www.w3.org/2003/05/soap-envelope\"><s:Header>" + "<a:MessageID>urn:uuid:00000000-0000-0000-0000-000000000000</a:MessageID>" + "<a:Action s:mustUnderstand=\"1\">action</a:Action></s:Header>" + "<s:Body/></s:Envelope>"; + static const char expected2[] = + "<s:Envelope xmlns:a=\"http://www.w3.org/2005/08/addressing\" " + "xmlns:s=\"http://www.w3.org/2003/05/soap-envelope\"><s:Header>" + "<a:MessageID>urn:uuid:00000000-0000-0000-0000-000000000000</a:MessageID>" + "<a:Action s:mustUnderstand=\"1\">action2</a:Action></s:Header>" + "<s:Body/></s:Envelope>"; + static const WCHAR action[] = {'a','c','t','i','o','n',0}; + static const WS_XML_STRING action2 = {7, (BYTE *)"action2"}; + HRESULT hr; + WS_MESSAGE *msg; + WS_XML_WRITER *writer; + const WCHAR *ptr = action; + + hr = WsSetHeader( NULL, 0, 0, 0, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateMessage( WS_ADDRESSING_VERSION_1_0, WS_ENVELOPE_VERSION_SOAP_1_2, NULL, 0, &msg, + NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSetHeader( msg, 0, 0, 0, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsSetHeader( msg, WS_ACTION_HEADER, WS_WSZ_TYPE, WS_WRITE_REQUIRED_POINTER, &ptr, + sizeof(ptr), NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSetHeader( msg, 0, WS_WSZ_TYPE, WS_WRITE_REQUIRED_POINTER, &ptr, sizeof(ptr), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsSetHeader( msg, WS_ACTION_HEADER, WS_WSZ_TYPE, WS_WRITE_REQUIRED_POINTER, &ptr, + sizeof(ptr), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_header( msg, expected, -1, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); + + hr = WsCreateWriter( NULL, 0, &writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEnvelopeStart( msg, writer, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, expected, 250, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); + check_output_header( msg, expected, -1, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); + + /* called after WsWriteEnvelopeStart */ + hr = WsSetHeader( msg, WS_ACTION_HEADER, WS_XML_STRING_TYPE, WS_WRITE_REQUIRED_VALUE, &action2, + sizeof(action2), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, expected, 250, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); + check_output_header( msg, expected2, -1, strstr(expected2, "urn:uuid:") - expected2, 46, __LINE__ ); + + WsFreeMessage( msg ); + WsFreeWriter( writer ); +} + START_TEST(msg) { test_WsCreateMessage(); @@ -532,4 +600,5 @@ START_TEST(msg) test_WsWriteEnvelopeStart(); test_WsWriteEnvelopeEnd(); test_WsWriteBody(); + test_WsSetHeader(); }

1 0

Hans Leidekker : webservices: Also write user supplied headers in WsWriteEnvelopeStart.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: be24b74a5f3b14e1ad2d6720f91e919683bd1a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be24b74a5f3b14e1ad2d6720f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 10 13:13:56 2016 +0200 webservices: Also write user supplied headers in WsWriteEnvelopeStart. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 55 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 50 insertions(+), 5 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 2c8fb3b..ecbc31d 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -379,15 +379,55 @@ static HRESULT get_addr_namespace( WS_ADDRESSING_VERSION ver, WS_XML_STRING *str } } +static const WS_XML_STRING *get_header_name( WS_HEADER_TYPE type ) +{ + static const WS_XML_STRING action = {6, (BYTE *)"Action"}, to = {2, (BYTE *)"To"}; + static const WS_XML_STRING msgid = {9, (BYTE *)"MessageID"}, relto = {9, (BYTE *)"RelatesTo"}; + static const WS_XML_STRING from = {4, (BYTE *)"From"}, replyto = {7, (BYTE *)"ReplyTo"}; + static const WS_XML_STRING faultto = {7, (BYTE *)"FaultTo"}; + + switch (type) + { + case WS_ACTION_HEADER: return &action; + case WS_TO_HEADER: return &to; + case WS_MESSAGE_ID_HEADER: return &msgid; + case WS_RELATES_TO_HEADER: return &relto; + case WS_FROM_HEADER: return &from; + case WS_REPLY_TO_HEADER: return &replyto; + case WS_FAULT_TO_HEADER: return &faultto; + default: + ERR( "unknown type %u\n", type ); + return NULL; + } +} + +static HRESULT write_header( WS_XML_WRITER *writer, const struct header *header ) +{ + static const WS_XML_STRING prefix_s = {1, (BYTE *)"s"}, prefix_a = {1, (BYTE *)"a"}; + static const WS_XML_STRING understand = {14, (BYTE *)"mustUnderstand"}, ns = {0, NULL}; + const WS_XML_STRING *localname = get_header_name( header->type ); + WS_XML_INT32_TEXT one = {{WS_XML_TEXT_TYPE_INT32}, 1}; + HRESULT hr; + + if ((hr = WsWriteStartElement( writer, &prefix_a, localname, &ns, NULL )) != S_OK) return hr; + if ((hr = WsWriteStartAttribute( writer, &prefix_s, &understand, &ns, FALSE, NULL )) != S_OK) return hr; + if ((hr = WsWriteText( writer, &one.text, NULL )) != S_OK) return hr; + if ((hr = WsWriteEndAttribute( writer, NULL )) != S_OK) return hr; + if ((hr = WsWriteText( writer, &header->text.text, NULL )) != S_OK) return hr; + return WsWriteEndElement( writer, NULL ); +} + static HRESULT write_envelope_start( struct msg *msg, WS_XML_WRITER *writer ) { static const char anonymous[] = "http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous"; - WS_XML_STRING prefix_s = {1, (BYTE *)"s"}, prefix_a = {1, (BYTE *)"a"}, body = {4, (BYTE *)"Body"}; - WS_XML_STRING envelope = {8, (BYTE *)"Envelope"}, header = {6, (BYTE *)"Header"}; - WS_XML_STRING msgid = {9, (BYTE *)"MessageID"}, replyto = {7, (BYTE *)"ReplyTo"}; - WS_XML_STRING address = {7, (BYTE *)"Address"}, ns_env, ns_addr; + static const WS_XML_STRING prefix_s = {1, (BYTE *)"s"}, prefix_a = {1, (BYTE *)"a"}; + static const WS_XML_STRING envelope = {8, (BYTE *)"Envelope"}, header = {6, (BYTE *)"Header"}; + static const WS_XML_STRING msgid = {9, (BYTE *)"MessageID"}, replyto = {7, (BYTE *)"ReplyTo"}; + static const WS_XML_STRING address = {7, (BYTE *)"Address"}, body = {4, (BYTE *)"Body"}; + WS_XML_STRING ns_env, ns_addr; WS_XML_UTF8_TEXT urn, addr; HRESULT hr; + ULONG i; if ((hr = get_env_namespace( msg->version_env, &ns_env )) != S_OK) return hr; if ((hr = get_addr_namespace( msg->version_addr, &ns_addr )) != S_OK) return hr; @@ -400,8 +440,13 @@ static HRESULT write_envelope_start( struct msg *msg, WS_XML_WRITER *writer ) urn.text.textType = WS_XML_TEXT_TYPE_UNIQUE_ID; memcpy( &urn.value, &msg->id, sizeof(msg->id) ); if ((hr = WsWriteText( writer, &urn.text, NULL )) != S_OK) return hr; - if ((hr = WsWriteEndElement( writer, NULL )) != S_OK) return hr; /* </a:MessageID> */ + + for (i = 0; i < msg->header_count; i++) + { + if ((hr = write_header( writer, msg->header[i] )) != S_OK) return hr; + } + if (msg->version_addr == WS_ADDRESSING_VERSION_0_9) { if ((hr = WsWriteStartElement( writer, &prefix_a, &replyto, &ns_addr, NULL )) != S_OK) return hr;

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
78
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 August 2016