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

Matteo Bruni : d3dx9: Allow implicit conversions in D3DXCreateTextureFromFileInMemoryEx.
by Alexandre Julliard Aug. 27, 2014

Aug. 27, 2014

Module: wine Branch: master Commit: 5aeb834dd4e7b9ed32fb3ffee532e7bcebce2bdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aeb834dd4e7b9ed32fb3ffee… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Aug 27 18:40:50 2014 +0200 d3dx9: Allow implicit conversions in D3DXCreateTextureFromFileInMemoryEx. They should be generally supported by the existing code. Specific missing format conversions are caught and reported by D3DXLoadSurfaceFromMemory(), which is called directly or indirectly from here. --- dlls/d3dx9_36/texture.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 47c3c1d..7ebe264 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -546,8 +546,6 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi IDirect3DTexture9 **texptr; IDirect3DTexture9 *buftex; IDirect3DSurface9 *surface; - BOOL file_width = FALSE, file_height = FALSE; - BOOL file_format = FALSE, file_miplevels = FALSE; BOOL dynamic_texture; D3DXIMAGE_INFO imginfo; UINT loaded_miplevels, skip_levels; @@ -590,25 +588,21 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi if (width == D3DX_FROM_FILE) { - file_width = TRUE; width = imginfo.Width; } if (height == D3DX_FROM_FILE) { - file_height = TRUE; height = imginfo.Height; } if (format == D3DFMT_FROM_FILE) { - file_format = TRUE; format = imginfo.Format; } if (miplevels == D3DX_FROM_FILE) { - file_miplevels = TRUE; miplevels = imginfo.MipLevels; } @@ -648,14 +642,6 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi miplevels = 1; } - if (((file_width) && (width != imginfo.Width)) || - ((file_height) && (height != imginfo.Height)) || - ((file_format) && (format != imginfo.Format)) || - ((file_miplevels) && (miplevels != imginfo.MipLevels))) - { - return D3DERR_NOTAVAILABLE; - } - if (FAILED(IDirect3DDevice9_GetDeviceCaps(device, &caps))) return D3DERR_INVALIDCALL;

1 0

Indrek Altpere : winemenubuilder: Fix resource leak (Valgrind).
by Alexandre Julliard Aug. 27, 2014

Aug. 27, 2014

Module: wine Branch: master Commit: 7b8624649ac5e577f0b8da802091c51d48bb7e88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b8624649ac5e577f0b8da802… Author: Indrek Altpere <efbiaiinzinz(a)hotmail.com> Date: Wed Aug 27 09:53:18 2014 +0300 winemenubuilder: Fix resource leak (Valgrind). --- programs/winemenubuilder/winemenubuilder.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 4675369..b617510 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -515,6 +515,8 @@ static HRESULT convert_to_native_icon(IStream *icoFile, int *indices, int numInd IWICBitmapSource_Release(sourceBitmap); if (dstFrame) IWICBitmapFrameEncode_Release(dstFrame); + if (options) + IPropertyBag2_Release(options); } hr = IWICBitmapEncoder_Commit(encoder);

1 0

Zhenbo Li : mshtml/tests: Fix a memory leak.
by Alexandre Julliard Aug. 27, 2014

Aug. 27, 2014

Module: wine Branch: master Commit: 334eedb09e4d55e68cd6de26144dc8ace33dc272 URL: http://source.winehq.org/git/wine.git/?a=commit;h=334eedb09e4d55e68cd6de261… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Wed Aug 27 15:19:38 2014 +0800 mshtml/tests: Fix a memory leak. --- dlls/mshtml/tests/dom.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 160a81e..03c3159 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7041,8 +7041,10 @@ static void test_elems(IHTMLDocument2 *doc) ok(hres == S_OK, "get_type failed: %08x\n", hres); ok(type == NULL, "Unexpected type %s\n", wine_dbgstr_w(type)); - hres = IHTMLScriptElement_put_type (script, a2bstr ("text/javascript")); + type = a2bstr("text/javascript"); + hres = IHTMLScriptElement_put_type (script, type); ok(hres == S_OK, "put_type failed: %08x\n", hres); + SysFreeString(type); hres = IHTMLScriptElement_get_type(script, &type); ok(hres == S_OK, "get_type failed: %08x\n", hres); ok(!strcmp_wa(type, "text/javascript"), "Unexpected type %s\n", wine_dbgstr_w(type));

1 0

Matteo Bruni : d3dx9: Avoid reading outside of the allocated surface memory (Valgrind).
by Alexandre Julliard Aug. 27, 2014

Aug. 27, 2014

Module: wine Branch: master Commit: 807c01727cdfbefaba0f71b063d20bf14e28e106 URL: http://source.winehq.org/git/wine.git/?a=commit;h=807c01727cdfbefaba0f71b06… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Aug 27 18:40:48 2014 +0200 d3dx9: Avoid reading outside of the allocated surface memory (Valgrind). --- dlls/d3dx9_36/surface.c | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index ad38444..c91048b 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1366,12 +1366,28 @@ static void init_argb_conversion_info(const struct pixel_format_desc *srcformat, * Extracts the relevant components from the source color and * drops the less significant bits if they aren't used by the destination format. */ -static void get_relevant_argb_components(const struct argb_conversion_info *info, DWORD col, DWORD *out) +static void get_relevant_argb_components(const struct argb_conversion_info *info, const BYTE *col, DWORD *out) { - UINT i = 0; - for(;i < 4;i++) - if(info->process_channel[i]) - out[i] = (col & info->srcmask[i]) >> info->srcshift[i]; + unsigned int i, j; + unsigned int component, mask; + + for (i = 0; i < 4; ++i) + { + if (!info->process_channel[i]) + continue; + + component = 0; + mask = info->srcmask[i]; + for (j = 0; j < 4 && mask; ++j) + { + if (info->srcshift[i] < j * 8) + component |= (col[j] & mask) << (j * 8 - info->srcshift[i]); + else + component |= (col[j] & mask) >> (info->srcshift[i] - j * 8); + mask >>= 8; + } + out[i] = component; + } } /************************************************************ @@ -1549,14 +1565,14 @@ void convert_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pit { DWORD val; - get_relevant_argb_components(&conv_info, *(DWORD *)src_ptr, channels); + get_relevant_argb_components(&conv_info, src_ptr, channels); val = make_argb_color(&conv_info, channels); if (color_key) { DWORD ck_pixel; - get_relevant_argb_components(&ck_conv_info, *(DWORD *)src_ptr, channels); + get_relevant_argb_components(&ck_conv_info, src_ptr, channels); ck_pixel = make_argb_color(&ck_conv_info, channels); if (ck_pixel == color_key) val &= ~conv_info.destmask[0]; @@ -1652,14 +1668,14 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic { DWORD val; - get_relevant_argb_components(&conv_info, *(DWORD *)src_ptr, channels); + get_relevant_argb_components(&conv_info, src_ptr, channels); val = make_argb_color(&conv_info, channels); if (color_key) { DWORD ck_pixel; - get_relevant_argb_components(&ck_conv_info, *(DWORD *)src_ptr, channels); + get_relevant_argb_components(&ck_conv_info, src_ptr, channels); ck_pixel = make_argb_color(&ck_conv_info, channels); if (ck_pixel == color_key) val &= ~conv_info.destmask[0];

1 0

Austin English : npptools: Add stub dll.
by Alexandre Julliard Aug. 27, 2014

Aug. 27, 2014

Module: wine Branch: master Commit: 8c9011db67092ff17f40f1ed6280fb70496a5233 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c9011db67092ff17f40f1ed6… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jul 27 00:17:59 2014 -0700 npptools: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/npptools/Makefile.in | 4 +++ dlls/npptools/main.c | 38 ++++++++++++++++++++++++++++ dlls/npptools/npptools.spec | 60 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 105 insertions(+) diff --git a/configure b/configure index a5c5eb4..fe2cf48 100755 --- a/configure +++ b/configure @@ -1151,6 +1151,7 @@ enable_netprofm enable_newdev enable_normaliz enable_npmshtml +enable_npptools enable_ntdll enable_ntdsapi enable_ntoskrnl_exe @@ -17148,6 +17149,7 @@ wine_fn_config_test dlls/netprofm/tests netprofm_test wine_fn_config_dll newdev enable_newdev implib wine_fn_config_dll normaliz enable_normaliz implib wine_fn_config_dll npmshtml enable_npmshtml +wine_fn_config_dll npptools enable_npptools wine_fn_config_dll ntdll enable_ntdll implib wine_fn_config_test dlls/ntdll/tests ntdll_test wine_fn_config_dll ntdsapi enable_ntdsapi implib diff --git a/configure.ac b/configure.ac index b93cf6a..ba0c927 100644 --- a/configure.ac +++ b/configure.ac @@ -3059,6 +3059,7 @@ WINE_CONFIG_TEST(dlls/netprofm/tests) WINE_CONFIG_DLL(newdev,,[implib]) WINE_CONFIG_DLL(normaliz,,[implib]) WINE_CONFIG_DLL(npmshtml) +WINE_CONFIG_DLL(npptools) WINE_CONFIG_DLL(ntdll,,[implib]) WINE_CONFIG_TEST(dlls/ntdll/tests) WINE_CONFIG_DLL(ntdsapi,,[implib]) diff --git a/dlls/npptools/Makefile.in b/dlls/npptools/Makefile.in new file mode 100644 index 0000000..a9bbd35 --- /dev/null +++ b/dlls/npptools/Makefile.in @@ -0,0 +1,4 @@ +MODULE = npptools.dll + +C_SRCS = \ + main.c diff --git a/dlls/npptools/main.c b/dlls/npptools/main.c new file mode 100644 index 0000000..a72f634 --- /dev/null +++ b/dlls/npptools/main.c @@ -0,0 +1,38 @@ +/* + * + * Copyright 2014 Austin English + * + * 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 <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID 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/npptools/npptools.spec b/dlls/npptools/npptools.spec new file mode 100644 index 0000000..9f69e21 --- /dev/null +++ b/dlls/npptools/npptools.spec @@ -0,0 +1,60 @@ +@ stub ClearEventData +@ stub CreateBlob +@ stub CreateNPPInterface +@ stub DestroyBlob +@ stub DestroyNPPBlobTable +@ stub DuplicateBlob +@ stub FilterNPPBlob +@ stub FindOneOf +@ stub FindUnknownBlobCategories +@ stub FindUnknownBlobTags +@ stub GetBoolFromBlob +@ stub GetClassIDFromBlob +@ stub GetDwordFromBlob +@ stub GetMacAddressFromBlob +@ stub GetNPPAddressFilterFromBlob +@ stub GetNPPBlobFromUI +@ stub GetNPPBlobTable +@ stub GetNPPEtypeSapFilter +@ stub GetNPPMacTypeAsNumber +@ stub GetNPPPatternFilterFromBlob +@ stub GetNPPTriggerFromBlob +@ stub GetNetworkInfoFromBlob +@ stub GetStringFromBlob +@ stub GetStringsFromBlob +@ stub IsRemoteNPP +@ stub LockBlob +@ stub MarshalBlob +@ stub MergeBlob +@ stub NmAddUsedEntry +@ stub NmHeapAllocate +@ stub NmHeapFree +@ stub NmHeapReallocate +@ stub NmHeapSetMaxSize +@ stub NmHeapSize +@ stub NmRemoveUsedEntry +@ stub RaiseNMEvent +@ stub ReadBlobFromFile +@ stub RegCreateBlobKey +@ stub RegOpenBlobKey +@ stub ReleaseEventSystem +@ stub RemoveFromBlob +@ stub SelectNPPBlobFromTable +@ stub SendEvent +@ stub SetBoolInBlob +@ stub SetClassIDInBlob +@ stub SetDwordInBlob +@ stub SetMacAddressInBlob +@ stub SetNPPAddressFilterInBlob +@ stub SetNPPEtypeSapFilter +@ stub SetNPPPatternFilterInBlob +@ stub SetNPPTriggerInBlob +@ stub SetNetworkInfoInBlob +@ stub SetStringInBlob +@ stub SubkeyExists +@ stub UnMarshalBlob +@ stub UnlockBlob +@ stub WriteBlobToFile +@ stub WriteCrackedBlobToFile +@ stub recursiveDeleteKey +@ stub setKeyAndValue

1 0

Nikolay Sivov : advapi32: Use heap helpers in security code.
by Alexandre Julliard Aug. 27, 2014

Aug. 27, 2014

Module: wine Branch: master Commit: b60a2710f8b63f23ccc1601a6f0af758193bf39c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b60a2710f8b63f23ccc1601a6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 27 15:48:17 2014 +0400 advapi32: Use heap helpers in security code. --- dlls/advapi32/lsa.c | 16 +++---- dlls/advapi32/security.c | 111 ++++++++++++++++++++++------------------------- 2 files changed, 60 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b60a2710f8b63f23ccc16…

1 0

Jacek Caban : d3d11.idl: Added a few more missing constants.
by Alexandre Julliard Aug. 26, 2014

Aug. 26, 2014

Module: wine Branch: master Commit: be415f3c8c580c0953dd6ba3230d8e08ed730a16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be415f3c8c580c0953dd6ba32… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 26 20:13:27 2014 +0200 d3d11.idl: Added a few more missing constants. --- include/d3d11.idl | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index 4e883f7..7bd8af7 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -176,6 +176,28 @@ const UINT D3D11_SO_NO_RASTERIZED_STREAM = 0xffffffff; const UINT D3D11_SO_OUTPUT_COMPONENT_COUNT = 128; const UINT D3D11_SO_STREAM_COUNT = 4; +const UINT D3D11_SPEC_DATE_DAY = 16; +const UINT D3D11_SPEC_DATE_MONTH = 05; +const UINT D3D11_SPEC_DATE_YEAR = 2011; + +cpp_quote("#define D3D11_SPEC_VERSION (1.07)") +cpp_quote("#define D3D11_SRGB_GAMMA (2.2f)") +cpp_quote("#define D3D11_SRGB_TO_FLOAT_DENOMINATOR_1 (12.92f)") +cpp_quote("#define D3D11_SRGB_TO_FLOAT_DENOMINATOR_2 (1.055f)") +cpp_quote("#define D3D11_SRGB_TO_FLOAT_EXPONENT (2.4f)") +cpp_quote("#define D3D11_SRGB_TO_FLOAT_OFFSET (0.055f)") +cpp_quote("#define D3D11_SRGB_TO_FLOAT_THRESHOLD (0.04045f)") +cpp_quote("#define D3D11_SRGB_TO_FLOAT_TOLERANCE_IN_ULP (0.5f)") + +const UINT D3D11_STANDARD_COMPONENT_BIT_COUNT = 32; +const UINT D3D11_STANDARD_COMPONENT_BIT_COUNT_DOUBLED = 64; +const UINT D3D11_STANDARD_MAXIMUM_ELEMENT_ALIGNMENT_BYTE_MULTIPLE = 4; +const UINT D3D11_STANDARD_PIXEL_COMPONENT_COUNT = 128; +const UINT D3D11_STANDARD_PIXEL_ELEMENT_COUNT = 32; +const UINT D3D11_STANDARD_VECTOR_SIZE = 4; +const UINT D3D11_STANDARD_VERTEX_ELEMENT_COUNT = 32; +const UINT D3D11_STANDARD_VERTEX_TOTAL_COMPONENT_COUNT = 64; + cpp_quote("#if !defined(D3D11_NO_HELPERS) && defined(__cplusplus)") cpp_quote("struct CD3D11_DEFAULT {};") cpp_quote("extern const DECLSPEC_SELECTANY CD3D11_DEFAULT D3D11_DEFAULT;")

1 0

Piotr Caban : msvcp71: Add basic_istream_char_read_ch export.
by Alexandre Julliard Aug. 26, 2014

Aug. 26, 2014

Module: wine Branch: master Commit: 9679937906e31c979f4db8a8bd7046edeaa5998c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9679937906e31c979f4db8a8b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 26 17:49:09 2014 +0200 msvcp71: Add basic_istream_char_read_ch export. --- dlls/msvcp71/msvcp71.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 3dc82a7..bb1b4ae 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -2,10 +2,10 @@ @ stub -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAC(a)Z @ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAD(a)Z(ptr ptr) basic_istream_char_read_ch @ cdecl -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAD(a)Z(ptr ptr) basic_istream_char_read_ch -@ stub -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAE(a)Z -@ stub -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAE(a)Z -@ stub -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PAC(a)Z -@ stub -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEAC(a)Z +@ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAE(a)Z(ptr ptr) basic_istream_char_read_ch +@ cdecl -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAE(a)Z(ptr ptr) basic_istream_char_read_ch +@ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PAC(a)Z(ptr ptr) basic_istream_char_read_ch +@ cdecl -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEAC(a)Z(ptr ptr) basic_istream_char_read_ch @ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PAD(a)Z(ptr ptr) basic_istream_char_read_str @ cdecl -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@PEAD(a)Z(ptr ptr) basic_istream_char_read_str @ stub -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@PAE(a)Z

1 0

Guillaume Charifi : oleaut32/tests: Add test for TLB dependencies lookup in resources.
by Alexandre Julliard Aug. 26, 2014

Aug. 26, 2014

Module: wine Branch: master Commit: 16000c6129bdcf892ac60e2cd092ccfb4d0fd2f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16000c6129bdcf892ac60e2cd… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Tue Aug 26 18:02:51 2014 +0200 oleaut32/tests: Add test for TLB dependencies lookup in resources. --- dlls/oleaut32/tests/typelib.c | 96 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 49057a4..728185a 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -5509,6 +5509,101 @@ static void test_stub(void) CoUninitialize(); } +static void test_dep(void) { + HRESULT hr; + const char *refFilename; + WCHAR refFilenameW[MAX_PATH]; + ITypeLib *preftLib; + ITypeInfo *preftInfo; + char filename[MAX_PATH]; + WCHAR filenameW[MAX_PATH]; + ICreateTypeLib2 *pctLib; + ICreateTypeInfo *pctInfo; + ITypeLib *ptLib; + ITypeInfo *ptInfo; + ITypeInfo *ptInfoExt = NULL; + HREFTYPE refType; + + static WCHAR ifacenameW[] = {'I','T','e','s','t','D','e','p',0}; + + static const GUID libguid = {0xe0228f26,0x2946,0x478c,{0xb6,0x4a,0x93,0xfe,0xef,0xa5,0x05,0x32}}; + static const GUID ifaceguid = {0x394376dd,0x3bb8,0x4804,{0x8c,0xcc,0x95,0x59,0x43,0x40,0x04,0xf3}}; + + trace("Starting typelib dependency tests\n"); + + refFilename = create_test_typelib(2); + MultiByteToWideChar(CP_ACP, 0, refFilename, -1, refFilenameW, MAX_PATH); + + hr = LoadTypeLibEx(refFilenameW, REGKIND_NONE, &preftLib); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ITypeLib_GetTypeInfoOfGuid(preftLib, &IID_ISimpleIface, &preftInfo); + ok(hr == S_OK, "got %08x\n", hr); + + GetTempFileNameA(".", "tlb", 0, filename); + MultiByteToWideChar(CP_ACP, 0, filename, -1, filenameW, MAX_PATH); + + if(sizeof(void*) == 8) { + hr = CreateTypeLib2(SYS_WIN64, filenameW, &pctLib); + ok(hr == S_OK, "got %08x\n", hr); + } else { + hr = CreateTypeLib2(SYS_WIN32, filenameW, &pctLib); + ok(hr == S_OK, "got %08x\n", hr); + } + + hr = ICreateTypeLib2_SetGuid(pctLib, &libguid); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SetLcid(pctLib, LOCALE_NEUTRAL); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_CreateTypeInfo(pctLib, ifacenameW, TKIND_INTERFACE, &pctInfo); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetGuid(pctInfo, &ifaceguid); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_SetTypeFlags(pctInfo, TYPEFLAG_FOLEAUTOMATION); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_AddRefTypeInfo(pctInfo, preftInfo, &refType); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeInfo_AddImplType(pctInfo, 0, refType); + ok(hr == S_OK, "got %08x\n", hr); + + ICreateTypeInfo_Release(pctInfo); + + hr = ICreateTypeLib2_SaveAllChanges(pctLib); + ok(hr == S_OK, "got %08x\n", hr); + + ICreateTypeLib2_Release(pctLib); + + ITypeInfo_Release(preftInfo); + ITypeLib_Release(preftLib); + + DeleteFileW(refFilenameW); + + hr = LoadTypeLibEx(filenameW, REGKIND_NONE, &ptLib); + ok(hr == S_OK, "got: %x\n", hr); + + hr = ITypeLib_GetTypeInfoOfGuid(ptLib, &ifaceguid, &ptInfo); + ok(hr == S_OK, "got: %x\n", hr); + + hr = ITypeInfo_GetRefTypeOfImplType(ptInfo, 0, &refType); + ok(hr == S_OK, "got: %x\n", hr); + + hr = ITypeInfo_GetRefTypeInfo(ptInfo, refType, &ptInfoExt); + todo_wine ok(hr == S_OK || broken(hr == TYPE_E_CANTLOADLIBRARY) /* win 2000 */, "got: %x\n", hr); + + ITypeInfo_Release(ptInfo); + if(ptInfoExt) + ITypeInfo_Release(ptInfoExt); + ITypeLib_Release(ptLib); + + DeleteFileW(filenameW); +} + START_TEST(typelib) { const char *filename; @@ -5548,4 +5643,5 @@ START_TEST(typelib) test_LoadRegTypeLib(); test_GetLibAttr(); test_stub(); + test_dep(); }

1 0

Aric Stewart : dwrite: Beginning implementation of IDWriteLocalFontFileLoader.
by Alexandre Julliard Aug. 26, 2014

Aug. 26, 2014

Module: wine Branch: master Commit: 95466a1c2f50f5df22c34be76c809db4a3dd18af URL: http://source.winehq.org/git/wine.git/?a=commit;h=95466a1c2f50f5df22c34be76… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Aug 26 08:11:59 2014 -0700 dwrite: Beginning implementation of IDWriteLocalFontFileLoader. --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 245 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/main.c | 17 ++- dlls/dwrite/tests/font.c | 46 ++++++++ 4 files changed, 307 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95466a1c2f50f5df22c34…

1 0