November 2008 - Wine-Commits

Ricardo Filipe : iphlpapi: Fixed dead store (llvm/clang).
by Alexandre Julliard Nov. 18, 2008

Nov. 18, 2008

Module: wine Branch: master Commit: c3db26d4bcee7f3f3fe8bedc697a50f1fe590852 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3db26d4bcee7f3f3fe8bedc6… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Wed Nov 12 23:38:21 2008 +0000 iphlpapi: Fixed dead store (llvm/clang). --- dlls/iphlpapi/icmp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index 3abdbba..a5858ca 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -339,7 +339,7 @@ DWORD WINAPI IcmpSendEcho( /* Get the reply */ ip_header_len=0; /* because gcc was complaining */ - while ((res=poll(&fdr,1,Timeout))>0) { + while (poll(&fdr,1,Timeout)>0) { recv_time = GetTickCount(); res=recvfrom(icp->sid, (char*)ip_header, maxlen, 0, (struct sockaddr*)&addr,&addrlen); TRACE("received %d bytes from %s\n",res, inet_ntoa(addr.sin_addr));

1 0

Ricardo Filipe : gdi32: Fix dead store (llvm/clang).
by Alexandre Julliard Nov. 18, 2008

Nov. 18, 2008

Module: wine Branch: master Commit: ca3d0d67a89e2f10bb6ca812f835ebe5d7a756b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca3d0d67a89e2f10bb6ca812f… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Wed Nov 12 23:34:01 2008 +0000 gdi32: Fix dead store (llvm/clang). --- dlls/gdi32/bidi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index f53ac26..9ac5e1d 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -1089,7 +1089,7 @@ BOOL BIDI_Reorder( if (WINE_GCPW_FORCE_RTL == (dwWineGCP_Flags&WINE_GCPW_DIR_MASK)) baselevel = 1; - i = done = 0; + done = 0; while (done < uCount) { unsigned j;

1 0

Ricardo Filipe : dbghelp: Fixed dead store (llvm/clang).
by Alexandre Julliard Nov. 18, 2008

Nov. 18, 2008

Module: wine Branch: master Commit: b5fcabb52c6ed8e4ba05e9eee4ba3c7850729772 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5fcabb52c6ed8e4ba05e9eee… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Wed Nov 12 23:15:08 2008 +0000 dbghelp: Fixed dead store (llvm/clang). --- dlls/dbghelp/dbghelp.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index fba22d0..1bfc338 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -314,7 +314,6 @@ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeP pcs->search_path = HeapReAlloc(GetProcessHeap(), 0, pcs->search_path, (size + 1 + len + 1) * sizeof(WCHAR)); pcs->search_path[size] = ';'; GetEnvironmentVariableW(alt_sym_path, pcs->search_path + size + 1, len); - size += 1 + len; } }

1 0

Ricardo Filipe : cabinet: Fix dead stores (llvm/clang).
by Alexandre Julliard Nov. 18, 2008

Nov. 18, 2008

Module: wine Branch: master Commit: 1a12aace576ad0a1ed3f17498d3e015bd98595e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a12aace576ad0a1ed3f17498… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Wed Nov 12 22:50:09 2008 +0000 cabinet: Fix dead stores (llvm/clang). --- dlls/cabinet/fci.c | 2 +- dlls/cabinet/fdi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cabinet/fci.c b/dlls/cabinet/fci.c index ea745a6..ed413f8 100644 --- a/dlls/cabinet/fci.c +++ b/dlls/cabinet/fci.c @@ -462,7 +462,7 @@ static cab_ULONG fci_get_checksum(const void *pv, UINT cb, CHECKSUM seed) case 2: ul |= (((ULONG)(*pb++)) << 8); case 1: - ul |= *pb++; + ul |= *pb; default: break; } diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 0825162..09d0fe7 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2830,7 +2830,7 @@ BOOL __cdecl FDICopy( if (file->offset > CAB(offset)) { /* decode bytes and send them to /dev/null */ - switch ((err = fdi_decomp(file, 0, decomp_state, pszCabPath, pfnfdin, pvUser))) { + switch (fdi_decomp(file, 0, decomp_state, pszCabPath, pfnfdin, pvUser)) { case DECR_OK: break; case DECR_USERABORT:

1 0

Francois Gouget : msxml3: Dynamically load libxslt. so and only call xsltInit() if present.
by Alexandre Julliard Nov. 18, 2008

Nov. 18, 2008

Module: wine Branch: master Commit: 3d384f172cb5fcabf441bd1c64cb4760df013781 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d384f172cb5fcabf441bd1c6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 17 19:29:32 2008 +0100 msxml3: Dynamically load libxslt.so and only call xsltInit() if present. --- configure | 142 ++++++------------------------------------ configure.ac | 13 +--- dlls/msxml3/Makefile.in | 2 +- dlls/msxml3/main.c | 57 +++++++++++++++--- dlls/msxml3/msxml_private.h | 21 ++++++ dlls/msxml3/node.c | 21 ++----- include/config.h.in | 9 +-- 7 files changed, 103 insertions(+), 162 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d384f172cb5fcabf441b…

1 0

Alexandre Julliard : ntdll: Increase subheap size quadratically to avoid slowdown when allocating tons of heap memory .
by Alexandre Julliard Nov. 18, 2008

Nov. 18, 2008

Module: wine Branch: master Commit: c38ce28af574b60e0ca0733d88a85c53e35082ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=c38ce28af574b60e0ca0733d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 18 12:49:12 2008 +0100 ntdll: Increase subheap size quadratically to avoid slowdown when allocating tons of heap memory. --- dlls/ntdll/heap.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index d94e1f0..99a68d2 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -142,9 +142,10 @@ typedef struct tagHEAP struct list entry; /* Entry in process heap list */ struct list subheap_list; /* Sub-heap list */ struct list large_list; /* Large blocks list */ + SIZE_T grow_size; /* Size of next subheap for growing heap */ DWORD magic; /* Magic number */ RTL_CRITICAL_SECTION critSection; /* Critical section for serialization */ - FREE_LIST_ENTRY freeList[HEAP_NB_FREE_LISTS]; /* Free lists */ + FREE_LIST_ENTRY freeList[HEAP_NB_FREE_LISTS] DECLSPEC_ALIGN(8); /* Free lists */ } HEAP; #define HEAP_MAGIC ((DWORD)('H' | ('E'<<8) | ('A'<<16) | ('P'<<24))) @@ -808,6 +809,7 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, heap = (HEAP *)address; heap->flags = flags; heap->magic = HEAP_MAGIC; + heap->grow_size = max( HEAP_DEF_SIZE, totalSize ); list_init( &heap->subheap_list ); list_init( &heap->large_list ); @@ -918,11 +920,13 @@ static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, SIZE_T size, if (total_size < size) return NULL; /* overflow */ if (!(subheap = HEAP_CreateSubHeap( heap, NULL, heap->flags, total_size, - max( HEAP_DEF_SIZE, total_size ) ))) + max( heap->grow_size, total_size ) ))) return NULL; + if (heap->grow_size < 128 * 1024 * 1024) heap->grow_size *= 2; + TRACE("created new sub-heap %p of %08lx bytes for heap %p\n", - subheap, total_size, heap ); + subheap, subheap->size, heap ); *ppSubHeap = subheap; return (ARENA_FREE *)((char *)subheap->base + subheap->headerSize);

1 0

Henri Verbeet : d3d10core: Add a test for D3D10CoreCreateDevice().
by Alexandre Julliard Nov. 18, 2008

Nov. 18, 2008

Module: wine Branch: master Commit: 1dad75955dcbc757bead4b1f837205fafc27d5f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dad75955dcbc757bead4b1f8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 18 09:27:58 2008 +0100 d3d10core: Add a test for D3D10CoreCreateDevice(). --- configure | 9 +++ configure.ac | 1 + dlls/d3d10core/tests/Makefile.in | 13 ++++ dlls/d3d10core/tests/device.c | 113 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 136 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 5845633..8fac4cb 100755 --- a/configure +++ b/configure @@ -24298,6 +24298,14 @@ dlls/d3d10core/Makefile: dlls/d3d10core/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/d3d10core/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/d3d10core/tests/Makefile" +test "x$enable_d3d10core_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + d3d10core/tests" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/d3d10core/tests/Makefile: dlls/d3d10core/tests/Makefile.in dlls/Maketest.rules" +ac_config_files="$ac_config_files dlls/d3d10core/tests/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/d3d8/Makefile" test "x$enable_d3d8" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ d3d8" @@ -28104,6 +28112,7 @@ do "dlls/d3d10/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d10/Makefile" ;; "dlls/d3d10/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d10/tests/Makefile" ;; "dlls/d3d10core/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d10core/Makefile" ;; + "dlls/d3d10core/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d10core/tests/Makefile" ;; "dlls/d3d8/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d8/Makefile" ;; "dlls/d3d8/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d8/tests/Makefile" ;; "dlls/d3d9/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/d3d9/Makefile" ;; diff --git a/configure.ac b/configure.ac index 19acfd6..947bde9 100644 --- a/configure.ac +++ b/configure.ac @@ -1777,6 +1777,7 @@ WINE_CONFIG_MAKEFILE([dlls/ctl3d32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DL WINE_CONFIG_MAKEFILE([dlls/d3d10/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/d3d10/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) WINE_CONFIG_MAKEFILE([dlls/d3d10core/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/d3d10core/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) WINE_CONFIG_MAKEFILE([dlls/d3d8/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/d3d8/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) WINE_CONFIG_MAKEFILE([dlls/d3d9/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/d3d10core/tests/Makefile.in b/dlls/d3d10core/tests/Makefile.in new file mode 100644 index 0000000..7003f7c --- /dev/null +++ b/dlls/d3d10core/tests/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = d3d10core.dll +IMPORTS = d3d10core dxgi kernel32 + +CTESTS = \ + device.c \ + +(a)MAKE_TEST_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c new file mode 100644 index 0000000..8a01222 --- /dev/null +++ b/dlls/d3d10core/tests/device.c @@ -0,0 +1,113 @@ +/* + * Copyright 2008 Henri Verbeet for CodeWeavers + * + * 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 "d3d10.h" +#include "wine/test.h" + +HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, + UINT flags, DWORD unknown0, ID3D10Device **device); + +static ID3D10Device *create_device(void) +{ + IDXGIFactory *factory = NULL; + IDXGIAdapter *adapter = NULL; + ID3D10Device *device = NULL; + HRESULT hr; + + hr = CreateDXGIFactory(&IID_IDXGIFactory, (void *)&factory); + ok(SUCCEEDED(hr), "CreateDXGIFactory failed, hr %#x\n", hr); + if (FAILED(hr)) goto cleanup; + + hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); + ok(SUCCEEDED(hr), "EnumAdapters failed, hr %#x\n", hr); + if (FAILED(hr)) goto cleanup; + + hr = D3D10CoreCreateDevice(factory, adapter, 0, 0, &device); + if (FAILED(hr)) + { + HMODULE d3d10ref; + + trace("Failed to create a HW device, trying REF\n"); + IDXGIAdapter_Release(adapter); + adapter = NULL; + + d3d10ref = LoadLibraryA("d3d10ref.dll"); + if (!d3d10ref) + { + trace("d3d10ref.dll not available, unable to create a REF device\n"); + goto cleanup; + } + + hr = IDXGIFactory_CreateSoftwareAdapter(factory, d3d10ref, &adapter); + FreeLibrary(d3d10ref); + ok(SUCCEEDED(hr), "CreateSoftwareAdapter failed, hr %#x\n", hr); + if (FAILED(hr)) goto cleanup; + + hr = D3D10CoreCreateDevice(factory, adapter, 0, 0, &device); + ok(SUCCEEDED(hr), "Failed to create a REF device, hr %#x\n", hr); + if (FAILED(hr)) goto cleanup; + } + +cleanup: + if (adapter) IDXGIAdapter_Release(adapter); + if (factory) IDXGIFactory_Release(factory); + + return device; +} + +static void test_device_interfaces(ID3D10Device *device) +{ + IUnknown *obj; + HRESULT hr; + + if (SUCCEEDED(hr = ID3D10Device_QueryInterface(device, &IID_IUnknown, (void **)&obj))) + IUnknown_Release(obj); + ok(SUCCEEDED(hr), "ID3D10Device does not implement IUnknown\n"); + + if (SUCCEEDED(hr = ID3D10Device_QueryInterface(device, &IID_IDXGIObject, (void **)&obj))) + IUnknown_Release(obj); + ok(SUCCEEDED(hr), "ID3D10Device does not implement IDXGIObject\n"); + + if (SUCCEEDED(hr = ID3D10Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&obj))) + IUnknown_Release(obj); + ok(SUCCEEDED(hr), "ID3D10Device does not implement IDXGIDevice\n"); + + if (SUCCEEDED(hr = ID3D10Device_QueryInterface(device, &IID_ID3D10Device, (void **)&obj))) + IUnknown_Release(obj); + ok(SUCCEEDED(hr), "ID3D10Device does not implement ID3D10Device\n"); +} + +START_TEST(device) +{ + ID3D10Device *device; + ULONG refcount; + + device = create_device(); + if (!device) + { + skip("Failed to create device, skipping tests\n"); + return; + } + + test_device_interfaces(device); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left\n", refcount); +}

1 0

Henri Verbeet : dxgi: Add a test for DXGID3D10CreateDevice().
by Alexandre Julliard Nov. 18, 2008

Nov. 18, 2008

Module: wine Branch: master Commit: 1dea8291fb4187fe5ca392d2ba41d75e81efdc38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dea8291fb4187fe5ca392d2b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 18 09:27:58 2008 +0100 dxgi: Add a test for DXGID3D10CreateDevice(). --- configure | 9 +++ configure.ac | 1 + dlls/dxgi/tests/Makefile.in | 13 +++++ dlls/dxgi/tests/device.c | 127 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 150 insertions(+), 0 deletions(-) diff --git a/configure b/configure index af1a5a2..5845633 100755 --- a/configure +++ b/configure @@ -24802,6 +24802,14 @@ dlls/dxgi/Makefile: dlls/dxgi/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/dxgi/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/dxgi/tests/Makefile" +test "x$enable_dxgi_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + dxgi/tests" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/dxgi/tests/Makefile: dlls/dxgi/tests/Makefile.in dlls/Maketest.rules" +ac_config_files="$ac_config_files dlls/dxgi/tests/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/dxguid/Makefile" test "x$enable_dxguid" != xno && ALL_IMPLIB_DIRS="$ALL_IMPLIB_DIRS \\ dxguid" @@ -28159,6 +28167,7 @@ do "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" ;; + "dlls/dxgi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxgi/tests/Makefile" ;; "dlls/dxguid/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxguid/Makefile" ;; "dlls/faultrep/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/faultrep/Makefile" ;; "dlls/fusion/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/fusion/Makefile" ;; diff --git a/configure.ac b/configure.ac index 71c2a45..19acfd6 100644 --- a/configure.ac +++ b/configure.ac @@ -1840,6 +1840,7 @@ WINE_CONFIG_MAKEFILE([dlls/dxdiagn/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DL 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]) +WINE_CONFIG_MAKEFILE([dlls/dxgi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS]) WINE_CONFIG_MAKEFILE([dlls/dxguid/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS]) WINE_CONFIG_MAKEFILE([dlls/faultrep/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/fusion/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/dxgi/tests/Makefile.in b/dlls/dxgi/tests/Makefile.in new file mode 100644 index 0000000..1020225 --- /dev/null +++ b/dlls/dxgi/tests/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = dxgi.dll +IMPORTS = dxgi kernel32 + +CTESTS = \ + device.c \ + +(a)MAKE_TEST_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c new file mode 100644 index 0000000..7f22bb4 --- /dev/null +++ b/dlls/dxgi/tests/device.c @@ -0,0 +1,127 @@ +/* + * Copyright 2008 Henri Verbeet for CodeWeavers + * + * 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 "d3d10.h" +#include "wine/test.h" + +HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, + IDXGIAdapter *adapter, UINT flags, DWORD arg5, void **device); + +static IDXGIDevice *create_device(HMODULE d3d10core) +{ + IDXGIDevice *dxgi_device = NULL; + IDXGIFactory *factory = NULL; + IDXGIAdapter *adapter = NULL; + IUnknown *device = NULL; + HRESULT hr; + + hr = CreateDXGIFactory(&IID_IDXGIFactory, (void *)&factory); + ok(SUCCEEDED(hr), "CreateDXGIFactory failed, hr %#x\n", hr); + if (FAILED(hr)) goto cleanup; + + hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); + ok(SUCCEEDED(hr), "EnumAdapters failed, hr %#x\n", hr); + if (FAILED(hr)) goto cleanup; + + hr = DXGID3D10CreateDevice(d3d10core, factory, adapter, 0, 0, (void **)&device); + if (FAILED(hr)) + { + HMODULE d3d10ref; + + trace("Failed to create a HW device, trying REF\n"); + IDXGIAdapter_Release(adapter); + adapter = NULL; + + d3d10ref = LoadLibraryA("d3d10ref.dll"); + if (!d3d10ref) + { + trace("d3d10ref.dll not available, unable to create a REF device\n"); + goto cleanup; + } + + hr = IDXGIFactory_CreateSoftwareAdapter(factory, d3d10ref, &adapter); + FreeLibrary(d3d10ref); + ok(SUCCEEDED(hr), "CreateSoftwareAdapter failed, hr %#x\n", hr); + if (FAILED(hr)) goto cleanup; + + hr = DXGID3D10CreateDevice(d3d10core, factory, adapter, 0, 0, (void **)&device); + ok(SUCCEEDED(hr), "Failed to create a REF device, hr %#x\n", hr); + if (FAILED(hr)) goto cleanup; + } + + hr = IUnknown_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Created device does not implement IDXGIDevice\n"); + IUnknown_Release(device); + +cleanup: + if (adapter) IDXGIAdapter_Release(adapter); + if (factory) IDXGIFactory_Release(factory); + + return dxgi_device; +} + +static void test_device_interfaces(IDXGIDevice *device) +{ + IUnknown *obj; + HRESULT hr; + + if (SUCCEEDED(hr = IDXGIDevice_QueryInterface(device, &IID_IUnknown, (void **)&obj))) + IUnknown_Release(obj); + ok(SUCCEEDED(hr), "IDXGIDevice does not implement IUnknown\n"); + + if (SUCCEEDED(hr = IDXGIDevice_QueryInterface(device, &IID_IDXGIObject, (void **)&obj))) + IUnknown_Release(obj); + ok(SUCCEEDED(hr), "IDXGIDevice does not implement IDXGIObject\n"); + + if (SUCCEEDED(hr = IDXGIDevice_QueryInterface(device, &IID_IDXGIDevice, (void **)&obj))) + IUnknown_Release(obj); + ok(SUCCEEDED(hr), "IDXGIDevice does not implement IDXGIDevice\n"); + + if (SUCCEEDED(hr = IDXGIDevice_QueryInterface(device, &IID_ID3D10Device, (void **)&obj))) + IUnknown_Release(obj); + ok(SUCCEEDED(hr), "IDXGIDevice does not implement ID3D10Device\n"); +} + +START_TEST(device) +{ + HMODULE d3d10core = LoadLibraryA("d3d10core.dll"); + IDXGIDevice *device; + ULONG refcount; + + if (!d3d10core) + { + win_skip("d3d10core.dll not available, skipping tests\n"); + return; + } + + device = create_device(d3d10core); + if (!device) + { + skip("Failed to create device, skipping tests\n"); + FreeLibrary(d3d10core); + return; + } + + test_device_interfaces(device); + + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left\n", refcount); + FreeLibrary(d3d10core); +}

1 0

Henri Verbeet : wininet: Treat an empty username as NULL in FTP_Connect().
by Alexandre Julliard Nov. 18, 2008

Nov. 18, 2008

Module: wine Branch: master Commit: 369da3aeb9d044866f53bc250768e18401027201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=369da3aeb9d044866f53bc250… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 18 09:27:59 2008 +0100 wininet: Treat an empty username as NULL in FTP_Connect(). --- dlls/wininet/ftp.c | 4 ++-- dlls/wininet/tests/ftp.c | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index cb24782..9ad34df 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2256,7 +2256,7 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, assert( hIC->hdr.htype == WH_HINIT ); - if (NULL == lpszUserName && NULL != lpszPassword) + if ((!lpszUserName || !strlenW(lpszUserName)) && lpszPassword) { INTERNET_SetLastError(ERROR_INVALID_PARAMETER); goto lerror; @@ -2302,7 +2302,7 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, if(hIC->lpszProxyBypass) FIXME("Proxy bypass is ignored.\n"); } - if ( !lpszUserName) { + if (!lpszUserName || !strlenW(lpszUserName)) { HKEY key; WCHAR szPassword[MAX_PATH]; DWORD len = sizeof(szPassword); diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 335215e..f7dc9c9 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -66,6 +66,8 @@ static void test_connect(HINTERNET hInternet) * anonymous : NULL * NULL : IEUser@ * NULL : NULL + * "" : IEUser@ + * "" : NULL */ SetLastError(0xdeadbeef); @@ -85,6 +87,13 @@ static void test_connect(HINTERNET hInternet) ok ( GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + SetLastError(0xdeadbeef); + hFtp = InternetConnect(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "", "IEUser@", + INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 0); + ok(!hFtp, "Expected InternetConnect to fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + /* Using a NULL username and password will be interpreted as anonymous ftp. The username will be 'anonymous' the password * is created via some simple heuristics (see dlls/wininet/ftp.c). * On Wine this registry key is not set by default so (NULL, NULL) will result in anonymous ftp with an (most likely) not @@ -103,6 +112,20 @@ static void test_connect(HINTERNET hInternet) ok ( hFtp != NULL, "InternetConnect failed : %d\n", GetLastError()); ok ( GetLastError() == ERROR_SUCCESS, "ERROR_SUCCESS, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + hFtp = InternetConnect(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "", NULL, + INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 0); + if (!hFtp) + { + ok(GetLastError() == ERROR_INTERNET_LOGIN_FAILURE, + "Expected ERROR_INTERNET_LOGIN_FAILURE, got %d\n", GetLastError()); + } + else + { + ok(GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + } } static void test_createdir(HINTERNET hFtp, HINTERNET hConnect)

1 0

Henri Verbeet : dxgi: Implement IDXGIFactory::EnumAdapters().
by Alexandre Julliard Nov. 18, 2008

Nov. 18, 2008

Module: wine Branch: master Commit: 1988ed16dbc5ff721833eccbdb8040a57114b06f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1988ed16dbc5ff721833eccbd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 18 09:27:58 2008 +0100 dxgi: Implement IDXGIFactory::EnumAdapters(). --- dlls/d3d10/tests/device.c | 4 ++-- dlls/dxgi/factory.c | 19 +++++++++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10/tests/device.c b/dlls/d3d10/tests/device.c index 3ad9113..8399cdb 100644 --- a/dlls/d3d10/tests/device.c +++ b/dlls/d3d10/tests/device.c @@ -57,11 +57,11 @@ static void test_device_interfaces(ID3D10Device *device) if (SUCCEEDED(hr = ID3D10Device_QueryInterface(device, &IID_IDXGIObject, (void **)&obj))) IUnknown_Release(obj); - todo_wine ok(SUCCEEDED(hr), "ID3D10Device does not implement IDXGIObject (%#x)\n", hr); + ok(SUCCEEDED(hr), "ID3D10Device does not implement IDXGIObject (%#x)\n", hr); if (SUCCEEDED(hr = ID3D10Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&obj))) IUnknown_Release(obj); - todo_wine ok(SUCCEEDED(hr), "ID3D10Device does not implement IDXGIDevice (%#x)\n", hr); + ok(SUCCEEDED(hr), "ID3D10Device does not implement IDXGIDevice (%#x)\n", hr); } START_TEST(device) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 92b6cb5..03db096 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -119,9 +119,24 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_GetParent(IWineDXGIFactory *iface, static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters(IWineDXGIFactory *iface, UINT adapter_idx, IDXGIAdapter **adapter) { - FIXME("iface %p, adapter_idx %u, adapter %p stub!\n", iface, adapter_idx, adapter); + struct dxgi_factory *This = (struct dxgi_factory *)iface; - return E_NOTIMPL; + TRACE("iface %p, adapter_idx %u, adapter %p\n", iface, adapter_idx, adapter); + + if (!adapter) return DXGI_ERROR_INVALID_CALL; + + if (adapter_idx >= This->adapter_count) + { + *adapter = NULL; + return DXGI_ERROR_NOT_FOUND; + } + + *adapter = (IDXGIAdapter *)This->adapters[adapter_idx]; + IDXGIAdapter_AddRef(*adapter); + + TRACE("Returning adapter %p\n", *adapter); + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_factory_MakeWindowAssociation(IWineDXGIFactory *iface, HWND window, UINT flags)

1 0