August 2016 - Wine-Commits - list.winehq.org

Michael Stefaniuc : ieframe/tests: Use todo_wine_if().
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: 390c27306194b3b646f850fcaaa5b4a9ff9ece2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=390c27306194b3b646f850fca… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 9 22:36:34 2016 +0200 ieframe/tests: Use todo_wine_if(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 35 +++++------------------------------ 1 file changed, 5 insertions(+), 30 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 1ff7ca2..cbd1d6b 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -914,12 +914,7 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe if (V_I4(pDispParams->rgvarg+1) == CSC_NAVIGATEFORWARD) { - if(nav_forward_todo) { - if(V_BOOL(pDispParams->rgvarg)) - todo_wine CHECK_EXPECT2(Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_TRUE); - else - todo_wine CHECK_EXPECT2(Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE); - }else { + todo_wine_if(nav_forward_todo) { if(V_BOOL(pDispParams->rgvarg)) CHECK_EXPECT2(Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_TRUE); else @@ -928,12 +923,7 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe } else if (V_I4(pDispParams->rgvarg+1) == CSC_NAVIGATEBACK) { - if(nav_back_todo) { - if(V_BOOL(pDispParams->rgvarg)) - todo_wine CHECK_EXPECT2(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_TRUE); - else - todo_wine CHECK_EXPECT2(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE); - }else { + todo_wine_if(nav_back_todo) { if(V_BOOL(pDispParams->rgvarg)) CHECK_EXPECT2(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_TRUE); else @@ -3028,12 +3018,7 @@ static void test_download(DWORD flags) CLEAR_CALLED(EnableModeless_FALSE); /* IE 8 */ if(!(flags & DWL_REFRESH)) { - if(nav_back_todo) { - if(flags & (DWL_FROM_GOFORWARD|DWL_BACK_ENABLE)) - todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_TRUE); - else - todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE); - }else { + todo_wine_if(nav_back_todo) { if(flags & (DWL_FROM_GOFORWARD|DWL_BACK_ENABLE)) CHECK_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_TRUE); else @@ -3238,24 +3223,14 @@ static void test_go_back(IWebBrowser2 *wb, const char *back_url, int back_enable CHECK_CALLED(Invoke_BEFORENAVIGATE2); nav_forward_todo = FALSE; - if(nav_back_todo) { - if(back_enable) - todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_TRUE); - else - todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE); - }else { + todo_wine_if(nav_back_todo) { if(back_enable) CHECK_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_TRUE); else CHECK_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE); } - if(forward_todo) { - if(forward_enable) - todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_TRUE); - else - todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE); - }else { + todo_wine_if(forward_todo) { if(forward_enable) CHECK_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_TRUE); else

1 0

Henri Verbeet : wined3d: Synchronise WINED3D_CS_OP_UNLOAD_RESOURCE resource access.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: af54f9b93a4632a76ee14ed98902a31f2e7c3472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af54f9b93a4632a76ee14ed98… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 10 18:44:46 2016 +0200 wined3d: Synchronise WINED3D_CS_OP_UNLOAD_RESOURCE resource access. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 0d5c151..c9d728c 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1256,6 +1256,7 @@ static void wined3d_cs_exec_unload_resource(struct wined3d_cs *cs, const void *d struct wined3d_resource *resource = op->resource; resource->resource_ops->resource_unload(resource); + wined3d_resource_release(resource); } void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) @@ -1266,6 +1267,8 @@ void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resou op->opcode = WINED3D_CS_OP_UNLOAD_RESOURCE; op->resource = resource; + wined3d_resource_acquire(resource); + cs->ops->submit(cs); }

1 0

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

Aug. 10, 2016

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

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

Aug. 10, 2016

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 : include: Add missing Web Services declarations.
by Alexandre Julliard Aug. 10, 2016

Aug. 10, 2016

Module: wine Branch: master Commit: 58cf38b796bf0ed7b6ffc8009395a8ce240b6a99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58cf38b796bf0ed7b6ffc8009… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 10 13:13:54 2016 +0200 include: Add missing Web Services declarations. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/webservices.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/webservices.h b/include/webservices.h index e35e389..c227a17 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -493,6 +493,11 @@ typedef struct _WS_STRING { WCHAR *chars; } WS_STRING; +typedef struct _WS_UNIQUE_ID { + WS_STRING uri; + GUID guid; +} WS_UNIQUE_ID; + typedef enum { WS_XML_NODE_TYPE_ELEMENT = 1, WS_XML_NODE_TYPE_TEXT = 2, @@ -906,6 +911,11 @@ struct _WS_HTTP_SSL_BINDING_TEMPLATE { WS_SSL_TRANSPORT_SECURITY_BINDING_TEMPLATE sslTransportSecurityBinding; }; +enum { + WS_MUST_UNDERSTAND_HEADER_ATTRIBUTE = 0x1, + WS_RELAY_HEADER_ATTRIBUTE = 0x2 +}; + typedef enum { WS_ADDRESSING_VERSION_0_9 = 1, WS_ADDRESSING_VERSION_1_0 = 2, @@ -971,6 +981,16 @@ typedef enum { } WS_MESSAGE_INITIALIZATION; typedef enum { + WS_ACTION_HEADER = 1, + WS_TO_HEADER = 2, + WS_MESSAGE_ID_HEADER = 3, + WS_RELATES_TO_HEADER = 4, + WS_FROM_HEADER = 5, + WS_REPLY_TO_HEADER = 6, + WS_FAULT_TO_HEADER = 7 +} WS_HEADER_TYPE; + +typedef enum { WS_DNS_ENDPOINT_IDENTITY_TYPE = 1, WS_UPN_ENDPOINT_IDENTITY_TYPE = 2, WS_SPN_ENDPOINT_IDENTITY_TYPE = 3, @@ -1401,8 +1421,10 @@ HRESULT WINAPI WsReceiveMessage(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DESCR WS_RECEIVE_OPTION, WS_READ_OPTION, WS_HEAP*, void*, ULONG, ULONG*, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsRemoveNode(const WS_XML_NODE_POSITION*, WS_ERROR*); +HRESULT WINAPI WsResetChannel(WS_CHANNEL*, WS_ERROR*); HRESULT WINAPI WsResetError(WS_ERROR*); HRESULT WINAPI WsResetHeap(WS_HEAP*, WS_ERROR*); +HRESULT WINAPI WsResetMessage(WS_MESSAGE*, WS_ERROR*); HRESULT WINAPI WsRequestReply(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DESCRIPTION*, WS_WRITE_OPTION, const void*, ULONG, WS_MESSAGE*, const WS_MESSAGE_DESCRIPTION*, WS_READ_OPTION, WS_HEAP*, void*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); @@ -1413,6 +1435,8 @@ HRESULT WINAPI WsSendReplyMessage(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DES const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsSetChannelProperty(WS_CHANNEL*, WS_CHANNEL_PROPERTY_ID, const void*, ULONG, WS_ERROR*); HRESULT WINAPI WsSetErrorProperty(WS_ERROR*, WS_ERROR_PROPERTY_ID, const void*, ULONG); +HRESULT WINAPI WsSetHeader(WS_MESSAGE*, WS_HEADER_TYPE, WS_TYPE, WS_WRITE_OPTION, const void*, ULONG, + WS_ERROR*); HRESULT WINAPI WsSetInput(WS_XML_READER*, const WS_XML_READER_ENCODING*, const WS_XML_READER_INPUT*, const WS_XML_READER_PROPERTY*, ULONG, WS_ERROR*); HRESULT WINAPI WsSetInputToBuffer(WS_XML_READER*, WS_XML_BUFFER*, const WS_XML_READER_PROPERTY*,

1 0

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

Aug. 10, 2016

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 Aug. 10, 2016

Aug. 10, 2016

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 Aug. 10, 2016

Aug. 10, 2016

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

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

Aug. 10, 2016

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

Hans Leidekker : webservices: Implement WsSetHeader.
by Alexandre Julliard Aug. 10, 2016

Aug. 10, 2016

Module: wine Branch: master Commit: dff16756e9e4e31f47c7ce0126591a427c24c250 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dff16756e9e4e31f47c7ce012… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 10 13:13:55 2016 +0200 webservices: Implement WsSetHeader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 145 +++++++++++++++++++++++++++++++++++--- dlls/webservices/webservices.spec | 2 +- 2 files changed, 138 insertions(+), 9 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index d7898a2..2c8fb3b 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -48,6 +48,12 @@ static const struct prop_desc msg_props[] = { sizeof(BOOL), TRUE }, /* WS_MESSAGE_PROPERTY_IS_ADDRESSED */ }; +struct header +{ + WS_HEADER_TYPE type; + WS_XML_UTF8_TEXT text; +}; + struct msg { WS_MESSAGE_INITIALIZATION init; @@ -61,10 +67,14 @@ struct msg WS_XML_BUFFER *buf; WS_XML_WRITER *writer; WS_XML_WRITER *writer_body; + ULONG header_count; + ULONG header_size; + struct header **header; ULONG prop_count; struct prop prop[sizeof(msg_props)/sizeof(msg_props[0])]; }; +#define HEADER_ARRAY_SIZE 2 static struct msg *alloc_msg(void) { static const ULONG count = sizeof(msg_props)/sizeof(msg_props[0]); @@ -72,23 +82,36 @@ static struct msg *alloc_msg(void) ULONG size = sizeof(*ret) + prop_size( msg_props, count ); if (!(ret = heap_alloc_zero( size ))) return NULL; - ret->state = WS_MESSAGE_STATE_EMPTY; + if (!(ret->header = heap_alloc( HEADER_ARRAY_SIZE * sizeof(struct header *) ))) + { + heap_free( ret ); + return NULL; + } + ret->state = WS_MESSAGE_STATE_EMPTY; + ret->header_size = HEADER_ARRAY_SIZE; prop_init( msg_props, count, ret->prop, &ret[1] ); - ret->prop_count = count; + ret->prop_count = count; return ret; } +static void free_headers( struct header **header, ULONG count ) +{ + ULONG i; + for (i = 0; i < count; i++) heap_free( header[i] ); +} + static void free_msg( struct msg *msg ) { if (!msg) return; WsFreeWriter( msg->writer ); WsFreeHeap( msg->heap ); heap_free( msg->addr.chars ); + free_headers( msg->header, msg->header_count ); + heap_free( msg->header ); heap_free( msg ); } #define HEAP_MAX_SIZE (1 << 16) - static HRESULT create_msg( WS_ENVELOPE_VERSION env_version, WS_ADDRESSING_VERSION addr_version, const WS_MESSAGE_PROPERTY *properties, ULONG count, WS_MESSAGE **handle ) { @@ -403,6 +426,16 @@ static HRESULT write_envelope_end( struct msg *msg, WS_XML_WRITER *writer ) return WsWriteEndElement( writer, NULL ); /* </s:Envelope> */ } +static HRESULT write_envelope( struct msg *msg ) +{ + HRESULT hr; + if (!msg->writer && (hr = WsCreateWriter( NULL, 0, &msg->writer, NULL )) != S_OK) return hr; + if (!msg->buf && (hr = WsCreateXmlBuffer( msg->heap, NULL, 0, &msg->buf, NULL )) != S_OK) return hr; + if ((hr = WsSetOutputToBuffer( msg->writer, msg->buf, NULL, 0, NULL )) != S_OK) return hr; + if ((hr = write_envelope_start( msg, msg->writer )) != S_OK) return hr; + return write_envelope_end( msg, msg->writer ); +} + /************************************************************************** * WsWriteEnvelopeStart [webservices.@] */ @@ -420,14 +453,11 @@ HRESULT WINAPI WsWriteEnvelopeStart( WS_MESSAGE *handle, WS_XML_WRITER *writer, return E_NOTIMPL; } - if (!handle) return E_INVALIDARG; + if (!handle || !writer) return E_INVALIDARG; if (msg->state != WS_MESSAGE_STATE_INITIALIZED) return WS_E_INVALID_OPERATION; - if ((hr = WsCreateWriter( NULL, 0, &msg->writer, NULL )) != S_OK) return hr; - if ((hr = WsSetOutputToBuffer( msg->writer, msg->buf, NULL, 0, NULL )) != S_OK) return hr; - if ((hr = write_envelope_start( msg, msg->writer )) != S_OK) return hr; + if ((hr = write_envelope( msg )) != S_OK) return hr; if ((hr = write_envelope_start( msg, writer )) != S_OK) return hr; - if ((hr = write_envelope_end( msg, msg->writer )) != S_OK) return hr; msg->writer_body = writer; msg->state = WS_MESSAGE_STATE_WRITING; @@ -479,3 +509,102 @@ HRESULT WINAPI WsWriteBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *de if (desc->elementLocalName) hr = WsWriteEndElement( msg->writer_body, NULL ); return hr; } + +static inline void set_utf8_text( WS_XML_UTF8_TEXT *text, BYTE *bytes, ULONG len ) +{ + text->text.textType = WS_XML_TEXT_TYPE_UTF8; + text->value.bytes = bytes; + text->value.length = len; +} + +static HRESULT alloc_header( WS_HEADER_TYPE type, WS_TYPE value_type, WS_WRITE_OPTION option, + const void *value, ULONG size, struct header **ret ) +{ + struct header *header; + + switch (value_type) + { + case WS_WSZ_TYPE: + { + int len; + const WCHAR *src; + + if (option != WS_WRITE_REQUIRED_POINTER || size != sizeof(WCHAR *)) return E_INVALIDARG; + + src = *(const WCHAR **)value; + len = WideCharToMultiByte( CP_UTF8, 0, src, -1, NULL, 0, NULL, NULL ) - 1; + if (!(header = heap_alloc( sizeof(*header) + len ))) return E_OUTOFMEMORY; + set_utf8_text( &header->text, (BYTE *)(header + 1), len ); + WideCharToMultiByte( CP_UTF8, 0, src, -1, (char *)header->text.value.bytes, len, NULL, NULL ); + break; + } + case WS_XML_STRING_TYPE: + { + const WS_XML_STRING *str = value; + + if (option != WS_WRITE_REQUIRED_VALUE) + { + FIXME( "unhandled write option %u\n", option ); + return E_NOTIMPL; + } + if (size != sizeof(*str)) return E_INVALIDARG; + if (!(header = heap_alloc( sizeof(*header) + str->length ))) return E_OUTOFMEMORY; + set_utf8_text( &header->text, (BYTE *)(header + 1), str->length ); + memcpy( header->text.value.bytes, str->bytes, str->length ); + break; + } + default: + FIXME( "unhandled type %u\n", value_type ); + return E_NOTIMPL; + } + + header->type = type; + *ret = header; + return S_OK; +} + +/************************************************************************** + * WsSetHeader [webservices.@] + */ +HRESULT WINAPI WsSetHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_TYPE value_type, + WS_WRITE_OPTION option, const void *value, ULONG size, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + struct header *header; + BOOL found = FALSE; + HRESULT hr; + ULONG i; + + TRACE( "%p %u %u %08x %p %u %p\n", handle, type, value_type, option, value, size, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!handle || type < WS_ACTION_HEADER || type > WS_FAULT_TO_HEADER) return E_INVALIDARG; + if (msg->state < WS_MESSAGE_STATE_INITIALIZED) return WS_E_INVALID_OPERATION; + + for (i = 0; i < msg->header_count; i++) + { + if (msg->header[i]->type == type) + { + found = TRUE; + break; + } + } + + if (found) heap_free( msg->header[i] ); + else + { + if (msg->header_count == msg->header_size) + { + struct header **tmp; + if (!(tmp = heap_realloc( msg->header, 2 * msg->header_size * sizeof(struct header *) ))) + return E_OUTOFMEMORY; + msg->header = tmp; + msg->header_size *= 2; + } + i = msg->header_count++; + } + + if ((hr = alloc_header( type, value_type, option, value, size, &header )) != S_OK) return hr; + msg->header[i] = header; + return write_envelope( msg ); +} diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 29b09c6..477f236 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -149,7 +149,7 @@ @ stdcall WsSetErrorProperty(ptr long ptr long) @ stub WsSetFaultErrorDetail @ stub WsSetFaultErrorProperty -@ stub WsSetHeader +@ stdcall WsSetHeader(ptr long long long ptr long ptr) @ stdcall WsSetInput(ptr ptr ptr ptr long ptr) @ stdcall WsSetInputToBuffer(ptr ptr ptr long ptr) @ stub WsSetListenerProperty

1 0