Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[cwittich] 19292: fixed length calculation of lpDependencies
by cwittich＠svn.reactos.com 17 Nov '05

17 Nov '05

fixed length calculation of lpDependencies Modified: trunk/reactos/lib/advapi32/service/scm.c _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-11-17 13:23:37 UTC (rev 19291) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-11-17 13:45:02 UTC (rev 19292) @@ -285,6 +285,9 @@ LPWSTR lpDependenciesW = NULL; LPWSTR lpServiceStartNameW = NULL; LPWSTR lpPasswordW = NULL; + DWORD dwDependenciesLength = 0; + DWORD dwLength; + LPSTR lpStr; int len = MultiByteToWideChar(CP_ACP, 0, lpServiceName, -1, NULL, 0); lpServiceNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); @@ -322,8 +325,19 @@ } MultiByteToWideChar(CP_ACP, 0, lpLoadOrderGroup, -1, lpLoadOrderGroupW, len); - len = MultiByteToWideChar(CP_ACP, 0, lpDependencies, -1, NULL, 0); - lpDependenciesW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (lpDependencies != NULL) + { + lpStr = (LPSTR)lpDependencies; + while (*lpStr) + { + dwLength = strlen(lpStr) + 1; + dwDependenciesLength += dwLength; + lpStr = lpStr + dwLength; + } + dwDependenciesLength++; + } + + lpDependenciesW = HeapAlloc(GetProcessHeap(), 0, dwDependenciesLength * sizeof(WCHAR)); if (!lpDependenciesW) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -365,13 +379,13 @@ cleanup: - if (!lpServiceNameW) HeapFree(GetProcessHeap(), 0, lpServiceNameW); - if (!lpDisplayNameW) HeapFree(GetProcessHeap(), 0, lpDisplayNameW); - if (!lpBinaryPathNameW) HeapFree(GetProcessHeap(), 0, lpBinaryPathNameW); - if (!lpLoadOrderGroupW) HeapFree(GetProcessHeap(), 0, lpLoadOrderGroupW); - if (!lpDependenciesW) HeapFree(GetProcessHeap(), 0, lpDependenciesW); - if (!lpServiceStartNameW) HeapFree(GetProcessHeap(), 0, lpServiceStartNameW); - if (!lpPasswordW) HeapFree(GetProcessHeap(), 0, lpPasswordW); + HeapFree(GetProcessHeap(), 0, lpServiceNameW); + HeapFree(GetProcessHeap(), 0, lpDisplayNameW); + HeapFree(GetProcessHeap(), 0, lpBinaryPathNameW); + HeapFree(GetProcessHeap(), 0, lpLoadOrderGroupW); + HeapFree(GetProcessHeap(), 0, lpDependenciesW); + HeapFree(GetProcessHeap(), 0, lpServiceStartNameW); + HeapFree(GetProcessHeap(), 0, lpPasswordW); return RetVal; }

1 0

[cwittich] 19291: implemented CreateServiceA
by cwittich＠svn.reactos.com 17 Nov '05

17 Nov '05

implemented CreateServiceA Modified: trunk/reactos/lib/advapi32/service/scm.c _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-11-17 13:01:29 UTC (rev 19290) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-11-17 13:23:37 UTC (rev 19291) @@ -258,7 +258,7 @@ /********************************************************************** * CreateServiceA * - * @unimplemented + * @implemented */ SC_HANDLE STDCALL @@ -277,8 +277,103 @@ LPCSTR lpServiceStartName, LPCSTR lpPassword) { - DPRINT1("CreateServiceA is unimplemented, but returning INVALID_HANDLE_VALUE instead of NULL\n"); - return INVALID_HANDLE_VALUE; + SC_HANDLE RetVal = NULL; + LPWSTR lpServiceNameW = NULL; + LPWSTR lpDisplayNameW = NULL; + LPWSTR lpBinaryPathNameW = NULL; + LPWSTR lpLoadOrderGroupW = NULL; + LPWSTR lpDependenciesW = NULL; + LPWSTR lpServiceStartNameW = NULL; + LPWSTR lpPasswordW = NULL; + + int len = MultiByteToWideChar(CP_ACP, 0, lpServiceName, -1, NULL, 0); + lpServiceNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!lpServiceNameW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, lpServiceName, -1, lpServiceNameW, len); + + len = MultiByteToWideChar(CP_ACP, 0, lpDisplayName, -1, NULL, 0); + lpDisplayNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!lpDisplayNameW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, lpDisplayName, -1, lpDisplayNameW, len); + + len = MultiByteToWideChar(CP_ACP, 0, lpBinaryPathName, -1, NULL, 0); + lpBinaryPathNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!lpBinaryPathNameW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, lpDisplayName, -1, lpBinaryPathNameW, len); + + len = MultiByteToWideChar(CP_ACP, 0, lpLoadOrderGroup, -1, NULL, 0); + lpLoadOrderGroupW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!lpLoadOrderGroupW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, lpLoadOrderGroup, -1, lpLoadOrderGroupW, len); + + len = MultiByteToWideChar(CP_ACP, 0, lpDependencies, -1, NULL, 0); + lpDependenciesW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!lpDependenciesW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, lpDependencies, -1, lpDependenciesW, len); + + len = MultiByteToWideChar(CP_ACP, 0, lpServiceStartName, -1, NULL, 0); + lpServiceStartName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!lpServiceStartNameW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, lpServiceStartName, -1, lpServiceStartNameW, len); + + len = MultiByteToWideChar(CP_ACP, 0, lpPassword, -1, NULL, 0); + lpPasswordW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!lpPasswordW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, lpPassword, -1, lpPasswordW, len); + + RetVal = CreateServiceW(hSCManager, + lpServiceNameW, + lpDisplayNameW, + dwDesiredAccess, + dwServiceType, + dwStartType, + dwErrorControl, + lpBinaryPathNameW, + lpLoadOrderGroupW, + lpdwTagId, + lpDependenciesW, + lpServiceStartNameW, + lpPasswordW); + + +cleanup: + if (!lpServiceNameW) HeapFree(GetProcessHeap(), 0, lpServiceNameW); + if (!lpDisplayNameW) HeapFree(GetProcessHeap(), 0, lpDisplayNameW); + if (!lpBinaryPathNameW) HeapFree(GetProcessHeap(), 0, lpBinaryPathNameW); + if (!lpLoadOrderGroupW) HeapFree(GetProcessHeap(), 0, lpLoadOrderGroupW); + if (!lpDependenciesW) HeapFree(GetProcessHeap(), 0, lpDependenciesW); + if (!lpServiceStartNameW) HeapFree(GetProcessHeap(), 0, lpServiceStartNameW); + if (!lpPasswordW) HeapFree(GetProcessHeap(), 0, lpPasswordW); + + return RetVal; }

1 0

[hpoussin] 19290: Revert part of 19289, I don't want all people to use French ReactOS...
by hpoussin＠svn.reactos.com 17 Nov '05

17 Nov '05

Revert part of 19289, I don't want all people to use French ReactOS... Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-11-17 12:49:37 UTC (rev 19289) +++ trunk/reactos/bootdata/hivesys.inf 2005-11-17 13:01:29 UTC (rev 19290) @@ -241,8 +241,8 @@ ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0443",0x00000000, "l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0843",0x00000000," l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0456",0x00000000," l_intl.nls" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","Default",0x000000 00,"040c" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","InstallLanguage", 0x00000000,"040c" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","Default",0x000000 00,"0409" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","InstallLanguage", 0x00000000,"0409" ; Supported and installed locales ; If you add/uncomment an entry here, please also add the appropriate Language

1 0

[hpoussin] 19289: - 2nd stage setup: start umpnpmgr service only after the installation of device classes
by hpoussin＠svn.reactos.com 17 Nov '05

17 Nov '05

- 2nd stage setup: start umpnpmgr service only after the installation of device classes - Implement ScmrChangeServiceConfigW - Change StartServiceW stub to return success This fixes a race condition in device installation, which sometimes lead to a bad installation for network cards, and no network connectivity at next reboot Modified: trunk/reactos/bootdata/hivesys.inf Modified: trunk/reactos/lib/advapi32/service/scm.c Modified: trunk/reactos/lib/syssetup/install.c Modified: trunk/reactos/subsys/system/services/rpcserver.c _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-11-17 08:29:59 UTC (rev 19288) +++ trunk/reactos/bootdata/hivesys.inf 2005-11-17 12:49:37 UTC (rev 19289) @@ -241,8 +241,8 @@ ;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0443",0x00000000, "l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0843",0x00000000," l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0456",0x00000000," l_intl.nls" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","Default",0x000000 00,"0409" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","InstallLanguage", 0x00000000,"0409" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","Default",0x000000 00,"040c" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","InstallLanguage", 0x00000000,"040c" ; Supported and installed locales ; If you add/uncomment an entry here, please also add the appropriate Language @@ -668,7 +668,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","ErrorControl",0x00010 001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Group",0x00000000,"Pl ugPlay" HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","ImagePath",0x00020000 ,"%SystemRoot%\system32\umpnpmgr.exe" -HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Start",0x00010001,0x 00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Start",0x00010001,0x 00000004 HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Type",0x00010001,0x00 000010 ; RPC service _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-11-17 08:29:59 UTC (rev 19288) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-11-17 12:49:37 UTC (rev 19289) @@ -126,7 +126,7 @@ DWORD dwLength; LPWSTR lpStr; - DPRINT1("ChangeServiceConfigW() called\n"); + DPRINT("ChangeServiceConfigW() called\n"); /* Calculate the Dependencies length*/ if (lpDependencies != NULL) @@ -1061,9 +1061,10 @@ DWORD dwNumServiceArgs, LPCWSTR *lpServiceArgVectors) { - DPRINT1("StartServiceW is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + DPRINT1("StartServiceW is unimplemented, but returns success...\n"); + //SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + //return FALSE; + return TRUE; } _____ Modified: trunk/reactos/lib/syssetup/install.c --- trunk/reactos/lib/syssetup/install.c 2005-11-17 08:29:59 UTC (rev 19288) +++ trunk/reactos/lib/syssetup/install.c 2005-11-17 12:49:37 UTC (rev 19289) @@ -331,6 +331,43 @@ } +static BOOL +EnableUserModePnpManager(VOID) +{ + SC_HANDLE hSCManager = NULL; + SC_HANDLE hService = NULL; + BOOL ret = FALSE; + + hSCManager = OpenSCManager(NULL, NULL, 0); + if (hSCManager == NULL) + goto cleanup; + + hService = OpenService(hSCManager, _T("PlugPlay"), SERVICE_CHANGE_CONFIG | SERVICE_START); + if (hService == NULL) + goto cleanup; + + ret = ChangeServiceConfig( + hService, + SERVICE_NO_CHANGE, SERVICE_AUTO_START, SERVICE_NO_CHANGE, + NULL, NULL, NULL, NULL, NULL, NULL, NULL); + if (!ret) + goto cleanup; + + ret = StartService(hService, 0, NULL); + if (!ret) + goto cleanup; + + ret = TRUE; + +cleanup: + if (hSCManager != NULL) + CloseServiceHandle(hSCManager); + if (hService != NULL) + CloseServiceHandle(hService); + return ret; +} + + DWORD STDCALL InstallReactOS (HINSTANCE hInstance) { @@ -493,6 +530,12 @@ return 0; } + if (!EnableUserModePnpManager()) + { + DebugPrint("EnableUserModePnpManager() failed!\n"); + return 0; + } + InstallWizard(); SetupCloseInfFile(hSysSetupInf); _____ Modified: trunk/reactos/subsys/system/services/rpcserver.c --- trunk/reactos/subsys/system/services/rpcserver.c 2005-11-17 08:29:59 UTC (rev 19288) +++ trunk/reactos/subsys/system/services/rpcserver.c 2005-11-17 12:49:37 UTC (rev 19289) @@ -539,6 +539,7 @@ DWORD dwError = ERROR_SUCCESS; PSERVICE_HANDLE hSvc; PSERVICE lpService = NULL; + HKEY hServiceKey = NULL; DPRINT("ScmrChangeServiceConfigW() called\n"); DPRINT("dwServiceType = %lu\n", dwServiceType); @@ -581,10 +582,137 @@ return ERROR_SERVICE_MARKED_FOR_DELETE; } - /* FIXME: ... */ + /* Open the service key */ + dwError = ScmOpenServiceKey(lpService->szServiceName, + KEY_WRITE, + &hServiceKey); + if (dwError != ERROR_SUCCESS) + goto done; + /* Write service data to the registry */ + /* Set the display name */ + if (lpDisplayName != NULL && *lpDisplayName != 0) + { + RegSetValueExW(hServiceKey, + L"DisplayName", + 0, + REG_SZ, + (LPBYTE)lpDisplayName, + (wcslen(lpDisplayName) + 1) * sizeof(WCHAR)); + } + + if (dwServiceType != SERVICE_NO_CHANGE) + { + /* Set the service type */ + dwError = RegSetValueExW(hServiceKey, + L"Type", + 0, + REG_DWORD, + (LPBYTE)&dwServiceType, + sizeof(DWORD)); + if (dwError != ERROR_SUCCESS) + goto done; + } + + if (dwStartType != SERVICE_NO_CHANGE) + { + /* Set the start value */ + dwError = RegSetValueExW(hServiceKey, + L"Start", + 0, + REG_DWORD, + (LPBYTE)&dwStartType, + sizeof(DWORD)); + if (dwError != ERROR_SUCCESS) + goto done; + } + + if (dwErrorControl != SERVICE_NO_CHANGE) + { + /* Set the error control value */ + dwError = RegSetValueExW(hServiceKey, + L"ErrorControl", + 0, + REG_DWORD, + (LPBYTE)&dwErrorControl, + sizeof(DWORD)); + if (dwError != ERROR_SUCCESS) + goto done; + } + +#if 0 + /* FIXME: set the new ImagePath value */ + + /* Set the image path */ + if (dwServiceType & SERVICE_WIN32) + { + if (lpBinaryPathName != NULL && *lpBinaryPathName != 0) + { + dwError = RegSetValueExW(hServiceKey, + L"ImagePath", + 0, + REG_EXPAND_SZ, + (LPBYTE)lpBinaryPathName, + (wcslen(lpBinaryPathName) + 1) * sizeof(WCHAR)); + if (dwError != ERROR_SUCCESS) + goto done; + } + } + else if (dwServiceType & SERVICE_DRIVER) + { + if (lpImagePath != NULL && *lpImagePath != 0) + { + dwError = RegSetValueExW(hServiceKey, + L"ImagePath", + 0, + REG_EXPAND_SZ, + (LPBYTE)lpImagePath, + (wcslen(lpImagePath) + 1) *sizeof(WCHAR)); + if (dwError != ERROR_SUCCESS) + goto done; + } + } +#endif + + /* Set the group name */ + if (lpLoadOrderGroup != NULL && *lpLoadOrderGroup != 0) + { + dwError = RegSetValueExW(hServiceKey, + L"Group", + 0, + REG_SZ, + (LPBYTE)lpLoadOrderGroup, + (wcslen(lpLoadOrderGroup) + 1) * sizeof(WCHAR)); + if (dwError != ERROR_SUCCESS) + goto done; + } + + if (lpdwTagId != NULL) + { + /* FIXME: Write tag */ + } + + /* Write dependencies */ + if (lpDependencies != NULL && *lpDependencies != 0) + { + dwError = ScmWriteDependencies(hServiceKey, + lpDependencies, + dwDependenciesLength); + if (dwError != ERROR_SUCCESS) + goto done; + } + + if (lpPassword != NULL) + { + /* FIXME: Write password */ + } + /* FIXME: Unlock database */ +done: + if (hServiceKey != NULL) + RegCloseKey(hServiceKey); + DPRINT("ScmrChangeServiceConfigW() done (Error %lu)\n", dwError); return dwError; @@ -695,11 +823,6 @@ wcscpy(lpService->lpDisplayName, lpDisplayName); } - - - /* FIXME: set lpLoadOrderGroup, lpDependencies etc. */ - - /* Write service data to the registry */ /* Create the service key */ dwError = ScmCreateServiceKey(lpServiceName,

1 0

[hpoussin] 19288: Second attempt to have a working keyboard and mouse at third reboot
by hpoussin＠svn.reactos.com 17 Nov '05

17 Nov '05

Second attempt to have a working keyboard and mouse at third reboot May fix bug 1018 Modified: trunk/reactos/media/inf/keyboard.inf Modified: trunk/reactos/media/inf/mouse.inf _____ Modified: trunk/reactos/media/inf/keyboard.inf --- trunk/reactos/media/inf/keyboard.inf 2005-11-17 05:53:52 UTC (rev 19287) +++ trunk/reactos/media/inf/keyboard.inf 2005-11-17 08:29:59 UTC (rev 19288) @@ -36,12 +36,14 @@ i8042prt.sys [PS2_Inst.NT.Services] -AddService = i8042prt, 0x00000002, i8042prt_Service_Inst +;DO NOT INSTALL i8042prt driver, as long as it is not PnP-compatible +;AddService = i8042prt, 0x00000002, i8042prt_Service_Inst +AddService = , 0x00000002 AddService = kbdclass, , kbdclass_Service_Inst [i8042prt_Service_Inst] ServiceType = 1 -StartType = 1 +StartType = 3 ErrorControl = 1 ServiceBinary = %12%\i8042prt.sys LoadOrderGroup = Keyboard Port _____ Modified: trunk/reactos/media/inf/mouse.inf --- trunk/reactos/media/inf/mouse.inf 2005-11-17 05:53:52 UTC (rev 19287) +++ trunk/reactos/media/inf/mouse.inf 2005-11-17 08:29:59 UTC (rev 19288) @@ -87,12 +87,14 @@ i8042prt.sys [PS2_Inst.NT.Services] -AddService = i8042prt, 0x00000002, i8042prt_Service_Inst +;DO NOT INSTALL i8042prt driver, as long as it is not PnP-compatible +;AddService = i8042prt, 0x00000002, i8042prt_Service_Inst +AddService = , 0x00000002 AddService = mouclass, , mouclass_Service_Inst [i8042prt_Service_Inst] ServiceType = 1 -StartType = 1 +StartType = 3 ErrorControl = 1 ServiceBinary = %12%\i8042prt.sys LoadOrderGroup = Keyboard Port

1 0

[sedwards] 19287: another no-op. Remove the win32apiisms. Make compatible with both DDKs
by sedwards＠svn.reactos.com 17 Nov '05

17 Nov '05

another no-op. Remove the win32apiisms. Make compatible with both DDKs Modified: trunk/reactos/hal/hal/hal.c _____ Modified: trunk/reactos/hal/hal/hal.c --- trunk/reactos/hal/hal/hal.c 2005-11-16 23:07:37 UTC (rev 19286) +++ trunk/reactos/hal/hal/hal.c 2005-11-17 05:53:52 UTC (rev 19287) @@ -12,7 +12,8 @@ /* INCLUDES ******************************************************************/ #include <ddk/ntddk.h> -#include <ndk/ntndk.h> +#include <ndk/halfuncs.h> +#include <ndk/kdfuncs.h> #define NDEBUG #include <debug.h> @@ -24,7 +25,7 @@ /* FUNCTIONS *****************************************************************/ NTSTATUS -STDCALL +NTAPI DriverEntry( PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) @@ -64,7 +65,7 @@ VOID -STDCALL +NTAPI HalAcquireDisplayOwnership( PHAL_RESET_DISPLAY_PARAMETERS ResetDisplayParameters) { @@ -73,7 +74,7 @@ NTSTATUS -STDCALL +NTAPI HalAdjustResourceList( PCM_RESOURCE_LIST Resources) { @@ -84,7 +85,7 @@ BOOLEAN -STDCALL +NTAPI HalAllProcessorsStarted(VOID) { UNIMPLEMENTED; @@ -94,7 +95,7 @@ NTSTATUS -STDCALL +NTAPI HalAllocateAdapterChannel( PADAPTER_OBJECT AdapterObject, PWAIT_CONTEXT_BLOCK WaitContextBlock, @@ -108,7 +109,7 @@ PVOID -STDCALL +NTAPI HalAllocateCommonBuffer( PADAPTER_OBJECT AdapterObject, ULONG Length, @@ -122,7 +123,7 @@ NTSTATUS -STDCALL +NTAPI HalAssignSlotResources( PUNICODE_STRING RegistryPath, PUNICODE_STRING DriverClassName, @@ -140,7 +141,7 @@ BOOLEAN -STDCALL +NTAPI HalBeginSystemInterrupt (ULONG Vector, KIRQL Irql, PKIRQL OldIrql) @@ -152,7 +153,7 @@ VOID -STDCALL +NTAPI HalCalibratePerformanceCounter( ULONG Count) { @@ -161,7 +162,7 @@ BOOLEAN -STDCALL +NTAPI HalDisableSystemInterrupt( ULONG Vector, KIRQL Irql) @@ -173,7 +174,7 @@ VOID -STDCALL +NTAPI HalDisplayString( PCH String) { @@ -182,7 +183,7 @@ BOOLEAN -STDCALL +NTAPI HalEnableSystemInterrupt( ULONG Vector, KIRQL Irql, @@ -195,7 +196,7 @@ VOID -STDCALL +NTAPI HalEndSystemInterrupt( KIRQL Irql, ULONG Unknown2) @@ -205,7 +206,7 @@ BOOLEAN -STDCALL +NTAPI HalFlushCommonBuffer( ULONG Unknown1, ULONG Unknown2, @@ -220,7 +221,7 @@ VOID -STDCALL +NTAPI HalFreeCommonBuffer( PADAPTER_OBJECT AdapterObject, ULONG Length, @@ -233,7 +234,7 @@ PADAPTER_OBJECT -STDCALL +NTAPI HalGetAdapter( PDEVICE_DESCRIPTION DeviceDescription, PULONG NumberOfMapRegisters) @@ -245,7 +246,7 @@ ULONG -STDCALL +NTAPI HalGetBusData( BUS_DATA_TYPE BusDataType, ULONG BusNumber, @@ -260,7 +261,7 @@ ULONG -STDCALL +NTAPI HalGetBusDataByOffset( BUS_DATA_TYPE BusDataType, ULONG BusNumber, @@ -276,7 +277,7 @@ BOOLEAN -STDCALL +NTAPI HalGetEnvironmentVariable( PCH Name, PCH Value, @@ -289,7 +290,7 @@ ULONG -STDCALL +NTAPI HalGetInterruptVector( INTERFACE_TYPE InterfaceType, ULONG BusNumber, @@ -305,7 +306,7 @@ VOID -STDCALL +NTAPI HalHandleNMI( ULONG Unused) { @@ -314,7 +315,7 @@ BOOLEAN -STDCALL +NTAPI HalInitSystem( ULONG BootPhase, PLOADER_PARAMETER_BLOCK LoaderBlock) @@ -326,7 +327,7 @@ VOID -STDCALL +NTAPI HalInitializeProcessor( ULONG ProcessorNumber, PVOID ProcessorStack) @@ -336,7 +337,7 @@ BOOLEAN -STDCALL +NTAPI HalMakeBeep( ULONG Frequency) { @@ -347,7 +348,7 @@ VOID -STDCALL +NTAPI HalProcessorIdle(VOID) { UNIMPLEMENTED; @@ -355,7 +356,7 @@ BOOLEAN -STDCALL +NTAPI HalQueryDisplayOwnership(VOID) { UNIMPLEMENTED; @@ -365,7 +366,7 @@ VOID -STDCALL +NTAPI HalQueryDisplayParameters( OUT PULONG DispSizeX, OUT PULONG DispSizeY, @@ -377,7 +378,7 @@ VOID -STDCALL +NTAPI HalQueryRealTimeClock( PTIME_FIELDS Time) { @@ -386,7 +387,7 @@ ULONG -STDCALL +NTAPI HalReadDmaCounter( PADAPTER_OBJECT AdapterObject) { @@ -397,14 +398,14 @@ VOID -STDCALL +NTAPI HalReleaseDisplayOwnership(VOID) { UNIMPLEMENTED; } VOID -STDCALL +NTAPI HalReportResourceUsage(VOID) { UNIMPLEMENTED; @@ -412,7 +413,7 @@ VOID -STDCALL +NTAPI HalRequestIpi( ULONG Unknown) { @@ -430,7 +431,7 @@ VOID -STDCALL +NTAPI HalReturnToFirmware( FIRMWARE_REENTRY Action) { @@ -439,7 +440,7 @@ ULONG -STDCALL +NTAPI HalSetBusData( BUS_DATA_TYPE BusDataType, ULONG BusNumber, @@ -454,7 +455,7 @@ ULONG -STDCALL +NTAPI HalSetBusDataByOffset( BUS_DATA_TYPE BusDataType, ULONG BusNumber, @@ -470,7 +471,7 @@ VOID -STDCALL +NTAPI HalSetDisplayParameters( ULONG CursorPosX, ULONG CursorPosY) @@ -480,7 +481,7 @@ BOOLEAN -STDCALL +NTAPI HalSetEnvironmentVariable( PCH Name, PCH Value) @@ -492,7 +493,7 @@ VOID -STDCALL +NTAPI HalSetRealTimeClock( PTIME_FIELDS Time) { @@ -501,7 +502,7 @@ BOOLEAN -STDCALL +NTAPI HalStartNextProcessor( ULONG Unknown1, ULONG Unknown2) @@ -526,7 +527,7 @@ BOOLEAN -STDCALL +NTAPI HalTranslateBusAddress( INTERFACE_TYPE InterfaceType, ULONG BusNumber, @@ -541,7 +542,7 @@ VOID -STDCALL +NTAPI IoAssignDriveLetters( PLOADER_PARAMETER_BLOCK LoaderBlock, PSTRING NtDeviceName, @@ -553,7 +554,7 @@ BOOLEAN -STDCALL +NTAPI IoFlushAdapterBuffers( PADAPTER_OBJECT AdapterObject, PMDL Mdl, @@ -569,7 +570,7 @@ VOID -STDCALL +NTAPI IoFreeAdapterChannel( PADAPTER_OBJECT AdapterObject) { @@ -578,7 +579,7 @@ VOID -STDCALL +NTAPI IoFreeMapRegisters( PADAPTER_OBJECT AdapterObject, PVOID MapRegisterBase, @@ -589,7 +590,7 @@ PHYSICAL_ADDRESS -STDCALL +NTAPI IoMapTransfer( PADAPTER_OBJECT AdapterObject, PMDL Mdl, @@ -609,7 +610,7 @@ BOOLEAN -STDCALL +NTAPI KdPortGetByte( PUCHAR ByteRecieved) { @@ -620,7 +621,7 @@ BOOLEAN -STDCALL +NTAPI KdPortGetByteEx( PKD_PORT_INFORMATION PortInformation, PUCHAR ByteRecieved) @@ -632,11 +633,11 @@ BOOLEAN -STDCALL +NTAPI KdPortInitialize( PKD_PORT_INFORMATION PortInformation, - DWORD Unknown1, - DWORD Unknown2) + ULONG Unknown1, + ULONG Unknown2) { UNIMPLEMENTED; @@ -645,11 +646,11 @@ BOOLEAN -STDCALL +NTAPI KdPortInitializeEx( PKD_PORT_INFORMATION PortInformation, - DWORD Unknown1, - DWORD Unknown2) + ULONG Unknown1, + ULONG Unknown2) { UNIMPLEMENTED; @@ -658,7 +659,7 @@ BOOLEAN -STDCALL +NTAPI KdPortPollByte( PUCHAR ByteRecieved) { @@ -669,7 +670,7 @@ BOOLEAN -STDCALL +NTAPI KdPortPollByteEx( PKD_PORT_INFORMATION PortInformation, PUCHAR ByteRecieved) @@ -681,7 +682,7 @@ VOID -STDCALL +NTAPI KdPortPutByte( UCHAR ByteToSend) { @@ -690,7 +691,7 @@ VOID -STDCALL +NTAPI KdPortPutByteEx( PKD_PORT_INFORMATION PortInformation, UCHAR ByteToSend) @@ -700,7 +701,7 @@ VOID -STDCALL +NTAPI KdPortRestore(VOID) { UNIMPLEMENTED; @@ -708,7 +709,7 @@ VOID -STDCALL +NTAPI KdPortSave(VOID) { UNIMPLEMENTED; @@ -716,7 +717,7 @@ BOOLEAN -STDCALL +NTAPI KdPortDisableInterrupts() { UNIMPLEMENTED; @@ -726,7 +727,7 @@ BOOLEAN -STDCALL +NTAPI KdPortEnableInterrupts() { UNIMPLEMENTED; @@ -736,7 +737,7 @@ #undef KeAcquireSpinLock VOID -STDCALL +NTAPI KeAcquireSpinLock( PKSPIN_LOCK SpinLock, PKIRQL OldIrql) @@ -776,9 +777,8 @@ UNIMPLEMENTED; } - VOID -STDCALL +NTAPI KeFlushWriteBuffer(VOID) { UNIMPLEMENTED; @@ -786,7 +786,7 @@ #undef KeGetCurrentIrql KIRQL -STDCALL +NTAPI KeGetCurrentIrql(VOID) { UNIMPLEMENTED; @@ -796,7 +796,7 @@ #undef KeLowerIrql VOID -STDCALL +NTAPI KeLowerIrql( KIRQL NewIrql) { @@ -805,7 +805,7 @@ LARGE_INTEGER -STDCALL +NTAPI KeQueryPerformanceCounter( PLARGE_INTEGER PerformanceFreq) { @@ -820,7 +820,7 @@ #undef KeRaiseIrql VOID -STDCALL +NTAPI KeRaiseIrql( KIRQL NewIrql, PKIRQL OldIrql) @@ -830,7 +830,7 @@ KIRQL -STDCALL +NTAPI KeRaiseIrqlToDpcLevel(VOID) { UNIMPLEMENTED; @@ -840,7 +840,7 @@ KIRQL -STDCALL +NTAPI KeRaiseIrqlToSynchLevel(VOID) { UNIMPLEMENTED; @@ -850,7 +850,7 @@ #undef KeReleaseSpinLock VOID -STDCALL +NTAPI KeReleaseSpinLock( PKSPIN_LOCK SpinLock, KIRQL NewIrql) @@ -860,7 +860,7 @@ VOID -STDCALL +NTAPI KeStallExecutionProcessor( ULONG Microseconds) { @@ -910,7 +910,7 @@ VOID -STDCALL +NTAPI READ_PORT_BUFFER_UCHAR( PUCHAR Port, PUCHAR Buffer, @@ -921,7 +921,7 @@ VOID -STDCALL +NTAPI READ_PORT_BUFFER_ULONG( PULONG Port, PULONG Buffer, @@ -932,7 +932,7 @@ VOID -STDCALL +NTAPI READ_PORT_BUFFER_USHORT( PUSHORT Port, PUSHORT Buffer, @@ -943,7 +943,7 @@ UCHAR -STDCALL +NTAPI READ_PORT_UCHAR( PUCHAR Port) { @@ -954,7 +954,7 @@ ULONG -STDCALL +NTAPI READ_PORT_ULONG( PULONG Port) { @@ -965,7 +965,7 @@ USHORT -STDCALL +NTAPI READ_PORT_USHORT( PUSHORT Port) { @@ -976,7 +976,7 @@ VOID -STDCALL +NTAPI WRITE_PORT_BUFFER_UCHAR( PUCHAR Port, PUCHAR Buffer, @@ -987,7 +987,7 @@ VOID -STDCALL +NTAPI WRITE_PORT_BUFFER_USHORT( PUSHORT Port, PUSHORT Buffer, @@ -998,7 +998,7 @@ VOID -STDCALL +NTAPI WRITE_PORT_BUFFER_ULONG( PULONG Port, PULONG Buffer, @@ -1009,7 +1009,7 @@ VOID -STDCALL +NTAPI WRITE_PORT_UCHAR( PUCHAR Port, UCHAR Value) @@ -1018,7 +1018,7 @@ } VOID -STDCALL +NTAPI WRITE_PORT_ULONG( PULONG Port, ULONG Value) @@ -1027,7 +1027,7 @@ } VOID -STDCALL +NTAPI WRITE_PORT_USHORT( PUSHORT Port, USHORT Value)

1 0

[mf] 19286: - use Winefile command line for initial directory selection
by mf＠svn.reactos.com 16 Nov '05

16 Nov '05

- use Winefile command line for initial directory selection - remove useless hwndParent variable Modified: trunk/reactos/subsys/system/winefile/Makefile.MinGW Modified: trunk/reactos/subsys/system/winefile/winefile.c Modified: trunk/reactos/subsys/system/winefile/winefile.h _____ Modified: trunk/reactos/subsys/system/winefile/Makefile.MinGW --- trunk/reactos/subsys/system/winefile/Makefile.MinGW 2005-11-16 22:28:05 UTC (rev 19285) +++ trunk/reactos/subsys/system/winefile/Makefile.MinGW 2005-11-16 23:07:37 UTC (rev 19286) @@ -25,7 +25,7 @@ ifeq ($(UNICODE),1) CFLAGS += -DUNICODE -# LFLAGS+= -Wl,--entry,_wWinMain@16 +#LFLAGS += -Wl,--entry,_wWinMain@16 RCFLAGS += -DUNICODE endif _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-11-16 22:28:05 UTC (rev 19285) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-11-16 23:07:37 UTC (rev 19286) @@ -2146,9 +2146,7 @@ break; case WM_DESTROY: - /* don't exit desktop when closing file manager window */ - if (!Globals.hwndParent) - PostQuitMessage(0); + PostQuitMessage(0); break; case WM_INITMENUPOPUP: { @@ -4683,11 +4681,11 @@ } -static void show_frame(HWND hwndParent, int cmdshow) +static void show_frame(HWND hwndParent, int cmdshow, LPCTSTR path) { const static TCHAR sMDICLIENT[] = {'M','D','I','C','L','I','E','N','T','\0'}; - TCHAR path[MAX_PATH], b1[BUFFER_LEN]; + TCHAR buffer[MAX_PATH], b1[BUFFER_LEN]; ChildWnd* child; HMENU hMenuFrame, hMenuWindow; @@ -4696,8 +4694,6 @@ if (Globals.hMainWnd) return; - Globals.hwndParent = hwndParent; - hMenuFrame = LoadMenu(Globals.hInstance, MAKEINTRESOURCE(IDM_WINEFILE)); hMenuWindow = GetSubMenu(hMenuFrame, GetMenuItemCount(hMenuFrame)-2); @@ -4752,8 +4748,12 @@ Globals.hMainWnd, (HMENU)IDW_STATUSBAR, hinstance, 0);*/ /*TODO: read paths and window placements from registry */ - GetCurrentDirectory(MAX_PATH, path); + if (!path || !*path) { + GetCurrentDirectory(MAX_PATH, buffer); + path = buffer; + } + ShowWindow(Globals.hMainWnd, cmdshow); //#if defined(_SHELL_FOLDERS) && !defined(__WINE__) @@ -4826,7 +4826,7 @@ #endif -static int winefile_main(HINSTANCE hinstance, HWND hwndParent, int cmdshow) +static int winefile_main(HINSTANCE hinstance, int cmdshow, LPCTSTR path) { MSG msg; @@ -4836,7 +4836,7 @@ /*TODO: read window placement from registry */ cmdshow = SW_MAXIMIZE; - show_frame(hwndParent, cmdshow); + show_frame(0, cmdshow, path); while(GetMessage(&msg, 0, 0, 0)) { if (Globals.hmdiclient && TranslateMDISysAccel(Globals.hmdiclient, &msg)) @@ -4855,17 +4855,26 @@ } -int APIENTRY WinMain(HINSTANCE hinstance, - HINSTANCE previnstance, - LPSTR cmdline, - int cmdshow) +#if defined(UNICODE) && defined(_MSC_VER) +int APIENTRY wWinMain(HINSTANCE hinstance, HINSTANCE previnstance, LPWSTR cmdline, int cmdshow) +#else +int APIENTRY WinMain(HINSTANCE hinstance, HINSTANCE previnstance, LPSTR cmdline, int cmdshow) +#endif { #ifdef _NO_EXTENSIONS if (find_window_class(sWINEFILEFRAME)) return 1; #endif - winefile_main(hinstance, 0, cmdshow); +#if defined(UNICODE) && !defined(_MSC_VER) + { /* convert ANSI cmdline into WCS path string */ + TCHAR buffer[MAX_PATH]; + MultiByteToWideChar(CP_ACP, 0, cmdline, -1, buffer, MAX_PATH); + winefile_main(hinstance, cmdshow, buffer); + } +#else + winefile_main(hinstance, cmdshow, cmdline); +#endif return 0; } _____ Modified: trunk/reactos/subsys/system/winefile/winefile.h --- trunk/reactos/subsys/system/winefile/winefile.h 2005-11-16 22:28:05 UTC (rev 19285) +++ trunk/reactos/subsys/system/winefile/winefile.h 2005-11-16 23:07:37 UTC (rev 19286) @@ -118,7 +118,6 @@ HANDLE hInstance; HACCEL haccel; ATOM hframeClass; - HWND hwndParent; HWND hMainWnd; HMENU hMenuFrame;

1 0

[sedwards] 19285: no op header change. Correct some of the header guards to match the DDK
by sedwards＠svn.reactos.com 16 Nov '05

16 Nov '05

no op header change. Correct some of the header guards to match the DDK Modified: trunk/reactos/w32api/include/ddk/afilter.h Modified: trunk/reactos/w32api/include/ddk/atm.h Modified: trunk/reactos/w32api/include/ddk/cfg.h Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h Modified: trunk/reactos/w32api/include/ddk/d3dhal.h Modified: trunk/reactos/w32api/include/ddk/scsi.h Modified: trunk/reactos/w32api/include/ddk/xfilter.h _____ Modified: trunk/reactos/w32api/include/ddk/afilter.h --- trunk/reactos/w32api/include/ddk/afilter.h 2005-11-16 21:55:42 UTC (rev 19284) +++ trunk/reactos/w32api/include/ddk/afilter.h 2005-11-16 22:28:05 UTC (rev 19285) @@ -20,8 +20,8 @@ * */ -#ifndef __AFILTER_H -#define __AFILTER_H +#ifndef _ARC_FILTER_DEFS_ +#define _ARC_FILTER_DEFS_ #if __GNUC__ >=3 #pragma GCC system_header @@ -186,4 +186,4 @@ } #endif -#endif /* __AFILTER_H */ +#endif /* _ARC_FILTER_DEFS_ */ _____ Modified: trunk/reactos/w32api/include/ddk/atm.h --- trunk/reactos/w32api/include/ddk/atm.h 2005-11-16 21:55:42 UTC (rev 19284) +++ trunk/reactos/w32api/include/ddk/atm.h 2005-11-16 22:28:05 UTC (rev 19285) @@ -20,8 +20,8 @@ * */ -#ifndef __ATM_H -#define __ATM_H +#ifndef _ATM_H +#define _ATM_H #if __GNUC__ >=3 #pragma GCC system_header @@ -504,4 +504,4 @@ } #endif -#endif /* __ATM_H */ +#endif /* _ATM_H */ _____ Modified: trunk/reactos/w32api/include/ddk/cfg.h --- trunk/reactos/w32api/include/ddk/cfg.h 2005-11-16 21:55:42 UTC (rev 19284) +++ trunk/reactos/w32api/include/ddk/cfg.h 2005-11-16 22:28:05 UTC (rev 19285) @@ -20,8 +20,8 @@ * */ -#ifndef __CFG_H -#define __CFG_H +#ifndef _CFG_INCLUDED_ +#define _CFG_INCLUDED_ #if __GNUC__ >=3 #pragma GCC system_header @@ -142,4 +142,4 @@ } #endif -#endif /* __CFG_H */ +#endif /* _CFG_INCLUDED_ */ _____ Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h --- trunk/reactos/w32api/include/ddk/cfgmgr32.h 2005-11-16 21:55:42 UTC (rev 19284) +++ trunk/reactos/w32api/include/ddk/cfgmgr32.h 2005-11-16 22:28:05 UTC (rev 19285) @@ -20,8 +20,8 @@ * */ -#ifndef __CFGMGR32_H -#define __CFGMGR32_H +#ifndef _CFGMGR32_H_ +#define _CFGMGR32_H_ #if __GNUC__ >=3 #pragma GCC system_header @@ -1876,4 +1876,4 @@ } #endif -#endif /* __CFGMGR32_H */ +#endif /* _CFGMGR32_H_ */ _____ Modified: trunk/reactos/w32api/include/ddk/d3dhal.h --- trunk/reactos/w32api/include/ddk/d3dhal.h 2005-11-16 21:55:42 UTC (rev 19284) +++ trunk/reactos/w32api/include/ddk/d3dhal.h 2005-11-16 22:28:05 UTC (rev 19285) @@ -19,8 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __WINE_D3DHAL_H -#define __WINE_D3DHAL_H +#ifndef _D3DHAL_H_ +#define _D3DHAL_H_ #ifdef __cplusplus extern "C" { @@ -522,4 +522,4 @@ } /* extern "C" */ #endif -#endif /* __WINE_DDRAWI_H */ +#endif /* _D3DHAL_H_ */ _____ Modified: trunk/reactos/w32api/include/ddk/scsi.h --- trunk/reactos/w32api/include/ddk/scsi.h 2005-11-16 21:55:42 UTC (rev 19284) +++ trunk/reactos/w32api/include/ddk/scsi.h 2005-11-16 22:28:05 UTC (rev 19285) @@ -20,8 +20,8 @@ * */ -#ifndef __SCSI_H -#define __SCSI_H +#ifndef _NTSCSI_ +#define _NTSCSI_ #if __GNUC__ >=3 #pragma GCC system_header @@ -1692,4 +1692,4 @@ } #endif -#endif /* __SCSI_H */ +#endif /* _NTSCSI_ */ _____ Modified: trunk/reactos/w32api/include/ddk/xfilter.h --- trunk/reactos/w32api/include/ddk/xfilter.h 2005-11-16 21:55:42 UTC (rev 19284) +++ trunk/reactos/w32api/include/ddk/xfilter.h 2005-11-16 22:28:05 UTC (rev 19285) @@ -20,8 +20,8 @@ * */ -#ifndef __XFILTER_H -#define __XFILTER_H +#ifndef _X_FILTER_DEFS_ +#define _X_FILTER_DEFS_ #if __GNUC__ >=3 #pragma GCC system_header @@ -233,4 +233,4 @@ } #endif -#endif /* __XFILTER_H */ +#endif /* _X_FILTER_DEFS_ */

1 0

[frik85] 19284: RosCMS (Part 6)
by frik85＠svn.reactos.com 16 Nov '05

16 Nov '05

RosCMS (Part 6) Plain SQL file for RosCMS Added: trunk/web/reactos.org/sql/ Added: trunk/web/reactos.org/sql/roscms.sql _____ Added: trunk/web/reactos.org/sql/roscms.sql --- trunk/web/reactos.org/sql/roscms.sql 2005-11-16 21:44:26 UTC (rev 19283) +++ trunk/web/reactos.org/sql/roscms.sql 2005-11-16 21:55:42 UTC (rev 19284) @@ -0,0 +1,249 @@ +-- +-- RosCMS - ReactOS Content Management System +-- Copyright (C) 2005 Ge van Geldorp <gvg(a)reactos.org> +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 2 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program; if not, write to the Free Software +-- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +-- +-- +-- Database: `roscms` +-- + +-- -------------------------------------------------------- + +-- +-- `content` +-- + +DROP TABLE IF EXISTS `content`; +CREATE TABLE `content` ( + `content_id` bigint(20) NOT NULL auto_increment, + `content_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `content_lang` varchar(10) collate utf8_unicode_ci NOT NULL default 'all', + `content_text` text collate utf8_unicode_ci NOT NULL, + `content_version` int(11) NOT NULL default '0', + `content_active` tinyint(4) NOT NULL default '0', + `content_visible` tinyint(4) NOT NULL default '0', + `content_description` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `content_editor` varchar(10) collate utf8_unicode_ci NOT NULL default '', + `content_usrname_id` bigint(20) NOT NULL default '0', + `content_date` date NOT NULL default '0000-00-00', + `content_time` time NOT NULL default '00:00:00', + PRIMARY KEY (`content_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Contents' AUTO_INCREMENT=0; + +-- -------------------------------------------------------- + +-- +-- `dyn_content` +-- + +DROP TABLE IF EXISTS `dyn_content`; +CREATE TABLE `dyn_content` ( + `dyn_id` bigint(20) NOT NULL auto_increment, + `dyn_content_id` bigint(20) NOT NULL default '0', + `dyn_content_nr` int(11) NOT NULL default '0', + `dyn_content_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `dyn_content_lang` varchar(10) collate utf8_unicode_ci NOT NULL default 'all', + `dyn_content_text1` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `dyn_content_text2` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `dyn_content_text3` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `dyn_content_text4` longtext collate utf8_unicode_ci NOT NULL, + `dyn_content_version` int(11) NOT NULL default '0', + `dyn_content_active` tinyint(4) NOT NULL default '0', + `dyn_content_visible` tinyint(4) NOT NULL default '0', + `dyn_content_editor` varchar(10) collate utf8_unicode_ci NOT NULL default '', + `dyn_content_usrname_id` bigint(20) NOT NULL default '0', + `dyn_content_date` date NOT NULL default '0000-00-00', + `dyn_content_time` time NOT NULL default '00:00:00', + PRIMARY KEY (`dyn_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Contents' AUTO_INCREMENT=0 ; + +-- -------------------------------------------------------- + +-- +-- `include_text` +-- + +DROP TABLE IF EXISTS `include_text`; +CREATE TABLE `include_text` ( + `inc_id` bigint(20) NOT NULL auto_increment, + `inc_level` tinyint(4) NOT NULL default '0', + `inc_word` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `inc_text` text collate utf8_unicode_ci NOT NULL, + `inc_lang` varchar(10) collate utf8_unicode_ci NOT NULL default 'all', + `inc_extra` varchar(20) collate utf8_unicode_ci NOT NULL default '', + `inc_vis` tinyint(4) NOT NULL default '0', + `inc_seclevel` tinyint(4) NOT NULL default '50', + `inc_usrname_id` bigint(20) NOT NULL default '0', + `inc_date` date NOT NULL default '0000-00-00', + `inc_time` time NOT NULL default '00:00:00', + PRIMARY KEY (`inc_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Replace words with text phrases' AUTO_INCREMENT=0 ; + +-- -------------------------------------------------------- + +-- +-- `languages` +-- + +DROP TABLE IF EXISTS `languages`; +CREATE TABLE `languages` ( + `lang_id` varchar(10) collate utf8_unicode_ci NOT NULL default '', + `lang_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `lang_level` int(11) NOT NULL default '0' +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='available languages'; + +-- -------------------------------------------------------- + +-- +-- `pages` +-- + +DROP TABLE IF EXISTS `pages`; +CREATE TABLE `pages` ( + `page_id` bigint(20) NOT NULL auto_increment, + `page_name` varchar(50) collate utf8_unicode_ci NOT NULL default '', + `page_language` varchar(50) collate utf8_unicode_ci NOT NULL default '', + `pages_extra` varchar(20) collate utf8_unicode_ci NOT NULL default '', + `page_text` text collate utf8_unicode_ci NOT NULL, + `page_version` int(11) NOT NULL default '0', + `page_active` tinyint(4) NOT NULL default '0', + `page_visible` tinyint(4) NOT NULL default '0', + `page_usrname_id` bigint(20) NOT NULL default '0', + `page_date` date NOT NULL default '0000-00-00', + `page_time` time NOT NULL default '00:00:00', + `page_generate_usrid` bigint(20) NOT NULL default '0', + `page_generate_timestamp` varchar(50) collate utf8_unicode_ci NOT NULL default '', + `page_title` varchar(150) collate utf8_unicode_ci NOT NULL default '', + `page_description` varchar(255) collate utf8_unicode_ci NOT NULL default '', + PRIMARY KEY (`page_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Pages' AUTO_INCREMENT=0 ; + +-- -------------------------------------------------------- + +-- +-- `roscms_security_log` +-- + +DROP TABLE IF EXISTS `roscms_security_log`; +CREATE TABLE `roscms_security_log` ( + `roscms_sec_log_id` bigint(20) NOT NULL auto_increment, + `roscms_sec_log_section` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `roscms_sec_log_priority` int(11) NOT NULL default '100', + `roscms_sec_log_reason` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `roscms_sec_log_user` varchar(100) collate utf8_unicode_ci NOT NULL default 'roscms_system', + `roscms_sec_log_useraccount` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `roscms_sec_log_userip` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `roscms_sec_log_referrer` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `roscms_sec_log_text` text collate utf8_unicode_ci NOT NULL, + `roscms_sec_log_date` date NOT NULL default '0000-00-00', + `roscms_sec_log_time` time NOT NULL default '00:00:00', + `roscms_sec_log_visible` int(11) NOT NULL default '1', + PRIMARY KEY (`roscms_sec_log_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='RosCMS Security Log' AUTO_INCREMENT=0 ; + +-- -------------------------------------------------------- + +-- +-- `subsys_mappings` +-- + +DROP TABLE IF EXISTS `subsys_mappings`; +CREATE TABLE `subsys_mappings` ( + `map_roscms_userid` bigint(20) NOT NULL default '0', + `map_subsys_name` varchar(10) character set utf8 NOT NULL default '', + `map_subsys_userid` int(7) NOT NULL default '0', + PRIMARY KEY (`map_roscms_userid`,`map_subsys_name`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- `user_sessions` +-- + +DROP TABLE IF EXISTS `user_sessions`; +CREATE TABLE `user_sessions` ( + `usersession_id` varchar(32) character set utf8 NOT NULL default '' COMMENT 'Unique ID of this session', + `usersession_user_id` bigint(20) NOT NULL default '0' COMMENT 'User this session belongs to', + `usersession_expires` datetime default NULL COMMENT 'Expiry date/time (NULL if does not expire)', + `usersession_browseragent` varchar(255) character set utf8 NOT NULL default '' COMMENT 'HTTP_USER_AGENT when this session was created', + `usersession_ipaddress` varchar(15) character set utf8 NOT NULL default '' COMMENT 'IP address from which this session was created', + PRIMARY KEY (`usersession_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci PACK_KEYS=0 COMMENT='Sessions'; + +-- -------------------------------------------------------- + +-- +-- `usergroup_members` +-- + +DROP TABLE IF EXISTS `usergroup_members`; +CREATE TABLE `usergroup_members` ( + `usergroupmember_userid` bigint(20) NOT NULL default '0', + `usergroupmember_usergroupid` varchar(10) collate utf8_unicode_ci NOT NULL default 'user' +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- `usergroups` +-- + +DROP TABLE IF EXISTS `usergroups`; +CREATE TABLE `usergroups` ( + `usrgroup_name_id` varchar(10) collate utf8_unicode_ci NOT NULL default '', + `usrgroup_name` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `usrgroup_intern_id` varchar(25) collate utf8_unicode_ci NOT NULL default '', + `usrgroup_securitylevel` tinyint(4) NOT NULL default '0', + `usrgroup_description` varchar(255) collate utf8_unicode_ci NOT NULL default '', + PRIMARY KEY (`usrgroup_name_id`), + UNIQUE KEY `usrgroup_name` (`usrgroup_name`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; + +-- -------------------------------------------------------- + +-- +-- `users` +-- + +DROP TABLE IF EXISTS `users`; +CREATE TABLE `users` ( + `user_id` bigint(20) NOT NULL auto_increment, + `user_name` varchar(20) collate utf8_unicode_ci NOT NULL default '', + `user_roscms_password` varchar(32) collate utf8_unicode_ci NOT NULL default '', + `user_roscms_getpwd_id` varchar(50) collate utf8_unicode_ci NOT NULL default '', + `user_timestamp_touch` varchar(50) collate utf8_unicode_ci NOT NULL default '', + `user_timestamp_touch2` timestamp NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, + `user_login_counter` bigint(20) NOT NULL default '0', + `user_account_enabled` varchar(10) collate utf8_unicode_ci NOT NULL default 'no', + `user_account_hidden` varchar(5) collate utf8_unicode_ci NOT NULL default 'no', + `user_register` timestamp NULL default NULL, + `user_fullname` varchar(100) collate utf8_unicode_ci NOT NULL default '', + `user_email` varchar(150) collate utf8_unicode_ci NOT NULL default '', + `user_website` varchar(150) collate utf8_unicode_ci NOT NULL default '', + `user_language` varchar(2) collate utf8_unicode_ci NOT NULL default '', + `user_country` varchar(2) collate utf8_unicode_ci NOT NULL default '', + `user_timezone` varchar(3) collate utf8_unicode_ci NOT NULL default '', + `user_occupation` varchar(50) collate utf8_unicode_ci NOT NULL default '', + `user_description` varchar(255) collate utf8_unicode_ci NOT NULL default '', + `user_setting_multisession` varchar(5) collate utf8_unicode_ci NOT NULL default 'true', + `user_setting_browseragent` varchar(5) collate utf8_unicode_ci NOT NULL default 'true', + `user_setting_ipaddress` varchar(5) collate utf8_unicode_ci NOT NULL default 'true', + `user_setting_timeout` varchar(5) collate utf8_unicode_ci NOT NULL default 'true', + PRIMARY KEY (`user_id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='RosCMS User Table' AUTO_INCREMENT=0 ; + + Property changes on: trunk/web/reactos.org/sql/roscms.sql ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native

1 0

[gvg] 19283: Add a bit of defensive programming
by gvg＠svn.reactos.com 16 Nov '05

16 Nov '05

Add a bit of defensive programming Modified: trunk/reactos/services/dhcp/adapter.c _____ Modified: trunk/reactos/services/dhcp/adapter.c --- trunk/reactos/services/dhcp/adapter.c 2005-11-16 21:43:38 UTC (rev 19282) +++ trunk/reactos/services/dhcp/adapter.c 2005-11-16 21:44:26 UTC (rev 19283) @@ -125,6 +125,7 @@ ( EnumKey, EnumKeysTop[i], "DriverDesc" ); if( DriverDesc && + RootDevice && !strcmp( DriverDesc, Adapter->DhclientInfo.name ) ) { TargetKeyName = malloc( strlen( TargetKeyNameStart ) +

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005