Ros-diffs September 2020

ros-diffs@reactos.org

25 participants
382 discussions

[reactos] 01/01: [EXPLORER] Registry key not closed on error (#3136)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d54e50f3dcfd89604504c… commit d54e50f3dcfd89604504cdebb072c6be6d5b1a78 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Tue Sep 8 21:55:45 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 8 21:55:45 2020 +0200 [EXPLORER] Registry key not closed on error (#3136) CORE-14519 --- base/shell/explorer/shellservice.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/base/shell/explorer/shellservice.cpp b/base/shell/explorer/shellservice.cpp index 2aded3050a0..459e9084cef 100644 --- a/base/shell/explorer/shellservice.cpp +++ b/base/shell/explorer/shellservice.cpp @@ -115,17 +115,18 @@ HRESULT InitShellServices(HDPA * phdpa) goto cleanup; } - RegCloseKey(hkey); - /* Initialize */ DPA_EnumCallback(hdpa, InitializeAllCallback, &hr); if (FAILED_UNEXPECTEDLY(hr)) goto cleanup; + RegCloseKey(hkey); + *phdpa = hdpa; return count > 0 ? S_OK : S_FALSE; cleanup: + RegCloseKey(hkey); *phdpa = NULL; ShutdownShellServices(hdpa); return hr;

4 years

[reactos] 01/01: [SOLITAIRE] French translation update (#3138)

by Kyle Katarn

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c7ccf4bc9b1808590a8a… commit 2c7ccf4bc9b1808590a8a0a1fe28912893dbe590 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Tue Sep 8 21:52:24 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 8 21:52:24 2020 +0200 [SOLITAIRE] French translation update (#3138) Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- base/applications/games/solitaire/lang/fr-FR.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/base/applications/games/solitaire/lang/fr-FR.rc b/base/applications/games/solitaire/lang/fr-FR.rc index 9f83c7268b8..f1f874719cd 100644 --- a/base/applications/games/solitaire/lang/fr-FR.rc +++ b/base/applications/games/solitaire/lang/fr-FR.rc @@ -18,13 +18,13 @@ BEGIN GROUPBOX "Cartes", -1, 7, 7, 90, 40 AUTORADIOBUTTON "En tirer une", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "En tirer trois", IDC_OPT_DRAWTHREE, 14, 32, 70, 10 - GROUPBOX "Scoring", -1, 100, 7, 75, 53 + GROUPBOX "Score", -1, 100, 7, 75, 53 AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10 - AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10 + AUTORADIOBUTTON "&Aucun", IDC_OPT_NOSCORE, 107, 45, 60, 10 AUTOCHECKBOX "Afficher le temp&s", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP AUTOCHECKBOX "Barre de s&tatut", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP - AUTOCHECKBOX "&Keep Score", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP + AUTOCHECKBOX "&Score cumulatif", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Annuler", IDCANCEL, 101, 97, 50, 14 END @@ -59,8 +59,8 @@ BEGIN IDS_SOL_QUIT "Quitter le jeu actuel ?" IDS_SOL_WIN "Félicitations ! Vous avez gagné !" IDS_SOL_DEAL "Redistribuer ?" - IDS_SOL_SCORE "Score: %d" - IDS_SOL_TIME "Time: %d" + IDS_SOL_SCORE "Score : %d" + IDS_SOL_TIME "Temps : %d" END /* Menus */

4 years

[reactos] 01/01: [Printing] Fix Typos and Test Regressions

by James Tabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ca217621dc88cc9c584f… commit 3ca217621dc88cc9c584f9da9ba47f34622c40f9 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Tue Sep 8 13:15:16 2020 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Tue Sep 8 13:15:16 2020 -0500 [Printing] Fix Typos and Test Regressions Fix WinSpool API regressions. Fix typos and debug prints. --- win32ss/printing/base/winspool/printers.c | 4 +++- win32ss/printing/monitors/localmon/xcv.c | 4 ++-- win32ss/printing/providers/localspl/main.c | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/win32ss/printing/base/winspool/printers.c b/win32ss/printing/base/winspool/printers.c index dfff8223a87..31865fd7afc 100644 --- a/win32ss/printing/base/winspool/printers.c +++ b/win32ss/printing/base/winspool/printers.c @@ -582,7 +582,7 @@ DeviceCapabilitiesW(LPCWSTR pDevice, LPCWSTR pPort, WORD fwCapability, LPWSTR pO { if (!IsValidDevmodeNoSizeW( (PDEVMODEW)pDevMode ) ) { - ERR("DeviceCapabilitiesW : Devode Invalid"); + ERR("DeviceCapabilitiesW : Devode Invalid\n"); return -1; } } @@ -916,7 +916,9 @@ DocumentPropertySheets( PPROPSHEETUI_INFO pCPSUIInfo, LPARAM lparam ) if ( fpDocumentPropertySheets ) { + FIXME("DPS : fpDocumentPropertySheets(%p, 0x%lx) pdmOut %p\n", pCPSUIInfo, lparam, pdphdr->pdmOut); Result = fpDocumentPropertySheets( pCPSUIInfo, lparam ); + FIXME("DPS : fpDocumentPropertySheets result %d cbOut %d\n",Result, pdphdr->cbOut); } else { diff --git a/win32ss/printing/monitors/localmon/xcv.c b/win32ss/printing/monitors/localmon/xcv.c index 25635c37e7d..1aeb4abe466 100644 --- a/win32ss/printing/monitors/localmon/xcv.c +++ b/win32ss/printing/monitors/localmon/xcv.c @@ -513,7 +513,7 @@ LocalmonXcvClosePort(HANDLE hXcv) } // Remove it from the list and free the memory. - LeaveCriticalSection(&pXcv->pLocalmon->Section); + EnterCriticalSection(&pXcv->pLocalmon->Section); RemoveEntryList(&pXcv->Entry); LeaveCriticalSection(&pXcv->pLocalmon->Section); DllFreeSplMem(pXcv); @@ -570,7 +570,7 @@ LocalmonXcvOpenPort(HANDLE hMonitor, PCWSTR pwszObject, ACCESS_MASK GrantedAcces PLOCALMON_HANDLE pLocalmon = (PLOCALMON_HANDLE)hMonitor; PLOCALMON_XCV pXcv; - TRACE("LocalmonXcvOpenPort(%p, %S, %lu, %p)\n", hMonitor, pwszObject, GrantedAccess, phXcv); + FIXME("LocalmonXcvOpenPort(%p, %S, %lu, %p)\n", hMonitor, pwszObject, GrantedAccess, phXcv); // Sanity checks if (!pLocalmon || !phXcv) diff --git a/win32ss/printing/providers/localspl/main.c b/win32ss/printing/providers/localspl/main.c index ba563a7c511..a8d6118e1bc 100644 --- a/win32ss/printing/providers/localspl/main.c +++ b/win32ss/printing/providers/localspl/main.c @@ -25,9 +25,9 @@ const DWORD dwSpoolerMinorVersion = 0; const WCHAR wszDefaultDocumentName[] = L"Local Downlevel Document"; PCWSTR wszPrintProviderInfo[3] = { - L"Windows NT Local Printers", // Description L"Windows NT Local Print Providor", // Name - L"Locally connected Printers" // Comment + L"Locally connected Printers", // Comment + L"Windows NT Local Printers" // Description }; // Local Constants

4 years

[reactos] 01/01: [GDI32] Force Return if other Type of Device Requested

by James Tabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8313483202b2fc89a6888… commit 8313483202b2fc89a6888cd067eb0f10d36e99c8 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Tue Sep 8 12:52:28 2020 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Tue Sep 8 12:52:28 2020 -0500 [GDI32] Force Return if other Type of Device Requested Fix CORE-17241 assert. --- win32ss/gdi/gdi32/objects/dc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/win32ss/gdi/gdi32/objects/dc.c b/win32ss/gdi/gdi32/objects/dc.c index bde7f2377a4..91df2a90984 100644 --- a/win32ss/gdi/gdi32/objects/dc.c +++ b/win32ss/gdi/gdi32/objects/dc.c @@ -53,10 +53,12 @@ IntCreateDICW( if (lpwszOutput) RtlInitUnicodeString(&Output, lpwszOutput); + // Handle Print device or something else. if (!Display) { - //Handle Print device or something else. + // WIP - GDI Print Commit coming in soon. DPRINT1("Not a DISPLAY device! %wZ\n", &Device); + return NULL; // Return NULL until then..... } hdc = NtGdiOpenDCW((Default ? NULL : &Device),

4 years

[reactos] 01/01: [NTOS:IO] Fix a reference leak in IopSynchronousCall on failure case

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=32c7c1157d64edd0f2e51… commit 32c7c1157d64edd0f2e512644e518abfcc372542 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Sep 8 14:51:20 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Sep 8 14:51:20 2020 +0300 [NTOS:IO] Fix a reference leak in IopSynchronousCall on failure case Co-authored-by: Vadim Galyant <vgal(a)rambler.ru> --- ntoskrnl/io/pnpmgr/pnpmgr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/io/pnpmgr/pnpmgr.c b/ntoskrnl/io/pnpmgr/pnpmgr.c index 7ed3eee62a0..ac9d71a9b99 100644 --- a/ntoskrnl/io/pnpmgr/pnpmgr.c +++ b/ntoskrnl/io/pnpmgr/pnpmgr.c @@ -563,7 +563,11 @@ IopSynchronousCall(IN PDEVICE_OBJECT DeviceObject, /* Allocate an IRP */ Irp = IoAllocateIrp(TopDeviceObject->StackSize, FALSE); - if (!Irp) return STATUS_INSUFFICIENT_RESOURCES; + if (!Irp) + { + ObDereferenceObject(TopDeviceObject); + return STATUS_INSUFFICIENT_RESOURCES; + } /* Initialize to failure */ Irp->IoStatus.Status = IoStatusBlock.Status = STATUS_NOT_SUPPORTED;

4 years

[reactos] 03/03: [CABMAN] Ensure we are minimally building with c++11

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9bd9c9d5a4348c884b7a9… commit 9bd9c9d5a4348c884b7a980f929bb2f68aa442cb Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Sep 3 18:13:21 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Sep 7 22:16:42 2020 +0200 [CABMAN] Ensure we are minimally building with c++11 --- sdk/tools/cabman/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/tools/cabman/CMakeLists.txt b/sdk/tools/cabman/CMakeLists.txt index 2f6f05ca5da..807c2990451 100644 --- a/sdk/tools/cabman/CMakeLists.txt +++ b/sdk/tools/cabman/CMakeLists.txt @@ -17,3 +17,4 @@ list(APPEND SOURCE add_host_tool(cabman ${SOURCE}) target_link_libraries(cabman PRIVATE host_includes zlibhost) +set_property(TARGET cabman PROPERTY CXX_STANDARD 11)

4 years

[reactos] 02/03: [CABMAN] Move CCFDATAStorage to a separate header

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=63f3275d154e7a91d74ad… commit 63f3275d154e7a91d74adcbf3cdba7210257b528 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Aug 30 20:38:43 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Sep 7 22:16:42 2020 +0200 [CABMAN] Move CCFDATAStorage to a separate header --- sdk/tools/cabman/CCFDATAStorage.cxx | 6 +++--- sdk/tools/cabman/CCFDATAStorage.h | 34 ++++++++++++++++++++++++++++++++++ sdk/tools/cabman/CMakeLists.txt | 3 ++- sdk/tools/cabman/cabinet.cxx | 1 + sdk/tools/cabman/cabinet.h | 25 +------------------------ 5 files changed, 41 insertions(+), 28 deletions(-) diff --git a/sdk/tools/cabman/CCFDATAStorage.cxx b/sdk/tools/cabman/CCFDATAStorage.cxx index b1790791c0b..c120af09f4a 100644 --- a/sdk/tools/cabman/CCFDATAStorage.cxx +++ b/sdk/tools/cabman/CCFDATAStorage.cxx @@ -1,10 +1,10 @@ /* * PROJECT: ReactOS cabinet manager * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * PURPOSE: CCFDATAStorage class implementation for Linux/Unix + * PURPOSE: CCFDATAStorage class implementation * COPYRIGHT: Copyright 2017 Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Copyright 2017 Colin Finck <mail(a)colinfinck.de> - * Copyright 2018 Dmitry Bagdanov <dimbo_job(a)mail.ru> + * Copyright 2018 Dmitry Bagdanov <dimbo_job(a)mail.ru> */ #include <stdio.h> #include <stdlib.h> @@ -16,7 +16,7 @@ #include <dirent.h> #endif -#include "cabinet.h" +#include "CCFDATAStorage.h" #include "raw.h" #include "mszip.h" diff --git a/sdk/tools/cabman/CCFDATAStorage.h b/sdk/tools/cabman/CCFDATAStorage.h new file mode 100644 index 00000000000..2382469636c --- /dev/null +++ b/sdk/tools/cabman/CCFDATAStorage.h @@ -0,0 +1,34 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS cabinet manager + * FILE: tools/cabman/cabman.h + * PURPOSE: Cabinet manager header + */ + +#pragma once + +#include "cabinet.h" + +#ifndef CAB_READ_ONLY + +class CCFDATAStorage +{ +public: + /* Default constructor */ + CCFDATAStorage(); + /* Default destructor */ + virtual ~CCFDATAStorage(); + ULONG Create(); + ULONG Destroy(); + ULONG Truncate(); + ULONG Position(); + ULONG Seek(LONG Position); + ULONG ReadBlock(PCFDATA Data, void* Buffer, PULONG BytesRead); + ULONG WriteBlock(PCFDATA Data, void* Buffer, PULONG BytesWritten); +private: + char FullName[PATH_MAX]; + FILE* FileHandle; +}; + +#endif /* CAB_READ_ONLY */ + diff --git a/sdk/tools/cabman/CMakeLists.txt b/sdk/tools/cabman/CMakeLists.txt index 16464fb9ab2..2f6f05ca5da 100644 --- a/sdk/tools/cabman/CMakeLists.txt +++ b/sdk/tools/cabman/CMakeLists.txt @@ -12,7 +12,8 @@ list(APPEND SOURCE mszip.h raw.cxx raw.h - CCFDATAStorage.cxx) + CCFDATAStorage.cxx + CCFDATAStorage.h) add_host_tool(cabman ${SOURCE}) target_link_libraries(cabman PRIVATE host_includes zlibhost) diff --git a/sdk/tools/cabman/cabinet.cxx b/sdk/tools/cabman/cabinet.cxx index 1f0d2766a12..1db3ce4e07a 100644 --- a/sdk/tools/cabman/cabinet.cxx +++ b/sdk/tools/cabman/cabinet.cxx @@ -24,6 +24,7 @@ # include <sys/types.h> #endif #include "cabinet.h" +#include "CCFDATAStorage.h" #include "raw.h" #include "mszip.h" diff --git a/sdk/tools/cabman/cabinet.h b/sdk/tools/cabman/cabinet.h index d47f87893cd..a78d3553d6d 100644 --- a/sdk/tools/cabman/cabinet.h +++ b/sdk/tools/cabman/cabinet.h @@ -308,29 +308,6 @@ public: /* Classes */ -#ifndef CAB_READ_ONLY - -class CCFDATAStorage -{ -public: - /* Default constructor */ - CCFDATAStorage(); - /* Default destructor */ - virtual ~CCFDATAStorage(); - ULONG Create(); - ULONG Destroy(); - ULONG Truncate(); - ULONG Position(); - ULONG Seek(LONG Position); - ULONG ReadBlock(PCFDATA Data, void* Buffer, PULONG BytesRead); - ULONG WriteBlock(PCFDATA Data, void* Buffer, PULONG BytesWritten); -private: - char FullName[PATH_MAX]; - FILE* FileHandle; -}; - -#endif /* CAB_READ_ONLY */ - class CCabinet { public: @@ -508,7 +485,7 @@ private: bool CreateNewDisk; bool CreateNewFolder; - CCFDATAStorage *ScratchFile; + class CCFDATAStorage *ScratchFile; FILE* SourceFile; bool ContinueFile; ULONG TotalBytesLeft;

4 years

[reactos] 01/03: [CABMAN] Replace some dynamically allocated strings with std::string CORE-17231

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7394d12f7e3c0ecdc4ff3… commit 7394d12f7e3c0ecdc4ff3a0e853fd71723f5fb81 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Aug 30 15:31:04 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Sep 7 22:16:28 2020 +0200 [CABMAN] Replace some dynamically allocated strings with std::string CORE-17231 --- sdk/tools/cabman/CMakeLists.txt | 9 +- sdk/tools/cabman/cabinet.cxx | 264 ++++++++++-------------------- sdk/tools/cabman/cabinet.h | 116 +++++++------ sdk/tools/cabman/{main.cxx => cabman.cxx} | 31 ++-- sdk/tools/cabman/cabman.h | 12 +- sdk/tools/cabman/dfp.cxx | 33 ++-- sdk/tools/cabman/dfp.h | 6 +- sdk/tools/cabman/mszip.h | 4 +- sdk/tools/cabman/raw.h | 4 +- 9 files changed, 204 insertions(+), 275 deletions(-) diff --git a/sdk/tools/cabman/CMakeLists.txt b/sdk/tools/cabman/CMakeLists.txt index 938478b57bb..16464fb9ab2 100644 --- a/sdk/tools/cabman/CMakeLists.txt +++ b/sdk/tools/cabman/CMakeLists.txt @@ -1,10 +1,17 @@ +#add_definitions(-DDBG) + list(APPEND SOURCE cabinet.cxx + cabinet.h dfp.cxx - main.cxx + dfp.h + cabman.cxx + cabman.h mszip.cxx + mszip.h raw.cxx + raw.h CCFDATAStorage.cxx) add_host_tool(cabman ${SOURCE}) diff --git a/sdk/tools/cabman/cabinet.cxx b/sdk/tools/cabman/cabinet.cxx index 64888daea2b..1f0d2766a12 100644 --- a/sdk/tools/cabman/cabinet.cxx +++ b/sdk/tools/cabman/cabinet.cxx @@ -77,8 +77,6 @@ CCabinet::CCabinet() *DiskPrev = '\0'; *CabinetNext = '\0'; *DiskNext = '\0'; - *DestPath = '\0'; - *CabinetReservedFile = '\0'; FileOpen = false; CabinetReservedFileBuffer = NULL; @@ -139,7 +137,7 @@ bool CCabinet::IsSeparator(char Char) return false; } -char* CCabinet::ConvertPath(char* Path, bool Allocate) +void CCabinet::ConvertPath(std::string& Path) /* * FUNCTION: Replaces \ or / with the one used by the host environment * ARGUMENTS: @@ -150,37 +148,20 @@ char* CCabinet::ConvertPath(char* Path, bool Allocate) * Pointer to new path */ { - char *newpath; - int i; - - if (Allocate) - newpath = strdup(Path); - else - newpath = Path; - - i = 0; - while (Path[i] != 0) + for (size_t i = 0; i < Path.size(); ++i) { #if defined(_WIN32) if (Path[i] == '/') - newpath[i] = '\\'; - else + Path[i] = '\\'; #else if (Path[i] == '\\') - newpath[i] = '/'; - else + Path[i] = '/'; #endif - newpath[i] = Path[i]; - - i++; } - newpath[i] = 0; - - return(newpath); } -char* CCabinet::GetFileName(char* Path) +const char* CCabinet::GetFileName(const char* Path) /* * FUNCTION: Returns a pointer to file name * ARGUMENTS: @@ -201,49 +182,18 @@ char* CCabinet::GetFileName(char* Path) } -void CCabinet::RemoveFileName(char* Path) -/* - * FUNCTION: Removes a file name from a path - * ARGUMENTS: - * Path = Pointer to string with path - */ -{ - char* FileName; - ULONG i; - - i = (Path [0] ? (Path[1] == ':' ? 2 : 0) : 0); - FileName = GetFileName(Path + i); - - if ((FileName != (Path + i)) && (IsSeparator(FileName [-1]))) - FileName--; - if ((FileName == (Path + i)) && (IsSeparator(FileName [0]))) - FileName++; - FileName[0] = 0; -} - - -bool CCabinet::NormalizePath(char* Path, - ULONG Length) +void CCabinet::NormalizePath(std::string& Path) /* * FUNCTION: Normalizes a path * ARGUMENTS: - * Path = Pointer to string with pathname - * Length = Number of bytes in Path - * RETURNS: - * true if there was enough room in Path, or false + * Path = string with pathname */ { - ULONG n; - bool OK = true; - - if ((n = (ULONG)strlen(Path)) && - (!IsSeparator(Path[n - 1])) && - (OK = ((n + 1) < Length))) + if (Path.length() > 0) { - Path[n] = DIR_SEPARATOR_CHAR; - Path[n + 1] = 0; + if (!IsSeparator(Path[Path.length() - 1])) + Path += DIR_SEPARATOR_CHAR; } - return OK; } @@ -258,7 +208,7 @@ char* CCabinet::GetCabinetName() } -void CCabinet::SetCabinetName(char* FileName) +void CCabinet::SetCabinetName(const char* FileName) /* * FUNCTION: Sets cabinet file name * ARGUMENTS: @@ -269,20 +219,19 @@ void CCabinet::SetCabinetName(char* FileName) } -void CCabinet::SetDestinationPath(char* DestinationPath) +void CCabinet::SetDestinationPath(const char* DestinationPath) /* * FUNCTION: Sets destination path * ARGUMENTS: * DestinationPath = Pointer to string with name of destination path */ { - strcpy(DestPath, DestinationPath); - ConvertPath(DestPath, false); - if (strlen(DestPath) > 0) - NormalizePath(DestPath, PATH_MAX); + DestPath = DestinationPath; + ConvertPath(DestPath); + NormalizePath(DestPath); } -ULONG CCabinet::AddSearchCriteria(char* SearchCriteria) +ULONG CCabinet::AddSearchCriteria(const char* SearchCriteria) /* * FUNCTION: Adds a criteria to the search criteria list * ARGUMENTS: @@ -294,7 +243,7 @@ ULONG CCabinet::AddSearchCriteria(char* SearchCriteria) PSEARCH_CRITERIA Criteria; // Add the criteria to the list of search criteria - Criteria = (PSEARCH_CRITERIA)malloc(sizeof(SEARCH_CRITERIA)); + Criteria = new SEARCH_CRITERIA; if(!Criteria) { DPRINT(MIN_TRACE, ("Insufficient memory.\n")); @@ -312,14 +261,7 @@ ULONG CCabinet::AddSearchCriteria(char* SearchCriteria) CriteriaListTail = Criteria; // Set the actual criteria string - Criteria->Search = (char*)malloc(strlen(SearchCriteria) + 1); - if (!Criteria->Search) - { - DPRINT(MIN_TRACE, ("Insufficient memory.\n")); - return CAB_STATUS_NOMEMORY; - } - - strcpy(Criteria->Search, SearchCriteria); + Criteria->Search = SearchCriteria; return CAB_STATUS_SUCCESS; } @@ -338,8 +280,7 @@ void CCabinet::DestroySearchCriteria() { NextCriteria = Criteria->Next; - free(Criteria->Search); - free(Criteria); + delete Criteria; Criteria = NextCriteria; } @@ -358,7 +299,7 @@ bool CCabinet::HasSearchCriteria() return (CriteriaListHead != NULL); } -bool CCabinet::SetCompressionCodec(char* CodecName) +bool CCabinet::SetCompressionCodec(const char* CodecName) /* * FUNCTION: Selects the codec to use for compression * ARGUMENTS: @@ -378,18 +319,18 @@ bool CCabinet::SetCompressionCodec(char* CodecName) return true; } -char* CCabinet::GetDestinationPath() +const char* CCabinet::GetDestinationPath() /* * FUNCTION: Returns destination path * RETURNS: * Pointer to string with name of destination path */ { - return DestPath; + return DestPath.c_str(); } -bool CCabinet::SetCabinetReservedFile(char* FileName) +bool CCabinet::SetCabinetReservedFile(const char* FileName) /* * FUNCTION: Sets cabinet reserved file * ARGUMENTS: @@ -398,12 +339,12 @@ bool CCabinet::SetCabinetReservedFile(char* FileName) { FILE* FileHandle; ULONG BytesRead; - char* ConvertedFileName; + std::string ConvertedFileName; - ConvertedFileName = ConvertPath(FileName, true); + ConvertedFileName = FileName; + ConvertPath(ConvertedFileName); - FileHandle = fopen(ConvertedFileName, "rb"); - free(ConvertedFileName); + FileHandle = fopen(ConvertedFileName.c_str(), "rb"); if (FileHandle == NULL) { DPRINT(MID_TRACE, ("Cannot open cabinet reserved file.\n")); @@ -440,23 +381,12 @@ bool CCabinet::SetCabinetReservedFile(char* FileName) fclose(FileHandle); - strcpy(CabinetReservedFile, FileName); + CabinetReservedFile = FileName; return true; } -char* CCabinet::GetCabinetReservedFile() -/* - * FUNCTION: Returns cabionet reserved file - * RETURNS: - * Pointer to string with name of cabinet reserved file - */ -{ - return CabinetReservedFile; -} - - ULONG CCabinet::GetCurrentDiskNumber() /* * FUNCTION: Returns current disk number @@ -673,7 +603,7 @@ ULONG CCabinet::FindNext(PCAB_SEARCH Search) (Search->Next->File.FileOffset <= LastFileOffset)) { DPRINT(MAX_TRACE, ("Skipping file (%s) FileOffset (0x%X) LastFileOffset (0x%X).\n", - Search->Next->FileName, (UINT)Search->Next->File.FileOffset, (UINT)LastFileOffset)); + Search->Next->FileName.c_str(), (UINT)Search->Next->File.FileOffset, (UINT)LastFileOffset)); Search->Next = Search->Next->Next; } @@ -692,7 +622,7 @@ ULONG CCabinet::FindNext(PCAB_SEARCH Search) while(Criteria) { - if(MatchFileNamePattern(Search->Next->FileName, Criteria->Search)) + if(MatchFileNamePattern(Search->Next->FileName.c_str(), Criteria->Search.c_str())) { bFound = true; break; @@ -736,7 +666,7 @@ ULONG CCabinet::FindNext(PCAB_SEARCH Search) } -ULONG CCabinet::ExtractFile(char* FileName) +ULONG CCabinet::ExtractFile(const char* FileName) /* * FUNCTION: Extracts a file from the cabinet * ARGUMENTS: @@ -796,7 +726,7 @@ ULONG CCabinet::ExtractFile(char* FileName) (UINT)File->DataBlock->AbsoluteOffset, (UINT)File->DataBlock->UncompOffset)); - strcpy(DestName, DestPath); + strcpy(DestName, DestPath.c_str()); strcat(DestName, FileName); /* Create destination file, fail if it already exists */ @@ -1302,10 +1232,10 @@ ULONG CCabinet::WriteFileToScratchStorage(PCFFILE_NODE FileNode) if (!ContinueFile) { /* Try to open file */ - SourceFile = fopen(FileNode->FileName, "rb"); + SourceFile = fopen(FileNode->FileName.c_str(), "rb"); if (SourceFile == NULL) { - DPRINT(MID_TRACE, ("File not found (%s).\n", FileNode->FileName)); + DPRINT(MID_TRACE, ("File not found (%s).\n", FileNode->FileName.c_str())); return CAB_STATUS_NOFILE; } @@ -1320,7 +1250,7 @@ ULONG CCabinet::WriteFileToScratchStorage(PCFFILE_NODE FileNode) } /* Call OnAdd event handler */ - OnAdd(&FileNode->File, FileNode->FileName); + OnAdd(&FileNode->File, FileNode->FileName.c_str()); TotalBytesLeft = FileNode->File.FileSize; @@ -1330,7 +1260,7 @@ ULONG CCabinet::WriteFileToScratchStorage(PCFFILE_NODE FileNode) CurrentFolderNode->Commit = true; PrevCabinetNumber = CurrentDiskNumber; - Size = sizeof(CFFILE) + (ULONG)strlen(GetFileName(FileNode->FileName)) + 1; + Size = sizeof(CFFILE) + (ULONG)strlen(GetFileName(FileNode->FileName.c_str())) + 1; CABHeader.FileTableOffset += Size; TotalFileSize += Size; DiskSize += Size; @@ -1621,23 +1551,16 @@ ULONG CCabinet::AddFile(char* FileName) { FILE* SrcFile; PCFFILE_NODE FileNode; - char* NewFileName; + std::string NewFileName; - NewFileName = (char*)malloc(strlen(FileName) + 1); - if (!NewFileName) - { - DPRINT(MIN_TRACE, ("Insufficient memory.\n")); - return CAB_STATUS_NOMEMORY; - } - strcpy(NewFileName, FileName); - ConvertPath(NewFileName, false); + NewFileName = FileName; + ConvertPath(NewFileName); /* Try to open file */ - SrcFile = fopen(NewFileName, "rb"); + SrcFile = fopen(NewFileName.c_str(), "rb"); if (SrcFile == NULL) { - DPRINT(MID_TRACE, ("File not found (%s).\n", NewFileName)); - free(NewFileName); + DPRINT(MID_TRACE, ("File not found (%s).\n", NewFileName.c_str())); return CAB_STATUS_CANNOT_OPEN; } @@ -1645,7 +1568,6 @@ ULONG CCabinet::AddFile(char* FileName) if (!FileNode) { DPRINT(MIN_TRACE, ("Insufficient memory.\n")); - free(NewFileName); fclose(SrcFile); return CAB_STATUS_NOMEMORY; } @@ -1687,7 +1609,7 @@ bool CCabinet::CreateSimpleCabinet() */ { bool bRet = false; - char* pszFile; + const char* pszFile; char szFilePath[PATH_MAX]; char szFile[PATH_MAX]; PSEARCH_CRITERIA Criteria; @@ -1716,20 +1638,20 @@ bool CCabinet::CreateSimpleCabinet() while(Criteria) { // Store the file path with a trailing slash in szFilePath - ConvertPath(Criteria->Search, false); - pszFile = strrchr(Criteria->Search, DIR_SEPARATOR_CHAR); + ConvertPath(Criteria->Search); + pszFile = strrchr(Criteria->Search.c_str(), DIR_SEPARATOR_CHAR); if(pszFile) { // Set the pointer to the start of the file name, not the slash pszFile++; - strncpy(szFilePath, Criteria->Search, pszFile - Criteria->Search); - szFilePath[pszFile - Criteria->Search] = 0; + strncpy(szFilePath, Criteria->Search.c_str(), pszFile - Criteria->Search.c_str()); + szFilePath[pszFile - Criteria->Search.c_str()] = 0; } else { - pszFile = Criteria->Search; + pszFile = Criteria->Search.c_str(); #if defined(_WIN32) szFilePath[0] = 0; @@ -1741,12 +1663,12 @@ bool CCabinet::CreateSimpleCabinet() #if defined(_WIN32) // Windows: Use the easy FindFirstFile/FindNextFile API for getting all files and checking them against the pattern - hFind = FindFirstFile(Criteria->Search, &FindFileData); + hFind = FindFirstFile(Criteria->Search.c_str(), &FindFileData); // Don't stop if a search criteria is not found if(hFind == INVALID_HANDLE_VALUE && GetLastError() != ERROR_FILE_NOT_FOUND) { - DPRINT(MIN_TRACE, ("FindFirstFile failed, Criteria: %s, error code is %u\n", Criteria->Search, (UINT)GetLastError())); + DPRINT(MIN_TRACE, ("FindFirstFile failed, Criteria: %s, error code is %u\n", Criteria->Search.c_str(), (UINT)GetLastError())); goto cleanup; } @@ -1845,7 +1767,7 @@ void CCabinet::SetMaxDiskSize(ULONG Size) /* Default event handlers */ bool CCabinet::OnOverwrite(PCFFILE File, - char* FileName) + const char* FileName) /* * FUNCTION: Called when extracting a file and it already exists * ARGUMENTS: @@ -1860,7 +1782,7 @@ bool CCabinet::OnOverwrite(PCFFILE File, void CCabinet::OnExtract(PCFFILE File, - char* FileName) + const char* FileName) /* * FUNCTION: Called just before extracting a file * ARGUMENTS: @@ -1871,8 +1793,8 @@ void CCabinet::OnExtract(PCFFILE File, } -void CCabinet::OnDiskChange(char* CabinetName, - char* DiskLabel) +void CCabinet::OnDiskChange(const char* CabinetName, + const char* DiskLabel) /* * FUNCTION: Called when a new disk is to be processed * ARGUMENTS: @@ -1882,11 +1804,15 @@ void CCabinet::OnDiskChange(char* CabinetName, { } +void CCabinet::OnVerboseMessage(const char* Message) +{ + +} #ifndef CAB_READ_ONLY void CCabinet::OnAdd(PCFFILE File, - char* FileName) + const char* FileName) /* * FUNCTION: Called just before adding a file to a cabinet * ARGUMENTS: @@ -1970,7 +1896,7 @@ ULONG CCabinet::GetAbsoluteOffset(PCFFILE_NODE File) PCFDATA_NODE Node; DPRINT(MAX_TRACE, ("FileName '%s' FileOffset (0x%X) FileSize (%u).\n", - File->FileName, + File->FileName.c_str(), (UINT)File->File.FileOffset, (UINT)File->File.FileSize)); @@ -1999,7 +1925,7 @@ ULONG CCabinet::GetAbsoluteOffset(PCFFILE_NODE File) } -ULONG CCabinet::LocateFile(char* FileName, +ULONG CCabinet::LocateFile(const char* FileName, PCFFILE_NODE *File) /* * FUNCTION: Locates a file in the cabinet @@ -2020,7 +1946,7 @@ ULONG CCabinet::LocateFile(char* FileName, Node = FileListHead; while (Node != NULL) { - if (strcasecmp(FileName, Node->FileName) == 0) + if (strcasecmp(FileName, Node->FileName.c_str()) == 0) { CurrentFolderNode = LocateFolderNode(Node->File.FileControlID); if (!CurrentFolderNode) @@ -2137,20 +2063,15 @@ ULONG CCabinet::ReadFileTable() return CAB_STATUS_INVALID_CAB; } - File->FileName = (char*)malloc(PATH_MAX); - if (!File->FileName) - { - DPRINT(MIN_TRACE, ("Insufficient memory.\n")); - return CAB_STATUS_NOMEMORY; - } - /* Read file name */ - Status = ReadString(File->FileName, PATH_MAX); + char Buf[PATH_MAX]; + Status = ReadString(Buf, PATH_MAX); if (Status != CAB_STATUS_SUCCESS) return Status; + File->FileName = Buf; DPRINT(MAX_TRACE, ("Found file '%s' at uncompressed offset (0x%X). Size (%u bytes) ControlId (0x%X).\n", - File->FileName, + File->FileName.c_str(), (UINT)File->File.FileOffset, (UINT)File->File.FileSize, File->File.FileControlID)); @@ -2234,12 +2155,10 @@ PCFFOLDER_NODE CCabinet::NewFolderNode() { PCFFOLDER_NODE Node; - Node = (PCFFOLDER_NODE)malloc(sizeof(CFFOLDER_NODE)); + Node = new CFFOLDER_NODE; if (!Node) return NULL; - memset(Node, 0, sizeof(CFFOLDER_NODE)); - Node->Folder.CompressionType = CAB_COMP_NONE; Node->Prev = FolderListTail; @@ -2266,12 +2185,10 @@ PCFFILE_NODE CCabinet::NewFileNode() { PCFFILE_NODE Node; - Node = (PCFFILE_NODE)malloc(sizeof(CFFILE_NODE)); + Node = new CFFILE_NODE; if (!Node) return NULL; - memset(Node, 0, sizeof(CFFILE_NODE)); - Node->Prev = FileListTail; if (FileListTail != NULL) @@ -2296,12 +2213,10 @@ PCFDATA_NODE CCabinet::NewDataNode(PCFFOLDER_NODE FolderNode) { PCFDATA_NODE Node; - Node = (PCFDATA_NODE)malloc(sizeof(CFDATA_NODE)); + Node = new CFDATA_NODE; if (!Node) return NULL; - memset(Node, 0, sizeof(CFDATA_NODE)); - Node->Prev = FolderNode->DataListTail; if (FolderNode->DataListTail != NULL) @@ -2329,7 +2244,7 @@ void CCabinet::DestroyDataNodes(PCFFOLDER_NODE FolderNode) while (NextNode != NULL) { PrevNode = NextNode->Next; - free(NextNode); + delete NextNode; NextNode = PrevNode; } FolderNode->DataListHead = NULL; @@ -2349,9 +2264,7 @@ void CCabinet::DestroyFileNodes() while (NextNode != NULL) { PrevNode = NextNode->Next; - if (NextNode->FileName) - free(NextNode->FileName); - free(NextNode); + delete NextNode; NextNode = PrevNode; } FileListHead = NULL; @@ -2392,13 +2305,11 @@ void CCabinet::DestroyDeletedFileNodes() FileListTail->Next = NULL; } - DPRINT(MAX_TRACE, ("Deleting file: '%s'\n", CurNode->FileName)); + DPRINT(MAX_TRACE, ("Deleting file node: '%s'\n", CurNode->FileName.c_str())); - TotalFileSize -= (sizeof(CFFILE) + (ULONG)strlen(GetFileName(CurNode->FileName)) + 1); + TotalFileSize -= (sizeof(CFFILE) + (ULONG)strlen(GetFileName(CurNode->FileName.c_str())) + 1); - if (CurNode->FileName) - free(CurNode->FileName); - free(CurNode); + delete CurNode; } CurNode = NextNode; } @@ -2418,7 +2329,7 @@ void CCabinet::DestroyFolderNodes() { PrevNode = NextNode->Next; DestroyDataNodes(NextNode); - free(NextNode); + delete NextNode; NextNode = PrevNode; } FolderListHead = NULL; @@ -2460,7 +2371,7 @@ void CCabinet::DestroyDeletedFolderNodes() } DestroyDataNodes(CurNode); - free(CurNode); + delete CurNode; TotalFolderSize -= sizeof(CFFOLDER); } @@ -2548,7 +2459,7 @@ ULONG CCabinet::ReadBlock(void* Buffer, return CAB_STATUS_SUCCESS; } -bool CCabinet::MatchFileNamePattern(char* FileName, char* Pattern) +bool CCabinet::MatchFileNamePattern(const char* FileName, const char* Pattern) /* * FUNCTION: Matches a wildcard character pattern against a file * ARGUMENTS: @@ -2563,8 +2474,8 @@ bool CCabinet::MatchFileNamePattern(char* FileName, char* Pattern) * Original location: http://www.busybox.net/cgi-bin/viewcvs.cgi/trunk/busybox/utility.c?rev=5&vi… */ { - char* retryPattern = NULL; - char* retryFileName = NULL; + const char* retryPattern = NULL; + const char* retryFileName = NULL; char ch; while (*FileName || *Pattern) @@ -2896,7 +2807,7 @@ ULONG CCabinet::WriteFileEntries() } DPRINT(MAX_TRACE, ("Writing file entry. FileControlID (0x%X) FileOffset (0x%X) FileSize (%u) FileName (%s).\n", - File->File.FileControlID, (UINT)File->File.FileOffset, (UINT)File->File.FileSize, File->FileName)); + File->File.FileControlID, (UINT)File->File.FileOffset, (UINT)File->File.FileSize, File->FileName.c_str())); if (fwrite(&File->File, sizeof(CFFILE), 1, FileHandle) < 1) { @@ -2904,7 +2815,8 @@ ULONG CCabinet::WriteFileEntries() return CAB_STATUS_CANNOT_WRITE; } - if (fwrite(GetFileName(File->FileName), strlen(GetFileName(File->FileName)) + 1, 1, FileHandle) < 1) + std::string fname = GetFileName(File->FileName.c_str()); + if (fwrite(fname.c_str(), fname.length() + 1, 1, FileHandle) < 1) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; @@ -3119,14 +3031,14 @@ ULONG CCabinet::GetFileTimes(FILE* FileHandle, PCFFILE_NODE File) char buf[PATH_MAX]; // Check for an absolute path - if (IsSeparator(File->FileName[0])) - strcpy(buf, File->FileName); + if (File->FileName.length() > 0 && IsSeparator(File->FileName[0])) + strcpy(buf, File->FileName.c_str()); else { if (!getcwd(buf, sizeof(buf))) return CAB_STATUS_CANNOT_READ; strcat(buf, DIR_SEPARATOR_STRING); - strcat(buf, File->FileName); + strcat(buf, File->FileName.c_str()); } if (stat(buf, &stbuf) == -1) @@ -3150,7 +3062,7 @@ ULONG CCabinet::GetAttributesOnFile(PCFFILE_NODE File) #if defined(_WIN32) LONG Attributes; - Attributes = GetFileAttributes(File->FileName); + Attributes = GetFileAttributes(File->FileName.c_str()); if (Attributes == -1) return CAB_STATUS_CANNOT_READ; @@ -3163,14 +3075,14 @@ ULONG CCabinet::GetAttributesOnFile(PCFFILE_NODE File) char buf[PATH_MAX]; // Check for an absolute path - if (IsSeparator(File->FileName[0])) - strcpy(buf, File->FileName); + if (File->FileName.length() > 0 && IsSeparator(File->FileName[0])) + strcpy(buf, File->FileName.c_str()); else { if (!getcwd(buf, sizeof(buf))) return CAB_STATUS_CANNOT_READ; strcat(buf, DIR_SEPARATOR_STRING); - strcat(buf, File->FileName); + strcat(buf, File->FileName.c_str()); } if (stat(buf, &stbuf) == -1) diff --git a/sdk/tools/cabman/cabinet.h b/sdk/tools/cabman/cabinet.h index 3bf6ba6edad..d47f87893cd 100644 --- a/sdk/tools/cabman/cabinet.h +++ b/sdk/tools/cabman/cabinet.h @@ -25,11 +25,16 @@ #include <stdio.h> #include <string.h> #include <limits.h> +#include <string> #ifndef PATH_MAX #define PATH_MAX MAX_PATH #endif +#if !defined(C_ASSERT) +#define C_ASSERT(expr) extern char (*c_assert(void)) [(expr) ? 1 : -1] +#endif + #if defined(_WIN32) #define DIR_SEPARATOR_CHAR '\\' #define DIR_SEPARATOR_STRING "\\" @@ -167,6 +172,8 @@ typedef struct _CFFOLDER */ } CFFOLDER, *PCFFOLDER; +C_ASSERT(sizeof(CFFOLDER) == 8); + typedef struct _CFFILE { @@ -179,6 +186,7 @@ typedef struct _CFFILE /* After this is the NULL terminated filename */ } CFFILE, *PCFFILE; +C_ASSERT(sizeof(CFFILE) == 16); typedef struct _CFDATA { @@ -190,55 +198,59 @@ typedef struct _CFDATA */ } CFDATA, *PCFDATA; +C_ASSERT(sizeof(CFDATA) == 8); + +/* Application structures */ + typedef struct _CFDATA_NODE { - struct _CFDATA_NODE *Next; - struct _CFDATA_NODE *Prev; - ULONG ScratchFilePosition; // Absolute offset in scratch file - ULONG AbsoluteOffset; // Absolute offset in cabinet - ULONG UncompOffset; // Uncompressed offset in folder - CFDATA Data; + struct _CFDATA_NODE *Next = nullptr; + struct _CFDATA_NODE *Prev = nullptr; + ULONG ScratchFilePosition = 0; // Absolute offset in scratch file + ULONG AbsoluteOffset = 0; // Absolute offset in cabinet + ULONG UncompOffset = 0; // Uncompressed offset in folder + CFDATA Data = { 0 }; } CFDATA_NODE, *PCFDATA_NODE; typedef struct _CFFOLDER_NODE { - struct _CFFOLDER_NODE *Next; - struct _CFFOLDER_NODE *Prev; - ULONG UncompOffset; // File size accumulator - ULONG AbsoluteOffset; - ULONG TotalFolderSize; // Total size of folder in current disk - PCFDATA_NODE DataListHead; - PCFDATA_NODE DataListTail; - ULONG Index; - bool Commit; // true if the folder should be committed - bool Delete; // true if marked for deletion - CFFOLDER Folder; + struct _CFFOLDER_NODE *Next = nullptr; + struct _CFFOLDER_NODE *Prev = nullptr; + ULONG UncompOffset = 0; // File size accumulator + ULONG AbsoluteOffset = 0; + ULONG TotalFolderSize = 0; // Total size of folder in current disk + PCFDATA_NODE DataListHead = nullptr; + PCFDATA_NODE DataListTail = nullptr; + ULONG Index = 0; + bool Commit = false; // true if the folder should be committed + bool Delete = false; // true if marked for deletion + CFFOLDER Folder = { 0 }; } CFFOLDER_NODE, *PCFFOLDER_NODE; typedef struct _CFFILE_NODE { - struct _CFFILE_NODE *Next; - struct _CFFILE_NODE *Prev; - CFFILE File; - char* FileName; - PCFDATA_NODE DataBlock; // First data block of file. NULL if not known - bool Commit; // true if the file data should be committed - bool Delete; // true if marked for deletion - PCFFOLDER_NODE FolderNode; // Folder this file belong to + struct _CFFILE_NODE *Next = nullptr; + struct _CFFILE_NODE *Prev = nullptr; + CFFILE File = { 0 }; + std::string FileName; + PCFDATA_NODE DataBlock = nullptr; // First data block of file. NULL if not known + bool Commit = false; // true if the file data should be committed + bool Delete = false; // true if marked for deletion + PCFFOLDER_NODE FolderNode = nullptr; // Folder this file belong to } CFFILE_NODE, *PCFFILE_NODE; typedef struct _SEARCH_CRITERIA { - struct _SEARCH_CRITERIA *Next; // Pointer to next search criteria - struct _SEARCH_CRITERIA *Prev; // Pointer to previous search criteria - char* Search; // The actual search criteria + struct _SEARCH_CRITERIA *Next = nullptr; // Pointer to next search criteria + struct _SEARCH_CRITERIA *Prev = nullptr; // Pointer to previous search criteria + std::string Search; // The actual search criteria } SEARCH_CRITERIA, *PSEARCH_CRITERIA; typedef struct _CAB_SEARCH { - PCFFILE_NODE Next; // Pointer to next node - PCFFILE File; // Pointer to current CFFILE - char* FileName; // Current filename + PCFFILE_NODE Next = nullptr; // Pointer to next node + PCFFILE File = nullptr; // Pointer to current CFFILE + std::string FileName; // Current filename } CAB_SEARCH, *PCAB_SEARCH; @@ -329,25 +341,21 @@ public: /* Determines if a character is a separator */ bool IsSeparator(char Char); /* Replaces \ or / with the one used be the host environment */ - char* ConvertPath(char* Path, bool Allocate); + void ConvertPath(std::string& Path); /* Returns a pointer to the filename part of a fully qualified filename */ - char* GetFileName(char* Path); - /* Removes a filename from a fully qualified filename */ - void RemoveFileName(char* Path); + const char* GetFileName(const char* Path); /* Normalizes a path */ - bool NormalizePath(char* Path, ULONG Length); + void NormalizePath(std::string& Path); /* Returns name of cabinet file */ char* GetCabinetName(); /* Sets the name of the cabinet file */ - void SetCabinetName(char* FileName); + void SetCabinetName(const char* FileName); /* Sets destination path for extracted files */ - void SetDestinationPath(char* DestinationPath); + void SetDestinationPath(const char* DestinationPath); /* Sets cabinet reserved file */ - bool SetCabinetReservedFile(char* FileName); - /* Returns cabinet reserved file */ - char* GetCabinetReservedFile(); + bool SetCabinetReservedFile(const char* FileName); /* Returns destination path */ - char* GetDestinationPath(); + const char* GetDestinationPath(); /* Returns zero-based current disk number */ ULONG GetCurrentDiskNumber(); /* Opens the current cabinet file */ @@ -359,13 +367,13 @@ public: /* Locates the next file in the current cabinet file */ ULONG FindNext(PCAB_SEARCH Search); /* Extracts a file from the current cabinet file */ - ULONG ExtractFile(char* FileName); + ULONG ExtractFile(const char* FileName); /* Select codec engine to use */ void SelectCodec(LONG Id); /* Returns whether a codec engine is selected */ bool IsCodecSelected(); /* Adds a search criteria for adding files to a simple cabinet, displaying files in a cabinet or extracting them */ - ULONG AddSearchCriteria(char* SearchCriteria); + ULONG AddSearchCriteria(const char* SearchCriteria); /* Destroys the search criteria list */ void DestroySearchCriteria(); /* Returns whether we have search criteria */ @@ -375,7 +383,7 @@ public: /* Creates a simple cabinet based on the search criteria data */ bool CreateSimpleCabinet(); /* Sets the codec to use for compression (based on a string value) */ - bool SetCompressionCodec(char* CodecName); + bool SetCompressionCodec(const char* CodecName); /* Creates a new cabinet file */ ULONG NewCabinet(); /* Forces a new disk to be created */ @@ -401,14 +409,16 @@ public: /* Default event handlers */ /* Handler called when a file is about to be overridden */ - virtual bool OnOverwrite(PCFFILE Entry, char* FileName); + virtual bool OnOverwrite(PCFFILE Entry, const char* FileName); /* Handler called when a file is about to be extracted */ - virtual void OnExtract(PCFFILE Entry, char* FileName); + virtual void OnExtract(PCFFILE Entry, const char* FileName); /* Handler called when a new disk is to be processed */ - virtual void OnDiskChange(char* CabinetName, char* DiskLabel); + virtual void OnDiskChange(const char* CabinetName, const char* DiskLabel); + + virtual void OnVerboseMessage(const char* Message); #ifndef CAB_READ_ONLY /* Handler called when a file is about to be added */ - virtual void OnAdd(PCFFILE Entry, char* FileName); + virtual void OnAdd(PCFFILE Entry, const char* FileName); /* Handler called when a cabinet need a name */ virtual bool OnCabinetName(ULONG Number, char* Name); /* Handler called when a disk needs a label */ @@ -417,7 +427,7 @@ public: private: PCFFOLDER_NODE LocateFolderNode(ULONG Index); ULONG GetAbsoluteOffset(PCFFILE_NODE File); - ULONG LocateFile(char* FileName, PCFFILE_NODE *File); + ULONG LocateFile(const char* FileName, PCFFILE_NODE *File); ULONG ReadString(char* String, LONG MaxLength); ULONG ReadFileTable(); ULONG ReadDataBlocks(PCFFOLDER_NODE FolderNode); @@ -431,7 +441,7 @@ private: void DestroyDeletedFolderNodes(); ULONG ComputeChecksum(void* Buffer, ULONG Size, ULONG Seed); ULONG ReadBlock(void* Buffer, ULONG Size, PULONG BytesRead); - bool MatchFileNamePattern(char* FileName, char* Pattern); + bool MatchFileNamePattern(const char* FileName, const char* Pattern); #ifndef CAB_READ_ONLY ULONG InitCabinetHeader(); ULONG WriteCabinetHeader(bool MoreDisks); @@ -459,8 +469,8 @@ private: ULONG FolderUncompSize; // Uncompressed size of folder ULONG BytesLeftInBlock; // Number of bytes left in current block bool ReuseBlock; - char DestPath[PATH_MAX]; - char CabinetReservedFile[PATH_MAX]; + std::string DestPath; + std::string CabinetReservedFile; void* CabinetReservedFileBuffer; ULONG CabinetReservedFileSize; FILE* FileHandle; diff --git a/sdk/tools/cabman/main.cxx b/sdk/tools/cabman/cabman.cxx similarity index 96% rename from sdk/tools/cabman/main.cxx rename to sdk/tools/cabman/cabman.cxx index ab7b7c77a53..0dd0ceaab1d 100644 --- a/sdk/tools/cabman/main.cxx +++ b/sdk/tools/cabman/cabman.cxx @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS cabinet manager - * FILE: tools/cabman/main.cxx + * FILE: tools/cabman/cabman.cxx * PURPOSE: Main program * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Colin Finck <mail(a)colinfinck.de> @@ -452,7 +452,7 @@ bool CCABManager::DisplayCabinet() printf("%s ", Attr2Str(Str, Search.File->Attributes)); sprintf(Str, "%u", (UINT)Search.File->FileSize); printf("%s ", Pad(Str, ' ', 13)); - printf("%s\n", Search.FileName); + printf("%s\n", Search.FileName.c_str()); FileCount++; ByteCount += Search.File->FileSize; @@ -513,7 +513,7 @@ bool CCABManager::ExtractFromCabinet() { do { - switch (Status = ExtractFile(Search.FileName)) + switch (Status = ExtractFile(Search.FileName.c_str())) { case CAB_STATUS_SUCCESS: break; @@ -589,7 +589,7 @@ bool CCABManager::Run() /* Event handlers */ bool CCABManager::OnOverwrite(PCFFILE File, - char* FileName) + const char* FileName) /* * FUNCTION: Called when extracting a file and it already exists * ARGUMENTS: @@ -608,7 +608,7 @@ bool CCABManager::OnOverwrite(PCFFILE File, void CCABManager::OnExtract(PCFFILE File, - char* FileName) + const char* FileName) /* * FUNCTION: Called just before extracting a file * ARGUMENTS: @@ -624,8 +624,8 @@ void CCABManager::OnExtract(PCFFILE File, -void CCABManager::OnDiskChange(char* CabinetName, - char* DiskLabel) +void CCABManager::OnDiskChange(const char* CabinetName, + const char* DiskLabel) /* * FUNCTION: Called when a new disk is to be processed * ARGUMENTS: @@ -641,7 +641,7 @@ void CCABManager::OnDiskChange(char* CabinetName, void CCABManager::OnAdd(PCFFILE File, - char* FileName) + const char* FileName) /* * FUNCTION: Called just before adding a file to a cabinet * ARGUMENTS: @@ -655,7 +655,13 @@ void CCABManager::OnAdd(PCFFILE File, } } -CCABManager CABMgr; +void CCABManager::OnVerboseMessage(const char* Message) +{ + if (Verbose) + { + printf("%s", Message); + } +} int main(int argc, char * argv[]) /* @@ -665,11 +671,12 @@ int main(int argc, char * argv[]) * argv = Pointer to list of command line arguments */ { - bool status = false; + CCABManager CABMgr; - if (CABMgr.ParseCmdline(argc, argv)) status = CABMgr.Run(); + if (!CABMgr.ParseCmdline(argc, argv)) + return false; - return (status ? 0 : 1); + return CABMgr.Run() ? 0 : 1; } /* EOF */ diff --git a/sdk/tools/cabman/cabman.h b/sdk/tools/cabman/cabman.h index a4160275a71..fa1478e13a9 100644 --- a/sdk/tools/cabman/cabman.h +++ b/sdk/tools/cabman/cabman.h @@ -31,11 +31,14 @@ private: bool CreateCabinet(); bool DisplayCabinet(); bool ExtractFromCabinet(); + /* Event handlers */ - virtual bool OnOverwrite(PCFFILE File, char* FileName); - virtual void OnExtract(PCFFILE File, char* FileName); - virtual void OnDiskChange(char* CabinetName, char* DiskLabel); - virtual void OnAdd(PCFFILE Entry, char* FileName); + virtual bool OnOverwrite(PCFFILE File, const char* FileName) override; + virtual void OnExtract(PCFFILE File, const char* FileName) override; + virtual void OnDiskChange(const char* CabinetName, const char* DiskLabel) override; + virtual void OnAdd(PCFFILE Entry, const char* FileName) override; + virtual void OnVerboseMessage(const char* Message) override; + /* Configuration */ bool ProcessAll; ULONG Mode; @@ -44,6 +47,5 @@ private: bool Verbose; }; -extern CCABManager CABMgr; /* EOF */ diff --git a/sdk/tools/cabman/dfp.cxx b/sdk/tools/cabman/dfp.cxx index e78211a06c6..b6b4335e59a 100644 --- a/sdk/tools/cabman/dfp.cxx +++ b/sdk/tools/cabman/dfp.cxx @@ -45,8 +45,6 @@ CDFParser::CDFParser() InfModeEnabled = false; InfFileHandle = NULL; - - strcpy(FileRelativePath, ""); } CDFParser::~CDFParser() @@ -65,21 +63,21 @@ CDFParser::~CDFParser() while (CNNext != NULL) { CNPrev = CNNext->Next; - free(CNNext); + delete CNNext; CNNext = CNPrev; } CNNext = DiskLabel; while (CNNext != NULL) { CNPrev = CNNext->Next; - free(CNNext); + delete CNNext; CNNext = CNPrev; } DNNext = MaxDiskSize; while (DNNext != NULL) { DNPrev = DNNext->Next; - free(DNNext); + delete DNNext; DNNext = DNPrev; } @@ -91,7 +89,7 @@ void CDFParser::WriteInfLine(char* InfLine) { char buf[PATH_MAX]; char eolbuf[2]; - char* destpath; + const char* destpath; if (DontGenerateInf) return; @@ -316,10 +314,7 @@ ULONG CDFParser::Parse() if (!InfFileOnly) { - if (CABMgr.IsVerbose()) - { - printf("Writing cabinet. This may take a while...\n"); - } + OnVerboseMessage("Writing cabinet. This may take a while...\n"); if (DiskCreated) { @@ -343,10 +338,7 @@ ULONG CDFParser::Parse() } } - if (CABMgr.IsVerbose()) - { - printf("Done.\n"); - } + OnVerboseMessage("Done.\n"); } return CAB_STATUS_SUCCESS; @@ -360,10 +352,9 @@ void CDFParser::SetFileRelativePath(char* Path) * Path = Pointer to string with path */ { - strcpy(FileRelativePath, Path); - ConvertPath(FileRelativePath, false); - if (strlen(FileRelativePath) > 0) - NormalizePath(FileRelativePath, PATH_MAX); + FileRelativePath = Path; + ConvertPath(FileRelativePath); + NormalizePath(FileRelativePath); } @@ -498,7 +489,7 @@ bool CDFParser::SetDiskName(PCABINET_NAME *List, ULONG Number, char* String) CN = CN->Next; } - CN = (PCABINET_NAME)malloc(sizeof(CABINET_NAME)); + CN = new CABINET_NAME; if (!CN) return false; @@ -564,7 +555,7 @@ bool CDFParser::SetDiskNumber(PDISK_NUMBER *List, ULONG Number, ULONG Value) DN = DN->Next; } - DN = (PDISK_NUMBER)malloc(sizeof(DISK_NUMBER)); + DN = new DISK_NUMBER; if (!DN) return false; @@ -1135,7 +1126,7 @@ ULONG CDFParser::PerformFileCopy() Status = AddFile(SrcName); if (Status == CAB_STATUS_CANNOT_OPEN) { - strcpy(SrcName, FileRelativePath); + strcpy(SrcName, FileRelativePath.c_str()); strcat(SrcName, BaseFilename); Status = AddFile(SrcName); } diff --git a/sdk/tools/cabman/dfp.h b/sdk/tools/cabman/dfp.h index 1c509715fbc..226bb89996c 100644 --- a/sdk/tools/cabman/dfp.h +++ b/sdk/tools/cabman/dfp.h @@ -69,11 +69,11 @@ public: void SetFileRelativePath(char* Path); bool InfFileOnly; bool DontGenerateInf; - char FileRelativePath[300]; + std::string FileRelativePath; private: /* Event handlers */ - virtual bool OnDiskLabel(ULONG Number, char* Label); - virtual bool OnCabinetName(ULONG Number, char* Name); + virtual bool OnDiskLabel(ULONG Number, char* Label) override; + virtual bool OnCabinetName(ULONG Number, char* Name) override; void WriteInfLine(char* InfLine); bool SetDiskName(PCABINET_NAME *List, ULONG Number, char* String); diff --git a/sdk/tools/cabman/mszip.h b/sdk/tools/cabman/mszip.h index 5b43d8170e5..2fffed7bfc0 100644 --- a/sdk/tools/cabman/mszip.h +++ b/sdk/tools/cabman/mszip.h @@ -26,12 +26,12 @@ public: virtual ULONG Compress(void* OutputBuffer, void* InputBuffer, ULONG InputLength, - PULONG OutputLength); + PULONG OutputLength) override; /* Uncompresses a data block */ virtual ULONG Uncompress(void* OutputBuffer, void* InputBuffer, ULONG InputLength, - PULONG OutputLength); + PULONG OutputLength) override; private: int Status; z_stream ZStream; /* Zlib stream */ diff --git a/sdk/tools/cabman/raw.h b/sdk/tools/cabman/raw.h index dfbc2ae2eb2..082431177f8 100644 --- a/sdk/tools/cabman/raw.h +++ b/sdk/tools/cabman/raw.h @@ -23,12 +23,12 @@ public: virtual ULONG Compress(void* OutputBuffer, void* InputBuffer, ULONG InputLength, - PULONG OutputLength); + PULONG OutputLength) override; /* Uncompresses a data block */ virtual ULONG Uncompress(void* OutputBuffer, void* InputBuffer, ULONG InputLength, - PULONG OutputLength); + PULONG OutputLength) override; }; /* EOF */

4 years

[reactos] 01/01: [ATL][ATL_APITEST] Add CString::Tokenize + testcase

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=58092fb4da352491e2f87… commit 58092fb4da352491e2f87fecc52ff5a652ab6669 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Sep 6 21:30:23 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Sep 7 22:13:43 2020 +0200 [ATL][ATL_APITEST] Add CString::Tokenize + testcase --- modules/rostests/apitests/atl/CString.cpp | 3 ++ modules/rostests/apitests/atl/CString.inl | 87 +++++++++++++++++++++++++++++++ sdk/lib/atl/cstringt.h | 64 +++++++++++++++++++++++ 3 files changed, 154 insertions(+) diff --git a/modules/rostests/apitests/atl/CString.cpp b/modules/rostests/apitests/atl/CString.cpp index 89782499521..fdb9d55020f 100644 --- a/modules/rostests/apitests/atl/CString.cpp +++ b/modules/rostests/apitests/atl/CString.cpp @@ -190,4 +190,7 @@ START_TEST(CString) test_bstrW(); test_bstrA(); + + test_tokenizeW(); + test_tokenizeA(); } diff --git a/modules/rostests/apitests/atl/CString.inl b/modules/rostests/apitests/atl/CString.inl index 193d8d40ba7..c0d661cfb8e 100644 --- a/modules/rostests/apitests/atl/CString.inl +++ b/modules/rostests/apitests/atl/CString.inl @@ -439,3 +439,90 @@ TEST_NAMEX(bstr) ::SysFreeString(bstr); } } + +TEST_NAMEX(tokenize) +{ + CStringX str(_X("%#First Second#Third")); + const XCHAR* Tokens = _X("% #"); + CStringX res; + + int nCurPos = 0; + + // All 'current' tokens are skipped + res = str.Tokenize(Tokens, nCurPos); + ok(res == _X("First"), "Expected str to be 'First', was: %s\n", dbgstrx(res)); + ok_dec(nCurPos, 8); + + res = str.Tokenize(Tokens, nCurPos); + ok(res == _X("Second"), "Expected str to be 'Second', was: %s\n", dbgstrx(res)); + ok_dec(nCurPos, 15); + + res = str.Tokenize(Tokens, nCurPos); + ok(res == _X("Third"), "Expected str to be 'Third', was: %s\n", dbgstrx(res)); + ok_dec(nCurPos, 21); + + // The final 'token' is empty, and nCurPos is set to -1 + // (Calling with nCurPos=-1 will assert) + res = str.Tokenize(Tokens, nCurPos); + ok(res == _X(""), "Expected str to be '', was: %s\n", dbgstrx(res)); + ok_dec(nCurPos, -1); + + str =_X("StartWithToken#%#"); + nCurPos = 0; + + res = str.Tokenize(Tokens, nCurPos); + ok(res == _X("StartWithToken"), "Expected str to be 'StartWithToken', was: %s\n", dbgstrx(res)); + ok_dec(nCurPos, 15); + + // Ending with tokens acts as if there were no tokens at the end + res = str.Tokenize(Tokens, nCurPos); + ok(res == _X(""), "Expected str to be '', was: %s\n", dbgstrx(res)); + ok_dec(nCurPos, -1); + + + str = _X(""); + nCurPos = 0; + + // Calling with an empty string returns 'no tokens' + res = str.Tokenize(Tokens, nCurPos); + ok(res == _X(""), "Expected str to be '', was: %s\n", dbgstrx(res)); + ok_dec(nCurPos, -1); + + str = _X(""); + nCurPos = 20; + + // Calling with a current position outside the strings acts the same as 'no tokens left' + res = str.Tokenize(Tokens, nCurPos); + ok(res == _X(""), "Expected str to be '', was: %s\n", dbgstrx(res)); + ok_dec(nCurPos, -1); + + + str = _X("test"); + nCurPos = 2; + + // Calling with a NULL pszTokens returns a substring starting at 'nCurPos', but not updating nCurPos! + res = str.Tokenize(NULL, nCurPos); + ok(res == _X("st"), "Expected str to be 'st', was: %s\n", dbgstrx(res)); + ok_dec(nCurPos, 2); + + + // Calling with an empty pszTokens behaves exactly the same + res = str.Tokenize(_X(""), nCurPos); + ok(res == _X("st"), "Expected str to be 'st', was: %s\n", dbgstrx(res)); + ok_dec(nCurPos, 2); + + nCurPos = 8; + + // Calling with a NULL pszTokens and an nCurPos out of bounds returns 'no tokens left' + res = str.Tokenize(NULL, nCurPos); + ok(res == _X(""), "Expected str to be '', was: %s\n", dbgstrx(res)); + ok_dec(nCurPos, -1); + + nCurPos = 8; + + // Calling with an empty pszTokens behaves exactly the same + res = str.Tokenize(_X(""), nCurPos); + ok(res == _X(""), "Expected str to be 'st', was: %s\n", dbgstrx(res)); + ok(res == _X(""), "Expected str to be '', was: %s\n", dbgstrx(res)); + ok_dec(nCurPos, -1); +} diff --git a/sdk/lib/atl/cstringt.h b/sdk/lib/atl/cstringt.h index ad89dc6270a..0afe3f4763f 100644 --- a/sdk/lib/atl/cstringt.h +++ b/sdk/lib/atl/cstringt.h @@ -140,6 +140,20 @@ public: return ::_wcsicmp(psz1, psz2); } + static int __cdecl StringSpanIncluding( + _In_z_ LPCWSTR pszBlock, + _In_z_ LPCWSTR pszSet) + { + return (int)::wcsspn(pszBlock, pszSet); + } + + static int __cdecl StringSpanExcluding( + _In_z_ LPCWSTR pszBlock, + _In_z_ LPCWSTR pszSet) + { + return (int)::wcscspn(pszBlock, pszSet); + } + static int __cdecl FormatV( _In_opt_z_ LPWSTR pszDest, _In_z_ LPCWSTR pszFormat, @@ -289,6 +303,20 @@ public: return ::_stricmp(psz1, psz2); } + static int __cdecl StringSpanIncluding( + _In_z_ LPCSTR pszBlock, + _In_z_ LPCSTR pszSet) + { + return (int)::strspn(pszBlock, pszSet); + } + + static int __cdecl StringSpanExcluding( + _In_z_ LPCSTR pszBlock, + _In_z_ LPCSTR pszSet) + { + return (int)::strcspn(pszBlock, pszSet); + } + static int __cdecl FormatV( _In_opt_z_ LPSTR pszDest, _In_z_ LPCSTR pszFormat, @@ -804,6 +832,42 @@ public: } + CStringT Tokenize(_In_z_ PCXSTR pszTokens, _Inout_ int& iStart) const + { + ATLASSERT(iStart >= 0); + + if (iStart < 0) + AtlThrow(E_INVALIDARG); + + if (!pszTokens || !pszTokens[0]) + { + if (iStart < CThisSimpleString::GetLength()) + { + return Mid(iStart); + } + iStart = -1; + return CStringT(); + } + + if (iStart < CThisSimpleString::GetLength()) + { + int iRangeOffset = StringTraits::StringSpanIncluding(CThisSimpleString::GetString() + iStart, pszTokens); + + if (iRangeOffset + iStart < CThisSimpleString::GetLength()) + { + int iNewStart = iStart + iRangeOffset; + int nCount = StringTraits::StringSpanExcluding(CThisSimpleString::GetString() + iNewStart, pszTokens); + + iStart = iNewStart + nCount + 1; + + return Mid(iNewStart, nCount); + } + } + + iStart = -1; + return CStringT(); + } + static PCXSTR DefaultTrimChars() { static XCHAR str[] = { ' ', '\t', '\r', '\n', 0 };

4 years

[reactos] 01/01: [SDK][NDK][PSTYPES] Fix regressions CORE-17247 & CORE-17248

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=abbe656407b7ff56d902c… commit abbe656407b7ff56d902c3f970d618eb269b9753 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Mon Sep 7 20:32:00 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Mon Sep 7 20:32:00 2020 +0200 [SDK][NDK][PSTYPES] Fix regressions CORE-17247 & CORE-17248 By reverting the guilty rev 0.4.14-dev-1239-g 7481bda679eccdf1eba3666e500074dcb966e748 and placing a C_ASSERT() to protect us from doing the same fault again in the future. (proposed by Mark Jansen) This will allow again to use kernel32.dll from 2k3sp2 to reach desktop and it will allow Google Earth to run again. Unfortunately it will break CORE-16757 again, but we did not ship that improvement yet and we believe that revert to be correct. When approaching CORE-16757 later, make sure to double-check also CORE-17247 & CORE-17248 with your fix. We did excessive testing here, see https://jira.reactos.org/browse/CORE-17247?focusedCommentId=125166&page=com… --- sdk/include/ndk/pstypes.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdk/include/ndk/pstypes.h b/sdk/include/ndk/pstypes.h index 55839aca37a..d10199097a3 100644 --- a/sdk/include/ndk/pstypes.h +++ b/sdk/include/ndk/pstypes.h @@ -910,12 +910,15 @@ typedef struct _PROCESS_SESSION_INFORMATION #endif -typedef struct DECLSPEC_ALIGN(4) _PROCESS_PRIORITY_CLASS +typedef struct _PROCESS_PRIORITY_CLASS { BOOLEAN Foreground; UCHAR PriorityClass; } PROCESS_PRIORITY_CLASS, *PPROCESS_PRIORITY_CLASS; +// Compatibility with windows, see CORE-16757, CORE-17106, CORE-17247 +C_ASSERT(sizeof(PROCESS_PRIORITY_CLASS) == 2); + typedef struct _PROCESS_FOREGROUND_BACKGROUND { BOOLEAN Foreground;

4 years

← Newer
1
...
31
32
33
34
35
36
37
38
39
Older →

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 September 2020