Ros-diffs

ros-diffs@reactos.org

81390 discussions

[amunger] 22899: Merge 22898 to branch.
by amunger＠svn.reactos.org 07 Jul '06

07 Jul '06

Author: amunger Date: Fri Jul 7 17:28:34 2006 New Revision: 22899 URL: http://svn.reactos.org/svn/reactos?rev=22899&view=rev Log: Merge 22898 to branch. Modified: branches/ros-branch-0_3_0/reactos/base/applications/network/ping/ping.c Modified: branches/ros-branch-0_3_0/reactos/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_0/reactos/base/applications/network/ping/ping.c (original) +++ branches/ros-branch-0_3_0/reactos/base/applications/network/ping/ping.c Fri Jul 7 17:28:34 2006 @@ -489,7 +489,7 @@ Packet->Icmp.Type = ICMPMSG_ECHOREQUEST; Packet->Icmp.Code = 0; Packet->Icmp.Id = (USHORT)GetCurrentProcessId(); - Packet->Icmp.SeqNum = (USHORT)CurrentSeqNum; + Packet->Icmp.SeqNum = htons((USHORT)CurrentSeqNum); Packet->Icmp.Checksum = 0; /* Timestamp is part of data area */

1 0

[amunger] 22898: Convert sequence number to network byte order before sending it on the wire.
by amunger＠svn.reactos.org 07 Jul '06

07 Jul '06

Author: amunger Date: Fri Jul 7 17:23:10 2006 New Revision: 22898 URL: http://svn.reactos.org/svn/reactos?rev=22898&view=rev Log: Convert sequence number to network byte order before sending it on the wire. Modified: trunk/reactos/base/applications/network/ping/ping.c Modified: trunk/reactos/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/ping.c (original) +++ trunk/reactos/base/applications/network/ping/ping.c Fri Jul 7 17:23:10 2006 @@ -489,7 +489,7 @@ Packet->Icmp.Type = ICMPMSG_ECHOREQUEST; Packet->Icmp.Code = 0; Packet->Icmp.Id = (USHORT)GetCurrentProcessId(); - Packet->Icmp.SeqNum = (USHORT)CurrentSeqNum; + Packet->Icmp.SeqNum = htons((USHORT)CurrentSeqNum); Packet->Icmp.Checksum = 0; /* Timestamp is part of data area */

1 0

[hpoussin] 22897: Fix typo (UNICODE -> _UNICODE)
by hpoussin＠svn.reactos.org 06 Jul '06

06 Jul '06

Author: hpoussin Date: Fri Jul 7 01:58:48 2006 New Revision: 22897 URL: http://svn.reactos.org/svn/reactos?rev=22897&view=rev Log: Fix typo (UNICODE -> _UNICODE) Modified: trunk/reactos/base/shell/cmd/console.c Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c (original) +++ trunk/reactos/base/shell/cmd/console.c Fri Jul 7 01:58:48 2006 @@ -182,7 +182,7 @@ 1, &dwWritten, NULL); -#ifdef UNICODE +#ifdef _UNICODE free(pBuf); #endif } @@ -230,7 +230,7 @@ NULL); -#ifdef UNICODE +#ifdef _UNICODE free(pBuf); #endif } @@ -330,7 +330,7 @@ } -#ifdef UNICODE +#ifdef _UNICODE free(pBuf); #endif return 0;

1 0

[greatlrd] 22896: Commit my autostart code for screen saver for now it is hardcode to 15 sec timeout
by greatlrd＠svn.reactos.org 06 Jul '06

06 Jul '06

Author: greatlrd Date: Fri Jul 7 00:42:45 2006 New Revision: 22896 URL: http://svn.reactos.org/svn/reactos?rev=22896&view=rev Log: Commit my autostart code for screen saver for now it is hardcode to 15 sec timeout Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Fri Jul 7 00:42:45 2006 @@ -3301,8 +3301,6 @@ return Request->Status = STATUS_SUCCESS; } -static BOOL ScreenSaverRunning = FALSE; - CSR_API(CsrStartScreenSaver) { @@ -3337,33 +3335,27 @@ add the code here as w3seek recomandete */ - if (ScreenSaverRunning == FALSE) - { - - RegOpenKeyExW(HKEY_CURRENT_USER, L"Control Panel\\Desktop", 0, KEY_ALL_ACCESS, &hKey); - result = RegQueryValueExW(hKey, L"SCRNSAVE.EXE", 0, &varType, (LPBYTE)szBuffer, &bufferSize); - if(result == ERROR_SUCCESS) - { - swprintf(szCmdline, L"%s /s",szBuffer); - DPRINT1("CsrStartScreenSaver : OK %S\n",szCmdline); - ZeroMemory( &si, sizeof(si) ); - si.cb = sizeof(si); - ZeroMemory( &pi, sizeof(pi) ); - ScreenSaverRunning = TRUE; - if(CreateProcessW( NULL, szCmdline, NULL, NULL, FALSE, 0, NULL,NULL,&si, &pi )) - { - - CloseHandle( pi.hProcess ); - CloseHandle( pi.hThread ); - ScreenSaverRunning = FALSE; - } - } - else - { - DPRINT1("CsrStartScreenSaver : FAIL %S\n",szBuffer); - } - RegCloseKey(hKey); - } + + RegOpenKeyExW(HKEY_CURRENT_USER, L"Control Panel\\Desktop", 0, KEY_ALL_ACCESS, &hKey); + result = RegQueryValueExW(hKey, L"SCRNSAVE.EXE", 0, &varType, (LPBYTE)szBuffer, &bufferSize); + if(result == ERROR_SUCCESS) + { + swprintf(szCmdline, L"%s /s",szBuffer); + DPRINT1("CsrStartScreenSaver : OK %S\n",szCmdline); + ZeroMemory( &si, sizeof(si) ); + si.cb = sizeof(si); + ZeroMemory( &pi, sizeof(pi) ); + if(CreateProcessW( NULL, szCmdline, NULL, NULL, FALSE, 0, NULL,NULL,&si, &pi )) + { + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + } + } + else + { + DPRINT1("CsrStartScreenSaver : FAIL %S\n",szBuffer); + } + RegCloseKey(hKey); } return Request->Status = STATUS_SUCCESS; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c Fri Jul 7 00:42:45 2006 @@ -39,6 +39,9 @@ /* GLOBALS *******************************************************************/ +static HANDLE ScreenSaverThreadHandle; +static CLIENT_ID ScreenSaverThreadId; + static HANDLE MouseDeviceHandle; static HANDLE MouseThreadHandle; static CLIENT_ID MouseThreadId; @@ -47,6 +50,7 @@ static HANDLE KeyboardDeviceHandle; static KEVENT InputThreadsStart; static BOOLEAN InputThreadsRunning = FALSE; +static BOOLEAN ScreenSaverRunning = FALSE; PUSER_MESSAGE_QUEUE pmPrimitiveMessageQueue = 0; /* FUNCTIONS *****************************************************************/ @@ -147,6 +151,65 @@ SendMouseEvent(mi); } + +VOID STDCALL +ScreenSaverThreadMain(PVOID StartContext) +{ + KEVENT Event; + LARGE_INTEGER Timeout; + NTSTATUS Status; + + KeSetPriorityThread(&PsGetCurrentThread()->Tcb, + LOW_REALTIME_PRIORITY + 3); + + for(;;) + { + DPRINT("Screen Saver auto start Thread Waiting for start event\n"); + Status = KeWaitForSingleObject(&InputThreadsStart, + 0, + KernelMode, + TRUE, + NULL); + DPRINT("Screen Saver auto start Thread Starting...\n"); + while(InputThreadsRunning) + { + NTSTATUS OldStatus; + /* FIXME + 1. read timeout value from reg + 2. read timeout value from spi msg + */ + OldStatus = STATUS_SUCCESS; + + Timeout.QuadPart = -150000000LL; /* 15 second timeout */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Status = KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, &Timeout); + + if(Status == STATUS_ALERTED && !InputThreadsRunning) + { + break; + } + if(!NT_SUCCESS(Status)) + { + DPRINT1("Win32K: Failed to read from Screen Saver auto thread.\n"); + return; //(Status); + } + + + if ((Status == STATUS_TIMEOUT) && (ScreenSaverRunning == FALSE)) + { + DPRINT1("Keyboard and Mouse TimeOut Starting Screen Saver...\n"); + CSR_API_MESSAGE Request; + ScreenSaverRunning = TRUE; + CsrInit(); + Request.Type = MAKE_CSR_API(START_SCREEN_SAVER, CSR_GUI); + Request.Data.StartScreenSaver.Start = TRUE; + co_CsrNotifyScreenSaver(&Request ); + } + } + DPRINT("Screen Saver auto start Thread Stopped...\n"); + } +} + VOID STDCALL MouseThreadMain(PVOID StartContext) @@ -223,6 +286,8 @@ } DPRINT("MouseEvent\n"); + ScreenSaverRunning = FALSE; + UserEnterExclusive(); ProcessMouseInputData(&MouseInput, Iosb.Information / sizeof(MOUSE_INPUT_DATA)); @@ -491,7 +556,7 @@ HWND hWnd; int id; - DPRINT("KeyInput @ %08x\n", &KeyInput); + DPRINT("KeyInput @ %08x\n", &KeyInput); Status = NtReadFile (KeyboardDeviceHandle, NULL, @@ -530,6 +595,8 @@ DPRINT1("Win32K: Failed to read from keyboard.\n"); return; //(Status); } + + ScreenSaverRunning = FALSE; /* Update modifier state */ fsModifiers = IntKeyboardGetModifiers(&KeyInput); @@ -809,6 +876,19 @@ DPRINT1("Win32K: Failed to create mouse thread.\n"); } + Status = PsCreateSystemThread(&ScreenSaverThreadHandle, + THREAD_ALL_ACCESS, + NULL, + NULL, + &ScreenSaverThreadId, + ScreenSaverThreadMain, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Win32K: Failed to create ScreenSaver auto start thread.\n"); + } + + return STATUS_SUCCESS; }

1 0

[fireball] 22895: Imitate success in WMI registration, so that drivers depending on it won't fail. (However DPRINT1 is inserted, so that devs notice the driver wants WMI)
by fireball＠svn.reactos.org 06 Jul '06

06 Jul '06

Author: fireball Date: Fri Jul 7 00:31:17 2006 New Revision: 22895 URL: http://svn.reactos.org/svn/reactos?rev=22895&view=rev Log: Imitate success in WMI registration, so that drivers depending on it won't fail. (However DPRINT1 is inserted, so that devs notice the driver wants WMI) Modified: trunk/reactos/ntoskrnl/wmi/wmi.c Modified: trunk/reactos/ntoskrnl/wmi/wmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/wmi/wmi.c?rev=228… ============================================================================== --- trunk/reactos/ntoskrnl/wmi/wmi.c (original) +++ trunk/reactos/ntoskrnl/wmi/wmi.c Fri Jul 7 00:31:17 2006 @@ -22,8 +22,10 @@ IoWMIRegistrationControl(IN PDEVICE_OBJECT DeviceObject, IN ULONG Action) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + DPRINT1("IoWMIRegistrationControl() called for DO %p, requesting %d action, returning success\n", + DeviceObject, Action); + + return STATUS_SUCCESS; } /*

1 0

[greatlrd] 22894: Screen Saver win32csr part 1. Clean up the code 2. Adding FIXME text 3. Fixing a bug cause screen saver was autostart whole time after timeout accord.
by greatlrd＠svn.reactos.org 06 Jul '06

06 Jul '06

Author: greatlrd Date: Thu Jul 6 23:35:16 2006 New Revision: 22894 URL: http://svn.reactos.org/svn/reactos?rev=22894&view=rev Log: Screen Saver win32csr part 1. Clean up the code 2. Adding FIXME text 3. Fixing a bug cause screen saver was autostart whole time after timeout accord. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Thu Jul 6 23:35:16 2006 @@ -3301,11 +3301,12 @@ return Request->Status = STATUS_SUCCESS; } +static BOOL ScreenSaverRunning = FALSE; CSR_API(CsrStartScreenSaver) { - DPRINT1("CsrStartScreenSaver : Start Screen Saver \n"); + DPRINT("CsrStartScreenSaver : Start Screen Saver \n"); if (Request->Data.StartScreenSaver.Start == TRUE) { @@ -3318,33 +3319,51 @@ DWORD bufferSize = sizeof(szBuffer); DWORD varType = REG_SZ; LONG result; - - - - // FIXME read the register key for the screen saver - //swprintf(szCmdline, L"c:\\reactos\\system32\\matrix.scr /s"); + + /* FIXME : + 1. Make it unicode and ansi compatible with TCHAR + + 2. Return state it is running if a tree try start it + one more screen saver when we already have one + screen saver running + + 3. Use GetLongPath or GetPathName so we can use %SystemRoot% in + the key that will make it posible for livecd have a preview screen + saver install. + + 4. Move the code to winlogon SAS and screen saver must run in + the secuar desktop. But current our Winlogon does not working + well with SAS and with Secure desktop, So I (Magnus Olsen aka GreatLord) + add the code here as w3seek recomandete + */ - RegOpenKeyExW(HKEY_CURRENT_USER, L"Control Panel\\Desktop", 0, KEY_ALL_ACCESS, &hKey); - result = RegQueryValueExW(hKey, L"SCRNSAVE.EXE", 0, &varType, (LPBYTE)szBuffer, &bufferSize); - if(result == ERROR_SUCCESS) - { - swprintf(szCmdline, L"%s /s",szBuffer); - DPRINT1("CsrStartScreenSaver : OK %S\n",szCmdline); - ZeroMemory( &si, sizeof(si) ); - si.cb = sizeof(si); - ZeroMemory( &pi, sizeof(pi) ); - if(CreateProcessW( NULL, szCmdline, NULL, NULL, FALSE, 0, NULL,NULL,&si, &pi )) - { - CloseHandle( pi.hProcess ); - CloseHandle( pi.hThread ); - } - } - else - { + if (ScreenSaverRunning == FALSE) + { + + RegOpenKeyExW(HKEY_CURRENT_USER, L"Control Panel\\Desktop", 0, KEY_ALL_ACCESS, &hKey); + result = RegQueryValueExW(hKey, L"SCRNSAVE.EXE", 0, &varType, (LPBYTE)szBuffer, &bufferSize); + if(result == ERROR_SUCCESS) + { + swprintf(szCmdline, L"%s /s",szBuffer); + DPRINT1("CsrStartScreenSaver : OK %S\n",szCmdline); + ZeroMemory( &si, sizeof(si) ); + si.cb = sizeof(si); + ZeroMemory( &pi, sizeof(pi) ); + ScreenSaverRunning = TRUE; + if(CreateProcessW( NULL, szCmdline, NULL, NULL, FALSE, 0, NULL,NULL,&si, &pi )) + { + + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + ScreenSaverRunning = FALSE; + } + } + else + { DPRINT1("CsrStartScreenSaver : FAIL %S\n",szBuffer); - } - - RegCloseKey(hKey); + } + RegCloseKey(hKey); + } } return Request->Status = STATUS_SUCCESS; }

1 0

[cwittich] 22893: fixed some warnings (msvc /W4)
by cwittich＠svn.reactos.org 06 Jul '06

06 Jul '06

Author: cwittich Date: Thu Jul 6 20:26:40 2006 New Revision: 22893 URL: http://svn.reactos.org/svn/reactos?rev=22893&view=rev Log: fixed some warnings (msvc /W4) Modified: trunk/reactos/base/applications/devmgr/devmgr.c trunk/reactos/base/applications/winver/winver.c Modified: trunk/reactos/base/applications/devmgr/devmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgr/d… ============================================================================== --- trunk/reactos/base/applications/devmgr/devmgr.c (original) +++ trunk/reactos/base/applications/devmgr/devmgr.c Thu Jul 6 20:26:40 2006 @@ -131,8 +131,8 @@ if (rc == ERROR_SUCCESS) { InsertIntoListView(i,ClassDescription,ClassName); - TextOut(hDC, 200, 40, empty, strlen(empty)); - TextOut(hDC, 200, 40, ClassDescription, strlen(ClassDescription)); + TextOut(hDC, 200, 40, empty, (int) strlen(empty)); + TextOut(hDC, 200, 40, ClassDescription, (int) strlen(ClassDescription)); _tprintf(_T("%d %s (%s)\n"), i, ClassName, ClassDescription); } else @@ -183,8 +183,8 @@ { _tprintf(_T("- %s\n"), PropertyBuffer); InsertIntoListView(0,PropertyBuffer," "); - TextOut(hDC, 200, 40, empty, strlen(empty)); - TextOut(hDC, 200, 40, PropertyBuffer, strlen(PropertyBuffer)); + TextOut(hDC, 200, 40, empty, (int) strlen(empty)); + TextOut(hDC, 200, 40, PropertyBuffer, (int) strlen(PropertyBuffer)); } else _tprintf(_T("SetupDiGetDeviceRegistryProperty() failed with status 0x%lx\n"), GetLastError()); @@ -239,16 +239,16 @@ _tprintf(_T("%s\n"), DisplayName); sprintf(temp,"%s%s",LevelSpaces,DisplayName); InsertIntoListView(0,temp," "); - TextOut(hDC, 200, 40, empty, strlen(empty)); - TextOut(hDC, 200, 40, DisplayName, strlen(DisplayName)); + TextOut(hDC, 200, 40, empty, (int) strlen(empty)); + TextOut(hDC, 200, 40, DisplayName, (int) strlen(DisplayName)); } else { _tprintf(_T("(unknown device)\n")); sprintf(temp,"%s%s",LevelSpaces,"(unknown device)"); InsertIntoListView(0,temp," "); - TextOut(hDC, 200, 40, empty, strlen(empty)); - TextOut(hDC, 200, 40, "(unknown device)", strlen("(unknown device)")); + TextOut(hDC, 200, 40, empty, (int) strlen(empty)); + TextOut(hDC, 200, 40, "(unknown device)", (int) strlen("(unknown device)")); } cr = ListSubNodes(child, Level + 1); if (cr != CR_SUCCESS) @@ -328,8 +328,8 @@ if (SetupDiGetDeviceInterfaceDetail(hDevInfo, &DeviceInterfaceData, DeviceInterfaceDetailData, sizeof(Buffer), NULL, NULL)) { _tprintf(_T("- device %-2ld: %s\n"), i, DeviceInterfaceDetailData->DevicePath); - TextOut(hDC, 200, 40, empty, strlen(empty)); - TextOut(hDC, 200, 40, DeviceInterfaceDetailData->DevicePath, strlen(DeviceInterfaceDetailData->DevicePath)); + TextOut(hDC, 200, 40, empty, (int) strlen(empty)); + TextOut(hDC, 200, 40, DeviceInterfaceDetailData->DevicePath, (int) strlen(DeviceInterfaceDetailData->DevicePath)); InsertIntoListView(i,DeviceInterfaceDetailData->DevicePath," "); } else @@ -481,7 +481,7 @@ InitListView(); CreateButtons(g_hInst, hWnd); - TextOut(hDC, 200, 40, empty, strlen(empty)); + TextOut(hDC, 200, 40, empty, (int) strlen(empty)); break; @@ -657,7 +657,7 @@ } else item.pszText = ""; - item.cchTextMax = _tcslen(item.pszText); + item.cchTextMax = (int) _tcslen(item.pszText); if (item.cchTextMax == 0) item.pszText = LPSTR_TEXTCALLBACK; item.iImage = 0; Modified: trunk/reactos/base/applications/winver/winver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winver/w… ============================================================================== --- trunk/reactos/base/applications/winver/winver.c (original) +++ trunk/reactos/base/applications/winver/winver.c Thu Jul 6 20:26:40 2006 @@ -3,6 +3,10 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { static const WCHAR szROS[] = { 'R','e','a','c','t','O','S','\n',0 }; + UNREFERENCED_PARAMETER(lpCmdLine); + UNREFERENCED_PARAMETER(nCmdShow); + UNREFERENCED_PARAMETER(hPrevInstance); + UNREFERENCED_PARAMETER(hInstance); ShellAbout(0, szROS, 0, 0); return 1; }

1 0

[cwittich] 22892: fixed about 70 warnings (msvc /W4)
by cwittich＠svn.reactos.org 06 Jul '06

06 Jul '06

Author: cwittich Date: Thu Jul 6 20:25:42 2006 New Revision: 22892 URL: http://svn.reactos.org/svn/reactos?rev=22892&view=rev Log: fixed about 70 warnings (msvc /W4) Modified: trunk/reactos/base/applications/regedit/childwnd.c trunk/reactos/base/applications/regedit/edit.c trunk/reactos/base/applications/regedit/find.c trunk/reactos/base/applications/regedit/framewnd.c trunk/reactos/base/applications/regedit/hexedit.c trunk/reactos/base/applications/regedit/listview.c trunk/reactos/base/applications/regedit/main.c trunk/reactos/base/applications/regedit/regproc.c trunk/reactos/base/applications/regedit/security.c Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/childwnd.c (original) +++ trunk/reactos/base/applications/regedit/childwnd.c Thu Jul 6 20:25:42 2006 @@ -67,7 +67,8 @@ static void ResizeWnd(ChildWnd* pChildWnd, int cx, int cy) { HDWP hdwp = BeginDeferWindowPos(2); - RECT rt = {0, 0, cx, cy}; + RECT rt; + SetRect(&rt, 0, 0, cx, cy); cx = pChildWnd->nSplitPos + SPLIT_WIDTH/2; DeferWindowPos(hdwp, pChildWnd->hTreeWnd, 0, rt.left, rt.top, pChildWnd->nSplitPos-SPLIT_WIDTH/2-rt.left, rt.bottom-rt.top, SWP_NOZORDER|SWP_NOACTIVATE); @@ -102,6 +103,8 @@ HKEY hRootKey; LPCTSTR keyPath, s; WORD wID = LOWORD(wParam); + + UNREFERENCED_PARAMETER(message); switch (wID) { /* Parse the menu selections: */ @@ -209,12 +212,12 @@ { if (RegOpenKey(hRootKey, szBuffer, &hOtherKey) == ERROR_SUCCESS) { - lstrcpyn(pszSuggestions, TEXT("HKCR\\"), iSuggestionsLength); + lstrcpyn(pszSuggestions, TEXT("HKCR\\"), (int) iSuggestionsLength); i = _tcslen(pszSuggestions); pszSuggestions += i; iSuggestionsLength -= i; - lstrcpyn(pszSuggestions, szBuffer, iSuggestionsLength); + lstrcpyn(pszSuggestions, szBuffer, (int) iSuggestionsLength); i = MIN(_tcslen(pszSuggestions) + 1, iSuggestionsLength); pszSuggestions += i; iSuggestionsLength -= i; @@ -235,12 +238,12 @@ if (RegQueryStringValue(hSubKey, TEXT("CLSID"), NULL, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0])) == ERROR_SUCCESS) { - lstrcpyn(pszSuggestions, TEXT("HKCR\\CLSID\\"), iSuggestionsLength); + lstrcpyn(pszSuggestions, TEXT("HKCR\\CLSID\\"), (int) iSuggestionsLength); i = _tcslen(pszSuggestions); pszSuggestions += i; iSuggestionsLength -= i; - lstrcpyn(pszSuggestions, szBuffer, iSuggestionsLength); + lstrcpyn(pszSuggestions, szBuffer, (int) iSuggestionsLength); i = MIN(_tcslen(pszSuggestions) + 1, iSuggestionsLength); pszSuggestions += i; iSuggestionsLength -= i; @@ -263,7 +266,7 @@ */ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { - static short last_split; + static int last_split; BOOL Result; ChildWnd* pChildWnd = g_pChildWnd; @@ -432,7 +435,7 @@ _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Regedit"), &hKey) == ERROR_SUCCESS) { - RegSetValueEx(hKey, _T("LastKey"), 0, REG_SZ, (LPBYTE) szBuffer, _tcslen(szBuffer) * sizeof(szBuffer[0])); + RegSetValueEx(hKey, _T("LastKey"), 0, REG_SZ, (LPBYTE) szBuffer, (DWORD) _tcslen(szBuffer) * sizeof(szBuffer[0])); RegCloseKey(hKey); } } Modified: trunk/reactos/base/applications/regedit/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/edit.c (original) +++ trunk/reactos/base/applications/regedit/edit.c Thu Jul 6 20:25:42 2006 @@ -103,6 +103,8 @@ HWND hwndValue; int len; + UNREFERENCED_PARAMETER(lParam); + switch(uMsg) { case WM_INITDIALOG: if(editValueName && _tcscmp(editValueName, _T(""))) @@ -168,6 +170,8 @@ HWND hwndValue; int len; + UNREFERENCED_PARAMETER(lParam); + switch(uMsg) { case WM_INITDIALOG: if(editValueName && _tcscmp(editValueName, _T(""))) @@ -238,7 +242,7 @@ case WM_CHAR: if (dwordEditMode == EDIT_MODE_DEC) { - if (isdigit(wParam & 0xff)) + if (isdigit((int) wParam & 0xff)) { break; } @@ -249,7 +253,7 @@ } else if (dwordEditMode == EDIT_MODE_HEX) { - if (isxdigit(wParam & 0xff)) + if (isxdigit((int) wParam & 0xff)) { break; } @@ -278,6 +282,8 @@ DWORD Base; DWORD Value = 0; + UNREFERENCED_PARAMETER(lParam); + switch(uMsg) { case WM_INITDIALOG: dwordEditMode = EDIT_MODE_HEX; @@ -383,6 +389,8 @@ { HWND hwndValue; UINT len; + + UNREFERENCED_PARAMETER(lParam); switch(uMsg) { case WM_INITDIALOG: @@ -408,7 +416,7 @@ case IDOK: if ((hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA))) { - len = HexEdit_GetBufferSize(hwndValue); + len = (UINT) HexEdit_GetBufferSize(hwndValue); if (len != valueDataLen && len > 0) { binValueData = HeapReAlloc(GetProcessHeap(), 0, binValueData, len); @@ -482,7 +490,7 @@ { if (stringValueData) { - lRet = RegSetValueEx(hKey, valueName, 0, type, (LPBYTE)stringValueData, (_tcslen(stringValueData) + 1) * sizeof(TCHAR)); + lRet = RegSetValueEx(hKey, valueName, 0, type, (LPBYTE)stringValueData, (DWORD) (_tcslen(stringValueData) + 1) * sizeof(TCHAR)); } else { @@ -496,7 +504,7 @@ { if (valueDataLen > 0) { - DWORD llen, listlen, nl_len; + size_t llen, listlen, nl_len; LPTSTR src, lines = NULL; if (!(stringValueData = HeapAlloc(GetProcessHeap(), 0, valueDataLen))) @@ -542,7 +550,7 @@ /* convert \r\n to \0 */ BOOL EmptyLines = FALSE; LPTSTR src, lines, nl; - DWORD linechars, buflen, c_nl, dest; + size_t linechars, buflen, c_nl, dest; src = stringValueData; buflen = sizeof(TCHAR); @@ -586,7 +594,7 @@ warning(hwnd, IDS_MULTI_SZ_EMPTY_STRING); } - lRet = RegSetValueEx(hKey, valueName, 0, type, (LPBYTE)lines, buflen); + lRet = RegSetValueEx(hKey, valueName, 0, type, (LPBYTE)lines, (DWORD) buflen); HeapFree(GetProcessHeap(), 0, lines); } else Modified: trunk/reactos/base/applications/regedit/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/find.c (original) +++ trunk/reactos/base/applications/regedit/find.c Thu Jul 6 20:25:42 2006 @@ -76,6 +76,9 @@ static INT_PTR CALLBACK AbortFindDialogProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(hDlg); + switch(uMsg) { case WM_CLOSE: @@ -102,6 +105,7 @@ static BOOL RegSearchProc(LPVOID lpParam) { MSG msg; + UNREFERENCED_PARAMETER(lpParam); if (s_hwndAbortDialog && PeekMessage(&msg, s_hwndAbortDialog, 0, 0, PM_REMOVE)) { Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/framewnd.c (original) +++ trunk/reactos/base/applications/regedit/framewnd.c Thu Jul 6 20:25:42 2006 @@ -119,6 +119,7 @@ static void OnEnterMenuLoop(HWND hWnd) { int nParts; + UNREFERENCED_PARAMETER(hWnd); /* Update the status bar pane sizes */ nParts = -1; @@ -191,6 +192,7 @@ static BOOL CheckCommDlgError(HWND hWnd) { DWORD dwErrorCode = CommDlgExtendedError(); + UNREFERENCED_PARAMETER(hWnd); switch (dwErrorCode) { case CDERR_DIALOGFAILURE: break; @@ -347,6 +349,8 @@ LPTSTR pszSelectedKey; OFNOTIFY *pOfnNotify; + UNREFERENCED_PARAMETER(wParam); + switch(uiMsg) { case WM_INITDIALOG: pOfn = (OPENFILENAME *) lParam; @@ -453,6 +457,7 @@ { #if 1 PRINTDLG pd; + UNREFERENCED_PARAMETER(path); ZeroMemory(&pd, sizeof(PRINTDLG)); pd.lStructSize = sizeof(PRINTDLG); @@ -714,7 +719,7 @@ STGMEDIUM stm; FORMATETC fe; - fe.cfFormat = RegisterClipboardFormat(CFSTR_DSOP_DS_SELECTION_LIST); + fe.cfFormat = (CLIPFORMAT) RegisterClipboardFormat(CFSTR_DSOP_DS_SELECTION_LIST); fe.ptd = NULL; fe.dwAspect = DVASPECT_CONTENT; fe.lindex = -1; @@ -787,6 +792,9 @@ LONG lRet; int item; + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(message); + switch (LOWORD(wParam)) { case ID_REGISTRY_IMPORTREGISTRYFILE: ImportRegistryFile(hWnd); Modified: trunk/reactos/base/applications/regedit/hexedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/hexedit.c (original) +++ trunk/reactos/base/applications/regedit/hexedit.c Thu Jul 6 20:25:42 2006 @@ -182,7 +182,7 @@ DWORD dx, dy, linestart; INT x; PBYTE buf, current, end, line; - UINT bufsize; + size_t bufsize; TCHAR hex[3], addr[17]; RECT rct; @@ -526,6 +526,7 @@ static LRESULT HEXEDIT_WM_CREATE(PHEXEDIT_DATA hed) { + UNREFERENCED_PARAMETER(hed); return 1; } @@ -541,6 +542,7 @@ static LRESULT HEXEDIT_WM_KILLFOCUS(PHEXEDIT_DATA hed) { + UNREFERENCED_PARAMETER(hed); DestroyCaret(); return 0; } @@ -550,6 +552,8 @@ { int ScrollY; SCROLLINFO si; + + UNREFERENCED_PARAMETER(ThumbPosition); ZeroMemory(&si, sizeof(SCROLLINFO)); si.cbSize = sizeof(SCROLLINFO); @@ -708,6 +712,9 @@ SCROLLINFO si; int ScrollY; + UNREFERENCED_PARAMETER(ButtonsDown); + UNREFERENCED_PARAMETER(MousePos); + SetFocus(hed->hWndSelf); si.cbSize = sizeof(SCROLLINFO); @@ -733,6 +740,7 @@ static LRESULT HEXEDIT_WM_GETDLGCODE(LPMSG Msg) { + UNREFERENCED_PARAMETER(Msg); return DLGC_WANTARROWS | DLGC_WANTCHARS; } @@ -743,6 +751,7 @@ POINT EditPos; DWORD Hit = HEXEDIT_HitRegionTest(hed, Pt); + UNREFERENCED_PARAMETER(Buttons); SetFocus(hed->hWndSelf); hed->Position = HEXEDIT_PositionFromPoint(hed, Pt, Hit, &EditPos, &NewField); @@ -849,6 +858,9 @@ static LRESULT HEXEDIT_WM_SIZE(PHEXEDIT_DATA hed, DWORD sType, WORD NewWidth, WORD NewHeight) { + UNREFERENCED_PARAMETER(sType); + UNREFERENCED_PARAMETER(NewHeight); + UNREFERENCED_PARAMETER(NewWidth); HEXEDIT_Update(hed); return 0; } Modified: trunk/reactos/base/applications/regedit/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/listview.c (original) +++ trunk/reactos/base/applications/regedit/listview.c Thu Jul 6 20:25:42 2006 @@ -128,7 +128,7 @@ item.state = 0; item.stateMask = 0; item.pszText = Name; - item.cchTextMax = _tcslen(item.pszText); + item.cchTextMax = (int) _tcslen(item.pszText); if (item.cchTextMax == 0) item.pszText = LPSTR_TEXTCALLBACK; item.iImage = 0; @@ -356,6 +356,8 @@ static int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort) { LINE_INFO*l, *r; + UNREFERENCED_PARAMETER(lParamSort); + l = (LINE_INFO*)lParam1; r = (LINE_INFO*)lParam2; @@ -373,6 +375,7 @@ BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result) { NMLVDISPINFO* Info; + UNREFERENCED_PARAMETER(wParam); *Result = TRUE; switch (((LPNMHDR)lParam)->code) { case LVN_GETDISPINFO: Modified: trunk/reactos/base/applications/regedit/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/main.c (original) +++ trunk/reactos/base/applications/regedit/main.c Thu Jul 6 20:25:42 2006 @@ -62,41 +62,38 @@ HMENU hEditMenu; TCHAR szBuffer[256]; - WNDCLASSEX wcFrame = { - sizeof(WNDCLASSEX), - CS_HREDRAW | CS_VREDRAW/*style*/, - FrameWndProc, - 0/*cbClsExtra*/, - 0/*cbWndExtra*/, - hInstance, - LoadIcon(hInstance, MAKEINTRESOURCE(IDI_REGEDIT)), - LoadCursor(0, IDC_ARROW), - 0/*hbrBackground*/, - 0/*lpszMenuName*/, - szFrameClass, - (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_REGEDIT), IMAGE_ICON, - GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED) - }; - ATOM hFrameWndClass = RegisterClassEx(&wcFrame); /* register frame window class */ - - WNDCLASSEX wcChild = { - sizeof(WNDCLASSEX), - CS_HREDRAW | CS_VREDRAW/*style*/, - ChildWndProc, - 0/*cbClsExtra*/, - sizeof(HANDLE)/*cbWndExtra*/, - hInstance, - LoadIcon(hInstance, MAKEINTRESOURCE(IDI_REGEDIT)), - LoadCursor(0, IDC_ARROW), - 0/*hbrBackground*/, - 0/*lpszMenuName*/, - szChildClass, - (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_REGEDIT), IMAGE_ICON, - GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED) - - }; - ATOM hChildWndClass = RegisterClassEx(&wcChild); /* register child windows class */ - hChildWndClass = hChildWndClass; /* warning eater */ + WNDCLASSEX wcFrame; + WNDCLASSEX wcChild; + ATOM hFrameWndClass; + ATOM hChildWndClass; + + ZeroMemory(&wcFrame, sizeof(WNDCLASSEX)); + wcFrame.cbSize = sizeof(WNDCLASSEX); + wcFrame.style = CS_HREDRAW | CS_VREDRAW; + wcFrame.lpfnWndProc = FrameWndProc; + wcFrame.hInstance = hInstance; + wcFrame.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_REGEDIT)); + wcFrame.hIconSm = (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_REGEDIT), + IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), LR_SHARED); + wcFrame.hCursor = LoadCursor(0, IDC_ARROW); + wcFrame.lpszClassName = szFrameClass; + + hFrameWndClass = RegisterClassEx(&wcFrame); /* register frame window class */ + + ZeroMemory(&wcChild, sizeof(WNDCLASSEX)); + wcChild.cbSize = sizeof(WNDCLASSEX); + wcChild.style = CS_HREDRAW | CS_VREDRAW; + wcChild.lpfnWndProc = ChildWndProc; + wcChild.cbWndExtra = sizeof(HANDLE); + wcChild.hInstance = hInstance; + wcChild.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_REGEDIT)); + wcChild.hCursor = LoadCursor(0, IDC_ARROW), + wcChild.lpszClassName = szChildClass, + wcChild.hIconSm = (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_REGEDIT), IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED); + + hChildWndClass = RegisterClassEx(&wcChild); /* register child windows class */ RegisterHexEditorClass(hInstance); @@ -195,6 +192,8 @@ MSG msg; HACCEL hAccel; + UNREFERENCED_PARAMETER(hPrevInstance); + /* int hCrt; FILE *hf; @@ -238,5 +237,5 @@ } ExitInstance(hInstance); - return msg.wParam; -} + return (int) msg.wParam; +} Modified: trunk/reactos/base/applications/regedit/regproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regproc.c (original) +++ trunk/reactos/base/applications/regedit/regproc.c Thu Jul 6 20:25:42 2006 @@ -227,8 +227,8 @@ char *s = str; /* Pointer to current */ char *b = (char*) buf; /* Pointer to result */ - ULONG strLen = strlen(str); - ULONG strPos = 0; + size_t strLen = strlen(str); + size_t strPos = 0; DWORD byteCount = 0; memset(buf, 0, bufLen); @@ -645,6 +645,7 @@ */ void doDeleteValue(LPSTR line) { + UNREFERENCED_PARAMETER(line); fprintf(stderr,"%s: deleteValue not yet implemented\n", getAppName()); } @@ -655,6 +656,7 @@ */ void doDeleteKey(LPSTR line) { + UNREFERENCED_PARAMETER(line); fprintf(stderr,"%s: deleteKey not yet implemented\n", getAppName()); } @@ -665,6 +667,7 @@ */ void doCreateKey(LPSTR line) { + UNREFERENCED_PARAMETER(line); fprintf(stderr,"%s: createKey not yet implemented\n", getAppName()); } @@ -735,6 +738,7 @@ */ void processQueryValue(LPSTR cmdline) { + UNREFERENCED_PARAMETER(cmdline); fprintf(stderr,"ERROR!!! - temporary disabled"); exit(1); #if 0 @@ -1791,6 +1795,8 @@ LONG lResult; LPCTSTR s; + UNREFERENCED_PARAMETER(dwValueIndex); + if (dwSearchFlags & (RSF_LOOKATVALUES | RSF_LOOKATDATA)) return ERROR_CALL_NOT_IMPLEMENTED; /* NYI */ Modified: trunk/reactos/base/applications/regedit/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/security.c (original) +++ trunk/reactos/base/applications/regedit/security.c Thu Jul 6 20:25:42 2006 @@ -28,6 +28,8 @@ #if REGEDIT_IMPLEMENT_ISECURITYINFORMATION2 DEFINE_GUID(IID_IRegKeySecurity2, 0xc3ccfdb4, 0x6f88, 0x11d2, 0x00a3, 0xce,0x00,0xc0,0x4f,0xb1,0x78,0x2a); #endif + +/* FIXME: already defined in aclui.h - causing problems when compiling with MSVC/PSDK*/ DEFINE_GUID(IID_IEffectivePermission, 0x3853dc76, 0x9f35, 0x407c, 0x0088, 0xa1,0xd1,0x93,0x44,0x36,0x5f,0xbc); DEFINE_GUID(IID_ISecurityObjectTypeInfo, 0xfc3066eb, 0x79ef, 0x444b, 0x0091, 0x11,0xd1,0x8a,0x75,0xeb,0xf2,0xfa); @@ -839,7 +841,7 @@ LPTSTR lpKeyPath = NULL; PCRegKeySecurity RegKeySecurity; SI_OBJECT_INFO ObjectInfo; - int lnMachine = 0, lnKeyName = 0; + size_t lnMachine = 0, lnKeyName = 0; if (pfnEditSecurity == NULL) {

1 0

[cwittich] 22891: added winver back to build
by cwittich＠svn.reactos.org 06 Jul '06

06 Jul '06

Author: cwittich Date: Thu Jul 6 20:24:51 2006 New Revision: 22891 URL: http://svn.reactos.org/svn/reactos?rev=22891&view=rev Log: added winver back to build Modified: trunk/reactos/base/applications/applications.rbuild Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/applicat… ============================================================================== --- trunk/reactos/base/applications/applications.rbuild (original) +++ trunk/reactos/base/applications/applications.rbuild Thu Jul 6 20:24:51 2006 @@ -73,4 +73,8 @@ <directory name="utils"> <xi:include href="utils/utils.rbuild" /> </directory> +<directory name="winver"> + <xi:include href="winver/winver.rbuild" /> +</directory> + </group>

1 0

[mbosma] 22890: [FORMATING] Replace Tabs with spaces to uniform the code.
by mbosma＠svn.reactos.org 06 Jul '06

06 Jul '06

Author: mbosma Date: Thu Jul 6 19:14:06 2006 New Revision: 22890 URL: http://svn.reactos.org/svn/reactos?rev=22890&view=rev Log: [FORMATING] Replace Tabs with spaces to uniform the code. Modified: trunk/reactos/drivers/filesystems/cdfs/fcb.c Modified: trunk/reactos/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fcb.c (original) +++ trunk/reactos/drivers/filesystems/cdfs/fcb.c Thu Jul 6 19:14:06 2006 @@ -79,13 +79,13 @@ { wcscpy(Fcb->PathName, FileName); if (wcsrchr(Fcb->PathName, '\\') != 0) - { - Fcb->ObjectName = wcsrchr(Fcb->PathName, '\\'); - } + { + Fcb->ObjectName = wcsrchr(Fcb->PathName, '\\'); + } else - { - Fcb->ObjectName = Fcb->PathName; - } + { + Fcb->ObjectName = Fcb->PathName; + } } ExInitializeResourceLite(&Fcb->MainResource); @@ -119,14 +119,14 @@ VOID CdfsGrabFCB(PDEVICE_EXTENSION Vcb, - PFCB Fcb) + PFCB Fcb) { KIRQL oldIrql; DPRINT("grabbing FCB at %x: %S, refCount:%d\n", - Fcb, - Fcb->PathName, - Fcb->RefCount); + Fcb, + Fcb->PathName, + Fcb->RefCount); KeAcquireSpinLock(&Vcb->FcbListLock, &oldIrql); Fcb->RefCount++; @@ -136,14 +136,14 @@ VOID CdfsReleaseFCB(PDEVICE_EXTENSION Vcb, - PFCB Fcb) + PFCB Fcb) { KIRQL oldIrql; DPRINT("releasing FCB at %x: %S, refCount:%d\n", - Fcb, - Fcb->PathName, - Fcb->RefCount); + Fcb, + Fcb->PathName, + Fcb->RefCount); KeAcquireSpinLock(&Vcb->FcbListLock, &oldIrql); Fcb->RefCount--; @@ -158,7 +158,7 @@ VOID CdfsAddFCBToTable(PDEVICE_EXTENSION Vcb, - PFCB Fcb) + PFCB Fcb) { KIRQL oldIrql; @@ -171,7 +171,7 @@ PFCB CdfsGrabFCBFromTable(PDEVICE_EXTENSION Vcb, - PUNICODE_STRING FileName) + PUNICODE_STRING FileName) { KIRQL oldIrql; PFCB Fcb; @@ -195,11 +195,11 @@ DPRINT("Comparing '%wZ' and '%S'\n", FileName, Fcb->PathName); if (_wcsicmp(FileName->Buffer, Fcb->PathName) == 0) - { - Fcb->RefCount++; - KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql); - return(Fcb); - } + { + Fcb->RefCount++; + KeReleaseSpinLock(&Vcb->FcbListLock, oldIrql); + return(Fcb); + } //FIXME: need to compare against short name in FCB here @@ -213,7 +213,7 @@ NTSTATUS CdfsFCBInitializeCache(PVCB Vcb, - PFCB Fcb) + PFCB Fcb) { PFILE_OBJECT FileObject; NTSTATUS Status; @@ -227,7 +227,7 @@ return(STATUS_INSUFFICIENT_RESOURCES); } RtlZeroMemory(newCCB, - sizeof(CCB)); + sizeof(CCB)); FileObject->SectionObjectPointer = &Fcb->SectionObjectPointers; FileObject->FsContext = Fcb; @@ -238,7 +238,7 @@ #ifdef USE_ROS_AND_FS Status = CcRosInitializeFileCache(FileObject, - PAGE_SIZE); + PAGE_SIZE); if (!NT_SUCCESS(Status)) { DbgPrint("CcRosInitializeFileCache failed\n"); @@ -248,9 +248,9 @@ Status = STATUS_SUCCESS; CcInitializeCacheMap(FileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), - FALSE, - NULL, - NULL); + FALSE, + NULL, + NULL); #endif ObDereferenceObject(FileObject); @@ -294,7 +294,7 @@ RtlInitUnicodeString(&FileName, L"\\"); Fcb = CdfsGrabFCBFromTable(Vcb, - &FileName); + &FileName); if (Fcb == NULL) { Fcb = CdfsMakeRootFCB(Vcb); @@ -306,8 +306,8 @@ static VOID CdfsGetDirEntryName(PDEVICE_EXTENSION DeviceExt, - PDIR_RECORD Record, - PWSTR Name) + PDIR_RECORD Record, + PWSTR Name) /* * FUNCTION: Retrieves the file name from a directory record. */ @@ -323,19 +323,19 @@ else { if (DeviceExt->CdInfo.JolietLevel == 0) - { - ULONG i; - - for (i = 0; i < Record->FileIdLength && Record->FileId[i] != ';'; i++) - Name[i] = (WCHAR)Record->FileId[i]; - Name[i] = 0; - } + { + ULONG i; + + for (i = 0; i < Record->FileIdLength && Record->FileId[i] != ';'; i++) + Name[i] = (WCHAR)Record->FileId[i]; + Name[i] = 0; + } else - { - CdfsSwapString(Name, - Record->FileId, - Record->FileIdLength); - } + { + CdfsSwapString(Name, + Record->FileId, + Record->FileIdLength); + } } DPRINT("Name '%S'\n", Name); @@ -344,13 +344,13 @@ NTSTATUS CdfsMakeFCBFromDirEntry(PVCB Vcb, - PFCB DirectoryFCB, - PWSTR LongName, - PWSTR ShortName, - PDIR_RECORD Record, - ULONG DirectorySector, - ULONG DirectoryOffset, - PFCB * fileFCB) + PFCB DirectoryFCB, + PWSTR LongName, + PWSTR ShortName, + PDIR_RECORD Record, + ULONG DirectorySector, + ULONG DirectoryOffset, + PFCB * fileFCB) { WCHAR pathName[MAX_PATH]; PFCB rcFCB; @@ -412,8 +412,8 @@ NTSTATUS CdfsAttachFCBToFileObject(PDEVICE_EXTENSION Vcb, - PFCB Fcb, - PFILE_OBJECT FileObject) + PFCB Fcb, + PFILE_OBJECT FileObject) { PCCB newCCB; @@ -435,18 +435,18 @@ #ifdef USE_ROS_CC_AND_FS NTSTATUS Status; Status = CcRosInitializeFileCache(FileObject, - PAGE_SIZE); + PAGE_SIZE); if (!NT_SUCCESS(Status)) - { - DbgPrint("CcRosInitializeFileCache failed\n"); - KEBUGCHECK(0); - } + { + DbgPrint("CcRosInitializeFileCache failed\n"); + KEBUGCHECK(0); + } #else CcInitializeCacheMap(FileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), - FALSE, - NULL, - NULL); + FALSE, + NULL, + NULL); #endif Fcb->Flags |= FCB_CACHE_INITIALIZED; } @@ -459,9 +459,9 @@ NTSTATUS CdfsDirFindFile(PDEVICE_EXTENSION DeviceExt, - PFCB DirectoryFcb, - PUNICODE_STRING FileToFind, - PFCB *FoundFCB) + PFCB DirectoryFcb, + PUNICODE_STRING FileToFind, + PFCB *FoundFCB) { UNICODE_STRING TempName; WCHAR Name[256]; @@ -487,9 +487,9 @@ ASSERT(FileToFind); DPRINT("CdfsDirFindFile(VCB:%p, dirFCB:%p, File:%wZ)\n", - DeviceExt, - DirectoryFcb, - FileToFind); + DeviceExt, + DirectoryFcb, + FileToFind); DPRINT("Dir Path:%S\n", DirectoryFcb->PathName); /* default to '.' if no filename specified */ @@ -503,11 +503,11 @@ StreamOffset.QuadPart = (LONGLONG)DirectoryFcb->Entry.ExtentLocationL * (LONGLONG)BLOCKSIZE; if (!CcMapData(DeviceExt->StreamFileObject, - &StreamOffset, - BLOCKSIZE, - TRUE, - &Context, - &Block)) + &StreamOffset, + BLOCKSIZE, + TRUE, + &Context, + &Block)) { DPRINT("CcMapData() failed\n"); return STATUS_UNSUCCESSFUL; @@ -519,13 +519,13 @@ while(TRUE) { if (Record->RecordLength == 0) - { - DPRINT("RecordLength == 0 Stopped!\n"); - break; - } + { + DPRINT("RecordLength == 0 Stopped!\n"); + break; + } DPRINT("RecordLength %u ExtAttrRecordLength %u NameLength %u\n", - Record->RecordLength, Record->ExtAttrRecordLength, Record->FileIdLength); + Record->RecordLength, Record->ExtAttrRecordLength, Record->FileIdLength); CdfsGetDirEntryName(DeviceExt, Record, Name); DPRINT ("Name '%S'\n", Name); @@ -539,66 +539,66 @@ memset(ShortNameBuffer, 0, 26); if ((RtlIsNameLegalDOS8Dot3(&LongName, NULL, &HasSpaces) == FALSE) || - (HasSpaces == TRUE)) - { - /* Build short name */ - RtlGenerate8dot3Name(&LongName, - FALSE, - &NameContext, - &ShortName); - } + (HasSpaces == TRUE)) + { + /* Build short name */ + RtlGenerate8dot3Name(&LongName, + FALSE, + &NameContext, + &ShortName); + } else - { - /* copy short name */ - RtlUpcaseUnicodeString(&ShortName, - &LongName, - FALSE); - } + { + /* copy short name */ + RtlUpcaseUnicodeString(&ShortName, + &LongName, + FALSE); + } DPRINT("ShortName '%wZ'\n", &ShortName); if (FsRtlIsNameInExpression(FileToFind, &LongName, TRUE, NULL) || - FsRtlIsNameInExpression(FileToFind, &ShortName, TRUE, NULL)) - { - DPRINT("Match found, %S\n", Name); - Status = CdfsMakeFCBFromDirEntry(DeviceExt, - DirectoryFcb, - Name, - ShortNameBuffer, - Record, - DirectoryFcb->Entry.ExtentLocationL, - Offset, - FoundFCB); - - CcUnpinData(Context); - - return(Status); - } + FsRtlIsNameInExpression(FileToFind, &ShortName, TRUE, NULL)) + { + DPRINT("Match found, %S\n", Name); + Status = CdfsMakeFCBFromDirEntry(DeviceExt, + DirectoryFcb, + Name, + ShortNameBuffer, + Record, + DirectoryFcb->Entry.ExtentLocationL, + Offset, + FoundFCB); + + CcUnpinData(Context); + + return(Status); + } Offset += Record->RecordLength; BlockOffset += Record->RecordLength; Record = (PDIR_RECORD)((ULONG_PTR)Block + BlockOffset); if (BlockOffset >= BLOCKSIZE || Record->RecordLength == 0) - { - DPRINT("Map next sector\n"); - CcUnpinData(Context); - StreamOffset.QuadPart += BLOCKSIZE; - Offset = ROUND_UP(Offset, BLOCKSIZE); - BlockOffset = 0; - - if (!CcMapData(DeviceExt->StreamFileObject, - &StreamOffset, - BLOCKSIZE, TRUE, - &Context, &Block)) - { - DPRINT("CcMapData() failed\n"); - return(STATUS_UNSUCCESSFUL); - } - Record = (PDIR_RECORD)((ULONG_PTR)Block + BlockOffset); - } + { + DPRINT("Map next sector\n"); + CcUnpinData(Context); + StreamOffset.QuadPart += BLOCKSIZE; + Offset = ROUND_UP(Offset, BLOCKSIZE); + BlockOffset = 0; + + if (!CcMapData(DeviceExt->StreamFileObject, + &StreamOffset, + BLOCKSIZE, TRUE, + &Context, &Block)) + { + DPRINT("CcMapData() failed\n"); + return(STATUS_UNSUCCESSFUL); + } + Record = (PDIR_RECORD)((ULONG_PTR)Block + BlockOffset); + } if (Offset >= DirSize) - break; + break; } CcUnpinData(Context); @@ -609,9 +609,9 @@ NTSTATUS CdfsGetFCBForFile(PDEVICE_EXTENSION Vcb, - PFCB *pParentFCB, - PFCB *pFCB, - PUNICODE_STRING FileName) + PFCB *pParentFCB, + PFCB *pFCB, + PUNICODE_STRING FileName) { UNICODE_STRING PathName; UNICODE_STRING ElementName; @@ -623,10 +623,10 @@ PFCB parentFCB; DPRINT("CdfsGetFCBForFile(%x, %x, %x, '%wZ')\n", - Vcb, - pParentFCB, - pFCB, - FileName); + Vcb, + pParentFCB, + pFCB, + FileName); /* Trivial case, open of the root directory on volume */ if (FileName->Buffer[0] == L'\0' || wcscmp(FileName->Buffer, L"\\") == 0) @@ -652,79 +652,79 @@ { /* Skip blank directory levels */ if ((CdfsGetNextPathElement(currentElement) - currentElement) == 0) - { - currentElement++; - continue; - } + { + currentElement++; + continue; + } DPRINT("Parsing, currentElement:%S\n", currentElement); DPRINT(" parentFCB:%x FCB:%x\n", parentFCB, FCB); /* Descend to next directory level */ if (parentFCB) - { - CdfsReleaseFCB(Vcb, parentFCB); - parentFCB = NULL; - } + { + CdfsReleaseFCB(Vcb, parentFCB); + parentFCB = NULL; + } /* fail if element in FCB is not a directory */ if (!CdfsFCBIsDirectory(FCB)) - { - DPRINT("Element in requested path is not a directory\n"); - - CdfsReleaseFCB(Vcb, FCB); - FCB = 0; - *pParentFCB = NULL; - *pFCB = NULL; - - return(STATUS_OBJECT_PATH_NOT_FOUND); - } + { + DPRINT("Element in requested path is not a directory\n"); + + CdfsReleaseFCB(Vcb, FCB); + FCB = 0; + *pParentFCB = NULL; + *pFCB = NULL; + + return(STATUS_OBJECT_PATH_NOT_FOUND); + } parentFCB = FCB; /* Extract next directory level into dirName */ CdfsWSubString(pathName, - FileName->Buffer, - CdfsGetNextPathElement(currentElement) - FileName->Buffer); + FileName->Buffer, + CdfsGetNextPathElement(currentElement) - FileName->Buffer); DPRINT(" pathName:%S\n", pathName); RtlInitUnicodeString(&PathName, pathName); FCB = CdfsGrabFCBFromTable(Vcb, &PathName); if (FCB == NULL) - { - CdfsWSubString(elementName, - currentElement, - CdfsGetNextPathElement(currentElement) - currentElement); - DPRINT(" elementName:%S\n", elementName); - - RtlInitUnicodeString(&ElementName, elementName); - Status = CdfsDirFindFile(Vcb, - parentFCB, - &ElementName, - &FCB); - if (Status == STATUS_OBJECT_NAME_NOT_FOUND) - { - *pParentFCB = parentFCB; - *pFCB = NULL; - currentElement = CdfsGetNextPathElement(currentElement); - if (*currentElement == L'\0' || CdfsGetNextPathElement(currentElement + 1) == 0) - { - return(STATUS_OBJECT_NAME_NOT_FOUND); - } - else - { - return(STATUS_OBJECT_PATH_NOT_FOUND); - } - } - else if (!NT_SUCCESS(Status)) - { - CdfsReleaseFCB(Vcb, parentFCB); - *pParentFCB = NULL; - *pFCB = NULL; - - return(Status); - } - } + { + CdfsWSubString(elementName, + currentElement, + CdfsGetNextPathElement(currentElement) - currentElement); + DPRINT(" elementName:%S\n", elementName); + + RtlInitUnicodeString(&ElementName, elementName); + Status = CdfsDirFindFile(Vcb, + parentFCB, + &ElementName, + &FCB); + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + { + *pParentFCB = parentFCB; + *pFCB = NULL; + currentElement = CdfsGetNextPathElement(currentElement); + if (*currentElement == L'\0' || CdfsGetNextPathElement(currentElement + 1) == 0) + { + return(STATUS_OBJECT_NAME_NOT_FOUND); + } + else + { + return(STATUS_OBJECT_PATH_NOT_FOUND); + } + } + else if (!NT_SUCCESS(Status)) + { + CdfsReleaseFCB(Vcb, parentFCB); + *pParentFCB = NULL; + *pFCB = NULL; + + return(Status); + } + } currentElement = CdfsGetNextPathElement(currentElement); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs