May 2017 - Wine-Commits - list.winehq.org

Nikolay Sivov : dwrite: Grab font data reference when adding replacement.
by Alexandre Julliard May 30, 2017

May 30, 2017

Module: wine Branch: master Commit: 7524db8937ec6ae94e690dda41cd363d4c37925a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7524db8937ec6ae94e690dda4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 30 10:10:59 2017 +0300 dwrite: Grab font data reference when adding replacement. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index a877ad0..0332587 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -405,6 +405,11 @@ static inline void* get_fontface_colr(struct dwrite_fontface *fontface) return get_fontface_table(&fontface->IDWriteFontFace4_iface, MS_COLR_TAG, &fontface->colr); } +static void addref_font_data(struct dwrite_font_data *data) +{ + InterlockedIncrement(&data->ref); +} + static void release_font_data(struct dwrite_font_data *data) { int i; @@ -1762,7 +1767,7 @@ static HRESULT create_font(struct dwrite_fontfamily *family, UINT32 index, IDWri IDWriteFontFamily1_AddRef(&family->IDWriteFontFamily1_iface); This->data = family->data->fonts[index]; This->style = This->data->style; - InterlockedIncrement(&This->data->ref); + addref_font_data(This->data); *font = &This->IDWriteFont3_iface; @@ -2135,7 +2140,7 @@ static HRESULT WINAPI dwritefontfamily_GetMatchingFonts(IDWriteFontFamily1 *ifac for (i = 0; i < This->data->font_count; i++) { if (!func || func(This->data->fonts[i])) { fonts->fonts[fonts->font_count] = This->data->fonts[i]; - InterlockedIncrement(&This->data->fonts[i]->ref); + addref_font_data(This->data->fonts[i]); fonts->font_count++; } } @@ -3554,8 +3559,10 @@ static BOOL fontcollection_add_replacement(struct dwrite_fontcollection *collect struct dwrite_fontfamily_data *replacement = collection->family_data[i]; WCHAR nameW[255]; - for (i = 0; i < replacement->font_count; i++) + for (i = 0; i < replacement->font_count; i++) { fontfamily_add_font(target, replacement->fonts[i]); + addref_font_data(replacement->fonts[i]); + } fontcollection_add_family(collection, target); fontstrings_get_en_string(replacement->familyname, nameW, sizeof(nameW)/sizeof(WCHAR));

1 0

Hans Leidekker : webservices: Add support for dictionary strings in the reader.
by Alexandre Julliard May 30, 2017

May 30, 2017

Module: wine Branch: master Commit: 0e942e5021f3411598ee4e813bd3e9cb59fc6c0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e942e5021f3411598ee4e813… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 30 10:09:06 2017 +0200 webservices: Add support for dictionary strings in the reader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 88 ++++++++++- dlls/webservices/tests/reader.c | 314 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 389 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e942e5021f3411598ee4…

1 0

Daniel Lehman : include: Add sqlucode.h.
by Alexandre Julliard May 30, 2017

May 30, 2017

Module: wine Branch: master Commit: 211803c16161b785bee6bb16c32fcc926d8131a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=211803c16161b785bee6bb16c… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu May 25 09:27:18 2017 -0700 include: Add sqlucode.h. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/sqlucode.h | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 7846d67..20160c5 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -602,6 +602,7 @@ HEADER_SRCS = \ sql.h \ sqlext.h \ sqltypes.h \ + sqlucode.h \ srrestoreptapi.h \ sspi.h \ sti.h \ diff --git a/include/sqlucode.h b/include/sqlucode.h new file mode 100644 index 0000000..c87348c --- /dev/null +++ b/include/sqlucode.h @@ -0,0 +1,64 @@ +/* + * MS SQL Unicode Definitions + * + * Copyright (C) 2017 Daniel Lehman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __SQLUCODE_H +#define __SQLUCODE_H + +#include <sqlext.h> + +#ifdef __cplusplus +extern "C" { +#endif + +SQLRETURN WINAPI SQLConnectW(SQLHDBC ConnectionHandle, + SQLWCHAR *ServerName, SQLSMALLINT NameLength1, + SQLWCHAR *UserName, SQLSMALLINT NameLength2, + SQLWCHAR *Authentication, SQLSMALLINT NameLength3); + +SQLRETURN WINAPI SQLDescribeColW(SQLHSTMT StatementHandle, + SQLUSMALLINT ColumnNumber, SQLWCHAR *ColumnName, + SQLSMALLINT BufferLength, SQLSMALLINT *NameLength, + SQLSMALLINT *DataType, SQLULEN *ColumnSize, + SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable); + +SQLRETURN WINAPI SQLExecDirectW(SQLHSTMT StatementHandle, + SQLWCHAR *StatementText, SQLINTEGER TextLength); + +SQLRETURN WINAPI SQLGetDiagRecW(SQLSMALLINT HandleType, SQLHANDLE Handle, + SQLSMALLINT RecNumber, SQLWCHAR *Sqlstate, + SQLINTEGER *NativeError, SQLWCHAR *MessageText, + SQLSMALLINT BufferLength, SQLSMALLINT *TextLength); + +SQLRETURN WINAPI SQLGetInfoW(SQLHDBC ConnectionHandle, + SQLUSMALLINT InfoType, SQLPOINTER InfoValue, + SQLSMALLINT BufferLength, SQLSMALLINT *StringLength); + +SQLRETURN WINAPI SQLPrepareW(SQLHSTMT StatementHandle, + SQLWCHAR *StatementText, SQLINTEGER TextLength); + +SQLRETURN WINAPI SQLSetStmtAttrW(SQLHSTMT StatementHandle, + SQLINTEGER Attribute, SQLPOINTER Value, + SQLINTEGER StringLength); + +#ifdef __cplusplus +} +#endif + +#endif

1 0

Hans Leidekker : webservices: Add a builtin dictionary.
by Alexandre Julliard May 30, 2017

May 30, 2017

Module: wine Branch: master Commit: 8214fcfa5d22f112e7d05de5a2b046014d92d1b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8214fcfa5d22f112e7d05de5a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 30 10:09:07 2017 +0200 webservices: Add a builtin dictionary. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 2 +- dlls/webservices/reader.c | 301 +++++++++++++++++++++++++-------- dlls/webservices/tests/reader.c | 2 +- dlls/webservices/webservices_private.h | 1 + dlls/webservices/writer.c | 41 +++-- 5 files changed, 261 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8214fcfa5d22f112e7d05…

1 0

Austin English : d3dx9_39: Sort specfile.
by Alexandre Julliard May 30, 2017

May 30, 2017

Module: wine Branch: master Commit: 0a9fac9a357e334e796f752389d529427d93a552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a9fac9a357e334e796f75238… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 19 17:51:15 2017 -0500 d3dx9_39: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_39/d3dx9_39.spec | 46 ++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/d3dx9_39/d3dx9_39.spec b/dlls/d3dx9_39/d3dx9_39.spec index a5caf3a..0408ff9 100644 --- a/dlls/d3dx9_39/d3dx9_39.spec +++ b/dlls/d3dx9_39/d3dx9_39.spec @@ -75,18 +75,18 @@ @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) @ stub D3DXCreateNPatchMesh(ptr ptr) @ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) -@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stub D3DXCreatePRTBuffer(long long long ptr) @ stub D3DXCreatePRTBufferTex(long long long long ptr) @ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) @ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) @ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) -@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) +@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -121,6 +121,7 @@ @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @ stdcall D3DXDisassembleShader(ptr long str ptr) +@ stdcall D3DXFVFFromDeclarator(ptr ptr) @ stdcall D3DXFileCreate(ptr) @ stdcall D3DXFillCubeTexture(ptr ptr ptr) @ stdcall D3DXFillCubeTextureTX(ptr ptr) @@ -139,7 +140,6 @@ @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall D3DXFVFFromDeclarator(ptr ptr) @ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) @ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) @ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) @@ -176,11 +176,11 @@ @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stub D3DXLoadPRTBufferFromFileA(ptr ptr) @ stub D3DXLoadPRTBufferFromFileW(ptr ptr) @ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) @ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -255,23 +255,6 @@ @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) @ stub D3DXRectPatchSize(ptr ptr ptr) -@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -284,12 +267,29 @@ @ stdcall D3DXSHMultiply4(ptr ptr ptr) @ stub D3DXSHMultiply5(ptr ptr ptr) @ stub D3DXSHMultiply6(ptr ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) +@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) @ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) @ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)

1 0

Józef Kucia : user32: Fix memory leak in WinHelpA().
by Alexandre Julliard May 30, 2017

May 30, 2017

Module: wine Branch: master Commit: ae9d5ce5f70ca196ee6b71e9d16cd4ded914d4f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae9d5ce5f70ca196ee6b71e9d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 30 12:21:54 2017 +0200 user32: Fix memory leak in WinHelpA(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winhelp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user32/winhelp.c b/dlls/user32/winhelp.c index a2c331b..c40b0fc 100644 --- a/dlls/user32/winhelp.c +++ b/dlls/user32/winhelp.c @@ -80,6 +80,7 @@ BOOL WINAPI WinHelpA( HWND hWnd, LPCSTR lpHelpFile, UINT wCommand, ULONG_PTR dwD HWND hDest; int size, dsize, nlen; WINHELP* lpwh; + LRESULT ret; hDest = FindWindowA("MS_WINHELP", NULL); if (!hDest) @@ -156,7 +157,9 @@ BOOL WINAPI WinHelpA( HWND hWnd, LPCSTR lpHelpFile, UINT wCommand, ULONG_PTR dwD lpwh->size, lpwh->command, lpwh->data, lpwh->ofsFilename ? (LPSTR)lpwh + lpwh->ofsFilename : ""); - return SendMessageA(hDest, WM_COPYDATA, (WPARAM)hWnd, (LPARAM)&cds); + ret = SendMessageA(hDest, WM_COPYDATA, (WPARAM)hWnd, (LPARAM)&cds); + HeapFree(GetProcessHeap(), 0, lpwh); + return ret; }

1 0

Hans Leidekker : webservices: Implement WsGetDictionary.
by Alexandre Julliard May 30, 2017

May 30, 2017

Module: wine Branch: master Commit: 419604e15babda4fdbc326da6952f4c9486a3292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=419604e15babda4fdbc326da6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 30 10:09:08 2017 +0200 webservices: Implement WsGetDictionary. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 18 +++++++++++++++++ dlls/webservices/tests/reader.c | 41 ++++++++++++++++++++++++++++++++++++++- dlls/webservices/webservices.spec | 2 +- 3 files changed, 59 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 01b464f..d59de3b 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -86,6 +86,24 @@ static WS_XML_DICTIONARY dict_builtin = {0x82704485,0x222a,0x4f7c,{0xb9,0x7b,0xe9,0xa4,0x62,0xa9,0x66,0x2b}} }; +/************************************************************************** + * WsGetDictionary [webservices.@] + */ +HRESULT WINAPI WsGetDictionary( WS_ENCODING encoding, WS_XML_DICTIONARY **dict, WS_ERROR *error ) +{ + TRACE( "%u %p %p\n", encoding, dict, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!dict) return E_INVALIDARG; + + if (encoding == WS_ENCODING_XML_BINARY_1 || encoding == WS_ENCODING_XML_BINARY_SESSION_1) + *dict = &dict_builtin; + else + *dict = NULL; + + return S_OK; +} + static inline int cmp_string( const unsigned char *str, ULONG len, const unsigned char *str2, ULONG len2 ) { if (len < len2) return -1; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 0e21e86..87f593f 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -1183,6 +1183,7 @@ static void test_WsReadNode(void) static const char str17[] = ""; HRESULT hr; WS_XML_READER *reader; + WS_XML_DICTIONARY *dict; const WS_XML_NODE *node; unsigned int i; int found; @@ -1334,6 +1335,21 @@ static void test_WsReadNode(void) ok( !memcmp( comment->value.bytes, " comment ", 9 ), "wrong data\n" ); } + dict = (WS_XML_DICTIONARY *)0xdeadbeef; + hr = WsGetDictionary( WS_ENCODING_XML_UTF8, &dict, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( dict == NULL, "got %p\n", dict ); + + dict = (WS_XML_DICTIONARY *)0xdeadbeef; + hr = WsGetDictionary( WS_ENCODING_XML_BINARY_1, &dict, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( dict != NULL, "dict not set\n" ); + + dict = (WS_XML_DICTIONARY *)0xdeadbeef; + hr = WsGetDictionary( WS_ENCODING_XML_BINARY_SESSION_1, &dict, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( dict != NULL, "dict not set\n" ); + WsFreeReader( reader ); } @@ -4898,7 +4914,7 @@ static void test_dictionary(void) const WS_XML_ATTRIBUTE *attr; const WS_XML_UTF8_TEXT *utf8; WS_XML_STRING strings[6]; - WS_XML_DICTIONARY dict; + WS_XML_DICTIONARY dict, *dict2; WS_XML_READER *reader; HRESULT hr; @@ -5163,6 +5179,29 @@ static void test_dictionary(void) ok( hr == S_OK, "got %08x\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + hr = WsGetDictionary( 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsGetDictionary( WS_ENCODING_XML_UTF8, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + dict2 = (WS_XML_DICTIONARY *)0xdeadbeef; + hr = WsGetDictionary( WS_ENCODING_XML_UTF8, &dict2, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( dict2 == NULL, "got %p\n", dict2 ); + + dict2 = (WS_XML_DICTIONARY *)0xdeadbeef; + hr = WsGetDictionary( WS_ENCODING_XML_BINARY_1, &dict2, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( dict2 != NULL, "dict2 not set\n" ); + ok( dict2 != &dict, "got %p\n", dict2 ); + + dict2 = (WS_XML_DICTIONARY *)0xdeadbeef; + hr = WsGetDictionary( WS_ENCODING_XML_BINARY_SESSION_1, &dict2, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( dict2 != NULL, "dict2 not set\n" ); + ok( dict2 != &dict, "got %p\n", dict2 ); + WsFreeReader( reader ); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 1f98aa3..c88935a 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -61,7 +61,7 @@ @ stdcall WsFreeWriter(ptr) @ stdcall WsGetChannelProperty(ptr long ptr long ptr) @ stub WsGetCustomHeader -@ stub WsGetDictionary +@ stdcall WsGetDictionary(long ptr ptr) @ stdcall WsGetErrorProperty(ptr long ptr long) @ stdcall WsGetErrorString(ptr long ptr) @ stub WsGetFaultErrorDetail

1 0

Michael Müller : wined3d: Don' t leak free_so_statistics_queries on device destruction.
by Alexandre Julliard May 30, 2017

May 30, 2017

Module: wine Branch: master Commit: 93c349c9c77fd66b90145677dfe102b7552fc097 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93c349c9c77fd66b90145677d… Author: Michael Müller <michael(a)fds-team.de> Date: Mon May 29 10:53:32 2017 +0200 wined3d: Don't leak free_so_statistics_queries on device destruction. 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/wined3d/context.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 49b9186..8ab0e10 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1336,6 +1336,7 @@ static void context_destroy_gl_resources(struct wined3d_context *context) checkGLcall("context cleanup"); } + HeapFree(GetProcessHeap(), 0, context->free_so_statistics_queries); HeapFree(GetProcessHeap(), 0, context->free_timestamp_queries); HeapFree(GetProcessHeap(), 0, context->free_occlusion_queries); HeapFree(GetProcessHeap(), 0, context->free_event_queries);

1 0

Józef Kucia : wined3d: Do not bother to check identity fixup support.
by Alexandre Julliard May 30, 2017

May 30, 2017

Module: wine Branch: master Commit: fca7f78ea0d6fdc51afced43a672a6802387ccea URL: http://source.winehq.org/git/wine.git/?a=commit;h=fca7f78ea0d6fdc51afced43a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 26 10:48:05 2017 +0200 wined3d: Do not bother to check identity fixup support. 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/wined3d/utils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 912511b..cc58042 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3350,6 +3350,9 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ if (!(format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_TEXTURE)) continue; + if (is_identity_fixup(format->color_fixup)) + continue; + TRACE("Checking support for fixup:\n"); dump_color_fixup_desc(format->color_fixup); if (!adapter->shader_backend->shader_color_fixup_supported(format->color_fixup)

1 0

Austin English : d3dx9_36: Sort specfile.
by Alexandre Julliard May 30, 2017

May 30, 2017

Module: wine Branch: master Commit: 131837eaafdaed9c534c70e26702870c08bcaab8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=131837eaafdaed9c534c70e26… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 19 17:51:12 2017 -0500 d3dx9_36: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_36.spec | 46 ++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index a5caf3a..0408ff9 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -75,18 +75,18 @@ @ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) @ stub D3DXCreateNPatchMesh(ptr ptr) @ stub D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) -@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) -@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stub D3DXCreatePRTBuffer(long long long ptr) @ stub D3DXCreatePRTBufferTex(long long long long ptr) @ stub D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) @ stub D3DXCreatePRTEngine(ptr ptr long ptr ptr) +@ stub D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) +@ stdcall D3DXCreatePolygon(ptr float long ptr ptr) @ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) @ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) @ stub D3DXCreateSPMesh(ptr ptr ptr ptr ptr) @ stdcall D3DXCreateSkinInfo(long ptr long ptr) -@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSkinInfoFVF(long long long ptr) +@ stub D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) @ stdcall D3DXCreateSphere(ptr float long long ptr ptr) @ stdcall D3DXCreateSprite(ptr ptr) @ stdcall D3DXCreateTeapot(ptr ptr ptr) @@ -121,6 +121,7 @@ @ stdcall D3DXDeclaratorFromFVF(long ptr) @ stdcall D3DXDisassembleEffect(ptr long ptr) @ stdcall D3DXDisassembleShader(ptr long str ptr) +@ stdcall D3DXFVFFromDeclarator(ptr ptr) @ stdcall D3DXFileCreate(ptr) @ stdcall D3DXFillCubeTexture(ptr ptr ptr) @ stdcall D3DXFillCubeTextureTX(ptr ptr) @@ -139,7 +140,6 @@ @ stub D3DXFrameNumNamedMatrices(ptr) @ stub D3DXFrameRegisterNamedMatrices(ptr ptr) @ stdcall D3DXFresnelTerm(float float) -@ stdcall D3DXFVFFromDeclarator(ptr ptr) @ stub D3DXGatherFragments(ptr long ptr ptr long ptr ptr) @ stub D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) @ stub D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) @@ -176,11 +176,11 @@ @ stdcall D3DXLoadMeshHierarchyFromXA(str long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXLoadMeshHierarchyFromXW(wstr long ptr ptr ptr ptr ptr) -@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stub D3DXLoadPRTBufferFromFileA(ptr ptr) @ stub D3DXLoadPRTBufferFromFileW(ptr ptr) @ stub D3DXLoadPRTCompBufferFromFileA(ptr ptr) @ stub D3DXLoadPRTCompBufferFromFileW(ptr ptr) +@ stub D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) @ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @@ -255,23 +255,6 @@ @ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) @ stub D3DXRectPatchSize(ptr ptr ptr) -@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) -@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) -@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) -@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) -@ stub D3DXSavePRTBufferToFileA(ptr ptr) -@ stub D3DXSavePRTBufferToFileW(ptr ptr) -@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) -@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) -@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) -@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) -@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) -@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) -@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) -@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) -@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stdcall D3DXSHEvalConeLight(long ptr float float float float ptr ptr ptr) @@ -284,12 +267,29 @@ @ stdcall D3DXSHMultiply4(ptr ptr ptr) @ stub D3DXSHMultiply5(ptr ptr ptr) @ stub D3DXSHMultiply6(ptr ptr ptr) -@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +@ stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) +@ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) +@ stub D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) +@ stub D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) +@ stub D3DXSavePRTBufferToFileA(ptr ptr) +@ stub D3DXSavePRTBufferToFileW(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileA(ptr ptr) +@ stub D3DXSavePRTCompBufferToFileW(ptr ptr) +@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) +@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) +@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) +@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) +@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) +@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) @ stub D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) @ stdcall D3DXSphereBoundProbe(ptr float ptr ptr) @ stub D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr)

1 0