Ros-diffs November 2021

ros-diffs@reactos.org

23 participants
97 discussions

[reactos] 01/01: [User32|API_TEST] Add Get Window Ptr Test

by James Tabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=993eb076549fba4dd3f2f… commit 993eb076549fba4dd3f2f3761962e65c34eda21e Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Sat Nov 27 14:47:11 2021 -0600 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Sat Nov 27 14:47:11 2021 -0600 [User32|API_TEST] Add Get Window Ptr Test Adding test to verify results from a foreign window process. See CORE-17856. --- modules/rostests/apitests/user32/WndProc.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/modules/rostests/apitests/user32/WndProc.c b/modules/rostests/apitests/user32/WndProc.c index c8a41fb0471..542d4b98dfe 100644 --- a/modules/rostests/apitests/user32/WndProc.c +++ b/modules/rostests/apitests/user32/WndProc.c @@ -135,6 +135,27 @@ static void test_wndproc(void) "UnregisterClassA() failed: LastError = %lu\n", GetLastError()); } +static void test_get_wndproc(void) +{ + LONG_PTR ret; + SetLastError(0xfeedf00d); + ret = GetWindowLongPtrA(GetShellWindow(), GWLP_WNDPROC); + ok (ret == 0, "Should return NULL\n"); + ok (GetLastError() == ERROR_ACCESS_DENIED, "Wrong return error!\n"); + SetLastError(0xfeedf00d); + ret = GetWindowLongPtrW(GetShellWindow(), GWLP_WNDPROC); + ok (ret == 0, "Should return NULL\n"); + ok (GetLastError() == ERROR_ACCESS_DENIED, "Wrong return error!\n"); + SetLastError(0xfeedf00d); + ret = GetWindowLongPtrA(GetShellWindow(), GWLP_WNDPROC); + ok (ret == 0, "Should return NULL\n"); + ok (GetLastError() == ERROR_ACCESS_DENIED, "Wrong return error!\n"); + SetLastError(0xfeedf00d); + ret = GetWindowLongPtrW(GetShellWindow(), GWLP_WNDPROC); + ok (ret == 0, "Should return NULL\n"); + ok (GetLastError() == ERROR_ACCESS_DENIED, "Wrong return error!\n"); +} + START_TEST(WndProc) { #ifdef __RUNTIME_CHECKS__ @@ -142,5 +163,6 @@ START_TEST(WndProc) return; #endif /* __RUNTIME_CHECKS__ */ + test_get_wndproc(); test_wndproc(); }

3 years

[reactos] 01/01: [User32] Add Back Break with Error Message

by James Tabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9cff384c222900d1f25c4… commit 9cff384c222900d1f25c4beae9362c44da99a3d9 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Sat Nov 27 11:35:42 2021 -0600 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Sat Nov 27 11:35:42 2021 -0600 [User32] Add Back Break with Error Message Add back missing break. See CORE-17856. --- win32ss/user/user32/windows/class.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/win32ss/user/user32/windows/class.c b/win32ss/user/user32/windows/class.c index 3602c2c1d72..376c91c3122 100644 --- a/win32ss/user/user32/windows/class.c +++ b/win32ss/user/user32/windows/class.c @@ -1134,6 +1134,8 @@ LONG_PTR IntGetWindowLong( HWND hwnd, INT offset, UINT size, BOOL unicode ) { SetLastError(ERROR_ACCESS_DENIED); retvalue = 0; + ERR("Outside Access and Denied!\n"); + break; } retvalue = (ULONG_PTR)IntGetWndProc(wndPtr, !unicode); break;

3 years

[reactos] 01/01: [FREELDR] Fix release builds for PC-98 and Xbox platforms

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1897f9f0c0e93f3f1aabb… commit 1897f9f0c0e93f3f1aabb5afffa900a745f9b3bb Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Nov 27 18:00:06 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Nov 27 20:22:09 2021 +0300 [FREELDR] Fix release builds for PC-98 and Xbox platforms Fix error C4013: 'DebugDisableScreenPort' undefined; assuming extern returning int Addendum to 98c17d31. CORE-16216 --- boot/freeldr/freeldr/include/debug.h | 1 + 1 file changed, 1 insertion(+) diff --git a/boot/freeldr/freeldr/include/debug.h b/boot/freeldr/freeldr/include/debug.h index 3ab9392b28e..247b8840647 100644 --- a/boot/freeldr/freeldr/include/debug.h +++ b/boot/freeldr/freeldr/include/debug.h @@ -117,6 +117,7 @@ void MEMORY_WRITE_BREAKPOINT4(unsigned long addr); #define DebugInit(FrLdrSectionId) #define BugCheck(fmt, ...) #define DbgDumpBuffer(mask, buf, len) + #define DebugDisableScreenPort() #define DbgParseDebugChannels(val) #endif // DBG

3 years

[reactos] 01/01: [NTVDM] Use strsafe functions for concantenation of strings in otvdm code. (#4124)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0609db55d7b3414e08002… commit 0609db55d7b3414e08002d8b3e396bff13a6fcde Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Thu Nov 25 14:06:05 2021 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 25 21:06:05 2021 +0100 [NTVDM] Use strsafe functions for concantenation of strings in otvdm code. (#4124) --- subsystems/mvdm/ntvdm/dos/dos32krnl/process.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c b/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c index 492467656c0..aa5680dc237 100644 --- a/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c +++ b/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c @@ -13,6 +13,7 @@ #define NDEBUG #include <debug.h> +#include <strsafe.h> #include "emulator.h" #include "cpu/cpu.h" @@ -803,9 +804,9 @@ WORD DosCreateProcess(IN LPCSTR ProgramName, CHAR ExpName[MAX_PATH]; ExpandEnvironmentStringsA(AppName, ExpName, ARRAYSIZE(ExpName) - 1); - strcat(ExpName, "\""); // Add double-quote before ProgramName - strcat(ExpName, ProgramName); // Append Program name - strcat(ExpName, "\""); // Add double-quote after ProgramName + StringCbCatA(ExpName, sizeof(ExpName), "\""); // Add double-quote before ProgramName + StringCbCatA(ExpName, sizeof(ExpName), ProgramName); // Append Program name + StringCbCatA(ExpName, sizeof(ExpName), "\""); // Add double-quote after ProgramName ZeroMemory(&pi, sizeof(pi)); ZeroMemory(&si, sizeof(si));

3 years

[reactos] 01/01: [NTOS:LPC] NtReplyWaitReceivePortEx returns the correct TotalLength for connect messages

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=990ba545379b253958403… commit 990ba545379b253958403eeb0296527f01e5234c Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Wed Nov 24 18:58:51 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed Nov 24 18:59:16 2021 +0100 [NTOS:LPC] NtReplyWaitReceivePortEx returns the correct TotalLength for connect messages This fixes the NtAcceptConnectPort apitest. --- ntoskrnl/lpc/reply.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/lpc/reply.c b/ntoskrnl/lpc/reply.c index 8454754c3aa..b3195e3826c 100644 --- a/ntoskrnl/lpc/reply.c +++ b/ntoskrnl/lpc/reply.c @@ -664,7 +664,7 @@ NtReplyWaitReceivePortEx(IN HANDLE PortHandle, Message = NULL; /* Setup the receive message */ - ReceiveMessage->u1.s1.TotalLength = (CSHORT)(sizeof(LPCP_MESSAGE) + + ReceiveMessage->u1.s1.TotalLength = (CSHORT)(sizeof(PORT_MESSAGE) + ConnectionInfoLength); ReceiveMessage->u1.s1.DataLength = (CSHORT)ConnectionInfoLength; RtlCopyMemory(ReceiveMessage + 1,

3 years, 1 month

[reactos] 01/01: [User32] Fix Copy Paste

by James Tabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a89844f7408fa1eb5c81e… commit a89844f7408fa1eb5c81e358c27490b095a680b1 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Wed Nov 24 09:36:50 2021 -0600 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Wed Nov 24 09:36:50 2021 -0600 [User32] Fix Copy Paste Pointed out by otya. See CORE-17856. --- win32ss/user/user32/windows/hook.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/win32ss/user/user32/windows/hook.c b/win32ss/user/user32/windows/hook.c index 78b1a37acb3..a9e9647eddf 100644 --- a/win32ss/user/user32/windows/hook.c +++ b/win32ss/user/user32/windows/hook.c @@ -712,7 +712,7 @@ User32CallHookProcFromKernel(PVOID Arguments, ULONG ArgumentLength) CWPSTRUCT *pCWPT = &pcwps->cwps; pCWP = HeapAlloc(GetProcessHeap(), 0, Common->lParamSize + sizeof(CWPSTRUCT)); RtlCopyMemory(pCWP, pCWPT, sizeof(CWPSTRUCT)); -// ERR("WH_CALLWNDPROC: Code %d, wParam %d msg %d\n",Common->Code,Common->wParam,pCWP->message); + //ERR("WH_CALLWNDPROC: Code %d, wParam %d hwnd %p msg %d\n",Common->Code,Common->wParam,pCWP->hwnd,pCWP->message); /* If more memory is reserved, then lParam is a pointer. * Size of the buffer is stocked in the lParam member, and its content * is at the end of the argument buffer */ @@ -731,7 +731,8 @@ User32CallHookProcFromKernel(PVOID Arguments, ULONG ArgumentLength) PCWPR_Struct pcwprs = (PCWPR_Struct)Common; CWPRETSTRUCT *pCWPRT = &pcwprs->cwprs; pCWPR = HeapAlloc(GetProcessHeap(), 0, Common->lParamSize + sizeof(CWPRETSTRUCT)); - RtlCopyMemory(pCWPR, pCWPRT, sizeof(CWPSTRUCT)); + RtlCopyMemory(pCWPR, pCWPRT, sizeof(CWPRETSTRUCT)); + //ERR("WH_CALLWNDPROCRET: Code %d, wParam %d hwnd %p msg %d\n",Common->Code,Common->wParam,pCWPRT->hwnd,pCWPRT->message); if ( Common->lParamSize ) { pCWPR->lParam = (LPARAM)((PCHAR)pCWPR + sizeof(CWPRETSTRUCT));

3 years, 1 month

[reactos] 01/01: [NTOS:IO] Fail, if io completion port and an apc routine are used at the same time

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=07e19a5e093ec44464031… commit 07e19a5e093ec444640313baa4a71e5c1940d517 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Wed Nov 24 13:34:26 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed Nov 24 13:34:26 2021 +0100 [NTOS:IO] Fail, if io completion port and an apc routine are used at the same time Add checks to NtNotifyChangeDirectoryFile, NtLockFile, NtReadFile and NtWriteFile. This fixes two ntdll tests. --- ntoskrnl/io/iomgr/iofunc.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/io/iomgr/iofunc.c b/ntoskrnl/io/iomgr/iofunc.c index b9bf75736f5..62fb626fa25 100644 --- a/ntoskrnl/io/iomgr/iofunc.c +++ b/ntoskrnl/io/iomgr/iofunc.c @@ -287,7 +287,7 @@ IopDeviceFsIoControl(IN HANDLE DeviceHandle, &HandleInformation); if (!NT_SUCCESS(Status)) return Status; - /* Can't use an I/O completion port and an APC in the same time */ + /* Can't use an I/O completion port and an APC at the same time */ if ((FileObject->CompletionContext) && (UserApcRoutine)) { /* Fail */ @@ -1675,6 +1675,14 @@ NtNotifyChangeDirectoryFile(IN HANDLE FileHandle, NULL); if (!NT_SUCCESS(Status)) return Status; + /* Can't use an I/O completion port and an APC at the same time */ + if ((FileObject->CompletionContext) && (ApcRoutine)) + { + /* Fail */ + ObDereferenceObject(FileObject); + return STATUS_INVALID_PARAMETER; + } + /* Check if we have an event handle */ if (EventHandle) { @@ -1793,6 +1801,14 @@ NtLockFile(IN HANDLE FileHandle, /* Check if we're called from user mode */ if (PreviousMode != KernelMode) { + /* Can't use an I/O completion port and an APC at the same time */ + if ((FileObject->CompletionContext) && (ApcRoutine)) + { + /* Fail */ + ObDereferenceObject(FileObject); + return STATUS_INVALID_PARAMETER; + } + /* Must have either FILE_READ_DATA or FILE_WRITE_DATA access */ if (!(HandleInformation.GrantedAccess & (FILE_WRITE_DATA | FILE_READ_DATA))) @@ -2743,6 +2759,14 @@ NtReadFile(IN HANDLE FileHandle, CapturedByteOffset = ProbeForReadLargeInteger(ByteOffset); } + /* Can't use an I/O completion port and an APC at the same time */ + if ((FileObject->CompletionContext) && (ApcRoutine)) + { + /* Fail */ + ObDereferenceObject(FileObject); + return STATUS_INVALID_PARAMETER; + } + /* Perform additional checks for non-cached file access */ if (FileObject->Flags & FO_NO_INTERMEDIATE_BUFFERING) { @@ -3796,6 +3820,14 @@ NtWriteFile(IN HANDLE FileHandle, CapturedByteOffset = ProbeForReadLargeInteger(ByteOffset); } + /* Can't use an I/O completion port and an APC at the same time */ + if ((FileObject->CompletionContext) && (ApcRoutine)) + { + /* Fail */ + ObDereferenceObject(FileObject); + return STATUS_INVALID_PARAMETER; + } + /* Perform additional checks for non-cached file access */ if (FileObject->Flags & FO_NO_INTERMEDIATE_BUFFERING) {

3 years, 1 month

[reactos] 01/01: [SYSSETUP][USETUP] [NLS] Update pt-PT translation (#4120)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b3c6407d6e52592aa8004… commit b3c6407d6e52592aa8004c2832759d2c969da5af Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Wed Nov 24 00:57:11 2021 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 24 01:57:11 2021 +0100 [SYSSETUP][USETUP] [NLS] Update pt-PT translation (#4120) - NLS: Change weekdays name to capital letter. - USETUP: Fix typos to pt-PT translation. - SYSSETUP: Update pt-PT translation. + Sync IDS_USER_ADMINISTRATOR_NAME and IDS_ADMINISTRATOR_NAME (in samsrv). --- base/setup/usetup/lang/pt-PT.h | 2 +- dll/win32/kernel32/winnls/nls/ptg.nls | 28 ++++++++++++++-------------- dll/win32/samsrv/lang/pt-PT.rc | 2 +- dll/win32/syssetup/lang/pt-PT.rc | 12 ++++++------ 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/usetup/lang/pt-PT.h index 5466de82d18..690e5cc3362 100644 --- a/base/setup/usetup/lang/pt-PT.h +++ b/base/setup/usetup/lang/pt-PT.h @@ -220,7 +220,7 @@ static MUI_ENTRY ptPTIntroPageEntries[] = { 6, 15, - "Fa\207a c\242pia de segur\306n\207 dos seus dados ou teste num computador", + "Fa\207a c\242pia de seguran\207a dos seus dados ou teste num computador", TEXT_STYLE_NORMAL, TEXT_ID_STATIC }, diff --git a/dll/win32/kernel32/winnls/nls/ptg.nls b/dll/win32/kernel32/winnls/nls/ptg.nls index c75d5a1cafe..cf5cd523ea6 100644 --- a/dll/win32/kernel32/winnls/nls/ptg.nls +++ b/dll/win32/kernel32/winnls/nls/ptg.nls @@ -67,13 +67,13 @@ STRINGTABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE LOCALE_S1159 "" LOCALE_S2359 "" LOCALE_SABBREVCTRYNAME "PRT" - LOCALE_SABBREVDAYNAME1 "seg" - LOCALE_SABBREVDAYNAME2 "ter" - LOCALE_SABBREVDAYNAME3 "qua" - LOCALE_SABBREVDAYNAME4 "qui" - LOCALE_SABBREVDAYNAME5 "sex" - LOCALE_SABBREVDAYNAME6 "sáb" - LOCALE_SABBREVDAYNAME7 "dom" + LOCALE_SABBREVDAYNAME1 "Seg" + LOCALE_SABBREVDAYNAME2 "Ter" + LOCALE_SABBREVDAYNAME3 "Qua" + LOCALE_SABBREVDAYNAME4 "Qui" + LOCALE_SABBREVDAYNAME5 "Sex" + LOCALE_SABBREVDAYNAME6 "Sáb" + LOCALE_SABBREVDAYNAME7 "Dom" LOCALE_SABBREVLANGNAME "PTG" LOCALE_SABBREVMONTHNAME1 "Jan" LOCALE_SABBREVMONTHNAME2 "Fev" @@ -91,13 +91,13 @@ STRINGTABLE LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE LOCALE_SCOUNTRY "Portugal" LOCALE_SCURRENCY "€" LOCALE_SDATE "-" - LOCALE_SDAYNAME1 "segunda-feira" - LOCALE_SDAYNAME2 "terça-feira" - LOCALE_SDAYNAME3 "quarta-feira" - LOCALE_SDAYNAME4 "quinta-feira" - LOCALE_SDAYNAME5 "sexta-feira" - LOCALE_SDAYNAME6 "sábado" - LOCALE_SDAYNAME7 "domingo" + LOCALE_SDAYNAME1 "Segunda-feira" + LOCALE_SDAYNAME2 "Terça-feira" + LOCALE_SDAYNAME3 "Quarta-feira" + LOCALE_SDAYNAME4 "Quinta-feira" + LOCALE_SDAYNAME5 "Sexta-feira" + LOCALE_SDAYNAME6 "Sábado" + LOCALE_SDAYNAME7 "Domingo" LOCALE_SDECIMAL "," LOCALE_SENGCOUNTRY "Portugal" LOCALE_SENGCURRNAME "Euro" diff --git a/dll/win32/samsrv/lang/pt-PT.rc b/dll/win32/samsrv/lang/pt-PT.rc index 5687933e00c..26fa4c8aa9c 100644 --- a/dll/win32/samsrv/lang/pt-PT.rc +++ b/dll/win32/samsrv/lang/pt-PT.rc @@ -32,7 +32,7 @@ BEGIN * If you translate the administrator account name, keep IDS_USER_ADMINISTRATOR_NAME and * syssetup.dll:IDS_ADMINISTRATOR_NAME synchronized. */ - IDS_USER_ADMINISTRATOR_NAME "Administrator" + IDS_USER_ADMINISTRATOR_NAME "Administrador" IDS_USER_ADMINISTRATOR_COMMENT "Conta interna usada para administrar o computador ou domínio." IDS_USER_GUEST_NAME "Convidado" IDS_USER_GUEST_COMMENT "Conta interna para acesso de convidado ao computador ou domínio." diff --git a/dll/win32/syssetup/lang/pt-PT.rc b/dll/win32/syssetup/lang/pt-PT.rc index db1ca0fd77f..9776a609035 100644 --- a/dll/win32/syssetup/lang/pt-PT.rc +++ b/dll/win32/syssetup/lang/pt-PT.rc @@ -59,7 +59,7 @@ BEGIN LTEXT "Nome do &Computador:", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 - LTEXT "A instalação vai criar uma conta chamada Administrator. Pode usar esta conta se precisar de acesso total ao seu computador.", IDC_STATIC, 54, 57, 250, 25 + LTEXT "A instalação vai criar uma conta chamada Administrador. Pode usar esta conta se precisar de acesso total ao seu computador.", IDC_STATIC, 54, 57, 250, 25 LTEXT "Digite uma palavra-passe para o administrador com 127 caracteres ou menos.", IDC_STATIC, 54, 87, 250, 8 LTEXT "Palavra-passe do &Administrador:", IDC_STATIC, 54, 104, 105, 8 EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD @@ -152,7 +152,7 @@ CAPTION "Definições avançadas" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "", IDC_PS2STATIC, 5, 20, 242, 110 - RTEXT "&Frequencia de amostragem:", -1, 27, 35, 90, 8 + RTEXT "&Frequência de amostragem:", -1, 27, 35, 90, 8 LTEXT "Relatórios por segundo", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL RTEXT "&Detecção da roda:", -1, 27, 55, 90, 8 @@ -175,8 +175,8 @@ BEGIN IDS_COMPUTERSUBTITLE "Deve fornecer um nome e palavra-passe de administrador para o seu computador." IDS_LOCALETITLE "Configurações Regionais" IDS_LOCALESUBTITLE "Pode personalizar o ReactOS para diferentes regiões e línguas." - IDS_LOCALETEXT "The Standards and formats are set to %s, and the location is set to %s." - IDS_LAYOUTTEXT "Your default text input language and method is: %s keyboard layout" + IDS_LOCALETEXT "Os padrões e formatos são definidos como %s, e o local é definido como %s." + IDS_LAYOUTTEXT "O método e idioma de entrada de texto padrão é: Estilo de teclado %s" IDS_DATETIMETITLE "Data e Hora" IDS_DATETIMESUBTITLE "Definir a data e a hora correctas para o seu computador." IDS_PROCESSTITLE "A registar componentes" @@ -202,7 +202,7 @@ BEGIN * samsrv.dll:IDS_USER_ADMINISTRATOR_NAME synchronized. * Also check the IDD_COMPUTERPAGE dialog. */ - IDS_ADMINISTRATOR_NAME "Administrator" + IDS_ADMINISTRATOR_NAME "Administrador" IDS_MACHINE_OWNER_NAME "Proprietário" END @@ -252,5 +252,5 @@ BEGIN IDS_PRODUCTWORKSTATIONNAME "Estação de trabalho ReactOS" IDS_PRODUCTSERVERINFO "O sistema será reconhecido como um servidor. As pastas privadas ""Minhas imagens"", ""Meus vídeos"" e ""Minhas músicas"" são independentes de ""Meus documentos""." IDS_PRODUCTWORKSTATIONINFO "O sistema será reconhecido como uma estação de trabalho. As pastas privadas ""Minhas imagens"", ""Meus vídeos"" e ""Minhas músicas"" estão em ""Meus documentos""." - IDS_DEFAULT "(Default)" + IDS_DEFAULT "(Padrão)" END

3 years, 1 month

[reactos] 01/01: [NTVDM] Add otya128's WineVDM integration code into ReactOS (#4113)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f05abec82a0fb8ccdde6… commit 0f05abec82a0fb8ccdde61e6127e8b728488861c Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Tue Nov 23 16:50:05 2021 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Nov 23 23:50:05 2021 +0100 [NTVDM] Add otya128's WineVDM integration code into ReactOS (#4113) This is an interim solution until a more integrated solution with NTVDM is developed. CORE-17852 --- subsystems/mvdm/ntvdm/dos/dos32krnl/process.c | 47 ++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 4 deletions(-) diff --git a/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c b/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c index 7f356b0912f..492467656c0 100644 --- a/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c +++ b/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c @@ -796,10 +796,49 @@ WORD DosCreateProcess(IN LPCSTR ProgramName, /* Those are handled by NTVDM */ case SCS_WOW_BINARY: { - DisplayMessage(L"Trying to load '%S'.\n" - L"WOW16 applications are not supported internally by NTVDM at the moment.\n" - L"Press 'OK' to continue.", - ProgramName); + static const PCSTR AppName = "\"%ProgramFiles%\\otvdm\\otvdmw.exe\" "; + + STARTUPINFOA si; + PROCESS_INFORMATION pi; + CHAR ExpName[MAX_PATH]; + + ExpandEnvironmentStringsA(AppName, ExpName, ARRAYSIZE(ExpName) - 1); + strcat(ExpName, "\""); // Add double-quote before ProgramName + strcat(ExpName, ProgramName); // Append Program name + strcat(ExpName, "\""); // Add double-quote after ProgramName + + ZeroMemory(&pi, sizeof(pi)); + ZeroMemory(&si, sizeof(si)); + si.cb = sizeof(si); + + /* Create the process */ + if (CreateProcessA(NULL, // No Application Name + ExpName, // Just our Command Line + NULL, // Cannot inherit Process Handle + NULL, // Cannot inherit Thread Handle + FALSE, // No handle inheritance + 0, // No extra creation flags + NULL, // No environment block + NULL, // No starting directory + &si, + &pi)) + { + /* Close the handles */ + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + break; + } + else + { + /* Retrieve the actual path to the "Program Files" directory for displaying the error */ + ExpandEnvironmentStringsA("%ProgramFiles%", ExpName, ARRAYSIZE(ExpName) - 1); + + DisplayMessage(L"Trying to load '%S'.\n" + L"WOW16 applications are not supported internally by NTVDM at the moment.\n" + L"Consider installing WineVDM from the ReactOS Applications Manager in\n'%S'.\n\n" + L"Click on OK to continue.", + ProgramName, ExpName); + } // Fall through } case SCS_DOS_BINARY:

3 years, 1 month

[reactos] 01/01: [WIN32SS:NTUSER] Fix window state after restoring snapped window (#4119)

by Denis Malikov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=db810d8e443ca4285f83d… commit db810d8e443ca4285f83d20ce6ab863c2ef028e6 Author: Denis Malikov <Getequ(a)users.noreply.github.com> AuthorDate: Wed Nov 24 05:34:03 2021 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Nov 23 23:34:03 2021 +0100 [WIN32SS:NTUSER] Fix window state after restoring snapped window (#4119) InternalPos.NormalRect is a key data for detecting whether a window was snapped. Keeping it after restore affecting next snap actions. CORE-16477 --- win32ss/user/ntuser/defwnd.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/win32ss/user/ntuser/defwnd.c b/win32ss/user/ntuser/defwnd.c index ea6adc73844..846a131cfb3 100644 --- a/win32ss/user/ntuser/defwnd.c +++ b/win32ss/user/ntuser/defwnd.c @@ -815,9 +815,16 @@ IntDefWindowProc( if (wParam == VK_DOWN) { if (topWnd->style & WS_MAXIMIZE) + { co_IntSendMessage(hwndTop, WM_SYSCOMMAND, SC_RESTORE, lParam); + + /* "Normal size" must be erased after restoring, otherwise it will block next side snap actions */ + RECTL_vSetEmptyRect(&topWnd->InternalPos.NormalRect); + } else + { co_IntSendMessage(hwndTop, WM_SYSCOMMAND, SC_MINIMIZE, lParam); + } } else if (wParam == VK_UP) {

3 years, 1 month

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2021