Ros-diffs October 2018

ros-diffs@reactos.org

21 participants
354 discussions

01/06: [KERNEL32] Fix some stubs for 0x600+

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=71993fd8c9b0b5b77ac11… commit 71993fd8c9b0b5b77ac11c761e52b0f70eba63aa Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Sep 5 21:46:37 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Oct 12 19:30:24 2018 +0200 [KERNEL32] Fix some stubs for 0x600+ --- dll/win32/kernel32/kernel32.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/kernel32/kernel32.spec b/dll/win32/kernel32/kernel32.spec index 0646588120..aea5d2f280 100644 --- a/dll/win32/kernel32/kernel32.spec +++ b/dll/win32/kernel32/kernel32.spec @@ -92,11 +92,11 @@ ;@ stdcall -arch=x86_64 ConsoleIMERoutine() @ stdcall ConsoleMenuControl(long long long) @ stdcall ContinueDebugEvent(long long long) -@ stdcall -stub -version=0x600+ ConvertCalDateTimeToSystemTime +@ stdcall -stub -version=0x600+ ConvertCalDateTimeToSystemTime(ptr ptr) @ stdcall ConvertDefaultLocale (long) @ stdcall ConvertFiberToThread() @ stdcall -stub -version=0x600+ ConvertNLSDayOfWeekToWin32DayOfWeek(long) -@ stdcall -stub -version=0x600+ ConvertSystemTimeToCalDateTime +@ stdcall -stub -version=0x600+ ConvertSystemTimeToCalDateTime(ptr long ptr) @ stdcall ConvertThreadToFiber(ptr) @ stdcall ConvertThreadToFiberEx(ptr long) @ stdcall CopyFileA(str str long)

7 years

02/02: [NTOS:KD] A few trivial code improvements

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a06b425839a5da3cd4486… commit a06b425839a5da3cd4486bc265d5e91c817b489a Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Oct 11 01:29:39 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Oct 12 08:43:02 2018 +0200 [NTOS:KD] A few trivial code improvements --- ntoskrnl/kd/wrappers/gdbstub_powerpc.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/kd/wrappers/gdbstub_powerpc.c b/ntoskrnl/kd/wrappers/gdbstub_powerpc.c index edc6904d25..8a223543b6 100644 --- a/ntoskrnl/kd/wrappers/gdbstub_powerpc.c +++ b/ntoskrnl/kd/wrappers/gdbstub_powerpc.c @@ -1244,7 +1244,7 @@ GspUnloadBreakpoints(PKTRAP_FRAME TrapFrame) static BOOLEAN gdb_attached_yet = FALSE; /* - * This function does all command procesing for interfacing to gdb. + * This function does all command processing for interfacing to gdb. */ KD_CONTINUE_TYPE NTAPI @@ -1295,7 +1295,7 @@ KdpGdbEnterDebuggerException(PEXCEPTION_RECORD ExceptionRecord, { LONG Esp; - stop_reply: +stop_reply: /* reply to host that an exception has occurred */ SigVal = GspComputeSignal(ExceptionRecord->ExceptionCode); @@ -1342,13 +1342,16 @@ KdpGdbEnterDebuggerException(PEXCEPTION_RECORD ExceptionRecord, switch(*ptr++) { case '?': +#if 1 /* a little hack to send more complete status information */ goto stop_reply; +#else GspOutBuffer[0] = 'S'; GspOutBuffer[1] = HexChars[SigVal >> 4]; GspOutBuffer[2] = HexChars[SigVal % 16]; GspOutBuffer[3] = 0; break; +#endif case 'd': GspRemoteDebug = !GspRemoteDebug; /* toggle debug flag */ break; @@ -1530,7 +1533,6 @@ KdpGdbEnterDebuggerException(PEXCEPTION_RECORD ExceptionRecord, case 'k': /* kill the program */ strcpy(GspOutBuffer, "OK"); break; - /* kill the program */ case 'H': /* Set thread */ GspSetThread(ptr);

7 years

01/02: [NTOS:KD] Remove an unreachable "break;"

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=561a10056b1b56e80815a… commit 561a10056b1b56e80815a781dc1c54bde1b8d442 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Oct 11 01:22:05 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Oct 12 08:43:02 2018 +0200 [NTOS:KD] Remove an unreachable "break;" On behalf of Kudratov Olimjon. CORE-8545 --- ntoskrnl/kd/wrappers/gdbstub_powerpc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/ntoskrnl/kd/wrappers/gdbstub_powerpc.c b/ntoskrnl/kd/wrappers/gdbstub_powerpc.c index a0c1ba521c..edc6904d25 100644 --- a/ntoskrnl/kd/wrappers/gdbstub_powerpc.c +++ b/ntoskrnl/kd/wrappers/gdbstub_powerpc.c @@ -1525,7 +1525,6 @@ KdpGdbEnterDebuggerException(PEXCEPTION_RECORD ExceptionRecord, ExReleaseFastMutex(&GspLock); DPRINT("Thread %p leaving stub\n", PsGetCurrentThread()); return kdContinue; - break; } case 'k': /* kill the program */

7 years

01/01: [NTOSKRNL] Don't keep the spin lock hold too long when we lost the BCB race

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1acb5a9fab662f65a3be4… commit 1acb5a9fab662f65a3be4fd319832edfe98cff6e Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Oct 12 08:20:32 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Oct 12 08:20:32 2018 +0200 [NTOSKRNL] Don't keep the spin lock hold too long when we lost the BCB race This will avoid a deadlock on unpin. --- ntoskrnl/cc/pin.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index bba87960c3..b3906a9321 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -385,6 +385,8 @@ CcPinRead ( iBcb = CcpFindBcb(SharedCacheMap, FileOffset, Length, TRUE); if (iBcb != NULL) { + KeReleaseSpinLock(&SharedCacheMap->BcbSpinLock, OldIrql); + /* Free our now unused BCB */ CcUnpinData(*Bcb); @@ -414,8 +416,8 @@ CcPinRead ( /* Insert ourselves in the linked list */ InsertTailList(&SharedCacheMap->BcbList, &iBcb->BcbEntry); + KeReleaseSpinLock(&SharedCacheMap->BcbSpinLock, OldIrql); } - KeReleaseSpinLock(&SharedCacheMap->BcbSpinLock, OldIrql); } /* We found a BCB, lock it and return it */ else

7 years

01/01: [NTOSKRNL] Rewrite BCB handling to be more robust

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cf8ba3bd9cb74870c64de… commit cf8ba3bd9cb74870c64deb29ea44ac12245a4e92 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Oct 11 23:15:01 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Oct 11 23:15:01 2018 +0200 [NTOSKRNL] Rewrite BCB handling to be more robust We now handle race conditions when creating BCB to avoid having duplicated BCB per shared maps. Also, we already specify whether the memory will be pinned when creating the BCB, to avoid potential duplications or BCB misuse. --- ntoskrnl/cc/pin.c | 151 ++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 113 insertions(+), 38 deletions(-) diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index 3e89cacddf..bba87960c3 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -31,6 +31,40 @@ ULONG CcPinReadNoWait = 0; /* FUNCTIONS *****************************************************************/ +static +PINTERNAL_BCB +NTAPI +CcpFindBcb( + IN PROS_SHARED_CACHE_MAP SharedCacheMap, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN BOOLEAN Pinned) +{ + PINTERNAL_BCB Bcb; + BOOLEAN Found = FALSE; + PLIST_ENTRY NextEntry; + + for (NextEntry = SharedCacheMap->BcbList.Flink; + NextEntry != &SharedCacheMap->BcbList; + NextEntry = NextEntry->Flink) + { + Bcb = CONTAINING_RECORD(NextEntry, INTERNAL_BCB, BcbEntry); + + if (Bcb->PFCB.MappedFileOffset.QuadPart <= FileOffset->QuadPart && + (Bcb->PFCB.MappedFileOffset.QuadPart + Bcb->PFCB.MappedLength) >= + (FileOffset->QuadPart + Length)) + { + if ((Pinned && Bcb->PinCount > 0) || (!Pinned && Bcb->PinCount == 0)) + { + Found = TRUE; + break; + } + } + } + + return (Found ? Bcb : NULL); +} + static BOOLEAN NTAPI @@ -39,6 +73,7 @@ CcpMapData( IN PLARGE_INTEGER FileOffset, IN ULONG Length, IN ULONG Flags, + IN BOOLEAN ToPin, OUT PVOID *pBcb, OUT PVOID *pBuffer) { @@ -46,7 +81,7 @@ CcpMapData( BOOLEAN Valid; PROS_VACB Vacb; NTSTATUS Status; - PINTERNAL_BCB iBcb; + PINTERNAL_BCB iBcb, DupBcb; LONGLONG ROffset; KIRQL OldIrql; @@ -133,45 +168,42 @@ CcpMapData( ExInitializeResourceLite(&iBcb->Lock); *pBcb = (PVOID)iBcb; - KeAcquireSpinLock(&SharedCacheMap->BcbSpinLock, &OldIrql); - InsertTailList(&SharedCacheMap->BcbList, &iBcb->BcbEntry); - KeReleaseSpinLock(&SharedCacheMap->BcbSpinLock, OldIrql); - - return TRUE; -} - -static -PINTERNAL_BCB -NTAPI -CcpFindBcb( - IN PROS_SHARED_CACHE_MAP SharedCacheMap, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN BOOLEAN Pinned) -{ - PINTERNAL_BCB Bcb; - BOOLEAN Found = FALSE; - PLIST_ENTRY NextEntry; - - for (NextEntry = SharedCacheMap->BcbList.Flink; - NextEntry != &SharedCacheMap->BcbList; - NextEntry = NextEntry->Flink) + /* Only insert if we're not to pin data */ + if (!ToPin) { - Bcb = CONTAINING_RECORD(NextEntry, INTERNAL_BCB, BcbEntry); + KeAcquireSpinLock(&SharedCacheMap->BcbSpinLock, &OldIrql); - if (Bcb->PFCB.MappedFileOffset.QuadPart <= FileOffset->QuadPart && - (Bcb->PFCB.MappedFileOffset.QuadPart + Bcb->PFCB.MappedLength) >= - (FileOffset->QuadPart + Length)) + /* Check if we raced with another BCB creation */ + DupBcb = CcpFindBcb(SharedCacheMap, FileOffset, Length, FALSE); + /* Yes, and we've lost */ + if (DupBcb != NULL) { - if ((Pinned && Bcb->PinCount > 0) || (!Pinned && Bcb->PinCount == 0)) - { - Found = TRUE; - break; - } + /* We'll return that BCB */ + ++DupBcb->RefCount; + + /* Delete the loser */ + CcRosReleaseVacb(SharedCacheMap, Vacb, TRUE, FALSE, FALSE); + ExDeleteResourceLite(&iBcb->Lock); + ExFreeToNPagedLookasideList(&iBcbLookasideList, iBcb); + + /* Return the winner - no need to update buffer address, it's + * relative to the VACB, which is unchanged. + */ + *pBcb = DupBcb; + } + /* Nope, insert ourselves */ + else + { + InsertTailList(&SharedCacheMap->BcbList, &iBcb->BcbEntry); } + KeReleaseSpinLock(&SharedCacheMap->BcbSpinLock, OldIrql); + } + else + { + InitializeListHead(&iBcb->BcbEntry); } - return (Found ? Bcb : NULL); + return TRUE; } /* @@ -218,7 +250,7 @@ CcMapData ( if (iBcb == NULL) { - Ret = CcpMapData(SharedCacheMap, FileOffset, Length, Flags, pBcb, pBuffer); + Ret = CcpMapData(SharedCacheMap, FileOffset, Length, Flags, FALSE, pBcb, pBuffer); } else { @@ -336,7 +368,7 @@ CcPinRead ( } /* Map first */ - if (!CcpMapData(SharedCacheMap, FileOffset, Length, Flags, Bcb, Buffer)) + if (!CcpMapData(SharedCacheMap, FileOffset, Length, Flags, TRUE, Bcb, Buffer)) { return FALSE; } @@ -347,6 +379,43 @@ CcPinRead ( CcUnpinData(*Bcb); return FALSE; } + + /* Did we race for the BCB creation? */ + KeAcquireSpinLock(&SharedCacheMap->BcbSpinLock, &OldIrql); + iBcb = CcpFindBcb(SharedCacheMap, FileOffset, Length, TRUE); + if (iBcb != NULL) + { + /* Free our now unused BCB */ + CcUnpinData(*Bcb); + + /* Lock the found BCB and return it */ + if (BooleanFlagOn(Flags, PIN_EXCLUSIVE)) + { + Result = ExAcquireResourceExclusiveLite(&iBcb->Lock, BooleanFlagOn(Flags, PIN_WAIT)); + } + else + { + Result = ExAcquireSharedStarveExclusive(&iBcb->Lock, BooleanFlagOn(Flags, PIN_WAIT)); + } + + if (!Result) + { + return FALSE; + } + + ++iBcb->PinCount; + ++iBcb->RefCount; + + *Bcb = iBcb; + } + else + { + iBcb = *Bcb; + + /* Insert ourselves in the linked list */ + InsertTailList(&SharedCacheMap->BcbList, &iBcb->BcbEntry); + } + KeReleaseSpinLock(&SharedCacheMap->BcbSpinLock, OldIrql); } /* We found a BCB, lock it and return it */ else @@ -469,7 +538,10 @@ CcUnpinDataForThread ( FALSE); KeAcquireSpinLock(&SharedCacheMap->BcbSpinLock, &OldIrql); - RemoveEntryList(&iBcb->BcbEntry); + if (!IsListEmpty(&iBcb->BcbEntry)) + { + RemoveEntryList(&iBcb->BcbEntry); + } KeReleaseSpinLock(&SharedCacheMap->BcbSpinLock, OldIrql); ExDeleteResourceLite(&iBcb->Lock); @@ -543,7 +615,10 @@ CcUnpinRepinnedBcb ( FALSE); KeAcquireSpinLock(&SharedCacheMap->BcbSpinLock, &OldIrql); - RemoveEntryList(&iBcb->BcbEntry); + if (!IsListEmpty(&iBcb->BcbEntry)) + { + RemoveEntryList(&iBcb->BcbEntry); + } KeReleaseSpinLock(&SharedCacheMap->BcbSpinLock, OldIrql); ExDeleteResourceLite(&iBcb->Lock);

7 years

01/01: [APPWIZ] Update French translation

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f4d8cb616ddb90142f8a… commit 8f4d8cb616ddb90142f8a2982beb23b0b27b38af Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Oct 10 08:42:38 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Oct 10 08:42:38 2018 +0200 [APPWIZ] Update French translation --- dll/cpl/appwiz/lang/fr-FR.rc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dll/cpl/appwiz/lang/fr-FR.rc b/dll/cpl/appwiz/lang/fr-FR.rc index 1aeb4989e0..dead951efb 100644 --- a/dll/cpl/appwiz/lang/fr-FR.rc +++ b/dll/cpl/appwiz/lang/fr-FR.rc @@ -43,22 +43,22 @@ END IDD_CONFIG_STARTMENU DIALOGEX 0, 0, 212, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Remove Shortcuts/Folders" +CAPTION "Supprimer des raccourcis/dossiers" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&To remove an item from the Start menu, select the item and click Remove.", -1, 10, 10, 192, 16 + LTEXT "&Pour supprimer un élément du menu démarrer, sélectionnez l'élément puis cliquez sur Surpprimer.", -1, 10, 10, 192, 16 CONTROL "List1", IDC_STARTMENU_TREE, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 10, 32, 192, 138 - PUSHBUTTON "&Remove", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP - DEFPUSHBUTTON "Close", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Supprimer", IDC_REMOVE_ENTRIES, 98, 176, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Fermer", IDOK, 152, 176, 50, 14, WS_GROUP | WS_TABSTOP END ID_DWL_GECKO_DIALOG DIALOGEX 0, 0, 260, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Installation du package Wine Gecko" +CAPTION "Installation du paquet Wine Gecko" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "ReactOS n'a trouvé aucun package Wine Gecko nécessaire pour pouvoir exécuter correctement les applications incluant du code HTML. ReactOS est capable de télécharger et d'installer automatiquement le package pour vous.", + CONTROL "ReactOS n'a trouvé aucun paquet Wine Gecko nécessaire pour pouvoir exécuter correctement les applications incluant du code HTML. ReactOS est capable de télécharger et d'installer automatiquement le paquet pour vous.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER | PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "&Installer", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP @@ -78,8 +78,8 @@ BEGIN IDS_DOWNLOADING "Téléchargement..." IDS_INSTALLING "Installation..." IDS_INVALID_SHA "La somme de contrôle du fichier téléchargé est erronée. Abandon de l'installation du fichier corrompu." - IDS_NEW_INTERNET_SHORTCUT "New Internet Shortcut" - IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." - IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." - IDS_CANTMAKESHORTCUT "Failed to create shortcut." + IDS_NEW_INTERNET_SHORTCUT "Nouveau raccourci Internet" + IDS_DWL_FAILED "Échec lors du téléchargement du paquet Gecko. Assurez-vous d'avoir une connexion Internet pour pouvoir le télécharger. L'installation va continuer sans installer Gecko." + IDS_CANTMAKEINETSHORTCUT "Échec lors de la création du raccourci Internet." + IDS_CANTMAKESHORTCUT "Échec lors de la création du raccourci." END

7 years

01/01: [NETCFGX] NetworkPropertySheetProvider: Fix property selection because the property list box is sorted.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d58f6558e022c6426d1ef… commit d58f6558e022c6426d1ef06e210d2af62c57be48 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Oct 9 23:19:48 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Oct 9 23:19:48 2018 +0200 [NETCFGX] NetworkPropertySheetProvider: Fix property selection because the property list box is sorted. CORE-15095 --- dll/win32/netcfgx/propertypage.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dll/win32/netcfgx/propertypage.c b/dll/win32/netcfgx/propertypage.c index 1c37083c9f..b069cf6062 100644 --- a/dll/win32/netcfgx/propertypage.c +++ b/dll/win32/netcfgx/propertypage.c @@ -789,6 +789,7 @@ OnInitDialog( HWND hwndControl; PWSTR pszText; DWORD i; + INT idx; TRACE("OnInitDialog()\n"); @@ -811,13 +812,15 @@ OnInitDialog( else pszText = pParamArray->Array[i].pszName; - ListBox_AddString(hwndControl, pszText); + idx = ListBox_AddString(hwndControl, pszText); + if (idx != LB_ERR) + ListBox_SetItemData(hwndControl, idx, (LPARAM)&pParamArray->Array[i]); } if (pParamArray->dwCount > 0) { ListBox_SetCurSel(hwndControl, 0); - pParamArray->pCurrentParam = &pParamArray->Array[0]; + pParamArray->pCurrentParam = (PPARAMETER)ListBox_GetItemData(hwndControl, 0); DisplayParameter(hwnd, pParamArray->pCurrentParam); } } @@ -855,7 +858,7 @@ OnCommand( iIndex = ListBox_GetCurSel((HWND)lParam); if (iIndex != LB_ERR && iIndex < pParamArray->dwCount) { - pParamArray->pCurrentParam = &pParamArray->Array[iIndex]; + pParamArray->pCurrentParam = (PPARAMETER)ListBox_GetItemData((HWND)lParam, iIndex); DisplayParameter(hwnd, pParamArray->pCurrentParam); } }

7 years

01/01: [BOOTDATA] Update optional modules according to 287d35b

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9b2a53e56b3d8f25543d1… commit 9b2a53e56b3d8f25543d1426920b1afc00428507 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Oct 9 08:40:41 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Oct 9 08:40:41 2018 +0200 [BOOTDATA] Update optional modules according to 287d35b This fixes optional modules being installed in places that make no sense. This also fixes auto installation of Gecko. Thus, this fixes unattended setup of ReactOS for testbots. CORE-15160 --- boot/bootdata/packages/reactos.dff.in | 46 +++++++++++++++++------------------ 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/boot/bootdata/packages/reactos.dff.in b/boot/bootdata/packages/reactos.dff.in index b0561522b6..f122a8f528 100644 --- a/boot/bootdata/packages/reactos.dff.in +++ b/boot/bootdata/packages/reactos.dff.in @@ -89,41 +89,41 @@ Signature = "$ReactOS$" .InfEnd ; Optional/proprietary files -"modules/optional/DroidSansFallback.ttf" 3 optional -"modules/optional/NOTICE_for_Droid_Font.txt" 4 optional +"modules/optional/DroidSansFallback.ttf" 4 optional +"modules/optional/NOTICE_for_Droid_Font.txt" 1 optional "modules/optional/netkvm.inf" 6 optional "modules/optional/netkvm.cat" 6 optional -"modules/optional/netkvm.sys" 2 optional +"modules/optional/netkvm.sys" 3 optional "modules/optional/viostor.inf" 6 optional "modules/optional/viostor.cat" 6 optional -"modules/optional/viostor.sys" 2 optional +"modules/optional/viostor.sys" 3 optional "modules/optional/qxl.inf" 6 optional "modules/optional/qxl.cat" 6 optional -"modules/optional/qxl.sys" 2 optional -"modules/optional/qxldd.dll" 1 optional +"modules/optional/qxl.sys" 3 optional +"modules/optional/qxldd.dll" 2 optional "modules/optional/b57win32.inf" 6 optional "modules/optional/b57win32.cat" 6 optional -"modules/optional/b57xp32.sys" 2 optional +"modules/optional/b57xp32.sys" 3 optional "modules/optional/bcmwl5.inf" 6 optional "modules/optional/bcm43xx.cat" 6 optional -"modules/optional/bcmwl5.sys" 2 optional +"modules/optional/bcmwl5.sys" 3 optional "modules/optional/alcxwdm.inf" 6 optional -"modules/optional/alcxwdm.sys" 2 optional +"modules/optional/alcxwdm.sys" 3 optional "modules/optional/net21x4.inf" 6 optional -"modules/optional/dc21x4.sys" 2 optional -"modules/optional/mfc42.dll" 1 optional -"modules/optional/mfc42u.dll" 1 optional -"modules/optional/mfc71.dll" 1 optional -"modules/optional/mfc71u.dll" 1 optional -"modules/optional/msvbvm50.dll" 1 optional -"modules/optional/msvbvm60.dll" 1 optional -"modules/optional/msvcirt.dll" 1 optional -"modules/optional/msvcp71.dll" 1 optional -"modules/optional/msvcr71.dll" 1 optional -"modules/optional/vmx_fb.dll" 1 optional -"modules/optional/vmx_mode.dll" 1 optional +"modules/optional/dc21x4.sys" 3 optional +"modules/optional/mfc42.dll" 2 optional +"modules/optional/mfc42u.dll" 2 optional +"modules/optional/mfc71.dll" 2 optional +"modules/optional/mfc71u.dll" 2 optional +"modules/optional/msvbvm50.dll" 2 optional +"modules/optional/msvbvm60.dll" 2 optional +"modules/optional/msvcirt.dll" 2 optional +"modules/optional/msvcp71.dll" 2 optional +"modules/optional/msvcr71.dll" 2 optional +"modules/optional/vmx_fb.dll" 2 optional +"modules/optional/vmx_mode.dll" 2 optional "modules/optional/vmx_svga.inf" 6 optional -"modules/optional/vmx_svga.sys" 2 optional -"modules/optional/wine_gecko-2.40-x86.msi" 4 optional +"modules/optional/vmx_svga.sys" 3 optional +"modules/optional/wine_gecko-2.40-x86.msi" 1 optional "boot/bootdata/bootcdregtest/AHKAppTests.cmd" 7 optional ; DON'T REMOVE THE FOLLOWING NEW LINE ! THIS MEANS YOU !

7 years

01/01: [MKHIVE] Fixes for the previous fixes.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4e6fc201a0b8cd12def21… commit 4e6fc201a0b8cd12def213363fdc8d7d7a4fa13d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Oct 9 01:23:52 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Oct 9 01:33:10 2018 +0200 [MKHIVE] Fixes for the previous fixes. - Fix parsing of the options. - Only uppercase the file name part and NOT the full path! And do it in a way GCC-Linux correctly understands, aka.: *ptr = toupper(*ptr); ++ptr; but NOT!: *ptr++ = toupper(*ptr); (that last one worked on GCC-Win and MSVC). [CMAKE] Let's keep SETUPREG.HIV and BCD hive file names in uppercase (use the '-u' switch) while keeping the other ones in lowercase. Should definitively fix GCCLin builder! --- sdk/cmake/CMakeMacros.cmake | 10 +++++----- sdk/tools/mkhive/mkhive.c | 18 ++++++++++-------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index 95fbf2b5fd..257fece149 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -810,15 +810,15 @@ function(create_registry_hives) # BootCD setup system hive add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/boot/bootdata/setupreg.hiv - COMMAND native-mkhive -h:SETUPREG -d:${CMAKE_BINARY_DIR}/boot/bootdata ${CMAKE_BINARY_DIR}/boot/bootdata/hivesys_utf16.inf + OUTPUT ${CMAKE_BINARY_DIR}/boot/bootdata/SETUPREG.HIV + COMMAND native-mkhive -h:SETUPREG -u -d:${CMAKE_BINARY_DIR}/boot/bootdata ${CMAKE_BINARY_DIR}/boot/bootdata/hivesys_utf16.inf DEPENDS native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata/hivesys_utf16.inf) add_custom_target(bootcd_hives - DEPENDS ${CMAKE_BINARY_DIR}/boot/bootdata/setupreg.hiv) + DEPENDS ${CMAKE_BINARY_DIR}/boot/bootdata/SETUPREG.HIV) add_cd_file( - FILE ${CMAKE_BINARY_DIR}/boot/bootdata/setupreg.hiv + FILE ${CMAKE_BINARY_DIR}/boot/bootdata/SETUPREG.HIV TARGET bootcd_hives DESTINATION reactos NO_CAB @@ -859,7 +859,7 @@ function(create_registry_hives) # BCD Hive add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/boot/bootdata/BCD - COMMAND native-mkhive -h:BCD -d:${CMAKE_BINARY_DIR}/boot/bootdata ${CMAKE_BINARY_DIR}/boot/bootdata/hivebcd_utf16.inf + COMMAND native-mkhive -h:BCD -u -d:${CMAKE_BINARY_DIR}/boot/bootdata ${CMAKE_BINARY_DIR}/boot/bootdata/hivebcd_utf16.inf DEPENDS native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata/hivebcd_utf16.inf) add_custom_target(bcd_hive diff --git a/sdk/tools/mkhive/mkhive.c b/sdk/tools/mkhive/mkhive.c index d09d97f290..7458a5a71f 100644 --- a/sdk/tools/mkhive/mkhive.c +++ b/sdk/tools/mkhive/mkhive.c @@ -92,6 +92,7 @@ int main(int argc, char *argv[]) { INT ret; UINT i; + PSTR ptr; BOOL UpperCaseFileName = FALSE; PCSTR HiveList = NULL; CHAR DestPath[PATH_MAX] = ""; @@ -108,13 +109,13 @@ int main(int argc, char *argv[]) /* Read the options */ for (i = 1; i < argc && *argv[i] == '-'; i++) { - if (argv[i][1] == '?' && argv[i][1] == 0) + if (argv[i][1] == '?' && argv[i][2] == 0) { usage(); return 0; } - if (argv[i][1] == 'u' && argv[i][1] == 0) + if (argv[i][1] == 'u' && argv[i][2] == 0) { UpperCaseFileName = TRUE; } @@ -173,6 +174,9 @@ int main(int argc, char *argv[]) strcpy(FileName, DestPath); strcat(FileName, DIR_SEPARATOR_STRING); + + ptr = FileName + strlen(FileName); + strcat(FileName, RegistryHives[i].HiveName); /* Exception for the special setup registry hive */ @@ -183,15 +187,13 @@ int main(int argc, char *argv[]) /* Adjust file name case if needed */ if (UpperCaseFileName) { - PSTR ptr = FileName; - while (*ptr) - *ptr++ = toupper(*ptr); + for (; *ptr; ++ptr) + *ptr = toupper(*ptr); } else { - PSTR ptr = FileName; - while (*ptr) - *ptr++ = tolower(*ptr); + for (; *ptr; ++ptr) + *ptr = tolower(*ptr); } if (!ExportBinaryHive(FileName, RegistryHives[i].CmHive))

7 years

01/01: [MKHIVE] Remove support for '/' options, this does not behave well under Linux.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f37dd1e10a50b1b8f57af… commit f37dd1e10a50b1b8f57afeb7d3226bcc9da23c4c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Oct 9 00:25:01 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Oct 9 00:25:01 2018 +0200 [MKHIVE] Remove support for '/' options, this does not behave well under Linux. --- sdk/tools/mkhive/mkhive.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/tools/mkhive/mkhive.c b/sdk/tools/mkhive/mkhive.c index ad667fd43f..d09d97f290 100644 --- a/sdk/tools/mkhive/mkhive.c +++ b/sdk/tools/mkhive/mkhive.c @@ -106,7 +106,7 @@ int main(int argc, char *argv[]) printf("Binary hive maker\n"); /* Read the options */ - for (i = 1; i < argc && (*argv[i] == '-' || *argv[i] == '/'); i++) + for (i = 1; i < argc && *argv[i] == '-'; i++) { if (argv[i][1] == '?' && argv[i][1] == 0) {

7 years

← Newer
1
...
22
23
24
25
26
27
28
...
36
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2018