December 2009 - Wine-Commits

Alistair Leslie-Hughes : mshtml: Add stub interface IHTMLFiltersCollection.
by Alexandre Julliard Dec. 22, 2009

Dec. 22, 2009

Module: wine Branch: master Commit: 2cd6ac2725c3a938889319b0f93af70d6f7095bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cd6ac2725c3a938889319b0f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Dec 19 23:23:19 2009 +1100 mshtml: Add stub interface IHTMLFiltersCollection. --- dlls/mshtml/dispex.c | 1 + dlls/mshtml/htmlelem.c | 208 +++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 35 +++++++ 4 files changed, 243 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2cd6ac2725c3a93888931…

1 0

Andrew Nguyen : cfgmgr32: Forward more functions to setupapi.
by Alexandre Julliard Dec. 22, 2009

Dec. 22, 2009

Module: wine Branch: master Commit: adf55f0000988c8de001c7a763100f3f6e8e73d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adf55f0000988c8de001c7a76… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Tue Dec 22 05:34:34 2009 -0600 cfgmgr32: Forward more functions to setupapi. --- dlls/cfgmgr32/cfgmgr32.spec | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index da53b37..780312a 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -27,7 +27,7 @@ @ stub CM_Dup_Range_List @ stub CM_Enable_DevNode @ stub CM_Enable_DevNode_Ex -@ stub CM_Enumerate_Classes +@ stdcall CM_Enumerate_Classes(long ptr long) setupapi.CM_Enumerate_Classes @ stub CM_Enumerate_Classes_Ex @ stub CM_Enumerate_EnumeratorsA @ stub CM_Enumerate_EnumeratorsW @@ -63,9 +63,9 @@ @ stdcall CM_Get_Device_IDA(ptr ptr long long) setupapi.CM_Get_Device_IDA @ stdcall CM_Get_Device_IDW(ptr ptr long long) setupapi.CM_Get_Device_IDW @ stub CM_Get_Device_ID_ExA -@ stub CM_Get_Device_ID_ExW +@ stdcall CM_Get_Device_ID_ExW(ptr ptr long long ptr) setupapi.CM_Get_Device_ID_ExW @ stdcall CM_Get_Device_ID_ListA(ptr ptr long long) setupapi.CM_Get_Device_ID_ListA -@ stub CM_Get_Device_ID_ListW +@ stdcall CM_Get_Device_ID_ListW(wstr ptr long long) setupapi.CM_Get_Device_ID_ListW @ stub CM_Get_Device_ID_List_ExA @ stub CM_Get_Device_ID_List_ExW @ stub CM_Get_Device_ID_List_SizeA @@ -84,8 +84,8 @@ @ stub CM_Get_Device_Interface_List_ExW @ stub CM_Get_Device_Interface_List_SizeA @ stub CM_Get_Device_Interface_List_SizeW -@ stub CM_Get_Device_Interface_List_Size_ExA -@ stub CM_Get_Device_Interface_List_Size_ExW +@ stdcall CM_Get_Device_Interface_List_Size_ExA(ptr ptr str long ptr) setupapi.CM_Get_Device_Interface_List_Size_ExA +@ stdcall CM_Get_Device_Interface_List_Size_ExW(ptr ptr wstr long ptr) setupapi.CM_Get_Device_Interface_List_Size_ExW @ stub CM_Get_First_Log_Conf @ stub CM_Get_First_Log_Conf_Ex @ stub CM_Get_Global_State

1 0

Andrew Nguyen : dxdiagn: Add tests for IDxDiagProvider.
by Alexandre Julliard Dec. 22, 2009

Dec. 22, 2009

Module: wine Branch: master Commit: dddf714f02bb875083998bc7027cb0f8f8eb3e2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dddf714f02bb875083998bc70… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Tue Dec 22 04:15:12 2009 -0600 dxdiagn: Add tests for IDxDiagProvider. --- configure | 9 +++ configure.ac | 1 + dlls/dxdiagn/tests/Makefile.in | 13 ++++ dlls/dxdiagn/tests/provider.c | 152 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 175 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 6484f8b..73d6b77 100755 --- a/configure +++ b/configure @@ -14841,6 +14841,14 @@ dlls/dxdiagn/Makefile: dlls/dxdiagn/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dxdiagn/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/dxdiagn/tests/Makefile" +test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + dxdiagn/tests" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/dxdiagn/tests/Makefile: dlls/dxdiagn/tests/Makefile.in dlls/Maketest.rules" +ac_config_files="$ac_config_files dlls/dxdiagn/tests/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dxerr8/Makefile" test "x$enable_dxerr8" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\ dxerr8" @@ -19001,6 +19009,7 @@ do "dlls/dswave/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dswave/Makefile" ;; "dlls/dwmapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dwmapi/Makefile" ;; "dlls/dxdiagn/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxdiagn/Makefile" ;; + "dlls/dxdiagn/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxdiagn/tests/Makefile" ;; "dlls/dxerr8/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxerr8/Makefile" ;; "dlls/dxerr9/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxerr9/Makefile" ;; "dlls/dxgi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxgi/Makefile" ;; diff --git a/configure.ac b/configure.ac index 99fb6b9..62ea51f 100644 --- a/configure.ac +++ b/configure.ac @@ -2240,6 +2240,7 @@ WINE_CONFIG_MAKEFILE([dlls/dssenh/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL WINE_CONFIG_MAKEFILE([dlls/dswave/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/dwmapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/dxdiagn/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/dxdiagn/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/dxerr8/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS]) WINE_CONFIG_MAKEFILE([dlls/dxerr9/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS]) WINE_CONFIG_MAKEFILE([dlls/dxgi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/dxdiagn/tests/Makefile.in b/dlls/dxdiagn/tests/Makefile.in new file mode 100644 index 0000000..720e382 --- /dev/null +++ b/dlls/dxdiagn/tests/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = dxdiagn.dll +IMPORTS = ole32 kernel32 + +CTESTS = \ + provider.c + +(a)MAKE_TEST_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/dxdiagn/tests/provider.c b/dlls/dxdiagn/tests/provider.c new file mode 100644 index 0000000..a893842 --- /dev/null +++ b/dlls/dxdiagn/tests/provider.c @@ -0,0 +1,152 @@ +/* + * Unit tests for IDxDiagProvider + * + * Copyright (C) 2009 Andrew Nguyen + * + * 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 "initguid.h" +#include "dxdiag.h" +#include "wine/test.h" + +static void test_Initialize(void) +{ + HRESULT hr; + IDxDiagProvider *pddp; + DXDIAG_INIT_PARAMS params; + + hr = CoCreateInstance(&CLSID_DxDiagProvider, NULL, CLSCTX_INPROC_SERVER, + &IID_IDxDiagProvider, (LPVOID*)&pddp); + ok(hr == S_OK, "Creating a IDxDiagProvider instance failed with %x\n", hr); + if (FAILED(hr)) + { + skip("Failed to create a IDxDiagProvider instance\n"); + return; + } + + /* Test passing a NULL DXDIAG_INIT_PARAMS pointer. */ + hr = IDxDiagProvider_Initialize(pddp, NULL); + ok(hr == E_POINTER, + "Expected IDxDiagProvider::Initialize to return E_POINTER, got %x\n", hr); + + /* Test passing invalid dwSize values. */ + params.dwSize = 0; + hr = IDxDiagProvider_Initialize(pddp, &params); + ok(hr == E_INVALIDARG, + "Expected IDxDiagProvider::Initialize to return E_INVALIDARG, got %x\n", hr); + + params.dwSize = sizeof(params) + 1; + hr = IDxDiagProvider_Initialize(pddp, &params); + ok(hr == E_INVALIDARG, + "Expected IDxDiagProvider::Initialize to return E_INVALIDARG, got %x\n", hr); + + /* Test passing an unexpected dwDxDiagHeaderVersion value. */ + params.dwSize = sizeof(params); + params.dwDxDiagHeaderVersion = 0; + params.bAllowWHQLChecks = FALSE; + params.pReserved = NULL; + hr = IDxDiagProvider_Initialize(pddp, &params); + todo_wine + ok(hr == E_INVALIDARG, + "Expected IDxDiagProvider::Initialize to return E_INVALIDARG, got %x\n", hr); + + /* Setting pReserved to a non-NULL value causes a crash on Windows. */ + if (0) + { + params.dwDxDiagHeaderVersion = DXDIAG_DX9_SDK_VERSION; + params.bAllowWHQLChecks = FALSE; + params.pReserved = (VOID*)0xdeadbeef; + hr = IDxDiagProvider_Initialize(pddp, &params); + trace("IDxDiagProvider::Initialize returned %x\n", hr); + } + + /* Test passing an appropriately initialized DXDIAG_INIT_PARAMS. */ + params.dwDxDiagHeaderVersion = DXDIAG_DX9_SDK_VERSION; + params.bAllowWHQLChecks = FALSE; + params.pReserved = NULL; + hr = IDxDiagProvider_Initialize(pddp, &params); + ok(hr == S_OK, "Expected IDxDiagProvider::Initialize to return S_OK, got %x\n", hr); + + /* Test initializing multiple times. */ + hr = IDxDiagProvider_Initialize(pddp, &params); + ok(hr == S_OK, "Expected IDxDiagProvider::Initialize to return S_OK, got %x\n", hr); + + IDxDiagProvider_Release(pddp); +} + +static void test_GetRootContainer(void) +{ + HRESULT hr; + IDxDiagProvider *pddp; + IDxDiagContainer *pddc; + DXDIAG_INIT_PARAMS params; + + hr = CoCreateInstance(&CLSID_DxDiagProvider, NULL, CLSCTX_INPROC_SERVER, + &IID_IDxDiagProvider, (LPVOID*)&pddp); + ok(hr == S_OK, "Creating a IDxDiagProvider instance failed with %x\n", hr); + if (FAILED(hr)) + { + skip("Failed to create a IDxDiagProvider instance\n"); + return; + } + + /* Test calling IDxDiagProvider::GetRootContainer before initialization. */ + hr = IDxDiagProvider_GetRootContainer(pddp, NULL); + todo_wine + ok(hr == CO_E_NOTINITIALIZED, + "Expected IDxDiagProvider::GetRootContainer to return CO_E_NOTINITIALIZED, got %x\n", hr); + + hr = IDxDiagProvider_GetRootContainer(pddp, &pddc); + todo_wine + ok(hr == CO_E_NOTINITIALIZED, + "Expected IDxDiagProvider::GetRootContainer to return CO_E_NOTINITIALIZED, got %x\n", hr); + + params.dwSize = sizeof(params); + params.dwDxDiagHeaderVersion = DXDIAG_DX9_SDK_VERSION; + params.bAllowWHQLChecks = FALSE; + params.pReserved = NULL; + hr = IDxDiagProvider_Initialize(pddp, &params); + ok(hr == S_OK, "Expected IDxDiagProvider::Initialize to return S_OK, got %x\n", hr); + if (FAILED(hr)) + { + skip("IDxDiagProvider::Initialize failed\n"); + IDxDiagProvider_Release(pddp); + return; + } + + /* Passing NULL causes a crash on Windows. */ + if (0) + { + hr = IDxDiagProvider_GetRootContainer(pddp, NULL); + trace("IDxDiagProvider::GetRootContainer returned %x\n", hr); + } + + hr = IDxDiagProvider_GetRootContainer(pddp, &pddc); + ok(hr == S_OK, "Expected IDxDiagProvider::GetRootContainer to return S_OK, got %x\n", hr); + + IDxDiagContainer_Release(pddc); + IDxDiagProvider_Release(pddp); +} + +START_TEST(provider) +{ + CoInitialize(NULL); + test_Initialize(); + test_GetRootContainer(); + CoUninitialize(); +}

1 0

Andrew Nguyen : dxdiagn: Fix a return value and avoid validating the input parameter for IDxDiagProviderImpl ::GetContainer.
by Alexandre Julliard Dec. 22, 2009

Dec. 22, 2009

Module: wine Branch: master Commit: e1dd6a869dcacd13f502db8b418f168765b8249a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1dd6a869dcacd13f502db8b4… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Tue Dec 22 04:15:15 2009 -0600 dxdiagn: Fix a return value and avoid validating the input parameter for IDxDiagProviderImpl::GetContainer. --- dlls/dxdiagn/provider.c | 5 +---- dlls/dxdiagn/tests/provider.c | 2 -- 2 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 0795910..1100940 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -110,11 +110,8 @@ static HRESULT WINAPI IDxDiagProviderImpl_GetRootContainer(PDXDIAGPROVIDER iface IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface; TRACE("(%p,%p)\n", iface, ppInstance); - if (NULL == ppInstance) { - return E_INVALIDARG; - } if (FALSE == This->init) { - return E_INVALIDARG; /* should be E_CO_UNINITIALIZED */ + return CO_E_NOTINITIALIZED; } if (NULL == This->pRootContainer) { hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &This->pRootContainer); diff --git a/dlls/dxdiagn/tests/provider.c b/dlls/dxdiagn/tests/provider.c index a893842..52670c0 100644 --- a/dlls/dxdiagn/tests/provider.c +++ b/dlls/dxdiagn/tests/provider.c @@ -107,12 +107,10 @@ static void test_GetRootContainer(void) /* Test calling IDxDiagProvider::GetRootContainer before initialization. */ hr = IDxDiagProvider_GetRootContainer(pddp, NULL); - todo_wine ok(hr == CO_E_NOTINITIALIZED, "Expected IDxDiagProvider::GetRootContainer to return CO_E_NOTINITIALIZED, got %x\n", hr); hr = IDxDiagProvider_GetRootContainer(pddp, &pddc); - todo_wine ok(hr == CO_E_NOTINITIALIZED, "Expected IDxDiagProvider::GetRootContainer to return CO_E_NOTINITIALIZED, got %x\n", hr);

1 0

David Adam : d3dx9/tests: 1 must be a float.
by Alexandre Julliard Dec. 22, 2009

Dec. 22, 2009

Module: wine Branch: master Commit: 202f826d02ac6d11544a234dbaeb41095b4c8a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=202f826d02ac6d11544a234db… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Tue Dec 22 10:26:45 2009 +0100 d3dx9/tests: 1 must be a float. --- dlls/d3dx9_36/tests/math.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 4eb7bcb..9cc9248 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -26,7 +26,7 @@ #define admitted_error 0.0001f -#define relative_error(exp, out) ((exp == 0.0f) ? fabs(exp - out) : (fabs(1 - out/ exp) )) +#define relative_error(exp, out) ((exp == 0.0f) ? fabs(exp - out) : (fabs(1.0f - out/ exp) )) #define expect_color(expectedcolor,gotcolor) ok((relative_error(expectedcolor.r, gotcolor.r)<admitted_error)&&(relative_error(expectedcolor.g, gotcolor.g)<admitted_error)&&(relative_error(expectedcolor.b, gotcolor.b)<admitted_error)&&(relative_error(expectedcolor.a, gotcolor.a)<admitted_error),"Expected Color= (%f, %f, %f, %f)\n , Got Color= (%f, %f, %f, %f)\n", expectedcolor.r, expectedcolor.g, expectedcolor.b, expectedcolor.a, gotcolor.r, gotcolor.g, gotcolor.b, gotcolor.a);

1 0

Andrew Nguyen : dxdiagn: Validate the dwDxDiagHeaderVersion member in IDxDiagProvider::Initialize.
by Alexandre Julliard Dec. 22, 2009

Dec. 22, 2009

Module: wine Branch: master Commit: a72af3100d9b7e478634435ef64f53fbaa3e9d2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a72af3100d9b7e478634435ef… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Tue Dec 22 04:15:18 2009 -0600 dxdiagn: Validate the dwDxDiagHeaderVersion member in IDxDiagProvider::Initialize. --- dlls/dxdiagn/provider.c | 3 ++- dlls/dxdiagn/tests/provider.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 1100940..6075c9d 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -96,7 +96,8 @@ static HRESULT WINAPI IDxDiagProviderImpl_Initialize(PDXDIAGPROVIDER iface, DXDI if (NULL == pParams) { return E_POINTER; } - if (pParams->dwSize != sizeof(DXDIAG_INIT_PARAMS)) { + if (pParams->dwSize != sizeof(DXDIAG_INIT_PARAMS) || + pParams->dwDxDiagHeaderVersion != DXDIAG_DX9_SDK_VERSION) { return E_INVALIDARG; } diff --git a/dlls/dxdiagn/tests/provider.c b/dlls/dxdiagn/tests/provider.c index 52670c0..47732bc 100644 --- a/dlls/dxdiagn/tests/provider.c +++ b/dlls/dxdiagn/tests/provider.c @@ -61,7 +61,6 @@ static void test_Initialize(void) params.bAllowWHQLChecks = FALSE; params.pReserved = NULL; hr = IDxDiagProvider_Initialize(pddp, &params); - todo_wine ok(hr == E_INVALIDARG, "Expected IDxDiagProvider::Initialize to return E_INVALIDARG, got %x\n", hr);

1 0

Andrew Nguyen : dxdiagn: Make the IDxDiag* interfaces conform to the IUnknown:: QueryInterface contract.
by Alexandre Julliard Dec. 22, 2009

Dec. 22, 2009

Module: wine Branch: master Commit: d36e3b4a1d71ca4decbbebd6fd4053fbec94bbb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d36e3b4a1d71ca4decbbebd6f… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Tue Dec 22 04:14:56 2009 -0600 dxdiagn: Make the IDxDiag* interfaces conform to the IUnknown::QueryInterface contract. --- dlls/dxdiagn/container.c | 3 +++ dlls/dxdiagn/provider.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index 621579b..e02d1d1 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -33,6 +33,8 @@ HRESULT WINAPI IDxDiagContainerImpl_QueryInterface(PDXDIAGCONTAINER iface, REFII { IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + if (!ppobj) return E_INVALIDARG; + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDxDiagContainer)) { IUnknown_AddRef(iface); @@ -41,6 +43,7 @@ HRESULT WINAPI IDxDiagContainerImpl_QueryInterface(PDXDIAGCONTAINER iface, REFII } WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 88d67b6..21bb32d 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -48,6 +48,8 @@ static HRESULT WINAPI IDxDiagProviderImpl_QueryInterface(PDXDIAGPROVIDER iface, { IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface; + if (!ppobj) return E_INVALIDARG; + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDxDiagProvider)) { IUnknown_AddRef(iface); @@ -56,6 +58,7 @@ static HRESULT WINAPI IDxDiagProviderImpl_QueryInterface(PDXDIAGPROVIDER iface, } WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Hans Leidekker : gdiplus: Implement GdipGet/ SetStringFormatMeasurableCharacterRanges.
by Alexandre Julliard Dec. 22, 2009

Dec. 22, 2009

Module: wine Branch: master Commit: 9f63f7d949abc7a67f0031d046818698b7e82ec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f63f7d949abc7a67f0031d04… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 22 10:37:55 2009 +0100 gdiplus: Implement GdipGet/SetStringFormatMeasurableCharacterRanges. --- dlls/gdiplus/gdiplus_private.h | 2 + dlls/gdiplus/stringformat.c | 41 +++++++++++++++++++++++++++++------- dlls/gdiplus/tests/stringformat.c | 15 ++++++++++--- 3 files changed, 46 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 9a357c8..6d778a4 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -282,6 +282,8 @@ struct GpStringFormat{ INT tabcount; REAL firsttab; REAL *tabs; + CharacterRange *character_ranges; + INT range_count; }; struct GpFontCollection{ diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c index bfe7d34..6e85008 100644 --- a/dlls/gdiplus/stringformat.c +++ b/dlls/gdiplus/stringformat.c @@ -48,6 +48,8 @@ GpStatus WINGDIPAPI GdipCreateStringFormat(INT attr, LANGID lang, (*format)->digitlang = LANG_NEUTRAL; (*format)->trimming = StringTrimmingCharacter; (*format)->digitsub = StringDigitSubstituteUser; + (*format)->character_ranges = NULL; + (*format)->range_count = 0; /* tabstops */ (*format)->tabcount = 0; (*format)->firsttab = 0.0; @@ -61,6 +63,7 @@ GpStatus WINGDIPAPI GdipDeleteStringFormat(GpStringFormat *format) if(!format) return InvalidParameter; + GdipFree(format->character_ranges); GdipFree(format->tabs); GdipFree(format); @@ -141,14 +144,16 @@ GpStatus WINGDIPAPI GdipGetStringFormatLineAlign(GpStringFormat *format, } GpStatus WINGDIPAPI GdipGetStringFormatMeasurableCharacterRangeCount( - GDIPCONST GpStringFormat* format, INT* count) + GDIPCONST GpStringFormat *format, INT *count) { if (!(format && count)) return InvalidParameter; - FIXME("stub: %p %p\n", format, count); + TRACE("%p %p\n", format, count); - return NotImplemented; + *count = format->range_count; + + return Ok; } GpStatus WINGDIPAPI GdipGetStringFormatTabStopCount(GDIPCONST GpStringFormat *format, @@ -242,15 +247,22 @@ GpStatus WINGDIPAPI GdipSetStringFormatLineAlign(GpStringFormat *format, return Ok; } -GpStatus WINGDIPAPI GdipSetStringFormatMeasurableCharacterRanges(GpStringFormat* - format, INT rangeCount, GDIPCONST CharacterRange* ranges) +GpStatus WINGDIPAPI GdipSetStringFormatMeasurableCharacterRanges( + GpStringFormat *format, INT rangeCount, GDIPCONST CharacterRange *ranges) { - if (!(format && rangeCount && ranges)) + if (!(format && ranges)) return InvalidParameter; - FIXME("stub: %p, %d, %p\n", format, rangeCount, ranges); + TRACE("%p, %d, %p\n", format, rangeCount, ranges); + + format->character_ranges = GdipAlloc(rangeCount * sizeof(CharacterRange)); + if (!format->character_ranges) + return OutOfMemory; - return NotImplemented; + memcpy(format->character_ranges, ranges, sizeof(CharacterRange) * rangeCount); + format->range_count = rangeCount; + + return Ok; } GpStatus WINGDIPAPI GdipSetStringFormatTabStops(GpStringFormat *format, REAL firsttab, @@ -331,6 +343,19 @@ GpStatus WINGDIPAPI GdipCloneStringFormat(GDIPCONST GpStringFormat *format, GpSt else (*newFormat)->tabs = NULL; + if(format->range_count > 0){ + (*newFormat)->character_ranges = GdipAlloc(sizeof(CharacterRange) * format->range_count); + if(!(*newFormat)->character_ranges){ + GdipFree((*newFormat)->tabs); + GdipFree(*newFormat); + return OutOfMemory; + } + memcpy((*newFormat)->character_ranges, format->character_ranges, + sizeof(CharacterRange) * format->range_count); + } + else + (*newFormat)->character_ranges = NULL; + TRACE("%p %p\n",format,newFormat); return Ok; diff --git a/dlls/gdiplus/tests/stringformat.c b/dlls/gdiplus/tests/stringformat.c index b28dbc6..117e57b 100644 --- a/dlls/gdiplus/tests/stringformat.c +++ b/dlls/gdiplus/tests/stringformat.c @@ -29,7 +29,7 @@ static void test_constructor(void) { GpStringFormat *format; GpStatus stat; - INT n; + INT n, count; StringAlignment align, valign; StringTrimming trimming; StringDigitSubstitute digitsub; @@ -43,6 +43,7 @@ static void test_constructor(void) GdipGetStringFormatHotkeyPrefix(format, &n); GdipGetStringFormatTrimming(format, &trimming); GdipGetStringFormatDigitSubstitution(format, &digitlang, &digitsub); + GdipGetStringFormatMeasurableCharacterRangeCount(format, &count); expect(HotkeyPrefixNone, n); expect(StringAlignmentNear, align); @@ -50,6 +51,7 @@ static void test_constructor(void) expect(StringTrimmingCharacter, trimming); expect(StringDigitSubstituteUser, digitsub); expect(LANG_NEUTRAL, digitlang); + expect(0, count); stat = GdipDeleteStringFormat(format); expect(Ok, stat); @@ -64,14 +66,19 @@ static void test_characterrange(void) stat = GdipCreateStringFormat(0, LANG_NEUTRAL, &format); expect(Ok, stat); -todo_wine -{ + stat = GdipSetStringFormatMeasurableCharacterRanges(NULL, 3, ranges); + expect(InvalidParameter, stat); + stat = GdipSetStringFormatMeasurableCharacterRanges(format, 0, ranges); + expect(Ok, stat); + stat = GdipSetStringFormatMeasurableCharacterRanges(format, 3, NULL); + expect(InvalidParameter, stat); + stat = GdipSetStringFormatMeasurableCharacterRanges(format, 3, ranges); expect(Ok, stat); stat = GdipGetStringFormatMeasurableCharacterRangeCount(format, &count); expect(Ok, stat); if (stat == Ok) expect(3, count); -} + stat= GdipDeleteStringFormat(format); expect(Ok, stat); }

1 0

Andrew Nguyen : setupapi: Implement SetupDiOpenDeviceInfoA/W as stubs.
by Alexandre Julliard Dec. 22, 2009

Dec. 22, 2009

Module: wine Branch: master Commit: 3eea5a8ae9192cdd524e7beb7261a67807897582 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eea5a8ae9192cdd524e7beb7… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Tue Dec 22 04:06:43 2009 -0600 setupapi: Implement SetupDiOpenDeviceInfoA/W as stubs. --- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 04473aa..bcf88f4 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -369,8 +369,8 @@ @ stdcall SetupDiOpenClassRegKeyExA(ptr long long str ptr) @ stdcall SetupDiOpenClassRegKeyExW(ptr long long wstr ptr) @ stdcall SetupDiOpenDevRegKey(ptr ptr long long long long) -@ stub SetupDiOpenDeviceInfoA -@ stub SetupDiOpenDeviceInfoW +@ stdcall SetupDiOpenDeviceInfoA(ptr str ptr long ptr) +@ stdcall SetupDiOpenDeviceInfoW(ptr wstr ptr long ptr) @ stdcall SetupDiOpenDeviceInterfaceA(ptr str long ptr) @ stub SetupDiOpenDeviceInterfaceRegKey @ stdcall SetupDiOpenDeviceInterfaceW(ptr wstr long ptr) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 44cd2c0..3496c6b 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -259,6 +259,28 @@ BOOL WINAPI SetupDiGetClassImageIndex(PSP_CLASSIMAGELIST_DATA ClassImageListData } /*********************************************************************** + * SetupDiOpenDeviceInfoA (SETUPAPI.@) + */ +BOOL WINAPI SetupDiOpenDeviceInfoA(HDEVINFO DeviceInfoSet, PCSTR DeviceInstanceId, + HWND hwndParent, DWORD OpenFlags, PSP_DEVINFO_DATA DeviceInfoData) +{ + FIXME("%p %s %p 0x%08x %p\n", DeviceInfoSet, debugstr_a(DeviceInstanceId), + hwndParent, OpenFlags, DeviceInfoData); + return FALSE; +} + +/*********************************************************************** + * SetupDiOpenDeviceInfoW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiOpenDeviceInfoW(HDEVINFO DeviceInfoSet, PCWSTR DeviceInstanceId, + HWND hwndParent, DWORD OpenFlags, PSP_DEVINFO_DATA DeviceInfoData) +{ + FIXME("%p %s %p 0x%08x %p\n", DeviceInfoSet, debugstr_w(DeviceInstanceId), + hwndParent, OpenFlags, DeviceInfoData); + return FALSE; +} + +/*********************************************************************** * CM_Locate_DevNodeA (SETUPAPI.@) */ CONFIGRET WINAPI CM_Locate_DevNodeA(PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, ULONG ulFlags)

1 0

Andrew Nguyen : dxdiagn: Fail class instantiation if aggregation is requested.
by Alexandre Julliard Dec. 22, 2009

Dec. 22, 2009

Module: wine Branch: master Commit: b0e3c91c0a6e9e1ec767697e45919f04aa13fe3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0e3c91c0a6e9e1ec767697e4… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Tue Dec 22 04:15:07 2009 -0600 dxdiagn: Fail class instantiation if aggregation is requested. --- dlls/dxdiagn/provider.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 21bb32d..0795910 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -139,12 +139,12 @@ HRESULT DXDiag_CreateDXDiagProvider(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, R IDxDiagProviderImpl* provider; TRACE("(%p, %s, %p)\n", punkOuter, debugstr_guid(riid), ppobj); - + + *ppobj = NULL; + if (punkOuter) return CLASS_E_NOAGGREGATION; + provider = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDxDiagProviderImpl)); - if (NULL == provider) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } + if (NULL == provider) return E_OUTOFMEMORY; provider->lpVtbl = &DxDiagProvider_Vtbl; provider->ref = 0; /* will be inited with QueryInterface */ return IDxDiagProviderImpl_QueryInterface ((PDXDIAGPROVIDER)provider, riid, ppobj);

1 0