Ros-diffs April 2013

ros-diffs@reactos.org

14 participants
265 discussions

[pschweitzer] 58806: [NTOSKRNL] Allow ignoring all nullable matching wildcards at the end of the expression string when name is over in FsRtlIs*InExpression() This fixes a few tests
by pschweitzer＠svn.reactos.org 21 Apr '13

21 Apr '13

Author: pschweitzer Date: Sun Apr 21 14:25:55 2013 New Revision: 58806 URL: http://svn.reactos.org/svn/reactos?rev=58806&view=rev Log: [NTOSKRNL] Allow ignoring all nullable matching wildcards at the end of the expression string when name is over in FsRtlIs*InExpression() This fixes a few tests Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c trunk/reactos/ntoskrnl/fsrtl/name.c Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/dbcsname.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Sun Apr 21 14:25:55 2013 @@ -247,10 +247,19 @@ ExpressionPosition = BackTracking[StarFound--]; } } - if (ExpressionPosition + 1 == Expression->Length && NamePosition == Name->Length && - (Expression->Buffer[ExpressionPosition] == ANSI_DOS_DOT || Expression->Buffer[ExpressionPosition] == '*')) - { - ExpressionPosition++; + /* If we have nullable matching wc at the end of the string, eat them */ + if (ExpressionPosition != Expression->Length && NamePosition == Name->Length) + { + while (ExpressionPosition < Expression->Length) + { + if (Expression->Buffer[ExpressionPosition] != ANSI_DOS_DOT && + Expression->Buffer[ExpressionPosition] != '*' && + Expression->Buffer[ExpressionPosition] != ANSI_DOS_STAR) + { + break; + } + ExpressionPosition++; + } } if (BackTracking) Modified: trunk/reactos/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/name.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] Sun Apr 21 14:25:55 2013 @@ -184,10 +184,19 @@ ExpressionPosition = BackTracking[StarFound--]; } } - if (ExpressionPosition + 1 == Expression->Length / sizeof(WCHAR) && NamePosition == Name->Length / sizeof(WCHAR) && - (Expression->Buffer[ExpressionPosition] == DOS_DOT || Expression->Buffer[ExpressionPosition] == L'*')) - { - ExpressionPosition++; + /* If we have nullable matching wc at the end of the string, eat them */ + if (ExpressionPosition != Expression->Length / sizeof(WCHAR) && NamePosition == Name->Length / sizeof(WCHAR)) + { + while (ExpressionPosition < Expression->Length / sizeof(WCHAR)) + { + if (Expression->Buffer[ExpressionPosition] != DOS_DOT && + Expression->Buffer[ExpressionPosition] != L'*' && + Expression->Buffer[ExpressionPosition] != DOS_STAR) + { + break; + } + ExpressionPosition++; + } } if (BackTracking)

1 0

[hbelusca] 58805: [CPORTLIB] Add a #pragma once directive to forbid multiple inclusions of the same header. [NTOSKRNL:KD64] Code formatting only
by hbelusca＠svn.reactos.org 21 Apr '13

21 Apr '13

Author: hbelusca Date: Sun Apr 21 14:03:07 2013 New Revision: 58805 URL: http://svn.reactos.org/svn/reactos?rev=58805&view=rev Log: [CPORTLIB] Add a #pragma once directive to forbid multiple inclusions of the same header. [NTOSKRNL:KD64] Code formatting only Modified: trunk/reactos/include/reactos/libs/cportlib/cportlib.h trunk/reactos/ntoskrnl/kd64/kdinit.c Modified: trunk/reactos/include/reactos/libs/cportlib/cportlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/cport… ============================================================================== --- trunk/reactos/include/reactos/libs/cportlib/cportlib.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/cportlib/cportlib.h [iso-8859-1] Sun Apr 21 14:03:07 2013 @@ -7,6 +7,8 @@ */ /* INCLUDES *******************************************************************/ + +#pragma once #include <ntdef.h> Modified: trunk/reactos/ntoskrnl/kd64/kdinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdinit.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdinit.c [iso-8859-1] Sun Apr 21 14:03:07 2013 @@ -366,7 +366,7 @@ } } - /* Check for incoming breakin and break on symbol load if we have it*/ + /* Check for incoming breakin and break on symbol load if we have it */ KdBreakAfterSymbolLoad = KdPollBreakIn(); } else

1 0

[hbelusca] 58804: [DESK] Convert language files to Unicode.
by hbelusca＠svn.reactos.org 21 Apr '13

21 Apr '13

Author: hbelusca Date: Sun Apr 21 13:57:28 2013 New Revision: 58804 URL: http://svn.reactos.org/svn/reactos?rev=58804&view=rev Log: [DESK] Convert language files to Unicode. Modified: trunk/reactos/dll/cpl/desk/lang/bg-BG.rc trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc trunk/reactos/dll/cpl/desk/lang/de-DE.rc trunk/reactos/dll/cpl/desk/lang/el-GR.rc trunk/reactos/dll/cpl/desk/lang/es-ES.rc trunk/reactos/dll/cpl/desk/lang/fr-FR.rc trunk/reactos/dll/cpl/desk/lang/hu-HU.rc trunk/reactos/dll/cpl/desk/lang/it-IT.rc trunk/reactos/dll/cpl/desk/lang/ja-JP.rc trunk/reactos/dll/cpl/desk/lang/no-NO.rc trunk/reactos/dll/cpl/desk/lang/sk-SK.rc trunk/reactos/dll/cpl/desk/lang/sv-SE.rc trunk/reactos/dll/cpl/desk/lang/zh-CN.rc trunk/reactos/dll/cpl/desk/rsrc.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/cpl/desk/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/bg-BG.rc… Modified: trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc… Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/de-DE.rc… Modified: trunk/reactos/dll/cpl/desk/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/el-GR.rc… Modified: trunk/reactos/dll/cpl/desk/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/es-ES.rc… Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/fr-FR.rc… Modified: trunk/reactos/dll/cpl/desk/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/hu-HU.rc… Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc… Modified: trunk/reactos/dll/cpl/desk/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ja-JP.rc… Modified: trunk/reactos/dll/cpl/desk/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/no-NO.rc… Modified: trunk/reactos/dll/cpl/desk/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sk-SK.rc… Modified: trunk/reactos/dll/cpl/desk/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sv-SE.rc… Modified: trunk/reactos/dll/cpl/desk/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/zh-CN.rc… Modified: trunk/reactos/dll/cpl/desk/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/rsrc.rc?rev=5…

1 0

[akhaldi] 58803: [IEXPLORE] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 21 Apr '13

21 Apr '13

Author: akhaldi Date: Sun Apr 21 13:53:35 2013 New Revision: 58803 URL: http://svn.reactos.org/svn/reactos?rev=58803&view=rev Log: [IEXPLORE] * Sync with Wine 1.5.26. Added: trunk/reactos/base/applications/iexplore/iexplore.inf (with props) Modified: trunk/reactos/base/applications/iexplore/CMakeLists.txt trunk/reactos/base/applications/iexplore/iexplore.rc trunk/reactos/base/applications/iexplore/main.c trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/applications/iexplore/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/iexplore… ============================================================================== --- trunk/reactos/base/applications/iexplore/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/iexplore/CMakeLists.txt [iso-8859-1] Sun Apr 21 13:53:35 2013 @@ -1,5 +1,7 @@ add_executable(iexplore main.c iexplore.rc) -set_module_type(iexplore win32gui) -add_importlibs(iexplore shdocvw msvcrt kernel32) +target_link_libraries(iexplore wine) +set_module_type(iexplore win32gui UNICODE) +add_importlibs(iexplore ieframe msvcrt kernel32 ntdll) +add_delay_importlibs(iexplore advpack version) add_cd_file(TARGET iexplore DESTINATION reactos FOR all) Added: trunk/reactos/base/applications/iexplore/iexplore.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/iexplore… ============================================================================== --- trunk/reactos/base/applications/iexplore/iexplore.inf (added) +++ trunk/reactos/base/applications/iexplore/iexplore.inf [iso-8859-1] Sun Apr 21 13:53:35 2013 @@ -1,0 +1,43 @@ +[version] +Signature="$CHICAGO$" + + +[RegisterIE] +AddReg=Classes.Reg, IE.Reg, Settings.Reg + + +[UnregisterIE] +DelReg=Classes.Reg, IE.Reg, Settings.Reg + + +[Classes.Reg] +HKCR,"CLSID\%CLSID_InternetExplorer%",,,"Internet Explorer(Ver 1.0)" +HKCR,"CLSID\%CLSID_InternetExplorer%\LocalServer32",,,"""%16422%\Internet Explorer\iexplore.exe""" +HKCR,"CLSID\%CLSID_InternetExplorer%\ProgID",,,"InternetExplorer.Application.1" +HKCR,"CLSID\%CLSID_InternetExplorer%\VersionIndependentProgID",,,"InternetExplorer.Application" + +HKCR,"CLSID\%CLSID_Internet%\DefaultIcon",,,"shdoclc.dll,-190" +HKCR,"CLSID\%CLSID_Internet%\Shell",,,"OpenHomePage" +HKCR,"CLSID\%CLSID_Internet%\Shell\OpenHomePage",,,"Open &Home Page" +HKCR,"CLSID\%CLSID_Internet%\Shell\OpenHomePage\Command",,,"""%16422%\Internet Explorer\iexplore.exe""" +HKCR,"CLSID\%CLSID_Internet%\ShellFolder",,2,"0x24" + + +[Settings.Reg] +HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",2,"http://www.winehq.org" +HKCU,"Software\Microsoft\Internet Explorer\Main","Search Page",2,"http://www.google.com" +HKCU,"Software\Microsoft\Internet Explorer\Settings","Text Color",2,"0,0,0" +HKLM,"Software\Microsoft\Internet Explorer\Main","Default_Page_URL",2,"http://www.winehq.org" +HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe",,,"%16422%\Internet Explorer\iexplore.exe" +HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe","Path",,"%16422%\Internet Explorer;" + + +[IE.Reg] +HKLM,"Software\Microsoft\Internet Explorer","Build",,"86001" +HKLM,"Software\Microsoft\Internet Explorer","Version",,"8.0.6001.18702" +HKLM,"Software\Microsoft\Internet Explorer","W2kVersion",,"8.0.6001.18702" + + +[Strings] +CLSID_InternetExplorer="{0002df01-0000-0000-c000-000000000046}" +CLSID_Internet="{871c5380-42a0-1069-a2ea-08002b30309d}" Propchange: trunk/reactos/base/applications/iexplore/iexplore.inf ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/iexplore/iexplore.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/iexplore… ============================================================================== --- trunk/reactos/base/applications/iexplore/iexplore.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/iexplore/iexplore.rc [iso-8859-1] Sun Apr 21 13:53:35 2013 @@ -28,3 +28,6 @@ /* @makedep: iexplore.ico */ 1 ICON iexplore.ico + +/* @makedep: iexplore.inf */ +REGINST REGINST iexplore.inf Modified: trunk/reactos/base/applications/iexplore/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/iexplore… ============================================================================== --- trunk/reactos/base/applications/iexplore/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/iexplore/main.c [iso-8859-1] Sun Apr 21 13:53:35 2013 @@ -18,11 +18,81 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +//#include <windows.h> + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + #include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <winreg.h> +#include <winver.h> -extern DWORD WINAPI IEWinMain(LPSTR, int); +#include <advpub.h> +//#include <ole2.h> +//#include <rpcproxy.h> -int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) +#include <wine/unicode.h> +#include <wine/debug.h> + +extern DWORD WINAPI IEWinMain(const WCHAR*, int); + +static BOOL check_native_ie(void) { + DWORD handle, size; + LPWSTR file_desc; + UINT bytes; + void* buf; + BOOL ret; + + static const WCHAR browseui_dllW[] = {'b','r','o','w','s','e','u','i','.','d','l','l',0}; + static const WCHAR wineW[] = {'W','i','n','e',0}; + static const WCHAR file_desc_strW[] = + {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o', + '\\','0','4','0','9','0','4','b','0', + '\\','F','i','l','e','D','e','s','c','r','i','p','t','i','o','n',0}; + + size = GetFileVersionInfoSizeW(browseui_dllW, &handle); + if(!size) + return TRUE; + + buf = HeapAlloc(GetProcessHeap(), 0, size); + GetFileVersionInfoW(browseui_dllW, 0, size,buf); + + ret = !VerQueryValueW(buf, file_desc_strW, (void**)&file_desc, &bytes) || !strstrW(file_desc, wineW); + + HeapFree(GetProcessHeap(), 0, buf); + return ret; +} + +static DWORD register_iexplore(BOOL doregister) +{ + HRESULT hres; + + if (check_native_ie()) { + WINE_MESSAGE("Native IE detected, not doing registration\n"); + return 0; + } + + hres = RegInstallA(NULL, doregister ? "RegisterIE" : "UnregisterIE", NULL); + return FAILED(hres); +} + +int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE prev, WCHAR *cmdline, int show) +{ + static const WCHAR regserverW[] = {'r','e','g','s','e','r','v','e','r',0}; + static const WCHAR unregserverW[] = {'u','n','r','e','g','s','e','r','v','e','r',0}; + + if(*cmdline == '-' || *cmdline == '/') { + if(!strcmpiW(cmdline+1, regserverW)) + return register_iexplore(TRUE); + if(!strcmpiW(cmdline+1, unregserverW)) + return register_iexplore(FALSE); + } + return IEWinMain(cmdline, show); } Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Sun Apr 21 13:53:35 2013 @@ -104,7 +104,7 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions",,0x00000012 ; FIXME - usetup doesn't handle extra paths -HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce","",0x00000000,"cmd /c md ""%programfiles%\Internet Explorer\"" && move %windir%\iexplore.exe ""%programfiles%\Internet Explorer\""" +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce","",0x00000000,"cmd /c md ""%programfiles%\Internet Explorer\"" && move %windir%\iexplore.exe ""%programfiles%\Internet Explorer\"" && ""%programfiles%\Internet Explorer\iexplore.exe"" /RegServer" ; Create .NET Framework InstallRoot key, reg_sz & full path ;HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce","InstallRoot.NET",0x00000000,"cmd /c reg add HKLM\SOFTWARE\Microsoft\.NETFramework /v InstallRoot /t REG_SZ /d %SystemRoot%\Microsoft.NET\Framework\" Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Apr 21 13:53:35 2013 @@ -212,7 +212,7 @@ reactos/base/applications/cmdutils/xcopy # Synced to Wine-1.3.37 reactos/base/applications/games/winmine # Forked at Wine-1_3_5 reactos/base/applications/extrac32 # Autosync -reactos/base/applications/iexplore # Autosync +reactos/base/applications/iexplore # Synced to Wine-1.5.26 reactos/base/applications/notepad # Forked at Wine-20041201 reactos/base/applications/reg # Autosync reactos/base/applications/regedit # Out of sync

1 0

[akhaldi] 58802: [SHDOCVW] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 21 Apr '13

21 Apr '13

Author: akhaldi Date: Sun Apr 21 13:50:00 2013 New Revision: 58802 URL: http://svn.reactos.org/svn/reactos?rev=58802&view=rev Log: [SHDOCVW] * Sync with Wine 1.5.26. Removed: trunk/reactos/dll/win32/shdocvw/De.rc trunk/reactos/dll/win32/shdocvw/En.rc trunk/reactos/dll/win32/shdocvw/Es.rc trunk/reactos/dll/win32/shdocvw/Fr.rc trunk/reactos/dll/win32/shdocvw/He.rc trunk/reactos/dll/win32/shdocvw/It.rc trunk/reactos/dll/win32/shdocvw/Ko.rc trunk/reactos/dll/win32/shdocvw/Lt.rc trunk/reactos/dll/win32/shdocvw/Nl.rc trunk/reactos/dll/win32/shdocvw/Pl.rc trunk/reactos/dll/win32/shdocvw/Pt.rc trunk/reactos/dll/win32/shdocvw/Ro.rc trunk/reactos/dll/win32/shdocvw/Si.rc trunk/reactos/dll/win32/shdocvw/Sr.rc trunk/reactos/dll/win32/shdocvw/Sv.rc trunk/reactos/dll/win32/shdocvw/Tr.rc trunk/reactos/dll/win32/shdocvw/Uk.rc trunk/reactos/dll/win32/shdocvw/classinfo.c trunk/reactos/dll/win32/shdocvw/client.c trunk/reactos/dll/win32/shdocvw/dochost.c trunk/reactos/dll/win32/shdocvw/events.c trunk/reactos/dll/win32/shdocvw/factory.c trunk/reactos/dll/win32/shdocvw/frame.c trunk/reactos/dll/win32/shdocvw/ie.c trunk/reactos/dll/win32/shdocvw/ietoolbar.bmp trunk/reactos/dll/win32/shdocvw/ietoolbar.svg trunk/reactos/dll/win32/shdocvw/iexplore.c trunk/reactos/dll/win32/shdocvw/intshcut.c trunk/reactos/dll/win32/shdocvw/navigate.c trunk/reactos/dll/win32/shdocvw/oleobject.c trunk/reactos/dll/win32/shdocvw/persist.c trunk/reactos/dll/win32/shdocvw/resource.h trunk/reactos/dll/win32/shdocvw/shdocvw.inf trunk/reactos/dll/win32/shdocvw/taskbarlist.c trunk/reactos/dll/win32/shdocvw/urlhist.c trunk/reactos/dll/win32/shdocvw/version.rc trunk/reactos/dll/win32/shdocvw/view.c trunk/reactos/dll/win32/shdocvw/webbrowser.c Modified: trunk/reactos/dll/win32/shdocvw/CMakeLists.txt trunk/reactos/dll/win32/shdocvw/shdocvw.h trunk/reactos/dll/win32/shdocvw/shdocvw.rc trunk/reactos/dll/win32/shdocvw/shdocvw.spec trunk/reactos/dll/win32/shdocvw/shdocvw_main.c trunk/reactos/dll/win32/shdocvw/shlinstobj.c trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/shdocvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/CMakeLis… Removed: trunk/reactos/dll/win32/shdocvw/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/De.rc?re… Removed: trunk/reactos/dll/win32/shdocvw/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/En.rc?re… Removed: trunk/reactos/dll/win32/shdocvw/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Es.rc?re… Removed: trunk/reactos/dll/win32/shdocvw/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Fr.rc?re… Removed: trunk/reactos/dll/win32/shdocvw/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/He.rc?re… Removed: trunk/reactos/dll/win32/shdocvw/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/It.rc?re… Removed: trunk/reactos/dll/win32/shdocvw/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Ko.rc?re… Removed: trunk/reactos/dll/win32/shdocvw/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Lt.rc?re… Removed: trunk/reactos/dll/win32/shdocvw/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Nl.rc?re… Removed: trunk/reactos/dll/win32/shdocvw/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Pl.rc?re… Removed: trunk/reactos/dll/win32/shdocvw/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Pt.rc?re… Removed: trunk/reactos/dll/win32/shdocvw/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Ro.rc?re… Removed: trunk/reactos/dll/win32/shdocvw/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Si.rc?re… Removed: trunk/reactos/dll/win32/shdocvw/Sr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Sr.rc?re… Removed: trunk/reactos/dll/win32/shdocvw/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Sv.rc?re… Removed: trunk/reactos/dll/win32/shdocvw/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Tr.rc?re… Removed: trunk/reactos/dll/win32/shdocvw/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Uk.rc?re… Removed: trunk/reactos/dll/win32/shdocvw/classinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/classinf… Removed: trunk/reactos/dll/win32/shdocvw/client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/client.c… Removed: trunk/reactos/dll/win32/shdocvw/dochost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/dochost.… Removed: trunk/reactos/dll/win32/shdocvw/events.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/events.c… Removed: trunk/reactos/dll/win32/shdocvw/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/factory.… Removed: trunk/reactos/dll/win32/shdocvw/frame.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/frame.c?… Removed: trunk/reactos/dll/win32/shdocvw/ie.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/ie.c?rev… Removed: trunk/reactos/dll/win32/shdocvw/ietoolbar.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/ietoolba… Removed: trunk/reactos/dll/win32/shdocvw/ietoolbar.svg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/ietoolba… Removed: trunk/reactos/dll/win32/shdocvw/iexplore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/iexplore… Removed: trunk/reactos/dll/win32/shdocvw/intshcut.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/intshcut… Removed: trunk/reactos/dll/win32/shdocvw/navigate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/navigate… Removed: trunk/reactos/dll/win32/shdocvw/oleobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/oleobjec… Removed: trunk/reactos/dll/win32/shdocvw/persist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/persist.… Removed: trunk/reactos/dll/win32/shdocvw/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/resource… Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… Removed: trunk/reactos/dll/win32/shdocvw/shdocvw.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… Modified: trunk/reactos/dll/win32/shdocvw/shdocvw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw_… Modified: trunk/reactos/dll/win32/shdocvw/shlinstobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shlinsto… Removed: trunk/reactos/dll/win32/shdocvw/taskbarlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/taskbarl… Removed: trunk/reactos/dll/win32/shdocvw/urlhist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/urlhist.… Removed: trunk/reactos/dll/win32/shdocvw/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/version.… Removed: trunk/reactos/dll/win32/shdocvw/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/view.c?r… Removed: trunk/reactos/dll/win32/shdocvw/webbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/webbrows… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[pschweitzer] 58801: [KMTESTS:FSRTL] Add more tests for FsRtlIs*InExpression() Tested on w2k3 by Thomas
by pschweitzer＠svn.reactos.org 21 Apr '13

21 Apr '13

Author: pschweitzer Date: Sun Apr 21 13:47:54 2013 New Revision: 58801 URL: http://svn.reactos.org/svn/reactos?rev=58801&view=rev Log: [KMTESTS:FSRTL] Add more tests for FsRtlIs*InExpression() Tested on w2k3 by Thomas Modified: trunk/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c Modified: trunk/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_fsrtl/FsRtlE… ============================================================================== --- trunk/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c [iso-8859-1] Sun Apr 21 13:47:54 2013 @@ -166,6 +166,44 @@ ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); RtlInitUnicodeString(&Name, L"F0_001.txt"); ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + + RtlInitUnicodeString(&Expression, L"F0_<\"*"); + RtlInitUnicodeString(&Name, L"."); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L".."); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L"SETUP.EXE"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L"f0_"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L"f0_"); + ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == TRUE, "expected TRUE, got FALSE\n"); + RtlInitUnicodeString(&Name, L"F0_"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); + RtlInitUnicodeString(&Name, L"f0_."); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L"f0_."); + ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == TRUE, "expected TRUE, got FALSE\n"); + RtlInitUnicodeString(&Name, L"F0_."); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); + RtlInitUnicodeString(&Name, L"F0_001"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); + RtlInitUnicodeString(&Name, L"F0_001"); + ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == TRUE, "expected TRUE, got FALSE\n"); + RtlInitUnicodeString(&Name, L"f0_001"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L"f0_001"); + ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == TRUE, "expected TRUE, got FALSE\n"); + RtlInitUnicodeString(&Name, L"F0_OO1."); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); + RtlInitUnicodeString(&Name, L"f0_001.txt"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitUnicodeString(&Name, L"f0_001.txt"); + ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == TRUE, "expected TRUE, got FALSE\n"); + RtlInitUnicodeString(&Name, L"F0_001.txt"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE\n"); + RtlInitUnicodeString(&Name, L"F0_001.txt"); + ok(FsRtlIsNameInExpression(&Expression, &Name, TRUE, NULL) == TRUE, "expected TRUE, got FALSE\n"); RtlInitUnicodeString(&Expression, L"*.TTF"); RtlInitUnicodeString(&Name, L"."); @@ -452,6 +490,32 @@ RtlInitAnsiString(&Name, "F0_001.txt"); ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitAnsiString(&Expression, "F0_<\"*"); + RtlInitAnsiString(&Name, "."); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitAnsiString(&Name, ".."); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitAnsiString(&Name, "SETUP.EXE"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitAnsiString(&Name, "f0_"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitAnsiString(&Name, "F0_"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); + RtlInitAnsiString(&Name, "f0_."); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitAnsiString(&Name, "F0_."); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); + RtlInitAnsiString(&Name, "F0_001"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); + RtlInitAnsiString(&Name, "f0_001"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitAnsiString(&Name, "F0_OO1."); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); + RtlInitAnsiString(&Name, "f0_001.txt"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n"); + RtlInitAnsiString(&Name, "F0_001.txt"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE\n"); + RtlInitAnsiString(&Expression, "*.TTF"); RtlInitAnsiString(&Name, "."); ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE\n");

1 0

[akhaldi] 58800: [EXPAND] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 21 Apr '13

21 Apr '13

Author: akhaldi Date: Sun Apr 21 12:33:33 2013 New Revision: 58800 URL: http://svn.reactos.org/svn/reactos?rev=58800&view=rev Log: [EXPAND] * Sync with Wine 1.5.26. Modified: trunk/reactos/base/system/expand/expand.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/system/expand/expand.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/expand.… ============================================================================== --- trunk/reactos/base/system/expand/expand.c [iso-8859-1] (original) +++ trunk/reactos/base/system/expand/expand.c [iso-8859-1] Sun Apr 21 12:33:33 2013 @@ -27,6 +27,21 @@ #include <stdio.h> #include <lzexpand.h> #include <setupapi.h> + +static int myprintf(const char* format, ...) +{ + va_list va; + char tmp[8192]; + DWORD w = 0; + int len; + + va_start(va, format); + len = vsnprintf(tmp, sizeof(tmp), format, va); + if (len > 0) + WriteFile(GetStdHandle(STD_ERROR_HANDLE), tmp, len, &w, NULL); + va_end(va); + return w; +} static UINT CALLBACK set_outfile( PVOID context, UINT notification, UINT_PTR param1, UINT_PTR param2 ) { @@ -85,9 +100,9 @@ if (argc < 3) { - fprintf( stderr, "Usage:\n" ); - fprintf( stderr, "\t%s infile outfile\n", argv[0] ); - fprintf( stderr, "\t%s /r infile\n", argv[0] ); + myprintf( "Usage:\n" ); + myprintf( "\t%s infile outfile\n", argv[0] ); + myprintf( "\t%s /r infile\n", argv[0] ); return 1; } @@ -98,7 +113,7 @@ if (!SetupGetFileCompressionInfoExA( infile, actual_name, sizeof(actual_name), NULL, NULL, NULL, &comp )) { - fprintf( stderr, "%s: can't open input file %s\n", argv[0], infile ); + myprintf( "%s: can't open input file %s\n", argv[0], infile ); return 1; } @@ -107,28 +122,22 @@ switch (comp) { case FILE_COMPRESSION_MSZIP: - { outfile_basename[0] = 0; if (!SetupIterateCabinetA( infile, 0, set_outfile, outfile_basename )) { - fprintf( stderr, "%s: can't determine original name\n", argv[0] ); + myprintf( "%s: can't determine original name\n", argv[0] ); return 1; } GetFullPathNameA( infile, sizeof(outfile), outfile, &basename_index ); *basename_index = 0; strcat( outfile, outfile_basename ); break; - } case FILE_COMPRESSION_WINLZA: - { GetExpandedNameA( infile, outfile_basename ); break; - } default: - { - fprintf( stderr, "%s: can't determine original\n", argv[0] ); + myprintf( "%s: can't determine original\n", argv[0] ); return 1; - } } } else @@ -136,21 +145,19 @@ if (!lstrcmpiA( infile, outfile )) { - fprintf( stderr, "%s: can't expand file to itself\n", argv[0] ); + myprintf( "%s: can't expand file to itself\n", argv[0] ); return 1; } switch (comp) { case FILE_COMPRESSION_MSZIP: - { if (!SetupIterateCabinetA( infile, 0, extract_callback, outfile )) { - fprintf( stderr, "%s: cabinet extraction failed\n", argv[0] ); + myprintf( "%s: cabinet extraction failed\n", argv[0] ); return 1; } break; - } case FILE_COMPRESSION_WINLZA: { INT hin, hout; @@ -159,13 +166,13 @@ if ((hin = LZOpenFileA( infile, &ofin, OF_READ )) < 0) { - fprintf( stderr, "%s: can't open input file %s\n", argv[0], infile ); + myprintf( "%s: can't open input file %s\n", argv[0], infile ); return 1; } if ((hout = LZOpenFileA( outfile, &ofout, OF_CREATE | OF_WRITE )) < 0) { LZClose( hin ); - fprintf( stderr, "%s: can't open output file %s\n", argv[0], outfile ); + myprintf( "%s: can't open output file %s\n", argv[0], outfile ); return 1; } error = LZCopy( hin, hout ); @@ -175,20 +182,18 @@ if (error < 0) { - fprintf( stderr, "%s: LZCopy failed, error is %ld\n", argv[0], error ); + myprintf( "%s: LZCopy failed, error is %d\n", argv[0], error ); return 1; } break; } default: - { if (!CopyFileA( infile, outfile, FALSE )) { - fprintf( stderr, "%s: CopyFileA failed\n", argv[0] ); + myprintf( "%s: CopyFileA failed\n", argv[0] ); return 1; } break; } - } return ret; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Apr 21 12:33:33 2013 @@ -219,7 +219,7 @@ reactos/base/applications/winhlp32 # Synced to Wine-1.5.26 reactos/base/applications/wordpad # Synced to Wine-1.5.26 reactos/base/services/rpcss # Synced to Wine-20081105 -reactos/base/system/expand # Autosync +reactos/base/system/expand # Synced to Wine-1.5.26 reactos/base/system/msiexec # Autosync reactos/modules/rosapps/winfile # Autosync

1 0

[akhaldi] 58799: [WORDPAD] * Sync with Wine 1.5.26.
by akhaldi＠svn.reactos.org 21 Apr '13

21 Apr '13

Author: akhaldi Date: Sun Apr 21 12:29:02 2013 New Revision: 58799 URL: http://svn.reactos.org/svn/reactos?rev=58799&view=rev Log: [WORDPAD] * Sync with Wine 1.5.26. Modified: trunk/reactos/base/applications/wordpad/print.c trunk/reactos/base/applications/wordpad/wordpad.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/applications/wordpad/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] Sun Apr 21 12:29:02 2013 @@ -144,7 +144,7 @@ rb.cxIdeal = 100; rb.wID = id; - SendMessageW(hRebarWnd, RB_INSERTBAND, -1, (LPARAM)&rb); + SendMessageW(hRebarWnd, RB_INSERTBANDW, -1, (LPARAM)&rb); } static HDC make_dc(void) @@ -626,7 +626,7 @@ rb.cxIdeal = 100; rb.wID = BANDID_PREVIEW_BUFFER; - SendMessageW(hReBar, RB_INSERTBAND, -1, (LPARAM)&rb); + SendMessageW(hReBar, RB_INSERTBANDW, -1, (LPARAM)&rb); } else { for(i = 0; i <= PREVIEW_BUTTONS; i++) Modified: trunk/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] Sun Apr 21 12:29:02 2013 @@ -580,10 +580,10 @@ SendMessageW(hEditorWnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&fmt); lstrcpyW(cf.lpLogFont->lfFaceName, fmt.szFaceName); - cf.lpLogFont->lfItalic = (fmt.dwEffects & CFE_ITALIC) ? TRUE : FALSE; + cf.lpLogFont->lfItalic = (fmt.dwEffects & CFE_ITALIC) != 0; cf.lpLogFont->lfWeight = (fmt.dwEffects & CFE_BOLD) ? FW_BOLD : FW_NORMAL; - cf.lpLogFont->lfUnderline = (fmt.dwEffects & CFE_UNDERLINE) ? TRUE : FALSE; - cf.lpLogFont->lfStrikeOut = (fmt.dwEffects & CFE_STRIKEOUT) ? TRUE : FALSE; + cf.lpLogFont->lfUnderline = (fmt.dwEffects & CFE_UNDERLINE) != 0; + cf.lpLogFont->lfStrikeOut = (fmt.dwEffects & CFE_STRIKEOUT) != 0; cf.lpLogFont->lfHeight = -MulDiv(fmt.yHeight / 20, GetDeviceCaps(hDC, LOGPIXELSY), 72); cf.rgbColors = fmt.crTextColor; @@ -598,9 +598,9 @@ fmt.dwEffects |= CFE_BOLD; if(cf.nFontType & ITALIC_FONTTYPE) fmt.dwEffects |= CFE_ITALIC; - if(cf.lpLogFont->lfUnderline == TRUE) + if(cf.lpLogFont->lfUnderline) fmt.dwEffects |= CFE_UNDERLINE; - if(cf.lpLogFont->lfStrikeOut == TRUE) + if(cf.lpLogFont->lfStrikeOut) fmt.dwEffects |= CFE_STRIKEOUT; fmt.crTextColor = cf.rgbColors; @@ -683,14 +683,14 @@ rbbinfo.cbSize = REBARBANDINFOW_V6_SIZE; rbbinfo.fMask = RBBIM_STYLE; - SendMessageW(hwndReBar, RB_GETBANDINFO, index, (LPARAM)&rbbinfo); + SendMessageW(hwndReBar, RB_GETBANDINFOW, index, (LPARAM)&rbbinfo); if(!show) rbbinfo.fStyle &= ~RBBS_BREAK; else rbbinfo.fStyle |= RBBS_BREAK; - SendMessageW(hwndReBar, RB_SETBANDINFO, index, (LPARAM)&rbbinfo); + SendMessageW(hwndReBar, RB_SETBANDINFOW, index, (LPARAM)&rbbinfo); } if(bandId == BANDID_TOOLBAR || bandId == BANDID_FORMATBAR || bandId == BANDID_RULER) @@ -832,7 +832,7 @@ MessageBoxW(hMainWnd, Message, wszAppTitle, MB_ICONEXCLAMATION | MB_OK); } -static void DoSaveFile(LPCWSTR wszSaveFileName, WPARAM format) +static BOOL DoSaveFile(LPCWSTR wszSaveFileName, WPARAM format) { HANDLE hFile; EDITSTREAM stream; @@ -844,7 +844,7 @@ if(hFile == INVALID_HANDLE_VALUE) { ShowWriteError(GetLastError()); - return; + return FALSE; } if(format == (SF_TEXT | SF_UNICODE)) @@ -856,7 +856,7 @@ if(writeOut != sizeof(unicode)) { CloseHandle(hFile); - return; + return FALSE; } } @@ -876,16 +876,18 @@ gt.codepage = 1200; if(SendMessageW(hEditorWnd, EM_GETTEXTLENGTHEX, (WPARAM)&gt, 0)) - return; + return FALSE; } lstrcpyW(wszFileName, wszSaveFileName); set_caption(wszFileName); SendMessageW(hEditorWnd, EM_SETMODIFY, FALSE, 0); set_fileformat(format); -} - -static void DialogSaveFile(void) + + return TRUE; +} + +static BOOL DialogSaveFile(void) { OPENFILENAMEW sfn; @@ -909,19 +911,11 @@ { if(MessageBoxWithResStringW(hMainWnd, MAKEINTRESOURCEW(STRING_SAVE_LOSEFORMATTING), wszAppTitle, MB_YESNO | MB_ICONEXCLAMATION) != IDYES) - { continue; - } else - { - DoSaveFile(sfn.lpstrFile, fileformat_flags(sfn.nFilterIndex-1)); - break; - } - } else - { - DoSaveFile(sfn.lpstrFile, fileformat_flags(sfn.nFilterIndex-1)); - break; - } - } + } + return DoSaveFile(sfn.lpstrFile, fileformat_flags(sfn.nFilterIndex-1)); + } + return FALSE; } static BOOL prompt_save_changes(void) @@ -968,10 +962,8 @@ case IDYES: if(wszFileName[0]) - DoSaveFile(wszFileName, fileFormat); - else - DialogSaveFile(); - return TRUE; + return DoSaveFile(wszFileName, fileFormat); + return DialogSaveFile(); default: return FALSE; @@ -1248,7 +1240,7 @@ flags = FR_DOWN | (pFr->Flags & (FR_MATCHCASE | FR_WHOLEWORD)); ft.lpstrText = pFr->lpstrFindWhat; - /* Only replace existing selectino if it is an exact match. */ + /* Only replace the existing selection if it is an exact match. */ if (sel.cpMin != sel.cpMax && (pFr->Flags & FR_REPLACE || pFr->Flags & FR_REPLACEALL)) { @@ -1393,15 +1385,15 @@ HWND hCombo, hList; int idx, result; - hCombo = (HWND)SendMessage(hComboEx, CBEM_GETCOMBOCONTROL, 0, 0); + hCombo = (HWND)SendMessageW(hComboEx, CBEM_GETCOMBOCONTROL, 0, 0); if (!hCombo) return FALSE; cbInfo.cbSize = sizeof(COMBOBOXINFO); - result = SendMessage(hCombo, CB_GETCOMBOBOXINFO, 0, (LPARAM)&cbInfo); + result = SendMessageW(hCombo, CB_GETCOMBOBOXINFO, 0, (LPARAM)&cbInfo); if (!result) return FALSE; hList = cbInfo.hwndList; - idx = SendMessage(hList, LB_GETCURSEL, 0, 0); + idx = SendMessageW(hList, LB_GETCURSEL, 0, 0); if (idx < 0) return FALSE; @@ -1706,7 +1698,7 @@ if(SendMessageW(hTabWnd, CB_FINDSTRINGEXACT, -1, (LPARAM)&buffer) == CB_ERR) { float number = 0; - int item_count = SendMessage(hTabWnd, CB_GETCOUNT, 0, 0); + int item_count = SendMessageW(hTabWnd, CB_GETCOUNT, 0, 0); if(!number_from_string(buffer, &number, &unit)) { @@ -1853,7 +1845,7 @@ rbb.cyChild = rbb.cyMinChild = HIWORD(SendMessageW(hToolBarWnd, TB_GETBUTTONSIZE, 0, 0)); rbb.wID = BANDID_TOOLBAR; - SendMessageW(hReBarWnd, RB_INSERTBAND, -1, (LPARAM)&rbb); + SendMessageW(hReBarWnd, RB_INSERTBANDW, -1, (LPARAM)&rbb); hFontListWnd = CreateWindowExW(0, WC_COMBOBOXEXW, NULL, WS_BORDER | WS_VISIBLE | WS_CHILD | CBS_DROPDOWN | CBS_SORT, @@ -1863,7 +1855,7 @@ rbb.cx = 200; rbb.wID = BANDID_FONTLIST; - SendMessageW(hReBarWnd, RB_INSERTBAND, -1, (LPARAM)&rbb); + SendMessageW(hReBarWnd, RB_INSERTBANDW, -1, (LPARAM)&rbb); hSizeListWnd = CreateWindowExW(0, WC_COMBOBOXEXW, NULL, WS_BORDER | WS_VISIBLE | WS_CHILD | CBS_DROPDOWN, @@ -1874,7 +1866,7 @@ rbb.fStyle ^= RBBS_BREAK; rbb.wID = BANDID_SIZELIST; - SendMessageW(hReBarWnd, RB_INSERTBAND, -1, (LPARAM)&rbb); + SendMessageW(hReBarWnd, RB_INSERTBANDW, -1, (LPARAM)&rbb); hFormatBarWnd = CreateToolbarEx(hReBarWnd, CCS_NOPARENTALIGN | CCS_NOMOVEY | WS_VISIBLE | TBSTYLE_TOOLTIPS | BTNS_BUTTON, @@ -1896,7 +1888,7 @@ rbb.hwndChild = hFormatBarWnd; rbb.wID = BANDID_FORMATBAR; - SendMessageW(hReBarWnd, RB_INSERTBAND, -1, (LPARAM)&rbb); + SendMessageW(hReBarWnd, RB_INSERTBANDW, -1, (LPARAM)&rbb); hRulerWnd = CreateWindowExW(0, WC_STATICW, NULL, WS_VISIBLE | WS_CHILD, 0, 0, 200, 10, hReBarWnd, (HMENU)IDC_RULER, hInstance, NULL); @@ -1906,7 +1898,7 @@ rbb.wID = BANDID_RULER; rbb.fStyle |= RBBS_BREAK; - SendMessageW(hReBarWnd, RB_INSERTBAND, -1, (LPARAM)&rbb); + SendMessageW(hReBarWnd, RB_INSERTBANDW, -1, (LPARAM)&rbb); hDLL = LoadLibraryW(wszRichEditDll); if(!hDLL) @@ -2013,13 +2005,13 @@ { if (pHdr->code == CBEN_ENDEDITW) { - NMCBEENDEDIT *endEdit = (NMCBEENDEDIT *)lParam; + NMCBEENDEDITW *endEdit = (NMCBEENDEDITW *)lParam; if(pHdr->hwndFrom == hwndFontList) { - on_fontlist_modified((LPWSTR)endEdit->szText); + on_fontlist_modified(endEdit->szText); } else if (pHdr->hwndFrom == hwndSizeList) { - on_sizelist_modified(hwndFontList,(LPWSTR)endEdit->szText); + on_sizelist_modified(hwndFontList,endEdit->szText); } } return 0; @@ -2037,9 +2029,9 @@ sprintf( buf,"selection = %d..%d, line count=%ld", pSC->chrg.cpMin, pSC->chrg.cpMax, - SendMessage(hwndEditor, EM_GETLINECOUNT, 0, 0)); + SendMessageW(hwndEditor, EM_GETLINECOUNT, 0, 0)); SetWindowTextA(GetDlgItem(hWnd, IDC_STATUSBAR), buf); - SendMessage(hWnd, WM_USER, 0, 0); + SendMessageW(hWnd, WM_USER, 0, 0); return 1; } return 0; @@ -2072,8 +2064,7 @@ case ID_FILE_NEW: { HINSTANCE hInstance = GetModuleHandleW(0); - int ret = DialogBox(hInstance, MAKEINTRESOURCE(IDD_NEWFILE), hWnd, - newfile_proc); + int ret = DialogBoxW(hInstance, MAKEINTRESOURCEW(IDD_NEWFILE), hWnd, newfile_proc); if(ret != ID_NEWFILE_ABORT) { @@ -2213,9 +2204,9 @@ RECT itemrc; POINT pt; int mid; - int itemidx = SendMessage(hFormatBarWnd, TB_COMMANDTOINDEX, ID_FORMAT_COLOR, 0); - - SendMessage(hFormatBarWnd, TB_GETITEMRECT, itemidx, (LPARAM)&itemrc); + int itemidx = SendMessageW(hFormatBarWnd, TB_COMMANDTOINDEX, ID_FORMAT_COLOR, 0); + + SendMessageW(hFormatBarWnd, TB_GETITEMRECT, itemidx, (LPARAM)&itemrc); pt.x = itemrc.left; pt.y = itemrc.bottom; ClientToScreen(hFormatBarWnd, &pt); @@ -2283,7 +2274,7 @@ tr.chrg.cpMin = 0; tr.chrg.cpMax = nLen; tr.lpstrText = data; - SendMessage (hwndEditor, EM_GETTEXTRANGE, 0, (LPARAM)&tr); + SendMessageW(hwndEditor, EM_GETTEXTRANGE, 0, (LPARAM)&tr); MessageBoxW(NULL, data, wszAppTitle, MB_OK); HeapFree( GetProcessHeap(), 0, data ); @@ -2319,9 +2310,9 @@ char buf[128]; WCHAR *data = NULL; - SendMessage(hwndEditor, EM_EXGETSEL, 0, (LPARAM)&range); + SendMessageW(hwndEditor, EM_EXGETSEL, 0, (LPARAM)&range); data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data) * (range.cpMax-range.cpMin+1)); - SendMessage(hwndEditor, EM_GETSELTEXT, 0, (LPARAM)data); + SendMessageW(hwndEditor, EM_GETSELTEXT, 0, (LPARAM)data); sprintf(buf, "Start = %d, End = %d", range.cpMin, range.cpMax); MessageBoxA(hWnd, buf, "Editor", MB_OK); MessageBoxW(hWnd, data, wszAppTitle, MB_OK); @@ -2332,7 +2323,7 @@ case ID_EDIT_READONLY: { - LONG nStyle = GetWindowLong(hwndEditor, GWL_STYLE); + LONG nStyle = GetWindowLongW(hwndEditor, GWL_STYLE); if (nStyle & ES_READONLY) SendMessageW(hwndEditor, EM_SETREADONLY, 0, 0); else @@ -2492,9 +2483,9 @@ pf.cbSize = sizeof(PARAFORMAT); SendMessageW(hwndEditor, EM_GETPARAFORMAT, 0, (LPARAM)&pf); CheckMenuItem(hMenu, ID_EDIT_READONLY, - MF_BYCOMMAND|(GetWindowLong(hwndEditor, GWL_STYLE)&ES_READONLY ? MF_CHECKED : MF_UNCHECKED)); + MF_BYCOMMAND|(GetWindowLongW(hwndEditor, GWL_STYLE)&ES_READONLY ? MF_CHECKED : MF_UNCHECKED)); CheckMenuItem(hMenu, ID_EDIT_MODIFIED, - MF_BYCOMMAND|(SendMessage(hwndEditor, EM_GETMODIFY, 0, 0) ? MF_CHECKED : MF_UNCHECKED)); + MF_BYCOMMAND|(SendMessageW(hwndEditor, EM_GETMODIFY, 0, 0) ? MF_CHECKED : MF_UNCHECKED)); if (pf.dwMask & PFM_ALIGNMENT) nAlignment = pf.wAlignment; CheckMenuItem(hMenu, ID_ALIGN_LEFT, MF_BYCOMMAND|(nAlignment == PFA_LEFT) ? @@ -2680,7 +2671,7 @@ wc.hIcon = LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_WORDPAD)); wc.hIconSm = LoadImageW(hInstance, MAKEINTRESOURCEW(IDI_WORDPAD), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED); - wc.hCursor = LoadCursor(NULL, IDC_IBEAM); + wc.hCursor = LoadCursorW(NULL, (LPWSTR)IDC_IBEAM); wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); wc.lpszMenuName = MAKEINTRESOURCEW(IDM_MAINMENU); wc.lpszClassName = wszMainWndClass; @@ -2693,7 +2684,7 @@ wc.hInstance = hInstance; wc.hIcon = NULL; wc.hIconSm = NULL; - wc.hCursor = LoadCursor(NULL, IDC_IBEAM); + wc.hCursor = LoadCursorW(NULL, (LPWSTR)IDC_IBEAM); wc.hbrBackground = NULL; wc.lpszMenuName = NULL; wc.lpszClassName = wszPreviewWndClass; @@ -2724,7 +2715,7 @@ while(GetMessageW(&msg,0,0,0)) { - if (IsDialogMessage(hFindWnd, &msg)) + if (IsDialogMessageW(hFindWnd, &msg)) continue; if (TranslateAcceleratorW(hMainWnd, hAccel, &msg)) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Apr 21 12:29:02 2013 @@ -217,7 +217,7 @@ reactos/base/applications/reg # Autosync reactos/base/applications/regedit # Out of sync reactos/base/applications/winhlp32 # Synced to Wine-1.5.26 -reactos/base/applications/wordpad # Autosync +reactos/base/applications/wordpad # Synced to Wine-1.5.26 reactos/base/services/rpcss # Synced to Wine-20081105 reactos/base/system/expand # Autosync reactos/base/system/msiexec # Autosync

1 0

[gadamopoulos] 58798: [desk.cpl] - Add a missing error check
by gadamopoulos＠svn.reactos.org 21 Apr '13

21 Apr '13

Author: gadamopoulos Date: Sun Apr 21 12:21:21 2013 New Revision: 58798 URL: http://svn.reactos.org/svn/reactos?rev=58798&view=rev Log: [desk.cpl] - Add a missing error check Modified: trunk/reactos/dll/cpl/desk/background.c Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/background.c [iso-8859-1] Sun Apr 21 12:21:21 2013 @@ -123,60 +123,62 @@ pData->listViewItemCount++; /* Add current wallpaper if any */ - RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, KEY_ALL_ACCESS, &regKey); - - result = RegQueryValueEx(regKey, TEXT("Wallpaper"), 0, &varType, (LPBYTE)wallpaperFilename, &bufferSize); - if ((result == ERROR_SUCCESS) && (_tcslen(wallpaperFilename) > 0)) - { - /* Allow environment variables in file name */ - if (ExpandEnvironmentStrings(wallpaperFilename, buffer, MAX_PATH)) + result = RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, KEY_ALL_ACCESS, &regKey); + if (result == ERROR_SUCCESS) + { + result = RegQueryValueEx(regKey, TEXT("Wallpaper"), 0, &varType, (LPBYTE)wallpaperFilename, &bufferSize); + if ((result == ERROR_SUCCESS) && (_tcslen(wallpaperFilename) > 0)) { - _tcscpy(wallpaperFilename, buffer); + /* Allow environment variables in file name */ + if (ExpandEnvironmentStrings(wallpaperFilename, buffer, MAX_PATH)) + { + _tcscpy(wallpaperFilename, buffer); + } + + himl = (HIMAGELIST)SHGetFileInfo(wallpaperFilename, + 0, + &sfi, + sizeof(sfi), + SHGFI_SYSICONINDEX | SHGFI_SMALLICON | + SHGFI_DISPLAYNAME); + + if (himl != NULL) + { + if (i++ == 0) + { + (void)ListView_SetImageList(hwndBackgroundList, himl, LVSIL_SMALL); + } + + backgroundItem = &pData->backgroundItems[pData->listViewItemCount]; + + backgroundItem->bWallpaper = TRUE; + + _tcscpy(backgroundItem->szDisplayName, sfi.szDisplayName); + p = _tcsrchr(backgroundItem->szDisplayName, _T('.')); + if (p) + *p = (TCHAR)0; + _tcscpy(backgroundItem->szFilename, wallpaperFilename); + + ZeroMemory(&listItem, sizeof(LV_ITEM)); + listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; + listItem.state = 0; + listItem.pszText = backgroundItem->szDisplayName; + listItem.iImage = sfi.iIcon; + listItem.iItem = pData->listViewItemCount; + listItem.lParam = pData->listViewItemCount; + + (void)ListView_InsertItem(hwndBackgroundList, &listItem); + ListView_SetItemState(hwndBackgroundList, + pData->listViewItemCount, + LVIS_SELECTED, + LVIS_SELECTED); + + pData->listViewItemCount++; + } } - himl = (HIMAGELIST)SHGetFileInfo(wallpaperFilename, - 0, - &sfi, - sizeof(sfi), - SHGFI_SYSICONINDEX | SHGFI_SMALLICON | - SHGFI_DISPLAYNAME); - - if (himl != NULL) - { - if (i++ == 0) - { - (void)ListView_SetImageList(hwndBackgroundList, himl, LVSIL_SMALL); - } - - backgroundItem = &pData->backgroundItems[pData->listViewItemCount]; - - backgroundItem->bWallpaper = TRUE; - - _tcscpy(backgroundItem->szDisplayName, sfi.szDisplayName); - p = _tcsrchr(backgroundItem->szDisplayName, _T('.')); - if (p) - *p = (TCHAR)0; - _tcscpy(backgroundItem->szFilename, wallpaperFilename); - - ZeroMemory(&listItem, sizeof(LV_ITEM)); - listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; - listItem.state = 0; - listItem.pszText = backgroundItem->szDisplayName; - listItem.iImage = sfi.iIcon; - listItem.iItem = pData->listViewItemCount; - listItem.lParam = pData->listViewItemCount; - - (void)ListView_InsertItem(hwndBackgroundList, &listItem); - ListView_SetItemState(hwndBackgroundList, - pData->listViewItemCount, - LVIS_SELECTED, - LVIS_SELECTED); - - pData->listViewItemCount++; - } - } - - RegCloseKey(regKey); + RegCloseKey(regKey); + } /* Add all the images in the C:\ReactOS directory. */

1 0

[gadamopoulos] 58797: [desk.cpl] - Formatting: Convert tabs to spaces - No code changes
by gadamopoulos＠svn.reactos.org 21 Apr '13

21 Apr '13

Author: gadamopoulos Date: Sun Apr 21 12:00:37 2013 New Revision: 58797 URL: http://svn.reactos.org/svn/reactos?rev=58797&view=rev Log: [desk.cpl] - Formatting: Convert tabs to spaces - No code changes Modified: trunk/reactos/dll/cpl/desk/advappdlg.c trunk/reactos/dll/cpl/desk/appearance.c trunk/reactos/dll/cpl/desk/appearance.h trunk/reactos/dll/cpl/desk/classinst.c trunk/reactos/dll/cpl/desk/desk.c trunk/reactos/dll/cpl/desk/desk.h trunk/reactos/dll/cpl/desk/draw.c trunk/reactos/dll/cpl/desk/effappdlg.c trunk/reactos/dll/cpl/desk/general.c trunk/reactos/dll/cpl/desk/resource.h trunk/reactos/dll/cpl/desk/settings.c trunk/reactos/dll/cpl/desk/theme.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/cpl/desk/advappdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advappdlg.c?r… Modified: trunk/reactos/dll/cpl/desk/appearance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.c?… Modified: trunk/reactos/dll/cpl/desk/appearance.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.h?… Modified: trunk/reactos/dll/cpl/desk/classinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/classinst.c?r… Modified: trunk/reactos/dll/cpl/desk/desk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.c?rev=58… Modified: trunk/reactos/dll/cpl/desk/desk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.h?rev=58… Modified: trunk/reactos/dll/cpl/desk/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/draw.c?rev=58… Modified: trunk/reactos/dll/cpl/desk/effappdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/effappdlg.c?r… Modified: trunk/reactos/dll/cpl/desk/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/general.c?rev… Modified: trunk/reactos/dll/cpl/desk/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resource.h?re… Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re… Modified: trunk/reactos/dll/cpl/desk/theme.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/theme.c?rev=5…

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
27
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2013