February 2010 - Wine-Commits

Alexandre Julliard : shdocvw: Don' t create empty default key values where not necessary.
by Alexandre Julliard Feb. 10, 2010

Feb. 10, 2010

Module: wine Branch: master Commit: ac853cfcf2db51d0b210833008a6e7157758e8b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac853cfcf2db51d0b21083300… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 10 14:30:19 2010 +0100 shdocvw: Don't create empty default key values where not necessary. --- dlls/shdocvw/shdocvw.inf | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shdocvw/shdocvw.inf b/dlls/shdocvw/shdocvw.inf index 9baa8c8..97891fb 100644 --- a/dlls/shdocvw/shdocvw.inf +++ b/dlls/shdocvw/shdocvw.inf @@ -34,10 +34,10 @@ HKCR,"CLSID\%CLSID_SearchAssistantOC%\InProcServer32",,,"%MODULE%" HKCR,"CLSID\%CLSID_SearchAssistantOC%\InProcServer32","ThreadingModel",,"Apartment" HKCR,"CLSID\%CLSID_SearchAssistantOC%\ProgID",,,"SearchAssistantOC.SearchAssistantOC.1" HKCR,"CLSID\%CLSID_SearchAssistantOC%\VersionIndependentProgID",,,"SearchAssistantOC.SearchAssistantOC" -HKCR,"SearchAssistantOC.SearchAssistantOC",,,"" +HKCR,"SearchAssistantOC.SearchAssistantOC",,,"SearchAssistantOC" HKCR,"SearchAssistantOC.SearchAssistantOC\CLSID",,,"%CLSID_SearchAssistantOC%" HKCR,"SearchAssistantOC.SearchAssistantOC\CurVer",,,"SearchAssistantOC.SearchAssistantOC.1" -HKCR,"SearchAssistantOC.SearchAssistantOC.1",,,"" +HKCR,"SearchAssistantOC.SearchAssistantOC.1",,,"SearchAssistantOC" HKCR,"SearchAssistantOC.SearchAssistantOC.1\CLSID",,,"%CLSID_SearchAssistantOC%" HKCR,"CLSID\%CLSID_ShellNameSpace%",,,"Shell Name Space" @@ -67,7 +67,7 @@ HKCR,"CLSID\%CLSID_ShellUIHelper%\ProgID",,,"Shell.UIHelper.1" HKCR,"Shell.UIHelper",,,"Microsoft Shell UI Helper" HKCR,"Shell.UIHelper\CLSID",,,"%CLSID_ShellUIHelper%" HKCR,"Shell.UIHelper\CurVer",,,"Shell.UIHelper.2" -HKCR,"Shell.UIHelper.1",,,"" +HKCR,"Shell.UIHelper.1",,,"Microsoft Shell UI Helper" HKCR,"Shell.UIHelper.1\CLSID",,,"%CLSID_ShellUIHelper%" HKCR,"CLSID\%CLSID_Internet%\DefaultIcon",,,"shdoclc.dll,-190" @@ -86,7 +86,7 @@ HKCR,"CLSID\%CLSID_WebBrowser%\VersionIndependentProgID",,,"Shell.Explorer" HKCR,"Shell.Explorer",,,"Microsoft Web Browser" HKCR,"Shell.Explorer\CLSID",,,"%CLSID_WebBrowser%" HKCR,"Shell.Explorer\CurVer",,,"Shell.Explorer.2" -HKCR,"Shell.Explorer.2",,,"" +HKCR,"Shell.Explorer.2",,,"Microsoft Web Browser" HKCR,"Shell.Explorer.2\CLSID",,,"%CLSID_WebBrowser%" HKCR,"CLSID\%CLSID_ShellWindows%",,,"ShellWindows" @@ -108,14 +108,14 @@ HKCR,"CLSID\%CLSID_WebBrowser_V1%\InProcServer32",,,"%MODULE%" HKCR,"CLSID\%CLSID_WebBrowser_V1%\InProcServer32","ThreadingModel",,"Apartment" HKCR,"CLSID\%CLSID_WebBrowser_V1%\ProgID",,,"Shell.Explorer.1" HKCR,"CLSID\%CLSID_WebBrowser_V1%\VersionIndependentProgID",,,"Shell.Explorer" -HKCR,"Shell.Explorer.1",,,"" +HKCR,"Shell.Explorer.1",,,"Microsoft Web Browser" HKCR,"Shell.Explorer.1\CLSID",,,"%CLSID_WebBrowser_V1%" HKCR,"CLSID\%CLSID_InternetShortcut%",,,"Internet Shortcut" HKCR,"CLSID\%CLSID_InternetShortcut%\InProcServer32",,,"%MODULE%" HKCR,"CLSID\%CLSID_InternetShortcut%\InProcServer32","ThreadingModel",,"Apartment" HKCR,"CLSID\%CLSID_InternetShortcut%\ProgID",,,"InternetShortcut" -HKCR,"CLSID\%CLSID_InternetShortcut%\shellex\MayChangeDefaultMenu",,, +HKCR,"CLSID\%CLSID_InternetShortcut%\shellex\MayChangeDefaultMenu",,16 HKCR,"InternetShortcut",,,"Internet Shortcut" HKCR,"InternetShortcut","EditFlags",2,"2" HKCR,"InternetShortcut","IsShortcut",,

1 0

Alexandre Julliard : mshtml: Don' t create empty default key values where not necessary.
by Alexandre Julliard Feb. 10, 2010

Feb. 10, 2010

Module: wine Branch: master Commit: d9f315a084deeb83def1cfee53154a0a48228164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9f315a084deeb83def1cfee5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 10 14:30:12 2010 +0100 mshtml: Don't create empty default key values where not necessary. --- dlls/mshtml/mshtml.inf | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/mshtml.inf b/dlls/mshtml/mshtml.inf index f493a3b..dccd736 100644 --- a/dlls/mshtml/mshtml.inf +++ b/dlls/mshtml/mshtml.inf @@ -90,7 +90,7 @@ HKCR,"CLSID\%CLSID_CRecalcEngine%\InProcServer32","ThreadingModel",,"Apartment" ;; CrSource HKCR,"CLSID\%CLSID_CrSource%",,,"Microsoft CrSource 4.0" -HKCR,"CLSID\%CLSID_CrSource%\BrowseInPlace",,,"" +HKCR,"CLSID\%CLSID_CrSource%\BrowseInPlace",,16 ;; HKCR,"CLSID\%CLSID_CrSource%\DefaultIcon",,0x00020000,"%IEXPLORE%,1" HKCR,"CLSID\%CLSID_CrSource%\EnablePlugin\.css",,,"PointPlus plugin" HKCR,"CLSID\%CLSID_CrSource%\InProcServer32",,,"mshtml.dll" @@ -113,7 +113,7 @@ HKCR,"ScriptBridge.ScriptBridge.1\CLSID",,,"%CLSID_Scriptlet%" ;; HTADocument HKCR,"CLSID\%CLSID_HTADocument%",,,"Microsoft HTA Document 6.0" -HKCR,"CLSID\%CLSID_HTADocument%\BrowseInPlace",,,"" +HKCR,"CLSID\%CLSID_HTADocument%\BrowseInPlace",,16 HKCR,"CLSID\%CLSID_HTADocument%\InProcServer32",,,"mshtml.dll" HKCR,"CLSID\%CLSID_HTADocument%\InProcServer32","ThreadingModel",,"Apartment" HKCR,"CLSID\%CLSID_HTADocument%\MiscStatus",,,"2228625" @@ -121,7 +121,7 @@ HKCR,"CLSID\%CLSID_HTADocument%\Version",,,"6.0" ;; HTMLDocument HKCR,"CLSID\%CLSID_HTMLDocument%",,,"HTML Document" -HKCR,"CLSID\%CLSID_HTMLDocument%\BrowseInPlace",,,"" +HKCR,"CLSID\%CLSID_HTMLDocument%\BrowseInPlace",,16 ;; HKCR,"CLSID\%CLSID_HTMLDocument%\DefaultIcon",,0x00020000,"%IEXPLORE%,1" HKCR,"CLSID\%CLSID_HTMLDocument%\InProcServer32",,,"mshtml.dll" HKCR,"CLSID\%CLSID_HTMLDocument%\InProcServer32","ThreadingModel",,"Apartment" @@ -132,7 +132,7 @@ HKCR,"CLSID\%CLSID_HTMLDocument%\EnablePlugin\.css",,,"PointPlus plugin" ;; HTMLPluginDocument HKCR,"CLSID\%CLSID_HTMLPluginDocument%",,,"Microsoft HTML Document 6.0" -HKCR,"CLSID\%CLSID_HTMLPluginDocument%\BrowseInPlace",,,"" +HKCR,"CLSID\%CLSID_HTMLPluginDocument%\BrowseInPlace",,16 HKCR,"CLSID\%CLSID_HTMLPluginDocument%\InProcServer32",,,"mshtml.dll" HKCR,"CLSID\%CLSID_HTMLPluginDocument%\InProcServer32","ThreadingModel",,"Apartment" HKCR,"CLSID\%CLSID_HTMLPluginDocument%\MiscStatus",,,"0" @@ -159,7 +159,7 @@ HKCR,"CLSID\%CLSID_HTMLWindowProxy%\InProcServer32",,,"mshtml.dll" HKCR,"CLSID\%CLSID_HTMLWindowProxy%\InProcServer32","ThreadingModel",,"Apartment" ;; IImageDecodeFilter -HKCR,"CLSID\%CLSID_IImageDecodeFilter%",,,"" +HKCR,"CLSID\%CLSID_IImageDecodeFilter%",,,"CoICOFilter Class" HKCR,"CLSID\%CLSID_IImageDecodeFilter%\InProcServer32",,,%_MOD_PATH% HKCR,"CLSID\%CLSID_IImageDecodeFilter%\InProcServer32","ThreadingModel",,"Apartment" HKCR,"MIME\Database\Content Type\image/x-wmf","Image Filter CLSID",,"%CLSID_IImageDecodeFilter%" @@ -214,7 +214,7 @@ HKCR,"CLSID\%CLSID_MailtoProtocol%\InProcServer32","ThreadingModel",,"Apartment" ;; MHTMLDocument HKCR,"CLSID\%CLSID_MHTMLDocument%",,,"MHTML Document" -HKCR,"CLSID\%CLSID_MHTMLDocument%\BrowseInPlace",,,"" +HKCR,"CLSID\%CLSID_MHTMLDocument%\BrowseInPlace",,16 ;; HKCR,"CLSID\%CLSID_MHTMLDocument%\DefaultIcon",,0x00020000,"%IEXPLORE%,1" HKCR,"CLSID\%CLSID_MHTMLDocument%\InProcServer32",,,"mshtml.dll" HKCR,"CLSID\%CLSID_MHTMLDocument%\InProcServer32","ThreadingModel",,"Apartment" @@ -229,13 +229,13 @@ HKCR,"CLSID\%CLSID_ResProtocol%\InProcServer32","ThreadingModel",,"Apartment" ;; Scriptlet HKCR,"CLSID\%CLSID_Scriptlet%",,,"Microsoft Scriptlet Component" -HKCR,"CLSID\%CLSID_Scriptlet%\Control" +HKCR,"CLSID\%CLSID_Scriptlet%\Control",,16 HKCR,"CLSID\%CLSID_Scriptlet%\InProcServer32",,,"%_MOD_PATH%" HKCR,"CLSID\%CLSID_Scriptlet%\InProcServer32","ThreadingModel",,"Apartment" HKCR,"CLSID\%CLSID_Scriptlet%\MiscStatus",,,"0" HKCR,"CLSID\%CLSID_Scriptlet%\MiscStatus\1",,,"131473" HKCR,"CLSID\%CLSID_Scriptlet%\ProgID",,,"ScriptBridge.ScriptBridge.1" -HKCR,"CLSID\%CLSID_Scriptlet%\Programmable" +HKCR,"CLSID\%CLSID_Scriptlet%\Programmable",,16 ;; HKCR,"CLSID\%CLSID_Scriptlet%\ToolboxBitmap32",,,"%IEXPLORE%,1" HKCR,"CLSID\%CLSID_Scriptlet%\TypeLib",,,"%LIBID_MSHTML%" HKCR,"CLSID\%CLSID_Scriptlet%\Version",,,"4.0" @@ -337,11 +337,11 @@ HKCR,"InternetShortcut\shell\printto\command",,,"rundll32.exe mshtml.dll,PrintHT HKCR,"htmlfile\shell\print\command",,,"rundll32.exe mshtml.dll,PrintHTML ""%%1""" HKCR,"htmlfile\shell\printto\command",,,"rundll32.exe mshtml.dll,PrintHTML ""%%1"" ""%%2"" ""%%3"" ""%%4""" HKCR,"htmlfile",,,"HTML Document" -HKCR,"htmlfile\BrowseInPlace",,,"" +HKCR,"htmlfile\BrowseInPlace",,16 HKCR,"htmlfile\CLSID",,,"%CLSID_HTMLDocument%" ;; HKCR,"htmlfile\DefaultIcon",,0x00020000,"%IEXPLORE%,1" HKCR,"htmlfile_FullWindowEmbed",,,"HTML Plugin Document" -HKCR,"htmlfile_FullWindowEmbed\BrowseInPlace",,,"" +HKCR,"htmlfile_FullWindowEmbed\BrowseInPlace",,16 HKCR,"htmlfile_FullWindowEmbed\CLSID",,,"%CLSID_HTMLPluginDocument%" HKCR,".htm",,,"htmlfile" HKCR,".htm","Content Type",,"text/html" @@ -398,7 +398,7 @@ HKCR,".mhtml","Content Type",,"message/rfc822" HKCR,".mht",,2,"mhtmlfile" HKCR,".mht","Content Type",,"message/rfc822" HKCR,"mhtmlfile",,,"MHTML Document" -HKCR,"mhtmlfile\BrowseInPlace",,,"" +HKCR,"mhtmlfile\BrowseInPlace",,16 HKCR,"mhtmlfile\CLSID",,,"%CLSID_MHTMLDocument%" ;; MPEG

1 0

Michael Stefaniuc : hhctrl.ocx: Use the SendMessage instead of ListView_GetItem.
by Alexandre Julliard Feb. 10, 2010

Feb. 10, 2010

Module: wine Branch: master Commit: 968f21477236966ac9bf9f1fb7c221f1c9ff2553 URL: http://source.winehq.org/git/wine.git/?a=commit;h=968f21477236966ac9bf9f1fb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 9 23:02:03 2010 +0100 hhctrl.ocx: Use the SendMessage instead of ListView_GetItem. SendMessage() is more explicit and also gets rid of three gcc -Wextra warning: value computed is not used --- dlls/hhctrl.ocx/help.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 680911a..30cb008 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -550,7 +550,7 @@ static LRESULT CALLBACK Child_WndProc(HWND hWnd, UINT message, WPARAM wParam, LP lvItem.iItem = (int) SendMessageW(hwndList, LVM_GETSELECTIONMARK, 0, 0); lvItem.mask = TVIF_PARAM; - ListView_GetItemW(hwndList, &lvItem); + SendMessageW(hwndList, LVM_GETITEMW, 0, (LPARAM)&lvItem); OnTopicChange(info, (void*) lvItem.lParam); return 0; } @@ -578,7 +578,7 @@ static LRESULT CALLBACK Child_WndProc(HWND hWnd, UINT message, WPARAM wParam, LP lvItem.iItem = (int) SendMessageW(hwndList, LVM_GETSELECTIONMARK, 0, 0); lvItem.mask = TVIF_PARAM; - ListView_GetItemW(hwndList, &lvItem); + SendMessageW(hwndList, LVM_GETITEMW, 0, (LPARAM)&lvItem); OnTopicChange(info, (void*) lvItem.lParam); return 0; } @@ -1095,7 +1095,7 @@ static LRESULT CALLBACK PopupChild_WndProc(HWND hWnd, UINT message, WPARAM wPara lvItem.iItem = (int) SendMessageW(info->popup.hwndList, LVM_GETSELECTIONMARK, 0, 0); lvItem.mask = TVIF_PARAM; - ListView_GetItemW(info->popup.hwndList, &lvItem); + SendMessageW(info->popup.hwndList, LVM_GETITEMW, 0, (LPARAM)&lvItem); iter = (IndexSubItem*) lvItem.lParam; NavigateToChm(info, info->index->merge.chm_file, iter->local); ShowWindow(info->popup.hwndPopup, SW_HIDE);

1 0

Alexandre Julliard : wine.inf: Don' t create empty default key values where not necessary.
by Alexandre Julliard Feb. 10, 2010

Feb. 10, 2010

Module: wine Branch: master Commit: eb7c14458c271fe694d09e48838a8bb458995a1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb7c14458c271fe694d09e488… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 10 14:29:52 2010 +0100 wine.inf: Don't create empty default key values where not necessary. --- tools/wine.inf.in | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index c0894af..fffbeb6 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -387,11 +387,11 @@ HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"LastID",,"5" HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,%CurrentVersion%\Setup,"BootDir",,"%30%" HKLM,%CurrentVersion%\Setup,"SharedDir",,"%25%" -HKLM,%CurrentVersion%\Uninstall,,,"" +HKLM,%CurrentVersion%\Uninstall,,16 HKLM,%CurrentVersionNT%,"RegisteredOrganization",2,"" HKLM,%CurrentVersionNT%,"RegisteredOwner",2,"" HKLM,%CurrentVersionNT%,"SystemRoot",,"%10%" -HKLM,%CurrentVersionNT%\Fonts,,,"" +HKLM,%CurrentVersionNT%\Fonts,,16 HKLM,%CurrentVersionNT%\Hotfix\Q246009,"Installed",,"1" [Debugger] @@ -538,7 +538,7 @@ HKLM,Software\Borland\Database Engine\Settings\SYSTEM\INIT,SHAREDMEMLOCATION,,90 HKLM,Software\Clients\Mail,,2,"Native Mail Client" HKLM,Software\Clients\Mail\Native Mail Client,,2,"Native Mail Client" HKLM,Software\Clients\Mail\Native Mail Client,"DLLPath",2,"%11%\winemapi.dll" -HKLM,Software\Microsoft\Advanced INF Setup,,,"" +HKLM,Software\Microsoft\Advanced INF Setup,,16 HKLM,Software\Microsoft\Rpc\SecurityService,1,2,"secur32.dll" HKLM,Software\Microsoft\Rpc\SecurityService,10,2,"secur32.dll" HKLM,Software\Microsoft\Rpc\SecurityService,14,2,"schannel.dll" @@ -546,9 +546,9 @@ HKLM,Software\Microsoft\Rpc\SecurityService,16,2,"secur32.dll" HKLM,Software\Microsoft\Rpc\SecurityService,18,2,"secur32.dll" HKLM,Software\Microsoft\Rpc\SecurityService,68,2,"netlogon.dll" HKLM,Software\Microsoft\Rpc\SecurityService,9,2,"secur32.dll" -HKLM,System\CurrentControlSet\Control\VMM32Files,,,"" +HKLM,System\CurrentControlSet\Control\VMM32Files,,16 HKCU,AppEvents\Schemes\Apps\Explorer\Navigating\.Current,,,"" -HKCU,Software\Microsoft\Protected Storage System Provider,,,"" +HKCU,Software\Microsoft\Protected Storage System Provider,,16 ; Some apps requires at least four subkeys of Active Setup\Installed Components HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},,2,"DirectDrawEx" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"ComponentID",2,"DirectDrawEx" @@ -2855,7 +2855,7 @@ StartType=3 ErrorControl=1 [Services] -HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,,"" +HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16 [VersionInfo] HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.1"

1 0

Dylan Smith : wordpad: Fixed quick print so that it doesn' t print blank pages.
by Alexandre Julliard Feb. 10, 2010

Feb. 10, 2010

Module: wine Branch: master Commit: 7aba35c6084bd949c7c733366e6ab0cbf87f0dba URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aba35c6084bd949c7c733366… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Feb 10 02:38:40 2010 -0500 wordpad: Fixed quick print so that it doesn't print blank pages. --- programs/wordpad/print.c | 3 ++- programs/wordpad/wordpad.c | 2 +- programs/wordpad/wordpad.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index 79b43a6..e43b4b9 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -403,11 +403,12 @@ void get_default_printer_opts(void) devNames = pd.hDevNames; } -void print_quick(LPWSTR wszFileName) +void print_quick(HWND hMainWnd, LPWSTR wszFileName) { PRINTDLGW pd; ZeroMemory(&pd, sizeof(pd)); + pd.hwndOwner = hMainWnd; pd.hDC = make_dc(); print(&pd, wszFileName); diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 0bbe360..bdaee2e 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2098,7 +2098,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) break; case ID_PRINT_QUICK: - print_quick(wszFileName); + print_quick(hMainWnd, wszFileName); target_device(hMainWnd, wordWrap[reg_formatindex(fileFormat)]); break; diff --git a/programs/wordpad/wordpad.h b/programs/wordpad/wordpad.h index 26aa41a..269f3a2 100644 --- a/programs/wordpad/wordpad.h +++ b/programs/wordpad/wordpad.h @@ -217,7 +217,7 @@ LPWSTR file_basename(LPWSTR); void dialog_printsetup(HWND); void dialog_print(HWND, LPWSTR); void target_device(HWND, DWORD); -void print_quick(LPWSTR); +void print_quick(HWND, LPWSTR); LRESULT preview_command(HWND, WPARAM); void init_preview(HWND, LPWSTR); void close_preview(HWND);

1 0

Michael Stefaniuc : itss: Reorder some code to avoid leaking memory on an error path.
by Alexandre Julliard Feb. 10, 2010

Feb. 10, 2010

Module: wine Branch: master Commit: 7a8638d8b32a84594aaebdb0ccf35677f1445fe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a8638d8b32a84594aaebdb0c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 9 23:01:26 2010 +0100 itss: Reorder some code to avoid leaking memory on an error path. Found by Smatch. --- dlls/itss/storage.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/itss/storage.c b/dlls/itss/storage.c index fa92c4f..79c863a 100644 --- a/dlls/itss/storage.c +++ b/dlls/itss/storage.c @@ -399,6 +399,10 @@ static HRESULT WINAPI ITSS_IStorageImpl_OpenStorage( TRACE("%p %s %p %u %p %u %p\n", This, debugstr_w(pwcsName), pstgPriority, grfMode, snbExclude, reserved, ppstg); + chmfile = chm_dup( This->chmfile ); + if( !chmfile ) + return E_FAIL; + len = strlenW( This->dir ) + strlenW( pwcsName ) + 1; path = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); strcpyW( path, This->dir ); @@ -423,9 +427,6 @@ static HRESULT WINAPI ITSS_IStorageImpl_OpenStorage( TRACE("Resolving %s\n", debugstr_w(path)); - chmfile = chm_dup( This->chmfile ); - if( !chmfile ) - return E_FAIL; return ITSS_create_chm_storage(chmfile, path, ppstg); }

1 0

Paul Vriens : shell32/tests: Fix a test failure on NT4.
by Alexandre Julliard Feb. 10, 2010

Feb. 10, 2010

Module: wine Branch: master Commit: 6a6c8e3ee2f887f598e6704bcdd62eefe8e01a94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a6c8e3ee2f887f598e6704bc… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Feb 10 08:30:06 2010 +0100 shell32/tests: Fix a test failure on NT4. --- dlls/shell32/tests/shlfileop.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 49ef8cb..777801e 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -1728,9 +1728,12 @@ static void test_copy(void) shfo.pTo = "\0"; shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; retval = SHFileOperation(&shfo); - ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(retval == ERROR_SUCCESS || + broken(retval == DE_OPCANCELLED), /* NT4 */ + "Expected ERROR_SUCCESS, got %d\n", retval); + if (retval == ERROR_SUCCESS) + ok(DeleteFileA("abcdefgh.abc"), "Expected file to exist\n"); ok(DeleteFileA("dir\\abcdefgh.abc"), "Expected file to exist\n"); - ok(DeleteFileA("abcdefgh.abc"), "Expected file to exist\n"); ok(RemoveDirectoryA("dir"), "Expected dir to exist\n"); }

1 0

Alexandre Julliard : itss: Don' t create empty default key values where not necessary.
by Alexandre Julliard Feb. 10, 2010

Feb. 10, 2010

Module: wine Branch: master Commit: 0887094f7065ed3d47344745398406f8a6b1fff9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0887094f7065ed3d473447453… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 10 14:29:58 2010 +0100 itss: Don't create empty default key values where not necessary. --- dlls/itss/itss.inf | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/itss/itss.inf b/dlls/itss/itss.inf index 22a1215..fcad4d1 100644 --- a/dlls/itss/itss.inf +++ b/dlls/itss/itss.inf @@ -16,7 +16,7 @@ DelReg=Classes.Reg, Misc.Reg HKCR,"CLSID\%CLSID_ITStorage%",,,"Microsoft InfoTech IStorage System" HKCR,"CLSID\%CLSID_ITStorage%\InProcServer32",,,"itss.dll" HKCR,"CLSID\%CLSID_ITStorage%\InProcServer32","ThreadingModel",,"Both" -HKCR,"CLSID\%CLSID_ITStorage%\NotInsertable",,,"" +HKCR,"CLSID\%CLSID_ITStorage%\NotInsertable",,16 HKCR,"CLSID\%CLSID_ITStorage%\ProgID",,,"MSITFS1.0" HKCR,"CLSID\%CLSID_ITStorage%\VersionIndependentProgID",,,"MSITFS" @@ -28,7 +28,7 @@ HKCR,"MSITFS\CurVer",,,"MSITFS1.0" HKCR,"CLSID\%CLSID_MSITStore%",,,"Microsoft InfoTech Protocol for IE 3.0" HKCR,"CLSID\%CLSID_MSITStore%\InProcServer32",,,"itss.dll" HKCR,"CLSID\%CLSID_MSITStore%\InProcServer32","ThreadingModel",,"Both" -HKCR,"CLSID\%CLSID_MSITStore%\NotInsertable",,,"" +HKCR,"CLSID\%CLSID_MSITStore%\NotInsertable",,16 HKCR,"CLSID\%CLSID_MSITStore%\ProgID",,,"MSITFS1.0" HKCR,"CLSID\%CLSID_MSITStore%\VersionIndependentProgID",,,"MSITFS" @@ -41,7 +41,7 @@ HKCR,"MSITStore\CurVer",,,"MSITStore1.0" HKCR,"CLSID\%CLSID_ITSProtocol%",,,"Microsoft InfoTech Protocol for IE 4.0" HKCR,"CLSID\%CLSID_ITSProtocol%\InProcServer32",,,"itss.dll" HKCR,"CLSID\%CLSID_ITSProtocol%\InProcServer32","ThreadingModel",,"Both" -HKCR,"CLSID\%CLSID_ITSProtocol%\NotInsertable",,,"" +HKCR,"CLSID\%CLSID_ITSProtocol%\NotInsertable",,16 HKCR,"CLSID\%CLSID_ITSProtocol%\ProgID",,,"MSITFS1.0" HKCR,"CLSID\%CLSID_ITSProtocol%\VersionIndependentProgID",,,"MSITFS" @@ -54,7 +54,7 @@ HKCR,"ITSProtocol\CurVer",,,"ITSProtocol1.0" HKCR,"CLSID\%CLSID_MSFSStore%",,,"Microsoft InfoTech IStorage for Win32 Files" HKCR,"CLSID\%CLSID_MSFSStore%\InProcServer32",,,"itss.dll" HKCR,"CLSID\%CLSID_MSFSStore%\InProcServer32","ThreadingModel",,"Both" -HKCR,"CLSID\%CLSID_MSFSStore%\NotInsertable",,,"" +HKCR,"CLSID\%CLSID_MSFSStore%\NotInsertable",,16 HKCR,"CLSID\%CLSID_MSFSStore%\ProgID",,,"MSITFS1.0" HKCR,"CLSID\%CLSID_MSFSStore%\VersionIndependentProgID",,,"MSITFS"

1 0

Alexandre Julliard : jscript: Don' t create empty default key values where not necessary.
by Alexandre Julliard Feb. 10, 2010

Feb. 10, 2010

Module: wine Branch: master Commit: 16a080fc022aeff3c5672625a4abc7c6aadaf2bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=16a080fc022aeff3c5672625a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 10 14:30:07 2010 +0100 jscript: Don't create empty default key values where not necessary. --- dlls/jscript/jscript.inf | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/jscript/jscript.inf b/dlls/jscript/jscript.inf index bdec721..9f683ed 100644 --- a/dlls/jscript/jscript.inf +++ b/dlls/jscript/jscript.inf @@ -12,27 +12,27 @@ DelReg=Classes.Reg [Classes.Reg] HKCR,"CLSID\%CLSID_JScript%",,,"JScript Language" -HKCR,"CLSID\%CLSID_JScript%\Implemented Categories\%CATID_ActiveScript%",,, -HKCR,"CLSID\%CLSID_JScript%\Implemented Categories\%CATID_ActiveScriptParse%",,, +HKCR,"CLSID\%CLSID_JScript%\Implemented Categories\%CATID_ActiveScript%",,16 +HKCR,"CLSID\%CLSID_JScript%\Implemented Categories\%CATID_ActiveScriptParse%",,16 HKCR,"CLSID\%CLSID_JScript%\InprocServer32",,,"%MODULE%" HKCR,"CLSID\%CLSID_JScript%\InprocServer32","ThreadingModel",,"Both" -HKCR,"CLSID\%CLSID_JScript%\OLEScript",,, +HKCR,"CLSID\%CLSID_JScript%\OLEScript",,16 HKCR,"CLSID\%CLSID_JScript%\ProgID",,,"JScript" HKCR,"CLSID\%CLSID_JScriptAuthor%",,,"JScript Language Authoring" -HKCR,"CLSID\%CLSID_JScriptAuthor%\Implemented Categories\%CATID_ActiveScriptAuthor%",,, +HKCR,"CLSID\%CLSID_JScriptAuthor%\Implemented Categories\%CATID_ActiveScriptAuthor%",,16 HKCR,"CLSID\%CLSID_JScriptAuthor%\InprocServer32",,,"%MODULE%" HKCR,"CLSID\%CLSID_JScriptAuthor%\InprocServer32","ThreadingModel",,"Both" -HKCR,"CLSID\%CLSID_JScriptAuthor%\OLEScript",,, +HKCR,"CLSID\%CLSID_JScriptAuthor%\OLEScript",,16 HKCR,"CLSID\%CLSID_JScriptAuthor%\ProgID",,,"JScript Author" HKCR,"CLSID\%CLSID_JScriptEncode%",,,"JScript Language Encoding" -HKCR,"CLSID\%CLSID_JScriptEncode%\Implemented Categories\%CATID_ActiveScript%",,, -HKCR,"CLSID\%CLSID_JScriptEncode%\Implemented Categories\%CATID_ActiveScriptParse%",,, -HKCR,"CLSID\%CLSID_JScriptEncode%\Implemented Categories\%CATID_ActiveScriptEncode%",,, +HKCR,"CLSID\%CLSID_JScriptEncode%\Implemented Categories\%CATID_ActiveScript%",,16 +HKCR,"CLSID\%CLSID_JScriptEncode%\Implemented Categories\%CATID_ActiveScriptParse%",,16 +HKCR,"CLSID\%CLSID_JScriptEncode%\Implemented Categories\%CATID_ActiveScriptEncode%",,16 HKCR,"CLSID\%CLSID_JScriptEncode%\InprocServer32",,,"%MODULE%" HKCR,"CLSID\%CLSID_JScriptEncode%\InprocServer32","ThreadingModel",,"Both" -HKCR,"CLSID\%CLSID_JScriptEncode%\OLEScript",,, +HKCR,"CLSID\%CLSID_JScriptEncode%\OLEScript",,16 HKCR,"CLSID\%CLSID_JScriptEncode%\ProgID",,,"JScript.Encode" HKCR,"Component Categories\%CATID_ActiveScriptAuthor%","409",,"Active Scripting Engine with Authoring" @@ -42,55 +42,55 @@ HKCR,"Component Categories\%CATID_ActiveScriptEncode%","409",,"Active Scripting HKCR,"ECMAScript",,,"JScript Language" HKCR,"ECMAScript\CLSID",,,"%CLSID_JScript%" -HKCR,"ECMAScript\OLEScript",,, +HKCR,"ECMAScript\OLEScript",,16 HKCR,"JavaScript",,,"JScript Language" HKCR,"JavaScript\CLSID",,,"%CLSID_JScript%" -HKCR,"JavaScript\OLEScript",,, +HKCR,"JavaScript\OLEScript",,16 HKCR,"JavaScript Author",,,"JScript Language Authoring" HKCR,"JavaScript Author\CLSID",,,"%CLSID_JScriptAuthor%" -HKCR,"JavaScript Author\OLEScript",,, +HKCR,"JavaScript Author\OLEScript",,16 HKCR,"JavaScript1.1",,,"JScript Language" HKCR,"JavaScript1.1\CLSID",,,"%CLSID_JScript%" -HKCR,"JavaScript1.1\OLEScript",,, +HKCR,"JavaScript1.1\OLEScript",,16 HKCR,"JavaScript1.1 Author",,,"JScript Language Authoring" HKCR,"JavaScript1.1 Author\CLSID",,,"%CLSID_JScriptAuthor%" -HKCR,"JavaScript1.1 Author\OLEScript",,, +HKCR,"JavaScript1.1 Author\OLEScript",,16 HKCR,"JavaScript1.2",,,"JScript Language" HKCR,"JavaScript1.2\CLSID",,,"%CLSID_JScript%" -HKCR,"JavaScript1.2\OLEScript",,, +HKCR,"JavaScript1.2\OLEScript",,16 HKCR,"JavaScript1.2 Author",,,"JScript Language Authoring" HKCR,"JavaScript1.2 Author\CLSID",,,"%CLSID_JScriptAuthor%" -HKCR,"JavaScript1.2 Author\OLEScript",,, +HKCR,"JavaScript1.2 Author\OLEScript",,16 HKCR,"JavaScript1.3",,,"JScript Language" HKCR,"JavaScript1.3\CLSID",,,"%CLSID_JScript%" -HKCR,"JavaScript1.3\OLEScript",,, +HKCR,"JavaScript1.3\OLEScript",,16 HKCR,"JScript",,,"JScript Language" HKCR,"JScript\CLSID",,,"%CLSID_JScript%" -HKCR,"JScript\OLEScript",,, +HKCR,"JScript\OLEScript",,16 HKCR,"JScript Author",,,"JScript Language Authoring" HKCR,"JScript Author\CLSID",,,"%CLSID_JScriptAuthor%" -HKCR,"JScript Author\OLEScript",,, +HKCR,"JScript Author\OLEScript",,16 HKCR,"JScript.Encode",,,"JScript Language Encoding" HKCR,"JScript.Encode\CLSID",,,"%CLSID_JScriptEncode%" -HKCR,"JScript.Encode\OLEScript",,, +HKCR,"JScript.Encode\OLEScript",,16 HKCR,"LiveScript",,,"JScript Language" HKCR,"LiveScript\CLSID",,,"%CLSID_JScript%" -HKCR,"LiveScript\OLEScript",,, +HKCR,"LiveScript\OLEScript",,16 HKCR,"LiveScript Author",,,"JScript Language Authoring" HKCR,"LiveScript Author\CLSID",,,"%CLSID_JScriptAuthor%" -HKCR,"LiveScript Author\OLEScript",,, +HKCR,"LiveScript Author\OLEScript",,16 [Strings]

1 0

Michael Stefaniuc : hhctrl.ocx: Remove a stray heap_alloc(0) (Smatch).
by Alexandre Julliard Feb. 10, 2010

Feb. 10, 2010

Module: wine Branch: master Commit: e8993f3ddd00333c1de2943ae4877800f4bfd077 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8993f3ddd00333c1de2943ae… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 9 23:01:37 2010 +0100 hhctrl.ocx: Remove a stray heap_alloc(0) (Smatch). --- dlls/hhctrl.ocx/search.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/search.c b/dlls/hhctrl.ocx/search.c index c584b66..f81e46c 100644 --- a/dlls/hhctrl.ocx/search.c +++ b/dlls/hhctrl.ocx/search.c @@ -97,7 +97,6 @@ static WCHAR *SearchCHM_File(IStorage *pStorage, const WCHAR *file, const char * stream_init(&stream, temp_stream); /* Remove all HTML formatting and record the title */ - buffer = heap_alloc(0); while(next_node(&stream, &node)) { get_node_name(&node, &node_name);

1 0