March 2010 - Wine-commits - list.winehq.org

Damjan Jovanovic : setupapi: Stub out SetupDiRemoveDevice.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: bf18e7e71f27035c4c9dbc6d447f57a907b9f752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf18e7e71f27035c4c9dbc6d4… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Mar 13 14:16:01 2010 +0200 setupapi: Stub out SetupDiRemoveDevice. --- dlls/setupapi/devinst.c | 12 ++++++++++++ dlls/setupapi/setupapi.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index ec586e7..31269ff 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1556,6 +1556,18 @@ BOOL WINAPI SetupDiRegisterDeviceInfo( } /*********************************************************************** + * SetupDiRemoveDevice (SETUPAPI.@) + */ +BOOL WINAPI SetupDiRemoveDevice( + HDEVINFO devinfo, + PSP_DEVINFO_DATA info) +{ + FIXME("(%p, %p): stub\n", devinfo, info); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * SetupDiEnumDeviceInfo (SETUPAPI.@) */ BOOL WINAPI SetupDiEnumDeviceInfo( diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 51a5c2e..5532aaa 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -375,7 +375,7 @@ @ stub SetupDiOpenDeviceInterfaceRegKey @ stdcall SetupDiOpenDeviceInterfaceW(ptr wstr long ptr) @ stdcall SetupDiRegisterDeviceInfo(ptr ptr long ptr ptr ptr) -@ stub SetupDiRemoveDevice +@ stdcall SetupDiRemoveDevice(ptr ptr) @ stub SetupDiRemoveDeviceInterface @ stub SetupDiSelectDevice @ stub SetupDiSelectOEMDrv

1 0

Andrew Nguyen : dxdiagn/tests: Add tests for IDxDiagContainer.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 5801d60a37fb67028a34b1310c4c1dbc0ee79d37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5801d60a37fb67028a34b1310… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Mar 14 11:03:52 2010 -0600 dxdiagn/tests: Add tests for IDxDiagContainer. --- dlls/dxdiagn/tests/Makefile.in | 1 + dlls/dxdiagn/tests/container.c | 108 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 0 deletions(-) diff --git a/dlls/dxdiagn/tests/Makefile.in b/dlls/dxdiagn/tests/Makefile.in index 401b4ad..62c807e 100644 --- a/dlls/dxdiagn/tests/Makefile.in +++ b/dlls/dxdiagn/tests/Makefile.in @@ -6,6 +6,7 @@ TESTDLL = dxdiagn.dll IMPORTS = ole32 kernel32 C_SRCS = \ + container.c \ provider.c @MAKE_TEST_RULES@ diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c new file mode 100644 index 0000000..b2aa4fc --- /dev/null +++ b/dlls/dxdiagn/tests/container.c @@ -0,0 +1,108 @@ +/* + * Unit tests for IDxDiagContainer + * + * Copyright 2010 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 "dxdiag.h" +#include "wine/test.h" + +static IDxDiagProvider *pddp; +static IDxDiagContainer *pddc; + +static BOOL create_root_IDxDiagContainer(void) +{ + HRESULT hr; + DXDIAG_INIT_PARAMS params; + + hr = CoCreateInstance(&CLSID_DxDiagProvider, NULL, CLSCTX_INPROC_SERVER, + &IID_IDxDiagProvider, (LPVOID*)&pddp); + if (SUCCEEDED(hr)) + { + params.dwSize = sizeof(params); + params.dwDxDiagHeaderVersion = DXDIAG_DX9_SDK_VERSION; + params.bAllowWHQLChecks = FALSE; + params.pReserved = NULL; + hr = IDxDiagProvider_Initialize(pddp, &params); + if (SUCCEEDED(hr)) + { + hr = IDxDiagProvider_GetRootContainer(pddp, &pddc); + if (SUCCEEDED(hr)) + return TRUE; + } + IDxDiagProvider_Release(pddp); + } + return FALSE; +} + +static void test_GetNumberOfChildContainers(void) +{ + HRESULT hr; + DWORD count; + + if (!create_root_IDxDiagContainer()) + { + skip("Unable to create the root IDxDiagContainer\n"); + return; + } + + hr = IDxDiagContainer_GetNumberOfChildContainers(pddc, NULL); + ok(hr == E_INVALIDARG, + "Expected IDxDiagContainer::GetNumberOfChildContainers to return E_INVALIDARG, got 0x%08x\n", hr); + + hr = IDxDiagContainer_GetNumberOfChildContainers(pddc, &count); + ok(hr == S_OK, + "Expected IDxDiagContainer::GetNumberOfChildContainers to return S_OK, got 0x%08x\n", hr); + if (hr == S_OK) + ok(count != 0, "Expected the number of child containers for the root container to be non-zero\n"); + + IDxDiagContainer_Release(pddc); + IDxDiagProvider_Release(pddp); +} + +static void test_GetNumberOfProps(void) +{ + HRESULT hr; + DWORD count; + + if (!create_root_IDxDiagContainer()) + { + skip("Unable to create the root IDxDiagContainer\n"); + return; + } + + hr = IDxDiagContainer_GetNumberOfProps(pddc, NULL); + ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::GetNumberOfProps to return E_INVALIDARG, got 0x%08x\n", hr); + + hr = IDxDiagContainer_GetNumberOfProps(pddc, &count); + ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfProps to return S_OK, got 0x%08x\n", hr); + if (hr == S_OK) + ok(count == 0, "Expected the number of properties for the root container to be zero\n"); + + IDxDiagContainer_Release(pddc); + IDxDiagProvider_Release(pddp); +} + +START_TEST(container) +{ + CoInitialize(NULL); + test_GetNumberOfChildContainers(); + test_GetNumberOfProps(); + CoUninitialize(); +}

1 0

Andrew Nguyen : dxdiagn: Fix return and output behavior of IDxDiagContainer ::EnumChildContainerNames.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 2c9a5900e630ffa71f5332a41dd4b2392de30807 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c9a5900e630ffa71f5332a41… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Mar 14 11:03:58 2010 -0600 dxdiagn: Fix return and output behavior of IDxDiagContainer::EnumChildContainerNames. --- dlls/dxdiagn/container.c | 15 +++++------ dlls/dxdiagn/tests/container.c | 49 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 8 deletions(-) diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index e02d1d1..e2b3af1 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -88,16 +88,13 @@ static HRESULT WINAPI IDxDiagContainerImpl_EnumChildContainerNames(PDXDIAGCONTAI IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; IDxDiagContainerImpl_SubContainer* p = NULL; DWORD i = 0; - - TRACE("(%p, %u, %s, %u)\n", iface, dwIndex, debugstr_w(pwszContainer), cchContainer); - if (NULL == pwszContainer) { + TRACE("(%p, %u, %p, %u)\n", iface, dwIndex, pwszContainer, cchContainer); + + if (NULL == pwszContainer || 0 == cchContainer) { return E_INVALIDARG; } - if (256 > cchContainer) { - return DXDIAG_E_INSUFFICIENT_BUFFER; - } - + p = This->subContainers; while (NULL != p) { if (dwIndex == i) { @@ -109,7 +106,9 @@ static HRESULT WINAPI IDxDiagContainerImpl_EnumChildContainerNames(PDXDIAGCONTAI } p = p->next; ++i; - } + } + + *pwszContainer = '\0'; return E_INVALIDARG; } diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index b2aa4fc..9ca464b 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -99,10 +99,59 @@ static void test_GetNumberOfProps(void) IDxDiagProvider_Release(pddp); } +static void test_EnumChildContainerNames(void) +{ + HRESULT hr; + WCHAR container[256]; + static const WCHAR testW[] = {'t','e','s','t',0}; + static const WCHAR zerotestW[] = {0,'e','s','t',0}; + + if (!create_root_IDxDiagContainer()) + { + skip("Unable to create the root IDxDiagContainer\n"); + return; + } + + /* Test various combinations of invalid parameters. */ + hr = IDxDiagContainer_EnumChildContainerNames(pddc, 0, NULL, 0); + ok(hr == E_INVALIDARG, + "Expected IDxDiagContainer::EnumChildContainerNames to return E_INVALIDARG, got 0x%08x\n", hr); + + hr = IDxDiagContainer_EnumChildContainerNames(pddc, 0, NULL, sizeof(container)/sizeof(WCHAR)); + ok(hr == E_INVALIDARG, + "Expected IDxDiagContainer::EnumChildContainerNames to return E_INVALIDARG, got 0x%08x\n", hr); + + /* Test the conditions in which the output buffer can be modified. */ + memcpy(container, testW, sizeof(testW)); + hr = IDxDiagContainer_EnumChildContainerNames(pddc, 0, container, 0); + ok(hr == E_INVALIDARG, + "Expected IDxDiagContainer::EnumChildContainerNames to return E_INVALIDARG, got 0x%08x\n", hr); + ok(!memcmp(container, testW, sizeof(testW)), + "Expected the container buffer to be untouched, got %s\n", wine_dbgstr_w(container)); + + memcpy(container, testW, sizeof(testW)); + hr = IDxDiagContainer_EnumChildContainerNames(pddc, ~0, container, 0); + ok(hr == E_INVALIDARG, + "Expected IDxDiagContainer::EnumChildContainerNames to return E_INVALIDARG, got 0x%08x\n", hr); + ok(!memcmp(container, testW, sizeof(testW)), + "Expected the container buffer to be untouched, got %s\n", wine_dbgstr_w(container)); + + memcpy(container, testW, sizeof(testW)); + hr = IDxDiagContainer_EnumChildContainerNames(pddc, ~0, container, sizeof(container)/sizeof(WCHAR)); + ok(hr == E_INVALIDARG, + "Expected IDxDiagContainer::EnumChildContainerNames to return E_INVALIDARG, got 0x%08x\n", hr); + ok(!memcmp(container, zerotestW, sizeof(zerotestW)), + "Expected the container buffer string to be empty, got %s\n", wine_dbgstr_w(container)); + + IDxDiagContainer_Release(pddc); + IDxDiagProvider_Release(pddp); +} + START_TEST(container) { CoInitialize(NULL); test_GetNumberOfChildContainers(); test_GetNumberOfProps(); + test_EnumChildContainerNames(); CoUninitialize(); }

1 0

Andrew Nguyen : dxdiagn: Fix string copy behavior with an excessively short buffer in IDxDiagContainer ::EnumChildContainerNames.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: fa9af5b68aaf5c3498898cb5558d548657a2367b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa9af5b68aaf5c3498898cb55… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Mar 14 16:36:30 2010 -0600 dxdiagn: Fix string copy behavior with an excessively short buffer in IDxDiagContainer::EnumChildContainerNames. --- dlls/dxdiagn/container.c | 10 +++--- dlls/dxdiagn/tests/container.c | 72 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 5 deletions(-) diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index e2b3af1..d1c023f 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -97,17 +97,17 @@ static HRESULT WINAPI IDxDiagContainerImpl_EnumChildContainerNames(PDXDIAGCONTAI p = This->subContainers; while (NULL != p) { - if (dwIndex == i) { - if (cchContainer <= strlenW(p->contName)) { - return DXDIAG_E_INSUFFICIENT_BUFFER; - } + if (dwIndex == i) { + TRACE("Found container name %s, copying string\n", debugstr_w(p->contName)); lstrcpynW(pwszContainer, p->contName, cchContainer); - return S_OK; + return (cchContainer <= strlenW(p->contName)) ? + DXDIAG_E_INSUFFICIENT_BUFFER : S_OK; } p = p->next; ++i; } + TRACE("Failed to find container name at specified index\n"); *pwszContainer = '\0'; return E_INVALIDARG; } diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index 9ca464b..6fbb085 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -103,6 +103,7 @@ static void test_EnumChildContainerNames(void) { HRESULT hr; WCHAR container[256]; + DWORD maxcount, index; static const WCHAR testW[] = {'t','e','s','t',0}; static const WCHAR zerotestW[] = {0,'e','s','t',0}; @@ -143,6 +144,77 @@ static void test_EnumChildContainerNames(void) ok(!memcmp(container, zerotestW, sizeof(zerotestW)), "Expected the container buffer string to be empty, got %s\n", wine_dbgstr_w(container)); + hr = IDxDiagContainer_GetNumberOfChildContainers(pddc, &maxcount); + ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfChildContainers to return S_OK, got 0x%08x\n", hr); + if (FAILED(hr)) + { + skip("IDxDiagContainer::GetNumberOfChildContainers failed\n"); + goto cleanup; + } + + trace("Starting child container enumeration of the root container:\n"); + + /* We should be able to enumerate as many child containers as the value + * that IDxDiagContainer::GetNumberOfChildContainers returns. */ + for (index = 0; index <= maxcount; index++) + { + /* A buffer size of 1 is unlikely to be valid, as only a null terminator + * could be stored, and it is unlikely that a container name could be empty. */ + DWORD buffersize = 1; + memcpy(container, testW, sizeof(testW)); + hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, container, buffersize); + if (hr == E_INVALIDARG) + { + /* We should get here when index is one more than the maximum index value. */ + ok(maxcount == index, + "Expected IDxDiagContainer::EnumChildContainerNames to return E_INVALIDARG " + "on the last index %d, got 0x%08x\n", index, hr); + ok(container[0] == '\0', + "Expected the container buffer string to be empty, got %s\n", wine_dbgstr_w(container)); + break; + } + else if (hr == DXDIAG_E_INSUFFICIENT_BUFFER) + { + WCHAR temp[256]; + + ok(container[0] == '\0', + "Expected the container buffer string to be empty, got %s\n", wine_dbgstr_w(container)); + + /* Get the container name to compare against. */ + hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, temp, sizeof(temp)/sizeof(WCHAR)); + ok(hr == S_OK, + "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); + + /* Show that the DirectX SDK's stipulation that the buffer be at + * least 256 characters long is a mere suggestion, and smaller sizes + * can be acceptable also. IDxDiagContainer::EnumChildContainerNames + * doesn't provide a way of getting the exact size required, so the + * buffersize value will be iterated to at most 256 characters. */ + for (buffersize = 2; buffersize <= 256; buffersize++) + { + memcpy(container, testW, sizeof(testW)); + hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, container, buffersize); + if (hr != DXDIAG_E_INSUFFICIENT_BUFFER) + break; + + ok(!memcmp(temp, container, sizeof(WCHAR)*(buffersize - 1)), + "Expected truncated container name string, got %s\n", wine_dbgstr_w(container)); + } + + ok(hr == S_OK, + "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK, " + "got hr = 0x%08x, buffersize = %d\n", hr, buffersize); + if (hr == S_OK) + trace("pddc[%d] = %s, length = %d\n", index, wine_dbgstr_w(container), buffersize); + } + else + { + ok(0, "IDxDiagContainer::EnumChildContainerNames unexpectedly returned 0x%08x\n", hr); + break; + } + } + +cleanup: IDxDiagContainer_Release(pddc); IDxDiagProvider_Release(pddp); }

1 0

Andrew Nguyen : dxdiagn: Initialize output pointer to NULL in IDxDiagContainer::GetChildContainer.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: c245c6ed0974fc5bac2e8abc6db869a2cca35f5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c245c6ed0974fc5bac2e8abc6… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Mar 14 11:04:07 2010 -0600 dxdiagn: Initialize output pointer to NULL in IDxDiagContainer::GetChildContainer. --- dlls/dxdiagn/container.c | 4 +- dlls/dxdiagn/tests/container.c | 71 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 2 deletions(-) diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index d1c023f..94d2774 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -129,7 +129,7 @@ static HRESULT IDxDiagContainerImpl_GetChildContainerInternal(PDXDIAGCONTAINER i static HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(PDXDIAGCONTAINER iface, LPCWSTR pwszContainer, IDxDiagContainer** ppInstance) { IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; - IDxDiagContainer* pContainer = NULL; + IDxDiagContainer* pContainer = (PDXDIAGCONTAINER)This; LPWSTR tmp, orig_tmp; INT tmp_len; WCHAR* cur; @@ -141,7 +141,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(PDXDIAGCONTAINER if return E_INVALIDARG; } - pContainer = (PDXDIAGCONTAINER) This; + *ppInstance = NULL; tmp_len = strlenW(pwszContainer) + 1; orig_tmp = tmp = HeapAlloc(GetProcessHeap(), 0, tmp_len * sizeof(WCHAR)); diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index 6fbb085..ccc5dd3 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -219,11 +219,82 @@ cleanup: IDxDiagProvider_Release(pddp); } +static void test_GetChildContainer(void) +{ + HRESULT hr; + WCHAR container[256] = {0}; + IDxDiagContainer *child; + + if (!create_root_IDxDiagContainer()) + { + skip("Unable to create the root IDxDiagContainer\n"); + return; + } + + /* Test various combinations of invalid parameters. */ + hr = IDxDiagContainer_GetChildContainer(pddc, NULL, NULL); + ok(hr == E_INVALIDARG, + "Expected IDxDiagContainer::GetChildContainer to return E_INVALIDARG, got 0x%08x\n", hr); + + child = (void*)0xdeadbeef; + hr = IDxDiagContainer_GetChildContainer(pddc, NULL, &child); + ok(hr == E_INVALIDARG, + "Expected IDxDiagContainer::GetChildContainer to return E_INVALIDARG, got 0x%08x\n", hr); + ok(child == (void*)0xdeadbeef, "Expected output pointer to be unchanged, got %p\n", child); + + hr = IDxDiagContainer_GetChildContainer(pddc, container, NULL); + ok(hr == E_INVALIDARG, + "Expected IDxDiagContainer::GetChildContainer to return E_INVALIDARG, got 0x%08x\n", hr); + + child = (void*)0xdeadbeef; + hr = IDxDiagContainer_GetChildContainer(pddc, container, &child); + ok(hr == E_INVALIDARG, + "Expected IDxDiagContainer::GetChildContainer to return E_INVALIDARG, got 0x%08x\n", hr); + ok(child == NULL, "Expected output pointer to be NULL, got %p\n", child); + + /* Get the name of a suitable child container. */ + hr = IDxDiagContainer_EnumChildContainerNames(pddc, 0, container, sizeof(container)/sizeof(WCHAR)); + ok(hr == S_OK, + "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); + if (FAILED(hr)) + { + skip("IDxDiagContainer::EnumChildContainerNames failed\n"); + goto cleanup; + } + + child = (void*)0xdeadbeef; + hr = IDxDiagContainer_GetChildContainer(pddc, container, &child); + ok(hr == S_OK, + "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + ok(child != NULL && child != (void*)0xdeadbeef, "Expected a valid output pointer, got %p\n", child); + + if (SUCCEEDED(hr)) + { + IDxDiagContainer *ptr; + + /* Show that IDxDiagContainer::GetChildContainer returns a different pointer + * for multiple calls for the same container name. */ + hr = IDxDiagContainer_GetChildContainer(pddc, container, &ptr); + ok(hr == S_OK, + "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + if (SUCCEEDED(hr)) + todo_wine ok(ptr != child, "Expected the two pointers (%p vs. %p) to be unequal", child, ptr); + + IDxDiagContainer_Release(ptr); + IDxDiagContainer_Release(child); + } + +cleanup: + IDxDiagContainer_Release(pddc); + IDxDiagProvider_Release(pddp); +} + START_TEST(container) { CoInitialize(NULL); test_GetNumberOfChildContainers(); test_GetNumberOfProps(); test_EnumChildContainerNames(); + test_GetChildContainer(); CoUninitialize(); }

1 0

Andrew Nguyen : dxdiagn: Fix dot parsing in IDxDiagContainer:: GetChildContainer for the case of a lone dot terminator.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: af1bcf7768c2c960fca88dcdfd753c171f6c8f0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=af1bcf7768c2c960fca88dcdf… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Mar 14 16:36:38 2010 -0600 dxdiagn: Fix dot parsing in IDxDiagContainer::GetChildContainer for the case of a lone dot terminator. --- dlls/dxdiagn/container.c | 4 ++ dlls/dxdiagn/tests/container.c | 99 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 0 deletions(-) diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index 94d2774..c684e97 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -151,6 +151,8 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(PDXDIAGCONTAINER if cur = strchrW(tmp, '.'); while (NULL != cur) { *cur = '\0'; /* cut tmp string to '.' */ + if (!*(cur + 1)) break; /* Account for a lone terminating period, as in "cont1.cont2.". */ + TRACE("Trying to get parent container %s\n", debugstr_w(tmp)); hr = IDxDiagContainerImpl_GetChildContainerInternal(pContainer, tmp, &pContainer); if (FAILED(hr) || NULL == pContainer) goto on_error; @@ -159,8 +161,10 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(PDXDIAGCONTAINER if cur = strchrW(tmp, '.'); } + TRACE("Trying to get container %s\n", debugstr_w(tmp)); hr = IDxDiagContainerImpl_GetChildContainerInternal(pContainer, tmp, ppInstance); if (SUCCEEDED(hr)) { + TRACE("Succeeded in getting the container instance\n"); IDxDiagContainerImpl_AddRef(*ppInstance); } diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index ccc5dd3..d2ed43f 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -20,6 +20,7 @@ #define COBJMACROS +#include <stdio.h> #include "dxdiag.h" #include "wine/test.h" @@ -289,6 +290,103 @@ cleanup: IDxDiagProvider_Release(pddp); } +static void test_dot_parsing(void) +{ + HRESULT hr; + WCHAR containerbufW[256] = {0}, childbufW[256] = {0}; + DWORD count, index; + size_t i; + static const struct + { + const char *format; + const HRESULT expect; + } test_strings[] = { + { "%s.%s", S_OK }, + { "%s.%s.", S_OK }, + { ".%s.%s", E_INVALIDARG }, + { "%s.%s..", E_INVALIDARG }, + { ".%s.%s.", E_INVALIDARG }, + { "..%s.%s", E_INVALIDARG }, + }; + + if (!create_root_IDxDiagContainer()) + { + skip("Unable to create the root IDxDiagContainer\n"); + return; + } + + /* Find a container with a child container of its own. */ + hr = IDxDiagContainer_GetNumberOfChildContainers(pddc, &count); + ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfChildContainers to return S_OK, got 0x%08x\n", hr); + if (FAILED(hr)) + { + skip("IDxDiagContainer::GetNumberOfChildContainers failed\n"); + goto cleanup; + } + + for (index = 0; index < count; index++) + { + IDxDiagContainer *child; + + hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, containerbufW, sizeof(containerbufW)/sizeof(WCHAR)); + ok(hr == S_OK, "Expected IDxDiagContainer_EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); + if (FAILED(hr)) + { + skip("IDxDiagContainer::EnumChildContainerNames failed\n"); + goto cleanup; + } + + hr = IDxDiagContainer_GetChildContainer(pddc, containerbufW, &child); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + + if (SUCCEEDED(hr)) + { + hr = IDxDiagContainer_EnumChildContainerNames(child, 0, childbufW, sizeof(childbufW)/sizeof(WCHAR)); + ok(hr == S_OK || hr == E_INVALIDARG, + "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK or E_INVALIDARG, got 0x%08x\n", hr); + IDxDiagContainer_Release(child); + + if (SUCCEEDED(hr)) + break; + } + } + + if (!*containerbufW || !*childbufW) + { + skip("Unable to find a suitable container\n"); + goto cleanup; + } + + trace("Testing IDxDiagContainer::GetChildContainer dot parsing with container %s and child container %s.\n", + wine_dbgstr_w(containerbufW), wine_dbgstr_w(childbufW)); + + for (i = 0; i < sizeof(test_strings)/sizeof(test_strings[0]); i++) + { + IDxDiagContainer *child; + char containerbufA[256]; + char childbufA[256]; + char dotbufferA[255 + 255 + 3 + 1]; + WCHAR dotbufferW[255 + 255 + 3 + 1]; /* containerbuf + childbuf + dots + null terminator */ + + WideCharToMultiByte(CP_ACP, 0, containerbufW, -1, containerbufA, sizeof(containerbufA), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, childbufW, -1, childbufA, sizeof(childbufA), NULL, NULL); + sprintf(dotbufferA, test_strings[i].format, containerbufA, childbufA); + MultiByteToWideChar(CP_ACP, 0, dotbufferA, -1, dotbufferW, sizeof(dotbufferW)/sizeof(WCHAR)); + + trace("Trying container name %s\n", wine_dbgstr_w(dotbufferW)); + hr = IDxDiagContainer_GetChildContainer(pddc, dotbufferW, &child); + ok(hr == test_strings[i].expect, + "Expected IDxDiagContainer::GetChildContainer to return 0x%08x for %s, got 0x%08x\n", + test_strings[i].expect, wine_dbgstr_w(dotbufferW), hr); + if (SUCCEEDED(hr)) + IDxDiagContainer_Release(child); + } + +cleanup: + IDxDiagContainer_Release(pddc); + IDxDiagProvider_Release(pddp); +} + START_TEST(container) { CoInitialize(NULL); @@ -296,5 +394,6 @@ START_TEST(container) test_GetNumberOfProps(); test_EnumChildContainerNames(); test_GetChildContainer(); + test_dot_parsing(); CoUninitialize(); }

1 0

Andrew Nguyen : dxdiagn: Fix return and output behavior of IDxDiagContainer ::EnumPropNames.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: f1e005410f968a1e0b3d97dcf320759b6385fc85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1e005410f968a1e0b3d97dcf… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Mar 14 11:04:20 2010 -0600 dxdiagn: Fix return and output behavior of IDxDiagContainer::EnumPropNames. --- dlls/dxdiagn/container.c | 13 ++---- dlls/dxdiagn/tests/container.c | 81 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 8 deletions(-) diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index c684e97..3829bb8 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -187,16 +187,13 @@ static HRESULT WINAPI IDxDiagContainerImpl_EnumPropNames(PDXDIAGCONTAINER iface, IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; IDxDiagContainerImpl_Property* p = NULL; DWORD i = 0; - - TRACE("(%p, %u, %s, %u)\n", iface, dwIndex, debugstr_w(pwszPropName), cchPropName); - if (NULL == pwszPropName) { + TRACE("(%p, %u, %p, %u)\n", iface, dwIndex, pwszPropName, cchPropName); + + if (NULL == pwszPropName || 0 == cchPropName) { return E_INVALIDARG; } - if (256 > cchPropName) { - return DXDIAG_E_INSUFFICIENT_BUFFER; - } - + p = This->properties; while (NULL != p) { if (dwIndex == i) { @@ -208,7 +205,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_EnumPropNames(PDXDIAGCONTAINER iface, } p = p->next; ++i; - } + } return E_INVALIDARG; } diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index d2ed43f..d1541e3 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -387,6 +387,86 @@ cleanup: IDxDiagProvider_Release(pddp); } +static void test_EnumPropNames(void) +{ + HRESULT hr; + WCHAR container[256], property[256]; + IDxDiagContainer *child = NULL; + DWORD count, index, propcount; + static const WCHAR testW[] = {'t','e','s','t',0}; + static const WCHAR zerotestW[] = {0,'e','s','t',0}; + + if (!create_root_IDxDiagContainer()) + { + skip("Unable to create the root IDxDiagContainer\n"); + return; + } + + /* Find a container with a non-zero number of properties. */ + hr = IDxDiagContainer_GetNumberOfChildContainers(pddc, &count); + ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfChildContainers to return S_OK, got 0x%08x\n", hr); + if (FAILED(hr)) + { + skip("IDxDiagContainer::GetNumberOfChildContainers failed\n"); + goto cleanup; + } + + for (index = 0; index < count; index++) + { + hr = IDxDiagContainer_EnumChildContainerNames(pddc, index, container, sizeof(container)/sizeof(WCHAR)); + ok(hr == S_OK, "Expected IDxDiagContainer_EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); + if (FAILED(hr)) + { + skip("IDxDiagContainer::EnumChildContainerNames failed\n"); + goto cleanup; + } + + hr = IDxDiagContainer_GetChildContainer(pddc, container, &child); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + + if (SUCCEEDED(hr)) + { + hr = IDxDiagContainer_GetNumberOfProps(child, &propcount); + ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfProps to return S_OK, got 0x%08x\n", hr); + + if (!propcount) + { + IDxDiagContainer_Release(child); + child = NULL; + } + else + break; + } + } + + if (!child) + { + skip("Unable to find a container with non-zero property count\n"); + goto cleanup; + } + + hr = IDxDiagContainer_EnumPropNames(child, ~0, NULL, 0); + ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::EnumPropNames to return E_INVALIDARG, got 0x%08x\n", hr); + + memcpy(property, testW, sizeof(testW)); + hr = IDxDiagContainer_EnumPropNames(child, ~0, property, 0); + ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::EnumPropNames to return E_INVALIDARG, got 0x%08x\n", hr); + ok(!memcmp(property, testW, sizeof(testW)), + "Expected the property buffer to be unchanged, got %s\n", wine_dbgstr_w(property)); + + memcpy(property, testW, sizeof(testW)); + hr = IDxDiagContainer_EnumPropNames(child, ~0, property, sizeof(property)/sizeof(WCHAR)); + ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::EnumPropNames to return E_INVALIDARG, got 0x%08x\n", hr); + ok(!memcmp(property, testW, sizeof(testW)), + "Expected the property buffer to be unchanged, got %s\n", wine_dbgstr_w(property)); + + IDxDiagContainer_Release(child); + +cleanup: + IDxDiagContainer_Release(pddc); + IDxDiagProvider_Release(pddp); +} + START_TEST(container) { CoInitialize(NULL); @@ -395,5 +475,6 @@ START_TEST(container) test_EnumChildContainerNames(); test_GetChildContainer(); test_dot_parsing(); + test_EnumPropNames(); CoUninitialize(); }

1 0

Juan Lang : rsaenh: Add simple tests for SHA-256, SHA-384, and SHA-512.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 972031643fc10a923afb372d1e713ebb4bb52286 URL: http://source.winehq.org/git/wine.git/?a=commit;h=972031643fc10a923afb372d1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Mar 8 10:56:56 2010 -0800 rsaenh: Add simple tests for SHA-256, SHA-384, and SHA-512. --- dlls/rsaenh/tests/rsaenh.c | 112 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 112 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 743a300..ce907f5 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -452,6 +452,17 @@ static void test_hashes(void) result = CryptDestroyHash(hHash); ok(result, "%08x\n", GetLastError()); + + /* The SHA-2 variants aren't supported in the RSA full provider */ + result = CryptCreateHash(hProv, CALG_SHA_256, 0, 0, &hHash); + ok(!result && GetLastError() == NTE_BAD_ALGID, + "expected NTE_BAD_ALGID, got %08x\n", GetLastError()); + result = CryptCreateHash(hProv, CALG_SHA_384, 0, 0, &hHash); + ok(!result && GetLastError() == NTE_BAD_ALGID, + "expected NTE_BAD_ALGID, got %08x\n", GetLastError()); + result = CryptCreateHash(hProv, CALG_SHA_512, 0, 0, &hHash); + ok(!result && GetLastError() == NTE_BAD_ALGID, + "expected NTE_BAD_ALGID, got %08x\n", GetLastError()); } static void test_block_cipher_modes(void) @@ -758,6 +769,106 @@ static void test_aes(int keylen) ok(result, "%08x\n", GetLastError()); } +static void test_sha2(void) +{ + static const unsigned char sha256hash[32] = { + 0x10, 0xfc, 0x3c, 0x51, 0xa1, 0x52, 0xe9, 0x0e, 0x5b, 0x90, + 0x31, 0x9b, 0x60, 0x1d, 0x92, 0xcc, 0xf3, 0x72, 0x90, 0xef, + 0x53, 0xc3, 0x5f, 0xf9, 0x25, 0x07, 0x68, 0x7d, 0x8a, 0x91, + 0x1a, 0x08 + }; + static const unsigned char sha384hash[48] = { + 0x98, 0xd3, 0x3f, 0x89, 0x0b, 0x23, 0x33, 0x44, 0x61, 0x32, + 0x5a, 0x7c, 0xa3, 0x03, 0x89, 0xb5, 0x11, 0xd7, 0x41, 0xc8, + 0x54, 0x6b, 0x12, 0x0c, 0x40, 0x15, 0xb6, 0x2a, 0x03, 0x43, + 0xe5, 0x64, 0x7f, 0x10, 0x1e, 0xae, 0x47, 0xa9, 0x39, 0x05, + 0x6f, 0x40, 0x60, 0x94, 0xd6, 0xad, 0x80, 0x55 + }; + static const unsigned char sha512hash[64] = { + 0x37, 0x86, 0x0e, 0x7d, 0x25, 0xd9, 0xf9, 0x84, 0x3e, 0x3d, + 0xc7, 0x13, 0x95, 0x73, 0x42, 0x04, 0xfd, 0x13, 0xad, 0x23, + 0x39, 0x16, 0x32, 0x5f, 0x99, 0x3e, 0x3c, 0xee, 0x3f, 0x11, + 0x36, 0xf9, 0xc9, 0x66, 0x08, 0x70, 0xcc, 0x49, 0xd8, 0xe0, + 0x7d, 0xa1, 0x57, 0x62, 0x71, 0xa6, 0xc9, 0xa4, 0x24, 0x60, + 0xfc, 0xde, 0x9d, 0xb2, 0xf1, 0xd2, 0xc2, 0xfb, 0x2d, 0xbf, + 0xb7, 0xf4, 0x81, 0xd4 + }; + unsigned char pbData[2048]; + BOOL result; + HCRYPTHASH hHash; + BYTE pbHashValue[64]; + DWORD hashlen, len; + int i; + + for (i=0; i<2048; i++) pbData[i] = (unsigned char)i; + + /* SHA-256 hash */ + result = CryptCreateHash(hProv, CALG_SHA_256, 0, 0, &hHash); + todo_wine + ok(result, "%08x\n", GetLastError()); + if (result) { + len = sizeof(DWORD); + result = CryptGetHashParam(hHash, HP_HASHSIZE, (BYTE*)&hashlen, &len, 0); + ok(result && (hashlen == 32), "%08x, hashlen: %d\n", GetLastError(), hashlen); + + result = CryptHashData(hHash, pbData, sizeof(pbData), 0); + ok(result, "%08x\n", GetLastError()); + + len = 32; + result = CryptGetHashParam(hHash, HP_HASHVAL, pbHashValue, &len, 0); + ok(result, "%08x\n", GetLastError()); + + ok(!memcmp(pbHashValue, sha256hash, 32), "Wrong SHA-256 hash!\n"); + + result = CryptDestroyHash(hHash); + ok(result, "%08x\n", GetLastError()); + } + + /* SHA-384 hash */ + result = CryptCreateHash(hProv, CALG_SHA_384, 0, 0, &hHash); + todo_wine + ok(result, "%08x\n", GetLastError()); + if (result) { + len = sizeof(DWORD); + result = CryptGetHashParam(hHash, HP_HASHSIZE, (BYTE*)&hashlen, &len, 0); + ok(result && (hashlen == 48), "%08x, hashlen: %d\n", GetLastError(), hashlen); + + result = CryptHashData(hHash, pbData, sizeof(pbData), 0); + ok(result, "%08x\n", GetLastError()); + + len = 48; + result = CryptGetHashParam(hHash, HP_HASHVAL, pbHashValue, &len, 0); + ok(result, "%08x\n", GetLastError()); + + ok(!memcmp(pbHashValue, sha384hash, 48), "Wrong SHA-384 hash!\n"); + + result = CryptDestroyHash(hHash); + ok(result, "%08x\n", GetLastError()); + } + + /* SHA-512 hash */ + result = CryptCreateHash(hProv, CALG_SHA_512, 0, 0, &hHash); + todo_wine + ok(result, "%08x\n", GetLastError()); + if (result) { + len = sizeof(DWORD); + result = CryptGetHashParam(hHash, HP_HASHSIZE, (BYTE*)&hashlen, &len, 0); + ok(result && (hashlen == 64), "%08x, hashlen: %d\n", GetLastError(), hashlen); + + result = CryptHashData(hHash, pbData, sizeof(pbData), 0); + ok(result, "%08x\n", GetLastError()); + + len = 64; + result = CryptGetHashParam(hHash, HP_HASHVAL, pbHashValue, &len, 0); + ok(result, "%08x\n", GetLastError()); + + ok(!memcmp(pbHashValue, sha512hash, 64), "Wrong SHA-512 hash!\n"); + + result = CryptDestroyHash(hHash); + ok(result, "%08x\n", GetLastError()); + } +} + static void test_rc2(void) { static const BYTE rc2_40_encrypted[16] = { @@ -2581,5 +2692,6 @@ START_TEST(rsaenh) test_aes(128); test_aes(192); test_aes(256); + test_sha2(); clean_up_aes_environment(); }

1 0

Juan Lang : include: Add a few missing OIDs.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 8447844d81505864360940056f2eb29b548bfc0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8447844d81505864360940056… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Mar 5 14:20:20 2010 -0800 include: Add a few missing OIDs. --- include/wincrypt.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index ad51e09..e536213 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2782,6 +2782,9 @@ typedef struct _CTL_FIND_SUBJECT_PARA #define szOID_RSA_MD5RSA "1.2.840.113549.1.1.4" #define szOID_RSA_SHA1RSA "1.2.840.113549.1.1.5" #define szOID_RSA_SET0AEP_RSA "1.2.840.113549.1.1.6" +#define szOID_RSA_SHA256RSA "1.2.840.113549.1.1.11" +#define szOID_RSA_SHA384RSA "1.2.840.113549.1.1.12" +#define szOID_RSA_SHA512RSA "1.2.840.113549.1.1.13" #define szOID_RSA_DH "1.2.840.113549.1.3.1" #define szOID_RSA_data "1.2.840.113549.1.7.1" #define szOID_RSA_signedData "1.2.840.113549.1.7.2"

1 0

Dmitry Timoshkov : user32: Restore special handling of monochrome bitmaps removed by c2202929ab4b6d1ce379865dfd8904186814f265 .
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 52ebbb8aa75b8f5d8b72c48127761ceec073e071 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52ebbb8aa75b8f5d8b72c4812… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Mar 11 16:22:33 2010 +0800 user32: Restore special handling of monochrome bitmaps removed by c2202929ab4b6d1ce379865dfd8904186814f265. --- dlls/user32/cursoricon.c | 49 ++++++++++++++++++++++++++++++++++----------- 1 files changed, 37 insertions(+), 12 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index a003cb0..0a9a895 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -765,6 +765,7 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, int sizeAnd, sizeXor; HBITMAP hAndBits = 0, hXorBits = 0; /* error condition for later */ BITMAP bmpXor, bmpAnd; + BOOL do_stretch; INT size; BITMAPINFO *pSrcInfo, *pDestInfo; @@ -788,10 +789,11 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, if (!width) width = bmi->bmiHeader.biWidth; if (!height) height = bmi->bmiHeader.biHeight/2; + do_stretch = (bmi->bmiHeader.biHeight/2 != height) || + (bmi->bmiHeader.biWidth != width); /* Scale the hotspot */ - if (((bmi->bmiHeader.biHeight/2 != height) || (bmi->bmiHeader.biWidth != width)) && - hotspot.x != ICON_HOTSPOT && hotspot.y != ICON_HOTSPOT) + if (do_stretch && hotspot.x != ICON_HOTSPOT && hotspot.y != ICON_HOTSPOT) { hotspot.x = (hotspot.x * width) / bmi->bmiHeader.biWidth; hotspot.y = (hotspot.y * height) / (bmi->bmiHeader.biHeight / 2); @@ -842,16 +844,30 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, } else { - hXorBits = CreateCompatibleBitmap(screen_dc, width, height); - - if(hXorBits) + if (do_stretch) { - if(!stretch_blt_icon(hXorBits, pDestInfo, pSrcInfo, (char*)bmi + size)) + hXorBits = CreateCompatibleBitmap(screen_dc, width, height); + if (hXorBits) { - DeleteObject(hXorBits); - hXorBits = 0; + if (!stretch_blt_icon(hXorBits, pDestInfo, pSrcInfo, (char*)bmi + size)) + { + DeleteObject(hXorBits); + hXorBits = 0; + } } } + else + { + if (is_dib_monochrome(bmi)) + { + hXorBits = CreateBitmap(width, height, 1, 1, NULL); + SetDIBits(screen_dc, hXorBits, 0, height, + (char *)bmi + size, pSrcInfo, DIB_RGB_COLORS); + } + else + hXorBits = CreateDIBitmap(screen_dc, &pSrcInfo->bmiHeader, + CBM_INIT, (char *)bmi + size, pSrcInfo, DIB_RGB_COLORS); + } } if( hXorBits ) @@ -879,12 +895,21 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, } /* Create the AND bitmap */ - hAndBits = CreateBitmap(width, height, 1, 1, NULL); + if (do_stretch) + { + hAndBits = CreateBitmap(width, height, 1, 1, NULL); - if(!stretch_blt_icon(hAndBits, pDestInfo, pSrcInfo, xbits)) + if (!stretch_blt_icon(hAndBits, pDestInfo, pSrcInfo, xbits)) + { + DeleteObject(hAndBits); + hAndBits = 0; + } + } + else { - DeleteObject(hAndBits); - hAndBits = 0; + hAndBits = CreateBitmap(width, height, 1, 1, NULL); + SetDIBits(screen_dc, hAndBits, 0, height, + xbits, pSrcInfo, DIB_RGB_COLORS); } if( !hAndBits )

1 0