December 2009 - Wine-commits

Maarten Lankhorst : mmdevapi: Add some initial tests.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: c38de04e45bc43c04e2ee8fe4a1a2d5a9ad4303a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c38de04e45bc43c04e2ee8fe4… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Dec 14 10:09:34 2009 +0100 mmdevapi: Add some initial tests. --- configure | 9 +++ configure.ac | 1 + dlls/mmdevapi/tests/Makefile.in | 13 ++++ dlls/mmdevapi/tests/mmdevenum.c | 134 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 157 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 2dee390..555bc0b 100755 --- a/configure +++ b/configure @@ -15417,6 +15417,14 @@ dlls/mmdevapi/Makefile: dlls/mmdevapi/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/mmdevapi/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/mmdevapi/tests/Makefile" +test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + mmdevapi/tests" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/mmdevapi/tests/Makefile: dlls/mmdevapi/tests/Makefile.in dlls/Maketest.rules" +ac_config_files="$ac_config_files dlls/mmdevapi/tests/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/mmdevldr.vxd/Makefile" test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ mmdevldr.vxd" @@ -19049,6 +19057,7 @@ do "dlls/mlang/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mlang/Makefile" ;; "dlls/mlang/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mlang/tests/Makefile" ;; "dlls/mmdevapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mmdevapi/Makefile" ;; + "dlls/mmdevapi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mmdevapi/tests/Makefile" ;; "dlls/mmdevldr.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mmdevldr.vxd/Makefile" ;; "dlls/mmsystem.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mmsystem.dll16/Makefile" ;; "dlls/monodebg.vxd/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/monodebg.vxd/Makefile" ;; diff --git a/configure.ac b/configure.ac index d4b13cb..e966142 100644 --- a/configure.ac +++ b/configure.ac @@ -2312,6 +2312,7 @@ WINE_CONFIG_MAKEFILE([dlls/midimap/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DL WINE_CONFIG_MAKEFILE([dlls/mlang/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/mlang/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/mmdevapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/mmdevapi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/mmdevldr.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/mmsystem.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) WINE_CONFIG_MAKEFILE([dlls/monodebg.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16]) diff --git a/dlls/mmdevapi/tests/Makefile.in b/dlls/mmdevapi/tests/Makefile.in new file mode 100644 index 0000000..4ac467c --- /dev/null +++ b/dlls/mmdevapi/tests/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = mmdevapi.dll +IMPORTS = ole32 version user32 kernel32 + +CTESTS = \ + mmdevenum.c + +(a)MAKE_TEST_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/mmdevapi/tests/mmdevenum.c b/dlls/mmdevapi/tests/mmdevenum.c new file mode 100644 index 0000000..5ebd32a --- /dev/null +++ b/dlls/mmdevapi/tests/mmdevenum.c @@ -0,0 +1,134 @@ +/* + * Copyright 2009 Maarten Lankhorst + * + * 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 + */ + +#include "wine/test.h" + +#define CINTERFACE +#define COBJMACROS + +#include "initguid.h" +#include "mmdeviceapi.h" +#include "dshow.h" +#include "dsound.h" + +/* Some of the QueryInterface tests are really just to check if I got the IID's right :) */ + +/* IMMDeviceCollection appears to have no QueryInterface method and instead forwards to mme */ +static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) +{ + IMMDeviceCollection *col2; + IMMDeviceEnumerator *mme2; + IUnknown *unk; + HRESULT hr; + ULONG ref; + UINT numdev; + IMMDevice *dev; + + ref = IUnknown_AddRef(col); + IUnknown_Release(col); + ok(ref == 2, "Invalid reference count %u on collection\n", ref); + + hr = IUnknown_QueryInterface(col, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "Cannot query for IID_IUnknown: 0x%08x\n", hr); + if (hr == S_OK) + { + ok((LONG_PTR)col == (LONG_PTR)unk, "Pointers are not identical %p/%p/%p\n", col, unk, mme); + IUnknown_Release(unk); + } + + hr = IUnknown_QueryInterface(col, &IID_IMMDeviceCollection, (void**)&col2); + ok(hr == S_OK, "Cannot query for IID_IMMDeviceCollection: 0x%08x\n", hr); + if (hr == S_OK) + IUnknown_Release(col2); + + hr = IUnknown_QueryInterface(col, &IID_IMMDeviceEnumerator, (void**)&mme2); + ok(hr == E_NOINTERFACE, "Query for IID_IMMDeviceEnumerator returned: 0x%08x\n", hr); + if (hr == S_OK) + IUnknown_Release(mme2); + + hr = IMMDeviceCollection_GetCount(col, NULL); + ok(hr == E_POINTER, "GetCount returned 0x%08x\n", hr); + + hr = IMMDeviceCollection_GetCount(col, &numdev); + ok(hr == S_OK, "GetCount returned 0x%08x\n", hr); + + dev = (void*)(LONG_PTR)0x12345678; + hr = IMMDeviceCollection_Item(col, numdev, &dev); + ok(hr == E_INVALIDARG, "Asking for too high device returned 0x%08x\n", hr); + ok(dev == NULL, "Returned non-null device\n"); + + if (!numdev) return; + hr = IMMDeviceCollection_Item(col, 0, NULL); + ok(hr == E_POINTER, "Query with null pointer returned 0x%08x\n", hr); + + hr = IMMDeviceCollection_Item(col, 0, &dev); + ok(hr == S_OK, "Valid Item returned 0x%08x\n", hr); + ok(dev != NULL, "Device is null!\n"); + if (dev) IUnknown_Release(dev); +} + +START_TEST(mmdevenum) +{ + HRESULT hr; + IUnknown *unk = NULL; + IMMDeviceEnumerator *mme; + ULONG ref; + IMMDeviceCollection *col; + + CoInitializeEx(NULL, COINIT_MULTITHREADED); + hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme); + if (FAILED(hr)) + { + skip("mmdevapi not available: 0x%08x\n", hr); + return; + } + + /* Odd behavior.. bug? */ + ref = IUnknown_AddRef(mme); + ok(ref == 3, "Invalid reference count after incrementing: %u\n", ref); + IUnknown_Release(mme); + + hr = IUnknown_QueryInterface(mme, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "returned 0x%08x\n", hr); + if (hr != S_OK) return; + + ok( (LONG_PTR)mme == (LONG_PTR)unk, "Pointers are unequal %p/%p\n", unk, mme); + IUnknown_Release(unk); + + col = (void*)(LONG_PTR)0x12345678; + hr = IMMDeviceEnumerator_EnumAudioEndpoints(mme, 0xffff, DEVICE_STATEMASK_ALL, &col); + ok(hr == E_INVALIDARG, "Setting invalid data flow returned 0x%08x\n", hr); + ok(col == NULL, "Collection pointer non-null on failure\n"); + + hr = IMMDeviceEnumerator_EnumAudioEndpoints(mme, eAll, DEVICE_STATEMASK_ALL+1, &col); + ok(hr == E_INVALIDARG, "Setting invalid mask returned 0x%08x\n", hr); + + hr = IMMDeviceEnumerator_EnumAudioEndpoints(mme, eAll, DEVICE_STATEMASK_ALL, NULL); + ok(hr == E_POINTER, "Invalid pointer returned: 0x%08x\n", hr); + + hr = IMMDeviceEnumerator_EnumAudioEndpoints(mme, eAll, DEVICE_STATEMASK_ALL, &col); + ok(hr == S_OK, "Valid EnumAudioEndpoints returned 0x%08x\n", hr); + if (hr == S_OK) + { + ok(!!col, "Returned null pointer\n"); + if (col) + test_collection(mme, col); + } + + IUnknown_Release(mme); +}

1 0

Maarten Lankhorst : mmdevapi: Add more tests.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 0c8fbb288f285a8083bc3693291cd18b137df170 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c8fbb288f285a8083bc36932… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Dec 14 10:09:35 2009 +0100 mmdevapi: Add more tests. --- dlls/mmdevapi/tests/Makefile.in | 1 + dlls/mmdevapi/tests/dependency.c | 101 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/tests/Makefile.in b/dlls/mmdevapi/tests/Makefile.in index 4ac467c..ef58c63 100644 --- a/dlls/mmdevapi/tests/Makefile.in +++ b/dlls/mmdevapi/tests/Makefile.in @@ -6,6 +6,7 @@ TESTDLL = mmdevapi.dll IMPORTS = ole32 version user32 kernel32 CTESTS = \ + dependency.c \ mmdevenum.c @MAKE_TEST_RULES@ diff --git a/dlls/mmdevapi/tests/dependency.c b/dlls/mmdevapi/tests/dependency.c new file mode 100644 index 0000000..1568bed --- /dev/null +++ b/dlls/mmdevapi/tests/dependency.c @@ -0,0 +1,101 @@ +/* + * Copyright 2009 Maarten Lankhorst + * + * 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 + */ + +#include "wine/test.h" + +#define CINTERFACE +#define COBJMACROS + +#ifdef STANDALONE +#include "initguid.h" +#endif + +#include "unknwn.h" +#include "uuids.h" +#include "mmdeviceapi.h" +#include "dshow.h" +#include "dsound.h" + +static inline const char *dump_guid( const GUID *id ) +{ + static char data[39]; + if (!id) return "(null)"; + wsprintfA( data, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + id->Data1, id->Data2, id->Data3, + id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], + id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); + return data; +} + +START_TEST(dependency) +{ + HRESULT hr; + IMMDeviceEnumerator *mme = NULL; + IMMDevice *dev = NULL; + IDirectSound8 *ds8 = NULL; + IBaseFilter *bf = NULL; + + CoInitializeEx(NULL, COINIT_MULTITHREADED); + hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme); + if (FAILED(hr)) + { + skip("mmdevapi not available: 0x%08x\n", hr); + return; + } + + hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(mme, eRender, eMultimedia, &dev); + ok(hr == S_OK, "GetDefaultAudioEndpoint failed: 0x%08x\n", hr); + if (hr != S_OK) + { + skip("GetDefaultAudioEndpoint returns 0x%08x, skipping tests\n", hr); + return; + } + + ok(!GetModuleHandle("dsound.dll"), "dsound.dll was already loaded!\n"); + + hr = IMMDevice_Activate(dev, &IID_IDirectSound8, CLSCTX_INPROC_SERVER, NULL, (void**)&ds8); + ok(hr == S_OK, "Activating ds8 interface failed: 0x%08x\n", hr); + if (hr == S_OK) + { + ok(GetModuleHandle("dsound.dll") != NULL, "dsound.dll not loaded!\n"); + ok(ds8 != NULL, "ds8 pointer is null\n"); + } + if (ds8) + IUnknown_Release(ds8); + + ok(!GetModuleHandle("quartz.dll"), "quartz.dll was already loaded!\n"); + hr = IMMDevice_Activate(dev, &IID_IBaseFilter, CLSCTX_INPROC_SERVER, NULL, (void**)&bf); + ok(hr == S_OK, "Activating bf failed: 0x%08x\n", hr); + if (hr == S_OK) + { + ok(GetModuleHandle("quartz.dll") != NULL, "quartz.dll not loaded!\n"); + ok(bf != NULL, "bf pointer is null\n"); + if (bf) + { + CLSID clsid; + hr = IBaseFilter_GetClassID(bf, &clsid); + ok(hr == S_OK, "GetClassId failed with 0x%08x\n", hr); + if (hr == S_OK) + ok(IsEqualCLSID(&clsid, &CLSID_DSoundRender), "Wrong class id %s", dump_guid(&clsid)); + } + } + if (bf) + IUnknown_Release(bf); + + IUnknown_Release(mme); +}

1 0

Hans Leidekker : rpcrt4: Add tests for RPC calls with authentication.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: fddabccaa1daae17f5fde0060d02d36b80acb080 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fddabccaa1daae17f5fde0060… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 14 11:54:36 2009 +0100 rpcrt4: Add tests for RPC calls with authentication. --- dlls/rpcrt4/tests/Makefile.in | 2 +- dlls/rpcrt4/tests/server.c | 159 ++++++++++++++++++++++++++++++++++++----- dlls/rpcrt4/tests/server.idl | 2 + 3 files changed, 145 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fddabccaa1daae17f5fde…

1 0

Stefan Leichter : setupapi: Implement SetupGetInfFileListW.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 9db754fe10469ee558e32598a43c01589f1199c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9db754fe10469ee558e32598a… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Dec 10 20:55:09 2009 +0100 setupapi: Implement SetupGetInfFileListW. --- dlls/setupapi/install.c | 131 ++++++++++++++++++++++++++++++++++++++++- dlls/setupapi/tests/install.c | 13 +---- 2 files changed, 129 insertions(+), 15 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 2064315..54eff1d 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1454,8 +1454,133 @@ BOOL WINAPI SetupInstallServicesFromInfSectionA( HINF Inf, PCSTR SectionName, DW BOOL WINAPI SetupGetInfFileListW(PCWSTR dir, DWORD style, PWSTR buffer, DWORD insize, PDWORD outsize) { - FIXME("(%s %d %p %d %p) stub\n", debugstr_w(dir), style, buffer, insize, outsize); - if(buffer) buffer[0] = 0; - if(outsize) *outsize = 1; + static WCHAR inf[] = {'\\','*','.','i','n','f',0 }; + WCHAR *filter, *fullname = NULL, *ptr = buffer; + DWORD dir_len, name_len = 20, size ; + WIN32_FIND_DATAW finddata; + HANDLE hdl; + if (style & ~( INF_STYLE_OLDNT | INF_STYLE_WIN4 | + INF_STYLE_CACHE_ENABLE | INF_STYLE_CACHE_DISABLE )) + { + FIXME( "unknown inf_style(s) 0x%x\n", + style & ~( INF_STYLE_OLDNT | INF_STYLE_WIN4 | + INF_STYLE_CACHE_ENABLE | INF_STYLE_CACHE_DISABLE )); + if( outsize ) *outsize = 1; + return TRUE; + } + if ((style & ( INF_STYLE_OLDNT | INF_STYLE_WIN4 )) == INF_STYLE_NONE) + { + FIXME( "inf_style INF_STYLE_NONE not handled\n" ); + if( outsize ) *outsize = 1; + return TRUE; + } + if (style & ( INF_STYLE_CACHE_ENABLE | INF_STYLE_CACHE_DISABLE )) + FIXME("ignored inf_style(s) %s %s\n", + ( style & INF_STYLE_CACHE_ENABLE ) ? "INF_STYLE_CACHE_ENABLE" : "", + ( style & INF_STYLE_CACHE_DISABLE ) ? "INF_STYLE_CACHE_DISABLE" : ""); + if( dir ) + { + DWORD att; + DWORD msize; + dir_len = strlenW( dir ); + if ( !dir_len ) return FALSE; + msize = ( 7 + dir_len ) * sizeof( WCHAR ); /* \\*.inf\0 */ + filter = HeapAlloc( GetProcessHeap(), 0, msize ); + if( !filter ) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + strcpyW( filter, dir ); + if ( '\\' == filter[dir_len - 1] ) + filter[--dir_len] = 0; + + att = GetFileAttributesW( filter ); + if (att != INVALID_FILE_ATTRIBUTES && !(att & FILE_ATTRIBUTE_DIRECTORY)) + { + HeapFree( GetProcessHeap(), 0, filter ); + SetLastError( ERROR_DIRECTORY ); + return FALSE; + } + } + else + { + WCHAR infdir[] = {'\\','i','n','f',0 }; + DWORD msize; + dir_len = GetWindowsDirectoryW( NULL, 0 ); + msize = ( 7 + 4 + dir_len ) * sizeof( WCHAR ); + filter = HeapAlloc( GetProcessHeap(), 0, msize ); + if( !filter ) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + GetWindowsDirectoryW( filter, msize ); + strcatW( filter, infdir ); + } + strcatW( filter, inf ); + + hdl = FindFirstFileW( filter , &finddata ); + if ( hdl == INVALID_HANDLE_VALUE ) + { + if( outsize ) *outsize = 1; + HeapFree( GetProcessHeap(), 0, filter ); + return TRUE; + } + size = 1; + do + { + static const WCHAR key[] = + {'S','i','g','n','a','t','u','r','e',0 }; + static const WCHAR section[] = + {'V','e','r','s','i','o','n',0 }; + static const WCHAR sig_win4_1[] = + {'$','C','h','i','c','a','g','o','$',0 }; + static const WCHAR sig_win4_2[] = + {'$','W','I','N','D','O','W','S',' ','N','T','$',0 }; + WCHAR signature[ MAX_PATH ]; + BOOL valid = FALSE; + DWORD len = strlenW( finddata.cFileName ); + if (!fullname || ( name_len < len )) + { + name_len = ( name_len < len ) ? len : name_len; + HeapFree( GetProcessHeap(), 0, fullname ); + fullname = HeapAlloc( GetProcessHeap(), 0, + ( 2 + dir_len + name_len) * sizeof( WCHAR )); + if( !fullname ) + { + HeapFree( GetProcessHeap(), 0, filter ); + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + strcpyW( fullname, filter ); + } + fullname[ dir_len + 1] = 0; /* keep '\\' */ + strcatW( fullname, finddata.cFileName ); + if (!GetPrivateProfileStringW( section, key, NULL, signature, MAX_PATH, fullname )) + signature[0] = 0; + if( INF_STYLE_OLDNT & style ) + valid = strcmpiW( sig_win4_1, signature ) && + strcmpiW( sig_win4_2, signature ); + if( INF_STYLE_WIN4 & style ) + valid = valid || !strcmpiW( sig_win4_1, signature ) || + !strcmpiW( sig_win4_2, signature ); + if( valid ) + { + size += 1 + strlenW( finddata.cFileName ); + if( ptr && insize >= size ) + { + strcpyW( ptr, finddata.cFileName ); + ptr += 1 + strlenW( finddata.cFileName ); + *ptr = 0; + } + } + } + while( FindNextFileW( hdl, &finddata )); + FindClose( hdl ); + + HeapFree( GetProcessHeap(), 0, fullname ); + HeapFree( GetProcessHeap(), 0, filter ); + if( outsize ) *outsize = size; return TRUE; } diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 9aed163..668b2c2 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -515,7 +515,6 @@ static void test_inffilelist(void) outsize = 0; SetLastError(0xdeadbeef); ret = pSetupGetInfFileListW(dir, INF_STYLE_WIN4, NULL, 0, &outsize); - todo_wine ok(!ret, "expected SetupGetInfFileListW to fail!\n"); /* create a private directory, the temp directory may contain some @@ -528,7 +527,7 @@ static void test_inffilelist(void) } if (!CreateDirectoryA(dirA, NULL )) { - win_skip("CreateDirectoryA failed with error %d\n", GetLastError()); + win_skip("CreateDirectoryA(%s) failed with error %d\n", dirA, GetLastError()); return; } if (!SetCurrentDirectoryA(dirA)) @@ -548,7 +547,6 @@ static void test_inffilelist(void) ret = pSetupGetInfFileListW(dir, INF_STYLE_WIN4, NULL, 0, &outsize); ok(ret, "expected SetupGetInfFileListW to succeed!\n"); ok(outsize == 1, "expected required buffersize to be 1, got %d\n", outsize); - todo_wine ok(ERROR_PATH_NOT_FOUND == GetLastError(), "expected error ERROR_PATH_NOT_FOUND, got %d\n", GetLastError()); @@ -563,9 +561,7 @@ static void test_inffilelist(void) outsize = 0xffffffff; SetLastError(0xdeadbeef); ret = pSetupGetInfFileListW(dir, INF_STYLE_WIN4, NULL, 0, &outsize); - todo_wine ok(!ret, "expected SetupGetInfFileListW to fail!\n"); - todo_wine ok(ERROR_DIRECTORY == GetLastError(), "expected error ERROR_DIRECTORY, got %d\n", GetLastError()); @@ -575,9 +571,7 @@ static void test_inffilelist(void) dir[lstrlenW(dir)] = '\\'; SetLastError(0xdeadbeef); ret = pSetupGetInfFileListW(dir, INF_STYLE_WIN4, NULL, 0, &outsize); - todo_wine ok(!ret, "expected SetupGetInfFileListW to fail!\n"); - todo_wine ok(ERROR_DIRECTORY == GetLastError(), "expected error ERROR_DIRECTORY, got %d\n", GetLastError()); @@ -587,7 +581,6 @@ static void test_inffilelist(void) expected = 3 + strlen(inffile) + strlen(inffile2); ret = pSetupGetInfFileListW(dir, INF_STYLE_WIN4, buffer, MAX_PATH, &outsize); ok(ret, "expected SetupGetInfFileListW to succeed!\n"); - todo_wine ok(expected == outsize, "expected required buffersize to be %d, got %d\n", expected, outsize); for(p = buffer; lstrlenW(p) && (outsize > (p - buffer)); p+=lstrlenW(p) + 1) @@ -599,7 +592,6 @@ static void test_inffilelist(void) create_inf_file(inffile2, inf2); ret = pSetupGetInfFileListW(dir, INF_STYLE_WIN4, buffer, MAX_PATH, &outsize); ok(ret, "expected SetupGetInfFileListW to succeed!\n"); - todo_wine ok(expected == outsize, "expected required buffersize to be %d, got %d\n", expected, outsize); for(p = buffer; lstrlenW(p) && (outsize > (p - buffer)); p+=lstrlenW(p) + 1) @@ -612,7 +604,6 @@ static void test_inffilelist(void) expected = 3 + strlen(inffile) + strlen(inffile2); ret = pSetupGetInfFileListW(dir, INF_STYLE_WIN4, buffer, MAX_PATH, &outsize); ok(ret, "expected SetupGetInfFileListW to succeed!\n"); - todo_wine ok(expected == outsize, "expected required buffersize to be %d, got %d\n", expected, outsize); for(p = buffer; lstrlenW(p) && (outsize > (p - buffer)); p+=lstrlenW(p) + 1) @@ -624,7 +615,6 @@ static void test_inffilelist(void) expected = 2 + strlen(invalid_inf); ret = pSetupGetInfFileListW(dir, INF_STYLE_OLDNT, buffer, MAX_PATH, &outsize); ok(ret, "expected SetupGetInfFileListW to succeed!\n"); - todo_wine ok(expected == outsize, "expected required buffersize to be %d, got %d\n", expected, outsize); for(p = buffer; lstrlenW(p) && (outsize > (p - buffer)); p+=lstrlenW(p) + 1) @@ -636,7 +626,6 @@ static void test_inffilelist(void) ret = pSetupGetInfFileListW(dir, INF_STYLE_OLDNT | INF_STYLE_WIN4, buffer, MAX_PATH, &outsize); ok(ret, "expected SetupGetInfFileListW to succeed!\n"); - todo_wine ok(expected == outsize, "expected required buffersize to be %d, got %d\n", expected, outsize); for(p = buffer; lstrlenW(p) && (outsize > (p - buffer)); p+=lstrlenW(p) + 1)

1 0

Eric Pouech : dbghelp: Don' t return error when validating a 64bit wide address on a 64bit platform.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 9ff52fb82cd764c48069edf51fb4f0ad5c23400a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ff52fb82cd764c48069edf51… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Dec 12 12:18:50 2009 +0100 dbghelp: Don't return error when validating a 64bit wide address on a 64bit platform. --- dlls/dbghelp/dbghelp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 3f85f0d..ae26518 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -106,7 +106,7 @@ struct process* process_find_by_handle(HANDLE hProcess) */ BOOL validate_addr64(DWORD64 addr) { - if (addr >> 32) + if (sizeof(void*) == sizeof(int) && (addr >> 32)) { FIXME("Unsupported address %s\n", wine_dbgstr_longlong(addr)); SetLastError(ERROR_INVALID_PARAMETER);

1 0

Eric Pouech : dbghelp: Enforce using 64bit integers for module' s address and size.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: c6eb8104dd31f1bbdd819cbfef6b9ffed9b88487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6eb8104dd31f1bbdd819cbfe… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Dec 12 12:18:56 2009 +0100 dbghelp: Enforce using 64bit integers for module's address and size. --- dlls/dbghelp/dbghelp_private.h | 4 ++-- dlls/dbghelp/module.c | 11 ++++++----- dlls/dbghelp/pe_module.c | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index bbf2ef0..328c79b 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -473,7 +473,7 @@ extern BOOL module_get_debug(struct module_pair*); extern struct module* module_new(struct process* pcs, const WCHAR* name, enum module_type type, BOOL virtual, - unsigned long addr, unsigned long size, + DWORD64 addr, DWORD64 size, unsigned long stamp, unsigned long checksum); extern struct module* module_get_containee(const struct process* pcs, @@ -505,7 +505,7 @@ extern struct module* HANDLE hFile, DWORD base, DWORD size); extern struct module* pe_load_builtin_module(struct process* pcs, const WCHAR* name, - DWORD base, DWORD size); + DWORD64 base, DWORD64 size); extern BOOL pe_load_debug_info(const struct process* pcs, struct module* module); /* source.c */ diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 1920dca..55eca44 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -122,7 +122,7 @@ static const char* get_module_type(enum module_type type, BOOL virtual) */ struct module* module_new(struct process* pcs, const WCHAR* name, enum module_type type, BOOL virtual, - unsigned long mod_addr, unsigned long size, + DWORD64 mod_addr, DWORD64 size, unsigned long stamp, unsigned long checksum) { struct module* module; @@ -134,8 +134,9 @@ struct module* module_new(struct process* pcs, const WCHAR* name, module->next = pcs->lmodules; pcs->lmodules = module; - TRACE("=> %s %08lx-%08lx %s\n", - get_module_type(type, virtual), mod_addr, mod_addr + size, + TRACE("=> %s %s-%s %s\n", + get_module_type(type, virtual), + wine_dbgstr_longlong(mod_addr), wine_dbgstr_longlong(mod_addr + size), debugstr_w(name)); pool_init(&module->pool, 65536); @@ -373,7 +374,7 @@ struct module* module_find_by_addr(const struct process* pcs, unsigned long addr * already loaded */ static BOOL module_is_container_loaded(const struct process* pcs, - const WCHAR* ImageName, DWORD base) + const WCHAR* ImageName, DWORD64 base) { size_t len; struct module* module; @@ -536,7 +537,7 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam { if (!wImageName) return FALSE; module = module_new(pcs, wImageName, module_get_type_by_name(wImageName), - TRUE, (DWORD)BaseOfDll, SizeOfDll, 0, 0); + TRUE, BaseOfDll, SizeOfDll, 0, 0); if (!module) return FALSE; if (wModuleName) module_set_module(module, wModuleName); module->module.SymType = SymVirtual; diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 664affc..03e9c86 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -448,7 +448,7 @@ BOOL pe_load_nt_header(HANDLE hProc, DWORD64 base, IMAGE_NT_HEADERS* nth) * */ struct module* pe_load_builtin_module(struct process* pcs, const WCHAR* name, - DWORD base, DWORD size) + DWORD64 base, DWORD64 size) { struct module* module = NULL;

1 0

Eric Pouech : dbghelp: A couple of fixes for dwarf2 support on a 64bit platform.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: b4da46ebe802bcc58e1dd53b374a938d556f2e8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4da46ebe802bcc58e1dd53b3… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Dec 12 12:19:02 2009 +0100 dbghelp: A couple of fixes for dwarf2 support on a 64bit platform. --- dlls/dbghelp/dwarf.c | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index bb7257e..4cd75f2 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -217,7 +217,7 @@ static unsigned char dwarf2_parse_byte(dwarf2_traverse_context_t* ctx) static unsigned short dwarf2_get_u2(const unsigned char* ptr) { - return *(const unsigned short*)ptr; + return *(const UINT16*)ptr; } static unsigned short dwarf2_parse_u2(dwarf2_traverse_context_t* ctx) @@ -229,7 +229,7 @@ static unsigned short dwarf2_parse_u2(dwarf2_traverse_context_t* ctx) static unsigned long dwarf2_get_u4(const unsigned char* ptr) { - return *(const unsigned long*)ptr; + return *(const UINT32*)ptr; } static unsigned long dwarf2_parse_u4(dwarf2_traverse_context_t* ctx) @@ -239,6 +239,11 @@ static unsigned long dwarf2_parse_u4(dwarf2_traverse_context_t* ctx) return uvalue; } +static DWORD64 dwarf2_get_u8(const unsigned char* ptr) +{ + return *(const UINT64*)ptr; +} + static unsigned long dwarf2_get_leb128_as_unsigned(const unsigned char* ptr, const unsigned char** end) { unsigned long ret = 0; @@ -309,6 +314,13 @@ static unsigned dwarf2_leb128_length(const dwarf2_traverse_context_t* ctx) return ret + 1; } +/****************************************************************** + * dwarf2_get_addr + * + * Returns an address. + * We assume that in all cases word size from Dwarf matches the size of + * addresses in platform where the exec is compiled. + */ static unsigned long dwarf2_get_addr(const unsigned char* ptr, unsigned word_size) { unsigned long ret; @@ -318,6 +330,9 @@ static unsigned long dwarf2_get_addr(const unsigned char* ptr, unsigned word_siz case 4: ret = dwarf2_get_u4(ptr); break; + case 8: + ret = dwarf2_get_u8(ptr); + break; default: FIXME("Unsupported Word Size %u\n", word_size); ret = 0; @@ -2033,7 +2048,7 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, cu_ctx.word_size = dwarf2_parse_byte(&cu_ctx); TRACE("Compilation Unit Header found at 0x%x:\n", - comp_unit_start - sections[section_debug].address); + (int)(comp_unit_start - sections[section_debug].address)); TRACE("- length: %lu\n", cu_length); TRACE("- version: %u\n", cu_version); TRACE("- abbrev_offset: %lu\n", cu_abbrev_offset);

1 0

Eric Pouech : winedbg: Enforce 64bit modules address on 64bit platforms.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 485280c64b9f361ecd31ebe43c93f731c69a84f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=485280c64b9f361ecd31ebe43… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Dec 12 12:19:08 2009 +0100 winedbg: Enforce 64bit modules address on 64bit platforms. --- programs/winedbg/debugger.h | 2 +- programs/winedbg/types.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index d0a0674..61325e3 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -94,7 +94,7 @@ enum dbg_internal_types struct dbg_type { unsigned long id; - DWORD module; + DWORD_PTR module; }; struct dbg_lvalue /* structure to hold left-values... */ diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 50695aa..68bf12b 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -561,7 +561,7 @@ static BOOL CALLBACK print_types_cb(PSYMBOL_INFO sym, ULONG size, void* ctx) struct dbg_type type; type.module = sym->ModBase; type.id = sym->TypeIndex; - dbg_printf("Mod: %08x ID: %08lx\n", type.module, type.id); + dbg_printf("Mod: %08lx ID: %08lx\n", type.module, type.id); types_print_type(&type, TRUE); dbg_printf("\n"); return TRUE;

1 0

Eric Pouech : winedbg: Ensure all addresses passed to break functions are 64bit wide.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 7daa50c0417186eb327d1984d8977641a10954ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=7daa50c0417186eb327d1984d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Dec 12 12:19:14 2009 +0100 winedbg: Ensure all addresses passed to break functions are 64bit wide. --- programs/winedbg/break.c | 8 ++++---- programs/winedbg/debugger.h | 2 +- programs/winedbg/tgt_active.c | 5 ++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index accf17b..c76a868 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -484,9 +484,9 @@ static inline BOOL module_is_container(const IMAGEHLP_MODULE* wmod_cntnr, * * Remove all Xpoints from module which base is 'base' */ -void break_delete_xpoints_from_module(unsigned long base) +void break_delete_xpoints_from_module(DWORD64 base) { - IMAGEHLP_MODULE im, im_elf; + IMAGEHLP_MODULE64 im, im_elf; int i; DWORD_PTR linear; struct dbg_breakpoint* bp = dbg_curr_process->bp; @@ -494,10 +494,10 @@ void break_delete_xpoints_from_module(unsigned long base) /* FIXME: should do it also on the ELF sibbling if any */ im.SizeOfStruct = sizeof(im); im_elf.SizeOfStruct = sizeof(im_elf); - if (!SymGetModuleInfo(dbg_curr_process->handle, base, &im)) return; + if (!SymGetModuleInfo64(dbg_curr_process->handle, base, &im)) return; /* try to get in fact the underlying ELF module (if any) */ - if (SymGetModuleInfo(dbg_curr_process->handle, im.BaseOfImage - 1, &im_elf) && + if (SymGetModuleInfo64(dbg_curr_process->handle, im.BaseOfImage - 1, &im_elf) && im_elf.BaseOfImage <= im.BaseOfImage && im_elf.BaseOfImage + im_elf.ImageSize >= im.BaseOfImage + im.ImageSize) im = im_elf; diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 61325e3..42f9b24 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -291,7 +291,7 @@ extern void break_add_watch_from_lvalue(const struct dbg_lvalue* lva extern void break_add_watch_from_id(const char* name); extern void break_check_delayed_bp(void); extern void break_delete_xpoint(int num); -extern void break_delete_xpoints_from_module(unsigned long base); +extern void break_delete_xpoints_from_module(DWORD64 base); extern void break_enable_xpoint(int num, BOOL enable); extern void break_info(void); extern void break_adjust_pc(ADDRESS64* addr, DWORD code, BOOL first_chance, BOOL* is_break); diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 23917e0..a25fbd4 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -626,9 +626,8 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de) WINE_TRACE("%04x:%04x: unload DLL @%p\n", de->dwProcessId, de->dwThreadId, de->u.UnloadDll.lpBaseOfDll); - break_delete_xpoints_from_module((unsigned long)de->u.UnloadDll.lpBaseOfDll); - SymUnloadModule(dbg_curr_process->handle, - (unsigned long)de->u.UnloadDll.lpBaseOfDll); + break_delete_xpoints_from_module((DWORD_PTR)de->u.UnloadDll.lpBaseOfDll); + SymUnloadModule64(dbg_curr_process->handle, (DWORD_PTR)de->u.UnloadDll.lpBaseOfDll); break; case OUTPUT_DEBUG_STRING_EVENT:

1 0

Eric Pouech : dbghelp: Force 64bit module enumeration on all platforms.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 97d44dd39969adc741acd271350c7292c6344f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97d44dd39969adc741acd2713… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Dec 12 12:19:23 2009 +0100 dbghelp: Force 64bit module enumeration on all platforms. --- programs/winedbg/debugger.h | 2 +- programs/winedbg/gdbproxy.c | 2 +- programs/winedbg/info.c | 1 - programs/winedbg/winedbg.c | 6 +++--- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 42f9b24..30846eb 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -458,7 +458,7 @@ extern struct dbg_thread* dbg_get_thread(struct dbg_process* p, DWORD tid); extern void dbg_del_thread(struct dbg_thread* t); extern BOOL dbg_init(HANDLE hProc, const WCHAR* in, BOOL invade); extern BOOL dbg_load_module(HANDLE hProc, HANDLE hFile, const WCHAR* name, DWORD_PTR base, DWORD size); -extern BOOL dbg_get_debuggee_info(HANDLE hProcess, IMAGEHLP_MODULE* imh_mod); +extern BOOL dbg_get_debuggee_info(HANDLE hProcess, IMAGEHLP_MODULE64* imh_mod); extern void dbg_set_option(const char*, const char*); extern void dbg_start_interactive(HANDLE hFile); extern void dbg_init_console(void); diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 4a63232..65b1cc3 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -2186,7 +2186,7 @@ static BOOL gdb_startup(struct gdb_context* gdbctx, DEBUG_EVENT* de, unsigned fl struct sockaddr_in s_addrs; unsigned int s_len = sizeof(s_addrs); struct pollfd pollfd; - IMAGEHLP_MODULE imh_mod; + IMAGEHLP_MODULE64 imh_mod; /* step 1: create socket for gdb connection request */ if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == -1) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 87fbebd..1b7eeb3 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -146,7 +146,6 @@ static const char* get_symtype_str(const IMAGEHLP_MODULE64* mi) struct info_module { IMAGEHLP_MODULE64* mi; - DWORD_PTR _base; unsigned num_alloc; unsigned num_used; }; diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 911cb6a..4aa0a3e 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -399,7 +399,7 @@ BOOL dbg_init(HANDLE hProc, const WCHAR* in, BOOL invade) struct mod_loader_info { HANDLE handle; - IMAGEHLP_MODULE* imh_mod; + IMAGEHLP_MODULE64* imh_mod; }; static BOOL CALLBACK mod_loader_cb(PCSTR mod_name, DWORD64 base, PVOID ctx) @@ -408,13 +408,13 @@ static BOOL CALLBACK mod_loader_cb(PCSTR mod_name, DWORD64 base, PVOID ctx) if (!strcmp(mod_name, "<wine-loader>")) { - if (SymGetModuleInfo(mli->handle, base, mli->imh_mod)) + if (SymGetModuleInfo64(mli->handle, base, mli->imh_mod)) return FALSE; /* stop enum */ } return TRUE; } -BOOL dbg_get_debuggee_info(HANDLE hProcess, IMAGEHLP_MODULE* imh_mod) +BOOL dbg_get_debuggee_info(HANDLE hProcess, IMAGEHLP_MODULE64* imh_mod) { struct mod_loader_info mli; DWORD opt;

1 0