April 2009 - Wine-commits - list.winehq.org

Hib Eris : msi/tests: Test type for INT column.
by Alexandre Julliard 28 Apr '09

28 Apr '09

Module: wine Branch: master Commit: fa8f8a3efc3630971fb042fd79e4487c6969b8d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa8f8a3efc3630971fb042fd7… Author: Hib Eris <Hib(a)hiberis.nl> Date: Sat Apr 25 21:34:38 2009 +0200 msi/tests: Test type for INT column. --- dlls/msi/tests/db.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index b2c7d06..0cf9af1 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1128,7 +1128,7 @@ static void test_viewgetcolumninfo(void) r = run_query( hdb, 0, "CREATE TABLE `Properties` " - "( `Property` CHAR(255), `Value` CHAR(1) PRIMARY KEY `Property`)" ); + "( `Property` CHAR(255), `Value` CHAR(1), `Intvalue` INT PRIMARY KEY `Property`)" ); ok( r == ERROR_SUCCESS , "Failed to create table\n" ); /* check the column types */ @@ -1137,12 +1137,14 @@ static void test_viewgetcolumninfo(void) ok( check_record( rec, 1, "S255"), "wrong record type\n"); ok( check_record( rec, 2, "S1"), "wrong record type\n"); + ok( check_record( rec, 3, "I2"), "wrong record type\n"); MsiCloseHandle( rec ); /* check the type in _Columns */ ok( 0x3dff == get_columns_table_type(hdb, "Properties", 1 ), "_columns table wrong\n"); ok( 0x1d01 == get_columns_table_type(hdb, "Properties", 2 ), "_columns table wrong\n"); + todo_wine ok( 0x1502 == get_columns_table_type(hdb, "Properties", 3 ), "_columns table wrong\n"); /* now try the names */ rec = get_column_info( hdb, "select * from `Properties`", MSICOLINFO_NAMES ); @@ -1150,6 +1152,7 @@ static void test_viewgetcolumninfo(void) ok( check_record( rec, 1, "Property"), "wrong record type\n"); ok( check_record( rec, 2, "Value"), "wrong record type\n"); + ok( check_record( rec, 3, "Intvalue"), "wrong record type\n"); MsiCloseHandle( rec );

1 0

Hib Eris : msi: Fix INT column data type.
by Alexandre Julliard 28 Apr '09

28 Apr '09

Module: wine Branch: master Commit: 15cb7290ee49babb0ab1521ddc592a640019d46e URL: http://source.winehq.org/git/wine.git/?a=commit;h=15cb7290ee49babb0ab1521dd… Author: Hib Eris <Hib(a)hiberis.nl> Date: Sat Apr 25 21:35:10 2009 +0200 msi: Fix INT column data type. --- dlls/msi/sql.y | 2 +- dlls/msi/tests/db.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index d71c186..f22234e 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -367,7 +367,7 @@ data_type: } | TK_INT { - $$ = 2; + $$ = 2 | 0x400; } | TK_LONG { diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 0cf9af1..ec9443b 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1144,7 +1144,7 @@ static void test_viewgetcolumninfo(void) /* check the type in _Columns */ ok( 0x3dff == get_columns_table_type(hdb, "Properties", 1 ), "_columns table wrong\n"); ok( 0x1d01 == get_columns_table_type(hdb, "Properties", 2 ), "_columns table wrong\n"); - todo_wine ok( 0x1502 == get_columns_table_type(hdb, "Properties", 3 ), "_columns table wrong\n"); + ok( 0x1502 == get_columns_table_type(hdb, "Properties", 3 ), "_columns table wrong\n"); /* now try the names */ rec = get_column_info( hdb, "select * from `Properties`", MSICOLINFO_NAMES );

1 0

Hib Eris : msi/tests: Test type for INTEGER, SHORT, LONG columns.
by Alexandre Julliard 28 Apr '09

28 Apr '09

Module: wine Branch: master Commit: 407866186c3d9a4ae2b55d46fdd30b40831f2990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=407866186c3d9a4ae2b55d46f… Author: Hib Eris <Hib(a)hiberis.nl> Date: Sat Apr 25 21:35:55 2009 +0200 msi/tests: Test type for INTEGER, SHORT, LONG columns. --- dlls/msi/tests/db.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index ec9443b..2d38274 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1128,7 +1128,13 @@ static void test_viewgetcolumninfo(void) r = run_query( hdb, 0, "CREATE TABLE `Properties` " - "( `Property` CHAR(255), `Value` CHAR(1), `Intvalue` INT PRIMARY KEY `Property`)" ); + "( `Property` CHAR(255), " + " `Value` CHAR(1), " + " `Intvalue` INT, " + " `Integervalue` INTEGER, " + " `Shortvalue` SHORT, " + " `Longvalue` LONG " + " PRIMARY KEY `Property`)" ); ok( r == ERROR_SUCCESS , "Failed to create table\n" ); /* check the column types */ @@ -1138,6 +1144,9 @@ static void test_viewgetcolumninfo(void) ok( check_record( rec, 1, "S255"), "wrong record type\n"); ok( check_record( rec, 2, "S1"), "wrong record type\n"); ok( check_record( rec, 3, "I2"), "wrong record type\n"); + ok( check_record( rec, 4, "I2"), "wrong record type\n"); + ok( check_record( rec, 5, "I2"), "wrong record type\n"); + ok( check_record( rec, 6, "I4"), "wrong record type\n"); MsiCloseHandle( rec ); @@ -1145,6 +1154,9 @@ static void test_viewgetcolumninfo(void) ok( 0x3dff == get_columns_table_type(hdb, "Properties", 1 ), "_columns table wrong\n"); ok( 0x1d01 == get_columns_table_type(hdb, "Properties", 2 ), "_columns table wrong\n"); ok( 0x1502 == get_columns_table_type(hdb, "Properties", 3 ), "_columns table wrong\n"); + ok( 0x1502 == get_columns_table_type(hdb, "Properties", 4 ), "_columns table wrong\n"); + todo_wine ok( 0x1502 == get_columns_table_type(hdb, "Properties", 5 ), "_columns table wrong\n"); + ok( 0x1104 == get_columns_table_type(hdb, "Properties", 6 ), "_columns table wrong\n"); /* now try the names */ rec = get_column_info( hdb, "select * from `Properties`", MSICOLINFO_NAMES ); @@ -1153,6 +1165,9 @@ static void test_viewgetcolumninfo(void) ok( check_record( rec, 1, "Property"), "wrong record type\n"); ok( check_record( rec, 2, "Value"), "wrong record type\n"); ok( check_record( rec, 3, "Intvalue"), "wrong record type\n"); + ok( check_record( rec, 4, "Integervalue"), "wrong record type\n"); + ok( check_record( rec, 5, "Shortvalue"), "wrong record type\n"); + ok( check_record( rec, 6, "Longvalue"), "wrong record type\n"); MsiCloseHandle( rec );

1 0

Hib Eris : msi: Fix SHORT column data type.
by Alexandre Julliard 28 Apr '09

28 Apr '09

Module: wine Branch: master Commit: 5e829d1323c01df9fe25c943f2e7a889570d4ac6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e829d1323c01df9fe25c943f… Author: Hib Eris <Hib(a)hiberis.nl> Date: Sat Apr 25 21:36:27 2009 +0200 msi: Fix SHORT column data type. --- dlls/msi/sql.y | 2 +- dlls/msi/tests/db.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index f22234e..7bf8ce6 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -363,7 +363,7 @@ data_type: } | TK_SHORT { - $$ = 2; + $$ = 2 | 0x400; } | TK_INT { diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 2d38274..0d9e3e3 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1155,7 +1155,7 @@ static void test_viewgetcolumninfo(void) ok( 0x1d01 == get_columns_table_type(hdb, "Properties", 2 ), "_columns table wrong\n"); ok( 0x1502 == get_columns_table_type(hdb, "Properties", 3 ), "_columns table wrong\n"); ok( 0x1502 == get_columns_table_type(hdb, "Properties", 4 ), "_columns table wrong\n"); - todo_wine ok( 0x1502 == get_columns_table_type(hdb, "Properties", 5 ), "_columns table wrong\n"); + ok( 0x1502 == get_columns_table_type(hdb, "Properties", 5 ), "_columns table wrong\n"); ok( 0x1104 == get_columns_table_type(hdb, "Properties", 6 ), "_columns table wrong\n"); /* now try the names */

1 0

André Hentschel : cmdlgtst: Spelling fix.
by Alexandre Julliard 28 Apr '09

28 Apr '09

Module: wine Branch: master Commit: 078d465fa9c01d96b6b700ca9178f0d68055e4fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=078d465fa9c01d96b6b700ca9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Apr 27 20:34:16 2009 +0200 cmdlgtst: Spelling fix. --- programs/cmdlgtst/De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmdlgtst/De.rc b/programs/cmdlgtst/De.rc index 323b6f8..f8e7d0e 100644 --- a/programs/cmdlgtst/De.rc +++ b/programs/cmdlgtst/De.rc @@ -145,7 +145,7 @@ FONT 8, "MS Shell Dlg" CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 12, 168, 11, 13 CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 12, 180, 11, 13 CONTROL "", -1, "static", SS_BLACKRECT | WS_CHILD | WS_VISIBLE, 24, 228, 11, 13 - CONTROL "Markierte Flags sind durch das System gesetzt wurden und m�ssen von dem Benutzer entfernt werden", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 48, 228, 98, 36 + CONTROL "Markierte Flags sind durch das System gesetzt worden und m�ssen von dem Benutzer entfernt werden", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 48, 228, 98, 36 } Print_Flags_Dialog DIALOG 4, 17, 239, 287

1 0

Eric Pouech : kernel32: In editline's keys table, use constants instead of numeric constants.
by Alexandre Julliard 28 Apr '09

28 Apr '09

Module: wine Branch: master Commit: 88bdc0c1107323046415865e5f72206bef9cac30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88bdc0c1107323046415865e5… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Apr 27 21:09:06 2009 +0200 kernel32: In editline's keys table, use constants instead of numeric constants. --- dlls/kernel32/editline.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 6fab049..bcbf927 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -727,13 +727,13 @@ static const KeyEntry EmacsKeyMapExtended[] = static const KeyMap EmacsKeyMap[] = { - {0x00000000, 1, StdKeyMap}, - {0x00000001, 1, EmacsKeyMapAlt}, /* left alt */ - {0x00000002, 1, EmacsKeyMapAlt}, /* right alt */ - {0x00000004, 1, EmacsKeyMapCtrl}, /* left ctrl */ - {0x00000008, 1, EmacsKeyMapCtrl}, /* right ctrl */ - {0x00000100, 0, EmacsKeyMapExtended}, - {0, 0, 0} + {0, 1, StdKeyMap}, + {RIGHT_ALT_PRESSED, 1, EmacsKeyMapAlt}, /* right alt */ + {LEFT_ALT_PRESSED, 1, EmacsKeyMapAlt}, /* left alt */ + {RIGHT_CTRL_PRESSED, 1, EmacsKeyMapCtrl}, /* right ctrl */ + {LEFT_CTRL_PRESSED, 1, EmacsKeyMapCtrl}, /* left ctrl */ + {ENHANCED_KEY, 0, EmacsKeyMapExtended}, + {0, 0, NULL} }; static const KeyEntry Win32KeyMapExtended[] = @@ -758,12 +758,12 @@ static const KeyEntry Win32KeyMapCtrlExtended[] = static const KeyMap Win32KeyMap[] = { - {0x00000000, 1, StdKeyMap}, - {0x00000000, 0, Win32ExtraStdKeyMap}, - {0x00000100, 0, Win32KeyMapExtended}, - {0x00000104, 0, Win32KeyMapCtrlExtended}, - {0x00000108, 0, Win32KeyMapCtrlExtended}, - {0, 0, 0} + {0, 1, StdKeyMap}, + {0, 0, Win32ExtraStdKeyMap}, + {ENHANCED_KEY, 0, Win32KeyMapExtended}, + {ENHANCED_KEY | RIGHT_CTRL_PRESSED, 0, Win32KeyMapCtrlExtended}, + {ENHANCED_KEY | LEFT_CTRL_PRESSED, 0, Win32KeyMapCtrlExtended}, + {0, 0, NULL} }; #undef CTRL

1 0

Massimo Del Fedele : gdiplus: Add stub for GdipBitmapSetPixel.
by Alexandre Julliard 28 Apr '09

28 Apr '09

Module: wine Branch: master Commit: a3221e7f2371b5671ba315bea90ebed84f6c2806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3221e7f2371b5671ba315bea… Author: Massimo Del Fedele <max(a)veneto.com> Date: Mon Apr 27 23:20:27 2009 +0200 gdiplus: Add stub for GdipBitmapSetPixel. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index ba98518..2d5bc78 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -42,7 +42,7 @@ @ stub GdipBitmapGetHistogramSize @ stdcall GdipBitmapGetPixel(ptr long long ptr) @ stdcall GdipBitmapLockBits(ptr ptr long long ptr) -@ stub GdipBitmapSetPixel +@ stdcall GdipBitmapSetPixel(ptr long long long) @ stdcall GdipBitmapSetResolution(ptr long long) @ stdcall GdipBitmapUnlockBits(ptr ptr) @ stdcall GdipClearPathMarkers(ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 5552225..fde6ab3 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -87,6 +87,21 @@ GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap* bitmap, INT x, INT y, return NotImplemented; } +GpStatus WINGDIPAPI GdipBitmapSetPixel(GpBitmap* bitmap, INT x, INT y, + ARGB color) +{ + static int calls; + TRACE("bitmap:%p, x:%d, y:%d, color:%08x\n", bitmap, x, y, color); + + if(!bitmap) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + /* This function returns a pointer to an array of pixels that represents the * bitmap. The *entire* bitmap is locked according to the lock mode specified by * flags. It is correct behavior that a user who calls this function with write

1 0

Vincent Povirk : gdiplus: Add test for GdipNewInstalledFontCollection.
by Alexandre Julliard 28 Apr '09

28 Apr '09

Module: wine Branch: master Commit: 31f2b8e1eab801d27815a68808e5124d9c06a344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31f2b8e1eab801d27815a6880… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jan 28 16:08:43 2009 -0600 gdiplus: Add test for GdipNewInstalledFontCollection. --- dlls/gdiplus/tests/font.c | 14 ++++++++++++++ include/gdiplusflat.h | 1 + 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 7d6582f..6fbb8e2 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -340,6 +340,19 @@ monospace: expect (Ok, stat); } +static void test_installedfonts (void) +{ + GpStatus stat; + GpFontCollection* collection=NULL; + + stat = GdipNewInstalledFontCollection(NULL); + expect (InvalidParameter, stat); + + stat = GdipNewInstalledFontCollection(&collection); + todo_wine expect (Ok, stat); + todo_wine ok (collection != NULL, "got NULL font collection\n"); +} + START_TEST(font) { struct GdiplusStartupInput gdiplusStartupInput; @@ -357,6 +370,7 @@ START_TEST(font) test_fontfamily(); test_fontfamily_properties(); test_getgenerics(); + test_installedfonts(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 158eb5e..f8ebc73 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -93,6 +93,7 @@ GpStatus WINGDIPAPI GdipGetFontHeight(GDIPCONST GpFont*, GDIPCONST GpGraphics*, GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont*, REAL, REAL*); /* FontCollection */ +GpStatus WINGDIPAPI GdipNewInstalledFontCollection(GpFontCollection**); GpStatus WINGDIPAPI GdipNewPrivateFontCollection(GpFontCollection**); GpStatus WINGDIPAPI GdipDeletePrivateFontCollection(GpFontCollection**); GpStatus WINGDIPAPI GdipPrivateAddFontFile(GpFontCollection*, GDIPCONST WCHAR*);

1 0

Vincent Povirk : gdiplus: Create a static InstalledFontCollection object, currently empty.
by Alexandre Julliard 28 Apr '09

28 Apr '09

Module: wine Branch: master Commit: 73eea0d05ffbe810092840f70c7fbce55f2bc8b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73eea0d05ffbe810092840f70… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 27 16:24:47 2009 -0500 gdiplus: Create a static InstalledFontCollection object, currently empty. --- dlls/gdiplus/font.c | 6 +++++- dlls/gdiplus/tests/font.c | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 6454765..68540e4 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -36,6 +36,8 @@ WINE_DEFAULT_DEBUG_CHANNEL (gdiplus); static const REAL mm_per_inch = 25.4; static const REAL inch_per_point = 1.0/72.0; +static GpFontCollection installedFontCollection = {0}; + static inline REAL get_dpi (void) { REAL dpi; @@ -936,5 +938,7 @@ GpStatus WINGDIPAPI GdipNewInstalledFontCollection( if (!fontCollection) return InvalidParameter; - return NotImplemented; + *fontCollection = &installedFontCollection; + + return Ok; } diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 6fbb8e2..0da5b2f 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -349,8 +349,8 @@ static void test_installedfonts (void) expect (InvalidParameter, stat); stat = GdipNewInstalledFontCollection(&collection); - todo_wine expect (Ok, stat); - todo_wine ok (collection != NULL, "got NULL font collection\n"); + expect (Ok, stat); + ok (collection != NULL, "got NULL font collection\n"); } START_TEST(font)

1 0

Austin English : notepad: Don't append seconds to time format.
by Alexandre Julliard 28 Apr '09

28 Apr '09

Module: wine Branch: master Commit: 2c3497b9082f5226140003a01ab0bcf696e0ad8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c3497b9082f5226140003a01… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Apr 27 18:39:49 2009 -0500 notepad: Don't append seconds to time format. --- programs/notepad/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index aa0a53c..0abbc33 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -654,7 +654,7 @@ VOID DIALOG_EditTimeDate(VOID) GetLocalTime(&st); - GetTimeFormat(LOCALE_USER_DEFAULT, 0, &st, NULL, szDate, MAX_STRING_LEN); + GetTimeFormat(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &st, NULL, szDate, MAX_STRING_LEN); SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)szDate); SendMessage(Globals.hEdit, EM_REPLACESEL, TRUE, (LPARAM)spaceW);

1 0