Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 52759: [NTDLL]: Export RtlActivateActivationContextEx.
by ion＠svn.reactos.org 21 Jul '11

21 Jul '11

Author: ion Date: Thu Jul 21 15:38:05 2011 New Revision: 52759 URL: http://svn.reactos.org/svn/reactos?rev=52759&view=rev Log: [NTDLL]: Export RtlActivateActivationContextEx. Modified: trunk/reactos/dll/ntdll/def/ntdll.pspec Modified: trunk/reactos/dll/ntdll/def/ntdll.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.pspec?… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.pspec [iso-8859-1] Thu Jul 21 15:38:05 2011 @@ -418,7 +418,7 @@ @ stdcall RtlAcquireSRWLockExclusive(ptr) @ stdcall RtlAcquireSRWLockShared(ptr) @ stdcall RtlActivateActivationContext(long ptr ptr) -//@ stdcall RtlActivateActivationContextEx +@ stdcall RtlActivateActivationContextEx(long ptr ptr ptr) @ fastcall RtlActivateActivationContextUnsafeFast(ptr ptr) @ stdcall RtlAddAccessAllowedAce(ptr long long ptr) @ stdcall RtlAddAccessAllowedAceEx(ptr long long long ptr)

1 0

[tkreuzer] 52758: [CMAKE] Add msconfig to build
by tkreuzer＠svn.reactos.org 21 Jul '11

21 Jul '11

Author: tkreuzer Date: Thu Jul 21 14:20:50 2011 New Revision: 52758 URL: http://svn.reactos.org/svn/reactos?rev=52758&view=rev Log: [CMAKE] Add msconfig to build Modified: trunk/reactos/base/applications/CMakeLists.txt Modified: trunk/reactos/base/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/CMakeLis… ============================================================================== --- trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/CMakeLists.txt [iso-8859-1] Thu Jul 21 14:20:50 2011 @@ -18,7 +18,7 @@ add_subdirectory(magnify) add_subdirectory(mmc) add_subdirectory(mplay32) -# add_subdirectory(msconfig) +add_subdirectory(msconfig) add_subdirectory(mscutils) add_subdirectory(mstsc) add_subdirectory(network)

1 0

[gedmurphy] 52757: [KERNEL32] Add GetLocaleInfoEx back to the exports, idndl needs it. Should fix default (rbuild) build. No idea (and don't care) about the cmake build, the cmake boys will have to...
by gedmurphy＠svn.reactos.org 21 Jul '11

21 Jul '11

Author: gedmurphy Date: Thu Jul 21 13:40:57 2011 New Revision: 52757 URL: http://svn.reactos.org/svn/reactos?rev=52757&view=rev Log: [KERNEL32] Add GetLocaleInfoEx back to the exports, idndl needs it. Should fix default (rbuild) build. No idea (and don't care) about the cmake build, the cmake boys will have to deal with that if it breaks. Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Thu Jul 21 13:40:57 2011 @@ -544,6 +544,7 @@ @ stdcall GetLocalTime(ptr) @ stdcall GetLocaleInfoA(long long ptr long) @ stdcall GetLocaleInfoW(long long ptr long) +@ stdcall GetLocaleInfoEx(wstr long wstr long) ; Vista+ @ stdcall GetLogicalDriveStringsA(long ptr) @ stdcall GetLogicalDriveStringsW(long ptr) @ stdcall GetLogicalDrives()

1 0

[ion] 52756: [KERNEL32]: Try to fix CMAKE build. I love how the RBUILD build is fine though.
by ion＠svn.reactos.org 21 Jul '11

21 Jul '11

Author: ion Date: Thu Jul 21 05:56:31 2011 New Revision: 52756 URL: http://svn.reactos.org/svn/reactos?rev=52756&view=rev Log: [KERNEL32]: Try to fix CMAKE build. I love how the RBUILD build is fine though. Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec trunk/reactos/dll/win32/kernel32/kernel32.spec trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Thu Jul 21 05:56:31 2011 @@ -543,7 +543,6 @@ @ stdcall GetLinguistLangSize(ptr) ; missing in Win 7 @ stdcall GetLocalTime(ptr) @ stdcall GetLocaleInfoA(long long ptr long) -@ stdcall GetLocaleInfoEx(wstr long wstr long) ; Vista+ @ stdcall GetLocaleInfoW(long long ptr long) @ stdcall GetLogicalDriveStringsA(long ptr) @ stdcall GetLogicalDriveStringsW(long ptr) @@ -853,7 +852,6 @@ ;@ stdcall K32InitializeProcessForWsWatch ; Win 7 ;@ stdcall K32QueryWorkingSet ; Win 7 ;@ stdcall K32QueryWorkingSetEx ; Win 7 -@ stdcall LCIDToLocaleName(long wstr long long) ; needed for wine gecko; missing in XP SP3 @ stdcall LCMapStringA(long long str long ptr long) ;@ stdcall LCMapStringEx ; Win 7 @ stdcall LCMapStringW(long long wstr long ptr long) @@ -996,7 +994,6 @@ ;@ stdcall QueryThreadpoolStackInformation ; Win 7 ;@ stdcall -arch=x86_64 QueryUmsThreadInformation ;@ stdcall QueryUnbiasedInterruptTime ; Win 7 -@ stdcall QueryWin31IniFilesMappedToRegistry(long long long long) ; missing in Win 7 @ stdcall QueueUserAPC(ptr long long) @ stdcall QueueUserWorkItem(ptr ptr long) @ stdcall RaiseException(long long long ptr) Modified: trunk/reactos/dll/win32/kernel32/kernel32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] Thu Jul 21 05:56:31 2011 @@ -541,7 +541,6 @@ @ stdcall GetLinguistLangSize(ptr) ; missing in Win 7 @ stdcall GetLocalTime(ptr) @ stdcall GetLocaleInfoA(long long ptr long) -@ stdcall GetLocaleInfoEx(wstr long wstr long) ; Vista+ @ stdcall GetLocaleInfoW(long long ptr long) @ stdcall GetLogicalDriveStringsA(long ptr) @ stdcall GetLogicalDriveStringsW(long ptr) @@ -851,7 +850,6 @@ ;@ stdcall K32InitializeProcessForWsWatch ; Win 7 ;@ stdcall K32QueryWorkingSet ; Win 7 ;@ stdcall K32QueryWorkingSetEx ; Win 7 -@ stdcall LCIDToLocaleName(long wstr long long) ; needed for wine gecko; missing in XP SP3 @ stdcall LCMapStringA(long long str long ptr long) ;@ stdcall LCMapStringEx ; Win 7 @ stdcall LCMapStringW(long long wstr long ptr long) @@ -994,7 +992,6 @@ ;@ stdcall QueryThreadpoolStackInformation ; Win 7 ;@ stdcall -arch=x86_64 QueryUmsThreadInformation ;@ stdcall QueryUnbiasedInterruptTime ; Win 7 -@ stdcall QueryWin31IniFilesMappedToRegistry(long long long long) ; missing in Win 7 @ stdcall QueueUserAPC(ptr long long) @ stdcall QueueUserWorkItem(ptr ptr long) @ stdcall RaiseException(long long long ptr) Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c [iso-8859-1] Thu Jul 21 05:56:31 2011 @@ -38,6 +38,7 @@ #define CRITICAL_SECTION RTL_CRITICAL_SECTION #define CRITICAL_SECTION_DEBUG RTL_CRITICAL_SECTION_DEBUG +#define CALINFO_MAX_YEAR 2029 WINE_DEFAULT_DEBUG_CHANNEL(nls); @@ -2085,3 +2086,213 @@ TRACE("(%p,0x%08x,0x%08x,0x%08x)\n", calinfoproc, locale, calendar, caltype); return NLS_EnumCalendarInfoAW(calinfoproc, locale, calendar, caltype, TRUE, TRUE); } + +/********************************************************************* + * GetCalendarInfoA (KERNEL32.@) + * + */ +int WINAPI GetCalendarInfoA(LCID lcid, CALID Calendar, CALTYPE CalType, + LPSTR lpCalData, int cchData, LPDWORD lpValue) +{ + int ret; + LPWSTR lpCalDataW = NULL; + + if (NLS_IsUnicodeOnlyLcid(lcid)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (cchData && + !(lpCalDataW = HeapAlloc(GetProcessHeap(), 0, cchData*sizeof(WCHAR)))) + return 0; + + ret = GetCalendarInfoW(lcid, Calendar, CalType, lpCalDataW, cchData, lpValue); + if(ret && lpCalDataW && lpCalData) + WideCharToMultiByte(CP_ACP, 0, lpCalDataW, cchData, lpCalData, cchData, NULL, NULL); + else if (CalType & CAL_RETURN_NUMBER) + ret *= sizeof(WCHAR); + HeapFree(GetProcessHeap(), 0, lpCalDataW); + + return ret; +} + +/********************************************************************* + * GetCalendarInfoW (KERNEL32.@) + * + */ +int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, + LPWSTR lpCalData, int cchData, LPDWORD lpValue) +{ + if (CalType & CAL_NOUSEROVERRIDE) + FIXME("flag CAL_NOUSEROVERRIDE used, not fully implemented\n"); + if (CalType & CAL_USE_CP_ACP) + FIXME("flag CAL_USE_CP_ACP used, not fully implemented\n"); + + if (CalType & CAL_RETURN_NUMBER) { + if (!lpValue) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + if (lpCalData != NULL) + WARN("lpCalData not NULL (%p) when it should!\n", lpCalData); + if (cchData != 0) + WARN("cchData not 0 (%d) when it should!\n", cchData); + } else { + if (lpValue != NULL) + WARN("lpValue not NULL (%p) when it should!\n", lpValue); + } + + /* FIXME: No verification is made yet wrt Locale + * for the CALTYPES not requiring GetLocaleInfoA */ + switch (CalType & ~(CAL_NOUSEROVERRIDE|CAL_RETURN_NUMBER|CAL_USE_CP_ACP)) { + case CAL_ICALINTVALUE: + FIXME("Unimplemented caltype %d\n", CalType & 0xffff); + return 0; + case CAL_SCALNAME: + FIXME("Unimplemented caltype %d\n", CalType & 0xffff); + return 0; + case CAL_IYEAROFFSETRANGE: + FIXME("Unimplemented caltype %d\n", CalType & 0xffff); + return 0; + case CAL_SERASTRING: + FIXME("Unimplemented caltype %d\n", CalType & 0xffff); + return 0; + case CAL_SSHORTDATE: + return GetLocaleInfoW(Locale, LOCALE_SSHORTDATE, lpCalData, cchData); + case CAL_SLONGDATE: + return GetLocaleInfoW(Locale, LOCALE_SLONGDATE, lpCalData, cchData); + case CAL_SDAYNAME1: + return GetLocaleInfoW(Locale, LOCALE_SDAYNAME1, lpCalData, cchData); + case CAL_SDAYNAME2: + return GetLocaleInfoW(Locale, LOCALE_SDAYNAME2, lpCalData, cchData); + case CAL_SDAYNAME3: + return GetLocaleInfoW(Locale, LOCALE_SDAYNAME3, lpCalData, cchData); + case CAL_SDAYNAME4: + return GetLocaleInfoW(Locale, LOCALE_SDAYNAME4, lpCalData, cchData); + case CAL_SDAYNAME5: + return GetLocaleInfoW(Locale, LOCALE_SDAYNAME5, lpCalData, cchData); + case CAL_SDAYNAME6: + return GetLocaleInfoW(Locale, LOCALE_SDAYNAME6, lpCalData, cchData); + case CAL_SDAYNAME7: + return GetLocaleInfoW(Locale, LOCALE_SDAYNAME7, lpCalData, cchData); + case CAL_SABBREVDAYNAME1: + return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME1, lpCalData, cchData); + case CAL_SABBREVDAYNAME2: + return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME2, lpCalData, cchData); + case CAL_SABBREVDAYNAME3: + return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME3, lpCalData, cchData); + case CAL_SABBREVDAYNAME4: + return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME4, lpCalData, cchData); + case CAL_SABBREVDAYNAME5: + return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME5, lpCalData, cchData); + case CAL_SABBREVDAYNAME6: + return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME6, lpCalData, cchData); + case CAL_SABBREVDAYNAME7: + return GetLocaleInfoW(Locale, LOCALE_SABBREVDAYNAME7, lpCalData, cchData); + case CAL_SMONTHNAME1: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME1, lpCalData, cchData); + case CAL_SMONTHNAME2: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME2, lpCalData, cchData); + case CAL_SMONTHNAME3: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME3, lpCalData, cchData); + case CAL_SMONTHNAME4: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME4, lpCalData, cchData); + case CAL_SMONTHNAME5: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME5, lpCalData, cchData); + case CAL_SMONTHNAME6: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME6, lpCalData, cchData); + case CAL_SMONTHNAME7: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME7, lpCalData, cchData); + case CAL_SMONTHNAME8: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME8, lpCalData, cchData); + case CAL_SMONTHNAME9: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME9, lpCalData, cchData); + case CAL_SMONTHNAME10: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME10, lpCalData, cchData); + case CAL_SMONTHNAME11: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME11, lpCalData, cchData); + case CAL_SMONTHNAME12: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME12, lpCalData, cchData); + case CAL_SMONTHNAME13: + return GetLocaleInfoW(Locale, LOCALE_SMONTHNAME13, lpCalData, cchData); + case CAL_SABBREVMONTHNAME1: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME1, lpCalData, cchData); + case CAL_SABBREVMONTHNAME2: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME2, lpCalData, cchData); + case CAL_SABBREVMONTHNAME3: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME3, lpCalData, cchData); + case CAL_SABBREVMONTHNAME4: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME4, lpCalData, cchData); + case CAL_SABBREVMONTHNAME5: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME5, lpCalData, cchData); + case CAL_SABBREVMONTHNAME6: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME6, lpCalData, cchData); + case CAL_SABBREVMONTHNAME7: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME7, lpCalData, cchData); + case CAL_SABBREVMONTHNAME8: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME8, lpCalData, cchData); + case CAL_SABBREVMONTHNAME9: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME9, lpCalData, cchData); + case CAL_SABBREVMONTHNAME10: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME10, lpCalData, cchData); + case CAL_SABBREVMONTHNAME11: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME11, lpCalData, cchData); + case CAL_SABBREVMONTHNAME12: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME12, lpCalData, cchData); + case CAL_SABBREVMONTHNAME13: + return GetLocaleInfoW(Locale, LOCALE_SABBREVMONTHNAME13, lpCalData, cchData); + case CAL_SYEARMONTH: + return GetLocaleInfoW(Locale, LOCALE_SYEARMONTH, lpCalData, cchData); + case CAL_ITWODIGITYEARMAX: + if (CalType & CAL_RETURN_NUMBER) + { + *lpValue = CALINFO_MAX_YEAR; + return sizeof(DWORD) / sizeof(WCHAR); + } + else + { + static const WCHAR fmtW[] = {'%','u',0}; + WCHAR buffer[10]; + int ret = snprintfW( buffer, 10, fmtW, CALINFO_MAX_YEAR ) + 1; + if (!lpCalData) return ret; + if (ret <= cchData) + { + strcpyW( lpCalData, buffer ); + return ret; + } + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return 0; + } + break; + default: + FIXME("Unknown caltype %d\n",CalType & 0xffff); + SetLastError(ERROR_INVALID_FLAGS); + return 0; + } + return 0; +} + +/********************************************************************* + * SetCalendarInfoA (KERNEL32.@) + * + */ +int WINAPI SetCalendarInfoA(LCID Locale, CALID Calendar, CALTYPE CalType, LPCSTR lpCalData) +{ + FIXME("(%08x,%08x,%08x,%s): stub\n", + Locale, Calendar, CalType, debugstr_a(lpCalData)); + return 0; +} + +/********************************************************************* + * SetCalendarInfoW (KERNEL32.@) + * + * + */ +int WINAPI SetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, LPCWSTR lpCalData) +{ + FIXME("(%08x,%08x,%08x,%s): stub\n", + Locale, Calendar, CalType, debugstr_w(lpCalData)); + return 0; +}

1 0

[ion] 52755: [KERNEL32]: Now really kill combdcb.c, as the Wine implementation is now in comm.c
by ion＠svn.reactos.org 21 Jul '11

21 Jul '11

Author: ion Date: Thu Jul 21 05:26:12 2011 New Revision: 52755 URL: http://svn.reactos.org/svn/reactos?rev=52755&view=rev Log: [KERNEL32]: Now really kill combdcb.c, as the Wine implementation is now in comm.c Removed: trunk/reactos/dll/win32/kernel32/client/misc/commdcb.c Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/dll/win32/kernel32/kernel32.rbuild Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Thu Jul 21 05:26:12 2011 @@ -62,7 +62,6 @@ client/file/volume.c client/misc/actctx.c client/misc/comm.c - client/misc/commdcb.c client/misc/lzexpand.c client/misc/muldiv.c client/misc/profile.c Removed: trunk/reactos/dll/win32/kernel32/client/misc/commdcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/misc/commdcb.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/misc/commdcb.c (removed) @@ -1,674 +1,0 @@ -/* - Copyright (c) 2008 KJK::Hyperion - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. -*/ - -/* Parses a mode string for a serial port, in the same syntax as the mode.com command */ -#if 0 -#if defined(__REACTOS__) && defined(_KERNEL32_) -#include <k32.h> - -#define DCB_BuildCommDCBA BuildCommDCBA -#define DCB_BuildCommDCBAndTimeoutsA BuildCommDCBAndTimeoutsA -#define DCB_BuildCommDCBW BuildCommDCBW -#define DCB_BuildCommDCBAndTimeoutsW BuildCommDCBAndTimeoutsW -#else -#include <stdio.h> -#include <stdlib.h> -#include <ctype.h> - -#define WIN32_LEAN_AND_MEAN -#include <windows.h> -#endif - -static -void DCB_SkipSpace(const char ** ppTail) -{ - while(**ppTail && isspace(**ppTail)) - ++ *ppTail; -} - -static -size_t DCB_SkipNonSpace(const char ** ppTail) -{ - const char * pOriginal = *ppTail; - - while(**ppTail && !isspace(**ppTail)) - ++ *ppTail; - - return *ppTail - pOriginal; -} - -static -BOOL DCB_SetBaudRate(unsigned long baudRate, LPDCB lpDCB) -{ - switch(baudRate) - { - case 11: lpDCB->BaudRate = 110; break; - case 15: lpDCB->BaudRate = 150; break; - case 30: lpDCB->BaudRate = 300; break; - case 60: lpDCB->BaudRate = 600; break; - case 12: lpDCB->BaudRate = 1200; break; - case 24: lpDCB->BaudRate = 2400; break; - case 48: lpDCB->BaudRate = 4800; break; - case 96: lpDCB->BaudRate = 9600; break; - case 19: lpDCB->BaudRate = 19200; break; - default: lpDCB->BaudRate = baudRate; break; - } - - return TRUE; -} - -static -BYTE DCB_SetParity(char parity, LPDCB lpDCB) -{ - switch(parity) - { - case 'N': - case 'n': - lpDCB->Parity = 0; - break; - - case 'O': - case 'o': - lpDCB->Parity = 1; - break; - - case 'E': - case 'e': - lpDCB->Parity = 2; - break; - - case 'M': - case 'm': - lpDCB->Parity = 3; - break; - - case 'S': - case 's': - lpDCB->Parity = 4; - break; - - default: - return FALSE; - } - - return TRUE; -} - -static -BYTE DCB_SetDataBits(unsigned long dataBits, LPDCB lpDCB) -{ - BOOL bRet; - - bRet = dataBits >= 5 && dataBits <= 8; - - if(!bRet) - return bRet; - - lpDCB->ByteSize = (BYTE)dataBits; - return bRet; -} - -static -BOOL DCB_ParseOldSeparator(const char ** ppTail) -{ - BOOL bRet; - - bRet = **ppTail == 0; - - if(bRet) - return bRet; - - bRet = **ppTail == ','; - - if(bRet) - { - ++ *ppTail; - return bRet; - } - - return bRet; -} - -static -unsigned long DCB_ParseOldNumber(const char ** ppTail, unsigned long nDefault) -{ - char * pNumTail; - unsigned long number; - - DCB_SkipSpace(ppTail); - - if(!isdigit(**ppTail)) - return nDefault; - - number = strtoul(*ppTail, &pNumTail, 10); - *ppTail = pNumTail; - - DCB_SkipSpace(ppTail); - return number; -} - -static -char DCB_ParseOldCharacter(const char ** ppTail, char cDefault) -{ - char character; - - DCB_SkipSpace(ppTail); - - if(**ppTail == 0 || **ppTail == ',') - return cDefault; - - character = **ppTail; - ++ *ppTail; - - DCB_SkipSpace(ppTail); - return character; -} - -static -const char * DCB_ParseOldString(const char ** ppTail, const char * pDefault, size_t * pLength) -{ - const char * string; - - DCB_SkipSpace(ppTail); - - if(**ppTail == 0 || **ppTail == ',') - return pDefault; - - string = *ppTail; - - *pLength = 0; - - while(**ppTail != 0 && **ppTail != ',' && !isspace(**ppTail)) - { - ++ *ppTail; - ++ *pLength; - } - - DCB_SkipSpace(ppTail); - return string; -} - -static -BOOL -DCB_ParseOldMode(const char * pTail, LPDCB lpDCB, LPCOMMTIMEOUTS lpCommTimeouts) -{ - BOOL bRet; - - unsigned long baudRate; - char parity; - unsigned long dataBits; - size_t stopBitsLength; - const char * stopBits; - char retry; - - /* Baud rate */ - baudRate = DCB_ParseOldNumber(&pTail, 0); - bRet = DCB_ParseOldSeparator(&pTail); - bRet = bRet && DCB_SetBaudRate(baudRate, lpDCB); - - if(!bRet) - return bRet; - - /* Parity */ - parity = DCB_ParseOldCharacter(&pTail, 'E'); - bRet = DCB_ParseOldSeparator(&pTail); - bRet = bRet && DCB_SetParity(parity, lpDCB); - - if(!bRet) - return bRet; - - /* Data bits */ - dataBits = DCB_ParseOldNumber(&pTail, 7); - bRet = DCB_ParseOldSeparator(&pTail); - bRet = bRet && DCB_SetDataBits(dataBits, lpDCB); - - if(!bRet) - return bRet; - - /* Stop bits */ - stopBitsLength = 1; - stopBits = DCB_ParseOldString(&pTail, baudRate == 110 ? "2" : "1", &stopBitsLength); - bRet = DCB_ParseOldSeparator(&pTail); - - if(!bRet) - return bRet; - - if(strncmp(stopBits, "1", stopBitsLength) == 0) - lpDCB->StopBits = 0; - else if(strncmp(stopBits, "1.5", stopBitsLength) == 0) - lpDCB->StopBits = 1; - else if(strncmp(stopBits, "2", stopBitsLength) == 0) - lpDCB->StopBits = 2; - else - return FALSE; - - /* Retry */ - retry = DCB_ParseOldCharacter(&pTail, 0); - bRet = *pTail == 0; - - if(!bRet) - return bRet; - - switch(retry) - { - case 0: - lpDCB->fInX = FALSE; - lpDCB->fOutX = FALSE; - lpDCB->fOutxCtsFlow = FALSE; - lpDCB->fOutxDsrFlow = FALSE; - lpDCB->fDtrControl = DTR_CONTROL_ENABLE; - lpDCB->fRtsControl = RTS_CONTROL_ENABLE; - break; - - case 'p': - case 'P': - lpDCB->fInX = FALSE; - lpDCB->fOutX = FALSE; - lpDCB->fOutxCtsFlow = TRUE; - lpDCB->fOutxDsrFlow = TRUE; - lpDCB->fDtrControl = DTR_CONTROL_HANDSHAKE; - lpDCB->fRtsControl = RTS_CONTROL_HANDSHAKE; - break; - - case 'x': - case 'X': - lpDCB->fInX = TRUE; - lpDCB->fOutX = TRUE; - lpDCB->fOutxCtsFlow = FALSE; - lpDCB->fOutxDsrFlow = FALSE; - lpDCB->fDtrControl = DTR_CONTROL_ENABLE; - lpDCB->fRtsControl = RTS_CONTROL_ENABLE; - break; - - default: - return FALSE; - } - - return bRet; -} - -static -BOOL DCB_ParseNewNumber(const char * pString, size_t cchString, unsigned long * pNumber) -{ - BOOL bRet; - char * pStringEnd; - unsigned long number; - - bRet = cchString > 0; - - if(!bRet) - return bRet; - - number = strtoul(pString, &pStringEnd, 10); - - bRet = pStringEnd - pString == cchString; - - if(!bRet) - return bRet; - - *pNumber = number; - return bRet; -} - -static -BOOL DCB_ParseNewBoolean(const char * pString, size_t cchString, BOOL * pBoolean) -{ - BOOL bRet; - - bRet = _strnicmp(pString, "on", cchString) == 0; - - if(bRet) - { - *pBoolean = bRet; - return bRet; - } - - bRet = _strnicmp(pString, "off", cchString) == 0; - - if(bRet) - { - *pBoolean = !bRet; - return bRet; - } - - return bRet; -} - -static -BOOL -DCB_ParseNewMode(const char * pTail, LPDCB lpDCB, LPCOMMTIMEOUTS lpCommTimeouts) -{ - BOOL bRet; - BOOL stopBitsSet = FALSE; - - lpDCB->StopBits = 0; - - while(*pTail) - { - const char * pArg; - size_t cchArg; - size_t cchArgName; - size_t cchArgValue; - const char * pArgName; - const char * pArgValue; - unsigned long nArgValue; - BOOL fArgValue; - - pArg = pTail; - cchArg = DCB_SkipNonSpace(&pTail); - DCB_SkipSpace(&pTail); - - for(cchArgName = 0; cchArgName < cchArg; ++ cchArgName) - { - if(pArg[cchArgName] == '=') - break; - } - - bRet = cchArgName < cchArg; - - if(!bRet) - return bRet; - - cchArgValue = cchArg - cchArgName - 1; - pArgName = pArg; - pArgValue = pArg + cchArgName + 1; - - if(_strnicmp(pArgName, "baud", cchArgName) == 0) - { - bRet = DCB_ParseNewNumber(pArgValue, cchArgValue, &nArgValue); - bRet = bRet && DCB_SetBaudRate(nArgValue, lpDCB); - - if(bRet) - { - if(lpDCB->BaudRate == 110 && !stopBitsSet) - lpDCB->StopBits = 2; - else - lpDCB->StopBits = 0; - } - } - else if(_strnicmp(pArgName, "parity", cchArgName) == 0) - { - bRet = cchArgValue == 1; - bRet = bRet && DCB_SetParity(pArgValue[0], lpDCB); - } - else if(_strnicmp(pArgName, "data", cchArgName) == 0) - { - bRet = DCB_ParseNewNumber(pArgValue, cchArgValue, &nArgValue); - bRet = bRet && DCB_SetDataBits(nArgValue, lpDCB); - } - else if(_strnicmp(pArgName, "stop", cchArgName) == 0) - { - stopBitsSet = TRUE; - - if(strncmp(pArgValue, "1", cchArgValue) == 0) - lpDCB->StopBits = 0; - else if(strncmp(pArgValue, "1.5", cchArgValue) == 0) - lpDCB->StopBits = 1; - else if(strncmp(pArgValue, "2", cchArgValue) == 0) - lpDCB->StopBits = 2; - else - bRet = FALSE; - } - else if(_strnicmp(pArgName, "to", cchArgName) == 0) - { - bRet = DCB_ParseNewBoolean(pArgValue, cchArgValue, &fArgValue); - - if(bRet) - { - if(lpCommTimeouts) - { - memset(lpCommTimeouts, 0, sizeof(*lpCommTimeouts)); - - if(fArgValue) - lpCommTimeouts->WriteTotalTimeoutConstant = 60000; - } - } - } - else if(_strnicmp(pArgName, "xon", cchArgName) == 0) - { - bRet = DCB_ParseNewBoolean(pArgValue, cchArgValue, &fArgValue); - - if(bRet) - { - lpDCB->fInX = !!fArgValue; - lpDCB->fOutX = !!fArgValue; - } - } - else if(_strnicmp(pArgName, "odsr", cchArgName) == 0) - { - bRet = DCB_ParseNewBoolean(pArgValue, cchArgValue, &fArgValue); - - if(bRet) - lpDCB->fOutxDsrFlow = !!fArgValue; - } - else if(_strnicmp(pArgName, "octs", cchArgName) == 0) - { - bRet = DCB_ParseNewBoolean(pArgValue, cchArgValue, &fArgValue); - - if(bRet) - lpDCB->fOutxCtsFlow = !!fArgValue; - } - else if(_strnicmp(pArgName, "dtr", cchArgName) == 0) - { - bRet = DCB_ParseNewBoolean(pArgValue, cchArgValue, &fArgValue); - - if(bRet) - { - if(fArgValue) - lpDCB->fDtrControl = DTR_CONTROL_ENABLE; - else - lpDCB->fDtrControl = DTR_CONTROL_DISABLE; - } - else - { - bRet = _strnicmp(pArgValue, "hs", cchArgValue) == 0; - - if(bRet) - lpDCB->fDtrControl = DTR_CONTROL_HANDSHAKE; - } - } - else if(_strnicmp(pArgName, "rts", cchArgName) == 0) - { - bRet = DCB_ParseNewBoolean(pArgValue, cchArgValue, &fArgValue); - - if(bRet) - { - if(fArgValue) - lpDCB->fRtsControl = RTS_CONTROL_ENABLE; - else - lpDCB->fRtsControl = RTS_CONTROL_DISABLE; - } - else - { - bRet = _strnicmp(pArgValue, "hs", cchArgValue) == 0; - - if(bRet) - lpDCB->fRtsControl = RTS_CONTROL_HANDSHAKE; - else - { - bRet = _strnicmp(pArgValue, "tg", cchArgValue) == 0; - - if(bRet) - lpDCB->fRtsControl = RTS_CONTROL_TOGGLE; - } - } - } - else if(_strnicmp(pArgName, "idsr", cchArgName) == 0) - { - bRet = DCB_ParseNewBoolean(pArgValue, cchArgValue, &fArgValue); - - if(bRet) - lpDCB->fDsrSensitivity = !!fArgValue; - } - else - bRet = FALSE; - - if(!bRet) - return bRet; - } - - return TRUE; -} - -static -BOOL -DCB_ValidPort(unsigned long nPort) -{ - BOOL bRet; - DWORD dwErr; - WCHAR szPort[3 + 10 + 1]; - - dwErr = GetLastError(); - - _snwprintf(szPort, sizeof(szPort) / sizeof(szPort[0]), L"COM%lu", nPort); - - bRet = QueryDosDeviceW(szPort, NULL, 0) == 0 && GetLastError() == ERROR_INSUFFICIENT_BUFFER; - - if(!bRet) - dwErr = ERROR_INVALID_PARAMETER; - - SetLastError(dwErr); - return bRet; -} - -/* - * @implemented - */ -BOOL -WINAPI -DCB_BuildCommDCBAndTimeoutsA(LPCSTR lpDef, LPDCB lpDCB, LPCOMMTIMEOUTS lpCommTimeouts) -{ - BOOL bRet; - LPCSTR pTail = lpDef; - DCB DCBCopy; - - if(_strnicmp(pTail, "COM", 3) == 0) - { - char * pNumTail; - unsigned long nPort; - - pTail += 3; - - if(!isdigit(*pTail)) - return FALSE; - - nPort = strtoul(pTail, &pNumTail, 10); - pTail = pNumTail; - - bRet = DCB_ValidPort(nPort); - - if(!bRet) - return bRet; - - DCB_SkipSpace(&pTail); - - if(*pTail == ':') - ++ pTail; - - DCB_SkipSpace(&pTail); - } - - DCBCopy = *lpDCB; - - if(isdigit(*pTail)) - bRet = DCB_ParseOldMode(pTail, &DCBCopy, lpCommTimeouts); - else - bRet = DCB_ParseNewMode(pTail, &DCBCopy, lpCommTimeouts); - - if(!bRet) - SetLastError(ERROR_INVALID_PARAMETER); - else - *lpDCB = DCBCopy; - - return bRet; -} - -/* - * @implemented - */ -BOOL -WINAPI -DCB_BuildCommDCBA(LPCSTR lpDef, LPDCB lpDCB) -{ - return DCB_BuildCommDCBAndTimeoutsA(lpDef, lpDCB, NULL); -} - -/* - * @implemented - */ -BOOL -WINAPI -DCB_BuildCommDCBAndTimeoutsW(LPCWSTR lpDef, LPDCB lpDCB, LPCOMMTIMEOUTS lpCommTimeouts) -{ - BOOL bRet; - HANDLE hHeap; - BOOL bInvalidChars; - LPSTR pszAscii; - int cchAscii; - DWORD dwErr; - - dwErr = ERROR_INVALID_PARAMETER; - cchAscii = WideCharToMultiByte(CP_ACP, 0, lpDef, -1, NULL, 0, NULL, NULL); - - bRet = cchAscii > 0; - - if(bRet) - { - hHeap = GetProcessHeap(); - pszAscii = HeapAlloc(hHeap, 0, cchAscii); - - bRet = pszAscii != NULL; - - if(bRet) - { - bInvalidChars = FALSE; - cchAscii = WideCharToMultiByte(CP_ACP, 0, lpDef, -1, pszAscii, cchAscii, NULL, &bInvalidChars); - - bRet = cchAscii > 0 && !bInvalidChars; - - if(bRet) - bRet = DCB_BuildCommDCBAndTimeoutsA(pszAscii, lpDCB, lpCommTimeouts); - - HeapFree(hHeap, 0, pszAscii); - } - else - dwErr = ERROR_OUTOFMEMORY; - } - - if(!bRet) - SetLastError(dwErr); - - return bRet; -} - -/* - * @implemented - */ -BOOL -WINAPI -DCB_BuildCommDCBW(LPCWSTR lpDef, LPDCB lpDCB) -{ - return DCB_BuildCommDCBAndTimeoutsW(lpDef, lpDCB, NULL); -} - -/* EOF */ -#endif Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Thu Jul 21 05:26:12 2011 @@ -80,7 +80,6 @@ <directory name="misc"> <file>actctx.c</file> <file>comm.c</file> - <file>commdcb.c</file> <file>lzexpand.c</file> <file>muldiv.c</file> <file>profile.c</file>

1 0

[ion] 52754: [KERNEL32]: Winesync all there is to Winesync in ReactOS' kernel32. This mainly affects LZ*, Comm*, *ProfileString* (INI), and *Resource* APIs, however the changes in there are relativ...
by ion＠svn.reactos.org 21 Jul '11

21 Jul '11

Author: ion Date: Thu Jul 21 05:24:59 2011 New Revision: 52754 URL: http://svn.reactos.org/svn/reactos?rev=52754&view=rev Log: [KERNEL32]: Winesync all there is to Winesync in ReactOS' kernel32. This mainly affects LZ*, Comm*, *ProfileString* (INI), and *Resource* APIs, however the changes in there are relatively minor. More substantial changes affect the locale/NLS/language functions, many which were bitrotting for 6+ years. In theory, this code is "better" than before, and it is closer to Wine (which arguably has better compatibility). It also resets things in sync with Wine however, and may lose and "fixes" ReactOS may have added over the years. But this is a good thing, since these fixes have been "lost" (they obviously never made it into Wine), and if regressions are now found due to this, actual upstream patches can be sent and picked up on the next sync. This avoids maintaining duplicate code, at the expenses of some potential short-term regressions in i18n. Finally, note that much of /string seems to be taken from Wine's Unicode library (which a host "unicode" already exists in ReactOS' tools/. It may be better (for someone with more experience as to these wine-isms) to simply just pull-in whatever winelib files are not currently present in ReactOS, and have kernel32 and tools/unicode use winelib, instead of having 2 or 3 copies of the code. Modified: trunk/reactos/dll/win32/kernel32/client/misc/comm.c trunk/reactos/dll/win32/kernel32/client/misc/commdcb.c trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c trunk/reactos/dll/win32/kernel32/client/misc/profile.c trunk/reactos/dll/win32/kernel32/client/misc/res.c trunk/reactos/dll/win32/kernel32/winnls/string/casemap.c trunk/reactos/dll/win32/kernel32/winnls/string/chartype.c trunk/reactos/dll/win32/kernel32/winnls/string/collation.c trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c trunk/reactos/dll/win32/kernel32/winnls/string/lang.c trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c trunk/reactos/dll/win32/kernel32/winnls/string/nls.c trunk/reactos/dll/win32/kernel32/winnls/string/sortkey.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/kernel32/client/misc/comm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/misc/commdcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/misc/lzexpand.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/misc/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/misc/res.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/winnls/string/casemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/string/chartype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/string/collation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/string/format_msg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/kernel32/winnls/string/sortkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/…

1 0

[ion] 52753: [WINE]: Fix build.
by ion＠svn.reactos.org 21 Jul '11

21 Jul '11

Author: ion Date: Thu Jul 21 03:19:44 2011 New Revision: 52753 URL: http://svn.reactos.org/svn/reactos?rev=52753&view=rev Log: [WINE]: Fix build. Modified: trunk/reactos/include/reactos/wine/unicode.h Modified: trunk/reactos/include/reactos/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/unico… ============================================================================== --- trunk/reactos/include/reactos/wine/unicode.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/unicode.h [iso-8859-1] Thu Jul 21 03:19:44 2011 @@ -60,7 +60,6 @@ #define snprintfW _snwprintf #define vsnprintfW _vsnwprintf #define isprintW iswprint -#define get_char_typeW(x) iswctype((x) >> 8, (x) & 0xFF) static __inline WCHAR *memchrW( const WCHAR *ptr, WCHAR ch, size_t n ) {

1 0

[ion] 52752: NO CODE CHANGE [KERNEL32]: Final part of the re-structure: move the last few files from "misc" into "client". Now "misc" is mostly composed of Wine-based code (which will soon by Wines...
by ion＠svn.reactos.org 21 Jul '11

21 Jul '11

Author: ion Date: Thu Jul 21 02:55:56 2011 New Revision: 52752 URL: http://svn.reactos.org/svn/reactos?rev=52752&view=rev Log: NO CODE CHANGE [KERNEL32]: Final part of the re-structure: move the last few files from "misc" into "client". Now "misc" is mostly composed of Wine-based code (which will soon by Winesynched) that provides functionality such as INI, .rsrc parsing and LZip expansion, as well as the RS232-based APIs. The rest of "client" is NT-layer glue, much of it buggy and in need of help. [KERNEL32]: Move "Beep" from environ.c to deviceio.c... seems to make more sense there. [KERNEL32]: Set kernel32_handle since Wine-synched code will depend on this. [KERNEL32]: Link with winelib, don't link with normaliz anymore. Added: trunk/reactos/dll/win32/kernel32/client/atom.c - copied unchanged from r52749, trunk/reactos/dll/win32/kernel32/client/misc/atom.c trunk/reactos/dll/win32/kernel32/client/compname.c - copied unchanged from r52749, trunk/reactos/dll/win32/kernel32/client/misc/computername.c trunk/reactos/dll/win32/kernel32/client/dllmain.c - copied, changed from r52749, trunk/reactos/dll/win32/kernel32/client/misc/dllmain.c trunk/reactos/dll/win32/kernel32/client/environ.c - copied, changed from r52749, trunk/reactos/dll/win32/kernel32/client/misc/env.c trunk/reactos/dll/win32/kernel32/client/handle.c - copied unchanged from r52749, trunk/reactos/dll/win32/kernel32/client/misc/handle.c trunk/reactos/dll/win32/kernel32/client/loader.c - copied unchanged from r52749, trunk/reactos/dll/win32/kernel32/client/misc/ldr.c trunk/reactos/dll/win32/kernel32/client/perfcnt.c - copied unchanged from r52749, trunk/reactos/dll/win32/kernel32/client/misc/perfcnt.c trunk/reactos/dll/win32/kernel32/client/power.c - copied unchanged from r52749, trunk/reactos/dll/win32/kernel32/client/misc/power.c trunk/reactos/dll/win32/kernel32/client/resntfy.c - copied unchanged from r52749, trunk/reactos/dll/win32/kernel32/client/misc/resntfy.c trunk/reactos/dll/win32/kernel32/client/sysinfo.c - copied unchanged from r52749, trunk/reactos/dll/win32/kernel32/client/misc/sysinfo.c trunk/reactos/dll/win32/kernel32/client/timerqueue.c - copied unchanged from r52749, trunk/reactos/dll/win32/kernel32/client/misc/timerqueue.c trunk/reactos/dll/win32/kernel32/client/utils.c - copied unchanged from r52749, trunk/reactos/dll/win32/kernel32/client/misc/utils.c trunk/reactos/dll/win32/kernel32/client/version.c - copied unchanged from r52749, trunk/reactos/dll/win32/kernel32/client/misc/version.c Removed: trunk/reactos/dll/win32/kernel32/client/misc/atom.c trunk/reactos/dll/win32/kernel32/client/misc/computername.c trunk/reactos/dll/win32/kernel32/client/misc/dllmain.c trunk/reactos/dll/win32/kernel32/client/misc/env.c trunk/reactos/dll/win32/kernel32/client/misc/handle.c trunk/reactos/dll/win32/kernel32/client/misc/ldr.c trunk/reactos/dll/win32/kernel32/client/misc/perfcnt.c trunk/reactos/dll/win32/kernel32/client/misc/power.c trunk/reactos/dll/win32/kernel32/client/misc/resntfy.c trunk/reactos/dll/win32/kernel32/client/misc/sysinfo.c trunk/reactos/dll/win32/kernel32/client/misc/timerqueue.c trunk/reactos/dll/win32/kernel32/client/misc/utils.c trunk/reactos/dll/win32/kernel32/client/misc/version.c Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/dll/win32/kernel32/client/file/deviceio.c trunk/reactos/dll/win32/kernel32/kernel32.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… Copied: trunk/reactos/dll/win32/kernel32/client/dllmain.c (from r52749, trunk/reactos/dll/win32/kernel32/client/misc/dllmain.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Copied: trunk/reactos/dll/win32/kernel32/client/environ.c (from r52749, trunk/reactos/dll/win32/kernel32/client/misc/env.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/file/deviceio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Removed: trunk/reactos/dll/win32/kernel32/client/misc/atom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Removed: trunk/reactos/dll/win32/kernel32/client/misc/computername.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Removed: trunk/reactos/dll/win32/kernel32/client/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Removed: trunk/reactos/dll/win32/kernel32/client/misc/env.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Removed: trunk/reactos/dll/win32/kernel32/client/misc/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Removed: trunk/reactos/dll/win32/kernel32/client/misc/ldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Removed: trunk/reactos/dll/win32/kernel32/client/misc/perfcnt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Removed: trunk/reactos/dll/win32/kernel32/client/misc/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Removed: trunk/reactos/dll/win32/kernel32/client/misc/resntfy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Removed: trunk/reactos/dll/win32/kernel32/client/misc/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Removed: trunk/reactos/dll/win32/kernel32/client/misc/timerqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Removed: trunk/reactos/dll/win32/kernel32/client/misc/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Removed: trunk/reactos/dll/win32/kernel32/client/misc/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3…

1 0

[ion] 52751: [PSDK]: Add missing RESETDEV define to winbase. [WINE]: Wrap Wine's get_char_typeW to iswctype in unicode.h, which will allow better sharing of synched code.
by ion＠svn.reactos.org 21 Jul '11

21 Jul '11

Author: ion Date: Thu Jul 21 02:51:50 2011 New Revision: 52751 URL: http://svn.reactos.org/svn/reactos?rev=52751&view=rev Log: [PSDK]: Add missing RESETDEV define to winbase. [WINE]: Wrap Wine's get_char_typeW to iswctype in unicode.h, which will allow better sharing of synched code. Modified: trunk/reactos/include/psdk/winbase.h trunk/reactos/include/reactos/wine/unicode.h Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Thu Jul 21 02:51:50 2011 @@ -222,6 +222,7 @@ #define SETRTS 3 #define SETXOFF 1 #define SETXON 2 +#define RESETDEV 7 #define SETBREAK 8 #define CLRBREAK 9 #define STILL_ACTIVE 0x103 Modified: trunk/reactos/include/reactos/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/unico… ============================================================================== --- trunk/reactos/include/reactos/wine/unicode.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/unicode.h [iso-8859-1] Thu Jul 21 02:51:50 2011 @@ -60,6 +60,7 @@ #define snprintfW _snwprintf #define vsnprintfW _vsnwprintf #define isprintW iswprint +#define get_char_typeW(x) iswctype((x) >> 8, (x) & 0xFF) static __inline WCHAR *memchrW( const WCHAR *ptr, WCHAR ch, size_t n ) {

1 0

[gedmurphy] 52750: [SHELL32_NEW] - Add some enums which were accidentally removed. - Add the rather strange Wineisms which some of their dlls rely on. - Should fix the build for this branch
by gedmurphy＠svn.reactos.org 20 Jul '11

20 Jul '11

Author: gedmurphy Date: Wed Jul 20 21:35:54 2011 New Revision: 52750 URL: http://svn.reactos.org/svn/reactos?rev=52750&view=rev Log: [SHELL32_NEW] - Add some enums which were accidentally removed. - Add the rather strange Wineisms which some of their dlls rely on. - Should fix the build for this branch Modified: branches/shell32_new-bringup/include/psdk/shlwapi.h branches/shell32_new-bringup/include/reactos/wine/commctrl.h Modified: branches/shell32_new-bringup/include/psdk/shlwapi.h URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/include/psd… ============================================================================== --- branches/shell32_new-bringup/include/psdk/shlwapi.h [iso-8859-1] (original) +++ branches/shell32_new-bringup/include/psdk/shlwapi.h [iso-8859-1] Wed Jul 20 21:35:54 2011 @@ -579,6 +579,11 @@ URL_SCHEME_MSSHELLROOTED, URL_SCHEME_MSSHELLIDLIST, URL_SCHEME_MSHELP, + URL_SCHEME_MSSHELLDEVICE, + URL_SCHEME_WILDCARD, + URL_SCHEME_SEARCH_MS, + URL_SCHEME_SEARCH, + URL_SCHEME_KNOWNFOLDER, URL_SCHEME_MAXVALUE } URL_SCHEME; Modified: branches/shell32_new-bringup/include/reactos/wine/commctrl.h URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/include/rea… ============================================================================== --- branches/shell32_new-bringup/include/reactos/wine/commctrl.h [iso-8859-1] (original) +++ branches/shell32_new-bringup/include/reactos/wine/commctrl.h [iso-8859-1] Wed Jul 20 21:35:54 2011 @@ -31,6 +31,19 @@ #else static const WCHAR DRAGLISTMSGSTRINGW[] = { 'c','o','m','m','c','t','r','l', '_','D','r','a','g','L','i','s','t','M','s','g',0 }; +#endif + +#define ListView_InsertItemA(hwnd,pitem) \ + (INT)SNDMSGA((hwnd),LVM_INSERTITEMA,0,(LPARAM)(const LVITEMA *)(pitem)) +#define ListView_InsertItemW(hwnd,pitem) \ + (INT)SNDMSGW((hwnd),LVM_INSERTITEMW,0,(LPARAM)(const LVITEMW *)(pitem)) + +#ifdef __cplusplus +#define SNDMSGA ::SendMessageA +#define SNDMSGW ::SendMessageW +#else +#define SNDMSGA SendMessageA +#define SNDMSGW SendMessageW #endif #define FLATSB_CLASSA "flatsb_class32"

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs