July 2012 - Wine-commits - list.winehq.org

Daniel Jelinski : comctl32/treeview: Fix the position reported by WM_CONTEXTMENU.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: baed448fc779dffbdf9b50a679213b98afb38806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baed448fc779dffbdf9b50a67… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Fri Jul 13 21:27:14 2012 +0200 comctl32/treeview: Fix the position reported by WM_CONTEXTMENU. --- dlls/comctl32/treeview.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 0b118b7..79de8aa 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -4259,12 +4259,9 @@ TREEVIEW_RButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam) SetFocus(infoPtr->hwnd); if(!TREEVIEW_SendSimpleNotify(infoPtr, NM_RCLICK)) { - /* Change to screen coordinate for WM_CONTEXTMENU */ - ClientToScreen(infoPtr->hwnd, &ht.pt); - /* Send a WM_CONTEXTMENU message in response to the RBUTTONUP */ SendMessageW(infoPtr->hwndNotify, WM_CONTEXTMENU, - (WPARAM)infoPtr->hwnd, MAKELPARAM(ht.pt.x, ht.pt.y)); + (WPARAM)infoPtr->hwnd, (LPARAM)GetMessagePos()); } }

1 0

Alistair Leslie-Hughes : mmcndmgr: Implement IMMCVersionInfo.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: f857ad522555586c1f223bbf49d6f1214257b551 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f857ad522555586c1f223bbf4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 20 22:29:35 2012 +1100 mmcndmgr: Implement IMMCVersionInfo. --- configure | 1 + configure.ac | 1 + dlls/mmcndmgr/mmcndmgr.c | 123 +++++++++++++++++++++++++++++++++++++-- dlls/mmcndmgr/tests/Makefile.in | 7 ++ dlls/mmcndmgr/tests/mmcndmgr.c | 66 +++++++++++++++++++++ 5 files changed, 193 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 5be9da3..77aea78 100755 --- a/configure +++ b/configure @@ -15296,6 +15296,7 @@ wine_fn_config_dll midimap enable_midimap wine_fn_config_dll mlang enable_mlang implib wine_fn_config_test dlls/mlang/tests mlang_test wine_fn_config_dll mmcndmgr enable_mmcndmgr +wine_fn_config_test dlls/mmcndmgr/tests mmcndmgr_test wine_fn_config_dll mmdevapi enable_mmdevapi wine_fn_config_test dlls/mmdevapi/tests mmdevapi_test wine_fn_config_dll mmdevldr.vxd enable_win16 diff --git a/configure.ac b/configure.ac index 52ef054..50e5513 100644 --- a/configure.ac +++ b/configure.ac @@ -2701,6 +2701,7 @@ WINE_CONFIG_DLL(midimap) WINE_CONFIG_DLL(mlang,,[implib]) WINE_CONFIG_TEST(dlls/mlang/tests) WINE_CONFIG_DLL(mmcndmgr) +WINE_CONFIG_TEST(dlls/mmcndmgr/tests) WINE_CONFIG_DLL(mmdevapi) WINE_CONFIG_TEST(dlls/mmdevapi/tests) WINE_CONFIG_DLL(mmdevldr.vxd,enable_win16) diff --git a/dlls/mmcndmgr/mmcndmgr.c b/dlls/mmcndmgr/mmcndmgr.c index 2a7e0d4..4449233 100644 --- a/dlls/mmcndmgr/mmcndmgr.c +++ b/dlls/mmcndmgr/mmcndmgr.c @@ -30,21 +30,134 @@ #include "wine/debug.h" #include "wine/library.h" +#include "initguid.h" #include "mmc.h" WINE_DEFAULT_DEBUG_CHANNEL(mmc); static HINSTANCE MMC_hInstance; -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) +static HRESULT WINAPI mmcversion_QueryInterface(IMMCVersionInfo *iface, REFIID riid, void **ppv) { - FIXME("(%s, %s, %p): stub\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - if(!ppv) - return E_INVALIDARG; + TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); - return E_NOTIMPL; + if ( IsEqualGUID( riid, &IID_IMMCVersionInfo ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *ppv = iface; + } + else + { + TRACE("Unsupported interface %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IMMCVersionInfo_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI mmcversion_AddRef(IMMCVersionInfo *iface) +{ + return 2; +} + +static ULONG WINAPI mmcversion_Release(IMMCVersionInfo *iface) +{ + return 1; +} + +static HRESULT WINAPI mmcversion_GetMMCVersion(IMMCVersionInfo *iface, LONG *pVersionMajor, LONG *pVersionMinor) +{ + TRACE("(%p, %p, %p): stub\n", iface, pVersionMajor, pVersionMinor); + + if(pVersionMajor) + *pVersionMajor = 3; + + if(pVersionMinor) + *pVersionMinor = 0; + + return S_OK; +} + +static const struct IMMCVersionInfoVtbl mmcversionVtbl = +{ + mmcversion_QueryInterface, + mmcversion_AddRef, + mmcversion_Release, + mmcversion_GetMMCVersion +}; + +static IMMCVersionInfo mmcVersionInfo = { &mmcversionVtbl }; + +/*********************************************************** + * ClassFactory implementation + */ +typedef HRESULT (*CreateInstanceFunc)(IUnknown*,REFIID,void**); + +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFGUID riid, void **ppvObject) +{ + if(IsEqualGUID(&IID_IClassFactory, riid) || IsEqualGUID(&IID_IUnknown, riid)) { + IClassFactory_AddRef(iface); + *ppvObject = iface; + return S_OK; + } + + WARN("not supported iid %s\n", debugstr_guid(riid)); + *ppvObject = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + + return 1; +} + +static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, + REFIID riid, void **ppv) +{ + TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); + return IMMCVersionInfo_QueryInterface(&mmcVersionInfo, riid, ppv); +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + TRACE("(%p)->(%x)\n", iface, fLock); + return S_OK; } +static const IClassFactoryVtbl MMCClassFactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ClassFactory_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory MMCVersionInfoFactory = { &MMCClassFactoryVtbl }; + +HRESULT WINAPI DllGetClassObject( REFCLSID riid, REFIID iid, LPVOID *ppv ) +{ + TRACE("%s %s %p\n", debugstr_guid(riid), debugstr_guid(iid), ppv ); + + if( IsEqualCLSID( riid, &CLSID_MMCVersionInfo )) + { + TRACE("(CLSID_MMCVersionInfo %s %p)\n", debugstr_guid(riid), ppv); + return IClassFactory_QueryInterface(&MMCVersionInfoFactory, iid, ppv); + } + + FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + return CLASS_E_CLASSNOTAVAILABLE; + } + HRESULT WINAPI DllRegisterServer(void) { return __wine_register_resources( MMC_hInstance ); diff --git a/dlls/mmcndmgr/tests/Makefile.in b/dlls/mmcndmgr/tests/Makefile.in new file mode 100644 index 0000000..1220069 --- /dev/null +++ b/dlls/mmcndmgr/tests/Makefile.in @@ -0,0 +1,7 @@ +TESTDLL = mmcndmgr.dll +IMPORTS = ole32 shlwapi uuid + +C_SRCS = \ + mmcndmgr.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/mmcndmgr/tests/mmcndmgr.c b/dlls/mmcndmgr/tests/mmcndmgr.c new file mode 100644 index 0000000..07d905e --- /dev/null +++ b/dlls/mmcndmgr/tests/mmcndmgr.c @@ -0,0 +1,66 @@ +/* + * + * Copyright 2011 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 COBJMACROS +#include <stdio.h> + +#include "windows.h" +#include "ole2.h" +#include "dispex.h" + +#include "wine/test.h" + +#include <initguid.h> +#include <mmc.h> + +static void test_get_version(void) +{ + IMMCVersionInfo * ver_info = NULL; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_MMCVersionInfo, NULL, CLSCTX_INPROC_SERVER, &IID_IMMCVersionInfo, (void**)&ver_info); + if (hr != S_OK) + { + trace("MMCVersionInfo interface not registered.\n"); + } + else + { + LONG lMajor, lMinor; + + hr = IMMCVersionInfo_GetMMCVersion(ver_info, &lMajor, &lMinor); + ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + if (hr == S_OK) + trace("MMC Version is %d.%d\n", lMajor, lMinor); + } + + if (ver_info) + { + IMMCVersionInfo_Release(ver_info); + } +} + + +START_TEST(mmcndmgr) +{ + CoInitialize(NULL); + + test_get_version(); + + CoUninitialize(); +}

1 0

André Hentschel : msvcrt: Add bsearch_s implementation by reusing code and tests from ntdll.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: f320f6cf4843eab3d22b60674808e4e3de964b5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f320f6cf4843eab3d22b60674… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jul 16 20:36:10 2012 +0200 msvcrt: Add bsearch_s implementation by reusing code and tests from ntdll. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcr90/tests/msvcr90.c | 48 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/misc.c | 27 +++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 6 files changed, 79 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index bf3a068..70bcbd0 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1434,7 +1434,7 @@ @ cdecl atoi(str) msvcrt.atoi @ cdecl atol(str) msvcrt.atol @ cdecl bsearch(ptr ptr long long ptr) msvcrt.bsearch -@ stub bsearch_s +@ cdecl bsearch_s(ptr ptr long long ptr ptr) msvcrt.bsearch_s @ cdecl btowc(long) msvcrt.btowc @ cdecl calloc(long long) msvcrt.calloc @ cdecl ceil(double) msvcrt.ceil diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 8686359..d758176 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1290,7 +1290,7 @@ @ cdecl atoi(str) msvcrt.atoi @ cdecl atol(str) msvcrt.atol @ cdecl bsearch(ptr ptr long long ptr) msvcrt.bsearch -@ stub bsearch_s +@ cdecl bsearch_s(ptr ptr long long ptr ptr) msvcrt.bsearch_s @ cdecl btowc(long) msvcrt.btowc @ cdecl calloc(long long) msvcrt.calloc @ cdecl ceil(double) msvcrt.ceil diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 6aefe20..5c27fca 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1285,7 +1285,7 @@ @ cdecl atoi(str) msvcrt.atoi @ cdecl atol(str) msvcrt.atol @ cdecl bsearch(ptr ptr long long ptr) msvcrt.bsearch -@ stub bsearch_s +@ cdecl bsearch_s(ptr ptr long long ptr ptr) msvcrt.bsearch_s @ cdecl btowc(long) msvcrt.btowc @ cdecl calloc(long long) msvcrt.calloc @ cdecl ceil(double) msvcrt.ceil diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index dc15472..92945ae 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -72,6 +72,8 @@ static unsigned __int64 (__cdecl *p_strtoui64)(const char *, char **, int); static errno_t (__cdecl *p_itoa_s)(int,char*,size_t,int); static int (__cdecl *p_wcsncat_s)(wchar_t *dst, size_t elem, const wchar_t *src, size_t count); static void (__cdecl *p_qsort_s)(void *, size_t, size_t, int (__cdecl *)(void *, const void *, const void *), void *); +static void* (__cdecl *p_bsearch_s)(const void *, const void *, size_t, size_t, + int (__cdecl *compare)(void *, const void *, const void *), void *); static int (__cdecl *p_controlfp_s)(unsigned int *, unsigned int, unsigned int); static int (__cdecl *p_atoflt)(_CRT_FLOAT *, char *); static unsigned int (__cdecl *p_set_abort_behavior)(unsigned int, unsigned int); @@ -134,6 +136,7 @@ static void* (WINAPI *pEncodePointer)(void *); static int cb_called[4]; static int g_qsort_s_context_counter; +static int g_bsearch_s_context_counter; static inline int almost_equal_f(float f1, float f2) { @@ -250,6 +253,7 @@ static BOOL init(void) SET(p_itoa_s, "_itoa_s"); SET(p_wcsncat_s,"wcsncat_s" ); SET(p_qsort_s, "qsort_s"); + SET(p_bsearch_s, "bsearch_s"); SET(p_controlfp_s, "_controlfp_s"); SET(p_atoflt, "_atoflt"); SET(p_set_abort_behavior, "_set_abort_behavior"); @@ -750,6 +754,49 @@ static void test_qsort_s(void) ok(!strcmp(strarr[6],"World"), "badly sorted, strarr[6] is %s\n", strarr[6]); } +static void test_bsearch_s(void) +{ + int arr[7] = { 1, 3, 4, 8, 16, 23, 42 }; + int *x, l, i, j = 1; + + errno = 0xdeadbeef; + SET_EXPECT(invalid_parameter_handler); + x = p_bsearch_s(NULL, NULL, 0, 0, NULL, NULL); + ok(x == NULL, "Expected bsearch_s to return NULL, got %p\n", x); + CHECK_CALLED(invalid_parameter_handler); + + g_bsearch_s_context_counter = 0; + SET_EXPECT(invalid_parameter_handler); + x = p_bsearch_s(&l, arr, j, 0, intcomparefunc, &g_bsearch_s_context_counter); + ok(x == NULL, "Expected bsearch_s to return NULL, got %p\n", x); + ok(g_bsearch_s_context_counter == 0, "callback shouldn't have been called\n"); + CHECK_CALLED(invalid_parameter_handler); + + g_bsearch_s_context_counter = 0; + SET_EXPECT(invalid_parameter_handler); + x = p_bsearch_s(&l, arr, j, sizeof(arr[0]), NULL, &g_bsearch_s_context_counter); + ok(x == NULL, "Expected bsearch_s to return NULL, got %p\n", x); + ok(g_bsearch_s_context_counter == 0, "callback shouldn't have been called\n"); + CHECK_CALLED(invalid_parameter_handler); + ok(errno == 0xdeadbeef, "errno = %x\n", errno); + + /* just try all array sizes */ + for (j=1;j<sizeof(arr)/sizeof(arr[0]);j++) { + for (i=0;i<j;i++) { + l = arr[i]; + g_bsearch_s_context_counter = 0; + x = p_bsearch_s(&l, arr, j, sizeof(arr[0]), intcomparefunc, &g_bsearch_s_context_counter); + ok (x == &arr[i], "bsearch_s did not find %d entry in loopsize %d.\n", i, j); + ok(g_bsearch_s_context_counter > 0, "callback wasn't called\n"); + } + l = 4242; + g_bsearch_s_context_counter = 0; + x = p_bsearch_s(&l, arr, j, sizeof(arr[0]), intcomparefunc, &g_bsearch_s_context_counter); + ok (x == NULL, "bsearch_s did find 4242 entry in loopsize %d.\n", j); + ok(g_bsearch_s_context_counter > 0, "callback wasn't called\n"); + } +} + static void test_controlfp_s(void) { unsigned int cur; @@ -1162,6 +1209,7 @@ START_TEST(msvcr90) test__itoa_s(); test_wcsncat_s(); test_qsort_s(); + test_bsearch_s(); test_controlfp_s(); test__atoflt(); test__set_abort_behavior(); diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index d40e38f..8f2c111 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -124,6 +124,33 @@ void* CDECL _lsearch(const void* match, void* start, } /********************************************************************* + * bsearch_s (msvcrt.@) + */ +void* CDECL MSVCRT_bsearch_s(const void *key, const void *base, + MSVCRT_size_t nmemb, MSVCRT_size_t size, + int (__cdecl *compare)(void *, const void *, const void *), void *ctx) +{ + ssize_t min = 0; + ssize_t max = nmemb - 1; + + if (!MSVCRT_CHECK_PMT(size != 0) || !MSVCRT_CHECK_PMT(compare != NULL)) + return NULL; + + while (min <= max) + { + ssize_t cursor = (min + max) / 2; + int ret = compare(ctx, key,(const char *)base+(cursor*size)); + if (!ret) + return (char*)base+(cursor*size); + if (ret < 0) + max = cursor - 1; + else + min = cursor + 1; + } + return NULL; +} + +/********************************************************************* * _chkesp (MSVCRT.@) * * Trap to a debugger if the value of the stack pointer has changed. diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 04ef9ad..934c247 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1226,7 +1226,7 @@ @ cdecl atoi(str) ntdll.atoi @ cdecl atol(str) ntdll.atol @ cdecl bsearch(ptr ptr long long ptr) ntdll.bsearch -# stub bsearch_s(ptr ptr long long ptr ptr) +@ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s @ cdecl btowc(long) MSVCRT_btowc @ cdecl calloc(long long) MSVCRT_calloc @ cdecl ceil(double) MSVCRT_ceil

1 0

Jacek Caban : mshtml: Ignore navigation failures from detached bindings.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: da7e0e38e8298df727dea69caab300323ac3d15c URL: http://source.winehq.org/git/wine.git/?a=commit;h=da7e0e38e8298df727dea69ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 17 13:17:49 2012 +0200 mshtml: Ignore navigation failures from detached bindings. --- dlls/mshtml/navigate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 2edb470..ecc8ef3 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1339,7 +1339,7 @@ static void handle_navigation_error(nsChannelBSC *This, DWORD result) BSTR unk; HRESULT hres; - if(!This->is_doc_channel) + if(!This->is_doc_channel || !This->bsc.window) return; outer_window = This->bsc.window->base.outer_window;

1 0

Aric Stewart : ups10: Implement Single Adjustment Positioning: Format 2.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: ea9f2266de2c5518609581568d3332355878075c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea9f2266de2c5518609581568… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jul 17 07:21:05 2012 -0500 ups10: Implement Single Adjustment Positioning: Format 2. --- dlls/usp10/opentype.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 9ffdf28..fcdc9a4 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -335,6 +335,14 @@ typedef struct { typedef struct { WORD PosFormat; WORD Coverage; + WORD ValueFormat; + WORD ValueCount; + WORD Value[1]; +} GPOS_SinglePosFormat2; + +typedef struct { + WORD PosFormat; + WORD Coverage; WORD ValueFormat1; WORD ValueFormat2; WORD PairSetCount; @@ -1086,7 +1094,7 @@ static VOID GPOS_apply_SingleAdjustment(const OT_LookupTable *look, const WORD * const GPOS_SinglePosFormat1 *spf1; WORD offset = GET_BE_WORD(look->SubTable[j]); spf1 = (const GPOS_SinglePosFormat1*)((const BYTE*)look+offset); - if (GET_BE_WORD(spf1->PosFormat == 1)) + if (GET_BE_WORD(spf1->PosFormat) == 1) { offset = GET_BE_WORD(spf1->Coverage); if (GSUB_is_glyph_covered((const BYTE*)spf1+offset, glyphs[glyph_index]) != -1) @@ -1098,8 +1106,30 @@ static VOID GPOS_apply_SingleAdjustment(const OT_LookupTable *look, const WORD * TRACE("Glyph Adjusted by %i,%i\n",ValueRecord.XPlacement,ValueRecord.YPlacement); } } + else if (GET_BE_WORD(spf1->PosFormat) == 2) + { + int index; + const GPOS_SinglePosFormat2 *spf2; + spf2 = (const GPOS_SinglePosFormat2*)spf1; + offset = GET_BE_WORD(spf2->Coverage); + index = GSUB_is_glyph_covered((const BYTE*)spf2+offset, glyphs[glyph_index]); + if (index != -1) + { + int size; + GPOS_ValueRecord ValueRecord = {0,0,0,0,0,0,0,0}; + WORD ValueFormat = GET_BE_WORD(spf2->ValueFormat); + size = GPOS_get_value_record(ValueFormat, spf2->Value, &ValueRecord); + if (index > 0) + { + offset = size * index; + GPOS_get_value_record(ValueFormat, &spf2->Value[offset], &ValueRecord); + } + GPOS_get_value_record_offsets((const BYTE*)spf2, &ValueRecord, ValueFormat, ppem, ptAdjust, ptAdvance); + TRACE("Glyph Adjusted by %i,%i\n",ValueRecord.XPlacement,ValueRecord.YPlacement); + } + } else - FIXME("Single Adjustment Positioning: Format 2 Unhandled\n"); + FIXME("Single Adjustment Positioning: Format %i Unhandled\n",GET_BE_WORD(spf1->PosFormat)); } }

1 0

Aric Stewart : usp10: Implement GPOS Coverage-based Chaining Context Glyph Positioning.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 6ae4cfe973612550e923899bb462133722ced3af URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ae4cfe973612550e923899bb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jul 17 07:21:37 2012 -0500 usp10: Implement GPOS Coverage-based Chaining Context Glyph Positioning. --- dlls/usp10/opentype.c | 125 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 125 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index fcdc9a4..cc57f65 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -388,6 +388,32 @@ typedef struct { GPOS_MarkRecord MarkRecord[1]; } GPOS_MarkArray; +typedef struct { + WORD SequenceIndex; + WORD LookupListIndex; +} GPOS_PosLookupRecord; + +typedef struct { + WORD PosFormat; + WORD BacktrackGlyphCount; + WORD Coverage[1]; +} GPOS_ChainContextPosFormat3_1; + +typedef struct { + WORD InputGlyphCount; + WORD Coverage[1]; +} GPOS_ChainContextPosFormat3_2; + +typedef struct { + WORD LookaheadGlyphCount; + WORD Coverage[1]; +} GPOS_ChainContextPosFormat3_3; + +typedef struct { + WORD PosCount; + GPOS_PosLookupRecord PosLookupRecord[1]; +} GPOS_ChainContextPosFormat3_4; + /********** * CMAP **********/ @@ -974,6 +1000,8 @@ INT OpenType_apply_GSUB_lookup(LPCVOID table, INT lookup_index, WORD *glyphs, IN /********** * GPOS **********/ +static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, INT* piAdvance, const OT_LookupList* lookup, INT lookup_index, const WORD *glyphs, INT glyph_index, INT write_dir, INT glyph_count, GOFFSET *pGoffset); + static INT GPOS_get_device_table_value(const OT_DeviceTable *DeviceTable, WORD ppem) { static const WORD mask[3] = {3,0xf,0xff}; @@ -1259,6 +1287,99 @@ static VOID GPOS_apply_MarkToBase(const OT_LookupTable *look, const WORD *glyphs } } +static INT GPOS_apply_ChainContextPos(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, INT* piAdvance, const OT_LookupList *lookup, const OT_LookupTable *look, const WORD *glyphs, INT glyph_index, INT write_dir, INT glyph_count, INT ppem, GOFFSET *pGoffset) +{ + int j; + + TRACE("Chaining Contextual Positioning Subtable\n"); + + for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) + { + int offset; + const GPOS_ChainContextPosFormat3_1 *ccpf3; + int dirLookahead = write_dir; + int dirBacktrack = -1 * write_dir; + + offset = GET_BE_WORD(look->SubTable[j]); + ccpf3 = (const GPOS_ChainContextPosFormat3_1*)((const BYTE*)look+offset); + + if (GET_BE_WORD(ccpf3->PosFormat) == 1) + { + FIXME(" TODO: subtype 1 (Simple Chaining Context Glyph Positioning)\n"); + continue; + } + else if (GET_BE_WORD(ccpf3->PosFormat) == 2) + { + FIXME(" TODO: subtype 2 (Class-based Chaining Context Glyph Positioning)\n"); + continue; + } + else if (GET_BE_WORD(ccpf3->PosFormat) == 3) + { + int k; + int indexGlyphs; + const GPOS_ChainContextPosFormat3_2 *ccpf3_2; + const GPOS_ChainContextPosFormat3_3 *ccpf3_3; + const GPOS_ChainContextPosFormat3_4 *ccpf3_4; + + TRACE(" subtype 3 (Coverage-based Chaining Context Glyph Positioning)\n"); + + for (k = 0; k < GET_BE_WORD(ccpf3->BacktrackGlyphCount); k++) + { + offset = GET_BE_WORD(ccpf3->Coverage[k]); + if (GSUB_is_glyph_covered((const BYTE*)ccpf3+offset, glyphs[glyph_index + (dirBacktrack * (k+1))]) == -1) + break; + } + if (k != GET_BE_WORD(ccpf3->BacktrackGlyphCount)) + continue; + TRACE("Matched Backtrack\n"); + + ccpf3_2 = (const GPOS_ChainContextPosFormat3_2*)(((LPBYTE)ccpf3)+sizeof(GPOS_ChainContextPosFormat3_1) + (sizeof(WORD) * (GET_BE_WORD(ccpf3->BacktrackGlyphCount)-1))); + + indexGlyphs = GET_BE_WORD(ccpf3_2->InputGlyphCount); + for (k = 0; k < indexGlyphs; k++) + { + offset = GET_BE_WORD(ccpf3_2->Coverage[k]); + if (GSUB_is_glyph_covered((const BYTE*)ccpf3+offset, glyphs[glyph_index + (write_dir * k)]) == -1) + break; + } + if (k != indexGlyphs) + continue; + TRACE("Matched IndexGlyphs\n"); + + ccpf3_3 = (const GPOS_ChainContextPosFormat3_3*)(((LPBYTE)ccpf3_2)+sizeof(GPOS_ChainContextPosFormat3_2) + (sizeof(WORD) * (GET_BE_WORD(ccpf3_2->InputGlyphCount)-1))); + + for (k = 0; k < GET_BE_WORD(ccpf3_3->LookaheadGlyphCount); k++) + { + offset = GET_BE_WORD(ccpf3_3->Coverage[k]); + if (GSUB_is_glyph_covered((const BYTE*)ccpf3+offset, glyphs[glyph_index + (dirLookahead * (indexGlyphs + k))]) == -1) + break; + } + if (k != GET_BE_WORD(ccpf3_3->LookaheadGlyphCount)) + continue; + TRACE("Matched LookAhead\n"); + + ccpf3_4 = (const GPOS_ChainContextPosFormat3_4*)(((LPBYTE)ccpf3_3)+sizeof(GPOS_ChainContextPosFormat3_3) + (sizeof(WORD) * (GET_BE_WORD(ccpf3_3->LookaheadGlyphCount)-1))); + + if (GET_BE_WORD(ccpf3_4->PosCount)) + { + for (k = 0; k < GET_BE_WORD(ccpf3_4->PosCount); k++) + { + int lookupIndex = GET_BE_WORD(ccpf3_4->PosLookupRecord[k].LookupListIndex); + int SequenceIndex = GET_BE_WORD(ccpf3_4->PosLookupRecord[k].SequenceIndex) * write_dir; + + TRACE("Position: %i -> %i %i\n",k, SequenceIndex, lookupIndex); + GPOS_apply_lookup(lpotm, lplogfont, piAdvance, lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, write_dir, glyph_count, pGoffset); + } + return glyph_index + indexGlyphs + GET_BE_WORD(ccpf3_3->LookaheadGlyphCount); + } + else return glyph_index + 1; + } + else + FIXME("Unhandled Chaining Contextual Positioning Format %i\n",GET_BE_WORD(ccpf3->PosFormat)); + } + return glyph_index + 1; +} + static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, INT* piAdvance, const OT_LookupList* lookup, INT lookup_index, const WORD *glyphs, INT glyph_index, INT write_dir, INT glyph_count, GOFFSET *pGoffset) { int offset; @@ -1334,6 +1455,10 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, I } break; } + case 8: + { + return GPOS_apply_ChainContextPos(lpotm, lplogfont, piAdvance, lookup, look, glyphs, glyph_index, write_dir, glyph_count, ppem, pGoffset); + } default: FIXME("We do not handle SubType %i\n",GET_BE_WORD(look->LookupType)); }

1 0

Alex Henrie : user32: Minimize and maximize boxes can only appear when WS_SYSMENU is set.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: c412d6f521e6d5f3cc28de677fc61c00a7a875ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=c412d6f521e6d5f3cc28de677… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jul 10 18:06:06 2012 -0600 user32: Minimize and maximize boxes can only appear when WS_SYSMENU is set. --- dlls/user32/nonclient.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 08ce674..bc7fcc0 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -576,8 +576,7 @@ LRESULT NC_HandleNCHitTest( HWND hwnd, POINT pt ) rect.top += GetSystemMetrics(SM_CYCAPTION) - 1; if (!PtInRect( &rect, pt )) { - BOOL min_or_max_box = (style & WS_MAXIMIZEBOX) || - (style & WS_MINIMIZEBOX); + BOOL min_or_max_box = (style & WS_SYSMENU) && (style & (WS_MINIMIZEBOX|WS_MAXIMIZEBOX)); if (ex_style & WS_EX_LAYOUTRTL) { /* Check system menu */

1 0

Alexandre Julliard : user32/tests: Move DlgDirList tests to avoid changing the current directory for other tests .
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: d8c90fa40b0bf08a9f0789dff34eb632a7482de6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c90fa40b0bf08a9f0789dff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 17 14:50:47 2012 +0200 user32/tests: Move DlgDirList tests to avoid changing the current directory for other tests. --- dlls/user32/tests/listbox.c | 48 +++++++++++++++++++++--------------------- 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 4be7604..ef4a35b 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -1335,28 +1335,6 @@ static void test_listbox_dlgdir(void) ok (itemCount == itemCount_justDrives + itemCount_allDirs, "DlgDirList() incorrectly filled the listbox!\n"); - /* Test behavior when loading folders from root with and without wildcard */ - strcpy(pathBuffer, "C:\\"); - res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); - ok(res || broken(!res) /* NT4/W2K */, "DlgDirList failed to list C:\\ folders\n"); - todo_wine ok(!strcmp(pathBuffer, "*") || broken(!res) /* NT4/W2K */, - "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); - - strcpy(pathBuffer, "C:\\*"); - res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); - ok(res || broken(!res) /* NT4/W2K */, "DlgDirList failed to list C:\\* folders\n"); - ok(!strcmp(pathBuffer, "*") || broken(!res) /* NT4/W2K */, - "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); - - /* Try loading files from an invalid folder */ - SetLastError(0xdeadbeef); - strcpy(pathBuffer, "C:\\INVALID$$DIR"); - res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); - todo_wine ok(!res, "DlgDirList should have failed with 0 but %d was returned\n", res); - todo_wine ok(GetLastError() == ERROR_NO_WILDCARD_CHARACTERS, - "GetLastError should return 0x589, got 0x%X\n",GetLastError()); - - /* Now test DlgDirSelectEx() in normal operation */ /* Fill with everything - drives, directory and all plain files. */ strcpy(pathBuffer, "*"); @@ -1433,6 +1411,8 @@ static void test_listbox_dlgdir(void) } } + DeleteFileA( "wtest1.tmp.c" ); + /* Now test DlgDirSelectEx() in abnormal operation */ /* Fill list with bogus entries, that look somewhat valid */ SendMessage(g_listBox, LB_RESETCONTENT, 0, 0); @@ -1493,9 +1473,29 @@ static void test_listbox_dlgdir(void) ok (!strcmp(pathBuffer, tempBuffer), "Formatted file should be %s, got %s\n", tempBuffer, pathBuffer); } } - DestroyWindow(hWnd); - DeleteFileA( "wtest1.tmp.c" ); + /* Test behavior when loading folders from root with and without wildcard */ + strcpy(pathBuffer, "C:\\"); + res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); + ok(res || broken(!res) /* NT4/W2K */, "DlgDirList failed to list C:\\ folders\n"); + todo_wine ok(!strcmp(pathBuffer, "*") || broken(!res) /* NT4/W2K */, + "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); + + strcpy(pathBuffer, "C:\\*"); + res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); + ok(res || broken(!res) /* NT4/W2K */, "DlgDirList failed to list C:\\* folders\n"); + ok(!strcmp(pathBuffer, "*") || broken(!res) /* NT4/W2K */, + "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); + + /* Try loading files from an invalid folder */ + SetLastError(0xdeadbeef); + strcpy(pathBuffer, "C:\\INVALID$$DIR"); + res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); + todo_wine ok(!res, "DlgDirList should have failed with 0 but %d was returned\n", res); + todo_wine ok(GetLastError() == ERROR_NO_WILDCARD_CHARACTERS, + "GetLastError should return 0x589, got 0x%X\n",GetLastError()); + + DestroyWindow(hWnd); } START_TEST(listbox)

1 0

Francois Gouget : mshtml: Avoid returning with an unset URL policy in error cases.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: f93ca73e61e0212f7023376e48458cb8dee9c593 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f93ca73e61e0212f7023376e4… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 17 14:42:18 2012 +0200 mshtml: Avoid returning with an unset URL policy in error cases. --- dlls/mshtml/secmgr.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/secmgr.c b/dlls/mshtml/secmgr.c index ff349ac..f961bca 100644 --- a/dlls/mshtml/secmgr.c +++ b/dlls/mshtml/secmgr.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <stdio.h> +#include <assert.h> #define COBJMACROS @@ -104,9 +105,7 @@ static HRESULT confirm_safety_load(HTMLDocumentNode *This, struct CONFIRMSAFETY CATID init_catid = CATID_SafeForInitializing; hres = ICatInformation_IsClassOfCategories(This->catmgr, &cs->clsid, 1, &init_catid, 0, NULL); - if(FAILED(hres)) - return hres; - + assert(SUCCEEDED(hres)); *ret = hres == S_OK ? URLPOLICY_ALLOW : URLPOLICY_DISALLOW; }

1 0

Nikolay Sivov : ole32: COM cleanup for IErrorInfo.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: fa4db6d9ef11b9725e84346f50be486b4687dd3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa4db6d9ef11b9725e84346f5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 17 11:14:12 2012 +0400 ole32: COM cleanup for IErrorInfo. --- dlls/ole32/errorinfo.c | 137 ++++++++++++++++++----------------------------- 1 files changed, 53 insertions(+), 84 deletions(-) diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c index 39751ab..6a499fc 100644 --- a/dlls/ole32/errorinfo.c +++ b/dlls/ole32/errorinfo.c @@ -121,91 +121,56 @@ static VOID ERRORINFO_SysFreeString(BSTR in) HeapFree(GetProcessHeap(), 0, bufferPointer); } - typedef struct ErrorInfoImpl { - const IErrorInfoVtbl *lpvtei; - const ICreateErrorInfoVtbl *lpvtcei; - const ISupportErrorInfoVtbl *lpvtsei; - LONG ref; + IErrorInfo IErrorInfo_iface; + ICreateErrorInfo ICreateErrorInfo_iface; + ISupportErrorInfo ISupportErrorInfo_iface; + LONG ref; - GUID m_Guid; - BSTR bstrSource; - BSTR bstrDescription; - BSTR bstrHelpFile; - DWORD m_dwHelpContext; + GUID m_Guid; + BSTR bstrSource; + BSTR bstrDescription; + BSTR bstrHelpFile; + DWORD m_dwHelpContext; } ErrorInfoImpl; -static const IErrorInfoVtbl IErrorInfoImpl_VTable; -static const ICreateErrorInfoVtbl ICreateErrorInfoImpl_VTable; -static const ISupportErrorInfoVtbl ISupportErrorInfoImpl_VTable; - -/* - converts an object pointer to This - */ - static inline ErrorInfoImpl *impl_from_IErrorInfo( IErrorInfo *iface ) { - return (ErrorInfoImpl *)((char*)iface - FIELD_OFFSET(ErrorInfoImpl, lpvtei)); + return CONTAINING_RECORD(iface, ErrorInfoImpl, IErrorInfo_iface); } static inline ErrorInfoImpl *impl_from_ICreateErrorInfo( ICreateErrorInfo *iface ) { - return (ErrorInfoImpl *)((char*)iface - FIELD_OFFSET(ErrorInfoImpl, lpvtcei)); + return CONTAINING_RECORD(iface, ErrorInfoImpl, ICreateErrorInfo_iface); } static inline ErrorInfoImpl *impl_from_ISupportErrorInfo( ISupportErrorInfo *iface ) { - return (ErrorInfoImpl *)((char*)iface - FIELD_OFFSET(ErrorInfoImpl, lpvtsei)); + return CONTAINING_RECORD(iface, ErrorInfoImpl, ISupportErrorInfo_iface); } - -/* - converts This to an object pointer - */ -#define _IErrorInfo_(This) ((IErrorInfo*)&(This)->lpvtei) -#define _ICreateErrorInfo_(This) (&(This)->lpvtcei) -#define _ISupportErrorInfo_(This) (&(This)->lpvtsei) - -static IErrorInfo * IErrorInfoImpl_Constructor(void) -{ - ErrorInfoImpl * ei = HeapAlloc(GetProcessHeap(), 0, sizeof(ErrorInfoImpl)); - if (ei) - { - ei->lpvtei = &IErrorInfoImpl_VTable; - ei->lpvtcei = &ICreateErrorInfoImpl_VTable; - ei->lpvtsei = &ISupportErrorInfoImpl_VTable; - ei->ref = 1; - ei->bstrSource = NULL; - ei->bstrDescription = NULL; - ei->bstrHelpFile = NULL; - ei->m_dwHelpContext = 0; - } - return (IErrorInfo *)ei; -} - - static HRESULT WINAPI IErrorInfoImpl_QueryInterface( IErrorInfo* iface, REFIID riid, - VOID** ppvoid) + void** ppvoid) { ErrorInfoImpl *This = impl_from_IErrorInfo(iface); - TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppvoid); + TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid),ppvoid); *ppvoid = NULL; if(IsEqualIID(riid, &IID_IErrorInfo)) { - *ppvoid = _IErrorInfo_(This); + *ppvoid = &This->IErrorInfo_iface; } else if(IsEqualIID(riid, &IID_ICreateErrorInfo)) { - *ppvoid = _ICreateErrorInfo_(This); + *ppvoid = &This->ICreateErrorInfo_iface; } else if(IsEqualIID(riid, &IID_ISupportErrorInfo)) { - *ppvoid = _ISupportErrorInfo_(This); + *ppvoid = &This->ISupportErrorInfo_iface; } if(*ppvoid) @@ -311,12 +276,11 @@ static HRESULT WINAPI IErrorInfoImpl_GetHelpContext( return S_OK; } -static const IErrorInfoVtbl IErrorInfoImpl_VTable = +static const IErrorInfoVtbl ErrorInfoVtbl = { IErrorInfoImpl_QueryInterface, IErrorInfoImpl_AddRef, IErrorInfoImpl_Release, - IErrorInfoImpl_GetGUID, IErrorInfoImpl_GetSource, IErrorInfoImpl_GetDescription, @@ -330,25 +294,22 @@ static HRESULT WINAPI ICreateErrorInfoImpl_QueryInterface( REFIID riid, VOID** ppvoid) { - ErrorInfoImpl *This = impl_from_ICreateErrorInfo(iface); - TRACE("(%p)\n", This); - return IErrorInfo_QueryInterface(_IErrorInfo_(This), riid, ppvoid); + ErrorInfoImpl *This = impl_from_ICreateErrorInfo(iface); + return IErrorInfo_QueryInterface(&This->IErrorInfo_iface, riid, ppvoid); } static ULONG WINAPI ICreateErrorInfoImpl_AddRef( ICreateErrorInfo* iface) { - ErrorInfoImpl *This = impl_from_ICreateErrorInfo(iface); - TRACE("(%p)\n", This); - return IErrorInfo_AddRef(_IErrorInfo_(This)); + ErrorInfoImpl *This = impl_from_ICreateErrorInfo(iface); + return IErrorInfo_AddRef(&This->IErrorInfo_iface); } static ULONG WINAPI ICreateErrorInfoImpl_Release( ICreateErrorInfo* iface) { - ErrorInfoImpl *This = impl_from_ICreateErrorInfo(iface); - TRACE("(%p)\n", This); - return IErrorInfo_Release(_IErrorInfo_(This)); + ErrorInfoImpl *This = impl_from_ICreateErrorInfo(iface); + return IErrorInfo_Release(&This->IErrorInfo_iface); } @@ -410,12 +371,11 @@ static HRESULT WINAPI ICreateErrorInfoImpl_SetHelpContext( return S_OK; } -static const ICreateErrorInfoVtbl ICreateErrorInfoImpl_VTable = +static const ICreateErrorInfoVtbl CreateErrorInfoVtbl = { ICreateErrorInfoImpl_QueryInterface, ICreateErrorInfoImpl_AddRef, ICreateErrorInfoImpl_Release, - ICreateErrorInfoImpl_SetGUID, ICreateErrorInfoImpl_SetSource, ICreateErrorInfoImpl_SetDescription, @@ -428,29 +388,22 @@ static HRESULT WINAPI ISupportErrorInfoImpl_QueryInterface( REFIID riid, VOID** ppvoid) { - ErrorInfoImpl *This = impl_from_ISupportErrorInfo(iface); - TRACE("(%p)\n", This); - - return IErrorInfo_QueryInterface(_IErrorInfo_(This), riid, ppvoid); + ErrorInfoImpl *This = impl_from_ISupportErrorInfo(iface); + return IErrorInfo_QueryInterface(&This->IErrorInfo_iface, riid, ppvoid); } -static ULONG WINAPI ISupportErrorInfoImpl_AddRef( - ISupportErrorInfo* iface) +static ULONG WINAPI ISupportErrorInfoImpl_AddRef(ISupportErrorInfo* iface) { - ErrorInfoImpl *This = impl_from_ISupportErrorInfo(iface); - TRACE("(%p)\n", This); - return IErrorInfo_AddRef(_IErrorInfo_(This)); + ErrorInfoImpl *This = impl_from_ISupportErrorInfo(iface); + return IErrorInfo_AddRef(&This->IErrorInfo_iface); } -static ULONG WINAPI ISupportErrorInfoImpl_Release( - ISupportErrorInfo* iface) +static ULONG WINAPI ISupportErrorInfoImpl_Release(ISupportErrorInfo* iface) { - ErrorInfoImpl *This = impl_from_ISupportErrorInfo(iface); - TRACE("(%p)\n", This); - return IErrorInfo_Release(_IErrorInfo_(This)); + ErrorInfoImpl *This = impl_from_ISupportErrorInfo(iface); + return IErrorInfo_Release(&This->IErrorInfo_iface); } - static HRESULT WINAPI ISupportErrorInfoImpl_InterfaceSupportsErrorInfo( ISupportErrorInfo* iface, REFIID riid) @@ -460,16 +413,32 @@ static HRESULT WINAPI ISupportErrorInfoImpl_InterfaceSupportsErrorInfo( return (IsEqualIID(riid, &This->m_Guid)) ? S_OK : S_FALSE; } -static const ISupportErrorInfoVtbl ISupportErrorInfoImpl_VTable = +static const ISupportErrorInfoVtbl SupportErrorInfoVtbl = { ISupportErrorInfoImpl_QueryInterface, ISupportErrorInfoImpl_AddRef, ISupportErrorInfoImpl_Release, - - ISupportErrorInfoImpl_InterfaceSupportsErrorInfo }; +static IErrorInfo* IErrorInfoImpl_Constructor(void) +{ + ErrorInfoImpl *This = HeapAlloc(GetProcessHeap(), 0, sizeof(ErrorInfoImpl)); + + if (!This) return NULL; + + This->IErrorInfo_iface.lpVtbl = &ErrorInfoVtbl; + This->ICreateErrorInfo_iface.lpVtbl = &CreateErrorInfoVtbl; + This->ISupportErrorInfo_iface.lpVtbl = &SupportErrorInfoVtbl; + This->ref = 1; + This->bstrSource = NULL; + This->bstrDescription = NULL; + This->bstrHelpFile = NULL; + This->m_dwHelpContext = 0; + + return &This->IErrorInfo_iface; +} + /*********************************************************************** * CreateErrorInfo (OLE32.@) *

1 0