Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SHIMGVW] Improve window size handling
by Katayama Hirofumi MZ 08 Dec '23

08 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=77ab709b61991c7e137d5… commit 77ab709b61991c7e137d5ea0264a107dd3787208 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Dec 8 14:56:12 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Dec 8 14:56:12 2023 +0900 [SHIMGVW] Improve window size handling CORE-19358 --- dll/win32/shimgvw/shimgvw.c | 41 +++++++++++++++++++---------------------- dll/win32/shimgvw/shimgvw.h | 8 ++++---- 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/dll/win32/shimgvw/shimgvw.c b/dll/win32/shimgvw/shimgvw.c index 6e04d71bcfc..0d9d3dc8342 100644 --- a/dll/win32/shimgvw/shimgvw.c +++ b/dll/win32/shimgvw/shimgvw.c @@ -829,6 +829,12 @@ ImageView_LoadSettings(VOID) DWORD dwSize; LONG nError; + shiSettings.Maximized = FALSE; + shiSettings.X = CW_USEDEFAULT; + shiSettings.Y = CW_USEDEFAULT; + shiSettings.Width = 520; + shiSettings.Height = 400; + nError = RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\ReactOS\\shimgvw", 0, KEY_READ, &hKey); if (nError) return FALSE; @@ -845,16 +851,17 @@ ImageView_SaveSettings(HWND hwnd) { WINDOWPLACEMENT wp; HKEY hKey; + RECT *prc; - ShowWindow(hwnd, SW_HIDE); wp.length = sizeof(WINDOWPLACEMENT); GetWindowPlacement(hwnd, &wp); - shiSettings.Left = wp.rcNormalPosition.left; - shiSettings.Top = wp.rcNormalPosition.top; - shiSettings.Right = wp.rcNormalPosition.right; - shiSettings.Bottom = wp.rcNormalPosition.bottom; - shiSettings.Maximized = (IsZoomed(hwnd) || (wp.flags & WPF_RESTORETOMAXIMIZED)); + prc = &wp.rcNormalPosition; + shiSettings.X = prc->left; + shiSettings.Y = prc->top; + shiSettings.Width = prc->right - prc->left; + shiSettings.Height = prc->bottom - prc->top; + shiSettings.Maximized = IsZoomed(hwnd); if (RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\ReactOS\\shimgvw"), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS) @@ -940,12 +947,6 @@ ImageView_DispWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) static VOID ImageView_InitControls(HWND hwnd) { - MoveWindow(hwnd, shiSettings.Left, shiSettings.Top, - shiSettings.Right - shiSettings.Left, - shiSettings.Bottom - shiSettings.Top, TRUE); - - if (shiSettings.Maximized) ShowWindow(hwnd, SW_MAXIMIZE); - hDispWnd = CreateWindowExW(WS_EX_CLIENTEDGE, WC_STATIC, L"", WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hwnd, NULL, hInstance, NULL); @@ -1182,14 +1183,7 @@ ImageView_CreateWindow(HWND hwnd, LPCWSTR szFileName) DPRINT1("Warning, CoInitializeEx failed with code=%08X\n", (int)hComRes); } - if (!ImageView_LoadSettings()) - { - shiSettings.Maximized = FALSE; - shiSettings.Left = 0; - shiSettings.Top = 0; - shiSettings.Right = 520; - shiSettings.Bottom = 400; - } + ImageView_LoadSettings(); // Initialize GDI+ gdiplusStartupInput.GdiplusVersion = 1; @@ -1214,8 +1208,11 @@ ImageView_CreateWindow(HWND hwnd, LPCWSTR szFileName) LoadStringW(hInstance, IDS_APPTITLE, szBuf, _countof(szBuf)); hMainWnd = CreateWindowExW(WS_EX_WINDOWEDGE, WC_SHIMGVW, szBuf, WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS, - CW_USEDEFAULT, CW_USEDEFAULT, - 0, 0, NULL, NULL, hInstance, NULL); + shiSettings.X, shiSettings.Y, + shiSettings.Width, shiSettings.Height, + NULL, NULL, hInstance, NULL); + if (shiSettings.Maximized) + ShowWindow(hMainWnd, SW_MAXIMIZE); // make sure the path has no quotes on it StringCbCopyW(szInitialFile, sizeof(szInitialFile), szFileName); diff --git a/dll/win32/shimgvw/shimgvw.h b/dll/win32/shimgvw/shimgvw.h index 4f89213a445..76aa255856f 100644 --- a/dll/win32/shimgvw/shimgvw.h +++ b/dll/win32/shimgvw/shimgvw.h @@ -8,10 +8,10 @@ extern HINSTANCE hInstance; typedef struct { BOOL Maximized; - INT Left; - INT Top; - INT Right; - INT Bottom; + INT X; + INT Y; + INT Width; + INT Height; } SHIMGVW_SETTINGS; typedef struct SHIMGVW_FILENODE_INTERNAL

1 0

[reactos] 01/01: [SHIMGVW] Use WM_GETMINMAXINFO instead of WM_SIZING
by Katayama Hirofumi MZ 08 Dec '23

08 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a500b513b0d0c8ed5f8b6… commit a500b513b0d0c8ed5f8b62e18c85259f6a6ecff9 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Dec 8 14:30:35 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Dec 8 14:30:35 2023 +0900 [SHIMGVW] Use WM_GETMINMAXINFO instead of WM_SIZING to limit window size. CORE-19358 --- dll/win32/shimgvw/shimgvw.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dll/win32/shimgvw/shimgvw.c b/dll/win32/shimgvw/shimgvw.c index 9cbea84cec3..6e04d71bcfc 100644 --- a/dll/win32/shimgvw/shimgvw.c +++ b/dll/win32/shimgvw/shimgvw.c @@ -1136,15 +1136,12 @@ ImageView_WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) } break; } - case WM_SIZING: + case WM_GETMINMAXINFO: { - LPRECT pRect = (LPRECT)lParam; - if (pRect->right-pRect->left < 350) - pRect->right = pRect->left + 350; - - if (pRect->bottom-pRect->top < 290) - pRect->bottom = pRect->top + 290; - return TRUE; + MINMAXINFO *pMMI = (MINMAXINFO*)lParam; + pMMI->ptMinTrackSize.x = 350; + pMMI->ptMinTrackSize.y = 290; + return 0; } case WM_SIZE: {

1 0

[reactos] 01/01: [SHIMGVW] Add VK_OEM_PLUS and VK_OEM_MINUS to IDR_ACCELERATOR
by Katayama Hirofumi MZ 08 Dec '23

08 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d178e6bb418f9666b0abf… commit d178e6bb418f9666b0abfaa0a5387ee92dd83217 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Dec 8 14:22:56 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Dec 8 14:22:56 2023 +0900 [SHIMGVW] Add VK_OEM_PLUS and VK_OEM_MINUS to IDR_ACCELERATOR Improve keyboard usability. CORE-19358 --- dll/win32/shimgvw/shimgvw.rc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dll/win32/shimgvw/shimgvw.rc b/dll/win32/shimgvw/shimgvw.rc index ea1fa645a60..b7b0b093da1 100644 --- a/dll/win32/shimgvw/shimgvw.rc +++ b/dll/win32/shimgvw/shimgvw.rc @@ -41,6 +41,8 @@ BEGIN VK_F11, IDC_SLIDE_SHOW, VIRTKEY VK_ADD, IDC_ZOOM_IN, VIRTKEY VK_SUBTRACT, IDC_ZOOM_OUT, VIRTKEY + VK_OEM_PLUS, IDC_ZOOM_IN, VIRTKEY, SHIFT + VK_OEM_MINUS,IDC_ZOOM_OUT, VIRTKEY "K", IDC_ROT_CLOCKW, VIRTKEY, CONTROL "L", IDC_ROT_COUNCW, VIRTKEY, CONTROL VK_DELETE, IDC_DELETE, VIRTKEY

1 0

[reactos] 01/01: [SHIMGVW] Implement IDC_BEST_FIT
by Katayama Hirofumi MZ 08 Dec '23

08 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f519a783cd77ab96ae33… commit 0f519a783cd77ab96ae33df2a02c3eb204f1571d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Dec 8 11:44:03 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Dec 8 11:44:03 2023 +0900 [SHIMGVW] Implement IDC_BEST_FIT - Add two parameters to UpdateZoom. - Enable/disable IDC_BEST_FIT and IDC_REAL_SIZE buttons in UpdateZoom. - Call ResetZoom on IDC_BEST_FIT. CORE-19358 --- dll/win32/shimgvw/shimgvw.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dll/win32/shimgvw/shimgvw.c b/dll/win32/shimgvw/shimgvw.c index 0a84f3e5208..9cbea84cec3 100644 --- a/dll/win32/shimgvw/shimgvw.c +++ b/dll/win32/shimgvw/shimgvw.c @@ -242,7 +242,7 @@ BOOL Anime_Step(DWORD *pdwDelay) return FALSE; } -static void UpdateZoom(UINT NewZoom) +static void UpdateZoom(UINT NewZoom, BOOL bEnableBestFit, BOOL bEnableRealSize) { BOOL bEnableZoomIn, bEnableZoomOut; @@ -270,6 +270,10 @@ static void UpdateZoom(UINT NewZoom) /* Redraw the display window */ InvalidateRect(hDispWnd, NULL, FALSE); + + /* Update toolbar buttons */ + SendMessageW(hToolBar, TB_ENABLEBUTTON, IDC_BEST_FIT, bEnableBestFit); + SendMessageW(hToolBar, TB_ENABLEBUTTON, IDC_REAL_SIZE, bEnableRealSize); } static void ZoomInOrOut(BOOL bZoomIn) @@ -308,7 +312,7 @@ static void ZoomInOrOut(BOOL bZoomIn) } /* Update toolbar and refresh screen */ - UpdateZoom(NewZoom); + UpdateZoom(NewZoom, TRUE, TRUE); } static void ResetZoom(void) @@ -353,7 +357,7 @@ static void ResetZoom(void) } } - UpdateZoom(NewZoom); + UpdateZoom(NewZoom, FALSE, TRUE); } static void pLoadImage(LPCWSTR szOpenFileName) @@ -1055,11 +1059,11 @@ ImageView_WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) break; case IDC_BEST_FIT: - DPRINT1("IDC_BEST_FIT unimplemented\n"); + ResetZoom(); break; case IDC_REAL_SIZE: - UpdateZoom(100); + UpdateZoom(100, TRUE, FALSE); return 0; case IDC_SLIDE_SHOW:

1 0

[reactos] 01/01: [SHIMGVW] Main window class must be "ShImgVw:CPreviewWnd"
by Katayama Hirofumi MZ 08 Dec '23

08 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02312c7bf1f0af1bbb4da… commit 02312c7bf1f0af1bbb4da9d0098d6c3c995977a0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Dec 8 11:01:00 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Dec 8 11:01:00 2023 +0900 [SHIMGVW] Main window class must be "ShImgVw:CPreviewWnd" and window style is (WS_VISIBLE | WS_CLIPSIBLINGS | WS_OVERLAPPEDWINDOW). CORE-19358 --- dll/win32/shimgvw/shimgvw.c | 8 ++++---- dll/win32/shimgvw/shimgvw.h | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dll/win32/shimgvw/shimgvw.c b/dll/win32/shimgvw/shimgvw.c index cb167561af2..0a84f3e5208 100644 --- a/dll/win32/shimgvw/shimgvw.c +++ b/dll/win32/shimgvw/shimgvw.c @@ -1200,19 +1200,19 @@ ImageView_CreateWindow(HWND hwnd, LPCWSTR szFileName) pLoadImage(szFileName); // Create the window - WndClass.lpszClassName = L"shimgvw_window"; + WndClass.lpszClassName = WC_SHIMGVW; WndClass.lpfnWndProc = ImageView_WndProc; WndClass.hInstance = hInstance; WndClass.style = CS_HREDRAW | CS_VREDRAW; WndClass.hIcon = LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_APP_ICON)); - WndClass.hCursor = LoadCursor(NULL, IDC_ARROW); + WndClass.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_ARROW); WndClass.hbrBackground = NULL; /* less flicker */ if (!RegisterClassW(&WndClass)) return -1; LoadStringW(hInstance, IDS_APPTITLE, szBuf, _countof(szBuf)); - hMainWnd = CreateWindowExW(0, L"shimgvw_window", szBuf, - WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_CAPTION, + hMainWnd = CreateWindowExW(WS_EX_WINDOWEDGE, WC_SHIMGVW, szBuf, + WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, NULL, NULL, hInstance, NULL); diff --git a/dll/win32/shimgvw/shimgvw.h b/dll/win32/shimgvw/shimgvw.h index 9bce39c6cbf..4f89213a445 100644 --- a/dll/win32/shimgvw/shimgvw.h +++ b/dll/win32/shimgvw/shimgvw.h @@ -20,3 +20,5 @@ typedef struct SHIMGVW_FILENODE_INTERNAL struct SHIMGVW_FILENODE_INTERNAL *Prev; struct SHIMGVW_FILENODE_INTERNAL *Next; } SHIMGVW_FILENODE; + +#define WC_SHIMGVW L"ShImgVw:CPreviewWnd"

1 0

[reactos] 01/01: [REGEDIT][REG] Limit registry type to 8 hex digits when importing (#6063)
by Whindmar Saksit 04 Dec '23

04 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e4d03f471b4b4ccac2a6c… commit e4d03f471b4b4ccac2a6c952ae6eb89550dbbd7a Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Mon Dec 4 16:46:06 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 4 16:46:06 2023 +0100 [REGEDIT][REG] Limit registry type to 8 hex digits when importing (#6063) Matches Windows and lets the Wine13i test in regedit_winetest pass. --- base/applications/cmdutils/reg/import.c | 5 +++++ base/applications/regedit/regproc.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/base/applications/cmdutils/reg/import.c b/base/applications/cmdutils/reg/import.c index 1d4e3d53536..91442cf06b3 100644 --- a/base/applications/cmdutils/reg/import.c +++ b/base/applications/cmdutils/reg/import.c @@ -276,7 +276,12 @@ static BOOL parse_data_type(struct parser *parser, WCHAR **line) /* "hex(xx):" is special */ val = wcstoul(*line, &end, 16); +#ifdef __REACTOS__ + /* Up to 8 hex digits, "hex(000000002)" is invalid */ + if (*end != ')' || *(end + 1) != ':' || (val == ~0u && errno == ERANGE) || end - *line > 8) +#else if (*end != ')' || *(end + 1) != ':' || (val == ~0u && errno == ERANGE)) +#endif return FALSE; parser->data_type = val; diff --git a/base/applications/regedit/regproc.c b/base/applications/regedit/regproc.c index 1ef1fc9e6c2..f8d448e08c8 100644 --- a/base/applications/regedit/regproc.c +++ b/base/applications/regedit/regproc.c @@ -339,7 +339,12 @@ static BOOL parse_data_type(struct parser *parser, WCHAR **line) /* "hex(xx):" is special */ val = wcstoul(*line, &end, 16); +#ifdef __REACTOS__ + /* Up to 8 hex digits, "hex(000000002)" is invalid */ + if (*end != ')' || *(end + 1) != ':' || (val == ~0u && errno == ERANGE) || end - *line > 8) +#else if (*end != ')' || *(end + 1) != ':' || (val == ~0u && errno == ERANGE)) +#endif return FALSE; parser->data_type = val;

1 0

[reactos] 01/01: [XDK] kefuncs.h: Unduplicate 2 function definitions (#6057)
by Serge Gautherie 04 Dec '23

04 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0c568c0c908863d8e8089… commit 0c568c0c908863d8e80897265d114a3caf74b20a Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Mon Dec 4 13:49:57 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 4 13:49:57 2023 +0100 [XDK] kefuncs.h: Unduplicate 2 function definitions (#6057) --- sdk/include/xdk/kefuncs.h | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/sdk/include/xdk/kefuncs.h b/sdk/include/xdk/kefuncs.h index b1f02f5a9a1..fa6a22150d1 100644 --- a/sdk/include/xdk/kefuncs.h +++ b/sdk/include/xdk/kefuncs.h @@ -139,21 +139,9 @@ VOID NTAPI KeSetSystemAffinityThread( _In_ KAFFINITY Affinity); - -NTKERNELAPI -VOID -NTAPI -KeSetTargetProcessorDpc( - _Inout_ PRKDPC Dpc, - _In_ CCHAR Number); - -NTKERNELAPI -KAFFINITY -NTAPI -KeQueryActiveProcessors(VOID); $endif (_WDMDDK_) -$if (_NTDDK_) +$if (_WDMDDK_ || _NTDDK_) NTKERNELAPI VOID NTAPI @@ -165,8 +153,6 @@ NTKERNELAPI KAFFINITY NTAPI KeQueryActiveProcessors(VOID); -$endif (_NTDDK_) -$if (_WDMDDK_ || _NTDDK_) #endif /* defined(SINGLE_GROUP_LEGACY_API) */ $endif (_WDMDDK_ || _NTDDK_)

1 0

[reactos] 02/02: [IMM32] Include ldrfuncs.h for RtlDllShutdownInProgress (#6071)
by Hermès Bélusca-Maïto 04 Dec '23

04 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1797566d734cac94c9d49… commit 1797566d734cac94c9d4987179dbaa7ce5a37574 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 3 19:57:45 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 4 13:47:39 2023 +0100 [IMM32] Include ldrfuncs.h for RtlDllShutdownInProgress (#6071) --- dll/win32/imm32/ctf.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dll/win32/imm32/ctf.c b/dll/win32/imm32/ctf.c index 1a0e26788ed..0c69428184d 100644 --- a/dll/win32/imm32/ctf.c +++ b/dll/win32/imm32/ctf.c @@ -6,15 +6,13 @@ */ #include "precomp.h" +#include <ndk/ldrfuncs.h> /* for RtlDllShutdownInProgress */ #include <msctf.h> /* for ITfLangBarMgr */ #include <objidl.h> /* for IInitializeSpy */ #include <compat_undoc.h> /* for BaseCheckAppcompatCache */ WINE_DEFAULT_DEBUG_CHANNEL(imm); -/* FIXME: Use proper header */ -BOOLEAN WINAPI RtlDllShutdownInProgress(VOID); - static BOOL Imm32InsideLoaderLock(VOID) { return NtCurrentTeb()->ProcessEnvironmentBlock->LoaderLock->OwningThread ==

1 0

[reactos] 01/02: [NDK] ldrfuncs.h: Add RtlDllShutdownInProgress; make the header C++-compatible (#6071)
by Hermès Bélusca-Maïto 04 Dec '23

04 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=48456d91085026d4489d2… commit 48456d91085026d4489d2f820b8ca793a8bdda3f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 30 17:13:16 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Dec 4 13:47:33 2023 +0100 [NDK] ldrfuncs.h: Add RtlDllShutdownInProgress; make the header C++-compatible (#6071) The function is added here, because it is loader-related and thus making sense there, instead of in rtlfuncs.h. --- sdk/include/ndk/ldrfuncs.h | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/sdk/include/ndk/ldrfuncs.h b/sdk/include/ndk/ldrfuncs.h index 52e682b57fb..9b58e9d5f20 100644 --- a/sdk/include/ndk/ldrfuncs.h +++ b/sdk/include/ndk/ldrfuncs.h @@ -28,6 +28,10 @@ Author: #include <ntimage.h> #endif +#ifdef __cplusplus +extern "C" { +#endif + // // Resource Functions // @@ -59,7 +63,6 @@ LdrEnumResources( _Out_writes_to_(*ResourceCount,*ResourceCount) LDR_ENUM_RESOURCE_INFO *Resources ); - NTSTATUS NTAPI LdrFindResourceDirectory_U( @@ -144,4 +147,17 @@ LdrEnumerateLoadedModules( _In_opt_ PVOID Context ); +#ifdef NTOS_MODE_USER +NTSYSAPI +BOOLEAN +NTAPI +RtlDllShutdownInProgress( + VOID +); +#endif + +#ifdef __cplusplus +} +#endif + #endif

1 0

[reactos] 01/01: [ACPI] Add acpi.rc to CMakeLists (#6089)
by Thamatip Chitpong 04 Dec '23

04 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2dd0c6c32b5bc9498899e… commit 2dd0c6c32b5bc9498899e70c9c1fa5095fe5b346 Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Mon Dec 4 07:17:08 2023 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 4 07:17:08 2023 +0700 [ACPI] Add acpi.rc to CMakeLists (#6089) Fix missing version info. --- drivers/bus/acpi/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/bus/acpi/CMakeLists.txt b/drivers/bus/acpi/CMakeLists.txt index f9ee29be83d..3535cf5604c 100644 --- a/drivers/bus/acpi/CMakeLists.txt +++ b/drivers/bus/acpi/CMakeLists.txt @@ -199,7 +199,10 @@ list(APPEND ACPI_SOURCE buspdo.c main.c) -add_library(acpi MODULE ${ACPI_SOURCE}) +add_library(acpi MODULE + ${ACPI_SOURCE} + acpi.rc) + set_module_type(acpi kernelmodedriver) target_link_libraries(acpi wdmguid acpica memcmp strtol ${PSEH_LIB}) add_importlibs(acpi ntoskrnl hal)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs