Ros-diffs March 2019

ros-diffs@reactos.org

36 participants
217 discussions

[reactos] 01/02: [MSV1_0] LsaApLogonUser: Pass the Authenticating Authority to the caller.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=96466710f888aac0aa7fd… commit 96466710f888aac0aa7fd2c5c89146234021eb82 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Mar 4 01:31:20 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Mar 4 01:37:14 2019 +0100 [MSV1_0] LsaApLogonUser: Pass the Authenticating Authority to the caller. --- dll/win32/msv1_0/msv1_0.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/dll/win32/msv1_0/msv1_0.c b/dll/win32/msv1_0/msv1_0.c index 1bb944e744..bdcdfc2f84 100644 --- a/dll/win32/msv1_0/msv1_0.c +++ b/dll/win32/msv1_0/msv1_0.c @@ -860,7 +860,7 @@ LsaApCallPackage(IN PLSA_CLIENT_REQUEST ClientRequest, ULONG MessageType; NTSTATUS Status; - TRACE("()\n"); + TRACE("LsaApCallPackage()\n"); if (SubmitBufferLength < sizeof(MSV1_0_PROTOCOL_MESSAGE_TYPE)) return STATUS_INVALID_PARAMETER; @@ -920,7 +920,7 @@ LsaApCallPackagePassthrough(IN PLSA_CLIENT_REQUEST ClientRequest, OUT PULONG ReturnBufferLength, OUT PNTSTATUS ProtocolStatus) { - TRACE("()\n"); + TRACE("LsaApCallPackagePassthrough()\n"); return STATUS_NOT_IMPLEMENTED; } @@ -938,7 +938,7 @@ LsaApCallPackageUntrusted(IN PLSA_CLIENT_REQUEST ClientRequest, OUT PULONG ReturnBufferLength, OUT PNTSTATUS ProtocolStatus) { - TRACE("()\n"); + TRACE("LsaApCallPackageUntrusted()\n"); return STATUS_NOT_IMPLEMENTED; } @@ -957,7 +957,7 @@ LsaApInitializePackage(IN ULONG AuthenticationPackageId, PANSI_STRING NameString; PCHAR NameBuffer; - TRACE("(%lu %p %p %p %p)\n", + TRACE("LsaApInitializePackage(%lu %p %p %p %p)\n", AuthenticationPackageId, LsaDispatchTable, Database, Confidentiality, AuthenticationPackageName); @@ -1003,7 +1003,7 @@ VOID NTAPI LsaApLogonTerminated(IN PLUID LogonId) { - TRACE("()\n"); + TRACE("LsaApLogonTerminated()\n"); } @@ -1054,6 +1054,8 @@ LsaApLogonUser(IN PLSA_CLIENT_REQUEST ClientRequest, *ProfileBuffer = NULL; *ProfileBufferLength = 0; *SubStatus = STATUS_SUCCESS; + *AccountName = NULL; + *AuthenticatingAuthority = NULL; if (LogonType == Interactive || LogonType == Batch || @@ -1371,6 +1373,20 @@ done: } } + /* Return the authenticating authority */ + *AuthenticatingAuthority = DispatchTable.AllocateLsaHeap(sizeof(UNICODE_STRING)); + if (*AuthenticatingAuthority != NULL) + { + (*AuthenticatingAuthority)->Buffer = DispatchTable.AllocateLsaHeap(LogonInfo->LogonDomainName.Length + + sizeof(UNICODE_NULL)); + if ((*AuthenticatingAuthority)->Buffer != NULL) + { + (*AuthenticatingAuthority)->MaximumLength = LogonInfo->LogonDomainName.Length + + sizeof(UNICODE_NULL); + RtlCopyUnicodeString(*AuthenticatingAuthority, &LogonInfo->LogonDomainName); + } + } + if (!NT_SUCCESS(Status)) { if (SessionCreated != FALSE)

5 years, 6 months

[reactos] 01/01: [DCOMLAUNCH][WMISVC] Stop busy waiting shutdown

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5b0087c8ea87c1952a1e… commit e5b0087c8ea87c1952a1edd4daee29839198d33c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Mar 3 23:14:07 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Mar 3 23:14:37 2019 +0100 [DCOMLAUNCH][WMISVC] Stop busy waiting shutdown --- base/services/dcomlaunch/dcomlaunch.c | 15 +++++++++------ base/services/wmisvc/wmisvc.c | 15 +++++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/base/services/dcomlaunch/dcomlaunch.c b/base/services/dcomlaunch/dcomlaunch.c index 280dbff3eb..49c8541c0c 100644 --- a/base/services/dcomlaunch/dcomlaunch.c +++ b/base/services/dcomlaunch/dcomlaunch.c @@ -25,6 +25,7 @@ static WCHAR ServiceName[] = L"dcomlaunch"; static SERVICE_STATUS_HANDLE ServiceStatusHandle; static SERVICE_STATUS ServiceStatus; +static HANDLE ShutdownEvent; /* FUNCTIONS *****************************************************************/ @@ -62,7 +63,8 @@ ServiceControlHandler(DWORD dwControl, { case SERVICE_CONTROL_STOP: DPRINT1(" SERVICE_CONTROL_STOP received\n"); - UpdateServiceStatus(SERVICE_STOPPED); + SetEvent(ShutdownEvent); + UpdateServiceStatus(SERVICE_STOP_PENDING); return ERROR_SUCCESS; case SERVICE_CONTROL_PAUSE: @@ -83,7 +85,8 @@ ServiceControlHandler(DWORD dwControl, case SERVICE_CONTROL_SHUTDOWN: DPRINT1(" SERVICE_CONTROL_SHUTDOWN received\n"); - UpdateServiceStatus(SERVICE_STOPPED); + SetEvent(ShutdownEvent); + UpdateServiceStatus(SERVICE_STOP_PENDING); return ERROR_SUCCESS; default : @@ -111,14 +114,14 @@ ServiceMain(DWORD argc, LPTSTR *argv) return; } + ShutdownEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + DealWithDeviceEvent(); UpdateServiceStatus(SERVICE_RUNNING); - do - { - Sleep(1); - } while (1); + WaitForSingleObject(ShutdownEvent, INFINITE); + CloseHandle(ShutdownEvent); UpdateServiceStatus(SERVICE_STOPPED); } diff --git a/base/services/wmisvc/wmisvc.c b/base/services/wmisvc/wmisvc.c index 8ac9d9b733..042ff84e3d 100644 --- a/base/services/wmisvc/wmisvc.c +++ b/base/services/wmisvc/wmisvc.c @@ -44,6 +44,7 @@ static WCHAR ServiceName[] = L"winmgmt"; static SERVICE_STATUS_HANDLE ServiceStatusHandle; static SERVICE_STATUS ServiceStatus; +static HANDLE ShutdownEvent; /* FUNCTIONS *****************************************************************/ @@ -81,7 +82,8 @@ ServiceControlHandler(DWORD dwControl, { case SERVICE_CONTROL_STOP: DPRINT1(" SERVICE_CONTROL_STOP received\n"); - UpdateServiceStatus(SERVICE_STOPPED); + SetEvent(ShutdownEvent); + UpdateServiceStatus(SERVICE_STOP_PENDING); return ERROR_SUCCESS; case SERVICE_CONTROL_PAUSE: @@ -102,7 +104,8 @@ ServiceControlHandler(DWORD dwControl, case SERVICE_CONTROL_SHUTDOWN: DPRINT1(" SERVICE_CONTROL_SHUTDOWN received\n"); - UpdateServiceStatus(SERVICE_STOPPED); + SetEvent(ShutdownEvent); + UpdateServiceStatus(SERVICE_STOP_PENDING); return ERROR_SUCCESS; default : @@ -128,12 +131,12 @@ ServiceMain(DWORD argc, LPTSTR *argv) return; } + ShutdownEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + UpdateServiceStatus(SERVICE_RUNNING); - do - { - Sleep(1); - } while (1); + WaitForSingleObject(ShutdownEvent, INFINITE); + CloseHandle(ShutdownEvent); UpdateServiceStatus(SERVICE_STOPPED); }

5 years, 6 months

[reactos] 01/01: Fix the MSVC version of ldexp filling up the FPU stack and bailing out with #IND after a few calls. Additionally, add it back to libcntpr.

by Colin Finck

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd0a28d1e41171a536129… commit bd0a28d1e41171a5361292e52c745bc8e48d3dde Author: Colin Finck <colin(a)reactos.org> AuthorDate: Fri Mar 1 17:49:03 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 3 16:11:27 2019 +0100 Fix the MSVC version of ldexp filling up the FPU stack and bailing out with #IND after a few calls. Additionally, add it back to libcntpr. MSVC was previously given a "result" variable to copy the fscale result from st(0). This led to another "fld" FPU stack push at the very end without popping the source value from the FPU stack. Moreover, this copy isn't even needed: A simple "fstp st(1)" at the end pops an element from the FPU stack while effectively storing the result in st(0), the register used for returning a double value. This problem didn't affect GCC, as it is only given the "fscale" instruction and does all necessary stack operations itself. However, looking into the CRT sources, I found many other i386 implementations with inline assembly suffering from the same problem. Fortunately, they have been replaced by pure assembly implementations a while ago, so it's time to finally remove them. ldexp would have also been a candidate for a pure assembly implementation, but the required check for NaN and setting errno (verified on Win2003) already outweighs the benefits. And we cannot just do a NaN check with FUCOMI as this is an i686/pentiumpro instruction while we're still targeting i586/pentium. I'm also using this opportunity to clean up the ldexp.c header and only put in the remaining contributors as returned by "git blame". Thanks to NightWolve1975 for reporting the problem! (https://twitter.com/nightwolve1975/status/1099042477531643912) --- sdk/lib/crt/libcntpr.cmake | 3 +- sdk/lib/crt/math/i386/atan2.c | 27 ------------------ sdk/lib/crt/math/i386/exp.c | 64 ------------------------------------------- sdk/lib/crt/math/i386/fmod.c | 49 --------------------------------- sdk/lib/crt/math/i386/fmodf.c | 28 ------------------- sdk/lib/crt/math/i386/ldexp.c | 45 ++++++++++++------------------ 6 files changed, 19 insertions(+), 197 deletions(-) diff --git a/sdk/lib/crt/libcntpr.cmake b/sdk/lib/crt/libcntpr.cmake index 8014bd370e..aa3b1d4fa6 100644 --- a/sdk/lib/crt/libcntpr.cmake +++ b/sdk/lib/crt/libcntpr.cmake @@ -105,7 +105,8 @@ if(ARCH STREQUAL "i386") math/i386/cilog.c math/i386/cipow.c math/i386/cisin.c - math/i386/cisqrt.c) + math/i386/cisqrt.c + math/i386/ldexp.c) if(NOT MSVC) list(APPEND LIBCNTPR_SOURCE except/i386/chkstk_ms.s) endif() diff --git a/sdk/lib/crt/math/i386/atan2.c b/sdk/lib/crt/math/i386/atan2.c deleted file mode 100644 index 7b7ebac8a2..0000000000 --- a/sdk/lib/crt/math/i386/atan2.c +++ /dev/null @@ -1,27 +0,0 @@ - -#include <math.h> - -double atan2 (double __y, double __x); - -/* - * @implemented - */ -double atan2 (double __y, double __x) -{ - register double __val; -#ifdef __GNUC__ - __asm __volatile__ - ("fpatan\n\t" - "fld %%st(0)" - : "=t" (__val) : "0" (__x), "u" (__y)); -#else - __asm - { - fld __y - fld __x - fpatan - fstp __val - } -#endif /*__GNUC__*/ - return __val; -} diff --git a/sdk/lib/crt/math/i386/exp.c b/sdk/lib/crt/math/i386/exp.c deleted file mode 100644 index 727a1cb541..0000000000 --- a/sdk/lib/crt/math/i386/exp.c +++ /dev/null @@ -1,64 +0,0 @@ -/* Math functions for i387. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by John C. Bowman <bowman(a)ipp-garching.mpg.de>, 1995. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include <math.h> - -double exp (double __x); - -double exp (double __x) -{ -#ifdef __GNUC__ - register double __value, __exponent; - __asm __volatile__ - ("fldl2e # e^x = 2^(x * log2(e))\n\t" - "fmul %%st(1) # x * log2(e)\n\t" - "fst %%st(1)\n\t" - "frndint # int(x * log2(e))\n\t" - "fxch\n\t" - "fsub %%st(1) # fract(x * log2(e))\n\t" - "f2xm1 # 2^(fract(x * log2(e))) - 1\n\t" - : "=t" (__value), "=u" (__exponent) : "0" (__x)); - __value += 1.0; - __asm __volatile__ - ("fscale" - : "=t" (__value) : "0" (__value), "u" (__exponent)); - - return __value; -#else - register double __val; - __asm - { - fld1 // store 1.0 for later use - fld __x - fldl2e // e^x = 2^(x * log2(e)) - fmul st,st(1) // x * log2(e) - fld st(0) - frndint // int(x * log2(e)) - fsub st,st(1) // fract(x * log2(e)) - fxch - f2xm1 // 2^(fract(x * log2(e))) - 1 - fadd st,st(3) // + 1.0 - fscale - fstp __val - } - return __val; -#endif /*__GNUC__*/ -} diff --git a/sdk/lib/crt/math/i386/fmod.c b/sdk/lib/crt/math/i386/fmod.c deleted file mode 100644 index fe74aa5e4d..0000000000 --- a/sdk/lib/crt/math/i386/fmod.c +++ /dev/null @@ -1,49 +0,0 @@ -/* Math functions for i387. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by John C. Bowman <bowman(a)ipp-garching.mpg.de>, 1995. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include <math.h> - -double fmod (double __x, double __y); - -double fmod (double __x, double __y) -{ - register double __val; -#ifdef __GNUC__ - __asm __volatile__ - ("1: fprem\n\t" - "fstsw %%ax\n\t" - "sahf\n\t" - "jp 1b" - : "=t" (__val) : "0" (__x), "u" (__y) : "ax", "cc"); -#else - __asm - { - fld __y - fld __x -L1: fprem1 - fstsw ax - sahf - jp L1 - fstp __val - } -#endif /*__GNUC__*/ - return __val; -} diff --git a/sdk/lib/crt/math/i386/fmodf.c b/sdk/lib/crt/math/i386/fmodf.c deleted file mode 100644 index 761f56c043..0000000000 --- a/sdk/lib/crt/math/i386/fmodf.c +++ /dev/null @@ -1,28 +0,0 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER.PD within this package. - */ -/* - * Written by J.T. Conklin <jtc(a)netbsd.org>. - * Public domain. - * - * Adapted for float type by Danny Smith - * <dannysmith(a)users.sourceforge.net>. - */ - -#include <math.h> - -float -fmodf (float x, float y) -{ - float res = 0.0F; - - asm ("1:\tfprem\n\t" - "fstsw %%ax\n\t" - "sahf\n\t" - "jp 1b\n\t" - "fstp %%st(1)" - : "=t" (res) : "0" (x), "u" (y) : "ax", "st(1)"); - return res; -} diff --git a/sdk/lib/crt/math/i386/ldexp.c b/sdk/lib/crt/math/i386/ldexp.c index 48cbc751d6..73d3e92772 100644 --- a/sdk/lib/crt/math/i386/ldexp.c +++ b/sdk/lib/crt/math/i386/ldexp.c @@ -1,33 +1,18 @@ -/* Math functions for i387. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by John C. Bowman <bowman(a)ipp-garching.mpg.de>, 1995. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ +/* + * PROJECT: ReactOS CRT + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Implements the ldexp CRT function for IA-32 with Windows-compatible error codes. + * COPYRIGHT: Copyright 2010 Timo Kreuzer (timo.kreuzer(a)reactos.org) + * Copyright 2011 Pierre Schweitzer (pierre(a)reactos.org) + * Copyright 2019 Colin Finck (colin(a)reactos.org) + */ #include <precomp.h> -#include <math.h> -#include <float.h> double ldexp (double value, int exp) { +#ifdef __GNUC__ register double result; -#ifndef __GNUC__ - register double __dy = (double)exp; #endif /* Check for value correctness @@ -43,15 +28,19 @@ double ldexp (double value, int exp) : "=t" (result) : "0" (value), "u" ((double)exp) : "1"); + return result; #else /* !__GNUC__ */ __asm { - fld __dy + fild exp fld value fscale - fstp result + fstp st(1) } + + /* "fstp st(1)" has copied st(0) to st(1), then popped the FPU stack, + * so that the value is again in st(0) now. Effectively, we have reduced + * the FPU stack by one element while preserving st(0). + * st(0) is also the register used for returning a double value. */ #endif /* !__GNUC__ */ - return result; } -

5 years, 6 months

[reactos] 01/01: [DCOMLAUNCH] Add a DcomLaunch service stub

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ab289a34a7af2e020c9b… commit 2ab289a34a7af2e020c9b4fe9045d2331ce15b05 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Mar 3 14:21:46 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Mar 3 14:25:19 2019 +0100 [DCOMLAUNCH] Add a DcomLaunch service stub This stub is responsible for providing the UUID seed to the kernel. For now, it generates a purely random seed - MAC address support is to be added. Because it's purely random seed and local the machine (not tied to the MAC address) it's made so that ExUuidCreate keeps returning RPC_NT_UUID_LOCAL_ONLY. It won't fix failing test for now. Nota: this service shouldn't exist as it. It should be implemented though rpcss DLL for both rpcss service (network service) and dcomlaunch service (local system service). Because rpcss is EXE based and wine-synced for now, I prefered stubbing a new service. This will have to be changed at some point. --- base/services/CMakeLists.txt | 1 + base/services/dcomlaunch/CMakeLists.txt | 11 +++ base/services/dcomlaunch/dcomlaunch.c | 142 +++++++++++++++++++++++++++++++ base/services/dcomlaunch/dcomlaunch.rc | 5 ++ base/services/dcomlaunch/dcomlaunch.spec | 1 + base/services/dcomlaunch/network.c | 140 ++++++++++++++++++++++++++++++ boot/bootdata/hivesft.inf | 2 +- boot/bootdata/hivesys.inf | 23 +++++ 8 files changed, 324 insertions(+), 1 deletion(-) diff --git a/base/services/CMakeLists.txt b/base/services/CMakeLists.txt index 977b5edf68..64cd734690 100644 --- a/base/services/CMakeLists.txt +++ b/base/services/CMakeLists.txt @@ -1,5 +1,6 @@ add_subdirectory(audiosrv) +add_subdirectory(dcomlaunch) add_subdirectory(dhcpcsvc) add_subdirectory(eventlog) add_subdirectory(nfsd) diff --git a/base/services/dcomlaunch/CMakeLists.txt b/base/services/dcomlaunch/CMakeLists.txt new file mode 100644 index 0000000000..6759d029aa --- /dev/null +++ b/base/services/dcomlaunch/CMakeLists.txt @@ -0,0 +1,11 @@ +spec2def(dcomlaunch.dll dcomlaunch.spec ADD_IMPORTLIB) + +add_library(dcomlaunch SHARED + dcomlaunch.c + network.c + dcomlaunch.rc + ${CMAKE_CURRENT_BINARY_DIR}/dcomlaunch.def) + +set_module_type(dcomlaunch win32dll UNICODE) +add_importlibs(dcomlaunch advapi32 msvcrt kernel32 ntdll) +add_cd_file(TARGET dcomlaunch DESTINATION reactos/system32 FOR all) diff --git a/base/services/dcomlaunch/dcomlaunch.c b/base/services/dcomlaunch/dcomlaunch.c new file mode 100644 index 0000000000..280dbff3eb --- /dev/null +++ b/base/services/dcomlaunch/dcomlaunch.c @@ -0,0 +1,142 @@ +/* + * PROJECT: ReactOS RPC Subsystem Service + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: DCOMLAUNCH service + * COPYRIGHT: Copyright 2019 Pierre Schweitzer + */ + +/* INCLUDES *****************************************************************/ + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <winsvc.h> + +#define NDEBUG +#include <debug.h> + +/* GLOBALS ******************************************************************/ + +static WCHAR ServiceName[] = L"dcomlaunch"; + +static SERVICE_STATUS_HANDLE ServiceStatusHandle; +static SERVICE_STATUS ServiceStatus; + +/* FUNCTIONS *****************************************************************/ + +static VOID +UpdateServiceStatus(DWORD dwState) +{ + ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + ServiceStatus.dwCurrentState = dwState; + ServiceStatus.dwControlsAccepted = 0; + ServiceStatus.dwWin32ExitCode = 0; + ServiceStatus.dwServiceSpecificExitCode = 0; + ServiceStatus.dwCheckPoint = 0; + + if (dwState == SERVICE_START_PENDING || + dwState == SERVICE_STOP_PENDING || + dwState == SERVICE_PAUSE_PENDING || + dwState == SERVICE_CONTINUE_PENDING) + ServiceStatus.dwWaitHint = 10000; + else + ServiceStatus.dwWaitHint = 0; + + SetServiceStatus(ServiceStatusHandle, + &ServiceStatus); +} + +static DWORD WINAPI +ServiceControlHandler(DWORD dwControl, + DWORD dwEventType, + LPVOID lpEventData, + LPVOID lpContext) +{ + DPRINT1("ServiceControlHandler() called\n"); + + switch (dwControl) + { + case SERVICE_CONTROL_STOP: + DPRINT1(" SERVICE_CONTROL_STOP received\n"); + UpdateServiceStatus(SERVICE_STOPPED); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_PAUSE: + DPRINT1(" SERVICE_CONTROL_PAUSE received\n"); + UpdateServiceStatus(SERVICE_PAUSED); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_CONTINUE: + DPRINT1(" SERVICE_CONTROL_CONTINUE received\n"); + UpdateServiceStatus(SERVICE_RUNNING); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_INTERROGATE: + DPRINT1(" SERVICE_CONTROL_INTERROGATE received\n"); + SetServiceStatus(ServiceStatusHandle, + &ServiceStatus); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_SHUTDOWN: + DPRINT1(" SERVICE_CONTROL_SHUTDOWN received\n"); + UpdateServiceStatus(SERVICE_STOPPED); + return ERROR_SUCCESS; + + default : + DPRINT1(" Control %lu received\n"); + return ERROR_CALL_NOT_IMPLEMENTED; + } +} + +VOID DealWithDeviceEvent(); + +VOID WINAPI +ServiceMain(DWORD argc, LPTSTR *argv) +{ + UNREFERENCED_PARAMETER(argc); + UNREFERENCED_PARAMETER(argv); + + DPRINT("ServiceMain() called\n"); + + ServiceStatusHandle = RegisterServiceCtrlHandlerExW(ServiceName, + ServiceControlHandler, + NULL); + if (!ServiceStatusHandle) + { + DPRINT1("RegisterServiceCtrlHandlerExW() failed! (Error %lu)\n", GetLastError()); + return; + } + + DealWithDeviceEvent(); + + UpdateServiceStatus(SERVICE_RUNNING); + + do + { + Sleep(1); + } while (1); + + UpdateServiceStatus(SERVICE_STOPPED); +} + +BOOL WINAPI +DllMain(HINSTANCE hinstDLL, + DWORD fdwReason, + LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/base/services/dcomlaunch/dcomlaunch.rc b/base/services/dcomlaunch/dcomlaunch.rc new file mode 100644 index 0000000000..f98315df2d --- /dev/null +++ b/base/services/dcomlaunch/dcomlaunch.rc @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "DcomLaunch Service" +#define REACTOS_STR_INTERNAL_NAME "dcomlaunch" +#define REACTOS_STR_ORIGINAL_FILENAME "dcomlaunch.dll" +#include <reactos/version.rc> diff --git a/base/services/dcomlaunch/dcomlaunch.spec b/base/services/dcomlaunch/dcomlaunch.spec new file mode 100644 index 0000000000..1b27fe5386 --- /dev/null +++ b/base/services/dcomlaunch/dcomlaunch.spec @@ -0,0 +1 @@ +@ stdcall ServiceMain(long ptr) diff --git a/base/services/dcomlaunch/network.c b/base/services/dcomlaunch/network.c new file mode 100644 index 0000000000..c6475c85e2 --- /dev/null +++ b/base/services/dcomlaunch/network.c @@ -0,0 +1,140 @@ +/* + * PROJECT: ReactOS RPC Subsystem Service + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: UUID initialization. + * COPYRIGHT: Copyright 2019 Pierre Schweitzer + */ + +/* INCLUDES *****************************************************************/ + +/* PSDK/NDK Headers */ +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <winsvc.h> +#include <ntddndis.h> + +#include <ndk/exfuncs.h> +#include <ntsecapi.h> + +#define NDEBUG +#include <debug.h> + +#define SEED_BUFFER_SIZE 6 + +/* FUNCTIONS ****************************************************************/ + +static BOOLEAN +getMacAddress(UCHAR * MacAddress) +{ + /* FIXME: query NDIS for all the interfaces */ + UNIMPLEMENTED; + return FALSE; +} + +static VOID +CookupNodeId(UCHAR * NodeId) +{ + CHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; + CHAR * CurrentChar; + DWORD Size; + LARGE_INTEGER PerformanceCount; + PDWORD NodeBegin, NodeMiddle; + DWORD dwValue; + MEMORYSTATUS MemoryStatus; + LUID Luid; + DWORD SectorsPerCluster, BytesPerSector, NumberOfFreeClusters, TotalNumberOfClusters; + + /* Initialize node id */ + memset(NodeId, 0x11, SEED_BUFFER_SIZE * sizeof(UCHAR)); + + /* Randomize it with computer name */ + Size = MAX_COMPUTERNAME_LENGTH + 1; + if (GetComputerNameA(ComputerName, &Size)) + { + Size = 0; + CurrentChar = &ComputerName[0]; + while (*CurrentChar != ANSI_NULL) + { + NodeId[Size] ^= *CurrentChar; + ++CurrentChar; + + /* Don't overflow our NodeId */ + if (++Size >= SEED_BUFFER_SIZE) + { + Size = 0; + } + } + } + + /* Now, we'll work directly on DWORD values */ + NodeBegin = (DWORD *)&NodeId[0]; + NodeMiddle = (DWORD *)&NodeId[2]; + + /* Randomize with performance counter */ + if (QueryPerformanceCounter(&PerformanceCount)) + { + *NodeMiddle = *NodeMiddle ^ PerformanceCount.u.HighPart ^ PerformanceCount.u.LowPart; + + dwValue = PerformanceCount.u.HighPart ^ PerformanceCount.u.LowPart ^ *NodeBegin; + } + else + { + dwValue = *NodeBegin; + } + + *NodeBegin = *NodeBegin ^ dwValue; + *NodeMiddle = *NodeMiddle ^ *NodeBegin; + + /* Then, with memory status */ + MemoryStatus.dwLength = sizeof(MemoryStatus); + GlobalMemoryStatus(&MemoryStatus); + + *NodeBegin = *NodeBegin ^ MemoryStatus.dwMemoryLoad; + *NodeMiddle = *NodeMiddle ^ MemoryStatus.dwTotalPhys; + *NodeBegin = *NodeBegin ^ MemoryStatus.dwTotalPageFile ^ MemoryStatus.dwAvailPhys; + *NodeMiddle = *NodeMiddle ^ MemoryStatus.dwTotalVirtual ^ MemoryStatus.dwAvailPageFile; + *NodeBegin = *NodeBegin ^ MemoryStatus.dwAvailVirtual; + + /* With a LUID */ + if (AllocateLocallyUniqueId(&Luid)) + { + *NodeBegin = *NodeBegin ^ Luid.LowPart; + *NodeMiddle = *NodeMiddle ^ Luid.HighPart; + } + + /* And finally with free disk space */ + if (GetDiskFreeSpaceA("c:\\", &SectorsPerCluster, &BytesPerSector, &NumberOfFreeClusters, &TotalNumberOfClusters)) + { + *NodeMiddle = *NodeMiddle ^ TotalNumberOfClusters * BytesPerSector * SectorsPerCluster; + *NodeBegin = *NodeBegin ^ NumberOfFreeClusters * BytesPerSector * SectorsPerCluster; + } + + /* + * Because it was locally generated, force the seed to be local + * setting this, will trigger the check for validness in the kernel + * and make the seed local + */ + NodeId[0] |= 0x80u; +} + +VOID DealWithDeviceEvent(VOID) +{ + NTSTATUS Status; + UCHAR UuidSeed[SEED_BUFFER_SIZE]; + + /* First, try to get a multicast MAC address */ + if (!getMacAddress(UuidSeed)) + { + DPRINT1("Failed finding a proper MAC address, will generate seed\n"); + CookupNodeId(UuidSeed); + } + + /* Seed our UUID generator */ + Status = NtSetUuidSeed(UuidSeed); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetUuidSeed failed with status: %lx\n", Status); + } +} diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf index 5f78d8f1df..efd5c0833e 100644 --- a/boot/bootdata/hivesft.inf +++ b/boot/bootdata/hivesft.inf @@ -1775,7 +1775,7 @@ HKLM,"SOFTWARE\Microsoft\Ole","EnableRemoteConnect",0x00000000,"N" ; SvcHost services HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost",,0x00000012 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost","DcomLaunch",0x00010000,"PlugPlay" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost","DcomLaunch",0x00010000,"DcomLaunch","PlugPlay" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost","netsvcs",0x00010000,"DHCP","BITS","lanmanserver","lanmanworkstation","Schedule","Themes","winmgmt" ; Win32 config diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index aa85d6ccdb..c8cd1821f8 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -2058,6 +2058,17 @@ HKLM,"SYSTEM\CurrentControlSet\Services\wuauserv","Start",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\wuauserv","Type",0x00010001,0x00000020 HKLM,"SYSTEM\CurrentControlSet\Services\wuauserv\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\wuauserv.dll" +; DCOMLAUNCH Service +HKLM,"SYSTEM\CurrentControlSet\Services\DcomLaunch","DisplayName",0x00000000,%DCOMLAUNCH_SERVICE% +HKLM,"SYSTEM\CurrentControlSet\Services\DcomLaunch","Description",0x00000000,%DCOMLAUNCH_SERVICE_DESCRIPTION% +HKLM,"SYSTEM\CurrentControlSet\Services\DcomLaunch","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\DcomLaunch","Group",0x00000000,"Event log" +HKLM,"SYSTEM\CurrentControlSet\Services\DcomLaunch","ImagePath",0x00020000,"%SystemRoot%\system32\svchost.exe -k DcomLaunch" +HKLM,"SYSTEM\CurrentControlSet\Services\DcomLaunch","ObjectName",0x00000000,"LocalSystem" +HKLM,"SYSTEM\CurrentControlSet\Services\DcomLaunch","Start",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\DcomLaunch","Type",0x00010001,0x00000020 +HKLM,"SYSTEM\CurrentControlSet\Services\DcomLaunch\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\dcomlaunch.dll" + ; Sound Blaster (NT4) ;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","Description",0x00000000,"Sound Blaster (NT4)" ;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","ErrorControl",0x00010001,0x00000001 @@ -2178,6 +2189,9 @@ AUDIO_SERVICE_DESCRIPTION="Provides audio facilities to applications" BITS_SERVICE="Background Intelligent Transfer Service" BITS_SERVICE_DESCRIPTION="Transfers files in the background using idle network bandwidth." +DCOMLAUNCH_SERVICE="DcomLaunch service" +DCOMLAUNCH_SERVICE_DESCRIPTION="DcomLaunch service stub." + EVENTLOG_SERVICE="Event Logger" EVENTLOG_SERVICE_DESCRIPTION="Logs events or messages sent by the operating system in a database accessible via the event log viewer." @@ -2320,6 +2334,9 @@ AUDIO_SERVICE_DESCRIPTION="Zapewnia aplikacjom dostęp do urządzeń audio." BITS_SERVICE="Usługa inteligentnego transferu w tle" BITS_SERVICE_DESCRIPTION="Przenosi dane pomiędzy klientami a serwerami w tle." +DCOMLAUNCH_SERVICE="DcomLaunch service" +DCOMLAUNCH_SERVICE_DESCRIPTION="DcomLaunch service stub." + EVENTLOG_SERVICE="Dziennik zdarzeń" EVENTLOG_SERVICE_DESCRIPTION="Zapisuje zdarzenia lub wiadomości wysyłane przez system operacyjny do bazy danych dostępnej za pomocą podglądu zdarzeń." @@ -2459,6 +2476,9 @@ AUDIO_SERVICE_DESCRIPTION="Oferă aplicațiilor funcționalități audio." BITS_SERVICE="Serviciu de transfer inteligent în fundal" BITS_SERVICE_DESCRIPTION="Transferă fișiere în fundal utilizând lățimea de bandă nefolosită a rețelei." +DCOMLAUNCH_SERVICE="DcomLaunch service" +DCOMLAUNCH_SERVICE_DESCRIPTION="DcomLaunch service stub." + EVENTLOG_SERVICE="Jurnal de evenimente" EVENTLOG_SERVICE_DESCRIPTION="Jurnalizează mesajele sau evenimentele transmise de sistemul de operare într-o bază de date accesibilă cu instrumentul „observator de evenimente”." @@ -2598,6 +2618,9 @@ AUDIO_SERVICE_DESCRIPTION="Обеспечивает звуковыми устр BITS_SERVICE="Фоновая интеллектуальная служба передачи (BITS)" BITS_SERVICE_DESCRIPTION="Обеспечивает передачу данных между клиентами и серверами в фоновом режиме с использованием пропускной способности простаивающей сети." +DCOMLAUNCH_SERVICE="DcomLaunch service" +DCOMLAUNCH_SERVICE_DESCRIPTION="DcomLaunch service stub." + EVENTLOG_SERVICE="Журнал событий" EVENTLOG_SERVICE_DESCRIPTION="Регистрирует события или сообщения, отправленные операционной системой в базе данных, доступной через средство просмотра журнала событий."

5 years, 6 months

[reactos] 01/01: [SHELL32] Update all languages RCs to fix possible text truncation CORE-15765

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1d7287288de6073ae5a5d… commit 1d7287288de6073ae5a5db16727b169a57ff6ec1 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Mar 3 02:23:34 2019 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Mar 3 02:23:34 2019 +0100 [SHELL32] Update all languages RCs to fix possible text truncation CORE-15765 IDD_BROWSE_FOR_FOLDER displays text controlled by the calling applications in IDC_BROWSE_FOR_FOLDER_TITLE. Its old height could lead to text truncation for existing 3rd party apps. The new height value for IDC_BROWSE_FOR_FOLDER_TITLE was inspired by IDC with the same from dialog IDD_BROWSE_FOR_FOLDER_NEW. I could change all languages to the same height, as dimensions of the dialog and surrounding controls were same. --- dll/win32/shell32/lang/bg-BG.rc | 2 +- dll/win32/shell32/lang/ca-ES.rc | 2 +- dll/win32/shell32/lang/cs-CZ.rc | 2 +- dll/win32/shell32/lang/da-DK.rc | 2 +- dll/win32/shell32/lang/de-DE.rc | 2 +- dll/win32/shell32/lang/el-GR.rc | 2 +- dll/win32/shell32/lang/en-GB.rc | 2 +- dll/win32/shell32/lang/en-US.rc | 2 +- dll/win32/shell32/lang/es-ES.rc | 2 +- dll/win32/shell32/lang/et-EE.rc | 2 +- dll/win32/shell32/lang/fi-FI.rc | 2 +- dll/win32/shell32/lang/fr-FR.rc | 2 +- dll/win32/shell32/lang/he-IL.rc | 2 +- dll/win32/shell32/lang/hi-IN.rc | 2 +- dll/win32/shell32/lang/hu-HU.rc | 2 +- dll/win32/shell32/lang/it-IT.rc | 2 +- dll/win32/shell32/lang/ja-JP.rc | 2 +- dll/win32/shell32/lang/ko-KR.rc | 2 +- dll/win32/shell32/lang/nl-NL.rc | 2 +- dll/win32/shell32/lang/no-NO.rc | 2 +- dll/win32/shell32/lang/pl-PL.rc | 2 +- dll/win32/shell32/lang/pt-BR.rc | 2 +- dll/win32/shell32/lang/pt-PT.rc | 2 +- dll/win32/shell32/lang/ro-RO.rc | 2 +- dll/win32/shell32/lang/ru-RU.rc | 2 +- dll/win32/shell32/lang/sk-SK.rc | 2 +- dll/win32/shell32/lang/sl-SI.rc | 2 +- dll/win32/shell32/lang/sq-AL.rc | 2 +- dll/win32/shell32/lang/sv-SE.rc | 2 +- dll/win32/shell32/lang/tr-TR.rc | 2 +- dll/win32/shell32/lang/uk-UA.rc | 2 +- dll/win32/shell32/lang/zh-CN.rc | 2 +- dll/win32/shell32/lang/zh-TW.rc | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 448384f68e..ac39de9955 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -96,7 +96,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Добре", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Отказ", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 429dd34036..0ced2ba62a 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -95,7 +95,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancel", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index daabd65bcd..539b04993e 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -101,7 +101,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Storno", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index a39927ee99..28c706afbb 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -101,7 +101,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Fortryd", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index f86c5f262b..78801725b8 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -95,7 +95,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Abbrechen", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index 3a943f229c..317c13710c 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -95,7 +95,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Άκυρο", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 14e6654a48..3b641dac92 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -95,7 +95,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancel", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index c5dd4829f4..65d3b8ed2a 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -95,7 +95,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancel", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index e207b501f4..a538c76eac 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -103,7 +103,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Aceptar", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancelar", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 1f9dee687f..d883bb5c91 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -102,7 +102,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Loobu", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 3f284deaab..170aca7d53 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -95,7 +95,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Peruuta", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 1c525d04f0..edbfb089e6 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -95,7 +95,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Annuler", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index f734560050..d2bb286678 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -95,7 +95,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "אישור", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "ביטול", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 3d759b38b1..97de5a4ccc 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -95,7 +95,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "ओके", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "रद्द करें", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index bab678e9d8..6ce780f28c 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -95,7 +95,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Mégse", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index f4de79b596..25fe7a7f3e 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -95,7 +95,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Annulla", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 9e5d792fd2..a83453cfff 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -95,7 +95,7 @@ FONT 9, "MS UI Gothic" BEGIN DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "キャンセル", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index af088d2160..b7e6600612 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -95,7 +95,7 @@ FONT 9, "굴림" BEGIN DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancel", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index cc7bc171dd..40ac2318e3 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -95,7 +95,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancel", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 997fd580b1..d263a92d95 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -95,7 +95,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Avbryt", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 8e808a890a..39ff26928d 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -100,7 +100,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Anuluj", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 9b3cb6744e..11b89e1d8a 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -95,7 +95,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancelar", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 5b30db67e8..1f14d56bef 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -95,7 +95,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancelar", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 3a8c580e5e..7be0d9c847 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -97,7 +97,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Con&firmă", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "A&nulează", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 5d56f1f7f3..2eb8327614 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -102,7 +102,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Отмена", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 25a9ba1461..ad004463be 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -95,7 +95,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Zrušiť", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index deb4179a91..6cfdab38b3 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -95,7 +95,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancel", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index ad7d9417d3..5cfa53a505 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -99,7 +99,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Anulo", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 5ba90e530b..45ffc3fa97 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -95,7 +95,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Avbryt", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 9eaa2a7c34..12be063868 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -97,7 +97,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Tamam", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "İptal", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index d1c45341a6..9b9ad54bcc 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -95,7 +95,7 @@ FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Скасувати", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 05c73039d2..5d42cc9689 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -105,7 +105,7 @@ FONT 9, "宋体" BEGIN DEFPUSHBUTTON "确定", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "取消", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index fe430d2a37..86e4533384 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -104,7 +104,7 @@ FONT 9, "新細明體" BEGIN DEFPUSHBUTTON "確定", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "取消", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP - LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 + LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 END

5 years, 6 months

[reactos] 01/01: [MSI] In dialogs show titlebar buttons CORE-15301

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=026c575577beb59e20ae8… commit 026c575577beb59e20ae8377ef01090b5e87a464 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Mar 3 01:26:59 2019 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Mar 3 01:26:59 2019 +0100 [MSI] In dialogs show titlebar buttons CORE-15301 Import the Wine fix https://source.winehq.org/git/wine.git/?a=commit;h=84e6b331918d57f39e20a306… Many thanks to the fixes author Fabian Maurer. --- dll/win32/msi/dialog.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dll/win32/msi/dialog.c b/dll/win32/msi/dialog.c index 97fc89cbce..376fa491fd 100644 --- a/dll/win32/msi/dialog.c +++ b/dll/win32/msi/dialog.c @@ -3791,6 +3791,10 @@ static LRESULT WINAPI MSIDialog_WndProc( HWND hwnd, UINT msg, case WM_COMMAND: return msi_dialog_oncommand( dialog, wParam, (HWND)lParam ); + case WM_CLOSE: + /* Simulate escape press */ + return msi_dialog_oncommand(dialog, 2, NULL); + case WM_ACTIVATE: if( LOWORD(wParam) == WA_INACTIVE ) dialog->hWndFocus = GetFocus(); @@ -3836,10 +3840,13 @@ static UINT dialog_run_message_loop( msi_dialog *dialog ) return SendMessageW( hMsiHiddenWindow, WM_MSI_DIALOG_CREATE, 0, (LPARAM) dialog ); /* create the dialog window, don't show it yet */ - style = WS_OVERLAPPED; + style = WS_OVERLAPPED | WS_SYSMENU; if( dialog->attributes & msidbDialogAttributesVisible ) style |= WS_VISIBLE; + if (dialog->parent == NULL && (dialog->attributes & msidbDialogAttributesMinimize)) + style |= WS_MINIMIZEBOX; + hwnd = CreateWindowW( szMsiDialogClass, dialog->name, style, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, dialog );

5 years, 6 months

[reactos] 01/01: [TASKMGR] Update german rc to avoid text truncation in status-bar CORE-15615

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b9614864156bef34d1f3… commit 3b9614864156bef34d1f36447a884709360ca8a3 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Mar 3 00:46:23 2019 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Mar 3 00:46:23 2019 +0100 [TASKMGR] Update german rc to avoid text truncation in status-bar CORE-15615 which became a necessity after the second field was reduced in width by commit 0.4.12-dev-363-g 473e0bfc838ddb7f84ebeaafc86acf3873d99c10 --- base/applications/taskmgr/lang/de-DE.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/taskmgr/lang/de-DE.rc b/base/applications/taskmgr/lang/de-DE.rc index 1a353cbf88..86d00c468d 100644 --- a/base/applications/taskmgr/lang/de-DE.rc +++ b/base/applications/taskmgr/lang/de-DE.rc @@ -439,7 +439,7 @@ BEGIN IDS_MSG_WARNINGCHANGEPRIORITY "WARNUNG: Das Ändern der Prioritätsklasse dieses Prozesses\nkann zu unerwünschten Ergebnissen, einschl. Systeminstabilität, führen.\nSind Sie sicher, dass Sie diese ändern möchten?" IDS_MSG_TRAYICONCPUUSAGE "CPU-Auslastung: %d%%" IDS_STATUS_MEMUSAGE "Speicher: %s / %s (%d%%)" - IDS_STATUS_CPUUSAGE "CPU-Auslastung: %3d%%" + IDS_STATUS_CPUUSAGE "CPU-Last: %3d%%" IDS_STATUS_PROCESSES "Prozesse: %d" IDS_NOT_RESPONDING "Keine Rückmeldung" IDS_RUNNING "Wird ausgeführt"

5 years, 6 months

[reactos] 01/01: [SETUPAPI] Implement CM_Next_Range()

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e88a6b2053d403f288546… commit e88a6b2053d403f288546694d8a7079c34180925 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Mar 2 20:52:52 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Mar 2 20:59:12 2019 +0100 [SETUPAPI] Implement CM_Next_Range() --- dll/win32/setupapi/cfgmgr.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c index 0a3035d6ae..6af41f2910 100644 --- a/dll/win32/setupapi/cfgmgr.c +++ b/dll/win32/setupapi/cfgmgr.c @@ -72,6 +72,7 @@ typedef struct _NOTIFY_DATA typedef struct _INTERNAL_RANGE { LIST_ENTRY ListEntry; + struct _INTERNAL_RANGE_LIST *pRangeList; DWORDLONG ullStart; DWORDLONG ullEnd; } INTERNAL_RANGE, *PINTERNAL_RANGE; @@ -1065,6 +1066,7 @@ CM_Add_Range( goto done; } + pRange->pRangeList = pRangeList; pRange->ullStart = ullStartValue; pRange->ullEnd = ullEndValue; @@ -5900,10 +5902,51 @@ CM_Next_Range( _Out_ PDWORDLONG pullEnd, _In_ ULONG ulFlags) { + PINTERNAL_RANGE_LIST pRangeList; + PINTERNAL_RANGE pRange; + PLIST_ENTRY ListEntry; + CONFIGRET ret = CR_SUCCESS; + FIXME("CM_Next_Range(%p %p %p %lx)\n", preElement, pullStart, pullEnd, ulFlags); - return CR_CALL_NOT_IMPLEMENTED; + pRange = (PINTERNAL_RANGE)preElement; + + if (pRange == NULL || pRange->pRangeList == NULL) + return CR_FAILURE; + + if (pullStart == NULL || pullEnd == NULL) + return CR_INVALID_POINTER; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + + pRangeList = pRange->pRangeList; + + /* Lock the range list */ + WaitForSingleObject(pRangeList->hMutex, INFINITE); + + /* Fail, if we reached the end of the list */ + if (pRange->ListEntry.Flink == &pRangeList->ListHead) + { + ret = CR_FAILURE; + goto done; + } + + /* Get the next range */ + ListEntry = pRangeList->ListHead.Flink; + pRange = CONTAINING_RECORD(ListEntry, INTERNAL_RANGE, ListEntry); + + /* Return the range data */ + *pullStart = pRange->ullStart; + *pullEnd = pRange->ullEnd; + *preElement = (RANGE_ELEMENT)pRange; + +done: + /* Unlock the range list */ + ReleaseMutex(pRangeList->hMutex); + + return ret; }

5 years, 6 months

[reactos] 01/01: [COVERITY][SETUPAPI] Release the blocks of memory when done

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0bc8e2a5bb733d4227b47… commit 0bc8e2a5bb733d4227b474b50d1b8ebfd0b3ee09 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Fri Mar 1 20:24:18 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Mar 2 20:39:09 2019 +0100 [COVERITY][SETUPAPI] Release the blocks of memory when done pRange variable allocates blocks of memory from the heap by HeapAlloc() although this resource is never freed afterwards. COVERITY CID 1427056 --- dll/win32/setupapi/cfgmgr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c index 98b09139b7..0a3035d6ae 100644 --- a/dll/win32/setupapi/cfgmgr.c +++ b/dll/win32/setupapi/cfgmgr.c @@ -1075,7 +1075,8 @@ CM_Add_Range( } else { - + HeapFree(GetProcessHeap(), 0, pRange); + UNIMPLEMENTED; } done:

5 years, 6 months

[reactos] 01/01: Use GDI Batch for PatBlt

by jimtabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b6262a25fd0a21de10af7… commit b6262a25fd0a21de10af78ce84cdf0b6add2978f Author: jimtabor <james.tabor(a)reactos.org> AuthorDate: Sat Mar 2 11:30:21 2019 -0600 Commit: jimtabor <james.tabor(a)reactos.org> CommitDate: Sat Mar 2 11:30:21 2019 -0600 Use GDI Batch for PatBlt This should increase speed a bit. Makes a good argument to use PolyPatBlt for more than one call. PolyPatBlt is not fully tested yet. --- win32ss/gdi/gdi32/include/gdi32p.h | 4 +- win32ss/gdi/gdi32/objects/painting.c | 61 +++++++++++++- win32ss/gdi/ntgdi/gdibatch.c | 158 ++++++++++++++++++++++++++++++++++- 3 files changed, 218 insertions(+), 5 deletions(-) diff --git a/win32ss/gdi/gdi32/include/gdi32p.h b/win32ss/gdi/gdi32/include/gdi32p.h index 9dc2ec4fb6..67d3a68dbf 100644 --- a/win32ss/gdi/gdi32/include/gdi32p.h +++ b/win32ss/gdi/gdi32/include/gdi32p.h @@ -388,8 +388,8 @@ GdiAllocBatchCommand( } /* Get the size of the entry */ - if (Cmd == GdiBCPatBlt) cjSize = 0; - else if (Cmd == GdiBCPolyPatBlt) cjSize = 0; + if (Cmd == GdiBCPatBlt) cjSize = sizeof(GDIBSPATBLT); + else if (Cmd == GdiBCPolyPatBlt) cjSize = sizeof(GDIBSPPATBLT); else if (Cmd == GdiBCTextOut) cjSize = 0; else if (Cmd == GdiBCExtTextOut) cjSize = 0; else if (Cmd == GdiBCSetBrushOrg) cjSize = sizeof(GDIBSSETBRHORG); diff --git a/win32ss/gdi/gdi32/objects/painting.c b/win32ss/gdi/gdi32/objects/painting.c index 150040cc0d..efc987e6cb 100644 --- a/win32ss/gdi/gdi32/objects/painting.c +++ b/win32ss/gdi/gdi32/objects/painting.c @@ -456,9 +456,35 @@ PatBlt( _In_ INT nHeight, _In_ DWORD dwRop) { + PDC_ATTR pdcattr; + HANDLE_METADC(BOOL, PatBlt, FALSE, hdc, nXLeft, nYLeft, nWidth, nHeight, dwRop); - /* FIXME some part need be done in user mode */ + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (pdcattr && !(pdcattr->ulDirty_ & DC_DIBSECTION)) + { + PGDIBSPATBLT pgO; + + pgO = GdiAllocBatchCommand(hdc, GdiBCPatBlt); + if (pgO) + { + pgO->nXLeft = nXLeft; + pgO->nYLeft = nYLeft; + pgO->nWidth = nWidth; + pgO->nHeight = nHeight; + pgO->dwRop = dwRop; + /* Snapshot attributes */ + pgO->hbrush = pdcattr->hbrush; + pgO->crForegroundClr = pdcattr->crForegroundClr; + pgO->crBackgroundClr = pdcattr->crBackgroundClr; + pgO->crBrushClr = pdcattr->crBrushClr; + pgO->ulForegroundClr = pdcattr->ulForegroundClr; + pgO->ulBackgroundClr = pdcattr->ulBackgroundClr; + pgO->ulBrushClr = pdcattr->ulBrushClr; + return TRUE; + } + } return NtGdiPatBlt( hdc, nXLeft, nYLeft, nWidth, nHeight, dwRop); } @@ -474,6 +500,7 @@ PolyPatBlt( UINT i; BOOL bResult; HBRUSH hbrOld; + PDC_ATTR pdcattr; /* Handle meta DCs */ if ((GDI_HANDLE_GET_TYPE(hdc) == GDILoObjType_LO_METADC16_TYPE) || @@ -511,7 +538,37 @@ PolyPatBlt( return bResult; } - /* FIXME some part need be done in user mode */ + /* Get the DC attribute */ + pdcattr = GdiGetDcAttr(hdc); + if (nCount && pdcattr && !(pdcattr->ulDirty_ & DC_DIBSECTION)) + { + PGDIBSPPATBLT pgO; + PTEB pTeb = NtCurrentTeb(); + + pgO = GdiAllocBatchCommand(hdc, GdiBCPolyPatBlt); + if (pgO) + { + USHORT cjSize = sizeof(GDIBSPPATBLT) + (nCount-1) * sizeof(PATRECT); + + if ((pTeb->GdiTebBatch.Offset + cjSize) <= GDIBATCHBUFSIZE) + { + pgO->Count = nCount; + pgO->Mode = dwMode; + pgO->rop4 = dwRop; + /* Snapshot attributes */ + pgO->crForegroundClr = pdcattr->crForegroundClr; + pgO->crBackgroundClr = pdcattr->crBackgroundClr; + pgO->crBrushClr = pdcattr->crBrushClr; + pgO->ulForegroundClr = pdcattr->ulForegroundClr; + pgO->ulBackgroundClr = pdcattr->ulBackgroundClr; + pgO->ulBrushClr = pdcattr->ulBrushClr; + RtlCopyMemory(pgO->pRect, pPoly, nCount * sizeof(PATRECT)); + // Recompute offset, remember one is already accounted for in the structure. + pTeb->GdiTebBatch.Offset += (nCount-1) * sizeof(PATRECT); + return TRUE; + } + } + } return NtGdiPolyPatBlt(hdc, dwRop, pPoly, nCount, dwMode); } diff --git a/win32ss/gdi/ntgdi/gdibatch.c b/win32ss/gdi/ntgdi/gdibatch.c index bd9306ae2e..3c7d6c2ad0 100644 --- a/win32ss/gdi/ntgdi/gdibatch.c +++ b/win32ss/gdi/ntgdi/gdibatch.c @@ -4,6 +4,7 @@ #define NDEBUG #include <debug.h> +BOOL FASTCALL IntPatBlt( PDC,INT,INT,INT,INT,DWORD,PEBRUSHOBJ); // // Gdi Batch Flush support functions. @@ -89,16 +90,171 @@ GdiFlushUserBatch(PDC dc, PGDIBATCHHDR pHdr) switch(Cmd) { case GdiBCPatBlt: + { + PGDIBSPATBLT pgDPB; + DWORD dwRop, flags; + HBRUSH hOrgBrush; + COLORREF crColor, crBkColor, crBrushClr; + ULONG ulForegroundClr, ulBackgroundClr, ulBrushClr; + if (!dc) break; + pgDPB = (PGDIBSPATBLT) pHdr; + /* Convert the ROP3 to a ROP4 */ + dwRop = pgDPB->dwRop; + dwRop = MAKEROP4(dwRop & 0xFF0000, dwRop); + /* Check if the rop uses a source */ + if (WIN32_ROP4_USES_SOURCE(dwRop)) + { + /* This is not possible */ + break; + } + /* Check if the DC has no surface (empty mem or info DC) */ + if (dc->dclevel.pSurface == NULL) + { + /* Nothing to do */ + break; + } + // Save current attributes and flags + crColor = dc->pdcattr->crForegroundClr; + crBkColor = dc->pdcattr->ulBackgroundClr; + crBrushClr = dc->pdcattr->crBrushClr; + ulForegroundClr = dc->pdcattr->ulForegroundClr; + ulBackgroundClr = dc->pdcattr->ulBackgroundClr; + ulBrushClr = dc->pdcattr->ulBrushClr; + hOrgBrush = dc->pdcattr->hbrush; + flags = dc->pdcattr->ulDirty_ & (DIRTY_BACKGROUND | DIRTY_TEXT | DIRTY_FILL | DC_BRUSH_DIRTY); + // Set the attribute snapshot + dc->pdcattr->hbrush = pgDPB->hbrush; + dc->pdcattr->crForegroundClr = pgDPB->crForegroundClr; + dc->pdcattr->crBackgroundClr = pgDPB->crBackgroundClr; + dc->pdcattr->crBrushClr = pgDPB->crBrushClr; + dc->pdcattr->ulForegroundClr = pgDPB->ulForegroundClr; + dc->pdcattr->ulBackgroundClr = pgDPB->ulBackgroundClr; + dc->pdcattr->ulBrushClr = pgDPB->ulBrushClr; + // Process dirty attributes if any + if (dc->pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) + DC_vUpdateFillBrush(dc); + if (dc->pdcattr->ulDirty_ & DIRTY_TEXT) + DC_vUpdateTextBrush(dc); + if (pdcattr->ulDirty_ & DIRTY_BACKGROUND) + DC_vUpdateBackgroundBrush(dc); + /* Call the internal function */ + IntPatBlt(dc, pgDPB->nXLeft, pgDPB->nYLeft, pgDPB->nWidth, pgDPB->nHeight, dwRop, &dc->eboFill); + // Restore attributes and flags + dc->pdcattr->hbrush = hOrgBrush; + dc->pdcattr->crForegroundClr = crColor; + dc->pdcattr->crBackgroundClr = crBkColor; + dc->pdcattr->crBrushClr = crBrushClr; + dc->pdcattr->ulForegroundClr = ulForegroundClr; + dc->pdcattr->ulBackgroundClr = ulBackgroundClr; + dc->pdcattr->ulBrushClr = ulBrushClr; + dc->pdcattr->ulDirty_ |= flags; break; + } case GdiBCPolyPatBlt: + { + PGDIBSPPATBLT pgDPB; + EBRUSHOBJ eboFill; + PBRUSH pbrush; + PPATRECT pRects; + INT cRects, i; + DWORD dwRop, flags; + COLORREF crColor, crBkColor, crBrushClr; + ULONG ulForegroundClr, ulBackgroundClr, ulBrushClr; + if (!dc) break; + pgDPB = (PGDIBSPPATBLT) pHdr; + /* Convert the ROP3 to a ROP4 */ + dwRop = pgDPB->rop4; + dwRop = MAKEROP4(dwRop & 0xFF0000, dwRop); + /* Check if the rop uses a source */ + if (WIN32_ROP4_USES_SOURCE(dwRop)) + { + /* This is not possible */ + break; + } + /* Check if the DC has no surface (empty mem or info DC) */ + if (dc->dclevel.pSurface == NULL) + { + /* Nothing to do */ + break; + } + // Save current attributes and flags + crColor = dc->pdcattr->crForegroundClr; + crBkColor = dc->pdcattr->ulBackgroundClr; + crBrushClr = dc->pdcattr->crBrushClr; + ulForegroundClr = dc->pdcattr->ulForegroundClr; + ulBackgroundClr = dc->pdcattr->ulBackgroundClr; + ulBrushClr = dc->pdcattr->ulBrushClr; + flags = dc->pdcattr->ulDirty_ & (DIRTY_BACKGROUND | DIRTY_TEXT | DIRTY_FILL | DC_BRUSH_DIRTY); + // Set the attribute snapshot + dc->pdcattr->crForegroundClr = pgDPB->crForegroundClr; + dc->pdcattr->crBackgroundClr = pgDPB->crBackgroundClr; + dc->pdcattr->crBrushClr = pgDPB->crBrushClr; + dc->pdcattr->ulForegroundClr = pgDPB->ulForegroundClr; + dc->pdcattr->ulBackgroundClr = pgDPB->ulBackgroundClr; + dc->pdcattr->ulBrushClr = pgDPB->ulBrushClr; + // Process dirty attributes if any + if (dc->pdcattr->ulDirty_ & DIRTY_TEXT) + DC_vUpdateTextBrush(dc); + if (pdcattr->ulDirty_ & DIRTY_BACKGROUND) + DC_vUpdateBackgroundBrush(dc); + + DPRINT1("GdiBCPolyPatBlt Testing\n"); + pRects = pgDPB->pRect; + cRects = pgDPB->Count; + + for (i = 0; i < cRects; i++) + { + pbrush = BRUSH_ShareLockBrush(pRects->hBrush); + + /* Check if we could lock the brush */ + if (pbrush != NULL) + { + /* Initialize a brush object */ + EBRUSHOBJ_vInitFromDC(&eboFill, pbrush, dc); + + IntPatBlt( + dc, + pRects->r.left, + pRects->r.top, + pRects->r.right, + pRects->r.bottom, + dwRop, + &eboFill); + + /* Cleanup the brush object and unlock the brush */ + EBRUSHOBJ_vCleanup(&eboFill); + BRUSH_ShareUnlockBrush(pbrush); + } + pRects++; + } + + // Restore attributes and flags + dc->pdcattr->crForegroundClr = crColor; + dc->pdcattr->crBackgroundClr = crBkColor; + dc->pdcattr->crBrushClr = crBrushClr; + dc->pdcattr->ulForegroundClr = ulForegroundClr; + dc->pdcattr->ulBackgroundClr = ulBackgroundClr; + dc->pdcattr->ulBrushClr = ulBrushClr; + dc->pdcattr->ulDirty_ |= flags; break; - + } case GdiBCTextOut: break; case GdiBCExtTextOut: + { + //GreExtTextOutW( hDC, + // XStart, + // YStart, + // fuOptions, + // &SafeRect, + // SafeString, + // Count, + // SafeDx, + // dwCodePage ); break; + } case GdiBCSetBrushOrg: {

5 years, 6 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 March 2019