Ros-diffs October 2013

ros-diffs@reactos.org

14 participants
325 discussions

[hbelusca] 60561: [CSRSRV]: In CsrCaptureArguments, be sure that the number of captured pointers is at most equal to MAXUSHORT (and not the total length of the captured buffer).
by hbelusca＠svn.reactos.org 06 Oct '13

06 Oct '13

Author: hbelusca Date: Sun Oct 6 14:20:18 2013 New Revision: 60561 URL: http://svn.reactos.org/svn/reactos?rev=60561&view=rev Log: [CSRSRV]: In CsrCaptureArguments, be sure that the number of captured pointers is at most equal to MAXUSHORT (and not the total length of the captured buffer). Modified: trunk/reactos/subsystems/win32/csrsrv/api.c Modified: trunk/reactos/subsystems/win32/csrsrv/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/ap… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/api.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/api.c [iso-8859-1] Sun Oct 6 14:20:18 2013 @@ -1153,7 +1153,7 @@ /* Check if the Length is valid */ if ((FIELD_OFFSET(CSR_CAPTURE_BUFFER, PointerOffsetsArray) + (LocalCaptureBuffer->PointerCount * sizeof(PVOID)) > Length) || - (Length > MAXWORD)) + (LocalCaptureBuffer->PointerCount > MAXUSHORT)) { /* Return failure */ DPRINT1("*** CSRSS: CaptureBuffer %p has bad length\n", LocalCaptureBuffer);

1 0

[hbelusca] 60560: [CSR] During my investigations for making working Win2k3 csrsrv.dll (or other CSR servers) into ROS (to compare our behaviour with our own csrsrv.dll and Win2k3 one), I hit a prob...
by hbelusca＠svn.reactos.org 06 Oct '13

06 Oct '13

Author: hbelusca Date: Sun Oct 6 13:33:17 2013 New Revision: 60560 URL: http://svn.reactos.org/svn/reactos?rev=60560&view=rev Log: [CSR] During my investigations for making working Win2k3 csrsrv.dll (or other CSR servers) into ROS (to compare our behaviour with our own csrsrv.dll and Win2k3 one), I hit a problem: if I test a checked-build version of csrsrv (or other CSR servers), everything was fine when they were loaded, but if I use a release-build version (i.e. without any debug information), I systematically hit a memory access violation which was traced back to the moment when a CSR server's CsrInitialization entry point was called. So I did the experiment, where I used our (debug-build) csrsrv with a free-build win2k3 CSR server dll (it was winsrv.dll, and I retested with basesrv.dll after). I hit the access violation. But if I took a debug-build version of winsrv.dll, everything was OK. I then added in our csrsrv' server.c file the following line (around line 212 of the current file version): DPRINT1("%s ; ServerDll->ValidTable = 0x%p ; ServerDll->NameTable = 0x%p ; ServerDll->SizeOfProcessData = %d ; ServerDll->ConnectCallback = 0x%p\n", DllString, ServerDll->ValidTable, ServerDll->NameTable, ServerDll->SizeOfProcessData, ServerDll->ConnectCallback); and I saw that, when using a debug-build win2k3 CSR server, everything was fine (in particular the ServerDll->SizeOfProcessData member contained a reasonable value, e.g. a size of 88 bytes), whereas if I used a free-build version, I got an off-by-one problem, with the ServerDll->ValidTable pointer valid but the ServerDll->NameTable member being equal to 88 (i.e. invalid pointer) and the ServerDll->SizeOfProcessData member being equal to a very large value, which looked like a pointer value. After more investigations, I saw that in debug-build CSR servers the list of API names were stored, whereas it was not the case in free-build versions. Therefore I concluded that the API names table was included *ONLY* in debug builds and not in release builds. Hence, to be able to test in ROS either debug-builds or release-builds versions of Windows CSR servers in ROS (and vice-versa), I introduced a #define called CSR_DBG, which is defined only if the DBG macro is != 0, and which is not defined otherwise. When the CSR_DBG flag is defined, API names tables are added in CSR servers and otherwise, they are not. Therefore, we are now able to test debug-build Windows CSR servers in ROS (the default possibility) or free-build versions of these CSR servers (but first, we have to build the other ones without the CSR_DBG flag, to avoid the off-by-one problem described above). Modified: trunk/reactos/include/reactos/subsys/csr/csrsrv.h trunk/reactos/subsystems/win/basesrv/init.c trunk/reactos/subsystems/win32/csrsrv/api.c trunk/reactos/subsystems/win32/csrsrv/api.h trunk/reactos/subsystems/win32/csrsrv/init.c trunk/reactos/subsystems/win32/csrsrv/server.c trunk/reactos/win32ss/user/winsrv/consrv/init.c trunk/reactos/win32ss/user/winsrv/usersrv/init.c Modified: trunk/reactos/include/reactos/subsys/csr/csrsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] Sun Oct 6 13:33:17 2013 @@ -9,6 +9,14 @@ #ifndef _CSRSRV_H #define _CSRSRV_H + +/* + * The CSR_DBG macro is defined for building CSR Servers + * with extended debugging information. + */ +#if DBG +#define CSR_DBG +#endif #include "csrmsg.h" @@ -215,7 +223,14 @@ ULONG HighestApiSupported; PCSR_API_ROUTINE *DispatchTable; PBOOLEAN ValidTable; // Table of booleans which describe whether or not a server function call is valid when it is called via CsrCallServerFromServer. +/* + * On Windows Server 2003, CSR Servers contain + * the API Names Table only in Debug Builds. + */ +#ifdef CSR_DBG PCHAR *NameTable; +#endif + ULONG SizeOfProcessData; PCSR_CONNECT_CALLBACK ConnectCallback; PCSR_DISCONNECT_CALLBACK DisconnectCallback; @@ -226,7 +241,11 @@ ULONG Unknown2[3]; } CSR_SERVER_DLL, *PCSR_SERVER_DLL; #ifndef _WIN64 -C_ASSERT(FIELD_OFFSET(CSR_SERVER_DLL, SharedSection) == 0x3C); + #ifdef CSR_DBG + C_ASSERT(FIELD_OFFSET(CSR_SERVER_DLL, SharedSection) == 0x3C); + #else + C_ASSERT(FIELD_OFFSET(CSR_SERVER_DLL, SharedSection) == 0x38); + #endif #endif typedef Modified: trunk/reactos/subsystems/win/basesrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/ini… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] Sun Oct 6 13:33:17 2013 @@ -97,6 +97,11 @@ TRUE, // BaseSrvNlsGetUserInfo }; +/* + * On Windows Server 2003, CSR Servers contain + * the API Names Table only in Debug Builds. + */ +#ifdef CSR_DBG PCHAR BaseServerApiNameTable[BasepMaxApiNumber - BASESRV_FIRST_API_NUMBER] = { "BaseCreateProcess", @@ -131,6 +136,7 @@ "BaseRegisterThread", "BaseNlsGetUserInfo", }; +#endif /* FUNCTIONS ******************************************************************/ @@ -567,7 +573,9 @@ LoadedServerDll->HighestApiSupported = BasepMaxApiNumber; LoadedServerDll->DispatchTable = BaseServerApiDispatchTable; LoadedServerDll->ValidTable = BaseServerApiServerValidTable; +#ifdef CSR_DBG LoadedServerDll->NameTable = BaseServerApiNameTable; +#endif LoadedServerDll->SizeOfProcessData = 0; LoadedServerDll->ConnectCallback = NULL; LoadedServerDll->DisconnectCallback = NULL; Modified: trunk/reactos/subsystems/win32/csrsrv/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/ap… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/api.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/api.c [iso-8859-1] Sun Oct 6 13:33:17 2013 @@ -77,23 +77,27 @@ { /* We are beyond the Maximum API ID, or it doesn't exist */ DPRINT1("API: %d\n", ApiId); +#ifdef CSR_DBG DPRINT1("CSRSS: %lx (%s) is invalid ApiTableIndex for %Z or is an " "invalid API to call from the server.\n", ApiId, ((ServerDll->NameTable) && (ServerDll->NameTable[ApiId])) ? ServerDll->NameTable[ApiId] : "*** UNKNOWN ***", &ServerDll->Name); +#endif // DbgBreakPoint(); ReplyMsg->Status = STATUS_ILLEGAL_FUNCTION; return STATUS_ILLEGAL_FUNCTION; } } +#ifdef CSR_DBG if (CsrDebug & 2) { DPRINT1("CSRSS: %s Api Request received from server process\n", ServerDll->NameTable[ApiId]); } +#endif /* Validation complete, start SEH */ _SEH2_TRY @@ -577,6 +581,7 @@ continue; } +#ifdef CSR_DBG if (CsrDebug & 2) { DPRINT1("[%02x] CSRSS: [%02x,%02x] - %s Api called from %08x\n", @@ -586,6 +591,7 @@ ServerDll->NameTable[ApiId], NULL); } +#endif /* Assume success */ ReceiveMsg.Status = STATUS_SUCCESS; @@ -781,6 +787,7 @@ continue; } +#ifdef CSR_DBG if (CsrDebug & 2) { DPRINT1("[%02x] CSRSS: [%02x,%02x] - %s Api called from %08x, Process %08x - %08x\n", @@ -792,6 +799,7 @@ CsrThread->Process, CsrProcess); } +#endif /* Assume success */ ReplyMsg = &ReceiveMsg; Modified: trunk/reactos/subsystems/win32/csrsrv/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/ap… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/api.h [iso-8859-1] Sun Oct 6 13:33:17 2013 @@ -40,6 +40,9 @@ #define CSR_SERVER_DLL_MAX 4 + +// Debug Flag +extern ULONG CsrDebug; extern HANDLE hBootstrapOk; extern HANDLE CsrApiPort; @@ -49,7 +52,6 @@ extern LIST_ENTRY CsrThreadHashTable[NUMBER_THREAD_HASH_BUCKETS]; extern PCSR_PROCESS CsrRootProcess; extern UNICODE_STRING CsrDirectoryName; -extern ULONG CsrDebug; extern ULONG CsrTotalPerProcessDataLength; extern SYSTEM_BASIC_INFORMATION CsrNtSysInfo; extern HANDLE CsrHeap; Modified: trunk/reactos/subsystems/win32/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/in… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/init.c [iso-8859-1] Sun Oct 6 13:33:17 2013 @@ -15,6 +15,9 @@ #include <debug.h> /* DATA ***********************************************************************/ + +// Debug Flag +ULONG CsrDebug = 0; // 0xFFFFFFFF; HANDLE CsrHeap = NULL; HANDLE CsrObjectDirectory = NULL; @@ -25,7 +28,6 @@ HANDLE CsrSmApiPort = NULL; HANDLE hSbApiPort = NULL; HANDLE CsrApiPort = NULL; -ULONG CsrDebug = 0; // 0xFFFFFFFF; ULONG CsrMaxApiRequestThreads; ULONG CsrTotalPerProcessDataLength; ULONG SessionId; Modified: trunk/reactos/subsystems/win32/csrsrv/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/se… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/server.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/server.c [iso-8859-1] Sun Oct 6 13:33:17 2013 @@ -15,6 +15,13 @@ /* DATA ***********************************************************************/ +PCSR_SERVER_DLL CsrLoadedServerDll[CSR_SERVER_DLL_MAX]; +PVOID CsrSrvSharedSectionHeap = NULL; +PVOID CsrSrvSharedSectionBase = NULL; +PVOID *CsrSrvSharedStaticServerData = NULL; +ULONG CsrSrvSharedSectionSize = 0; +HANDLE CsrSrvSharedSection = NULL; + PCSR_API_ROUTINE CsrServerApiDispatchTable[CsrpMaxApiNumber] = { CsrSrvClientConnect, @@ -33,6 +40,11 @@ TRUE }; +/* + * On Windows Server 2003, CSR Servers contain + * the API Names Table only in Debug Builds. + */ +#ifdef CSR_DBG PCHAR CsrServerApiNameTable[CsrpMaxApiNumber] = { "ClientConnect", @@ -41,13 +53,7 @@ "IdentifyAlertableThread", "SetPriorityClass" }; - -PCSR_SERVER_DLL CsrLoadedServerDll[CSR_SERVER_DLL_MAX]; -PVOID CsrSrvSharedSectionHeap = NULL; -PVOID CsrSrvSharedSectionBase = NULL; -PVOID *CsrSrvSharedStaticServerData = NULL; -ULONG CsrSrvSharedSectionSize = 0; -HANDLE CsrSrvSharedSection = NULL; +#endif /* PRIVATE FUNCTIONS **********************************************************/ @@ -73,7 +79,9 @@ LoadedServerDll->HighestApiSupported = CsrpMaxApiNumber; LoadedServerDll->DispatchTable = CsrServerApiDispatchTable; LoadedServerDll->ValidTable = CsrServerApiServerValidTable; +#ifdef CSR_DBG LoadedServerDll->NameTable = CsrServerApiNameTable; +#endif LoadedServerDll->SizeOfProcessData = 0; LoadedServerDll->ConnectCallback = NULL; LoadedServerDll->DisconnectCallback = NULL; Modified: trunk/reactos/win32ss/user/winsrv/consrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/init.c [iso-8859-1] Sun Oct 6 13:33:17 2013 @@ -218,6 +218,11 @@ // FALSE, // SrvConsoleClientConnect, }; +/* + * On Windows Server 2003, CSR Servers contain + * the API Names Table only in Debug Builds. + */ +#ifdef CSR_DBG PCHAR ConsoleServerApiNameTable[ConsolepMaxApiNumber - CONSRV_FIRST_API_NUMBER] = { "OpenConsole", @@ -313,7 +318,7 @@ // "SetScreenBufferInfo", // "ConsoleClientConnect", }; - +#endif /* FUNCTIONS ******************************************************************/ @@ -532,7 +537,9 @@ LoadedServerDll->HighestApiSupported = ConsolepMaxApiNumber; LoadedServerDll->DispatchTable = ConsoleServerApiDispatchTable; LoadedServerDll->ValidTable = ConsoleServerApiServerValidTable; +#ifdef CSR_DBG LoadedServerDll->NameTable = ConsoleServerApiNameTable; +#endif LoadedServerDll->SizeOfProcessData = sizeof(CONSOLE_PROCESS_DATA); LoadedServerDll->ConnectCallback = ConSrvConnect; LoadedServerDll->DisconnectCallback = ConSrvDisconnect; Modified: trunk/reactos/win32ss/user/winsrv/usersrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] Sun Oct 6 13:33:17 2013 @@ -57,6 +57,11 @@ // FALSE, // SrvGetSetShutdownBlockReason }; +/* + * On Windows Server 2003, CSR Servers contain + * the API Names Table only in Debug Builds. + */ +#ifdef CSR_DBG PCHAR UserServerApiNameTable[UserpMaxApiNumber - USERSRV_FIRST_API_NUMBER] = { "SrvExitWindowsEx", @@ -73,7 +78,7 @@ // "SrvConsoleHandleOperation", // "SrvGetSetShutdownBlockReason", }; - +#endif /* FUNCTIONS ******************************************************************/ @@ -291,7 +296,9 @@ LoadedServerDll->HighestApiSupported = UserpMaxApiNumber; LoadedServerDll->DispatchTable = UserServerApiDispatchTable; LoadedServerDll->ValidTable = UserServerApiServerValidTable; +#ifdef CSR_DBG LoadedServerDll->NameTable = UserServerApiNameTable; +#endif LoadedServerDll->SizeOfProcessData = 0; LoadedServerDll->ConnectCallback = NULL; LoadedServerDll->DisconnectCallback = NULL;

1 0

[spetreolle] 60559: [SETUPAPI] Add stubs for SetupVerifyInfFile, called by VMWare tools installer.
by spetreolle＠svn.reactos.org 06 Oct '13

06 Oct '13

Author: spetreolle Date: Sun Oct 6 12:56:48 2013 New Revision: 60559 URL: http://svn.reactos.org/svn/reactos?rev=60559&view=rev Log: [SETUPAPI] Add stubs for SetupVerifyInfFile, called by VMWare tools installer. Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec trunk/reactos/dll/win32/setupapi/stubs.c Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Sun Oct 6 12:56:48 2013 @@ -530,8 +530,8 @@ @ stub SetupUninstallNewlyCopiedInfs @ stdcall SetupUninstallOEMInfA(str long ptr) @ stdcall SetupUninstallOEMInfW(wstr long ptr) -@ stub SetupVerifyInfFileA -@ stub SetupVerifyInfFileW +@ stdcall SetupVerifyInfFileA(str ptr ptr) +@ stdcall SetupVerifyInfFileW(wstr ptr ptr) @ stdcall UnicodeToMultiByte(wstr long) pSetupUnicodeToMultiByte @ stub VerifyCatalogFile @ stub pSetupAccessRunOnceNodeList Modified: trunk/reactos/dll/win32/setupapi/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/stubs.c [iso-8859-1] Sun Oct 6 12:56:48 2013 @@ -113,7 +113,7 @@ } /*********************************************************************** - * SetupDiRemoveDevice(SETUPAPI.@) + * SetupDiRemoveDevice(SETUPAPI.@) */ BOOL WINAPI SetupDiRemoveDevice( @@ -127,7 +127,7 @@ /*********************************************************************** - * SetupDiUnremoveDevice(SETUPAPI.@) + * SetupDiUnremoveDevice(SETUPAPI.@) */ BOOL WINAPI SetupDiUnremoveDevice( @@ -154,3 +154,31 @@ return FALSE; } +/*********************************************************************** + * SetupVerifyInfFileA(SETUPAPI.@) + */ +BOOL WINAPI +SetupVerifyInfFileA( + IN PCSTR InfName, + IN PSP_ALTPLATFORM_INFO AltPlatformInfo, + OUT PSP_INF_SIGNER_INFO_A InfFileName) +{ + FIXME ("Stub %s %p %p\n", debugstr_a(InfName), AltPlatformInfo, InfFileName); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** + * SetupVerifyInfFileW(SETUPAPI.@) + */ +BOOL WINAPI +SetupVerifyInfFileW( + IN PCWSTR InfName, + IN PSP_ALTPLATFORM_INFO AltPlatformInfo, + OUT PSP_INF_SIGNER_INFO_W InfFileName) +{ + FIXME ("Stub %s %p %p\n", debugstr_w(InfName), AltPlatformInfo, InfFileName); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} +

1 0

[spetreolle] 60558: [SETUPAPI] Add _SP_INF_SIGNER_INFO and _SP_ALTPLATFORM_INFO defines.
by spetreolle＠svn.reactos.org 06 Oct '13

06 Oct '13

Author: spetreolle Date: Sun Oct 6 12:56:01 2013 New Revision: 60558 URL: http://svn.reactos.org/svn/reactos?rev=60558&view=rev Log: [SETUPAPI] Add _SP_INF_SIGNER_INFO and _SP_ALTPLATFORM_INFO defines. Modified: trunk/reactos/include/psdk/setupapi.h Modified: trunk/reactos/include/psdk/setupapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/setupapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/setupapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/setupapi.h [iso-8859-1] Sun Oct 6 12:56:01 2013 @@ -678,14 +678,47 @@ DWORD InfCount; BYTE VersionData[ANYSIZE_ARRAY]; } SP_INF_INFORMATION, *PSP_INF_INFORMATION; -typedef struct _SP_ALTPLATFORM_INFO { +typedef struct _SP_INF_SIGNER_INFO_A { + DWORD cbSize; + CHAR CatalogFile; + CHAR DigitalSigner; + CHAR DigitalSignerVersion; +} SP_INF_SIGNER_INFO_A, *PSP_INF_SIGNER_INFO_A; +typedef struct _SP_INF_SIGNER_INFO_W { + DWORD cbSize; + WCHAR CatalogFile; + WCHAR DigitalSigner; + WCHAR DigitalSignerVersion; +} SP_INF_SIGNER_INFO_W, *PSP_INF_SIGNER_INFO_W; +typedef struct _SP_ALTPLATFORM_INFO_V1 { DWORD cbSize; DWORD Platform; DWORD MajorVersion; DWORD MinorVersion; WORD ProcessorArchitecture; WORD Reserved; -} SP_ALTPLATFORM_INFO, *PSP_ALTPLATFORM_INFO; +} SP_ALTPLATFORM_INFO_V1, *PSP_ALTPLATFORM_INFO_V1; +typedef struct _SP_ALTPLATFORM_INFO_V2 { + DWORD cbSize; + DWORD Platform; + DWORD MajorVersion; + DWORD MinorVersion; + WORD ProcessorArchitecture; + union + { + WORD Reserved; + WORD Flags; + } DUMMYUNIONNAME; + DWORD FirstValidatedMajorVersion; + DWORD FirstValidatedMinorVersion; +} SP_ALTPLATFORM_INFO_V2, *PSP_ALTPLATFORM_INFO_V2; +#if _WIN32_WINNT <= 0x0500 +typedef SP_ALTPLATFORM_INFO_V1 SP_ALTPLATFORM_INFO; +typedef PSP_ALTPLATFORM_INFO_V1 PSP_ALTPLATFORM_INFO; +#else +typedef SP_ALTPLATFORM_INFO_V2 SP_ALTPLATFORM_INFO; +typedef PSP_ALTPLATFORM_INFO_V2 PSP_ALTPLATFORM_INFO; +#endif typedef struct _SP_ORIGINAL_FILE_INFO_A { DWORD cbSize; CHAR OriginalInfName[MAX_PATH];

1 0

[tfaber] 60557: [POWERCFG.CPL] - Use Yes/No instead of Ok/Cancel for "Are you sure you want to delete the power scheme?" Patch by Lee Schroeder. - Remove some unnecessary casts CORE-7503 #resolve
by tfaber＠svn.reactos.org 06 Oct '13

06 Oct '13

Author: tfaber Date: Sun Oct 6 10:31:02 2013 New Revision: 60557 URL: http://svn.reactos.org/svn/reactos?rev=60557&view=rev Log: [POWERCFG.CPL] - Use Yes/No instead of Ok/Cancel for "Are you sure you want to delete the power scheme?" Patch by Lee Schroeder. - Remove some unnecessary casts CORE-7503 #resolve Modified: trunk/reactos/dll/cpl/powercfg/powershemes.c Modified: trunk/reactos/dll/cpl/powercfg/powershemes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powershem… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powershemes.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/powershemes.c [iso-8859-1] Sun Oct 6 10:31:02 2013 @@ -471,7 +471,7 @@ LoadString(hApplet, IDS_DEL_SCHEME_TITLE, szBufT, sizeof(szBufT) / sizeof(TCHAR)); LoadString(hApplet, IDS_DEL_SCHEME, szBuf, sizeof(szBuf) / sizeof(TCHAR)); - if (MessageBox(hwnd, (LPCTSTR)szBuf, (LPCTSTR)szBufT, MB_OKCANCEL | MB_ICONQUESTION) == IDOK) + if (MessageBox(hwnd, szBuf, szBufT, MB_YESNO | MB_ICONQUESTION) == IDYES) { UINT Current;

1 0

[hbelusca] 60556: [CSRSRV]: Fix long-time SMSS port name typo (it is SbApiPort).
by hbelusca＠svn.reactos.org 06 Oct '13

06 Oct '13

Author: hbelusca Date: Sun Oct 6 00:30:29 2013 New Revision: 60556 URL: http://svn.reactos.org/svn/reactos?rev=60556&view=rev Log: [CSRSRV]: Fix long-time SMSS port name typo (it is SbApiPort). Modified: trunk/reactos/subsystems/win32/csrsrv/srv.h Modified: trunk/reactos/subsystems/win32/csrsrv/srv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/sr… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/srv.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/srv.h [iso-8859-1] Sun Oct 6 00:30:29 2013 @@ -49,7 +49,7 @@ #define SESSION_ROOT L"\\Sessions" #define GLOBAL_ROOT L"\\GLOBAL??" #define SYMLINK_NAME L"SymbolicLink" -#define SB_PORT_NAME L"SbAbiPort" +#define SB_PORT_NAME L"SbApiPort" #define CSR_PORT_NAME L"ApiPort" #define UNICODE_PATH_SEP L"\\"

1 0

[hbelusca] 60555: [CSRSRV]: Less PPORT_MESSAGE casts.
by hbelusca＠svn.reactos.org 06 Oct '13

06 Oct '13

Author: hbelusca Date: Sun Oct 6 00:04:18 2013 New Revision: 60555 URL: http://svn.reactos.org/svn/reactos?rev=60555&view=rev Log: [CSRSRV]: Less PPORT_MESSAGE casts. Modified: trunk/reactos/subsystems/win32/csrsrv/session.c Modified: trunk/reactos/subsystems/win32/csrsrv/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/se… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/session.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/session.c [iso-8859-1] Sun Oct 6 00:04:18 2013 @@ -443,7 +443,7 @@ /* Accept the connection */ Status = NtAcceptConnectPort(&hPort, NULL, - (PPORT_MESSAGE)Message, + &Message->h, TRUE, NULL, &RemotePortView);

1 0

[hbelusca] 60554: [CSRSRV]: Add the 0x prefix when we display some hex output.
by hbelusca＠svn.reactos.org 05 Oct '13

05 Oct '13

Author: hbelusca Date: Sat Oct 5 23:56:12 2013 New Revision: 60554 URL: http://svn.reactos.org/svn/reactos?rev=60554&view=rev Log: [CSRSRV]: Add the 0x prefix when we display some hex output. Modified: trunk/reactos/subsystems/win32/csrsrv/init.c Modified: trunk/reactos/subsystems/win32/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/in… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/init.c [iso-8859-1] Sat Oct 5 23:56:12 2013 @@ -969,7 +969,7 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("CSRSRV:%s: NtQuerySystemInformation failed (Status=%08lx)\n", + DPRINT1("CSRSRV:%s: NtQuerySystemInformation failed (Status=0x%08lx)\n", __FUNCTION__, Status); return Status; } @@ -981,7 +981,7 @@ Status = CsrSetProcessSecurity(); if (!NT_SUCCESS(Status)) { - DPRINT1("CSRSRV:%s: CsrSetProcessSecurity failed (Status=%08lx)\n", + DPRINT1("CSRSRV:%s: CsrSetProcessSecurity failed (Status=0x%08lx)\n", __FUNCTION__, Status); return Status; } @@ -990,7 +990,7 @@ Status = CsrInitializeNtSessionList(); if (!NT_SUCCESS(Status)) { - DPRINT1("CSRSRV:%s: CsrInitializeSessions failed (Status=%08lx)\n", + DPRINT1("CSRSRV:%s: CsrInitializeSessions failed (Status=0x%08lx)\n", __FUNCTION__, Status); return Status; } @@ -999,7 +999,7 @@ Status = CsrInitializeProcessStructure(); if (!NT_SUCCESS(Status)) { - DPRINT1("CSRSRV:%s: CsrInitializeProcessStructure failed (Status=%08lx)\n", + DPRINT1("CSRSRV:%s: CsrInitializeProcessStructure failed (Status=0x%08lx)\n", __FUNCTION__, Status); return Status; } @@ -1008,7 +1008,7 @@ Status = CsrParseServerCommandLine(ArgumentCount, Arguments); if (!NT_SUCCESS(Status)) { - DPRINT1("CSRSRV:%s: CsrParseServerCommandLine failed (Status=%08lx)\n", + DPRINT1("CSRSRV:%s: CsrParseServerCommandLine failed (Status=0x%08lx)\n", __FUNCTION__, Status); return Status; } @@ -1017,7 +1017,7 @@ Status = CsrInitCsrRootProcess(); if (!NT_SUCCESS(Status)) { - DPRINT1("CSRSRV:%s: CsrInitCsrRootProcess failed (Status=%08lx)\n", + DPRINT1("CSRSRV:%s: CsrInitCsrRootProcess failed (Status=0x%08lx)\n", __FUNCTION__, Status); return Status; } @@ -1026,7 +1026,7 @@ Status = CsrApiPortInitialize(); if (!NT_SUCCESS(Status)) { - DPRINT1("CSRSRV:%s: CsrApiPortInitialize failed (Status=%08lx)\n", + DPRINT1("CSRSRV:%s: CsrApiPortInitialize failed (Status=0x%08lx)\n", __FUNCTION__, Status); return Status; } @@ -1035,7 +1035,7 @@ Status = CsrSbApiPortInitialize(); if (!NT_SUCCESS(Status)) { - DPRINT1("CSRSRV:%s: CsrSbApiPortInitialize failed (Status=%08lx)\n", + DPRINT1("CSRSRV:%s: CsrSbApiPortInitialize failed (Status=0x%08lx)\n", __FUNCTION__, Status); return Status; } @@ -1047,7 +1047,7 @@ &CsrSmApiPort); if (!NT_SUCCESS(Status)) { - DPRINT1("CSRSRV:%s: SmConnectToSm failed (Status=%08lx)\n", + DPRINT1("CSRSRV:%s: SmConnectToSm failed (Status=0x%08lx)\n", __FUNCTION__, Status); return Status; } @@ -1056,7 +1056,7 @@ Status = NtSetDefaultHardErrorPort(CsrApiPort); if (!NT_SUCCESS(Status)) { - DPRINT1("CSRSRV:%s: NtSetDefaultHardErrorPort failed (Status=%08lx)\n", + DPRINT1("CSRSRV:%s: NtSetDefaultHardErrorPort failed (Status=0x%08lx)\n", __FUNCTION__, Status); return Status; }

1 0

[hbelusca] 60553: [CSRSRV][CONSRV] CSR_WAIT_FUNCTION functions are callbacks and therefore are __stdcall aka. NTAPI. Fix this. Now, using either our csrsrv or win2k3' csrsrv works without problems; ...
by hbelusca＠svn.reactos.org 05 Oct '13

05 Oct '13

Author: hbelusca Date: Sat Oct 5 23:34:25 2013 New Revision: 60553 URL: http://svn.reactos.org/svn/reactos?rev=60553&view=rev Log: [CSRSRV][CONSRV] CSR_WAIT_FUNCTION functions are callbacks and therefore are __stdcall aka. NTAPI. Fix this. Now, using either our csrsrv or win2k3' csrsrv works without problems; there is no console key-press problems anymore (aka. stack corruption when calling multiple times CsrNotifyWait, which called those CSR_WAIT_FUNCTION functions). Modified: trunk/reactos/include/reactos/subsys/csr/csrsrv.h trunk/reactos/win32ss/user/winsrv/consrv/coninput.c trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c Modified: trunk/reactos/include/reactos/subsys/csr/csrsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] Sat Oct 5 23:34:25 2013 @@ -134,7 +134,7 @@ */ typedef BOOLEAN -(*CSR_WAIT_FUNCTION)( +(NTAPI *CSR_WAIT_FUNCTION)( IN PLIST_ENTRY WaitList, IN PCSR_THREAD WaitThread, IN PCSR_API_MESSAGE WaitApiMessage, Modified: trunk/reactos/win32ss/user/winsrv/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] Sat Oct 5 23:34:25 2013 @@ -78,6 +78,7 @@ // Wait function CSR_WAIT_FUNCTION static BOOLEAN +NTAPI ReadCharsThread(IN PLIST_ENTRY WaitList, IN PCSR_THREAD WaitThread, IN PCSR_API_MESSAGE WaitApiMessage, @@ -193,6 +194,7 @@ // Wait function CSR_WAIT_FUNCTION static BOOLEAN +NTAPI ReadInputBufferThread(IN PLIST_ENTRY WaitList, IN PCSR_THREAD WaitThread, IN PCSR_API_MESSAGE WaitApiMessage, Modified: trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] Sat Oct 5 23:34:25 2013 @@ -308,6 +308,7 @@ // Wait function CSR_WAIT_FUNCTION static BOOLEAN +NTAPI WriteConsoleThread(IN PLIST_ENTRY WaitList, IN PCSR_THREAD WaitThread, IN PCSR_API_MESSAGE WaitApiMessage,

1 0

[spetreolle] 60552: [GDI32_WINETEST] [USER32_WINETEST] Use Jira bug ids.
by spetreolle＠svn.reactos.org 05 Oct '13

05 Oct '13

Author: spetreolle Date: Sat Oct 5 22:20:32 2013 New Revision: 60552 URL: http://svn.reactos.org/svn/reactos?rev=60552&view=rev Log: [GDI32_WINETEST] [USER32_WINETEST] Use Jira bug ids. Modified: trunk/rostests/winetests/gdi32/font.c trunk/rostests/winetests/gdi32/metafile.c trunk/rostests/winetests/user32/win.c Modified: trunk/rostests/winetests/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/font.c?re… ============================================================================== --- trunk/rostests/winetests/gdi32/font.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/font.c [iso-8859-1] Sat Oct 5 22:20:32 2013 @@ -336,7 +336,7 @@ if(!winetest_interactive) { - skip("reactos bug 5401: Skipping bitmap font tests!\n"); + skip("reactos bug ROSTESTS-8: Skipping bitmap font tests!\n"); return; } Modified: trunk/rostests/winetests/gdi32/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/metafile.… ============================================================================== --- trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] Sat Oct 5 22:20:32 2013 @@ -1737,7 +1737,7 @@ if(!winetest_interactive) { - skip("skipping match_emf_record(), bug 5393\n"); + skip("skipping match_emf_record(), bug ROSTESTS-4\n"); return 0; } Modified: trunk/rostests/winetests/user32/win.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/win.c?re… ============================================================================== --- trunk/rostests/winetests/user32/win.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/win.c [iso-8859-1] Sat Oct 5 22:20:32 2013 @@ -7575,7 +7575,7 @@ test_SetForegroundWindow(hwndMain); if(!winetest_interactive) - skip("bug 5957: skipping test_shell_window, it crashes ros/win7 explorer\n"); + skip("bug ROSTESTS-23: skipping test_shell_window, it crashes ros/win7 explorer\n"); else test_shell_window(); test_handles( hwndMain );

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
33
Older →

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 October 2013