February 2010 - Wine-Commits

Hans Leidekker : msi: Add summary information stream to the streams table.
by Alexandre Julliard Feb. 19, 2010

Feb. 19, 2010

Module: wine Branch: master Commit: 1ff992314887d03abeb4098789701ff3bfd5d2d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ff992314887d03abeb409878… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 19 12:27:36 2010 +0100 msi: Add summary information stream to the streams table. --- dlls/msi/msipriv.h | 1 + dlls/msi/streams.c | 21 ++++++++++++++++----- dlls/msi/suminfo.c | 3 --- dlls/msi/tests/db.c | 42 +++++++++++++++++++++++++++++++++++++++++- 4 files changed, 58 insertions(+), 9 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 5ea707f..2278ff7 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1074,6 +1074,7 @@ static const WCHAR szProductID[] = {'P','r','o','d','u','c','t','I','D',0}; static const WCHAR szPIDTemplate[] = {'P','I','D','T','e','m','p','l','a','t','e',0}; static const WCHAR szPIDKEY[] = {'P','I','D','K','E','Y',0}; static const WCHAR szTYPELIB[] = {'T','Y','P','E','L','I','B',0}; +static const WCHAR szSumInfo[] = {5 ,'S','u','m','m','a','r','y','I','n','f','o','r','m','a','t','i','o','n',0}; /* memory allocation macro functions */ static void *msi_alloc( size_t len ) __WINE_ALLOC_SIZE(1); diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 28c3093..8ec2ad9 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -32,6 +32,7 @@ #include "query.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(msidb); @@ -486,7 +487,8 @@ static INT add_streams_to_table(MSISTREAMSVIEW *sv) STATSTG stat; STREAM *stream = NULL; HRESULT hr; - UINT count = 0, size; + UINT r, count = 0, size; + LPWSTR encname; hr = IStorage_EnumElements(sv->db->storage, 0, NULL, 0, &stgenum); if (FAILED(hr)) @@ -525,13 +527,22 @@ static INT add_streams_to_table(MSISTREAMSVIEW *sv) break; } - hr = IStorage_OpenStream(sv->db->storage, stat.pwcsName, 0, - STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream->stream); + if (!strcmpW(stat.pwcsName, szSumInfo)) + { + /* summary information stream is not encoded */ + r = db_get_raw_stream(sv->db, stat.pwcsName, &stream->stream); + } + else + { + encname = encode_streamname(FALSE, stat.pwcsName); + r = db_get_raw_stream(sv->db, encname, &stream->stream); + msi_free(encname); + } CoTaskMemFree(stat.pwcsName); - if (FAILED(hr)) + if (r != ERROR_SUCCESS) { - WARN("failed to open stream: %08x\n", hr); + WARN("unable to get stream %u\n", r); count = -1; break; } diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index df35c4d..902a61f 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -86,9 +86,6 @@ static HRESULT (WINAPI *pPropVariantChangeType) #define SECT_HDR_SIZE (sizeof(PROPERTYSECTIONHEADER)) -static const WCHAR szSumInfo[] = { 5 ,'S','u','m','m','a','r','y', - 'I','n','f','o','r','m','a','t','i','o','n',0 }; - static void free_prop( PROPVARIANT *prop ) { if (prop->vt == VT_LPSTR ) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 17c78dd..8df17e8 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1411,7 +1411,7 @@ static void create_file_data(LPCSTR name, LPCSTR data, DWORD size) static void test_streamtable(void) { - MSIHANDLE hdb = 0, rec, view; + MSIHANDLE hdb = 0, rec, view, hsi; char file[MAX_PATH]; char buf[MAX_PATH]; DWORD size; @@ -1456,6 +1456,46 @@ static void test_streamtable(void) MsiCloseHandle( rec ); + r = MsiDatabaseOpenView( hdb, + "SELECT * FROM `_Streams` WHERE `Name` = '\5SummaryInformation'", &view ); + ok( r == ERROR_SUCCESS, "Failed to open database view: %u\n", r ); + + r = MsiViewExecute( view, 0 ); + ok( r == ERROR_SUCCESS, "Failed to execute view: %u\n", r ); + + r = MsiViewFetch( view, &rec ); + ok( r == ERROR_NO_MORE_ITEMS, "Unexpected result: %u\n", r ); + + MsiCloseHandle( rec ); + MsiViewClose( view ); + MsiCloseHandle( view ); + + /* create a summary information stream */ + r = MsiGetSummaryInformationA( hdb, NULL, 1, &hsi ); + ok( r == ERROR_SUCCESS, "Failed to get summary information handle: %u\n", r ); + + r = MsiSummaryInfoSetPropertyA( hsi, PID_SECURITY, VT_I4, 2, NULL, NULL ); + ok( r == ERROR_SUCCESS, "Failed to set property: %u\n", r ); + + r = MsiSummaryInfoPersist( hsi ); + ok( r == ERROR_SUCCESS, "Failed to save summary information: %u\n", r ); + + MsiCloseHandle( hsi ); + + r = MsiDatabaseOpenView( hdb, + "SELECT * FROM `_Streams` WHERE `Name` = '\5SummaryInformation'", &view ); + ok( r == ERROR_SUCCESS, "Failed to open database view: %u\n", r ); + + r = MsiViewExecute( view, 0 ); + ok( r == ERROR_SUCCESS, "Failed to execute view: %u\n", r ); + + r = MsiViewFetch( view, &rec ); + ok( r == ERROR_SUCCESS, "Unexpected result: %u\n", r ); + + MsiCloseHandle( rec ); + MsiViewClose( view ); + MsiCloseHandle( view ); + /* insert a file into the _Streams table */ create_file( "test.txt" );

1 0

Hans Leidekker : msi: Destroy streams cache when applying a transform.
by Alexandre Julliard Feb. 19, 2010

Feb. 19, 2010

Module: wine Branch: master Commit: d9e40b821988ffe363af56d0264b89e2c29ca043 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9e40b821988ffe363af56d02… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 19 12:25:38 2010 +0100 msi: Destroy streams cache when applying a transform. --- dlls/msi/database.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 7855fea..757be67 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -225,16 +225,6 @@ end: return ret; } -void append_storage_to_db( MSIDATABASE *db, IStorage *stg ) -{ - MSITRANSFORM *t; - - t = msi_alloc( sizeof *t ); - t->stg = stg; - IStorage_AddRef( stg ); - list_add_tail( &db->transforms, &t->entry ); -} - static void free_transforms( MSIDATABASE *db ) { while( !list_empty( &db->transforms ) ) @@ -259,6 +249,19 @@ static void free_streams( MSIDATABASE *db ) } } +void append_storage_to_db( MSIDATABASE *db, IStorage *stg ) +{ + MSITRANSFORM *t; + + t = msi_alloc( sizeof *t ); + t->stg = stg; + IStorage_AddRef( stg ); + list_add_tail( &db->transforms, &t->entry ); + + /* the transform may add or replace streams */ + free_streams( db ); +} + static VOID MSI_CloseDatabase( MSIOBJECTHDR *arg ) { MSIDATABASE *db = (MSIDATABASE *) arg;

1 0

Hans Leidekker : msi: Fix a memory leak.
by Alexandre Julliard Feb. 19, 2010

Feb. 19, 2010

Module: wine Branch: master Commit: ddb20916235967b3ea29d3e8e0400e0cf0d5642d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddb20916235967b3ea29d3e8e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 19 12:27:02 2010 +0100 msi: Fix a memory leak. --- dlls/msi/streams.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 8d2e748..28c3093 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -505,7 +505,10 @@ static INT add_streams_to_table(MSISTREAMSVIEW *sv) break; if (stat.type != STGTY_STREAM) + { + CoTaskMemFree(stat.pwcsName); continue; + } /* table streams are not in the _Streams table */ if (*stat.pwcsName == 0x4840)

1 0

Hans Leidekker : msi: Accept '\5' and '-' in SQL identifiers.
by Alexandre Julliard Feb. 19, 2010

Feb. 19, 2010

Module: wine Branch: master Commit: f80f1cc2db46e113bff1b132bfc008c2c52fa8b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f80f1cc2db46e113bff1b132b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 19 12:25:09 2010 +0100 msi: Accept '\5' and '-' in SQL identifiers. --- dlls/msi/tests/db.c | 24 ++++++++++++++++++++++++ dlls/msi/tokenize.c | 4 ++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 037be7d..17c78dd 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -683,6 +683,30 @@ static void test_msibadqueries(void) r = try_query( hdb, "select * from 'c'"); ok(r == ERROR_BAD_QUERY_SYNTAX, "query failed\n"); + r = try_query( hdb, "CREATE TABLE `\5a` (`b` CHAR NOT NULL PRIMARY KEY `b`)" ); + ok( r == ERROR_SUCCESS , "query failed: %u\n", r ); + + r = try_query( hdb, "SELECT * FROM \5a" ); + ok( r == ERROR_SUCCESS , "query failed: %u\n", r ); + + r = try_query( hdb, "CREATE TABLE `a\5` (`b` CHAR NOT NULL PRIMARY KEY `b`)" ); + ok( r == ERROR_SUCCESS , "query failed: %u\n", r ); + + r = try_query( hdb, "SELECT * FROM a\5" ); + ok( r == ERROR_SUCCESS , "query failed: %u\n", r ); + + r = try_query( hdb, "CREATE TABLE `-a` (`b` CHAR NOT NULL PRIMARY KEY `b`)" ); + ok( r == ERROR_SUCCESS , "query failed: %u\n", r ); + + r = try_query( hdb, "SELECT * FROM -a" ); + todo_wine ok( r == ERROR_SUCCESS , "query failed: %u\n", r ); + + r = try_query( hdb, "CREATE TABLE `a-` (`b` CHAR NOT NULL PRIMARY KEY `b`)" ); + ok( r == ERROR_SUCCESS , "query failed: %u\n", r ); + + r = try_query( hdb, "SELECT * FROM a-" ); + ok( r == ERROR_SUCCESS , "query failed: %u\n", r ); + r = MsiCloseHandle( hdb ); ok(r == ERROR_SUCCESS , "Failed to close database transact\n"); diff --git a/dlls/msi/tokenize.c b/dlls/msi/tokenize.c index 0482456..e17ded8 100644 --- a/dlls/msi/tokenize.c +++ b/dlls/msi/tokenize.c @@ -166,9 +166,9 @@ static int sqliteKeywordCode(const WCHAR *z, int n){ */ static const char isIdChar[] = { /* x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC xD xE xF */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x */ + 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 1x */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 2x */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, /* 2x */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, /* 3x */ 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 4x */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, /* 5x */

1 0

Hans Leidekker : msi: Encode stream name in the callers of db_get_raw_stream.
by Alexandre Julliard Feb. 19, 2010

Feb. 19, 2010

Module: wine Branch: master Commit: 9f68142118499dec47f48ccda91383615992bbe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f68142118499dec47f48ccda… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 19 12:26:30 2010 +0100 msi: Encode stream name in the callers of db_get_raw_stream. --- dlls/msi/database.c | 23 ++++++++++------------- dlls/msi/table.c | 8 +++++--- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 757be67..8ec2411 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -125,20 +125,14 @@ static UINT clone_open_stream( MSIDATABASE *db, LPCWSTR name, IStream **stm ) UINT db_get_raw_stream( MSIDATABASE *db, LPCWSTR stname, IStream **stm ) { - LPWSTR encname; HRESULT r; - encname = encode_streamname(FALSE, stname); - - TRACE("%s -> %s\n",debugstr_w(stname),debugstr_w(encname)); + TRACE("%s\n", debugstr_w(stname)); - if (clone_open_stream( db, encname, stm ) == ERROR_SUCCESS) - { - msi_free( encname ); + if (clone_open_stream( db, stname, stm ) == ERROR_SUCCESS) return ERROR_SUCCESS; - } - r = IStorage_OpenStream( db->storage, encname, NULL, + r = IStorage_OpenStream( db->storage, stname, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, stm ); if( FAILED( r ) ) { @@ -147,15 +141,13 @@ UINT db_get_raw_stream( MSIDATABASE *db, LPCWSTR stname, IStream **stm ) LIST_FOR_EACH_ENTRY( transform, &db->transforms, MSITRANSFORM, entry ) { TRACE("looking for %s in transform storage\n", debugstr_w(stname) ); - r = IStorage_OpenStream( transform->stg, encname, NULL, + r = IStorage_OpenStream( transform->stg, stname, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, stm ); if (SUCCEEDED(r)) break; } } - msi_free( encname ); - if( SUCCEEDED(r) ) { MSISTREAM *stream; @@ -181,10 +173,15 @@ UINT read_raw_stream_data( MSIDATABASE *db, LPCWSTR stname, ULONG sz, count; IStream *stm = NULL; STATSTG stat; + LPWSTR encname; + + encname = encode_streamname( FALSE, stname ); + r = db_get_raw_stream( db, encname, &stm ); + msi_free( encname ); - r = db_get_raw_stream( db, stname, &stm ); if( r != ERROR_SUCCESS) return ret; + r = IStream_Stat(stm, &stat, STATFLAG_NONAME ); if( FAILED( r ) ) { diff --git a/dlls/msi/table.c b/dlls/msi/table.c index cc40515..6737ac5 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1168,7 +1168,7 @@ static UINT TABLE_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, ISt { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; UINT r; - LPWSTR full_name = NULL; + LPWSTR encname, full_name = NULL; if( !view->ops->fetch_int ) return ERROR_INVALID_PARAMETER; @@ -1180,11 +1180,13 @@ static UINT TABLE_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, ISt return r; } - r = db_get_raw_stream( tv->db, full_name, stm ); + encname = encode_streamname( FALSE, full_name ); + r = db_get_raw_stream( tv->db, encname, stm ); if( r ) ERR("fetching stream %s, error = %d\n",debugstr_w(full_name), r); - msi_free( full_name ); + msi_free( full_name ); + msi_free( encname ); return r; }

1 0

Alexandre Julliard : user32: Fix Z-order handling of windows that have a top-most owner.
by Alexandre Julliard Feb. 19, 2010

Feb. 19, 2010

Module: wine Branch: master Commit: adf9dcd6a70ef2c125e154f4cd095a616e5505f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adf9dcd6a70ef2c125e154f4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 19 13:05:08 2010 +0100 user32: Fix Z-order handling of windows that have a top-most owner. --- dlls/user32/tests/win.c | 23 +++++++++++++++++++---- dlls/user32/winpos.c | 10 ++++++---- server/window.c | 12 ++++++++++-- 3 files changed, 35 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 2799ec8..cd83749 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2159,7 +2159,7 @@ static void check_z_order_debug(HWND hwnd, HWND next, HWND prev, HWND owner, /*trace("skipping next %p (%p)\n", test, UlongToHandle(GetWindowLongPtr(test, GWLP_HINSTANCE)));*/ test = GetWindow(test, GW_HWNDNEXT); } - ok_(file, line)(next == test, "expected next %p, got %p\n", next, test); + ok_(file, line)(next == test, "%p: expected next %p, got %p\n", hwnd, next, test); test = GetWindow(hwnd, GW_HWNDPREV); /* skip foreign windows */ @@ -2171,13 +2171,14 @@ static void check_z_order_debug(HWND hwnd, HWND next, HWND prev, HWND owner, /*trace("skipping prev %p (%p)\n", test, UlongToHandle(GetWindowLongPtr(test, GWLP_HINSTANCE)));*/ test = GetWindow(test, GW_HWNDPREV); } - ok_(file, line)(prev == test, "expected prev %p, got %p\n", prev, test); + ok_(file, line)(prev == test, "%p: expected prev %p, got %p\n", hwnd, prev, test); test = GetWindow(hwnd, GW_OWNER); - ok_(file, line)(owner == test, "expected owner %p, got %p\n", owner, test); + ok_(file, line)(owner == test, "%p: expected owner %p, got %p\n", hwnd, owner, test); ex_style = GetWindowLong(hwnd, GWL_EXSTYLE); - ok_(file, line)(!(ex_style & WS_EX_TOPMOST) == !topmost, "expected %stopmost\n", topmost ? "" : "NOT "); + ok_(file, line)(!(ex_style & WS_EX_TOPMOST) == !topmost, "%p: expected %stopmost\n", + hwnd, topmost ? "" : "NOT "); } static void test_popup_zorder(HWND hwnd_D, HWND hwnd_E) @@ -2258,6 +2259,20 @@ static void test_popup_zorder(HWND hwnd_D, HWND hwnd_E) check_z_order(hwnd_A, hwnd_D, 0, 0, TRUE); #endif + /* make hwnd_C owned by a topmost window */ + DestroyWindow( hwnd_C ); + hwnd_C = CreateWindowEx(0, "MainWindowClass", NULL, + WS_POPUP, + 100, 100, 100, 100, + hwnd_A, 0, GetModuleHandle(0), NULL); + trace("hwnd_C %p\n", hwnd_C); + check_z_order(hwnd_E, 0, hwnd_D, 0, FALSE); + check_z_order(hwnd_D, hwnd_E, hwnd_F, 0, FALSE); + check_z_order(hwnd_F, hwnd_D, hwnd_B, 0, FALSE); + check_z_order(hwnd_B, hwnd_F, hwnd_A, hwnd_F, TRUE); + check_z_order(hwnd_A, hwnd_B, hwnd_C, 0, TRUE); + check_z_order(hwnd_C, hwnd_A, 0, hwnd_A, TRUE); + DestroyWindow(hwnd_A); DestroyWindow(hwnd_B); DestroyWindow(hwnd_C); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 65e9389..f8a3c41 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1627,22 +1627,24 @@ static HWND SWP_DoOwnedPopups(HWND hwnd, HWND hwndInsertAfter) { /* make sure this popup stays above the owner */ - if (hwndInsertAfter != HWND_TOP && hwndInsertAfter != HWND_TOPMOST) + if (hwndInsertAfter != HWND_TOPMOST) { if (!(list = WIN_ListChildren( GetDesktopWindow() ))) return hwndInsertAfter; for (i = 0; list[i]; i++) { + BOOL topmost = (GetWindowLongW( list[i], GWL_EXSTYLE ) & WS_EX_TOPMOST) != 0; + if (list[i] == owner) { if (i > 0) hwndInsertAfter = list[i-1]; - else hwndInsertAfter = HWND_TOP; + else hwndInsertAfter = topmost ? HWND_TOPMOST : HWND_TOP; break; } - if (hwndInsertAfter == HWND_NOTOPMOST) + if (hwndInsertAfter == HWND_TOP || hwndInsertAfter == HWND_NOTOPMOST) { - if (!(GetWindowLongW( list[i], GWL_EXSTYLE ) & WS_EX_TOPMOST)) break; + if (!topmost) break; } else if (list[i] == hwndInsertAfter) break; } diff --git a/server/window.c b/server/window.c index a0e0788..5fd6f71 100644 --- a/server/window.c +++ b/server/window.c @@ -187,9 +187,17 @@ static void link_window( struct window *win, struct window *previous ) struct list *entry = win->parent->children.next; if (!(win->ex_style & WS_EX_TOPMOST)) /* put it above the first non-topmost window */ { - while (entry != &win->parent->children && - LIST_ENTRY( entry, struct window, entry )->ex_style & WS_EX_TOPMOST) + while (entry != &win->parent->children) + { + struct window *next = LIST_ENTRY( entry, struct window, entry ); + if (!(next->ex_style & WS_EX_TOPMOST)) break; + if (next->handle == win->owner) /* keep it above owner */ + { + win->ex_style |= WS_EX_TOPMOST; + break; + } entry = entry->next; + } } list_add_before( entry, &win->entry ); }

1 0

Hans Leidekker : msi: Include run mode in fixmes.
by Alexandre Julliard Feb. 19, 2010

Feb. 19, 2010

Module: wine Branch: master Commit: f4bcb105d2f6a06b50b0319c531bb6b20a61ac48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4bcb105d2f6a06b50b0319c5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 19 12:23:56 2010 +0100 msi: Include run mode in fixmes. --- dlls/msi/install.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 6e19863..c23075d 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -717,7 +717,7 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) break; default: - FIXME("unimplemented run mode\n"); + FIXME("unimplemented run mode: %d\n", iRunMode); r = TRUE; } @@ -766,7 +766,7 @@ UINT WINAPI MsiSetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode, BOOL fState) break; case MSIRUNMODE_REBOOTNOW: - FIXME("unimplemented run mode\n"); + FIXME("unimplemented run mode: %d\n", iRunMode); r = ERROR_FUNCTION_FAILED; break;

1 0

Vincent Povirk : comdlg32/tests: Font sizes are influenced by the display dpi.
by Alexandre Julliard Feb. 19, 2010

Feb. 19, 2010

Module: wine Branch: master Commit: 38c66289114d1ebbc03634843392aff4eaabd43c URL: http://source.winehq.org/git/wine.git/?a=commit;h=38c66289114d1ebbc03634843… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 18 14:47:43 2010 -0600 comdlg32/tests: Font sizes are influenced by the display dpi. --- dlls/comdlg32/tests/fontdlg.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/tests/fontdlg.c b/dlls/comdlg32/tests/fontdlg.c index 885fb44..a277e08 100644 --- a/dlls/comdlg32/tests/fontdlg.c +++ b/dlls/comdlg32/tests/fontdlg.c @@ -32,6 +32,18 @@ #include "wine/test.h" +static int get_dpiy(void) +{ + HDC hdc; + int result; + + hdc = GetDC(0); + result = GetDeviceCaps(hdc, LOGPIXELSY); + ReleaseDC(0, hdc); + + return result; +} + static UINT_PTR CALLBACK CFHookProcOK(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { switch (msg) @@ -49,6 +61,8 @@ static void test_ChooseFontA(void) LOGFONTA lfa; CHOOSEFONTA cfa; BOOL ret; + int dpiy = get_dpiy(); + int expected_pointsize, expected_lfheight; memset(&lfa, 0, sizeof(LOGFONTA)); lfa.lfHeight = -16; @@ -63,8 +77,12 @@ static void test_ChooseFontA(void) ret = ChooseFontA(&cfa); + expected_pointsize = MulDiv(16, 72, dpiy) * 10; + expected_lfheight = -MulDiv(expected_pointsize, dpiy, 720); + ok(ret == TRUE, "ChooseFontA returned FALSE\n"); - ok(lfa.lfHeight == -16, "Expected -16, got %i\n", lfa.lfHeight); + ok(cfa.iPointSize == expected_pointsize, "Expected %i, got %i\n", expected_pointsize, cfa.iPointSize); + ok(lfa.lfHeight == expected_lfheight, "Expected %i, got %i\n", expected_lfheight, lfa.lfHeight); ok(lfa.lfWeight == FW_NORMAL, "Expected FW_NORMAL, got %i\n", lfa.lfWeight); ok(strcmp(lfa.lfFaceName, "Symbol") == 0, "Expected Symbol, got %s\n", lfa.lfFaceName); }

1 0

Trey Hunner : cmd: Add test for 'if' case sensitivity.
by Alexandre Julliard Feb. 19, 2010

Feb. 19, 2010

Module: wine Branch: master Commit: 41c0db3ce91782f4ce766850fbe98f6d9d6c487d URL: http://source.winehq.org/git/wine.git/?a=commit;h=41c0db3ce91782f4ce766850f… Author: Trey Hunner <treyhunner(a)gmail.com> Date: Thu Feb 18 21:39:32 2010 -0800 cmd: Add test for 'if' case sensitivity. --- programs/cmd/tests/test_builtins.cmd | 7 +++++++ programs/cmd/tests/test_builtins.cmd.exp | 4 ++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 317fbdd..ed2b75b 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -36,3 +36,10 @@ if 1 == 0 ( ) else ( echo else seems to work ) +echo Testing case sensitivity with and without /i option +if bar==BAR echo if does not default to case sensitivity +if not bar==BAR echo if seems to default to case sensitivity +if /i foo==FOO echo if /i seems to work +if /i not foo==FOO echo if /i seems to be broken +if /I foo==FOO echo if /I seems to work +if /I not foo==FOO echo if /I seems to be broken diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index c53aa1f..2c0e980 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -20,3 +20,7 @@ bar if/else should work with blocks if seems to work else seems to work +Testing case sensitivity with and without /i option +if seems to default to case sensitivity +if /i seems to work +if /I seems to work

1 0

Alexandre Julliard : advapi32/tests: Fix the ReadEventLog error checking.
by Alexandre Julliard Feb. 19, 2010

Feb. 19, 2010

Module: wine Branch: master Commit: 71fa5a36b156c7637591724316e93696700a52a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71fa5a36b156c763759172431… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 19 11:36:12 2010 +0100 advapi32/tests: Fix the ReadEventLog error checking. --- dlls/advapi32/tests/eventlog.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 3907873..ff3f658 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -767,22 +767,28 @@ static void test_readwrite(void) { win_skip("Win7 fails when using incorrect event types\n"); ret = ReportEvent(handle, 0, 0, 0, NULL, 0, 0, NULL, NULL); + ok(ret, "Expected success : %d\n", GetLastError()); } else { void *buf; - DWORD read, needed; + DWORD read, needed = 0; EVENTLOGRECORD *record; + ok(ret, "Expected success : %d\n", GetLastError()); + /* Needed to catch earlier Vista (with no ServicePack for example) */ buf = HeapAlloc(GetProcessHeap(), 0, sizeof(EVENTLOGRECORD)); - if (ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, - 0, buf, sizeof(EVENTLOGRECORD), &read, &needed)) + if (!(ret = ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, + 0, buf, sizeof(EVENTLOGRECORD), &read, &needed)) && + GetLastError() == ERROR_INSUFFICIENT_BUFFER) { buf = HeapReAlloc(GetProcessHeap(), 0, buf, needed); - ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, - 0, buf, needed, &read, &needed); - + ret = ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, + 0, buf, needed, &read, &needed); + } + if (ret) + { record = (EVENTLOGRECORD *)buf; /* Vista and W2K8 return EVENTLOG_SUCCESS, Windows versions before return @@ -793,7 +799,6 @@ static void test_readwrite(void) } HeapFree(GetProcessHeap(), 0, buf); } - ok(ret, "Expected success : %d\n", GetLastError()); /* This will clear the eventlog. The record numbering for new * events however differs on Vista SP1+. Before Vista the first

1 0