October 2006 - Wine-Commits

Andrew Talbot : d3d8: Cast-qual warnings fix.
by Alexandre Julliard Oct. 27, 2006

Oct. 27, 2006

Module: wine Branch: master Commit: 4471ad44a36698c0b61148567fb12c9d80854732 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4471ad44a36698c0b61148567… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Oct 26 20:57:37 2006 +0100 d3d8: Cast-qual warnings fix. --- dlls/d3d8/device.c | 6 +++--- dlls/d3d8/volume.c | 2 +- dlls/d3d8/volumetexture.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 67d3b8b..8b20920 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -309,7 +309,7 @@ static void WINAPI IDirect3DDevice8Impl_ TRACE("(%p) Relay\n", This); /* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */ - return IWineD3DDevice_SetGammaRamp(This->WineD3DDevice, 0, Flags, (WINED3DGAMMARAMP *) pRamp); + return IWineD3DDevice_SetGammaRamp(This->WineD3DDevice, 0, Flags, (CONST WINED3DGAMMARAMP *) pRamp); } static void WINAPI IDirect3DDevice8Impl_GetGammaRamp(LPDIRECT3DDEVICE8 iface, D3DGAMMARAMP* pRamp) { @@ -1448,14 +1448,14 @@ static HRESULT WINAPI IDirect3DDevice8Im IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_DrawRectPatch(This->WineD3DDevice, Handle, pNumSegs, (WINED3DRECTPATCH_INFO *)pRectPatchInfo); + return IWineD3DDevice_DrawRectPatch(This->WineD3DDevice, Handle, pNumSegs, (CONST WINED3DRECTPATCH_INFO *)pRectPatchInfo); } static HRESULT WINAPI IDirect3DDevice8Impl_DrawTriPatch(LPDIRECT3DDEVICE8 iface, UINT Handle,CONST float* pNumSegs,CONST D3DTRIPATCH_INFO* pTriPatchInfo) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_DrawTriPatch(This->WineD3DDevice, Handle, pNumSegs, (WINED3DTRIPATCH_INFO *)pTriPatchInfo); + return IWineD3DDevice_DrawTriPatch(This->WineD3DDevice, Handle, pNumSegs, (CONST WINED3DTRIPATCH_INFO *)pTriPatchInfo); } static HRESULT WINAPI IDirect3DDevice8Impl_DeletePatch(LPDIRECT3DDEVICE8 iface, UINT Handle) { diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index e2db2f8..4e3350b 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -152,7 +152,7 @@ static HRESULT WINAPI IDirect3DVolume8Im static HRESULT WINAPI IDirect3DVolume8Impl_LockBox(LPDIRECT3DVOLUME8 iface, D3DLOCKED_BOX *pLockedVolume, CONST D3DBOX *pBox, DWORD Flags) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; TRACE("(%p) relay %p %p %p %d\n", This, This->wineD3DVolume, pLockedVolume, pBox, Flags); - return IWineD3DVolume_LockBox(This->wineD3DVolume, (WINED3DLOCKED_BOX *) pLockedVolume, (WINED3DBOX *) pBox, Flags); + return IWineD3DVolume_LockBox(This->wineD3DVolume, (WINED3DLOCKED_BOX *) pLockedVolume, (CONST WINED3DBOX *) pBox, Flags); } static HRESULT WINAPI IDirect3DVolume8Impl_UnlockBox(LPDIRECT3DVOLUME8 iface) { diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index ada6ccd..cf0202c 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -171,7 +171,7 @@ static HRESULT WINAPI IDirect3DVolumeTex static HRESULT WINAPI IDirect3DVolumeTexture8Impl_LockBox(LPDIRECT3DVOLUMETEXTURE8 iface, UINT Level, D3DLOCKED_BOX *pLockedVolume, CONST D3DBOX *pBox, DWORD Flags) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; TRACE("(%p) Relay %p %p %p %d\n", This, This->wineD3DVolumeTexture, pLockedVolume, pBox,Flags); - return IWineD3DVolumeTexture_LockBox(This->wineD3DVolumeTexture, Level, (WINED3DLOCKED_BOX *) pLockedVolume, (WINED3DBOX *) pBox, Flags); + return IWineD3DVolumeTexture_LockBox(This->wineD3DVolumeTexture, Level, (WINED3DLOCKED_BOX *) pLockedVolume, (CONST WINED3DBOX *) pBox, Flags); } static HRESULT WINAPI IDirect3DVolumeTexture8Impl_UnlockBox(LPDIRECT3DVOLUMETEXTURE8 iface, UINT Level) { @@ -183,7 +183,7 @@ static HRESULT WINAPI IDirect3DVolumeTex static HRESULT WINAPI IDirect3DVolumeTexture8Impl_AddDirtyBox(LPDIRECT3DVOLUMETEXTURE8 iface, CONST D3DBOX *pDirtyBox) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; TRACE("(%p) Relay\n", This); - return IWineD3DVolumeTexture_AddDirtyBox(This->wineD3DVolumeTexture, (WINED3DBOX *) pDirtyBox); + return IWineD3DVolumeTexture_AddDirtyBox(This->wineD3DVolumeTexture, (CONST WINED3DBOX *) pDirtyBox); }

1 0

James Hawkins : msi: Extract cabinets based on DiskId, not LastSequence.
by Alexandre Julliard Oct. 27, 2006

Oct. 27, 2006

Module: wine Branch: master Commit: 62dc9ca691ea1449dc217351dc6ea7f9ca33ce17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62dc9ca691ea1449dc217351d… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Oct 27 00:42:14 2006 -0700 msi: Extract cabinets based on DiskId, not LastSequence. --- dlls/msi/files.c | 7 ++++++- dlls/msi/tests/install.c | 16 ++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 7eec8a2..2f68467 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -458,7 +458,7 @@ static UINT ready_media_for_file( MSIPAC '`','M','e','d','i','a','`',' ','W','H','E','R','E',' ', '`','L','a','s','t','S','e','q','u','e','n','c','e','`',' ','>','=', ' ','%', 'i',' ','O','R','D','E','R',' ','B','Y',' ', - '`','L','a','s','t','S','e','q','u','e','n','c','e','`',0}; + '`','D','i','s','k','I','d','`',0}; LPCWSTR cab, volume; DWORD sz; INT seq; @@ -700,8 +700,13 @@ UINT ACTION_InstallFiles(MSIPACKAGE *pac if (file->IsCompressed) { if (INVALID_FILE_ATTRIBUTES == GetFileAttributesW(file->TargetPath)) + { ERR("compressed file wasn't extracted (%s)\n", debugstr_w(file->TargetPath)); + rc = ERROR_INSTALL_FAILURE; + break; + } + continue; } diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 70edf11..01d0615 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -839,13 +839,13 @@ static void test_caborder(void) create_cab_file("test2.cab", MEDIA_SIZE, "augustus\0"); r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + ok(!delete_pf("msitest\\augustus", TRUE), "File is installed\n"); todo_wine { - ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); - ok(!delete_pf("msitest\\augustus", TRUE), "File is installed\n"); - ok(!delete_pf("msitest", FALSE), "File is installed\n"); + ok(!delete_pf("msitest\\maximus", TRUE), "File is installed\n"); + ok(!delete_pf("msitest", FALSE), "File is installed\n"); } - ok(!delete_pf("msitest\\maximus", TRUE), "File is installed\n"); DeleteFile("test1.cab"); DeleteFile("test2.cab"); @@ -854,12 +854,12 @@ static void test_caborder(void) create_cab_file("test2.cab", MEDIA_SIZE, "maximus\0augustus\0"); r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + ok(!delete_pf("msitest\\maximus", TRUE), "File is installed\n"); + ok(!delete_pf("msitest\\augustus", TRUE), "File is installed\n"); todo_wine { - ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); - ok(!delete_pf("msitest\\maximus", TRUE), "File is installed\n"); - ok(!delete_pf("msitest\\augustus", TRUE), "File is installed\n"); - ok(!delete_pf("msitest", FALSE), "File is installed\n"); + ok(!delete_pf("msitest", FALSE), "File is installed\n"); } DeleteFile("test1.cab");

1 0

Alexandre Julliard : kernel32: Close the directory handle in FindNextFile as soon as we reach the end of the directory .
by Alexandre Julliard Oct. 27, 2006

Oct. 27, 2006

Module: wine Branch: master Commit: 5e0823056898524321458a88e0d6937007d0b0bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e0823056898524321458a88e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 27 12:27:33 2006 +0200 kernel32: Close the directory handle in FindNextFile as soon as we reach the end of the directory. --- dlls/kernel32/file.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index b5e58e0..15dd719 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1546,6 +1546,7 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR LPVOID data, FINDEX_SEARCH_OPS search_op, LPVOID filter, DWORD flags) { + static const WCHAR wildcardsW[] = { '*','?',0 }; WCHAR *mask, *p; FIND_FIRST_INFO *info = NULL; UNICODE_STRING nt_name; @@ -1637,6 +1638,12 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR SetLastError( ERROR_FILE_NOT_FOUND ); return INVALID_HANDLE_VALUE; } + if (!strpbrkW( info->mask.Buffer, wildcardsW )) + { + /* we can't find two files with the same name */ + CloseHandle( info->handle ); + info->handle = 0; + } return (HANDLE)info; error: @@ -1671,7 +1678,8 @@ BOOL WINAPI FindNextFileW( HANDLE handle RtlEnterCriticalSection( &info->cs ); - for (;;) + if (!info->handle) SetLastError( ERROR_NO_MORE_FILES ); + else for (;;) { if (info->data_pos >= info->data_len) /* need to read some more data */ { @@ -1682,6 +1690,11 @@ BOOL WINAPI FindNextFileW( HANDLE handle if (io.u.Status) { SetLastError( RtlNtStatusToDosError( io.u.Status ) ); + if (io.u.Status == STATUS_NO_MORE_FILES) + { + CloseHandle( info->handle ); + info->handle = 0; + } break; } info->data_len = io.Information;

1 0

James Hawkins : msi: Test the order in which cab files are handled in the Media table.
by Alexandre Julliard Oct. 27, 2006

Oct. 27, 2006

Module: wine Branch: master Commit: 005c0a792ea48a1e95b321d9a2a3c70c1973959d URL: http://source.winehq.org/git/wine.git/?a=commit;h=005c0a792ea48a1e95b321d9a… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Oct 26 17:16:05 2006 -0700 msi: Test the order in which cab files are handled in the Media table. --- dlls/msi/tests/install.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 760e81e..70edf11 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -823,6 +823,54 @@ static void test_continuouscabs(void) DeleteFile(msifile); } +static void test_caborder(void) +{ + UINT r; + + create_file("imperator", 100); + create_file("maximus", 500); + create_file("augustus", 50000); + + create_database(msifile, cc_tables, sizeof(cc_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + create_cab_file("test1.cab", MEDIA_SIZE, "maximus\0"); + create_cab_file("test2.cab", MEDIA_SIZE, "augustus\0"); + + r = MsiInstallProductA(msifile, NULL); + todo_wine + { + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + ok(!delete_pf("msitest\\augustus", TRUE), "File is installed\n"); + ok(!delete_pf("msitest", FALSE), "File is installed\n"); + } + ok(!delete_pf("msitest\\maximus", TRUE), "File is installed\n"); + + DeleteFile("test1.cab"); + DeleteFile("test2.cab"); + + create_cab_file("test1.cab", MEDIA_SIZE, "imperator\0"); + create_cab_file("test2.cab", MEDIA_SIZE, "maximus\0augustus\0"); + + r = MsiInstallProductA(msifile, NULL); + todo_wine + { + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + ok(!delete_pf("msitest\\maximus", TRUE), "File is installed\n"); + ok(!delete_pf("msitest\\augustus", TRUE), "File is installed\n"); + ok(!delete_pf("msitest", FALSE), "File is installed\n"); + } + + DeleteFile("test1.cab"); + DeleteFile("test2.cab"); + + DeleteFile("imperator"); + DeleteFile("maximus"); + DeleteFile("augustus"); + DeleteFile(msifile); +} + START_TEST(install) { DWORD len; @@ -839,4 +887,5 @@ START_TEST(install) test_MsiSetComponentState(); test_packagecoltypes(); test_continuouscabs(); + test_caborder(); }

1 0

James Hawkins : msi: Implement handling for the ErrorDialog and use it to change media.
by Alexandre Julliard Oct. 27, 2006

Oct. 27, 2006

Module: wine Branch: master Commit: c6bfbde849b5ddf2217f30bbac31bc7e43043278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6bfbde849b5ddf2217f30bba… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Oct 26 17:13:52 2006 -0700 msi: Implement handling for the ErrorDialog and use it to change media. --- dlls/msi/dialog.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/files.c | 30 +++++++++++++ dlls/msi/msipriv.h | 1 + dlls/msi/tests/install.c | 2 + 4 files changed, 136 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 403e65f..407cb29 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3448,3 +3448,106 @@ void msi_dialog_unregister_class( void ) UnregisterClassW( szMsiHiddenWindow, NULL ); uiThreadId = 0; } + +static UINT error_dialog_handler(MSIPACKAGE *package, LPCWSTR event, + LPCWSTR argument, msi_dialog* dialog) +{ + static const WCHAR end_dialog[] = {'E','n','d','D','i','a','l','o','g',0}; + static const WCHAR error_abort[] = {'E','r','r','o','r','A','b','o','r','t',0}; + static const WCHAR error_cancel[] = {'E','r','r','o','r','C','a','n','c','e','l',0}; + static const WCHAR error_no[] = {'E','r','r','o','r','N','o',0}; + static const WCHAR result_prop[] = { + 'M','S','I','E','r','r','o','r','D','i','a','l','o','g','R','e','s','u','l','t',0 + }; + + if ( lstrcmpW( event, end_dialog ) ) + return ERROR_SUCCESS; + + if ( !lstrcmpW( argument, error_abort ) || !lstrcmpW( argument, error_cancel ) || + !lstrcmpW( argument, error_no ) ) + { + MSI_SetPropertyW( package, result_prop, error_abort ); + } + + ControlEvent_CleanupSubscriptions(package); + msi_dialog_end_dialog( dialog ); + + return ERROR_SUCCESS; +} + +static UINT msi_error_dialog_set_error( MSIPACKAGE *package, LPWSTR error_dialog, LPWSTR error ) +{ + MSIRECORD * row; + + static const WCHAR update[] = + {'U','P','D','A','T','E',' ','`','C','o','n','t','r','o','l','`',' ', + 'S','E','T',' ','`','T','e','x','t','`',' ','=',' ','\'','%','s','\'',' ', + 'W','H','E','R','E', ' ','`','D','i','a','l','o','g','_','`',' ','=',' ','\'','%','s','\'',' ', + 'A','N','D',' ','`','C','o','n','t','r','o','l','`',' ','=',' ', + '\'','E','r','r','o','r','T','e','x','t','\'',0}; + + row = MSI_QueryGetRecord( package->db, update, error, error_dialog ); + if (!row) + return ERROR_FUNCTION_FAILED; + + msiobj_release(&row->hdr); + return ERROR_SUCCESS; +} + +UINT msi_spawn_error_dialog( MSIPACKAGE *package, LPWSTR error_dialog, LPWSTR error ) +{ + msi_dialog *dialog; + WCHAR result[MAX_PATH]; + UINT r = ERROR_SUCCESS; + DWORD size = MAX_PATH; + int res; + + static const WCHAR pn_prop[] = {'P','r','o','d','u','c','t','N','a','m','e',0}; + static const WCHAR title_fmt[] = {'%','s',' ','W','a','r','n','i','n','g',0}; + static const WCHAR error_abort[] = {'E','r','r','o','r','A','b','o','r','t',0}; + static const WCHAR result_prop[] = { + 'M','S','I','E','r','r','o','r','D','i','a','l','o','g','R','e','s','u','l','t',0 + }; + + if ( !error_dialog ) + { + LPWSTR product_name = msi_dup_property( package, pn_prop ); + WCHAR title[MAX_PATH]; + + sprintfW( title, title_fmt, product_name ); + res = MessageBoxW( NULL, error, title, MB_OKCANCEL | MB_ICONWARNING ); + + msi_free( product_name ); + + if ( res == IDOK ) + return ERROR_SUCCESS; + else + return ERROR_FUNCTION_FAILED; + } + + r = msi_error_dialog_set_error( package, error_dialog, error ); + if ( r != ERROR_SUCCESS ) + return r; + + dialog = msi_dialog_create( package, error_dialog, package->dialog, + error_dialog_handler ); + if ( !dialog ) + return ERROR_FUNCTION_FAILED; + + dialog->finished = FALSE; + r = msi_dialog_run_message_loop( dialog ); + if ( r != ERROR_SUCCESS ) + goto done; + + r = MSI_GetPropertyW( package, result_prop, result, &size ); + if ( r != ERROR_SUCCESS) + r = ERROR_SUCCESS; + + if ( !lstrcmpW( result, error_abort ) ) + r = ERROR_FUNCTION_FAILED; + +done: + msi_dialog_destroy( dialog ); + + return r; +} diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 6c5b288..7eec8a2 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -425,6 +425,29 @@ static UINT msi_extract_remote_cabinet( return !extract_cabinet_file(package, mi->source, mi->last_path); } +static UINT msi_change_media( MSIPACKAGE *package, struct media_info *mi, LPCWSTR prompt ) +{ + LPWSTR error, error_dialog; + UINT r = ERROR_SUCCESS; + + static const WCHAR szUILevel[] = {'U','I','L','e','v','e','l',0}; + static const WCHAR error_prop[] = {'E','r','r','o','r','D','i','a','l','o','g',0}; + + if ( msi_get_property_int(package, szUILevel, 0) == INSTALLUILEVEL_NONE ) + return ERROR_SUCCESS; + + error = generate_error_string( package, 1302, 1, prompt ); + error_dialog = msi_dup_property( package, error_prop ); + + while ( r == ERROR_SUCCESS && GetFileAttributesW( mi->source ) == INVALID_FILE_ATTRIBUTES ) + r = msi_spawn_error_dialog( package, error_dialog, error ); + + msi_free( error ); + msi_free( error_dialog ); + + return r; +} + static UINT ready_media_for_file( MSIPACKAGE *package, struct media_info *mi, MSIFILE *file ) { @@ -528,6 +551,12 @@ static UINT ready_media_for_file( MSIPAC strcpyW(mi->last_path,mi->source); strcatW(mi->source,cab); + if (GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES) + rc = msi_change_media(package, mi, prompt); + + if ( rc != ERROR_SUCCESS ) + goto done; + MsiSourceListSetInfoW(package->ProductCode, NULL, MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT|MSISOURCETYPE_MEDIA, @@ -570,6 +599,7 @@ static UINT ready_media_for_file( MSIPAC MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, mi->count, volume, prompt); +done: msiobj_release(&row->hdr); return rc; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 4745b9e..45bdeac 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -680,6 +680,7 @@ extern UINT msi_dialog_reset( msi_dialog extern UINT msi_dialog_directorylist_up( msi_dialog *dialog ); extern msi_dialog *msi_dialog_get_parent( msi_dialog *dialog ); extern LPWSTR msi_dialog_get_name( msi_dialog *dialog ); +extern UINT msi_spawn_error_dialog( MSIPACKAGE*, LPWSTR, LPWSTR ); /* preview */ extern MSIPREVIEW *MSI_EnableUIPreview( MSIDATABASE * ); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index aed5a78..760e81e 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -803,6 +803,8 @@ static void test_continuouscabs(void) create_cc_test_files(); create_database(msifile, cc_tables, sizeof(cc_tables) / sizeof(msi_table)); + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + r = MsiInstallProductA(msifile, NULL); todo_wine {

1 0

Mike McCormack : msi: Remove redundant null checks before MSI_EvaluateCondition.
by Alexandre Julliard Oct. 27, 2006

Oct. 27, 2006

Module: wine Branch: master Commit: 9375fd9fd3fd7308ad4741bf3b04eb1df7694c52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9375fd9fd3fd7308ad4741bf3… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Oct 27 17:29:02 2006 +0900 msi: Remove redundant null checks before MSI_EvaluateCondition. --- dlls/msi/action.c | 35 +++++++++++++---------------------- 1 files changed, 13 insertions(+), 22 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 161a2d6..e7ba6a2 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -700,12 +700,10 @@ static UINT ACTION_PerformActionSequence /* check conditions */ cond = MSI_RecordGetString(row,2); - if (cond) - { - /* this is a hack to skip errors in the condition code */ - if (MSI_EvaluateConditionW(package, cond) == MSICONDITION_FALSE) - goto end; - } + + /* this is a hack to skip errors in the condition code */ + if (MSI_EvaluateConditionW(package, cond) == MSICONDITION_FALSE) + goto end; action = MSI_RecordGetString(row,1); if (!action) @@ -743,20 +741,17 @@ static UINT ITERATE_Actions(MSIRECORD *r if (!action) { ERR("Error is retrieving action name\n"); - return ERROR_FUNCTION_FAILED; + return ERROR_FUNCTION_FAILED; } /* check conditions */ cond = MSI_RecordGetString(row,2); - if (cond) + + /* this is a hack to skip errors in the condition code */ + if (MSI_EvaluateConditionW(iap->package, cond) == MSICONDITION_FALSE) { - /* this is a hack to skip errors in the condition code */ - if (MSI_EvaluateConditionW(iap->package, cond) == MSICONDITION_FALSE) - { - TRACE("Skipping action: %s (condition is false)\n", - debugstr_w(action)); - return ERROR_SUCCESS; - } + TRACE("Skipping action: %s (condition is false)\n", debugstr_w(action)); + return ERROR_SUCCESS; } if (iap->UI) @@ -2044,14 +2039,10 @@ static UINT ACTION_CostFinalize(MSIPACKA TRACE("Enabling or Disabling Components\n"); LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) { - if (comp->Condition) + if (MSI_EvaluateConditionW(package, comp->Condition) == MSICONDITION_FALSE) { - if (MSI_EvaluateConditionW(package, - comp->Condition) == MSICONDITION_FALSE) - { - TRACE("Disabling component %s\n", debugstr_w(comp->Component)); - comp->Enabled = FALSE; - } + TRACE("Disabling component %s\n", debugstr_w(comp->Component)); + comp->Enabled = FALSE; } }

1 0

Mike McCormack : msi: Avoid crashing if writeout_cabinet_stream fails.
by Alexandre Julliard Oct. 27, 2006

Oct. 27, 2006

Module: wine Branch: master Commit: b851d46552f1f5f6641be212d2fae7ece791d10b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b851d46552f1f5f6641be212d… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Oct 27 17:29:19 2006 +0900 msi: Avoid crashing if writeout_cabinet_stream fails. --- dlls/msi/files.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 99cc6b5..6c5b288 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -490,11 +490,16 @@ static UINT ready_media_for_file( MSIPAC /* the stream does not contain the # character */ if (cab[0]=='#') { - LPWSTR path; + LPWSTR path, p; + + rc = writeout_cabinet_stream(package,&cab[1],mi->source); + if (rc != ERROR_SUCCESS) + return rc; - writeout_cabinet_stream(package,&cab[1],mi->source); mi->last_path = strdupW(mi->source); - *(strrchrW(mi->last_path,'\\')+1)=0; + p = strrchrW(mi->last_path,'\\'); + if (p) + p[1] = 0; path = msi_dup_property( package, cszSourceDir );

1 0

Mike McCormack : comctl32: Move code assuming Nx1 into ImageList_CreateImage.
by Alexandre Julliard Oct. 27, 2006

Oct. 27, 2006

Module: wine Branch: master Commit: b0499bf71b64915c682c2077851562d932e8e3a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0499bf71b64915c682c20778… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Oct 26 21:12:44 2006 +0900 comctl32: Move code assuming Nx1 into ImageList_CreateImage. --- dlls/comctl32/imagelist.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 0da2a90..60cde81 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -77,7 +77,7 @@ typedef struct static INTERNALDRAG InternalDrag = { 0, 0, 0, 0, 0, 0, FALSE, 0 }; -static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT width, UINT height); +static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count, UINT height); static inline BOOL is_valid(HIMAGELIST himl) { @@ -123,7 +123,7 @@ IMAGELIST_InternalExpandBitmaps (HIMAGEL TRACE("Create expanded bitmaps : himl=%p x=%d y=%d count=%d\n", himl, nNewWidth, cy, nNewCount); hdcBitmap = CreateCompatibleDC (0); - hbmNewBitmap = ImageList_CreateImage(hdcBitmap, himl, nNewWidth, cy); + hbmNewBitmap = ImageList_CreateImage(hdcBitmap, himl, nNewCount, cy); if (hbmNewBitmap == 0) ERR("creating new image bitmap (x=%d y=%d)!\n", nNewWidth, cy); @@ -609,7 +609,7 @@ ImageList_Create (INT cx, INT cy, UINT f himl->uBitsPixel = (UINT)GetDeviceCaps (himl->hdcImage, BITSPIXEL); if (himl->cMaxImage > 0) { - himl->hbmImage = ImageList_CreateImage(himl->hdcImage, himl, cx * himl->cMaxImage, cy); + himl->hbmImage = ImageList_CreateImage(himl->hdcImage, himl, himl->cMaxImage, cy); SelectObject(himl->hdcImage, himl->hbmImage); } else himl->hbmImage = 0; @@ -2071,7 +2071,7 @@ ImageList_Remove (HIMAGELIST himl, INT i for (nCount = 0; nCount < MAX_OVERLAYIMAGE; nCount++) himl->nOvlIdx[nCount] = -1; - hbmNewImage = ImageList_CreateImage(himl->hdcImage, himl, himl->cMaxImage * himl->cx, himl->cy); + hbmNewImage = ImageList_CreateImage(himl->hdcImage, himl, himl->cMaxImage, himl->cy); SelectObject (himl->hdcImage, hbmNewImage); DeleteObject (himl->hbmImage); himl->hbmImage = hbmNewImage; @@ -2097,7 +2097,7 @@ ImageList_Remove (HIMAGELIST himl, INT i TRACE(" - Max. number of images: %d / %d (Old/New)\n", himl->cMaxImage, himl->cCurImage + himl->cGrow - 1); - hbmNewImage = ImageList_CreateImage(himl->hdcImage, himl, cxNew, himl->cy); + hbmNewImage = ImageList_CreateImage(himl->hdcImage, himl, nCount, himl->cy); if (himl->hbmMask) hbmNewMask = CreateBitmap (cxNew, himl->cy, 1, 1, NULL); @@ -2524,7 +2524,7 @@ ImageList_SetIconSize (HIMAGELIST himl, for (nCount = 0; nCount < MAX_OVERLAYIMAGE; nCount++) himl->nOvlIdx[nCount] = -1; - hbmNew = ImageList_CreateImage(himl->hdcImage, himl, himl->cMaxImage * himl->cx, himl->cy); + hbmNew = ImageList_CreateImage(himl->hdcImage, himl, himl->cMaxImage, himl->cy); SelectObject (himl->hdcImage, hbmNew); DeleteObject (himl->hbmImage); himl->hbmImage = hbmNew; @@ -2580,7 +2580,7 @@ ImageList_SetImageCount (HIMAGELIST himl hdcBitmap = CreateCompatibleDC (0); - hbmNewBitmap = ImageList_CreateImage(hdcBitmap, himl, nNewCount * himl->cx, himl->cy); + hbmNewBitmap = ImageList_CreateImage(hdcBitmap, himl, nNewCount, himl->cy); if (hbmNewBitmap != 0) { @@ -2825,10 +2825,11 @@ ImageList_Write (HIMAGELIST himl, LPSTRE } -static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT width, UINT height) +static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count, UINT height) { HBITMAP hbmNewBitmap; UINT ilc = (himl->flags & 0xFE); + UINT width = count * himl->cx; if ((ilc >= ILC_COLOR4 && ilc <= ILC_COLOR32) || ilc == ILC_COLOR) {

1 0

Detlef Riekenberg : tools/wine.inf: Add default printer ports.
by Alexandre Julliard Oct. 27, 2006

Oct. 27, 2006

Module: wine Branch: master Commit: 832398f41ddab14a0bf5f05b082a2716af920664 URL: http://source.winehq.org/git/wine.git/?a=commit;h=832398f41ddab14a0bf5f05b0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Oct 26 18:32:07 2006 +0200 tools/wine.inf: Add default printer ports. --- tools/wine.inf | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index d539ea8..e16b1b0 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -644,6 +644,14 @@ HKLM,"Software\Microsoft\OLE","EnableRem [Printing] HKLM,%Control%\Print\Monitors\Local Port,"Driver",2,"localspl.dll" +HKLM,%CurrentVersionNT%\Ports,"FILE:",,"" +HKLM,%CurrentVersionNT%\Ports,"LPT1:",,"" +HKLM,%CurrentVersionNT%\Ports,"LPT2:",,"" +HKLM,%CurrentVersionNT%\Ports,"LPT3:",,"" +HKLM,%CurrentVersionNT%\Ports,"COM1:",2,"9600,n,8,1" +HKLM,%CurrentVersionNT%\Ports,"COM2:",2,"9600,n,8,1" +HKLM,%CurrentVersionNT%\Ports,"COM3:",2,"9600,n,8,1" +HKLM,%CurrentVersionNT%\Ports,"COM4:",2,"9600,n,8,1" [Tapi] HKLM,%CurrentVersion%\Telephony,"Perf1",0x10001,0x5045524a

1 0

Rob Shearman : rpcrt4: Don' t terminate the loop on the buffer becoming filled, but when we receive a packet with the RPC_FLG_LAST flag set.
by Alexandre Julliard Oct. 27, 2006

Oct. 27, 2006

Module: wine Branch: master Commit: fbe829cbb1c89771c0115e1196c167be73506612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbe829cbb1c89771c0115e119… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Oct 26 23:15:11 2006 +0100 rpcrt4: Don't terminate the loop on the buffer becoming filled, but when we receive a packet with the RPC_FLG_LAST flag set. This matches what is mentioned in the DCE/RPC specification. --- dlls/rpcrt4/rpc_message.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index f102cf6..6d434c0 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -546,7 +546,7 @@ RPC_STATUS RPCRT4_Receive(RpcConnection } buffer_length = 0; buffer_ptr = pMsg->Buffer; - while (buffer_length < pMsg->BufferLength) + while (TRUE) { unsigned int header_auth_len = RPC_AUTH_VERIFIER_LEN(&(*Header)->common); @@ -598,16 +598,8 @@ RPC_STATUS RPCRT4_Receive(RpcConnection } } - /* when there is no more data left, it should be the last packet */ - if (buffer_length == pMsg->BufferLength && - ((*Header)->common.flags & RPC_FLG_LAST) == 0) { - WARN("no more data left, but not last packet\n"); - status = RPC_S_PROTOCOL_ERROR; - goto fail; - } - buffer_length += data_length; - if (buffer_length < pMsg->BufferLength) { + if (!((*Header)->common.flags & RPC_FLG_LAST)) { TRACE("next header\n"); /* read the header of next packet */ @@ -620,8 +612,11 @@ RPC_STATUS RPCRT4_Receive(RpcConnection buffer_ptr += data_length; first_flag = 0; + } else { + break; } } + pMsg->BufferLength = buffer_length; /* respond to authorization request */ if (common_hdr.ptype == PKT_BIND_ACK && auth_length > sizeof(RpcAuthVerifier))

1 0