Ros-diffs January 2022

ros-diffs@reactos.org

28 participants
173 discussions

[reactos] 02/06: [BOOTDATA] hivesys.inf: remove UseNewKey setting

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5afea63e6618c1448a037… commit 5afea63e6618c1448a0372c0237703724a97eef9 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon Dec 27 20:29:07 2021 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Jan 6 17:45:03 2022 +0100 [BOOTDATA] hivesys.inf: remove UseNewKey setting Neither LiveCD nor BootCD 2nd stage are able to use new registry key for videoprt, as they depend of some PnP entries which are unavailable. This line was added in a7ebc6bd5c7a332bacce91594589d6bfaea2bce7 (r43711) Note that it doesn't change much for ReactOS yet, as neither videoprt.sys nor win32k.sys take care of this parameter. --- boot/bootdata/hivesys.inf | 1 - 1 file changed, 1 deletion(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 3647ab22fec..43142022444 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -1480,7 +1480,6 @@ HKLM,"SYSTEM\CurrentControlSet\Control\ServiceGroupOrder","List",0x00010000, \ ; Set the timeout for directx/ReactX graphic surface lock see _EDD_DIRECTDRAW_GLOBAL struct for more info HKLM,"SYSTEM\CurrentControlSet\Control\GraphicsDrivers\DCI","Timeout",0x00010001,0x00000007 -HKLM,"SYSTEM\CurrentControlSet\Control\GraphicsDrivers\UseNewKey",,0x00000012 ; Group order, the first DWORD is the count of entries, ; the following dwords are the tag entries for the load order.

2 years, 8 months

[reactos] 01/06: [SETUPLIB] Upgrade display settings even if no hardware profile exists

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cdae92ed8cdb159985c66… commit cdae92ed8cdb159985c66d291600998a5f322dc0 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon Dec 27 14:17:45 2021 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Jan 6 17:45:03 2022 +0100 [SETUPLIB] Upgrade display settings even if no hardware profile exists --- base/setup/lib/settings.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/base/setup/lib/settings.c b/base/setup/lib/settings.c index f958d846960..d392511dd2e 100644 --- a/base/setup/lib/settings.c +++ b/base/setup/lib/settings.c @@ -894,6 +894,17 @@ ProcessDisplayRegistry( Status = NtOpenKey(&KeyHandle, KEY_SET_VALUE, &ObjectAttributes); + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + { + /* Try without Hardware Profile part */ + RtlStringCchPrintfW(RegPath, ARRAYSIZE(RegPath), + L"System\\CurrentControlSet\\Services\\%s\\Device0", + ServiceName); + RtlInitUnicodeString(&KeyName, RegPath); + Status = NtOpenKey(&KeyHandle, + KEY_SET_VALUE, + &ObjectAttributes); + } if (!NT_SUCCESS(Status)) { DPRINT1("NtOpenKey() failed (Status %lx)\n", Status);

2 years, 8 months

[reactos] 01/01: [SDK:REACTOS] Move our ROS-specific header-only UI libraries into a "ui" sub-folder. (#4205)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a6bf77e7b9adc1e20e717… commit a6bf77e7b9adc1e20e7170a05f179f7e25b36653 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 26 02:15:30 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jan 6 02:17:25 2022 +0100 [SDK:REACTOS] Move our ROS-specific header-only UI libraries into a "ui" sub-folder. (#4205) --- base/applications/rapps/gui.cpp | 2 +- base/applications/rapps/include/appview.h | 2 +- base/applications/rapps/include/crichedit.h | 2 +- base/applications/rapps/include/gui.h | 2 +- base/applications/rapps/loaddlg.cpp | 2 +- base/shell/explorer/precomp.h | 4 ++-- dll/shellext/acppage/precomp.h | 2 +- dll/shellext/zipfldr/precomp.h | 2 +- dll/win32/browseui/CAutoComplete.h | 4 ++-- dll/win32/browseui/internettoolbar.cpp | 2 +- dll/win32/shell32/CDefView.cpp | 2 +- dll/win32/shell32/shellmenu/shellmenu.h | 2 +- dll/win32/shell32/wine/brsfolder.c | 2 +- sdk/include/reactos/{ => ui}/layout.h | 0 sdk/include/reactos/{ => ui}/rosctrls.h | 0 sdk/include/reactos/{ => ui}/rosdlgs.h | 0 16 files changed, 15 insertions(+), 15 deletions(-) diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index a7590e51a43..ec2b15366e0 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -25,7 +25,7 @@ #include <atlwin.h> #include <wininet.h> #include <shellutils.h> -#include <rosctrls.h> +#include <ui/rosctrls.h> #include <gdiplus.h> #include <math.h> diff --git a/base/applications/rapps/include/appview.h b/base/applications/rapps/include/appview.h index 206f99e37ab..d318c0903e7 100644 --- a/base/applications/rapps/include/appview.h +++ b/base/applications/rapps/include/appview.h @@ -14,7 +14,7 @@ #include <atlwin.h> #include <wininet.h> #include <shellutils.h> -#include <rosctrls.h> +#include <ui/rosctrls.h> #include <gdiplus.h> #include <math.h> diff --git a/base/applications/rapps/include/crichedit.h b/base/applications/rapps/include/crichedit.h index e3cd93345d0..6c6a2222cef 100644 --- a/base/applications/rapps/include/crichedit.h +++ b/base/applications/rapps/include/crichedit.h @@ -1,5 +1,5 @@ #pragma once -#include <rosctrls.h> +#include <ui/rosctrls.h> class CRichEdit : public CWindow diff --git a/base/applications/rapps/include/gui.h b/base/applications/rapps/include/gui.h index 738379d7a1e..3a000b1ba60 100644 --- a/base/applications/rapps/include/gui.h +++ b/base/applications/rapps/include/gui.h @@ -15,7 +15,7 @@ #include <atlwin.h> #include <wininet.h> #include <shellutils.h> -#include <rosctrls.h> +#include <ui/rosctrls.h> #include <gdiplus.h> #include <math.h> diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index fbe85205b19..18d67d347c4 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -40,7 +40,7 @@ #include <debug.h> -#include <rosctrls.h> +#include <ui/rosctrls.h> #include <windowsx.h> #include <process.h> #undef SubclassWindow diff --git a/base/shell/explorer/precomp.h b/base/shell/explorer/precomp.h index 86c5b80a284..efce3c2a233 100644 --- a/base/shell/explorer/precomp.h +++ b/base/shell/explorer/precomp.h @@ -43,8 +43,8 @@ #include <shlguid_undoc.h> #include <undocshell.h> -#include <rosctrls.h> -#include <rosdlgs.h> +#include <ui/rosctrls.h> +#include <ui/rosdlgs.h> #include <shellutils.h> #include "tmschema.h" diff --git a/dll/shellext/acppage/precomp.h b/dll/shellext/acppage/precomp.h index 129b6f84479..7f239da884d 100644 --- a/dll/shellext/acppage/precomp.h +++ b/dll/shellext/acppage/precomp.h @@ -17,7 +17,7 @@ #include <atlsimpcoll.h> #include <atlstr.h> #include <atlwin.h> -#include <rosdlgs.h> +#include <ui/rosdlgs.h> ULONG DbgPrint(PCH Format,...); #include <apphelp.h> diff --git a/dll/shellext/zipfldr/precomp.h b/dll/shellext/zipfldr/precomp.h index f21ce4873d5..b5845168073 100644 --- a/dll/shellext/zipfldr/precomp.h +++ b/dll/shellext/zipfldr/precomp.h @@ -12,7 +12,7 @@ #include <atlcom.h> #include <atlcoll.h> #include <atlstr.h> -#include <rosdlgs.h> +#include <ui/rosdlgs.h> #include <shlwapi.h> #include <shellapi.h> #include <strsafe.h> diff --git a/dll/win32/browseui/CAutoComplete.h b/dll/win32/browseui/CAutoComplete.h index af3bddabde7..97d633c5db2 100644 --- a/dll/win32/browseui/CAutoComplete.h +++ b/dll/win32/browseui/CAutoComplete.h @@ -21,8 +21,8 @@ */ #pragma once -#include "atltypes.h" -#include "rosctrls.h" +#include <atltypes.h> +#include <ui/rosctrls.h> class CACListView; class CACScrollBar; diff --git a/dll/win32/browseui/internettoolbar.cpp b/dll/win32/browseui/internettoolbar.cpp index 5c35bfdcaa3..bacc5110ade 100644 --- a/dll/win32/browseui/internettoolbar.cpp +++ b/dll/win32/browseui/internettoolbar.cpp @@ -1037,7 +1037,7 @@ HRESULT STDMETHODCALLTYPE CInternetToolbar::InitNew() hResult = IUnknown_GetWindow(menuBar, &fMenuBandWindow); fMenuBar.Attach(menuBar.Detach()); // transfer the ref count - // FIXME: The ros Rebar does not properly support fixed-size items such as the brandband, + // FIXME: The ROS Rebar does not properly support fixed-size items such as the brandband, // and it will put them in their own row, sized to take up the whole row. #if 0 /* Create and attach the brand/logo to the rebar */ diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 1a15523491d..8a4fc939789 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -36,7 +36,7 @@ TODO: #include "precomp.h" #include <atlwin.h> -#include <rosctrls.h> +#include <ui/rosctrls.h> WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/dll/win32/shell32/shellmenu/shellmenu.h b/dll/win32/shell32/shellmenu/shellmenu.h index 1cc7c7a0cd1..411239240e8 100644 --- a/dll/win32/shell32/shellmenu/shellmenu.h +++ b/dll/win32/shell32/shellmenu/shellmenu.h @@ -52,7 +52,7 @@ #include <undocuser.h> #include <shellutils.h> -#include <rosctrls.h> +#include <ui/rosctrls.h> #include "../shresdef.h" #include <wine/debug.h> diff --git a/dll/win32/shell32/wine/brsfolder.c b/dll/win32/shell32/wine/brsfolder.c index b9983d1f1f0..84c7c63a5f0 100644 --- a/dll/win32/shell32/wine/brsfolder.c +++ b/dll/win32/shell32/wine/brsfolder.c @@ -40,7 +40,7 @@ #include "shresdef.h" #ifdef __REACTOS__ #include <shlwapi.h> - #include "layout.h" /* Resizable window */ + #include "ui/layout.h" /* Resizable window */ #endif WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/sdk/include/reactos/layout.h b/sdk/include/reactos/ui/layout.h similarity index 100% rename from sdk/include/reactos/layout.h rename to sdk/include/reactos/ui/layout.h diff --git a/sdk/include/reactos/rosctrls.h b/sdk/include/reactos/ui/rosctrls.h similarity index 100% rename from sdk/include/reactos/rosctrls.h rename to sdk/include/reactos/ui/rosctrls.h diff --git a/sdk/include/reactos/rosdlgs.h b/sdk/include/reactos/ui/rosdlgs.h similarity index 100% rename from sdk/include/reactos/rosdlgs.h rename to sdk/include/reactos/ui/rosdlgs.h

2 years, 8 months

[reactos] 01/01: [WINLOGON] Start screen saver as current user (#4135)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9db24e33c7d3609bade7a… commit 9db24e33c7d3609bade7a37a55af79cb4a83a9b2 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Wed Jan 5 19:10:56 2022 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 6 04:10:56 2022 +0300 [WINLOGON] Start screen saver as current user (#4135) This fixes displaying user-defined text for 3D Text ScreenSaver. Also set the process to IDLE_PRIORITY_CLASS. CORE-17875 --- base/system/winlogon/screensaver.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/base/system/winlogon/screensaver.c b/base/system/winlogon/screensaver.c index 6bd681ca39e..6f37bf57362 100644 --- a/base/system/winlogon/screensaver.c +++ b/base/system/winlogon/screensaver.c @@ -332,16 +332,17 @@ StartScreenSaver( /* FIXME: Run the screen saver on the secure screen saver desktop if required */ StartupInfo.lpDesktop = L"WinSta0\\Default"; - ret = CreateProcessW(szApplicationName, - szCommandLine, - NULL, - NULL, - FALSE, - 0, - NULL, - NULL, - &StartupInfo, - &ProcessInformation); + ret = CreateProcessAsUserW(Session->UserToken, + szApplicationName, + szCommandLine, + NULL, + NULL, + FALSE, + IDLE_PRIORITY_CLASS, + NULL, + NULL, + &StartupInfo, + &ProcessInformation); if (!ret) { ERR("WL: Unable to start %S, error %lu\n", szApplicationName, GetLastError());

2 years, 8 months

[reactos] 01/01: [VIDEOPRT] Match Zw*Key() DesiredAccess values (#4145)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40b9ee0ae0a43ec963e5c… commit 40b9ee0ae0a43ec963e5c41e6fce0a037e904c20 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Jan 6 02:04:09 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 6 04:04:09 2022 +0300 [VIDEOPRT] Match Zw*Key() DesiredAccess values (#4145) Even if the kernel mode does not care, this makes it clear. --- win32ss/drivers/videoprt/registry.c | 4 ++-- win32ss/drivers/videoprt/videoprt.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/win32ss/drivers/videoprt/registry.c b/win32ss/drivers/videoprt/registry.c index f5d7f4084b1..76b3ead0846 100644 --- a/win32ss/drivers/videoprt/registry.c +++ b/win32ss/drivers/videoprt/registry.c @@ -339,7 +339,7 @@ IntSetupDeviceSettingsKey( OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = ZwOpenKey(&SourceKeyHandle, KEY_WRITE, &ObjectAttributes); + Status = ZwOpenKey(&SourceKeyHandle, KEY_READ, &ObjectAttributes); if (Status != STATUS_SUCCESS) { ERR_(VIDEOPRT, "ZwOpenKey failed for settings key: status 0x%lx\n", Status); @@ -564,7 +564,7 @@ IntCreateNewRegistryPath( OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = ZwOpenKey(&NewKey, KEY_READ, &ObjectAttributes); + Status = ZwOpenKey(&NewKey, KEY_WRITE, &ObjectAttributes); if (!NT_SUCCESS(Status)) { ERR_(VIDEOPRT, "Failed to open settings key. Status 0x%lx\n", Status); diff --git a/win32ss/drivers/videoprt/videoprt.c b/win32ss/drivers/videoprt/videoprt.c index 35580904a7b..6f94d2a788d 100644 --- a/win32ss/drivers/videoprt/videoprt.c +++ b/win32ss/drivers/videoprt/videoprt.c @@ -617,7 +617,7 @@ IntLoadRegistryParameters(VOID) NULL); Status = ZwCreateKey(&KeyHandle, - KEY_WRITE, + READ_CONTROL, // Non-0 placeholder: no use for this handle. &ObjectAttributes, 0, NULL,

2 years, 8 months

[reactos] 01/01: [WINDOWSCODECS] Add converter for WICPixelFormat32bppRGBA (#4239)

by Thomas Csovcsity

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cfaeaaa993d55a72e6925… commit cfaeaaa993d55a72e6925236355ef4ce9eca0063 Author: Thomas Csovcsity <46087964+thc13(a)users.noreply.github.com> AuthorDate: Thu Jan 6 01:56:45 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 6 03:56:45 2022 +0300 [WINDOWSCODECS] Add converter for WICPixelFormat32bppRGBA (#4239) This fixes CORE-15708 "PdfSam 3.3.5 setup can not decode bmp" https://jira.reactos.org/browse/CORE-15708 Wine does not have this issue, but it did not have it back when last sync to WineStaging-4.18 was done. This commit is as near as possible to actual wine-7.0-rc3 version. This wine code uses reverse_bgr8 instead of own convert_rgba_to_bgra, but it leads to wrong colors. --- dll/win32/windowscodecs/bmpdecode.c | 1 + dll/win32/windowscodecs/converter.c | 52 +++++++++++++++++++++++------ dll/win32/windowscodecs/main.c | 21 ++++++++++++ dll/win32/windowscodecs/wincodecs_private.h | 1 + 4 files changed, 65 insertions(+), 10 deletions(-) diff --git a/dll/win32/windowscodecs/bmpdecode.c b/dll/win32/windowscodecs/bmpdecode.c index f5a2589d68a..5ee4ac38ccb 100644 --- a/dll/win32/windowscodecs/bmpdecode.c +++ b/dll/win32/windowscodecs/bmpdecode.c @@ -744,6 +744,7 @@ static const struct bitfields_format bitfields_formats[] = { {16,0xf800,0x7e0,0x1f,0,&GUID_WICPixelFormat16bppBGR565,BmpFrameDecode_ReadUncompressed}, {32,0xff0000,0xff00,0xff,0,&GUID_WICPixelFormat32bppBGR,BmpFrameDecode_ReadUncompressed}, {32,0xff0000,0xff00,0xff,0xff000000,&GUID_WICPixelFormat32bppBGRA,BmpFrameDecode_ReadUncompressed}, + {32,0xff000000,0xff0000,0xff00,0xff,&GUID_WICPixelFormat32bppRGBA,BmpFrameDecode_ReadUncompressed}, {32,0xff,0xff00,0xff0000,0,&GUID_WICPixelFormat32bppBGR,BmpFrameDecode_ReadRGB8}, {0} }; diff --git a/dll/win32/windowscodecs/converter.c b/dll/win32/windowscodecs/converter.c index dcc2f05693f..cac2ac1aa5a 100644 --- a/dll/win32/windowscodecs/converter.c +++ b/dll/win32/windowscodecs/converter.c @@ -722,6 +722,15 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe pbBuffer[cbStride*y+4*x+3] = 0xff; } return S_OK; + case format_32bppRGBA: + if (prc) + { + HRESULT res; + res = IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); + if (FAILED(res)) return res; + convert_rgba_to_bgra(4, pbBuffer, prc->Width, prc->Height, cbStride); + } + return S_OK; case format_32bppBGRA: if (prc) return IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); @@ -859,6 +868,7 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe } return S_OK; default: + FIXME("Unimplemented conversion path!\n"); return WINCODEC_ERR_UNSUPPORTEDOPERATION; } } @@ -1038,6 +1048,7 @@ static HRESULT copypixels_to_24bppBGR(struct FormatConverter *This, const WICRec case format_32bppBGR: case format_32bppBGRA: case format_32bppPBGRA: + case format_32bppRGBA: if (prc) { HRESULT res; @@ -1061,17 +1072,38 @@ static HRESULT copypixels_to_24bppBGR(struct FormatConverter *This, const WICRec { srcrow = srcdata; dstrow = pbBuffer; - for (y=0; y<prc->Height; y++) { - srcpixel=srcrow; - dstpixel=dstrow; - for (x=0; x<prc->Width; x++) { - *dstpixel++=*srcpixel++; /* blue */ - *dstpixel++=*srcpixel++; /* green */ - *dstpixel++=*srcpixel++; /* red */ - srcpixel++; /* alpha */ + + if (source_format == format_32bppRGBA) + { + for (y = 0; y < prc->Height; y++) + { + srcpixel = srcrow; + dstpixel = dstrow; + for (x = 0; x < prc->Width; x++) { + *dstpixel++ = srcpixel[2]; /* blue */ + *dstpixel++ = srcpixel[1]; /* green */ + *dstpixel++ = srcpixel[0]; /* red */ + srcpixel += 4; + } + srcrow += srcstride; + dstrow += cbStride; + } + } + else + { + for (y = 0; y < prc->Height; y++) + { + srcpixel = srcrow; + dstpixel = dstrow; + for (x = 0; x < prc->Width; x++) { + *dstpixel++ = *srcpixel++; /* blue */ + *dstpixel++ = *srcpixel++; /* green */ + *dstpixel++ = *srcpixel++; /* red */ + srcpixel++; /* alpha */ + } + srcrow += srcstride; + dstrow += cbStride; } - srcrow += srcstride; - dstrow += cbStride; } } diff --git a/dll/win32/windowscodecs/main.c b/dll/win32/windowscodecs/main.c index 78281519b81..751f4625133 100644 --- a/dll/win32/windowscodecs/main.c +++ b/dll/win32/windowscodecs/main.c @@ -228,6 +228,27 @@ void reverse_bgr8(UINT bytesperpixel, LPBYTE bits, UINT width, UINT height, INT } } +void convert_rgba_to_bgra(UINT bytesperpixel, LPBYTE bits, UINT width, UINT height, INT stride) +{ + UINT x, y; + BYTE *pixel, temp; + + for (y=0; y<height; y++) + { + pixel = bits + stride * y; + + for (x=0; x<width; x++) + { + temp = pixel[3]; + pixel[3] = pixel[0]; + pixel[0] = pixel[1]; + pixel[1] = pixel[2]; + pixel[2] = temp; + pixel += bytesperpixel; + } + } +} + HRESULT get_pixelformat_bpp(const GUID *pixelformat, UINT *bpp) { HRESULT hr; diff --git a/dll/win32/windowscodecs/wincodecs_private.h b/dll/win32/windowscodecs/wincodecs_private.h index ff192c26399..d5172b6befe 100644 --- a/dll/win32/windowscodecs/wincodecs_private.h +++ b/dll/win32/windowscodecs/wincodecs_private.h @@ -184,6 +184,7 @@ extern HRESULT write_source(IWICBitmapFrameEncode *iface, INT width, INT height) DECLSPEC_HIDDEN; extern void reverse_bgr8(UINT bytesperpixel, LPBYTE bits, UINT width, UINT height, INT stride) DECLSPEC_HIDDEN; +extern void convert_rgba_to_bgra(UINT bytesperpixel, LPBYTE bits, UINT width, UINT height, INT stride) DECLSPEC_HIDDEN; extern HRESULT get_pixelformat_bpp(const GUID *pixelformat, UINT *bpp) DECLSPEC_HIDDEN;

2 years, 8 months

[reactos] 01/01: [RPCRT4] Fix implicit in attribute handling in write_param_fs()

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1723c223e3032fcc460e7… commit 1723c223e3032fcc460e7c212ab5b72be9238351 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon May 24 08:56:17 2021 +0200 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Jan 6 03:48:29 2022 +0300 [RPCRT4] Fix implicit in attribute handling in write_param_fs() Cherry-pick wine-5.0-rc1-50-g1aaf870 by Jacek Caban. https://source.winehq.org/git/wine.git/?a=commit;h=1aaf870039dfb8419ae060d8… (OLEAUT32_WINETEST part shall be imported later.) CORE-17884 --- dll/win32/rpcrt4/ndr_typelib.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dll/win32/rpcrt4/ndr_typelib.c b/dll/win32/rpcrt4/ndr_typelib.c index ac101067c8d..5aa98bb9c7b 100644 --- a/dll/win32/rpcrt4/ndr_typelib.c +++ b/dll/win32/rpcrt4/ndr_typelib.c @@ -1029,16 +1029,18 @@ static HRESULT write_param_fs(ITypeInfo *typeinfo, unsigned char *type, BOOL is_return, unsigned short *stack_offset) { USHORT param_flags = desc->paramdesc.wParamFlags; - int is_in = param_flags & PARAMFLAG_FIN; - int is_out = param_flags & PARAMFLAG_FOUT; TYPEDESC *tdesc = &desc->tdesc, *tfs_tdesc; unsigned short server_size; unsigned short stack_size = get_stack_size(typeinfo, tdesc); unsigned char basetype; unsigned short flags; + int is_in, is_out; size_t off = 0; HRESULT hr; + is_out = param_flags & PARAMFLAG_FOUT; + is_in = (param_flags & PARAMFLAG_FIN) || (!is_out && !is_return); + hr = get_param_info(typeinfo, tdesc, is_in, is_out, &server_size, &flags, &basetype, &tfs_tdesc);

2 years, 8 months

[reactos] 01/01: [TRANSLATION] Update Hungarian (hu-HU) translation (#4220)

by Tibor Lajos Füzi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a4d5dbeaa4bb8141243c… commit 1a4d5dbeaa4bb8141243cf86f2e802beb048144c Author: Tibor Lajos Füzi <tibor.fuzi(a)gmail.com> AuthorDate: Wed Jan 5 18:38:38 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 5 20:38:38 2022 +0300 [TRANSLATION] Update Hungarian (hu-HU) translation (#4220) [LABEL] Improve existing and add missing translations [NOTEPAD] Fix a typo [FORMAT] Improve existing translation [REGSVR32] Improve existing translation [RUNDLL32] Improve existing translation [CPL:DESK] Fix typos --- base/applications/cmdutils/label/lang/hu-HU.rc | 24 +++++++------- base/applications/notepad/lang/hu-HU.rc | 2 +- base/system/format/lang/hu-HU.rc | 44 +++++++++++++------------- base/system/regsvr32/lang/hu-HU.rc | 16 +++++----- base/system/rundll32/lang/hu-HU.rc | 4 +-- dll/cpl/desk/lang/hu-HU.rc | 4 +-- 6 files changed, 46 insertions(+), 48 deletions(-) diff --git a/base/applications/cmdutils/label/lang/hu-HU.rc b/base/applications/cmdutils/label/lang/hu-HU.rc index ce2f033c3bc..b837e3491fb 100644 --- a/base/applications/cmdutils/label/lang/hu-HU.rc +++ b/base/applications/cmdutils/label/lang/hu-HU.rc @@ -4,18 +4,16 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN -// STRING_LABEL_HELP "A kötet címkéjét megjeleníti, vagy megváltoztatja.\n\n\ -//LABEL [meghajtó:] [új_címke]\n" - STRING_LABEL_HELP "Creates, changes or deletes the volume label of a disk.\n\n\ -LABEL [drive:][label]\n\n\ - drive: Specifies the drive letter of a drive.\n\ - label Specifies the label of the drive." - STRING_LABEL_TEXT1 "A (%c) meghajtóban lévõ kötet címkéje %s\n" - STRING_LABEL_TEXT2 "A (%c) megjajtóban lévõ kötetnek nincs címkéje.\n" - STRING_LABEL_TEXT3 "A kötet sorozatszáma %04X-%04X\n" - STRING_LABEL_TEXT4 "Új kötetcímke (32 betû, ENTER ha üres)? " - STRING_LABEL_PROMPT "Delete current volume label (Y/N)? " - STRING_LABEL_OPTIONS "YN" + STRING_LABEL_HELP "Létrehozza, megváltoztatja vagy törli a kötet címkéjét.\n\n\ +LABEL [meghajtó:][címke]\n\n\ + meghajtó: Megadja a meghajtó betűjelét.\n\ + címke Megadja a meghajtó címkéjét." + STRING_LABEL_TEXT1 "A(z) %c: meghajtóban lévő kötet címkéje %s\n" + STRING_LABEL_TEXT2 "A(z) %c: meghajtóban lévő kötetnek nincs címkéje.\n" + STRING_LABEL_TEXT3 "A kötet sorozatszáma: %04X-%04X\n" + STRING_LABEL_TEXT4 "Új kötetcímke (32 betű, ENTER ha üres)? " + STRING_LABEL_PROMPT "Törli a jelenlegi kötetcímkét? (I/N)? " + STRING_LABEL_OPTIONS "IN" STRING_ERROR_INVALID_DRIVE "Érvénytelen meghajtó\n" - STRING_ERROR_INVALID_LABEL "Invalid volume label\n" + STRING_ERROR_INVALID_LABEL "Érvénytelen kötetcímke\n" END diff --git a/base/applications/notepad/lang/hu-HU.rc b/base/applications/notepad/lang/hu-HU.rc index b3e2a21697d..48d1086851f 100644 --- a/base/applications/notepad/lang/hu-HU.rc +++ b/base/applications/notepad/lang/hu-HU.rc @@ -44,7 +44,7 @@ BEGIN MENUITEM "Tör&lés\tDel", CMD_DELETE MENUITEM SEPARATOR MENUITEM "&Keresés...", CMD_SEARCH - MENUITEM "Köve&tkezõ keresése\tF3", CMD_SEARCH_NEXT + MENUITEM "Köve&tkező keresése\tF3", CMD_SEARCH_NEXT MENUITEM "Csere...\tCtrl+H", CMD_REPLACE MENUITEM "Ugrás...\tCtrl+G", CMD_GOTO MENUITEM SEPARATOR diff --git a/base/system/format/lang/hu-HU.rc b/base/system/format/lang/hu-HU.rc index e9bed183ef3..4cf8f2bb988 100644 --- a/base/system/format/lang/hu-HU.rc +++ b/base/system/format/lang/hu-HU.rc @@ -4,45 +4,45 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN - STRING_HELP "Használat: %s kötet: [-FS:állományrendszer] [-V:címke] [-Q] [-A:méret] [-C]\n\n\ - [kötet:] A meghajtóbetûjelet adja meg (kettõsponttal a végén).\n\ - -FS:állományrendszer Az állományrendszer típusát adja meg (%s).\n\ - -V:címke A Kötetcímke neve.\n\ + STRING_HELP "Használat: %s kötet: [-FS:fájlrendszer] [-V:címke] [-Q] [-A:méret] [-C]\n\n\ + [kötet:] A formázandó meghajtó betűjelet adja meg.\n\ + -FS:fájlrendszer A fájlrendszer típusát adja meg (%s).\n\ + -V:címke A kötetcímkét adja meg.\n\ -Q Gyorsformázást hajt végre.\n\ - -A:méret Felülbírálja az alapértelmezett szektorcsoport-\n\ - méretet. Általános használathoz az alapértelmezett\n\ + -A:méret Felülbírálja az alapértelmezett szektorcsoport méretet.\n\ + Általános használathoz az alapértelmezett\n\ értékek ajánlottak.\n\ - Az NTFS a következõ értékeket támogatja: 512, 1024, 2048,\n\ + Az NTFS a következő értékeket támogatja: 512, 1024, 2048,\n\ 4096, 8192, 16K, 32K, 64K.\n\ - A FAT a következõ értékeket támogatja: 8192, 16K, 32K, 64K,\n\ + A FAT a következő értékeket támogatja: 8192, 16K, 32K, 64K,\n\ 128K, 256K.\n\ NTFS-tömörítés nem lehetséges 4096 bájtnál nagyobb\n\ szektorcsoportoknál.\n\ - -C Az új köteten létrehozott állományok alapból tömörítve jönnek\n\ - létre.\n\n" + -C Az új köteten létrehozott állományok alapból tömörítve\n\ + jönnek létre.\n\n" STRING_COMPLETE "%lu százalék befejezve.\r" - STRING_FORMAT_FAIL "A FormatEx végrehajtása sikertelenül fejezõdött be.\n\n" - STRING_NO_SUPPORT "A Mûvelet Nem Támogatott" - STRING_FMIFS_FAIL "Nem találtam meg az FMIFS kezdõpontját.\n\n" + STRING_FORMAT_FAIL "A FormatEx végrehajtása sikertelenül fejeződött be.\n\n" + STRING_NO_SUPPORT "A művelet nem támogatott" + STRING_FMIFS_FAIL "Az FMIFS belépési pontok nem találhatók.\n\n" STRING_UNKNOW_ARG "Érvénytelen paraméter: %s\n" STRING_DRIVE_PARM "Hiányzik a meghajtó meghatározás.\n\n" STRING_ERROR_DRIVE_TYPE "Nem sikerült lekérdezni a meghajtó típusát" - STRING_INSERT_DISK "Helyezzen be új lemezt a következõ meghajtóba: %C:\\ Ha készen áll, nyomja meg az ENTER billenytût..." + STRING_INSERT_DISK "Helyezzen be új lemezt a következő meghajtóba: %C:\nHa készen áll, nyomja meg az ENTER billentyűt..." STRING_NO_VOLUME "Nem sikerült megállapítani címkét" STRING_NO_VOLUME_SIZE "Nem sikerült megállapítani a kötet méretét" - STRING_FILESYSTEM "A állományrendszer típusa %s.\n" + STRING_FILESYSTEM "A fájlrendszer típusa %s.\n" STRING_LABEL_NAME_EDIT "Adja meg a címkét az alábbi meghajtóhoz: %C: " STRING_ERROR_LABEL "Érvénytelen címkét adott meg a meghajtóhoz.\n" - STRING_YN_FORMAT "\nFIGYELMEZTETÉS: A NEM CSERÉLHETÕ LEMEZMEGHAJTÓN (%C:) MINDEN ADAT EL FOG VESZNI.\n\ + STRING_YN_FORMAT "\nFIGYELMEZTETÉS: A NEM CSERÉLHETŐ LEMEZMEGHAJTÓN (%C:) MINDEN ADAT EL FOG VESZNI.\n\ \nFolytatja a formázást (I/N)? " STRING_YES_NO_FAQ "IN" - STRING_VERIFYING "Ellenõrzés" + STRING_VERIFYING "Ellenőrzés" STRING_FAST_FMT "Gyorsformázás" - STRING_CREATE_FSYS "Állományrendszer létrehozása.\n" + STRING_CREATE_FSYS "Fájlrendszer létrehozása.\n" STRING_FMT_COMPLETE "Formázás befejezve.\n" - STRING_VOL_COMPRESS "A Kötet nem támogatja a tömörítést.\n" + STRING_VOL_COMPRESS "A kötet nem támogatja a tömörítést.\n" STRING_ENTER_LABEL "Kötetcímke (legfeljebb 11 karakter, ENTER ha nincs)? " - STRING_NO_LABEL "A kötet nem kapott címkét" - STRING_FREE_SPACE "\n%I64d bájt teljes lemezterület.\n%I64d bájt elérhetõ a köteten.\n" - STRING_SERIAL_NUMBER "\nA Kötet sorozatszáma: %04X-%04X\n" + STRING_NO_LABEL "Nem sikerült elnevezni a kötetet" + STRING_FREE_SPACE "\n%I64d bájt teljes lemezterület.\n%I64d bájt elérhető a köteten.\n" + STRING_SERIAL_NUMBER "\nA kötet sorozatszáma: %04X-%04X\n" END diff --git a/base/system/regsvr32/lang/hu-HU.rc b/base/system/regsvr32/lang/hu-HU.rc index 893da8dcd9d..0703cb00642 100644 --- a/base/system/regsvr32/lang/hu-HU.rc +++ b/base/system/regsvr32/lang/hu-HU.rc @@ -8,14 +8,14 @@ BEGIN /u - Kiszolgáló regisztrációjának megszüntetése\n\ /s - Néma üzemmód, üzenetek megjelenítése nélkül\n\ /c - Parancssori kimenet\n\ -/i - DllInstall meghívása a következõ [parancssor] átadásával; /u hívással használva a dll eltávolítása\n\ +/i - DllInstall meghívása a következő [parancssor] átadásával; /u hívással használva a dll eltávolítása\n\ /n - Ne hívja meg a DllRegisterServer függvényt; ezt a beállítást a /i kapcsolóval együtt kell használni" IDS_NoDllSpecified "Nincs megadva DLL név." - IDS_InvalidFlag "Meghatároztlan belépési pont: %s" - IDS_SwitchN_NoI "Meghatározatlan belépési pont: /n csak az /i kapcsolóval használható." - IDS_DllNotLoaded "Hiba a LoadLibrary('%s') függvényben.\nA visszaadott kód: 0x%08x." - IDS_MissingEntry "A(z) %s betöltõdése megtörtént, de nem található a következõ belépési pont: %s.\n\n\ -A(z) %s -t nem lehet hozzáadni, vagy a(z) %s egy érvénytelen változata van a memóriában. Használja a PView-et hogy megkeresse és eltávolítsa azt." - IDS_FailureMessage "A(z) %s sikertelen a következõben: %s.\nA visszaadott kód: 0x%08x" - IDS_SuccessMessage "A(z) %s sikerült a következõben: %s." + IDS_InvalidFlag "Érvénytelen paraméter: %s" + IDS_SwitchN_NoI "Érvénytelen paraméter: /n csak az /i kapcsolóval használható." + IDS_DllNotLoaded "LoadLibrary('%s') sikertelen.\nVisszatérési érték a GetLastError-ból: 0x%08x." + IDS_MissingEntry "A(z) %s betöltődött, de nem található a következő belépési pont: %s.\n\n\ +A(z) %s lehet hogy nincs exportálva, vagy a(z) %s egy hibás változata van a memóriában. Használja a PView-et hogy megkeresse és eltávolítsa azt." + IDS_FailureMessage "A(z) %s sikertelen a következőben: %s.\nA visszaadott kód: 0x%08x" + IDS_SuccessMessage "A(z) %s sikerült a következőben: %s." END diff --git a/base/system/rundll32/lang/hu-HU.rc b/base/system/rundll32/lang/hu-HU.rc index b08de9e9f7b..c5cb60d2a70 100644 --- a/base/system/rundll32/lang/hu-HU.rc +++ b/base/system/rundll32/lang/hu-HU.rc @@ -4,6 +4,6 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_DllNotLoaded "A(z) '%s' állományt, vagy valamelyik összetevõjét nem sikerült megnyitni" - IDS_MissingEntry "Hiányzó bejegyzés: %s\nIn A Következõ állomány nem tölthetõ be: %s" + IDS_DllNotLoaded "A LoadLibrary nem tudta betölteni a következőt: '%s'" + IDS_MissingEntry "Hiányzó belépési pont: %s\nItt: %s" END diff --git a/dll/cpl/desk/lang/hu-HU.rc b/dll/cpl/desk/lang/hu-HU.rc index daa09d82453..48dac0caa2b 100644 --- a/dll/cpl/desk/lang/hu-HU.rc +++ b/dll/cpl/desk/lang/hu-HU.rc @@ -109,11 +109,11 @@ EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE CAPTION "Effektusok" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Az alábbi áttünés &effektet használja menükhöz és eszköztippekhez", + CONTROL "Az alábbi áttűnés &effektet használja menükhöz és eszköztippekhez", IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP - CONTROL "Az alábbi módszert használja a képernyőn megjelenő &betűtípusok simítására.", IDC_EFFAPPEARANCE_SMOOTHING, + CONTROL "Az alábbi módszert használja a képernyőn megjelenő &betűtípusok simítására", IDC_EFFAPPEARANCE_SMOOTHING, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP

2 years, 8 months

[reactos] 02/02: [NTOS:CM] Refactor full CPU identifier values

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=77fd33c99c79d6bd7b6a5… commit 77fd33c99c79d6bd7b6a5a299f11e3aebffd0de4 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Jan 5 02:48:54 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Wed Jan 5 18:28:40 2022 +0300 [NTOS:CM] Refactor full CPU identifier values Dedicated to Victor Perevertkin. --- ntoskrnl/config/i386/cmhardwr.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/ntoskrnl/config/i386/cmhardwr.c b/ntoskrnl/config/i386/cmhardwr.c index 1810da6a53b..235250d7076 100644 --- a/ntoskrnl/config/i386/cmhardwr.c +++ b/ntoskrnl/config/i386/cmhardwr.c @@ -14,14 +14,7 @@ /* GLOBALS *******************************************************************/ -#ifdef _M_IX86 -PCHAR CmpID1 = "80%u86-%c%x"; -PCHAR CmpID2 = "x86 Family %u Model %u Stepping %u"; -#else -PCHAR CmpID1 = "EM64T Family %u Model %u Stepping %u"; -PCHAR CmpID2 = "AMD64 Family %u Model %u Stepping %u"; -PCHAR CmpID3 = "VIA64 Family %u Model %u Stepping %u"; -#endif +PCHAR CmpFullCpuID = "%s Family %u Model %u Stepping %u"; PCHAR CmpBiosStrings[] = { "Ver", @@ -353,7 +346,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc for (i = 0; i < KeNumberProcessors; i++) { #ifdef _M_AMD64 - PCHAR CmpID; + PCHAR FamilyId; #endif /* Get the PRCB */ Prcb = KiProcessorBlock[i]; @@ -370,18 +363,19 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Check if the CPU doesn't support CPUID */ if (!Prcb->CpuID) { - /* Build ID1-style string for older CPUs */ + /* Build 80x86-style string for older CPUs */ sprintf(Buffer, - CmpID1, + "80%u86-%c%x", Prcb->CpuType, (Prcb->CpuStep >> 8) + 'A', Prcb->CpuStep & 0xff); } else { - /* Build ID2-style string for newer CPUs */ + /* Build full ID string for newer CPUs */ sprintf(Buffer, - CmpID2, + CmpFullCpuID, + "x86", Prcb->CpuType, (Prcb->CpuStep >> 8), Prcb->CpuStep & 0xff); @@ -390,22 +384,23 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc if (Prcb->CpuVendor == CPU_VIA) { /* This is VIA64 family */ - CmpID = CmpID3; + FamilyId = "VIA64"; } else if (Prcb->CpuVendor == CPU_AMD) { /* This is AMD64 family */ - CmpID = CmpID2; + FamilyId = "AMD64"; } else { /* This is generic EM64T family */ - CmpID = CmpID1; + FamilyId = "EM64T"; } /* ID string has the same style for all 64-bit CPUs */ sprintf(Buffer, - CmpID, + CmpFullCpuID, + FamilyId, Prcb->CpuType, (Prcb->CpuStep >> 8), Prcb->CpuStep & 0xff);

2 years, 8 months

[reactos] 01/02: [NTOS:KE/x64] Detect CPU vendor properly and store value in PRCB

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84cc81ee298b9030a0c39… commit 84cc81ee298b9030a0c39dfd60487bc8c2ed1703 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Jan 5 00:50:51 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Wed Jan 5 18:28:40 2022 +0300 [NTOS:KE/x64] Detect CPU vendor properly and store value in PRCB Also generate processor identifier properly based on this value on the Configuration Manager machine-dependent initialization. Update processor driver INF file accordingly. CORE-17970 CORE-14922 --- drivers/processor/processr/cpu.inf | 10 ++++++++++ ntoskrnl/config/i386/cmhardwr.c | 36 ++++++++++++++++++++++++++++++++++++ ntoskrnl/ke/amd64/cpu.c | 19 ++++++++----------- 3 files changed, 54 insertions(+), 11 deletions(-) diff --git a/drivers/processor/processr/cpu.inf b/drivers/processor/processr/cpu.inf index ca3dd062b96..268ec540e8a 100644 --- a/drivers/processor/processr/cpu.inf +++ b/drivers/processor/processr/cpu.inf @@ -62,6 +62,9 @@ HKR, , Icon, 0, "-28" %IntelP4Processor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_15 %IntelProcessor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86 +[Intel.NTAMD64] +%IntelProcessor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_EM64T + [AMD] %AMDK6Processor.DeviceDesc% = Processr_Inst,ACPI\AuthenticAMD_-_x86_Family_5_Model_7 %AMDK62Processor.DeviceDesc% = Processr_Inst,ACPI\AuthenticAMD_-_x86_Family_5_Model_8 @@ -74,6 +77,10 @@ HKR, , Icon, 0, "-28" %AMDQProcessor.DeviceDesc% = Processr_Inst,ACPI\AuthenticAMD_-_x86_Family_17 %AMDProcessor.DeviceDesc% = Processr_Inst,ACPI\AuthenticAMD_-_x86 +[AMD.NTAMD64] +%AMDK8Processor.DeviceDesc% = Processr_Inst,ACPI\AuthenticAMD_-_AMD64_Family_15 +%AMDProcessor.DeviceDesc% = Processr_Inst,ACPI\AuthenticAMD_-_AMD64 + [Transmeta] %TransmetaProcessor.DeviceDesc% = Processr_Inst,ACPI\GenuineTMx86_-_x86 @@ -84,6 +91,9 @@ HKR, , Icon, 0, "-28" %ViaNANOProcessor.DeviceDesc% = Processr_Inst,ACPI\CentaurHauls_-_x86_Family_6_Model_15 %ViaProcessor.DeviceDesc% = Processr_Inst,ACPI\CentaurHauls_-_x86 +[VIA.NTAMD64] +%ViaProcessor.DeviceDesc% = Processr_Inst,ACPI\CentaurHauls_-_VIA64 + ;---------------------------- Processr Driver --------------------------- [Processr_Inst.NT] diff --git a/ntoskrnl/config/i386/cmhardwr.c b/ntoskrnl/config/i386/cmhardwr.c index 7bdd139ecbd..1810da6a53b 100644 --- a/ntoskrnl/config/i386/cmhardwr.c +++ b/ntoskrnl/config/i386/cmhardwr.c @@ -14,8 +14,14 @@ /* GLOBALS *******************************************************************/ +#ifdef _M_IX86 PCHAR CmpID1 = "80%u86-%c%x"; PCHAR CmpID2 = "x86 Family %u Model %u Stepping %u"; +#else +PCHAR CmpID1 = "EM64T Family %u Model %u Stepping %u"; +PCHAR CmpID2 = "AMD64 Family %u Model %u Stepping %u"; +PCHAR CmpID3 = "VIA64 Family %u Model %u Stepping %u"; +#endif PCHAR CmpBiosStrings[] = { "Ver", @@ -346,6 +352,9 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc /* Loop all CPUs */ for (i = 0; i < KeNumberProcessors; i++) { +#ifdef _M_AMD64 + PCHAR CmpID; +#endif /* Get the PRCB */ Prcb = KiProcessorBlock[i]; @@ -357,6 +366,7 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc ConfigData.ComponentEntry.AffinityMask = AFFINITY_MASK(i); ConfigData.ComponentEntry.Identifier = Buffer; +#if defined(_M_IX86) /* Check if the CPU doesn't support CPUID */ if (!Prcb->CpuID) { @@ -376,6 +386,32 @@ CmpInitializeMachineDependentConfiguration(IN PLOADER_PARAMETER_BLOCK LoaderBloc (Prcb->CpuStep >> 8), Prcb->CpuStep & 0xff); } +#elif defined(_M_AMD64) + if (Prcb->CpuVendor == CPU_VIA) + { + /* This is VIA64 family */ + CmpID = CmpID3; + } + else if (Prcb->CpuVendor == CPU_AMD) + { + /* This is AMD64 family */ + CmpID = CmpID2; + } + else + { + /* This is generic EM64T family */ + CmpID = CmpID1; + } + + /* ID string has the same style for all 64-bit CPUs */ + sprintf(Buffer, + CmpID, + Prcb->CpuType, + (Prcb->CpuStep >> 8), + Prcb->CpuStep & 0xff); +#else +#error Unknown architecture +#endif /* Save the ID string length now that we've created it */ ConfigData.ComponentEntry.IdentifierLength = (ULONG)strlen(Buffer) + 1; diff --git a/ntoskrnl/ke/amd64/cpu.c b/ntoskrnl/ke/amd64/cpu.c index 320e48bdd3b..659264cde30 100644 --- a/ntoskrnl/ke/amd64/cpu.c +++ b/ntoskrnl/ke/amd64/cpu.c @@ -33,10 +33,7 @@ volatile LONG KiTbFlushTimeStamp; /* CPU Signatures */ static const CHAR CmpIntelID[] = "GenuineIntel"; static const CHAR CmpAmdID[] = "AuthenticAMD"; -static const CHAR CmpCyrixID[] = "CyrixInstead"; -static const CHAR CmpTransmetaID[] = "GenuineTMx86"; static const CHAR CmpCentaurID[] = "CentaurHauls"; -static const CHAR CmpRiseID[] = "RiseRiseRise"; /* FUNCTIONS *****************************************************************/ @@ -89,25 +86,25 @@ KiGetCpuVendor(VOID) /* Now check the CPU Type */ if (!strcmp((PCHAR)Prcb->VendorString, CmpIntelID)) { - return CPU_INTEL; + Prcb->CpuVendor = CPU_INTEL; } else if (!strcmp((PCHAR)Prcb->VendorString, CmpAmdID)) { - return CPU_AMD; + Prcb->CpuVendor = CPU_AMD; } else if (!strcmp((PCHAR)Prcb->VendorString, CmpCentaurID)) { DPRINT1("VIA CPUs not fully supported\n"); - return CPU_VIA; + Prcb->CpuVendor = CPU_VIA; } - else if (!strcmp((PCHAR)Prcb->VendorString, CmpRiseID)) + else { - DPRINT1("Rise CPUs not fully supported\n"); - return 0; + /* Invalid CPU */ + DPRINT1("%s CPU support not fully tested!\n", Prcb->VendorString); + Prcb->CpuVendor = CPU_UNKNOWN; } - /* Invalid CPU */ - return CPU_UNKNOWN; + return Prcb->CpuVendor; } ULONG

2 years, 8 months

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 2022