Ros-diffs April 2020

ros-diffs@reactos.org

45 participants
395 discussions

[reactos] 01/01: [CMAKE] Fix build with CMake 3.17.1-ReactOS (RosBE 2.2)
by Victor Perevertkin 27 Apr '20

27 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8639a131b09b97688b5f4… commit 8639a131b09b97688b5f45e172f8c5fa0ea15e6f Author: Victor Perevertkin <victor(a)perevertkin.ru> AuthorDate: Mon Apr 27 03:40:48 2020 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Mon Apr 27 03:40:48 2020 +0300 [CMAKE] Fix build with CMake 3.17.1-ReactOS (RosBE 2.2) --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 50fbf192c4b..703d92f3bbe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -139,7 +139,7 @@ else() add_definitions(-D_WINKD_) endif() - if(CMAKE_VERSION MATCHES "ReactOS") + if(CMAKE_VERSION MATCHES "ReactOS" AND CMAKE_VERSION VERSION_LESS 3.3.0) set(PCH 1 CACHE BOOL "Whether to use precompiled headers") else() set(PCH 0 CACHE BOOL "Whether to use precompiled headers")

1 0

[reactos] 01/01: [PROFMAP] Initial implementation (#2119)
by Oleg Dubinskiy 26 Apr '20

26 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=70b6658af86266b6ea803… commit 70b6658af86266b6ea803990aca3d57a571cbe11 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Sun Apr 26 22:15:21 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 26 21:15:21 2020 +0200 [PROFMAP] Initial implementation (#2119) Co-Authored-By: Stanislav Motylkov <x86corez(a)gmail.com> --- dll/win32/CMakeLists.txt | 1 + dll/win32/profmap/CMakeLists.txt | 13 +++++++ dll/win32/profmap/profmap.c | 77 ++++++++++++++++++++++++++++++++++++++++ dll/win32/profmap/profmap.rc | 5 +++ dll/win32/profmap/profmap.spec | 6 ++++ 5 files changed, 102 insertions(+) diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt index d8ecf5ca50f..e69b50bc877 100644 --- a/dll/win32/CMakeLists.txt +++ b/dll/win32/CMakeLists.txt @@ -158,6 +158,7 @@ add_subdirectory(pdh) add_subdirectory(pidgen) add_subdirectory(powrprof) add_subdirectory(printui) +add_subdirectory(profmap) add_subdirectory(propsys) add_subdirectory(psapi) add_subdirectory(pstorec) diff --git a/dll/win32/profmap/CMakeLists.txt b/dll/win32/profmap/CMakeLists.txt new file mode 100644 index 00000000000..03c350c0330 --- /dev/null +++ b/dll/win32/profmap/CMakeLists.txt @@ -0,0 +1,13 @@ + +spec2def(profmap.dll profmap.spec) + +list(APPEND SOURCE + profmap.c + profmap.rc + ${CMAKE_CURRENT_BINARY_DIR}/profmap_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/profmap.def) + +add_library(profmap MODULE ${SOURCE}) +set_module_type(profmap win32dll) +add_importlibs(profmap msvcrt kernel32 ntdll) +add_cd_file(TARGET profmap DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/profmap/profmap.c b/dll/win32/profmap/profmap.c new file mode 100644 index 00000000000..a9a75946a4f --- /dev/null +++ b/dll/win32/profmap/profmap.c @@ -0,0 +1,77 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * FILE: dll/win32/profmap/profmap.c + * PURPOSE: ReactOS User Profile Mapping API + * COPYRIGHT: Copyright 2019 Oleg Dubinskiy (oleg.dubinskij2013(a)yandex.ua) + */ + +/* INCLUDES *******************************************************************/ + +#include <windef.h> +#include <winbase.h> + +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS ***********************************************************/ + +/* + * @implemented + */ +BOOL +WINAPI +DllMain(HINSTANCE hinstDll, + DWORD dwReason, + LPVOID reserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDll); + break; + + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} + +/* + * @unimplemented + * + * NOTES: + * Based on the documentation from: + * http://sendmail2.blogspot.com/2012/11/windows-small-business-server-2008_75… + */ +BOOL +WINAPI +RemapAndMoveUserA(IN LPCSTR pComputer, + IN DWORD dwFlags, + IN LPCSTR pCurrentUser, + IN LPCSTR pNewUser) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* + * @unimplemented + * + * NOTES: + * Based on the documentation from: + * http://sendmail2.blogspot.com/2012/11/windows-small-business-server-2008_75… + */ +BOOL +WINAPI +RemapAndMoveUserW(IN LPCWSTR pComputer, + IN DWORD dwFlags, + IN LPCWSTR pCurrentUser, + IN LPCWSTR pNewUser) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* EOF */ diff --git a/dll/win32/profmap/profmap.rc b/dll/win32/profmap/profmap.rc new file mode 100644 index 00000000000..abbb3ca5283 --- /dev/null +++ b/dll/win32/profmap/profmap.rc @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS User Profile Mapping API" +#define REACTOS_STR_INTERNAL_NAME "profmap" +#define REACTOS_STR_ORIGINAL_FILENAME "profmap.dll" +#include <reactos/version.rc> diff --git a/dll/win32/profmap/profmap.spec b/dll/win32/profmap/profmap.spec new file mode 100644 index 00000000000..d4039086339 --- /dev/null +++ b/dll/win32/profmap/profmap.spec @@ -0,0 +1,6 @@ +@ stdcall DllMain(ptr long ptr) +@ stub InitializeProfileMappingApi +@ stdcall RemapAndMoveUserA(str long str str) +@ stdcall RemapAndMoveUserW(wstr long wstr wstr) +@ stub RemapUserProfileA +@ stub RemapUserProfileW

1 0

[reactos] 03/03: [EXPLORER] trayclock: Update timer delay when showing seconds is modified
by Serge Gautherie 26 Apr '20

26 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=96b7cb1a4ff9a378ee315… commit 96b7cb1a4ff9a378ee315fa270b961f5437c305f Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri Jan 24 14:47:58 2020 +0100 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sun Apr 26 21:41:39 2020 +0300 [EXPLORER] trayclock: Update timer delay when showing seconds is modified --- base/shell/explorer/trayclock.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/base/shell/explorer/trayclock.cpp b/base/shell/explorer/trayclock.cpp index e2ccc4a4a87..9736ffbc8b8 100644 --- a/base/shell/explorer/trayclock.cpp +++ b/base/shell/explorer/trayclock.cpp @@ -696,7 +696,12 @@ LRESULT CTrayClockWnd::OnTaskbarSettingsChanged(UINT uMsg, WPARAM wParam, LPARAM if (newSettings->bShowSeconds != g_TaskbarSettings.bShowSeconds) { g_TaskbarSettings.bShowSeconds = newSettings->bShowSeconds; - bRealign = TRUE; + if (!g_TaskbarSettings.sr.HideClock) + { + bRealign = TRUE; + + ResetTime(); + } } if (newSettings->sr.HideClock != g_TaskbarSettings.sr.HideClock)

1 0

[reactos] 02/03: [EXPLORER] trayclock: Better handle timers, especially when it is hidden
by Serge Gautherie 26 Apr '20

26 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e68bee751847c704ae554… commit e68bee751847c704ae554687519f5baa47375f95 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri Jan 24 14:47:58 2020 +0100 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sun Apr 26 21:41:39 2020 +0300 [EXPLORER] trayclock: Better handle timers, especially when it is hidden --- base/shell/explorer/trayclock.cpp | 43 +++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/base/shell/explorer/trayclock.cpp b/base/shell/explorer/trayclock.cpp index 45a673693cc..e2ccc4a4a87 100644 --- a/base/shell/explorer/trayclock.cpp +++ b/base/shell/explorer/trayclock.cpp @@ -452,8 +452,7 @@ BOOL CTrayClockWnd::ResetTime() KillTimer(ID_TRAYCLOCK_TIMER); IsTimerEnabled = FALSE; } - - if (IsInitTimerEnabled) + else if (IsInitTimerEnabled) { KillTimer(ID_TRAYCLOCK_TIMER_INIT); } @@ -464,9 +463,6 @@ BOOL CTrayClockWnd::ResetTime() Ret = SetTimer(ID_TRAYCLOCK_TIMER_INIT, uiDueTime, NULL) != 0; IsInitTimerEnabled = Ret; - /* Update the time */ - Update(); - return Ret; } @@ -500,9 +496,6 @@ VOID CTrayClockWnd::CalibrateTimer() uiWait2. */ Ret = SetTimer(ID_TRAYCLOCK_TIMER, uiWait2, NULL) != 0; IsTimerEnabled = Ret; - - /* Update the time */ - Update(); } else { @@ -510,6 +503,9 @@ VOID CTrayClockWnd::CalibrateTimer() minute/second ends. */ ResetTime(); } + + /* Update the time */ + Update(); } LRESULT CTrayClockWnd::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -519,8 +515,7 @@ LRESULT CTrayClockWnd::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& { KillTimer(ID_TRAYCLOCK_TIMER); } - - if (IsInitTimerEnabled) + else if (IsInitTimerEnabled) { KillTimer(ID_TRAYCLOCK_TIMER_INIT); } @@ -668,7 +663,14 @@ LRESULT CTrayClockWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& b m_tooltip.AddTool(&ti); - ResetTime(); + if (!g_TaskbarSettings.sr.HideClock) + { + ResetTime(); + } + + /* Update the time */ + Update(); + return TRUE; } @@ -702,6 +704,25 @@ LRESULT CTrayClockWnd::OnTaskbarSettingsChanged(UINT uMsg, WPARAM wParam, LPARAM g_TaskbarSettings.sr.HideClock = newSettings->sr.HideClock; ShowWindow(g_TaskbarSettings.sr.HideClock ? SW_HIDE : SW_SHOW); bRealign = TRUE; + + if (g_TaskbarSettings.sr.HideClock) + { + /* Disable all timers */ + if (IsTimerEnabled) + { + KillTimer(ID_TRAYCLOCK_TIMER); + IsTimerEnabled = FALSE; + } + else if (IsInitTimerEnabled) + { + KillTimer(ID_TRAYCLOCK_TIMER_INIT); + IsInitTimerEnabled = FALSE; + } + } + else + { + ResetTime(); + } } if (bRealign)

1 0

[reactos] 01/03: [EXPLORER] CTrayClockWnd::CalculateDueTime(): Fix uiDueTime value
by Serge Gautherie 26 Apr '20

26 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e45b15aca2496958658ae… commit e45b15aca2496958658ae24a0d0c2e3b774aeb7b Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri Jan 24 04:41:00 2020 +0100 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sun Apr 26 21:41:39 2020 +0300 [EXPLORER] CTrayClockWnd::CalculateDueTime(): Fix uiDueTime value when showing seconds. --- base/shell/explorer/trayclock.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/base/shell/explorer/trayclock.cpp b/base/shell/explorer/trayclock.cpp index 3d66edcd28e..45a673693cc 100644 --- a/base/shell/explorer/trayclock.cpp +++ b/base/shell/explorer/trayclock.cpp @@ -424,12 +424,9 @@ UINT CTrayClockWnd::CalculateDueTime() { UINT uiDueTime; - /* Calculate the due time */ GetLocalTime(&LocalTime); uiDueTime = 1000 - (UINT) LocalTime.wMilliseconds; - if (g_TaskbarSettings.bShowSeconds) - uiDueTime += (UINT) LocalTime.wSecond * 100; - else + if (!g_TaskbarSettings.bShowSeconds) uiDueTime += (59 - (UINT) LocalTime.wSecond) * 1000; if (uiDueTime < USER_TIMER_MINIMUM || uiDueTime > USER_TIMER_MAXIMUM)

1 0

[reactos] 01/01: [CODEOWNERS ] Clarify the use of teams
by Adam Stachowicz 26 Apr '20

26 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8cf3cff27c8e63114ddca… commit 8cf3cff27c8e63114ddca44315a377faf7979806 Author: Adam Stachowicz <saibamenppl(a)gmail.com> AuthorDate: Sun Apr 26 20:39:09 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 26 20:39:09 2020 +0200 [CODEOWNERS ] Clarify the use of teams --- CODEOWNERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CODEOWNERS b/CODEOWNERS index e83c7a754a7..81ebab8ac5a 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -325,6 +325,8 @@ amd64/ @tkreuzer /boot/freeldr/freeldr/arch/realmode/amd64.S @tkreuzer # Translations +# This is the list of translation teams in ReactOS GitHub organization. +# If you want to be part of one - hit us at https://chat.reactos.org/ de-DE.rc @reactos/lang-german fr-FR.rc @reactos/lang-french nl-NL.rc @reactos/lang-dutch

1 0

[reactos] 02/02: [SHLWAPI] Add version limit for export from NT 5.1 to NT5.2, because it was dropped since NT6
by Oleg Dubinskiy 26 Apr '20

26 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9f0a0f65ead75ce01c855… commit 9f0a0f65ead75ce01c855cdf098b987a2522f8aa Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Sun Apr 26 20:43:53 2020 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Apr 26 20:20:40 2020 +0200 [SHLWAPI] Add version limit for export from NT 5.1 to NT5.2, because it was dropped since NT6 Co-Authored-By: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> --- dll/win32/shlwapi/shlwapi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shlwapi/shlwapi.spec b/dll/win32/shlwapi/shlwapi.spec index 251d2567d9f..9bcd21739bf 100644 --- a/dll/win32/shlwapi/shlwapi.spec +++ b/dll/win32/shlwapi/shlwapi.spec @@ -549,7 +549,7 @@ 549 stdcall -noname SHCoCreateInstanceAC(ptr ptr long ptr ptr) 550 stub -noname GetTemplateInfoFromHandle 551 stub -noname IShellFolder_CompareIDs -552 stdcall -stub -noname SHEvaluateSystemCommandTemplate(wstr ptr ptr ptr) +552 stdcall -stub -noname -version=0x501-0x502 SHEvaluateSystemCommandTemplate(wstr ptr ptr ptr) 553 stdcall IsInternetESCEnabled() 554 stdcall -noname -stub SHGetAllAccessSA() 555 stdcall AssocQueryStringByKeyA(long long ptr str ptr ptr)

1 0

[reactos] 01/02: [SHLWAPI] Improve SHEvaluateSystemCommandTemplate export CORE-14742
by Oleg Dubinskiy 26 Apr '20

26 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ee08399112957c5799610… commit ee08399112957c579961060ce32c75344e36b89e Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Sun Apr 26 16:21:46 2020 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Apr 26 20:20:40 2020 +0200 [SHLWAPI] Improve SHEvaluateSystemCommandTemplate export CORE-14742 --- dll/win32/shlwapi/shlwapi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shlwapi/shlwapi.spec b/dll/win32/shlwapi/shlwapi.spec index 1b3525c6dd3..251d2567d9f 100644 --- a/dll/win32/shlwapi/shlwapi.spec +++ b/dll/win32/shlwapi/shlwapi.spec @@ -549,7 +549,7 @@ 549 stdcall -noname SHCoCreateInstanceAC(ptr ptr long ptr ptr) 550 stub -noname GetTemplateInfoFromHandle 551 stub -noname IShellFolder_CompareIDs -552 stub -noname SHEvaluateSystemCommandTemplate +552 stdcall -stub -noname SHEvaluateSystemCommandTemplate(wstr ptr ptr ptr) 553 stdcall IsInternetESCEnabled() 554 stdcall -noname -stub SHGetAllAccessSA() 555 stdcall AssocQueryStringByKeyA(long long ptr str ptr ptr)

1 0

[reactos] 01/01: [WIN32SS] Fix formatting only.
by Hermès Bélusca-Maïto 26 Apr '20

26 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=73064a760203f335aa0ce… commit 73064a760203f335aa0ce7e2001de0e54ebdcb3e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 26 19:10:48 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 26 19:32:21 2020 +0200 [WIN32SS] Fix formatting only. --- win32ss/user/ntuser/guicheck.c | 90 +++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/win32ss/user/ntuser/guicheck.c b/win32ss/user/ntuser/guicheck.c index ec76333ad4b..c94dda37720 100644 --- a/win32ss/user/ntuser/guicheck.c +++ b/win32ss/user/ntuser/guicheck.c @@ -21,72 +21,72 @@ static LONG NrGuiAppsRunning = 0; static BOOL FASTCALL co_AddGuiApp(PPROCESSINFO W32Data) { - W32Data->W32PF_flags |= W32PF_CREATEDWINORDC; - if (InterlockedIncrement(&NrGuiAppsRunning) == 1) - { - BOOL Initialized; + W32Data->W32PF_flags |= W32PF_CREATEDWINORDC; + if (InterlockedIncrement(&NrGuiAppsRunning) == 1) + { + BOOL Initialized; - Initialized = co_IntInitializeDesktopGraphics(); + Initialized = co_IntInitializeDesktopGraphics(); - if (!Initialized) - { - W32Data->W32PF_flags &= ~W32PF_CREATEDWINORDC; - InterlockedDecrement(&NrGuiAppsRunning); - return FALSE; - } - } - return TRUE; + if (!Initialized) + { + W32Data->W32PF_flags &= ~W32PF_CREATEDWINORDC; + InterlockedDecrement(&NrGuiAppsRunning); + return FALSE; + } + } + return TRUE; } static void FASTCALL RemoveGuiApp(PPROCESSINFO W32Data) { - W32Data->W32PF_flags &= ~W32PF_CREATEDWINORDC; - if (InterlockedDecrement(&NrGuiAppsRunning) == 0) - { - IntEndDesktopGraphics(); - } + W32Data->W32PF_flags &= ~W32PF_CREATEDWINORDC; + if (InterlockedDecrement(&NrGuiAppsRunning) == 0) + { + IntEndDesktopGraphics(); + } } BOOL FASTCALL co_IntGraphicsCheck(BOOL Create) { - PPROCESSINFO W32Data; + PPROCESSINFO W32Data; - W32Data = PsGetCurrentProcessWin32Process(); - if (Create) - { - if (! (W32Data->W32PF_flags & W32PF_CREATEDWINORDC) && ! (W32Data->W32PF_flags & W32PF_MANUALGUICHECK)) - { - return co_AddGuiApp(W32Data); - } - } - else - { - if ((W32Data->W32PF_flags & W32PF_CREATEDWINORDC) && ! (W32Data->W32PF_flags & W32PF_MANUALGUICHECK)) - { - RemoveGuiApp(W32Data); - } - } + W32Data = PsGetCurrentProcessWin32Process(); + if (Create) + { + if (!(W32Data->W32PF_flags & W32PF_CREATEDWINORDC) && !(W32Data->W32PF_flags & W32PF_MANUALGUICHECK)) + { + return co_AddGuiApp(W32Data); + } + } + else + { + if ((W32Data->W32PF_flags & W32PF_CREATEDWINORDC) && !(W32Data->W32PF_flags & W32PF_MANUALGUICHECK)) + { + RemoveGuiApp(W32Data); + } + } - return TRUE; + return TRUE; } VOID FASTCALL co_IntUserManualGuiCheck(BOOL Create) { - PPROCESSINFO W32Data = (PPROCESSINFO)PsGetCurrentProcessWin32Process(); - W32Data->W32PF_flags |= W32PF_MANUALGUICHECK; + PPROCESSINFO W32Data = (PPROCESSINFO)PsGetCurrentProcessWin32Process(); + W32Data->W32PF_flags |= W32PF_MANUALGUICHECK; - if (Create) - { - co_AddGuiApp(W32Data); - } - else - { - RemoveGuiApp(W32Data); - } + if (Create) + { + co_AddGuiApp(W32Data); + } + else + { + RemoveGuiApp(W32Data); + } } /* EOF */

1 0

[reactos] 01/01: [MEDIA][CMAKE] Create add_driver_inf cmake function *.inf files for drivers can now be placed along with the driver code
by Victor Perevertkin 26 Apr '20

26 Apr '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=019f21ee1d764dff8586a… commit 019f21ee1d764dff8586acc847a299714e83977a Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sun Apr 26 19:50:44 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sun Apr 26 20:28:04 2020 +0300 [MEDIA][CMAKE] Create add_driver_inf cmake function *.inf files for drivers can now be placed along with the driver code --- drivers/bus/acpi/CMakeLists.txt | 1 + {media/inf => drivers/bus/acpi}/acpi.inf | 0 drivers/filesystems/btrfs/CMakeLists.txt | 1 + {media/inf => drivers/filesystems/btrfs}/btrfs.inf | 0 drivers/network/dd/e1000/CMakeLists.txt | 1 + .../inf => drivers/network/dd/e1000}/nete1000.inf | 0 drivers/network/dd/ne2000/CMakeLists.txt | 1 + .../network/dd/ne2000/netne2000.inf | 0 .../network/dd/ne2000/netrtl8029.inf | 0 drivers/network/dd/netkvm/CMakeLists.txt | 1 + .../inf => drivers/network/dd/netkvm}/netkvm.inf | 0 drivers/network/dd/pcnet/CMakeLists.txt | 1 + .../network/dd/pcnet/netpcnet.inf | 0 drivers/network/dd/rtl8139/CMakeLists.txt | 1 + .../network/dd/rtl8139/netrtl8139.inf | 0 drivers/processor/processr/CMakeLists.txt | 1 + {media/inf => drivers/processor/processr}/cpu.inf | 0 drivers/storage/class/cdrom/CMakeLists.txt | 1 + .../inf => drivers/storage/class/cdrom}/cdrom.inf | 0 drivers/storage/class/disk/CMakeLists.txt | 1 + {media/inf => drivers/storage/class/disk}/disk.inf | 0 drivers/storage/class/disk_new/CMakeLists.txt | 1 + drivers/storage/floppy/fdc/CMakeLists.txt | 1 + drivers/usb/usbstor/CMakeLists.txt | 1 + {media/inf => drivers/usb/usbstor}/usbstor.inf | 0 drivers/wdm/audio/hdaudbus/CMakeLists.txt | 1 + .../wdm/audio/hdaudbus}/hdaudbus.inf | 0 media/inf/CMakeLists.txt | 29 +++------------------- sdk/cmake/CMakeMacros.cmake | 17 ++++++++++++- win32ss/drivers/miniport/xboxvmp/CMakeLists.txt | 1 + .../drivers/miniport/xboxvmp}/xboxdisp.inf | 0 31 files changed, 34 insertions(+), 27 deletions(-) diff --git a/drivers/bus/acpi/CMakeLists.txt b/drivers/bus/acpi/CMakeLists.txt index c7be9f22ca3..69d26a13a47 100644 --- a/drivers/bus/acpi/CMakeLists.txt +++ b/drivers/bus/acpi/CMakeLists.txt @@ -203,6 +203,7 @@ target_link_libraries(acpi wdmguid acpica memcmp strtol ${PSEH_LIB}) add_importlibs(acpi ntoskrnl hal) add_pch(acpi precomp.h ACPI_SOURCE) add_cd_file(TARGET acpi DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_driver_inf(acpi acpi.inf) add_subdirectory(cmbatt) add_subdirectory(compbatt) diff --git a/media/inf/acpi.inf b/drivers/bus/acpi/acpi.inf similarity index 100% rename from media/inf/acpi.inf rename to drivers/bus/acpi/acpi.inf diff --git a/drivers/filesystems/btrfs/CMakeLists.txt b/drivers/filesystems/btrfs/CMakeLists.txt index b45a57cb470..0fd490853ca 100644 --- a/drivers/filesystems/btrfs/CMakeLists.txt +++ b/drivers/filesystems/btrfs/CMakeLists.txt @@ -70,3 +70,4 @@ set_module_type(btrfs kernelmodedriver) target_link_libraries(btrfs rtlver zlib_solo chkstk wdmguid ${PSEH_LIB}) add_importlibs(btrfs ntoskrnl hal) add_cd_file(TARGET btrfs DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_driver_inf(btrfs btrfs.inf) diff --git a/media/inf/btrfs.inf b/drivers/filesystems/btrfs/btrfs.inf similarity index 100% rename from media/inf/btrfs.inf rename to drivers/filesystems/btrfs/btrfs.inf diff --git a/drivers/network/dd/e1000/CMakeLists.txt b/drivers/network/dd/e1000/CMakeLists.txt index 2e0bf13a7e0..8bb4aa25ccf 100644 --- a/drivers/network/dd/e1000/CMakeLists.txt +++ b/drivers/network/dd/e1000/CMakeLists.txt @@ -19,3 +19,4 @@ add_pch(e1000 nic.h SOURCE) set_module_type(e1000 kernelmodedriver) add_importlibs(e1000 ndis ntoskrnl hal) add_cd_file(TARGET e1000 DESTINATION reactos/system32/drivers FOR all) +add_driver_inf(e1000 nete1000.inf) diff --git a/media/inf/nete1000.inf b/drivers/network/dd/e1000/nete1000.inf similarity index 100% rename from media/inf/nete1000.inf rename to drivers/network/dd/e1000/nete1000.inf diff --git a/drivers/network/dd/ne2000/CMakeLists.txt b/drivers/network/dd/ne2000/CMakeLists.txt index 7e720aaa2c3..ba6af5b8526 100644 --- a/drivers/network/dd/ne2000/CMakeLists.txt +++ b/drivers/network/dd/ne2000/CMakeLists.txt @@ -11,3 +11,4 @@ add_pch(ne2000 include/ne2000.h SOURCE) set_module_type(ne2000 kernelmodedriver) add_importlibs(ne2000 ndis ntoskrnl hal) add_cd_file(TARGET ne2000 DESTINATION reactos/system32/drivers FOR all) +add_driver_inf(ne2000 netne2000.inf netrtl8029.inf) diff --git a/media/inf/netisa.inf b/drivers/network/dd/ne2000/netne2000.inf similarity index 100% rename from media/inf/netisa.inf rename to drivers/network/dd/ne2000/netne2000.inf diff --git a/media/inf/netrtpnt.inf b/drivers/network/dd/ne2000/netrtl8029.inf similarity index 100% rename from media/inf/netrtpnt.inf rename to drivers/network/dd/ne2000/netrtl8029.inf diff --git a/drivers/network/dd/netkvm/CMakeLists.txt b/drivers/network/dd/netkvm/CMakeLists.txt index 729068401ff..881653525ad 100644 --- a/drivers/network/dd/netkvm/CMakeLists.txt +++ b/drivers/network/dd/netkvm/CMakeLists.txt @@ -24,6 +24,7 @@ add_library(netkvm MODULE ${SOURCE} wxp/parandis.rc) set_module_type(netkvm kernelmodedriver) add_importlibs(netkvm ndis ntoskrnl hal) add_cd_file(TARGET netkvm DESTINATION reactos/system32/drivers FOR all) +add_driver_inf(netkvm netkvm.inf) if (NOT MSVC) add_compile_flags("-Wno-unused-function") diff --git a/media/inf/netkvm.inf b/drivers/network/dd/netkvm/netkvm.inf similarity index 100% rename from media/inf/netkvm.inf rename to drivers/network/dd/netkvm/netkvm.inf diff --git a/drivers/network/dd/pcnet/CMakeLists.txt b/drivers/network/dd/pcnet/CMakeLists.txt index 34e58268e21..439073eaff7 100644 --- a/drivers/network/dd/pcnet/CMakeLists.txt +++ b/drivers/network/dd/pcnet/CMakeLists.txt @@ -15,3 +15,4 @@ add_pch(pcnet pcnet.h SOURCE) set_module_type(pcnet kernelmodedriver) add_importlibs(pcnet ndis ntoskrnl hal) add_cd_file(TARGET pcnet DESTINATION reactos/system32/drivers FOR all) +add_driver_inf(pcnet netpcnet.inf) diff --git a/media/inf/netamd.inf b/drivers/network/dd/pcnet/netpcnet.inf similarity index 100% rename from media/inf/netamd.inf rename to drivers/network/dd/pcnet/netpcnet.inf diff --git a/drivers/network/dd/rtl8139/CMakeLists.txt b/drivers/network/dd/rtl8139/CMakeLists.txt index 59ad7fc55e2..82b7aecf929 100644 --- a/drivers/network/dd/rtl8139/CMakeLists.txt +++ b/drivers/network/dd/rtl8139/CMakeLists.txt @@ -16,3 +16,4 @@ add_pch(rtl8139 nic.h SOURCE) set_module_type(rtl8139 kernelmodedriver) add_importlibs(rtl8139 ndis ntoskrnl hal) add_cd_file(TARGET rtl8139 DESTINATION reactos/system32/drivers FOR all) +add_driver_inf(rtl8139 netrtl8139.inf) diff --git a/media/inf/netrtl.inf b/drivers/network/dd/rtl8139/netrtl8139.inf similarity index 100% rename from media/inf/netrtl.inf rename to drivers/network/dd/rtl8139/netrtl8139.inf diff --git a/drivers/processor/processr/CMakeLists.txt b/drivers/processor/processr/CMakeLists.txt index 9bbd366fa31..bfd8b71ddca 100644 --- a/drivers/processor/processr/CMakeLists.txt +++ b/drivers/processor/processr/CMakeLists.txt @@ -10,3 +10,4 @@ set_module_type(processr kernelmodedriver) add_importlibs(processr hal ntoskrnl) add_pch(processr processr.h SOURCE) add_cd_file(TARGET processr DESTINATION reactos/system32/drivers FOR all) +add_driver_inf(processr cpu.inf) diff --git a/media/inf/cpu.inf b/drivers/processor/processr/cpu.inf similarity index 100% rename from media/inf/cpu.inf rename to drivers/processor/processr/cpu.inf diff --git a/drivers/storage/class/cdrom/CMakeLists.txt b/drivers/storage/class/cdrom/CMakeLists.txt index c764fdfc07c..97b7a2431df 100644 --- a/drivers/storage/class/cdrom/CMakeLists.txt +++ b/drivers/storage/class/cdrom/CMakeLists.txt @@ -12,3 +12,4 @@ add_importlibs(cdrom class2 scsiport ntoskrnl hal) add_pch(cdrom precomp.h SOURCE) add_cd_file(TARGET cdrom DESTINATION reactos/system32/drivers NO_CAB FOR all) add_registry_inf(cdrom_reg.inf) +add_driver_inf(cdrom cdrom.inf) diff --git a/media/inf/cdrom.inf b/drivers/storage/class/cdrom/cdrom.inf similarity index 100% rename from media/inf/cdrom.inf rename to drivers/storage/class/cdrom/cdrom.inf diff --git a/drivers/storage/class/disk/CMakeLists.txt b/drivers/storage/class/disk/CMakeLists.txt index 70fdda9fb8d..eb2ff3fef4f 100644 --- a/drivers/storage/class/disk/CMakeLists.txt +++ b/drivers/storage/class/disk/CMakeLists.txt @@ -5,3 +5,4 @@ set_module_type(disk kernelmodedriver) add_importlibs(disk class2 scsiport ntoskrnl hal) add_cd_file(TARGET disk DESTINATION reactos/system32/drivers NO_CAB FOR all) add_registry_inf(disk_reg.inf) +add_driver_inf(disk disk.inf) diff --git a/media/inf/disk.inf b/drivers/storage/class/disk/disk.inf similarity index 100% rename from media/inf/disk.inf rename to drivers/storage/class/disk/disk.inf diff --git a/drivers/storage/class/disk_new/CMakeLists.txt b/drivers/storage/class/disk_new/CMakeLists.txt index 252f6735ff2..8860e9beea4 100644 --- a/drivers/storage/class/disk_new/CMakeLists.txt +++ b/drivers/storage/class/disk_new/CMakeLists.txt @@ -22,3 +22,4 @@ set_module_type(disk_new kernelmodedriver) add_importlibs(disk_new classpnp ntoskrnl hal) add_pch(disk_new disk.h SOURCE) add_cd_file(TARGET disk_new DESTINATION reactos/system32/drivers NO_CAB FOR all) +#add_driver_inf(disk_new diskdev.inf) diff --git a/drivers/storage/floppy/fdc/CMakeLists.txt b/drivers/storage/floppy/fdc/CMakeLists.txt index a9c6211e912..839f77518e8 100644 --- a/drivers/storage/floppy/fdc/CMakeLists.txt +++ b/drivers/storage/floppy/fdc/CMakeLists.txt @@ -11,3 +11,4 @@ set_module_type(fdc kernelmodedriver) add_importlibs(fdc hal ntoskrnl) add_pch(fdc fdc.h SOURCE) add_cd_file(TARGET fdc DESTINATION reactos/system32/drivers FOR all) +add_driver_inf(fdc fdc.inf) diff --git a/drivers/usb/usbstor/CMakeLists.txt b/drivers/usb/usbstor/CMakeLists.txt index 82e445f0424..567ee54dd14 100644 --- a/drivers/usb/usbstor/CMakeLists.txt +++ b/drivers/usb/usbstor/CMakeLists.txt @@ -23,3 +23,4 @@ set_module_type(usbstor kernelmodedriver) add_importlibs(usbstor ntoskrnl hal usbd) add_pch(usbstor usbstor.h SOURCE) add_cd_file(TARGET usbstor DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_driver_inf(usbstor usbstor.inf) diff --git a/media/inf/usbstor.inf b/drivers/usb/usbstor/usbstor.inf similarity index 100% rename from media/inf/usbstor.inf rename to drivers/usb/usbstor/usbstor.inf diff --git a/drivers/wdm/audio/hdaudbus/CMakeLists.txt b/drivers/wdm/audio/hdaudbus/CMakeLists.txt index 952dd7242e8..3c5883dc64f 100644 --- a/drivers/wdm/audio/hdaudbus/CMakeLists.txt +++ b/drivers/wdm/audio/hdaudbus/CMakeLists.txt @@ -15,3 +15,4 @@ set_module_type(hdaudbus kernelmodedriver) target_link_libraries(hdaudbus libcntpr ${PSEH_LIB}) add_importlibs(hdaudbus ntoskrnl hal) add_cd_file(TARGET hdaudbus DESTINATION reactos/system32/drivers FOR all) +add_driver_inf(hdaudbus hdaudbus.inf) diff --git a/media/inf/hdaudbus.inf b/drivers/wdm/audio/hdaudbus/hdaudbus.inf similarity index 100% rename from media/inf/hdaudbus.inf rename to drivers/wdm/audio/hdaudbus/hdaudbus.inf diff --git a/media/inf/CMakeLists.txt b/media/inf/CMakeLists.txt index 6d0a50bb1b6..ba9f1fcdc0c 100644 --- a/media/inf/CMakeLists.txt +++ b/media/inf/CMakeLists.txt @@ -1,20 +1,14 @@ list(APPEND INF_FILES - acpi.inf audio.inf battery.inf bda.inf bth.inf - btrfs.inf c_image.inf - cdrom.inf - cpu.inf - disk.inf display.inf fdc.inf flpydisk.inf hal.inf - hdaudbus.inf hdc.inf input.inf keyboard.inf @@ -25,12 +19,6 @@ list(APPEND INF_FILES monitor.inf msmouse.inf NET_NIC.inf - netamd.inf - nete1000.inf - netisa.inf - netkvm.inf - netrtl.inf - netrtpnt.inf nettcpip.inf ports.inf scsi.inf @@ -38,10 +26,8 @@ list(APPEND INF_FILES unknown.inf usb.inf usbport.inf - usbstor.inf wdmaudio.inf - wmiacpi.inf - xboxdisp.inf) + wmiacpi.inf) list(APPEND UTF8_INF_FILES defltws.inf @@ -49,17 +35,8 @@ list(APPEND UTF8_INF_FILES intl.inf layout.inf) -foreach(item ${INF_FILES}) - set(_converted_item ${CMAKE_CURRENT_BINARY_DIR}/${item}) - set(_source_item ${CMAKE_CURRENT_SOURCE_DIR}/${item}) - add_custom_command(OUTPUT "${_converted_item}" - COMMAND native-utf16le "${_source_item}" "${_converted_item}" - DEPENDS native-utf16le "${_source_item}") - add_cd_file(TARGET converted_inf_files FILE ${_converted_item} DESTINATION reactos/inf FOR all) - list(APPEND _converted_inf_files ${_converted_item}) -endforeach(item) - -add_custom_target(converted_inf_files DEPENDS ${_converted_inf_files}) +# module name is used for a custom target creation, so we can put any unique name here +add_driver_inf(media_inf ${INF_FILES}) foreach(item ${UTF8_INF_FILES}) add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/${item}" DESTINATION reactos/inf FOR all) diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index a3be90baa74..d29b95afd82 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -298,7 +298,7 @@ macro(dir_to_num dir var) elseif(${dir} STREQUAL reactos/3rdParty) set(${var} 63) elseif(${dir} STREQUAL reactos/Resources/Themes/Lunar) - set(${var} 64) + set(${var} 64) elseif(${dir} STREQUAL reactos/Resources/Themes/Mizu) set(${var} 65) elseif(${dir} STREQUAL reactos/system32/spool/prtprocs/x64) @@ -908,6 +908,21 @@ function(create_registry_hives) endfunction() +function(add_driver_inf _module) + # Add to the inf files list + foreach(_file ${ARGN}) + set(_converted_item ${CMAKE_CURRENT_BINARY_DIR}/${_file}) + set(_source_item ${CMAKE_CURRENT_SOURCE_DIR}/${_file}) + add_custom_command(OUTPUT "${_converted_item}" + COMMAND native-utf16le "${_source_item}" "${_converted_item}" + DEPENDS native-utf16le "${_source_item}") + add_cd_file(FILE ${_converted_item} DESTINATION reactos/inf FOR all) + list(APPEND _converted_inf_files ${_converted_item}) + endforeach() + + add_custom_target(${_module}_inf_files DEPENDS ${_converted_inf_files}) +endfunction() + if(KDBG) set(ROSSYM_LIB "rossym") else() diff --git a/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt b/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt index e9d37f0edee..2595ebb13a7 100644 --- a/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt +++ b/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt @@ -11,3 +11,4 @@ set_module_type(xboxvmp kernelmodedriver) add_importlibs(xboxvmp ntoskrnl videoprt) add_cd_file(TARGET xboxvmp DESTINATION reactos/system32/drivers FOR all) add_registry_inf(xboxvmp_reg.inf) +add_driver_inf(xboxvmp xboxdisp.inf) diff --git a/media/inf/xboxdisp.inf b/win32ss/drivers/miniport/xboxvmp/xboxdisp.inf similarity index 100% rename from media/inf/xboxdisp.inf rename to win32ss/drivers/miniport/xboxvmp/xboxdisp.inf

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
40
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 April 2020