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

Paul Vriens : uxtheme: Add framework and initial tests.
by Alexandre Julliard June 14, 2006

June 14, 2006

Module: wine Branch: refs/heads/master Commit: 569a452d3adefafd11c8dea9f3286965d21c88bd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=569a452d3adefafd11c8dea… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Jun 13 14:16:58 2006 +0200 uxtheme: Add framework and initial tests. --- configure | 3 - configure.ac | 1 dlls/uxtheme/Makefile.in | 2 dlls/uxtheme/tests/.gitignore | 3 + dlls/uxtheme/tests/Makefile.in | 13 ++ dlls/uxtheme/tests/system.c | 223 ++++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 9 +- 7 files changed, 250 insertions(+), 4 deletions(-) create mode 100644 dlls/uxtheme/tests/.gitignore create mode 100644 dlls/uxtheme/tests/Makefile.in create mode 100644 dlls/uxtheme/tests/system.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=569a452d3adefafd11c…

1 0

Choe Hwanjin : winuser.h: Add some missing virtual key symbols.
by Alexandre Julliard June 14, 2006

June 14, 2006

Module: wine Branch: refs/heads/master Commit: 03cc51abde6fe48c8b4583c9ed422267d0c50dd8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=03cc51abde6fe48c8b4583c… Author: Choe Hwanjin <choe.hwanjin(a)gmail.com> Date: Wed Jun 14 15:52:27 2006 +0900 winuser.h: Add some missing virtual key symbols. --- include/winuser.h | 28 ++++++++++++++++++++++++---- 1 files changed, 24 insertions(+), 4 deletions(-) diff --git a/include/winuser.h b/include/winuser.h index dcaef92..e6c5a28 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3463,10 +3463,23 @@ #define VK_CONTROL 0x11 #define VK_MENU 0x12 #define VK_PAUSE 0x13 #define VK_CAPITAL 0x14 -/* 0x15-0x19 Reserved for Kanji systems */ + +#define VK_KANA 0x15 +#define VK_HANGEUL 0x15 +#define VK_HANGUL 0x15 +#define VK_JUNJA 0x17 +#define VK_FINAL 0x18 +#define VK_HANJA 0x19 +#define VK_KANJI 0x19 + /* 0x1A Undefined */ #define VK_ESCAPE 0x1B -/* 0x1C-0x1F Reserved for Kanji systems */ + +#define VK_CONVERT 0x1C +#define VK_NONCONVERT 0x1D +#define VK_ACCEPT 0x1E +#define VK_MODECHANGE 0x1F + #define VK_SPACE 0x20 #define VK_PRIOR 0x21 #define VK_NEXT 0x22 @@ -3489,7 +3502,8 @@ #define VK_HELP 0x2F #define VK_LWIN 0x5B #define VK_RWIN 0x5C #define VK_APPS 0x5D -/* 0x5E-0x5F Unassigned */ +/* 0x5E Unassigned */ +#define VK_SLEEP 0x5F #define VK_NUMPAD0 0x60 #define VK_NUMPAD1 0x61 #define VK_NUMPAD2 0x62 @@ -3533,7 +3547,13 @@ #define VK_F24 0x87 /* 0x88-0x8F Unassigned */ #define VK_NUMLOCK 0x90 #define VK_SCROLL 0x91 -/* 0x92-0x9F Unassigned */ +#define VK_OEM_NEC_EQUAL 0x92 +#define VK_OEM_FJ_JISHO 0x92 +#define VK_OEM_FJ_MASSHOU 0x93 +#define VK_OEM_FJ_TOUROKU 0x94 +#define VK_OEM_FJ_LOYA 0x95 +#define VK_OEM_FJ_ROYA 0x96 +/* 0x97-0x9F Unassigned */ /* * differencing between right and left shift/control/alt key. * Used only by GetAsyncKeyState() and GetKeyState().

1 0

Mike McCormack : msi: Add a test for reading long strings.
by Alexandre Julliard June 14, 2006

June 14, 2006

Module: wine Branch: refs/heads/master Commit: 863bc989b989c5ab25b36b348c94688cf0c5728e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=863bc989b989c5ab25b36b3… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jun 13 21:34:28 2006 +0900 msi: Add a test for reading long strings. --- dlls/msi/tests/db.c | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index f9776f9..4320816 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -894,10 +894,10 @@ static void test_longstrings(void) const char insert_query[] = "INSERT INTO `strings` ( `id`, `val` ) VALUES('1', 'Z')"; char *str; - MSIHANDLE hdb; - UINT len; + MSIHANDLE hdb = 0, hview = 0, hrec = 0; + DWORD len; UINT r; - const int STRING_LENGTH = 0x10005; + const DWORD STRING_LENGTH = 0x10005; DeleteFile(msifile); /* just MsiOpenDatabase should not create a file */ @@ -922,7 +922,29 @@ static void test_longstrings(void) MsiDatabaseCommit(hdb); ok(r == ERROR_SUCCESS, "MsiDatabaseCommit failed\n"); + MsiCloseHandle(hdb); + + r = MsiOpenDatabase(msifile, MSIDBOPEN_READONLY, &hdb); + ok(r == ERROR_SUCCESS, "MsiOpenDatabase failed\n"); + + r = MsiDatabaseOpenView(hdb, "select * from `strings` where `id` = 1", &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + + MsiCloseHandle(hview); + + r = MsiRecordGetString(hrec, 2, NULL, &len); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + todo_wine { + ok(len == STRING_LENGTH, "string length wrong\n"); + } + MsiCloseHandle(hrec); MsiCloseHandle(hdb); DeleteFile(msifile); }

1 0

Mike McCormack : msi: Add a test for creating a record with a long string.
by Alexandre Julliard June 14, 2006

June 14, 2006

Module: wine Branch: refs/heads/master Commit: 2d323b3df882bb131f075ff2a17c37403384d6e0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2d323b3df882bb131f075ff… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jun 13 21:34:16 2006 +0900 msi: Add a test for creating a record with a long string. --- dlls/msi/tests/db.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 6f895e3..f9776f9 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -886,6 +886,45 @@ static void test_msiexport(void) ok( length == strlen(expected), "length of data wrong\n"); ok( !lstrcmp(buffer, expected), "data doesn't match\n"); } + DeleteFile(msifile); +} + +static void test_longstrings(void) +{ + const char insert_query[] = + "INSERT INTO `strings` ( `id`, `val` ) VALUES('1', 'Z')"; + char *str; + MSIHANDLE hdb; + UINT len; + UINT r; + const int STRING_LENGTH = 0x10005; + + DeleteFile(msifile); + /* just MsiOpenDatabase should not create a file */ + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "MsiOpenDatabase failed\n"); + + /* create a table */ + r = try_query( hdb, + "CREATE TABLE `strings` ( `id` INT, `val` CHAR(0) PRIMARY KEY `id`)"); + ok(r == ERROR_SUCCESS, "query failed\n"); + + /* try a insert a very long string */ + str = HeapAlloc(GetProcessHeap(), 0, STRING_LENGTH+sizeof insert_query); + len = strchr(insert_query, 'Z') - insert_query; + strcpy(str, insert_query); + memset(str+len, 'Z', STRING_LENGTH); + strcpy(str+len+STRING_LENGTH, insert_query+len+1); + r = try_query( hdb, str ); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + + HeapFree(GetProcessHeap(), 0, str); + + MsiDatabaseCommit(hdb); + ok(r == ERROR_SUCCESS, "MsiDatabaseCommit failed\n"); + + MsiCloseHandle(hdb); + DeleteFile(msifile); } START_TEST(db) @@ -898,4 +937,5 @@ START_TEST(db) test_viewgetcolumninfo(); test_getcolinfo(); test_msiexport(); + test_longstrings(); }

1 0

Mike McCormack : msi: Add a test for MsiDatabaseExport.
by Alexandre Julliard June 14, 2006

June 14, 2006

Module: wine Branch: refs/heads/master Commit: d2dca89c527867a7173b90d6a2e4710326e4deb0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d2dca89c527867a7173b90d… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jun 13 21:33:27 2006 +0900 msi: Add a test for MsiDatabaseExport. --- dlls/msi/tests/db.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 77 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index fc8331b..6f895e3 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -812,6 +812,82 @@ static void test_viewgetcolumninfo(void) MsiCloseHandle( hdb ); } +static void test_msiexport(void) +{ + MSIHANDLE hdb = 0, hview = 0; + UINT r; + char *query; + char path[MAX_PATH]; + const char file[] = "phone.txt"; + HANDLE handle; + char buffer[0x100]; + DWORD length; + const char expected[] = + "id\tname\tnumber\r\n" + "I2\tS32\tS32\r\n" + "phone\tid\r\n" + "1\tAbe\t8675309\r\n"; + + DeleteFile(msifile); + + /* just MsiOpenDatabase should not create a file */ + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "MsiOpenDatabase failed\n"); + + /* create a table */ + query = "CREATE TABLE `phone` ( " + "`id` INT, `name` CHAR(32), `number` CHAR(32) " + "PRIMARY KEY `id`)"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + /* insert a value into it */ + query = "INSERT INTO `phone` ( `id`, `name`, `number` )" + "VALUES('1', 'Abe', '8675309')"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + GetCurrentDirectory(MAX_PATH, path); + + todo_wine { + r = MsiDatabaseExport(hdb, "phone", path, file); + ok(r == ERROR_SUCCESS, "MsiDatabaseExport failed\n"); + + MsiCloseHandle(hdb); + + lstrcat(path, "\\"); + lstrcat(path, file); + + /* check the data that was written */ + length = 0; + memset(buffer, 0, sizeof buffer); + handle = CreateFile(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + if (handle != INVALID_HANDLE_VALUE) + { + ReadFile(handle, buffer, sizeof buffer, &length, NULL); + CloseHandle(handle); + DeleteFile(path); + } + else + ok(0, "failed to open file %s\n", path); + + ok( length == strlen(expected), "length of data wrong\n"); + ok( !lstrcmp(buffer, expected), "data doesn't match\n"); + } +} + START_TEST(db) { test_msidatabase(); @@ -821,4 +897,5 @@ START_TEST(db) test_viewmodify(); test_viewgetcolumninfo(); test_getcolinfo(); + test_msiexport(); }

1 0

Mike McCormack : mapi: Fix declaration of LPMAPISENDMAIL ( spotted by Cho Hwanjin).
by Alexandre Julliard June 14, 2006

June 14, 2006

Module: wine Branch: refs/heads/master Commit: e9cc5156db54a17cf7f482080da9ece999faebb0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e9cc5156db54a17cf7f4820… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jun 14 11:40:17 2006 +0900 mapi: Fix declaration of LPMAPISENDMAIL (spotted by Cho Hwanjin). --- include/mapi.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/mapi.h b/include/mapi.h index 73b6f0e..f8695f3 100644 --- a/include/mapi.h +++ b/include/mapi.h @@ -191,7 +191,7 @@ typedef MAPISENDDOCUMENTS *LPMAPISENDDOC MAPISENDDOCUMENTS MAPISendDocuments; typedef ULONG (WINAPI MAPISENDMAIL)(LHANDLE,ULONG_PTR,lpMapiMessage,FLAGS,ULONG); -typedef MAPISENDMAIL *LPMAPI; +typedef MAPISENDMAIL *LPMAPISENDMAIL; MAPISENDMAIL MAPISendMail; #ifdef __cplusplus

1 0

Mike McCormack : advpack: Remove some dead code. (Coverity)
by Alexandre Julliard June 14, 2006

June 14, 2006

Module: wine Branch: refs/heads/master Commit: a87ba6f4451f022a0d49bf7b347e455cec4c4b3e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a87ba6f4451f022a0d49bf7… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jun 14 11:16:32 2006 +0900 advpack: Remove some dead code. (Coverity) --- dlls/advpack/reg.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/advpack/reg.c b/dlls/advpack/reg.c index 04a5a86..64e3ca6 100644 --- a/dlls/advpack/reg.c +++ b/dlls/advpack/reg.c @@ -224,7 +224,6 @@ HRESULT WINAPI RegInstallW(HMODULE hm, L int i; CABINFOW cabinfo; WCHAR tmp_ini_path[MAX_PATH]; - HINF hinf = INVALID_HANDLE_VALUE; HRESULT hr = E_FAIL; TRACE("(%p, %s, %p)\n", hm, debugstr_w(pszSection), pstTable); @@ -262,8 +261,6 @@ HRESULT WINAPI RegInstallW(HMODULE hm, L hr = ExecuteCabW(NULL, &cabinfo, NULL); done: - if (hinf != INVALID_HANDLE_VALUE) - SetupCloseInfFile(hinf); DeleteFileW(tmp_ini_path);

1 0

Mike McCormack : dbghelp: Fix the prototype of some callbacks.
by Alexandre Julliard June 14, 2006

June 14, 2006

Module: wine Branch: refs/heads/master Commit: cafe24b3ed2d17367cf619db3bac37894f5c0127 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cafe24b3ed2d17367cf619d… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jun 14 10:58:29 2006 +0900 dbghelp: Fix the prototype of some callbacks. --- include/dbghelp.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/dbghelp.h b/include/dbghelp.h index b7bdb0f..9afaa90 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -754,11 +754,11 @@ #include <poppack.h> #define SLMFLAG_VIRTUAL 0x1 #define SLMFLAG_NO_SYMBOLS 0x4 -typedef BOOL (CALLBACK *PENUMLOADED_MODULES_CALLBACK)(PSTR, DWORD, ULONG, PVOID); +typedef BOOL (CALLBACK *PENUMLOADED_MODULES_CALLBACK)(PSTR, ULONG, ULONG, PVOID); BOOL WINAPI EnumerateLoadedModules(HANDLE, PENUMLOADED_MODULES_CALLBACK, PVOID); -typedef BOOL (CALLBACK *PENUMLOADED_MODULES_CALLBACK64)(PSTR, DWORD, ULONG64, PVOID); +typedef BOOL (CALLBACK *PENUMLOADED_MODULES_CALLBACK64)(PSTR, DWORD64, ULONG, PVOID); BOOL WINAPI EnumerateLoadedModules64(HANDLE, PENUMLOADED_MODULES_CALLBACK64, PVOID); -typedef BOOL (CALLBACK *PSYM_ENUMMODULES_CALLBACK)(PSTR, DWORD, PVOID); +typedef BOOL (CALLBACK *PSYM_ENUMMODULES_CALLBACK)(PSTR, ULONG, PVOID); BOOL WINAPI SymEnumerateModules(HANDLE, PSYM_ENUMMODULES_CALLBACK, PVOID); typedef BOOL (CALLBACK *PSYM_ENUMMODULES_CALLBACK64)(PSTR, DWORD64, PVOID); BOOL WINAPI SymEnumerateModules64(HANDLE, PSYM_ENUMMODULES_CALLBACK64, PVOID);

1 0

Mike McCormack : crypt32: Fix a cast for Win64.
by Alexandre Julliard June 14, 2006

June 14, 2006

Module: wine Branch: refs/heads/master Commit: 4dace74bd8f2a3369de3fa644d410b9ed6d64022 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4dace74bd8f2a3369de3fa6… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jun 14 10:58:15 2006 +0900 crypt32: Fix a cast for Win64. --- dlls/crypt32/oid.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 7bc7aad..bbe4225 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -968,7 +968,7 @@ static void init_oid_info(HINSTANCE hins (LPWSTR)((LPBYTE)info + sizeof(struct OIDInfo)); info->info.dwGroupId = oidInfoConstructors[i].dwGroupId; info->info.u.Algid = oidInfoConstructors[i].Algid; - LoadStringW(hinst, (UINT)oidInfoConstructors[i].pwszName, + LoadStringW(hinst, (UINT_PTR)oidInfoConstructors[i].pwszName, (LPWSTR)info->info.pwszName, len + 1); if (oidInfoConstructors[i].blob) {

1 0

Mike McCormack : wrc: Remove some tokens declared twice.
by Alexandre Julliard June 14, 2006

June 14, 2006

Module: wine Branch: refs/heads/master Commit: 2d107f98ab5d7662247fca02f9ffe5c109bed1cf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2d107f98ab5d7662247fca0… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jun 14 10:58:02 2006 +0900 wrc: Remove some tokens declared twice. --- tools/wrc/parser.y | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index 27c378d..252606c 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -300,7 +300,6 @@ static int rsrcid_to_token(int lookahead %token tFILEVERSION tPRODUCTVERSION tFILEFLAGSMASK tFILEOS tFILETYPE tFILEFLAGS tFILESUBTYPE %token tMENUBARBREAK tMENUBREAK tMENUITEM tPOPUP tSEPARATOR %token tHELP -%token tSTRING tIDENT tRAWDATA %token tTOOLBAR tBUTTON %token tBEGIN tEND %token tDLGINIT

1 0