Ros-diffs July 2019

ros-diffs@reactos.org

22 participants
146 discussions

[reactos] 01/01: [W32TIME] Use an event to stop the service

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b15e72206a5511ea1cd3… commit 6b15e72206a5511ea1cd3a734ce3155e3668d084 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jul 28 22:37:17 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jul 28 22:38:04 2019 +0200 [W32TIME] Use an event to stop the service CORE-16180 --- base/services/w32time/w32time.c | 52 +++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/base/services/w32time/w32time.c b/base/services/w32time/w32time.c index d6a6828b637..590396fc771 100644 --- a/base/services/w32time/w32time.c +++ b/base/services/w32time/w32time.c @@ -12,6 +12,7 @@ SERVICE_STATUS ServiceStatus; SERVICE_STATUS_HANDLE hStatus; +HANDLE hStopEvent = NULL; static WCHAR ServiceName[] = L"W32Time"; int InitService(VOID); @@ -208,28 +209,21 @@ ControlHandler(DWORD request) switch (request) { case SERVICE_CONTROL_STOP: - DPRINT("W32Time Service stopped.\n"); - - ServiceStatus.dwWin32ExitCode = 0; - ServiceStatus.dwCurrentState = SERVICE_STOPPED; - SetServiceStatus(hStatus, &ServiceStatus); - return; - case SERVICE_CONTROL_SHUTDOWN: - DPRINT("W32Time Service stopped.\n"); + DPRINT("Stopping W32Time Service\n"); ServiceStatus.dwWin32ExitCode = 0; - ServiceStatus.dwCurrentState = SERVICE_STOPPED; + ServiceStatus.dwCurrentState = SERVICE_STOP_PENDING; SetServiceStatus(hStatus, &ServiceStatus); + + if (hStopEvent) + SetEvent(hStopEvent); return; default: break; } - /* Report current status */ - SetServiceStatus(hStatus, &ServiceStatus); - return; } @@ -239,7 +233,7 @@ WINAPI ServiceMain(DWORD argc, LPWSTR *argv) { int result; - DWORD dwPollInterval; + DWORD dwInterval; UNREFERENCED_PARAMETER(argc); UNREFERENCED_PARAMETER(argv); @@ -260,14 +254,27 @@ ServiceMain(DWORD argc, LPWSTR *argv) return; } + /* Create the stop event */ + hStopEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + if (hStopEvent == NULL) + { + ServiceStatus.dwCurrentState = SERVICE_STOPPED; + ServiceStatus.dwWin32ExitCode = GetLastError(); + ServiceStatus.dwControlsAccepted = 0; + SetServiceStatus(hStatus, &ServiceStatus); + return; + } + + /* Get the interval */ + dwInterval = GetIntervalSetting(); + /* We report the running status to SCM. */ ServiceStatus.dwCurrentState = SERVICE_RUNNING; SetServiceStatus(hStatus, &ServiceStatus); /* The worker loop of a service */ - while (ServiceStatus.dwCurrentState == SERVICE_RUNNING) + for (;;) { - dwPollInterval = GetIntervalSetting(); result = SetTime(); if (result) @@ -284,13 +291,24 @@ ServiceMain(DWORD argc, LPWSTR *argv) * service when the correct conditions can be determined, but it * is left commented out. ServiceStatus.dwCurrentState = SERVICE_STOPPED; - ServiceStatus.dwWin32ExitCode = -1; + ServiceStatus.dwWin32ExitCode = result; SetServiceStatus(hStatus, &ServiceStatus); return; */ } - Sleep(dwPollInterval * 1000); + if (WaitForSingleObject(hStopEvent, dwInterval) == WAIT_OBJECT_0) + { + CloseHandle(hStopEvent); + hStopEvent = NULL; + + ServiceStatus.dwCurrentState = SERVICE_STOPPED; + ServiceStatus.dwWin32ExitCode = ERROR_SUCCESS; + ServiceStatus.dwControlsAccepted = 0; + SetServiceStatus(hStatus, &ServiceStatus); + DPRINT("Stopped W32Time Service\n"); + return; + } } return; }

5 years, 4 months

[reactos] 01/01: [FREELDR] Trivial improvements (#1757)

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f25e464c2147a6233d35… commit 8f25e464c2147a6233d35b4fbc64279dd53280aa Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Jul 28 19:20:53 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 28 18:20:53 2019 +0200 [FREELDR] Trivial improvements (#1757) * [FREELDR] Fix uninitialized string in DiskGetBootPath() CORE-16216 CORE-16248 * [FREELDR] xboxdisk: Add comment and fix code style --- boot/freeldr/freeldr/arch/i386/xboxdisk.c | 3 ++- boot/freeldr/freeldr/disk/disk.c | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/boot/freeldr/freeldr/arch/i386/xboxdisk.c b/boot/freeldr/freeldr/arch/i386/xboxdisk.c index c63f066551c..9e31ce9937d 100644 --- a/boot/freeldr/freeldr/arch/i386/xboxdisk.c +++ b/boot/freeldr/freeldr/arch/i386/xboxdisk.c @@ -30,6 +30,7 @@ DBG_DEFAULT_CHANNEL(DISK); #define XBOX_IDE_COMMAND_PORT 0x1f0 #define XBOX_IDE_CONTROL_PORT 0x170 +/* BRFR signature at disk offset 0x600 */ #define XBOX_SIGNATURE_SECTOR 3 #define XBOX_SIGNATURE ('B' | ('R' << 8) | ('F' << 16) | ('R' << 24)) @@ -479,7 +480,7 @@ XboxDiskGetPartitionEntry(UCHAR DriveNumber, ULONG PartitionNumber, PPARTITION_T * This is the Xbox, chances are that there is a Xbox-standard * partitionless disk in it so let's check that first. */ - if (1 <= PartitionNumber && PartitionNumber <= sizeof(XboxPartitions) / sizeof(XboxPartitions[0]) && + if (PartitionNumber >= 1 && PartitionNumber <= sizeof(XboxPartitions) / sizeof(XboxPartitions[0]) && MachDiskReadLogicalSectors(DriveNumber, XBOX_SIGNATURE_SECTOR, 1, SectorData)) { if (*((PULONG) SectorData) == XBOX_SIGNATURE) diff --git a/boot/freeldr/freeldr/disk/disk.c b/boot/freeldr/freeldr/disk/disk.c index 46da0be1f75..55701205248 100644 --- a/boot/freeldr/freeldr/disk/disk.c +++ b/boot/freeldr/freeldr/disk/disk.c @@ -104,6 +104,9 @@ BOOLEAN DiskGetBootPath(OUT PCHAR BootPath, IN ULONG Size) if (*FrldrBootPath) goto Done; + if (Size) + BootPath[0] = ANSI_NULL; + /* 0x49 is our magic ramdisk drive, so try to detect it first */ if (FrldrBootDrive == 0x49) {

5 years, 4 months

[reactos] 02/02: [DLLs] Fix .spec files regarding OLE-specific exports.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b6135732d49e97404de92… commit b6135732d49e97404de922fbf01d5631573b8c70 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jun 2 00:23:02 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 28 16:26:22 2019 +0200 [DLLs] Fix .spec files regarding OLE-specific exports. - Do not use hardcoded ordinals, add missing '-private'. Except for MSXML3, OLE32 and RSAENH, see commit bff824b2 for more details. - SHSVCS: The 6 first exports are nonamed with ordinals. Replace exported commented stubs by actual exported stubs instead. Co-Authored-By: Timo Kreuzer <timo.kreuzer(a)reactos.org> --- base/services/shsvcs/shsvcs.spec | 32 ++++++++++++++++---------------- dll/directx/bdaplgin/bdaplgin.spec | 8 ++++---- dll/directx/ddraw/ddraw.spec | 4 ++-- dll/directx/msdvbnp/msdvbnp.spec | 8 ++++---- dll/directx/msvidctl/msvidctl.spec | 8 ++++---- dll/shellext/netplwiz/netplwiz.spec | 2 +- drivers/multimedia/bdasup/bdasup.spec | 2 +- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/base/services/shsvcs/shsvcs.spec b/base/services/shsvcs/shsvcs.spec index e3ef5261f80..db98bcf0819 100644 --- a/base/services/shsvcs/shsvcs.spec +++ b/base/services/shsvcs/shsvcs.spec @@ -1,16 +1,16 @@ -1 stdcall ThemeWatchForStart() -2 stdcall ThemeWaitForServiceReady(long) -#3 stub Stub3 -#4 stub Stub4 -#5 stub Stub5 -#6 stub Stub6 -#7 stub BadApplicationServiceMain -8 stdcall DllInstall(long wstr) -9 stdcall DllRegisterServer() -10 stdcall DllUnregisterServer() -#11 stub HardwareDetectionServiceMain -12 stdcall ThemeServiceMain(long ptr) -#13 stub CreateHardwareEventMoniker -14 stdcall DllCanUnloadNow() -15 stdcall DllGetClassObject(ptr ptr ptr) -#16 stub FUSCompatibilityEntryW +1 stdcall -noname ThemeWatchForStart() +2 stdcall -noname ThemeWaitForServiceReady(long) +3 stdcall -stub -noname ThemeUserLogoff() +4 stdcall -stub -noname ThemeUserLogon(ptr) +5 stdcall -stub -noname ThemeUserStartShell() +6 stdcall -stub -noname ThemeUserTSReconnect() +@ stdcall -stub BadApplicationServiceMain(long ptr) +@ stdcall -private DllInstall(long wstr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() +@ stdcall -stub HardwareDetectionServiceMain(long ptr) +@ stdcall ThemeServiceMain(long ptr) +@ stdcall -stub CreateHardwareEventMoniker(ptr ptr ptr) +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -stub FUSCompatibilityEntryW(long long wstr long) diff --git a/dll/directx/bdaplgin/bdaplgin.spec b/dll/directx/bdaplgin/bdaplgin.spec index 5baed04ed66..b16365d0c9f 100644 --- a/dll/directx/bdaplgin/bdaplgin.spec +++ b/dll/directx/bdaplgin/bdaplgin.spec @@ -1,4 +1,4 @@ -@ stdcall DllCanUnloadNow() -@ stdcall DllGetClassObject(ptr ptr ptr) -@ stdcall DllRegisterServer() -@ stdcall DllUnregisterServer() +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dll/directx/ddraw/ddraw.spec b/dll/directx/ddraw/ddraw.spec index c372ab91504..07cabfaf527 100644 --- a/dll/directx/ddraw/ddraw.spec +++ b/dll/directx/ddraw/ddraw.spec @@ -13,8 +13,8 @@ @ stdcall DirectDrawEnumerateW(ptr ptr) @ stdcall DirectDrawEnumerateExA(ptr ptr long) @ stdcall DirectDrawEnumerateExW(ptr ptr long) -#@ stdcall DllCanUnloadNow() -#@ stdcall DllGetClassObject(ptr ptr ptr) +#@ stdcall -private DllCanUnloadNow() +#@ stdcall -private DllGetClassObject(ptr ptr ptr) #@ stdcall GetDDSurfaceLocal #@ stdcall GetOLEThunkData #@ stdcall GetSurfaceFromDC diff --git a/dll/directx/msdvbnp/msdvbnp.spec b/dll/directx/msdvbnp/msdvbnp.spec index 5baed04ed66..b16365d0c9f 100644 --- a/dll/directx/msdvbnp/msdvbnp.spec +++ b/dll/directx/msdvbnp/msdvbnp.spec @@ -1,4 +1,4 @@ -@ stdcall DllCanUnloadNow() -@ stdcall DllGetClassObject(ptr ptr ptr) -@ stdcall DllRegisterServer() -@ stdcall DllUnregisterServer() +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dll/directx/msvidctl/msvidctl.spec b/dll/directx/msvidctl/msvidctl.spec index 5baed04ed66..b16365d0c9f 100644 --- a/dll/directx/msvidctl/msvidctl.spec +++ b/dll/directx/msvidctl/msvidctl.spec @@ -1,4 +1,4 @@ -@ stdcall DllCanUnloadNow() -@ stdcall DllGetClassObject(ptr ptr ptr) -@ stdcall DllRegisterServer() -@ stdcall DllUnregisterServer() +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dll/shellext/netplwiz/netplwiz.spec b/dll/shellext/netplwiz/netplwiz.spec index 433874cb0b2..3437cce869c 100644 --- a/dll/shellext/netplwiz/netplwiz.spec +++ b/dll/shellext/netplwiz/netplwiz.spec @@ -5,7 +5,7 @@ 5 stub ClearAutoLogon @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) -8 stub -private DllInstall +@ stub -private DllInstall 9 stdcall DllMain(ptr long ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() diff --git a/drivers/multimedia/bdasup/bdasup.spec b/drivers/multimedia/bdasup/bdasup.spec index cd1b2e45e39..cdaa7776717 100644 --- a/drivers/multimedia/bdasup/bdasup.spec +++ b/drivers/multimedia/bdasup/bdasup.spec @@ -1,4 +1,4 @@ -@ stdcall DllInitialize(ptr) +@ stdcall -private DllInitialize(ptr) @ stdcall BdaCheckChanges(ptr) @ stdcall BdaCommitChanges(ptr) @ stdcall BdaCreateFilterFactory(ptr ptr ptr)

5 years, 4 months

[reactos] 01/02: [SPEC2DEF] Check whether OLE-specific exports do not have assigned ordinals, as they should be.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2becb000c8944e3b62cf3… commit 2becb000c8944e3b62cf3d1a50c2c44f83b0613d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jun 2 00:11:18 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 28 15:50:30 2019 +0200 [SPEC2DEF] Check whether OLE-specific exports do not have assigned ordinals, as they should be. The check is done at the same time as when we check also that these exports are marked PRIVATE or not. This permits us to check for the same conditions as MS' LINK.EXE, but here on GCC builds as well. See the following pages for more details: https://docs.microsoft.com/en-us/cpp/error-messages/tool-errors/linker-tool… https://docs.microsoft.com/en-us/cpp/error-messages/tool-errors/linker-tool… In this last page (LNK4222), the specified list of exports is incomplete. Manual tests showed that the very same list as for LNK4104 is checked. --- sdk/tools/spec2def/spec2def.c | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/sdk/tools/spec2def/spec2def.c b/sdk/tools/spec2def/spec2def.c index fe89a128156..65fa07cc6a2 100644 --- a/sdk/tools/spec2def/spec2def.c +++ b/sdk/tools/spec2def/spec2def.c @@ -95,7 +95,12 @@ const char* astrCallingConventions[] = "EXTERN" }; -static const char* astrShouldBePrivate[] = +/* + * List of OLE exports that should be PRIVATE and not be assigned an ordinal. + * In case these conditions are not met when linking with MS LINK.EXE, warnings + * LNK4104 and LNK4222 respectively are emitted. + */ +static const char* astrOlePrivateExports[] = { "DllCanUnloadNow", "DllGetClassObject", @@ -1087,15 +1092,37 @@ ParseFile(char* pcStart, FILE *fileDest, PFNOUTLINE OutputLine) return -1; } - if (!gbMSComp && !gbNotPrivateNoWarn && gbImportLib && !(exp.uFlags & FL_PRIVATE)) + /* + * Check for special handling of OLE exports, only when MSVC + * is not used, since otherwise this is handled by MS LINK.EXE. + */ + if (!gbMSComp) { - for (i = 0; i < ARRAYSIZE(astrShouldBePrivate); i++) + /* Check whether the current export is not PRIVATE, or has an ordinal */ + int bIsNotPrivate = (!gbNotPrivateNoWarn && /*gbImportLib &&*/ !(exp.uFlags & FL_PRIVATE)); + int bHasOrdinal = (exp.uFlags & FL_ORDINAL); + + /* Check whether the current export is an OLE export, in case any of these tests pass */ + if (bIsNotPrivate || bHasOrdinal) { - if (strlen(astrShouldBePrivate[i]) == exp.strName.len && - strncmp(exp.strName.buf, astrShouldBePrivate[i], exp.strName.len) == 0) + for (i = 0; i < ARRAYSIZE(astrOlePrivateExports); ++i) { - fprintf(stderr, "%s line %d: warning: export of '%.*s' should be PRIVATE\n", - pszSourceFileName, nLine, exp.strName.len, exp.strName.buf); + if (strlen(astrOlePrivateExports[i]) == exp.strName.len && + strncmp(exp.strName.buf, astrOlePrivateExports[i], exp.strName.len) == 0) + { + /* The current export is an OLE export: display the corresponding warning */ + if (bIsNotPrivate) + { + fprintf(stderr, "%s line %d: warning: exported symbol '%.*s' should be PRIVATE\n", + pszSourceFileName, nLine, exp.strName.len, exp.strName.buf); + } + if (bHasOrdinal) + { + fprintf(stderr, "%s line %d: warning: exported symbol '%.*s' should not be assigned an ordinal\n", + pszSourceFileName, nLine, exp.strName.len, exp.strName.buf); + } + break; + } } } }

5 years, 4 months

[reactos] 01/01: [MSV1_0] LsaApCallPackage: The messages MsV1_0EnumerateUsers, MsV1_0GetUserInfo and MsV1_0ReLogonUsers are obsolete.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=12aba91abb0ad0a9f9637… commit 12aba91abb0ad0a9f9637c6497ff8a7332f5b6f5 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jul 28 14:57:46 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jul 28 14:57:46 2019 +0200 [MSV1_0] LsaApCallPackage: The messages MsV1_0EnumerateUsers, MsV1_0GetUserInfo and MsV1_0ReLogonUsers are obsolete. --- dll/win32/msv1_0/msv1_0.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dll/win32/msv1_0/msv1_0.c b/dll/win32/msv1_0/msv1_0.c index 6529cd05112..c100aafd6ef 100644 --- a/dll/win32/msv1_0/msv1_0.c +++ b/dll/win32/msv1_0/msv1_0.c @@ -940,10 +940,13 @@ LsaApCallPackage(IN PLSA_CLIENT_REQUEST ClientRequest, { case MsV1_0Lm20ChallengeRequest: case MsV1_0Lm20GetChallengeResponse: + Status = STATUS_NOT_IMPLEMENTED; + break; + case MsV1_0EnumerateUsers: case MsV1_0GetUserInfo: case MsV1_0ReLogonUsers: - Status = STATUS_NOT_IMPLEMENTED; + Status = STATUS_INVALID_PARAMETER; break; case MsV1_0ChangePassword:

5 years, 4 months

[reactos] 02/02: [GDI32] Allow functions to access printing support.

by jimtabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=665871527ba4e88ad1d07… commit 665871527ba4e88ad1d07b9fbda7635f7e826210 Author: jimtabor <james.tabor(a)reactos.org> AuthorDate: Sat Jul 27 14:15:42 2019 -0500 Commit: jimtabor <james.tabor(a)reactos.org> CommitDate: Sat Jul 27 14:15:42 2019 -0500 [GDI32] Allow functions to access printing support. Reapplying lost committed code. --- win32ss/gdi/gdi32/include/gdi32p.h | 2 ++ win32ss/gdi/gdi32/objects/arc.c | 10 +++++++ win32ss/gdi/gdi32/objects/bitmap.c | 32 ++++++++++++++++++++++ win32ss/gdi/gdi32/objects/painting.c | 52 ++++++++++++++++++++++++++++++++++-- win32ss/gdi/gdi32/objects/text.c | 2 ++ 5 files changed, 96 insertions(+), 2 deletions(-) diff --git a/win32ss/gdi/gdi32/include/gdi32p.h b/win32ss/gdi/gdi32/include/gdi32p.h index c979ee9eee0..50c13f856a2 100644 --- a/win32ss/gdi/gdi32/include/gdi32p.h +++ b/win32ss/gdi/gdi32/include/gdi32p.h @@ -740,4 +740,6 @@ METADC_GetAndSetDCDWord( _In_ USHORT usMF16Id, _In_ DWORD dwError); +HDC WINAPI GdiConvertAndCheckDC(HDC hdc); + /* EOF */ diff --git a/win32ss/gdi/gdi32/objects/arc.c b/win32ss/gdi/gdi32/objects/arc.c index 37dd5145d0f..444b05a295b 100644 --- a/win32ss/gdi/gdi32/objects/arc.c +++ b/win32ss/gdi/gdi32/objects/arc.c @@ -26,6 +26,8 @@ Arc( xEndArc, yEndArc); + if ( GdiConvertAndCheckDC(hdc) == NULL ) return FALSE; + return NtGdiArcInternal(GdiTypeArc, hdc, xLeft, @@ -62,6 +64,8 @@ AngleArc( RCAST(DWORD, eStartAngle), RCAST(DWORD, eSweepAngle)); + if ( GdiConvertAndCheckDC(hdc) == NULL ) return FALSE; + return NtGdiAngleArc(hdc, x, y, @@ -96,6 +100,8 @@ ArcTo( xRadial2, yRadial2); + if ( GdiConvertAndCheckDC(hdc) == NULL ) return FALSE; + return NtGdiArcInternal(GdiTypeArcTo, hdc, xLeft, @@ -134,6 +140,8 @@ Chord( xRadial2, yRadial2); + if ( GdiConvertAndCheckDC(hdc) == NULL ) return FALSE; + return NtGdiArcInternal(GdiTypeChord, hdc, xLeft, @@ -176,6 +184,8 @@ Pie( xRadial2, yRadial2); + if ( GdiConvertAndCheckDC(hdc) == NULL ) return FALSE; + return NtGdiArcInternal(GdiTypePie, hdc, xLeft, diff --git a/win32ss/gdi/gdi32/objects/bitmap.c b/win32ss/gdi/gdi32/objects/bitmap.c index 050cc031032..a3f4c482c6f 100644 --- a/win32ss/gdi/gdi32/objects/bitmap.c +++ b/win32ss/gdi/gdi32/objects/bitmap.c @@ -691,6 +691,34 @@ SetDIBitsToDevice( lpbmi, ColorUse); + // Handle the "Special Case"! + { + PLDC pldc; + ULONG hType = GDI_HANDLE_GET_TYPE(hdc); + if (hType != GDILoObjType_LO_DC_TYPE && hType != GDILoObjType_LO_METADC16_TYPE) + { + pldc = GdiGetLDC(hdc); + if (pldc) + { + if (pldc->Flags & LDC_STARTPAGE) StartPage(hdc); + + if (pldc->Flags & LDC_SAPCALLBACK) GdiSAPCallback(pldc); + + if (pldc->Flags & LDC_KILL_DOCUMENT) + { + LinesCopied = 0; + goto Exit; + } + } + else + { + SetLastError(ERROR_INVALID_HANDLE); + LinesCopied = 0; + goto Exit; + } + } + } + if ((pConvertedInfo->bmiHeader.biCompression == BI_RLE8) || (pConvertedInfo->bmiHeader.biCompression == BI_RLE4)) { @@ -742,6 +770,7 @@ SetDIBitsToDevice( TRUE, NULL); } +Exit: if (Bits != pvSafeBits) RtlFreeHeap(RtlGetProcessHeap(), 0, pvSafeBits); if (lpbmi != pConvertedInfo) @@ -826,6 +855,9 @@ StretchDIBits( } } #endif + + if ( GdiConvertAndCheckDC(hdc) == NULL ) return 0; + pConvertedInfo = ConvertBitmapInfo(lpBitsInfo, iUsage, &ConvertedInfoSize, FALSE); if (!pConvertedInfo) diff --git a/win32ss/gdi/gdi32/objects/painting.c b/win32ss/gdi/gdi32/objects/painting.c index f41e7a78ab7..2f9564ceb22 100644 --- a/win32ss/gdi/gdi32/objects/painting.c +++ b/win32ss/gdi/gdi32/objects/painting.c @@ -13,6 +13,8 @@ LineTo( { HANDLE_METADC(BOOL, LineTo, FALSE, hdc, x, y); + if ( GdiConvertAndCheckDC(hdc) == NULL ) return FALSE; + return NtGdiLineTo(hdc, x, y); } @@ -75,6 +77,8 @@ Ellipse( { HANDLE_METADC(BOOL, Ellipse, FALSE, hdc, left, top, right, bottom); + if ( GdiConvertAndCheckDC(hdc) == NULL ) return FALSE; + return NtGdiEllipse(hdc, left, top, right, bottom); } @@ -93,6 +97,8 @@ Rectangle( { HANDLE_METADC(BOOL, Rectangle, FALSE, hdc, left, top, right, bottom); + if ( GdiConvertAndCheckDC(hdc) == NULL ) return FALSE; + return NtGdiRectangle(hdc, left, top, right, bottom); } @@ -113,6 +119,8 @@ RoundRect( { HANDLE_METADC(BOOL, RoundRect, FALSE, hdc, left, top, right, bottom, width, height); + if ( GdiConvertAndCheckDC(hdc) == NULL ) return FALSE; + return NtGdiRoundRect(hdc, left, top, right, bottom, width, height); } @@ -146,6 +154,8 @@ SetPixel( { HANDLE_METADC(COLORREF, SetPixel, CLR_INVALID, hdc, x, y, crColor); + if ( GdiConvertAndCheckDC(hdc) == NULL ) return FALSE; + return NtGdiSetPixel(hdc, x, y, crColor); } @@ -181,6 +191,8 @@ FillRgn( HANDLE_METADC(BOOL, FillRgn, FALSE, hdc, hrgn, hbr); + if ( GdiConvertAndCheckDC(hdc) == NULL ) return FALSE; + return NtGdiFillRgn(hdc, hrgn, hbr); } @@ -203,6 +215,8 @@ FrameRgn( HANDLE_METADC(BOOL, FrameRgn, FALSE, hdc, hrgn, hbr, nWidth, nHeight); + if ( GdiConvertAndCheckDC(hdc) == NULL ) return FALSE; + return NtGdiFrameRgn(hdc, hrgn, hbr, nWidth, nHeight); } @@ -222,6 +236,8 @@ InvertRgn( HANDLE_METADC(BOOL, InvertRgn, FALSE, hdc, hrgn); + if ( GdiConvertAndCheckDC(hdc) == NULL ) return FALSE; + return NtGdiInvertRgn(hdc, hrgn); } @@ -251,6 +267,8 @@ PolyBezier( { HANDLE_METADC(BOOL, PolyBezier, FALSE, hdc, apt, cpt); + if ( GdiConvertAndCheckDC(hdc) == NULL ) return FALSE; + return NtGdiPolyPolyDraw(hdc ,(PPOINT)apt, &cpt, 1, GdiPolyBezier); } @@ -267,6 +285,8 @@ PolyBezierTo( { HANDLE_METADC(BOOL, PolyBezierTo, FALSE, hdc, apt, cpt); + if ( GdiConvertAndCheckDC(hdc) == NULL ) return FALSE; + return NtGdiPolyPolyDraw(hdc , (PPOINT)apt, &cpt, 1, GdiPolyBezierTo); } @@ -284,6 +304,8 @@ PolyDraw( { HANDLE_METADC(BOOL, PolyDraw, FALSE, hdc, apt, aj, cpt); + if ( GdiConvertAndCheckDC(hdc) == NULL ) return FALSE; + return NtGdiPolyDraw(hdc, (PPOINT)apt, (PBYTE)aj, cpt); } @@ -300,6 +322,8 @@ Polygon( { HANDLE_METADC(BOOL, Polygon, FALSE, hdc, apt, cpt); + if ( GdiConvertAndCheckDC(hdc) == NULL ) return FALSE; + return NtGdiPolyPolyDraw(hdc , (PPOINT)apt, (PULONG)&cpt, 1, GdiPolyPolygon); } @@ -316,6 +340,8 @@ Polyline( { HANDLE_METADC(BOOL, Polyline, FALSE, hdc, apt, cpt); + if ( GdiConvertAndCheckDC(hdc) == NULL ) return FALSE; + return NtGdiPolyPolyDraw(hdc, (PPOINT)apt, (PULONG)&cpt, 1, GdiPolyPolyLine); } @@ -332,6 +358,8 @@ PolylineTo( { HANDLE_METADC(BOOL, PolylineTo, FALSE, hdc, apt, cpt); + if ( GdiConvertAndCheckDC(hdc) == NULL ) return FALSE; + return NtGdiPolyPolyDraw(hdc , (PPOINT)apt, &cpt, 1, GdiPolyLineTo); } @@ -349,6 +377,8 @@ PolyPolygon( { HANDLE_METADC(BOOL, PolyPolygon, FALSE, hdc, apt, asz, csz); + if ( GdiConvertAndCheckDC(hdc) == NULL ) return FALSE; + return NtGdiPolyPolyDraw(hdc, (PPOINT)apt, (PULONG)asz, csz, GdiPolyPolygon); } @@ -369,6 +399,8 @@ PolyPolyline( HANDLE_METADC(BOOL, PolyPolyline, FALSE, hdc, apt, asz, csz); + if ( GdiConvertAndCheckDC(hdc) == NULL ) return FALSE; + return NtGdiPolyPolyDraw(hdc , (PPOINT)apt, (PULONG)asz, csz, GdiPolyPolyLine); } @@ -387,6 +419,8 @@ ExtFloodFill( { HANDLE_METADC(BOOL, ExtFloodFill, FALSE, hdc, xStart, yStart, crFill, fuFillType); + if ( GdiConvertAndCheckDC(hdc) == NULL ) return FALSE; + return NtGdiExtFloodFill(hdc, xStart, yStart, crFill, fuFillType); } @@ -443,6 +477,8 @@ BitBlt( cx, dwRop); + if ( GdiConvertAndCheckDC(hdcDest) == NULL ) return FALSE; + return NtGdiBitBlt(hdcDest, xDest, yDest, cx, cy, hdcSrc, xSrc, ySrc, dwRop, 0, 0); } @@ -460,6 +496,8 @@ PatBlt( HANDLE_METADC(BOOL, PatBlt, FALSE, hdc, nXLeft, nYLeft, nWidth, nHeight, dwRop); + if ( GdiConvertAndCheckDC(hdc) == NULL ) return FALSE; + /* Get the DC attribute */ pdcattr = GdiGetDcAttr(hdc); if (pdcattr && !(pdcattr->ulDirty_ & DC_DIBSECTION)) @@ -612,6 +650,8 @@ StretchBlt( cySrc, dwRop); + if ( GdiConvertAndCheckDC(hdcDest) == NULL ) return FALSE; + return NtGdiStretchBlt(hdcDest, xDest, yDest, @@ -662,6 +702,8 @@ MaskBlt( yMask, dwRop); + if ( GdiConvertAndCheckDC(hdcDest) == NULL ) return FALSE; + return NtGdiMaskBlt(hdcDest, xDest, yDest, @@ -709,6 +751,8 @@ PlgBlt( xMask, yMask); + if ( GdiConvertAndCheckDC(hdcDest) == NULL ) return FALSE; + return NtGdiPlgBlt(hdcDest, (LPPOINT)ppt, hdcSrc, @@ -756,6 +800,8 @@ GdiAlphaBlend( cySrc, blendfn); + if ( GdiConvertAndCheckDC(hdcDst) == NULL ) return FALSE; + return NtGdiAlphaBlend(hdcDst, xDst, yDst, @@ -804,7 +850,8 @@ GdiTransparentBlt( cySrc, crTransparent); - /* FIXME some part need be done in user mode */ + if ( GdiConvertAndCheckDC(hdcDst) == NULL ) return FALSE; + return NtGdiTransparentBlt(hdcDst, xDst, yDst, cxDst, cyDst, hdcSrc, xSrc, ySrc, cxSrc, cySrc, crTransparent); } @@ -823,6 +870,7 @@ GdiGradientFill( { HANDLE_METADC(BOOL, GradientFill, FALSE, hdc, pVertex, nVertex, pMesh, nCount, ulMode); - /* FIXME some part need be done in user mode */ + if ( GdiConvertAndCheckDC(hdc) == NULL ) return FALSE; + return NtGdiGradientFill(hdc, pVertex, nVertex, pMesh, nCount, ulMode); } diff --git a/win32ss/gdi/gdi32/objects/text.c b/win32ss/gdi/gdi32/objects/text.c index 6d4936edfc0..e00e01e50fe 100644 --- a/win32ss/gdi/gdi32/objects/text.c +++ b/win32ss/gdi/gdi32/objects/text.c @@ -505,6 +505,8 @@ ExtTextOutW( cwc, lpDx); + if ( GdiConvertAndCheckDC(hdc) == NULL ) return FALSE; + if (!(fuOptions & (ETO_GLYPH_INDEX | ETO_IGNORELANGUAGE))) { if (LoadLPK(LPK_ETO))

5 years, 4 months

[reactos] 01/02: [GDI32] Add more to Local DC structure.

by jimtabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4563ca28d3bc5cf0e2e7b… commit 4563ca28d3bc5cf0e2e7b1394807ee14c0a342e7 Author: jimtabor <james.tabor(a)reactos.org> AuthorDate: Sat Jul 27 14:13:14 2019 -0500 Commit: jimtabor <james.tabor(a)reactos.org> CommitDate: Sat Jul 27 14:13:14 2019 -0500 [GDI32] Add more to Local DC structure. Make the two structures identical. These are used for printing and enhanced metafile support. --- win32ss/gdi/gdi32/wine/gdi_private.h | 28 +++++++++++++++++++++++----- win32ss/gdi/gdi32/wine/rosglue.c | 13 +++++++++++++ win32ss/include/ntgdihdl.h | 10 +++++++--- 3 files changed, 43 insertions(+), 8 deletions(-) diff --git a/win32ss/gdi/gdi32/wine/gdi_private.h b/win32ss/gdi/gdi32/wine/gdi_private.h index 0bce298918a..f3b79c462b7 100644 --- a/win32ss/gdi/gdi32/wine/gdi_private.h +++ b/win32ss/gdi/gdi32/wine/gdi_private.h @@ -52,17 +52,35 @@ struct gdi_obj_funcs BOOL (*pDeleteObject)( HGDIOBJ handle ); }; +/* DC_ATTR LCD Types */ +#define LDC_LDC 0x00000001 +#define LDC_EMFLDC 0x00000002 + typedef struct tagWINEDC { HDC hdc; + ULONG Flags; + INT iType; + union { + PVOID pvEmfDC; /* Pointer to ENHMETAFILE structure */ + PHYSDEV physDev; /* current top of the physdev stack */ + }; + LPWSTR pwszPort; + ABORTPROC pAbortProc; + DWORD CallBackTick; + HANDLE hPrinter; + PDEVMODEW pdm; + PVOID pUMPDev; + PVOID pUMdhpdev; + ULONG DevCaps[36]; + HBRUSH hBrush; + HPEN hPen; + //// struct gdi_physdev NullPhysDev; - PHYSDEV physDev; /* current top of the physdev stack */ LONG refcount; /* thread refcount */ INT saveLevel; - HFONT hFont; - HBRUSH hBrush; - HPEN hPen; - HPALETTE hPalette; + HFONT hFont; + HPALETTE hPalette; } WINEDC, DC; WINEDC* get_physdev_dc( PHYSDEV dev ); diff --git a/win32ss/gdi/gdi32/wine/rosglue.c b/win32ss/gdi/gdi32/wine/rosglue.c index d5d99d8c3bd..d1b5038f27d 100644 --- a/win32ss/gdi/gdi32/wine/rosglue.c +++ b/win32ss/gdi/gdi32/wine/rosglue.c @@ -320,6 +320,8 @@ alloc_dc_ptr(WORD magic) return NULL; } + pWineDc->iType = LDC_EMFLDC; + /* Set the Wine DC as LDC */ GdiSetLDC(pWineDc->hdc, pWineDc); } @@ -1132,6 +1134,17 @@ METADC_Dispatch( return FALSE; } + // See if this is other than a METADATA issue. + if (GDI_HANDLE_GET_TYPE(hdc) == GDILoObjType_LO_ALTDC_TYPE) + { + WINEDC* pwdc = (WINEDC*)GdiGetLDC(hdc); + if (pwdc && pwdc->iType != LDC_EMFLDC) + { + /* Let the caller handle it */ + return FALSE; + } + } + physdev = GetPhysDev(hdc); if (physdev == NULL) { diff --git a/win32ss/include/ntgdihdl.h b/win32ss/include/ntgdihdl.h index 647acb341c6..1cbb8545d45 100644 --- a/win32ss/include/ntgdihdl.h +++ b/win32ss/include/ntgdihdl.h @@ -173,10 +173,11 @@ #define LDC_INIT_DOCUMENT 0x00000040 #define LDC_INIT_PAGE 0x00000080 #define LDC_STARTPAGE 0x00000100 -#define LDC_PLAY_MFDC 0x00000800 #define LDC_CLOCKWISE 0x00002000 #define LDC_KILL_DOCUMENT 0x00010000 #define LDC_META_PRINT 0x00020000 +#define LDC_DIRECT 0x00040000 +#define LDC_RESET_BANDING 0x00080000 #define LDC_INFODC 0x01000000 /* If CreateIC was passed. */ #define LDC_DEVCAPS 0x02000000 #define LDC_ATENDPAGE 0x10000000 @@ -278,11 +279,14 @@ typedef struct _LDC ABORTPROC pAbortProc; /* AbortProc for Printing */ DWORD CallBackTick; HANDLE hPrinter; /* Local or Remote Printer driver */ - PVOID pUMPDev; - PUMDHPDEV pUMdhpdev; + PDEVMODEW pdm; + PVOID pUMPDev; /* Ptr to User Mode Printer Device structure */ + PUMDHPDEV pUMdhpdev; /* Ptr to Combined UMPD and DHPDEV structure */ DEVCAPS DevCaps; HBRUSH BrushColor; HPEN PenColor; + // wine data + DWORD dwData[7]; } LDC, *PLDC; typedef struct _DC_ATTR

5 years, 4 months

[reactos] 01/01: [PSDK] Add missing UnregisterDeviceNotification() to winuser.h.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=294af4a7743424c746e28… commit 294af4a7743424c746e28e58186b76bfd742bd3c Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jul 27 19:59:32 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jul 27 19:59:32 2019 +0200 [PSDK] Add missing UnregisterDeviceNotification() to winuser.h. --- sdk/include/psdk/winuser.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk/include/psdk/winuser.h b/sdk/include/psdk/winuser.h index 40e629e6f18..594b15beb17 100644 --- a/sdk/include/psdk/winuser.h +++ b/sdk/include/psdk/winuser.h @@ -5344,6 +5344,9 @@ BOOL WINAPI UnionRect(_Out_ LPRECT, _In_ LPCRECT, _In_ LPCRECT); BOOL WINAPI UnloadKeyboardLayout(_In_ HKL); BOOL WINAPI UnregisterClassA(_In_ LPCSTR,HINSTANCE); BOOL WINAPI UnregisterClassW(_In_ LPCWSTR,HINSTANCE); +#if (WINVER >= 0x0500) +BOOL WINAPI UnregisterDeviceNotification(_In_ HDEVNOTIFY); +#endif BOOL WINAPI UnregisterHotKey(_In_opt_ HWND, _In_ int); BOOL WINAPI UpdateWindow(_In_ HWND); #if (_WIN32_WINNT >= 0x0500)

5 years, 5 months

[reactos] 01/01: [AUDIOSVC] Fix the coding style. No code changes!

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=353e05a4f363db3a9779d… commit 353e05a4f363db3a9779d0ceea16230eb26a3e22 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jul 27 16:54:15 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jul 27 18:20:04 2019 +0200 [AUDIOSVC] Fix the coding style. No code changes! --- base/services/audiosrv/main.c | 15 +++++++-------- base/services/audiosrv/pnp.c | 18 +++++++++--------- base/services/audiosrv/pnp_list_lock.c | 15 +++++++-------- base/services/audiosrv/pnp_list_manager.c | 15 ++++++--------- base/services/audiosrv/services.c | 19 ++----------------- 5 files changed, 31 insertions(+), 51 deletions(-) diff --git a/base/services/audiosrv/main.c b/base/services/audiosrv/main.c index b9324b015d1..efbff7dc81e 100644 --- a/base/services/audiosrv/main.c +++ b/base/services/audiosrv/main.c @@ -14,7 +14,7 @@ SERVICE_STATUS service_status; /* This is for testing only! */ VOID -InitializeFakeDevice() +InitializeFakeDevice(VOID) { PnP_AudioDevice* list_node; @@ -30,7 +30,7 @@ ServiceControlHandler( LPVOID lpEventData, LPVOID lpContext) { - switch ( dwControl ) + switch (dwControl) { case SERVICE_CONTROL_INTERROGATE : { @@ -85,7 +85,7 @@ ServiceMain(DWORD argc, LPWSTR argv) NULL); logmsg("Service status handle %d\n", service_status_handle); - if ( ! service_status_handle ) + if (!service_status_handle) { logmsg("Failed to register service control handler\n"); /* FIXME - we should fail */ @@ -105,7 +105,7 @@ ServiceMain(DWORD argc, LPWSTR argv) logmsg("Creating audio device list\n"); /* This creates the audio device list and mutex */ - if ( ! CreateAudioDeviceList(AUDIO_LIST_MAX_SIZE) ) + if (!CreateAudioDeviceList(AUDIO_LIST_MAX_SIZE)) { logmsg("Failed to create audio device list\n"); service_status.dwCurrentState = SERVICE_STOPPED; @@ -116,7 +116,7 @@ ServiceMain(DWORD argc, LPWSTR argv) logmsg("Registering for device notifications\n"); /* We want to know when devices are added/removed */ - if ( ! RegisterForDeviceNotifications() ) + if (!RegisterForDeviceNotifications()) { /* FIXME: This is not fatal at present as ROS does not support this */ logmsg("Failed to register for device notifications\n"); @@ -132,12 +132,11 @@ ServiceMain(DWORD argc, LPWSTR argv) /* start system audio services */ StartSystemAudioServices(); - InitializeFakeDevice(); logmsg("Processing existing devices\n"); /* Now find any devices that already exist on the system */ - if ( ! ProcessExistingDevices() ) + if (!ProcessExistingDevices()) { logmsg("Could not process existing devices\n"); UnregisterDeviceNotifications(); @@ -156,7 +155,7 @@ ServiceMain(DWORD argc, LPWSTR argv) SetServiceStatus(service_status_handle, &service_status); } -int wmain() +int wmain(VOID) { SERVICE_TABLE_ENTRYW service_table[] = { diff --git a/base/services/audiosrv/pnp.c b/base/services/audiosrv/pnp.c index 764c4215baf..7db8a550569 100644 --- a/base/services/audiosrv/pnp.c +++ b/base/services/audiosrv/pnp.c @@ -23,7 +23,7 @@ static HDEVNOTIFY device_notification_handle = NULL; */ BOOL -ProcessExistingDevices() +ProcessExistingDevices(VOID) { SP_DEVICE_INTERFACE_DATA interface_data; SP_DEVINFO_DATA device_data; @@ -124,7 +124,7 @@ ProcessDeviceArrival(DEV_BROADCAST_DEVICEINTERFACE* device) */ BOOL -RegisterForDeviceNotifications() +RegisterForDeviceNotifications(VOID) { DEV_BROADCAST_DEVICEINTERFACE notification_filter; @@ -141,8 +141,7 @@ RegisterForDeviceNotifications() DEVICE_NOTIFY_SERVICE_HANDLE /* | DEVICE_NOTIFY_ALL_INTERFACE_CLASSES*/); - - if ( ! device_notification_handle ) + if (!device_notification_handle) { logmsg("RegisterDeviceNotification() failed with error %d\n", GetLastError()); } @@ -156,11 +155,12 @@ RegisterForDeviceNotifications() called. */ -VOID UnregisterDeviceNotifications() +VOID +UnregisterDeviceNotifications(VOID) { /* TODO -- NOT IMPLEMENTED! */ - if ( device_notification_handle ) + if (device_notification_handle) { /* TODO */ device_notification_handle = NULL; @@ -177,12 +177,12 @@ HandleDeviceEvent( DWORD dwEventType, LPVOID lpEventData) { - switch ( dwEventType ) + switch (dwEventType) { - case DBT_DEVICEARRIVAL : + case DBT_DEVICEARRIVAL: { DEV_BROADCAST_DEVICEINTERFACE* incoming_device = - (DEV_BROADCAST_DEVICEINTERFACE*) lpEventData; + (DEV_BROADCAST_DEVICEINTERFACE*)lpEventData; return ProcessDeviceArrival(incoming_device); } diff --git a/base/services/audiosrv/pnp_list_lock.c b/base/services/audiosrv/pnp_list_lock.c index eef85d32f3d..ea6224a6ed3 100644 --- a/base/services/audiosrv/pnp_list_lock.c +++ b/base/services/audiosrv/pnp_list_lock.c @@ -13,7 +13,7 @@ static HANDLE audio_device_list_lock = NULL; BOOL -InitializeAudioDeviceListLock() +InitializeAudioDeviceListLock(VOID) { /* The security stuff is to make sure the mutex can be grabbed by other processes - is this the best idea though ??? */ @@ -32,27 +32,26 @@ InitializeAudioDeviceListLock() FALSE, AUDIO_LIST_LOCK_NAME); - return ( audio_device_list_lock != NULL ); + return (audio_device_list_lock != NULL); } VOID -KillAudioDeviceListLock() +KillAudioDeviceListLock(VOID) { CloseHandle(audio_device_list_lock); audio_device_list_lock = NULL; } VOID -LockAudioDeviceList() +LockAudioDeviceList(VOID) { - assert( audio_device_list_lock != NULL ); + assert(audio_device_list_lock != NULL); WaitForSingleObject(audio_device_list_lock, INFINITE); } VOID -UnlockAudioDeviceList() +UnlockAudioDeviceList(VOID) { - assert( audio_device_list_lock != NULL ); + assert(audio_device_list_lock != NULL); ReleaseMutex(audio_device_list_lock); } - diff --git a/base/services/audiosrv/pnp_list_manager.c b/base/services/audiosrv/pnp_list_manager.c index 428a4bfde14..46d09eb0376 100644 --- a/base/services/audiosrv/pnp_list_manager.c +++ b/base/services/audiosrv/pnp_list_manager.c @@ -23,8 +23,7 @@ CreateDeviceDescriptor(WCHAR* path, BOOL is_enabled) /* printf("path_length %d, total %d\n", path_length, size);*/ device = malloc(size); - - if ( ! device ) + if (! device) { logmsg("Failed to create a device descriptor (malloc fail)\n"); return NULL; @@ -71,7 +70,7 @@ AppendAudioDeviceToList(PnP_AudioDevice* device) */ /* We DON'T want to overshoot the end of the buffer! */ - if ( audio_device_list->size + device_info_size > audio_device_list->max_size ) + if (audio_device_list->size + device_info_size > audio_device_list->max_size) { /*printf("max_size would be exceeded! Failing...\n");*/ @@ -101,7 +100,7 @@ CreateAudioDeviceList(DWORD max_size) { /* printf("Initializing memory device list lock\n");*/ - if ( ! InitializeAudioDeviceListLock() ) + if (!InitializeAudioDeviceListLock()) { /*printf("Failed!\n");*/ return FALSE; @@ -120,8 +119,7 @@ CreateAudioDeviceList(DWORD max_size) 0, max_size, AUDIO_LIST_NAME); - - if ( ! device_list_file ) + if (!device_list_file) { logmsg("Creation of audio device list failed (err %d)\n", GetLastError()); @@ -138,8 +136,7 @@ CreateAudioDeviceList(DWORD max_size) 0, 0, max_size); - - if ( ! audio_device_list ) + if (!audio_device_list) { logmsg("MapViewOfFile FAILED (err %d)\n", GetLastError()); @@ -168,7 +165,7 @@ CreateAudioDeviceList(DWORD max_size) } VOID -DestroyAudioDeviceList() +DestroyAudioDeviceList(VOID) { logmsg("Destroying device list\n"); diff --git a/base/services/audiosrv/services.c b/base/services/audiosrv/services.c index dee6431629a..68c14835e06 100644 --- a/base/services/audiosrv/services.c +++ b/base/services/audiosrv/services.c @@ -30,7 +30,7 @@ WaitForService( Sleep(1000); - }while(Index++ < RetryCount); + } while (Index++ < RetryCount); logmsg("Timeout while waiting for service to become ready %p\n", hService); @@ -47,7 +47,6 @@ StartAudioService( BOOL ret; hService = OpenService(hSCManager, ServiceName, SERVICE_ALL_ACCESS); - if (!hService) { logmsg("Failed to open service %S %x\n", ServiceName, GetLastError()); @@ -67,11 +66,8 @@ StartAudioService( return ret; } - - - BOOL -StartSystemAudioServices() +StartSystemAudioServices(VOID) { SC_HANDLE hSCManager; @@ -92,14 +88,3 @@ StartSystemAudioServices() CloseServiceHandle(hSCManager); return TRUE; } - - - - - - - - - - -

5 years, 5 months

[reactos] 01/01: [USETUP] Use "L" key instead of "D" for deleting partitions at 1st setup stage

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6ee7cba77b3a0e2f3383d… commit 6ee7cba77b3a0e2f3383d4ae8dddcc52a1a55965 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Fri Jun 28 16:45:32 2019 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jul 27 13:18:34 2019 +0200 [USETUP] Use "L" key instead of "D" for deleting partitions at 1st setup stage --- base/setup/usetup/lang/bg-BG.h | 4 ++-- base/setup/usetup/lang/bn-BD.h | 4 ++-- base/setup/usetup/lang/cs-CZ.h | 4 ++-- base/setup/usetup/lang/da-DK.h | 6 +++--- base/setup/usetup/lang/de-DE.h | 4 ++-- base/setup/usetup/lang/el-GR.h | 4 ++-- base/setup/usetup/lang/en-US.h | 4 ++-- base/setup/usetup/lang/es-ES.h | 4 ++-- base/setup/usetup/lang/et-EE.h | 4 ++-- base/setup/usetup/lang/fr-FR.h | 4 ++-- base/setup/usetup/lang/he-IL.h | 4 ++-- base/setup/usetup/lang/it-IT.h | 4 ++-- base/setup/usetup/lang/ja-JP.h | 4 ++-- base/setup/usetup/lang/lt-LT.h | 4 ++-- base/setup/usetup/lang/ms-MY.h | 4 ++-- base/setup/usetup/lang/nl-NL.h | 4 ++-- base/setup/usetup/lang/pl-PL.h | 4 ++-- base/setup/usetup/lang/pt-BR.h | 4 ++-- base/setup/usetup/lang/pt-PT.h | 4 ++-- base/setup/usetup/lang/ro-RO.h | 4 ++-- base/setup/usetup/lang/ru-RU.h | 4 ++-- base/setup/usetup/lang/sk-SK.h | 4 ++-- base/setup/usetup/lang/sq-AL.h | 4 ++-- base/setup/usetup/lang/sv-SE.h | 4 ++-- base/setup/usetup/lang/tr-TR.h | 4 ++-- base/setup/usetup/lang/uk-UA.h | 4 ++-- base/setup/usetup/usetup.c | 2 +- 27 files changed, 54 insertions(+), 54 deletions(-) diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h index 390b2b2e32c..7c44315d9f1 100644 --- a/base/setup/usetup/lang/bg-BG.h +++ b/base/setup/usetup/lang/bg-BG.h @@ -1410,7 +1410,7 @@ static MUI_ENTRY bgBGDeletePartitionEntries[] = { 8, 18, - "\x07 \215\240\342\250\341\255\245\342\245 D, \247\240 \244\240 \250\247\342\340\250\245\342\245 \244\357\253\240.", + "\x07 \215\240\342\250\341\255\245\342\245 L, \247\240 \244\240 \250\247\342\340\250\245\342\245 \244\357\253\240.", TEXT_STYLE_NORMAL }, { @@ -1428,7 +1428,7 @@ static MUI_ENTRY bgBGDeletePartitionEntries[] = { 0, 0, - " D = \210\247\342\340\250\242\240\255\245 \255\240 \244\357\253\240, ESC = \216\342\252\240\247 F3 = \210\247\345\256\244", + " L = \210\247\342\340\250\242\240\255\245 \255\240 \244\357\253\240, ESC = \216\342\252\240\247 F3 = \210\247\345\256\244", TEXT_TYPE_STATUS }, { diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h index 1cde9329cb8..8bb8b75df65 100644 --- a/base/setup/usetup/lang/bn-BD.h +++ b/base/setup/usetup/lang/bn-BD.h @@ -1399,7 +1399,7 @@ static MUI_ENTRY bnBDDeletePartitionEntries[] = { 8, 18, - "\x07 Press D to delete the partition.", + "\x07 Press L to delete the partition.", TEXT_STYLE_NORMAL }, { @@ -1417,7 +1417,7 @@ static MUI_ENTRY bnBDDeletePartitionEntries[] = { 0, 0, - "D = Delete Partition ESC = Cancel F3 = Quit", + "L = Delete Partition ESC = Cancel F3 = Quit", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h index 361d7529d92..4c8e661dff1 100644 --- a/base/setup/usetup/lang/cs-CZ.h +++ b/base/setup/usetup/lang/cs-CZ.h @@ -1408,7 +1408,7 @@ static MUI_ENTRY csCZDeletePartitionEntries[] = { 8, 18, - "\x07 Stisknut\241m D odstran\241te odd\241l.", + "\x07 Stisknut\241m L odstran\241te odd\241l.", TEXT_STYLE_NORMAL }, { @@ -1426,7 +1426,7 @@ static MUI_ENTRY csCZDeletePartitionEntries[] = { 0, 0, - "D = Odstranit odd\241l ESC = Zru\347it F3 = Ukon\237it", + "L = Odstranit odd\241l ESC = Zru\347it F3 = Ukon\237it", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h index c203f21e049..3aee65bcf70 100644 --- a/base/setup/usetup/lang/da-DK.h +++ b/base/setup/usetup/lang/da-DK.h @@ -1415,7 +1415,7 @@ static MUI_ENTRY daDKDeletePartitionEntries[] = { 8, 18, - "\x07 Tryk p\206 D for at slette partitionen.", + "\x07 Tryk p\206 L for at slette partitionen.", TEXT_STYLE_NORMAL }, { @@ -1433,7 +1433,7 @@ static MUI_ENTRY daDKDeletePartitionEntries[] = { 0, 0, - "D = Slet partition ESC = Annuller F3 = Afslut", + "L = Slet partition ESC = Annuller F3 = Afslut", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1961,4 +1961,4 @@ MUI_STRING daDKStrings[] = {STRING_ADDKBLAYOUTS, "Tilf\233jer tastaturlayouts"}, {0, 0} -}; \ No newline at end of file +}; diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h index a01c38b1a1e..eab9c9bfdff 100644 --- a/base/setup/usetup/lang/de-DE.h +++ b/base/setup/usetup/lang/de-DE.h @@ -1402,7 +1402,7 @@ static MUI_ENTRY deDEDeletePartitionEntries[] = { 8, 18, - "\x07 Dr\201cken Sie D, um die Partition zu l\224schen.", + "\x07 Dr\201cken Sie L, um die Partition zu l\224schen.", TEXT_STYLE_NORMAL }, { @@ -1420,7 +1420,7 @@ static MUI_ENTRY deDEDeletePartitionEntries[] = { 0, 0, - "D = L\224sche Partition ESC = Abbrechen F3 = Installation abbrechen", + "L = L\224sche Partition ESC = Abbrechen F3 = Installation abbrechen", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h index c839e82b270..fc2d6d6f118 100644 --- a/base/setup/usetup/lang/el-GR.h +++ b/base/setup/usetup/lang/el-GR.h @@ -1426,7 +1426,7 @@ static MUI_ENTRY elGRDeletePartitionEntries[] = { 8, 18, - "\x07 \217\230\253\343\251\253\234 D \232\240\230 \244\230 \233\240\230\232\250\341\257\234\253\234 \253\246 partition.", + "\x07 \217\230\253\343\251\253\234 L \232\240\230 \244\230 \233\240\230\232\250\341\257\234\253\234 \253\246 partition.", TEXT_STYLE_NORMAL }, { @@ -1444,7 +1444,7 @@ static MUI_ENTRY elGRDeletePartitionEntries[] = { 0, 0, - " D = \203\240\230\232\250\230\255\343 Partition ESC = \200\241\347\250\340\251\236 F3 = \200\247\246\256\351\250\236\251\236", + " L = \203\240\230\232\250\230\255\343 Partition ESC = \200\241\347\250\340\251\236 F3 = \200\247\246\256\351\250\236\251\236", TEXT_TYPE_STATUS }, { diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h index 8ba4fabbff2..63faa0fde62 100644 --- a/base/setup/usetup/lang/en-US.h +++ b/base/setup/usetup/lang/en-US.h @@ -1400,7 +1400,7 @@ static MUI_ENTRY enUSDeletePartitionEntries[] = { 8, 18, - "\x07 Press D to delete the partition.", + "\x07 Press L to delete the partition.", TEXT_STYLE_NORMAL }, { @@ -1418,7 +1418,7 @@ static MUI_ENTRY enUSDeletePartitionEntries[] = { 0, 0, - "D = Delete Partition ESC = Cancel F3 = Quit", + "L = Delete Partition ESC = Cancel F3 = Quit", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h index dd550908868..7ab27f9dbb8 100644 --- a/base/setup/usetup/lang/es-ES.h +++ b/base/setup/usetup/lang/es-ES.h @@ -1405,7 +1405,7 @@ static MUI_ENTRY esESDeletePartitionEntries[] = { 8, 18, - "\x07 Presione D para borrar la partici\242n.", + "\x07 Presione L para borrar la partici\242n.", TEXT_STYLE_NORMAL }, { @@ -1423,7 +1423,7 @@ static MUI_ENTRY esESDeletePartitionEntries[] = { 0, 0, - " D = Borrar partici\242n ESC = Cancelar F3 = Salir", + " L = Borrar partici\242n ESC = Cancelar F3 = Salir", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h index cb18cab6064..b0ef95d4d03 100644 --- a/base/setup/usetup/lang/et-EE.h +++ b/base/setup/usetup/lang/et-EE.h @@ -1403,7 +1403,7 @@ static MUI_ENTRY etEEDeletePartitionEntries[] = { 8, 18, - "\x07 Vajuta D partitsiooni kustutamiseks.", + "\x07 Vajuta L partitsiooni kustutamiseks.", TEXT_STYLE_NORMAL }, { @@ -1421,7 +1421,7 @@ static MUI_ENTRY etEEDeletePartitionEntries[] = { 0, 0, - "D = Kustuta partitsioon ESC = Katkesta F3 = V\204lju", + "L = Kustuta partitsioon ESC = Katkesta F3 = V\204lju", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h index d50f7fb5df8..9eea85258b8 100644 --- a/base/setup/usetup/lang/fr-FR.h +++ b/base/setup/usetup/lang/fr-FR.h @@ -1420,7 +1420,7 @@ static MUI_ENTRY frFRDeletePartitionEntries[] = { 8, 18, - "\x07 Appuyez sur D pour supprimer la partition.", + "\x07 Appuyez sur L pour supprimer la partition.", TEXT_STYLE_NORMAL }, { @@ -1438,7 +1438,7 @@ static MUI_ENTRY frFRDeletePartitionEntries[] = { 0, 0, - "D = Supprimer la Partition \220CHAP = Annuler F3 = Quitter", + "L = Supprimer la Partition \220CHAP = Annuler F3 = Quitter", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h index 4f252a92917..3bf458bb251 100644 --- a/base/setup/usetup/lang/he-IL.h +++ b/base/setup/usetup/lang/he-IL.h @@ -1404,7 +1404,7 @@ static MUI_ENTRY heILDeletePartitionEntries[] = { 8, 18, - "\x07 .\204\226\211\207\216\204 \232\200 \227\205\207\216\214 \211\203\213 D \225\207\214", + "\x07 .\204\226\211\207\216\204 \232\200 \227\205\207\216\214 \211\203\213 L \225\207\214", TEXT_STYLE_NORMAL }, { @@ -1422,7 +1422,7 @@ static MUI_ENTRY heILDeletePartitionEntries[] = { 0, 0, - "\204\220\227\232\204 \214\205\210\211\201 = F3 \214\205\210\211\201 = ESC \204\226\211\207\216 \227\207\216 = D", + "\204\220\227\232\204 \214\205\210\211\201 = F3 \214\205\210\211\201 = ESC \204\226\211\207\216 \227\207\216 = L", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h index 736b71418ca..171089ca44c 100644 --- a/base/setup/usetup/lang/it-IT.h +++ b/base/setup/usetup/lang/it-IT.h @@ -1405,7 +1405,7 @@ static MUI_ENTRY itITDeletePartitionEntries[] = { 8, 18, - "\x07 Premere D per cancellare la partizione.", + "\x07 Premere L per cancellare la partizione.", TEXT_STYLE_NORMAL }, { @@ -1423,7 +1423,7 @@ static MUI_ENTRY itITDeletePartitionEntries[] = { 0, 0, - " D = Cancella la partizione ESC = Annulla F3 = Termina", + " L = Cancella la partizione ESC = Annulla F3 = Termina", TEXT_TYPE_STATUS }, { diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index b8a7a49a05e..58c254f44c8 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -1403,7 +1403,7 @@ static MUI_ENTRY jaJPDeletePartitionEntries[] = { 8, 18, - "\x07 \272\311 \312\337\260\303\250\274\256\335\246 \273\270\274\336\256 \275\331\306\312 D \267\260\246 \265\274\303 \270\300\336\273\262\241", + "\x07 \272\311 \312\337\260\303\250\274\256\335\246 \273\270\274\336\256 \275\331\306\312 L \267\260\246 \265\274\303 \270\300\336\273\262\241", TEXT_STYLE_NORMAL }, { @@ -1421,7 +1421,7 @@ static MUI_ENTRY jaJPDeletePartitionEntries[] = { 0, 0, - "D = \312\337\260\303\274\256\335 \273\270\274\336\256 ESC = \267\254\335\276\331 F3 = \301\255\263\274", + "L = \312\337\260\303\274\256\335 \273\270\274\336\256 ESC = \267\254\335\276\331 F3 = \301\255\263\274", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h index 5fe9791674e..e1ebf82d13c 100644 --- a/base/setup/usetup/lang/lt-LT.h +++ b/base/setup/usetup/lang/lt-LT.h @@ -1411,7 +1411,7 @@ static MUI_ENTRY ltLTDeletePartitionEntries[] = { 8, 18, - "\x07 Press D to delete the partition.", + "\x07 Press L to delete the partition.", TEXT_STYLE_NORMAL }, { @@ -1429,7 +1429,7 @@ static MUI_ENTRY ltLTDeletePartitionEntries[] = { 0, 0, - "D = Delete Partition ESC = At\325aukti F3 = Baigti", + "L = Delete Partition ESC = At\325aukti F3 = Baigti", TEXT_TYPE_STATUS }, { diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h index be06b02dd16..32d76284080 100644 --- a/base/setup/usetup/lang/ms-MY.h +++ b/base/setup/usetup/lang/ms-MY.h @@ -1299,7 +1299,7 @@ static MUI_ENTRY msMYDeletePartitionEntries[] = { 8, 18, - "\x07 Tekan D untuk menghapuskan partition itu.", + "\x07 Tekan L untuk menghapuskan partition itu.", TEXT_STYLE_NORMAL }, { @@ -1317,7 +1317,7 @@ static MUI_ENTRY msMYDeletePartitionEntries[] = { 0, 0, - "D = Menghapuskan partition ESC = Batal F3 = Keluar", + "L = Menghapuskan partition ESC = Batal F3 = Keluar", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h index e2beb8c3e60..a868590d4d3 100644 --- a/base/setup/usetup/lang/nl-NL.h +++ b/base/setup/usetup/lang/nl-NL.h @@ -1415,7 +1415,7 @@ static MUI_ENTRY nlNLDeletePartitionEntries[] = { 8, 18, - "\x07 Druk op D om de partitie te verwijderen.", + "\x07 Druk op L om de partitie te verwijderen.", TEXT_STYLE_NORMAL }, { @@ -1433,7 +1433,7 @@ static MUI_ENTRY nlNLDeletePartitionEntries[] = { 0, 0, - "D = Verwijder partitie ESC = Annuleren F3 = Afsluiten", + "L = Verwijder partitie ESC = Annuleren F3 = Afsluiten", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h index 6f6061dde5d..87c93c7ccd0 100644 --- a/base/setup/usetup/lang/pl-PL.h +++ b/base/setup/usetup/lang/pl-PL.h @@ -1411,7 +1411,7 @@ static MUI_ENTRY plPLDeletePartitionEntries[] = { 8, 18, - "\x07 Naci\230nij D, by usun\245\206 partycj\251.", + "\x07 Naci\230nij L, by usun\245\206 partycj\251.", TEXT_STYLE_NORMAL }, { @@ -1429,7 +1429,7 @@ static MUI_ENTRY plPLDeletePartitionEntries[] = { 0, 0, - "D = Usuni\251cie partycji ESC = Anulowanie F3 = Wyj\230cie", + "L = Usuni\251cie partycji ESC = Anulowanie F3 = Wyj\230cie", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h index 32987a7c104..1c5b97d9961 100644 --- a/base/setup/usetup/lang/pt-BR.h +++ b/base/setup/usetup/lang/pt-BR.h @@ -1427,7 +1427,7 @@ static MUI_ENTRY ptBRDeletePartitionEntries[] = { 8, 18, - "\x07 Para excluir esta parti\207\306o, pressione D", + "\x07 Para excluir esta parti\207\306o, pressione L", TEXT_STYLE_NORMAL }, { @@ -1451,7 +1451,7 @@ static MUI_ENTRY ptBRDeletePartitionEntries[] = { 0, 0, - "D=Excluir ESC=Cancelar F3=Sair", + "L=Excluir ESC=Cancelar F3=Sair", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/usetup/lang/pt-PT.h index 17f5515a271..68d5a0b9d22 100644 --- a/base/setup/usetup/lang/pt-PT.h +++ b/base/setup/usetup/lang/pt-PT.h @@ -1427,7 +1427,7 @@ static MUI_ENTRY ptPTDeletePartitionEntries[] = { 8, 18, - "\x07 Para excluir esta parti\207\306o, pressione D", + "\x07 Para excluir esta parti\207\306o, pressione L", TEXT_STYLE_NORMAL }, { @@ -1451,7 +1451,7 @@ static MUI_ENTRY ptPTDeletePartitionEntries[] = { 0, 0, - "D=Excluir ESC=Cancelar F3=Sair", + "L=Excluir ESC=Cancelar F3=Sair", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index 79ea3bfe568..92fa85b3397 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -1434,7 +1434,7 @@ static MUI_ENTRY roRODeletePartitionEntries[] = { 8, 18, - "\x07 Tasta\376i D pentru a \272terge parti\376ia.", + "\x07 Tasta\376i L pentru a \272terge parti\376ia.", TEXT_STYLE_NORMAL }, { @@ -1452,7 +1452,7 @@ static MUI_ENTRY roRODeletePartitionEntries[] = { 0, 0, - "D = \252tergere parti\376ie ESC = Anulare F3 = Ie\272ire", + "L = \252tergere parti\376ie ESC = Anulare F3 = Ie\272ire", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h index 3f281b32a37..d820c8089a1 100644 --- a/base/setup/usetup/lang/ru-RU.h +++ b/base/setup/usetup/lang/ru-RU.h @@ -1420,7 +1420,7 @@ static MUI_ENTRY ruRUDeletePartitionEntries[] = { 8, 18, - "\x07 \215\240\246\254\250\342\245 D \244\253\357 \343\244\240\253\245\255\250\357 \340\240\247\244\245\253\240.", + "\x07 \215\240\246\254\250\342\245 L \244\253\357 \343\244\240\253\245\255\250\357 \340\240\247\244\245\253\240.", TEXT_STYLE_NORMAL }, { @@ -1438,7 +1438,7 @@ static MUI_ENTRY ruRUDeletePartitionEntries[] = { 0, 0, - "D = \223\244\240\253\250\342\354 \340\240\247\244\245\253 ESC = \216\342\254\245\255\240 F3 = \202\353\345\256\244", + "L = \223\244\240\253\250\342\354 \340\240\247\244\245\253 ESC = \216\342\254\245\255\240 F3 = \202\353\345\256\244", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h index ccca6f385d6..8adac0cdb22 100644 --- a/base/setup/usetup/lang/sk-SK.h +++ b/base/setup/usetup/lang/sk-SK.h @@ -1409,7 +1409,7 @@ static MUI_ENTRY skSKDeletePartitionEntries[] = { 8, 18, - "\x07 Stla\237te D pre odstr\240nenie oblasti.", + "\x07 Stla\237te L pre odstr\240nenie oblasti.", TEXT_STYLE_NORMAL }, { @@ -1427,7 +1427,7 @@ static MUI_ENTRY skSKDeletePartitionEntries[] = { 0, 0, - "D = Odstr\240ni\234 oblas\234 ESC = Zru\347i\234 F3 = Skon\237i\234", + "L = Odstr\240ni\234 oblas\234 ESC = Zru\347i\234 F3 = Skon\237i\234", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h index 6c46b3d65e4..d2e1f9276ae 100644 --- a/base/setup/usetup/lang/sq-AL.h +++ b/base/setup/usetup/lang/sq-AL.h @@ -1407,7 +1407,7 @@ static MUI_ENTRY sqALDeletePartitionEntries[] = { 8, 18, - "\x07 Kliko D p\211r t\211 fshir\211 particionin.", + "\x07 Kliko L p\211r t\211 fshir\211 particionin.", TEXT_STYLE_NORMAL }, { @@ -1425,7 +1425,7 @@ static MUI_ENTRY sqALDeletePartitionEntries[] = { 0, 0, - "D = Fshi Particionin ESC = Anulo F3 = Dil", + "L = Fshi Particionin ESC = Anulo F3 = Dil", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h index 571c8d8361d..9e6ece2cb62 100644 --- a/base/setup/usetup/lang/sv-SE.h +++ b/base/setup/usetup/lang/sv-SE.h @@ -1409,7 +1409,7 @@ static MUI_ENTRY svSEDeletePartitionEntries[] = { 8, 18, - "\x07 Tryck D f\224r att ta bort partitionen.", + "\x07 Tryck L f\224r att ta bort partitionen.", TEXT_STYLE_NORMAL }, { @@ -1427,7 +1427,7 @@ static MUI_ENTRY svSEDeletePartitionEntries[] = { 0, 0, - " D = Tar bort Partitionen ESC = Avbryt F3 = Avsluta", + " L = Tar bort Partitionen ESC = Avbryt F3 = Avsluta", TEXT_TYPE_STATUS }, { diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h index 87608cee5be..80196752ea9 100644 --- a/base/setup/usetup/lang/tr-TR.h +++ b/base/setup/usetup/lang/tr-TR.h @@ -1381,7 +1381,7 @@ static MUI_ENTRY trTRDeletePartitionEntries[] = { 8, 18, - "\x07 B\224l\201m\201 silmek i\207in D'ye bas\215n\215z.", + "\x07 B\224l\201m\201 silmek i\207in L'ye bas\215n\215z.", TEXT_STYLE_NORMAL }, { @@ -1399,7 +1399,7 @@ static MUI_ENTRY trTRDeletePartitionEntries[] = { 0, 0, - "D = B\224l\201m Sil ESC = \230ptal F3 = \200\215k", + "L = B\224l\201m Sil ESC = \230ptal F3 = \200\215k", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h index e24f2011520..5f6258c7444 100644 --- a/base/setup/usetup/lang/uk-UA.h +++ b/base/setup/usetup/lang/uk-UA.h @@ -1408,7 +1408,7 @@ static MUI_ENTRY ukUADeletePartitionEntries[] = { 8, 18, - "\x07 \215\240\342\250\341\255i\342\354 D \244\253\357 \242\250\244\240\253\245\255\255\357 \340\256\247\244i\253\343.", + "\x07 \215\240\342\250\341\255i\342\354 L \244\253\357 \242\250\244\240\253\245\255\255\357 \340\256\247\244i\253\343.", TEXT_STYLE_NORMAL }, { @@ -1426,7 +1426,7 @@ static MUI_ENTRY ukUADeletePartitionEntries[] = { 0, 0, - "D = \202\250\244\240\253\250\342\250 \220\256\247\244i\253 ESC = \221\252\240\341\343\242\240\342\250 F3 = \202\250\251\342\250", + "L = \202\250\244\240\253\250\342\250 \220\256\247\244i\253 ESC = \221\252\240\341\343\242\240\342\250 F3 = \202\250\251\342\250", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 239fd3465ce..63c13c5bd01 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -2653,7 +2653,7 @@ DeletePartitionPage(PINPUT_RECORD Ir) { return SELECT_PARTITION_PAGE; } - else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'D') /* D */ + else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'L') /* L */ { DeletePartition(PartitionList, CurrentPartition,

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