wine-commits May 2018

wine-commits@winehq.org

2 participants
716 discussions

Michael Stefaniuc : notepad: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 23 May '18

23 May '18

Module: wine Branch: master Commit: d98be23eaba1cd49a2d0733581266b233f6e52d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d98be23eaba1cd49a2d07335… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 23 00:41:53 2018 +0200 notepad: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/notepad/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 6f567a9..da39eec 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -76,7 +76,7 @@ VOID SetFileNameAndEncoding(LPCWSTR szFileName, ENCODING enc) { lstrcpyW(Globals.szFileName, szFileName); Globals.szFileTitle[0] = 0; - GetFileTitleW(szFileName, Globals.szFileTitle, sizeof(Globals.szFileTitle) / sizeof(WCHAR)); + GetFileTitleW(szFileName, Globals.szFileTitle, ARRAY_SIZE(Globals.szFileTitle)); Globals.encFile = enc; }

1 0

Nikolay Sivov : dwrite/tests: Skip some tests on variable fonts.
by Alexandre Julliard 23 May '18

23 May '18

Module: wine Branch: master Commit: abe71945ef04578daf356b8f2ad904d9fe6c7ba8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abe71945ef04578daf356b8f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 23 08:24:38 2018 +0300 dwrite/tests: Skip some tests on variable fonts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 34 ++++++++++++++++++++++++++++++++++ include/dwrite_3.idl | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 6c72319..44a81a1 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2544,6 +2544,19 @@ static void get_logfont_from_font(IDWriteFont *font, LOGFONTW *logfont) IDWriteFontFace_Release(fontface); } +static BOOL has_face_variations(IDWriteFontFace *fontface) +{ + IDWriteFontFace5 *fontface5; + BOOL ret = FALSE; + + if (SUCCEEDED(IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace5, (void **)&fontface5))) { + ret = IDWriteFontFace5_HasVariations(fontface5); + IDWriteFontFace5_Release(fontface5); + } + + return ret; +} + static void test_ConvertFontFaceToLOGFONT(void) { IDWriteFontCollection *collection; @@ -2614,6 +2627,13 @@ if (0) /* crashes on native */ hr = IDWriteFont_CreateFontFace(font, &fontface); ok(hr == S_OK, "got 0x%08x\n", hr); + if (has_face_variations(fontface)) { + skip("%s: test does not support variable fonts.\n", wine_dbgstr_w(nameW)); + IDWriteFontFace_Release(fontface); + IDWriteFont_Release(font); + continue; + } + memset(&logfont, 0xcc, sizeof(logfont)); hr = IDWriteGdiInterop_ConvertFontFaceToLOGFONT(interop, fontface, &logfont); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -4014,6 +4034,8 @@ if (0) { /* crashes on native */ for (j = 0; j < font_count; j++) { static const WCHAR spaceW[] = {' ', 0}; + IDWriteFontFace *fontface; + BOOL has_variations; hr = IDWriteFontFamily_GetFont(family, j, &font); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -4028,6 +4050,18 @@ if (0) { /* crashes on native */ lstrcatW(nameW, spaceW); lstrcatW(nameW, facenameW); + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + has_variations = has_face_variations(fontface); + IDWriteFontFace_Release(fontface); + + if (has_variations) { + skip("%s: test does not support variable fonts.\n", wine_dbgstr_w(nameW)); + IDWriteFont_Release(font); + continue; + } + system = FALSE; memset(&logfont, 0xcc, sizeof(logfont)); hr = IDWriteGdiInterop_ConvertFontToLOGFONT(interop, font, &logfont, &system); diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index 6b4931c..af4ffc8 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -22,6 +22,7 @@ interface IDWriteFontFaceReference; interface IDWriteFontFace3; interface IDWriteFontSet; interface IDWriteFontDownloadQueue; +interface IDWriteFontResource; cpp_quote("#ifndef _WINGDI_") /* already defined in wingdi.h but needed for WIDL */ @@ -457,6 +458,37 @@ interface IDWriteFontFace4 : IDWriteFontFace3 void ReleaseGlyphImageData(void *context); } +typedef enum DWRITE_FONT_AXIS_TAG +{ + DWRITE_FONT_AXIS_TAG_WEIGHT = 0x74686777, /* 'wght' */ + DWRITE_FONT_AXIS_TAG_WIDTH = 0x68746477, /* 'wdth' */ + DWRITE_FONT_AXIS_TAG_SLANT = 0x746e6c73, /* 'slnt' */ + DWRITE_FONT_AXIS_TAG_OPTICAL_SIZE = 0x7a73706f, /* 'opsz' */ + DWRITE_FONT_AXIS_TAG_ITALIC = 0x6c617469, /* 'ital' */ +} DWRITE_FONT_AXIS_TAG; + +typedef struct DWRITE_FONT_AXIS_VALUE +{ + DWRITE_FONT_AXIS_TAG axisTag; + FLOAT value; +} DWRITE_FONT_AXIS_VALUE; + +[ + local, + object, + uuid(98eff3a5-b667-479a-b145-e2fa5b9fdc29) +] +interface IDWriteFontFace5 : IDWriteFontFace4 +{ + UINT32 GetFontAxisValueCount(); + HRESULT GetFontAxisValues( + DWRITE_FONT_AXIS_VALUE *values, + UINT32 value_count); + BOOL HasVariations(); + HRESULT GetFontResource(IDWriteFontResource **resource); + BOOL Equals(IDWriteFontFace *fontface); +} + typedef struct DWRITE_COLOR_GLYPH_RUN1 { DWRITE_GLYPH_RUN glyphRun;

1 0

Nikolay Sivov : dwrite/tests: Remove a test failing after recent update.
by Alexandre Julliard 23 May '18

23 May '18

Module: wine Branch: master Commit: 3493792da30bd5ce3531bc5168199c8f4efd7605 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3493792da30bd5ce3531bc51… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 23 08:24:37 2018 +0300 dwrite/tests: Remove a test failing after recent update. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index f23bfcc..6c72319 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3233,12 +3233,7 @@ static void test_shared_isolated(void) ok(shared == shared2, "got %p, and %p\n", shared, shared2); IDWriteFactory_Release(shared2); - hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, &IID_IUnknown, (IUnknown**)&shared2); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(shared == shared2, "got %p, and %p\n", shared, shared2); - IDWriteFactory_Release(shared); - IDWriteFactory_Release(shared2); /* we got 2 references, released 2 - still same pointer is returned */ hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, &IID_IDWriteFactory, (IUnknown**)&shared2);

1 0

Alexandre Julliard : vkd3d release 1.0
by Alexandre Julliard 23 May '18

23 May '18

Module: website Branch: master Commit: 55cb706c0fcba7e139e666b4921e11aef0fb3459 URL: https://source.winehq.org/git/website.git/?a=commit;h=55cb706c0fcba7e139e66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 19:26:10 2018 +0200 vkd3d release 1.0 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018052301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2018052301.xml b/news/en/2018052301.xml new file mode 100644 index 0000000..3742db1 --- /dev/null +++ b/news/en/2018052301.xml @@ -0,0 +1,16 @@ +<news> +<date>May 23, 2018</date> +<title>Vkd3d 1.0 Released</title> +<body> +The Wine team is proud to announce that release 1.0 of vkd3d, the +Direct3D 12 to Vulkan translation library, is now available. + +This is the first release of vkd3d. A lot of Direct3D 12 features are still +missing and bugs are expected. The current version was tested mainly with demo +applications. A number of features that are being worked on have been deferred +to the next development cycle. This includes in particular geometry and +tessellation shaders support, various shader translation improvements, as well +as various improvements for core Direct3D 12 methods. + +The source is <a href="https://dl.winehq.org/vkd3d/source/vkd3d-1.0.tar.xz">available here</a>. +</body></news>

1 0

Tag vkd3d-1.0 : Alexandre Julliard : Release 1.0
by Alexandre Julliard 23 May '18

23 May '18

Module: vkd3d Branch: refs/tags/vkd3d-1.0 Tag: 9e3814ff2bb8ceb2deaf65302bcf6548ac31febd URL: https://source.winehq.org/git/vkd3d.git/?a=tag;h=9e3814ff2bb8ceb2deaf65302b… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 19:19:15 2018 +0200 Release 1.0

1 0

Alexandre Julliard : Release 1.0.
by Alexandre Julliard 23 May '18

23 May '18

Module: vkd3d Branch: master Commit: 020c119e2da0786d8be0615cff961c190b00d62d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=020c119e2da0786d8be0615… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 19:19:15 2018 +0200 Release 1.0. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 2 +- 2 files changed, 91 insertions(+), 1 deletion(-) diff --git a/ANNOUNCE b/ANNOUNCE new file mode 100644 index 0000000..8c2c1de --- /dev/null +++ b/ANNOUNCE @@ -0,0 +1,90 @@ +The Wine team is proud to announce that release 1.0 of vkd3d, the +Direct3D 12 to Vulkan translation library, is now available. + +This is the first release of vkd3d. A lot of Direct3D 12 features are still +missing and bugs are expected. The current version was tested mainly with demo +applications. A number of features that are being worked on have been deferred +to the next development cycle. This includes in particular geometry and +tessellation shaders support, various shader translation improvements, as well +as various improvements for core Direct3D 12 methods. + +The source is available from the following location: + + https://dl.winehq.org/vkd3d/source/vkd3d-1.0.tar.xz + +The current source can also be pulled directly from the git repository: + + https://source.winehq.org/git/vkd3d.git/ + +Vkd3d is available thanks to the work of multiple people. See the file AUTHORS +for the complete list. + +---------------------------------------------------------------- + +What's included in vkd3d 1.0 +============================ + + +*** libvkd3d + +- libvkd3d is the main component of the vkd3d project. It's a 3D graphics + library built on top of Vulkan with an API very similar to Direct3D 12. + +- A significant number of Direct3D 12 features are implemented, including: + - Graphics and compute pipelines. + - Command lists, command allocators and command queues. + - Descriptors and descriptor heaps. + - Root signatures. + - Constant buffer, shader resource, unordered access, render target and depth + stencil views. + - Samplers. + - Static samplers. + - Descriptors copying. + - Committed resources. + - Fences. + - Queries and query heaps. + - Resource barriers. + - Root constants. + - Basic support for indirect draws and dispatches. + - Basic support for command signatures. + - Various Clear*() methods. + - Various Copy*() methods. + + +*** libvkd3d-shader + +- libvkd3d-shader is a library which translates shader model 4 and 5 bytecode + to SPIR-V. In this release, libvkd3d-shader is an internal library. Its API + isn't set in stone yet. + +- Vertex, pixel and compute shaders are supported. Also, very simple geometry + shaders should be translated correctly. Issues are expected when trying to + translate tessellation shaders or more complex geometry shaders. + +- A significant number of shader instructions are supported in this release, + including: + - Arithmetic instructions. + - Bit instructions. + - Comparison instructions. + - Control flow instructions. + - Sample, gather and load instructions. + - Atomic instructions. + - UAV instructions. + +- Root signature serialization and deserialization is implemented. + +- Shader model 4 and 5 bytecode parser is imported from wined3d. + +- Shader model 5.1 is not supported yet. + + +*** libvkd3d-utils + +- libvkd3d-utils contains simple implementations of various functions which + might be useful for source ports of Direct3D 12 applications. + + +*** demos + +- A simple hello triangle Direct3D 12 demo. +- A Direct3D 12 port of glxgears. diff --git a/configure.ac b/configure.ac index 2b8249e..de4ece8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT([vkd3d], 0.0.1) +AC_INIT([vkd3d],[1.0]) AC_CONFIG_AUX_DIR([bin]) AC_CONFIG_MACRO_DIR([m4])

1 0

Józef Kucia : include: Force stack alignment on i386.
by Alexandre Julliard 23 May '18

23 May '18

Module: vkd3d Branch: master Commit: d3c59c1a01e691934cc60a6dded5de87174d4225 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d3c59c1a01e691934cc60a6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 23 12:14:47 2018 +0200 include: Force stack alignment on i386. 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> --- include/vkd3d_windows.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_windows.h b/include/vkd3d_windows.h index 9cea6b4..ca7da53 100644 --- a/include/vkd3d_windows.h +++ b/include/vkd3d_windows.h @@ -168,7 +168,11 @@ typedef struct SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES; # ifdef __x86_64__ # define __stdcall __attribute__((ms_abi)) # else -# define __stdcall __attribute__((__stdcall__)) +# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) +# define __stdcall __attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__)) +# else +# define __stdcall __attribute__((__stdcall__)) +# endif # endif # define WINAPI __stdcall

1 0

Matej Špindler : kernel32: Check for LOCALE_NOUSEROVERRIDE for neutral locales.
by Alexandre Julliard 22 May '18

22 May '18

Module: wine Branch: master Commit: da5112c74313b5236183135204cab38a8b0169ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=da5112c74313b52361831352… Author: Matej Špindler <spindler.matej(a)gmail.com> Date: Tue May 22 17:15:01 2018 +0200 kernel32: Check for LOCALE_NOUSEROVERRIDE for neutral locales. Signed-off-by: Matej Špindler <spindler.matej(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 2 +- dlls/kernel32/tests/locale.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 5a6ff35..d21a763 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1812,7 +1812,7 @@ INT WINAPI GetLocaleInfoEx(LPCWSTR locale, LCTYPE info, LPWSTR buffer, INT len) /* special handling for neutral locale names */ if (locale && strlenW(locale) == 2) { - switch (info) + switch (info & ~LOCALE_LOCALEINFOFLAGSMASK) { case LOCALE_SNAME: if (len && len < 3) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 91a8703..791f015 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4499,6 +4499,10 @@ static void test_GetLocaleInfoEx(void) ok(ret == 1, "got %d\n", ret); ok(!bufferW[0], "got %s\n", wine_dbgstr_w(bufferW)); + ret = pGetLocaleInfoEx(enW, LOCALE_SPARENT | LOCALE_NOUSEROVERRIDE, bufferW, sizeof(bufferW)/sizeof(WCHAR)); + ok(ret == 1, "got %d\n", ret); + ok(!bufferW[0], "got %s\n", wine_dbgstr_w(bufferW)); + ret = pGetLocaleInfoEx(enW, LOCALE_SCOUNTRY, bufferW, sizeof(bufferW)/sizeof(WCHAR)); ok(ret == lstrlenW(bufferW)+1, "got %d\n", ret); if ((PRIMARYLANGID(LANGIDFROMLCID(GetSystemDefaultLCID())) != LANG_ENGLISH) ||

1 0

Jacek Caban : itss: Support COM aggregation in its protocol handler.
by Alexandre Julliard 22 May '18

22 May '18

Module: wine Branch: master Commit: cd5570d9efd0cea19e5863fb334da3d40dd9658d URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd5570d9efd0cea19e5863fb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 22 11:31:59 2018 +0200 itss: Support COM aggregation in its protocol handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/itss/itss.c | 29 ++++++++++++------ dlls/itss/protocol.c | 76 ++++++++++++++++++++++++++++++++-------------- dlls/itss/tests/protocol.c | 64 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 138 insertions(+), 31 deletions(-) diff --git a/dlls/itss/itss.c b/dlls/itss/itss.c index f47a0e9..1d236a5 100644 --- a/dlls/itss/itss.c +++ b/dlls/itss/itss.c @@ -105,20 +105,31 @@ static ULONG WINAPI ITSSCF_Release(LPCLASSFACTORY iface) } -static HRESULT WINAPI ITSSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, - REFIID riid, LPVOID *ppobj) +static HRESULT WINAPI ITSSCF_CreateInstance(IClassFactory *iface, IUnknown *outer, + REFIID riid, void **ppv) { IClassFactoryImpl *This = impl_from_IClassFactory(iface); + IUnknown *unk; HRESULT hres; - LPUNKNOWN punk; - TRACE("(%p)->(%p,%s,%p)\n", This, pOuter, debugstr_guid(riid), ppobj); + TRACE("(%p)->(%p %s %p)\n", This, outer, debugstr_guid(riid), ppv); - *ppobj = NULL; - hres = This->pfnCreateInstance(pOuter, (LPVOID *) &punk); - if (SUCCEEDED(hres)) { - hres = IUnknown_QueryInterface(punk, riid, ppobj); - IUnknown_Release(punk); + if(outer && !IsEqualGUID(riid, &IID_IUnknown)) { + *ppv = NULL; + return CLASS_E_NOAGGREGATION; + } + + hres = This->pfnCreateInstance(outer, (void**)&unk); + if(FAILED(hres)) { + *ppv = NULL; + return hres; + } + + if(!IsEqualGUID(riid, &IID_IUnknown)) { + hres = IUnknown_QueryInterface(unk, riid, ppv); + IUnknown_Release(unk); + }else { + *ppv = unk; } return hres; } diff --git a/dlls/itss/protocol.c b/dlls/itss/protocol.c index 1463518..1cdb365 100644 --- a/dlls/itss/protocol.c +++ b/dlls/itss/protocol.c @@ -36,16 +36,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(itss); typedef struct { + IUnknown IUnknown_inner; IInternetProtocol IInternetProtocol_iface; IInternetProtocolInfo IInternetProtocolInfo_iface; LONG ref; + IUnknown *outer; ULONG offset; struct chmFile *chm_file; struct chmUnitInfo chm_object; } ITSProtocol; +static inline ITSProtocol *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, ITSProtocol, IUnknown_inner); +} + static inline ITSProtocol *impl_from_IInternetProtocol(IInternetProtocol *iface) { return CONTAINING_RECORD(iface, ITSProtocol, IInternetProtocol_iface); @@ -65,14 +72,13 @@ static void release_chm(ITSProtocol *This) This->offset = 0; } -static HRESULT WINAPI ITSProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) +static HRESULT WINAPI ITSProtocol_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { - ITSProtocol *This = impl_from_IInternetProtocol(iface); + ITSProtocol *This = impl_from_IUnknown(iface); - *ppv = NULL; if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IInternetProtocol_iface; + *ppv = &This->IUnknown_inner; }else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) { TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", This, ppv); *ppv = &This->IInternetProtocol_iface; @@ -82,28 +88,27 @@ static HRESULT WINAPI ITSProtocol_QueryInterface(IInternetProtocol *iface, REFII }else if(IsEqualGUID(&IID_IInternetProtocolInfo, riid)) { TRACE("(%p)->(IID_IInternetProtocolInfo %p)\n", This, ppv); *ppv = &This->IInternetProtocolInfo_iface; + }else { + *ppv = NULL; + WARN("not supported interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; } - if(*ppv) { - IInternetProtocol_AddRef(iface); - return S_OK; - } - - WARN("not supported interface %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } -static ULONG WINAPI ITSProtocol_AddRef(IInternetProtocol *iface) +static ULONG WINAPI ITSProtocol_AddRef(IUnknown *iface) { - ITSProtocol *This = impl_from_IInternetProtocol(iface); + ITSProtocol *This = impl_from_IUnknown(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); return ref; } -static ULONG WINAPI ITSProtocol_Release(IInternetProtocol *iface) +static ULONG WINAPI ITSProtocol_Release(IUnknown *iface) { - ITSProtocol *This = impl_from_IInternetProtocol(iface); + ITSProtocol *This = impl_from_IUnknown(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -118,6 +123,30 @@ static ULONG WINAPI ITSProtocol_Release(IInternetProtocol *iface) return ref; } +static const IUnknownVtbl ITSProtocolUnkVtbl = { + ITSProtocol_QueryInterface, + ITSProtocol_AddRef, + ITSProtocol_Release +}; + +static HRESULT WINAPI ITSInternetProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) +{ + ITSProtocol *This = impl_from_IInternetProtocol(iface); + return IUnknown_QueryInterface(This->outer, riid, ppv); +} + +static ULONG WINAPI ITSInternetProtocol_AddRef(IInternetProtocol *iface) +{ + ITSProtocol *This = impl_from_IInternetProtocol(iface); + return IUnknown_AddRef(This->outer); +} + +static ULONG WINAPI ITSInternetProtocol_Release(IInternetProtocol *iface) +{ + ITSProtocol *This = impl_from_IInternetProtocol(iface); + return IUnknown_Release(This->outer); +} + static LPCWSTR skip_schema(LPCWSTR url) { static const WCHAR its_schema[] = {'i','t','s',':'}; @@ -387,9 +416,9 @@ static HRESULT WINAPI ITSProtocol_UnlockRequest(IInternetProtocol *iface) } static const IInternetProtocolVtbl ITSProtocolVtbl = { - ITSProtocol_QueryInterface, - ITSProtocol_AddRef, - ITSProtocol_Release, + ITSInternetProtocol_QueryInterface, + ITSInternetProtocol_AddRef, + ITSInternetProtocol_Release, ITSProtocol_Start, ITSProtocol_Continue, ITSProtocol_Abort, @@ -520,21 +549,24 @@ static const IInternetProtocolInfoVtbl ITSProtocolInfoVtbl = { ITSProtocolInfo_QueryInfo }; -HRESULT ITSProtocol_create(IUnknown *pUnkOuter, LPVOID *ppobj) +HRESULT ITSProtocol_create(IUnknown *outer, void **ppv) { ITSProtocol *ret; - TRACE("(%p %p)\n", pUnkOuter, ppobj); + TRACE("(%p %p)\n", outer, ppv); ITSS_LockModule(); ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ITSProtocol)); + if(!ret) + return E_OUTOFMEMORY; + ret->IUnknown_inner.lpVtbl = &ITSProtocolUnkVtbl; ret->IInternetProtocol_iface.lpVtbl = &ITSProtocolVtbl; ret->IInternetProtocolInfo_iface.lpVtbl = &ITSProtocolInfoVtbl; ret->ref = 1; + ret->outer = outer ? outer : &ret->IUnknown_inner; - *ppobj = &ret->IInternetProtocol_iface; - + *ppv = &ret->IUnknown_inner; return S_OK; } diff --git a/dlls/itss/tests/protocol.c b/dlls/itss/tests/protocol.c index 663411f..3028da4 100644 --- a/dlls/itss/tests/protocol.c +++ b/dlls/itss/tests/protocol.c @@ -60,6 +60,7 @@ DEFINE_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); DEFINE_EXPECT(ReportProgress_DIRECTBIND); DEFINE_EXPECT(ReportData); DEFINE_EXPECT(ReportResult); +DEFINE_EXPECT(outer_QI_test); static HRESULT expect_hrResult; static IInternetProtocol *read_protocol = NULL; @@ -660,6 +661,68 @@ static void delete_chm(void) ok(ret, "DeleteFileA failed: %d\n", GetLastError()); } +static const IID outer_test_iid = {0xabcabc00,0,0,{0,0,0,0,0,0,0,0x66}}; + +static HRESULT WINAPI outer_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &outer_test_iid)) { + CHECK_EXPECT(outer_QI_test); + *ppv = (IUnknown*)0xdeadbeef; + return S_OK; + } + ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI outer_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI outer_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl outer_vtbl = { + outer_QueryInterface, + outer_AddRef, + outer_Release +}; + +static void test_com_aggregation(const CLSID *clsid) +{ + IUnknown outer = { &outer_vtbl }; + IClassFactory *class_factory; + IUnknown *unk, *unk2, *unk3; + HRESULT hres; + + hres = CoGetClassObject(clsid, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void**)&class_factory); + ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); + + hres = IClassFactory_CreateInstance(class_factory, &outer, &IID_IUnknown, (void**)&unk); + ok(hres == S_OK, "CreateInstance returned: %08x\n", hres); + + hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocol, (void**)&unk2); + ok(hres == S_OK, "Could not get IInternetProtocol iface: %08x\n", hres); + + SET_EXPECT(outer_QI_test); + hres = IUnknown_QueryInterface(unk2, &outer_test_iid, (void**)&unk3); + CHECK_CALLED(outer_QI_test); + ok(hres == S_OK, "Could not get IInternetProtocol iface: %08x\n", hres); + ok(unk3 == (IUnknown*)0xdeadbeef, "unexpected unk2\n"); + + IUnknown_Release(unk2); + IUnknown_Release(unk); + + unk = (void*)0xdeadbeef; + hres = IClassFactory_CreateInstance(class_factory, &outer, &IID_IInternetProtocol, (void**)&unk); + ok(hres == CLASS_E_NOAGGREGATION, "CreateInstance returned: %08x\n", hres); + ok(!unk, "unk = %p\n", unk); + + IClassFactory_Release(class_factory); +} + START_TEST(protocol) { OleInitialize(NULL); @@ -669,6 +732,7 @@ START_TEST(protocol) test_its_protocol(); test_mk_protocol(); + test_com_aggregation(&CLSID_ITSProtocol); delete_chm(); OleUninitialize();

1 0

Zebediah Figura : msi/tests: Test deferral of InstallODBC and RemoveODBC.
by Alexandre Julliard 22 May '18

22 May '18

Module: wine Branch: master Commit: 7305e5fd8c1262e369c2807e83adfb9aaf4f2e7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7305e5fd8c1262e369c2807e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 18 22:00:58 2018 -0500 msi/tests: Test deferral of InstallODBC and RemoveODBC. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/Makefile.in | 2 +- dlls/msi/tests/action.c | 14 +++++++++++++ dlls/msi/tests/custom.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 4 files changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/Makefile.in b/dlls/msi/tests/Makefile.in index 43a5657..18a6457 100644 --- a/dlls/msi/tests/Makefile.in +++ b/dlls/msi/tests/Makefile.in @@ -1,7 +1,7 @@ TESTDLL = msi.dll IMPORTS = cabinet msi shell32 ole32 oleaut32 user32 advapi32 version odbccp32 -custom_IMPORTS = uuid msi ole32 shell32 advapi32 +custom_IMPORTS = uuid msi ole32 shell32 advapi32 odbccp32 SOURCES = \ action.c \ diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index e33decc..943c939 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -870,7 +870,11 @@ static const char odbc_install_exec_seq_dat[] = "InstallInitialize\t\t1500\n" "ProcessComponents\t\t1600\n" "InstallODBC\t\t3000\n" + "io_immediate\tNOT REMOVE\t3001\n" + "io_deferred\tNOT REMOVE\t3002\n" "RemoveODBC\t\t3100\n" + "ro_immediate\tREMOVE\t3101\n" + "ro_deferred\tREMOVE\t3102\n" "RemoveFiles\t\t3900\n" "InstallFiles\t\t4000\n" "RegisterProduct\t\t5000\n" @@ -878,6 +882,15 @@ static const char odbc_install_exec_seq_dat[] = "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const char odbc_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "io_immediate\t1\tcustom.dll\todbc_absent\n" + "io_deferred\t1025\tcustom.dll\todbc_present\n" + "ro_immediate\t1\tcustom.dll\todbc_present\n" + "ro_deferred\t1025\tcustom.dll\todbc_absent\n"; + static const char odbc_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" "i2\ti4\tL64\tS255\tS32\tS72\n" @@ -1969,6 +1982,7 @@ static const msi_table odbc_tables[] = ADD_TABLE(odbc_translator), ADD_TABLE(odbc_datasource), ADD_TABLE(odbc_install_exec_seq), + ADD_TABLE(odbc_custom_action), ADD_TABLE(odbc_media), ADD_TABLE(property) }; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 4e3e2dc..0f34eb0 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -24,6 +24,7 @@ #include <windef.h> #include <winbase.h> #include <winsvc.h> +#include <odbcinst.h> #define COBJMACROS #include <shlobj.h> #include <msxml.h> @@ -1314,3 +1315,51 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { ok(hinst, !pf_exists("msitest\\duplicate2.txt"), "file present\n"); return ERROR_SUCCESS; } + +UINT WINAPI odbc_present(MSIHANDLE hinst) +{ + int gotdriver = 0, gotdriver2 = 0; + char buffer[1000], *p; + WORD len; + BOOL r; + + r = SQLGetInstalledDrivers(buffer, sizeof(buffer), &len); + ok(hinst, len < sizeof(buffer), "buffer too small\n"); + ok(hinst, r, "SQLGetInstalledDrivers failed\n"); + for (p = buffer; *p; p += strlen(p) + 1) + { + if (!strcmp(p, "ODBC test driver")) + gotdriver = 1; + if (!strcmp(p, "ODBC test driver2")) + gotdriver2 = 1; + } +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + ok(hinst, gotdriver, "driver absent\n"); + ok(hinst, gotdriver2, "driver 2 absent\n"); +} + return ERROR_SUCCESS; +} + +UINT WINAPI odbc_absent(MSIHANDLE hinst) +{ + int gotdriver = 0, gotdriver2 = 0; + char buffer[1000], *p; + WORD len; + BOOL r; + + r = SQLGetInstalledDrivers(buffer, sizeof(buffer), &len); + ok(hinst, len < sizeof(buffer), "buffer too small\n"); + ok(hinst, r, "SQLGetInstalledDrivers failed\n"); + for (p = buffer; *p; p += strlen(p) + 1) + { + if (!strcmp(p, "ODBC test driver")) + gotdriver = 1; + if (!strcmp(p, "ODBC test driver2")) + gotdriver2 = 1; + } +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + ok(hinst, !gotdriver, "driver present\n"); + ok(hinst, !gotdriver2, "driver 2 present\n"); +} + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 1b15ca9..52feffa 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -9,6 +9,8 @@ @ stdcall crs_absent(long) @ stdcall file_present(long) @ stdcall file_absent(long) +@ stdcall odbc_present(long) +@ stdcall odbc_absent(long) @ stdcall rd_present(long) @ stdcall rd_absent(long) @ stdcall sds_present(long)

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2018