February 2007 - Wine-commits

Marcus Meissner : devenum: Initialize hKeysub.
by Alexandre Julliard 09 Feb '07

09 Feb '07

Module: wine Branch: master Commit: b224319a267441ac9cf8a99baa9ce01c6891c5f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b224319a267441ac9cf8a99ba… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Feb 8 20:35:44 2007 +0100 devenum: Initialize hKeysub. --- dlls/devenum/devenum_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/devenum/devenum_main.c b/dlls/devenum/devenum_main.c index 66b0f0e..0dde409 100644 --- a/dlls/devenum/devenum_main.c +++ b/dlls/devenum/devenum_main.c @@ -311,6 +311,7 @@ static HRESULT register_clsids(int count for (i = 0; i < count; i++) { + hkeySub = 0; if (SUCCEEDED(res)) { res = StringFromCLSID(pRegInfo[i].clsid, &clsidString); @@ -351,7 +352,7 @@ static HRESULT register_clsids(int count (lstrlenW(pszThreadingModel) + 1) * sizeof(WCHAR)); RegCloseKey(hkeyInproc32); } - RegCloseKey(hkeySub); + if (hkeySub) RegCloseKey(hkeySub); CoTaskMemFree(clsidString); clsidString = NULL; }

1 0

Marcus Meissner : kernel32: Remove CloseHandle call.
by Alexandre Julliard 09 Feb '07

09 Feb '07

Module: wine Branch: master Commit: c05b43f46431c3cf897a539686bdf1467544b296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c05b43f46431c3cf897a53968… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Feb 8 21:14:51 2007 +0100 kernel32: Remove CloseHandle call. --- dlls/kernel32/vxd.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/vxd.c b/dlls/kernel32/vxd.c index b08c020..bd984da 100644 --- a/dlls/kernel32/vxd.c +++ b/dlls/kernel32/vxd.c @@ -243,7 +243,6 @@ HANDLE VXD_Open( LPCWSTR filenameW, DWOR } ERR("too many open VxD modules, please report\n" ); - CloseHandle( handle ); FreeLibrary( module ); handle = 0;

1 0

Hans Leidekker : wineshelllink: Use "=" instead of "==" to compare strings.
by Alexandre Julliard 09 Feb '07

09 Feb '07

Module: wine Branch: master Commit: 0931b4feaf6b154e813e4aad80d85fd3b70726a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0931b4feaf6b154e813e4aad8… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Feb 8 15:32:44 2007 +0100 wineshelllink: Use "=" instead of "==" to compare strings. --- tools/wineshelllink | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/wineshelllink b/tools/wineshelllink index 07334dc..acae7b3 100755 --- a/tools/wineshelllink +++ b/tools/wineshelllink @@ -101,7 +101,7 @@ directory_entry() [Desktop Entry] Type=Directory EOF - if [ "$1" == "wine" ] ; then + if [ "$1" = "wine" ] ; then echo "Name=Wine" echo "Icon=wine" else @@ -208,7 +208,7 @@ if [ $mode = "menu" ] ; then mkdir -p "$xdg_data_dir/applications/wine/`dirname "$link"`" linkpath=`dirname "$link" | sed 's!/!-!g'` - if [ "$linkpath" == "." ] ; then + if [ "$linkpath" = "." ] ; then linkpath="" else linkpath="-$linkpath"

1 0

Hans Leidekker : wineshelllink: Keep using the slash as path separator.
by Alexandre Julliard 09 Feb '07

09 Feb '07

Module: wine Branch: master Commit: 49c19e27cb7cb8917f3e1c1a3352c41816e38a92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c19e27cb7cb8917f3e1c1a3… Author: Hans Leidekker <ecl(a)it.vu.nl> Date: Thu Feb 8 15:33:00 2007 +0100 wineshelllink: Keep using the slash as path separator. --- tools/wineshelllink | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/tools/wineshelllink b/tools/wineshelllink index acae7b3..84d4671 100755 --- a/tools/wineshelllink +++ b/tools/wineshelllink @@ -153,6 +153,9 @@ BEGIN { RS="<" } # new item write_menu_file() { + menu=`echo $1 | sed 's!/!-!g'` + filename=`echo $2 | sed 's!/!-!g'` + tmpfile=`mktemp` ( echo '<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"' @@ -160,7 +163,7 @@ write_menu_file() echo '<Menu>' echo ' <Name>Applications</Name>' - IFS="-" + IFS="/" fullname='wine' for i in $1; do @@ -179,16 +182,16 @@ write_menu_file() IFS=" " - for i in $(get_menu_entries "$1"); do - test "$i" = "$2" && continue + for i in $(get_menu_entries "$menu"); do + test "$i" = "$filename" && continue echo " <Filename>$i</Filename>" done # New record - echo " <Filename>$2</Filename>" + echo " <Filename>$filename</Filename>" echo " </Include>" - IFS='-' + IFS='/' for i in $1; do echo " </Menu>" done @@ -196,7 +199,7 @@ write_menu_file() ) > $tmpfile chmod 0600 $tmpfile - mv -f $tmpfile "$xdg_config_dir/$1.menu" + mv -f $tmpfile "$xdg_config_dir/$menu.menu" } @@ -207,15 +210,15 @@ linkname=`basename "$link"` if [ $mode = "menu" ] ; then mkdir -p "$xdg_data_dir/applications/wine/`dirname "$link"`" - linkpath=`dirname "$link" | sed 's!/!-!g'` + linkpath=`dirname "$link"` if [ "$linkpath" = "." ] ; then linkpath="" else - linkpath="-$linkpath" + linkpath="/$linkpath" fi desktop_entry > "$xdg_data_dir/applications/wine/$link.desktop" - write_menu_file "wine$linkpath" "wine$linkpath-$linkname.desktop" + write_menu_file "wine$linkpath" "wine$linkpath/$linkname.desktop" else desktop_entry > "$HOME/Desktop/$linkname.desktop" fi

1 0

Vitaly Lipatov : Some fixes in russian resources.
by Alexandre Julliard 09 Feb '07

09 Feb '07

Module: wine Branch: master Commit: c8bcbdb90ded28b9f12eda77a731d6a87c951720 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8bcbdb90ded28b9f12eda77a… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Thu Feb 8 18:34:40 2007 +0300 Some fixes in russian resources. --- dlls/comctl32/comctl_Ru.rc | 2 +- dlls/comdlg32/cdlg_Ru.rc | 6 ++-- dlls/msi/msi_Ru.rc | 2 +- dlls/shell32/shell32_Ru.rc | 42 ++++++++++++++++++------------------ dlls/user32/resources/user32_Ru.rc | 2 +- dlls/winmm/winmm_Ru.rc | 2 +- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/comctl32/comctl_Ru.rc b/dlls/comctl32/comctl_Ru.rc index 35418e4..2bbb513 100644 --- a/dlls/comctl32/comctl_Ru.rc +++ b/dlls/comctl32/comctl_Ru.rc @@ -40,7 +40,7 @@ FONT 8, "MS Shell Dlg" BEGIN PUSHBUTTON "< &��", IDC_BACK_BUTTON,71,138,50,14 DEFPUSHBUTTON "&�� >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "��", IDC_FINISH_BUTTON,121,138,50,14 + DEFPUSHBUTTON "��", IDC_FINISH_BUTTON,121,138,50,14 PUSHBUTTON "��", IDCANCEL,178,138,50,14 PUSHBUTTON "&��", IDHELP,235,138,50,14,WS_GROUP LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN diff --git a/dlls/comdlg32/cdlg_Ru.rc b/dlls/comdlg32/cdlg_Ru.rc index 7afe4e3..2e14b90 100644 --- a/dlls/comdlg32/cdlg_Ru.rc +++ b/dlls/comdlg32/cdlg_Ru.rc @@ -157,7 +157,7 @@ FONT 8, "MS Shell Dlg" LTEXT "��|��&��", 1090, 150, 151, 48, 10 LTEXT "��&��:", 726 /*1094*/,254,126,32,10 EDITTEXT 706, 288,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP - LTEXT "&��:",727/*1095*/,254,140,32,10 + LTEXT "&��:",727/*1095*/,254,140,32,10 EDITTEXT 707, 288,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP LTEXT "�&��:",728 /*1096*/,264,154,24,10 EDITTEXT 708, 288,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP @@ -210,7 +210,7 @@ FONT 8, "MS Shell Dlg" LTEXT "�&�� :", -1, 4, 26, 48, 8 EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "&�� ", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "� &�� ", 1041, 5, 62, 104, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "� &�� ", 1041, 5, 62, 104, 12, BS_AUTOCHECKBOX | WS_TABSTOP DEFPUSHBUTTON "&�� ", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "&��", psh1 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP @@ -339,7 +339,7 @@ FONT 8, "MS Shell Dlg" LTEXT "�� &��:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL - LTEXT "�� &��",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY + LTEXT "&�� :",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "�� &��",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 diff --git a/dlls/msi/msi_Ru.rc b/dlls/msi/msi_Ru.rc index 888faa3..2646573 100644 --- a/dlls/msi/msi_Ru.rc +++ b/dlls/msi/msi_Ru.rc @@ -22,7 +22,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - 4 "The specified installation package could not be opened. Please check the file path and try again." + 4 "�� . �� ." 5 "�� %s �� " 9 "�� %s" 10 "�� " diff --git a/dlls/shell32/shell32_Ru.rc b/dlls/shell32/shell32_Ru.rc index a3c5da8..53baaa9 100644 --- a/dlls/shell32/shell32_Ru.rc +++ b/dlls/shell32/shell32_Ru.rc @@ -21,8 +21,8 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT MENU_001 MENU DISCARDABLE BEGIN - MENUITEM "&�� ", FCIDM_SHVIEW_BIGICON - MENUITEM "&�� ", FCIDM_SHVIEW_SMALLICON + MENUITEM "&�� ", FCIDM_SHVIEW_BIGICON + MENUITEM "&�� ", FCIDM_SHVIEW_SMALLICON MENUITEM "&��", FCIDM_SHVIEW_LISTVIEW MENUITEM "&��", FCIDM_SHVIEW_REPORTVIEW END @@ -36,27 +36,27 @@ BEGIN BEGIN POPUP "&��" BEGIN - MENUITEM "&�� ", FCIDM_SHVIEW_BIGICON - MENUITEM "&�� ", FCIDM_SHVIEW_SMALLICON + MENUITEM "&�� ", FCIDM_SHVIEW_BIGICON + MENUITEM "&�� ", FCIDM_SHVIEW_SMALLICON MENUITEM "&��", FCIDM_SHVIEW_LISTVIEW MENUITEM "&��", FCIDM_SHVIEW_REPORTVIEW END MENUITEM SEPARATOR - POPUP "Arrange &Icons" + POPUP "�� &��" BEGIN - MENUITEM "�� &��", 0x30 /* column 0 */ - MENUITEM "�� &��", 0x32 /* column 2 */ - MENUITEM "�� &��", 0x31 /* ... */ - MENUITEM "�� &��", 0x33 + MENUITEM "�� &��", 0x30 /* column 0 */ + MENUITEM "�� &��", 0x32 /* column 2 */ + MENUITEM "�� &��", 0x31 /* ... */ + MENUITEM "�� &��", 0x33 MENUITEM SEPARATOR MENUITEM "&��", FCIDM_SHVIEW_AUTOARRANGE END - MENUITEM "�&�� ", FCIDM_SHVIEW_SNAPTOGRID + MENUITEM "�&�� ", FCIDM_SHVIEW_SNAPTOGRID MENUITEM SEPARATOR MENUITEM "�&��", FCIDM_SHVIEW_REFRESH MENUITEM SEPARATOR MENUITEM "&��", FCIDM_SHVIEW_INSERT - MENUITEM "�� &��", FCIDM_SHVIEW_INSERTLINK + MENUITEM "�� &��", FCIDM_SHVIEW_INSERTLINK MENUITEM SEPARATOR POPUP "��" BEGIN @@ -82,7 +82,7 @@ BEGIN MENUITEM "&��", FCIDM_SHVIEW_CUT MENUITEM "&��", FCIDM_SHVIEW_COPY MENUITEM SEPARATOR - MENUITEM "�� &��", FCIDM_SHVIEW_CREATELINK + MENUITEM "�� &��", FCIDM_SHVIEW_CREATELINK MENUITEM "&��", FCIDM_SHVIEW_DELETE MENUITEM "��&��", FCIDM_SHVIEW_RENAME MENUITEM SEPARATOR @@ -138,9 +138,9 @@ STRINGTABLE DISCARDABLE IDS_SHV_COLUMN1 "��" IDS_SHV_COLUMN2 "��" IDS_SHV_COLUMN3 "��" - IDS_SHV_COLUMN4 "��" + IDS_SHV_COLUMN4 "��" IDS_SHV_COLUMN5 "��" - IDS_SHV_COLUMN6 "�� " + IDS_SHV_COLUMN6 "�� " IDS_SHV_COLUMN7 "��" IDS_SHV_COLUMN8 "��" IDS_SHV_COLUMN9 "��" @@ -152,8 +152,8 @@ STRINGTABLE DISCARDABLE IDS_MYCOMPUTER "�� " /* context menus */ - IDS_VIEW_LARGE "&�� " - IDS_VIEW_SMALL "&�� " + IDS_VIEW_LARGE "&�� " + IDS_VIEW_SMALL "&�� " IDS_VIEW_LIST "&��" IDS_VIEW_DETAILS "&��" IDS_SELECT "&��" @@ -172,23 +172,23 @@ STRINGTABLE DISCARDABLE IDS_RESTART_TITLE "��" IDS_RESTART_PROMPT "�� Windows?" IDS_SHUTDOWN_TITLE "�� " - IDS_SHUTDOWN_PROMPT "�� Wine?" + IDS_SHUTDOWN_PROMPT "�� Wine?" /* shell folder path default values */ IDS_PROGRAMS "�� \\��" IDS_PERSONAL "�� " IDS_FAVORITES "��" IDS_STARTUP "�� \\��\\��" - IDS_RECENT "Recent" - IDS_SENDTO "��" + IDS_RECENT "��" + IDS_SENDTO "��" IDS_STARTMENU "�� " IDS_MYMUSIC "�� " IDS_MYVIDEO "�� " IDS_DESKTOPDIRECTORY "�� " - IDS_NETHOOD "NetHood" + IDS_NETHOOD "�� " IDS_TEMPLATES "��" IDS_APPDATA "Application Data" - IDS_PRINTHOOD "PrintHood" + IDS_PRINTHOOD "��" IDS_LOCAL_APPDATA "Local Settings\\Application Data" IDS_INTERNET_CACHE "Local Settings\\Temporary Internet Files" IDS_COOKIES "Cookies" diff --git a/dlls/user32/resources/user32_Ru.rc b/dlls/user32/resources/user32_Ru.rc index 9420ff4..4b70886 100644 --- a/dlls/user32/resources/user32_Ru.rc +++ b/dlls/user32/resources/user32_Ru.rc @@ -67,5 +67,5 @@ END STRINGTABLE DISCARDABLE { IDS_ERROR "��" - IDS_MDI_MOREWINDOWS "&�� ..." + IDS_MDI_MOREWINDOWS "&�� ..." } diff --git a/dlls/winmm/winmm_Ru.rc b/dlls/winmm/winmm_Ru.rc index 9b296f1..7d18aeb 100644 --- a/dlls/winmm/winmm_Ru.rc +++ b/dlls/winmm/winmm_Ru.rc @@ -31,7 +31,7 @@ MMSYSERR_INVALHANDLE, "�� MMSYSERR_NODRIVER, "� �� ! \n" MMSYSERR_NOMEM, "�� . �� ." MMSYSERR_NOTSUPPORTED, "�� . �� Capabilities, �� , �� ." -MMSYSERR_BADERRNUM, "�� ." +MMSYSERR_BADERRNUM, "�� ." MMSYSERR_INVALFLAG, "�� ." MMSYSERR_INVALPARAM, "�� ."

1 0

James Hawkins : msi: Don't skip files continued from a previous cabinet.
by Alexandre Julliard 08 Feb '07

08 Feb '07

Module: wine Branch: master Commit: 5b8282120a676e66a0e767438cb8abfe43bddd58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b8282120a676e66a0e767438… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Feb 7 21:58:14 2007 -0600 msi: Don't skip files continued from a previous cabinet. --- dlls/msi/files.c | 2 +- dlls/msi/tests/install.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index e370b1e..61992a3 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -716,7 +716,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *pac LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) { - if (file->state != msifs_missing && file->state != msifs_overwrite) + if (file->state != msifs_missing && !mi->is_continuous && file->state != msifs_overwrite) continue; if (file->Sequence > mi->last_sequence || mi->is_continuous || diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 00b7763..7a8412b 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -214,6 +214,13 @@ static const CHAR mm_media_dat[] = "Disk "Media\tDiskId\n" "1\t3\t\ttest1.cab\tDISK1\t\n"; +static const CHAR ss_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" + "i2\ti4\tL64\tS255\tS32\tS72\n" + "Media\tDiskId\n" + "1\t2\t\ttest1.cab\tDISK1\t\n" + "2\t2\t\ttest2.cab\tDISK2\t\n" + "3\t12\t\ttest3.cab\tDISK3\t\n"; + typedef struct _msi_table { const CHAR *filename; @@ -286,6 +293,18 @@ static const msi_table mm_tables[] = ADD_TABLE(property), }; +static const msi_table ss_tables[] = +{ + ADD_TABLE(cc_component), + ADD_TABLE(directory), + ADD_TABLE(cc_feature), + ADD_TABLE(cc_feature_comp), + ADD_TABLE(cc_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(ss_media), + ADD_TABLE(property), +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -1021,6 +1040,29 @@ static void test_mixedmedia(void) DeleteFile(msifile); } +static void test_samesequence(void) +{ + UINT r; + + create_cc_test_files(); + create_database(msifile, ss_tables, sizeof(ss_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); + } + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + + delete_cab_files(); + DeleteFile(msifile); +} + START_TEST(install) { DWORD len; @@ -1044,6 +1086,7 @@ START_TEST(install) test_continuouscabs(); test_caborder(); test_mixedmedia(); + test_samesequence(); SetCurrentDirectoryA(prev_path); }

1 0

Rob Shearman : oleaut32: Fix the return value of ITypeInfo:: Invoke when the property-put named argument isn't DISPID_PROPERTYPUT.
by Alexandre Julliard 08 Feb '07

08 Feb '07

Module: wine Branch: master Commit: 30b6f9acd68f5c45971fabfd37458ce4840e70d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30b6f9acd68f5c45971fabfd3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 7 19:30:07 2007 +0000 oleaut32: Fix the return value of ITypeInfo::Invoke when the property-put named argument isn't DISPID_PROPERTYPUT. --- dlls/oleaut32/tests/tmarshal.c | 5 +---- dlls/oleaut32/typelib.c | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 996c2da..2393a93 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -975,10 +975,7 @@ static void test_typelibmarshal(void) dispparams.rgvarg = vararg; VariantInit(&varresult); hr = IDispatch_Invoke(pDispatch, DISPID_TM_NAME, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYPUT, &dispparams, &varresult, &excepinfo, NULL); - todo_wine - { - ok(hr == DISP_E_PARAMNOTFOUND, "IDispatch_Invoke should have returned DISP_E_PARAMNOTFOUND instead of 0x%08x\n", hr); - } + ok(hr == DISP_E_PARAMNOTFOUND, "IDispatch_Invoke should have returned DISP_E_PARAMNOTFOUND instead of 0x%08x\n", hr); VariantClear(&varresult); /* tests param type that cannot be coerced */ diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 50ddd2f..d75e7bc 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5481,7 +5481,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke if (!cNamedArgs || (rgdispidNamedArgs[0] != DISPID_PROPERTYPUT)) { ERR("first named arg for property put invocation must be DISPID_PROPERTYPUT\n"); - hres = DISP_E_PARAMNOTOPTIONAL; + hres = DISP_E_PARAMNOTFOUND; goto func_fail; } /* ignore the DISPID_PROPERTYPUT named argument from now on */

1 0

Mikołaj Zalewski : comctl32: listview: Create the LISTVIEW_INFO in WM_NCCREATE.
by Alexandre Julliard 08 Feb '07

08 Feb '07

Module: wine Branch: master Commit: 3ea059c9d74a91ae89eb486ff775d5bd36a02141 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ea059c9d74a91ae89eb486ff… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Feb 7 21:12:52 2007 +0100 comctl32: listview: Create the LISTVIEW_INFO in WM_NCCREATE. --- dlls/comctl32/listview.c | 89 ++++++++++++++++++++++++++-------------- dlls/comctl32/tests/listview.c | 29 +++++++++++++ 2 files changed, 87 insertions(+), 31 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 91cafca..208d28b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7673,17 +7673,17 @@ static CALLBACK VOID LISTVIEW_DelayedEdi /*** * DESCRIPTION: - * Creates the listview control. + * Creates the listview control - the WM_NCCREATE phase. * * PARAMETER(S): * [I] hwnd : window handle * [I] lpcs : the create parameters * * RETURN: - * Success: 0 - * Failure: -1 + * Success: TRUE + * Failure: FALSE */ -static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) +static LRESULT LISTVIEW_NCCreate(HWND hwnd, const CREATESTRUCTW *lpcs) { LISTVIEW_INFO *infoPtr; UINT uView = lpcs->style & LVS_TYPEMASK; @@ -7693,7 +7693,7 @@ static LRESULT LISTVIEW_Create(HWND hwnd /* initialize info pointer */ infoPtr = Alloc(sizeof(LISTVIEW_INFO)); - if (!infoPtr) return -1; + if (!infoPtr) return FALSE; SetWindowLongPtrW(hwnd, 0, (DWORD_PTR)infoPtr); @@ -7701,8 +7701,7 @@ static LRESULT LISTVIEW_Create(HWND hwnd infoPtr->dwStyle = lpcs->style; /* determine the type of structures to use */ infoPtr->hwndNotify = lpcs->hwndParent; - infoPtr->notifyFormat = SendMessageW(infoPtr->hwndNotify, WM_NOTIFYFORMAT, - (WPARAM)infoPtr->hwndSelf, (LPARAM)NF_QUERY); + /* infoPtr->notifyFormat will be filled in WM_CREATE */ /* initialize color information */ infoPtr->clrBk = CLR_NONE; @@ -7731,12 +7730,58 @@ static LRESULT LISTVIEW_Create(HWND hwnd infoPtr->hFont = infoPtr->hDefaultFont; LISTVIEW_SaveTextMetrics(infoPtr); + /* allocate memory for the data structure */ + if (!(infoPtr->selectionRanges = ranges_create(10))) goto fail; + if (!(infoPtr->hdpaItems = DPA_Create(10))) goto fail; + if (!(infoPtr->hdpaPosX = DPA_Create(10))) goto fail; + if (!(infoPtr->hdpaPosY = DPA_Create(10))) goto fail; + if (!(infoPtr->hdpaColumns = DPA_Create(10))) goto fail; + + /* initialize the icon sizes */ + set_icon_size(&infoPtr->iconSize, infoPtr->himlNormal, uView != LVS_ICON); + set_icon_size(&infoPtr->iconStateSize, infoPtr->himlState, TRUE); + return TRUE; + +fail: + DestroyWindow(infoPtr->hwndHeader); + ranges_destroy(infoPtr->selectionRanges); + DPA_Destroy(infoPtr->hdpaItems); + DPA_Destroy(infoPtr->hdpaPosX); + DPA_Destroy(infoPtr->hdpaPosY); + DPA_Destroy(infoPtr->hdpaColumns); + Free(infoPtr); + return FALSE; +} + +/*** + * DESCRIPTION: + * Creates the listview control - the WM_CREATE phase. Most of the data is + * already set up in LISTVIEW_NCCreate + * + * PARAMETER(S): + * [I] hwnd : window handle + * [I] lpcs : the create parameters + * + * RETURN: + * Success: 0 + * Failure: -1 + */ +static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) +{ + LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongPtrW(hwnd, 0); + UINT uView = lpcs->style & LVS_TYPEMASK; + + TRACE("(lpcs=%p)\n", lpcs); + + infoPtr->notifyFormat = SendMessageW(infoPtr->hwndNotify, WM_NOTIFYFORMAT, + (WPARAM)infoPtr->hwndSelf, (LPARAM)NF_QUERY); + /* create header */ infoPtr->hwndHeader = CreateWindowW(WC_HEADERW, NULL, WS_CHILD | HDS_HORZ | HDS_FULLDRAG | (DWORD)((LVS_NOSORTHEADER & lpcs->style)?0:HDS_BUTTONS), 0, 0, 0, 0, hwnd, NULL, lpcs->hInstance, NULL); - if (!infoPtr->hwndHeader) goto fail; + if (!infoPtr->hwndHeader) return -1; /* set header unicode format */ SendMessageW(infoPtr->hwndHeader, HDM_SETUNICODEFORMAT, (WPARAM)TRUE, (LPARAM)NULL); @@ -7744,20 +7789,9 @@ static LRESULT LISTVIEW_Create(HWND hwnd /* set header font */ SendMessageW(infoPtr->hwndHeader, WM_SETFONT, (WPARAM)infoPtr->hFont, (LPARAM)TRUE); - /* allocate memory for the data structure */ - if (!(infoPtr->selectionRanges = ranges_create(10))) goto fail; - if (!(infoPtr->hdpaItems = DPA_Create(10))) goto fail; - if (!(infoPtr->hdpaPosX = DPA_Create(10))) goto fail; - if (!(infoPtr->hdpaPosY = DPA_Create(10))) goto fail; - if (!(infoPtr->hdpaColumns = DPA_Create(10))) goto fail; - - /* initialize the icon sizes */ - set_icon_size(&infoPtr->iconSize, infoPtr->himlNormal, uView != LVS_ICON); - set_icon_size(&infoPtr->iconStateSize, infoPtr->himlState, TRUE); - /* init item size to avoid division by 0 */ LISTVIEW_UpdateItemSize (infoPtr); - + if (uView == LVS_REPORT) { if (!(LVS_NOCOLUMNHEADER & lpcs->style)) @@ -7775,16 +7809,6 @@ static LRESULT LISTVIEW_Create(HWND hwnd OpenThemeData(hwnd, themeClass); return 0; - -fail: - DestroyWindow(infoPtr->hwndHeader); - ranges_destroy(infoPtr->selectionRanges); - DPA_Destroy(infoPtr->hdpaItems); - DPA_Destroy(infoPtr->hdpaPosX); - DPA_Destroy(infoPtr->hdpaPosY); - DPA_Destroy(infoPtr->hdpaColumns); - Free(infoPtr); - return -1; } /*** @@ -9246,7 +9270,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg TRACE("(uMsg=%x wParam=%x lParam=%lx)\n", uMsg, wParam, lParam); - if (!infoPtr && (uMsg != WM_CREATE)) + if (!infoPtr && (uMsg != WM_NCCREATE)) return DefWindowProcW(hwnd, uMsg, wParam, lParam); switch (uMsg) @@ -9605,6 +9629,9 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg case WM_COMMAND: return LISTVIEW_Command(infoPtr, wParam, lParam); + case WM_NCCREATE: + return LISTVIEW_NCCreate(hwnd, (LPCREATESTRUCTW)lParam); + case WM_CREATE: return LISTVIEW_Create(hwnd, (LPCREATESTRUCTW)lParam); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 9d14e39..6c1a3b1 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -343,6 +343,34 @@ static void test_items(void) DestroyWindow(hwnd); } +/* test setting imagelist between WM_NCCREATE and WM_CREATE */ +static WNDPROC listviewWndProc; +static HIMAGELIST test_create_imagelist; + +static LRESULT CALLBACK create_test_wndproc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + if (uMsg == WM_CREATE) + SendMessage(hwnd, LVM_SETIMAGELIST, 0, (LPARAM)test_create_imagelist); + return CallWindowProc(listviewWndProc, hwnd, uMsg, wParam, lParam); +} + +static void test_create() +{ + HWND hList; + WNDCLASSEX cls; + cls.cbSize = sizeof(WNDCLASSEX); + ok(GetClassInfoEx(GetModuleHandle(NULL), "SysListView32", &cls), "GetClassInfoEx failed\n"); + listviewWndProc = cls.lpfnWndProc; + cls.lpfnWndProc = create_test_wndproc; + cls.lpszClassName = "MyListView32"; + ok(RegisterClassEx(&cls), "RegisterClassEx failed\n"); + + test_create_imagelist = ImageList_Create(16, 16, 0, 5, 10); + hList = CreateWindow("MyListView32", "Test", WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, GetModuleHandle(NULL), 0); + ok((HIMAGELIST)SendMessage(hList, LVM_GETIMAGELIST, 0, 0) == test_create_imagelist, "Image list not obtained\n"); + DestroyWindow(hList); +} + START_TEST(listview) { INITCOMMONCONTROLSEX icc; @@ -354,4 +382,5 @@ START_TEST(listview) test_images(); test_checkboxes(); test_items(); + test_create(); }

1 0

Rob Shearman : oleaut32: Implement automatic value getting in ITypeInfo:: Invoke.
by Alexandre Julliard 08 Feb '07

08 Feb '07

Module: wine Branch: master Commit: a3235dd1d441c410c59cb4eca83ec77183874d08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3235dd1d441c410c59cb4eca… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 7 19:28:43 2007 +0000 oleaut32: Implement automatic value getting in ITypeInfo::Invoke. If an IDispatch object is returned from in the retval for a propget function and an extra parameter was passed in to ITypeInfo::Invoke then it should call IDispatch::Invoke on the returned object with the extra parameter to retrieve the value of the object, which is then returned in pVarResult. --- dlls/oleaut32/tests/tmarshal.c | 12 +++--------- dlls/oleaut32/typelib.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 0654622..996c2da 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -898,11 +898,8 @@ static void test_typelibmarshal(void) "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", excepinfo.wCode, excepinfo.scode); - todo_wine - { - ok(V_VT(&varresult) == VT_I2, "V_VT(&varresult) was %d instead of VT_I2\n", V_VT(&varresult)); - ok(V_I2(&varresult) == 1234, "V_I2(&varresult) was %d instead of 1234\n", V_I2(&varresult)); - } + ok(V_VT(&varresult) == VT_I2, "V_VT(&varresult) was %d instead of VT_I2\n", V_VT(&varresult)); + ok(V_I2(&varresult) == 1234, "V_I2(&varresult) was %d instead of 1234\n", V_I2(&varresult)); VariantClear(&varresult); /* call Value with a VT_VARIANT|VT_BYREF type */ @@ -1033,10 +1030,7 @@ static void test_typelibmarshal(void) dispparams.rgdispidNamedArgs = NULL; dispparams.rgvarg = vararg; hr = IDispatch_Invoke(pDispatch, DISPID_TM_STATE, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL); - todo_wine - { - ok(hr == DISP_E_NOTACOLLECTION, "IDispatch_Invoke should have returned DISP_E_NOTACOLLECTION instead of 0x%08x\n", hr); - } + ok(hr == DISP_E_NOTACOLLECTION, "IDispatch_Invoke should have returned DISP_E_NOTACOLLECTION instead of 0x%08x\n", hr); IDispatch_Release(pDispatch); IWidget_Release(pWidget); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 63ec327..50ddd2f 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5519,6 +5519,19 @@ static HRESULT WINAPI ITypeInfo_fnInvoke if (wParamFlags & PARAMFLAG_FRETVAL) { + /* under most conditions the caller is not allowed to + * pass in a dispparam arg in the index of what would be + * the retval parameter. however, there is an exception + * where the extra parameter is used in an extra + * IDispatch::Invoke below */ + if ((i < pDispParams->cArgs) && + ((func_desc->cParams != 1) || !pVarResult || + !(func_desc->invkind & INVOKE_PROPERTYGET))) + { + hres = DISP_E_BADPARAMCOUNT; + break; + } + /* note: this check is placed so that if the caller passes * in a VARIANTARG for the retval we just ignore it, like * native does */ @@ -5733,6 +5746,29 @@ static HRESULT WINAPI ITypeInfo_fnInvoke VariantClear(&varresult); } + if (SUCCEEDED(hres) && pVarResult && (func_desc->cParams == 1) && + (wFlags == INVOKE_PROPERTYGET) && + (func_desc->lprgelemdescParam[0].u.paramdesc.wParamFlags & PARAMFLAG_FRETVAL) && + (pDispParams->cArgs != 0)) + { + if (V_VT(pVarResult) == VT_DISPATCH) + { + IDispatch *pDispatch = V_DISPATCH(pVarResult); + /* Note: not VariantClear; we still need the dispatch + * pointer to be valid */ + VariantInit(pVarResult); + hres = IDispatch_Invoke(pDispatch, DISPID_VALUE, &IID_NULL, + GetSystemDefaultLCID(), INVOKE_PROPERTYGET, + pDispParams, pVarResult, pExcepInfo, pArgErr); + IDispatch_Release(pDispatch); + } + else + { + VariantClear(pVarResult); + hres = DISP_E_NOTACOLLECTION; + } + } + func_fail: HeapFree(GetProcessHeap(), 0, buffer); break;

1 0

Rob Shearman : oleaut32: Always register the typelib for the tmarshal tests .
by Alexandre Julliard 08 Feb '07

08 Feb '07

Module: wine Branch: master Commit: d2a38cef9981eef210b31abfea341804c60494d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2a38cef9981eef210b31abfe… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 7 22:09:43 2007 +0000 oleaut32: Always register the typelib for the tmarshal tests. --- dlls/oleaut32/tests/tmarshal.c | 39 +++++++++++++-------------------------- 1 files changed, 13 insertions(+), 26 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 99bbf00..9308408 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -520,16 +520,20 @@ typedef struct KindaEnum LONG refs; } KindaEnum; -static HRESULT register_current_module_typelib(ITypeLib **typelib) +static HRESULT register_current_module_typelib(void) { WCHAR path[MAX_PATH]; HRESULT hr; + ITypeLib *typelib; GetModuleFileNameW(NULL, path, MAX_PATH); - hr = LoadTypeLib(path, typelib); + hr = LoadTypeLib(path, &typelib); if (SUCCEEDED(hr)) - hr = RegisterTypeLib(*typelib, path, NULL); + { + hr = RegisterTypeLib(typelib, path, NULL); + ITypeLib_Release(typelib); + } return hr; } @@ -544,11 +548,6 @@ static IWidget *Widget_Create(void) hr = LoadRegTypeLib(&LIBID_TestTypelib, 1, 0, LOCALE_NEUTRAL, &pTypeLib); ok_ole_success(hr, LoadRegTypeLib); - if (hr == TYPE_E_LIBNOTREGISTERED) - { - hr = register_current_module_typelib(&pTypeLib); - ok_ole_success(hr, register_current_module_typelib); - } if (SUCCEEDED(hr)) { ITypeInfo *pTypeInfo; @@ -658,19 +657,6 @@ static const IKindaEnumWidgetVtbl KindaE static IKindaEnumWidget *KindaEnumWidget_Create(void) { KindaEnum *This; - HRESULT hr; - ITypeLib *pTypeLib; - - hr = LoadRegTypeLib(&LIBID_TestTypelib, 1, 0, LOCALE_NEUTRAL, &pTypeLib); - if (hr == TYPE_E_LIBNOTREGISTERED) - { - hr = register_current_module_typelib(&pTypeLib); - ok_ole_success(hr, register_current_module_typelib); - } - else - ok_ole_success(hr, LoadRegTypeLib); - if (SUCCEEDED(hr)) - ITypeLib_Release(pTypeLib); This = (KindaEnum *)HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) return NULL; @@ -720,11 +706,7 @@ static ITypeInfo *NonOleAutomation_GetTy { ITypeLib *pTypeLib; HRESULT hr = LoadRegTypeLib(&LIBID_TestTypelib, 1, 0, LOCALE_NEUTRAL, &pTypeLib); - if (hr == TYPE_E_LIBNOTREGISTERED) - { - hr = register_current_module_typelib(&pTypeLib); - ok_ole_success(hr, register_current_module_typelib); - } + ok_ole_success(hr, LoadRegTypeLib); if (SUCCEEDED(hr)) { ITypeInfo *pTypeInfo; @@ -1106,8 +1088,13 @@ static void test_DispCallFunc(void) START_TEST(tmarshal) { + HRESULT hr; + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + hr = register_current_module_typelib(); + ok_ole_success(hr, register_current_module_typelib); + test_typelibmarshal(); test_DispCallFunc();

1 0