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

Nikolay Sivov : mshtml: Formatting change to get rid of warning on GCC 6.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: 8fbaeb3058f0fec147e4690384565571e9f2e707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fbaeb3058f0fec147e469038… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 10 22:25:24 2016 +0200 mshtml: Formatting change to get rid of warning on GCC 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/script.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 40deda4..f10a702 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -989,10 +989,10 @@ static HRESULT ScriptBSC_read_data(BSCallback *bsc, IStream *stream) do { if(This->bsc.readed >= This->size) { - void *new_buf; - new_buf = heap_realloc(This->buf, This->size << 1); - if(!new_buf) - return E_OUTOFMEMORY; + void *new_buf; + new_buf = heap_realloc(This->buf, This->size << 1); + if(!new_buf) + return E_OUTOFMEMORY; This->size <<= 1; This->buf = new_buf; }

1 0

Nikolay Sivov : t2embed: Fix embedding type resolution order.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: 8be1357bd50cd230786df16df75ea0888d57ced7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8be1357bd50cd230786df16df… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 11 00:19:21 2016 +0300 t2embed: Fix embedding type resolution order. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/t2embed/main.c | 15 ++++++++---- dlls/t2embed/tests/Makefile.in | 2 +- dlls/t2embed/tests/t2embed.c | 55 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 6 deletions(-) diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index 9fae0a8..48e20f5 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -33,7 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(t2embed); BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - switch (fdwReason) { case DLL_WINE_PREATTACH: @@ -89,14 +88,20 @@ LONG WINAPI TTGetEmbeddingType(HDC hDC, ULONG *status) if (!status) return E_PERMISSIONSINVALID; + otm.otmfsType &= 0xf; if (otm.otmfsType == LICENSE_INSTALLABLE) *status = EMBED_INSTALLABLE; - else if (otm.otmfsType & LICENSE_NOEMBEDDING) - *status = EMBED_NOEMBEDDING; - else if (otm.otmfsType & LICENSE_PREVIEWPRINT) - *status = EMBED_PREVIEWPRINT; else if (otm.otmfsType & LICENSE_EDITABLE) *status = EMBED_EDITABLE; + else if (otm.otmfsType & LICENSE_PREVIEWPRINT) + *status = EMBED_PREVIEWPRINT; + else if (otm.otmfsType & LICENSE_NOEMBEDDING) + *status = EMBED_NOEMBEDDING; + else + { + WARN("unrecognized flags, %#x\n", otm.otmfsType); + *status = EMBED_INSTALLABLE; + } return E_NONE; } diff --git a/dlls/t2embed/tests/Makefile.in b/dlls/t2embed/tests/Makefile.in index f7a5809..c4f49a3 100644 --- a/dlls/t2embed/tests/Makefile.in +++ b/dlls/t2embed/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = t2embed.dll -IMPORTS = gdi32 t2embed +IMPORTS = user32 gdi32 t2embed C_SRCS = \ t2embed.c diff --git a/dlls/t2embed/tests/t2embed.c b/dlls/t2embed/tests/t2embed.c index 79102a6..9f278a5 100644 --- a/dlls/t2embed/tests/t2embed.c +++ b/dlls/t2embed/tests/t2embed.c @@ -19,10 +19,59 @@ #include <stdarg.h> #include "windef.h" +#include "winbase.h" #include "wingdi.h" +#include "winuser.h" #include "t2embapi.h" #include "wine/test.h" +static int CALLBACK enum_font_proc(ENUMLOGFONTEXA *enumlf, NEWTEXTMETRICEXA *ntm, DWORD type, LPARAM lParam) +{ + OUTLINETEXTMETRICA otm; + HDC hdc = GetDC(NULL); + HFONT hfont, old_font; + ULONG status; + LONG ret; + + hfont = CreateFontIndirectA(&enumlf->elfLogFont); + old_font = SelectObject(hdc, hfont); + + otm.otmSize = sizeof(otm); + if (GetOutlineTextMetricsA(hdc, otm.otmSize, &otm)) + { + ULONG expected = 0xffff; + UINT fsType = otm.otmfsType & 0xf; + + ret = TTGetEmbeddingType(hdc, &status); + ok(ret == E_NONE, "got %d\n", ret); + + if (fsType == LICENSE_INSTALLABLE) + expected = EMBED_INSTALLABLE; + else if (fsType & LICENSE_EDITABLE) + expected = EMBED_EDITABLE; + else if (fsType & LICENSE_PREVIEWPRINT) + expected = EMBED_PREVIEWPRINT; + else if (fsType & LICENSE_NOEMBEDDING) + expected = EMBED_NOEMBEDDING; + + ok(expected == status, "%s: status %d, expected %d, fsType %#x\n", enumlf->elfLogFont.lfFaceName, status, + expected, otm.otmfsType); + } + else + { + status = 0xdeadbeef; + ret = TTGetEmbeddingType(hdc, &status); + ok(ret == E_NOTATRUETYPEFONT, "%s: got %d\n", enumlf->elfLogFont.lfFaceName, ret); + ok(status == 0xdeadbeef, "%s: got status %d\n", enumlf->elfLogFont.lfFaceName, status); + } + + SelectObject(hdc, old_font); + DeleteObject(hfont); + ReleaseDC(NULL, hdc); + + return 1; +} + static void test_TTGetEmbeddingType(void) { HFONT hfont, old_font; @@ -73,6 +122,12 @@ static void test_TTGetEmbeddingType(void) SelectObject(hdc, old_font); DeleteObject(hfont); + + /* repeat for all system fonts */ + logfont.lfCharSet = DEFAULT_CHARSET; + logfont.lfFaceName[0] = 0; + EnumFontFamiliesExA(hdc, &logfont, (FONTENUMPROCA)enum_font_proc, 0, 0); + DeleteDC(hdc); }

1 0

Nikolay Sivov : comctl32/treeview: Fix item dragging and selection for TVS_FULLROWSELECT style.
by Alexandre Julliard 10 Aug '16

10 Aug '16

Module: wine Branch: master Commit: af02e1082818a45a135a32686c77b84f0c699f73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af02e1082818a45a135a32686… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 10 15:11:02 2016 +0300 comctl32/treeview: Fix item dragging and selection for TVS_FULLROWSELECT style. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 47 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index dc31a9b..55e22e2 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4197,9 +4197,9 @@ TREEVIEW_LButtonDoubleClick(TREEVIEW_INFO *infoPtr, LPARAM lParam) static LRESULT TREEVIEW_LButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) { + BOOL do_track, do_select, bDoLabelEdit; HWND hwnd = infoPtr->hwnd; TVHITTESTINFO ht; - BOOL bTrack, bDoLabelEdit; /* If Edit control is active - kill it and return. * The best way to do it is to set focus to itself. @@ -4219,15 +4219,32 @@ TREEVIEW_LButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) TRACE("item %d\n", TREEVIEW_GetItemIndex(infoPtr, ht.hItem)); /* update focusedItem and redraw both items */ - if(ht.hItem && (ht.flags & TVHT_ONITEM)) + if (ht.hItem) { - infoPtr->focusedItem = ht.hItem; - TREEVIEW_InvalidateItem(infoPtr, infoPtr->focusedItem); - TREEVIEW_InvalidateItem(infoPtr, infoPtr->selectedItem); + BOOL do_focus; + + if (TREEVIEW_IsFullRowSelect(infoPtr)) + do_focus = ht.flags & (TVHT_ONITEMINDENT | TVHT_ONITEM | TVHT_ONITEMRIGHT); + else + do_focus = ht.flags & TVHT_ONITEM; + + if (do_focus) + { + infoPtr->focusedItem = ht.hItem; + TREEVIEW_InvalidateItem(infoPtr, infoPtr->focusedItem); + TREEVIEW_InvalidateItem(infoPtr, infoPtr->selectedItem); + } } - bTrack = (ht.flags & TVHT_ONITEM) - && !(infoPtr->dwStyle & TVS_DISABLEDRAGDROP); + if (!(infoPtr->dwStyle & TVS_DISABLEDRAGDROP)) + { + if (TREEVIEW_IsFullRowSelect(infoPtr)) + do_track = ht.flags & (TVHT_ONITEMINDENT | TVHT_ONITEM | TVHT_ONITEMRIGHT); + else + do_track = ht.flags & TVHT_ONITEM; + } + else + do_track = FALSE; /* * If the style allows editing and the node is already selected @@ -4237,16 +4254,15 @@ TREEVIEW_LButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) (ht.flags & TVHT_ONITEMLABEL) && (infoPtr->selectedItem == ht.hItem); /* Send NM_CLICK right away */ - if (!bTrack) - if (TREEVIEW_SendSimpleNotify(infoPtr, NM_CLICK)) - goto setfocus; + if (!do_track && TREEVIEW_SendSimpleNotify(infoPtr, NM_CLICK)) + goto setfocus; if (ht.flags & TVHT_ONITEMBUTTON) { TREEVIEW_Toggle(infoPtr, ht.hItem, TRUE); goto setfocus; } - else if (bTrack) + else if (do_track) { /* if TREEVIEW_TrackMouse == 1 dragging occurred and the cursor left the dragged item's rectangle */ if (TREEVIEW_TrackMouse(infoPtr, ht.pt)) { @@ -4268,9 +4284,14 @@ TREEVIEW_LButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) } } - if (bTrack && TREEVIEW_SendSimpleNotify(infoPtr, NM_CLICK)) + if (do_track && TREEVIEW_SendSimpleNotify(infoPtr, NM_CLICK)) goto setfocus; + if (TREEVIEW_IsFullRowSelect(infoPtr)) + do_select = ht.flags & (TVHT_ONITEMINDENT | TVHT_ONITEMICON | TVHT_ONITEMLABEL | TVHT_ONITEMRIGHT); + else + do_select = ht.flags & (TVHT_ONITEMICON | TVHT_ONITEMLABEL); + if (bDoLabelEdit) { if (infoPtr->Timer & TV_EDIT_TIMER_SET) @@ -4279,7 +4300,7 @@ TREEVIEW_LButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) SetTimer(hwnd, TV_EDIT_TIMER, GetDoubleClickTime(), 0); infoPtr->Timer |= TV_EDIT_TIMER_SET; } - else if (ht.flags & (TVHT_ONITEMICON|TVHT_ONITEMLABEL)) /* select the item if the hit was inside of the icon or text */ + else if (do_select) { TREEVIEW_ITEM *selection = infoPtr->selectedItem;

1 0

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

10 Aug '16

Module: wine Branch: master Commit: 9c5b9399fc04ad93fdf31e8cda5431fa6170a0f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c5b9399fc04ad93fdf31e8cd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 10 13:13:53 2016 +0200 webservices/tests: Add some tests for WsSetWriterPosition. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 3343ae5..65828a4 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -1576,6 +1576,7 @@ static void test_WsGetWriterPosition(void) static void test_WsSetWriterPosition(void) { + WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; WS_HEAP *heap; WS_XML_WRITER *writer; WS_XML_BUFFER *buf1, *buf2; @@ -1617,6 +1618,29 @@ static void test_WsSetWriterPosition(void) hr = WsSetWriterPosition( writer, &pos, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); + hr = WsSetOutputToBuffer( writer, buf1, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* try to write at non-final position */ + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + pos.buffer = pos.node = NULL; + hr = WsGetWriterPosition( writer, &pos, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( pos.buffer == buf1, "wrong buffer\n" ); + ok( pos.node != NULL, "node not set\n" ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_buffer( buf1, "<t/>", __LINE__ ); + + hr = WsSetWriterPosition( writer, &pos, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + WsFreeWriter( writer ); WsFreeHeap( heap ); }

1 0

Hans Leidekker : include: Add missing Web Services declarations.
by Alexandre Julliard 10 Aug '16

10 Aug '16

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

Hans Leidekker : webservices: Implement WsSetHeader.
by Alexandre Julliard 10 Aug '16

10 Aug '16

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

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

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

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

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