Ros-diffs January 2014

ros-diffs@reactos.org

14 participants
426 discussions

[tkreuzer] 61625: [FREELDR] Modify UiMessageBox so that it allows to pass a format string and parameters. Make use of it in WinLdrLoadBootDrivers to show the file that couldn't be loaded.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jan 14 20:12:07 2014 New Revision: 61625 URL: http://svn.reactos.org/svn/reactos?rev=61625&view=rev Log: [FREELDR] Modify UiMessageBox so that it allows to pass a format string and parameters. Make use of it in WinLdrLoadBootDrivers to show the file that couldn't be loaded. Modified: trunk/reactos/boot/freeldr/freeldr/include/ui.h trunk/reactos/boot/freeldr/freeldr/ui/ui.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c Modified: trunk/reactos/boot/freeldr/freeldr/include/ui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/ui.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/ui.h [iso-8859-1] Tue Jan 14 20:12:07 2014 @@ -66,7 +66,7 @@ VOID UiDrawStatusText(PCSTR StatusText); // Draws text at the very bottom line on the screen VOID UiUpdateDateTime(VOID); // Updates the date and time VOID UiInfoBox(PCSTR MessageText); // Displays a info box on the screen -VOID UiMessageBox(PCSTR MessageText); // Displays a message box on the screen with an ok button +VOID UiMessageBox(PCSTR Format, ...); // Displays a message box on the screen with an ok button VOID UiMessageBoxCritical(PCSTR MessageText); // Displays a message box on the screen with an ok button using no system resources VOID UiDrawProgressBarCenter(ULONG Position, ULONG Range, PCHAR ProgressText); // Draws the progress bar showing nPos percent filled VOID UiDrawProgressBar(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, ULONG Position, ULONG Range, PCHAR ProgressText); // Draws the progress bar showing nPos percent filled Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/ui… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/ui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/ui.c [iso-8859-1] Tue Jan 14 20:12:07 2014 @@ -344,9 +344,15 @@ UiDrawCenteredText(Left, Top, Right, Bottom, MessageText, ATTR(UiTextColor, UiMenuBgColor)); } -VOID UiMessageBox(PCSTR MessageText) -{ - UiVtbl.MessageBox(MessageText); +VOID UiMessageBox(PCSTR Format, ...) +{ + CHAR Buffer[256]; + va_list ap; + + va_start(ap, Format); + vsnprintf(Buffer, sizeof(Buffer) - sizeof(CHAR), Format, ap); + UiVtbl.MessageBox(Buffer); + va_end(ap); } VOID UiMessageBoxCritical(PCSTR MessageText) Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Tue Jan 14 20:12:07 2014 @@ -325,7 +325,8 @@ //FIXME: Maybe remove it from the list and try to continue? if (!Status) { - UiMessageBox("Can't load boot driver!"); + ERR("Can't load boot driver '%wZ'!", &BootDriver->FilePath); + UiMessageBox("Can't load boot driver '%wZ'!", &BootDriver->FilePath); return FALSE; } Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c [iso-8859-1] Tue Jan 14 20:12:07 2014 @@ -538,9 +538,9 @@ /* Get the Driver's Name */ ValueSize = sizeof(ServiceName); rc = RegEnumKey(hServiceKey, Index, ServiceName, &ValueSize); - //TRACE_CH(REACTOS, "RegEnumKey(): rc %d\n", (int)rc); - - /* Makre sure it's valid, and check if we're done */ + TRACE("RegEnumKey(): rc %d\n", (int)rc); + + /* Make sure it's valid, and check if we're done */ if (rc == ERROR_NO_MORE_ITEMS) break; if (rc != ERROR_SUCCESS) @@ -627,7 +627,7 @@ FrLdrHeapFree(GroupNameBuffer, TAG_WLDR_NAME); return; } - //TRACE_CH(REACTOS, "Service %d: '%S'\n", (int)Index, ServiceName); + TRACE("Service %d: '%S'\n", (int)Index, ServiceName); /* open driver Key */ rc = RegOpenKey(hServiceKey, ServiceName, &hDriverKey);

10 years, 11 months

[tkreuzer] 61624: [RTL] Fix a nasty bug in RtlQueryRegistryValues, that caused memory corruption when the the key name or data had the "wrong" length.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jan 14 19:41:01 2014 New Revision: 61624 URL: http://svn.reactos.org/svn/reactos?rev=61624&view=rev Log: [RTL] Fix a nasty bug in RtlQueryRegistryValues, that caused memory corruption when the the key name or data had the "wrong" length. Modified: trunk/reactos/lib/rtl/registry.c Modified: trunk/reactos/lib/rtl/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/registry.c?rev=616… ============================================================================== --- trunk/reactos/lib/rtl/registry.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/registry.c [iso-8859-1] Tue Jan 14 19:41:01 2014 @@ -211,7 +211,7 @@ /* Check if we have space to copy the data */ RequiredLength = KeyValueInfo->NameLength + sizeof(UNICODE_NULL); - if (SpareLength < RequiredLength) + if ((SpareData > DataEnd) || (SpareLength < RequiredLength)) { /* Fail and return the missing length */ *InfoSize = (ULONG)(SpareData - (PCHAR)KeyValueInfo) + RequiredLength;

10 years, 11 months

[tkreuzer] 61623: [NTOSKRNL] Forgot to commit this file.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jan 13 22:35:01 2014 New Revision: 61623 URL: http://svn.reactos.org/svn/reactos?rev=61623&view=rev Log: [NTOSKRNL] Forgot to commit this file. Modified: trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Mon Jan 13 22:35:01 2014 @@ -649,7 +649,7 @@ LoaderExtension = LoaderBlock->Extension; if (LoaderExtension) { - ASSERTMSG("ReactOS doesn't support NTLDR Profiles yet!\n", FALSE); + DPRINT("ReactOS doesn't support NTLDR Profiles yet!\n"); } /* Create the current hardware profile key */ @@ -816,7 +816,6 @@ if (HiveBase) { /* Import it */ - ((PHBASE_BLOCK)HiveBase)->Length = LoaderBlock->RegistryLength; Status = CmpInitializeHive((PCMHIVE*)&SystemHive, HINIT_MEMORY, HIVE_NOLAZYFLUSH,

10 years, 11 months

[ekohl] 61622: [WINLOGON] - Implement the STATE_LOCKED and STATE_LOCKED_SAS states and their transitions. [MSGINA] - Disable the logoff button of the security dialog if the AutoAdminLogon option is...

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Jan 13 22:15:27 2014 New Revision: 61622 URL: http://svn.reactos.org/svn/reactos?rev=61622&view=rev Log: [WINLOGON] - Implement the STATE_LOCKED and STATE_LOCKED_SAS states and their transitions. [MSGINA] - Disable the logoff button of the security dialog if the AutoAdminLogon option is enabled. - Implement the unlock computer dialog. The user name and password check is not implemented yet. Just press OK to unlock the computer. - Simulate an SAS when the DisableCAD option is enabled and the computer is locked. The unlock dialog appears immediately. Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/winlogon.h trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/msgina.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Mon Jan 13 22:15:27 2014 @@ -861,6 +861,11 @@ { Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); } + else if (Session->LogonState == STATE_LOCKED_SAS) + { + Session->LogonState = STATE_LOCKED; + Session->Gina.Functions.WlxDisplayLockedNotice(Session->Gina.Context); + } break; case WLX_SAS_ACTION_LOCK_WKSTA: /* 0x03 */ if (Session->Gina.Functions.WlxIsLockOk(Session->Gina.Context)) @@ -922,10 +927,12 @@ IN DWORD dwSasType) { DWORD wlxAction = WLX_SAS_ACTION_NONE; + HWND hwnd; /* Ignore SAS if we are already in an SAS state */ if (Session->LogonState == STATE_LOGGED_OFF_SAS || - Session->LogonState == STATE_LOGGED_ON_SAS) + Session->LogonState == STATE_LOGGED_ON_SAS || + Session->LogonState == STATE_LOCKED_SAS) return; if (Session->LogonState == STATE_LOGGED_ON) @@ -934,7 +941,16 @@ wlxAction = (DWORD)Session->Gina.Functions.WlxLoggedOnSAS(Session->Gina.Context, dwSasType, NULL); } else if (Session->LogonState == STATE_LOCKED) + { + hwnd = GetTopDialogWindow(); + if (hwnd != NULL) + { + SendMessage(hwnd, WM_USER, 0, 0); + } + + Session->LogonState = STATE_LOCKED_SAS; wlxAction = (DWORD)Session->Gina.Functions.WlxWkstaLockedSAS(Session->Gina.Context, dwSasType); + } else { /* Display a new dialog (if necessary) */ @@ -948,7 +964,6 @@ default: { PSID LogonSid = NULL; /* FIXME */ - HWND hwnd; hwnd = GetTopDialogWindow(); if (hwnd != NULL) Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] Mon Jan 13 22:15:27 2014 @@ -194,7 +194,7 @@ STATE_LOGGED_ON_SAS, STATE_SCREENSAVER, // not used yet STATE_LOCKED, - STATE_LOCKED_SAS, // not used yet + STATE_LOCKED_SAS, STATE_LOGGING_OFF, // not used yet STATE_SHUTTING_DOWN, // not used yet STATE_SHUT_DOWN // not used yet Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Mon Jan 13 22:15:27 2014 @@ -282,6 +282,9 @@ wsprintfW(Buffer4, Buffer1, Buffer2, Buffer3); SetDlgItemTextW(hwnd, IDC_LOGONDATE, Buffer4); + + if (pgContext->bAutoAdminLogon == TRUE) + EnableWindow(GetDlgItem(hwnd, IDC_LOGOFF), FALSE); } @@ -518,16 +521,109 @@ return WLX_SAS_ACTION_NONE; } + +static +INT_PTR +CALLBACK +UnlockWindowProc( + IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + PGINA_CONTEXT pgContext; + + pgContext = (PGINA_CONTEXT)GetWindowLongPtr(hwndDlg, GWL_USERDATA); + + switch (uMsg) + { + case WM_INITDIALOG: + pgContext = (PGINA_CONTEXT)lParam; + SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pgContext); + + if (pgContext->bDisableCAD == TRUE) + EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), FALSE); + + SetFocus(GetDlgItem(hwndDlg, IDC_USERNAME)); + + pgContext->hBitmap = LoadImage(hDllInstance, MAKEINTRESOURCE(IDI_ROSLOGO), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + return TRUE; + + case WM_PAINT: + { + PAINTSTRUCT ps; + HDC hdc; + if (pgContext->hBitmap) + { + hdc = BeginPaint(hwndDlg, &ps); + DrawStateW(hdc, NULL, NULL, (LPARAM)pgContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP); + EndPaint(hwndDlg, &ps); + } + return TRUE; + } + case WM_DESTROY: + DeleteObject(pgContext->hBitmap); + return TRUE; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + { +#if 0 + LPWSTR UserName = NULL, Password = NULL; + INT result = WLX_SAS_ACTION_NONE; + + if (GetTextboxText(hwndDlg, IDC_USERNAME, &UserName) && *UserName == '\0') + break; + if (GetTextboxText(hwndDlg, IDC_PASSWORD, &Password) && + DoLoginTasks(pgContext, UserName, NULL, Password)) + { + result = WLX_SAS_ACTION_LOGON; + } + HeapFree(GetProcessHeap(), 0, UserName); + HeapFree(GetProcessHeap(), 0, Password); + EndDialog(hwndDlg, result); +#endif + EndDialog(hwndDlg, WLX_SAS_ACTION_UNLOCK_WKSTA); + return TRUE; + } + + case IDCANCEL: + EndDialog(hwndDlg, WLX_SAS_ACTION_NONE); + return TRUE; + } + break; + } + + return FALSE; +} + + static INT GUILockedSAS( IN OUT PGINA_CONTEXT pgContext) { + int result; + TRACE("GUILockedSAS()\n"); - UNREFERENCED_PARAMETER(pgContext); - - UNIMPLEMENTED; - return WLX_SAS_ACTION_UNLOCK_WKSTA; + result = pgContext->pWlxFuncs->WlxDialogBoxParam( + pgContext->hWlx, + pgContext->hDllInstance, + MAKEINTRESOURCEW(IDD_UNLOCK_DLG), + GetDesktopWindow(), + UnlockWindowProc, + (LPARAM)pgContext); + if (result >= WLX_SAS_ACTION_LOGON && + result <= WLX_SAS_ACTION_SWITCH_CONSOLE) + { + WARN("GUILockedSAS() returns 0x%x\n", result); + return result; + } + + WARN("GUILockedSAS() failed (0x%x)\n", result); + return WLX_SAS_ACTION_NONE; } Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Mon Jan 13 22:15:27 2014 @@ -819,8 +819,6 @@ else pgContext->AutoLogonState = AUTOLOGON_DISABLED; -TRACE("pgContext->bDisableCAD: %lu\n", pgContext->bDisableCAD); - if (pgContext->bDisableCAD == TRUE) { pgContext->pWlxFuncs->WlxSasNotify(pgContext->hWlx, WLX_SAS_TYPE_CTRL_ALT_DEL); @@ -902,6 +900,12 @@ TRACE("WlxDisplayLockedNotice()\n"); + if (pgContext->bDisableCAD == TRUE) + { + pgContext->pWlxFuncs->WlxSasNotify(pgContext->hWlx, WLX_SAS_TYPE_CTRL_ALT_DEL); + return; + } + pGinaUI->DisplayLockedNotice(pgContext); }

10 years, 11 months

[tkreuzer] 61621: [CMLIB] Pay back the US National Debt. ... well not entirely, but at least remove the "hack similar in magnitude to the US's National Debt"! As a nice side effect we can now load ...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jan 13 21:18:03 2014 New Revision: 61621 URL: http://svn.reactos.org/svn/reactos?rev=61621&view=rev Log: [CMLIB] Pay back the US National Debt. ... well not entirely, but at least remove the "hack similar in magnitude to the US's National Debt"! As a nice side effect we can now load Windows 2003 hive files. Modified: trunk/reactos/lib/cmlib/hivebin.c trunk/reactos/lib/cmlib/hivecell.c trunk/reactos/lib/cmlib/hiveinit.c trunk/reactos/lib/cmlib/hivewrt.c Modified: trunk/reactos/lib/cmlib/hivebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivebin.c?rev=61… ============================================================================== --- trunk/reactos/lib/cmlib/hivebin.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivebin.c [iso-8859-1] Mon Jan 13 21:18:03 2014 @@ -98,6 +98,9 @@ RtlSetBits(&RegistryHive->DirtyVector, Bin->FileOffset / HV_BLOCK_SIZE, BlockCount); + + /* Update size in the base block */ + RegistryHive->BaseBlock->Length += BinSize; } return Bin; Modified: trunk/reactos/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivecell.c?rev=6… ============================================================================== --- trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] Mon Jan 13 21:18:03 2014 @@ -149,7 +149,7 @@ ULONG Size) { ULONG Index; - static CCHAR FindFirstSet[256] = { + static CCHAR FindFirstSet[128] = { 0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, @@ -157,23 +157,16 @@ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7}; - + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6}; + + ASSERT(Size >= (1 << 3)); Index = (Size >> 3) - 1; if (Index >= 16) { - if (Index > 255) + if (Index > 127) Index = 23; else - Index = FindFirstSet[Index] + 7; + Index = FindFirstSet[Index] + 16; } return Index; @@ -301,7 +294,7 @@ Hive->Storage[Stable].FreeDisplay[Index] = HCELL_NIL; Hive->Storage[Volatile].FreeDisplay[Index] = HCELL_NIL; } - +//__debugbreak(); BlockOffset = 0; BlockIndex = 0; while (BlockIndex < Hive->Storage[Stable].Length) Modified: trunk/reactos/lib/cmlib/hiveinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hiveinit.c?rev=6… ============================================================================== --- trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] Mon Jan 13 21:18:03 2014 @@ -107,7 +107,7 @@ BaseBlock->Format = HBASE_FORMAT_MEMORY; BaseBlock->Cluster = 1; BaseBlock->RootCell = HCELL_NIL; - BaseBlock->Length = HV_BLOCK_SIZE; + BaseBlock->Length = 0; BaseBlock->Sequence1 = 1; BaseBlock->Sequence2 = 1; /* FIXME: Fill in the file name */ @@ -145,11 +145,7 @@ PULONG BitmapBuffer; SIZE_T ChunkSize; - // - // This hack is similar in magnitude to the US's National Debt - // ChunkSize = ((PHBASE_BLOCK)ChunkBase)->Length; - ((PHBASE_BLOCK)ChunkBase)->Length = HV_BLOCK_SIZE; DPRINT("ChunkSize: %lx\n", ChunkSize); if (ChunkSize < sizeof(HBASE_BLOCK) || @@ -172,7 +168,7 @@ * we go. */ - Hive->Storage[Stable].Length = (ULONG)(ChunkSize / HV_BLOCK_SIZE) - 1; + Hive->Storage[Stable].Length = (ULONG)(ChunkSize / HV_BLOCK_SIZE); Hive->Storage[Stable].BlockList = Hive->Allocate(Hive->Storage[Stable].Length * sizeof(HMAP_ENTRY), FALSE, TAG_CM); @@ -305,8 +301,6 @@ Hive->Free(BaseBlock, 0); BaseBlock = Hive->Allocate(PAGE_SIZE, TRUE, TAG_CM); if (!BaseBlock) return NoMemory; - - //BaseBlock->Length = PAGE_SIZE; ?? } /* Clear it */ @@ -384,8 +378,6 @@ FileSize); if (!Result) return STATUS_NOT_REGISTRY_FILE; - /* Apply "US National Debt" hack */ - ((PHBASE_BLOCK)HiveData)->Length = FileSize; /* Free our base block... it's usless in this implementation */ Hive->Free(BaseBlock, 0); Modified: trunk/reactos/lib/cmlib/hivewrt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivewrt.c?rev=61… ============================================================================== --- trunk/reactos/lib/cmlib/hivewrt.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivewrt.c [iso-8859-1] Mon Jan 13 21:18:03 2014 @@ -27,6 +27,8 @@ return TRUE; ASSERT(RegistryHive->ReadOnly == FALSE); + ASSERT(RegistryHive->BaseBlock->Length == + RegistryHive->Storage[Stable].Length * HV_BLOCK_SIZE); DPRINT("HvpWriteLog called\n"); @@ -150,6 +152,8 @@ BOOLEAN Success; ASSERT(RegistryHive->ReadOnly == FALSE); + ASSERT(RegistryHive->BaseBlock->Length == + RegistryHive->Storage[Stable].Length * HV_BLOCK_SIZE); DPRINT("HvpWriteHive called\n");

10 years, 11 months

[cwittich] 61620: [halx86] fix vendor name lookup - MegaRAID SAS 8480E VGA controllers does not exist (yet)

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Jan 13 20:09:12 2014 New Revision: 61620 URL: http://svn.reactos.org/svn/reactos?rev=61620&view=rev Log: [halx86] fix vendor name lookup - MegaRAID SAS 8480E VGA controllers does not exist (yet) Modified: trunk/reactos/hal/halx86/legacy/bussupp.c Modified: trunk/reactos/hal/halx86/legacy/bussupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bussupp.… ============================================================================== --- trunk/reactos/hal/halx86/legacy/bussupp.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/bussupp.c [iso-8859-1] Mon Jan 13 20:09:12 2014 @@ -735,12 +735,12 @@ } /* Isolate the vendor name */ - sprintf(LookupString, "%04x ", PciData->VendorID); + sprintf(LookupString, "\r\n%04x ", PciData->VendorID); VendorName = strstr(VendorTable, LookupString); if (VendorName) { /* Copy the vendor name into our buffer */ - VendorName += 6; + VendorName += 8; p = strpbrk(VendorName, "\r\n"); Length = p - VendorName; if (Length >= sizeof(bVendorName)) Length = sizeof(bVendorName) - 1;

10 years, 11 months

[cwittich] 61619: [usetup] fix layout issue in german translation

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Jan 13 18:43:14 2014 New Revision: 61619 URL: http://svn.reactos.org/svn/reactos?rev=61619&view=rev Log: [usetup] fix layout issue in german translation Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Mon Jan 13 18:43:14 2014 @@ -1351,7 +1351,7 @@ "\n" "Partitionen zu erstellen/lschen kann die Partitionstabelle zerstren.\n" "\n" - " \x07 Drcken Sie F3, um das Setup zu beenden." + " \x07 Drcken Sie F3, um das Setup zu beenden.\n" " \x07 Drcken Sie ENTER, um das Setup Fortzusetzen.", "F3 = Beenden ENTER = Fortsetzen" },

10 years, 11 months

[akhaldi] 61618: [ACCESS] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jan 13 13:18:29 2014 New Revision: 61618 URL: http://svn.reactos.org/svn/reactos?rev=61618&view=rev Log: [ACCESS] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. CORE-7716 Modified: trunk/reactos/dll/cpl/access/access.c trunk/reactos/dll/cpl/access/access.h trunk/reactos/dll/cpl/access/display.c trunk/reactos/dll/cpl/access/general.c trunk/reactos/dll/cpl/access/keyboard.c trunk/reactos/dll/cpl/access/mouse.c trunk/reactos/dll/cpl/access/sound.c Modified: trunk/reactos/dll/cpl/access/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.c?re… ============================================================================== --- trunk/reactos/dll/cpl/access/access.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/access.c [iso-8859-1] Mon Jan 13 13:18:29 2014 @@ -8,6 +8,8 @@ */ #include "access.h" + +#include <cpl.h> #define NUM_APPLETS (1) Modified: trunk/reactos/dll/cpl/access/access.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.h?re… ============================================================================== --- trunk/reactos/dll/cpl/access/access.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/access.h [iso-8859-1] Mon Jan 13 13:18:29 2014 @@ -1,12 +1,11 @@ +#include <stdarg.h> + #define WIN32_NO_STATUS -#include <stdarg.h> #include <windef.h> #include <winbase.h> #include <winreg.h> -#include <wingdi.h> #include <winuser.h> #include <commctrl.h> -#include <cpl.h> #include <tchar.h> #include "resource.h" Modified: trunk/reactos/dll/cpl/access/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/display.c?r… ============================================================================== --- trunk/reactos/dll/cpl/access/display.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/display.c [iso-8859-1] Mon Jan 13 13:18:29 2014 @@ -9,9 +9,9 @@ #include "access.h" +#include <wingdi.h> #define ID_BLINK_TIMER 346 - static VOID FillColorSchemeComboBox(HWND hwnd) Modified: trunk/reactos/dll/cpl/access/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/general.c?r… ============================================================================== --- trunk/reactos/dll/cpl/access/general.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/general.c [iso-8859-1] Mon Jan 13 13:18:29 2014 @@ -8,7 +8,6 @@ */ #include "access.h" - #define BAUDTICKS 6 static UINT nBaudArray[BAUDTICKS] = {300, 1200, 2400, 4800, 9600, 19200}; Modified: trunk/reactos/dll/cpl/access/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/keyboard.c?… ============================================================================== --- trunk/reactos/dll/cpl/access/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/keyboard.c [iso-8859-1] Mon Jan 13 13:18:29 2014 @@ -8,7 +8,6 @@ */ #include "access.h" - #define BOUNCETICKS 5 static UINT nBounceArray[BOUNCETICKS] = {500, 700, 1000, 1500, 2000}; Modified: trunk/reactos/dll/cpl/access/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/mouse.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/access/mouse.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/mouse.c [iso-8859-1] Mon Jan 13 13:18:29 2014 @@ -8,7 +8,6 @@ */ #include "access.h" - #define SPEEDTICKS 9 #define ACCELTICKS 9 Modified: trunk/reactos/dll/cpl/access/sound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/sound.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/access/sound.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/sound.c [iso-8859-1] Mon Jan 13 13:18:29 2014 @@ -8,7 +8,6 @@ */ #include "access.h" - static VOID OnInitDialog(HWND hwndDlg, PGLOBAL_DATA pGlobalData)

10 years, 11 months

[akhaldi] 61617: [LIBSXLT] * Create a main header and move some inclusions to it. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jan 13 13:16:57 2014 New Revision: 61617 URL: http://svn.reactos.org/svn/reactos?rev=61617&view=rev Log: [LIBSXLT] * Create a main header and move some inclusions to it. CORE-7716 Added: trunk/reactos/dll/3rdparty/libxslt/precomp.h (with props) Modified: trunk/reactos/dll/3rdparty/libxslt/attributes.c trunk/reactos/dll/3rdparty/libxslt/attrvt.c trunk/reactos/dll/3rdparty/libxslt/config.h trunk/reactos/dll/3rdparty/libxslt/documents.c trunk/reactos/dll/3rdparty/libxslt/extensions.c trunk/reactos/dll/3rdparty/libxslt/extra.c trunk/reactos/dll/3rdparty/libxslt/functions.c trunk/reactos/dll/3rdparty/libxslt/imports.c trunk/reactos/dll/3rdparty/libxslt/keys.c trunk/reactos/dll/3rdparty/libxslt/namespaces.c trunk/reactos/dll/3rdparty/libxslt/numbers.c trunk/reactos/dll/3rdparty/libxslt/pattern.c trunk/reactos/dll/3rdparty/libxslt/preproc.c trunk/reactos/dll/3rdparty/libxslt/security.c trunk/reactos/dll/3rdparty/libxslt/templates.c trunk/reactos/dll/3rdparty/libxslt/transform.c trunk/reactos/dll/3rdparty/libxslt/variables.c trunk/reactos/dll/3rdparty/libxslt/xslt.c trunk/reactos/dll/3rdparty/libxslt/xsltlocale.c trunk/reactos/dll/3rdparty/libxslt/xsltutils.c Modified: trunk/reactos/dll/3rdparty/libxslt/attributes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/attri… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/attributes.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/attributes.c [iso-8859-1] Mon Jan 13 13:16:57 2014 @@ -9,45 +9,7 @@ * daniel(a)veillard.com */ -#define IN_LIBXSLT -#include "libxslt.h" - -#include <string.h> - -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_MATH_H -#include <math.h> -#endif -#ifdef HAVE_FLOAT_H -#include <float.h> -#endif -#ifdef HAVE_IEEEFP_H -#include <ieeefp.h> -#endif -#ifdef HAVE_NAN_H -#include <nan.h> -#endif -#ifdef HAVE_CTYPE_H -#include <ctype.h> -#endif - -#include <libxml/xmlmemory.h> -#include <libxml/tree.h> -#include <libxml/hash.h> -#include <libxml/xmlerror.h> -#include <libxml/uri.h> -#include <libxml/parserInternals.h> -#include "xslt.h" -#include "xsltInternals.h" -#include "xsltutils.h" -#include "attributes.h" -#include "namespaces.h" -#include "templates.h" -#include "imports.h" -#include "transform.h" -#include "preproc.h" +#include "precomp.h" #define WITH_XSLT_DEBUG_ATTRIBUTES #ifdef WITH_XSLT_DEBUG Modified: trunk/reactos/dll/3rdparty/libxslt/attrvt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/attrv… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/attrvt.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/attrvt.c [iso-8859-1] Mon Jan 13 13:16:57 2014 @@ -13,19 +13,7 @@ * daniel(a)veillard.com */ -#define IN_LIBXSLT -#include "libxslt.h" - -#include <string.h> - -#include <libxml/xmlmemory.h> -#include <libxml/tree.h> -#include <libxml/xpath.h> -#include <libxml/xpathInternals.h> -#include "xslt.h" -#include "xsltutils.h" -#include "xsltInternals.h" -#include "templates.h" +#include "precomp.h" #ifdef WITH_XSLT_DEBUG #define WITH_XSLT_DEBUG_AVT Modified: trunk/reactos/dll/3rdparty/libxslt/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/confi… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/config.h [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/config.h [iso-8859-1] Mon Jan 13 13:16:57 2014 @@ -1 +1,3 @@ +#pragma once + #include <win32config.h> Modified: trunk/reactos/dll/3rdparty/libxslt/documents.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/docum… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/documents.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/documents.c [iso-8859-1] Mon Jan 13 13:16:57 2014 @@ -6,24 +6,7 @@ * daniel(a)veillard.com */ -#define IN_LIBXSLT -#include "libxslt.h" - -#include <string.h> - -#include <libxml/xmlmemory.h> -#include <libxml/tree.h> -#include <libxml/hash.h> -#include <libxml/parser.h> -#include <libxml/parserInternals.h> -#include "xslt.h" -#include "xsltInternals.h" -#include "xsltutils.h" -#include "documents.h" -#include "transform.h" -#include "imports.h" -#include "keys.h" -#include "security.h" +#include "precomp.h" #ifdef LIBXML_XINCLUDE_ENABLED #include <libxml/xinclude.h> Modified: trunk/reactos/dll/3rdparty/libxslt/extensions.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/exten… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/extensions.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/extensions.c [iso-8859-1] Mon Jan 13 13:16:57 2014 @@ -9,31 +9,14 @@ * daniel(a)veillard.com */ -#define IN_LIBXSLT -#include "libxslt.h" - -#include <string.h> -#include <limits.h> - -#include <libxml/xmlmemory.h> -#include <libxml/tree.h> -#include <libxml/hash.h> -#include <libxml/xmlerror.h> -#include <libxml/parserInternals.h> -#include <libxml/xpathInternals.h> +#include "precomp.h" + #ifdef WITH_MODULES #include <libxml/xmlmodule.h> #endif #include <libxml/list.h> -#include <libxml/xmlIO.h> -#include "xslt.h" -#include "xsltInternals.h" -#include "xsltutils.h" -#include "imports.h" -#include "extensions.h" #ifdef _WIN32 -#include <stdlib.h> /* for _MAX_PATH */ #ifndef PATH_MAX #define PATH_MAX _MAX_PATH #endif Modified: trunk/reactos/dll/3rdparty/libxslt/extra.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/extra… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/extra.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/extra.c [iso-8859-1] Mon Jan 13 13:16:57 2014 @@ -10,30 +10,7 @@ * daniel(a)veillard.com */ -#define IN_LIBXSLT -#include "libxslt.h" - -#include <string.h> -#ifdef HAVE_TIME_H -#include <time.h> -#endif -#ifdef HAVE_STDLIB_H -#include <stdlib.h> -#endif - -#include <libxml/xmlmemory.h> -#include <libxml/tree.h> -#include <libxml/hash.h> -#include <libxml/xmlerror.h> -#include <libxml/parserInternals.h> -#include "xslt.h" -#include "xsltInternals.h" -#include "xsltutils.h" -#include "extensions.h" -#include "variables.h" -#include "transform.h" -#include "extra.h" -#include "preproc.h" +#include "precomp.h" #ifdef WITH_XSLT_DEBUG #define WITH_XSLT_DEBUG_EXTRA Modified: trunk/reactos/dll/3rdparty/libxslt/functions.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/funct… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/functions.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/functions.c [iso-8859-1] Mon Jan 13 13:16:57 2014 @@ -10,37 +10,9 @@ * Bjorn Reese <breese(a)users.sourceforge.net> for number formatting */ -#define IN_LIBXSLT -#include "libxslt.h" - -#include <string.h> - -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_CTYPE_H -#include <ctype.h> -#endif - -#include <libxml/xmlmemory.h> -#include <libxml/parser.h> -#include <libxml/tree.h> -#include <libxml/valid.h> -#include <libxml/hash.h> -#include <libxml/xmlerror.h> -#include <libxml/xpath.h> -#include <libxml/xpathInternals.h> -#include <libxml/parserInternals.h> -#include <libxml/uri.h> +#include "precomp.h" + #include <libxml/xpointer.h> -#include "xslt.h" -#include "xsltInternals.h" -#include "xsltutils.h" -#include "functions.h" -#include "extensions.h" -#include "numbersInternals.h" -#include "keys.h" -#include "documents.h" #ifdef WITH_XSLT_DEBUG #define WITH_XSLT_DEBUG_FUNCTION Modified: trunk/reactos/dll/3rdparty/libxslt/imports.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/impor… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/imports.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/imports.c [iso-8859-1] Mon Jan 13 13:16:57 2014 @@ -9,44 +9,7 @@ * daniel(a)veillard.com */ -#define IN_LIBXSLT -#include "libxslt.h" - -#include <string.h> - -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_MATH_H -#include <math.h> -#endif -#ifdef HAVE_FLOAT_H -#include <float.h> -#endif -#ifdef HAVE_IEEEFP_H -#include <ieeefp.h> -#endif -#ifdef HAVE_NAN_H -#include <nan.h> -#endif -#ifdef HAVE_CTYPE_H -#include <ctype.h> -#endif - -#include <libxml/xmlmemory.h> -#include <libxml/tree.h> -#include <libxml/hash.h> -#include <libxml/xmlerror.h> -#include <libxml/uri.h> -#include "xslt.h" -#include "xsltInternals.h" -#include "xsltutils.h" -#include "preproc.h" -#include "imports.h" -#include "documents.h" -#include "security.h" -#include "pattern.h" - +#include "precomp.h" /************************************************************************ * * Modified: trunk/reactos/dll/3rdparty/libxslt/keys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/keys.… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/keys.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/keys.c [iso-8859-1] Mon Jan 13 13:16:57 2014 @@ -9,25 +9,7 @@ * daniel(a)veillard.com */ -#define IN_LIBXSLT -#include "libxslt.h" - -#include <string.h> - -#include <libxml/xmlmemory.h> -#include <libxml/tree.h> -#include <libxml/valid.h> -#include <libxml/hash.h> -#include <libxml/xmlerror.h> -#include <libxml/parserInternals.h> -#include <libxml/xpathInternals.h> -#include <libxml/xpath.h> -#include "xslt.h" -#include "xsltInternals.h" -#include "xsltutils.h" -#include "imports.h" -#include "templates.h" -#include "keys.h" +#include "precomp.h" #ifdef WITH_XSLT_DEBUG #define WITH_XSLT_DEBUG_KEYS Modified: trunk/reactos/dll/3rdparty/libxslt/namespaces.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/names… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/namespaces.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/namespaces.c [iso-8859-1] Mon Jan 13 13:16:57 2014 @@ -9,45 +9,7 @@ * daniel(a)veillard.com */ -#define IN_LIBXSLT -#include "libxslt.h" - -#include <string.h> - -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_MATH_H -#include <math.h> -#endif -#ifdef HAVE_FLOAT_H -#include <float.h> -#endif -#ifdef HAVE_IEEEFP_H -#include <ieeefp.h> -#endif -#ifdef HAVE_NAN_H -#include <nan.h> -#endif -#ifdef HAVE_CTYPE_H -#include <ctype.h> -#endif -#ifndef XSLT_NEED_TRIO -#include <stdio.h> -#else -#include <trio.h> -#endif - -#include <libxml/xmlmemory.h> -#include <libxml/tree.h> -#include <libxml/hash.h> -#include <libxml/xmlerror.h> -#include <libxml/uri.h> -#include "xslt.h" -#include "xsltInternals.h" -#include "xsltutils.h" -#include "namespaces.h" -#include "imports.h" +#include "precomp.h" /************************************************************************ * * Modified: trunk/reactos/dll/3rdparty/libxslt/numbers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/numbe… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/numbers.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/numbers.c [iso-8859-1] Mon Jan 13 13:16:57 2014 @@ -10,24 +10,7 @@ * Bjorn Reese <breese(a)users.sourceforge.net> */ -#define IN_LIBXSLT -#include "libxslt.h" - -#include <math.h> -#include <limits.h> -#include <float.h> -#include <string.h> - -#include <libxml/xmlmemory.h> -#include <libxml/parserInternals.h> -#include <libxml/xpath.h> -#include <libxml/xpathInternals.h> -#include <libxml/encoding.h> -#include "xsltutils.h" -#include "pattern.h" -#include "templates.h" -#include "transform.h" -#include "numbersInternals.h" +#include "precomp.h" #ifndef FALSE # define FALSE (0 == 1) Modified: trunk/reactos/dll/3rdparty/libxslt/pattern.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/patte… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/pattern.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/pattern.c [iso-8859-1] Mon Jan 13 13:16:57 2014 @@ -14,26 +14,7 @@ * TODO: detect [number] at compilation, optimize accordingly */ -#define IN_LIBXSLT -#include "libxslt.h" - -#include <string.h> - -#include <libxml/xmlmemory.h> -#include <libxml/tree.h> -#include <libxml/valid.h> -#include <libxml/hash.h> -#include <libxml/xmlerror.h> -#include <libxml/parserInternals.h> -#include <libxml/xpath.h> -#include "xslt.h" -#include "xsltInternals.h" -#include "xsltutils.h" -#include "imports.h" -#include "templates.h" -#include "keys.h" -#include "pattern.h" -#include "documents.h" +#include "precomp.h" #ifdef WITH_XSLT_DEBUG #define WITH_XSLT_DEBUG_PATTERN Added: trunk/reactos/dll/3rdparty/libxslt/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/preco… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/precomp.h (added) +++ trunk/reactos/dll/3rdparty/libxslt/precomp.h [iso-8859-1] Mon Jan 13 13:16:57 2014 @@ -0,0 +1,75 @@ +#ifndef _LIBXSLT_PCH_ +#define _LIBXSLT_PCH_ + +#define IN_LIBXSLT +#include <libxslt.h> + +#ifndef XSLT_NEED_TRIO +#include <stdio.h> +#else +#include <trio.h> +#endif + +#include <string.h> +#include <limits.h> + +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_MATH_H +#include <math.h> +#endif +#ifdef HAVE_FLOAT_H +#include <float.h> +#endif +#ifdef HAVE_IEEEFP_H +#include <ieeefp.h> +#endif +#ifdef HAVE_NAN_H +#include <nan.h> +#endif +#ifdef HAVE_CTYPE_H +#include <ctype.h> +#endif +#ifdef HAVE_TIME_H +#include <time.h> +#endif +#ifdef HAVE_STDLIB_H +#include <stdlib.h> +#endif + +#include <libxml/xmlmemory.h> +#include <libxml/tree.h> +#include <libxml/hash.h> +#include <libxml/xmlerror.h> +#include <libxml/uri.h> +#include <libxml/parser.h> +#include <libxml/parserInternals.h> +#include <libxml/xpath.h> +#include <libxml/xpathInternals.h> +#include <libxml/valid.h> +#include <libxml/encoding.h> +#include <libxml/dict.h> +#include <libxml/xmlIO.h> +#include <libxml/HTMLtree.h> + +#include "xslt.h" +#include "xsltInternals.h" +#include "xsltutils.h" +#include "attributes.h" +#include "namespaces.h" +#include "templates.h" +#include "imports.h" +#include "transform.h" +#include "preproc.h" +#include "documents.h" +#include "keys.h" +#include "security.h" +#include "extensions.h" +#include "variables.h" +#include "extra.h" +#include "pattern.h" +#include "numbersInternals.h" +#include "functions.h" + +#endif /* _LIBXSLT_PCH_ */ Propchange: trunk/reactos/dll/3rdparty/libxslt/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/3rdparty/libxslt/preproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/prepr… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/preproc.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/preproc.c [iso-8859-1] Mon Jan 13 13:16:57 2014 @@ -15,31 +15,7 @@ * daniel(a)veillard.com */ -#define IN_LIBXSLT -#include "libxslt.h" - -#include <string.h> - -#include <libxml/xmlmemory.h> -#include <libxml/parser.h> -#include <libxml/tree.h> -#include <libxml/valid.h> -#include <libxml/hash.h> -#include <libxml/uri.h> -#include <libxml/encoding.h> -#include <libxml/xmlerror.h> -#include "xslt.h" -#include "xsltutils.h" -#include "xsltInternals.h" -#include "transform.h" -#include "templates.h" -#include "variables.h" -#include "numbersInternals.h" -#include "preproc.h" -#include "extra.h" -#include "imports.h" -#include "extensions.h" -#include "pattern.h" +#include "precomp.h" #ifdef WITH_XSLT_DEBUG #define WITH_XSLT_DEBUG_PREPROC Modified: trunk/reactos/dll/3rdparty/libxslt/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/secur… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/security.c [iso-8859-1] Mon Jan 13 13:16:57 2014 @@ -6,36 +6,13 @@ * daniel(a)veillard.com */ -#define IN_LIBXSLT -#include "libxslt.h" - -#include <string.h> - -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif +#include "precomp.h" + #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> #endif -#ifdef HAVE_MATH_H -#include <math.h> -#endif -#ifdef HAVE_FLOAT_H -#include <float.h> -#endif -#ifdef HAVE_IEEEFP_H -#include <ieeefp.h> -#endif -#ifdef HAVE_NAN_H -#include <nan.h> -#endif -#ifdef HAVE_CTYPE_H -#include <ctype.h> -#endif - #if defined(WIN32) && !defined(__CYGWIN__) -//#include <windows.h> #ifndef INVALID_FILE_ATTRIBUTES #define INVALID_FILE_ATTRIBUTES ((DWORD)-1) #endif @@ -51,16 +28,6 @@ # define HAVE_STAT # endif #endif - -#include <libxml/xmlmemory.h> -#include <libxml/tree.h> -#include <libxml/uri.h> -#include "xslt.h" -#include "xsltInternals.h" -#include "xsltutils.h" -#include "extensions.h" -#include "security.h" - struct _xsltSecurityPrefs { xsltSecurityCheck readFile; Modified: trunk/reactos/dll/3rdparty/libxslt/templates.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/templ… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/templates.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/templates.c [iso-8859-1] Mon Jan 13 13:16:57 2014 @@ -9,27 +9,9 @@ * daniel(a)veillard.com */ -#define IN_LIBXSLT -#include "libxslt.h" - -#include <string.h> - -#include <libxml/xmlmemory.h> +#include "precomp.h" + #include <libxml/globals.h> -#include <libxml/xmlerror.h> -#include <libxml/tree.h> -#include <libxml/dict.h> -#include <libxml/xpathInternals.h> -#include <libxml/parserInternals.h> -#include "xslt.h" -#include "xsltInternals.h" -#include "xsltutils.h" -#include "variables.h" -#include "functions.h" -#include "templates.h" -#include "transform.h" -#include "namespaces.h" -#include "attributes.h" #ifdef WITH_XSLT_DEBUG #define WITH_XSLT_DEBUG_TEMPLATES Modified: trunk/reactos/dll/3rdparty/libxslt/transform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/trans… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/transform.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/transform.c [iso-8859-1] Mon Jan 13 13:16:57 2014 @@ -16,42 +16,9 @@ * daniel(a)veillard.com */ -#define IN_LIBXSLT -#include "libxslt.h" - -#include <string.h> -#include <stdio.h> - -#include <libxml/xmlmemory.h> -#include <libxml/parser.h> -#include <libxml/tree.h> -#include <libxml/valid.h> -#include <libxml/hash.h> -#include <libxml/encoding.h> -#include <libxml/xmlerror.h> -#include <libxml/xpath.h> -#include <libxml/parserInternals.h> -#include <libxml/xpathInternals.h> -#include <libxml/HTMLtree.h> +#include "precomp.h" + #include <libxml/debugXML.h> -#include <libxml/uri.h> -#include "xslt.h" -#include "xsltInternals.h" -#include "xsltutils.h" -#include "pattern.h" -#include "transform.h" -#include "variables.h" -#include "numbersInternals.h" -#include "namespaces.h" -#include "attributes.h" -#include "templates.h" -#include "imports.h" -#include "keys.h" -#include "documents.h" -#include "extensions.h" -#include "extra.h" -#include "preproc.h" -#include "security.h" #ifdef WITH_XSLT_DEBUG #define WITH_XSLT_DEBUG_EXTRA Modified: trunk/reactos/dll/3rdparty/libxslt/variables.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/varia… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/variables.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/variables.c [iso-8859-1] Mon Jan 13 13:16:57 2014 @@ -9,28 +9,7 @@ * daniel(a)veillard.com */ -#define IN_LIBXSLT -#include "libxslt.h" - -#include <string.h> - -#include <libxml/xmlmemory.h> -#include <libxml/tree.h> -#include <libxml/valid.h> -#include <libxml/hash.h> -#include <libxml/xmlerror.h> -#include <libxml/xpath.h> -#include <libxml/xpathInternals.h> -#include <libxml/parserInternals.h> -#include <libxml/dict.h> -#include "xslt.h" -#include "xsltInternals.h" -#include "xsltutils.h" -#include "variables.h" -#include "transform.h" -#include "imports.h" -#include "preproc.h" -#include "keys.h" +#include "precomp.h" #ifdef WITH_XSLT_DEBUG #define WITH_XSLT_DEBUG_VARIABLE Modified: trunk/reactos/dll/3rdparty/libxslt/xslt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xslt.… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/xslt.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/xslt.c [iso-8859-1] Mon Jan 13 13:16:57 2014 @@ -13,35 +13,7 @@ * daniel(a)veillard.com */ -#define IN_LIBXSLT -#include "libxslt.h" - -#include <string.h> - -#include <libxml/xmlmemory.h> -#include <libxml/parser.h> -#include <libxml/tree.h> -#include <libxml/valid.h> -#include <libxml/hash.h> -#include <libxml/uri.h> -#include <libxml/xmlerror.h> -#include <libxml/parserInternals.h> -#include <libxml/xpathInternals.h> -#include <libxml/xpath.h> -#include "xslt.h" -#include "xsltInternals.h" -#include "pattern.h" -#include "variables.h" -#include "namespaces.h" -#include "attributes.h" -#include "xsltutils.h" -#include "imports.h" -#include "keys.h" -#include "documents.h" -#include "extensions.h" -#include "preproc.h" -#include "extra.h" -#include "security.h" +#include "precomp.h" #ifdef WITH_XSLT_DEBUG #define WITH_XSLT_DEBUG_PARSING Modified: trunk/reactos/dll/3rdparty/libxslt/xsltlocale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xsltl… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/xsltlocale.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/xsltlocale.c [iso-8859-1] Mon Jan 13 13:16:57 2014 @@ -10,14 +10,9 @@ * winapi port: Roumen Petrov */ -#define IN_LIBXSLT -#include "libxslt.h" - -#include <string.h> -#include <libxml/xmlmemory.h> +#include "precomp.h" #include "xsltlocale.h" -#include "xsltutils.h" #if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 2 #define newlocale __newlocale Modified: trunk/reactos/dll/3rdparty/libxslt/xsltutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xsltu… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/xsltutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/xsltutils.c [iso-8859-1] Mon Jan 13 13:16:57 2014 @@ -9,38 +9,14 @@ * daniel(a)veillard.com */ -#define IN_LIBXSLT -#include "libxslt.h" - -#ifndef XSLT_NEED_TRIO -#include <stdio.h> -#else -#include <trio.h> -#endif - -#include <string.h> -#include <time.h> +#include "precomp.h" + #ifdef HAVE_SYS_TIME_H #include <sys/time.h> #endif #ifdef HAVE_UNISTD_H #include <unistd.h> #endif -#ifdef HAVE_STDLIB_H -#include <stdlib.h> -#endif -#include <stdarg.h> - -#include <libxml/xmlmemory.h> -#include <libxml/tree.h> -#include <libxml/HTMLtree.h> -#include <libxml/xmlerror.h> -#include <libxml/xmlIO.h> -#include "xsltutils.h" -#include "templates.h" -#include "xsltInternals.h" -#include "imports.h" -#include "transform.h" /* gettimeofday on Windows ??? */ #if defined(WIN32) && !defined(__CYGWIN__)

10 years, 11 months

[akhaldi] 61616: [WINLOGON] * Remove one time inclusions from the main header and put them back where they belong. * Improve the main header. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jan 13 13:16:29 2014 New Revision: 61616 URL: http://svn.reactos.org/svn/reactos?rev=61616&view=rev Log: [WINLOGON] * Remove one time inclusions from the main header and put them back where they belong. * Improve the main header. CORE-7716 Modified: trunk/reactos/base/system/winlogon/environment.c trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/winlogon.h Modified: trunk/reactos/base/system/winlogon/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/envir… ============================================================================== --- trunk/reactos/base/system/winlogon/environment.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/environment.c [iso-8859-1] Mon Jan 13 13:16:29 2014 @@ -11,9 +11,6 @@ /* INCLUDES *****************************************************************/ #include "winlogon.h" - -/* GLOBALS ******************************************************************/ - /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Mon Jan 13 13:16:29 2014 @@ -12,6 +12,14 @@ /* INCLUDES *****************************************************************/ #include "winlogon.h" + +#define WIN32_LEAN_AND_MEAN +#include <aclapi.h> +#include <mmsystem.h> +#include <userenv.h> +#include <ndk/setypes.h> +#include <ndk/sefuncs.h> +#include <reactos/winlogon.h> /* GLOBALS ******************************************************************/ Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Mon Jan 13 13:16:29 2014 @@ -11,6 +11,8 @@ /* INCLUDES *****************************************************************/ #include "winlogon.h" + +#include <ndk/cmfuncs.h> /* GLOBALS ******************************************************************/ Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] Mon Jan 13 13:16:29 2014 @@ -26,24 +26,22 @@ #ifndef __WINLOGON_MAIN_H__ #define __WINLOGON_MAIN_H__ +#include <stdarg.h> + #define USE_GETLASTINPUTINFO #define WIN32_NO_STATUS -#define WIN32_LEAN_AND_MEAN -#include <windows.h> -#include <mmsystem.h> -#include <userenv.h> +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winuser.h> +#include <winreg.h> #include <winwlx.h> -#include <cmfuncs.h> -#include <rtlfuncs.h> -#include <exfuncs.h> -#include <setypes.h> -#include <sefuncs.h> -#include <aclapi.h> +#include <ndk/rtlfuncs.h> +#include <ndk/exfuncs.h> #include <strsafe.h> #include <reactos/undocuser.h> -#include <reactos/winlogon.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(winlogon);

10 years, 11 months

← Newer
1
...
25
26
27
28
29
30
31
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2014