November 2006 - Wine-Commits

Mike McCormack : msi: Add a test showing which tables are special.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: 2f2143b4ecacd8bed120928da1386ae1d299c41b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f2143b4ecacd8bed120928da… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Nov 17 15:15:03 2006 +0900 msi: Add a test showing which tables are special. --- dlls/msi/tests/db.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 21fa374..441d6f5 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -3122,6 +3122,39 @@ static void test_update(void) ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); } +void test_special_tables(void) +{ + const char *query; + MSIHANDLE hdb = 0; + UINT r; + + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "MsiOpenDatabase failed\n"); + + query = "CREATE TABLE `_Properties` ( " + "`foo` INT NOT NULL, `bar` INT LOCALIZABLE PRIMARY KEY `foo`)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "failed to create table\n"); + + query = "CREATE TABLE `_Streams` ( " + "`foo` INT NOT NULL, `bar` INT LOCALIZABLE PRIMARY KEY `foo`)"; + r = run_query(hdb, 0, query); + todo_wine ok(r == ERROR_BAD_QUERY_SYNTAX, "created _Streams table\n"); + + query = "CREATE TABLE `_Tables` ( " + "`foo` INT NOT NULL, `bar` INT LOCALIZABLE PRIMARY KEY `foo`)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_BAD_QUERY_SYNTAX, "created _Tables table\n"); + + query = "CREATE TABLE `_Columns` ( " + "`foo` INT NOT NULL, `bar` INT LOCALIZABLE PRIMARY KEY `foo`)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_BAD_QUERY_SYNTAX, "created _Columns table\n"); + + r = MsiCloseHandle(hdb); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); +} + START_TEST(db) { test_msidatabase(); @@ -3144,4 +3177,5 @@ START_TEST(db) test_alter(); test_integers(); test_update(); + test_special_tables(); }

1 0

Mike McCormack : msi: Fix a memory leak in load_folder().
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: eba742e5cdfd534f918fa560a50d439c9ffa8d3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=eba742e5cdfd534f918fa560a… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Nov 17 17:50:41 2006 +0900 msi: Fix a memory leak in load_folder(). --- dlls/msi/action.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 7dcb375..1a13fb7 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1527,16 +1527,16 @@ static MSIFOLDER *load_folder( MSIPACKAG TRACE("Working to load %s\n",debugstr_w(dir)); + row = MSI_QueryGetRecord(package->db, Query, dir); + if (!row) + return NULL; + folder = msi_alloc_zero( sizeof (MSIFOLDER) ); if (!folder) return NULL; folder->Directory = strdupW(dir); - row = MSI_QueryGetRecord(package->db, Query, dir); - if (!row) - return NULL; - p = msi_dup_record_field(row, 3); /* split src and target dir */

1 0

Kevin Koltzau : winnt.h: Add AMD64 relocation types.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: c3c1b7025fe67166a8aafaef736665f8492d03cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3c1b7025fe67166a8aafaef7… Author: Kevin Koltzau <kevin(a)plop.org> Date: Thu Nov 16 23:29:29 2006 -0500 winnt.h: Add AMD64 relocation types. --- include/winnt.h | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index edf0873..fe83ff1 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2845,6 +2845,25 @@ typedef struct _IMAGE_RELOCATION #define IMAGE_REL_IA64_RESERVED_16 0x0016 #define IMAGE_REL_IA64_ADDEND 0x001F +/* AMD64 relocation types */ +#define IMAGE_REL_AMD64_ABSOLUTE 0x0000 +#define IMAGE_REL_AMD64_ADDR64 0x0001 +#define IMAGE_REL_AMD64_ADDR32 0x0002 +#define IMAGE_REL_AMD64_ADDR32NB 0x0003 +#define IMAGE_REL_AMD64_REL32 0x0004 +#define IMAGE_REL_AMD64_REL32_1 0x0005 +#define IMAGE_REL_AMD64_REL32_2 0x0006 +#define IMAGE_REL_AMD64_REL32_3 0x0007 +#define IMAGE_REL_AMD64_REL32_4 0x0008 +#define IMAGE_REL_AMD64_REL32_5 0x0009 +#define IMAGE_REL_AMD64_SECTION 0x000A +#define IMAGE_REL_AMD64_SECREL 0x000B +#define IMAGE_REL_AMD64_SECREL7 0x000C +#define IMAGE_REL_AMD64_TOKEN 0x000D +#define IMAGE_REL_AMD64_SREL32 0x000E +#define IMAGE_REL_AMD64_PAIR 0x000F +#define IMAGE_REL_AMD64_SSPAN32 0x0010 + /* archive format */ #define IMAGE_ARCHIVE_START_SIZE 8

1 0

Mike McCormack : msi: Remove some redundant else statements.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: 5bffd28be7f0314446ebf46d1c2a8c75c9398905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bffd28be7f0314446ebf46d1… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Nov 17 15:14:39 2006 +0900 msi: Remove some redundant else statements. --- dlls/msi/helpers.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 427c1af..82f98b6 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -249,16 +249,18 @@ LPWSTR resolve_folder(MSIPACKAGE *packag TRACE(" already resolved to %s\n",debugstr_w(path)); return path; } - else if (source && f->ResolvedSource) + + if (source && f->ResolvedSource) { path = strdupW( f->ResolvedSource ); TRACE(" (source)already resolved to %s\n",debugstr_w(path)); return path; } - else if (!source && f->Property) + + if (!source && f->Property) { path = build_directory_name( 2, f->Property, NULL ); - + TRACE(" internally set to %s\n",debugstr_w(path)); if (set_prop) MSI_SetPropertyW( package, name, path );

1 0

Kevin Koltzau : winedump: Print new DLL characteristics.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: 64506c0a5162915582e6c5662ab75a3d3847a8f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64506c0a5162915582e6c5662… Author: Kevin Koltzau <kevin(a)plop.org> Date: Thu Nov 16 22:43:25 2006 -0500 winedump: Print new DLL characteristics. --- tools/winedump/pe.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index dd7588c..d452525 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -196,6 +196,9 @@ static inline void print_dllflags(const { printf(" %-34s 0x%X\n", title, value); #define X(f,s) if (value & f) printf(" %s\n", s) + X(IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE, "DYNAMIC_BASE"); + X(IMAGE_DLLCHARACTERISTICS_FORCE_INTEGRITY, "FORCE_INTEGRITY"); + X(IMAGE_DLLCHARACTERISTICS_NX_COMPAT, "NX_COMPAT"); X(IMAGE_DLLCHARACTERISTICS_NO_ISOLATION, "NO_ISOLATION"); X(IMAGE_DLLCHARACTERISTICS_NO_SEH, "NO_SEH"); X(IMAGE_DLLCHARACTERISTICS_NO_BIND, "NO_BIND");

1 0

Kevin Koltzau : winnt.h: Add defines for new DLL characteristics.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: 8cebef67971b0574d4b613c0ad2b082958a28b70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cebef67971b0574d4b613c0a… Author: Kevin Koltzau <kevin(a)plop.org> Date: Thu Nov 16 22:23:14 2006 -0500 winnt.h: Add defines for new DLL characteristics. --- include/winnt.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index fb760af..edf0873 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2198,6 +2198,9 @@ typedef struct _IMAGE_VXD_HEADER { #define IMAGE_SUBSYSTEM_XBOX 14 /* DLL Characteristics */ +#define IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE 0x0040 +#define IMAGE_DLLCHARACTERISTICS_FORCE_INTEGRITY 0x0080 +#define IMAGE_DLLCHARACTERISTICS_NX_COMPAT 0x0100 #define IMAGE_DLLCHARACTERISTICS_NO_ISOLATION 0x0200 #define IMAGE_DLLCHARACTERISTICS_NO_SEH 0x0400 #define IMAGE_DLLCHARACTERISTICS_NO_BIND 0x0800

1 0

Huw Davies : msxml3: Implement createProcessingInstruction with a stub PI object.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: 7c34694c015f80d6bc1aba233ce40c285c6df749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c34694c015f80d6bc1aba233… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 16 23:17:00 2006 +0000 msxml3: Implement createProcessingInstruction with a stub PI object. --- dlls/msxml3/Makefile.in | 1 + dlls/msxml3/domdoc.c | 19 ++- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/pi.c | 544 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 563 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c34694c015f80d6bc1ab…

1 0

Alexandre Julliard : kernel32: Use the appropriate Unix locale for GetLocaleInfo when a default LCID is used .
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: 2b01f6e07cb6821bd94f58703331ac778f8b0ab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b01f6e07cb6821bd94f58703… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 16 22:11:58 2006 +0100 kernel32: Use the appropriate Unix locale for GetLocaleInfo when a default LCID is used. For instance LOCALE_SDATE is looked up in the lcid corresponding to LC_TIME, LOCALE_IDIGITS in the LC_NUMERIC lcid, etc. --- dlls/kernel32/lcformat.c | 2 + dlls/kernel32/locale.c | 300 ++++++++++++++++++++++++++++++++++++---------- dlls/kernel32/time.c | 2 - 3 files changed, 240 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b01f6e07cb6821bd94f5…

1 0

Alexandre Julliard : kernel32: Added the locale name entry to all locale definitions.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

1 0

Alexandre Julliard : kernel32: Rewrote the locale matching to match more elements and to support Windows-format locale names .
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: 123b6fec22e3e4ab832b5af7fa1e3f960924d38b URL: http://source.winehq.org/git/wine.git/?a=commit;h=123b6fec22e3e4ab832b5af7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 16 22:11:19 2006 +0100 kernel32: Rewrote the locale matching to match more elements and to support Windows-format locale names. Added implementation for LocaleNameToLCID and LCIDToLocaleName. --- dlls/kernel32/locale.c | 560 ++++++++++++++++++++++++++---------------------- include/winnls.h | 21 ++ 2 files changed, 330 insertions(+), 251 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=123b6fec22e3e4ab832b5…

1 0