May 2007 - Wine-commits - list.winehq.org

Rob Shearman : setupapi: SetupOpenInfFile returns INVALID_HANDLE_VALUE on failure, not NULL.
by Alexandre Julliard 11 May '07

11 May '07

Module: wine Branch: master Commit: c4eeb9f6fae56a6e85b847a03a78ec0e1fde01c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4eeb9f6fae56a6e85b847a03… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu May 10 14:25:39 2007 +0100 setupapi: SetupOpenInfFile returns INVALID_HANDLE_VALUE on failure, not NULL. Fix SetupQueryInfOriginalFileInformation to check for the former rather than the latter. --- dlls/setupapi/query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index cd50dee..8699264 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -672,7 +672,7 @@ BOOL WINAPI SetupQueryInfOriginalFileInformationW( * the original inf file and cache it, but that would require building a * .pnf file. */ hinf = SetupOpenInfFileW(inf_path, NULL, INF_STYLE_WIN4, NULL); - if (!hinf) return FALSE; + if (hinf == INVALID_HANDLE_VALUE) return FALSE; if (!SetupGetLineTextW(NULL, hinf, wszVersion, wszCatalogFile, OriginalFileInfo->OriginalCatalogName,

1 0

Kirill K. Smirnov : kernel32/tests: Add tests for console screen buffer.
by Alexandre Julliard 10 May '07

10 May '07

Module: wine Branch: master Commit: 8f459380132be7b267b21b3b6b980699ae7698ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f459380132be7b267b21b3b6… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Wed May 9 20:55:08 2007 +0400 kernel32/tests: Add tests for console screen buffer. --- dlls/kernel32/tests/console.c | 199 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 197 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index abd42bd..2a8c467 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2,6 +2,7 @@ * Unit tests for console API * * Copyright (c) 2003,2004 Eric Pouech + * Copyright (c) 2007 Kirill K. Smirnov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -551,6 +552,200 @@ static void testCtrlHandler(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "Bad error %u\n", GetLastError()); } +/* + * Test console screen buffer: + * 1) Try to set invalid handle. + * 2) Try to set non-console handles. + * 3) Use CONOUT$ file as active SB. + * 4) Test cursor. + * 5) Test output codepage to show it is not a property of SB. + * 6) Test switching to old SB if we close all handles to current SB - works + * in Windows, TODO in wine. + * + * What is not tested but should be: + * 1) ScreenBufferInfo + */ +static void testScreenBuffer(HANDLE hConOut) +{ + HANDLE hConOutRW, hConOutRO, hConOutWT; + HANDLE hFileOutRW, hFileOutRO, hFileOutWT; + HANDLE hConOutNew; + char test_str1[] = "Test for SB1"; + char test_str2[] = "Test for SB2"; + char test_cp866[] = {0xe2, 0xa5, 0xe1, 0xe2, 0}; + char test_cp1251[] = {0xf2, 0xe5, 0xf1, 0xf2, 0}; + WCHAR test_unicode[] = {0x0442, 0x0435, 0x0441, 0x0442, 0}; + WCHAR str_wbuf[20]; + char str_buf[20]; + DWORD len; + COORD c; + BOOL ret; + DWORD oldcp; + + /* In the beginning set output codepage to 866 */ + oldcp = GetConsoleOutputCP(); + ok(SetConsoleOutputCP(866), "Cannot set output codepage to 866\n"); + + hConOutRW = CreateConsoleScreenBuffer(GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + CONSOLE_TEXTMODE_BUFFER, NULL); + ok(hConOutRW != INVALID_HANDLE_VALUE, + "Cannot create a new screen buffer for ReadWrite\n"); + hConOutRO = CreateConsoleScreenBuffer(GENERIC_READ, + FILE_SHARE_READ, NULL, + CONSOLE_TEXTMODE_BUFFER, NULL); + ok(hConOutRO != INVALID_HANDLE_VALUE, + "Cannot create a new screen buffer for ReadOnly\n"); + hConOutWT = CreateConsoleScreenBuffer(GENERIC_WRITE, + FILE_SHARE_WRITE, NULL, + CONSOLE_TEXTMODE_BUFFER, NULL); + ok(hConOutWT != INVALID_HANDLE_VALUE, + "Cannot create a new screen buffer for WriteOnly\n"); + + hFileOutRW = CreateFileA("NUL", GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + ok(hFileOutRW != INVALID_HANDLE_VALUE, "Cannot open NUL for ReadWrite\n"); + hFileOutRO = CreateFileA("NUL", GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, 0, NULL); + ok(hFileOutRO != INVALID_HANDLE_VALUE, "Cannot open NUL for ReadOnly\n"); + hFileOutWT = CreateFileA("NUL", GENERIC_WRITE, FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, NULL); + ok(hFileOutWT != INVALID_HANDLE_VALUE, "Cannot open NUL for WriteOnly\n"); + + /* Trying to set invalid handle */ + SetLastError(0); + ok(!SetConsoleActiveScreenBuffer(INVALID_HANDLE_VALUE), + "Shouldn't succeed\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "GetLastError: expecting %u got %u\n", + ERROR_INVALID_HANDLE, GetLastError()); + + /* Trying to set non-console handles */ + SetLastError(0); + ok(!SetConsoleActiveScreenBuffer(hFileOutRW), "Shouldn't succeed\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "GetLastError: expecting %u got %u\n", + ERROR_INVALID_HANDLE, GetLastError()); + + SetLastError(0); + ok(!SetConsoleActiveScreenBuffer(hFileOutRO), "Shouldn't succeed\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "GetLastError: expecting %u got %u\n", + ERROR_INVALID_HANDLE, GetLastError()); + + SetLastError(0); + ok(!SetConsoleActiveScreenBuffer(hFileOutWT), "Shouldn't succeed\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "GetLastError: expecting %u got %u\n", + ERROR_INVALID_HANDLE, GetLastError()); + + CloseHandle(hFileOutRW); + CloseHandle(hFileOutRO); + CloseHandle(hFileOutWT); + + /* Trying to set SB handles with various access modes */ + SetLastError(0); + ok(!SetConsoleActiveScreenBuffer(hConOutRO), "Shouldn't succeed\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "GetLastError: expecting %u got %u\n", + ERROR_INVALID_HANDLE, GetLastError()); + + ok(SetConsoleActiveScreenBuffer(hConOutWT), "Couldn't set new WriteOnly SB\n"); + + ok(SetConsoleActiveScreenBuffer(hConOutRW), "Couldn't set new ReadWrite SB\n"); + + CloseHandle(hConOutWT); + CloseHandle(hConOutRO); + + /* Now we have two ReadWrite SB, active must be hConOutRW */ + /* Open current SB via CONOUT$ */ + hConOutNew = CreateFileA("CONOUT$", GENERIC_READ|GENERIC_WRITE, 0, + NULL, OPEN_EXISTING, 0, 0); + ok(hConOutNew != INVALID_HANDLE_VALUE, "CONOUT$ is not opened\n"); + + + /* test cursor */ + c.X = c.Y = 10; + SetConsoleCursorPosition(hConOut, c); + c.X = c.Y = 5; + SetConsoleCursorPosition(hConOutRW, c); + okCURSOR(hConOutNew, c); + c.X = c.Y = 10; + okCURSOR(hConOut, c); + + + c.X = c.Y = 0; + + /* Write using hConOutNew... */ + SetConsoleCursorPosition(hConOutNew, c); + ret = WriteConsoleA(hConOutNew, test_str2, lstrlenA(test_str2), &len, NULL); + ok (ret && len == lstrlenA(test_str2), "WriteConsoleA failed\n"); + /* ... and read it back via hConOutRW */ + ret = ReadConsoleOutputCharacterA(hConOutRW, str_buf, lstrlenA(test_str2), c, &len); + ok(ret && len == lstrlenA(test_str2), "ReadConsoleOutputCharacterA failed\n"); + str_buf[lstrlenA(test_str2)] = 0; + ok(!lstrcmpA(str_buf, test_str2), "got '%s' expected '%s'\n", str_buf, test_str2); + + + /* Now test output codepage handling. Current is 866 as we set earlier. */ + SetConsoleCursorPosition(hConOutRW, c); + ret = WriteConsoleA(hConOutRW, test_cp866, lstrlenA(test_cp866), &len, NULL); + ok(ret && len == lstrlenA(test_cp866), "WriteConsoleA failed\n"); + ret = ReadConsoleOutputCharacterW(hConOutRW, str_wbuf, lstrlenA(test_cp866), c, &len); + ok(ret && len == lstrlenA(test_cp866), "ReadConsoleOutputCharacterW failed\n"); + str_wbuf[lstrlenA(test_cp866)] = 0; + ok(!lstrcmpW(str_wbuf, test_unicode), "string does not match the pattern\n"); + + /* + * cp866 is OK, let's switch to cp1251. + * We expect that this codepage will be used in every SB - active and not. + */ + ok(SetConsoleOutputCP(1251), "Cannot set output cp to 1251\n"); + SetConsoleCursorPosition(hConOutRW, c); + ret = WriteConsoleA(hConOutRW, test_cp1251, lstrlenA(test_cp1251), &len, NULL); + ok(ret && len == lstrlenA(test_cp1251), "WriteConsoleA failed\n"); + ret = ReadConsoleOutputCharacterW(hConOutRW, str_wbuf, lstrlenA(test_cp1251), c, &len); + ok(ret && len == lstrlenA(test_cp1251), "ReadConsoleOutputCharacterW failed\n"); + str_wbuf[lstrlenA(test_cp1251)] = 0; + ok(!lstrcmpW(str_wbuf, test_unicode), "string does not match the pattern\n"); + + /* Check what has happened to hConOut. */ + SetConsoleCursorPosition(hConOut, c); + ret = WriteConsoleA(hConOut, test_cp1251, lstrlenA(test_cp1251), &len, NULL); + ok(ret && len == lstrlenA(test_cp1251), "WriteConsoleA failed\n"); + ret = ReadConsoleOutputCharacterW(hConOut, str_wbuf, lstrlenA(test_cp1251), c, &len); + ok(ret && len == lstrlenA(test_cp1251), "ReadConsoleOutputCharacterW failed\n"); + str_wbuf[lstrlenA(test_cp1251)] = 0; + ok(!lstrcmpW(str_wbuf, test_unicode), "string does not match the pattern\n"); + + /* Close all handles of current console SB */ + CloseHandle(hConOutNew); + CloseHandle(hConOutRW); + + /* Now active SB should be hConOut */ + hConOutNew = CreateFileA("CONOUT$", GENERIC_READ|GENERIC_WRITE, 0, + NULL, OPEN_EXISTING, 0, 0); + ok(hConOutNew != INVALID_HANDLE_VALUE, "CONOUT$ is not opened\n"); + + /* Write using hConOutNew... */ + SetConsoleCursorPosition(hConOutNew, c); + ret = WriteConsoleA(hConOutNew, test_str1, lstrlenA(test_str1), &len, NULL); + ok (ret && len == lstrlenA(test_str1), "WriteConsoleA failed\n"); + /* ... and read it back via hConOut */ + ret = ReadConsoleOutputCharacterA(hConOut, str_buf, lstrlenA(test_str1), c, &len); + ok(ret && len == lstrlenA(test_str1), "ReadConsoleOutputCharacterA failed\n"); + str_buf[lstrlenA(test_str1)] = 0; + todo_wine ok(!lstrcmpA(str_buf, test_str1), "got '%s' expected '%s'\n", str_buf, test_str1); + CloseHandle(hConOutNew); + + /* This is not really needed under Windows */ + SetConsoleActiveScreenBuffer(hConOut); + + /* restore codepage */ + SetConsoleOutputCP(oldcp); +} + START_TEST(console) { HANDLE hConIn, hConOut; @@ -585,8 +780,8 @@ START_TEST(console) /* testBottomScroll(); */ /* will test all the scrolling operations */ testScroll(hConOut, sbi.dwSize); - /* will test sb creation / modification... */ - /* testScreenBuffer() */ + /* will test sb creation / modification / codepage handling */ + testScreenBuffer(hConOut); testCtrlHandler(); /* still to be done: access rights & access on objects */ }

1 0

Dan Hipschman : widl: Simplify make_safearray.
by Alexandre Julliard 10 May '07

10 May '07

Module: wine Branch: master Commit: 541dddfde37120d1334dade507e390836403bf82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=541dddfde37120d1334dade50… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed May 9 20:48:13 2007 -0700 widl: Simplify make_safearray. --- tools/widl/parser.y | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 8c85565..b2f4691 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1279,13 +1279,8 @@ static type_t *make_class(char *name) static type_t *make_safearray(type_t *type) { type_t *sa = duptype(find_type("SAFEARRAY", 0), 1); - type_t *ptr; - sa->ref = type; - ptr = make_type(RPC_FC_FP, sa); - ptr->name = xstrdup("SAFEARRAY"); - - return ptr; + return make_type(RPC_FC_FP, sa); } #define HASHMAX 64

1 0

Dan Hipschman : widl: Remove dead code in write_msft.c.
by Alexandre Julliard 10 May '07

10 May '07

Module: wine Branch: master Commit: 234855f059a374c76783c180dd00193023da6aff URL: http://source.winehq.org/git/wine.git/?a=commit;h=234855f059a374c76783c180d… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed May 9 20:49:06 2007 -0700 widl: Remove dead code in write_msft.c. --- tools/widl/write_msft.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 54affd9..439d7be 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1157,14 +1157,6 @@ static int encode_var( vt = get_type_vt(var->type); type = var->type; - while(!vt) { - if(type->ref == NULL) { - vt = VT_VOID; - break; - } - type = type->ref; - vt = get_type_vt(type); - } encode_type(typelib, vt, type, encoded_type, width, alignment, decoded_size); if(type->type == RPC_FC_IP) return 2; return 0;

1 0

James Hawkins : msi: Deformat the key path before opening the key.
by Alexandre Julliard 10 May '07

10 May '07

Module: wine Branch: master Commit: 0de574b258b86c1399af5a53485280e4eb8b7952 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0de574b258b86c1399af5a534… Author: James Hawkins <truiken(a)gmail.com> Date: Thu May 10 00:02:50 2007 -0500 msi: Deformat the key path before opening the key. --- dlls/msi/appsearch.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 4c5847e..ea2f7cf 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -244,6 +244,7 @@ static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNAT 'w','h','e','r','e',' ', 'S','i','g','n','a','t','u','r','e','_',' ','=',' ', '\'','%','s','\'',0}; LPWSTR keyPath = NULL, valueName = NULL; + LPWSTR deformatted = NULL; int root, type; HKEY rootKey, key = NULL; DWORD sz = 0, regType; @@ -264,11 +265,11 @@ static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNAT root = MSI_RecordGetInteger(row,2); keyPath = msi_dup_record_field(row,3); - /* FIXME: keyPath needs to be expanded for properties */ valueName = msi_dup_record_field(row,4); - /* FIXME: valueName probably does too */ type = MSI_RecordGetInteger(row,5); + deformat_string(package, keyPath, &deformatted); + switch (root) { case msidbRegistryRootClassesRoot: @@ -288,7 +289,7 @@ static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNAT goto end; } - rc = RegOpenKeyW(rootKey, keyPath, &key); + rc = RegOpenKeyW(rootKey, deformatted, &key); if (rc) { TRACE("RegOpenKeyW returned %d\n", rc); @@ -337,6 +338,7 @@ end: msi_free( keyPath ); msi_free( valueName ); + msi_free( deformatted ); msiobj_release(&row->hdr);

1 0

Kirill K. Smirnov : server: Fix access check in screen buffer handling.
by Alexandre Julliard 10 May '07

10 May '07

Module: wine Branch: master Commit: 545d7f130cc4ef1cf06040ea886c6facfcd03f75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=545d7f130cc4ef1cf06040ea8… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Wed May 9 20:56:29 2007 +0400 server: Fix access check in screen buffer handling. --- server/console.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/console.c b/server/console.c index cb34cb3..8e667d4 100644 --- a/server/console.c +++ b/server/console.c @@ -611,10 +611,10 @@ static int set_console_input_info( const struct set_console_input_info_request * struct screen_buffer *screen_buffer; screen_buffer = (struct screen_buffer *)get_handle_obj( current->process, req->active_sb, - CONSOLE_READ, &screen_buffer_ops ); + CONSOLE_WRITE, &screen_buffer_ops ); if (!screen_buffer || screen_buffer->input != console) { - set_error( STATUS_INVALID_PARAMETER ); + set_error( STATUS_INVALID_HANDLE ); if (screen_buffer) release_object( screen_buffer ); goto error; }

1 0

Dan Hipschman : widl: Add string_of_type function, prettify code.
by Alexandre Julliard 10 May '07

10 May '07

Module: wine Branch: master Commit: 933ca7b126c12c222a7c5509c266f96af8221b9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=933ca7b126c12c222a7c5509c… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed May 9 20:46:31 2007 -0700 widl: Add string_of_type function, prettify code. --- tools/widl/typegen.c | 139 ++++++++++++++++++++------------------------------ 1 files changed, 55 insertions(+), 84 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 400cb02..d3d2c1c 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -62,6 +62,36 @@ struct expr_eval_routine static size_t type_memsize(const type_t *t, int ptr_level, const array_dims_t *array, unsigned int *align); static size_t fields_memsize(const var_list_t *fields, unsigned int *align); +const char *string_of_type(unsigned char type) +{ + switch (type) + { + case RPC_FC_BYTE: return "FC_BYTE"; + case RPC_FC_CHAR: return "FC_CHAR"; + case RPC_FC_SMALL: return "FC_SMALL"; + case RPC_FC_USMALL: return "FC_USMALL"; + case RPC_FC_WCHAR: return "FC_WCHAR"; + case RPC_FC_SHORT: return "FC_SHORT"; + case RPC_FC_USHORT: return "FC_USHORT"; + case RPC_FC_LONG: return "FC_LONG"; + case RPC_FC_ULONG: return "FC_ULONG"; + case RPC_FC_FLOAT: return "FC_FLOAT"; + case RPC_FC_HYPER: return "FC_HYPER"; + case RPC_FC_DOUBLE: return "FC_DOUBLE"; + case RPC_FC_ENUM16: return "FC_ENUM16"; + case RPC_FC_ENUM32: return "FC_ENUM32"; + case RPC_FC_IGNORE: return "FC_IGNORE"; + case RPC_FC_ERROR_STATUS_T: return "FC_ERROR_STATUS_T"; + case RPC_FC_RP: return "FC_RP"; + case RPC_FC_UP: return "FC_UP"; + case RPC_FC_OP: return "FC_OP"; + case RPC_FC_FP: return "FC_FP"; + default: + error("string_of_type: unknown type 0x%02x\n", type); + return NULL; + } +} + static int compare_expr(const expr_t *a, const expr_t *b) { int ret; @@ -220,36 +250,18 @@ static size_t write_procformatstring_var(FILE *file, int indent, else print_file(file, indent, "0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - switch(type->type) + if (is_base_type(type->type)) + { + print_file(file, indent, "0x%02x, /* %s */\n", type->type, string_of_type(type->type)); + size = 2; /* includes param type prefix */ + } + else if (type->type == RPC_FC_BIND_PRIMITIVE) { -#define CASE_BASETYPE(fctype) \ - case RPC_##fctype: \ - print_file(file, indent, "0x%02x, /* " #fctype " */\n", RPC_##fctype); \ - size = 2; /* includes param type prefix */ \ - break - - CASE_BASETYPE(FC_BYTE); - CASE_BASETYPE(FC_CHAR); - CASE_BASETYPE(FC_WCHAR); - CASE_BASETYPE(FC_USHORT); - CASE_BASETYPE(FC_SHORT); - CASE_BASETYPE(FC_ULONG); - CASE_BASETYPE(FC_LONG); - CASE_BASETYPE(FC_HYPER); - CASE_BASETYPE(FC_IGNORE); - CASE_BASETYPE(FC_USMALL); - CASE_BASETYPE(FC_SMALL); - CASE_BASETYPE(FC_FLOAT); - CASE_BASETYPE(FC_DOUBLE); - CASE_BASETYPE(FC_ERROR_STATUS_T); -#undef CASE_BASETYPE - - case RPC_FC_BIND_PRIMITIVE: print_file(file, indent, "0x%02x, /* FC_IGNORE */\n", RPC_FC_IGNORE); size = 2; /* includes param type prefix */ - break; - - default: + } + else + { error("Unknown/unsupported type: %s (0x%02x)\n", var->name, type->type); size = 0; } @@ -329,31 +341,11 @@ void write_procformatstring(FILE *file, const ifref_list_t *ifaces, int for_obje static int write_base_type(FILE *file, const type_t *type, unsigned int *typestring_offset) { - switch (type->type) + if (is_base_type(type->type)) { -#define CASE_BASETYPE(fctype) \ - case RPC_##fctype: \ - print_file(file, 2, "0x%02x, /* " #fctype " */\n", RPC_##fctype); \ - *typestring_offset += 1; \ - return 1; - - CASE_BASETYPE(FC_BYTE); - CASE_BASETYPE(FC_CHAR); - CASE_BASETYPE(FC_SMALL); - CASE_BASETYPE(FC_USMALL); - CASE_BASETYPE(FC_WCHAR); - CASE_BASETYPE(FC_SHORT); - CASE_BASETYPE(FC_USHORT); - CASE_BASETYPE(FC_LONG); - CASE_BASETYPE(FC_ULONG); - CASE_BASETYPE(FC_FLOAT); - CASE_BASETYPE(FC_HYPER); - CASE_BASETYPE(FC_DOUBLE); - CASE_BASETYPE(FC_ENUM16); - CASE_BASETYPE(FC_ENUM32); - CASE_BASETYPE(FC_IGNORE); - CASE_BASETYPE(FC_ERROR_STATUS_T); -#undef CASE_BASETYPE + print_file(file, 2, "0x%02x,\t/* %s */\n", type->type, string_of_type(type->type)); + *typestring_offset += 1; + return 1; } return 0; } @@ -813,7 +805,7 @@ static size_t write_string_tfs(FILE *file, const attr_list_t *attrs, print_file(file, 2,"0x%x, 0x%x, /* %s%s */\n", pointer_type, flags, - pointer_type == RPC_FC_FP ? "FC_FP" : (pointer_type == RPC_FC_UP ? "FC_UP" : "FC_RP"), + string_of_type(pointer_type), (flags & RPC_FC_P_SIMPLEPOINTER) ? " [simple_pointer]" : ""); *typestring_offset += 2; @@ -884,7 +876,7 @@ static size_t write_array_tfs(FILE *file, const attr_list_t *attrs, print_file(file, 2, "0x%x, 0x00, /* %s */\n", pointer_type, - pointer_type == RPC_FC_FP ? "FC_FP" : (pointer_type == RPC_FC_UP ? "FC_UP" : "FC_RP")); + string_of_type(pointer_type)); print_file(file, 2, "NdrFcShort(0x2),\n"); *typestring_offset += 4; @@ -1306,7 +1298,7 @@ static void write_pointer_only_tfs(FILE *file, const attr_list_t *attrs, int poi print_file(file, 2, "0x%x, 0x%x,\t\t/* %s", pointer_type, flags, - pointer_type == RPC_FC_FP ? "FC_FP" : (pointer_type == RPC_FC_UP ? "FC_UP" : "FC_RP")); + string_of_type(pointer_type)); if (file) { if (flags & 0x04) @@ -1482,37 +1474,16 @@ static size_t write_typeformatstring_var(FILE *file, int indent, const func_t *f } /* special case for pointers to base types */ - switch (base->type) + if (is_base_type(base->type)) { -#define CASE_BASETYPE(fctype) \ - case RPC_##fctype: \ - print_file(file, indent, "0x%x, 0x%x, /* %s %s[simple_pointer] */\n", \ - pointer_type, \ - (!in_attr && out_attr) ? 0x0C : 0x08, \ - pointer_type == RPC_FC_FP ? "FC_FP" : (pointer_type == RPC_FC_UP ? "FC_UP" : "FC_RP"), \ - (!in_attr && out_attr) ? "[allocated_on_stack] " : ""); \ - print_file(file, indent, "0x%02x, /* " #fctype " */\n", RPC_##fctype); \ - print_file(file, indent, "0x5c, /* FC_PAD */\n"); \ - *typeformat_offset += 4; \ - return start_offset - CASE_BASETYPE(FC_BYTE); - CASE_BASETYPE(FC_CHAR); - CASE_BASETYPE(FC_SMALL); - CASE_BASETYPE(FC_USMALL); - CASE_BASETYPE(FC_WCHAR); - CASE_BASETYPE(FC_SHORT); - CASE_BASETYPE(FC_USHORT); - CASE_BASETYPE(FC_LONG); - CASE_BASETYPE(FC_ULONG); - CASE_BASETYPE(FC_FLOAT); - CASE_BASETYPE(FC_HYPER); - CASE_BASETYPE(FC_DOUBLE); - CASE_BASETYPE(FC_ENUM16); - CASE_BASETYPE(FC_ENUM32); - CASE_BASETYPE(FC_IGNORE); - CASE_BASETYPE(FC_ERROR_STATUS_T); - default: - break; + print_file(file, indent, "0x%x, 0x%x, /* %s %s[simple_pointer] */\n", + pointer_type, (!in_attr && out_attr) ? 0x0C : 0x08, + string_of_type(pointer_type), + (!in_attr && out_attr) ? "[allocated_on_stack] " : ""); + print_file(file, indent, "0x%02x, /* %s */\n", base->type, string_of_type(base->type)); + print_file(file, indent, "0x5c, /* FC_PAD */\n"); + *typeformat_offset += 4; + return start_offset; } }

1 0

Dan Hipschman : widl: Remove redundant get_var_vt function.
by Alexandre Julliard 10 May '07

10 May '07

Module: wine Branch: master Commit: e7495555a09e1c5631d7de77926a95bf3f551201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7495555a09e1c5631d7de779… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed May 9 20:47:24 2007 -0700 widl: Remove redundant get_var_vt function. --- tools/widl/typelib.c | 14 -------------- tools/widl/typelib.h | 1 - tools/widl/write_msft.c | 6 +++--- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 1e63e96..3bdbcf3 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -212,20 +212,6 @@ unsigned short get_type_vt(type_t *t) return 0; } -unsigned short get_var_vt(var_t *v) -{ - unsigned short vt; - const char *tname = v->type->name; - - chat("get_var_vt: var %p type->name %s\n", v, tname ? tname : "NULL"); - if (tname) { - vt = builtin_vt(tname); - if (vt) return vt; - } - - return get_type_vt(v->type); -} - void start_typelib(char *name, attr_list_t *attrs) { in_typelib++; diff --git a/tools/widl/typelib.h b/tools/widl/typelib.h index 126b66a..b17387d 100644 --- a/tools/widl/typelib.h +++ b/tools/widl/typelib.h @@ -82,7 +82,6 @@ enum VARENUM { VT_TYPEMASK = 0xfff }; extern unsigned short get_type_vt(type_t *t); -extern unsigned short get_var_vt(var_t *v); extern int create_msft_typelib(typelib_t *typelib); #endif diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 6916128..54affd9 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1155,7 +1155,7 @@ static int encode_var( } dump_type(var->type); - vt = get_var_vt(var); + vt = get_type_vt(var->type); type = var->type; while(!vt) { if(type->ref == NULL) { @@ -1445,7 +1445,7 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, const func_t *func, int if (arg->type->type == RPC_FC_ENUM16) vt = VT_INT; else - vt = get_var_vt(arg); + vt = get_type_vt(arg->type); paramflags |= 0x30; /* PARAMFLAG_FHASDEFAULT | PARAMFLAG_FOPT */ chat("default value %ld\n", expr->cval); write_value(typeinfo->typelib, defaultdata, vt, &expr->cval); @@ -1458,7 +1458,7 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, const func_t *func, int if (arg->type->type == RPC_FC_ENUM16) vt = VT_INT; else - vt = get_var_vt(arg); + vt = get_type_vt(arg->type); paramflags |= 0x30; /* PARAMFLAG_FHASDEFAULT | PARAMFLAG_FOPT */ chat("default value '%s'\n", s); write_value(typeinfo->typelib, defaultdata, vt, s);

1 0

Mounir IDRASSI : crypt32: Correct the implementation of CertCreateSelfSignCertificate.
by Alexandre Julliard 10 May '07

10 May '07

Module: wine Branch: master Commit: 204bdb8755d65511c7b85eecfeb1eca27d4b3027 URL: http://source.winehq.org/git/wine.git/?a=commit;h=204bdb8755d65511c7b85eecf… Author: Mounir IDRASSI <mounir.idrassi(a)idrix.fr> Date: Thu May 10 04:01:03 2007 +0200 crypt32: Correct the implementation of CertCreateSelfSignCertificate. --- dlls/crypt32/cert.c | 82 +++++++++++++++++++++++++++++++++++++------- dlls/crypt32/tests/cert.c | 49 +++++++++++++++++++++++++++ 2 files changed, 118 insertions(+), 13 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index d20a49f..884c2da 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1970,10 +1970,10 @@ static void CertContext_SetKeyProvInfo(PCCERT_CONTEXT context, } } size = sizeof(info.dwKeySpec); - ret = CryptGetProvParam(hProv, PP_KEYSPEC, (LPBYTE)&info.dwKeySpec, - &size, 0); - if (!ret) - info.dwKeySpec = AT_SIGNATURE; + /* in case no CRYPT_KEY_PROV_INFO given, + * we always use AT_SIGNATURE key spec + */ + info.dwKeySpec = AT_SIGNATURE; size = sizeof(info.dwProvType); ret = CryptGetProvParam(hProv, PP_PROVTYPE, (LPBYTE)&info.dwProvType, &size, 0); @@ -1996,19 +1996,19 @@ static void CertContext_SetKeyProvInfo(PCCERT_CONTEXT context, * in blob, using the crypto provider hProv and the signature algorithm sigAlgo. */ static PCCERT_CONTEXT CRYPT_CreateSignedCert(const CRYPT_DER_BLOB *blob, - HCRYPTPROV hProv, PCRYPT_ALGORITHM_IDENTIFIER sigAlgo) + HCRYPTPROV hProv, DWORD dwKeySpec, PCRYPT_ALGORITHM_IDENTIFIER sigAlgo) { PCCERT_CONTEXT context = NULL; BOOL ret; DWORD sigSize = 0; - ret = CryptSignCertificate(hProv, AT_SIGNATURE, X509_ASN_ENCODING, + ret = CryptSignCertificate(hProv, dwKeySpec, X509_ASN_ENCODING, blob->pbData, blob->cbData, sigAlgo, NULL, NULL, &sigSize); if (ret) { LPBYTE sig = CryptMemAlloc(sigSize); - ret = CryptSignCertificate(hProv, AT_SIGNATURE, X509_ASN_ENCODING, + ret = CryptSignCertificate(hProv, dwKeySpec, X509_ASN_ENCODING, blob->pbData, blob->cbData, sigAlgo, NULL, sig, &sigSize); if (ret) { @@ -2168,24 +2168,80 @@ PCCERT_CONTEXT WINAPI CertCreateSelfSignCertificate(HCRYPTPROV hProv, PCCERT_CONTEXT context = NULL; BOOL ret, releaseContext = FALSE; PCERT_PUBLIC_KEY_INFO pubKey = NULL; - DWORD pubKeySize = 0; + DWORD pubKeySize = 0,dwKeySpec = AT_SIGNATURE; TRACE("(%08lx, %p, %08x, %p, %p, %p, %p, %p)\n", hProv, pSubjectIssuerBlob, dwFlags, pKeyProvInfo, pSignatureAlgorithm, pStartTime, pExtensions, pExtensions); + if(!pSubjectIssuerBlob) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + if (!hProv) { - hProv = CRYPT_CreateKeyProv(); - releaseContext = TRUE; + if (!pKeyProvInfo) + { + hProv = CRYPT_CreateKeyProv(); + releaseContext = TRUE; + } + else if (pKeyProvInfo->dwFlags & CERT_SET_KEY_PROV_HANDLE_PROP_ID) + { + SetLastError(NTE_BAD_FLAGS); + return NULL; + } + else + { + HCRYPTKEY hKey = 0; + /* acquire the context using the given information*/ + ret = CryptAcquireContextW(&hProv,pKeyProvInfo->pwszContainerName, + pKeyProvInfo->pwszProvName,pKeyProvInfo->dwProvType, + pKeyProvInfo->dwFlags); + if (!ret) + { + if(GetLastError() != NTE_BAD_KEYSET) + return NULL; + /* create the key set */ + ret = CryptAcquireContextW(&hProv,pKeyProvInfo->pwszContainerName, + pKeyProvInfo->pwszProvName,pKeyProvInfo->dwProvType, + pKeyProvInfo->dwFlags|CRYPT_NEWKEYSET); + if (!ret) + return NULL; + } + dwKeySpec = pKeyProvInfo->dwKeySpec; + /* check if the key is here */ + ret = CryptGetUserKey(hProv,dwKeySpec,&hKey); + if(!ret) + { + if (NTE_NO_KEY == GetLastError()) + { /* generate the key */ + ret = CryptGenKey(hProv,dwKeySpec,0,&hKey); + } + if (!ret) + { + CryptReleaseContext(hProv,0); + SetLastError(NTE_BAD_KEYSET); + return NULL; + } + } + CryptDestroyKey(hKey); + releaseContext = TRUE; + } + } + else if (pKeyProvInfo) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; } - CryptExportPublicKeyInfo(hProv, AT_SIGNATURE, X509_ASN_ENCODING, NULL, + CryptExportPublicKeyInfo(hProv, dwKeySpec, X509_ASN_ENCODING, NULL, &pubKeySize); pubKey = CryptMemAlloc(pubKeySize); if (pubKey) { - ret = CryptExportPublicKeyInfo(hProv, AT_SIGNATURE, X509_ASN_ENCODING, + ret = CryptExportPublicKeyInfo(hProv, dwKeySpec, X509_ASN_ENCODING, pubKey, &pubKeySize); if (ret) { @@ -2203,7 +2259,7 @@ PCCERT_CONTEXT WINAPI CertCreateSelfSignCertificate(HCRYPTPROV hProv, if (ret) { if (!(dwFlags & CERT_CREATE_SELFSIGN_NO_SIGN)) - context = CRYPT_CreateSignedCert(&blob, hProv, + context = CRYPT_CreateSignedCert(&blob, hProv,dwKeySpec, &info.SignatureAlgorithm); else context = CertCreateCertificateContext(X509_ASN_ENCODING, diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 345c9f5..cdc6cfb 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1157,6 +1157,7 @@ static void testCreateSelfSignCert(void) HCRYPTPROV csp; BOOL ret; HCRYPTKEY key; + CRYPT_KEY_PROV_INFO info; /* This crashes: context = CertCreateSelfSignCertificate(0, NULL, 0, NULL, NULL, NULL, NULL, @@ -1228,6 +1229,54 @@ static void testCreateSelfSignCert(void) CryptReleaseContext(csp, 0); ret = CryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, CRYPT_DELETEKEYSET); + + /* do the same test with AT_KEYEXCHANGE and key info*/ + memset(&info,0,sizeof(info)); + info.dwProvType = PROV_RSA_FULL; + info.dwKeySpec = AT_KEYEXCHANGE; + info.pwszProvName = (LPWSTR) MS_DEF_PROV_W; + info.pwszContainerName = cspNameW; + context = CertCreateSelfSignCertificate(0, &name, 0, &info, NULL, NULL, + NULL, NULL); + ok(context != NULL, "CertCreateSelfSignCertificate failed: %08x\n", + GetLastError()); + if (context) + { + DWORD size = 0; + PCRYPT_KEY_PROV_INFO info; + + /* The context must have a key provider info property */ + ret = CertGetCertificateContextProperty(context, + CERT_KEY_PROV_INFO_PROP_ID, NULL, &size); + ok(ret && size, "Expected non-zero key provider info\n"); + if (size) + { + info = HeapAlloc(GetProcessHeap(), 0, size); + if (info) + { + ret = CertGetCertificateContextProperty(context, + CERT_KEY_PROV_INFO_PROP_ID, info, &size); + ok(ret, "CertGetCertificateContextProperty failed: %08x\n", + GetLastError()); + if (ret) + { + /* Sanity-check the key provider */ + ok(!lstrcmpW(info->pwszContainerName, cspNameW), + "Unexpected key container\n"); + ok(!lstrcmpW(info->pwszProvName, MS_DEF_PROV_W), + "Unexpected provider\n"); + ok(info->dwKeySpec == AT_KEYEXCHANGE, + "Expected AT_KEYEXCHANGE, got %d\n", info->dwKeySpec); + } + HeapFree(GetProcessHeap(), 0, info); + } + } + + CertFreeCertificateContext(context); + } + + CryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, + CRYPT_DELETEKEYSET); } static const LPCSTR keyUsages[] = { szOID_PKIX_KP_CODE_SIGNING,

1 0

H. Verbeet : wined3d: Load texture coordinates even if no texture is bound to that stage at this time .
by Alexandre Julliard 10 May '07

10 May '07

Module: wine Branch: master Commit: 79ca4e022d593ec6106bad1e1ffde7b8c31ad01b URL: http://source.winehq.org/git/wine.git/?a=commit;h=79ca4e022d593ec6106bad1e1… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed May 9 19:08:27 2007 +0200 wined3d: Load texture coordinates even if no texture is bound to that stage at this time. --- dlls/wined3d/state.c | 63 +++++++++++++++++++++++--------------------------- 1 files changed, 29 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c0643a2..ba25501 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1825,46 +1825,41 @@ static void loadTexCoords(IWineD3DStateBlockImpl *stateblock, WineDirect3DVertex unsigned int mapped_stage = 0; unsigned int textureNo = 0; + /* The code below uses glClientActiveTexture and glMultiTexCoord* which are all part of the GL_ARB_multitexture extension. */ + /* Abort if we don't support the extension. */ + if (!GL_SUPPORT(ARB_MULTITEXTURE)) { + FIXME("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); + return; + } + for (textureNo = 0; textureNo < GL_LIMITS(texture_stages); ++textureNo) { - /* The code below uses glClientActiveTexture and glMultiTexCoord* which are all part of the GL_ARB_multitexture extension. */ - /* Abort if we don't support the extension. */ - if (!GL_SUPPORT(ARB_MULTITEXTURE)) { - FIXME("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); - continue; - } + int coordIdx = stateblock->textureState[textureNo][WINED3DTSS_TEXCOORDINDEX]; - if (stateblock->textures[textureNo]) { - int coordIdx = stateblock->textureState[textureNo][WINED3DTSS_TEXCOORDINDEX]; + mapped_stage = stateblock->wineD3DDevice->texUnitMap[textureNo]; + if (mapped_stage == -1) continue; + + if (coordIdx < MAX_TEXTURES && (sd->u.s.texCoords[coordIdx].lpData || sd->u.s.texCoords[coordIdx].VBO)) { + TRACE("Setting up texture %u, idx %d, cordindx %u, data %p\n", + textureNo, mapped_stage, coordIdx, sd->u.s.texCoords[coordIdx].lpData); + + if (*curVBO != sd->u.s.texCoords[coordIdx].VBO) { + GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, sd->u.s.texCoords[coordIdx].VBO)); + checkGLcall("glBindBufferARB"); + *curVBO = sd->u.s.texCoords[coordIdx].VBO; + } - mapped_stage = stateblock->wineD3DDevice->texUnitMap[textureNo]; - /* The gl texture unit will never be -1 for a bound texture */ GL_EXTCALL(glClientActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage)); checkGLcall("glClientActiveTextureARB"); - if (coordIdx >= MAX_TEXTURES) { - VTRACE(("tex: %d - Skip tex coords, as being system generated\n", textureNo)); - GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + mapped_stage, 0, 0, 0, 1)); - } else if (sd->u.s.texCoords[coordIdx].lpData == NULL && sd->u.s.texCoords[coordIdx].VBO == 0) { - VTRACE(("Bound texture but no texture coordinates supplied, so skipping\n")); - GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + mapped_stage, 0, 0, 0, 1)); - } else { - TRACE("Setting up texture %u, idx %d, cordindx %u, data %p\n", - textureNo, mapped_stage, coordIdx, sd->u.s.texCoords[coordIdx].lpData); - if (*curVBO != sd->u.s.texCoords[coordIdx].VBO) { - GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, sd->u.s.texCoords[coordIdx].VBO)); - checkGLcall("glBindBufferARB"); - *curVBO = sd->u.s.texCoords[coordIdx].VBO; - } - /* The coords to supply depend completely on the fvf / vertex shader */ - glTexCoordPointer( - WINED3D_ATR_SIZE(sd->u.s.texCoords[coordIdx].dwType), - WINED3D_ATR_GLTYPE(sd->u.s.texCoords[coordIdx].dwType), - sd->u.s.texCoords[coordIdx].dwStride, - sd->u.s.texCoords[coordIdx].lpData + stateblock->loadBaseVertexIndex * sd->u.s.texCoords[coordIdx].dwStride + offset[sd->u.s.texCoords[coordIdx].streamNo]); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - } - } else if (!GL_SUPPORT(NV_REGISTER_COMBINERS)) { - GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + textureNo, 0, 0, 0, 1)); + /* The coords to supply depend completely on the fvf / vertex shader */ + glTexCoordPointer( + WINED3D_ATR_SIZE(sd->u.s.texCoords[coordIdx].dwType), + WINED3D_ATR_GLTYPE(sd->u.s.texCoords[coordIdx].dwType), + sd->u.s.texCoords[coordIdx].dwStride, + sd->u.s.texCoords[coordIdx].lpData + stateblock->loadBaseVertexIndex * sd->u.s.texCoords[coordIdx].dwStride + offset[sd->u.s.texCoords[coordIdx].streamNo]); + glEnableClientState(GL_TEXTURE_COORD_ARRAY); + } else { + GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + mapped_stage, 0, 0, 0, 1)); } } if (GL_SUPPORT(NV_REGISTER_COMBINERS)) {

1 0