May 2010 - Wine-Commits - list.winehq.org

Sven Baars : comdlg32: Fix some alignment issues in the Dutch translation.
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: 6b21d0c66338f8c7416bcae40340ee9aef00f34c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b21d0c66338f8c7416bcae40… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed May 5 15:15:54 2010 +0200 comdlg32: Fix some alignment issues in the Dutch translation. --- dlls/comdlg32/cdlg_Nl.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/cdlg_Nl.rc b/dlls/comdlg32/cdlg_Nl.rc index cd04bf8..dfd5d4e 100644 --- a/dlls/comdlg32/cdlg_Nl.rc +++ b/dlls/comdlg32/cdlg_Nl.rc @@ -44,7 +44,7 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "&Openen", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Annuleren", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Help", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "Alleen &Lezen", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Alleen &Lezen", 1040, 208, 68, 55, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -66,7 +66,7 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "&Opslaan als", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Annuleren", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Help", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP - CHECKBOX "Alleen &Lezen", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Alleen &Lezen", 1040, 208, 68, 55, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -139,7 +139,7 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Help" , 1038,218,57,40,14,WS_GROUP | WS_TABSTOP GROUPBOX "Effecten",1072,6,72,84,34,WS_GROUP CHECKBOX "&Doorhalen", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Onderstrepen", 1041, 10,94,50,10, BS_AUTOCHECKBOX + CHECKBOX "&Onderstrepen", 1041, 10,94,60,10, BS_AUTOCHECKBOX LTEXT "&Kleur:", 1091 ,6,110,30,9 COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP

1 0

Sven Baars : comctl32: Fix Dutch translation.
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: fbd8722856e8565273b23eb59d791c5f7a83c548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbd8722856e8565273b23eb59… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed May 5 15:06:00 2010 +0200 comctl32: Fix Dutch translation. --- dlls/comctl32/comctl_Nl.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/comctl_Nl.rc b/dlls/comctl32/comctl_Nl.rc index c89403d..fe2bf7a 100644 --- a/dlls/comctl32/comctl_Nl.rc +++ b/dlls/comctl32/comctl_Nl.rc @@ -77,7 +77,7 @@ STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE { IDM_TODAY "Vandaag:" - IDM_GOTODAY "Ga vandaag naar" + IDM_GOTODAY "Ga naar vandaag" } STRINGTABLE DISCARDABLE

1 0

Hans Leidekker : msi: Apply registered patches in MsiOpenPackage.
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: 82d7b04c2cbf5fe1a7f8072d9c66d0abc38252c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d7b04c2cbf5fe1a7f8072d9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 5 14:37:55 2010 +0200 msi: Apply registered patches in MsiOpenPackage. --- dlls/msi/action.c | 53 ++++++++++++++++++------------ dlls/msi/msipriv.h | 4 ++ dlls/msi/package.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/msi/tests/patch.c | 8 ++-- 4 files changed, 120 insertions(+), 27 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 35030e2..6ed1417 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -492,7 +492,7 @@ done: return r; } -static UINT msi_parse_patch_summary( MSISUMMARYINFO *si, MSIPATCHINFO **patch ) +UINT msi_parse_patch_summary( MSISUMMARYINFO *si, MSIPATCHINFO **patch ) { MSIPATCHINFO *pi; UINT r = ERROR_SUCCESS; @@ -520,15 +520,40 @@ static UINT msi_parse_patch_summary( MSISUMMARYINFO *si, MSIPATCHINFO **patch ) return r; } +UINT msi_apply_patch_db( MSIPACKAGE *package, MSIDATABASE *patch_db, MSIPATCHINFO *patch ) +{ + UINT i, r = ERROR_SUCCESS; + WCHAR **substorage; + + /* apply substorage transforms */ + substorage = msi_split_string( patch->transforms, ';' ); + for (i = 0; substorage && substorage[i] && r == ERROR_SUCCESS; i++) + r = msi_apply_substorage_transform( package, patch_db, substorage[i] ); + + msi_free( substorage ); + if (r != ERROR_SUCCESS) + return r; + + msi_set_media_source_prop( package ); + + /* + * There might be a CAB file in the patch package, + * so append it to the list of storages to search for streams. + */ + append_storage_to_db( package->db, patch_db->storage ); + + list_add_tail( &package->patches, &patch->entry ); + return ERROR_SUCCESS; +} + static UINT msi_apply_patch_package( MSIPACKAGE *package, LPCWSTR file ) { static const WCHAR dotmsp[] = {'.','m','s','p',0}; MSIDATABASE *patch_db = NULL; WCHAR localfile[MAX_PATH]; - LPWSTR *substorage; MSISUMMARYINFO *si; MSIPATCHINFO *patch = NULL; - UINT i, r = ERROR_SUCCESS; + UINT r = ERROR_SUCCESS; TRACE("%p %s\n", package, debugstr_w( file ) ); @@ -573,23 +598,9 @@ static UINT msi_apply_patch_package( MSIPACKAGE *package, LPCWSTR file ) } patch->localfile = strdupW( localfile ); - /* apply substorage transforms */ - substorage = msi_split_string( patch->transforms, ';' ); - for ( i = 0; substorage && substorage[i] && r == ERROR_SUCCESS; i++ ) - r = msi_apply_substorage_transform( package, patch_db, substorage[i] ); - - msi_free( substorage ); - if (r != ERROR_SUCCESS) - goto done; - msi_set_media_source_prop( package ); - - /* - * There might be a CAB file in the patch package, - * so append it to the list of storages to search for streams. - */ - append_storage_to_db( package->db, patch_db->storage ); - - list_add_tail( &package->patches, &patch->entry ); + r = msi_apply_patch_db( package, patch_db, patch ); + if ( r != ERROR_SUCCESS ) + WARN("patch failed to apply %u\n", r); done: msiobj_release( &si->hdr ); @@ -729,7 +740,7 @@ static BOOL needs_ui_sequence(MSIPACKAGE *package) return (level & INSTALLUILEVEL_MASK) >= INSTALLUILEVEL_REDUCED; } -static UINT msi_set_context(MSIPACKAGE *package) +UINT msi_set_context(MSIPACKAGE *package) { int num; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 354aca5..a8737a2 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -685,7 +685,10 @@ extern UINT MSI_DatabaseApplyTransformW( MSIDATABASE *db, LPCWSTR szTransformFile, int iErrorCond ); extern void append_storage_to_db( MSIDATABASE *db, IStorage *stg ); +/* patch functions */ extern UINT msi_check_patch_applicable( MSIPACKAGE *package, MSISUMMARYINFO *si ); +extern UINT msi_parse_patch_summary( MSISUMMARYINFO *si, MSIPATCHINFO **patch ); +extern UINT msi_apply_patch_db( MSIPACKAGE *package, MSIDATABASE *patch_db, MSIPATCHINFO *patch ); /* action internals */ extern UINT MSI_InstallPackage( MSIPACKAGE *, LPCWSTR, LPCWSTR ); @@ -758,6 +761,7 @@ extern UINT msi_download_file( LPCWSTR szUrl, LPWSTR filename ); extern UINT msi_package_add_info(MSIPACKAGE *, DWORD, DWORD, LPCWSTR, LPWSTR); extern UINT msi_package_add_media_disk(MSIPACKAGE *, DWORD, DWORD, DWORD, LPWSTR, LPWSTR); extern UINT msi_clone_properties(MSIPACKAGE *); +extern UINT msi_set_context(MSIPACKAGE *); extern UINT MSI_GetFeatureCost(MSIPACKAGE *, MSIFEATURE *, MSICOSTTREE, INSTALLSTATE, LPINT); /* for deformating */ diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 2ffd66e..e53de53 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1048,6 +1048,8 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) msi_clone_properties( package ); package->ProductCode = msi_dup_property( package->db, szProductCode ); + package->script = msi_alloc_zero( sizeof(MSISCRIPT) ); + set_installed_prop( package ); set_installer_properties( package ); @@ -1167,6 +1169,60 @@ UINT msi_get_local_package_name( LPWSTR path, LPCWSTR suffix ) return ERROR_SUCCESS; } +static UINT apply_registered_patch( MSIPACKAGE *package, LPCWSTR patch_code ) +{ + UINT r; + DWORD len; + WCHAR patch_file[MAX_PATH]; + MSIDATABASE *patch_db; + MSIPATCHINFO *patch_info; + MSISUMMARYINFO *si; + + len = sizeof(patch_file) / sizeof(WCHAR); + r = MsiGetPatchInfoExW( patch_code, package->ProductCode, NULL, package->Context, + INSTALLPROPERTY_LOCALPACKAGEW, patch_file, &len ); + if (r != ERROR_SUCCESS) + { + ERR("failed to get patch filename %u\n", r); + return r; + } + + r = MSI_OpenDatabaseW( patch_file, MSIDBOPEN_READONLY + MSIDBOPEN_PATCHFILE, &patch_db ); + if (r != ERROR_SUCCESS) + { + ERR("failed to open patch database %s\n", debugstr_w( patch_file )); + return r; + } + + si = MSI_GetSummaryInformationW( patch_db->storage, 0 ); + if (!si) + { + msiobj_release( &patch_db->hdr ); + return ERROR_FUNCTION_FAILED; + } + + r = msi_parse_patch_summary( si, &patch_info ); + msiobj_release( &si->hdr ); + if (r != ERROR_SUCCESS) + { + ERR("failed to parse patch summary %u\n", r); + msiobj_release( &patch_db->hdr ); + return r; + } + + r = msi_apply_patch_db( package, patch_db, patch_info ); + msiobj_release( &patch_db->hdr ); + if (r != ERROR_SUCCESS) + { + ERR("failed to apply patch %u\n", r); + msi_free( patch_info->patchcode ); + msi_free( patch_info->transforms ); + msi_free( patch_info->localfile ); + msi_free( patch_info ); + } + return r; +} + UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) { static const WCHAR OriginalDatabase[] = @@ -1180,6 +1236,7 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) UINT r; WCHAR temppath[MAX_PATH], localfile[MAX_PATH], cachefile[MAX_PATH]; LPCWSTR file = szPackage; + DWORD index = 0; TRACE("%s %p\n", debugstr_w(szPackage), pPackage); @@ -1293,9 +1350,30 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) msi_set_property( package->db, OriginalDatabase, fullpath ); } - package->script = msi_alloc_zero( sizeof(MSISCRIPT) ); - *pPackage = package; + msi_set_context( package ); + + while (1) + { + WCHAR patch_code[GUID_SIZE]; + r = MsiEnumPatchesExW( package->ProductCode, NULL, package->Context, + MSIPATCHSTATE_APPLIED, index, patch_code, NULL, NULL, NULL, NULL ); + if (r != ERROR_SUCCESS) + break; + + TRACE("found registered patch %s\n", debugstr_w(patch_code)); + r = apply_registered_patch( package, patch_code ); + if (r != ERROR_SUCCESS) + { + ERR("registered patch failed to apply %u\n", r); + MSI_FreePackage( (MSIOBJECTHDR *)package ); + return r; + } + + index++; + } + + *pPackage = package; return ERROR_SUCCESS; } diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index e386925..2c7459d 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -731,7 +731,7 @@ static void test_simple_patch( void ) ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); r = MsiViewFetch( hview, &hrec ); - todo_wine ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); MsiCloseHandle( hrec ); MsiViewClose( hview ); @@ -942,13 +942,13 @@ static void test_system_tables( void ) ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); r = find_entry( hdb, "_Tables", "MsiPatchHeaders" ); - todo_wine ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); r = find_entry( hdb, "_Tables", "Patch" ); - todo_wine ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); r = find_entry( hdb, "_Tables", "PatchPackage" ); - todo_wine ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); + ok( r == ERROR_SUCCESS, "failed to find entry %u\n", r ); MsiCloseHandle( hdb ); MsiCloseHandle( hproduct );

1 0

Huw Davies : comctl32: Silence a few compiler warnings.
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: 1af17844301c4924dd8324cbf2f9c3c1ef0394b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1af17844301c4924dd8324cbf… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 4 14:05:13 2010 +0100 comctl32: Silence a few compiler warnings. --- dlls/comctl32/datetime.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index dc2dd12..2418950 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -614,7 +614,7 @@ DATETIME_ReturnFieldWidth (const DATETIME_INFO *infoPtr, HDC hdc, int count, SHO lctype = LOCALE_SABBREVMONTHNAME1; max_count = 12; break; - case FULLMONTH: + default: /* FULLMONTH */ fall = fld_mon; lctype = LOCALE_SMONTHNAME1; max_count = 12;

1 0

Piotr Caban : msvcrt: Added ___mb_cur_max_l_func implementation.
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: 100e925cb421e7db27cf71f77f37111b2a4a6e9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=100e925cb421e7db27cf71f77… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 5 13:37:18 2010 +0200 msvcrt: Added ___mb_cur_max_l_func implementation. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 9 +++++++++ dlls/msvcrt/msvcrt.spec | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 92db3f0..e430401 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -136,7 +136,7 @@ @ cdecl ___lc_collate_cp_func() msvcrt.___lc_collate_cp_func @ cdecl ___lc_handle_func() msvcrt.___lc_handle_func @ cdecl ___mb_cur_max_func() msvcrt.___mb_cur_max_func -@ stub ___mb_cur_max_l_func +@ cdecl ___mb_cur_max_l_func(ptr) msvcrt.___mb_cur_max_l_func @ cdecl ___setlc_active_func() msvcrt.___setlc_active_func @ cdecl ___unguarded_readlc_active_add_func() msvcrt.___unguarded_readlc_active_add_func @ extern __argc msvcrt.__argc diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 2f2f275..b09a32d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -133,7 +133,7 @@ @ cdecl ___lc_collate_cp_func() msvcrt.___lc_collate_cp_func @ cdecl ___lc_handle_func() msvcrt.___lc_handle_func @ cdecl ___mb_cur_max_func() msvcrt.___mb_cur_max_func -@ stub ___mb_cur_max_l_func +@ cdecl ___mb_cur_max_l_func(ptr) msvcrt.___mb_cur_max_l_func @ cdecl ___setlc_active_func() msvcrt.___setlc_active_func @ cdecl ___unguarded_readlc_active_add_func() msvcrt.___unguarded_readlc_active_add_func @ extern __argc msvcrt.__argc diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index cd52f6c..e558808 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -169,6 +169,15 @@ int* CDECL MSVCRT____mb_cur_max_func(void) return &get_locale()->locinfo->mb_cur_max; } +/* ___mb_cur_max_l_func - not exported in native msvcrt */ +int* CDECL ___mb_cur_max_l_func(MSVCRT__locale_t locale) +{ + if(!locale) + locale = get_locale(); + + return &locale->locinfo->mb_cur_max; +} + /********************************************************************* * _setmbcp (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6e581df..42fe133 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1436,3 +1436,4 @@ @ cdecl _free_locale(ptr) @ cdecl _configthreadlocale(long) @ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l +@ cdecl ___mb_cur_max_l_func(ptr)

1 0

Gerald Pfeifer : wrc: Remove variable type which is not really used from rsrcid_to_token.
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: 3aa6cff4ceece9c4f7b482b64ab1710fdcad74af URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aa6cff4ceece9c4f7b482b64… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed May 5 00:24:35 2010 +0200 wrc: Remove variable type which is not really used from rsrcid_to_token. --- tools/wrc/parser.y | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-) diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index 28d4bc9..a62bccf 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -2865,7 +2865,6 @@ clean: static int rsrcid_to_token(int lookahead) { int token; - const char *type = "?"; /* Get a token if we don't have one yet */ if(lookahead == YYEMPTY) @@ -2886,64 +2885,49 @@ static int rsrcid_to_token(int lookahead) switch(yylval.num) { case WRC_RT_CURSOR: - type = "CURSOR"; token = tCURSOR; break; case WRC_RT_ICON: - type = "ICON"; token = tICON; break; case WRC_RT_BITMAP: - type = "BITMAP"; token = tBITMAP; break; case WRC_RT_FONT: - type = "FONT"; token = tFONT; break; case WRC_RT_FONTDIR: - type = "FONTDIR"; token = tFONTDIR; break; case WRC_RT_RCDATA: - type = "RCDATA"; token = tRCDATA; break; case WRC_RT_MESSAGETABLE: - type = "MESSAGETABLE"; token = tMESSAGETABLE; break; case WRC_RT_DLGINIT: - type = "DLGINIT"; token = tDLGINIT; break; case WRC_RT_ACCELERATOR: - type = "ACCELERATOR"; token = tACCELERATORS; break; case WRC_RT_MENU: - type = "MENU"; token = tMENU; break; case WRC_RT_DIALOG: - type = "DIALOG"; token = tDIALOG; break; case WRC_RT_VERSION: - type = "VERSION"; token = tVERSIONINFO; break; case WRC_RT_TOOLBAR: - type = "TOOLBAR"; token = tTOOLBAR; break; case WRC_RT_HTML: - type = "HTML"; token = tHTML; break; case WRC_RT_STRING: - type = "STRINGTABLE"; break; case WRC_RT_ANICURSOR:

1 0

Gerald Pfeifer : kernel32/tests: Remove variable len which is not really used from test_CommandLine.
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: 978b4898e5314bae66747c5ca3286fc3b41e4930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=978b4898e5314bae66747c5ca… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed May 5 00:24:09 2010 +0200 kernel32/tests: Remove variable len which is not really used from test_CommandLine. --- dlls/kernel32/tests/process.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 7b5ac75..806c468 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -794,7 +794,6 @@ static void test_CommandLine(void) char buffer2[MAX_PATH]; PROCESS_INFORMATION info; STARTUPINFOA startup; - DWORD len; BOOL ret; memset(&startup, 0, sizeof(startup)); @@ -873,7 +872,7 @@ static void test_CommandLine(void) assert(DeleteFileA(resfile) != 0); get_file_name(resfile); - len = GetFullPathNameA(selfname, MAX_PATH, fullpath, &lpFilePart); + GetFullPathNameA(selfname, MAX_PATH, fullpath, &lpFilePart); assert ( lpFilePart != 0); *(lpFilePart -1 ) = 0; p = strrchr(fullpath, '\\'); @@ -895,7 +894,7 @@ static void test_CommandLine(void) /* Using AppName */ get_file_name(resfile); - len = GetFullPathNameA(selfname, MAX_PATH, fullpath, &lpFilePart); + GetFullPathNameA(selfname, MAX_PATH, fullpath, &lpFilePart); assert ( lpFilePart != 0); *(lpFilePart -1 ) = 0; p = strrchr(fullpath, '\\');

1 0

Alexandre Julliard : comctl32: Add support for alpha blending in ImageList_DrawIndirect.
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: 599531b7d9459196dfa6931c718b7f6ca426ee49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=599531b7d9459196dfa6931c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 5 12:47:24 2010 +0200 comctl32: Add support for alpha blending in ImageList_DrawIndirect. --- dlls/comctl32/imagelist.c | 35 ++++++++++++++++++++++++++++++----- 1 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 83b563c..63f0ea0 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -1088,6 +1088,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) HBITMAP hImageBmp, hOldImageBmp, hBlendMaskBmp; BOOL bIsTransparent, bBlend, bResult = FALSE, bMask; HIMAGELIST himl; + HBRUSH hOldBrush; POINT pt; if (!pimldp || !(himl = pimldp->himl)) return FALSE; @@ -1138,12 +1139,38 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) oldImageFg = SetTextColor( hImageDC, RGB( 0, 0, 0 ) ); oldImageBk = SetBkColor( hImageDC, RGB( 0xff, 0xff, 0xff ) ); + if (fState & ILS_ALPHA) + { + BLENDFUNCTION func; + COLORREF colour; + + func.BlendOp = AC_SRC_OVER; + func.BlendFlags = 0; + func.SourceConstantAlpha = pimldp->Frame; + func.AlphaFormat = AC_SRC_ALPHA; + if (bIsTransparent) + { + bResult = GdiAlphaBlend( pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy, + hImageListDC, pt.x, pt.y, cx, cy, func ); + goto end; + } + colour = pimldp->rgbBk; + if (colour == CLR_DEFAULT) colour = himl->clrBk; + if (colour == CLR_NONE) colour = GetBkColor( pimldp->hdcDst ); + + hOldBrush = SelectObject (hImageDC, CreateSolidBrush (colour)); + PatBlt( hImageDC, 0, 0, cx, cy, PATCOPY ); + GdiAlphaBlend( hImageDC, 0, 0, cx, cy, hImageListDC, pt.x, pt.y, cx, cy, func ); + DeleteObject (SelectObject (hImageDC, hOldBrush)); + bResult = BitBlt( pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy, hImageDC, 0, 0, SRCCOPY ); + goto end; + } + /* * Draw the initial image */ if( bMask ) { if (himl->hbmMask) { - HBRUSH hOldBrush; hOldBrush = SelectObject (hImageDC, CreateSolidBrush (GetTextColor(pimldp->hdcDst))); PatBlt( hImageDC, 0, 0, cx, cy, PATCOPY ); BitBlt(hImageDC, 0, 0, cx, cy, hMaskListDC, pt.x, pt.y, SRCPAINT); @@ -1155,14 +1182,13 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) goto end; } } else { - HBRUSH hOldBrush = SelectObject (hImageDC, GetStockObject(BLACK_BRUSH)); + hOldBrush = SelectObject (hImageDC, GetStockObject(BLACK_BRUSH)); PatBlt( hImageDC, 0, 0, cx, cy, PATCOPY); SelectObject(hImageDC, hOldBrush); } } else { /* blend the image with the needed solid background */ COLORREF colour = RGB(0,0,0); - HBRUSH hOldBrush; if( !bIsTransparent ) { @@ -1187,7 +1213,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) /* Time for blending, if required */ if (bBlend) { - HBRUSH hBlendBrush, hOldBrush; + HBRUSH hBlendBrush; COLORREF clrBlend = pimldp->rgbFg; HDC hBlendMaskDC = hImageListDC; HBITMAP hOldBitmap; @@ -1231,7 +1257,6 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) if (fState & ILS_SATURATE) FIXME("ILS_SATURATE: unimplemented!\n"); if (fState & ILS_GLOW) FIXME("ILS_GLOW: unimplemented!\n"); if (fState & ILS_SHADOW) FIXME("ILS_SHADOW: unimplemented!\n"); - if (fState & ILS_ALPHA) FIXME("ILS_ALPHA: unimplemented!\n"); if (fStyle & ILD_PRESERVEALPHA) FIXME("ILD_PRESERVEALPHA: unimplemented!\n"); if (fStyle & ILD_SCALE) FIXME("ILD_SCALE: unimplemented!\n");

1 0

Alexandre Julliard : shell32: Load the application icon for the control panel window.
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: 3f5136ce3a1d60d7a532b36bbf8c57959a910f6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f5136ce3a1d60d7a532b36bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 5 11:00:38 2010 +0200 shell32: Load the application icon for the control panel window. --- dlls/shell32/control.c | 12 ++++++++---- dlls/shell32/shresdef.h | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 730f8a6..898e0ed 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -475,10 +475,12 @@ static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, case IDM_CPANEL_ABOUT: { WCHAR appName[MAX_STRING_LEN]; + HICON icon = LoadImageW((HINSTANCE)GetWindowLongPtrW(hWnd, GWLP_HINSTANCE), + MAKEINTRESOURCEW(IDI_APPICON), IMAGE_ICON, 48, 48, LR_SHARED); LoadStringW(shell32_hInstance, IDS_CPANEL_TITLE, appName, sizeof(appName) / sizeof(appName[0])); - ShellAboutW(hWnd, appName, NULL, NULL); + ShellAboutW(hWnd, appName, NULL, icon); return 0; } @@ -612,7 +614,7 @@ static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, static void Control_DoInterface(CPanel* panel, HWND hWnd, HINSTANCE hInst) { - WNDCLASSW wc; + WNDCLASSEXW wc; MSG msg; WCHAR appName[MAX_STRING_LEN]; const WCHAR className[] = {'S','h','e','l','l','_','C','o','n','t','r','o', @@ -625,13 +627,15 @@ static void Control_DoInterface(CPanel* panel, HWND hWnd, HINSTANCE hInst) wc.cbClsExtra = 0; wc.cbWndExtra = sizeof(CPlApplet*); wc.hInstance = panel->hInst = hInst; - wc.hIcon = 0; + wc.hIcon = LoadIconW( hInst, MAKEINTRESOURCEW(IDI_APPICON) ); wc.hCursor = LoadCursorW( 0, (LPWSTR)IDC_ARROW ); wc.hbrBackground = GetStockObject(WHITE_BRUSH); wc.lpszMenuName = NULL; wc.lpszClassName = className; + wc.hIconSm = LoadImageW( hInst, MAKEINTRESOURCEW(IDI_APPICON), IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED); - if (!RegisterClassW(&wc)) return; + if (!RegisterClassExW(&wc)) return; CreateWindowExW(0, wc.lpszClassName, appName, WS_OVERLAPPEDWINDOW | WS_VISIBLE, diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 88c93c8..93fb518 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -178,6 +178,8 @@ #define IDI_SHELL_CONFIRM_DELETE 161 #define IDI_SHELL_MY_DOCUMENTS 235 +#define IDI_APPICON 101 + /* AVI resources, windows shell32 has 14 of them: 150-152 and 160-170 FIXME: Need to add them, but for now just let them use the same: searching.avi

1 0

Alexandre Julliard : shdocvw: Support setting an icon on the main iexplore window.
by Alexandre Julliard May 5, 2010

May 5, 2010

Module: wine Branch: master Commit: 8182520f135723337abc1eb649c14a5803c55d2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8182520f135723337abc1eb64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 5 11:00:19 2010 +0200 shdocvw: Support setting an icon on the main iexplore window. --- dlls/shdocvw/iexplore.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index d65810f..9c14cfc 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -37,6 +37,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +#define IDI_APPICON 101 + static const WCHAR szIEWinFrame[] = { 'I','E','F','r','a','m','e',0 }; static LRESULT iewnd_OnCreate(HWND hwnd, LPCREATESTRUCTW lpcs) @@ -85,7 +87,7 @@ ie_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) void register_iewindow_class(void) { - WNDCLASSW wc; + WNDCLASSEXW wc; memset(&wc, 0, sizeof wc); wc.style = 0; @@ -93,13 +95,15 @@ void register_iewindow_class(void) wc.cbClsExtra = 0; wc.cbWndExtra = sizeof(InternetExplorer*); wc.hInstance = shdocvw_hinstance; - wc.hIcon = 0; - wc.hCursor = LoadCursorW(0, MAKEINTRESOURCEW(IDI_APPLICATION)); + wc.hIcon = LoadIconW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDI_APPICON)); + wc.hIconSm = LoadImageW(GetModuleHandleW(0), MAKEINTRESOURCEW(IDI_APPICON), IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED); + wc.hCursor = LoadCursorW(0, MAKEINTRESOURCEW(IDC_ARROW)); wc.hbrBackground = 0; wc.lpszClassName = szIEWinFrame; wc.lpszMenuName = NULL; - RegisterClassW(&wc); + RegisterClassExW(&wc); } void unregister_iewindow_class(void)

1 0