Ros-diffs February 2005

ros-diffs@reactos.org

23 participants
411 discussions

[weiden] 13596: Forward to user32 when appropriate in shlwapi and removed dependencies to libunicode

by weiden＠svn.reactos.com

Forward to user32 when appropriate in shlwapi and removed dependencies to libunicode Modified: trunk/reactos/Makefile Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/include/wine/unicode.h Modified: trunk/reactos/lib/comdlg32/Makefile.ros-template Modified: trunk/reactos/lib/msi/Makefile.ros-template Modified: trunk/reactos/lib/oleaut32/Makefile.ros-template Modified: trunk/reactos/lib/riched20/Makefile.ros-template Modified: trunk/reactos/lib/setupapi/Makefile.ros-template Modified: trunk/reactos/lib/shlwapi/Makefile.ros-template Modified: trunk/reactos/lib/shlwapi/ordinal.c Modified: trunk/reactos/lib/shlwapi/shlwapi.spec Modified: trunk/reactos/lib/winspool/Makefile _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-02-16 15:44:34 UTC (rev 13595) +++ trunk/reactos/Makefile 2005-02-16 16:44:54 UTC (rev 13596) @@ -41,6 +41,9 @@ # vfatlib LIB_FSLIB = vfatlib +# libunicode, must be empty! +LIBUNICODE = + # Static libraries LIB_STATIC = string rosrtl epsapi uuid libwine zlib rtl tgetopt pseh adns dxguid strmiids crt rossym wdmguid @@ -59,7 +62,7 @@ gdi32 gdiplus glu32 hid imagehlp imm32 iphlpapi kernel32 lzexpand mesa32 midimap mmdrv mpr msacm msafd \ msgina msi msimg32 msvcrt20 msvideo mswsock netapi32 ntdll ole32 oleaut32 oledlg olepro32 opengl32 \ packet psapi riched20 richedit rpcrt4 samlib secur32 setupapi shell32 shlwapi smdll snmpapi syssetup \ - twain unicode user32 userenv version wininet winmm winspool ws2help ws2_32 wsock32 wshirda dnsapi \ + twain user32 userenv version wininet winmm winspool ws2help ws2_32 wsock32 wshirda dnsapi \ urlmon shdocvw dinput dinput8 dxdiagn devenum dsound $(DLLS_KBD) $(DLLS_CPL) $(DLLS_SHELLEXT) SUBSYS = smss win32k csrss ntvdm _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-02-16 15:44:34 UTC (rev 13595) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-02-16 16:44:54 UTC (rev 13596) @@ -74,6 +74,7 @@ lib\dinput8\dinput8.dll 1 lib\dsound\dsound.dll 1 lib\dxdiagn\dxdiagn.dll 1 +lib\expat\expat.dll 1 lib\fmifs\fmifs.dll 1 lib\freetype\freetype.dll 1 lib\gdi32\gdi32.dll 1 @@ -119,7 +120,6 @@ lib\syssetup\syssetup.dll 1 lib\twain\twain_32.dll 1 lib\urlmon\urlmon.dll 1 -lib\unicode\wine_unicode.dll 1 lib\user32\user32.dll 1 lib\userenv\userenv.dll 1 lib\version\version.dll 1 _____ Modified: trunk/reactos/include/wine/unicode.h --- trunk/reactos/include/wine/unicode.h 2005-02-16 15:44:34 UTC (rev 13595) +++ trunk/reactos/include/wine/unicode.h 2005-02-16 16:44:54 UTC (rev 13596) @@ -7,41 +7,6 @@ #include <winbase.h> #include <winnls.h> -/* code page info common to SBCS and DBCS */ -struct cp_info -{ - unsigned int codepage; /* codepage id */ - unsigned int char_size; /* char size (1 or 2 bytes) */ - wchar_t def_char; /* default char value (can be double-byte) */ - wchar_t def_unicode_char; /* default Unicode char value */ - const char *name; /* code page name */ -}; - -struct sbcs_table -{ - struct cp_info info; - const wchar_t *cp2uni; /* code page -> Unicode map */ - const unsigned char *uni2cp_low; /* Unicode -> code page map */ - const unsigned short *uni2cp_high; -}; - -struct dbcs_table -{ - struct cp_info info; - const wchar_t *cp2uni; /* code page -> Unicode map */ - const unsigned char *cp2uni_leadbytes; - const unsigned short *uni2cp_low; /* Unicode -> code page map */ - const unsigned short *uni2cp_high; - unsigned char lead_bytes[12]; /* lead bytes ranges */ -}; - -union cptable -{ - struct cp_info info; - struct sbcs_table sbcs; - struct dbcs_table dbcs; -}; - #define strlenW(s) wcslen((const wchar_t *)(s)) #define strcpyW(d,s) wcscpy((wchar_t *)(d),(const wchar_t *)(s)) #define strcatW(d,s) wcscat((wchar_t *)(d),(const wchar_t *)(s)) @@ -54,6 +19,7 @@ #define strcmpW(s1,s2) wcscmp((const wchar_t *)(s1),(const wchar_t *)(s2)) #define strcmpiW(s1,s2) _wcsicmp((const wchar_t *)(s1),(const wchar_t *)(s2)) #define strncmpiW(s1,s2,n) _wcsnicmp((const wchar_t *)(s1),(const wchar_t *)(s2),(n)) +#define strtoulW(s1,s2,b) wcstoul((const wchar_t *)(s1),(wchar_t **)(s2),(b)) #define tolowerW(n) towlower((n)) #define toupperW(n) towupper((n)) #define islowerW(n) iswlower((n)) @@ -67,21 +33,14 @@ #define atolW(s) _wtol((const wchar_t *)(s)) #define strlwrW(s) _wcslwr((wchar_t *)(s)) #define struprW(s) _wcsupr((wchar_t *)(s)) -#define sprintfW wsprintfW +#define sprintfW swprintf #define snprintfW _snwprintf +#define vsnprintfW vsnwprintf #ifndef WINE_UNICODE_API #define WINE_UNICODE_API __attribute__((dllimport)) #endif -/* the character type contains the C1_* flags in the low 12 bits */ -/* and the C2_* type in the high 4 bits */ -static inline unsigned short get_char_typeW( wchar_t ch ) -{ - extern WINE_UNICODE_API const unsigned short wine_wctype_table[]; - return wine_wctype_table[wine_wctype_table[ch >> 8] + (ch & 0xff)]; -} - static inline WCHAR *strpbrkW( const WCHAR *str, const WCHAR *accept ) { for ( ; *str; str++) if (strchrW( accept, *str )) return (WCHAR *)str; _____ Modified: trunk/reactos/lib/comdlg32/Makefile.ros-template --- trunk/reactos/lib/comdlg32/Makefile.ros-template 2005-02-16 15:44:34 UTC (rev 13595) +++ trunk/reactos/lib/comdlg32/Makefile.ros-template 2005-02-16 16:44:54 UTC (rev 13596) @@ -5,7 +5,7 @@ TARGET_CFLAGS = -D__REACTOS__ @EXTRADEFS@ -TARGET_SDKLIBS = @IMPORTS@ wine.a wine_unicode.a wine_uuid.a ntdll.a winspool.a +TARGET_SDKLIBS = @IMPORTS@ wine.a wine_uuid.a ntdll.a winspool.a TARGET_BASE = $(TARGET_BASE_LIB_COMDLG32) _____ Modified: trunk/reactos/lib/msi/Makefile.ros-template --- trunk/reactos/lib/msi/Makefile.ros-template 2005-02-16 15:44:34 UTC (rev 13595) +++ trunk/reactos/lib/msi/Makefile.ros-template 2005-02-16 16:44:54 UTC (rev 13596) @@ -6,7 +6,7 @@ TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ -TARGET_SDKLIBS = @IMPORTS@ winmm.a wine.a wine_uuid.a wine_unicode.a ntdll.a +TARGET_SDKLIBS = @IMPORTS@ winmm.a wine.a wine_uuid.a ntdll.a TARGET_BASE = $(TARGET_BASE_LIB_WINMM) _____ Modified: trunk/reactos/lib/oleaut32/Makefile.ros-template --- trunk/reactos/lib/oleaut32/Makefile.ros-template 2005-02-16 15:44:34 UTC (rev 13595) +++ trunk/reactos/lib/oleaut32/Makefile.ros-template 2005-02-16 16:44:54 UTC (rev 13596) @@ -6,7 +6,7 @@ TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ -TARGET_SDKLIBS = @IMPORTS@ winmm.a wine.a wine_uuid.a wine_unicode.a ntdll.a +TARGET_SDKLIBS = @IMPORTS@ winmm.a wine.a wine_uuid.a ntdll.a TARGET_BASE = $(TARGET_BASE_LIB_OLEAUT32) _____ Modified: trunk/reactos/lib/riched20/Makefile.ros-template --- trunk/reactos/lib/riched20/Makefile.ros-template 2005-02-16 15:44:34 UTC (rev 13595) +++ trunk/reactos/lib/riched20/Makefile.ros-template 2005-02-16 16:44:54 UTC (rev 13596) @@ -6,7 +6,7 @@ TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ -D__WINESRC__ -TARGET_SDKLIBS = @IMPORTS@ wine.a ntdll.a wine_unicode.a +TARGET_SDKLIBS = @IMPORTS@ wine.a ntdll.a TARGET_BASE = $(TARGET_BASE_LIB_SETUPAPI) _____ Modified: trunk/reactos/lib/setupapi/Makefile.ros-template --- trunk/reactos/lib/setupapi/Makefile.ros-template 2005-02-16 15:44:34 UTC (rev 13595) +++ trunk/reactos/lib/setupapi/Makefile.ros-template 2005-02-16 16:44:54 UTC (rev 13596) @@ -1,21 +1,21 @@ -# $Id: Makefile.ros-template 12852 2005-01-06 13:58:04Z mf $ - -TARGET_NAME = setupapi - -TARGET_OBJECTS = @C_SRCS@ - -TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ -D__WINESRC__ - -TARGET_SDKLIBS = @IMPORTS@ wine.a ntdll.a wine_unicode.a - -TARGET_BASE = $(TARGET_BASE_LIB_SETUPAPI) - -TARGET_RC_SRCS = @RC_SRCS@ -TARGET_RC_BINSRC = @RC_BINSRC@ -TARGET_RC_BINARIES = @RC_BINARIES@ - -default: all - -DEP_OBJECTS = $(TARGET_OBJECTS) - -include $(TOOLS_PATH)/depend.mk +# $Id: Makefile.ros-template 12852 2005-01-06 13:58:04Z mf $ + +TARGET_NAME = setupapi + +TARGET_OBJECTS = @C_SRCS@ + +TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ -D__WINESRC__ + +TARGET_SDKLIBS = @IMPORTS@ wine.a ntdll.a + +TARGET_BASE = $(TARGET_BASE_LIB_SETUPAPI) + +TARGET_RC_SRCS = @RC_SRCS@ +TARGET_RC_BINSRC = @RC_BINSRC@ +TARGET_RC_BINARIES = @RC_BINARIES@ + +default: all + +DEP_OBJECTS = $(TARGET_OBJECTS) + +include $(TOOLS_PATH)/depend.mk _____ Modified: trunk/reactos/lib/shlwapi/Makefile.ros-template --- trunk/reactos/lib/shlwapi/Makefile.ros-template 2005-02-16 15:44:34 UTC (rev 13595) +++ trunk/reactos/lib/shlwapi/Makefile.ros-template 2005-02-16 16:44:54 UTC (rev 13596) @@ -1,22 +1,22 @@ -# $Id: Makefile.ros-template 11910 2004-12-03 23:37:44Z blight $ - -TARGET_NAME = shlwapi - -TARGET_OBJECTS = @C_SRCS@ - -TARGET_CFLAGS = -DWINSHLWAPI= -D__REACTOS__ @EXTRADEFS@ - -# FIXME: we don't do delayed imports yet so oleaut32.a is listed explicitly -# NOTE: msvcrt.a must be listed before ntdll.a, because sprintf that is -# exported from ntdll doesn't support printing of float types (%f) -TARGET_SDKLIBS = msvcrt.a @IMPORTS@ oleaut32.a wine.a wine_uuid.a wine_unicode.a msvcrt.a ntdll.a - -TARGET_NORC = yes - -TARGET_BASE = $(TARGET_BASE_LIB_SHLWAPI) - -default: all - -DEP_OBJECTS = $(TARGET_OBJECTS) - -include $(TOOLS_PATH)/depend.mk +# $Id: Makefile.ros-template 11910 2004-12-03 23:37:44Z blight $ + +TARGET_NAME = shlwapi + +TARGET_OBJECTS = @C_SRCS@ + +TARGET_CFLAGS = -DWINSHLWAPI= -D__REACTOS__ @EXTRADEFS@ + +# FIXME: we don't do delayed imports yet so oleaut32.a is listed explicitly +# NOTE: msvcrt.a must be listed before ntdll.a, because sprintf that is +# exported from ntdll doesn't support printing of float types (%f) +TARGET_SDKLIBS = msvcrt.a @IMPORTS@ oleaut32.a wine.a wine_uuid.a msvcrt.a ntdll.a + +TARGET_NORC = yes + +TARGET_BASE = $(TARGET_BASE_LIB_SHLWAPI) + +default: all + +DEP_OBJECTS = $(TARGET_OBJECTS) + +include $(TOOLS_PATH)/depend.mk Property changes on: trunk/reactos/lib/shlwapi/Makefile.ros-template ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/shlwapi/ordinal.c --- trunk/reactos/lib/shlwapi/ordinal.c 2005-02-16 15:44:34 UTC (rev 13595) +++ trunk/reactos/lib/shlwapi/ordinal.c 2005-02-16 16:44:54 UTC (rev 13596) @@ -681,74 +681,6 @@ } /*********************************************************************** ** - * @ [SHLWAPI.25] - * - * Determine if a Unicode character is alphabetic. - * - * PARAMS - * wc [I] Character to check. - * - * RETURNS - * TRUE, if wc is alphabetic, - * FALSE otherwise. - */ -BOOL WINAPI IsCharAlphaWrapW(WCHAR wc) -{ - return (get_char_typeW(wc) & C1_ALPHA) != 0; -} - -/********************************************************************** *** - * @ [SHLWAPI.26] - * - * Determine if a Unicode character is upper-case. - * - * PARAMS - * wc [I] Character to check. - * - * RETURNS - * TRUE, if wc is upper-case, - * FALSE otherwise. - */ -BOOL WINAPI IsCharUpperWrapW(WCHAR wc) -{ - return (get_char_typeW(wc) & C1_UPPER) != 0; -} - -/********************************************************************** *** - * @ [SHLWAPI.27] - * - * Determine if a Unicode character is lower-case. - * - * PARAMS - * wc [I] Character to check. - * - * RETURNS - * TRUE, if wc is lower-case, - * FALSE otherwise. - */ -BOOL WINAPI IsCharLowerWrapW(WCHAR wc) -{ - return (get_char_typeW(wc) & C1_LOWER) != 0; -} - -/********************************************************************** *** - * @ [SHLWAPI.28] - * - * Determine if a Unicode character is alphabetic or a digit. - * - * PARAMS - * wc [I] Character to check. - * - * RETURNS - * TRUE, if wc is alphabetic or a digit, - * FALSE otherwise. - */ -BOOL WINAPI IsCharAlphaNumericWrapW(WCHAR wc) -{ - return (get_char_typeW(wc) & (C1_ALPHA|C1_DIGIT)) != 0; -} - -/********************************************************************** *** * @ [SHLWAPI.29] * * Determine if a Unicode character is a space. @@ -762,7 +694,9 @@ */ BOOL WINAPI IsCharSpaceW(WCHAR wc) { - return (get_char_typeW(wc) & C1_SPACE) != 0; + WORD CharType; + + return GetStringTypeW(CT_CTYPE1, &wc, 1, &CharType) && (CharType & C1_SPACE); } /*********************************************************************** ** @@ -780,7 +714,9 @@ */ BOOL WINAPI IsCharBlankW(WCHAR wc) { - return (get_char_typeW(wc) & C1_BLANK) != 0; + WORD CharType; + + return GetStringTypeW(CT_CTYPE1, &wc, 1, &CharType) && (CharType & C1_BLANK); } /*********************************************************************** ** @@ -797,7 +733,9 @@ */ BOOL WINAPI IsCharPunctW(WCHAR wc) { - return (get_char_typeW(wc) & C1_PUNCT) != 0; + WORD CharType; + + return GetStringTypeW(CT_CTYPE1, &wc, 1, &CharType) && (CharType & C1_PUNCT); } /*********************************************************************** ** @@ -814,7 +752,9 @@ */ BOOL WINAPI IsCharCntrlW(WCHAR wc) { - return (get_char_typeW(wc) & C1_CNTRL) != 0; + WORD CharType; + + return GetStringTypeW(CT_CTYPE1, &wc, 1, &CharType) && (CharType & C1_CNTRL); } /*********************************************************************** ** @@ -831,7 +771,9 @@ */ BOOL WINAPI IsCharDigitW(WCHAR wc) { - return (get_char_typeW(wc) & C1_DIGIT) != 0; + WORD CharType; + + return GetStringTypeW(CT_CTYPE1, &wc, 1, &CharType) && (CharType & C1_DIGIT); } /*********************************************************************** ** @@ -848,7 +790,9 @@ */ BOOL WINAPI IsCharXDigitW(WCHAR wc) { - return (get_char_typeW(wc) & C1_XDIGIT) != 0; + WORD CharType; + + return GetStringTypeW(CT_CTYPE1, &wc, 1, &CharType) && (CharType & C1_XDIGIT); } /*********************************************************************** ** _____ Modified: trunk/reactos/lib/shlwapi/shlwapi.spec --- trunk/reactos/lib/shlwapi/shlwapi.spec 2005-02-16 15:44:34 UTC (rev 13595) +++ trunk/reactos/lib/shlwapi/shlwapi.spec 2005-02-16 16:44:54 UTC (rev 13596) @@ -1,839 +1,839 @@ -1 stdcall -noname ParseURLA(str ptr) -2 stdcall -noname ParseURLW(wstr ptr) -3 stdcall -noname PathFileExistsDefExtA(str long) -4 stdcall -noname PathFileExistsDefExtW(wstr long) -5 stdcall -noname PathFindOnPathExA(str ptr long) -6 stdcall -noname PathFindOnPathExW(wstr ptr long) -7 stdcall -noname SHAllocShared(ptr long long) -8 stdcall -noname SHLockShared(long long) -9 stdcall -noname SHUnlockShared(ptr) -10 stdcall -noname SHFreeShared(long long) -11 stdcall -noname SHMapHandle(long long long long long) -12 stdcall -noname SHCreateMemStream(ptr long) -13 stdcall -noname RegisterDefaultAcceptHeaders(ptr ptr) -14 stdcall -noname GetAcceptLanguagesA(ptr ptr) -15 stdcall -noname GetAcceptLanguagesW(ptr ptr) -16 stdcall SHCreateThread(ptr ptr long ptr) -17 stdcall -noname SHWriteDataBlockList(ptr ptr) -18 stdcall -noname SHReadDataBlockList(ptr ptr) -19 stdcall -noname SHFreeDataBlockList(ptr) -20 stdcall -noname SHAddDataBlock(ptr ptr) -21 stdcall -noname SHRemoveDataBlock(ptr long) -22 stdcall -noname SHFindDataBlock(ptr long) -23 stdcall -noname SHStringFromGUIDA(ptr ptr long) -24 stdcall -noname SHStringFromGUIDW(ptr ptr long) -25 stdcall -noname IsCharAlphaWrapW(long) -26 stdcall -noname IsCharUpperWrapW(long) -27 stdcall -noname IsCharLowerWrapW(long) -28 stdcall -noname IsCharAlphaNumericWrapW(long) -29 stdcall -noname IsCharSpaceW(long) -30 stdcall -noname IsCharBlankW(long) -31 stdcall -noname IsCharPunctW(long) -32 stdcall -noname IsCharCntrlW(ptr) -33 stdcall -noname IsCharDigitW(long) -34 stdcall -noname IsCharXDigitW(long) -35 stdcall -noname GetStringType3ExW(ptr long ptr) -36 stdcall -noname AppendMenuWrapW(long long long wstr) -37 stdcall @(ptr long long long long) user32.CallWindowProcW -38 stdcall @(wstr) user32.CharLowerW -39 stdcall @(wstr long) user32.CharLowerBuffW -40 stdcall @(wstr) user32.CharNextW -41 stdcall @(wstr wstr) user32.CharPrevW -42 stdcall @(wstr) user32.CharToOemW -43 stdcall @(wstr) user32.CharUpperW -44 stdcall @(wstr long) user32.CharUpperBuffW -45 stdcall @(long long wstr long wstr long) kernel32.CompareStringW -46 stdcall @(long ptr long) user32.CopyAcceleratorTableW -47 stdcall @(ptr long) user32.CreateAcceleratorTableW -48 stdcall @(wstr wstr wstr ptr) gdi32.CreateDCW -49 stdcall @(long ptr long ptr long) user32.CreateDialogParamA -50 stdcall @(wstr ptr) kernel32.CreateDirectoryW -51 stdcall @(ptr long long wstr) kernel32.CreateEventW -52 stdcall @(wstr long long ptr long long long) kernel32.CreateFileW -53 stdcall @(ptr) gdi32.CreateFontIndirectW -54 stdcall @(wstr wstr wstr ptr) gdi32.CreateICW -55 stdcall @(long wstr wstr long long long long long long long long ptr) user32.CreateWindowExW -56 stdcall @(long long long long) user32.DefWindowProcW -57 stdcall @(wstr) kernel32.DeleteFileW -58 stdcall @(long ptr long ptr long) user32.DialogBoxIndirectParamW -59 stdcall @(long wstr long ptr long) user32.DialogBoxParamW -60 stdcall @(ptr) user32.DispatchMessageW -61 stdcall @(long wstr long ptr long) user32.DrawTextW -62 stdcall @(long wstr ptr long) gdi32.EnumFontFamiliesW -63 stdcall @(long ptr ptr long long) gdi32.EnumFontFamiliesExW -64 stdcall @(long wstr ptr long) kernel32.EnumResourceNamesW -65 stdcall @(wstr ptr) kernel32.FindFirstFileW -66 stdcall @(long wstr wstr) kernel32.FindResourceW -67 stdcall @(wstr wstr) user32.FindWindowW -68 stdcall @(long ptr long long ptr long ptr) kernel32.FormatMessageW -69 stdcall @(long wstr ptr) user32.GetClassInfoW -70 stdcall @(long long) user32.GetClassLongW -71 stdcall @(long ptr long) user32.GetClassNameW -72 stdcall @(long ptr long) user32.GetClipboardFormatNameW -73 stdcall @(long ptr) kernel32.GetCurrentDirectoryW -74 stdcall -noname GetDlgItemTextWrapW(long long wstr long) -75 stdcall @(wstr) kernel32.GetFileAttributesW -76 stdcall @(wstr long ptr ptr) kernel32.GetFullPathNameW -77 stdcall @(long long ptr long) kernel32.GetLocaleInfoW -78 stdcall @(long long ptr long long) user32.GetMenuStringW -79 stdcall @(ptr long long long) user32.GetMessageW -80 stdcall @(long ptr long) kernel32.GetModuleFileNameW -81 stdcall @(ptr long) kernel32.GetSystemDirectoryW -82 stdcall @(wstr wstr wstr long ptr ptr) kernel32.SearchPathW -83 stdcall @(wstr) kernel32.GetModuleHandleW -84 stdcall @(long long ptr) gdi32.GetObjectW -85 stdcall @(wstr wstr long wstr) kernel32.GetPrivateProfileIntW -86 stdcall @(wstr wstr wstr ptr long) kernel32.GetProfileStringW -87 stdcall @(long wstr) user32.GetPropW -88 stdcall @(long long wstr long ptr) kernel32.GetStringTypeExW -89 stdcall @(wstr wstr long ptr) kernel32.GetTempFileNameW -90 stdcall @(long ptr) kernel32.GetTempPathW -91 stdcall @(long wstr long ptr) gdi32.GetTextExtentPoint32W -92 stdcall @(long long ptr) gdi32.GetTextFaceW -93 stdcall @(long ptr) gdi32.GetTextMetricsW -94 stdcall @(long long) user32.GetWindowLongW -95 stdcall @(long ptr long) user32.GetWindowTextW -96 stdcall @(long) user32.GetWindowTextLengthW -97 stdcall @(ptr long) kernel32.GetWindowsDirectoryW -98 stdcall @(long long long long ptr) user32.InsertMenuW -99 stdcall @(long ptr) user32.IsDialogMessageW -100 stdcall @(long wstr) user32.LoadAcceleratorsW -101 stdcall @(long wstr) user32.LoadBitmapW -102 stdcall @(long wstr) user32.LoadCursorW -103 stdcall @(long wstr) user32.LoadIconW -104 stdcall @(long wstr long long long long) user32.LoadImageW -105 stdcall @(wstr long long) kernel32.LoadLibraryExW -106 stdcall @(long wstr) user32.LoadMenuW -107 stdcall @(long long ptr long) user32.LoadStringW -108 stdcall @(ptr) user32.MessageBoxIndirectW -109 stdcall @(long long long long ptr) user32.ModifyMenuW -110 stdcall @(long long long long) gdi32.GetCharWidth32W -111 stdcall @(long wstr long long ptr long) gdi32.GetCharacterPlacementW -112 stdcall @(wstr wstr long) kernel32.CopyFileW -113 stdcall @(wstr wstr) kernel32.MoveFileW -114 stdcall @(ptr ptr) user32.OemToCharW -115 stdcall @(wstr) kernel32.OutputDebugStringW -116 stdcall @(ptr long long long long) user32.PeekMessageW -117 stdcall @(long long long long) user32.PostMessageW -118 stdcall @(long long long long) user32.PostThreadMessageW -119 stdcall @(long wstr ptr) advapi32.RegCreateKeyW -120 stdcall @(long wstr long ptr long long ptr ptr ptr) advapi32.RegCreateKeyExW -121 stdcall @(long wstr) advapi32.RegDeleteKeyW -122 stdcall @(long long ptr long) advapi32.RegEnumKeyW -123 stdcall @(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumKeyExW -124 stdcall @(long wstr ptr) advapi32.RegOpenKeyW -125 stdcall @(long wstr long long ptr) advapi32.RegOpenKeyExW -126 stdcall @(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) advapi32.RegQueryInfoKeyW -127 stdcall @(long wstr ptr ptr) advapi32.RegQueryValueW -128 stdcall @(long wstr ptr ptr ptr ptr) advapi32.RegQueryValueExW -129 stdcall @(long wstr long ptr long) advapi32.RegSetValueW -130 stdcall @(long wstr long long ptr long) advapi32.RegSetValueExW -131 stdcall @(ptr) user32.RegisterClassW -132 stdcall @(wstr) user32.RegisterClipboardFormatW -133 stdcall @(wstr) user32.RegisterWindowMessageW -134 stdcall @(long wstr) user32.RemovePropW -135 stdcall @(long long long long long) user32.SendDlgItemMessageW -136 stdcall @(long long long long) user32.SendMessageW -137 stdcall @(wstr) kernel32.SetCurrentDirectoryW -138 stdcall -noname SetDlgItemTextWrapW(long long wstr) -139 stdcall @(long long long ptr) user32.SetMenuItemInfoW -140 stdcall @(long wstr long) user32.SetPropW -141 stdcall @(long long long) user32.SetWindowLongW -142 stdcall @(long long long long) user32.SetWindowsHookExW -143 stdcall @(long wstr) user32.SetWindowTextW -144 stdcall @(long ptr) gdi32.StartDocW -145 stdcall @(long long ptr long) user32.SystemParametersInfoW -146 stdcall @(long long ptr) user32.TranslateAcceleratorW -147 stdcall @(wstr long) user32.UnregisterClassW -148 stdcall @(long) user32.VkKeyScanW -149 stdcall @(long wstr long long) user32.WinHelpW -150 stdcall @(ptr wstr ptr) user32.wvsprintfW -151 stdcall -noname StrCmpNCA(str ptr long) -152 stdcall -noname StrCmpNCW(wstr wstr long) -153 stdcall -noname StrCmpNICA(long long long) -154 stdcall -noname StrCmpNICW(wstr wstr long) -155 stdcall -noname StrCmpCA(str str) -156 stdcall -noname StrCmpCW(wstr wstr) -157 stdcall -noname StrCmpICA(str str) -158 stdcall -noname StrCmpICW(wstr wstr) -159 stdcall @(long long wstr long wstr long) kernel32.CompareStringW -160 stdcall -noname SHAboutInfoA(ptr long) -161 stdcall -noname SHAboutInfoW(ptr long) -162 stdcall -noname SHTruncateString(str long) -163 stdcall -noname IUnknown_QueryStatus(ptr ptr long ptr ptr) -164 stdcall -noname IUnknown_Exec(ptr ptr long long ptr ptr) -165 stdcall -noname SHSetWindowBits(long long long long) -166 stdcall -noname SHIsEmptyStream(ptr) -167 stdcall -noname SHSetParentHwnd(long ptr) -168 stdcall -noname ConnectToConnectionPoint(ptr ptr long ptr ptr ptr) -169 stdcall -noname IUnknown_AtomicRelease(long) -170 stdcall -noname PathSkipLeadingSlashesA(str) -171 stdcall -noname SHIsSameObject(ptr ptr) -172 stdcall -noname IUnknown_GetWindow(ptr ptr) -173 stdcall -noname IUnknown_SetOwner(ptr ptr) -174 stdcall -noname IUnknown_SetSite(ptr ptr) -175 stdcall -noname IUnknown_GetClassID(ptr ptr) -176 stdcall -noname IUnknown_QueryService(ptr ptr ptr ptr) -177 stdcall -noname SHLoadMenuPopup(ptr wstr) -178 stdcall -noname SHPropagateMessage(ptr long long long long) -179 stdcall -noname SHMenuIndexFromID(long long) -180 stdcall -noname SHRemoveAllSubMenus(long) -181 stdcall -noname SHEnableMenuItem(long long long) -182 stdcall -noname SHCheckMenuItem(long long long) -183 stdcall -noname SHRegisterClassA(ptr) -184 stdcall @(ptr ptr long) SHLWAPI_184 -185 stdcall -noname SHMessageBoxCheckA(ptr str str long long str) -186 stdcall -noname SHSimulateDrop(ptr ptr long ptr ptr) -187 stdcall -noname SHLoadFromPropertyBag(ptr ptr) -188 stub -noname IUnknown_TranslateAcceleratorOCS -189 stdcall -noname IUnknown_OnFocusOCS(ptr ptr) -190 stub -noname IUnknown_HandleIRestrict -191 stdcall -noname SHMessageBoxCheckW(ptr wstr wstr long long wstr) -192 stdcall -noname SHGetMenuFromID(ptr long) -193 stdcall -noname SHGetCurColorRes() -194 stdcall -noname SHWaitForSendMessageThread(ptr long) -195 stub -noname SHIsExpandableFolder -196 stub -noname DnsRecordSetCompare -197 stdcall -noname SHFillRectClr(long ptr long) -198 stdcall -noname SHSearchMapInt(ptr ptr long long) -199 stdcall -noname IUnknown_Set(ptr ptr) -200 stub -noname MayQSForward -201 stdcall -noname MayExecForward(ptr long ptr long long ptr ptr) -202 stdcall -noname IsQSForward(ptr long ptr) -203 stdcall -noname SHStripMneumonicA(str) -204 stdcall -noname SHIsChildOrSelf(long long) -205 stdcall -noname SHGetValueGoodBootA(long str str ptr ptr ptr) -206 stdcall -noname SHGetValueGoodBootW(long wstr wstr ptr ptr ptr) -207 stub -noname IContextMenu_Invoke -208 stdcall -noname FDSA_Initialize(long long ptr ptr long) -209 stdcall -noname FDSA_Destroy(ptr) -210 stdcall -noname FDSA_InsertItem(ptr long ptr) -211 stdcall -noname FDSA_DeleteItem(ptr long) -212 stdcall @(ptr ptr long) SHLWAPI_212 -213 stdcall -noname IStream_Reset(ptr) -214 stdcall -noname IStream_Size(ptr ptr) -215 stdcall -noname SHAnsiToUnicode(str ptr long) -216 stdcall -noname SHAnsiToUnicodeCP(long str ptr long) -217 stdcall -noname SHUnicodeToAnsi(wstr ptr ptr) -218 stdcall -noname SHUnicodeToAnsiCP(long wstr ptr ptr) -219 stdcall -noname QISearch(long long long long) -220 stub -noname SHSetDefaultDialogFont -221 stdcall -noname SHRemoveDefaultDialogFont(ptr) -222 stdcall -noname _SHGlobalCounterCreate(long) -223 stdcall -noname _SHGlobalCounterGetValue(long) -224 stdcall -noname _SHGlobalCounterIncrement(long) -225 stdcall -noname SHStripMneumonicW(wstr) -226 stub -noname ZoneCheckPathA -227 stub -noname ZoneCheckPathW -228 stub -noname ZoneCheckUrlA -229 stub -noname ZoneCheckUrlW -230 stub -noname ZoneCheckUrlExA -231 stub -noname ZoneCheckUrlExW -232 stub -noname ZoneCheckUrlExCacheA -233 stub -noname ZoneCheckUrlExCacheW -234 stub -noname ZoneCheckHost -235 stub -noname ZoneCheckHostEx -236 stdcall -noname SHPinDllOfCLSID(ptr) -237 stdcall -noname SHRegisterClassW(ptr) -238 stdcall -noname SHUnregisterClassesA(ptr ptr long) -239 stdcall -noname SHUnregisterClassesW(ptr ptr long) -240 stdcall -noname SHDefWindowProc(long long long long) -241 stdcall -noname StopWatchMode() -242 stdcall -noname StopWatchFlush() -243 stdcall -noname StopWatchA(long str long long long) -244 stdcall -noname StopWatchW(long wstr long long long) -245 stdcall -noname StopWatch_TimerHandler(ptr ptr long ptr) -246 stub -noname StopWatch_CheckMsg -247 stdcall -noname StopWatch_MarkFrameStart(str) -248 stub -noname StopWatch_MarkSameFrameStart -249 stdcall -noname StopWatch_MarkJavaStop(wstr ptr long) -250 stdcall -noname GetPerfTime() -251 stub -noname StopWatch_DispatchTime -252 stdcall -noname StopWatch_SetMsgLastLocation(long) -253 stub -noname StopWatchExA -254 stub -noname StopWatchExW -255 stub -noname EventTraceHandler -256 stub -noname IUnknown_GetSite -257 stdcall -noname SHCreateWorkerWindowA(long ptr long long ptr long) -258 stub -noname SHRegisterWaitForSingleObject -259 stub -noname SHUnregisterWait -260 stdcall -noname SHQueueUserWorkItem(long long long long long long long) -261 stub -noname SHCreateTimerQueue -262 stub -noname SHDeleteTimerQueue -263 stub -noname SHSetTimerQueueTimer -264 stub -noname SHChangeTimerQueueTimer -265 stub -noname SHCancelTimerQueueTimer -266 stdcall -noname SHRestrictionLookup(long wstr ptr ptr) -267 stdcall -noname SHWeakQueryInterface(long long long long) -268 stdcall -noname SHWeakReleaseInterface(long long) -269 stdcall -noname GUIDFromStringA(str ptr) -270 stdcall -noname GUIDFromStringW(wstr ptr) -271 stdcall -noname SHGetRestriction(wstr wstr wstr) -272 stub -noname SHSetThreadPoolLimits -273 stub -noname SHTerminateThreadPool -274 stub -noname RegisterGlobalHotkeyW -275 stub -noname RegisterGlobalHotkeyA -276 stdcall -noname WhichPlatform() -277 stub -noname SHDialogBox -278 stdcall -noname SHCreateWorkerWindowW(long long long long long long) -279 stdcall -noname SHInvokeDefaultCommand(ptr ptr ptr) -280 stdcall -noname SHRegGetIntW(ptr wstr long) -281 stdcall -noname SHPackDispParamsV(ptr ptr ptr ptr) -282 stdcall -noname SHPackDispParams(ptr ptr ptr ptr) -283 stub -noname IConnectionPoint_InvokeWithCancel -284 stdcall -noname IConnectionPoint_SimpleInvoke(ptr ptr ptr) -285 stdcall -noname IConnectionPoint_OnChanged(ptr long) -286 stub -noname IUnknown_CPContainerInvokeParam -287 stdcall -noname IUnknown_CPContainerOnChanged(ptr long) -288 stub -noname IUnknown_CPContainerInvokeIndirect -289 stdcall -noname PlaySoundWrapW(wstr long long) -290 stub -noname SHMirrorIcon -291 stdcall -noname SHMessageBoxCheckExA(ptr ptr ptr ptr ptr long str) -292 stdcall -noname SHMessageBoxCheckExW(ptr ptr ptr ptr ptr long wstr) -293 stub -noname SHCancelUserWorkItems -294 stdcall -noname SHGetIniStringW(long long long long long) -295 stdcall -noname SHSetIniStringW(wstr ptr wstr wstr) -296 stub -noname CreateURLFileContentsW -297 stub -noname CreateURLFileContentsA -298 stdcall @(wstr wstr wstr wstr) kernel32.WritePrivateProfileStringW -299 stdcall -noname ExtTextOutWrapW(long long long long ptr wstr long ptr) -300 stdcall @(long long long long long long long long long long long long long wstr) gdi32.CreateFontW -301 stdcall @(long wstr long ptr long ptr) user32.DrawTextExW -302 stdcall @(long long long ptr) user32.GetMenuItemInfoW -303 stdcall @(long long long ptr) user32.InsertMenuItemW -304 stdcall @(wstr) gdi32.CreateMetaFileW -305 stdcall @(ptr long wstr) kernel32.CreateMutexW -306 stdcall @(wstr ptr long) kernel32.ExpandEnvironmentStringsW -307 stdcall @(ptr long long wstr) kernel32.CreateSemaphoreW -308 stdcall @(ptr long) kernel32.IsBadStringPtrW -309 stdcall @(wstr) kernel32.LoadLibraryW -310 stdcall @(long long ptr wstr ptr long) kernel32.GetTimeFormatW -311 stdcall @(long long ptr wstr ptr long) kernel32.GetDateFormatW -312 stdcall @(wstr wstr wstr ptr long wstr) kernel32.GetPrivateProfileStringW -313 stdcall -noname SHGetFileInfoWrapW(ptr long ptr long long) -314 stdcall @(ptr) user32.RegisterClassExW -315 stdcall @(long wstr ptr) user32.GetClassInfoExW -316 stub -noname IShellFolder_GetDisplayNameOf -317 stub -noname IShellFolder_ParseDisplayName -318 stdcall -noname DragQueryFileWrapW(long long wstr long) -319 stdcall @(long long wstr wstr) user32.FindWindowExW -320 stdcall -noname RegisterMIMETypeForExtensionA(str str) -321 stdcall -noname RegisterMIMETypeForExtensionW(wstr wstr) -322 stdcall -noname UnregisterMIMETypeForExtensionA(str) -323 stdcall -noname UnregisterMIMETypeForExtensionW(wstr) -324 stdcall -noname RegisterExtensionForMIMETypeA(str str) -325 stdcall -noname RegisterExtensionForMIMETypeW(wstr wstr) -326 stdcall -noname UnregisterExtensionForMIMETypeA(str) -327 stdcall -noname UnregisterExtensionForMIMETypeW(wstr) -328 stdcall -noname GetMIMETypeSubKeyA(str ptr long) -329 stdcall -noname GetMIMETypeSubKeyW(wstr ptr long) -330 stdcall -noname MIME_GetExtensionA(str ptr long) -331 stdcall -noname MIME_GetExtensionW(wstr ptr long) -332 stdcall @(ptr long) user32.CallMsgFilterW -333 stdcall -noname SHBrowseForFolderWrapW(ptr) -334 stdcall -noname SHGetPathFromIDListWrapW(ptr ptr) -335 stdcall -noname ShellExecuteExWrapW(ptr) -336 stdcall -noname SHFileOperationWrapW(ptr) -337 stdcall -noname ExtractIconExWrapW(wstr long ptr ptr long) -338 stdcall @(wstr long) kernel32.SetFileAttributesW -339 stdcall @(long long wstr ptr ptr long) kernel32.GetNumberFormatW -340 stdcall @(long wstr wstr long) user32.MessageBoxW -341 stdcall @(long ptr) kernel32.FindNextFileW -342 stdcall -noname SHInterlockedCompareExchange(ptr long long) -343 stdcall -noname SHRegGetCLSIDKeyA(ptr str long long ptr) -344 stdcall -noname SHRegGetCLSIDKeyW(ptr wstr long long ptr) -345 stdcall -noname SHAnsiToAnsi(str ptr long) -346 stdcall -noname SHUnicodeToUnicode(wstr ptr long) -347 stdcall @(long wstr) advapi32.RegDeleteValueW -348 stub -noname SHGetFileDescriptionW -349 stub -noname SHGetFileDescriptionA -350 stdcall -noname GetFileVersionInfoSizeWrapW(wstr ptr) -351 stdcall -noname GetFileVersionInfoWrapW(wstr ptr long ptr) -352 stdcall -noname VerQueryValueWrapW(ptr wstr ptr ptr) -353 stub -noname SHFormatDateTimeA -354 stub -noname SHFormatDateTimeW -355 stdcall -noname IUnknown_EnableModeless(ptr long) -356 stdcall -noname _CreateAllAccessSecurityAttributes(ptr ptr) -357 stdcall -noname SHGetNewLinkInfoWrapW(wstr wstr wstr long long) -358 stdcall -noname SHDefExtractIconWrapW(wstr long long ptr ptr long) -359 stdcall @(long long wstr) kernel32.OpenEventW -360 stdcall @(wstr) kernel32.RemoveDirectoryW -361 stdcall @(wstr ptr long) kernel32.GetShortPathNameW -362 stdcall @(ptr ptr) advapi32.GetUserNameW -363 stdcall -noname SHInvokeCommand(ptr ptr ptr long) -364 stdcall -noname DoesStringRoundTripA(str ptr long) -365 stdcall -noname DoesStringRoundTripW(wstr ptr long) -366 stdcall @(long long ptr ptr ptr ptr ptr ptr) advapi32.RegEnumValueW -367 stdcall @(wstr wstr ptr long wstr) kernel32.WritePrivateProfileStructW -368 stdcall @(wstr wstr ptr long wstr) kernel32.GetPrivateProfileStructW -369 stdcall @(wstr wstr ptr ptr long long ptr wstr ptr ptr) kernel32.CreateProcessW -370 stdcall -noname ExtractIconWrapW(long wstr long) -371 stdcall DdeInitializeWrapW(ptr ptr long long) user32.DdeInitializeW -372 stdcall DdeCreateStringHandleWrapW(long ptr long) user32.DdeCreateStringHandleW -373 stdcall DdeQueryStringWrapW(long ptr wstr long long) user32.DdeQueryStringW -374 stub -noname SHCheckDiskForMediaA -375 stub -noname SHCheckDiskForMediaW -376 stdcall -noname MLGetUILanguage() # kernel32.GetUserDefaultUILanguage -377 stdcall MLLoadLibraryA(str long long) -378 stdcall MLLoadLibraryW(wstr long long) -379 stub -noname Shell_GetCachedImageIndexWrapW -380 stub -noname Shell_GetCachedImageIndexWrapA -381 stub -noname AssocCopyVerbs -382 stub -noname ZoneComputePaneSize -383 stub -noname ZoneConfigureW -384 stub -noname SHRestrictedMessageBox -385 stub -noname SHLoadRawAccelerators -386 stub -noname SHQueryRawAccelerator -387 stub -noname SHQueryRawAcceleratorMsg -388 stub -noname ShellMessageBoxWrapW -389 stdcall -noname GetSaveFileNameWrapW(ptr) -390 stdcall -noname WNetRestoreConnectionWrapW(long wstr) -391 stdcall -noname WNetGetLastErrorWrapW(ptr ptr long ptr long) -392 stdcall EndDialogWrap(ptr ptr) user32.EndDialog -393 stdcall @(long ptr long ptr long) user32.CreateDialogIndirectParamW -394 stdcall @(long ptr long ptr long) user32.CreateDialogIndirectParamA -395 stub -noname MLWinHelpA -396 stub -noname MLHtmlHelpA -397 stub -noname MLWinHelpW -398 stub -noname MLHtmlHelpW -399 stdcall -noname StrCpyNXA(str str long) -400 stdcall -noname StrCpyNXW(wstr wstr long) -401 stdcall -noname PageSetupDlgWrapW(ptr) -402 stdcall -noname PrintDlgWrapW(ptr) -403 stdcall -noname GetOpenFileNameWrapW(ptr) -404 stub -noname IShellFolder_EnumObjects -405 stdcall -noname MLBuildResURLA(str ptr long str ptr long) -406 stdcall -noname MLBuildResURLW(wstr ptr long wstr ptr long) -407 stub -noname AssocMakeProgid -408 stub -noname AssocMakeShell -409 stub -noname AssocMakeApplicationByKeyW -410 stub -noname AssocMakeApplicationByKeyA -411 stub -noname AssocMakeFileExtsToApplicationW -412 stub -noname AssocMakeFileExtsToApplicationA -413 stdcall -noname SHGetMachineInfo(long) -414 stub -noname SHHtmlHelpOnDemandW -415 stub -noname SHHtmlHelpOnDemandA -416 stub -noname SHWinHelpOnDemandW -417 stub -noname SHWinHelpOnDemandA -418 stdcall -noname MLFreeLibrary(long) -419 stdcall -noname SHFlushSFCacheWrap() -420 stub @ # CMemStream::Commit -421 stub -noname SHLoadPersistedDataObject -422 stdcall -noname _SHGlobalCounterCreateNamedA(str long) -423 stdcall -noname _SHGlobalCounterCreateNamedW(wstr long) -424 stdcall -noname _SHGlobalCounterDecrement(long) -425 stub -noname DeleteMenuWrap -426 stub -noname DestroyMenuWrap -427 stub -noname TrackPopupMenuWrap -428 stdcall @(long long long long long ptr) user32.TrackPopupMenuEx -429 stdcall -noname MLIsMLHInstance(long) -430 stdcall -noname MLSetMLHInstance(long long) -431 stdcall -noname MLClearMLHInstance(long) -432 stub -noname SHSendMessageBroadcastA -433 stub -noname SHSendMessageBroadcastW -434 stdcall @(long long long long long long ptr) user32.SendMessageTimeoutW -435 stub -noname CLSIDFromProgIDWrap -436 stdcall -noname CLSIDFromStringWrap(wstr ptr) -437 stdcall -noname IsOS(long) -438 stub -noname SHLoadRegUIStringA -439 stub -noname SHLoadRegUIStringW -440 stdcall -noname SHGetWebFolderFilePathA(str ptr long) -441 stdcall -noname SHGetWebFolderFilePathW(wstr ptr long) -442 stdcall @(wstr ptr long) kernel32.GetEnvironmentVariableW -443 stdcall @(ptr long) kernel32.GetSystemWindowsDirectoryA -444 stdcall @(ptr long) kernel32.GetSystemWindowsDirectoryW -445 stdcall -noname PathFileExistsAndAttributesA(str ptr) -446 stdcall -noname PathFileExistsAndAttributesW(wstr ptr) -447 stub -noname FixSlashesAndColonA -448 stdcall -noname FixSlashesAndColonW(wstr) -449 stub -noname NextPathA -450 stub -noname NextPathW -451 stub -noname CharUpperNoDBCSA -452 stub -noname CharUpperNoDBCSW -453 stub -noname CharLowerNoDBCSA -454 stub -noname CharLowerNoDBCSW -455 stdcall -noname PathIsValidCharA(long long) -456 stdcall -noname PathIsValidCharW(long long) -457 stub -noname GetLongPathNameWrapW -458 stub -noname GetLongPathNameWrapA -459 stdcall SHExpandEnvironmentStringsA(str ptr long) kernel32.ExpandEnvironmentStringsA -460 stdcall SHExpandEnvironmentStringsW(wstr ptr long) kernel32.ExpandEnvironmentStringsW -461 stdcall -noname SHGetAppCompatFlags(long) -462 stub -noname UrlFixupW -463 stub -noname SHExpandEnvironmentStringsForUserA -464 stub -noname SHExpandEnvironmentStringsForUserW -465 stub -noname PathUnExpandEnvStringsForUserA -466 stub -noname PathUnExpandEnvStringsForUserW -467 stub -noname SHRunIndirectRegClientCommand -468 stub -noname RunIndirectRegCommand -469 stub -noname RunRegCommand -470 stub -noname IUnknown_ProfferServiceOld -471 stub -noname SHCreatePropertyBagOnRegKey -472 stub -noname SHCreatePropertyBagOnProfileSelections -473 stub -noname SHGetIniStringUTF7W -474 stub -noname SHSetIniStringUTF7W -475 stub -noname GetShellSecurityDescriptor -476 stub -noname SHGetObjectCompatFlags -477 stub -noname SHCreatePropertyBagOnMemory -478 stub -noname IUnknown_TranslateAcceleratorIO -479 stub -noname IUnknown_UIActivateIO -480 stub -noname UrlCrackW -481 stub -noname IUnknown_HasFocusIO -482 stub -noname SHMessageBoxHelpA -483 stub -noname SHMessageBoxHelpW -484 stub -noname IUnknown_QueryServiceExec -485 stub -noname MapWin32ErrorToSTG -486 stub -noname ModeToCreateFileFlags - -488 stub -noname SHConvertGraphicsFile -489 stub -noname GlobalAddAtomWrapW -490 stub -noname GlobalFindAtomWrapW -491 stdcall -noname SHGetShellKey(long long long) -492 stub -noname PrettifyFileDescriptionW -493 stub -noname SHPropertyBag_ReadType -494 stub -noname SHPropertyBag_ReadStr -495 stub -noname SHPropertyBag_WriteStr -496 stub -noname SHPropertyBag_ReadInt -497 stub -noname SHPropertyBag_WriteInt -498 stub -noname SHPropertyBag_ReadBOOLOld -499 stub -noname SHPropertyBag_WriteBOOL - -505 stub -noname SHPropertyBag_ReadGUID -506 stub -noname SHPropertyBag_WriteGUID -507 stub -noname SHPropertyBag_ReadDWORD -508 stub -noname SHPropertyBag_WriteDWORD -509 stdcall -noname IUnknown_OnFocusChangeIS(ptr ptr long) -510 stub -noname SHLockSharedEx -511 stub -noname PathFileExistsDefExtAndAttributesW -512 stub -noname IStream_ReadPidl -513 stub -noname IStream_WritePidl -514 stub -noname IUnknown_ProfferService - -516 stdcall -noname SKGetValueW(long wstr wstr long long long) -517 stub -noname SKSetValueW -518 stub -noname SKDeleteValueW -519 stub -noname SKAllocValueW -520 stub -noname SHPropertyBag_ReadBSTR -521 stub -noname SHPropertyBag_ReadPOINTL -522 stub -noname SHPropertyBag_WritePOINTL -523 stub -noname SHPropertyBag_ReadRECTL -524 stub -noname SHPropertyBag_WriteRECTL -525 stub -noname SHPropertyBag_ReadPOINTS -526 stub -noname SHPropertyBag_WritePOINTS -527 stub -noname SHPropertyBag_ReadSHORT -528 stub -noname SHPropertyBag_WriteSHORT -529 stub -noname SHPropertyBag_ReadInt -530 stub -noname SHPropertyBag_WriteInt -531 stub -noname SHPropertyBag_ReadStream -532 stub -noname SHPropertyBag_WriteStream -533 stub -noname SHGetPerScreenResName -534 stub -noname SHPropertyBag_ReadBOOL -535 stub -noname SHPropertyBag_Delete -536 stub -noname IUnknown_QueryServicePropertyBag -537 stub -noname SHBoolSystemParametersInfo -538 stub -noname IUnknown_QueryServicePropertyBag -539 stub -noname IUnknown_ShowBrowserBar -540 stub -noname SHInvokeCommandOnContextMenu -541 stub -noname SHInvokeCommandsOnContextMen -542 stdcall -noname GetUIVersion() -543 stub -noname CreateColorSpaceWrapW -544 stub -noname QuerySourceCreateFromKey -545 stub -noname SHForwardContextMenuMsg -546 stub -noname IUnknown_DoContextMenuPopup - -548 stub -noname SHAreIconsEqual -549 stdcall -noname SHCoCreateInstanceAC(ptr ptr long ptr ptr) -550 stub -noname GetTemplateInfoFroHandle -551 stub -noname IShellFolder_CompareIDs - -@ stdcall AssocCreate(long long long long ptr ptr) -@ stdcall AssocQueryKeyA(long long str ptr ptr) -@ stdcall AssocQueryKeyW(long long wstr ptr ptr) -@ stdcall AssocQueryStringA(long long ptr ptr str ptr) -@ stdcall AssocQueryStringByKeyA(long long ptr ptr str ptr) -@ stdcall AssocQueryStringByKeyW(long long ptr ptr wstr ptr) -@ stdcall AssocQueryStringW(long long ptr ptr wstr ptr) -@ stdcall ChrCmpIA(long long) -@ stdcall ChrCmpIW(long long) -@ stdcall ColorAdjustLuma(long long long) -@ stdcall ColorHLSToRGB(long long long) -@ stdcall ColorRGBToHLS(long ptr ptr ptr) -@ stdcall DllGetVersion (ptr) SHLWAPI_DllGetVersion -@ stdcall GetMenuPosFromID(ptr long) -@ stdcall HashData (ptr long ptr long) -@ stdcall IntlStrEqWorkerA(long str str long) StrIsIntlEqualA -@ stdcall IntlStrEqWorkerW(long wstr wstr long) StrIsIntlEqualW -@ stdcall PathAddBackslashA (str) -@ stdcall PathAddBackslashW (wstr) -@ stdcall PathAddExtensionA (str str) -@ stdcall PathAddExtensionW (wstr wstr) -@ stdcall PathAppendA (str str) -@ stdcall PathAppendW (wstr wstr) -@ stdcall PathBuildRootA (ptr long) -@ stdcall PathBuildRootW (ptr long) -@ stdcall PathCanonicalizeA (ptr str) -@ stdcall PathCanonicalizeW (ptr wstr) -@ stdcall PathCombineA (ptr ptr ptr) -@ stdcall PathCombineW (ptr ptr ptr) [truncated at 1000 lines; 1118 more skipped]

19 years, 10 months

[ekohl] 13595: - Implement CaptureStringArg and CaptureAndConvertAnsiArg.

by ekohl＠svn.reactos.com

- Implement CaptureStringArg and CaptureAndConvertAnsiArg. - FileExists: Restore error mode. - Move configuration manager functions to a separate file. - Add cfgmgr32.h. Added: trunk/reactos/include/wine/cfgmgr32.h Modified: trunk/reactos/lib/setupapi/Makefile.in Added: trunk/reactos/lib/setupapi/cfgmgr.c Modified: trunk/reactos/lib/setupapi/misc.c Modified: trunk/reactos/lib/setupapi/setupapi.spec Modified: trunk/reactos/lib/setupapi/stubs.c _____ Added: trunk/reactos/include/wine/cfgmgr32.h --- trunk/reactos/include/wine/cfgmgr32.h 2005-02-16 15:27:30 UTC (rev 13594) +++ trunk/reactos/include/wine/cfgmgr32.h 2005-02-16 15:44:34 UTC (rev 13595) @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2005 Mike McCormack + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _CFGMGR32_H_ +#define _CFGMGR32_H_ + +typedef DWORD CONFIGRET; +typedef HANDLE HMACHINE; +typedef HMACHINE *PHMACHINE; + +#define CR_SUCCESS 0x00000000 +#define CR_INVALID_DATA 0x0000001F +#define CR_ACCESS_DENIED 0x00000033 + + +CONFIGRET WINAPI CM_Connect_MachineA( PCSTR, PHMACHINE ); +CONFIGRET WINAPI CM_Connect_MachineW( PCWSTR, PHMACHINE ); +#define CM_Connect_Machine WINELIB_NAME_AW(CM_Connect_Machine) + +CONFIGRET WINAPI CM_Disconnect_Machine( HMACHINE ); + +CONFIGRET WINAPI CM_Get_Device_ID_ListA( PCSTR, PCHAR, ULONG, ULONG ); +CONFIGRET WINAPI CM_Get_Device_ID_ListW( PCWSTR, PWCHAR, ULONG, ULONG ); +#define CM_Get_Device_ID_List WINELIB_NAME_AW(CM_Get_Device_ID_List) +CONFIGRET WINAPI CM_Get_Device_ID_List_ExA( PCSTR, PCHAR, ULONG, ULONG, HMACHINE ); +CONFIGRET WINAPI CM_Get_Device_ID_List_ExW( PCWSTR, PWCHAR, ULONG, ULONG, HMACHINE ); +#define CM_Get_Device_ID_List_Ex WINELIB_NAME_AW(CM_Get_Device_ID_List_Ex) +CONFIGRET WINAPI CM_Get_Device_ID_List_SizeA( PULONG, PCSTR, ULONG ); +CONFIGRET WINAPI CM_Get_Device_ID_List_SizeW( PULONG, PCWSTR, ULONG ); +#define CM_Get_Device_ID_List_Size WINELIB_NAME_AW(CM_Get_Device_ID_List_Size) +CONFIGRET WINAPI CM_Get_Device_ID_List_Size_ExA( PULONG, PCSTR, ULONG, HMACHINE ); +CONFIGRET WINAPI CM_Get_Device_ID_List_Size_ExW( PULONG, PCWSTR, ULONG, HMACHINE ); +#define CM_Get_Device_ID_List_Size_Ex WINELIB_NAME_AW(CM_Get_Device_ID_List_Size_Ex) + +#endif /* _CFGMGR32_H_ */ _____ Modified: trunk/reactos/lib/setupapi/Makefile.in --- trunk/reactos/lib/setupapi/Makefile.in 2005-02-16 15:27:30 UTC (rev 13594) +++ trunk/reactos/lib/setupapi/Makefile.in 2005-02-16 15:44:34 UTC (rev 13595) @@ -9,6 +9,7 @@ EXTRALIBS = $(LIBUNICODE) C_SRCS = \ + cfgmgr.c \ devinst.c \ dirid.c \ diskspace.c \ _____ Added: trunk/reactos/lib/setupapi/cfgmgr.c --- trunk/reactos/lib/setupapi/cfgmgr.c 2005-02-16 15:27:30 UTC (rev 13594) +++ trunk/reactos/lib/setupapi/cfgmgr.c 2005-02-16 15:44:34 UTC (rev 13595) @@ -0,0 +1,183 @@ +/* + * Configuration manager functions + * + * Copyright 2000 James Hatheway + * Copyright 2005 Eric Kohl + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winnls.h" +#include "winreg.h" +#include "setupapi.h" +#include "cfgmgr32.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(setupapi); + + +/********************************************************************** * + * CM_Connect_MachineA [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Connect_MachineA(PCSTR UNCServerName, PHMACHINE phMachine) +{ + PWSTR pServerNameW; + CONFIGRET ret; + + TRACE("%s %p\n", UNCServerName, phMachine); + + if (UNCServerName == NULL || *UNCServerName == 0) + { + return CM_Connect_MachineW(NULL, phMachine); + } + + if (CaptureAndConvertAnsiArg(UNCServerName, &pServerNameW)) + { + return CR_INVALID_DATA; + } + + ret = CM_Connect_MachineW(pServerNameW, phMachine); + + MyFree(pServerNameW); + + return ret; +} + + +/********************************************************************** * + * CM_Connect_MachineW [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Connect_MachineW(PCWSTR UNCServerName, PHMACHINE phMachine) +{ + FIXME("%s %p\n", debugstr_w(UNCServerName), phMachine); + return CR_ACCESS_DENIED; +} + + +/********************************************************************** * + * CM_Disconnect_Machine [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Disconnect_Machine(HMACHINE hMachine) +{ + FIXME("%lx\n", hMachine); + return CR_SUCCESS; +} + + +/********************************************************************** * + * CM_Get_Device_ID_ListA [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Device_ID_ListA( + PCSTR pszFilter, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags ) +{ + FIXME("%p %p %ld %ld\n", pszFilter, Buffer, BufferLen, ulFlags); + memset(Buffer,0,2); + return CR_SUCCESS; +} + + +/********************************************************************** * + * CM_Get_Device_ID_ListW [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Device_ID_ListW( + PCWSTR pszFilter, PWCHAR Buffer, ULONG BufferLen, ULONG ulFlags ) +{ + TRACE("%p %p %ld %ld\n", pszFilter, Buffer, BufferLen, ulFlags); + return CM_Get_Device_ID_List_ExW(pszFilter, Buffer, BufferLen, + ulFlags, NULL); +} + + +/********************************************************************** * + * CM_Get_Device_ID_List_ExA [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Device_ID_List_ExA( + PCSTR pszFilter, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags, + HMACHINE hMachine ) +{ + FIXME("%p %p %ld %ld %lx\n", + pszFilter, Buffer, BufferLen, ulFlags, hMachine); + memset(Buffer,0,2); + return CR_SUCCESS; +} + + +/********************************************************************** * + * CM_Get_Device_ID_List_ExW [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Device_ID_List_ExW( + PCWSTR pszFilter, PWCHAR Buffer, ULONG BufferLen, ULONG ulFlags, + HMACHINE hMachine ) +{ + FIXME("%p %p %ld %ld %lx\n", + pszFilter, Buffer, BufferLen, ulFlags, hMachine); + memset(Buffer,0,2); + return CR_SUCCESS; +} + + +/********************************************************************** * + * CM_Get_Device_ID_List_SizeA [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Device_ID_List_SizeA( + PULONG pulLen, PCSTR pszFilter, ULONG ulFlags) +{ + FIXME("%p %s %ld\n", pulLen, pszFilter, ulFlags); + *pulLen = 2; + return CR_SUCCESS; +} + + +/********************************************************************** * + * CM_Get_Device_ID_List_SizeW [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Device_ID_List_SizeW( + PULONG pulLen, PCWSTR pszFilter, ULONG ulFlags) +{ + FIXME("%p %s %ld\n", pulLen, debugstr_w(pszFilter), ulFlags); + *pulLen = 2; + return CR_SUCCESS; +} + + +/********************************************************************** * + * CM_Get_Device_ID_List_Size_ExA [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Device_ID_List_Size_ExA( + PULONG pulLen, PCSTR pszFilter, ULONG ulFlags, HMACHINE hMachine) +{ + FIXME("%p %s %ld %lx\n", pulLen, pszFilter, ulFlags, hMachine); + *pulLen = 2; + return CR_SUCCESS; +} + + +/********************************************************************** * + * CM_Get_Device_ID_List_Size_ExW [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Get_Device_ID_List_Size_ExW( + PULONG pulLen, PCWSTR pszFilter, ULONG ulFlags, HMACHINE hMachine) +{ + FIXME("%p %s %ld %lx\n", pulLen, debugstr_w(pszFilter), ulFlags, hMachine); + *pulLen = 2; + return CR_SUCCESS; +} _____ Modified: trunk/reactos/lib/setupapi/misc.c --- trunk/reactos/lib/setupapi/misc.c 2005-02-16 15:27:30 UTC (rev 13594) +++ trunk/reactos/lib/setupapi/misc.c 2005-02-16 15:44:34 UTC (rev 13595) @@ -463,6 +463,19 @@ } +/********************************************************************** **** + * DelayedMove [SETUPAPI.@] + * + * Moves a file upon the next reboot. + * + * PARAMS + * lpExistingFileName [I] Current file name + * lpNewFileName [I] New file name + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ BOOL WINAPI DelayedMove(LPCWSTR lpExistingFileName, LPCWSTR lpNewFileName) { if (OsVersionInfo.dwPlatformId != VER_PLATFORM_WIN32_NT) @@ -476,6 +489,19 @@ } +/********************************************************************** **** + * FileExists [SETUPAPI.@] + * + * Checks whether a file exists. + * + * PARAMS + * lpFileName [I] Name of the file to check + * lpNewFileName [O] Optional information about the existing file + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ BOOL WINAPI FileExists(LPCWSTR lpFileName, LPWIN32_FIND_DATAW lpFileFindData) { WIN32_FIND_DATAW FindData; @@ -499,5 +525,61 @@ if (lpFileFindData) memcpy(lpFileFindData, &FindData, sizeof(WIN32_FIND_DATAW)); + SetErrorMode(uErrorMode); + return TRUE; } + + +/********************************************************************** **** + * CaptureStringArg [SETUPAPI.@] + * + * Captures a UNICODE string. + * + * PARAMS + * lpSrc [I] UNICODE string to be captured + * lpDst [O] Pointer to the captured UNICODE string + * + * RETURNS + * Success: ERROR_SUCCESS + * Failure: ERROR_INVALID_PARAMETER + * + * NOTE + * Call MyFree to release the captured UNICODE string. + */ +DWORD WINAPI CaptureStringArg(LPCWSTR pSrc, LPWSTR *pDst) +{ + if (pDst == NULL) + return ERROR_INVALID_PARAMETER; + + *pDst = DuplicateString(pSrc); + + return ERROR_SUCCESS; +} + + +/********************************************************************** **** + * CaptureAndConvertAnsiArg [SETUPAPI.@] + * + * Captures an ANSI string and converts it to a UNICODE string. + * + * PARAMS + * lpSrc [I] ANSI string to be captured + * lpDst [O] Pointer to the captured UNICODE string + * + * RETURNS + * Success: ERROR_SUCCESS + * Failure: ERROR_INVALID_PARAMETER + * + * NOTE + * Call MyFree to release the captured UNICODE string. + */ +DWORD WINAPI CaptureAndConvertAnsiArg(LPCSTR pSrc, LPWSTR *pDst) +{ + if (pDst == NULL) + return ERROR_INVALID_PARAMETER; + + *pDst = MultiByteToUnicode(pSrc, CP_ACP); + + return ERROR_SUCCESS; +} _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-02-16 15:27:30 UTC (rev 13594) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-02-16 15:44:34 UTC (rev 13595) @@ -18,7 +18,7 @@ @ stub CM_Add_Range @ stub CM_Add_Res_Des @ stub CM_Add_Res_Des_Ex -@ stub CM_Connect_MachineA +@ stdcall CM_Connect_MachineA(str ptr) @ stdcall CM_Connect_MachineW(wstr ptr) @ stub CM_Create_DevNodeA @ stub CM_Create_DevNodeW @@ -75,14 +75,14 @@ @ stub CM_Get_Device_IDW @ stub CM_Get_Device_ID_ExA @ stub CM_Get_Device_ID_ExW -@ stdcall CM_Get_Device_ID_ListA(ptr ptr long long) -@ stub CM_Get_Device_ID_ListW -@ stub CM_Get_Device_ID_List_ExA -@ stub CM_Get_Device_ID_List_ExW -@ stub CM_Get_Device_ID_List_SizeA -@ stub CM_Get_Device_ID_List_SizeW -@ stub CM_Get_Device_ID_List_Size_ExA -@ stub CM_Get_Device_ID_List_Size_ExW +@ stdcall CM_Get_Device_ID_ListA(str str long long) +@ stdcall CM_Get_Device_ID_ListW(wstr wstr long long) +@ stdcall CM_Get_Device_ID_List_ExA(str str long long long) +@ stdcall CM_Get_Device_ID_List_ExW(wstr wstr long long long) +@ stdcall CM_Get_Device_ID_List_SizeA(ptr str long) +@ stdcall CM_Get_Device_ID_List_SizeW(ptr wstr long) +@ stdcall CM_Get_Device_ID_List_Size_ExA(ptr str long long) +@ stdcall CM_Get_Device_ID_List_Size_ExW(ptr wstr long long) @ stub CM_Get_Device_ID_Size @ stub CM_Get_Device_ID_Size_Ex @ stub CM_Get_Device_Interface_AliasA @@ -190,8 +190,8 @@ @ stub CM_Unregister_Device_InterfaceW @ stub CM_Unregister_Device_Interface_ExA @ stub CM_Unregister_Device_Interface_ExW -@ stub CaptureAndConvertAnsiArg -@ stub CaptureStringArg +@ stdcall CaptureAndConvertAnsiArg(str ptr) +@ stdcall CaptureStringArg(wstr ptr) @ stub CenterWindowRelativeToParent @ stub ConcatenatePaths @ stdcall DelayedMove(wstr wstr) _____ Modified: trunk/reactos/lib/setupapi/stubs.c --- trunk/reactos/lib/setupapi/stubs.c 2005-02-16 15:27:30 UTC (rev 13594) +++ trunk/reactos/lib/setupapi/stubs.c 2005-02-16 15:44:34 UTC (rev 13595) @@ -90,41 +90,8 @@ return FALSE; } -/********************************************************************** * - * CM_Connect_MachineW (SETUPAPI.@) - */ -DWORD WINAPI CM_Connect_MachineW(LPCWSTR name, void * machine) -{ -#define CR_SUCCESS 0x00000000 -#define CR_ACCESS_DENIED 0x00000033 - FIXME("\n"); - return CR_ACCESS_DENIED; -} /*********************************************************************** - * CM_Disconnect_Machine (SETUPAPI.@) - */ -DWORD WINAPI CM_Disconnect_Machine(DWORD handle) -{ - FIXME("\n"); - return CR_SUCCESS; - -} - -/********************************************************************** * - * CM_Get_Device_ID_ListA (SETUPAPI.@) - */ - -DWORD WINAPI CM_Get_Device_ID_ListA( - PCSTR pszFilter, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags ) -{ - FIXME("%p %p %ld %ld\n", pszFilter, Buffer, BufferLen, ulFlags ); - memset(Buffer,0,2); - return CR_SUCCESS; -} - - -/********************************************************************** * * SetupCopyOEMInfA (SETUPAPI.@) */ BOOL WINAPI SetupCopyOEMInfA(PCSTR sourceinffile, PCSTR sourcemedialoc,

19 years, 10 months

[navaraf] 13594: File system drivers should forward the IRP_MJ_SHUTDOWN request to underlying storage drivers. Fixes bug #504.

by navaraf＠svn.reactos.com

File system drivers should forward the IRP_MJ_SHUTDOWN request to underlying storage drivers. Fixes bug #504. Modified: trunk/reactos/drivers/fs/vfat/shutdown.c _____ Modified: trunk/reactos/drivers/fs/vfat/shutdown.c --- trunk/reactos/drivers/fs/vfat/shutdown.c 2005-02-16 14:01:34 UTC (rev 13593) +++ trunk/reactos/drivers/fs/vfat/shutdown.c 2005-02-16 15:27:30 UTC (rev 13594) @@ -14,6 +14,34 @@ /* FUNCTIONS ****************************************************************/ +NTSTATUS +VfatDiskShutDown(PVCB Vcb) +{ + PIRP Irp; + KEVENT Event; + NTSTATUS Status; + IO_STATUS_BLOCK IoStatus; + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_SHUTDOWN, Vcb->StorageDevice, + NULL, 0, NULL, &Event, &IoStatus); + if (Irp) + { + Status = IoCallDriver(Vcb->StorageDevice, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IoStatus.Status; + } + } + else + { + Status = IoStatus.Status; + } + + return Status; +} + NTSTATUS STDCALL VfatShutdown(PDEVICE_OBJECT DeviceObject, PIRP Irp) { @@ -37,15 +65,24 @@ ExAcquireResourceExclusiveLite(&DeviceExt->DirResource, TRUE); Status = VfatFlushVolume(DeviceExt, DeviceExt->VolumeFcb); - ExReleaseResourceLite(&DeviceExt->DirResource); - if (!NT_SUCCESS(Status)) - { + if (NT_SUCCESS(Status)) + { + Status = VfatDiskShutDown(DeviceExt); + if (!NT_SUCCESS(Status)) + DPRINT1("VfatDiskShutDown failed, status = %x\n", Status); + } + else + { DPRINT1("VfatFlushVolume failed, status = %x\n", Status); - Irp->IoStatus.Status = Status; } + ExReleaseResourceLite(&DeviceExt->DirResource); + /* FIXME: Unmount the logical volume */ + + if (!NT_SUCCESS(Status)) + Irp->IoStatus.Status = Status; } - ExReleaseResourceLite(&VfatGlobalData->VolumeListLock); + ExReleaseResourceLite(&VfatGlobalData->VolumeListLock); /* FIXME: Free all global acquired resources */ @@ -53,13 +90,13 @@ } else { + Irp->IoStatus.Status = STATUS_INVALID_DEVICE_REQUEST; Status = STATUS_INVALID_DEVICE_REQUEST; } - Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); - IoCompleteRequest(Irp, IO_NO_INCREMENT); return(Status); }

19 years, 10 months

[weiden] 13593: converted libexpat to a static library

by weiden＠svn.reactos.com

converted libexpat to a static library Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/lib/expat/Makefile _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-02-16 03:17:36 UTC (rev 13592) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-02-16 14:01:34 UTC (rev 13593) @@ -74,7 +74,6 @@ lib\dinput8\dinput8.dll 1 lib\dsound\dsound.dll 1 lib\dxdiagn\dxdiagn.dll 1 -lib\expat\expat.dll 1 lib\fmifs\fmifs.dll 1 lib\freetype\freetype.dll 1 lib\gdi32\gdi32.dll 1 _____ Modified: trunk/reactos/lib/expat/Makefile --- trunk/reactos/lib/expat/Makefile 2005-02-16 03:17:36 UTC (rev 13592) +++ trunk/reactos/lib/expat/Makefile 2005-02-16 14:01:34 UTC (rev 13593) @@ -2,15 +2,13 @@ PATH_TO_TOP = ../.. +include $(PATH_TO_TOP)/config + TARGET_NAME = expat -TARGET_TYPE = dynlink -TARGET_BASE = $(TARGET_BASE_LIB_EXPAT) -TARGET_NORC = yes -TARGET_DEFONLY = yes -TARGET_DEFNAME = lib/libexpat +TARGET_TYPE = library -TARGET_CFLAGS = -D__USE_W32API -DHAVE_EXPAT_CONFIG_H -O2 -Wall -Wmissing-prototypes -Wstrict-prototypes -fexceptions +TARGET_CFLAGS = -D__USE_W32API -DHAVE_EXPAT_CONFIG_H -Wall -Wmissing-prototypes -Wstrict-prototypes -fexceptions TARGET_LFLAGS = -nostartfiles LIB_OBJECTS = \

19 years, 10 months

[sedwards] 13592: Add EOL to make gcc shutup.

by sedwards＠svn.reactos.com

Add EOL to make gcc shutup. Modified: trunk/rosapps/cmdutils/touch/various.h _____ Modified: trunk/rosapps/cmdutils/touch/various.h --- trunk/rosapps/cmdutils/touch/various.h 2005-02-16 00:24:12 UTC (rev 13591) +++ trunk/rosapps/cmdutils/touch/various.h 2005-02-16 03:17:36 UTC (rev 13592) @@ -52,4 +52,4 @@ //}; //#endif -#endif \ No newline at end of file +#endif

19 years, 10 months

[jimtabor] 13591: Update and sync Msiexec with Wine Cvs.

by jimtabor＠svn.reactos.com

Update and sync Msiexec with Wine Cvs. Modified: trunk/reactos/subsys/system/msiexec/Makefile Modified: trunk/reactos/subsys/system/msiexec/Makefile.in Modified: trunk/reactos/subsys/system/msiexec/msiexec.c _____ Modified: trunk/reactos/subsys/system/msiexec/Makefile --- trunk/reactos/subsys/system/msiexec/Makefile 2005-02-15 21:24:19 UTC (rev 13590) +++ trunk/reactos/subsys/system/msiexec/Makefile 2005-02-16 00:24:12 UTC (rev 13591) @@ -11,7 +11,16 @@ TARGET_CFLAGS = -I$(PATH_TO_TOP)/include/wine -D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0501 -D__USE_W32API TARGET_OBJECTS = msiexec.o -TARGET_SDKLIBS = msi.a ole32.a ntdll.a user32.a kernel32.a wine.a wine_uuid.a + +TARGET_SDKLIBS = wine.a \ + ntdll.a \ + kernel32.a \ + user32.a \ + advapi32.a \ + ole32.a \ + wine_uuid.a \ + msi.a + TARGET_RC_SRCS = version.rc TARGET_RC_BINSRC = _____ Modified: trunk/reactos/subsys/system/msiexec/Makefile.in --- trunk/reactos/subsys/system/msiexec/Makefile.in 2005-02-15 21:24:19 UTC (rev 13590) +++ trunk/reactos/subsys/system/msiexec/Makefile.in 2005-02-16 00:24:12 UTC (rev 13591) @@ -4,7 +4,7 @@ VPATH = @srcdir@ MODULE = msiexec.exe APPMODE = -mconsole -IMPORTS = msi ole32 user32 kernel32 +IMPORTS = msi ole32 advapi32 user32 kernel32 C_SRCS = \ msiexec.c _____ Modified: trunk/reactos/subsys/system/msiexec/msiexec.c --- trunk/reactos/subsys/system/msiexec/msiexec.c 2005-02-15 21:24:19 UTC (rev 13590) +++ trunk/reactos/subsys/system/msiexec/msiexec.c 2005-02-16 00:24:12 UTC (rev 13591) @@ -2,6 +2,7 @@ * msiexec.exe implementation * * Copyright 2004 Vincent BÚron + * Copyright 2005 Mike McCormack * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,9 +27,16 @@ #include "msiexec.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(msiexec); +struct string_list +{ + struct string_list *next; + WCHAR str[1]; +}; + static const char UsageStr[] = "Usage:\n" " Install a product:\n" @@ -58,86 +66,206 @@ "\n" "Copyright 2004 Vincent BÚron\n"; -static const char ActionAdmin[] = "ACTION=ADMIN "; -static const char RemoveAll[] = "REMOVE=ALL "; +static const WCHAR ActionAdmin[] = { + 'A','C','T','I','O','N','=','A','D','M','I','N',' ',0 }; +static const WCHAR RemoveAll[] = { + 'R','E','M','O','V','E','=','A','L','L',' ',0 }; +static const WCHAR InstallRunOnce[] = { + 'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'I','n','s','t','a','l','l','e','r','\\', + 'R','u','n','O','n','c','e','E','n','t','r','i','e','s',0}; + static void ShowUsage(int ExitCode) { printf(UsageStr); ExitProcess(ExitCode); } -static BOOL GetProductCode(LPCSTR str, LPCSTR *PackageName, LPGUID *ProductCode) +static BOOL IsProductCode(LPWSTR str) { - BOOL ret = FALSE; - int len = 0; - LPWSTR wstr = NULL; + GUID ProductCode; - if(strlen(str) == 38) + if(lstrlenW(str) != 38) + return FALSE; + return ( (CLSIDFromString(str, &ProductCode) == NOERROR) ); + +} + +static VOID StringListAppend(struct string_list **list, LPCWSTR str) +{ + struct string_list *entry; + DWORD size; + + size = sizeof *entry + lstrlenW(str) * sizeof (WCHAR); + entry = HeapAlloc(GetProcessHeap(), 0, size); + if(!entry) { - len = MultiByteToWideChar(CP_ACP, 0, str, -1, wstr, 0); - wstr = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR)); - ret = (CLSIDFromString(wstr, *ProductCode) == NOERROR); - HeapFree(GetProcessHeap(), 0, wstr); - wstr = NULL; + WINE_ERR("Out of memory!\n"); + ExitProcess(1); } + lstrcpyW(entry->str, str); + entry->next = NULL; - if(!ret) + /* + * Ignoring o(n^2) time complexity to add n strings for simplicity, + * add the string to the end of the list to preserve the order. + */ + while( *list ) + list = &(*list)->next; + *list = entry; +} + +static LPWSTR build_properties(struct string_list *property_list) +{ + struct string_list *list; + LPWSTR ret, p, value; + DWORD len; + BOOL needs_quote; + + if(!property_list) + return NULL; + + /* count the space we need */ + len = 1; + for(list = property_list; list; list = list->next) + len += lstrlenW(list->str) + 3; + + ret = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + + /* add a space before each string, and quote the value */ + p = ret; + for(list = property_list; list; list = list->next) { - HeapFree(GetProcessHeap(), 0, *ProductCode); - *ProductCode = NULL; - *PackageName = str; + value = strchrW(list->str,'='); + if(!value) + continue; + len = value - list->str; + *p++ = ' '; + strncpyW(p, list->str, len); + p += len; + *p++ = '='; + + /* check if the value contains spaces and maybe quote it */ + value++; + needs_quote = strchrW(value,' ') ? 1 : 0; + if(needs_quote) + *p++ = '"'; + len = lstrlenW(value); + strncpyW(p, value, len); + p += len; + if(needs_quote) + *p++ = '"'; } + *p = 0; + WINE_TRACE("properties -> %s\n", wine_dbgstr_w(ret) ); + return ret; } -static VOID StringListAppend(LPSTR *StringList, LPCSTR StringAppend) +static LPWSTR build_transforms(struct string_list *transform_list) { - LPSTR TempStr = HeapReAlloc(GetProcessHeap(), 0, *StringList, HeapSize(GetProcessHeap(), 0, *StringList)+strlen(StringAppend)); - if(!TempStr) + struct string_list *list; + LPWSTR ret, p; + DWORD len; + + /* count the space we need */ + len = 1; + for(list = transform_list; list; list = list->next) + len += lstrlenW(list->str) + 1; + + ret = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + + /* add all the transforms with a semicolon between each one */ + p = ret; + for(list = transform_list; list; list = list->next) { - WINE_ERR("Out of memory!\n"); - ExitProcess(1); + len = lstrlenW(list->str); + lstrcpynW(p, list->str, len ); + p += len; + if(list->next) + *p++ = ';'; } - *StringList = TempStr; - strcat(*StringList, StringAppend); + *p = 0; + + return ret; } -static VOID StringCompareRemoveLast(LPSTR String, CHAR character) +static DWORD msi_atou(LPCWSTR str) { - int len = strlen(String); - if(len && String[len-1] == character) String[len-1] = 0; + DWORD ret = 0; + while(*str >= '0' && *str <= '9') + { + ret *= 10; + ret += (*str - '0'); + str++; + } + return 0; } -static INT MSIEXEC_lstrncmpiA(LPCSTR str1, LPCSTR str2, INT size) +static LPWSTR msi_strdup(LPCWSTR str) { - INT ret; + DWORD len = lstrlenW(str)+1; + LPWSTR ret = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); + lstrcpyW(ret, str); + return ret; +} - if ((str1 == NULL) && (str2 == NULL)) return 0; - if (str1 == NULL) return -1; - if (str2 == NULL) return 1; +/* str1 is the same as str2, ignoring case */ +static BOOL msi_strequal(LPCWSTR str1, LPCSTR str2) +{ + DWORD len, ret; + LPWSTR strW; - ret = CompareStringA(GetThreadLocale(), NORM_IGNORECASE, str1, size, str2, -1); - if (ret) ret -= 2; + len = MultiByteToWideChar( CP_ACP, 0, str2, -1, NULL, 0); + if( !len ) + return TRUE; + if( lstrlenW(str1) != (len-1) ) + return TRUE; + strW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); + MultiByteToWideChar( CP_ACP, 0, str2, -1, strW, len); + ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, str1, len, strW, len); + HeapFree(GetProcessHeap(), 0, strW); + return (ret != CSTR_EQUAL); +} - return ret; +/* str2 is at the beginning of str1, ignoring case */ +static BOOL msi_strprefix(LPCWSTR str1, LPCSTR str2) +{ + DWORD len, ret; + LPWSTR strW; + + len = MultiByteToWideChar( CP_ACP, 0, str2, -1, NULL, 0); + if( !len ) + return TRUE; + if( lstrlenW(str1) < (len-1) ) + return TRUE; + strW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); + MultiByteToWideChar( CP_ACP, 0, str2, -1, strW, len); + ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, str1, len-1, strW, len-1); + HeapFree(GetProcessHeap(), 0, strW); + return (ret != CSTR_EQUAL); } -static VOID *LoadProc(LPCSTR DllName, LPCSTR ProcName, HMODULE* DllHandle) +static VOID *LoadProc(LPCWSTR DllName, LPCSTR ProcName, HMODULE* DllHandle) { VOID* (*proc)(void); - *DllHandle = LoadLibraryExA(DllName, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); + *DllHandle = LoadLibraryExW(DllName, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); if(!*DllHandle) { - fprintf(stderr, "Unable to load dll %s\n", DllName); + fprintf(stderr, "Unable to load dll %s\n", wine_dbgstr_w(DllName)); ExitProcess(1); } proc = (VOID *) GetProcAddress(*DllHandle, ProcName); if(!proc) { - fprintf(stderr, "Dll %s does not implement function %s\n", DllName, ProcName); + fprintf(stderr, "Dll %s does not implement function %s\n", + wine_dbgstr_w(DllName), ProcName); FreeLibrary(*DllHandle); ExitProcess(1); } @@ -145,7 +273,7 @@ return proc; } -static void DllRegisterServer(LPCSTR DllName) +static DWORD DllRegisterServer(LPCWSTR DllName) { HRESULT hr; DLLREGISTERSERVER pfDllRegisterServer = NULL; @@ -156,15 +284,16 @@ hr = pfDllRegisterServer(); if(FAILED(hr)) { - fprintf(stderr, "Failed to register dll %s\n", DllName); - ExitProcess(1); + fprintf(stderr, "Failed to register dll %s\n", wine_dbgstr_w(DllName)); + return 1; } - printf("Successfully registered dll %s\n", DllName); + printf("Successfully registered dll %s\n", wine_dbgstr_w(DllName)); if(DllHandle) FreeLibrary(DllHandle); + return 0; } -static void DllUnregisterServer(LPCSTR DllName) +static DWORD DllUnregisterServer(LPCWSTR DllName) { HRESULT hr; DLLUNREGISTERSERVER pfDllUnregisterServer = NULL; @@ -175,16 +304,134 @@ hr = pfDllUnregisterServer(); if(FAILED(hr)) { - fprintf(stderr, "Failed to unregister dll %s\n", DllName); - ExitProcess(1); + fprintf(stderr, "Failed to unregister dll %s\n", wine_dbgstr_w(DllName)); + return 1; } - printf("Successfully unregistered dll %s\n", DllName); + printf("Successfully unregistered dll %s\n", wine_dbgstr_w(DllName)); if(DllHandle) FreeLibrary(DllHandle); + return 0; } -int main(int argc, char *argv[]) +/* + * state machine to break up the command line properly + */ + +enum chomp_state { + cs_whitespace, + cs_token, + cs_quote +}; + +static int chomp( WCHAR *str ) +{ + enum chomp_state state = cs_whitespace; + WCHAR *p, *out; + int count = 0, ignore; + + for( p = str, out = str; *p; p++ ) + { + ignore = 1; + switch( state ) + { + case cs_whitespace: + switch( *p ) + { + case ' ': + break; + case '"': + state = cs_quote; + count++; + break; + default: + count++; + ignore = 0; + state = cs_token; + } + break; + + case cs_token: + switch( *p ) + { + case '"': + state = cs_quote; + break; + case ' ': + state = cs_whitespace; + *out++ = 0; + break; + default: + ignore = 0; + } + break; + + case cs_quote: + switch( *p ) + { + case '"': + state = cs_token; + break; + default: + ignore = 0; + } + break; + } + if( !ignore ) + *out++ = *p; + } + + *out = 0; + + return count; +} + +void process_args( WCHAR *cmdline, int *pargc, WCHAR ***pargv ) +{ + WCHAR **argv, *p = msi_strdup(cmdline); + int i, n; + + n = chomp( p ); + argv = HeapAlloc(GetProcessHeap(), 0, sizeof (WCHAR*)*(n+1)); + for( i=0; i<n; i++ ) + { + argv[i] = p; + p += lstrlenW(p) + 1; + } + argv[i] = NULL; + + *pargc = n; + *pargv = argv; +} + +BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR ***pargv ) +{ + LONG r; + HKEY hkey = 0, hkeyArgs = 0; + DWORD sz = 0, type = 0; + LPWSTR buf = NULL; + BOOL ret = FALSE; + + r = RegOpenKeyW(HKEY_LOCAL_MACHINE, InstallRunOnce, &hkey); + if(r != ERROR_SUCCESS) + return FALSE; + r = RegQueryValueExW(hkey, ident, 0, &type, 0, &sz); + if(r == ERROR_SUCCESS && type == REG_SZ) + { + buf = HeapAlloc(GetProcessHeap(), 0, sz); + r = RegQueryValueExW(hkey, ident, 0, &type, (LPBYTE)buf, &sz); + if( r == ERROR_SUCCESS ) + { + process_args(buf, pargc, pargv); + ret = TRUE; + } + } + RegCloseKey(hkeyArgs); + return ret; +} + +int main(int argc, char **argv) +{ int i; BOOL FunctionInstall = FALSE; BOOL FunctionInstallAdmin = FALSE; @@ -197,59 +444,74 @@ BOOL FunctionUnregServer = FALSE; BOOL FunctionUnknown = FALSE; - BOOL GotProductCode = FALSE; - LPCSTR PackageName = NULL; - LPGUID ProductCode = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID)); - LPSTR Properties = HeapAlloc(GetProcessHeap(), 0, 1); + LPWSTR PackageName = NULL; + LPWSTR Properties = NULL; + struct string_list *property_list = NULL; DWORD RepairMode = 0; DWORD AdvertiseMode = 0; - LPSTR Transforms = HeapAlloc(GetProcessHeap(), 0, 1); + LPWSTR Transforms = NULL; + struct string_list *transform_list = NULL; LANGID Language = 0; DWORD LogMode = 0; - LPSTR LogFileName = NULL; + LPWSTR LogFileName = NULL; DWORD LogAttributes = 0; - LPSTR PatchFileName = NULL; + LPWSTR PatchFileName = NULL; INSTALLTYPE InstallType = INSTALLTYPE_DEFAULT; - INSTALLUILEVEL InstallUILevel = 0, retInstallUILevel; + INSTALLUILEVEL InstallUILevel = INSTALLUILEVEL_FULL; - LPSTR DllName = NULL; + LPWSTR DllName = NULL; + DWORD ReturnCode; + LPWSTR *argvW = NULL; - Properties[0] = 0; - Transforms[0] = 0; + /* overwrite the command line */ + process_args( GetCommandLineW(), &argc, &argvW ); + /* + * If the args begin with /@ IDENT then we need to load the real + * command line out of the RunOnceEntries key in the registry. + * We do that before starting to process the real commandline, + * then overwrite the commandline again. + */ + if(!msi_strequal(argvW[1], "/@")) + { + if(!process_args_from_reg( argvW[2], &argc, &argvW )) + return 1; + } + for(i = 1; i < argc; i++) { - WINE_TRACE("argv[%d] = %s\n", i, argv[i]); + WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); - if (!lstrcmpiA(argv[i], "/regserver")) - { - FunctionRegServer = TRUE; - } - else if (!lstrcmpiA(argv[i], "/unregserver") || !lstrcmpiA(argv[i], "/unregister")) - { - FunctionUnregServer = TRUE; - } - else if(!MSIEXEC_lstrncmpiA(argv[i], "/i", 2)) + if (!msi_strequal(argvW[i], "/regserver")) { - char *argvi = argv[i]; + FunctionRegServer = TRUE; + } + else if (!msi_strequal(argvW[i], "/unregserver") || !msi_strequal(argvW[i], "/unregister")) + { + FunctionUnregServer = TRUE; + } + else if(!msi_strprefix(argvW[i], "/i")) + { + LPWSTR argvWi = argvW[i]; FunctionInstall = TRUE; - if(strlen(argvi) > 2) - argvi += 2; - else { + if(lstrlenW(argvWi) > 2) + argvWi += 2; + else + { i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argv[%d] = %s\n", i, argv[i]); - argvi = argv[i]; + WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); + argvWi = argvW[i]; } - GotProductCode = GetProductCode(argvi, &PackageName, &ProductCode); + PackageName = argvWi; } - else if(!lstrcmpiA(argv[i], "/a")) + else if(!msi_strequal(argvW[i], "/a")) { FunctionInstall = TRUE; FunctionInstallAdmin = TRUE; @@ -257,18 +519,18 @@ i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argv[%d] = %s\n", i, argv[i]); - PackageName = argv[i]; - StringListAppend(&Properties, ActionAdmin); + WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); + PackageName = argvW[i]; + StringListAppend(&property_list, ActionAdmin); } - else if(!MSIEXEC_lstrncmpiA(argv[i], "/f", 2)) + else if(!msi_strprefix(argvW[i], "/f")) { int j; - int len = strlen(argv[i]); + int len = lstrlenW(argvW[i]); FunctionRepair = TRUE; for(j = 2; j < len; j++) { - switch(argv[i][j]) + switch(argvW[i][j]) { case 'P': case 'p': @@ -311,7 +573,7 @@ RepairMode |= REINSTALLMODE_PACKAGE; break; default: - fprintf(stderr, "Unknown option \"%c\" in Repair mode\n", argv[i][j]); + fprintf(stderr, "Unknown option \"%c\" in Repair mode\n", argvW[i][j]); break; } } @@ -326,27 +588,27 @@ i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argv[%d] = %s\n", i, argv[i]); - GotProductCode = GetProductCode(argv[i], &PackageName, &ProductCode); + WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); + PackageName = argvW[i]; } - else if(!lstrcmpiA(argv[i], "/x")) + else if(!msi_strequal(argvW[i], "/x")) { FunctionInstall = TRUE; i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argv[%d] = %s\n", i, argv[i]); - GotProductCode = GetProductCode(argv[i], &PackageName, &ProductCode); - StringListAppend(&Properties, RemoveAll); + WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); + PackageName = argvW[i]; + StringListAppend(&property_list, RemoveAll); } - else if(!MSIEXEC_lstrncmpiA(argv[i], "/j", 2)) + else if(!msi_strprefix(argvW[i], "/j")) { int j; - int len = strlen(argv[i]); + int len = lstrlenW(argvW[i]); FunctionAdvertise = TRUE; for(j = 2; j < len; j++) { - switch(argv[i][j]) + switch(argvW[i][j]) { case 'U': case 'u': @@ -357,65 +619,63 @@ AdvertiseMode = ADVERTISEFLAGS_MACHINEASSIGN; break; default: - fprintf(stderr, "Unknown option \"%c\" in Advertise mode\n", argv[i][j]); + fprintf(stderr, "Unknown option \"%c\" in Advertise mode\n", argvW[i][j]); break; } } i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argv[%d] = %s\n", i, argv[i]); - PackageName = argv[i]; + WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); + PackageName = argvW[i]; } - else if(!lstrcmpiA(argv[i], "u")) + else if(!msi_strequal(argvW[i], "u")) { FunctionAdvertise = TRUE; AdvertiseMode = ADVERTISEFLAGS_USERASSIGN; i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argv[%d] = %s\n", i, argv[i]); - PackageName = argv[i]; + WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); + PackageName = argvW[i]; } - else if(!lstrcmpiA(argv[i], "m")) + else if(!msi_strequal(argvW[i], "m")) { FunctionAdvertise = TRUE; AdvertiseMode = ADVERTISEFLAGS_MACHINEASSIGN; i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argv[%d] = %s\n", i, argv[i]); - PackageName = argv[i]; + WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); + PackageName = argvW[i]; } - else if(!lstrcmpiA(argv[i], "/t")) + else if(!msi_strequal(argvW[i], "/t")) { i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argv[%d] = %s\n", i, argv[i]); - StringListAppend(&Transforms, argv[i]); - StringListAppend(&Transforms, ";"); + WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); + StringListAppend(&transform_list, argvW[i]); } - else if(!MSIEXEC_lstrncmpiA(argv[i], "TRANSFORMS=", 11)) + else if(!msi_strprefix(argvW[i], "TRANSFORMS=")) { - StringListAppend(&Transforms, argv[i]+11); - StringListAppend(&Transforms, ";"); + StringListAppend(&transform_list, argvW[i]+11); } - else if(!lstrcmpiA(argv[i], "/g")) + else if(!msi_strequal(argvW[i], "/g")) { i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argv[%d] = %s\n", i, argv[i]); - Language = strtol(argv[i], NULL, 0); + WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); + Language = msi_atou(argvW[i]); } - else if(!MSIEXEC_lstrncmpiA(argv[i], "/l", 2)) + else if(!msi_strprefix(argvW[i], "/l")) { int j; - int len = strlen(argv[i]); + int len = lstrlenW(argvW[i]); for(j = 2; j < len; j++) { - switch(argv[i][j]) + switch(argvW[i][j]) { case 'I': case 'i': @@ -491,174 +751,147 @@ i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argv[%d] = %s\n", i, argv[i]); - LogFileName = argv[i]; - if(MsiEnableLogA(LogMode, LogFileName, LogAttributes) != ERROR_SUCCESS) + WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); + LogFileName = argvW[i]; + if(MsiEnableLogW(LogMode, LogFileName, LogAttributes) != ERROR_SUCCESS) { - fprintf(stderr, "Logging in %s (0x%08lx, %lu) failed\n", LogFileName, LogMode, LogAttributes); + fprintf(stderr, "Logging in %s (0x%08lx, %lu) failed\n", + wine_dbgstr_w(LogFileName), LogMode, LogAttributes); ExitProcess(1); } } - else if(!lstrcmpiA(argv[i], "/p")) + else if(!msi_strequal(argvW[i], "/p")) { FunctionPatch = TRUE; i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argv[%d] = %s\n", i, argv[i]); - PatchFileName = argv[i]; + WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); + PatchFileName = argvW[i]; } - else if(!MSIEXEC_lstrncmpiA(argv[i], "/q", 2)) + else if(!msi_strprefix(argvW[i], "/q")) { - if(strlen(argv[i]) == 2 || !lstrcmpiA(argv[i]+2, "n")) + if(lstrlenW(argvW[i]) == 2 || !msi_strequal(argvW[i]+2, "n")) { InstallUILevel = INSTALLUILEVEL_NONE; } - else if(!lstrcmpiA(argv[i]+2, "b")) + else if(!msi_strequal(argvW[i]+2, "b")) { InstallUILevel = INSTALLUILEVEL_BASIC; } - else if(!lstrcmpiA(argv[i]+2, "r")) + else if(!msi_strequal(argvW[i]+2, "r")) { InstallUILevel = INSTALLUILEVEL_REDUCED; } - else if(!lstrcmpiA(argv[i]+2, "f")) + else if(!msi_strequal(argvW[i]+2, "f")) { InstallUILevel = INSTALLUILEVEL_FULL|INSTALLUILEVEL_ENDDIALOG; } - else if(!lstrcmpiA(argv[i]+2, "n+")) + else if(!msi_strequal(argvW[i]+2, "n+")) { InstallUILevel = INSTALLUILEVEL_NONE|INSTALLUILEVEL_ENDDIALOG; } - else if(!lstrcmpiA(argv[i]+2, "b+")) + else if(!msi_strequal(argvW[i]+2, "b+")) { InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG; } - else if(!lstrcmpiA(argv[i]+2, "b-")) + else if(!msi_strequal(argvW[i]+2, "b-")) { InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY; } - else if(!lstrcmpiA(argv[i]+2, "b+!")) - { + else if(!msi_strequal(argvW[i]+2, "b+!")) + { InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG; WINE_FIXME("Unknown modifier: !\n"); } else { - fprintf(stderr, "Unknown option \"%s\" for UI level\n", argv[i]+2); + fprintf(stderr, "Unknown option \"%s\" for UI level\n", + wine_dbgstr_w(argvW[i]+2)); } - retInstallUILevel = MsiSetInternalUI(InstallUILevel, NULL); - if(retInstallUILevel == INSTALLUILEVEL_NOCHANGE) - { - fprintf(stderr, "Setting the UI level to 0x%x failed.\n", InstallUILevel); - ExitProcess(1); - } } - else if(!lstrcmpiA(argv[i], "/y")) + else if(!msi_strequal(argvW[i], "/y")) { FunctionDllRegisterServer = TRUE; i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argv[%d] = %s\n", i, argv[i]); - DllName = argv[i]; + WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); + DllName = argvW[i]; } - else if(!lstrcmpiA(argv[i], "/z")) + else if(!msi_strequal(argvW[i], "/z")) { FunctionDllUnregisterServer = TRUE; i++; if(i >= argc) ShowUsage(1); - WINE_TRACE("argv[%d] = %s\n", i, argv[i]); - DllName = argv[i]; + WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); + DllName = argvW[i]; } - else if(!lstrcmpiA(argv[i], "/h") || !lstrcmpiA(argv[i], "/?")) + else if(!msi_strequal(argvW[i], "/h") || !msi_strequal(argvW[i], "/?")) { ShowUsage(0); } - else if(!lstrcmpiA(argv[i], "/m")) + else if(!msi_strequal(argvW[i], "/m")) { FunctionUnknown = TRUE; WINE_FIXME("Unknown parameter /m\n"); } - else if(!lstrcmpiA(argv[i], "/D")) + else if(!msi_strequal(argvW[i], "/D")) { FunctionUnknown = TRUE; WINE_FIXME("Unknown parameter /D\n"); } - else if(strchr(argv[i], '=')) + else if(strchrW(argvW[i], '=')) { - StringListAppend(&Properties, argv[i]); - StringListAppend(&Properties, " "); + StringListAppend(&property_list, argvW[i]); } else { FunctionInstall = TRUE; - GotProductCode = GetProductCode(argv[i], &PackageName, &ProductCode); + PackageName = argvW[i]; } } - StringCompareRemoveLast(Properties, ' '); - StringCompareRemoveLast(Transforms, ';'); + /* start the GUI */ + MsiSetInternalUI(InstallUILevel, NULL); + Properties = build_properties( property_list ); + Transforms = build_transforms( transform_list ); + if(FunctionInstallAdmin && FunctionPatch) FunctionInstall = FALSE; + ReturnCode = 1; if(FunctionInstall) { - if(GotProductCode) - { - WINE_FIXME("Product code treatment not implemented yet\n"); - ExitProcess(1); - } + if(IsProductCode(PackageName)) + ReturnCode = MsiConfigureProductExW(PackageName, 0, INSTALLSTATE_DEFAULT, Properties); else - { - if(MsiInstallProductA(PackageName, Properties) != ERROR_SUCCESS) - { - fprintf(stderr, "Installation of %s (%s) failed.\n", PackageName, Properties); - ExitProcess(1); - } - } + ReturnCode = MsiInstallProductW(PackageName, Properties); } else if(FunctionRepair) { - if(GotProductCode) - { + if(IsProductCode(PackageName)) WINE_FIXME("Product code treatment not implemented yet\n"); - ExitProcess(1); - } else - { - if(MsiReinstallProductA(PackageName, RepairMode) != ERROR_SUCCESS) - { - fprintf(stderr, "Repair of %s (0x%08lx) failed.\n", PackageName, RepairMode); - ExitProcess(1); - } - } + ReturnCode = MsiReinstallProductW(PackageName, RepairMode); } else if(FunctionAdvertise) { - if(MsiAdvertiseProductA(PackageName, (LPSTR) AdvertiseMode, Transforms, Language) != ERROR_SUCCESS) - { - fprintf(stderr, "Advertising of %s (%lu, %s, 0x%04x) failed.\n", PackageName, AdvertiseMode, Transforms, Language); - ExitProcess(1); - } + ReturnCode = MsiAdvertiseProductW(PackageName, (LPWSTR) AdvertiseMode, Transforms, Language); } else if(FunctionPatch) { - if(MsiApplyPatchA(PatchFileName, PackageName, InstallType, Properties) != ERROR_SUCCESS) - { - fprintf(stderr, "Patching with %s (%s, %d, %s)\n", PatchFileName, PackageName, InstallType, Properties); - ExitProcess(1); - } + ReturnCode = MsiApplyPatchW(PatchFileName, PackageName, InstallType, Properties); } else if(FunctionDllRegisterServer) { - DllRegisterServer(DllName); + ReturnCode = DllRegisterServer(DllName); } else if(FunctionDllUnregisterServer) { - DllUnregisterServer(DllName); + ReturnCode = DllUnregisterServer(DllName); } else if (FunctionRegServer) { @@ -675,5 +908,5 @@ else ShowUsage(1); - return 0; + return ReturnCode; }

19 years, 10 months

[chorns] 13590: Merge 13159:13510 from trunk

by chorns＠svn.reactos.com

Merge 13159:13510 from trunk Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/ReactOS.xml Modified: branches/xmlbuildsystem/reactos/apps/utils/Makefile Modified: branches/xmlbuildsystem/reactos/apps/utils/net/directory.xml Added: branches/xmlbuildsystem/reactos/apps/utils/net/ftp/ Added: branches/xmlbuildsystem/reactos/apps/utils/net/ftp/ftp.xml Modified: branches/xmlbuildsystem/reactos/apps/utils/net/ping/ping.c Added: branches/xmlbuildsystem/reactos/apps/utils/net/route/route.xml Added: branches/xmlbuildsystem/reactos/apps/utils/net/tracert/ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/whois/whois.rc Modified: branches/xmlbuildsystem/reactos/apps/utils/objdir/objdir.c Added: branches/xmlbuildsystem/reactos/apps/utils/rosperf/ Modified: branches/xmlbuildsystem/reactos/apps/utils/shutdown/shutdown.c Modified: branches/xmlbuildsystem/reactos/apps/utils/tickcount/makefile Modified: branches/xmlbuildsystem/reactos/apps/utils/tickcount/tickcount.c Modified: branches/xmlbuildsystem/reactos/baseaddress.cfg Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/CHANGELOG Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/Makefile Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/archmach. c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hardware. c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hardware. h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/i386disk. c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/i386rtl.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/machpc.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/machxbox. h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/mb.S Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/portio.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/xboxcons. c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk. c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/xboxfont. c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/xboxrtc.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/xboxvideo .c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/bootmgr.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/cache/blocklist.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/cache/cache.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/cache/cm.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/cmdline.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/comm/rs232.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/custom.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/debug.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/disk/disk.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/disk/partition.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/drivemap.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/freeldr.xml Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/freeldr_base.xml Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/freeldr_base64k.xml Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/freeldr_main.xml Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/freeldr_startup.xml Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/fs/ext2.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/fs/ext2.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/fs/fat.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/fs/fat.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/fs/fs.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/fs/fsrec.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/fs/fsrec.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/fs/iso.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/fs/iso.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/fs/ntfs.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/fs/ntfs.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/bootmgr.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/cache.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/cmdline.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/comm.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/debug.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/disk.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/drivemap.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/freeldr.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/fs.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/inffile.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/inifile.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/linux.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/machine.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/mm.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/multiboot.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/oslist.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/portio.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/reactos.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/rtl.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/ui.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/version.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/video.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/inffile/inffile.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/inifile/ini.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/inifile/ini_init.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/inifile/inifile.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/inifile/parse.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/linuxboot.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/machine.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/miscboot.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/mm/mem.h [truncated at 100 lines; 1237 more skipped] _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-02-15 20:55:59 UTC (rev 13589) +++ branches/xmlbuildsystem/reactos/Makefile 2005-02-15 21:24:19 UTC (rev 13590) @@ -26,23 +26,21 @@ ${nmkdir} $(ROS_INTERMEDIATE) endif -Makefile.auto: rmkdir buildno wmc rbuild +include tools/Makefile +-include Makefile.auto + +Makefile.auto: $(RMKDIR_TARGET) $(BUILDNO_TARGET) $(NCI_SERVICE_FILES) $(WMC_TARGET) $(RBUILD_TARGET) tools$(SEP)rbuild$(SEP)rbuild$(EXEPOSTFIX) mingw -# $(MAKE) $(MAKECMDGOALS) + $(MAKE) $(MAKECMDGOALS) -init:: \ +init: \ include$(SEP)reactos$(SEP)bugcodes.h \ ntoskrnl$(SEP)bugcodes.rc \ include$(SEP)reactos$(SEP)errcodes.h \ lib$(SEP)kernel32$(SEP)errcodes.rc -include$(SEP)reactos$(SEP)bugcodes.h ntoskrnl$(SEP)bugcodes.rc: ntoskrnl$(SEP)ntoskrnl.mc - $(WMC_TARGET) -H include$(SEP)reactos$(SEP)bugcodes.h -o ntoskrnl$(SEP)bugcodes.rc bugcodes$(SEP)ntoskrnl.mc +include$(SEP)reactos$(SEP)bugcodes.h ntoskrnl$(SEP)bugcodes.rc: $(WMC_TARGET) ntoskrnl$(SEP)ntoskrnl.mc + $(WMC_TARGET) -H include$(SEP)reactos$(SEP)bugcodes.h -o ntoskrnl$(SEP)bugcodes.rc ntoskrnl$(SEP)ntoskrnl.mc -include$(SEP)reactos$(SEP)errcodes.h lib$(SEP)kernel32$(SEP)errcodes.rc: lib$(SEP)kernel32$(SEP)kernel32.mc +include$(SEP)reactos$(SEP)errcodes.h lib$(SEP)kernel32$(SEP)errcodes.rc: $(WMC_TARGET) lib$(SEP)kernel32$(SEP)kernel32.mc $(WMC_TARGET) -H include$(SEP)reactos$(SEP)errcodes.h -o lib$(SEP)kernel32$(SEP)errcodes.rc lib$(SEP)kernel32$(SEP)kernel32.mc - -include tools/Makefile -include tools/rbuild/makefile - -#-include Makefile.auto _____ Modified: branches/xmlbuildsystem/reactos/ReactOS.xml --- branches/xmlbuildsystem/reactos/ReactOS.xml 2005-02-15 20:55:59 UTC (rev 13589) +++ branches/xmlbuildsystem/reactos/ReactOS.xml 2005-02-15 21:24:19 UTC (rev 13590) @@ -36,14 +36,6 @@ <directory name="hal"> <xi:include href="hal/directory.xml" /> </directory> - <directory name="iface"> - <directory name="addsys"> - <xi:include href="iface/addsys/addsys.xml" /> - </directory> - <directory name="native"> - <xi:include href="iface/native/genntdll.xml" /> - </directory> - </directory> <directory name="lib"> <xi:include href="lib/directory.xml" /> </directory> _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/Makefile --- branches/xmlbuildsystem/reactos/apps/utils/Makefile 2005-02-15 20:55:59 UTC (rev 13589) +++ branches/xmlbuildsystem/reactos/apps/utils/Makefile 2005-02-15 21:24:19 UTC (rev 13590) @@ -11,7 +11,7 @@ # cabman cat net objdir partinfo pice ps sc stats UTIL_APPS = cat objdir partinfo pnpdump sc shutdown stats tickcount consw rundll32 ps -UTIL_NET_APPS = arp finger ipconfig netstat ping route telnet whois +UTIL_NET_APPS = arp finger ftp ipconfig netstat ping route telnet whois all: $(UTIL_APPS) $(UTIL_NET_APPS) _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/directory.xml --- branches/xmlbuildsystem/reactos/apps/utils/net/directory.xml 2005-02-15 20:55:59 UTC (rev 13589) +++ branches/xmlbuildsystem/reactos/apps/utils/net/directory.xml 2005-02-15 21:24:19 UTC (rev 13590) @@ -4,6 +4,9 @@ <directory name="finger"> <xi:include href="finger/finger.xml" /> </directory> +<directory name="ftp"> + <xi:include href="ftp/ftp.xml" /> +</directory> <directory name="ipconfig"> <xi:include href="ipconfig/ipconfig.xml" /> </directory> @@ -13,6 +16,9 @@ <directory name="ping"> <xi:include href="ping/ping.xml" /> </directory> +<directory name="route"> + <xi:include href="route/route.xml" /> +</directory> <directory name="telnet"> <xi:include href="telnet/telnet.xml" /> </directory> _____ Copied: branches/xmlbuildsystem/reactos/apps/utils/net/ftp (from rev 13510, trunk/reactos/apps/utils/net/ftp) Property changes on: branches/xmlbuildsystem/reactos/apps/utils/net/ftp ___________________________________________________________________ Name: svn:ignore + *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.map _____ Added: branches/xmlbuildsystem/reactos/apps/utils/net/ftp/ftp.xml --- trunk/reactos/apps/utils/net/ftp/ftp.xml 2005-02-12 16:47:02 UTC (rev 13510) +++ branches/xmlbuildsystem/reactos/apps/utils/net/ftp/ftp.xml 2005-02-15 21:24:19 UTC (rev 13590) @@ -0,0 +1,15 @@ +<module name="ftp" type="win32cui"> + <include base="ftp">.</include> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>ws2_32</library> + <library>iphlpapi</library> + <file>cmds.c</file> + <file>cmdtab.c</file> + <file>domacro.c</file> + <file>fake.c</file> + <file>ftp.c</file> + <file>main.c</file> + <file>ruserpass.c</file> + <file>ftp.rc</file> +</module> _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/ping/ping.c --- branches/xmlbuildsystem/reactos/apps/utils/net/ping/ping.c 2005-02-15 20:55:59 UTC (rev 13589) +++ branches/xmlbuildsystem/reactos/apps/utils/net/ping/ping.c 2005-02-15 21:24:19 UTC (rev 13590) @@ -331,7 +331,7 @@ } if (phe != NULL) { - CopyMemory(&Target.sin_addr, phe->h_addr_list, phe->h_length); + CopyMemory(&Target.sin_addr, phe->h_addr, phe->h_length); } else { Target.sin_addr.s_addr = Addr; } @@ -391,19 +391,9 @@ LARGE_INTEGER LargeTime; LargeTime.QuadPart = Time.QuadPart / TicksPerMs.QuadPart; + _i64toa(LargeTime.QuadPart, Convstr, 10); strcpy(String, Convstr); - strcat(String, ","); - - LargeTime.QuadPart = (Time.QuadPart % TicksPerMs.QuadPart) / TicksPerUs.QuadPart; - _i64toa(LargeTime.QuadPart, Convstr, 10); - Length = strlen(Convstr); - if (Length < 4) { - for (i = 0; i < 4 - Length; i++) - strcat(String, "0"); - } - - strcat(String, Convstr); strcat(String, "ms"); } @@ -417,6 +407,7 @@ CHAR Time[100]; LARGE_INTEGER RelativeTime; LARGE_INTEGER LargeTime; + CHAR Sign[1]; IpHeader = (PIPv4_HEADER)buffer; @@ -449,10 +440,17 @@ RelativeTime.QuadPart = (LargeTime.QuadPart - Icmp->Timestamp.QuadPart); - TimeToMsString(Time, RelativeTime); + if ((RelativeTime.QuadPart / TicksPerMs.QuadPart) < 1) { + strcpy(Sign, "<"); + strcpy(Time, "1ms"); + } else { + strcpy(Sign, "="); + TimeToMsString(Time, RelativeTime); + } - printf("Reply from %s: bytes=%d time=%s TTL=%d\n", inet_ntoa(from->sin_addr), - size - IphLength - sizeof(ICMP_ECHO_PACKET), Time, IpHeader->TTL); + + printf("Reply from %s: bytes=%d time%s%s TTL=%d\n", inet_ntoa(from->sin_addr), + size - IphLength - sizeof(ICMP_ECHO_PACKET), Sign, Time, IpHeader->TTL); if (RelativeTime.QuadPart < MinRTT.QuadPart) { MinRTT.QuadPart = RelativeTime.QuadPart; MinRTTSet = TRUE; _____ Added: branches/xmlbuildsystem/reactos/apps/utils/net/route/route.xml --- branches/xmlbuildsystem/reactos/apps/utils/net/route/route.xml 2005-02-15 20:55:59 UTC (rev 13589) +++ branches/xmlbuildsystem/reactos/apps/utils/net/route/route.xml 2005-02-15 21:24:19 UTC (rev 13590) @@ -0,0 +1,8 @@ +<module name="route" type="win32cui"> + <include base="route">.</include> + <library>kernel32</library> + <library>ws2_32</library> + <library>iphlpapi</library> + <file>route.c</file> + <file>route.rc</file> +</module> _____ Copied: branches/xmlbuildsystem/reactos/apps/utils/net/tracert (from rev 13510, trunk/reactos/apps/utils/net/tracert) _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/whois/whois.rc --- branches/xmlbuildsystem/reactos/apps/utils/net/whois/whois.rc 2005-02-15 20:55:59 UTC (rev 13589) +++ branches/xmlbuildsystem/reactos/apps/utils/net/whois/whois.rc 2005-02-15 21:24:19 UTC (rev 13590) @@ -3,5 +3,4 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS TCP/IPv4 Win32 Whois\0" #define REACTOS_STR_INTERNAL_NAME "whois\0" #define REACTOS_STR_ORIGINAL_FILENAME "whois.exe\0" -#define REACTOS_STR_ORIGINAL_COPYRIGHT "Steven Edwards (Isolation(a)users.sourceforge.net)\0" #include <reactos/version.rc> _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/objdir/objdir.c --- branches/xmlbuildsystem/reactos/apps/utils/objdir/objdir.c 2005-02-15 20:55:59 UTC (rev 13589) +++ branches/xmlbuildsystem/reactos/apps/utils/objdir/objdir.c 2005-02-15 21:24:19 UTC (rev 13590) @@ -79,10 +79,14 @@ return "STATUS_PATH_SYNTAX_BAD"; case STATUS_NO_MORE_ENTRIES: return "STATUS_NO_MORE_ENTRIES"; + case STATUS_MORE_ENTRIES: + return "STATUS_MORE_ENTRIES"; case STATUS_ACCESS_DENIED: return "STATUS_ACCESS_DENIED"; case STATUS_UNSUCCESSFUL: return "STATUS_UNSUCCESSFUL"; + case STATUS_INVALID_HANDLE: + return "STATUS_INVALID_HANDLE"; } sprintf (RawValue, "0x%08lx", Status); return (const char *) RawValue; @@ -173,8 +177,9 @@ OBJECT_ATTRIBUTES ObjectAttributes; NTSTATUS Status; HANDLE DirectoryHandle; - BYTE DirectoryEntry [MAX_DIR_ENTRY * sizeof(DIRECTORY_BASIC_INFORMATION)]; - PDIRECTORY_BASIC_INFORMATION pDirectoryEntry = (PDIRECTORY_BASIC_INFORMATION) DirectoryEntry; + BYTE DirectoryEntry [512]; + POBJECT_DIRECTORY_INFORMATION pDirectoryEntry = (POBJECT_DIRECTORY_INFORMATION) DirectoryEntry; + POBJECT_DIRECTORY_INFORMATION pDirectoryEntries = (POBJECT_DIRECTORY_INFORMATION) DirectoryEntry; ULONG Context = 0; ULONG ReturnLength = 0; ULONG EntryCount = 0; @@ -217,25 +222,23 @@ return (FALSE); } printf ("\n Directory of %s\n\n", DirectoryNameA); + + for(;;) + { /* * Enumerate each item in the directory. */ Status = NtQueryDirectoryObject ( DirectoryHandle, - pDirectoryEntry, + pDirectoryEntries, sizeof DirectoryEntry, FALSE,/* ReturnSingleEntry */ - TRUE, /* RestartScan */ + FALSE, /* RestartScan */ & Context, & ReturnLength ); - if (!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status) && Status != STATUS_NO_MORE_ENTRIES) { - if (STATUS_NO_MORE_ENTRIES == Status) - { - NtClose (DirectoryHandle); - return TRUE; - } printf ( "Failed to query directory object (Status: %s)\n", StatusToName (Status) @@ -243,12 +246,17 @@ NtClose (DirectoryHandle); return (FALSE); } - while (0 != pDirectoryEntry->ObjectTypeName.Length) + if (Status == STATUS_NO_MORE_ENTRIES) { + break; + } + pDirectoryEntry = pDirectoryEntries; + while (EntryCount < Context) + { CHAR ObjectNameA [MAX_PATH]; CHAR TypeNameA [MAX_PATH]; CHAR TargetNameA [MAX_PATH]; - + if (0 == wcscmp (L"SymbolicLink", pDirectoryEntry->ObjectTypeName.Buffer)) { if (TRUE == ExpandSymbolicLink ( @@ -258,7 +266,7 @@ ) ) { - + printf ( "%-16s %s -> %s\n", RawUszAsz (pDirectoryEntry->ObjectTypeName.Buffer, TypeNameA), @@ -283,9 +291,10 @@ RawUszAsz (pDirectoryEntry->ObjectName.Buffer, ObjectNameA) ); } + ++ pDirectoryEntry; ++ EntryCount; - ++ pDirectoryEntry; } + }; printf ("\n\t%lu object(s)\n", EntryCount); /* * Free any resource. @@ -296,7 +305,7 @@ */ if (FALSE != Recurse) { - pDirectoryEntry = (PDIRECTORY_BASIC_INFORMATION) DirectoryEntry; + pDirectoryEntry = (POBJECT_DIRECTORY_INFORMATION) DirectoryEntry; while (0 != pDirectoryEntry->ObjectTypeName.Length) { if (0 == wcscmp (L"Directory", pDirectoryEntry->ObjectTypeName.Buffer)) _____ Copied: branches/xmlbuildsystem/reactos/apps/utils/rosperf (from rev 13510, trunk/reactos/apps/utils/rosperf) Property changes on: branches/xmlbuildsystem/reactos/apps/utils/rosperf ___________________________________________________________________ Name: svn:ignore + *.o *.a *.d *.exe *.coff *.sym *.map _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/shutdown/shutdown.c --- branches/xmlbuildsystem/reactos/apps/utils/shutdown/shutdown.c 2005-02-15 20:55:59 UTC (rev 13589) +++ branches/xmlbuildsystem/reactos/apps/utils/shutdown/shutdown.c 2005-02-15 21:24:19 UTC (rev 13590) @@ -146,7 +146,6 @@ if (! AdjustTokenPrivileges(hToken, FALSE, &npr, 0, 0, 0) || ERROR_SUCCESS != GetLastError()) { - CloseHandle(hToken); if (ERROR_NOT_ALL_ASSIGNED == GetLastError()) { _ftprintf(stderr, _T("You are not authorized to shutdown the system\n")); @@ -155,6 +154,7 @@ { _ftprintf(stderr, _T("AdjustTokenPrivileges failed with error %d\n"), (int) GetLastError()); } + CloseHandle(hToken); exit(1); } CloseHandle(hToken); _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/tickcount/makefile --- branches/xmlbuildsystem/reactos/apps/utils/tickcount/makefile 2005-02-15 20:55:59 UTC (rev 13589) +++ branches/xmlbuildsystem/reactos/apps/utils/tickcount/makefile 2005-02-15 21:24:19 UTC (rev 13590) @@ -12,7 +12,7 @@ TARGET_OBJECTS = tickcount.o -TARGET_CFLAGS = -Wall -Werror +TARGET_CFLAGS = -Wall -Werror -D__USE_W32API include $(PATH_TO_TOP)/rules.mak _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/tickcount/tickcount.c --- branches/xmlbuildsystem/reactos/apps/utils/tickcount/tickcount.c 2005-02-15 20:55:59 UTC (rev 13589) +++ branches/xmlbuildsystem/reactos/apps/utils/tickcount/tickcount.c 2005-02-15 21:24:19 UTC (rev 13590) @@ -1,30 +1,32 @@ /* $Id$ */ /* - tickcount -- Display the kernel tick count in human-readable format + tickcount -- Display the kernel tick count (or any tick count passed as an + argument or as input) in human-readable format This is public domain software */ #include <assert.h> #include <stdio.h> +#include <stdlib.h> #include <tchar.h> #include <windows.h> -typedef __int64 int64_t; -typedef unsigned __int64 uint64_t; +typedef __int64 int64_; +typedef unsigned __int64 uint64_; -#define TICKS_YEAR (TICKS_DAY * ((uint64_t)365)) -#define TICKS_MONTH (TICKS_DAY * ((uint64_t)30)) -#define TICKS_WEEK (TICKS_DAY * ((uint64_t)7)) -#define TICKS_DAY (TICKS_HOUR * ((uint64_t)24)) -#define TICKS_HOUR (TICKS_MINUTE * ((uint64_t)60)) -#define TICKS_MINUTE (TICKS_SECOND * ((uint64_t)60)) -#define TICKS_SECOND ((uint64_t)1000) +#define TICKS_YEAR (TICKS_DAY * ((uint64_)365)) +#define TICKS_MONTH (TICKS_DAY * ((uint64_)30)) +#define TICKS_WEEK (TICKS_DAY * ((uint64_)7)) +#define TICKS_DAY (TICKS_HOUR * ((uint64_)24)) +#define TICKS_HOUR (TICKS_MINUTE * ((uint64_)60)) +#define TICKS_MINUTE (TICKS_SECOND * ((uint64_)60)) +#define TICKS_SECOND ((uint64_)1000) #define SLICES_COUNT (sizeof(ticks_per_slice) / sizeof(ticks_per_slice[0])) -uint64_t ticks_per_slice[] = +uint64_ ticks_per_slice[] = { TICKS_YEAR, TICKS_MONTH, @@ -36,7 +38,7 @@ 1 }; -_TCHAR * slice_names_singular[] = +_TCHAR * slice_names_singular[SLICES_COUNT] = { _T("year"), _T("month"), @@ -48,7 +50,7 @@ _T("millisecond") }; -_TCHAR * slice_names_plural[] = +_TCHAR * slice_names_plural[SLICES_COUNT] = { _T("years"), _T("months"), @@ -62,16 +64,16 @@ void print_uptime ( - uint64_t tickcount, - uint64_t prevsliceval, + uint64_ tickcount, + uint64_ prevsliceval, _TCHAR * prevsliceunit, int curslice ) { - uint64_t tick_cur = tickcount / ticks_per_slice[curslice]; - uint64_t tick_residual = tickcount % ticks_per_slice[curslice]; + uint64_ tick_cur = tickcount / ticks_per_slice[curslice]; + uint64_ tick_residual = tickcount % ticks_per_slice[curslice]; - assert(tick_cur <= (~((uint64_t)0))); + assert(tick_cur <= (~((uint64_)0))); if(tick_residual == 0) { @@ -134,9 +136,56 @@ } } -int _tmain() +int parse_print(const _TCHAR * str) { - print_uptime((uint64_t)GetTickCount(), 0, NULL, 0); + int64_ tickcount; + + tickcount = _ttoi64(str); + + if(tickcount < 0) + tickcount = - tickcount; + else if(tickcount == 0) + return 1; + + print_uptime(tickcount, 0, NULL, 0); _puttc(_T('\n'), stdout); + return 0; } + +int _tmain(int argc, _TCHAR * argv[]) +{ + int r; + + if(argc <= 1) + { + print_uptime((uint64_)GetTickCount(), 0, NULL, 0); + _puttc(_T('\n'), stdout); + } + else if(argc == 2 && argv[1][0] == _T('-') && argv[1][1] == 0) + { + while(!feof(stdin)) + { + _TCHAR buf[23]; + _TCHAR * str; + + str = _fgetts(buf, 22, stdin); + + if(str == NULL) + return 0; + + if((r = parse_print(str)) != 0) + return r; + } + } + else + { + int i; + + for(i = 1; i < argc; ++ i) + if((r = parse_print(argv[i])) != 0) + return r; + } + + return 0; +} _____ Modified: branches/xmlbuildsystem/reactos/baseaddress.cfg --- branches/xmlbuildsystem/reactos/baseaddress.cfg 2005-02-15 20:55:59 UTC (rev 13589) +++ branches/xmlbuildsystem/reactos/baseaddress.cfg 2005-02-15 21:24:19 UTC (rev 13590) @@ -88,9 +88,9 @@ TARGET_BASE_LIB_ADVAPI32 =0x77dc0000 TARGET_BASE_LIB_USER32 =0x77e60000 TARGET_BASE_LIB_GDI32 =0x77ed0000 -TARGET_BASE_LIB_DNSAPI =0x78000000 +TARGET_BASE_LIB_DNSAPI =0x77f00000 TARGET_BASE_LIB_MSVCRT =0x78000000 -TARGET_BASE_LIB_MSVCRT20 =0x78000000 +TARGET_BASE_LIB_MSVCRT20 =0x78500000 TARGET_BASE_LIB_EXPAT =0x79000000 TARGET_BASE_LIB_KERNEL32 =0x7C800000 TARGET_BASE_LIB_NTDLL =0x7C900000 _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/CHANGELOG --- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/CHANGELOG 2005-02-15 20:55:59 UTC (rev 13589) +++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/CHANGELOG 2005-02-15 21:24:19 UTC (rev 13590) @@ -1,3 +1,9 @@ +Changes in v2.0.0 (02/07/2005) (alex ionesco) + +- PE loading of ntoskrnl.exe +- Work on 3GB support +- w32api conversion + Changes in v1.8.26 (10/30/2004) (chorns) - Print stack frames on crashes. _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/Makefile --- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/Makefile 2005-02-15 20:55:59 UTC (rev 13589) +++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/Makefile 2005-02-15 21:24:19 UTC (rev 13590) @@ -83,7 +83,7 @@ $(CP) setupldr.sys $(BOOTCD_DIR)/disk/loader/setupldr.sys -COMPILER_OPTIONS = -Wall -Werror -nostdlib -nostdinc -ffreestanding -fno-builtin -fno-inline \ +COMPILER_OPTIONS = -Wall -Werror -nostdlib -ffreestanding -fno-builtin -fno-inline \ -fno-zero-initialized-in-bss -O1 -MD # FreeLoader does not use any of the standard libraries, includes, or built-in functions @@ -95,7 +95,7 @@ COMPILER_DEFINES = -D__$(TARGET)__ $(COMPILER_DEBUG_DEFINES) -COMPILER_INCLUDES = -I$(SRCDIR)/include +COMPILER_INCLUDES = -I$(SRCDIR)/include -I$(PATH_TO_TOP)/w32api/include -I$(PATH_TO_TOP)/include -I$(PATH_TO_TOP)/ntoskrnl/include CFLAGS = $(COMPILER_OPTIONS) \ $(COMPILER_DEFINES) \ @@ -262,9 +262,9 @@ @echo Make ALL done. -freeldr.sys : $(ALL_OBJS) +freeldr.sys : $(ALL_OBJS) $(PATH_TO_TOP)/dk/w32/lib/librossym.a @echo ===================================================== LINKING $@ - @$(LD) $(LFLAGS) -o freeldr.exe $(F_OBJS) + @$(LD) $(LFLAGS) -o freeldr.exe $(F_OBJS) $(PATH_TO_TOP)/dk/w32/lib/librossym.a ifeq ($(FULL_MAP),yes) @$(OBJDUMP) -d -S freeldr.exe > freeldr.map else _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/archmach. c --- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/archmach. c 2005-02-15 20:55:59 UTC (rev 13589) +++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/archmach. c 2005-02-15 21:24:19 UTC (rev 13590) @@ -29,14 +29,14 @@ VOID MachInit(VOID) { - U32 PciId; + ULONG PciId; memset(&MachVtbl, 0, sizeof(MACHVTBL)); /* Check for Xbox by identifying device at PCI 0:0:0, if it's * 0x10de/0x02a5 then we're running on an Xbox */ - WRITE_PORT_ULONG((U32*) 0xcf8, CONFIG_CMD(0, 0, 0)); - PciId = READ_PORT_ULONG((U32*) 0xcfc); + WRITE_PORT_ULONG((ULONG*) 0xcf8, CONFIG_CMD(0, 0, 0)); + PciId = READ_PORT_ULONG((ULONG*) 0xcfc); if (0x02a510de == PciId) { XboxMachInit(); _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hardware. c --- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hardware. c 2005-02-15 20:55:59 UTC (rev 13589) +++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hardware. c 2005-02-15 21:24:19 UTC (rev 13590) @@ -89,96 +89,43 @@ #define CONTROLLER_TIMEOUT 250 -typedef struct _CM_INT13_DRIVE_PARAMETER -{ - U16 DriveSelect; - U32 MaxCylinders; - U16 SectorsPerTrack; - U16 MaxHeads; - U16 NumberDrives; -} CM_INT13_DRIVE_PARAMETER, *PCM_INT13_DRIVE_PARAMETER; - - typedef struct _CM_DISK_GEOMETRY_DEVICE_DATA { - U32 BytesPerSector; - U32 NumberOfCylinders; - U32 SectorsPerTrack; - U32 NumberOfHeads; + ULONG BytesPerSector; + ULONG NumberOfCylinders; + ULONG SectorsPerTrack; + ULONG NumberOfHeads; } CM_DISK_GEOMETRY_DEVICE_DATA, *PCM_DISK_GEOMETRY_DEVICE_DATA; typedef struct _CM_PNP_BIOS_DEVICE_NODE { - U16 Size; - U8 Node; - U32 ProductId; - U8 DeviceType[3]; - U16 DeviceAttributes; + USHORT Size; + UCHAR Node; + ULONG ProductId; + UCHAR DeviceType[3]; + USHORT DeviceAttributes; } __attribute__((packed)) CM_PNP_BIOS_DEVICE_NODE, *PCM_PNP_BIOS_DEVICE_NODE; typedef struct _CM_PNP_BIOS_INSTALLATION_CHECK { - U8 Signature[4]; - U8 Revision; - U8 Length; - U16 ControlField; - U8 Checksum; - U32 EventFlagAddress; - U16 RealModeEntryOffset; - U16 RealModeEntrySegment; - U16 ProtectedModeEntryOffset; - U32 ProtectedModeCodeBaseAddress; - U32 OemDeviceId; - U16 RealModeDataBaseAddress; - U32 ProtectedModeDataBaseAddress; + UCHAR Signature[4]; + UCHAR Revision; + UCHAR Length; + USHORT ControlField; + UCHAR Checksum; + ULONG EventFlagAddress; + USHORT RealModeEntryOffset; + USHORT RealModeEntrySegment; + USHORT ProtectedModeEntryOffset; + ULONG ProtectedModeCodeBaseAddress; + ULONG OemDeviceId; + USHORT RealModeDataBaseAddress; + ULONG ProtectedModeDataBaseAddress; } __attribute__((packed)) CM_PNP_BIOS_INSTALLATION_CHECK, *PCM_PNP_BIOS_INSTALLATION_CHECK; -typedef struct _CM_SERIAL_DEVICE_DATA -{ - U16 Version; - U16 Revision; - U32 BaudClock; -} __attribute__((packed)) CM_SERIAL_DEVICE_DATA, *PCM_SERIAL_DEVICE_DATA; - - -typedef struct _CM_FLOPPY_DEVICE_DATA -{ - U16 Version; - U16 Revision; - CHAR Size[8]; - U32 MaxDensity; - U32 MountDensity; - - /* Version 2.0 data */ - U8 StepRateHeadUnloadTime; - U8 HeadLoadTime; - U8 MotorOffTime; - U8 SectorLengthCode; - U8 SectorPerTrack; - U8 ReadWriteGapLength; - U8 DataTransferLength; - U8 FormatGapLength; - U8 FormatFillCharacter; - U8 HeadSettleTime; - U8 MotorSettleTime; - U8 MaximumTrackValue; - U8 DataTransferRate; -} __attribute__((packed)) CM_FLOPPY_DEVICE_DATA, *PCM_FLOPPY_DEVICE_DATA; - - -typedef struct _CM_KEYBOARD_DEVICE_DATA -{ - U16 Version; - U16 Revision; - U8 Type; - U8 Subtype; - U16 KeyboardFlags; -} __attribute__((packed)) CM_KEYBOARD_DEVICE_DATA, *PCM_KEYBOARD_DEVICE_DATA; - - static char Hex[] = "0123456789ABCDEF"; static unsigned int delay_count = 1; @@ -187,28 +134,28 @@ static VOID -__KeStallExecutionProcessor(U32 Loops) +__StallExecutionProcessor(ULONG Loops) { register unsigned int i; for (i = 0; i < Loops; i++); } -VOID KeStallExecutionProcessor(U32 Microseconds) +VOID StallExecutionProcessor(ULONG Microseconds) { - U64 LoopCount = ((U64)delay_count * (U64)Microseconds) / 1000ULL; - __KeStallExecutionProcessor((U32)LoopCount); + ULONGLONG LoopCount = ((ULONGLONG)delay_count * (ULONGLONG)Microseconds) / 1000ULL; + __StallExecutionProcessor((ULONG)LoopCount); } -static U32 +static ULONG Read8254Timer(VOID) { - U32 Count; + ULONG Count; - WRITE_PORT_UCHAR((PU8)0x43, 0x00); - Count = READ_PORT_UCHAR((PU8)0x40); - Count |= READ_PORT_UCHAR((PU8)0x40) << 8; + WRITE_PORT_UCHAR((PUCHAR)0x43, 0x00); + Count = READ_PORT_UCHAR((PUCHAR)0x40); + Count |= READ_PORT_UCHAR((PUCHAR)0x40) << 8; return Count; } @@ -217,9 +164,9 @@ static VOID WaitFor8254Wraparound(VOID) { - U32 CurCount; - U32 PrevCount = ~0; - S32 Delta; + ULONG CurCount; + ULONG PrevCount = ~0; + LONG Delta; CurCount = Read8254Timer(); @@ -242,14 +189,14 @@ VOID HalpCalibrateStallExecution(VOID) { - U32 i; - U32 calib_bit; - U32 CurCount; + ULONG i; + ULONG calib_bit; + ULONG CurCount; /* Initialise timer interrupt with MILLISECOND ms interval */ - WRITE_PORT_UCHAR((PU8)0x43, 0x34); /* binary, mode 2, LSB/MSB, ch 0 */ - WRITE_PORT_UCHAR((PU8)0x40, LATCH & 0xff); /* LSB */ - WRITE_PORT_UCHAR((PU8)0x40, LATCH >> 8); /* MSB */ + WRITE_PORT_UCHAR((PUCHAR)0x43, 0x34); /* binary, mode 2, LSB/MSB, ch 0 */ + WRITE_PORT_UCHAR((PUCHAR)0x40, LATCH & 0xff); /* LSB */ + WRITE_PORT_UCHAR((PUCHAR)0x40, LATCH >> 8); /* MSB */ /* Stage 1: Coarse calibration */ @@ -262,7 +209,7 @@ WaitFor8254Wraparound(); - __KeStallExecutionProcessor(delay_count); /* Do the delay */ + __StallExecutionProcessor(delay_count); /* Do the delay */ CurCount = Read8254Timer(); } while (CurCount > LATCH / 2); @@ -281,7 +228,7 @@ WaitFor8254Wraparound(); - __KeStallExecutionProcessor(delay_count); /* Do the delay */ + __StallExecutionProcessor(delay_count); /* Do the delay */ CurCount = Read8254Timer(); if (CurCount <= LATCH / 2) /* If a tick has passed, turn the */ @@ -294,13 +241,13 @@ VOID -SetComponentInformation(HKEY ComponentKey, - U32 Flags, - U32 Key, - U32 Affinity) +SetComponentInformation(FRLDRHKEY ComponentKey, + ULONG Flags, + ULONG Key, + ULONG Affinity) { CM_COMPONENT_INFORMATION CompInfo; - S32 Error; + LONG Error; CompInfo.Flags = Flags; CompInfo.Version = 0; @@ -311,7 +258,7 @@ Error = RegSetValue(ComponentKey, "Component Information", REG_BINARY, - (PU8)&CompInfo, + (PUCHAR)&CompInfo, sizeof(CM_COMPONENT_INFORMATION)); if (Error != ERROR_SUCCESS) { @@ -321,23 +268,23 @@ static VOID -DetectPnpBios(HKEY SystemKey, U32 *BusNumber) +DetectPnpBios(FRLDRHKEY SystemKey, ULONG *BusNumber) { PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; PCM_PNP_BIOS_DEVICE_NODE DeviceNode; PCM_PNP_BIOS_INSTALLATION_CHECK InstData; char Buffer[80]; - HKEY BusKey; - U32 x; - U32 NodeSize = 0; - U32 NodeCount = 0; - U8 NodeNumber; - U32 FoundNodeCount; + FRLDRHKEY BusKey; + ULONG x; + ULONG NodeSize = 0; + ULONG NodeCount = 0; + UCHAR NodeNumber; + ULONG FoundNodeCount; int i; - U32 PnpBufferSize; - U32 Size; + ULONG PnpBufferSize; + ULONG Size; char *Ptr; - S32 Error; + LONG Error; InstData = (PCM_PNP_BIOS_INSTALLATION_CHECK)PnpBiosSupported(); if (InstData == NULL || strncmp(InstData->Signature, "$PnP", 4)) @@ -351,6 +298,9 @@ x = PnpBiosGetDeviceNodeCount(&NodeSize, &NodeCount); + NodeCount &= 0xFF; // needed since some fscked up BIOSes return + // wrong info (e.g. Mac Virtual PC) + // e.g. look: http://my.execpc.com/~geezer/osd/pnp/pnp16.c if (x != 0 || NodeSize == 0 || NodeCount == 0) { DbgPrint((DPRINT_HWDETECT, "PnP-BIOS failed to enumerate device nodes\n")); @@ -385,7 +335,7 @@ Error = RegSetValue(BusKey, "Identifier", REG_SZ, - (PU8)"PNP BIOS", + (PUCHAR)"PNP BIOS", 9); if (Error != ERROR_SUCCESS) { @@ -425,7 +375,7 @@ PnpBufferSize = sizeof(CM_PNP_BIOS_INSTALLATION_CHECK); for (i = 0; i < 0xFF; i++) { - NodeNumber = (U8)i; + NodeNumber = (UCHAR)i; x = PnpBiosGetDeviceNode(&NodeNumber, (PVOID)DISKREADBUFFER); if (x == 0) @@ -463,7 +413,7 @@ Error = RegSetValue(BusKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PU8) FullResourceDescriptor, + (PUCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -477,15 +427,15 @@ static VOID -SetHarddiskConfigurationData(HKEY DiskKey, - U32 DriveNumber) +SetHarddiskConfigurationData(FRLDRHKEY DiskKey, + ULONG DriveNumber) { PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; PCM_DISK_GEOMETRY_DEVICE_DATA DiskGeometry; EXTENDED_GEOMETRY ExtGeometry; GEOMETRY Geometry; - U32 Size; - S32 Error; + ULONG Size; + LONG Error; /* Set 'Configuration Data' value */ Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + @@ -545,7 +495,7 @@ Error = RegSetValue(DiskKey, "Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, - (PU8) FullResourceDescriptor, + (PUCHAR) FullResourceDescriptor, Size); MmFreeMemory(FullResourceDescriptor); if (Error != ERROR_SUCCESS) @@ -558,16 +508,16 @@ static VOID -SetHarddiskIdentifier(HKEY DiskKey, - U32 DriveNumber) +SetHarddiskIdentifier(FRLDRHKEY DiskKey, + ULONG DriveNumber) { PMASTER_BOOT_RECORD Mbr; - U32 *Buffer; - U32 i; - U32 Checksum; - U32 Signature; + ULONG *Buffer; + ULONG i; + ULONG Checksum; + ULONG Signature; char Identifier[20]; - S32 Error; + LONG Error; /* Read the MBR */ if (!MachDiskReadLogicalSectors(DriveNumber, 0ULL, 1, (PVOID)DISKREADBUFFER)) @@ -576,7 +526,7 @@ return; } - Buffer = (U32*)DISKREADBUFFER; + Buffer = (ULONG*)DISKREADBUFFER; Mbr = (PMASTER_BOOT_RECORD)DISKREADBUFFER; Signature = Mbr->Signature; @@ -618,7 +568,7 @@ Error = RegSetValue(DiskKey, "Identifier", REG_SZ, - (PU8) Identifier, + (PUCHAR) Identifier, 20); if (Error != ERROR_SUCCESS) { @@ -630,18 +580,18 @@ static VOID -DetectBiosDisks(HKEY SystemKey, - HKEY BusKey) [truncated at 1000 lines; 215613 more skipped]

19 years, 10 months

[chorns] 13589: Copy msimg32

by chorns＠svn.reactos.com

Copy msimg32 Added: branches/xmlbuildsystem/reactos/lib/msimg32/ _____ Copied: branches/xmlbuildsystem/reactos/lib/msimg32 (from rev 13510, trunk/reactos/lib/msimg32)

19 years, 10 months

[chorns] 13588: Remove msimg32

by chorns＠svn.reactos.com

Remove msimg32 Deleted: branches/xmlbuildsystem/reactos/lib/msimg32/

19 years, 10 months

[navaraf] 13587: Fix inline assembler register specification (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=10153).

by navaraf＠svn.reactos.com

Fix inline assembler register specification (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=10153). Modified: trunk/reactos/hal/halx86/include/hal.h _____ Modified: trunk/reactos/hal/halx86/include/hal.h --- trunk/reactos/hal/halx86/include/hal.h 2005-02-15 19:40:30 UTC (rev 13586) +++ trunk/reactos/hal/halx86/include/hal.h 2005-02-15 19:43:17 UTC (rev 13587) @@ -417,13 +417,13 @@ static inline BYTE Ki386ReadFsByte(ULONG offset) { BYTE b; - __asm__ __volatile__("movb %%fs:(%1),%0":"=g" (b):"0" (offset)); + __asm__ __volatile__("movb %%fs:(%1),%0":"=q" (b):"0" (offset)); return b; } static inline VOID Ki386WriteFsByte(ULONG offset, BYTE value) { - __asm__ __volatile__("movb %0,%%fs:(%1)"::"r" (value), "r" (offset)); + __asm__ __volatile__("movb %0,%%fs:(%1)"::"q" (value), "r" (offset)); } #elif defined(_MSC_VER)

19 years, 10 months

← Newer
1
...
17
18
19
20
21
22
23
...
42
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2005