June 2010 - Wine-Commits - list.winehq.org

Andrew Nguyen : setupapi/tests: Add simple enumeration tests for SetupIterateCabinetW.
by Alexandre Julliard June 16, 2010

June 16, 2010

Module: wine Branch: master Commit: 813024d4923c633da5e755ff993d0e3662365a6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=813024d4923c633da5e755ff9… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jun 15 05:21:07 2010 -0500 setupapi/tests: Add simple enumeration tests for SetupIterateCabinetW. --- dlls/setupapi/tests/setupcab.c | 73 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 70 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/tests/setupcab.c b/dlls/setupapi/tests/setupcab.c index 801d111..47a9ab9 100644 --- a/dlls/setupapi/tests/setupcab.c +++ b/dlls/setupapi/tests/setupcab.c @@ -42,6 +42,8 @@ static const BYTE comp_cab_zip_multi[] = { 0x4d, 0xe1, 0xe5, 0x2a, 0x2e, 0x49, 0x2d, 0xca, 0x03, 0x8a, 0x02, 0x00 }; +static const WCHAR docW[] = {'d','o','c',0}; + static void create_source_fileA(LPSTR filename, const BYTE *data, DWORD size) { HANDLE handle; @@ -150,7 +152,6 @@ static void test_invalid_parametersA(void) static void test_invalid_parametersW(void) { static const WCHAR nonexistentW[] = {'c',':','\\','n','o','n','e','x','i','s','t','e','n','t','.','c','a','b',0}; - static const WCHAR docW[] = {'d','o','c',0}; static const WCHAR emptyW[] = {0}; BOOL ret; @@ -282,8 +283,6 @@ static void test_invalid_callbackA(void) static void test_invalid_callbackW(void) { - static const WCHAR docW[] = {'d','o','c',0}; - BOOL ret; WCHAR source[MAX_PATH], temp[MAX_PATH]; @@ -373,6 +372,73 @@ static void test_simple_enumerationA(void) DeleteFileA(source); } +static const WCHAR tristramW[] = {'t','r','i','s','t','r','a','m',0}; +static const WCHAR wineW[] = {'w','i','n','e',0}; +static const WCHAR shandyW[] = {'s','h','a','n','d','y',0}; +static const WCHAR *expected_filesW[] = {tristramW, wineW, shandyW}; + +static UINT CALLBACK simple_callbackW(PVOID Context, UINT Notification, + UINT_PTR Param1, UINT_PTR Param2) +{ + static int index; + int *file_count = Context; + + switch (Notification) + { + case SPFILENOTIFY_CABINETINFO: + index = 0; + return NO_ERROR; + case SPFILENOTIFY_FILEINCABINET: + { + FILE_IN_CABINET_INFO_W *info = (FILE_IN_CABINET_INFO_W *)Param1; + + (*file_count)++; + + if (index < sizeof(expected_filesW)/sizeof(WCHAR *)) + { + ok(!lstrcmpW(expected_filesW[index], info->NameInCabinet), + "[%d] Expected file %s, got %s\n", + index, wine_dbgstr_w(expected_filesW[index]), wine_dbgstr_w(info->NameInCabinet)); + index++; + return FILEOP_SKIP; + } + else + { + ok(0, "Unexpectedly enumerated more than number of files in cabinet, index = %d\n", index); + return FILEOP_ABORT; + } + } + default: + return NO_ERROR; + } +} + +static void test_simple_enumerationW(void) +{ + BOOL ret; + WCHAR source[MAX_PATH], temp[MAX_PATH]; + int enum_count = 0; + + ret = SetupIterateCabinetW(NULL, 0, NULL, NULL); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("SetupIterateCabinetW is not available\n"); + return; + } + + GetTempPathW(sizeof(temp)/sizeof(WCHAR), temp); + GetTempFileNameW(temp, docW, 0, source); + + create_source_fileW(source, comp_cab_zip_multi, sizeof(comp_cab_zip_multi)); + + ret = SetupIterateCabinetW(source, 0, simple_callbackW, &enum_count); + ok(ret == 1, "Expected SetupIterateCabinetW to return 1, got %d\n", ret); + ok(enum_count == sizeof(expected_files)/sizeof(WCHAR *), + "Unexpectedly enumerated %d files\n", enum_count); + + DeleteFileW(source); +} + START_TEST(setupcab) { test_invalid_parametersA(); @@ -386,4 +452,5 @@ START_TEST(setupcab) } test_simple_enumerationA(); + test_simple_enumerationW(); }

1 0

Andrew Nguyen : setupapi: Only extract the first MSZIP cabinet file in SetupDecompressOrExtractFile.
by Alexandre Julliard June 16, 2010

June 16, 2010

Module: wine Branch: master Commit: a44506b563af5a1f852c3c26478adb75ffe01b38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a44506b563af5a1f852c3c264… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jun 15 22:05:36 2010 -0500 setupapi: Only extract the first MSZIP cabinet file in SetupDecompressOrExtractFile. --- dlls/setupapi/misc.c | 26 +++++++++++--------- dlls/setupapi/tests/misc.c | 54 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 67 insertions(+), 13 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 3343cd2..6e83962 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -1456,26 +1456,27 @@ static DWORD decompress_file_lz( LPCWSTR source, LPCWSTR target ) return ret; } +struct callback_context +{ + int has_extracted; + LPCWSTR target; +}; + static UINT CALLBACK decompress_or_copy_callback( PVOID context, UINT notification, UINT_PTR param1, UINT_PTR param2 ) { + struct callback_context *context_info = context; FILE_IN_CABINET_INFO_W *info = (FILE_IN_CABINET_INFO_W *)param1; switch (notification) { case SPFILENOTIFY_FILEINCABINET: { - LPCWSTR filename, targetname = context; - WCHAR *p; - - if ((p = strrchrW( targetname, '\\' ))) filename = p + 1; - else filename = targetname; + if (context_info->has_extracted) + return FILEOP_ABORT; - if (!lstrcmpiW( filename, info->NameInCabinet )) - { - strcpyW( info->FullTargetName, targetname ); - return FILEOP_DOIT; - } - return FILEOP_SKIP; + strcpyW( info->FullTargetName, context_info->target ); + context_info->has_extracted = 1; + return FILEOP_DOIT; } default: return NO_ERROR; } @@ -1483,9 +1484,10 @@ static UINT CALLBACK decompress_or_copy_callback( PVOID context, UINT notificati static DWORD decompress_file_cab( LPCWSTR source, LPCWSTR target ) { + struct callback_context context = {0, target}; BOOL ret; - ret = SetupIterateCabinetW( source, 0, decompress_or_copy_callback, (PVOID)target ); + ret = SetupIterateCabinetW( source, 0, decompress_or_copy_callback, &context ); if (ret) return ERROR_SUCCESS; else return GetLastError(); diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index 20f2683..f2d885d 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -361,6 +361,9 @@ static BOOL compare_file_data(LPSTR file, const BYTE *data, DWORD size) static const BYTE uncompressed[] = { 'u','n','c','o','m','p','r','e','s','s','e','d','\r','\n' }; +static const BYTE laurence[] = { + 'l','a','u','r','e','n','c','e','\r','\n' +}; static const BYTE comp_lzx[] = { 0x53, 0x5a, 0x44, 0x44, 0x88, 0xf0, 0x27, 0x33, 0x41, 0x00, 0x0e, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x75, 0x6e, 0x63, 0x6f, 0x6d, 0x70, 0x3f, 0x72, 0x65, 0x73, 0x73, 0x65, 0x64 @@ -394,6 +397,18 @@ static const BYTE comp_cab_zip[] = { 0x00, 0x7c, 0x80, 0x26, 0x2b, 0x12, 0x00, 0x0e, 0x00, 0x43, 0x4b, 0x2b, 0xcd, 0x4b, 0xce, 0xcf, 0x2d, 0x28, 0x4a, 0x2d, 0x2e, 0x4e, 0x4d, 0xe1, 0xe5, 0x02, 0x00 }; +static const BYTE comp_cab_zip_multi[] = { + 0x4d, 0x53, 0x43, 0x46, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x01, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x71, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x0a, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd1, 0x38, 0xf0, 0x48, 0x20, 0x00, 0x74, 0x72, 0x69, 0x73, + 0x74, 0x72, 0x61, 0x6d, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd1, + 0x38, 0xf0, 0x48, 0x20, 0x00, 0x77, 0x69, 0x6e, 0x65, 0x00, 0x08, 0x00, 0x00, 0x00, 0x18, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xd1, 0x38, 0xf0, 0x48, 0x20, 0x00, 0x73, 0x68, 0x61, 0x6e, 0x64, 0x79, + 0x00, 0x67, 0x2c, 0x03, 0x85, 0x23, 0x00, 0x20, 0x00, 0x43, 0x4b, 0xcb, 0x49, 0x2c, 0x2d, 0x4a, + 0xcd, 0x4b, 0x4e, 0xe5, 0xe5, 0x2a, 0xcd, 0x4b, 0xce, 0xcf, 0x2d, 0x28, 0x4a, 0x2d, 0x2e, 0x4e, + 0x4d, 0xe1, 0xe5, 0x2a, 0x2e, 0x49, 0x2d, 0xca, 0x03, 0x8a, 0x02, 0x00 +}; static void test_SetupGetFileCompressionInfo(void) { @@ -523,6 +538,23 @@ static void test_SetupDecompressOrCopyFile(void) {source, NULL, &type}, }; + const struct + { + const char *filename; + const BYTE *expected_buffer; + const size_t buffer_size; + } zip_multi_tests[] = + { + {"tristram", laurence, sizeof(laurence)}, + {"tristram.txt", laurence, sizeof(laurence)}, + {"wine", laurence, sizeof(laurence)}, + {"wine.txt", laurence, sizeof(laurence)}, + {"shandy", laurence, sizeof(laurence)}, + {"shandy.txt", laurence, sizeof(laurence)}, + {"deadbeef", laurence, sizeof(laurence)}, + {"deadbeef.txt", laurence, sizeof(laurence)}, + }; + GetTempPathA(sizeof(temp), temp); GetTempFileNameA(temp, "doc", 0, source); GetTempFileNameA(temp, "doc", 0, target); @@ -624,7 +656,27 @@ static void test_SetupDecompressOrCopyFile(void) ok(!ret, "SetupDecompressOrCopyFile failed unexpectedly: %d\n", ret); ok(compare_file_data(target, comp_cab_zip, sizeof(comp_cab_zip)), "incorrect target file\n"); - DeleteFileA(target); + /* Show that SetupDecompressOrCopyFileA simply extracts the first file it + * finds within the compressed cabinet. Contents are: + * tristram -> "laurence\r\n" + * wine -> "uncompressed\r\n" + * shandy -> "sterne\r\n" */ + + create_source_file(source, comp_cab_zip_multi, sizeof(comp_cab_zip_multi)); + + p = strrchr(target, '\\'); + + for (i = 0; i < sizeof(zip_multi_tests)/sizeof(zip_multi_tests[0]); i++) + { + lstrcpyA(p + 1, zip_multi_tests[i].filename); + + ret = SetupDecompressOrCopyFileA(source, target, NULL); + ok(!ret, "[%d] SetupDecompressOrCopyFile failed unexpectedly: %d\n", i, ret); + ok(compare_file_data(target, zip_multi_tests[i].expected_buffer, zip_multi_tests[i].buffer_size), + "[%d] incorrect target file\n", i); + DeleteFileA(target); + } + DeleteFileA(source); }

1 0

Andrew Nguyen : setupapi: Validate the cabinet filename parameter in SetupIterateCabinetW.
by Alexandre Julliard June 16, 2010

June 16, 2010

Module: wine Branch: master Commit: debe525f3fa8a5e80994dc9fca46d88f6db49e79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=debe525f3fa8a5e80994dc9fc… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed Jun 16 07:35:57 2010 -0500 setupapi: Validate the cabinet filename parameter in SetupIterateCabinetW. --- dlls/setupapi/setupcab.c | 8 ++- dlls/setupapi/tests/setupcab.c | 112 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index 185fe17..4a54ae4 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -622,7 +622,7 @@ BOOL WINAPI SetupIterateCabinetW(PCWSTR CabinetFile, DWORD Reserved, UINT len; SC_HSC_W my_hsc; ERF erf; - WCHAR pszCabPathW[MAX_PATH], *p; + WCHAR pszCabPathW[MAX_PATH], *p = NULL; DWORD fpnsize; BOOL ret; @@ -632,7 +632,11 @@ BOOL WINAPI SetupIterateCabinetW(PCWSTR CabinetFile, DWORD Reserved, if (!LoadCABINETDll()) return FALSE; - if (!CabinetFile) return FALSE; + if (!CabinetFile) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } fpnsize = GetFullPathNameW(CabinetFile, MAX_PATH, pszCabPathW, &p); if (fpnsize > MAX_PATH) { diff --git a/dlls/setupapi/tests/setupcab.c b/dlls/setupapi/tests/setupcab.c index 6e211ce..3c126c9 100644 --- a/dlls/setupapi/tests/setupcab.c +++ b/dlls/setupapi/tests/setupcab.c @@ -40,6 +40,17 @@ static void create_source_fileA(LPSTR filename, const BYTE *data, DWORD size) CloseHandle(handle); } +static void create_source_fileW(LPWSTR filename, const BYTE *data, DWORD size) +{ + HANDLE handle; + DWORD written; + + handle = CreateFileW(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + WriteFile(handle, data, size, &written, NULL); + CloseHandle(handle); +} + static UINT CALLBACK dummy_callbackA(PVOID Context, UINT Notification, UINT_PTR Param1, UINT_PTR Param2) { @@ -48,6 +59,14 @@ static UINT CALLBACK dummy_callbackA(PVOID Context, UINT Notification, return 0; } +static UINT CALLBACK dummy_callbackW(PVOID Context, UINT Notification, + UINT_PTR Param1, UINT_PTR Param2) +{ + ok(0, "Received unexpected notification (%p, %u, %lu, %lu)\n", Context, + Notification, Param1, Param2); + return 0; +} + static void test_invalid_parametersA(void) { BOOL ret; @@ -115,7 +134,100 @@ static void test_invalid_parametersA(void) DeleteFileA(source); } +static void test_invalid_parametersW(void) +{ + static const WCHAR nonexistentW[] = {'c',':','\\','n','o','n','e','x','i','s','t','e','n','t','.','c','a','b',0}; + static const WCHAR docW[] = {'d','o','c',0}; + static const WCHAR emptyW[] = {0}; + + BOOL ret; + WCHAR source[MAX_PATH], temp[MAX_PATH]; + int i; + + const struct + { + PCWSTR CabinetFile; + PSP_FILE_CALLBACK MsgHandler; + DWORD expected_lasterror; + int todo_lasterror; + } invalid_parameters[] = + { + {nonexistentW, NULL, ERROR_FILE_NOT_FOUND}, + {nonexistentW, dummy_callbackW, ERROR_FILE_NOT_FOUND}, + {source, NULL, ERROR_INVALID_DATA, 1}, + {source, dummy_callbackW, ERROR_INVALID_DATA, 1}, + }; + + ret = SetupIterateCabinetW(NULL, 0, NULL, NULL); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("SetupIterateCabinetW is not available\n"); + return; + } + + GetTempPathW(sizeof(temp)/sizeof(WCHAR), temp); + GetTempFileNameW(temp, docW, 0, source); + + create_source_fileW(source, NULL, 0); + + for (i = 0; i < sizeof(invalid_parameters)/sizeof(invalid_parameters[0]); i++) + { + SetLastError(0xdeadbeef); + ret = SetupIterateCabinetW(invalid_parameters[i].CabinetFile, 0, + invalid_parameters[i].MsgHandler, NULL); + ok(!ret, "[%d] Expected SetupIterateCabinetW to return 0, got %d\n", i, ret); + if (invalid_parameters[i].todo_lasterror) + { + todo_wine + ok(GetLastError() == invalid_parameters[i].expected_lasterror, + "[%d] Expected GetLastError() to return %u, got %u\n", + i, invalid_parameters[i].expected_lasterror, GetLastError()); + } + else + { + ok(GetLastError() == invalid_parameters[i].expected_lasterror, + "[%d] Expected GetLastError() to return %u, got %u\n", + i, invalid_parameters[i].expected_lasterror, GetLastError()); + } + } + + SetLastError(0xdeadbeef); + ret = SetupIterateCabinetW(NULL, 0, NULL, NULL); + ok(!ret, "Expected SetupIterateCabinetW to return 0, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER || + GetLastError() == ERROR_NOT_ENOUGH_MEMORY, /* Vista/Win2k8 */ + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupIterateCabinetW(NULL, 0, dummy_callbackW, NULL); + ok(!ret, "Expected SetupIterateCabinetW to return 0, got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER || + GetLastError() == ERROR_NOT_ENOUGH_MEMORY, /* Vista/Win2k8 */ + "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupIterateCabinetW(emptyW, 0, NULL, NULL); + ok(!ret, "Expected SetupIterateCabinetW to return 0, got %d\n", ret); + ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY || + GetLastError() == ERROR_FILE_NOT_FOUND, /* NT4/Win2k */ + "Expected GetLastError() to return ERROR_NOT_ENOUGH_MEMORY, got %u\n", + GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupIterateCabinetW(emptyW, 0, dummy_callbackW, NULL); + ok(!ret, "Expected SetupIterateCabinetW to return 0, got %d\n", ret); + ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY || + GetLastError() == ERROR_FILE_NOT_FOUND, /* NT4/Win2k */ + "Expected GetLastError() to return ERROR_NOT_ENOUGH_MEMORY, got %u\n", + GetLastError()); + + DeleteFileW(source); +} + START_TEST(setupcab) { test_invalid_parametersA(); + test_invalid_parametersW(); }

1 0

Alexandre Julliard : ntdll: Print a warning when failing to set execute permissions on a section.
by Alexandre Julliard June 16, 2010

June 16, 2010

Module: wine Branch: master Commit: b9a13d6d819ac265b1a75005045b42edfecfb704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9a13d6d819ac265b1a750050… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 16 20:06:47 2010 +0200 ntdll: Print a warning when failing to set execute permissions on a section. --- dlls/ntdll/virtual.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 23a5d4c..84427fb 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1285,7 +1285,9 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz (nt->OptionalHeader.AddressOfEntryPoint < sec->VirtualAddress + size)) vprot |= VPROT_EXEC; - VIRTUAL_SetProt( view, ptr + sec->VirtualAddress, size, vprot ); + if (!VIRTUAL_SetProt( view, ptr + sec->VirtualAddress, size, vprot ) && (vprot & VPROT_EXEC)) + ERR( "failed to set %08x protection on section %.8s, noexec filesystem?\n", + sec->Characteristics, sec->Name ); } done:

1 0

Detlef Riekenberg : winspool: Return ERROR_MORE_DATA, when the app probe for the needed buffer size.
by Alexandre Julliard June 16, 2010

June 16, 2010

Module: wine Branch: master Commit: 18193b193bd80190b51b57ef8312e7e38369ad9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=18193b193bd80190b51b57ef8… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jun 16 00:42:23 2010 +0200 winspool: Return ERROR_MORE_DATA, when the app probe for the needed buffer size. --- dlls/winspool.drv/info.c | 12 ++++++++++++ dlls/winspool.drv/tests/info.c | 15 +++++++++++++++ 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 3f97ebd..885b8df 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -5367,6 +5367,8 @@ DWORD WINAPI GetPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName, ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters); if (ret) return ret; + TRACE("printer->name: %s\n", debugstr_w(printer->name)); + if (printer->name) { ret = RegOpenKeyW(hkeyPrinters, printer->name, &hkeyPrinter); @@ -5385,9 +5387,13 @@ DWORD WINAPI GetPrinterDataExA(HANDLE hPrinter, LPCSTR pKeyName, ret = RegQueryValueExA(printer->name ? hkeySubkey : hkeyPrinters, pValueName, 0, pType, pData, pcbNeeded); + if (!ret && !pData) ret = ERROR_MORE_DATA; + RegCloseKey(hkeySubkey); RegCloseKey(hkeyPrinter); RegCloseKey(hkeyPrinters); + + TRACE("--> %d\n", ret); return ret; } @@ -5411,6 +5417,8 @@ DWORD WINAPI GetPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName, ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters); if (ret) return ret; + TRACE("printer->name: %s\n", debugstr_w(printer->name)); + if (printer->name) { ret = RegOpenKeyW(hkeyPrinters, printer->name, &hkeyPrinter); @@ -5429,9 +5437,13 @@ DWORD WINAPI GetPrinterDataExW(HANDLE hPrinter, LPCWSTR pKeyName, ret = RegQueryValueExW(printer->name ? hkeySubkey : hkeyPrinters, pValueName, 0, pType, pData, pcbNeeded); + if (!ret && !pData) ret = ERROR_MORE_DATA; + RegCloseKey(hkeySubkey); RegCloseKey(hkeyPrinter); RegCloseKey(hkeyPrinters); + + TRACE("--> %d\n", ret); return ret; } diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index be7be7d..b86d367 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2364,6 +2364,14 @@ static void test_GetPrinterData(void) ok( !res && (type == REG_SZ) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d or %d)\n", res, type, needed, buffer, len, len * sizeof(WCHAR)); + + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = GetPrinterDataA(hprn, defaultspooldirectory, NULL, NULL, 0, &needed); + ok( (res == ERROR_MORE_DATA) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), + "got %d, needed: %d (expected ERROR_MORE_DATA and %d or %d)\n", + res, needed, len, len * sizeof(WCHAR)); + /* ToDo: test SPLREG_* */ SetLastError(0xdeadbeef); @@ -2451,6 +2459,13 @@ static void test_GetPrinterDataEx(void) "got %d, type %d, needed: %d and '%s' (expected ERROR_SUCCESS, REG_SZ and %d or %d)\n", res, type, needed, buffer, len, len * sizeof(WCHAR)); + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pGetPrinterDataExA(hprn, NULL, defaultspooldirectory, NULL, NULL, 0, &needed); + ok( (res == ERROR_MORE_DATA) && ((needed == len) || (needed == (len * sizeof(WCHAR)))), + "got %d, needed: %d (expected ERROR_MORE_DATA and %d or %d)\n", + res, needed, len, len * sizeof(WCHAR)); + SetLastError(0xdeadbeef); res = ClosePrinter(hprn); ok(res, "ClosePrinter error %d\n", GetLastError());

1 0

André Hentschel : winegcc: Add detection for --param options.
by Alexandre Julliard June 16, 2010

June 16, 2010

Module: wine Branch: master Commit: 7d7562d7394c55ac0bc472890e1d5f092e47fba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d7562d7394c55ac0bc472890… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 15 21:30:01 2010 +0200 winegcc: Add detection for --param options. --- tools/winegcc/winegcc.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index fd31060..40f44c3 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1189,6 +1189,10 @@ int main(int argc, char **argv) if (strcmp("-framework", argv[i]) == 0) next_is_arg = 1; break; + case '-': + if (strcmp("--param", argv[i]) == 0) + next_is_arg = 1; + break; } if (next_is_arg) option_arg = argv[i+1];

1 0

Jörg Höhle : mmsystem: Log MCI command name again .
by Alexandre Julliard June 16, 2010

June 16, 2010

Module: wine Branch: master Commit: 8f5ec326e11362d73a27af4b6c098c14af38cd0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f5ec326e11362d73a27af4b6… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Jun 14 20:21:22 2010 +0200 mmsystem: Log MCI command name again. --- dlls/mmsystem.dll16/mci16.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mmsystem.dll16/mci16.c b/dlls/mmsystem.dll16/mci16.c index f09923a..914636d 100644 --- a/dlls/mmsystem.dll16/mci16.c +++ b/dlls/mmsystem.dll16/mci16.c @@ -627,7 +627,7 @@ DWORD WINAPI mciSendCommand16(UINT16 wDevID, UINT16 wMsg, DWORD dwParam1, DWORD BOOL to32; DWORD_PTR dwParam2 = p2; - TRACE("(%04X, %u, %08X, %08lX)\n", wDevID, wMsg, dwParam1, dwParam2); + TRACE("(%04X, %s, %08X, %08lX)\n", wDevID, MCI_MessageToString(wMsg), dwParam1, dwParam2); switch (wMsg) { case MCI_CLOSE: @@ -651,11 +651,11 @@ DWORD WINAPI mciSendCommand16(UINT16 wDevID, UINT16 wMsg, DWORD dwParam1, DWORD switch (res = MCI_MapMsg16To32W(wMsg, dwParam1, &dwParam2)) { case MMSYSTEM_MAP_MSGERROR: - TRACE("Not handled yet (%u)\n", wMsg); + TRACE("%s not handled yet\n", MCI_MessageToString(wMsg)); dwRet = MCIERR_DRIVER_INTERNAL; break; case MMSYSTEM_MAP_NOMEM: - TRACE("Problem mapping msg=%u from 16 to 32a\n", wMsg); + TRACE("Problem mapping %s from 16 to 32a\n", MCI_MessageToString(wMsg)); dwRet = MCIERR_OUT_OF_MEMORY; break; case MMSYSTEM_MAP_OK:

1 0

Aric Stewart : usp10/tests: Having numbers in the ScriptStringXtoCP tests causes unpredictable behavior .
by Alexandre Julliard June 16, 2010

June 16, 2010

Module: wine Branch: master Commit: 25f45df11d6c1ae4d5889d2ccd09751f8741052c URL: http://source.winehq.org/git/wine.git/?a=commit;h=25f45df11d6c1ae4d5889d2cc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 16 15:12:44 2010 +0900 usp10/tests: Having numbers in the ScriptStringXtoCP tests causes unpredictable behavior. --- dlls/usp10/tests/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index e47d7c5..8b1f603 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1243,7 +1243,7 @@ static void test_ScriptStringXtoCP_CPtoX(HDC hdc) */ HRESULT hr; - WCHAR teststr1[] = {'T', 'e', 's', 't', 'e', '1', '2', ' ', 'a', '\0'}; + WCHAR teststr1[] = {'T', 'e', 's', 't', 'e', 'a', 'b', ' ', 'a', '\0'}; void *String = (WCHAR *) &teststr1; /* ScriptStringAnalysis needs void */ int String_len = (sizeof(teststr1)/sizeof(WCHAR))-1; int Glyphs = String_len * 2 + 16; /* size of buffer as recommended */

1 0

Alexandre Julliard : user32: Don' t try to alpha blend icons when drawing to a monochrome device.
by Alexandre Julliard June 16, 2010

June 16, 2010

Module: wine Branch: master Commit: d87715c831de95cd4ba572db275ac2f0e856dfac URL: http://source.winehq.org/git/wine.git/?a=commit;h=d87715c831de95cd4ba572db2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 16 14:54:37 2010 +0200 user32: Don't try to alpha blend icons when drawing to a monochrome device. --- dlls/user32/cursoricon.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 0f8d7da..9a1810e 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2054,11 +2054,21 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, if (ptr->alpha && (flags & DI_IMAGE)) { - BLENDFUNCTION pixelblend = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA }; + BOOL is_mono = FALSE; - SelectObject( hMemDC, ptr->alpha ); - if (GdiAlphaBlend( hdc_dest, x, y, cxWidth, cyWidth, hMemDC, - 0, 0, ptr->width, ptr->height, pixelblend )) goto done; + if (GetObjectType( hdc_dest ) == OBJ_MEMDC) + { + BITMAP bm; + HBITMAP bmp = GetCurrentObject( hdc_dest, OBJ_BITMAP ); + is_mono = GetObjectW( bmp, sizeof(bm), &bm ) && bm.bmBitsPixel == 1; + } + if (!is_mono) + { + BLENDFUNCTION pixelblend = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA }; + SelectObject( hMemDC, ptr->alpha ); + if (GdiAlphaBlend( hdc_dest, x, y, cxWidth, cyWidth, hMemDC, + 0, 0, ptr->width, ptr->height, pixelblend )) goto done; + } } if (flags & DI_MASK)

1 0

Michael Stefaniuc : mapi32: The Portuguese translation is in UTF-8.
by Alexandre Julliard June 16, 2010

June 16, 2010

Module: wine Branch: master Commit: 8e151f51260598f2bbd1e6e9290edaa1ad950696 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e151f51260598f2bbd1e6e92… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 15 23:12:11 2010 +0200 mapi32: The Portuguese translation is in UTF-8. --- dlls/mapi32/Pt.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/Pt.rc b/dlls/mapi32/Pt.rc index 4772bcf..ab8a8d1 100644 --- a/dlls/mapi32/Pt.rc +++ b/dlls/mapi32/Pt.rc @@ -23,6 +23,8 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE +#pragma code_page(65001) + STRINGTABLE { IDS_NO_MAPI_CLIENT, "O envio de correio falhou porque não existe um cliente de correio MAPI instalado."

1 0