https://git.reactos.org/?p=reactos.git;a=commitdiff;h=61c77d1f87118b2758855…
commit 61c77d1f87118b27588554ff14ccb69a7910608b
Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Wed Jun 28 15:37:55 2023 +0200
Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Wed Jun 28 17:21:58 2023 +0200
[XBOXVMP] Real OG XBOX NVidia GPU exposes 3 access ranges, so retrieve them.
CORE-19011
Fix a "bug" I introduced in commit 61012eb54.
VideoPortGetAccessRanges() expects the caller to specify at least the
total number of ranges the hardware exposes, otherwise it fails with
ERROR_MORE_DATA. (Tested also with the help of Windows' videoprt.sys.)
On real original XBOX there are three:
```
01:00.0 VGA compatible controller [0300]: NVIDIA Corporation NV2A [XGPU] [10de:02a0] (rev a1)
Subsystem: Unknown [0000:0000]
Flags: bus master, 66MHz, medium devsel, latency 0, IRQ 03
Memory at fd000000 (32-bit, non-prefetchable) [size=16M]
Memory at f0000000 (32-bit, prefetchable) [size=128M]
Memory at 00000000 (32-bit, prefetchable) [size=512K]
```
Thanks to Stanislav and Daniel for tests on the real XBOX.
---
win32ss/drivers/miniport/xboxvmp/xboxvmp.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/win32ss/drivers/miniport/xboxvmp/xboxvmp.c b/win32ss/drivers/miniport/xboxvmp/xboxvmp.c
index 5cf76e08b12..0c9e1f67ee8 100644
--- a/win32ss/drivers/miniport/xboxvmp/xboxvmp.c
+++ b/win32ss/drivers/miniport/xboxvmp/xboxvmp.c
@@ -62,7 +62,8 @@ XboxVmpFindAdapter(
{
PXBOXVMP_DEVICE_EXTENSION XboxVmpDeviceExtension;
VP_STATUS Status;
- VIDEO_ACCESS_RANGE AccessRanges[2];
+ /* 3 access ranges: for MMIO, VRAM, and Indirect memory access IO ports */
+ VIDEO_ACCESS_RANGE AccessRanges[3];
USHORT VendorId = 0x10DE; /* NVIDIA Corporation */
USHORT DeviceId = 0x02A0; /* NV2A XGPU */
ULONG Slot = 0;
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bfdb012f1fe18cd11192f…
commit bfdb012f1fe18cd11192f9d496591412330e50bc
Author: Stanislav Motylkov <x86corez(a)gmail.com>
AuthorDate: Tue Jun 27 21:44:06 2023 +0300
Commit: Stanislav Motylkov <x86corez(a)gmail.com>
CommitDate: Tue Jun 27 21:44:06 2023 +0300
[FONTVIEW] Improve English wording of IDS_ERROR_OPENKEY
---
base/applications/fontview/lang/bg-BG.rc | 2 +-
base/applications/fontview/lang/cs-CZ.rc | 2 +-
base/applications/fontview/lang/en-US.rc | 2 +-
base/applications/fontview/lang/es-ES.rc | 2 +-
base/applications/fontview/lang/fr-FR.rc | 2 +-
base/applications/fontview/lang/he-IL.rc | 2 +-
base/applications/fontview/lang/id-ID.rc | 2 +-
base/applications/fontview/lang/it-IT.rc | 2 +-
base/applications/fontview/lang/lt-LT.rc | 2 +-
base/applications/fontview/lang/ms-MY.rc | 2 +-
base/applications/fontview/lang/no-NO.rc | 2 +-
base/applications/fontview/lang/pl-PL.rc | 2 +-
base/applications/fontview/lang/pt-BR.rc | 2 +-
base/applications/fontview/lang/ro-RO.rc | 2 +-
base/applications/fontview/lang/sk-SK.rc | 2 +-
base/applications/fontview/lang/sq-AL.rc | 2 +-
base/applications/fontview/lang/sv-SE.rc | 2 +-
base/applications/fontview/lang/tr-TR.rc | 2 +-
base/applications/fontview/lang/uk-UA.rc | 2 +-
base/applications/fontview/lang/zh-CN.rc | 2 +-
base/applications/fontview/lang/zh-HK.rc | 2 +-
base/applications/fontview/lang/zh-TW.rc | 2 +-
22 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/base/applications/fontview/lang/bg-BG.rc b/base/applications/fontview/lang/bg-BG.rc
index d40020e64b5..51f6fb4f899 100644
--- a/base/applications/fontview/lang/bg-BG.rc
+++ b/base/applications/fontview/lang/bg-BG.rc
@@ -12,7 +12,7 @@ BEGIN
IDS_ERROR_NOCLASS "Неуспешно изпълнение на класа на прозореца."
IDS_ERROR_ISINSTALLED "This font is already installed!"
IDS_ERROR_FONTCPY "Failed to copy the font file!"
- IDS_ERROR_OPENKEY "Failed to open the fonts key!"
+ IDS_ERROR_OPENKEY "Failed to open the fonts registry key!"
IDS_ERROR_REGISTER "Failed to register the new font!"
IDS_SUCCESS "Success"
IDS_COMPLETED "Font installation completed."
diff --git a/base/applications/fontview/lang/cs-CZ.rc b/base/applications/fontview/lang/cs-CZ.rc
index d73fd4c9224..ac5ae909a29 100644
--- a/base/applications/fontview/lang/cs-CZ.rc
+++ b/base/applications/fontview/lang/cs-CZ.rc
@@ -12,7 +12,7 @@ BEGIN
IDS_ERROR_NOCLASS "Inicializace okna aplikace selhala."
IDS_ERROR_ISINSTALLED "This font is already installed!"
IDS_ERROR_FONTCPY "Failed to copy the font file!"
- IDS_ERROR_OPENKEY "Failed to open the fonts key!"
+ IDS_ERROR_OPENKEY "Failed to open the fonts registry key!"
IDS_ERROR_REGISTER "Failed to register the new font!"
IDS_SUCCESS "Success"
IDS_COMPLETED "Font installation completed."
diff --git a/base/applications/fontview/lang/en-US.rc b/base/applications/fontview/lang/en-US.rc
index 3c3836b8598..21f5dc4f263 100644
--- a/base/applications/fontview/lang/en-US.rc
+++ b/base/applications/fontview/lang/en-US.rc
@@ -12,7 +12,7 @@ BEGIN
IDS_ERROR_NOCLASS "Could not initialize window class."
IDS_ERROR_ISINSTALLED "This font is already installed!"
IDS_ERROR_FONTCPY "Failed to copy the font file!"
- IDS_ERROR_OPENKEY "Failed to open the fonts key!"
+ IDS_ERROR_OPENKEY "Failed to open the fonts registry key!"
IDS_ERROR_REGISTER "Failed to register the new font!"
IDS_SUCCESS "Success"
IDS_COMPLETED "Font installation completed."
diff --git a/base/applications/fontview/lang/es-ES.rc b/base/applications/fontview/lang/es-ES.rc
index 2168a64f6b7..b4be28242d7 100644
--- a/base/applications/fontview/lang/es-ES.rc
+++ b/base/applications/fontview/lang/es-ES.rc
@@ -14,7 +14,7 @@ BEGIN
IDS_ERROR_NOCLASS "No es posible iniciar la clase de ventana."
IDS_ERROR_ISINSTALLED "This font is already installed!"
IDS_ERROR_FONTCPY "Failed to copy the font file!"
- IDS_ERROR_OPENKEY "Failed to open the fonts key!"
+ IDS_ERROR_OPENKEY "Failed to open the fonts registry key!"
IDS_ERROR_REGISTER "Failed to register the new font!"
IDS_SUCCESS "Success"
IDS_COMPLETED "Font installation completed."
diff --git a/base/applications/fontview/lang/fr-FR.rc b/base/applications/fontview/lang/fr-FR.rc
index 0d22b91d720..ae3b967acbf 100644
--- a/base/applications/fontview/lang/fr-FR.rc
+++ b/base/applications/fontview/lang/fr-FR.rc
@@ -12,7 +12,7 @@ BEGIN
IDS_ERROR_NOCLASS "Impossible d'initialiser la classe de fenêtre."
IDS_ERROR_ISINSTALLED "This font is already installed!"
IDS_ERROR_FONTCPY "Failed to copy the font file!"
- IDS_ERROR_OPENKEY "Failed to open the fonts key!"
+ IDS_ERROR_OPENKEY "Failed to open the fonts registry key!"
IDS_ERROR_REGISTER "Failed to register the new font!"
IDS_SUCCESS "Success"
IDS_COMPLETED "Font installation completed."
diff --git a/base/applications/fontview/lang/he-IL.rc b/base/applications/fontview/lang/he-IL.rc
index b9fd3083233..ff9413d26a3 100644
--- a/base/applications/fontview/lang/he-IL.rc
+++ b/base/applications/fontview/lang/he-IL.rc
@@ -14,7 +14,7 @@ BEGIN
IDS_ERROR_NOCLASS "Could not initialize window class."
IDS_ERROR_ISINSTALLED "This font is already installed!"
IDS_ERROR_FONTCPY "Failed to copy the font file!"
- IDS_ERROR_OPENKEY "Failed to open the fonts key!"
+ IDS_ERROR_OPENKEY "Failed to open the fonts registry key!"
IDS_ERROR_REGISTER "Failed to register the new font!"
IDS_SUCCESS "Success"
IDS_COMPLETED "Font installation completed."
diff --git a/base/applications/fontview/lang/id-ID.rc b/base/applications/fontview/lang/id-ID.rc
index c6db7b57f02..43b4a1b99cd 100644
--- a/base/applications/fontview/lang/id-ID.rc
+++ b/base/applications/fontview/lang/id-ID.rc
@@ -12,7 +12,7 @@ BEGIN
IDS_ERROR_NOCLASS "Tidak bisa memulai window class."
IDS_ERROR_ISINSTALLED "This font is already installed!"
IDS_ERROR_FONTCPY "Failed to copy the font file!"
- IDS_ERROR_OPENKEY "Failed to open the fonts key!"
+ IDS_ERROR_OPENKEY "Failed to open the fonts registry key!"
IDS_ERROR_REGISTER "Failed to register the new font!"
IDS_SUCCESS "Success"
IDS_COMPLETED "Font installation completed."
diff --git a/base/applications/fontview/lang/it-IT.rc b/base/applications/fontview/lang/it-IT.rc
index 70bdd487d39..af14ad7024e 100644
--- a/base/applications/fontview/lang/it-IT.rc
+++ b/base/applications/fontview/lang/it-IT.rc
@@ -12,7 +12,7 @@ BEGIN
IDS_ERROR_NOCLASS "Impossibile avviare la classe."
IDS_ERROR_ISINSTALLED "This font is already installed!"
IDS_ERROR_FONTCPY "Failed to copy the font file!"
- IDS_ERROR_OPENKEY "Failed to open the fonts key!"
+ IDS_ERROR_OPENKEY "Failed to open the fonts registry key!"
IDS_ERROR_REGISTER "Failed to register the new font!"
IDS_SUCCESS "Success"
IDS_COMPLETED "Font installation completed."
diff --git a/base/applications/fontview/lang/lt-LT.rc b/base/applications/fontview/lang/lt-LT.rc
index 52c254b892d..a9098c6959e 100644
--- a/base/applications/fontview/lang/lt-LT.rc
+++ b/base/applications/fontview/lang/lt-LT.rc
@@ -14,7 +14,7 @@ BEGIN
IDS_ERROR_NOCLASS "Nepavyko inicijuoti lango klasės."
IDS_ERROR_ISINSTALLED "This font is already installed!"
IDS_ERROR_FONTCPY "Failed to copy the font file!"
- IDS_ERROR_OPENKEY "Failed to open the fonts key!"
+ IDS_ERROR_OPENKEY "Failed to open the fonts registry key!"
IDS_ERROR_REGISTER "Failed to register the new font!"
IDS_SUCCESS "Success"
IDS_COMPLETED "Font installation completed."
diff --git a/base/applications/fontview/lang/ms-MY.rc b/base/applications/fontview/lang/ms-MY.rc
index 2e9a40d8777..7614cae6d96 100644
--- a/base/applications/fontview/lang/ms-MY.rc
+++ b/base/applications/fontview/lang/ms-MY.rc
@@ -14,7 +14,7 @@ BEGIN
IDS_ERROR_NOCLASS "Tidak dapat mengawalkan kelas tetingkap."
IDS_ERROR_ISINSTALLED "This font is already installed!"
IDS_ERROR_FONTCPY "Failed to copy the font file!"
- IDS_ERROR_OPENKEY "Failed to open the fonts key!"
+ IDS_ERROR_OPENKEY "Failed to open the fonts registry key!"
IDS_ERROR_REGISTER "Failed to register the new font!"
IDS_SUCCESS "Success"
IDS_COMPLETED "Font installation completed."
diff --git a/base/applications/fontview/lang/no-NO.rc b/base/applications/fontview/lang/no-NO.rc
index 4fd6807dbbd..c7a918d138e 100644
--- a/base/applications/fontview/lang/no-NO.rc
+++ b/base/applications/fontview/lang/no-NO.rc
@@ -12,7 +12,7 @@ BEGIN
IDS_ERROR_NOCLASS "Kunne ikke initialise vindu klassen."
IDS_ERROR_ISINSTALLED "This font is already installed!"
IDS_ERROR_FONTCPY "Failed to copy the font file!"
- IDS_ERROR_OPENKEY "Failed to open the fonts key!"
+ IDS_ERROR_OPENKEY "Failed to open the fonts registry key!"
IDS_ERROR_REGISTER "Failed to register the new font!"
IDS_SUCCESS "Success"
IDS_COMPLETED "Font installation completed."
diff --git a/base/applications/fontview/lang/pl-PL.rc b/base/applications/fontview/lang/pl-PL.rc
index da0568e2c14..f014fde1bd8 100644
--- a/base/applications/fontview/lang/pl-PL.rc
+++ b/base/applications/fontview/lang/pl-PL.rc
@@ -20,7 +20,7 @@ BEGIN
IDS_ERROR_NOCLASS "Nie udało się zainicjować klasy window."
IDS_ERROR_ISINSTALLED "This font is already installed!"
IDS_ERROR_FONTCPY "Failed to copy the font file!"
- IDS_ERROR_OPENKEY "Failed to open the fonts key!"
+ IDS_ERROR_OPENKEY "Failed to open the fonts registry key!"
IDS_ERROR_REGISTER "Failed to register the new font!"
IDS_SUCCESS "Success"
IDS_COMPLETED "Font installation completed."
diff --git a/base/applications/fontview/lang/pt-BR.rc b/base/applications/fontview/lang/pt-BR.rc
index 7f43f410fe6..c14afa00fcd 100644
--- a/base/applications/fontview/lang/pt-BR.rc
+++ b/base/applications/fontview/lang/pt-BR.rc
@@ -14,7 +14,7 @@ BEGIN
IDS_ERROR_NOCLASS "Não foi possível inicializar a janela."
IDS_ERROR_ISINSTALLED "This font is already installed!"
IDS_ERROR_FONTCPY "Failed to copy the font file!"
- IDS_ERROR_OPENKEY "Failed to open the fonts key!"
+ IDS_ERROR_OPENKEY "Failed to open the fonts registry key!"
IDS_ERROR_REGISTER "Failed to register the new font!"
IDS_SUCCESS "Success"
IDS_COMPLETED "Font installation completed."
diff --git a/base/applications/fontview/lang/ro-RO.rc b/base/applications/fontview/lang/ro-RO.rc
index 49104b645dd..49390b0e16f 100644
--- a/base/applications/fontview/lang/ro-RO.rc
+++ b/base/applications/fontview/lang/ro-RO.rc
@@ -14,7 +14,7 @@ BEGIN
IDS_ERROR_NOCLASS "Clasa de ferestre nu a putut fi inițializată."
IDS_ERROR_ISINSTALLED "This font is already installed!"
IDS_ERROR_FONTCPY "Failed to copy the font file!"
- IDS_ERROR_OPENKEY "Failed to open the fonts key!"
+ IDS_ERROR_OPENKEY "Failed to open the fonts registry key!"
IDS_ERROR_REGISTER "Failed to register the new font!"
IDS_SUCCESS "Success"
IDS_COMPLETED "Font installation completed."
diff --git a/base/applications/fontview/lang/sk-SK.rc b/base/applications/fontview/lang/sk-SK.rc
index 8ec3ebec534..b2daffdeac0 100644
--- a/base/applications/fontview/lang/sk-SK.rc
+++ b/base/applications/fontview/lang/sk-SK.rc
@@ -17,7 +17,7 @@ BEGIN
IDS_ERROR_NOCLASS "Nepodarilo sa inicializovať triedu window."
IDS_ERROR_ISINSTALLED "This font is already installed!"
IDS_ERROR_FONTCPY "Failed to copy the font file!"
- IDS_ERROR_OPENKEY "Failed to open the fonts key!"
+ IDS_ERROR_OPENKEY "Failed to open the fonts registry key!"
IDS_ERROR_REGISTER "Failed to register the new font!"
IDS_SUCCESS "Success"
IDS_COMPLETED "Font installation completed."
diff --git a/base/applications/fontview/lang/sq-AL.rc b/base/applications/fontview/lang/sq-AL.rc
index 38ff80531d4..9c911dd2acc 100644
--- a/base/applications/fontview/lang/sq-AL.rc
+++ b/base/applications/fontview/lang/sq-AL.rc
@@ -16,7 +16,7 @@ BEGIN
IDS_ERROR_NOCLASS "Nuk mund të fillojë dritaren e klases."
IDS_ERROR_ISINSTALLED "This font is already installed!"
IDS_ERROR_FONTCPY "Failed to copy the font file!"
- IDS_ERROR_OPENKEY "Failed to open the fonts key!"
+ IDS_ERROR_OPENKEY "Failed to open the fonts registry key!"
IDS_ERROR_REGISTER "Failed to register the new font!"
IDS_SUCCESS "Success"
IDS_COMPLETED "Font installation completed."
diff --git a/base/applications/fontview/lang/sv-SE.rc b/base/applications/fontview/lang/sv-SE.rc
index eb389506897..68f300709a8 100644
--- a/base/applications/fontview/lang/sv-SE.rc
+++ b/base/applications/fontview/lang/sv-SE.rc
@@ -19,7 +19,7 @@ BEGIN
IDS_ERROR_NOCLASS "Kunde inte initialisera Windows klassen."
IDS_ERROR_ISINSTALLED "This font is already installed!"
IDS_ERROR_FONTCPY "Failed to copy the font file!"
- IDS_ERROR_OPENKEY "Failed to open the fonts key!"
+ IDS_ERROR_OPENKEY "Failed to open the fonts registry key!"
IDS_ERROR_REGISTER "Failed to register the new font!"
IDS_SUCCESS "Success"
IDS_COMPLETED "Font installation completed."
diff --git a/base/applications/fontview/lang/tr-TR.rc b/base/applications/fontview/lang/tr-TR.rc
index 41ec9878032..c2d14d5c8d4 100644
--- a/base/applications/fontview/lang/tr-TR.rc
+++ b/base/applications/fontview/lang/tr-TR.rc
@@ -20,7 +20,7 @@ BEGIN
IDS_ERROR_NOCLASS "Pencere sınıfı başlatılamadı."
IDS_ERROR_ISINSTALLED "This font is already installed!"
IDS_ERROR_FONTCPY "Failed to copy the font file!"
- IDS_ERROR_OPENKEY "Failed to open the fonts key!"
+ IDS_ERROR_OPENKEY "Failed to open the fonts registry key!"
IDS_ERROR_REGISTER "Failed to register the new font!"
IDS_SUCCESS "Success"
IDS_COMPLETED "Font installation completed."
diff --git a/base/applications/fontview/lang/uk-UA.rc b/base/applications/fontview/lang/uk-UA.rc
index 3805e243aca..4d471d18732 100644
--- a/base/applications/fontview/lang/uk-UA.rc
+++ b/base/applications/fontview/lang/uk-UA.rc
@@ -20,7 +20,7 @@ BEGIN
IDS_ERROR_NOCLASS "Неможливо ініціалізувати віконний клас."
IDS_ERROR_ISINSTALLED "This font is already installed!"
IDS_ERROR_FONTCPY "Failed to copy the font file!"
- IDS_ERROR_OPENKEY "Failed to open the fonts key!"
+ IDS_ERROR_OPENKEY "Failed to open the fonts registry key!"
IDS_ERROR_REGISTER "Failed to register the new font!"
IDS_SUCCESS "Success"
IDS_COMPLETED "Font installation completed."
diff --git a/base/applications/fontview/lang/zh-CN.rc b/base/applications/fontview/lang/zh-CN.rc
index dd10e512673..bf6cb07ab15 100644
--- a/base/applications/fontview/lang/zh-CN.rc
+++ b/base/applications/fontview/lang/zh-CN.rc
@@ -22,7 +22,7 @@ BEGIN
IDS_ERROR_NOCLASS "无法初始化窗口。"
IDS_ERROR_ISINSTALLED "This font is already installed!"
IDS_ERROR_FONTCPY "Failed to copy the font file!"
- IDS_ERROR_OPENKEY "Failed to open the fonts key!"
+ IDS_ERROR_OPENKEY "Failed to open the fonts registry key!"
IDS_ERROR_REGISTER "Failed to register the new font!"
IDS_SUCCESS "Success"
IDS_COMPLETED "Font installation completed."
diff --git a/base/applications/fontview/lang/zh-HK.rc b/base/applications/fontview/lang/zh-HK.rc
index a6e4c3d2d29..6795422128b 100644
--- a/base/applications/fontview/lang/zh-HK.rc
+++ b/base/applications/fontview/lang/zh-HK.rc
@@ -20,7 +20,7 @@ BEGIN
IDS_ERROR_NOCLASS "無法初始化視窗。"
IDS_ERROR_ISINSTALLED "This font is already installed!"
IDS_ERROR_FONTCPY "Failed to copy the font file!"
- IDS_ERROR_OPENKEY "Failed to open the fonts key!"
+ IDS_ERROR_OPENKEY "Failed to open the fonts registry key!"
IDS_ERROR_REGISTER "Failed to register the new font!"
IDS_SUCCESS "Success"
IDS_COMPLETED "Font installation completed."
diff --git a/base/applications/fontview/lang/zh-TW.rc b/base/applications/fontview/lang/zh-TW.rc
index 0fec829a58d..fa595504313 100644
--- a/base/applications/fontview/lang/zh-TW.rc
+++ b/base/applications/fontview/lang/zh-TW.rc
@@ -20,7 +20,7 @@ BEGIN
IDS_ERROR_NOCLASS "無法初始化視窗。"
IDS_ERROR_ISINSTALLED "This font is already installed!"
IDS_ERROR_FONTCPY "Failed to copy the font file!"
- IDS_ERROR_OPENKEY "Failed to open the fonts key!"
+ IDS_ERROR_OPENKEY "Failed to open the fonts registry key!"
IDS_ERROR_REGISTER "Failed to register the new font!"
IDS_SUCCESS "Success"
IDS_COMPLETED "Font installation completed."