June 2015 - Wine-Commits - list.winehq.org

Hans Leidekker : wbemprox: Fix some memory leaks (Coverity).
by Alexandre Julliard June 22, 2015

June 22, 2015

Module: wine Branch: master Commit: 13490899f1439d4653ef96c308d93b4c42ca0ba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13490899f1439d4653ef96c30… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 22 12:13:30 2015 +0200 wbemprox: Fix some memory leaks (Coverity). --- dlls/wbemprox/builtin.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index b55e9ad..0c6f8a7 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1586,6 +1586,8 @@ static enum fill_status fill_datafile( struct table *table, const struct expr *c for (;;) { + heap_free( glob ); + heap_free( path ); path = pop_dir( dirstack, &len ); if (!(glob = build_glob( root[0], path, len ))) { @@ -1635,8 +1637,6 @@ static enum fill_status fill_datafile( struct table *table, const struct expr *c FindClose( handle ); } if (!peek_dir( dirstack )) break; - heap_free( glob ); - heap_free( path ); } } @@ -1678,6 +1678,8 @@ static enum fill_status fill_directory( struct table *table, const struct expr * for (;;) { + heap_free( glob ); + heap_free( path ); path = pop_dir( dirstack, &len ); if (!(glob = build_glob( root[0], path, len ))) { @@ -1728,8 +1730,6 @@ static enum fill_status fill_directory( struct table *table, const struct expr * FindClose( handle ); } if (!peek_dir( dirstack )) break; - heap_free( glob ); - heap_free( path ); } }

1 0

Nikolay Sivov : dwrite: Store character spacing layout settings.
by Alexandre Julliard June 22, 2015

June 22, 2015

Module: wine Branch: master Commit: b43850a36320477653aa599cfb158b58a74806b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b43850a36320477653aa599cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 18 19:52:15 2015 +0300 dwrite: Store character spacing layout settings. --- dlls/dwrite/layout.c | 109 ++++++++++++++++++++++++++++++++++++++++----- dlls/dwrite/tests/layout.c | 19 ++++++-- 2 files changed, 112 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b43850a36320477653aa5…

1 0

Alistair Leslie-Hughes : d3dcompiler_46: Add stub dll.
by Alexandre Julliard June 22, 2015

June 22, 2015

Module: wine Branch: master Commit: ca7ce1678b61b88966a48f591be566e04f3d669f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca7ce1678b61b88966a48f591… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 16 11:00:26 2015 +1000 d3dcompiler_46: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/d3dcompiler_46/Makefile.in | 6 +++++ dlls/d3dcompiler_46/d3dcompiler_46.spec | 25 ++++++++++++++++++ dlls/d3dcompiler_46/d3dcompiler_46_main.c | 42 +++++++++++++++++++++++++++++++ dlls/d3dcompiler_46/version.rc | 27 ++++++++++++++++++++ tools/make_specfiles | 1 + 7 files changed, 104 insertions(+) diff --git a/configure b/configure index c0951db..80648ff 100755 --- a/configure +++ b/configure @@ -984,6 +984,7 @@ enable_d3dcompiler_40 enable_d3dcompiler_41 enable_d3dcompiler_42 enable_d3dcompiler_43 +enable_d3dcompiler_46 enable_d3dim enable_d3drm enable_d3dx10_33 @@ -17179,6 +17180,7 @@ wine_fn_config_dll d3dcompiler_41 enable_d3dcompiler_41 wine_fn_config_dll d3dcompiler_42 enable_d3dcompiler_42 wine_fn_config_dll d3dcompiler_43 enable_d3dcompiler_43 implib d3dcompiler wine_fn_config_test dlls/d3dcompiler_43/tests d3dcompiler_43_test +wine_fn_config_dll d3dcompiler_46 enable_d3dcompiler_46 wine_fn_config_dll d3dim enable_d3dim implib wine_fn_config_dll d3drm enable_d3drm implib wine_fn_config_test dlls/d3drm/tests d3drm_test diff --git a/configure.ac b/configure.ac index f9df3f0..22c12ac 100644 --- a/configure.ac +++ b/configure.ac @@ -2856,6 +2856,7 @@ WINE_CONFIG_DLL(d3dcompiler_41) WINE_CONFIG_DLL(d3dcompiler_42) WINE_CONFIG_DLL(d3dcompiler_43,,[implib],[d3dcompiler]) WINE_CONFIG_TEST(dlls/d3dcompiler_43/tests) +WINE_CONFIG_DLL(d3dcompiler_46) WINE_CONFIG_DLL(d3dim,,[implib]) WINE_CONFIG_DLL(d3drm,,[implib]) WINE_CONFIG_TEST(dlls/d3drm/tests) diff --git a/dlls/d3dcompiler_46/Makefile.in b/dlls/d3dcompiler_46/Makefile.in new file mode 100644 index 0000000..08c5145 --- /dev/null +++ b/dlls/d3dcompiler_46/Makefile.in @@ -0,0 +1,6 @@ +MODULE = d3dcompiler_46.dll + +C_SRCS = \ + d3dcompiler_46_main.c + +RC_SRCS = version.rc diff --git a/dlls/d3dcompiler_46/d3dcompiler_46.spec b/dlls/d3dcompiler_46/d3dcompiler_46.spec new file mode 100644 index 0000000..526a997 --- /dev/null +++ b/dlls/d3dcompiler_46/d3dcompiler_46.spec @@ -0,0 +1,25 @@ +@ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) d3dcompiler_43.D3DAssemble +@ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile +@ stub D3DCompile2 +@ stub D3DCompileFromFile +@ stub D3DCompressShaders +@ stdcall D3DCreateBlob(long ptr) d3dcompiler_43.D3DCreateBlob +@ stub D3DDecompressShaders +@ stdcall D3DDisassemble(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble +@ stdcall D3DDisassemble10Effect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect +@ stub D3DDisassemble11Trace +@ stub D3DDisassembleRegion +@ stdcall D3DGetBlobPart(ptr long long long ptr) d3dcompiler_43.D3DGetBlobPart +@ stdcall D3DGetDebugInfo(ptr long ptr) d3dcompiler_43.D3DGetDebugInfo +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputAndOutputSignatureBlob +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetOutputSignatureBlob +@ stub D3DGetTraceInstructionOffsets +@ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess +@ stub D3DReadFileToBlob +@ stdcall D3DReflect(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stub D3DReturnFailure1 +@ stub D3DSetBlobPart +@ stdcall D3DStripShader(ptr long long ptr) d3dcompiler_43.D3DStripShader +@ stub D3DWriteBlobToFile +@ stub DebugSetMute diff --git a/dlls/d3dcompiler_46/d3dcompiler_46_main.c b/dlls/d3dcompiler_46/d3dcompiler_46_main.c new file mode 100644 index 0000000..80da1ff --- /dev/null +++ b/dlls/d3dcompiler_46/d3dcompiler_46_main.c @@ -0,0 +1,42 @@ +/* + * Direct3D shader compiler main file + * + * Copyright 2015 Alistair Leslie-Hughes + * + * 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 + * + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/d3dcompiler_46/version.rc b/dlls/d3dcompiler_46/version.rc new file mode 100644 index 0000000..7f2ff53 --- /dev/null +++ b/dlls/d3dcompiler_46/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright 2015 Alistair Leslie-Hughes + * + * 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 + * + */ + +#define WINE_FILEDESCRIPTION_STR "Wine D3DCompiler" +#define WINE_FILENAME_STR "d3dcompiler_46.dll" +#define WINE_FILEVERSION 9,30,9200,20789 +#define WINE_FILEVERSION_STR "9.30.9200.20789" +#define WINE_PRODUCTVERSION 9,30,9200,20789 +#define WINE_PRODUCTVERSION_STR "9.30.9200.20789" + +#include "wine/wine_common_ver.rc" diff --git a/tools/make_specfiles b/tools/make_specfiles index 179e6d5..c61d9e6 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -94,6 +94,7 @@ my @dll_groups = ], [ "d3dcompiler_43", + "d3dcompiler_46", "d3dcompiler_42", "d3dcompiler_41", "d3dcompiler_40",

1 0

Hans Leidekker : msi: Open database cabinet streams through the streams implementation.
by Alexandre Julliard June 22, 2015

June 22, 2015

Module: wine Branch: master Commit: 597c5f9c4b35c7645d916cd687cede42fd331d0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=597c5f9c4b35c7645d916cd68… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 22 12:12:48 2015 +0200 msi: Open database cabinet streams through the streams implementation. --- dlls/msi/action.c | 7 ++++--- dlls/msi/media.c | 35 +++++++++++++++++++++++------------ dlls/msi/tests/patch.c | 30 +++++++++++++++++++++++++++++- 3 files changed, 56 insertions(+), 16 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e87dd7f..88bb1bb 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1313,9 +1313,10 @@ static UINT load_media( MSIRECORD *row, LPVOID param ) const WCHAR *cabinet = MSI_RecordGetString( row, 4 ); /* FIXME: load external cabinets and directory sources too */ - if (!cabinet || cabinet[0] != '#') return ERROR_SUCCESS; - msi_add_cabinet_stream( package, disk_id, package->db->storage, cabinet ); - return ERROR_SUCCESS; + if (!cabinet || cabinet[0] != '#' || disk_id >= MSI_INITIAL_MEDIA_TRANSFORM_DISKID) + return ERROR_SUCCESS; + + return msi_add_cabinet_stream( package, disk_id, package->db->storage, cabinet ); } static UINT load_all_media( MSIPACKAGE *package ) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 7c8c94f..d75f59f 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -220,28 +220,39 @@ static INT_PTR CDECL cabinet_open_stream( char *pszFile, int oflag, int pmode ) { MSICABINETSTREAM *cab; IStream *stream; - WCHAR *encoded; - HRESULT hr; - cab = msi_get_cabinet_stream( package_disk.package, package_disk.id ); - if (!cab) + if (!(cab = msi_get_cabinet_stream( package_disk.package, package_disk.id ))) { WARN("failed to get cabinet stream\n"); return -1; } - if (!cab->stream[0] || !(encoded = encode_streamname( FALSE, cab->stream + 1 ))) + if (cab->storage == package_disk.package->db->storage) { - WARN("failed to encode stream name\n"); - return -1; + UINT r = msi_get_stream( package_disk.package->db, cab->stream + 1, &stream ); + if (r != ERROR_SUCCESS) + { + WARN("failed to get stream %u\n", r); + return -1; + } } - hr = IStorage_OpenStream( cab->storage, encoded, NULL, STGM_READ|STGM_SHARE_EXCLUSIVE, 0, &stream ); - if (FAILED(hr)) + else /* patch storage */ { - WARN("failed to open stream 0x%08x\n", hr); + HRESULT hr; + WCHAR *encoded; + + if (!(encoded = encode_streamname( FALSE, cab->stream + 1 ))) + { + WARN("failed to encode stream name\n"); + return -1; + } + hr = IStorage_OpenStream( cab->storage, encoded, NULL, STGM_READ|STGM_SHARE_EXCLUSIVE, 0, &stream ); msi_free( encoded ); - return -1; + if (FAILED(hr)) + { + WARN("failed to open stream 0x%08x\n", hr); + return -1; + } } - msi_free( encoded ); return (INT_PTR)stream; } diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index 62a4b86..3c23656 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -969,6 +969,29 @@ static UINT find_entry( MSIHANDLE hdb, const char *table, const char *entry ) return r; } +static UINT find_entryW( MSIHANDLE hdb, const WCHAR *table, const WCHAR *entry ) +{ + static const WCHAR fmt[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','`','%','s','`',' ', + 'W','H','E','R','E',' ','`','N','a','m','e','`',' ','=',' ','\'','%','s','\'',0}; + WCHAR query[0x100]; + MSIHANDLE hview, hrec; + UINT r; + + wsprintfW( query, fmt, table, entry ); + r = MsiDatabaseOpenViewW( hdb, query, &hview ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewExecute( hview, 0 ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewFetch( hview, &hrec ); + MsiViewClose( hview ); + MsiCloseHandle( hview ); + MsiCloseHandle( hrec ); + return r; +} + static INT get_integer( MSIHANDLE hdb, UINT field, const char *query) { UINT r; @@ -1032,11 +1055,13 @@ static char *get_string( MSIHANDLE hdb, UINT field, const char *query) static void test_system_tables( void ) { + static const char patchsource[] = "MSPSRC0F96CDC04CDF4304B2837B9264889EF7"; + static const WCHAR streamsW[] = {'_','S','t','r','e','a','m','s',0}; + static const WCHAR CAB_msitest_encodedW[] = {0x3a8c,0x47cb,0x45b0,0x45ec,0x45a8,0x4837,0}; UINT r; char *cr; const char *query; MSIHANDLE hproduct, hdb, hview, hrec; - static const char patchsource[] = "MSPSRC0F96CDC04CDF4304B2837B9264889EF7"; if (!pMsiApplyPatchA) { @@ -1138,6 +1163,9 @@ static void test_system_tables( void ) r = find_entry( hdb, "_Streams", "\5SummaryInformation" ); ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + r = find_entryW( hdb, streamsW, CAB_msitest_encodedW ); + ok( r == ERROR_NO_MORE_ITEMS, "failed to find entry %u\n", r ); + query = "SELECT * FROM `_Storages`"; r = MsiDatabaseOpenViewA( hdb, query, &hview ); ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r );

1 0

Hans Leidekker : msi/tests: Fix test failures on win2k3.
by Alexandre Julliard June 22, 2015

June 22, 2015

Module: wine Branch: master Commit: 806ff30f921c9463e39dde6b0ce601eb0605b8b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=806ff30f921c9463e39dde6b0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 22 12:12:08 2015 +0200 msi/tests: Fix test failures on win2k3. --- dlls/msi/tests/install.c | 149 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 149 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=806ff30f921c9463e39dd…

1 0

Alistair Leslie-Hughes : d3dcompiler_47: Add stub dll.
by Alexandre Julliard June 22, 2015

June 22, 2015

Module: wine Branch: master Commit: e70b50d7723d9770c4a056b72640fa5319ee0515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e70b50d7723d9770c4a056b72… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 16 11:01:53 2015 +1000 d3dcompiler_47: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/d3dcompiler_47/Makefile.in | 6 +++++ dlls/d3dcompiler_47/d3dcompiler_47.spec | 29 +++++++++++++++++++++ dlls/d3dcompiler_47/d3dcompiler_47_main.c | 42 +++++++++++++++++++++++++++++++ dlls/d3dcompiler_47/version.rc | 27 ++++++++++++++++++++ tools/make_specfiles | 1 + 7 files changed, 108 insertions(+) diff --git a/configure b/configure index 80648ff..33dd534 100755 --- a/configure +++ b/configure @@ -985,6 +985,7 @@ enable_d3dcompiler_41 enable_d3dcompiler_42 enable_d3dcompiler_43 enable_d3dcompiler_46 +enable_d3dcompiler_47 enable_d3dim enable_d3drm enable_d3dx10_33 @@ -17181,6 +17182,7 @@ wine_fn_config_dll d3dcompiler_42 enable_d3dcompiler_42 wine_fn_config_dll d3dcompiler_43 enable_d3dcompiler_43 implib d3dcompiler wine_fn_config_test dlls/d3dcompiler_43/tests d3dcompiler_43_test wine_fn_config_dll d3dcompiler_46 enable_d3dcompiler_46 +wine_fn_config_dll d3dcompiler_47 enable_d3dcompiler_47 wine_fn_config_dll d3dim enable_d3dim implib wine_fn_config_dll d3drm enable_d3drm implib wine_fn_config_test dlls/d3drm/tests d3drm_test diff --git a/configure.ac b/configure.ac index 22c12ac..f56b6f6 100644 --- a/configure.ac +++ b/configure.ac @@ -2857,6 +2857,7 @@ WINE_CONFIG_DLL(d3dcompiler_42) WINE_CONFIG_DLL(d3dcompiler_43,,[implib],[d3dcompiler]) WINE_CONFIG_TEST(dlls/d3dcompiler_43/tests) WINE_CONFIG_DLL(d3dcompiler_46) +WINE_CONFIG_DLL(d3dcompiler_47) WINE_CONFIG_DLL(d3dim,,[implib]) WINE_CONFIG_DLL(d3drm,,[implib]) WINE_CONFIG_TEST(dlls/d3drm/tests) diff --git a/dlls/d3dcompiler_47/Makefile.in b/dlls/d3dcompiler_47/Makefile.in new file mode 100644 index 0000000..9f6ef8f --- /dev/null +++ b/dlls/d3dcompiler_47/Makefile.in @@ -0,0 +1,6 @@ +MODULE = d3dcompiler_47.dll + +C_SRCS = \ + d3dcompiler_47_main.c + +RC_SRCS = version.rc diff --git a/dlls/d3dcompiler_47/d3dcompiler_47.spec b/dlls/d3dcompiler_47/d3dcompiler_47.spec new file mode 100644 index 0000000..08bc418 --- /dev/null +++ b/dlls/d3dcompiler_47/d3dcompiler_47.spec @@ -0,0 +1,29 @@ +@ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) d3dcompiler_43.D3DAssemble +@ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile +@ stub D3DCompile2 +@ stub D3DCompileFromFile +@ stub D3DCompressShaders +@ stdcall D3DCreateBlob(long ptr) d3dcompiler_43.D3DCreateBlob +@ stub D3DCreateFunctionLinkingGraph +@ stub D3DCreateLinker +@ stub D3DDecompressShaders +@ stdcall D3DDisassemble(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble +@ stdcall D3DDisassemble10Effect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect +@ stub D3DDisassemble11Trace +@ stub D3DDisassembleRegion +@ stdcall D3DGetBlobPart(ptr long long long ptr) d3dcompiler_43.D3DGetBlobPart +@ stdcall D3DGetDebugInfo(ptr long ptr) d3dcompiler_43.D3DGetDebugInfo +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputAndOutputSignatureBlob +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetOutputSignatureBlob +@ stub D3DGetTraceInstructionOffsets +@ stub D3DLoadModule +@ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess +@ stub D3DReadFileToBlob +@ stdcall D3DReflect(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stub D3DReflectLibrary +@ stub D3DReturnFailure1 +@ stub D3DSetBlobPart +@ stdcall D3DStripShader(ptr long long ptr) d3dcompiler_43.D3DStripShader +@ stub D3DWriteBlobToFile +@ stub DebugSetMute diff --git a/dlls/d3dcompiler_47/d3dcompiler_47_main.c b/dlls/d3dcompiler_47/d3dcompiler_47_main.c new file mode 100644 index 0000000..320a4e0 --- /dev/null +++ b/dlls/d3dcompiler_47/d3dcompiler_47_main.c @@ -0,0 +1,42 @@ +/* + * Direct3D shader compiler main file + * + * Copyright 2015 Alistair Leslie-Hughes + * + * 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 + * + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instdll, DWORD reason, void *reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instdll); + break; + } + + return TRUE; +} diff --git a/dlls/d3dcompiler_47/version.rc b/dlls/d3dcompiler_47/version.rc new file mode 100644 index 0000000..5d03d7e --- /dev/null +++ b/dlls/d3dcompiler_47/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright 2015 Alistair Leslie-Hughes + * + * 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 + * + */ + +#define WINE_FILEDESCRIPTION_STR "Wine D3DCompiler" +#define WINE_FILENAME_STR "d3dcompiler_47.dll" +#define WINE_FILEVERSION 6,3,9600,16984 +#define WINE_FILEVERSION_STR "6.3.9600.16984" +#define WINE_PRODUCTVERSION 6,3,9600,16984 +#define WINE_PRODUCTVERSION_STR "6.3.9600.16984" + +#include "wine/wine_common_ver.rc" diff --git a/tools/make_specfiles b/tools/make_specfiles index c61d9e6..e967e68 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -94,6 +94,7 @@ my @dll_groups = ], [ "d3dcompiler_43", + "d3dcompiler_47", "d3dcompiler_46", "d3dcompiler_42", "d3dcompiler_41",

1 0

Hans Leidekker : wbemprox: Implement Win32_Process.WorkingSetSize.
by Alexandre Julliard June 22, 2015

June 22, 2015

Module: wine Branch: master Commit: 927400be6318ff65bb8b99f6c59faeb1ca075e9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=927400be6318ff65bb8b99f6c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 22 12:14:21 2015 +0200 wbemprox: Implement Win32_Process.WorkingSetSize. --- dlls/wbemprox/builtin.c | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 41a8e97..f1e5c4a 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -351,6 +351,8 @@ static const WCHAR prop_volumenameW[] = {'V','o','l','u','m','e','N','a','m','e',0}; static const WCHAR prop_volumeserialnumberW[] = {'V','o','l','u','m','e','S','e','r','i','a','l','N','u','m','b','e','r',0}; +static const WCHAR prop_workingsetsizeW[] = + {'W','o','r','k','i','n','g','S','e','t','S','i','z','e',0}; /* column definitions must be kept in sync with record structures below */ static const struct column col_baseboard[] = @@ -521,16 +523,17 @@ static const struct column col_printer[] = }; static const struct column col_process[] = { - { prop_captionW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_commandlineW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_handleW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_pprocessidW, CIM_UINT32, VT_I4 }, - { prop_processidW, CIM_UINT32, VT_I4 }, - { prop_threadcountW, CIM_UINT32, VT_I4 }, + { prop_captionW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_commandlineW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_handleW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_pprocessidW, CIM_UINT32, VT_I4 }, + { prop_processidW, CIM_UINT32, VT_I4 }, + { prop_threadcountW, CIM_UINT32, VT_I4 }, + { prop_workingsetsizeW, CIM_UINT64 }, /* methods */ - { method_getownerW, CIM_FLAG_ARRAY|COL_FLAG_METHOD } + { method_getownerW, CIM_FLAG_ARRAY|COL_FLAG_METHOD } }; static const struct column col_processor[] = { @@ -911,6 +914,7 @@ struct record_process UINT32 pprocess_id; UINT32 process_id; UINT32 thread_count; + UINT64 workingsetsize; /* methods */ class_method *get_owner; }; @@ -2204,16 +2208,17 @@ static enum fill_status fill_process( struct table *table, const struct expr *co if (!resize_table( table, row + 1, sizeof(*rec) )) goto done; rec = (struct record_process *)(table->data + offset); - rec->caption = heap_strdupW( entry.szExeFile ); - rec->commandline = get_cmdline( entry.th32ProcessID ); - rec->description = heap_strdupW( entry.szExeFile ); + rec->caption = heap_strdupW( entry.szExeFile ); + rec->commandline = get_cmdline( entry.th32ProcessID ); + rec->description = heap_strdupW( entry.szExeFile ); sprintfW( handle, fmtW, entry.th32ProcessID ); - rec->handle = heap_strdupW( handle ); - rec->name = heap_strdupW( entry.szExeFile ); - rec->process_id = entry.th32ProcessID; - rec->pprocess_id = entry.th32ParentProcessID; - rec->thread_count = entry.cntThreads; - rec->get_owner = process_get_owner; + rec->handle = heap_strdupW( handle ); + rec->name = heap_strdupW( entry.szExeFile ); + rec->process_id = entry.th32ProcessID; + rec->pprocess_id = entry.th32ParentProcessID; + rec->thread_count = entry.cntThreads; + rec->workingsetsize = 0; + rec->get_owner = process_get_owner; if (!match_row( table, row, cond, &status )) { free_row_values( table, row );

1 0

Nikolay Sivov : dwrite: Forward GetRecommendedRenderingMode() to newer method.
by Alexandre Julliard June 22, 2015

June 22, 2015

Module: wine Branch: master Commit: 86a7f329be04505e372cfe8aef73daeb7d00b80c URL: http://source.winehq.org/git/wine.git/?a=commit;h=86a7f329be04505e372cfe8ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 19 13:58:09 2015 +0300 dwrite: Forward GetRecommendedRenderingMode() to newer method. --- dlls/dwrite/font.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 587dc05..8ffad31 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -703,9 +703,11 @@ static HRESULT WINAPI dwritefontface1_GetRecommendedRenderingMode(IDWriteFontFac DWRITE_OUTLINE_THRESHOLD threshold, DWRITE_MEASURING_MODE measuring_mode, DWRITE_RENDERING_MODE *rendering_mode) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - FIXME("(%p)->(%f %f %f %p %d %d %d %p): stub\n", This, font_emsize, dpiX, dpiY, transform, is_sideways, + DWRITE_GRID_FIT_MODE gridfitmode; + TRACE("(%p)->(%.2f %.2f %.2f %p %d %d %d %p)\n", This, font_emsize, dpiX, dpiY, transform, is_sideways, threshold, measuring_mode, rendering_mode); - return E_NOTIMPL; + return IDWriteFontFace2_GetRecommendedRenderingMode(iface, font_emsize, dpiX, dpiY, transform, is_sideways, + threshold, measuring_mode, NULL, rendering_mode, &gridfitmode); } static HRESULT WINAPI dwritefontface1_GetVerticalGlyphVariants(IDWriteFontFace2 *iface, UINT32 glyph_count,

1 0

Jacek Caban : wininet: Cache blocking state in netconn_t.
by Alexandre Julliard June 22, 2015

June 22, 2015

Module: wine Branch: master Commit: 9d3fda008f07d9651df2c0894403b46d59e46845 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d3fda008f07d9651df2c0894… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 19 15:21:46 2015 +0200 wininet: Cache blocking state in netconn_t. --- dlls/wininet/internet.h | 1 + dlls/wininet/netconnection.c | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 4044bbf..8c3a1f1 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -68,6 +68,7 @@ typedef struct { int socket; BOOL secure; + BOOL is_blocking; CtxtHandle ssl_ctx; SecPkgContext_StreamSizes ssl_sizes; server_t *server; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 983782d..7305860 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -282,8 +282,11 @@ void init_winsock(void) static void set_socket_blocking(netconn_t *conn, BOOL is_blocking) { - ULONG arg = !is_blocking; - ioctlsocket(conn->socket, FIONBIO, &arg); + if(conn->is_blocking != is_blocking) { + ULONG arg = !is_blocking; + ioctlsocket(conn->socket, FIONBIO, &arg); + } + conn->is_blocking = is_blocking; } static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD timeout)

1 0

Gerald Pfeifer : winedbg: Avoid "uninitialized variable" compiler warning in types_extract_as_longlong.
by Alexandre Julliard June 22, 2015

June 22, 2015

Module: wine Branch: master Commit: ced33792ff9b3dfae1a391521df6dd4762bd23ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=ced33792ff9b3dfae1a391521… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Jun 21 21:30:17 2015 +0200 winedbg: Avoid "uninitialized variable" compiler warning in types_extract_as_longlong. --- programs/winedbg/types.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 31e7d38..8e8e9c4 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -56,7 +56,7 @@ BOOL types_get_real_type(struct dbg_type* type, DWORD* tag) LONGLONG types_extract_as_longlong(const struct dbg_lvalue* lvalue, unsigned* psize, BOOL *issigned) { - LONGLONG rtn; + LONGLONG rtn = 0; DWORD tag, bt; DWORD64 size; struct dbg_type type = lvalue->type; @@ -123,7 +123,6 @@ LONGLONG types_extract_as_longlong(const struct dbg_lvalue* lvalue, default: WINE_FIXME("Unsupported tag %u\n", tag); RaiseException(DEBUG_STATUS_NOT_AN_INTEGER, 0, 0, NULL); - rtn = 0; } return rtn;

1 0