February 2007 - Wine-commits

Mike McCormack : ole32: Add a few more tests for transacted storage.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 4c46194cf5daf75a7a8d80c81d32e42fa3868358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c46194cf5daf75a7a8d80c81… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Feb 6 18:39:58 2007 +0900 ole32: Add a few more tests for transacted storage. --- dlls/ole32/tests/storage32.c | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 663bc30..9a90ad3 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -862,10 +862,11 @@ static void test_transact(void) static const WCHAR szPrefix[] = { 's','t','g',0 }; static const WCHAR szDot[] = { '.',0 }; WCHAR filename[MAX_PATH]; - IStorage *stg = NULL; + IStorage *stg = NULL, *stg2 = NULL; HRESULT r; IStream *stm = NULL; static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + static const WCHAR stmname2[] = { 'F','O','O',0 }; if(!GetTempFileNameW(szDot, szPrefix, 0, filename)) return; @@ -878,9 +879,28 @@ static void test_transact(void) ok(r==S_OK, "StgCreateDocfile failed\n"); /* now create a stream, but don't commit it */ + r = IStorage_CreateStream(stg, stmname2, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + ok(r==S_OK, "IStorage->CreateStream failed\n"); + + r = IStream_Write(stm, "this is stream 1\n", 16, NULL); + ok(r==S_OK, "IStream->Write failed\n"); + + r = IStream_Release(stm); + + r = IStorage_Commit(stg, 0); + ok(r==S_OK, "IStorage->Commit failed\n"); + + /* now create a stream, but don't commit it */ + stm = NULL; r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); ok(r==S_OK, "IStorage->CreateStream failed\n"); + r = IStream_Write(stm, "this is stream 2\n", 16, NULL); + ok(r==S_OK, "IStream->Write failed\n"); + + r = IStream_Commit(stm, STGC_ONLYIFCURRENT | STGC_DANGEROUSLYCOMMITMERELYTODISKCACHE); + ok(r==S_OK, "IStream->Commit failed\n"); + r = IStream_Release(stm); IStorage_Release(stg); @@ -902,13 +922,24 @@ static void test_transact(void) r = IStorage_OpenStream(stg, stmname, NULL, STGM_TRANSACTED|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); ok(r==STG_E_INVALIDFUNCTION, "IStorage->OpenStream failed %08x\n", r); + r = IStorage_OpenStorage(stg, stmname, NULL, STGM_TRANSACTED|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg2 ); + ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream failed %08x\n", r); + todo_wine { r = IStorage_OpenStream(stg, stmname, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream should fail %08x\n", r); } + if (stm) + r = IStream_Release(stm); + r = IStorage_OpenStorage(stg, stmname2, NULL, STGM_TRANSACTED|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg2 ); + ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream failed %08x\n", r); + + r = IStorage_OpenStream(stg, stmname2, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); + ok(r==S_OK, "IStorage->OpenStream should fail %08x\n", r); if (stm) r = IStream_Release(stm); + IStorage_Release(stg); r = DeleteFileW(filename);

1 0

Mike McCormack : widl: Implement dispinterfaces derived from an interface.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 609cd3027749067a70bcdfa5054be71669f19fcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=609cd3027749067a70bcdfa50… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Feb 6 18:09:17 2007 +0900 widl: Implement dispinterfaces derived from an interface. --- tools/widl/parser.y | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 1741b83..9cd1b12 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -726,13 +726,13 @@ dispinterfacedef: dispinterfacehdr '{' if (!parse_only && do_header) write_dispinterface($$); if (!parse_only && do_idfile) write_diid($$); } -/* FIXME: not sure how to handle this yet - | dispinterfacehdr '{' interface '}' { $$ = $1; - compute_method_indexes($$); - if (!parse_only && do_header) write_interface($$); - if (!parse_only && do_idfile) write_iid($$); + | dispinterfacehdr + '{' interface ';' '}' { $$ = $1; + $$->fields = $3->fields; + $$->funcs = $3->funcs; + if (!parse_only && do_header) write_dispinterface($$); + if (!parse_only && do_idfile) write_diid($$); } -*/ ; inherit: { $$ = NULL; }

1 0

Francois Gouget : Add missing '\n's in traces.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 0271a09d4c6ff4896eed65ab0b74d06752eac43f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0271a09d4c6ff4896eed65ab0… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 6 10:16:53 2007 +0100 Add missing '\n's in traces. --- dlls/kernel32/tests/sync.c | 2 +- dlls/winealsa.drv/dsoutput.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 19c9067..6031fc5 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -191,7 +191,7 @@ static void test_slist(void) memset(&slist_header, 0xFF, sizeof(slist_header)); pInitializeSListHead(&slist_header); ok(memcmp(&test_header, &slist_header, sizeof(SLIST_HEADER)) == 0, - "InitializeSListHead didn't zero-fill list header"); + "InitializeSListHead didn't zero-fill list header\n"); size = pQueryDepthSList(&slist_header); ok(size == 0, "initially created slist has size %d, expected 0\n", size); diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index f104ff9..1b7e9b1 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -231,7 +231,7 @@ static DWORD CALLBACK DBSB_MMAPLoop(LPVO SetEvent(hEvent); goto out; default: - ERR("Unhandled event %s", ALSA_getCmdString(msg)); + ERR("Unhandled event %s\n", ALSA_getCmdString(msg)); break; } if (hEvent != INVALID_HANDLE_VALUE)

1 0

Jan Zerebecki : urlmon: Remove redundant const.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: ea6ee42c714e2408e09539aa19fb99adf2778c52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea6ee42c714e2408e09539aa1… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Tue Feb 6 08:42:22 2007 +0100 urlmon: Remove redundant const. --- dlls/urlmon/urlmon_main.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 5dc9b54..7cee585 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -400,7 +400,7 @@ void WINAPI ReleaseBindInfo(BINDINFO* pb * * Determines the Multipurpose Internet Mail Extensions (MIME) type from the data provided. */ -static BOOL text_html_filter(const BYTE const *b, DWORD size) +static BOOL text_html_filter(const BYTE *b, DWORD size) { int i; @@ -419,7 +419,7 @@ static BOOL text_html_filter(const BYTE return FALSE; } -static BOOL image_gif_filter(const BYTE const *b, DWORD size) +static BOOL image_gif_filter(const BYTE *b, DWORD size) { return size >= 6 && (b[0] == 'G' || b[0] == 'g') @@ -430,69 +430,69 @@ static BOOL image_gif_filter(const BYTE && (b[5] == 'A' || b[5] == 'a'); } -static BOOL image_pjpeg_filter(const BYTE const *b, DWORD size) +static BOOL image_pjpeg_filter(const BYTE *b, DWORD size) { return size > 2 && b[0] == 0xff && b[1] == 0xd8; } -static BOOL image_tiff_filter(const BYTE const *b, DWORD size) +static BOOL image_tiff_filter(const BYTE *b, DWORD size) { return size > 2 && b[0] == 0x4d && b[1] == 0x4d; } -static BOOL image_xpng_filter(const BYTE const *b, DWORD size) +static BOOL image_xpng_filter(const BYTE *b, DWORD size) { static const BYTE xpng_header[] = {0x89,'P','N','G',0x0d,0x0a,0x1a,0x0a}; return size > sizeof(xpng_header) && !memcmp(b, xpng_header, sizeof(xpng_header)); } -static BOOL image_bmp_filter(const BYTE const *b, DWORD size) +static BOOL image_bmp_filter(const BYTE *b, DWORD size) { return size >= 14 && b[0] == 0x42 && b[1] == 0x4d && *(const DWORD *)(b+6) == 0; } -static BOOL video_avi_filter(const BYTE const *b, DWORD size) +static BOOL video_avi_filter(const BYTE *b, DWORD size) { return size > 12 && b[0] == 'R' && b[1] == 'I' && b[2] == 'F' && b[3] == 'F' && b[8] == 'A' && b[9] == 'V' && b[10] == 'I' && b[11] == 0x20; } -static BOOL video_mpeg_filter(const BYTE const *b, DWORD size) +static BOOL video_mpeg_filter(const BYTE *b, DWORD size) { return size > 4 && !b[0] && !b[1] && b[2] == 0x01 && (b[3] == 0xb3 || b[3] == 0xba); } -static BOOL application_pdf_filter(const BYTE const *b, DWORD size) +static BOOL application_pdf_filter(const BYTE *b, DWORD size) { return size > 4 && b[0] == 0x25 && b[1] == 0x50 && b[2] == 0x44 && b[3] == 0x46; } -static BOOL application_xzip_filter(const BYTE const *b, DWORD size) +static BOOL application_xzip_filter(const BYTE *b, DWORD size) { return size > 2 && b[0] == 0x50 && b[1] == 0x4b; } -static BOOL application_xgzip_filter(const BYTE const *b, DWORD size) +static BOOL application_xgzip_filter(const BYTE *b, DWORD size) { return size > 2 && b[0] == 0x1f && b[1] == 0x8b; } -static BOOL application_java_filter(const BYTE const *b, DWORD size) +static BOOL application_java_filter(const BYTE *b, DWORD size) { return size > 4 && b[0] == 0xca && b[1] == 0xfe && b[2] == 0xba && b[3] == 0xbe; } -static BOOL application_xmsdownload(const BYTE const *b, DWORD size) +static BOOL application_xmsdownload(const BYTE *b, DWORD size) { return size > 2 && b[0] == 'M' && b[1] == 'Z'; } -static BOOL text_plain_filter(const BYTE const *b, DWORD size) +static BOOL text_plain_filter(const BYTE *b, DWORD size) { const BYTE *ptr; @@ -504,7 +504,7 @@ static BOOL text_plain_filter(const BYTE return TRUE; } -static BOOL application_octet_stream_filter(const BYTE const *b, DWORD size) +static BOOL application_octet_stream_filter(const BYTE *b, DWORD size) { return TRUE; } @@ -539,7 +539,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC } if(pBuffer) { - const BYTE const *buf = pBuffer; + const BYTE *buf = pBuffer; DWORD len; LPCWSTR ret = NULL; int i; @@ -568,7 +568,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC static const struct { LPCWSTR mime; - BOOL (*filter)(const BYTE const*,DWORD); + BOOL (*filter)(const BYTE *,DWORD); } mime_filters[] = { {wszTextHtml, text_html_filter}, {wszImageGif, image_gif_filter},

1 0

Mike McCormack : msi: Add a test showing MsiGetProperty returns correct values.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 824b89987a27837daf8ab005da0055ad71c526d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=824b89987a27837daf8ab005d… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Feb 6 18:07:52 2007 +0900 msi: Add a test showing MsiGetProperty returns correct values. --- dlls/msi/tests/package.c | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index a0a72f0..233b472 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -1347,12 +1347,26 @@ static BOOL check_prop_empty( MSIHANDLE static void test_props(void) { - MSIHANDLE hpkg; + MSIHANDLE hpkg, hdb; UINT r; DWORD sz; char buffer[0x100]; - hpkg = package_from_db(create_package_db()); + hdb = create_package_db(); + r = run_query( hdb, + "CREATE TABLE `Property` ( " + "`Property` CHAR(255) NOT NULL, " + "`Value` CHAR(255) " + "PRIMARY KEY `Property`)" ); + ok( r == ERROR_SUCCESS , "Failed\n" ); + + r = run_query(hdb, + "INSERT INTO `Property` " + "(`Property`, `Value`) " + "VALUES( 'MetadataCompName', 'Photoshop.dll' )"); + ok( r == ERROR_SUCCESS , "Failed\n" ); + + hpkg = package_from_db( hdb ); ok( hpkg, "failed to create package\n"); /* test invalid values */ @@ -1473,6 +1487,19 @@ static void test_props(void) ok( !strcmp(buffer,"foo"), "buffer wrong\n"); ok( sz == 3, "wrong size returned\n"); + r = MsiSetProperty(hpkg, "MetadataCompName", "Photoshop.dll"); + ok( r == ERROR_SUCCESS, "wrong return val\n"); + + sz = 0; + r = MsiGetProperty(hpkg, "MetadataCompName", NULL, &sz ); + ok( r == ERROR_SUCCESS, "return wrong\n"); + ok( sz == 13, "size wrong (%d)\n", sz); + + sz = 13; + r = MsiGetProperty(hpkg, "MetadataCompName", buffer, &sz ); + ok( r == ERROR_MORE_DATA, "return wrong\n"); + ok( !strcmp(buffer,"Photoshop.dl"), "buffer wrong\n"); + MsiCloseHandle( hpkg ); DeleteFile(msifile); }

1 0

Mike McCormack : msi: Factor out code to calculate column offsets.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: a16e5151da9432f7deab7b89d4babb421b40e569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a16e5151da9432f7deab7b89d… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Feb 6 18:08:20 2007 +0900 msi: Factor out code to calculate column offsets. --- dlls/msi/table.c | 35 +++++++++++++++++++++-------------- 1 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index dd611d2..420519b 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -873,6 +873,24 @@ static const MSICOLUMNINFO _Tables_cols[ { szTables, 1, szName, MSITYPE_VALID | MSITYPE_STRING | 64, 0 }, }; +static void table_calc_column_offsets( MSICOLUMNINFO *colinfo, DWORD count ) +{ + DWORD i; + + for( i=0; colinfo && (i<count); i++ ) + { + assert( (i+1) == colinfo[ i ].number ); + if (i) + colinfo[i].offset = colinfo[ i - 1 ].offset + + bytes_per_column( &colinfo[ i - 1 ] ); + else + colinfo[i].offset = 0; + TRACE("column %d is [%s] with type %08x ofs %d\n", + colinfo[i].number, debugstr_w(colinfo[i].colname), + colinfo[i].type, colinfo[i].offset); + } +} + static UINT get_defaulttablecolumns( LPCWSTR name, MSICOLUMNINFO *colinfo, UINT *sz) { const MSICOLUMNINFO *p; @@ -905,6 +923,7 @@ static UINT get_defaulttablecolumns( LPC if( colinfo && (i >= *sz) ) break; } + table_calc_column_offsets( colinfo, n ); *sz = n; return ERROR_SUCCESS; } @@ -994,26 +1013,14 @@ static UINT get_tablecolumns( MSIDATABAS TRACE("%s has %d columns\n", debugstr_w(szTableName), n); - if (maxcount && n != maxcount) + if (colinfo && n != maxcount) { ERR("missing column in table %s\n", debugstr_w(szTableName)); msi_free_colinfo(colinfo, maxcount ); return ERROR_FUNCTION_FAILED; } - /* calculate the offsets */ - for( i=0; maxcount && (i<maxcount); i++ ) - { - assert( (i+1) == colinfo[ i ].number ); - if (i) - colinfo[i].offset = colinfo[ i - 1 ].offset - + bytes_per_column( &colinfo[ i - 1 ] ); - else - colinfo[i].offset = 0; - TRACE("column %d is [%s] with type %08x ofs %d\n", - colinfo[i].number, debugstr_w(colinfo[i].colname), - colinfo[i].type, colinfo[i].offset); - } + table_calc_column_offsets( colinfo, n ); *sz = n; return ERROR_SUCCESS;

1 0

Mike McCormack : msi: Add the generated typelib to the resources.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 59736773d731e55cfd0faa60d246857f3486beee URL: http://source.winehq.org/git/wine.git/?a=commit;h=59736773d731e55cfd0faa60d… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Feb 6 18:40:59 2007 +0900 msi: Add the generated typelib to the resources. --- dlls/msi/msi.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/msi.rc b/dlls/msi/msi.rc index ed818ad..cbe18fe 100644 --- a/dlls/msi/msi.rc +++ b/dlls/msi/msi.rc @@ -46,6 +46,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +1 TYPELIB LOADONCALL DISCARDABLE msiserver.tlb + /* BINRES instadvert.bmp */ 0x1001 BITMAP instadvert.bmp /* {

1 0

Mike McCormack : msi: Test the dispid for CreateRecord.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 224ead82531b85ac9366227d3d7975452f810d1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=224ead82531b85ac9366227d3… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Feb 6 18:41:12 2007 +0900 msi: Test the dispid for CreateRecord. --- dlls/msi/tests/iface.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/iface.c b/dlls/msi/tests/iface.c index d7dc640..9a0742b 100644 --- a/dlls/msi/tests/iface.c +++ b/dlls/msi/tests/iface.c @@ -64,6 +64,7 @@ static void test_msi_dispid(void) } todo_wine { + ok( get_dispid( disp, "CreateRecord" ) == 1, "dispid wrong\n"); ok( get_dispid( disp, "OpenPackage" ) == 2, "dispid wrong\n"); ok( get_dispid( disp, "OpenProduct" ) == 3, "dispid wrong\n"); ok( get_dispid( disp, "OpenDatabase" ) == 4, "dispid wrong\n");

1 0

Andrew Talbot : wineps.drv: Declare some functions static.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 550ea86ffd37f57dba71167425c789334cafe965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=550ea86ffd37f57dba7116742… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Feb 5 21:24:35 2007 +0000 wineps.drv: Declare some functions static. --- dlls/wineps.drv/driver.c | 4 ++-- dlls/wineps.drv/escape.c | 2 +- dlls/wineps.drv/ppd.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index e096bf6..fececd7 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -195,8 +195,8 @@ WORD WINAPI PSDRV_AdvancedSetupDialog16( * * Dialog proc for 'Paper' propsheet */ -INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM - lParam) +static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, + WPARAM wParam, LPARAM lParam) { PSDRV_DLGINFO *di; int i, Cursel = 0; diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index dcc972e..3e5de7f 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -381,7 +381,7 @@ INT PSDRV_EndPage( PSDRV_PDEVICE *physDe /************************************************************************ * PSDRV_StartDocA */ -INT PSDRV_StartDocA( PSDRV_PDEVICE *physDev, const DOCINFOA *doc ) +static INT PSDRV_StartDocA( PSDRV_PDEVICE *physDev, const DOCINFOA *doc ) { LPCSTR output = "LPT1:"; BYTE buf[300]; diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index 0b17bce..9b7169b 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -467,7 +467,7 @@ static BOOL PSDRV_PPDGetNextTuple(FILE * * entry which is appended to the list if name is not found. * */ -PAGESIZE *PSDRV_PPDGetPageSizeInfo(PPD *ppd, char *name) +static PAGESIZE *PSDRV_PPDGetPageSizeInfo(PPD *ppd, char *name) { PAGESIZE *page = ppd->PageSizes, *lastpage;

1 0

Misha Koshelev : msi: InstallPackage check for UI level must not disregard flags.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: ecd20e28ac8de743483ae9c313ab6d56be502aa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd20e28ac8de743483ae9c31… Author: Misha Koshelev <mk144210(a)bcm.tmc.edu> Date: Mon Feb 5 23:25:15 2007 -0600 msi: InstallPackage check for UI level must not disregard flags. --- dlls/msi/action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 0c8ac79..6c2fdf4 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -642,7 +642,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *pac msi_apply_transforms( package ); msi_apply_patches( package ); - if ( msi_get_property_int(package, szUILevel, 0) >= INSTALLUILEVEL_REDUCED ) + if ( (msi_get_property_int(package, szUILevel, 0) & 0xf) >= INSTALLUILEVEL_REDUCED ) { package->script->InWhatSequence |= SEQUENCE_UI; rc = ACTION_ProcessUISequence(package);

1 0