Ros-diffs April 2005

ros-diffs@reactos.org

26 participants
477 discussions

[mbosma] 14634: PackageManager: Little fix

by mbosma＠svn.reactos.com

PackageManager: Little fix Modified: trunk/rosapps/packmgr/cmd-line/main.c _____ Modified: trunk/rosapps/packmgr/cmd-line/main.c --- trunk/rosapps/packmgr/cmd-line/main.c 2005-04-16 11:42:44 UTC (rev 14633) +++ trunk/rosapps/packmgr/cmd-line/main.c 2005-04-16 11:48:26 UTC (rev 14634) @@ -22,43 +22,42 @@ if(argc<2) return Help(); - // install a package - if (argv[1] == "install") + if (!strcmp(argv[1], "install")) Install(); // install a package from source - else if (argv[1] == "src-inst") + else if (!strcmp(argv[1], "src-inst")) { wprintf(L"Sorry but I can't do that yet. \n"); } // update a package - else if (argv[1] == "update") + else if (!strcmp(argv[1], "update")) { wprintf(L"Sorry but I can't do that yet. \n"); } // update everything - else if (argv[1] == "dist-upgrade") + else if (!strcmp(argv[1], "dist-upgrade")) { wprintf(L"Sorry but I can't do that yet. \n"); } // remove a package - else if (argv[1] == "remove") + else if (!strcmp(argv[1], "remove")) { wprintf(L"Sorry but I can't do that yet. \n"); } // search for a package - else if (argv[1] == "show") + else if (!strcmp(argv[1], "show")) { Show(); } // search for a package - else if (argv[1] == "search") + else if (!strcmp(argv[1], "search")) { wprintf(L"Sorry but I can't do that yet. \n"); }

19 years, 5 months

[mbosma] 14633: PackageManager: Changed download server to my own webspace. Because http://svn.reactos.com is still offline.

by mbosma＠svn.reactos.com

PackageManager: Changed download server to my own webspace. Because http://svn.reactos.com is still offline. Modified: trunk/rosapps/packmgr/lib/download.cpp _____ Modified: trunk/rosapps/packmgr/lib/download.cpp --- trunk/rosapps/packmgr/lib/download.cpp 2005-04-16 11:11:52 UTC (rev 14632) +++ trunk/rosapps/packmgr/lib/download.cpp 2005-04-16 11:42:44 UTC (rev 14633) @@ -16,7 +16,7 @@ #include <wine/urlmon.h> // Server there all the files lie -const char* tree_server = "http://svn.reactos.com/viewcvs/*checkout*/trunk/rosapps/packmgr/tree/"; +const char* tree_server = "http://maarten-online.de/xml/"; //"http://svn.reactos.com/viewcvs/*checkout*/trunk/rosapps/packmgr/tree/ "; HRESULT WINAPI URLDownloadToFileA( LPUNKNOWN pCaller,

19 years, 5 months

[hpoussin] 14631: Allow interrupts indicating an empty buffer only if some bytes are pending

by hpoussin＠svn.reactos.com

Allow interrupts indicating an empty buffer only if some bytes are pending This should correct the boot in Qemu Modified: trunk/reactos/drivers/dd/serial/misc.c _____ Modified: trunk/reactos/drivers/dd/serial/misc.c --- trunk/reactos/drivers/dd/serial/misc.c 2005-04-15 22:02:37 UTC (rev 14630) +++ trunk/reactos/drivers/dd/serial/misc.c 2005-04-15 22:14:13 UTC (rev 14631) @@ -130,11 +130,13 @@ DeviceExtension->ComPort, Byte); DeviceExtension->SerialPerfStats.TransmittedCount++; } + if (!IsCircularBufferEmpty(&DeviceExtension->OutputBuffer)) + { + /* allow new interrupts */ + IER = READ_PORT_UCHAR(SER_IER(ComPortBase)); + WRITE_PORT_UCHAR(SER_IER(ComPortBase), IER | SR_IER_THR_EMPTY); + } KeReleaseSpinLock(&DeviceExtension->OutputBufferLock, Irql); - - /* allow new interrupts */ - IER = READ_PORT_UCHAR(SER_IER(ComPortBase)); - WRITE_PORT_UCHAR(SER_IER(ComPortBase), IER | SR_IER_THR_EMPTY); } BOOLEAN STDCALL

19 years, 5 months

[ekohl] 14630: Use RPC for making calls to the Service Control Manager.

by ekohl＠svn.reactos.com

Use RPC for making calls to the Service Control Manager. Added: trunk/reactos/include/idl/svcctl.idl Modified: trunk/reactos/lib/advapi32/makefile Modified: trunk/reactos/lib/advapi32/service/scm.c Modified: trunk/reactos/subsys/system/services/makefile Added: trunk/reactos/subsys/system/services/rpcserver.c Modified: trunk/reactos/subsys/system/services/services.c Modified: trunk/reactos/subsys/system/services/services.h _____ Added: trunk/reactos/include/idl/svcctl.idl --- trunk/reactos/include/idl/svcctl.idl 2005-04-15 19:33:51 UTC (rev 14629) +++ trunk/reactos/include/idl/svcctl.idl 2005-04-15 22:02:37 UTC (rev 14630) @@ -0,0 +1,72 @@ +/* + * Service Control Manager (SCM) interface definition + */ + +//#include <windef.h> +//#include <winsvc.h> + +#define DWORD unsigned long +#define BOOL unsigned long +#define SC_HANDLE unsigned int +#define LPCSTR char* +#define LPCWSTR wchar_t* + +[ + uuid(367abb81-9844-35f1-ad32-98f038001003), + version(2.0), + pointer_default(unique), + explicit_handle +] +interface svcctl +{ +cpp_quote("#if 0"); + typedef struct _SERVICE_STATUS + { + DWORD dwServiceType; + DWORD dwCurrentState; + DWORD dwControlsAccepted; + DWORD dwWin32ExitCode; + DWORD dwServiceSpecificExitCode; + DWORD dwCheckPoint; + DWORD dwWaitHint; + } SERVICE_STATUS, *LPSERVICE_STATUS; +cpp_quote("#endif"); + + /* Service 0 */ + DWORD ScmrCloseServiceHandle([in] handle_t BindingHandle, + [in] SC_HANDLE hSCObject); + + /* Service 1 */ +// BOOL ScmrControlService([in] handle_t BindingHandle, +// [in] SC_HANDLE hService, +// [in] DWORD dwControl, +// [out] LPSERVICE_STATUS lpServiceStatus); + + /* Service 2 */ + DWORD ScmrDeleteService([in] handle_t BindingHandle, + [in] SC_HANDLE hService); + + DWORD ScmrOpenSCManagerA([in] handle_t BindingHandle, + [in, string, unique] LPCSTR lpMachineName, + [in, string, unique] LPCSTR lpDatabaseName, + [in] DWORD dwDesiredAccess, + [out] SC_HANDLE *hScm); + + DWORD ScmrOpenSCManagerW([in] handle_t BindingHandle, + [in, string, unique] LPCWSTR lpMachineName, + [in, string, unique] LPCWSTR lpDatabaseName, + [in] DWORD dwDesiredAccess, + [out] SC_HANDLE *hScm); + + SC_HANDLE ScmrOpenServiceA([in] handle_t BindingHandle, + [in] SC_HANDLE hSCManager, + [in, string] LPCSTR lpServiceName, + [in] DWORD dwDesiredAccess, + [out] SC_HANDLE *hScm); + + SC_HANDLE ScmrOpenServiceW([in] handle_t BindingHandle, + [in] SC_HANDLE hSCManager, + [in, string] LPCWSTR lpServiceName, + [in] DWORD dwDesiredAccess, + [out] SC_HANDLE *hScm); +} _____ Modified: trunk/reactos/lib/advapi32/makefile --- trunk/reactos/lib/advapi32/makefile 2005-04-15 19:33:51 UTC (rev 14629) +++ trunk/reactos/lib/advapi32/makefile 2005-04-15 22:02:37 UTC (rev 14630) @@ -16,7 +16,7 @@ TARGET_LFLAGS = -nostartfiles -nostdlib -TARGET_SDKLIBS = ntdll.a kernel32.a +TARGET_SDKLIBS = ntdll.a kernel32.a rpcrt4.a TARGET_BASE = $(TARGET_BASE_LIB_ADVAPI32) @@ -51,7 +51,8 @@ service/eventlog.o \ service/scm.o \ service/sctrl.o \ - service/undoc.o + service/undoc.o \ + service/svcctl_c.o TOKEN_OBJECTS = \ token/privilege.o \ @@ -67,8 +68,17 @@ DEP_OBJECTS = $(TARGET_OBJECTS) +TARGET_CLEAN = service/svcctl_c.c service/svcctl.h + include $(PATH_TO_TOP)/rules.mak include $(TOOLS_PATH)/helper.mk include $(TOOLS_PATH)/depend.mk + +WIDL_FLAGS = -o \ + -D _X86_ -D MIDL_PASS \ + -I $(PATH_TO_TOP)/w32api/include + +service/svcctl_c.c service/svcctl.h: $(PATH_TO_TOP)/include/idl/svcctl.idl + $(WIDL) $(WIDL_FLAGS) -h -H service/svcctl.h -c -C service/svcctl_c.c $(PATH_TO_TOP)/include/idl/svcctl.idl _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-04-15 19:33:51 UTC (rev 14629) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-04-15 22:02:37 UTC (rev 14630) @@ -1,10 +1,10 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/advapi32/service/scm.c * PURPOSE: Service control manager functions * PROGRAMMER: Emanuele Aliberti + * Eric Kohl * UPDATE HISTORY: * 19990413 EA created * 19990515 EA @@ -13,11 +13,70 @@ /* INCLUDES ******************************************************************/ #include "advapi32.h" +#include "svcctl.h" + #define NDEBUG #include <debug.h> /* FUNCTIONS *****************************************************************/ +handle_t BindingHandle = NULL; + +static VOID +HandleBind(VOID) +{ + LPWSTR pszStringBinding; + RPC_STATUS status; + + if (BindingHandle != NULL) + return; + + status = RpcStringBindingComposeW(NULL, + L"ncacn_np", + NULL, + L"\\pipe\\ntsvcs", + NULL, + &pszStringBinding); + if (status) + { + DPRINT1("RpcStringBindingCompose returned 0x%x\n", status); + return; + } + + /* Set the binding handle that will be used to bind to the server. */ + status = RpcBindingFromStringBindingW(pszStringBinding, + &BindingHandle); + if (status) + { + DPRINT1("RpcBindingFromStringBinding returned 0x%x\n", status); + } + + status = RpcStringFreeW(&pszStringBinding); + if (status) + { + DPRINT1("RpcStringFree returned 0x%x\n", status); + } +} + + +#if 0 +static VOID +HandleUnbind(VOID) +{ + RPC_STATUS status; + + if (BindingHandle == NULL) + return; + + status = RpcBindingFree(&BindingHandle); + if (status) + { + DPRINT1("RpcBindingFree returned 0x%x\n", status); + } +} +#endif + + /********************************************************************** * ChangeServiceConfigA * @@ -75,17 +134,27 @@ * * @implemented */ -BOOL -STDCALL +BOOL STDCALL CloseServiceHandle(SC_HANDLE hSCObject) { - DPRINT("CloseServiceHandle() - called.\n"); + DWORD dwError; - if (!CloseHandle(hSCObject)) { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - return TRUE; + DPRINT1("CloseServiceHandle() called\n"); + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrCloseServiceHandle(BindingHandle, + (unsigned int)hSCObject); + DPRINT1("dwError %lu\n", dwError); + + if (dwError) + { + SetLastError(dwError); + return FALSE; + } + + return TRUE; } @@ -94,15 +163,36 @@ * * @unimplemented */ -BOOL -STDCALL +BOOL STDCALL ControlService(SC_HANDLE hService, DWORD dwControl, LPSERVICE_STATUS lpServiceStatus) { - DPRINT1("ControlService is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); +#if 0 + DWORD dwError; + + DPRINT1("ControlService(%x, %x, %p)\n", + hService, dwControl, lpServiceStatus); + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrControlService(BindingHandle, + (unsigned int)hService, + dwControl, + lpServiceStatus); + if (dwError != ERROR_SUCCESS) + { + SetLastError(dwError); return FALSE; + } + + return TRUE; +#endif + + DPRINT1("ControlService is unimplemented\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } @@ -165,13 +255,25 @@ * * @unimplemented */ -BOOL -STDCALL +BOOL STDCALL DeleteService(SC_HANDLE hService) { - DPRINT1("DeleteService is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + DWORD dwError; + + DPRINT1("DeleteService(%x)\n", hService); + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrDeleteService(BindingHandle, + (unsigned int)hService); + if (dwError != ERROR_SUCCESS) + { + SetLastError(dwError); return FALSE; + } + + return TRUE; } @@ -410,6 +512,7 @@ return FALSE; } + /********************************************************************** * LockServiceDatabase * @@ -417,7 +520,7 @@ */ SC_LOCK STDCALL -LockServiceDatabase(SC_HANDLE hSCManager) +LockServiceDatabase(SC_HANDLE hSCManager) { DPRINT1("LockServiceDatabase is unimplemented\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -425,36 +528,80 @@ } +static VOID +WaitForSCManager(VOID) +{ + HANDLE hEvent; + + DPRINT1("WaitForSCManager() called\n"); + + /* Try to open the existing event */ + hEvent = OpenEventW(SYNCHRONIZE, + FALSE, + L"SvcctrlStartEvent_A3725DX"); + if (hEvent == NULL) + { + if (GetLastError() != ERROR_FILE_NOT_FOUND) + return; + + /* Try to create a new event */ + hEvent = CreateEventW(NULL, + TRUE, + FALSE, + L"SvcctrlStartEvent_A3725DX"); + if (hEvent == NULL) + { + /* Try to open the existing event again */ + hEvent = OpenEventW(SYNCHRONIZE, + FALSE, + L"SvcctrlStartEvent_A3725DX"); + if (hEvent == NULL) + return; + } + } + + /* Wait for 3 minutes */ + WaitForSingleObject(hEvent, 180000); + CloseHandle(hEvent); + + DPRINT1("ScmWaitForSCManager() done\n"); +} + + /********************************************************************** * OpenSCManagerA * - * @unplemented + * @implemented */ SC_HANDLE STDCALL OpenSCManagerA(LPCSTR lpMachineName, - LPCSTR lpDatabaseName, - DWORD dwDesiredAccess) + LPCSTR lpDatabaseName, + DWORD dwDesiredAccess) { - SC_HANDLE Handle; - UNICODE_STRING MachineNameW; - UNICODE_STRING DatabaseNameW; - ANSI_STRING MachineNameA; - ANSI_STRING DatabaseNameA; + SC_HANDLE hScm = NULL; + DWORD dwError; - DPRINT("OpenSCManagerA(%x, %x, %d)\n", lpMachineName, lpDatabaseName, dwDesiredAccess); + DPRINT1("OpenSCManagerA(%s, %s, %lx)\n", + lpMachineName, lpDatabaseName, dwDesiredAccess); - RtlInitAnsiString(&MachineNameA, (LPSTR)lpMachineName); - RtlAnsiStringToUnicodeString(&MachineNameW, &MachineNameA, TRUE); - RtlInitAnsiString(&DatabaseNameA, (LPSTR)lpDatabaseName); - RtlAnsiStringToUnicodeString(&DatabaseNameW, &DatabaseNameA, TRUE); + WaitForSCManager(); - Handle = OpenSCManagerW(lpMachineName ? MachineNameW.Buffer : NULL, - lpDatabaseName ? DatabaseNameW.Buffer : NULL, - dwDesiredAccess); + HandleBind(); - RtlFreeHeap(GetProcessHeap(), 0, MachineNameW.Buffer); - RtlFreeHeap(GetProcessHeap(), 0, DatabaseNameW.Buffer); - return Handle; + /* Call to services.exe using RPC */ + dwError = ScmrOpenSCManagerA(BindingHandle, + (LPSTR)lpMachineName, + (LPSTR)lpDatabaseName, + dwDesiredAccess, + (unsigned int*)&hScm); + DPRINT1("hScm = %p\n", hScm); + if (dwError) + { + SetLastError(dwError); + return NULL; + } + + return hScm; } @@ -463,215 +610,111 @@ * * @unimplemented */ -SC_HANDLE STDCALL OpenSCManagerW(LPCWSTR lpMachineName, - LPCWSTR lpDatabaseName, - DWORD dwDesiredAccess) +SC_HANDLE STDCALL +OpenSCManagerW(LPCWSTR lpMachineName, + LPCWSTR lpDatabaseName, + DWORD dwDesiredAccess) { - HANDLE hPipe; - DWORD dwMode; - DWORD dwWait; - BOOL fSuccess; - HANDLE hStartEvent; - LPWSTR lpszPipeName = L"\\\\.\\pipe\\Ntsvcs"; + SC_HANDLE hScm = NULL; + DWORD dwError; - DPRINT("OpenSCManagerW(%x, %x, %d)\n", lpMachineName, lpDatabaseName, dwDesiredAccess); + DPRINT1("OpenSCManagerW(%S, %S, %lx)\n", + lpMachineName, lpDatabaseName, dwDesiredAccess); - if (lpMachineName == NULL || wcslen(lpMachineName) == 0) - { - if (lpDatabaseName != NULL && wcscmp(lpDatabaseName, SERVICES_ACTIVE_DATABASEW) != 0) - { - DPRINT("OpenSCManagerW() - Invalid parameters.\n"); - return NULL; - } + WaitForSCManager(); - DPRINT("OpenSCManagerW() - OpenEvent(\"SvcctrlStartEvent_A3725DX\")\n"); + HandleBind(); - // Only connect to scm when event "SvcctrlStartEvent_A3725DX" is signaled - hStartEvent = OpenEventW(SYNCHRONIZE, FALSE, L"SvcctrlStartEvent_A3725DX"); - if (hStartEvent == NULL) - { - SetLastError(ERROR_DATABASE_DOES_NOT_EXIST); - DPRINT("OpenSCManagerW() - Failed to Open Event \"SvcctrlStartEvent_A3725DX\".\n"); - return NULL; - } + /* Call to services.exe using RPC */ + dwError = ScmrOpenSCManagerW(BindingHandle, + (LPWSTR)lpMachineName, + (LPWSTR)lpDatabaseName, + dwDesiredAccess, + (unsigned int*)&hScm); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrOpenSCManagerW() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return NULL; + } - DPRINT("OpenSCManagerW() - Waiting forever on event handle: %x\n", hStartEvent); + DPRINT1("hScm = %p\n", hScm); -#if 1 - dwWait = WaitForSingleObject(hStartEvent, INFINITE); - if (dwWait == WAIT_FAILED) - { - DPRINT("OpenSCManagerW() - Wait For Start Event failed.\n"); - SetLastError(ERROR_ACCESS_DENIED); - return NULL; - } -#else - { - DWORD Count; - - /* wait for event creation (by SCM) for max. 20 seconds */ - for (Count = 0; Count < 20; Count++) - { - dwWait = WaitForSingleObject(hStartEvent, 1000); - if (dwWait == WAIT_FAILED) - { - DPRINT("OpenSCManagerW() - Wait For Start Event failed.\n"); - Sleep(1000); - } - else - { - break; - } - } - - if (dwWait == WAIT_FAILED) - { - DbgPrint("WL: Failed to wait on event \"SvcctrlStartEvent_A3725DX\"\n"); - } - - } -#endif - - DPRINT("OpenSCManagerW() - Closing handle to event...\n"); - - CloseHandle(hStartEvent); - - // Try to open a named pipe; wait for it, if necessary - while (1) - { - DWORD dwLastError; - DPRINT("OpenSCManagerW() - attempting to open named pipe to SCM.\n"); - hPipe = CreateFileW(lpszPipeName, // pipe name - dwDesiredAccess, - 0, // no sharing - NULL, // no security attributes - OPEN_EXISTING, // opens existing pipe - 0, // default attributes - NULL); // no template file - - DPRINT("OpenSCManagerW() - handle to named pipe: %x\n", hPipe); - // Break if the pipe handle is valid - if (hPipe != INVALID_HANDLE_VALUE) - { - break; - } - - // Exit if an error other than ERROR_PIPE_BUSY occurs - dwLastError = GetLastError(); - if (dwLastError != ERROR_PIPE_BUSY) - { - DPRINT("OpenSCManagerW() - returning at 4, dwLastError %d\n", dwLastError); - return NULL; - } - - // All pipe instances are busy, so wait for 20 seconds - if (!WaitNamedPipeW(lpszPipeName, 20000)) - { - DPRINT("OpenSCManagerW() - Failed on WaitNamedPipeW(...).\n"); - return NULL; - } - } - - // The pipe connected; change to message-read mode - dwMode = PIPE_READMODE_MESSAGE; - fSuccess = SetNamedPipeHandleState( - hPipe, // pipe handle - &dwMode, // new pipe mode - NULL, // don't set maximum bytes - NULL); // don't set maximum time - if (!fSuccess) - { - CloseHandle(hPipe); - DPRINT("OpenSCManagerW() - Failed on SetNamedPipeHandleState(...).\n"); - return NULL; - } -#if 0 - // Send a message to the pipe server - lpvMessage = (argc > 1) ? argv[1] : "default message"; - - fSuccess = WriteFile( - hPipe, // pipe handle - lpvMessage, // message - strlen(lpvMessage) + 1, // message length - &cbWritten, // bytes written - NULL); // not overlapped - if (!fSuccess) - { - CloseHandle(hPipe); - DPRINT("OpenSCManagerW() - Failed to write to pipe.\n"); - return NULL; - } - - do - { - DPRINT("OpenSCManagerW() - in I/O loop to SCM...\n"); - // Read from the pipe - fSuccess = ReadFile( - hPipe, // pipe handle - chBuf, // buffer to receive reply - 512, // size of buffer - &cbRead, // number of bytes read - NULL); // not overlapped - - if (!fSuccess && GetLastError() != ERROR_MORE_DATA) - { - break; - } - - // Reply from the pipe is written to STDOUT. - if (!WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), chBuf, cbRead, &cbWritten, NULL)) - { - break; - } - } while(!fSuccess); // repeat loop if ERROR_MORE_DATA - - DPRINT("OpenSCManagerW() - I/O loop completed.\n"); - //CloseHandle(hPipe); -#endif - DPRINT("OpenSCManagerW() - success, returning handle to pipe %x\n", hPipe); - return hPipe; - } - else - { - /* FIXME: Connect to remote SCM */ - DPRINT("OpenSCManagerW() - FIXME: Connect to remote SCM is unimplemented.\n"); - return NULL; - } + return hScm; } /********************************************************************** * OpenServiceA * - * @unimplemented + * @implemented */ SC_HANDLE STDCALL OpenServiceA(SC_HANDLE hSCManager, LPCSTR lpServiceName, DWORD dwDesiredAccess) { - DPRINT1("OpenServiceA is unimplemented, returning ERROR_SERVICE_DOES_NOT_EXIST for %s\n", lpServiceName); - SetLastError(ERROR_SERVICE_DOES_NOT_EXIST); - return NULL; + SC_HANDLE hService = NULL; + DWORD dwError; + + DPRINT1("OpenServiceA(%p, %s, %lx)\n", + hSCManager, lpServiceName, dwDesiredAccess); + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrOpenServiceA(BindingHandle, + (unsigned int)hSCManager, + (LPSTR)lpServiceName, + dwDesiredAccess, + (unsigned int*)&hService); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrOpenServiceA() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return NULL; + } + + DPRINT1("hService = %p\n", hService); + + return hService; } /********************************************************************** * OpenServiceW * - * @unimplemented + * @implemented */ -SC_HANDLE -STDCALL -OpenServiceW( - SC_HANDLE hSCManager, - LPCWSTR lpServiceName, - DWORD dwDesiredAccess - ) +SC_HANDLE STDCALL +OpenServiceW(SC_HANDLE hSCManager, + LPCWSTR lpServiceName, + DWORD dwDesiredAccess) { - DPRINT1("OpenServiceW is unimplemented, returning ERROR_SERVICE_DOES_NOT_EXIST for %S\n", lpServiceName); - SetLastError(ERROR_SERVICE_DOES_NOT_EXIST); - return NULL; + SC_HANDLE hService = NULL; + DWORD dwError; + + DPRINT1("OpenServiceW(%p, %S, %lx)\n", + hSCManager, lpServiceName, dwDesiredAccess); + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrOpenServiceW(BindingHandle, + (unsigned int)hSCManager, + (LPWSTR)lpServiceName, + dwDesiredAccess, + (unsigned int*)&hService); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrOpenServiceW() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return NULL; + } + + DPRINT1("hService = %p\n", hService); + + return hService; } @@ -860,4 +903,14 @@ } +void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) +{ + return GlobalAlloc(GPTR,len); +} + +void __RPC_USER midl_user_free(void __RPC_FAR * ptr) +{ + GlobalFree(ptr); +} + /* EOF */ _____ Modified: trunk/reactos/subsys/system/services/makefile --- trunk/reactos/subsys/system/services/makefile 2005-04-15 19:33:51 UTC (rev 14629) +++ trunk/reactos/subsys/system/services/makefile 2005-04-15 22:02:37 UTC (rev 14630) @@ -10,14 +10,29 @@ TARGET_INSTALLDIR = system32 -TARGET_SDKLIBS = ntdll.a kernel32.a user32.a +TARGET_SDKLIBS = ntdll.a kernel32.a user32.a rpcrt4.a -TARGET_OBJECTS = $(TARGET_NAME).o database.o +TARGET_OBJECTS = svcctl_s.o database.o services.o rpcserver.o -TARGET_CFLAGS = -D__USE_W32API -Wall -Werror +TARGET_CFLAGS = -Wall -Werror -fno-builtin \ + -D__USE_W32API \ + -D_WIN32_IE=0x0500 \ + -D_WIN32_WINNT=0x501 \ + -DWINVER=0x600 \ + -DUNICODE \ + -D_UNICODE +TARGET_CLEAN = svcctl_s.c svcctl_s.h + +DEP_OBJECTS = $(TARGET_OBJECTS) + include $(PATH_TO_TOP)/rules.mak include $(TOOLS_PATH)/helper.mk +include $(TOOLS_PATH)/depend.mk + +svcctl_s.c svcctl_s.h: $(PATH_TO_TOP)/include/idl/svcctl.idl + $(WIDL) -o -h -H svcctl_s.h -s -S svcctl_s.c $(PATH_TO_TOP)/include/idl/svcctl.idl + # EOF _____ Added: trunk/reactos/subsys/system/services/rpcserver.c --- trunk/reactos/subsys/system/services/rpcserver.c 2005-04-15 19:33:51 UTC (rev 14629) +++ trunk/reactos/subsys/system/services/rpcserver.c 2005-04-15 22:02:37 UTC (rev 14630) @@ -0,0 +1,349 @@ +/* + + */ + +/* INCLUDES ****************************************************************/ + +#define NTOS_MODE_USER +#include <ntos.h> +#include <stdio.h> +#include <windows.h> + +#include "services.h" +#include "svcctl_s.h" + +#define NDEBUG +#include <debug.h> + + +/* GLOBALS *****************************************************************/ + +#define MANAGER_TAG 0x72674D68 /* 'hMgr' */ +#define SERVICE_TAG 0x63765368 /* 'hSvc' */ + +typedef struct _SCMGR_HANDLE +{ + DWORD Tag; + DWORD RefCount; + DWORD DesiredAccess; +} SCMGR_HANDLE; + + +typedef struct _MANAGER_HANDLE +{ + SCMGR_HANDLE Handle; + + /* FIXME: Insert more data here */ + + WCHAR DatabaseName[1]; +} MANAGER_HANDLE, *PMANAGER_HANDLE; + + +typedef struct _SERVICE_HANDLE +{ + SCMGR_HANDLE Handle; + + DWORD DesiredAccess; + PVOID DatabaseEntry; /* FIXME */ + + /* FIXME: Insert more data here */ + +} SERVICE_HANDLE, *PSERVICE_HANDLE; + + +/* FUNCTIONS ***************************************************************/ + +VOID +ScmStartRpcServer(VOID) +{ + RPC_STATUS Status; + + DPRINT("ScmStartRpcServer() called"); + + Status = RpcServerUseProtseqEp(L"ncacn_np", + 10, + L"\\pipe\\ntsvcs", + NULL); + if (Status != RPC_S_OK) + { + DPRINT1("RpcServerUseProtseqEp() failed (Status %lx)\n", Status); + return; + } + + Status = RpcServerRegisterIf(svcctl_ServerIfHandle, + NULL, + NULL); + if (Status != RPC_S_OK) + { + DPRINT1("RpcServerRegisterIf() failed (Status %lx)\n", Status); + return; + } + + Status = RpcServerListen(1, 20, TRUE); + if (Status != RPC_S_OK) + { + DPRINT1("RpcServerListen() failed (Status %lx)\n", Status); + return; + } + + DPRINT("ScmStartRpcServer() done"); +} + + +static DWORD +ScmCreateManagerHandle(LPWSTR lpDatabaseName, + SC_HANDLE *Handle, + DWORD dwDesiredAccess) +{ + PMANAGER_HANDLE Ptr; + + Ptr = GlobalAlloc(GPTR, + sizeof(MANAGER_HANDLE) + wcslen(lpDatabaseName) * sizeof(WCHAR)); + if (Ptr == NULL) + return ERROR_NOT_ENOUGH_MEMORY; + + Ptr->Handle.Tag = MANAGER_TAG; + Ptr->Handle.RefCount = 1; + Ptr->Handle.DesiredAccess = dwDesiredAccess; + + /* FIXME: initialize more data here */ + + wcscpy(Ptr->DatabaseName, lpDatabaseName); + + *Handle = (SC_HANDLE)Ptr; + + return ERROR_SUCCESS; +} + + +static DWORD +ScmCreateServiceHandle(LPVOID lpDatabaseEntry, + SC_HANDLE *Handle, + DWORD dwDesiredAccess) +{ + PMANAGER_HANDLE Ptr; + + Ptr = GlobalAlloc(GPTR, + sizeof(SERVICE_HANDLE)); + if (Ptr == NULL) + return ERROR_NOT_ENOUGH_MEMORY; + + Ptr->Handle.Tag = SERVICE_TAG; + Ptr->Handle.RefCount = 1; + Ptr->Handle.DesiredAccess = dwDesiredAccess; + + /* FIXME: initialize more data here */ + // Ptr->DatabaseEntry = lpDatabaseEntry; + + *Handle = (SC_HANDLE)Ptr; + + return ERROR_SUCCESS; +} + + +/* Service 0 */ +unsigned long +ScmrCloseServiceHandle(handle_t BindingHandle, + unsigned int hScObject) +{ + PMANAGER_HANDLE hManager; + + DPRINT("ScmrCloseServiceHandle() called\n"); + + DPRINT("hScObject = %X\n", hScObject); + + if (hScObject == 0) + return ERROR_INVALID_HANDLE; + + hManager = (PMANAGER_HANDLE)hScObject; + if (hManager->Handle.Tag == MANAGER_TAG) + { + DPRINT("Found manager handle\n"); + + hManager->Handle.RefCount--; + if (hManager->Handle.RefCount == 0) + { + /* FIXME: add cleanup code */ + + GlobalFree(hManager); + } + + DPRINT("ScmrCloseServiceHandle() done\n"); + return ERROR_SUCCESS; + } + else if (hManager->Handle.Tag == SERVICE_TAG) + { + DPRINT("Found service handle\n"); + + hManager->Handle.RefCount--; + if (hManager->Handle.RefCount == 0) + { + /* FIXME: add cleanup code */ + + GlobalFree(hManager); + } + + DPRINT("ScmrCloseServiceHandle() done\n"); + return ERROR_SUCCESS; + } + + DPRINT1("Invalid handle tag (Tag %lx)\n", hManager->Handle.Tag); + + return ERROR_INVALID_HANDLE; +} + + +/* Service 1 */ +#if 0 +unsigned long +ScmrControlService(handle_t BindingHandle, + unsigned int hService, + unsigned long dwControl, + LPSERVICE_STATUS lpServiceStatus) +{ + DPRINT("ScmrControlService() called\n"); + +#if 0 + lpServiceStatus->dwServiceType = 0x12345678; + lpServiceStatus->dwCurrentState = 0x98765432; + lpServiceStatus->dwControlsAccepted = 0xdeadbabe; + lpServiceStatus->dwWin32ExitCode = 0xbaadf00d; + lpServiceStatus->dwServiceSpecificExitCode = 0xdeadf00d; + lpServiceStatus->dwCheckPoint = 0xbaadbabe; + lpServiceStatus->dwWaitHint = 0x2468ACE1; +#endif + + return TRUE; +} +#endif + [truncated at 1000 lines; 487 more skipped]

19 years, 5 months

[arty] 14629: Removed need for separately prefixed binutils.

by arty＠svn.reactos.com

Removed need for separately prefixed binutils. Modified: trunk/reactos/boot/freeldr/bootsect/Makefile.powerpc _____ Modified: trunk/reactos/boot/freeldr/bootsect/Makefile.powerpc --- trunk/reactos/boot/freeldr/bootsect/Makefile.powerpc 2005-04-15 17:56:40 UTC (rev 14628) +++ trunk/reactos/boot/freeldr/bootsect/Makefile.powerpc 2005-04-15 19:33:51 UTC (rev 14629) @@ -27,8 +27,8 @@ rm freeldr.tmp ofwldr: $(OBJS) - mppcw32-ld --no-omagic $(LDSECT) $(OBJS) -g -o $@.elf - mppcw32-objcopy $(SECTIONS) -O aixcoff-rs6000 $@.elf $@ + $(LD) -melf32ppc --no-omagic $(LDSECT) $(OBJS) -g -o $@.elf + $(OBJCOPY) $(SECTIONS) -O aixcoff-rs6000 $@.elf $@ $(TOOLS)/hack-coff $@ clean:

19 years, 5 months

[ekohl] 14628: Support in-pointers to structs.

by ekohl＠svn.reactos.com

Support in-pointers to structs. Modified: trunk/reactos/tools/widl/ChangeLog Modified: trunk/reactos/tools/widl/client.c Modified: trunk/reactos/tools/widl/parser.y Modified: trunk/reactos/tools/widl/server.c Modified: trunk/reactos/tools/widl/y.tab.c _____ Modified: trunk/reactos/tools/widl/ChangeLog --- trunk/reactos/tools/widl/ChangeLog 2005-04-15 15:56:19 UTC (rev 14627) +++ trunk/reactos/tools/widl/ChangeLog 2005-04-15 17:56:40 UTC (rev 14628) @@ -1,5 +1,13 @@ ChangeLog +2005-04-15 ekohl + + tools/widl/client.c + tools/widl/parser.y + tools/widl/server.c + +Support in-pointers to structs. + 2005-04-03 ekohl tools/widl/client.c _____ Modified: trunk/reactos/tools/widl/client.c --- trunk/reactos/tools/widl/client.c 2005-04-15 15:56:19 UTC (rev 14627) +++ trunk/reactos/tools/widl/client.c 2005-04-15 17:56:40 UTC (rev 14628) @@ -75,6 +75,65 @@ } +static int get_type_size(type_t *type, int alignment) +{ + int size; + var_t *field; + + switch(type->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + size = 1; + size = ((size + alignment - 1) & ~(alignment -1)); + break; + + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + size = 2; + size = ((size + alignment - 1) & ~(alignment -1)); + break; + + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_FLOAT: + size = 4; + size = ((size + alignment - 1) & ~(alignment -1)); + break; + + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + size = 8; + size = ((size + alignment - 1) & ~(alignment -1)); + break; + + case RPC_FC_IGNORE: + size = 0; + break; + + case RPC_FC_STRUCT: + field = type->fields; + size = 0; + while (NEXT_LINK(field)) field = NEXT_LINK(field); + while (field) + { + size += get_type_size(field->type, alignment); + field = PREV_LINK(field); + } + break; + + default: + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, type->type); + return 0; + } + + return size; +} + + static void write_procformatstring(type_t *iface) { func_t *func = iface->funcs; @@ -113,8 +172,39 @@ print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); print_client("0x%02x, /* FC_<type> */\n", get_base_type(var->type->type)); } + else if (var->type->type == RPC_FC_RP) + { + var_t *field = var->type->ref->ref->fields; + int size; + + if (in_attr & !out_attr) + print_client("0x4d, /* FC_IN_PARAM */\n"); + else if (!in_attr & out_attr) + print_client("0x51, /* FC_OUT_PARAM */\n"); + else if (in_attr & out_attr) + print_client("0x50, /* FC_IN_OUT_PARAM */\n"); + fprintf(client, "#ifndef _ALPHA_\n"); + print_client("0x01,\n"); + fprintf(client, "#else\n"); + print_client("0x02,\n"); + fprintf(client, "#endif\n"); + print_client("NdrFcShort(0x%x),\n", type_offset); + + size = 9; + while (NEXT_LINK(field)) field = NEXT_LINK(field); + while (field) + { + size++; + field = PREV_LINK(field); + } + if (size % 2) + size++; + type_offset += size; + } else { + print_client("0x4d, /* FC_IN_PARAM */\n"); + error("%s:%d Unknown/unsupported type 0x%x\n", __FUNCTION__,__LINE__, var->type->type); return; @@ -122,8 +212,8 @@ } else if (var->ptr_level == 1) { - if (is_base_type(var->type)) - { +// if (is_base_type(var->type)) +// { if (in_attr & !out_attr) print_client("0x4d, /* FC_IN_PARAM */\n"); else if (!in_attr & out_attr) @@ -137,14 +227,20 @@ fprintf(client, "#endif\n"); print_client("NdrFcShort(0x%x),\n", type_offset); type_offset += 4; - } - else - { - error("%s:%d Unknown/unsupported type 0x%x\n", - __FUNCTION__,__LINE__, var->type->type); - return; - } +// } +// else +// { +// error("%s:%d Unknown/unsupported type 0x%x\n", +// __FUNCTION__,__LINE__, var->type->type); +// return; +// } } + else + { + error("%s:%d Pointer level %d is not supported!\n", + __FUNCTION__,__LINE__, var->ptr_level); + return; + } var = PREV_LINK(var); } @@ -185,7 +281,7 @@ { func_t *func = iface->funcs; var_t *var; - int out_attr; + int in_attr, out_attr; int string_attr; int ptr_attr, ref_attr, unique_attr; @@ -195,7 +291,7 @@ print_client("0,\n"); print_client("{\n"); indent++; - print_client("NdrFcShort(0x0),\n"); + print_client("NdrFcShort(0x00),\n"); while (NEXT_LINK(func)) func = NEXT_LINK(func); while (func) @@ -206,6 +302,7 @@ while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { + in_attr = is_attr(var->attrs, ATTR_IN); out_attr = is_attr(var->attrs, ATTR_OUT); string_attr = is_attr(var->attrs, ATTR_STRING); @@ -216,8 +313,51 @@ return; } - if (var->ptr_level == 1) + if (var->ptr_level == 0) { + if (!is_base_type(var->type)) + { + if (var->type->type == RPC_FC_RP) + { + var_t *field; + int tsize = 9; + unsigned char flags = 0; + + if (!in_attr && out_attr) + flags |= RPC_FC_P_ONSTACK; + + print_client("0x11, 0x%02X, /* FC_RP, [flags] */\n", flags); + print_client("NdrFcShort(0x%02X),\n", 0x02); + print_client("0x%02X,\n", var->type->ref->ref->type); + print_client("0x%02X,\n", 3); /* alignment -1 */ + print_client("NdrFcShort(0x%02X),\n", get_type_size(var->type->ref->ref, 4)); + + field = var->type->ref->ref->fields; + while (NEXT_LINK(field)) field = NEXT_LINK(field); + while (field) + { + print_client("0x%02X,\n", get_base_type(field->type->type)); + tsize++; + field = PREV_LINK(field); + } + if (tsize % 2) + { + print_client("0x5c, /* FC_PAD */\n"); + tsize++; + } + print_client("0x5b, /* FC_END */\n"); + } + else + { + + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, var->type->type); + return; + } + } + } + else if (var->ptr_level == 1) + { ptr_attr = is_attr(var->attrs, ATTR_PTR); ref_attr = is_attr(var->attrs, ATTR_REF); unique_attr = is_attr(var->attrs, ATTR_UNIQUE); @@ -389,6 +529,17 @@ size = 0; break; + case 0: + printf("%s\n", __FUNCTION__); + printf("ptr_level %d\n", var->ptr_level); + printf("Type %p\n", var->type); + printf("Type %x\n", var->type->type); + printf("Type name: %s\n", var->type->name); + printf("Tref %p\n", var->type->ref); + printf("Tref->name %s\n", var->type->ref->name); + printf("Tref->ref %p\n", var->type->ref->ref); + return; + default: error("%s:%d Unknown/unsupported type 0x%x\n", __FUNCTION__,__LINE__, var->type->type); @@ -441,6 +592,12 @@ size = 0; break; + case RPC_FC_RP: + case RPC_FC_UP: + case RPC_FC_FP: + size = 0; + break; + default: error("%s:%d Unknown/unsupported type 0x%x\n", __FUNCTION__,__LINE__, var->type->type); @@ -489,10 +646,25 @@ if (in_attr) { - if (var->ptr_level == 1 && - string_attr && - (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) + if (var->ptr_level == 0 && + var->type->type == RPC_FC_RP) { + if (var->type->ref->ref->type == RPC_FC_STRUCT) + { + print_client("NdrSimpleStructBufferSize(\n"); + indent++; + print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_client("(unsigned char __RPC_FAR *)%s,\n", var->name); + print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", + local_type_offset + 4); + nothing_printed = 1; + indent--; + } + } + else if (var->ptr_level == 1 && + string_attr && + (var->type->type == RPC_FC_CHAR || var->type->type == RPC_FC_WCHAR)) + { if (ptr_attr) { /* FIXME: not supported yet */ @@ -523,8 +695,28 @@ } /* calculate the next type offset */ - if (var->ptr_level == 1) + if (var->ptr_level == 0) { + if ((var->type->type == RPC_FC_RP) && + (var->type->ref->ref->type == RPC_FC_STRUCT)) + { + var_t *field = var->type->ref->ref->fields; + int tsize = 9; + + while (NEXT_LINK(field)) field = NEXT_LINK(field); + while (field) + { + tsize++; + field = PREV_LINK(field); + } + if (tsize % 2) + tsize++; + + local_type_offset += tsize; + } + } + else if (var->ptr_level == 1) + { local_type_offset += 4; } } @@ -545,6 +737,7 @@ int string_attr; int ptr_attr, ref_attr, unique_attr; var_t *var; + unsigned int local_type_offset = *type_offset; if (!func->args) return; @@ -670,81 +863,118 @@ } else { - alignment = 0; - switch (var->type->type) + if (is_base_type(var->type)) { - case RPC_FC_BYTE: - case RPC_FC_CHAR: - case RPC_FC_SMALL: - size = 1; alignment = 0; - break; + switch (var->type->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + size = 1; + alignment = 0; + break; - case RPC_FC_WCHAR: - case RPC_FC_USHORT: - case RPC_FC_SHORT: - size = 2; - if (last_size > 0 && last_size < 2) - alignment = (2 - last_size); - break; + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + size = 2; + if (last_size > 0 && last_size < 2) + alignment = (2 - last_size); + break; - case RPC_FC_ULONG: - case RPC_FC_LONG: - case RPC_FC_FLOAT: - size = 4; - if (last_size > 0 && last_size < 4) - alignment = (4 - last_size); - break; + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_FLOAT: + size = 4; + if (last_size > 0 && last_size < 4) + alignment = (4 - last_size); + break; - case RPC_FC_HYPER: - case RPC_FC_DOUBLE: - size = 8; - if (last_size > 0 && last_size < 4) - alignment = (4 - last_size); - break; + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + size = 8; + if (last_size > 0 && last_size < 4) + alignment = (4 - last_size); + break; - case RPC_FC_IGNORE: - size = 0; - break; + case RPC_FC_IGNORE: + size = 0; + break; - default: - error("%s:%d Unknown/unsupported type 0x%x\n", - __FUNCTION__,__LINE__, var->type->type); - return; - } + default: + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, var->type->type); + return; + } - if (size != 0) - { - if (alignment != 0) - print_client("_StubMsg.Buffer += %u;\n", alignment); + if (size != 0) + { + if (alignment != 0) + print_client("_StubMsg.Buffer += %u;\n", alignment); - print_client("*(("); - write_type(client, var->type, NULL, var->tname); - fprintf(client, " __RPC_FAR*)_StubMsg.Buffer) = "); - if (var->ptr_level == 1) - fprintf(client, "*"); - write_name(client, var); - fprintf(client, ";\n"); - print_client("_StubMsg.Buffer += sizeof("); - write_type(client, var->type, NULL, var->tname); - fprintf(client, ");\n"); - fprintf(client, "\n"); + print_client("*(("); + write_type(client, var->type, NULL, var->tname); + fprintf(client, " __RPC_FAR*)_StubMsg.Buffer) = "); + if (var->ptr_level == 1) + fprintf(client, "*"); + write_name(client, var); + fprintf(client, ";\n"); + print_client("_StubMsg.Buffer += sizeof("); + write_type(client, var->type, NULL, var->tname); + fprintf(client, ");\n"); + fprintf(client, "\n"); - last_size = size; + last_size = size; + } } + else if (var->type->type == RPC_FC_RP) + { + if (var->type->ref->ref->type == RPC_FC_STRUCT) + { + print_client("NdrSimpleStructMarshall(\n"); + indent++; + print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_client("(unsigned char __RPC_FAR *)%s,\n", var->name); + print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", + *type_offset + 4); + indent--; + fprintf(client, "\n"); + } + } } } /* calculate the next type offset */ - if (var->ptr_level == 1) + if (var->ptr_level == 0) { - *type_offset += 4; + if ((var->type->type == RPC_FC_RP) && + (var->type->ref->ref->type == RPC_FC_STRUCT)) + { + var_t *field = var->type->ref->ref->fields; + int tsize = 9; + + while (NEXT_LINK(field)) field = NEXT_LINK(field); + while (field) + { + tsize++; + field = PREV_LINK(field); + } + if (tsize % 2) + tsize++; + + local_type_offset += tsize; + } } + else if (var->ptr_level == 1) + { + local_type_offset += 4; + } } } -static void unmarshall_out_arguments(func_t *func) +static void unmarshall_out_arguments(func_t *func, unsigned int *type_offset) { unsigned int alignment; unsigned int size; @@ -752,6 +982,7 @@ int out_attr; var_t *var; var_t *def; + unsigned int local_type_offset = *type_offset; def = func->def; @@ -763,80 +994,131 @@ for (; var; var = PREV_LINK(var)) { out_attr = is_attr(var->attrs, ATTR_OUT); - if (!out_attr) - continue; - - if (var->ptr_level > 1) + if (out_attr) { - error("Function '%s' argument '%s': Pointer level %d not supported!\n", - func->def->name, var->name, var->ptr_level); - return; - } + if (var->ptr_level > 1) + { + error("Function '%s' argument '%s': Pointer level %d not supported!\n", + func->def->name, var->name, var->ptr_level); + return; + } - alignment = 0; - switch (var->type->type) - { - case RPC_FC_BYTE: - case RPC_FC_CHAR: - case RPC_FC_SMALL: - size = 1; - alignment = 0; - break; + if (is_base_type(var->type)) + { + alignment = 0; + switch (var->type->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + size = 1; + alignment = 0; + break; - case RPC_FC_WCHAR: - case RPC_FC_USHORT: - case RPC_FC_SHORT: - size = 2; - if (last_size > 0 && last_size < 2) - alignment = (2 - last_size); - break; + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + size = 2; + if (last_size > 0 && last_size < 2) + alignment = (2 - last_size); + break; - case RPC_FC_ULONG: - case RPC_FC_LONG: - case RPC_FC_FLOAT: - size = 4; - if (last_size > 0 && last_size < 4) - alignment = (4 - last_size); - break; + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_FLOAT: + size = 4; + if (last_size > 0 && last_size < 4) + alignment = (4 - last_size); + break; - case RPC_FC_HYPER: - case RPC_FC_DOUBLE: - size = 8; - if (last_size > 0 && last_size < 4) - alignment = (4 - last_size); - break; + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + size = 8; + if (last_size > 0 && last_size < 4) + alignment = (4 - last_size); + break; - case RPC_FC_IGNORE: - size = 0; - break; + case RPC_FC_IGNORE: + size = 0; + break; - default: - error("%s:%d Unknown/unsupported type 0x%x\n", - __FUNCTION__,__LINE__, var->type->type); - return; + default: + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, var->type->type); + return; + } + + if (size != 0) + { + if (var->ptr_level == 1) + { + fprintf(client, "\n"); + if (alignment != 0) + print_client("_StubMsg.Buffer += %u;\n", alignment); + + print_client("*"); + write_name(client, var); + fprintf(client, " = *(("); + write_type(client, var->type, NULL, var->tname); + fprintf(client, " __RPC_FAR *)_StubMsg.Buffer);\n"); + + print_client("_StubMsg.Buffer += sizeof("); + write_type(client, var->type, NULL, var->tname); + fprintf(client, ");\n"); + } + + last_size = size; + } + } + else if (var->type->type == RPC_FC_RP) + { + if (var->type->ref->ref->type == RPC_FC_STRUCT) + { + fprintf(client, "\n"); + print_client("NdrSimpleStructUnmarshall(\n"); + indent++; + print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_client("(unsigned char __RPC_FAR * __RPC_FAR *)&%s,\n", var->name); + print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u],\n", + *type_offset + 4); + print_client("(unsigned char)0);\n"); + indent--; + fprintf(client, "\n"); + } + } + else + { + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, var->type->type); + return; + } } - if (size != 0) + /* calculate the next type offset */ + if (var->ptr_level == 0) { - if (var->ptr_level == 1) + if ((var->type->type == RPC_FC_RP) && + (var->type->ref->ref->type == RPC_FC_STRUCT)) { - fprintf(client, "\n"); - if (alignment != 0) - print_client("_StubMsg.Buffer += %u;\n", alignment); + var_t *field = var->type->ref->ref->fields; + int tsize = 9; - print_client("*"); - write_name(client, var); - fprintf(client, " = *(("); - write_type(client, var->type, NULL, var->tname); - fprintf(client, " __RPC_FAR *)_StubMsg.Buffer);\n"); + while (NEXT_LINK(field)) field = NEXT_LINK(field); + while (field) + { + tsize++; + field = PREV_LINK(field); + } + if (tsize % 2) + tsize++; - print_client("_StubMsg.Buffer += sizeof("); - write_type(client, var->type, NULL, var->tname); - fprintf(client, ");\n"); + local_type_offset += tsize; } - - last_size = size; } + else if (var->ptr_level == 1) + { + local_type_offset += 4; + } } } @@ -1102,9 +1384,44 @@ indent -= 2; /* unmarshal out arguments */ - unmarshall_out_arguments(func); + unmarshall_out_arguments(func, &type_offset); } + /* update type_offset */ + if (func->args) + { + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + if (var->ptr_level == 0) + { + if ((var->type->type == RPC_FC_RP) && + (var->type->ref->ref->type == RPC_FC_STRUCT)) + { + var_t *field = var->type->ref->ref->fields; + int tsize = 9; + + while (NEXT_LINK(field)) field = NEXT_LINK(field); + while (field) + { + tsize++; + field = PREV_LINK(field); + } + if (tsize % 2) + tsize++; + + type_offset += tsize; + } + } + else if (var->ptr_level == 1) + { + type_offset += 4; + } + var = PREV_LINK(var); + } + } + /* update proc_offset */ if (func->args) { @@ -1267,7 +1584,7 @@ func_t *func; var_t *var; - /* determine the proc format string size */ + /* determine the type format string size */ func = iface->funcs; while (NEXT_LINK(func)) func = NEXT_LINK(func); while (func) @@ -1279,8 +1596,26 @@ while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - if (var->ptr_level == 1) + if (var->ptr_level == 0) { + if (var->type->type == RPC_FC_RP) + { + var_t *field = var->type->ref->ref->fields; + int tsize = 9; + + while (NEXT_LINK(field)) field = NEXT_LINK(field); + while (field) + { + tsize ++; + field = PREV_LINK(field); + } + if (tsize % 2) + tsize++; + size += tsize; + } + } + else if (var->ptr_level == 1) + { if (is_base_type(var->type)) size += 4; } @@ -1319,6 +1654,8 @@ case 0: if (is_base_type(var->type)) size += 2; + else if (var->type->type == RPC_FC_RP) + size += 4; break; case 1: _____ Modified: trunk/reactos/tools/widl/parser.y --- trunk/reactos/tools/widl/parser.y 2005-04-15 15:56:19 UTC (rev 14627) +++ trunk/reactos/tools/widl/parser.y 2005-04-15 17:56:40 UTC (rev 14628) @@ -593,7 +593,8 @@ coclasshdr: attributes coclass { $$ = $2; $$->attrs = $1; - if (!parse_only && do_header) write_coclass($$); + if (!parse_only && do_header) + write_coclass($$); } ; @@ -725,6 +726,7 @@ structdef: tSTRUCT t_ident '{' fields '}' { $$ = get_typev(RPC_FC_STRUCT, $2, tsSTRUCT); /* overwrite RPC_FC_STRUCT with a more exact type */ $$->type = get_struct_type( $4 ); + $$->name = $2->name; $$->fields = $4; $$->defined = TRUE; if(in_typelib) @@ -744,14 +746,15 @@ | tUNION aIDENTIFIER { $$ = make_tref(NULL, find_type2($2, tsUNION)); } ; -typedef: tTYPEDEF m_attributes type pident_list { typeref_t *tref = uniq_tref($3); +typedef: tTYPEDEF m_attributes type pident_list { typeref_t *tref = uniq_tref($3); $4->tname = tref->name; tref->name = NULL; $$ = type_ref(tref); $$->attrs = $2; - if (!parse_only && do_header) write_typedef($$, $4); - if (in_typelib && $$->attrs) - add_typedef($$, $4); + if (!parse_only && do_header) + write_typedef($$, $4); + if (in_typelib && $$->attrs) + add_typedef($$, $4); reg_types($$, $4, 0); } ; @@ -1114,6 +1117,7 @@ nt->t = t; nt->next = type_hash[hash]; type_hash[hash] = nt; + type->name = name; return type; } @@ -1136,7 +1140,14 @@ } t = get_attrv( type->attrs, ATTR_POINTERTYPE ); if (t) return t; - return RPC_FC_FP; + + if(is_attr( type->attrs, ATTR_PTR )) + return RPC_FC_FP; + + if(is_attr( type->attrs, ATTR_UNIQUE )) + return RPC_FC_UP; + + return RPC_FC_RP; } static type_t *reg_types(type_t *type, var_t *names, int t) _____ Modified: trunk/reactos/tools/widl/server.c --- trunk/reactos/tools/widl/server.c 2005-04-15 15:56:19 UTC (rev 14627) +++ trunk/reactos/tools/widl/server.c 2005-04-15 17:56:40 UTC (rev 14628) @@ -80,6 +80,65 @@ } +static int get_type_size(type_t *type, int alignment) +{ + int size; + var_t *field; + + switch(type->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + size = 1; + size = ((size + alignment - 1) & ~(alignment -1)); + break; + + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + size = 2; + size = ((size + alignment - 1) & ~(alignment -1)); + break; + + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_FLOAT: + size = 4; + size = ((size + alignment - 1) & ~(alignment -1)); + break; + + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + size = 8; + size = ((size + alignment - 1) & ~(alignment -1)); + break; + + case RPC_FC_IGNORE: + size = 0; + break; + + case RPC_FC_STRUCT: + field = type->fields; + size = 0; + while (NEXT_LINK(field)) field = NEXT_LINK(field); + while (field) + { + size += get_type_size(field->type, alignment); + field = PREV_LINK(field); + } + break; + + default: + error("%s:%d Unknown/unsupported type 0x%x\n", + __FUNCTION__,__LINE__, type->type); + return 0; + } + + return size; +} + + static void write_procformatstring(type_t *iface) { func_t *func = iface->funcs; @@ -118,6 +177,35 @@ print_server("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); print_server("0x%02x, /* FC_<type> */\n", get_base_type(var->type->type)); } + else if (var->type->type == RPC_FC_RP) + { + var_t *field = var->type->ref->ref->fields; + int size; + + if (in_attr & !out_attr) + print_server("0x4d, /* FC_IN_PARAM */\n"); + else if (!in_attr & out_attr) + print_server("0x51, /* FC_OUT_PARAM */\n"); + else if (in_attr & out_attr) + print_server("0x50, /* FC_IN_OUT_PARAM */\n"); + fprintf(server, "#ifndef _ALPHA_\n"); + print_server("0x01,\n"); + fprintf(server, "#else\n"); + print_server("0x02,\n"); + fprintf(server, "#endif\n"); + print_server("NdrFcShort(0x%x),\n", type_offset); + + size = 9; + while (NEXT_LINK(field)) field = NEXT_LINK(field); + while (field) + { + size++; + field = PREV_LINK(field); + } + if (size % 2) + size++; + type_offset += size; + } else { error("%s:%d Unknown/unsupported type 0x%x\n", @@ -127,8 +215,8 @@ } else if (var->ptr_level == 1) { - if (is_base_type(var->type)) - { +// if (is_base_type(var->type)) +// { if (in_attr & !out_attr) print_server("0x4d, /* FC_IN_PARAM */\n"); else if (!in_attr & out_attr) @@ -142,13 +230,13 @@ fprintf(server, "#endif\n"); print_server("NdrFcShort(0x%x),\n", type_offset); type_offset += 4; - } - else - { - error("%s:%d Unknown/unsupported type 0x%x\n", - __FUNCTION__,__LINE__, var->type->type); [truncated at 1000 lines; 1132 more skipped]

19 years, 5 months

[hpoussin] 14627: Add ASSERTs

by hpoussin＠svn.reactos.com

Add ASSERTs Correct a bug when processing IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / TargetDeviceRelation (serenum) Don't breakpoint if NDEBUG is defined (serenum) Allow to write more than 16 bytes in one IRP_MJ_WRITE (serial) Modified: trunk/reactos/drivers/bus/serenum/detect.c Modified: trunk/reactos/drivers/bus/serenum/misc.c Modified: trunk/reactos/drivers/bus/serenum/pdo.c Modified: trunk/reactos/drivers/bus/serenum/serenum.c Modified: trunk/reactos/drivers/dd/serial/circularbuffer.c Modified: trunk/reactos/drivers/dd/serial/create.c Modified: trunk/reactos/drivers/dd/serial/devctrl.c Modified: trunk/reactos/drivers/dd/serial/info.c Modified: trunk/reactos/drivers/dd/serial/misc.c Modified: trunk/reactos/drivers/dd/serial/pnp.c Modified: trunk/reactos/drivers/dd/serial/rw.c _____ Modified: trunk/reactos/drivers/bus/serenum/detect.c --- trunk/reactos/drivers/bus/serenum/detect.c 2005-04-15 10:52:29 UTC (rev 14626) +++ trunk/reactos/drivers/bus/serenum/detect.c 2005-04-15 15:56:19 UTC (rev 14627) @@ -199,7 +199,7 @@ KTIMER Timer; LARGE_INTEGER DueTime; - DueTime.QuadPart = -milliseconds * 10; + DueTime.QuadPart = milliseconds * -10; KeInitializeTimer(&Timer); KeSetTimer(&Timer, DueTime, NULL); return KeWaitForSingleObject(&Timer, Executive, KernelMode, FALSE, NULL); _____ Modified: trunk/reactos/drivers/bus/serenum/misc.c --- trunk/reactos/drivers/bus/serenum/misc.c 2005-04-15 10:52:29 UTC (rev 14626) +++ trunk/reactos/drivers/bus/serenum/misc.c 2005-04-15 15:56:19 UTC (rev 14627) @@ -14,10 +14,12 @@ NTSTATUS SerenumDuplicateUnicodeString( - OUT PUNICODE_STRING Destination, - IN PUNICODE_STRING Source, - IN POOL_TYPE PoolType) + OUT PUNICODE_STRING Destination, + IN PUNICODE_STRING Source, + IN POOL_TYPE PoolType) { + ASSERT(Destination); + if (Source == NULL) { RtlInitUnicodeString(Destination, NULL); @@ -52,6 +54,8 @@ ULONG DestinationSize = 0; NTSTATUS Status = STATUS_SUCCESS; + ASSERT(Destination); + /* Calculate length needed for destination unicode string */ va_start(args, Destination); Source = va_arg(args, PCSZ); @@ -133,6 +137,8 @@ ASSERT(((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFDO) ; LowerDevice = ((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; + ASSERT(LowerDevice); + KeInitializeEvent(&Event, NotificationEvent, FALSE); IoCopyCurrentIrpStackLocationToNext(Irp); @@ -162,6 +168,7 @@ ASSERT(DeviceExtension->Common.IsFDO); LowerDevice = DeviceExtension->LowerDevice; + ASSERT(LowerDevice); DPRINT("Serenum: calling lower device 0x%p [%wZ]\n", LowerDevice, &LowerDevice->DriverObject->DriverName); IoSkipCurrentIrpStackLocation(Irp); @@ -180,6 +187,7 @@ ASSERT(!DeviceExtension->Common.IsFDO); Fdo = DeviceExtension->AttachedFdo; + ASSERT(Fdo); DPRINT("Serenum: calling attached Fdo 0x%p [%wZ]\n", Fdo, &Fdo->DriverObject->DriverName); IoSkipCurrentIrpStackLocation(Irp); @@ -195,6 +203,7 @@ ASSERT(((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFDO) ; LowerDevice = ((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; + ASSERT(LowerDevice); IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(LowerDevice, Irp); _____ Modified: trunk/reactos/drivers/bus/serenum/pdo.c --- trunk/reactos/drivers/bus/serenum/pdo.c 2005-04-15 10:52:29 UTC (rev 14626) +++ trunk/reactos/drivers/bus/serenum/pdo.c 2005-04-15 15:56:19 UTC (rev 14627) @@ -99,6 +99,7 @@ return STATUS_INSUFFICIENT_RESOURCES; ObReferenceObject(DeviceObject); + DeviceRelations->Count = 1; DeviceRelations->Objects[0] = DeviceObject; *pDeviceRelations = DeviceRelations; _____ Modified: trunk/reactos/drivers/bus/serenum/serenum.c --- trunk/reactos/drivers/bus/serenum/serenum.c 2005-04-15 10:52:29 UTC (rev 14626) +++ trunk/reactos/drivers/bus/serenum/serenum.c 2005-04-15 15:56:19 UTC (rev 14627) @@ -52,7 +52,9 @@ { DPRINT1("Serenum: FDO stub for major function 0x%lx\n", IoGetCurrentIrpStackLocation(Irp)->MajorFunction); +#ifndef NDEBUG DbgBreakPoint(); +#endif Status = Irp->IoStatus.Status; } } @@ -73,7 +75,9 @@ { DPRINT1("Serenum: PDO stub for major function 0x%lx\n", IoGetCurrentIrpStackLocation(Irp)->MajorFunction); +#ifndef NDEBUG DbgBreakPoint(); +#endif Status = Irp->IoStatus.Status; } } @@ -100,12 +104,6 @@ for (i = 0; i < IRP_MJ_MAXIMUM_FUNCTION; i++) DriverObject->MajorFunction[i] = IrpStub; - /*DriverObject->MajorFunction[IRP_MJ_CREATE] = SerialCreate; - DriverObject->MajorFunction[IRP_MJ_CLOSE] = SerialClose; - DriverObject->MajorFunction[IRP_MJ_CLEANUP] = SerialCleanup; - DriverObject->MajorFunction[IRP_MJ_READ] = SerialRead; - DriverObject->MajorFunction[IRP_MJ_WRITE] = SerialWrite;*/ - //DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = Serenum; //DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = SerialQueryInformation; DriverObject->MajorFunction[IRP_MJ_PNP] = SerenumPnp; //DriverObject->MajorFunction[IRP_MJ_POWER] = SerialPower; _____ Modified: trunk/reactos/drivers/dd/serial/circularbuffer.c --- trunk/reactos/drivers/dd/serial/circularbuffer.c 2005-04-15 10:52:29 UTC (rev 14626) +++ trunk/reactos/drivers/dd/serial/circularbuffer.c 2005-04-15 15:56:19 UTC (rev 14627) @@ -17,6 +17,7 @@ IN ULONG BufferSize) { DPRINT("Serial: InitializeCircularBuffer(pBuffer %p, BufferSize %lu)\n", pBuffer, BufferSize); + ASSERT(pBuffer); pBuffer->Buffer = (PUCHAR)ExAllocatePoolWithTag(NonPagedPool, BufferSize * sizeof(UCHAR), SERIAL_TAG); if (!pBuffer->Buffer) return STATUS_INSUFFICIENT_RESOURCES; @@ -30,6 +31,7 @@ IN PCIRCULAR_BUFFER pBuffer) { DPRINT("Serial: FreeCircularBuffer(pBuffer %p)\n", pBuffer); + ASSERT(pBuffer); ExFreePoolWithTag(pBuffer->Buffer, SERIAL_TAG); return STATUS_SUCCESS; } @@ -39,6 +41,7 @@ IN PCIRCULAR_BUFFER pBuffer) { DPRINT("Serial: IsCircularBufferEmpty(pBuffer %p)\n", pBuffer); + ASSERT(pBuffer); return (pBuffer->ReadPosition == pBuffer->WritePosition); } @@ -49,6 +52,7 @@ { ULONG NextPosition; DPRINT("Serial: PushCircularBufferEntry(pBuffer %p, Entry 0x%x)\n", pBuffer, Entry); + ASSERT(pBuffer); ASSERT(pBuffer->Length); NextPosition = (pBuffer->WritePosition + 1) % pBuffer->Length; if (NextPosition == pBuffer->ReadPosition) @@ -64,6 +68,7 @@ OUT PUCHAR Entry) { DPRINT("Serial: PopCircularBufferEntry(pBuffer %p)\n", pBuffer); + ASSERT(pBuffer); ASSERT(pBuffer->Length); if (IsCircularBufferEmpty(pBuffer)) return STATUS_ARRAY_BOUNDS_EXCEEDED; @@ -80,6 +85,7 @@ PUCHAR NewBuffer; DPRINT("Serial: IncreaseCircularBufferSize(pBuffer %p, NewBufferSize %lu)\n", pBuffer, NewBufferSize); + ASSERT(pBuffer); ASSERT(pBuffer->Length); if (pBuffer->Length > NewBufferSize) return STATUS_INVALID_PARAMETER; _____ Modified: trunk/reactos/drivers/dd/serial/create.c --- trunk/reactos/drivers/dd/serial/create.c 2005-04-15 10:52:29 UTC (rev 14626) +++ trunk/reactos/drivers/dd/serial/create.c 2005-04-15 15:56:19 UTC (rev 14627) @@ -26,6 +26,8 @@ FileObject = Stack->FileObject; DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(FileObject); + if (Stack->Parameters.Create.Options & FILE_DIRECTORY_FILE) { CHECKPOINT; _____ Modified: trunk/reactos/drivers/dd/serial/devctrl.c --- trunk/reactos/drivers/dd/serial/devctrl.c 2005-04-15 10:52:29 UTC (rev 14626) +++ trunk/reactos/drivers/dd/serial/devctrl.c 2005-04-15 15:56:19 UTC (rev 14627) @@ -20,10 +20,10 @@ OUT PVOID* BufferIn, OUT PVOID* BufferOut) { - ASSERT(Irp); - ASSERT(BufferIn); - ASSERT(BufferOut); - + ASSERT(Irp); + ASSERT(BufferIn); + ASSERT(BufferOut); + switch (IO_METHOD_FROM_CTL_CODE(IoControlCode)) { case METHOD_BUFFERED: @@ -118,6 +118,9 @@ UCHAR Lcr = 0; NTSTATUS Status; + ASSERT(DeviceExtension); + ASSERT(NewSettings); + DPRINT("Serial: SerialSetLineControl(COM%lu, Settings { %lu %lu %lu })\n", DeviceExtension->ComPort, NewSettings->StopBits, NewSettings->Parity, NewSettings->WordLength); @@ -184,6 +187,8 @@ SerialClearPerfStats( IN PSERIAL_DEVICE_EXTENSION DeviceExtension) { + ASSERT(DeviceExtension); + RtlZeroMemory(&DeviceExtension->SerialPerfStats, sizeof(SERIALPERF_STATS)); DeviceExtension->BreakInterruptErrorCount = 0; return TRUE; @@ -195,6 +200,7 @@ PSERIAL_DEVICE_EXTENSION pDeviceExtension; pDeviceExtension = (PSERIAL_DEVICE_EXTENSION) IoGetCurrentIrpStackLocation(pIrp)->DeviceObject->DeviceExtension; + ASSERT(DeviceExtension); /* * we assume buffer is big enough to hold SerialPerfStats structure * caller must verify this @@ -212,6 +218,8 @@ OUT PSERIAL_COMMPROP pCommProp, IN PSERIAL_DEVICE_EXTENSION DeviceExtension) { + ASSERT(pCommProp); + RtlZeroMemory(pCommProp, sizeof(SERIAL_COMMPROP)); pCommProp->PacketLength = sizeof(SERIAL_COMMPROP); @@ -257,6 +265,7 @@ { KIRQL Irql; + ASSERT(pSerialStatus); RtlZeroMemory(pSerialStatus, sizeof(SERIAL_STATUS)); pSerialStatus->Errors = 0; _____ Modified: trunk/reactos/drivers/dd/serial/info.c --- trunk/reactos/drivers/dd/serial/info.c 2005-04-15 10:52:29 UTC (rev 14626) +++ trunk/reactos/drivers/dd/serial/info.c 2005-04-15 15:56:19 UTC (rev 14627) @@ -37,12 +37,13 @@ DPRINT("Serial: IRP_MJ_QUERY_INFORMATION / FileStandardInformation\n"); if (BufferLength < sizeof(FILE_STANDARD_INFORMATION)) Status = STATUS_BUFFER_OVERFLOW; - else + else if (!StandardInfo) + Status = STATUS_INVALID_PARAMETER; { StandardInfo->AllocationSize.QuadPart = 0; StandardInfo->EndOfFile.QuadPart = 0; - StandardInfo->Directory = FALSE; - StandardInfo->NumberOfLinks = 0; + StandardInfo->Directory = FALSE; + StandardInfo->NumberOfLinks = 0; StandardInfo->DeletePending = FALSE; /* FIXME: should be TRUE sometimes */ Status = STATUS_SUCCESS; } @@ -52,9 +53,13 @@ { PFILE_POSITION_INFORMATION PositionInfo = (PFILE_POSITION_INFORMATION)SystemBuffer; + ASSERT(PositionInfo); + DPRINT("Serial: IRP_MJ_QUERY_INFORMATION / FilePositionInformation\n"); if (BufferLength < sizeof(PFILE_POSITION_INFORMATION)) Status = STATUS_BUFFER_OVERFLOW; + else if (!PositionInfo) + Status = STATUS_INVALID_PARAMETER; else { PositionInfo->CurrentByteOffset.QuadPart = 0; _____ Modified: trunk/reactos/drivers/dd/serial/misc.c --- trunk/reactos/drivers/dd/serial/misc.c 2005-04-15 10:52:29 UTC (rev 14626) +++ trunk/reactos/drivers/dd/serial/misc.c 2005-04-15 15:56:19 UTC (rev 14627) @@ -32,6 +32,8 @@ KEVENT Event; NTSTATUS Status; + ASSERT(LowerDevice); + KeInitializeEvent(&Event, NotificationEvent, FALSE); IoCopyCurrentIrpStackLocationToNext(Irp); @@ -56,6 +58,8 @@ { PDEVICE_OBJECT LowerDevice = ((PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; + ASSERT(LowerDevice); + IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(LowerDevice, Irp); } _____ Modified: trunk/reactos/drivers/dd/serial/pnp.c --- trunk/reactos/drivers/dd/serial/pnp.c 2005-04-15 10:52:29 UTC (rev 14626) +++ trunk/reactos/drivers/dd/serial/pnp.c 2005-04-15 15:56:19 UTC (rev 14627) @@ -31,6 +31,9 @@ static ULONG ComPortNumber = 1; DPRINT("Serial: SerialAddDeviceInternal called\n"); + + ASSERT(DeviceObject); + ASSERT(Pdo); /* Create new device object */ swprintf(DeviceNameBuffer, L"\\Device\\Serial%lu", DeviceNumber); @@ -125,12 +128,10 @@ if (Pdo == NULL) return STATUS_SUCCESS; - /* We have here a PDO that does not correspond to a legacy - * serial port. So call the internal AddDevice function. + /* We have here a PDO not null. It represents a real serial + * port. So call the internal AddDevice function. */ return SerialAddDeviceInternal(DriverObject, Pdo, UartUnknown, NULL, NULL); - - } NTSTATUS STDCALL @@ -160,6 +161,8 @@ DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(ResourceList); + ASSERT(DeviceExtension); ASSERT(DeviceExtension->PnpState == dsStopped); DeviceExtension->BaudRate = 19200 | SERIAL_BAUD_USER; _____ Modified: trunk/reactos/drivers/dd/serial/rw.c --- trunk/reactos/drivers/dd/serial/rw.c 2005-04-15 10:52:29 UTC (rev 14626) +++ trunk/reactos/drivers/dd/serial/rw.c 2005-04-15 15:56:19 UTC (rev 14627) @@ -37,6 +37,9 @@ ULONG_PTR Information = 0; NTSTATUS Status; + ASSERT(DeviceObject); + ASSERT(WorkItemData); + DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; Length = IoGetCurrentIrpStackLocation(Irp)->Parameters.Read.Length; @@ -285,9 +288,19 @@ Status = PushCircularBufferEntry(&DeviceExtension->OutputBuffer, Buffer[Information]); if (!NT_SUCCESS(Status)) { - DPRINT("Serial: buffer overrun on COM%lu\n", DeviceExtension->ComPort); - DeviceExtension->SerialPerfStats.BufferOverrunErrorCount++; - break; + if (Status == STATUS_BUFFER_TOO_SMALL) + { + KeReleaseSpinLock(&DeviceExtension->OutputBufferLock, Irql); + SerialSendByte(NULL, DeviceExtension, NULL, NULL); + KeAcquireSpinLock(&DeviceExtension->OutputBufferLock, &Irql); + continue; + } + else + { + DPRINT("Serial: buffer overrun on COM%lu\n", DeviceExtension->ComPort); + DeviceExtension->SerialPerfStats.BufferOverrunErrorCount++; + break; + } } Information++; }

19 years, 5 months

[weiden] 14626: use the correct version of KeGetCurrentIrql for MP

by weiden＠svn.reactos.com

use the correct version of KeGetCurrentIrql for MP Modified: trunk/reactos/hal/halx86/mp/mpsirql.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h _____ Modified: trunk/reactos/hal/halx86/mp/mpsirql.c --- trunk/reactos/hal/halx86/mp/mpsirql.c 2005-04-15 06:24:35 UTC (rev 14625) +++ trunk/reactos/hal/halx86/mp/mpsirql.c 2005-04-15 10:52:29 UTC (rev 14626) @@ -29,6 +29,7 @@ /* FUNCTIONS ****************************************************************/ +#undef KeGetCurrentIrql KIRQL STDCALL KeGetCurrentIrql (VOID) /* * PURPOSE: Returns the current irq level @@ -55,6 +56,7 @@ } +#undef KeSetCurrentIrql VOID KeSetCurrentIrql (KIRQL NewIrql) /* * PURPOSE: Sets the current irq level without taking any action _____ Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h 2005-04-15 06:24:35 UTC (rev 14625) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h 2005-04-15 10:52:29 UTC (rev 14626) @@ -203,10 +203,9 @@ #define LOCK "lock ; " #else #define LOCK "" +#define KeGetCurrentIrql(X) (((PKPCR)KPCR_BASE)->Irql) #endif -#define KeGetCurrentIrql(X) (((PKPCR)KPCR_BASE)->Irql) - #if defined(__GNUC__) #define Ke386DisableInterrupts() __asm__("cli\n\t"); #define Ke386EnableInterrupts() __asm__("sti\n\t");

19 years, 5 months

[ion] 14625: Implemented Guarded Mutex, a drop-in replacement for Fast Mutex (the correct one, not the one ROS incorrectly implements) on NT 5.2. Not fully tested yet, so nothing switched to it and probably not usable. Also made KeGetCurrentThread/Irql become inlined, since this should create quite a speed boost. Made KeLeaveCriticalRegion deliver APCs if possible, and made Crit regions macros usable from outside ntoskrnl thanks to a new NT 5.2 API (KiCheckForKernelApcDelivery). Guarded Mutex co

by ion＠svn.reactos.com

Implemented Guarded Mutex, a drop-in replacement for Fast Mutex (the correct one, not the one ROS incorrectly implements) on NT 5.2. Not fully tested yet, so nothing switched to it and probably not usable. Also made KeGetCurrentThread/Irql become inlined, since this should create quite a speed boost. Made KeLeaveCriticalRegion deliver APCs if possible, and made Crit regions macros usable from outside ntoskrnl thanks to a new NT 5.2 API (KiCheckForKernelApcDelivery). Guarded Mutex code based on Filip Navara. Modified: trunk/reactos/drivers/storage/diskdump/diskdump.c Modified: trunk/reactos/hal/hal/hal.c Modified: trunk/reactos/hal/halx86/generic/fmutex.c Modified: trunk/reactos/hal/halx86/generic/irql.c Modified: trunk/reactos/include/ddk/kedef.h Modified: trunk/reactos/include/ddk/kefuncs.h Modified: trunk/reactos/include/ddk/ketypes.h Modified: trunk/reactos/ntoskrnl/Makefile Modified: trunk/reactos/ntoskrnl/ex/i386/interlck.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/ps.h Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/include/internal/ps.h Modified: trunk/reactos/ntoskrnl/ke/apc.c Modified: trunk/reactos/ntoskrnl/ke/gmutex.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.def Modified: trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/drivers/storage/diskdump/diskdump.c --- trunk/reactos/drivers/storage/diskdump/diskdump.c 2005-04-15 00:48:25 UTC (rev 14624) +++ trunk/reactos/drivers/storage/diskdump/diskdump.c 2005-04-15 06:24:35 UTC (rev 14625) @@ -41,6 +41,7 @@ #undef VERSION #define VERSION "0.0.1" +#undef KeGetCurrentIrql /* PROTOTYPES ***************************************************************/ NTSTATUS STDCALL _____ Modified: trunk/reactos/hal/hal/hal.c --- trunk/reactos/hal/hal/hal.c 2005-04-15 00:48:25 UTC (rev 14624) +++ trunk/reactos/hal/hal/hal.c 2005-04-15 06:24:35 UTC (rev 14625) @@ -748,7 +748,7 @@ UNIMPLEMENTED; } - +#undef KeGetCurrentIrql KIRQL STDCALL KeGetCurrentIrql(VOID) _____ Modified: trunk/reactos/hal/halx86/generic/fmutex.c --- trunk/reactos/hal/halx86/generic/fmutex.c 2005-04-15 00:48:25 UTC (rev 14624) +++ trunk/reactos/hal/halx86/generic/fmutex.c 2005-04-15 06:24:35 UTC (rev 14625) @@ -18,6 +18,8 @@ /* FUNCTIONS *****************************************************************/ +#undef KeEnterCriticalRegion +#undef KeLeaveCriticalRegion VOID FASTCALL ExAcquireFastMutex (PFAST_MUTEX FastMutex) { _____ Modified: trunk/reactos/hal/halx86/generic/irql.c --- trunk/reactos/hal/halx86/generic/irql.c 2005-04-15 00:48:25 UTC (rev 14624) +++ trunk/reactos/hal/halx86/generic/irql.c 2005-04-15 06:24:35 UTC (rev 14625) @@ -65,6 +65,7 @@ /* FUNCTIONS ****************************************************************/ +#undef KeGetCurrentIrql KIRQL STDCALL KeGetCurrentIrql (VOID) /* * PURPOSE: Returns the current irq level _____ Modified: trunk/reactos/include/ddk/kedef.h --- trunk/reactos/include/ddk/kedef.h 2005-04-15 00:48:25 UTC (rev 14624) +++ trunk/reactos/include/ddk/kedef.h 2005-04-15 06:24:35 UTC (rev 14625) @@ -56,7 +56,7 @@ WrPageOut, WrRendezvous, Spare2, - Spare3, + WrGuardedMutex, Spare4, Spare5, Spare6, _____ Modified: trunk/reactos/include/ddk/kefuncs.h --- trunk/reactos/include/ddk/kefuncs.h 2005-04-15 00:48:25 UTC (rev 14624) +++ trunk/reactos/include/ddk/kefuncs.h 2005-04-15 06:24:35 UTC (rev 14625) @@ -809,4 +809,48 @@ IN NTSTATUS ExceptionCode ); +VOID +FASTCALL +KeAcquireGuardedMutex( + PKGUARDED_MUTEX GuardedMutex +); + +VOID +FASTCALL +KeAcquireGuardedMutexUnsafe( + PKGUARDED_MUTEX GuardedMutex +); + +VOID +STDCALL +KeEnterGuardedRegion(VOID); + +VOID +STDCALL +KeLeaveGuardedRegion(VOID); + +VOID +FASTCALL +KeInitializeGuardedMutex( + PKGUARDED_MUTEX GuardedMutex +); + +VOID +FASTCALL +KeReleaseGuardedMutexUnsafe( + PKGUARDED_MUTEX GuardedMutex +); + +VOID +FASTCALL +KeReleaseGuardedMutex( + PKGUARDED_MUTEX GuardedMutex +); + +BOOL +FASTCALL +KeTryToAcquireGuardedMutex( + PKGUARDED_MUTEX GuardedMutex +); + #endif /* __INCLUDE_DDK_KEFUNCS_H */ _____ Modified: trunk/reactos/include/ddk/ketypes.h --- trunk/reactos/include/ddk/ketypes.h 2005-04-15 00:48:25 UTC (rev 14624) +++ trunk/reactos/include/ddk/ketypes.h 2005-04-15 06:24:35 UTC (rev 14625) @@ -180,6 +180,21 @@ UCHAR ApcDisable; } KMUTEX, *PKMUTEX, KMUTANT, *PKMUTANT; +typedef struct _KGUARDED_MUTEX +{ + LONG Count; + struct _KTHREAD* Owner; + ULONG Contention; + KGATE Gate; + union { + struct { + SHORT KernelApcDisable; + SHORT SpecialApcDisable; + }; + ULONG CombinedApcDisable; + }; +} KGUARDED_MUTEX, *PKGUARDED_MUTEX; + #include <pshpack1.h> typedef struct _KSEMAPHORE _____ Modified: trunk/reactos/ntoskrnl/Makefile --- trunk/reactos/ntoskrnl/Makefile 2005-04-15 00:48:25 UTC (rev 14624) +++ trunk/reactos/ntoskrnl/Makefile 2005-04-15 06:24:35 UTC (rev 14625) @@ -100,6 +100,8 @@ ke/dpc.o \ ke/device.o \ ke/event.o \ + ke/gate.o \ + ke/gmutex.o \ ke/kqueue.o \ ke/kthread.o \ ke/ipi.o \ _____ Modified: trunk/reactos/ntoskrnl/ex/i386/interlck.c --- trunk/reactos/ntoskrnl/ex/i386/interlck.c 2005-04-15 00:48:25 UTC (rev 14624) +++ trunk/reactos/ntoskrnl/ex/i386/interlck.c 2005-04-15 06:24:35 UTC (rev 14625) @@ -396,7 +396,45 @@ #error Unknown compiler for inline assembler #endif +/********************************************************************** + * FASTCALL: @InterlockedClearBit@8 + * STDCALL: _InterlockedClearBit@8 + */ +#if defined(__GNUC__) +/* + * @implemented + */ +UCHAR +FASTCALL +InterlockedClearBit(PLONG Destination, + LONG Bit); +__asm__("\n\t.global @InterlockedClearBit@8\n\t" + "@InterlockedClearBit@8:\n\t" + LOCK + "btr %edx,(%ecx)\n\t" + "setc %al\n\t" + "ret $8\n\t"); + +#elif defined(_MSC_VER) +/* + * @implemented + */ +__declspec(naked) +UCHAR +FASTCALL +InterlockedClearBit(PUCHAR Destination, + UCHAR Bit) +{ + __asm LOCK btr [ecx], edx + __asm setc al + __asm ret +} + +#else +#error Unknown compiler for inline assembler +#endif + /********************************************************************** * FASTCALL: @InterlockedCompareExchange@12 * STDCALL: _InterlockedCompareExchange@12 _____ Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h 2005-04-15 00:48:25 UTC (rev 14624) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h 2005-04-15 06:24:35 UTC (rev 14625) @@ -205,6 +205,7 @@ #define LOCK "" #endif +#define KeGetCurrentIrql(X) (((PKPCR)KPCR_BASE)->Irql) #if defined(__GNUC__) #define Ke386DisableInterrupts() __asm__("cli\n\t"); _____ Modified: trunk/reactos/ntoskrnl/include/internal/i386/ps.h --- trunk/reactos/ntoskrnl/include/internal/i386/ps.h 2005-04-15 00:48:25 UTC (rev 14624) +++ trunk/reactos/ntoskrnl/include/internal/i386/ps.h 2005-04-15 06:24:35 UTC (rev 14625) @@ -292,6 +292,7 @@ #define KeGetCurrentKPCR(X) ((PKPCR)KPCR_BASE) #define KeGetCurrentPrcb() (((PKPCR)KPCR_BASE)->Prcb) +#define KeGetCurrentThread(X) (((PKPCR)KPCR_BASE)->PrcbData.CurrentThread) #endif _____ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h --- trunk/reactos/ntoskrnl/include/internal/ke.h 2005-04-15 00:48:25 UTC (rev 14624) +++ trunk/reactos/ntoskrnl/include/internal/ke.h 2005-04-15 06:24:35 UTC (rev 14625) @@ -49,6 +49,26 @@ #define IPI_REQUEST_DPC 2 #define IPI_REQUEST_FREEZE 3 +/* MACROS ************************************************************************ */ + +#define KeEnterCriticalRegion(X) \ +{ \ + PKTHREAD _Thread = KeGetCurrentThread(); \ + if (_Thread) _Thread->KernelApcDisable--; \ +} + +#define KeLeaveCriticalRegion(X) \ +{ \ + PKTHREAD _Thread = KeGetCurrentThread(); \ + if((_Thread) && (++_Thread->KernelApcDisable == 0)) \ + { \ + if (!IsListEmpty(&_Thread->ApcState.ApcListHead[KernelMode])) \ + { \ + KiKernelApcDeliveryCheck(); \ + } \ + } \ +} + /* threadsch.c ********************************************************************/ /* Thread Scheduler Functions */ @@ -77,7 +97,29 @@ KiUnblockThread(PKTHREAD Thread, PNTSTATUS WaitStatus, KPRIORITY Increment); + +/* gmutex.c ********************************************************************/ +VOID +FASTCALL +KiAcquireGuardedMutexContented(PKGUARDED_MUTEX GuardedMutex); + +/* gate.c **********************************************************************/ + +VOID +FASTCALL +KeInitializeGate(PKGATE Gate); + +VOID +FASTCALL +KeSignalGateBoostPriority(PKGATE Gate); + +VOID +FASTCALL +KeWaitForGate(PKGATE Gate, + KWAIT_REASON WaitReason, + KPROCESSOR_MODE WaitMode); + /* ipi.c ********************************************************************/ BOOLEAN STDCALL @@ -237,7 +279,9 @@ VOID STDCALL KiDeliverApc(KPROCESSOR_MODE PreviousMode, PVOID Reserved, PKTRAP_FRAME TrapFrame); - +VOID +STDCALL +KiKernelApcDeliveryCheck(VOID); LONG STDCALL KiInsertQueue(IN PKQUEUE Queue, _____ Modified: trunk/reactos/ntoskrnl/include/internal/ps.h --- trunk/reactos/ntoskrnl/include/internal/ps.h 2005-04-15 00:48:25 UTC (rev 14624) +++ trunk/reactos/ntoskrnl/include/internal/ps.h 2005-04-15 06:24:35 UTC (rev 14625) @@ -97,7 +97,13 @@ CHAR Quantum; /* 6B */ KWAIT_BLOCK WaitBlock[4]; /* 6C */ PVOID LegoData; /* CC */ - ULONG KernelApcDisable; /* D0 */ + union { + struct { + USHORT KernelApcDisable; + USHORT SpecialApcDisable; + }; + ULONG CombinedApcDisable; /* D0 */ + }; KAFFINITY UserAffinity; /* D4 */ UCHAR SystemAffinityActive;/* D8 */ UCHAR PowerState; /* D9 */ _____ Modified: trunk/reactos/ntoskrnl/ke/apc.c --- trunk/reactos/ntoskrnl/ke/apc.c 2005-04-15 00:48:25 UTC (rev 14624) +++ trunk/reactos/ntoskrnl/ke/apc.c 2005-04-15 06:24:35 UTC (rev 14625) @@ -17,6 +17,51 @@ /* FUNCTIONS *****************************************************************/ /*++ + * KiKernelApcDeliveryCheck + * @implemented NT 5.2 + * + * The KiKernelApcDeliveryCheck routine is called whenever APCs have just + * been re-enabled in Kernel Mode, such as after leaving a Critical or + * Guarded Region. It delivers APCs if the environment is right. + * + * Params: + * None. + * + * Returns: + * None. + * + * Remarks: + * This routine allows KeLeave/EnterCritical/GuardedRegion to be used as a + * macro from inside WIN32K or other Drivers, which will then only have to + * do an Import API call in the case where APCs are enabled again. + * + *--*/ +VOID +STDCALL +KiKernelApcDeliveryCheck(VOID) +{ + /* We should only deliver at passive */ + if (KeGetCurrentIrql() == PASSIVE_LEVEL) + { + /* Raise to APC and Deliver APCs, then lower back to Passive */ + KfRaiseIrql(APC_LEVEL); + KiDeliverApc(KernelMode, 0, 0); + KfLowerIrql(PASSIVE_LEVEL); + } + else + { + /* + * If we're not at passive level it means someone raised IRQL + * to APC level before the a critical or guarded section was entered + * (e.g) by a fast mutex). This implies that the APCs shouldn't + * be delivered now, but after the IRQL is lowered to passive + * level again. + */ + HalRequestSoftwareInterrupt(APC_LEVEL); + } +} + +/*++ * KeEnterCriticalRegion * @implemented NT4 * @@ -37,6 +82,7 @@ * Callers of KeEnterCriticalRegion must be running at IRQL <= APC_LEVEL. * *--*/ +#undef KeEnterCriticalRegion VOID STDCALL KeEnterCriticalRegion(VOID) @@ -47,6 +93,45 @@ } /*++ + * KeLeaveCriticalRegion + * @implemented NT4 + * + * The KeLeaveCriticalRegion routine reenables the delivery of normal + * kernel-mode APCs that were disabled by a call to KeEnterCriticalRegion. + * + * Params: + * None. + * + * Returns: + * None. + * + * Remarks: + * Highest-level drivers can call this routine while running in the context + * of the thread that requested the current I/O operation. + * + * Callers of KeLeaveCriticalRegion must be running at IRQL <= DISPATCH_LEVEL. + * + *--*/ +#undef KeLeaveCriticalRegion +VOID +STDCALL +KeLeaveCriticalRegion (VOID) +{ + PKTHREAD Thread = KeGetCurrentThread(); + + /* Check if Kernel APCs are now enabled */ + if((Thread) && (++Thread->KernelApcDisable == 0)) + { + /* Check if we need to request an APC Delivery */ + if (!IsListEmpty(&Thread->ApcState.ApcListHead[KernelMode])) + { + /* Check for the right environment */ + KiKernelApcDeliveryCheck(); + } + } +} + +/*++ * KeInitializeApc * @implemented NT4 * @@ -326,45 +411,6 @@ } /*++ - * KeLeaveCriticalRegion - * @implemented NT4 - * - * The KeLeaveCriticalRegion routine reenables the delivery of normal - * kernel-mode APCs that were disabled by a call to KeEnterCriticalRegion. - * - * Params: - * None. - * - * Returns: - * None. - * - * Remarks: - * Highest-level drivers can call this routine while running in the context - * of the thread that requested the current I/O operation. - * - * Callers of KeLeaveCriticalRegion must be running at IRQL <= DISPATCH_LEVEL. - * - *--*/ -VOID -STDCALL -KeLeaveCriticalRegion (VOID) -{ - PKTHREAD Thread = KeGetCurrentThread(); - - /* Check if Kernel APCs are now enabled */ - if((Thread) && (++Thread->KernelApcDisable == 0)) { - - /* Check if we need to request an APC Delivery */ - if (!IsListEmpty(&Thread->ApcState.ApcListHead[KernelMode])) { - - /* Set APC Pending */ - Thread->ApcState.KernelApcPending = TRUE; - HalRequestSoftwareInterrupt(APC_LEVEL); - } - } -} - -/*++ * KeRemoveQueueApc * * The KeRemoveQueueApc routine removes a given APC object from the system _____ Modified: trunk/reactos/ntoskrnl/ke/gmutex.c --- trunk/reactos/ntoskrnl/ke/gmutex.c 2005-04-15 00:48:25 UTC (rev 14624) +++ trunk/reactos/ntoskrnl/ke/gmutex.c 2005-04-15 06:24:35 UTC (rev 14625) @@ -1,11 +1,11 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS Kernel * FILE: ntoskrnl/ke/gmutex.c - * PURPOSE: Implements guarded mutex (w2k3+/64) + * PURPOSE: Implements Guarded Mutex * - * PROGRAMMERS: No programmer listed. + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) and + * Filip Navara (xnavara(a)volny.cz) */ /* INCLUDES *****************************************************************/ @@ -13,17 +13,209 @@ #include <ntoskrnl.h> #include <internal/debug.h> +UCHAR +FASTCALL +InterlockedClearBit(PLONG Destination, + LONG Bit); + +typedef enum _KGUARDED_MUTEX_BITS +{ + GM_LOCK_BIT = 1, + GM_LOCK_WAITER_WOKEN = 2, + GM_LOCK_WAITER_INC = 4 +} KGUARDED_MUTEX_BITS; + /* FUNCTIONS *****************************************************************/ -/* -KeAcquireGuardedMutex -KeAcquireGuardedMutexUnsafe -KeEnterGuardedRegion -KeInitializeGuardedMutex -KeReleaseGuardedMutexUnsafe -KeTryToAcquireGuardedMutex -KeReleaseGuardedMutex -KeLeaveGuardedRegion -*/ +/** + * @name KeEnterGuardedRegion + * + * Enters a guarded region. This causes all (incl. special kernel) APCs + * to be disabled. + */ +VOID +STDCALL +KeEnterGuardedRegion(VOID) +{ + /* Disable Special APCs */ + KeGetCurrentThread()->SpecialApcDisable--; +} +/** + * @name KeLeaveGuardedRegion + * + * Leaves a guarded region and delivers pending APCs if possible. + */ +VOID +STDCALL +KeLeaveGuardedRegion(VOID) +{ + PKTHREAD Thread = KeGetCurrentThread(); + + /* Boost the enable count and check if Special APCs are enabled */ + if (++Thread->SpecialApcDisable == 0) + { + /* Check if there are Kernel APCs on the list */ + if (!IsListEmpty(&Thread->ApcState.ApcListHead[KernelMode])) + { + /* Check for APC Delivery */ + KiKernelApcDeliveryCheck(); + } + } +} + +VOID +FASTCALL +KeInitializeGuardedMutex(PKGUARDED_MUTEX GuardedMutex) +{ + /* Setup the Initial Data */ + GuardedMutex->Count = GM_LOCK_BIT; + GuardedMutex->Owner = NULL; + GuardedMutex->Contention = 0; + + /* Initialize the Wait Gate */ + KeInitializeGate(&GuardedMutex->Gate); +} + +VOID +FASTCALL +KiAcquireGuardedMutexContented(PKGUARDED_MUTEX GuardedMutex) +{ + ULONG BitsToRemove; + ULONG BitsToAdd; + LONG OldValue; + + /* Increase the contention count */ + InterlockedIncrement(&GuardedMutex->Contention); + + /* Start by unlocking the Guarded Mutex */ + BitsToRemove = GM_LOCK_BIT; + BitsToAdd = GM_LOCK_WAITER_INC; + + while (1) + { + /* Get the Count Bits */ + OldValue = (volatile LONG)GuardedMutex->Count; + + /* Check if the Guarded Mutex is locked */ + if (OldValue & GM_LOCK_BIT) + { + /* Unlock it by removing the Lock Bit */ + if (InterlockedCompareExchange(&GuardedMutex->Count, + OldValue &~ BitsToRemove, + OldValue) == OldValue) + { + /* The Guarded Mutex is now unlocked */ + break; + } + } + else + { + /* The Guarded Mutex isn't locked, so simply set the bits */ + if (InterlockedCompareExchange(&GuardedMutex->Count, + OldValue | BitsToAdd, + OldValue) != OldValue) + { + /* The Guarded Mutex value changed behind our back, start over */ + continue; + } + + /* Now we have to wait for it */ + KeWaitForGate(&GuardedMutex->Gate, WrGuardedMutex, KernelMode); + + /* Ok, the wait is done, so set the new bits */ + BitsToRemove = GM_LOCK_BIT | GM_LOCK_WAITER_WOKEN; + BitsToAdd = GM_LOCK_WAITER_WOKEN; + } + } +} + +VOID +FASTCALL +KeAcquireGuardedMutex(PKGUARDED_MUTEX GuardedMutex) +{ + /* Disable Special APCs */ + KeEnterGuardedRegion(); + + /* Do the Unsafe Acquire */ + KeAcquireGuardedMutexUnsafe(GuardedMutex); +} + +VOID +FASTCALL +KeAcquireGuardedMutexUnsafe(PKGUARDED_MUTEX GuardedMutex) +{ + /* Remove the lock */ + if (!InterlockedClearBit(&GuardedMutex->Count, 0)) + { + /* The Guarded Mutex was already locked, enter contented case */ + KiAcquireGuardedMutexContented(GuardedMutex); + } + + /* Set the Owner */ + GuardedMutex->Owner = KeGetCurrentThread(); +} + +VOID +FASTCALL +KeReleaseGuardedMutexUnsafe(PKGUARDED_MUTEX GuardedMutex) +{ + LONG OldValue; + + /* Destroy the Owner */ + GuardedMutex->Owner = NULL; + + /* Add the Lock Bit */ + OldValue = InterlockedExchangeAdd(&GuardedMutex->Count, 1); + + /* Check if it was already locked, but not woken */ + if (OldValue && !(OldValue & GM_LOCK_WAITER_WOKEN)) + { + /* Update the Oldvalue to what it should be now */ + OldValue |= GM_LOCK_BIT; + + /* Remove the Woken bit */ + if (InterlockedCompareExchange(&GuardedMutex->Count, + OldValue &~ GM_LOCK_WAITER_WOKEN, + OldValue) == OldValue) + { + /* Signal the Gate */ + KeSignalGateBoostPriority(&GuardedMutex->Gate); + } + } +} + +VOID +FASTCALL +KeReleaseGuardedMutex(PKGUARDED_MUTEX GuardedMutex) +{ + /* Do the actual release */ + KeReleaseGuardedMutexUnsafe(GuardedMutex); + + /* Re-enable APCs */ + KeLeaveGuardedRegion(); +} + +BOOL +FASTCALL +KeTryToAcquireGuardedMutex(PKGUARDED_MUTEX GuardedMutex) +{ + /* Block APCs */ + KeEnterGuardedRegion(); + + /* Remove the lock */ + if (InterlockedClearBit(&GuardedMutex->Count, 0)) + { + /* Re-enable APCs */ + KeLeaveGuardedRegion(); + + /* Return failure */ + return FALSE; + } + + /* Set the Owner */ + GuardedMutex->Owner = KeGetCurrentThread(); + return TRUE; +} + /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/ntoskrnl.def --- trunk/reactos/ntoskrnl/ntoskrnl.def 2005-04-15 00:48:25 UTC (rev 14624) +++ trunk/reactos/ntoskrnl/ntoskrnl.def 2005-04-15 06:24:35 UTC (rev 14625) @@ -649,6 +649,7 @@ ;KiBugCheckData DATA KiCoprocessorError@0 KiDeliverApc@12 +KiKernelApcDeliveryCheck@0 KiDispatchInterrupt@0 KiEnableTimerWatchdog KiInterruptDispatch2@8 _____ Modified: trunk/reactos/ntoskrnl/ps/thread.c --- trunk/reactos/ntoskrnl/ps/thread.c 2005-04-15 00:48:25 UTC (rev 14624) +++ trunk/reactos/ntoskrnl/ps/thread.c 2005-04-15 06:24:35 UTC (rev 14625) @@ -44,10 +44,15 @@ /* FUNCTIONS ***************************************************************/ +#ifdef KeGetCurrentThread +#undef KeGetCurrentThread +#endif /* * @implemented */ -PKTHREAD STDCALL KeGetCurrentThread(VOID) +PKTHREAD +STDCALL +KeGetCurrentThread(VOID) { #ifdef CONFIG_SMP ULONG Flags; _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-04-15 00:48:25 UTC (rev 14624) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-04-15 06:24:35 UTC (rev 14625) @@ -929,6 +929,21 @@ ULONG OldIrql; } FAST_MUTEX, *PFAST_MUTEX; +typedef struct _KGUARDED_MUTEX +{ + LONG Count; + struct _KTHREAD* Owner; + ULONG Contention; + struct _KGATE* Gate; + union { + struct { + SHORT KernelApcDisable; + SHORT SpecialApcDisable; + }; + ULONG CombinedApcDisable; + }; +} KGUARDED_MUTEX, *PKGUARDED_MUTEX, *RESTRICTED_POINTER PRKGUARDED_MUTEX; + typedef struct _KTIMER { DISPATCHER_HEADER Header; ULARGE_INTEGER DueTime;

19 years, 5 months

[hpoussin] 14623: Change debug messages to more neutral ones

by hpoussin＠svn.reactos.com

Change debug messages to more neutral ones Modified: trunk/reactos/ntoskrnl/io/device.c Modified: trunk/reactos/ntoskrnl/io/pnpreport.c _____ Modified: trunk/reactos/ntoskrnl/io/device.c --- trunk/reactos/ntoskrnl/io/device.c 2005-04-14 21:47:57 UTC (rev 14622) +++ trunk/reactos/ntoskrnl/io/device.c 2005-04-14 22:41:48 UTC (rev 14623) @@ -168,7 +168,7 @@ { /* FIXME: IoAttachDeviceToDeviceStackSafe must not call * IoAttachDeviceToDeviceStack, but the other way around! */ - DPRINT1("IoAttachDeviceToDeviceStackSafe() badly implemented!\n"); + DPRINT("IoAttachDeviceToDeviceStackSafe() badly implemented!\n"); *AttachedToDeviceObject = IoAttachDeviceToDeviceStack(SourceDevice, TargetDevice); return STATUS_SUCCESS; } _____ Modified: trunk/reactos/ntoskrnl/io/pnpreport.c --- trunk/reactos/ntoskrnl/io/pnpreport.c 2005-04-14 21:47:57 UTC (rev 14622) +++ trunk/reactos/ntoskrnl/io/pnpreport.c 2005-04-14 22:41:48 UTC (rev 14623) @@ -81,7 +81,7 @@ OUT PBOOLEAN ConflictDetected) { *ConflictDetected = FALSE; - DPRINT1("IoReportResourceForDetection unimplemented\n"); + DPRINT1("IoReportResourceForDetection partly implemented\n"); /* HACK: check if serial debug output is enabled. If yes, * prevent serial port driver to detect this serial port

19 years, 5 months

← Newer
1
...
23
24
25
26
27
28
29
...
48
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 April 2005