December 2009 - Wine-commits

Paul Vriens : ddraw/tests: Fix some test failures on Vista+.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 0f0d92bf138a7976be300221e358567e7c49ef7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f0d92bf138a7976be300221e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Dec 10 13:19:48 2009 +0100 ddraw/tests: Fix some test failures on Vista+. --- dlls/ddraw/tests/dsurface.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index f6f1258..ab0408b 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -3048,6 +3048,7 @@ static void GetDCFormatTest(void) const char *name; DDPIXELFORMAT fmt; BOOL getdc_capable; + HRESULT alt_result; } testdata[] = { { "D3DFMT_A8R8G8B8", @@ -3071,7 +3072,8 @@ static void GetDCFormatTest(void) sizeof(DDPIXELFORMAT), DDPF_RGB, 0, {32}, {0x000000ff}, {0x0000ff00}, {0x00ff0000}, {0x00000000} }, - TRUE + TRUE, + DDERR_CANTCREATEDC /* Vista+ */ }, { "D3DFMT_X8B8G8R8", @@ -3079,7 +3081,8 @@ static void GetDCFormatTest(void) sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, {32}, {0x000000ff}, {0x0000ff00}, {0x00ff0000}, {0xff000000} }, - TRUE + TRUE, + DDERR_CANTCREATEDC /* Vista+ */ }, { "D3DFMT_A4R4G4B4", @@ -3087,7 +3090,8 @@ static void GetDCFormatTest(void) sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, {16}, {0x00000f00}, {0x000000f0}, {0x0000000f}, {0x0000f000} }, - TRUE + TRUE, + DDERR_CANTCREATEDC /* Vista+ */ }, { "D3DFMT_X4R4G4B4", @@ -3095,7 +3099,8 @@ static void GetDCFormatTest(void) sizeof(DDPIXELFORMAT), DDPF_RGB, 0, {16}, {0x00000f00}, {0x000000f0}, {0x0000000f}, {0x00000000} }, - TRUE + TRUE, + DDERR_CANTCREATEDC /* Vista+ */ }, { "D3DFMT_R5G6B5", @@ -3240,7 +3245,9 @@ static void GetDCFormatTest(void) hr = IDirectDrawSurface7_GetDC(surface, &dc); if(testdata[i].getdc_capable) { - ok(SUCCEEDED(hr), "GetDC on a %s surface failed(0x%08x), expected it to work\n", + ok(SUCCEEDED(hr) || + (testdata[i].alt_result && hr == testdata[i].alt_result), + "GetDC on a %s surface failed(0x%08x), expected it to work\n", testdata[i].name, hr); } else

1 0

Alexandre Julliard : winedbg: Fix a number of 64-bit pointer truncation issues.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: ec73f0b71a249d8685f8a135dcf94028adf386f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec73f0b71a249d8685f8a135d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 10 15:23:45 2009 +0100 winedbg: Fix a number of 64-bit pointer truncation issues. --- programs/winedbg/be_i386.c | 70 ++++++++++++++-------------- programs/winedbg/be_x86_64.c | 100 ++++++++++++++++++++-------------------- programs/winedbg/break.c | 14 +++--- programs/winedbg/dbg.y | 2 +- programs/winedbg/debug.l | 4 +- programs/winedbg/debugger.h | 22 +++++----- programs/winedbg/gdbproxy.c | 15 +++--- programs/winedbg/info.c | 14 +++--- programs/winedbg/memory.c | 2 +- programs/winedbg/source.c | 2 +- programs/winedbg/stack.c | 12 +++--- programs/winedbg/symbol.c | 19 ++++---- programs/winedbg/tgt_active.c | 10 ++-- programs/winedbg/types.c | 4 +- programs/winedbg/winedbg.c | 12 +++--- 15 files changed, 151 insertions(+), 151 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ec73f0b71a249d8685f8a…

1 0

Alexandre Julliard : dbghelp: Moved addr_to_linear() to stack.c.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 7f88738fa6eb6b6b28958f9d69f44d7b2f999a3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f88738fa6eb6b6b28958f9d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 10 15:29:20 2009 +0100 dbghelp: Moved addr_to_linear() to stack.c. --- dlls/dbghelp/Makefile.in | 1 - dlls/dbghelp/dbghelp_private.h | 1 - dlls/dbghelp/memory.c | 61 ---------------------------------------- dlls/dbghelp/stack.c | 29 +++++++++++++++++++ 4 files changed, 29 insertions(+), 63 deletions(-) diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in index a44d3c9..eaf0ae4 100644 --- a/dlls/dbghelp/Makefile.in +++ b/dlls/dbghelp/Makefile.in @@ -16,7 +16,6 @@ C_SRCS = \ elf_module.c \ image.c \ macho_module.c \ - memory.c \ minidump.c \ module.c \ msc.c \ diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 4faae4d..cae3c95 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -441,7 +441,6 @@ extern BOOL elf_read_wine_loader_dbg_info(struct process* pcs); extern BOOL elf_synchronize_module_list(struct process* pcs); struct elf_thunk_area; extern int elf_is_in_thunk_area(unsigned long addr, const struct elf_thunk_area* thunks); -extern DWORD WINAPI addr_to_linear(HANDLE hProcess, HANDLE hThread, ADDRESS* addr); /* macho_module.c */ #define MACHO_NO_MAP ((const void*)-1) diff --git a/dlls/dbghelp/memory.c b/dlls/dbghelp/memory.c deleted file mode 100644 index 6f64016..0000000 --- a/dlls/dbghelp/memory.c +++ /dev/null @@ -1,61 +0,0 @@ -/* - * File memory.c - managing memory - * - * Copyright (C) 2004, Eric Pouech - * - * 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 "config.h" - -#include <assert.h> -#include "dbghelp_private.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); - -/****************************************************************** - * addr_to_linear - * - * converts an address into its linear value - */ -DWORD WINAPI addr_to_linear(HANDLE hProcess, HANDLE hThread, ADDRESS* addr) -{ - LDT_ENTRY le; - - switch (addr->Mode) - { - case AddrMode1616: - if (GetThreadSelectorEntry(hThread, addr->Segment, &le)) - return (le.HighWord.Bits.BaseHi << 24) + - (le.HighWord.Bits.BaseMid << 16) + le.BaseLow + LOWORD(addr->Offset); - break; - case AddrMode1632: - if (GetThreadSelectorEntry(hThread, addr->Segment, &le)) - return (le.HighWord.Bits.BaseHi << 24) + - (le.HighWord.Bits.BaseMid << 16) + le.BaseLow + addr->Offset; - break; - case AddrModeReal: - return (DWORD)(LOWORD(addr->Segment) << 4) + addr->Offset; - case AddrModeFlat: - return addr->Offset; - default: - FIXME("Unsupported (yet) mode (%x)\n", addr->Mode); - return 0; - } - FIXME("Failed to linearize address %04x:%08x (mode %x)\n", - addr->Segment, addr->Offset, addr->Mode); - return 0; -} diff --git a/dlls/dbghelp/stack.c b/dlls/dbghelp/stack.c index 3c66fcb..959ab64 100644 --- a/dlls/dbghelp/stack.c +++ b/dlls/dbghelp/stack.c @@ -56,6 +56,35 @@ static const char* wine_dbgstr_addr(const ADDRESS* addr) } } +static DWORD WINAPI addr_to_linear(HANDLE hProcess, HANDLE hThread, ADDRESS* addr) +{ + LDT_ENTRY le; + + switch (addr->Mode) + { + case AddrMode1616: + if (GetThreadSelectorEntry(hThread, addr->Segment, &le)) + return (le.HighWord.Bits.BaseHi << 24) + + (le.HighWord.Bits.BaseMid << 16) + le.BaseLow + LOWORD(addr->Offset); + break; + case AddrMode1632: + if (GetThreadSelectorEntry(hThread, addr->Segment, &le)) + return (le.HighWord.Bits.BaseHi << 24) + + (le.HighWord.Bits.BaseMid << 16) + le.BaseLow + addr->Offset; + break; + case AddrModeReal: + return (DWORD)(LOWORD(addr->Segment) << 4) + addr->Offset; + case AddrModeFlat: + return addr->Offset; + default: + FIXME("Unsupported (yet) mode (%x)\n", addr->Mode); + return 0; + } + FIXME("Failed to linearize address %04x:%08x (mode %x)\n", + addr->Segment, addr->Offset, addr->Mode); + return 0; +} + static BOOL CALLBACK read_mem(HANDLE hProcess, DWORD addr, void* buffer, DWORD size, LPDWORD nread) {

1 0

Ken Thomases : kernel32: Consolidate some related code closer together.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 18d9632914cc51005d52cceb7615fedfdfb66aaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=18d9632914cc51005d52cceb7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Dec 9 15:03:18 2009 -0600 kernel32: Consolidate some related code closer together. --- dlls/kernel32/locale.c | 46 ++++++++++++++++++++++------------------------ 1 files changed, 22 insertions(+), 24 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 0b466e0..834d5b9 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2926,8 +2926,6 @@ void LOCALE_Init(void) #ifdef __APPLE__ /* MacOS doesn't set the locale environment variables so we have to do it ourselves */ - CFArrayRef preferred_locales, all_locales; - CFStringRef user_language_string_ref = NULL; char user_locale[50]; CFLocaleRef user_locale_ref = CFLocaleCopyCurrent(); @@ -2953,15 +2951,6 @@ void LOCALE_Init(void) unix_cp = CP_UTF8; /* default to utf-8 even if we don't get a valid locale */ setenv( "LANG", user_locale, 0 ); TRACE( "setting locale to '%s'\n", user_locale ); - - /* We still want to set the retrieve the preferred language as chosen in - System Preferences.app, because it can differ from CFLocaleCopyCurrent(). - */ - all_locales = CFLocaleCopyAvailableLocaleIdentifiers(); - preferred_locales = CFBundleCopyLocalizationsForPreferences( all_locales, NULL ); - if (preferred_locales && CFArrayGetCount( preferred_locales )) - user_language_string_ref = CFArrayGetValueAtIndex( preferred_locales, 0 ); - CFRelease( all_locales ); #endif /* __APPLE__ */ setlocale( LC_ALL, "" ); @@ -2970,19 +2959,28 @@ void LOCALE_Init(void) if (!lcid_LC_MESSAGES) lcid_LC_MESSAGES = lcid_LC_CTYPE; #ifdef __APPLE__ - /* Override lcid_LC_MESSAGES with user_language if LC_MESSAGES is set to default */ - if (user_language_string_ref && !getenv("LC_ALL") && !getenv("LC_MESSAGES")) - { - struct locale_name locale_name; - WCHAR buffer[128]; - CFStringGetCString( user_language_string_ref, user_locale, sizeof(user_locale), kCFStringEncodingUTF8 ); - strcpynAtoW( buffer, user_locale, sizeof(buffer)/sizeof(WCHAR) ); - parse_locale_name( buffer, &locale_name ); - lcid_LC_MESSAGES = locale_name.lcid; - TRACE( "setting lcid_LC_MESSAGES to '%s'\n", user_locale ); - } - if (preferred_locales) - CFRelease( preferred_locales ); + /* Override lcid_LC_MESSAGES with user's preferred language if LC_MESSAGES is set to default */ + if (!getenv("LC_ALL") && !getenv("LC_MESSAGES")) + { + /* Retrieve the preferred language as chosen in System Preferences. */ + CFArrayRef all_locales = CFLocaleCopyAvailableLocaleIdentifiers(); + CFArrayRef preferred_locales = CFBundleCopyLocalizationsForPreferences( all_locales, NULL ); + CFStringRef user_language_string_ref; + if (preferred_locales && CFArrayGetCount( preferred_locales ) && + (user_language_string_ref = CFArrayGetValueAtIndex( preferred_locales, 0 ))) + { + struct locale_name locale_name; + WCHAR buffer[128]; + CFStringGetCString( user_language_string_ref, user_locale, sizeof(user_locale), kCFStringEncodingUTF8 ); + strcpynAtoW( buffer, user_locale, sizeof(buffer)/sizeof(WCHAR) ); + parse_locale_name( buffer, &locale_name ); + lcid_LC_MESSAGES = locale_name.lcid; + TRACE( "setting lcid_LC_MESSAGES to '%s'\n", user_locale ); + } + CFRelease( all_locales ); + if (preferred_locales) + CFRelease( preferred_locales ); + } #endif NtSetDefaultUILanguage( LANGIDFROMLCID(lcid_LC_MESSAGES) );

1 0

Wolfram Sang : ntoskrnl: Add IoAllocateErrorLogEntry stub.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 7790280c5b6277347cc2873602c4f46aea872ee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7790280c5b6277347cc287360… Author: Wolfram Sang <wolfram(a)the-dreams.de> Date: Wed Dec 9 19:22:14 2009 +0100 ntoskrnl: Add IoAllocateErrorLogEntry stub. --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 06971ad..63d6fc9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -374,6 +374,16 @@ void WINAPI IoFreeIrp( IRP *irp ) /*********************************************************************** + * IoAllocateErrorLogEntry (NTOSKRNL.EXE.@) + */ +PVOID WINAPI IoAllocateErrorLogEntry( PVOID IoObject, UCHAR EntrySize ) +{ + FIXME( "stub: %p, %u\n", IoObject, EntrySize ); + return NULL; +} + + +/*********************************************************************** * IoAllocateMdl (NTOSKRNL.EXE.@) */ PMDL WINAPI IoAllocateMdl( PVOID VirtualAddress, ULONG Length, BOOLEAN SecondaryBuffer, BOOLEAN ChargeQuota, PIRP Irp ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index b85fcb9..f6402af 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -310,7 +310,7 @@ @ stub IoAllocateAdapterChannel @ stub IoAllocateController @ stdcall IoAllocateDriverObjectExtension(ptr ptr long ptr) -@ stub IoAllocateErrorLogEntry +@ stdcall IoAllocateErrorLogEntry(ptr long) @ stdcall IoAllocateIrp(long long) @ stdcall IoAllocateMdl(ptr long long long ptr) @ stdcall IoAllocateWorkItem(ptr) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index df0ad5d..3bc7238 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1040,6 +1040,7 @@ void WINAPI ExFreePool(PVOID); void WINAPI ExFreePoolWithTag(PVOID,ULONG); NTSTATUS WINAPI IoAllocateDriverObjectExtension(PDRIVER_OBJECT,PVOID,ULONG,PVOID*); +PVOID WINAPI IoAllocateErrorLogEntry(PVOID,UCHAR); PIRP WINAPI IoAllocateIrp(CCHAR,BOOLEAN); NTSTATUS WINAPI IoCreateDevice(DRIVER_OBJECT*,ULONG,UNICODE_STRING*,DEVICE_TYPE,ULONG,BOOLEAN,DEVICE_OBJECT**); NTSTATUS WINAPI IoCreateDriver(UNICODE_STRING*,PDRIVER_INITIALIZE);

1 0

Paul Vriens : imagehlp/tests: Run tests again on Win95.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: f976907d4f07e9777a6f0ffae348c20f93a0d4a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f976907d4f07e9777a6f0ffae… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Dec 10 11:41:48 2009 +0100 imagehlp/tests: Run tests again on Win95. --- dlls/imagehlp/tests/integrity.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/imagehlp/tests/integrity.c b/dlls/imagehlp/tests/integrity.c index df77dab..a551d1f 100644 --- a/dlls/imagehlp/tests/integrity.c +++ b/dlls/imagehlp/tests/integrity.c @@ -121,12 +121,18 @@ static BOOL copy_dll_file(void) static DWORD get_file_size(void) { - WIN32_FILE_ATTRIBUTE_DATA info; + HANDLE file; + DWORD filesize = 0; - if (GetFileAttributesEx(test_dll_path, GetFileExInfoStandard, &info)) + file = CreateFileA(test_dll_path, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (file == INVALID_HANDLE_VALUE) return 0; - return info.nFileSizeLow; + filesize = GetFileSize(file, NULL); + CloseHandle(file); + + return filesize; } static void test_add_certificate(char *cert_data, int len)

1 0

Paul Vriens : ole32/tests: Don't crash on Win9x/ WinMe by using more A-functions.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 49d40d80f4a4221e1a61f5443adf18ce0b81ec4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=49d40d80f4a4221e1a61f5443… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Dec 10 11:55:58 2009 +0100 ole32/tests: Don't crash on Win9x/WinMe by using more A-functions. --- dlls/ole32/tests/storage32.c | 72 +++++++++++++++++++++++++----------------- 1 files changed, 43 insertions(+), 29 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index b658a46..2c73c74 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -36,7 +36,9 @@ DEFINE_GUID( test_stg_cls, 0x88888888, 0x0425, 0x0000, 0,0,0,0,0,0,0,0); static CHAR filenameA[MAX_PATH]; static WCHAR filename[MAX_PATH]; +static const char file1_nameA[] = {'c','o','p','y','t','e','s','t','A',0}; static const WCHAR file1_name[] = {'c','o','p','y','t','e','s','t','A',0}; +static const char file2_nameA[] = {'c','o','p','y','t','e','s','t','B',0}; static const WCHAR file2_name[] = {'c','o','p','y','t','e','s','t','B',0}; static const WCHAR stgA_name[] = {'S','t','o','r','a','g','e','A',0}; static const WCHAR stgB_name[] = {'S','t','o','r','a','g','e','B',0}; @@ -44,6 +46,15 @@ static const WCHAR strmA_name[] = {'S','t','r','e','a','m','A',0}; static const WCHAR strmB_name[] = {'S','t','r','e','a','m','B',0}; static const WCHAR strmC_name[] = {'S','t','r','e','a','m','C',0}; +/* Win9x and WinMe don't have lstrcmpW */ +static int strcmp_ww(LPCWSTR strw1, LPCWSTR strw2) +{ + CHAR stra1[512], stra2[512]; + WideCharToMultiByte(CP_ACP, 0, strw1, -1, stra1, sizeof(stra1), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, strw2, -1, stra2, sizeof(stra2), NULL, NULL); + return lstrcmpA(stra1, stra2); +} + static void test_hglobal_storage_stat(void) { ILockBytes *ilb = NULL; @@ -1910,6 +1921,7 @@ static void test_fmtusertypestg(void) IStorage *stg; IEnumSTATSTG *stat; HRESULT hr; + static const char fileA[] = {'f','m','t','t','e','s','t',0}; static const WCHAR fileW[] = {'f','m','t','t','e','s','t',0}; static WCHAR userTypeW[] = {'S','t','g','U','s','r','T','y','p','e',0}; static WCHAR strmNameW[] = {1,'C','o','m','p','O','b','j',0}; @@ -1933,7 +1945,7 @@ static void test_fmtusertypestg(void) DWORD got; while ((hr = IEnumSTATSTG_Next(stat, 1, &statstg, &got)) == S_OK && got == 1) { - if (lstrcmpW(statstg.pwcsName, strmNameW) == 0) + if (strcmp_ww(statstg.pwcsName, strmNameW) == 0) found = TRUE; else ok(0, "found unexpected stream or storage\n"); @@ -1956,7 +1968,7 @@ static void test_fmtusertypestg(void) DWORD got; while ((hr = IEnumSTATSTG_Next(stat, 1, &statstg, &got)) == S_OK && got == 1) { - if (lstrcmpW(statstg.pwcsName, strmNameW) == 0) + if (strcmp_ww(statstg.pwcsName, strmNameW) == 0) found = TRUE; else ok(0, "found unexpected stream or storage\n"); @@ -1966,7 +1978,7 @@ static void test_fmtusertypestg(void) } IStorage_Release(stg); - DeleteFileW( fileW ); + DeleteFileA( fileA ); } } @@ -2124,7 +2136,7 @@ static void test_copyto(void) hr = IStream_Read(strm_tmp, buf, sizeof(buf), NULL); ok(hr == S_OK, "Read failed: 0x%08x\n", hr); if(SUCCEEDED(hr)) - ok(lstrcmpW(buf, strmA_name) == 0, + ok(strcmp_ww(buf, strmA_name) == 0, "Expected %s to be read, got %s\n", wine_dbgstr_w(strmA_name), wine_dbgstr_w(buf)); IStream_Release(strm_tmp); @@ -2147,7 +2159,7 @@ static void test_copyto(void) hr = IStream_Read(strm_tmp, buf, sizeof(buf), NULL); ok(hr == S_OK, "Read failed: 0x%08x\n", hr); if(SUCCEEDED(hr)) - ok(lstrcmpW(buf, strmB_name) == 0, + ok(strcmp_ww(buf, strmB_name) == 0, "Expected %s to be read, got %s\n", wine_dbgstr_w(strmB_name), wine_dbgstr_w(buf)); IStream_Release(strm_tmp); @@ -2165,7 +2177,7 @@ static void test_copyto(void) hr = IStream_Read(strm_tmp, buf, sizeof(buf), NULL); ok(hr == S_OK, "Read failed: 0x%08x\n", hr); if(SUCCEEDED(hr)) - ok(lstrcmpW(buf, strmC_name) == 0, + ok(strcmp_ww(buf, strmC_name) == 0, "Expected %s to be read, got %s\n", wine_dbgstr_w(strmC_name), wine_dbgstr_w(buf)); IStream_Release(strm_tmp); @@ -2177,8 +2189,8 @@ cleanup: if(file2) IStorage_Release(file2); - DeleteFileW(file1_name); - DeleteFileW(file2_name); + DeleteFileA(file1_nameA); + DeleteFileA(file2_nameA); } static void test_copyto_snbexclusions(void) @@ -2239,7 +2251,7 @@ static void test_copyto_snbexclusions(void) hr = IStream_Read(strm_tmp, buf, sizeof(buf), NULL); ok(hr == S_OK, "Read failed: 0x%08x\n", hr); if(SUCCEEDED(hr)) - ok(lstrcmpW(buf, strmB_name) == 0, + ok(strcmp_ww(buf, strmB_name) == 0, "Expected %s to be read, got %s\n", wine_dbgstr_w(strmB_name), wine_dbgstr_w(buf)); IStream_Release(strm_tmp); @@ -2260,8 +2272,8 @@ cleanup: if(file2) IStorage_Release(file2); - DeleteFileW(file1_name); - DeleteFileW(file2_name); + DeleteFileA(file1_nameA); + DeleteFileA(file2_nameA); } static void test_copyto_iidexclusions_storage(void) @@ -2327,7 +2339,7 @@ static void test_copyto_iidexclusions_storage(void) hr = IStream_Read(strm_tmp, buf, sizeof(buf), NULL); ok(hr == S_OK, "Read failed: 0x%08x\n", hr); if(SUCCEEDED(hr)) - ok(lstrcmpW(buf, strmC_name) == 0, + ok(strcmp_ww(buf, strmC_name) == 0, "Expected %s to be read, got %s\n", wine_dbgstr_w(strmC_name), wine_dbgstr_w(buf)); IStream_Release(strm_tmp); @@ -2339,8 +2351,8 @@ cleanup: if(file2) IStorage_Release(file2); - DeleteFileW(file1_name); - DeleteFileW(file2_name); + DeleteFileA(file1_nameA); + DeleteFileA(file2_nameA); } static void test_copyto_iidexclusions_stream(void) @@ -2412,8 +2424,8 @@ cleanup: if(file2) IStorage_Release(file2); - DeleteFileW(file1_name); - DeleteFileW(file2_name); + DeleteFileA(file1_nameA); + DeleteFileA(file2_nameA); } static void test_rename(void) @@ -2490,10 +2502,11 @@ static void test_toplevel_stat(void) IStorage *stg = NULL; HRESULT r; STATSTG stat; - WCHAR prev_dir[MAX_PATH]; - WCHAR temp[MAX_PATH]; - WCHAR full_path[MAX_PATH]; - LPWSTR rel_path; + char prev_dir[MAX_PATH]; + char temp[MAX_PATH]; + char full_path[MAX_PATH]; + LPSTR rel_pathA; + WCHAR rel_path[MAX_PATH]; DeleteFileA(filenameA); @@ -2502,7 +2515,7 @@ static void test_toplevel_stat(void) ok(r==S_OK, "StgCreateDocfile failed\n"); r = IStorage_Stat( stg, &stat, STATFLAG_DEFAULT ); - ok(!lstrcmpW(stat.pwcsName, filename), "expected %s, got %s\n", + ok(!strcmp_ww(stat.pwcsName, filename), "expected %s, got %s\n", wine_dbgstr_w(filename), wine_dbgstr_w(stat.pwcsName)); CoTaskMemFree(stat.pwcsName); @@ -2512,7 +2525,7 @@ static void test_toplevel_stat(void) ok(r==S_OK, "StgOpenStorage failed with error 0x%08x\n", r); r = IStorage_Stat( stg, &stat, STATFLAG_DEFAULT ); - ok(!lstrcmpW(stat.pwcsName, filename), "expected %s, got %s\n", + ok(!strcmp_ww(stat.pwcsName, filename), "expected %s, got %s\n", wine_dbgstr_w(filename), wine_dbgstr_w(stat.pwcsName)); CoTaskMemFree(stat.pwcsName); @@ -2521,20 +2534,21 @@ static void test_toplevel_stat(void) DeleteFileA(filenameA); /* Stat always returns the full path, even for files opened with a relative path. */ - GetCurrentDirectoryW(MAX_PATH, prev_dir); + GetCurrentDirectoryA(MAX_PATH, prev_dir); - GetTempPathW(MAX_PATH, temp); + GetTempPathA(MAX_PATH, temp); - SetCurrentDirectoryW(temp); + SetCurrentDirectoryA(temp); - GetFullPathNameW(filename, MAX_PATH, full_path, &rel_path); + GetFullPathNameA(filenameA, MAX_PATH, full_path, &rel_pathA); + MultiByteToWideChar(CP_ACP, 0, rel_pathA, -1, rel_path, MAX_PATH); r = StgCreateDocfile( rel_path, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE |STGM_TRANSACTED, 0, &stg); ok(r==S_OK, "StgCreateDocfile failed\n"); r = IStorage_Stat( stg, &stat, STATFLAG_DEFAULT ); - ok(!lstrcmpW(stat.pwcsName, filename), "expected %s, got %s\n", + ok(!strcmp_ww(stat.pwcsName, filename), "expected %s, got %s\n", wine_dbgstr_w(filename), wine_dbgstr_w(stat.pwcsName)); CoTaskMemFree(stat.pwcsName); @@ -2544,13 +2558,13 @@ static void test_toplevel_stat(void) ok(r==S_OK, "StgOpenStorage failed with error 0x%08x\n", r); r = IStorage_Stat( stg, &stat, STATFLAG_DEFAULT ); - ok(!lstrcmpW(stat.pwcsName, filename), "expected %s, got %s\n", + ok(!strcmp_ww(stat.pwcsName, filename), "expected %s, got %s\n", wine_dbgstr_w(filename), wine_dbgstr_w(stat.pwcsName)); CoTaskMemFree(stat.pwcsName); IStorage_Release( stg ); - SetCurrentDirectoryW(prev_dir); + SetCurrentDirectoryA(prev_dir); DeleteFileA(filenameA); }

1 0

Erich Hoover : ws2_32: Separate out hostent creation from duplication.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: f9f9566c74de7cb49a3355b658879213d61b36e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9f9566c74de7cb49a3355b65… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sat Dec 5 19:26:33 2009 -0700 ws2_32: Separate out hostent creation from duplication. --- dlls/ws2_32/socket.c | 58 +++++++++++++++++++++++++++++++++++++------------- 1 files changed, 43 insertions(+), 15 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 02d8af5..2cc8609 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -282,6 +282,7 @@ static INT num_startup; /* reference counter */ static FARPROC blocking_hook = (FARPROC)WSA_DefaultBlockingHook; /* function prototypes */ +static struct WS_hostent *WS_create_he(char *name, int aliases, int addresses); static struct WS_hostent *WS_dup_he(const struct hostent* p_he); static struct WS_protoent *WS_dup_pe(const struct protoent* p_pe); static struct WS_servent *WS_dup_se(const struct servent* p_se); @@ -4459,33 +4460,60 @@ static int list_dup(char** l_src, char** l_to, int item_size) /* ----- hostent */ -/* duplicate hostent entry - * and handle all Win16/Win32 dependent things (struct size, ...) *correctly*. - * Ditto for protoent and servent. +/* create a hostent entry + * + * Creates the entry with enough memory for the name, aliases + * addresses, and the address pointers. Also copies the name + * and sets up all the pointers. */ -static struct WS_hostent *WS_dup_he(const struct hostent* p_he) +static struct WS_hostent *WS_create_he(char *name, int aliases, int addresses) { - char *p; struct WS_hostent *p_to; + char *p; - int size = (sizeof(*p_he) + - strlen(p_he->h_name) + 1 + - list_size(p_he->h_aliases, 0) + - list_size(p_he->h_addr_list, p_he->h_length)); + int size = (sizeof(struct WS_hostent) + + strlen(name) + 1 + + sizeof(char *)*aliases + + sizeof(char *)*addresses); if (!(p_to = check_buffer_he(size))) return NULL; - p_to->h_addrtype = p_he->h_addrtype; - p_to->h_length = p_he->h_length; + memset(p_to, 0, size); p = (char *)(p_to + 1); p_to->h_name = p; - strcpy(p, p_he->h_name); + strcpy(p, name); p += strlen(p) + 1; - p_to->h_aliases = (char **)p; - p += list_dup(p_he->h_aliases, p_to->h_aliases, 0); + if (aliases != 0) + { + p_to->h_aliases = (char **)p; + p += sizeof(char *)*aliases; + } + if (addresses != 0) + { + p_to->h_addr_list = (char **)p; + p += sizeof(char *)*addresses; + } + return p_to; +} + +/* duplicate hostent entry + * and handle all Win16/Win32 dependent things (struct size, ...) *correctly*. + * Ditto for protoent and servent. + */ +static struct WS_hostent *WS_dup_he(const struct hostent* p_he) +{ + int addresses = list_size(p_he->h_addr_list, p_he->h_length); + int aliases = list_size(p_he->h_aliases, 0); + struct WS_hostent *p_to; + + p_to = WS_create_he(p_he->h_name, aliases, addresses); + + if (!p_to) return NULL; + p_to->h_addrtype = p_he->h_addrtype; + p_to->h_length = p_he->h_length; - p_to->h_addr_list = (char **)p; + list_dup(p_he->h_aliases, p_to->h_aliases, 0); list_dup(p_he->h_addr_list, p_to->h_addr_list, p_he->h_length); return p_to; }

1 0

Erich Hoover : ws2_32: Return the full list of local IP addresses when gethostbyname() is called on the local hostname.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 355818ae1e1222bffab7d014a952e4f70e3623d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=355818ae1e1222bffab7d014a… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sat Dec 5 19:26:56 2009 -0700 ws2_32: Return the full list of local IP addresses when gethostbyname() is called on the local hostname. --- dlls/ws2_32/socket.c | 206 ++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 181 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=355818ae1e1222bffab7d…

1 0

Maarten Lankhorst : dsound: Clean up DSPROPERTY_Enumerate1.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: d0b43b86dd820a6065bd0d8294d8e822f65f00e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0b43b86dd820a6065bd0d829… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Dec 9 16:58:02 2009 +0100 dsound: Clean up DSPROPERTY_Enumerate1. --- dlls/dsound/propset.c | 128 ++++++++++++++++++------------------------------- 1 files changed, 46 insertions(+), 82 deletions(-) diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index c257eea..6c62325 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -702,88 +702,6 @@ static HRESULT DSPROPERTY_DescriptionW( return S_OK; } -static HRESULT DSPROPERTY_Enumerate1( - LPVOID pPropData, - ULONG cbPropData, - PULONG pcbReturned ) -{ - PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1_DATA ppd = (PDSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1_DATA) pPropData; - HRESULT err; - TRACE("(pPropData=%p,cbPropData=%d,pcbReturned=%p)\n", - pPropData,cbPropData,pcbReturned); - - if (ppd) { - if (ppd->Callback) { - unsigned devs, wod, wid; - DSDRIVERDESC desc; - DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA data; - - devs = waveOutGetNumDevs(); - for (wod = 0; wod < devs; ++wod) { - err = mmErr(waveOutMessage(UlongToHandle(wod),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0)); - if (err == DS_OK) { - PIDSCDRIVER drv; - ZeroMemory(&data, sizeof(data)); - data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_RENDER; - data.WaveDeviceId = wod; - data.DeviceId = DSOUND_renderer_guids[wod]; - lstrcpynA(data.DescriptionA, desc.szDesc, sizeof(data.DescriptionA)); - lstrcpynA(data.ModuleA, desc.szDrvname, sizeof(data.ModuleA)); - - MultiByteToWideChar( CP_ACP, 0, data.DescriptionA, -1, data.DescriptionW, sizeof(data.DescriptionW)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, data.ModuleA, -1, data.ModuleW, sizeof(data.ModuleW)/sizeof(WCHAR) ); - - data.Type = DIRECTSOUNDDEVICE_TYPE_EMULATED; - err = mmErr(waveOutMessage(UlongToHandle(wod), DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0)); - if (err == DS_OK && drv) - data.Type = DIRECTSOUNDDEVICE_TYPE_VXD; - else - WARN("waveOutMessage(DRV_QUERYDSOUNDIFACE) failed\n"); - - TRACE("calling Callback(%p,%p)\n", &data, ppd->Context); - (ppd->Callback)(&data, ppd->Context); - } - } - - devs = waveInGetNumDevs(); - for (wid = 0; wid < devs; ++wid) { - err = mmErr(waveInMessage(UlongToHandle(wid),DRV_QUERYDSOUNDDESC,(DWORD_PTR)&desc,0)); - if (err == DS_OK) { - PIDSCDRIVER drv; - ZeroMemory(&data, sizeof(data)); - data.DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE; - data.WaveDeviceId = wid; - data.DeviceId = DSOUND_capture_guids[wid]; - lstrcpynA(data.DescriptionA, desc.szDesc, sizeof(data.DescriptionA)); - lstrcpynA(data.ModuleA, desc.szDrvname, sizeof(data.ModuleA)); - - MultiByteToWideChar( CP_ACP, 0, data.DescriptionA, -1, data.DescriptionW, sizeof(data.DescriptionW)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, data.ModuleA, -1, data.ModuleW, sizeof(data.ModuleW)/sizeof(WCHAR) ); - - data.Type = DIRECTSOUNDDEVICE_TYPE_EMULATED; - err = mmErr(waveInMessage(UlongToHandle(wid), DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0)); - if (err == DS_OK && drv) - data.Type = DIRECTSOUNDDEVICE_TYPE_VXD; - else - WARN("waveInMessage(DRV_QUERYDSOUNDIFACE) failed\n"); - - TRACE("calling Callback(%p,%p)\n", &data, ppd->Context); - (ppd->Callback)(&data, ppd->Context); - } - } - - return S_OK; - } - } - - if (pcbReturned) { - *pcbReturned = 0; - FIXME("*pcbReturned=%d\n", *pcbReturned); - } - - return E_PROP_ID_UNSUPPORTED; -} - static HRESULT DSPROPERTY_EnumerateW( LPVOID pPropData, ULONG cbPropData, @@ -874,6 +792,21 @@ static BOOL DSPROPERTY_descWtoA(DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA return TRUE; } +static void DSPROPERTY_descWto1(DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA *dataW, + DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA *data1) +{ + data1->DeviceId = dataW->DeviceId; + lstrcpynW(data1->ModuleW, dataW->Module, sizeof(data1->ModuleW)/sizeof(*data1->ModuleW)); + lstrcpynW(data1->DescriptionW, dataW->Description, sizeof(data1->DescriptionW)/sizeof(*data1->DescriptionW)); + WideCharToMultiByte(CP_ACP, 0, data1->DescriptionW, -1, data1->DescriptionA, sizeof(data1->DescriptionA)-1, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, data1->ModuleW, -1, data1->ModuleA, sizeof(data1->ModuleA)-1, NULL, NULL); + data1->DescriptionA[sizeof(data1->DescriptionA)-1] = 0; + data1->ModuleA[sizeof(data1->ModuleA)-1] = 0; + data1->Type = dataW->Type; + data1->DataFlow = dataW->DataFlow; + data1->WaveDeviceId = data1->Devnode = dataW->WaveDeviceId; +} + static BOOL CALLBACK DSPROPERTY_enumWtoA(DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA *descW, void *data) { DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A_DATA descA; @@ -909,6 +842,37 @@ static HRESULT DSPROPERTY_EnumerateA( return DSPROPERTY_EnumerateW(&data, cbPropData, pcbReturned); } +static BOOL CALLBACK DSPROPERTY_enumWto1(DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W_DATA *descW, void *data) +{ + DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA desc1; + DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1_DATA *ppd = data; + BOOL ret; + + DSPROPERTY_descWto1(descW, &desc1); + ret = ppd->Callback(&desc1, ppd->Context); + return ret; +} + +static HRESULT DSPROPERTY_Enumerate1( + LPVOID pPropData, + ULONG cbPropData, + PULONG pcbReturned) +{ + DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1_DATA *ppd = pPropData; + DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA data; + + if (!ppd || !ppd->Callback) + { + WARN("Invalid ppd %p\n", ppd); + return E_PROP_ID_UNSUPPORTED; + } + + data.Callback = DSPROPERTY_enumWto1; + data.Context = ppd; + + return DSPROPERTY_EnumerateW(&data, cbPropData, pcbReturned); +} + static HRESULT WINAPI IKsPrivatePropertySetImpl_Get( LPKSPROPERTYSET iface, REFGUID guidPropSet,

1 0