Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [NTOSKRNL] When marking a VACB dirty on unmap/unpin, use CcRosMarkDirtyVacb(). This should help reducing race conditions with lazy writer, and thus reduce random BSODs.
by Pierre Schweitzer 27 Jan '18

27 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a3d78067abce395b79065… commit a3d78067abce395b7906598da0d85c20abd49d59 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Jan 27 10:57:50 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Jan 27 10:59:27 2018 +0100 [NTOSKRNL] When marking a VACB dirty on unmap/unpin, use CcRosMarkDirtyVacb(). This should help reducing race conditions with lazy writer, and thus reduce random BSODs. CORE-14263 --- ntoskrnl/cc/view.c | 50 ++++++++++++++++++++++---------------------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 0340c68407..706623b0a5 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -517,26 +517,25 @@ CcRosReleaseVacb ( BOOLEAN Mapped) { BOOLEAN WasDirty; - KIRQL oldIrql; ASSERT(SharedCacheMap); DPRINT("CcRosReleaseVacb(SharedCacheMap 0x%p, Vacb 0x%p, Valid %u)\n", SharedCacheMap, Vacb, Valid); - KeAcquireGuardedMutex(&ViewLock); - KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql); - Vacb->Valid = Valid; - WasDirty = Vacb->Dirty; - Vacb->Dirty = Vacb->Dirty || Dirty; - - if (!WasDirty && Vacb->Dirty) + WasDirty = FALSE; + if (Dirty) { - InsertTailList(&DirtyVacbListHead, &Vacb->DirtyVacbListEntry); - CcTotalDirtyPages += VACB_MAPPING_GRANULARITY / PAGE_SIZE; - Vacb->SharedCacheMap->DirtyPages += VACB_MAPPING_GRANULARITY / PAGE_SIZE; + if (!Vacb->Dirty && Dirty) + { + CcRosMarkDirtyVacb(Vacb); + } + else + { + WasDirty = TRUE; + } } if (Mapped) @@ -553,8 +552,6 @@ CcRosReleaseVacb ( CcRosVacbIncRefCount(Vacb); } - KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); - KeReleaseGuardedMutex(&ViewLock); CcRosReleaseVacbLock(Vacb); return STATUS_SUCCESS; @@ -676,7 +673,6 @@ CcRosUnmapVacb ( { PROS_VACB Vacb; BOOLEAN WasDirty; - KIRQL oldIrql; ASSERT(SharedCacheMap); @@ -689,21 +685,21 @@ CcRosUnmapVacb ( return STATUS_UNSUCCESSFUL; } - KeAcquireGuardedMutex(&ViewLock); - KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql); - - WasDirty = Vacb->Dirty; - Vacb->Dirty = Vacb->Dirty || NowDirty; - - Vacb->MappedCount--; - - if (!WasDirty && NowDirty) + WasDirty = FALSE; + if (NowDirty) { - InsertTailList(&DirtyVacbListHead, &Vacb->DirtyVacbListEntry); - CcTotalDirtyPages += VACB_MAPPING_GRANULARITY / PAGE_SIZE; - Vacb->SharedCacheMap->DirtyPages += VACB_MAPPING_GRANULARITY / PAGE_SIZE; + if (!Vacb->Dirty && NowDirty) + { + CcRosMarkDirtyVacb(Vacb); + } + else + { + WasDirty = TRUE; + } } + Vacb->MappedCount--; + CcRosVacbDecRefCount(Vacb); if (!WasDirty && NowDirty) { @@ -714,8 +710,6 @@ CcRosUnmapVacb ( CcRosVacbDecRefCount(Vacb); } - KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); - KeReleaseGuardedMutex(&ViewLock); CcRosReleaseVacbLock(Vacb); return STATUS_SUCCESS;

1 0

01/01: [KMTEST] TcpIpConnect: Fix harmless typos (#299)
by Serge Gautherie 27 Jan '18

27 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1971137a5fe7ba52ac816… commit 1971137a5fe7ba52ac8166c8282fd71f6ce7069f Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Jan 27 10:50:10 2018 +0100 Commit: Alexander Shaposhnikov <sanchaez(a)reactos.org> CommitDate: Sat Jan 27 11:50:10 2018 +0200 [KMTEST] TcpIpConnect: Fix harmless typos (#299) - 1 s/ok_bool_true/ok/, overkill though harmless. - 1 s/ntohs/htons/, typo though harmless. ROSTESTS-274 --- modules/rostests/kmtests/tcpip/TcpIp_user.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/kmtests/tcpip/TcpIp_user.c b/modules/rostests/kmtests/tcpip/TcpIp_user.c index cf699810a0..7d9fb562a9 100644 --- a/modules/rostests/kmtests/tcpip/TcpIp_user.c +++ b/modules/rostests/kmtests/tcpip/TcpIp_user.c @@ -57,7 +57,7 @@ AcceptProc( ok(Error == 0, ""); ListenSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - ok_bool_true(ListenSocket != INVALID_SOCKET, "socket failed"); + ok(ListenSocket != INVALID_SOCKET, "socket failed"); ZeroMemory(&ListenAddress, sizeof(ListenAddress)); ListenAddress.sin_addr.S_un.S_addr = inet_addr("127.0.0.1"); @@ -77,7 +77,7 @@ AcceptProc( ok(AcceptSocket != INVALID_SOCKET, "\n"); ok_eq_long(AcceptAddressLength, sizeof(AcceptAddress)); ok_eq_hex(AcceptAddress.sin_addr.S_un.S_addr, inet_addr("127.0.0.1")); - ok_eq_hex(AcceptAddress.sin_port, ntohs(TEST_CONNECT_CLIENT_PORT)); + ok_eq_hex(AcceptAddress.sin_port, htons(TEST_CONNECT_CLIENT_PORT)); return 0; }

1 0

02/02: [CABMAN] Move CCFDATAStorage class to a separate file
by Dmitry Bagdanov 27 Jan '18

27 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=991d33c5d1a9bb3b21c86… commit 991d33c5d1a9bb3b21c860d830231886869ce09c Author: Dmitry Bagdanov <dimbo_job(a)mail.ru> AuthorDate: Fri Jan 26 22:46:35 2018 +0700 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Jan 27 10:42:05 2018 +0100 [CABMAN] Move CCFDATAStorage class to a separate file --- sdk/tools/cabman/CCFDATAStorage.cxx | 198 ++++++++++++++++++++++++++++++++++++ sdk/tools/cabman/CMakeLists.txt | 3 +- sdk/tools/cabman/cabinet.cxx | 172 ------------------------------- 3 files changed, 200 insertions(+), 173 deletions(-) diff --git a/sdk/tools/cabman/CCFDATAStorage.cxx b/sdk/tools/cabman/CCFDATAStorage.cxx new file mode 100644 index 0000000000..1d7ef5e64f --- /dev/null +++ b/sdk/tools/cabman/CCFDATAStorage.cxx @@ -0,0 +1,198 @@ +/* + * PROJECT: ReactOS cabinet manager + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: CCFDATAStorage class implementation for Linux/Unix + * 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> + */ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/stat.h> +#include <sys/types.h> + +#if !defined(_WIN32) +#include <dirent.h> +#endif + +#include "cabinet.h" +#include "raw.h" +#include "mszip.h" + +#if !defined(CAB_READ_ONLY) + + /** + * @name CCFDATAStorage class + * @implemented + * + * Default constructor + */ +CCFDATAStorage::CCFDATAStorage() +{ + FileHandle = NULL; +} + +/** +* @name CCFDATAStorage class +* @implemented +* +* Default destructor +*/ +CCFDATAStorage::~CCFDATAStorage() +{ + ASSERT(FileHandle == NULL); +} + +/** +* @name CCFDATAStorage class +* @implemented +* +* Creates the file +* +* @return +* Status of operation +*/ +ULONG CCFDATAStorage::Create() +{ + if ((FileHandle = tmpfile()) == NULL) + return CAB_STATUS_CANNOT_CREATE; + + return CAB_STATUS_SUCCESS; +} + +/** +* @name CCFDATAStorage class +* @implemented +* +* Destroys the file +* +* @return +* Status of operation +*/ +ULONG CCFDATAStorage::Destroy() +{ + ASSERT(FileHandle != NULL); + + fclose(FileHandle); + + FileHandle = NULL; + + return CAB_STATUS_SUCCESS; +} + +/** +* @name CCFDATAStorage class +* @implemented +* +* Truncate the scratch file to zero bytes +* +* @return +* Status of operation +*/ +ULONG CCFDATAStorage::Truncate() +{ + fclose(FileHandle); + FileHandle = tmpfile(); + if (FileHandle == NULL) + { + DPRINT(MID_TRACE, ("ERROR '%i'.\n", errno)); + return CAB_STATUS_FAILURE; + } + + return CAB_STATUS_SUCCESS; +} + +/** +* @name CCFDATAStorage class +* @implemented +* +* Returns current position in file +* +* @return +* Current position +*/ +ULONG CCFDATAStorage::Position() +{ + return (ULONG)ftell(FileHandle); +} + + +/** +* @name CCFDATAStorage class +* @implemented +* +* Seeks to an absolute position +* +* @param Position +* Absolute position to seek to +* +* @return +* Status of operation +*/ +ULONG CCFDATAStorage::Seek(LONG Position) +{ + if (fseek(FileHandle, (off_t)Position, SEEK_SET) != 0) + return CAB_STATUS_FAILURE; + else + return CAB_STATUS_SUCCESS; +} + + +/** +* @name CCFDATAStorage class +* @implemented +* +* Reads a CFDATA block from the file +* +* @param Data +* Pointer to CFDATA block for the buffer +* +* @param Buffer +* Pointer to buffer to store data read +* +* @param BytesRead +* Pointer to buffer to write number of bytes read +* +* @return +* Status of operation +*/ +ULONG CCFDATAStorage::ReadBlock(PCFDATA Data, void* Buffer, PULONG BytesRead) +{ + *BytesRead = fread(Buffer, 1, Data->CompSize, FileHandle); + if (*BytesRead != Data->CompSize) + return CAB_STATUS_CANNOT_READ; + + return CAB_STATUS_SUCCESS; +} + + +/** +* @name CCFDATAStorage class +* @implemented +* +* Writes a CFDATA block to the file +* +* @param Data +* Pointer to CFDATA block for the buffer +* +* @param Buffer +* Pointer to buffer with data to write +* +* @param BytesWritten +* Pointer to buffer to write number of bytes written +* +* @return +* Status of operation +*/ +ULONG CCFDATAStorage::WriteBlock(PCFDATA Data, void* Buffer, PULONG BytesWritten) +{ + *BytesWritten = fwrite(Buffer, 1, Data->CompSize, FileHandle); + if (*BytesWritten != Data->CompSize) + return CAB_STATUS_CANNOT_WRITE; + + return CAB_STATUS_SUCCESS; +} + + +#endif /* CAB_READ_ONLY */ diff --git a/sdk/tools/cabman/CMakeLists.txt b/sdk/tools/cabman/CMakeLists.txt index baf1066ae1..f684c73f35 100644 --- a/sdk/tools/cabman/CMakeLists.txt +++ b/sdk/tools/cabman/CMakeLists.txt @@ -4,7 +4,8 @@ list(APPEND SOURCE dfp.cxx main.cxx mszip.cxx - raw.cxx) + raw.cxx + CCFDATAStorage.cxx) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib) add_host_tool(cabman ${SOURCE}) diff --git a/sdk/tools/cabman/cabinet.cxx b/sdk/tools/cabman/cabinet.cxx index 6fbf84309a..5202404bd8 100644 --- a/sdk/tools/cabman/cabinet.cxx +++ b/sdk/tools/cabman/cabinet.cxx @@ -62,178 +62,6 @@ void DumpBuffer(void* Buffer, ULONG Size) #endif /* DBG */ #endif - /** - * @name CCFDATAStorage class - * @implemented - * - * Default constructor - */ -CCFDATAStorage::CCFDATAStorage() -{ - FileHandle = NULL; -} - -/** -* @name CCFDATAStorage class -* @implemented -* -* Default destructor -*/ -CCFDATAStorage::~CCFDATAStorage() -{ - ASSERT(FileHandle == NULL); -} - -/** -* @name CCFDATAStorage class -* @implemented -* -* Creates the file -* -* @return -* Status of operation -*/ -ULONG CCFDATAStorage::Create() -{ - if ((FileHandle = tmpfile()) == NULL) - return CAB_STATUS_CANNOT_CREATE; - - return CAB_STATUS_SUCCESS; -} - -/** -* @name CCFDATAStorage class -* @implemented -* -* Destroys the file -* -* @return -* Status of operation -*/ -ULONG CCFDATAStorage::Destroy() -{ - ASSERT(FileHandle != NULL); - - fclose(FileHandle); - - FileHandle = NULL; - - return CAB_STATUS_SUCCESS; -} - -/** -* @name CCFDATAStorage class -* @implemented -* -* Truncate the scratch file to zero bytes -* -* @return -* Status of operation -*/ -ULONG CCFDATAStorage::Truncate() -{ - fclose(FileHandle); - FileHandle = tmpfile(); - if (FileHandle == NULL) - { - DPRINT(MID_TRACE, ("ERROR '%i'.\n", errno)); - return CAB_STATUS_FAILURE; - } - - return CAB_STATUS_SUCCESS; -} - -/** -* @name CCFDATAStorage class -* @implemented -* -* Returns current position in file -* -* @return -* Current position -*/ -ULONG CCFDATAStorage::Position() -{ - return (ULONG)ftell(FileHandle); -} - - -/** -* @name CCFDATAStorage class -* @implemented -* -* Seeks to an absolute position -* -* @param Position -* Absolute position to seek to -* -* @return -* Status of operation -*/ -ULONG CCFDATAStorage::Seek(LONG Position) -{ - if (fseek(FileHandle, (off_t)Position, SEEK_SET) != 0) - return CAB_STATUS_FAILURE; - else - return CAB_STATUS_SUCCESS; -} - - -/** -* @name CCFDATAStorage class -* @implemented -* -* Reads a CFDATA block from the file -* -* @param Data -* Pointer to CFDATA block for the buffer -* -* @param Buffer -* Pointer to buffer to store data read -* -* @param BytesRead -* Pointer to buffer to write number of bytes read -* -* @return -* Status of operation -*/ -ULONG CCFDATAStorage::ReadBlock(PCFDATA Data, void* Buffer, PULONG BytesRead) -{ - *BytesRead = fread(Buffer, 1, Data->CompSize, FileHandle); - if (*BytesRead != Data->CompSize) - return CAB_STATUS_CANNOT_READ; - - return CAB_STATUS_SUCCESS; -} - - -/** -* @name CCFDATAStorage class -* @implemented -* -* Writes a CFDATA block to the file -* -* @param Data -* Pointer to CFDATA block for the buffer -* -* @param Buffer -* Pointer to buffer with data to write -* -* @param BytesWritten -* Pointer to buffer to write number of bytes written -* -* @return -* Status of operation -*/ -ULONG CCFDATAStorage::WriteBlock(PCFDATA Data, void* Buffer, PULONG BytesWritten) -{ - *BytesWritten = fwrite(Buffer, 1, Data->CompSize, FileHandle); - if (*BytesWritten != Data->CompSize) - return CAB_STATUS_CANNOT_WRITE; - - return CAB_STATUS_SUCCESS; -} - #endif /* CAB_READ_ONLY */

1 0

01/02: [CABMAN] Remove _WIN32 ifdef's
by Dmitry Bagdanov 27 Jan '18

27 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ae391dd609c33cb1fcce2… commit ae391dd609c33cb1fcce2b6415a371d8a958cc66 Author: Dmitry Bagdanov <dimbo_job(a)mail.ru> AuthorDate: Fri Jan 26 22:44:14 2018 +0700 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Jan 27 10:42:05 2018 +0100 [CABMAN] Remove _WIN32 ifdef's --- sdk/tools/cabman/cabinet.cxx | 783 +++++++++++-------------------------------- sdk/tools/cabman/cabinet.h | 43 +-- sdk/tools/cabman/dfp.cxx | 117 ++----- sdk/tools/cabman/dfp.h | 4 +- sdk/tools/cabman/mszip.cxx | 4 +- 5 files changed, 243 insertions(+), 708 deletions(-) diff --git a/sdk/tools/cabman/cabinet.cxx b/sdk/tools/cabman/cabinet.cxx index 5e951d4968..6fbf84309a 100644 --- a/sdk/tools/cabman/cabinet.cxx +++ b/sdk/tools/cabman/cabinet.cxx @@ -27,39 +27,6 @@ #include "raw.h" #include "mszip.h" -#if defined(_WIN32) -#define GetSizeOfFile(handle) _GetSizeOfFile(handle) -static LONG _GetSizeOfFile(FILEHANDLE handle) -{ - ULONG size = GetFileSize(handle, NULL); - if (size == INVALID_FILE_SIZE) - return -1; - - return size; -} -#define ReadFileData(handle, buffer, size, bytesread) _ReadFileData(handle, buffer, size, bytesread) -static bool _ReadFileData(FILEHANDLE handle, void* buffer, ULONG size, PULONG bytesread) -{ - return ReadFile(handle, buffer, size, (LPDWORD)bytesread, NULL) != 0; -} -#else -#define GetSizeOfFile(handle) _GetSizeOfFile(handle) -static LONG _GetSizeOfFile(FILEHANDLE handle) -{ - LONG size; - fseek(handle, 0, SEEK_END); - size = ftell(handle); - fseek(handle, 0, SEEK_SET); - return size; -} -#define ReadFileData(handle, buffer, size, bytesread) _ReadFileData(handle, buffer, size, bytesread) -static bool _ReadFileData(FILEHANDLE handle, void* buffer, ULONG size, PULONG bytesread) -{ - *bytesread = fread(buffer, 1, size, handle); - return *bytesread == size; -} -#endif - #ifndef CAB_READ_ONLY #if 0 @@ -67,7 +34,7 @@ static bool _ReadFileData(FILEHANDLE handle, void* buffer, ULONG size, PULONG by void DumpBuffer(void* Buffer, ULONG Size) { - FILEHANDLE FileHandle; + HANDLE FileHandle; ULONG BytesWritten; /* Create file, overwrite if it already exists */ @@ -95,110 +62,76 @@ void DumpBuffer(void* Buffer, ULONG Size) #endif /* DBG */ #endif -/* CCFDATAStorage */ - -CCFDATAStorage::CCFDATAStorage() -/* - * FUNCTION: Default constructor + /** + * @name CCFDATAStorage class + * @implemented + * + * Default constructor */ +CCFDATAStorage::CCFDATAStorage() { - FileCreated = false; + FileHandle = NULL; } - +/** +* @name CCFDATAStorage class +* @implemented +* +* Default destructor +*/ CCFDATAStorage::~CCFDATAStorage() -/* - * FUNCTION: Default destructor - */ { - ASSERT(!FileCreated); + ASSERT(FileHandle == NULL); } - +/** +* @name CCFDATAStorage class +* @implemented +* +* Creates the file +* +* @return +* Status of operation +*/ ULONG CCFDATAStorage::Create() -/* - * FUNCTION: Creates the file - * ARGUMENTS: - * FileName = Pointer to name of file - * RETURNS: - * Status of operation - */ { -#if defined(_WIN32) - char tmpPath[MAX_PATH]; -#endif - ASSERT(!FileCreated); - -#if defined(_WIN32) - if (GetTempPath(MAX_PATH, tmpPath) == 0) - return CAB_STATUS_CANNOT_CREATE; - if(GetTempFileName(tmpPath, "cab", 0, FullName) == 0) - return CAB_STATUS_CANNOT_CREATE; - - /* Create file, overwrite if it already exists */ - FileHandle = CreateFile(FullName, // Create this file - GENERIC_READ | GENERIC_WRITE, // Open for reading/writing - 0, // No sharing - NULL, // No security - CREATE_ALWAYS, // Create or overwrite - FILE_FLAG_SEQUENTIAL_SCAN | // Optimize for sequential scans - FILE_FLAG_DELETE_ON_CLOSE | // Delete file when closed - FILE_ATTRIBUTE_TEMPORARY, // Temporary file - NULL); // No attribute template - if (FileHandle == INVALID_HANDLE_VALUE) - { - DPRINT(MID_TRACE, ("ERROR '%u'.\n", (UINT)GetLastError())); - return CAB_STATUS_CANNOT_CREATE; - } -#else /* !_WIN32 */ - /*if (tmpnam(FullName) == NULL)*/ if ((FileHandle = tmpfile()) == NULL) return CAB_STATUS_CANNOT_CREATE; - /* - FileHandle = fopen(FullName, "w+b"); - if (FileHandle == NULL) { - DPRINT(MID_TRACE, ("ERROR '%i'.\n", errno)); - return CAB_STATUS_CANNOT_CREATE; - } - */ -#endif - - FileCreated = true; return CAB_STATUS_SUCCESS; } - +/** +* @name CCFDATAStorage class +* @implemented +* +* Destroys the file +* +* @return +* Status of operation +*/ ULONG CCFDATAStorage::Destroy() -/* - * FUNCTION: Destroys the file - * RETURNS: - * Status of operation - */ { - ASSERT(FileCreated); + ASSERT(FileHandle != NULL); - CloseFile(FileHandle); + fclose(FileHandle); - FileCreated = false; + FileHandle = NULL; return CAB_STATUS_SUCCESS; } - +/** +* @name CCFDATAStorage class +* @implemented +* +* Truncate the scratch file to zero bytes +* +* @return +* Status of operation +*/ ULONG CCFDATAStorage::Truncate() -/* - * FUNCTION: Truncate the scratch file to zero bytes - * RETURNS: - * Status of operation - */ { -#if defined(_WIN32) - if( SetFilePointer(FileHandle, 0, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER ) - return CAB_STATUS_FAILURE; - if (!SetEndOfFile(FileHandle)) - return CAB_STATUS_FAILURE; -#else /* !_WIN32 */ fclose(FileHandle); FileHandle = tmpfile(); if (FileHandle == NULL) @@ -206,95 +139,98 @@ ULONG CCFDATAStorage::Truncate() DPRINT(MID_TRACE, ("ERROR '%i'.\n", errno)); return CAB_STATUS_FAILURE; } -#endif + return CAB_STATUS_SUCCESS; } - +/** +* @name CCFDATAStorage class +* @implemented +* +* Returns current position in file +* +* @return +* Current position +*/ ULONG CCFDATAStorage::Position() -/* - * FUNCTION: Returns current position in file - * RETURNS: - * Current position - */ { -#if defined(_WIN32) - return SetFilePointer(FileHandle, 0, NULL, FILE_CURRENT); -#else return (ULONG)ftell(FileHandle); -#endif } +/** +* @name CCFDATAStorage class +* @implemented +* +* Seeks to an absolute position +* +* @param Position +* Absolute position to seek to +* +* @return +* Status of operation +*/ ULONG CCFDATAStorage::Seek(LONG Position) -/* - * FUNCTION: Seeks to an absolute position - * ARGUMENTS: - * Position = Absolute position to seek to - * RETURNS: - * Status of operation - */ { -#if defined(_WIN32) - if( SetFilePointer(FileHandle, - Position, - NULL, - FILE_BEGIN) == INVALID_SET_FILE_POINTER ) - return CAB_STATUS_FAILURE; - else - return CAB_STATUS_SUCCESS; -#else if (fseek(FileHandle, (off_t)Position, SEEK_SET) != 0) return CAB_STATUS_FAILURE; else return CAB_STATUS_SUCCESS; -#endif } +/** +* @name CCFDATAStorage class +* @implemented +* +* Reads a CFDATA block from the file +* +* @param Data +* Pointer to CFDATA block for the buffer +* +* @param Buffer +* Pointer to buffer to store data read +* +* @param BytesRead +* Pointer to buffer to write number of bytes read +* +* @return +* Status of operation +*/ ULONG CCFDATAStorage::ReadBlock(PCFDATA Data, void* Buffer, PULONG BytesRead) -/* - * FUNCTION: Reads a CFDATA block from the file - * ARGUMENTS: - * Data = Pointer to CFDATA block for the buffer - * Buffer = Pointer to buffer to store data read - * BytesWritten = Pointer to buffer to write number of bytes read - * RETURNS: - * Status of operation - */ { -#if defined(_WIN32) - if (!ReadFile(FileHandle, Buffer, Data->CompSize, (LPDWORD)BytesRead, NULL)) - return CAB_STATUS_CANNOT_READ; -#else - *BytesRead = fread(Buffer, 1, Data->CompSize, FileHandle); if (*BytesRead != Data->CompSize) return CAB_STATUS_CANNOT_READ; -#endif + return CAB_STATUS_SUCCESS; } +/** +* @name CCFDATAStorage class +* @implemented +* +* Writes a CFDATA block to the file +* +* @param Data +* Pointer to CFDATA block for the buffer +* +* @param Buffer +* Pointer to buffer with data to write +* +* @param BytesWritten +* Pointer to buffer to write number of bytes written +* +* @return +* Status of operation +*/ ULONG CCFDATAStorage::WriteBlock(PCFDATA Data, void* Buffer, PULONG BytesWritten) -/* - * FUNCTION: Writes a CFDATA block to the file - * ARGUMENTS: - * Data = Pointer to CFDATA block for the buffer - * Buffer = Pointer to buffer with data to write - * BytesWritten = Pointer to buffer to write number of bytes written - * RETURNS: - * Status of operation - */ { -#if defined(_WIN32) - if (!WriteFile(FileHandle, Buffer, Data->CompSize, (LPDWORD)BytesWritten, NULL)) - return CAB_STATUS_CANNOT_WRITE; -#else *BytesWritten = fwrite(Buffer, 1, Data->CompSize, FileHandle); if (*BytesWritten != Data->CompSize) return CAB_STATUS_CANNOT_WRITE; -#endif + return CAB_STATUS_SUCCESS; } @@ -351,7 +287,7 @@ CCabinet::~CCabinet() { if (CabinetReservedFileBuffer != NULL) { - FreeMemory(CabinetReservedFileBuffer); + free(CabinetReservedFileBuffer); CabinetReservedFileBuffer = NULL; CabinetReservedFileSize = 0; } @@ -530,7 +466,7 @@ ULONG CCabinet::AddSearchCriteria(char* SearchCriteria) PSEARCH_CRITERIA Criteria; // Add the criteria to the list of search criteria - Criteria = (PSEARCH_CRITERIA)AllocateMemory(sizeof(SEARCH_CRITERIA)); + Criteria = (PSEARCH_CRITERIA)malloc(sizeof(SEARCH_CRITERIA)); if(!Criteria) { DPRINT(MIN_TRACE, ("Insufficient memory.\n")); @@ -548,7 +484,7 @@ ULONG CCabinet::AddSearchCriteria(char* SearchCriteria) CriteriaListTail = Criteria; // Set the actual criteria string - Criteria->Search = (char*)AllocateMemory(strlen(SearchCriteria) + 1); + Criteria->Search = (char*)malloc(strlen(SearchCriteria) + 1); if (!Criteria->Search) { DPRINT(MIN_TRACE, ("Insufficient memory.\n")); @@ -574,8 +510,8 @@ void CCabinet::DestroySearchCriteria() { NextCriteria = Criteria->Next; - FreeMemory(Criteria->Search); - FreeMemory(Criteria); + free(Criteria->Search); + free(Criteria); Criteria = NextCriteria; } @@ -632,26 +568,12 @@ bool CCabinet::SetCabinetReservedFile(char* FileName) * FileName = Pointer to string with name of cabinet reserved file */ { - FILEHANDLE FileHandle; + FILE* FileHandle; ULONG BytesRead; char* ConvertedFileName; ConvertedFileName = ConvertPath(FileName, true); -#if defined(_WIN32) - FileHandle = CreateFile(ConvertedFileName, // Open this file - GENERIC_READ, // Open for reading - FILE_SHARE_READ, // Share for reading - NULL, // No security - OPEN_EXISTING, // Existing file only - FILE_ATTRIBUTE_NORMAL, // Normal file - NULL); // No attribute template - free(ConvertedFileName); - if (FileHandle == INVALID_HANDLE_VALUE) - { - DPRINT(MID_TRACE, ("Cannot open cabinet reserved file.\n")); - return false; - } -#else /* !_WIN32 */ + FileHandle = fopen(ConvertedFileName, "rb"); free(ConvertedFileName); if (FileHandle == NULL) @@ -659,7 +581,6 @@ bool CCabinet::SetCabinetReservedFile(char* FileName) DPRINT(MID_TRACE, ("Cannot open cabinet reserved file.\n")); return false; } -#endif CabinetReservedFileSize = GetSizeOfFile(FileHandle); if (CabinetReservedFileSize == (ULONG)-1) @@ -670,24 +591,25 @@ bool CCabinet::SetCabinetReservedFile(char* FileName) if (CabinetReservedFileSize == 0) { - CloseFile(FileHandle); + fclose(FileHandle); return false; } - CabinetReservedFileBuffer = AllocateMemory(CabinetReservedFileSize); + CabinetReservedFileBuffer = malloc(CabinetReservedFileSize); if (!CabinetReservedFileBuffer) { - CloseFile(FileHandle); + fclose(FileHandle); return false; } - if (!ReadFileData(FileHandle, CabinetReservedFileBuffer, CabinetReservedFileSize, &BytesRead)) + BytesRead = fread(CabinetReservedFileBuffer, 1, CabinetReservedFileSize, FileHandle); + if( BytesRead != CabinetReservedFileSize ) { - CloseFile(FileHandle); + fclose(FileHandle); return false; } - CloseFile(FileHandle); + fclose(FileHandle); strcpy(CabinetReservedFile, FileName); @@ -733,32 +655,16 @@ ULONG CCabinet::Open() ULONG BytesRead; ULONG Size; - OutputBuffer = AllocateMemory(CAB_BLOCKSIZE + 12); // This should be enough + OutputBuffer = malloc(CAB_BLOCKSIZE + 12); // This should be enough if (!OutputBuffer) return CAB_STATUS_NOMEMORY; -#if defined(_WIN32) - FileHandle = CreateFile(CabinetName, // Open this file - GENERIC_READ, // Open for reading - FILE_SHARE_READ, // Share for reading - NULL, // No security - OPEN_EXISTING, // Existing file only - FILE_ATTRIBUTE_NORMAL, // Normal file - NULL); // No attribute template - - if (FileHandle == INVALID_HANDLE_VALUE) - { - DPRINT(MID_TRACE, ("Cannot open file.\n")); - return CAB_STATUS_CANNOT_OPEN; - } -#else /* !_WIN32 */ FileHandle = fopen(CabinetName, "rb"); if (FileHandle == NULL) { DPRINT(MID_TRACE, ("Cannot open file.\n")); return CAB_STATUS_CANNOT_OPEN; } -#endif FileOpen = true; @@ -798,19 +704,11 @@ ULONG CCabinet::Open() FolderReserved = (Size >> 16) & 0xFF; DataReserved = (Size >> 24) & 0xFF; -#if defined(_WIN32) - if (SetFilePointer(FileHandle, CabinetReserved, NULL, FILE_CURRENT) == INVALID_SET_FILE_POINTER) - { - DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", (UINT)GetLastError())); - return CAB_STATUS_FAILURE; - } -#else - if (fseek(FileHandle, (off_t)CabinetReserved, SEEK_CUR) != 0) + if (fseek(FileHandle, CabinetReserved, SEEK_CUR) != 0) { DPRINT(MIN_TRACE, ("fseek() failed.\n")); return CAB_STATUS_FAILURE; } -#endif } if ((CABHeader.Flags & CAB_FLAG_HASPREV) > 0) @@ -902,7 +800,7 @@ void CCabinet::Close() { if (FileOpen) { - CloseFile(FileHandle); + fclose(FileHandle); FileOpen = false; } } @@ -1029,7 +927,7 @@ ULONG CCabinet::ExtractFile(char* FileName) ULONG CurrentOffset; PUCHAR Buffer; PUCHAR CurrentBuffer; - FILEHANDLE DestFile; + FILE* DestFile; PCFFILE_NODE File; CFDATA CFData; ULONG Status; @@ -1073,40 +971,6 @@ ULONG CCabinet::ExtractFile(char* FileName) strcat(DestName, FileName); /* Create destination file, fail if it already exists */ -#if defined(_WIN32) - DestFile = CreateFile(DestName, // Create this file - GENERIC_WRITE, // Open for writing - 0, // No sharing - NULL, // No security - CREATE_NEW, // New file only - FILE_ATTRIBUTE_NORMAL, // Normal file - NULL); // No attribute template - if (DestFile == INVALID_HANDLE_VALUE) - { - /* If file exists, ask to overwrite file */ - if (((Status = GetLastError()) == ERROR_FILE_EXISTS) && - (OnOverwrite(&File->File, FileName))) - { - /* Create destination file, overwrite if it already exists */ - DestFile = CreateFile(DestName, // Create this file - GENERIC_WRITE, // Open for writing - 0, // No sharing - NULL, // No security - TRUNCATE_EXISTING, // Truncate the file - FILE_ATTRIBUTE_NORMAL, // Normal file - NULL); // No attribute template - if (DestFile == INVALID_HANDLE_VALUE) - return CAB_STATUS_CANNOT_CREATE; - } - else - { - if (Status == ERROR_FILE_EXISTS) - return CAB_STATUS_FILE_EXISTS; - else - return CAB_STATUS_CANNOT_CREATE; - } - } -#else /* !_WIN32 */ DestFile = fopen(DestName, "rb"); if (DestFile != NULL) { @@ -1127,11 +991,11 @@ ULONG CCabinet::ExtractFile(char* FileName) if (DestFile == NULL) return CAB_STATUS_CANNOT_CREATE; } -#endif + #if defined(_WIN32) if (!DosDateTimeToFileTime(File->File.FileDate, File->File.FileTime, &FileTime)) { - CloseFile(DestFile); + fclose(DestFile); DPRINT(MIN_TRACE, ("DosDateTimeToFileTime() failed (%u).\n", (UINT)GetLastError())); return CAB_STATUS_CANNOT_WRITE; } @@ -1140,12 +1004,13 @@ ULONG CCabinet::ExtractFile(char* FileName) #else //DPRINT(MIN_TRACE, ("FIXME: DosDateTimeToFileTime\n")); #endif + SetAttributesOnFile(DestName, File->File.Attributes); - Buffer = (PUCHAR)AllocateMemory(CAB_BLOCKSIZE + 12); // This should be enough + Buffer = (PUCHAR)malloc(CAB_BLOCKSIZE + 12); // This should be enough if (!Buffer) { - CloseFile(DestFile); + fclose(DestFile); DPRINT(MIN_TRACE, ("Insufficient memory.\n")); return CAB_STATUS_NOMEMORY; } @@ -1154,28 +1019,13 @@ ULONG CCabinet::ExtractFile(char* FileName) OnExtract(&File->File, FileName); /* Search to start of file */ -#if defined(_WIN32) - Offset = SetFilePointer(FileHandle, - File->DataBlock->AbsoluteOffset, - NULL, - FILE_BEGIN); - if (Offset == INVALID_SET_FILE_POINTER) - { - DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", (UINT)GetLastError())); - CloseFile(DestFile); - FreeMemory(Buffer); - return CAB_STATUS_INVALID_CAB; - } -#else if (fseek(FileHandle, (off_t)File->DataBlock->AbsoluteOffset, SEEK_SET) != 0) { DPRINT(MIN_TRACE, ("fseek() failed.\n")); - CloseFile(DestFile); - FreeMemory(Buffer); - return CAB_STATUS_FAILURE; + fclose(DestFile); + free(Buffer); + return CAB_STATUS_INVALID_CAB; } - Offset = ftell(FileHandle); -#endif Size = File->File.FileSize; Offset = File->File.FileOffset; @@ -1205,8 +1055,8 @@ ULONG CCabinet::ExtractFile(char* FileName) if (((Status = ReadBlock(&CFData, sizeof(CFDATA), &BytesRead)) != CAB_STATUS_SUCCESS) || (BytesRead != sizeof(CFDATA))) { - CloseFile(DestFile); - FreeMemory(Buffer); + fclose(DestFile); + free(Buffer); DPRINT(MIN_TRACE, ("Cannot read from file (%u).\n", (UINT)Status)); return CAB_STATUS_INVALID_CAB; } @@ -1226,8 +1076,8 @@ ULONG CCabinet::ExtractFile(char* FileName) if (((Status = ReadBlock(CurrentBuffer, BytesToRead, &BytesRead)) != CAB_STATUS_SUCCESS) || (BytesToRead != BytesRead)) { - CloseFile(DestFile); - FreeMemory(Buffer); + fclose(DestFile); + free(Buffer); DPRINT(MIN_TRACE, ("Cannot read from file (%u).\n", (UINT)Status)); return CAB_STATUS_INVALID_CAB; } @@ -1240,7 +1090,7 @@ ULONG CCabinet::ExtractFile(char* FileName) if (Checksum != CFData.Checksum) { CloseFile(DestFile); - FreeMemory(Buffer); + free(Buffer); DPRINT(MIN_TRACE, ("Bad checksum (is 0x%X, should be 0x%X).\n", Checksum, CFData.Checksum)); return CAB_STATUS_INVALID_CAB; @@ -1255,8 +1105,8 @@ ULONG CCabinet::ExtractFile(char* FileName) { if (strlen(DiskNext) == 0) { - CloseFile(DestFile); - FreeMemory(Buffer); + fclose(DestFile); + free(Buffer); return CAB_STATUS_NOFILE; } @@ -1274,8 +1124,8 @@ ULONG CCabinet::ExtractFile(char* FileName) Status = Open(); if (Status != CAB_STATUS_SUCCESS) { - CloseFile(DestFile); - FreeMemory(Buffer); + fclose(DestFile); + free(Buffer); return Status; } @@ -1285,8 +1135,8 @@ ULONG CCabinet::ExtractFile(char* FileName) if (Status == CAB_STATUS_NOFILE) { DPRINT(MID_TRACE, ("Cannot locate file (%u).\n", (UINT)Status)); - CloseFile(DestFile); - FreeMemory(Buffer); + fclose(DestFile); + free(Buffer); return Status; } @@ -1294,26 +1144,13 @@ ULONG CCabinet::ExtractFile(char* FileName) File->DataBlock = CurrentFolderNode->DataListHead; /* Search to start of file */ -#if defined(_WIN32) - if( SetFilePointer(FileHandle, - File->DataBlock->AbsoluteOffset, - NULL, - FILE_BEGIN) == INVALID_SET_FILE_POINTER ) - { - DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", (UINT)GetLastError())); - CloseFile(DestFile); - FreeMemory(Buffer); - return CAB_STATUS_INVALID_CAB; - } -#else if (fseek(FileHandle, (off_t)File->DataBlock->AbsoluteOffset, SEEK_SET) != 0) { DPRINT(MIN_TRACE, ("fseek() failed.\n")); - CloseFile(DestFile); - FreeMemory(Buffer); + fclose(DestFile); + free(Buffer); return CAB_STATUS_INVALID_CAB; } -#endif DPRINT(MAX_TRACE, ("Continuing extraction of file at uncompressed offset (0x%X) Size (%u bytes) AO (0x%X) UO (0x%X).\n", (UINT)File->File.FileOffset, @@ -1333,8 +1170,8 @@ ULONG CCabinet::ExtractFile(char* FileName) Status = Codec->Uncompress(OutputBuffer, Buffer, TotalBytesRead, &BytesToWrite); if (Status != CS_SUCCESS) { - CloseFile(DestFile); - FreeMemory(Buffer); + fclose(DestFile); + free(Buffer); DPRINT(MID_TRACE, ("Cannot uncompress block.\n")); if (Status == CS_NOMEMORY) return CAB_STATUS_NOMEMORY; @@ -1345,8 +1182,8 @@ ULONG CCabinet::ExtractFile(char* FileName) { DPRINT(MID_TRACE, ("BytesToWrite (%u) != CFData.UncompSize (%d)\n", (UINT)BytesToWrite, CFData.UncompSize)); - CloseFile(DestFile); - FreeMemory(Buffer); + fclose(DestFile); + free(Buffer); return CAB_STATUS_INVALID_CAB; } @@ -1364,8 +1201,8 @@ ULONG CCabinet::ExtractFile(char* FileName) if (((Status = ReadBlock(&CFData, sizeof(CFDATA), &BytesRead)) != CAB_STATUS_SUCCESS) || (BytesRead != sizeof(CFDATA))) { - CloseFile(DestFile); - FreeMemory(Buffer); + fclose(DestFile); + free(Buffer); DPRINT(MIN_TRACE, ("Cannot read from file (%u).\n", (UINT)Status)); return CAB_STATUS_INVALID_CAB; } @@ -1374,28 +1211,14 @@ ULONG CCabinet::ExtractFile(char* FileName) CFData.CompSize, CFData.UncompSize)); /* Go to next data block */ -#if defined(_WIN32) - if( SetFilePointer(FileHandle, - CurrentDataNode->AbsoluteOffset + sizeof(CFDATA) + - CurrentDataNode->Data.CompSize, - NULL, - FILE_BEGIN) == INVALID_SET_FILE_POINTER ) - { - DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", (UINT)GetLastError())); - CloseFile(DestFile); - FreeMemory(Buffer); - return CAB_STATUS_INVALID_CAB; - } -#else if (fseek(FileHandle, (off_t)CurrentDataNode->AbsoluteOffset + sizeof(CFDATA) + CurrentDataNode->Data.CompSize, SEEK_SET) != 0) { DPRINT(MIN_TRACE, ("fseek() failed.\n")); - CloseFile(DestFile); - FreeMemory(Buffer); + fclose(DestFile); + free(Buffer); return CAB_STATUS_INVALID_CAB; } -#endif ReuseBlock = false; } @@ -1417,23 +1240,17 @@ ULONG CCabinet::ExtractFile(char* FileName) (UINT)BytesSkipped, (UINT)Skip, (UINT)Size)); -#if defined(_WIN32) - if (!WriteFile(DestFile, (void*)((PUCHAR)OutputBuffer + BytesSkipped), - BytesToWrite, (LPDWORD)&BytesWritten, NULL) || - (BytesToWrite != BytesWritten)) - { - DPRINT(MIN_TRACE, ("Status 0x%X.\n", (UINT)GetLastError())); -#else BytesWritten = BytesToWrite; if (fwrite((void*)((PUCHAR)OutputBuffer + BytesSkipped), - BytesToWrite, 1, DestFile) < 1) + BytesToWrite, 1, DestFile) < 1) { -#endif - CloseFile(DestFile); - FreeMemory(Buffer); + fclose(DestFile); + free(Buffer); DPRINT(MIN_TRACE, ("Cannot write to file.\n")); + return CAB_STATUS_CANNOT_WRITE; } + Size -= BytesToWrite; CurrentOffset += BytesToWrite; @@ -1443,9 +1260,9 @@ ULONG CCabinet::ExtractFile(char* FileName) } while (Size > 0); } - CloseFile(DestFile); + fclose(DestFile); - FreeMemory(Buffer); + free(Buffer); return CAB_STATUS_SUCCESS; } @@ -1510,8 +1327,8 @@ ULONG CCabinet::NewCabinet() CurrentDiskNumber = 0; - OutputBuffer = AllocateMemory(CAB_BLOCKSIZE + 12); // This should be enough - InputBuffer = AllocateMemory(CAB_BLOCKSIZE + 12); // This should be enough + OutputBuffer = malloc(CAB_BLOCKSIZE + 12); // This should be enough + InputBuffer = malloc(CAB_BLOCKSIZE + 12); // This should be enough if ((!OutputBuffer) || (!InputBuffer)) { DPRINT(MIN_TRACE, ("Insufficient memory.\n")); @@ -1656,28 +1473,12 @@ ULONG CCabinet::WriteFileToScratchStorage(PCFFILE_NODE FileNode) if (!ContinueFile) { /* Try to open file */ -#if defined(_WIN32) - SourceFile = CreateFile( - FileNode->FileName, // Open this file - GENERIC_READ, // Open for reading - FILE_SHARE_READ, // Share for reading - NULL, // No security - OPEN_EXISTING, // File must exist - FILE_ATTRIBUTE_NORMAL, // Normal file - NULL); // No attribute template - if (SourceFile == INVALID_HANDLE_VALUE) - { - DPRINT(MID_TRACE, ("File not found (%s).\n", FileNode->FileName)); - return CAB_STATUS_NOFILE; - } -#else /* !_WIN32 */ SourceFile = fopen(FileNode->FileName, "rb"); if (SourceFile == NULL) { - DPRINT(MID_TRACE, ("Cannot open cabinet reserved file.\n")); + DPRINT(MID_TRACE, ("File not found (%s).\n", FileNode->FileName)); return CAB_STATUS_NOFILE; } -#endif if (CreateNewFolder) { @@ -1717,7 +1518,7 @@ ULONG CCabinet::WriteFileToScratchStorage(PCFFILE_NODE FileNode) else BytesToRead = TotalBytesLeft; - if (!ReadFileData(SourceFile, CurrentIBuffer, BytesToRead, &BytesRead) || (BytesToRead != BytesRead)) + if ( (BytesRead = fread(CurrentIBuffer, 1, BytesToRead, SourceFile)) != BytesToRead ) { DPRINT(MIN_TRACE, ("Cannot read from file. BytesToRead (%u) BytesRead (%u) CurrentIBufferSize (%u).\n", (UINT)BytesToRead, (UINT)BytesRead, (UINT)CurrentIBufferSize)); @@ -1739,7 +1540,7 @@ ULONG CCabinet::WriteFileToScratchStorage(PCFFILE_NODE FileNode) if (TotalBytesLeft == 0) { - CloseFile(SourceFile); + fclose(SourceFile); FileNode->Delete = true; if (FileNode->File.FileControlID > CAB_FILE_MAX_FOLDER) @@ -1870,42 +1671,6 @@ ULONG CCabinet::CommitDisk(ULONG MoreDisks) OnCabinetName(CurrentDiskNumber, CabinetName); /* Create file, fail if it already exists */ -#if defined(_WIN32) - FileHandle = CreateFile(CabinetName, // Create this file - GENERIC_WRITE, // Open for writing - 0, // No sharing - NULL, // No security - CREATE_NEW, // New file only - FILE_ATTRIBUTE_NORMAL, // Normal file - NULL); // No attribute template - if (FileHandle == INVALID_HANDLE_VALUE) - { - ULONG Status; - /* If file exists, ask to overwrite file */ - if (((Status = GetLastError()) == ERROR_FILE_EXISTS) && - (OnOverwrite(NULL, CabinetName))) - { - - /* Create cabinet file, overwrite if it already exists */ - FileHandle = CreateFile(CabinetName, // Create this file - GENERIC_WRITE, // Open for writing - 0, // No sharing - NULL, // No security - TRUNCATE_EXISTING, // Truncate the file - FILE_ATTRIBUTE_NORMAL, // Normal file - NULL); // No attribute template - if (FileHandle == INVALID_HANDLE_VALUE) - return CAB_STATUS_CANNOT_CREATE; - } - else - { - if (Status == ERROR_FILE_EXISTS) - return CAB_STATUS_FILE_EXISTS; - else - return CAB_STATUS_CANNOT_CREATE; - } - } -#else /* !_WIN32 */ FileHandle = fopen(CabinetName, "rb"); if (FileHandle != NULL) { @@ -1927,7 +1692,6 @@ ULONG CCabinet::CommitDisk(ULONG MoreDisks) if (FileHandle == NULL) return CAB_STATUS_CANNOT_CREATE; } -#endif WriteCabinetHeader(MoreDisks != 0); @@ -1953,7 +1717,7 @@ ULONG CCabinet::CommitDisk(ULONG MoreDisks) FolderNode = FolderNode->Next; } - CloseFile(FileHandle); + fclose(FileHandle); ScratchFile->Truncate(); @@ -1994,13 +1758,13 @@ ULONG CCabinet::CloseCabinet() if (InputBuffer) { - FreeMemory(InputBuffer); + free(InputBuffer); InputBuffer = NULL; } if (OutputBuffer) { - FreeMemory(OutputBuffer); + free(OutputBuffer); OutputBuffer = NULL; } @@ -2026,11 +1790,11 @@ ULONG CCabinet::AddFile(char* FileName) * Status of operation */ { - FILEHANDLE SrcFile; + FILE* SrcFile; PCFFILE_NODE FileNode; char* NewFileName; - NewFileName = (char*)AllocateMemory(strlen(FileName) + 1); + NewFileName = (char*)malloc(strlen(FileName) + 1); if (!NewFileName) { DPRINT(MIN_TRACE, ("Insufficient memory.\n")); @@ -2040,37 +1804,20 @@ ULONG CCabinet::AddFile(char* FileName) ConvertPath(NewFileName, false); /* Try to open file */ -#if defined(_WIN32) - SrcFile = CreateFile( - NewFileName, // Open this file - GENERIC_READ, // Open for reading - FILE_SHARE_READ, // Share for reading - NULL, // No security - OPEN_EXISTING, // File must exist - FILE_ATTRIBUTE_NORMAL, // Normal file - NULL); // No attribute template - if (SrcFile == INVALID_HANDLE_VALUE) - { - DPRINT(MID_TRACE, ("File not found (%s).\n", NewFileName)); - FreeMemory(NewFileName); - return CAB_STATUS_CANNOT_OPEN; - } -#else /* !_WIN32 */ SrcFile = fopen(NewFileName, "rb"); if (SrcFile == NULL) { DPRINT(MID_TRACE, ("File not found (%s).\n", NewFileName)); - FreeMemory(NewFileName); + free(NewFileName); return CAB_STATUS_CANNOT_OPEN; } -#endif FileNode = NewFileNode(); if (!FileNode) { DPRINT(MIN_TRACE, ("Insufficient memory.\n")); - FreeMemory(NewFileName); - CloseFile(SrcFile); + free(NewFileName); + fclose(SrcFile); return CAB_STATUS_NOMEMORY; } @@ -2082,25 +1829,25 @@ ULONG CCabinet::AddFile(char* FileName) if (FileNode->File.FileSize == (ULONG)-1) { DPRINT(MIN_TRACE, ("Cannot read from file.\n")); - CloseFile(SrcFile); + fclose(SrcFile); return CAB_STATUS_CANNOT_READ; } if (GetFileTimes(SrcFile, FileNode) != CAB_STATUS_SUCCESS) { DPRINT(MIN_TRACE, ("Cannot read file times.\n")); - CloseFile(SrcFile); + fclose(SrcFile); return CAB_STATUS_CANNOT_READ; } if (GetAttributesOnFile(FileNode) != CAB_STATUS_SUCCESS) { DPRINT(MIN_TRACE, ("Cannot read file attributes.\n")); - CloseFile(SrcFile); + fclose(SrcFile); return CAB_STATUS_CANNOT_READ; } - CloseFile(SrcFile); + fclose(SrcFile); return CAB_STATUS_SUCCESS; } @@ -2512,22 +2259,12 @@ ULONG CCabinet::ReadString(char* String, LONG MaxLength) // + 1 to skip the terminating NULL character as well. Size = -(MaxLength - Size) + 1; -#if defined(_WIN32) - if( SetFilePointer(FileHandle, - (LONG)Size, - NULL, - FILE_CURRENT) == INVALID_SET_FILE_POINTER ) - { - DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", (UINT)GetLastError())); - return CAB_STATUS_INVALID_CAB; - } -#else if (fseek(FileHandle, (off_t)Size, SEEK_CUR) != 0) { DPRINT(MIN_TRACE, ("fseek() failed.\n")); return CAB_STATUS_INVALID_CAB; } -#endif + return CAB_STATUS_SUCCESS; } @@ -2548,22 +2285,11 @@ ULONG CCabinet::ReadFileTable() (UINT)CABHeader.FileTableOffset)); /* Seek to file table */ -#if defined(_WIN32) - if( SetFilePointer(FileHandle, - CABHeader.FileTableOffset, - NULL, - FILE_BEGIN) == INVALID_SET_FILE_POINTER ) - { - DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", (UINT)GetLastError())); - return CAB_STATUS_INVALID_CAB; - } -#else if (fseek(FileHandle, (off_t)CABHeader.FileTableOffset, SEEK_SET) != 0) { DPRINT(MIN_TRACE, ("fseek() failed.\n")); return CAB_STATUS_INVALID_CAB; } -#endif for (i = 0; i < CABHeader.FileCount; i++) { @@ -2581,7 +2307,7 @@ ULONG CCabinet::ReadFileTable() return CAB_STATUS_INVALID_CAB; } - File->FileName = (char*)AllocateMemory(PATH_MAX); + File->FileName = (char*)malloc(PATH_MAX); if (!File->FileName) { DPRINT(MIN_TRACE, ("Insufficient memory.\n")); @@ -2636,22 +2362,11 @@ ULONG CCabinet::ReadDataBlocks(PCFFOLDER_NODE FolderNode) } /* Seek to data block */ -#if defined(_WIN32) - if( SetFilePointer(FileHandle, - AbsoluteOffset, - NULL, - FILE_BEGIN) == INVALID_SET_FILE_POINTER ) - { - DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", (UINT)GetLastError())); - return CAB_STATUS_INVALID_CAB; - } -#else if (fseek(FileHandle, (off_t)AbsoluteOffset, SEEK_SET) != 0) { DPRINT(MIN_TRACE, ("fseek() failed.\n")); return CAB_STATUS_INVALID_CAB; } -#endif if ((Status = ReadBlock(&Node->Data, sizeof(CFDATA), &BytesRead)) != CAB_STATUS_SUCCESS) @@ -2689,7 +2404,7 @@ PCFFOLDER_NODE CCabinet::NewFolderNode() { PCFFOLDER_NODE Node; - Node = (PCFFOLDER_NODE)AllocateMemory(sizeof(CFFOLDER_NODE)); + Node = (PCFFOLDER_NODE)malloc(sizeof(CFFOLDER_NODE)); if (!Node) return NULL; @@ -2721,7 +2436,7 @@ PCFFILE_NODE CCabinet::NewFileNode() { PCFFILE_NODE Node; - Node = (PCFFILE_NODE)AllocateMemory(sizeof(CFFILE_NODE)); + Node = (PCFFILE_NODE)malloc(sizeof(CFFILE_NODE)); if (!Node) return NULL; @@ -2751,7 +2466,7 @@ PCFDATA_NODE CCabinet::NewDataNode(PCFFOLDER_NODE FolderNode) { PCFDATA_NODE Node; - Node = (PCFDATA_NODE)AllocateMemory(sizeof(CFDATA_NODE)); + Node = (PCFDATA_NODE)malloc(sizeof(CFDATA_NODE)); if (!Node) return NULL; @@ -2784,7 +2499,7 @@ void CCabinet::DestroyDataNodes(PCFFOLDER_NODE FolderNode) while (NextNode != NULL) { PrevNode = NextNode->Next; - FreeMemory(NextNode); + free(NextNode); NextNode = PrevNode; } FolderNode->DataListHead = NULL; @@ -2805,8 +2520,8 @@ void CCabinet::DestroyFileNodes() { PrevNode = NextNode->Next; if (NextNode->FileName) - FreeMemory(NextNode->FileName); - FreeMemory(NextNode); + free(NextNode->FileName); + free(NextNode); NextNode = PrevNode; } FileListHead = NULL; @@ -2852,8 +2567,8 @@ void CCabinet::DestroyDeletedFileNodes() TotalFileSize -= (sizeof(CFFILE) + (ULONG)strlen(GetFileName(CurNode->FileName)) + 1); if (CurNode->FileName) - FreeMemory(CurNode->FileName); - FreeMemory(CurNode); + free(CurNode->FileName); + free(CurNode); } CurNode = NextNode; } @@ -2873,7 +2588,7 @@ void CCabinet::DestroyFolderNodes() { PrevNode = NextNode->Next; DestroyDataNodes(NextNode); - FreeMemory(NextNode); + free(NextNode); NextNode = PrevNode; } FolderListHead = NULL; @@ -2915,7 +2630,7 @@ void CCabinet::DestroyDeletedFolderNodes() } DestroyDataNodes(CurNode); - FreeMemory(CurNode); + free(CurNode); TotalFolderSize -= sizeof(CFFOLDER); } @@ -2997,7 +2712,8 @@ ULONG CCabinet::ReadBlock(void* Buffer, * Status of operation */ { - if (!ReadFileData(FileHandle, Buffer, Size, BytesRead)) + *BytesRead = fread(Buffer, 1, Size, FileHandle); + if ( *BytesRead != Size ) return CAB_STATUS_INVALID_CAB; return CAB_STATUS_SUCCESS; } @@ -3201,20 +2917,11 @@ ULONG CCabinet::WriteCabinetHeader(bool MoreDisks) CABHeader.CabinetSize = DiskSize; /* Write header */ -#if defined(_WIN32) - if (!WriteFile(FileHandle, &CABHeader, sizeof(CFHEADER), (LPDWORD)&BytesWritten, NULL)) - { - DPRINT(MIN_TRACE, ("Cannot write to file.\n")); - return CAB_STATUS_CANNOT_WRITE; - } -#else - BytesWritten = sizeof(CFHEADER); if (fwrite(&CABHeader, sizeof(CFHEADER), 1, FileHandle) < 1) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; } -#endif /* Write per-cabinet reserved area if present */ if (CABHeader.Flags & CAB_FLAG_RESERVE) @@ -3224,35 +2931,20 @@ ULONG CCabinet::WriteCabinetHeader(bool MoreDisks) ReservedSize = CabinetReservedFileSize & 0xffff; ReservedSize |= (0 << 16); /* Folder reserved area size */ ReservedSize |= (0 << 24); /* Folder reserved area size */ -#if defined(_WIN32) - if (!WriteFile(FileHandle, &ReservedSize, sizeof(ULONG), (LPDWORD)&BytesWritten, NULL)) - { - DPRINT(MIN_TRACE, ("Cannot write to file.\n")); - return CAB_STATUS_CANNOT_WRITE; - } -#else + BytesWritten = sizeof(ULONG); if (fwrite(&ReservedSize, sizeof(ULONG), 1, FileHandle) < 1) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; } -#endif -#if defined(_WIN32) - if (!WriteFile(FileHandle, CabinetReservedFileBuffer, CabinetReservedFileSize, (LPDWORD)&BytesWritten, NULL)) - { - DPRINT(MIN_TRACE, ("Cannot write to file.\n")); - return CAB_STATUS_CANNOT_WRITE; - } -#else BytesWritten = CabinetReservedFileSize; if (fwrite(CabinetReservedFileBuffer, CabinetReservedFileSize, 1, FileHandle) < 1) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; } -#endif } if ((CABHeader.Flags & CAB_FLAG_HASPREV) > 0) @@ -3261,39 +2953,23 @@ ULONG CCabinet::WriteCabinetHeader(bool MoreDisks) /* Write name of previous cabinet */ Size = (ULONG)strlen(CabinetPrev) + 1; -#if defined(_WIN32) - if (!WriteFile(FileHandle, CabinetPrev, Size, (LPDWORD)&BytesWritten, NULL)) - { - DPRINT(MIN_TRACE, ("Cannot write to file.\n")); - return CAB_STATUS_CANNOT_WRITE; - } -#else BytesWritten = Size; if (fwrite(CabinetPrev, Size, 1, FileHandle) < 1) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; } -#endif DPRINT(MAX_TRACE, ("DiskPrev '%s'.\n", DiskPrev)); /* Write label of previous disk */ Size = (ULONG)strlen(DiskPrev) + 1; -#if defined(_WIN32) - if (!WriteFile(FileHandle, DiskPrev, Size, (LPDWORD)&BytesWritten, NULL)) - { - DPRINT(MIN_TRACE, ("Cannot write to file.\n")); - return CAB_STATUS_CANNOT_WRITE; - } -#else BytesWritten = Size; if (fwrite(DiskPrev, Size, 1, FileHandle) < 1) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; } -#endif } if ((CABHeader.Flags & CAB_FLAG_HASNEXT) > 0) @@ -3302,39 +2978,23 @@ ULONG CCabinet::WriteCabinetHeader(bool MoreDisks) /* Write name of next cabinet */ Size = (ULONG)strlen(CabinetNext) + 1; -#if defined(_WIN32) - if (!WriteFile(FileHandle, CabinetNext, Size, (LPDWORD)&BytesWritten, NULL)) - { - DPRINT(MIN_TRACE, ("Cannot write to file.\n")); - return CAB_STATUS_CANNOT_WRITE; - } -#else BytesWritten = Size; if (fwrite(CabinetNext, Size, 1, FileHandle) < 1) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; } -#endif DPRINT(MAX_TRACE, ("DiskNext '%s'.\n", DiskNext)); /* Write label of next disk */ Size = (ULONG)strlen(DiskNext) + 1; -#if defined(_WIN32) - if (!WriteFile(FileHandle, DiskNext, Size, (LPDWORD)&BytesWritten, NULL)) - { - DPRINT(MIN_TRACE, ("Cannot write to file.\n")); - return CAB_STATUS_CANNOT_WRITE; - } -#else BytesWritten = Size; if (fwrite(DiskNext, Size, 1, FileHandle) < 1) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; } -#endif } return CAB_STATUS_SUCCESS; @@ -3349,7 +3009,6 @@ ULONG CCabinet::WriteFolderEntries() */ { PCFFOLDER_NODE FolderNode; - ULONG BytesWritten; DPRINT(MAX_TRACE, ("Writing folder table.\n")); @@ -3361,24 +3020,11 @@ ULONG CCabinet::WriteFolderEntries() DPRINT(MAX_TRACE, ("Writing folder entry. CompressionType (0x%X) DataBlockCount (%d) DataOffset (0x%X).\n", FolderNode->Folder.CompressionType, FolderNode->Folder.DataBlockCount, (UINT)FolderNode->Folder.DataOffset)); -#if defined(_WIN32) - if (!WriteFile(FileHandle, - &FolderNode->Folder, - sizeof(CFFOLDER), - (LPDWORD)&BytesWritten, - NULL)) - { - DPRINT(MIN_TRACE, ("Cannot write to file.\n")); - return CAB_STATUS_CANNOT_WRITE; - } -#else - BytesWritten = sizeof(CFFOLDER); if (fwrite(&FolderNode->Folder, sizeof(CFFOLDER), 1, FileHandle) < 1) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; } -#endif } FolderNode = FolderNode->Next; } @@ -3395,7 +3041,6 @@ ULONG CCabinet::WriteFileEntries() */ { PCFFILE_NODE File; - ULONG BytesWritten; bool SetCont = false; DPRINT(MAX_TRACE, ("Writing file table.\n")); @@ -3423,37 +3068,17 @@ 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)); -#if defined(_WIN32) - if (!WriteFile(FileHandle, - &File->File, - sizeof(CFFILE), - (LPDWORD)&BytesWritten, - NULL)) - return CAB_STATUS_CANNOT_WRITE; -#else - BytesWritten = sizeof(CFFILE); if (fwrite(&File->File, sizeof(CFFILE), 1, FileHandle) < 1) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; } -#endif -#if defined(_WIN32) - if (!WriteFile(FileHandle, - GetFileName(File->FileName), - (DWORD)strlen(GetFileName(File->FileName)) + 1, - (LPDWORD)&BytesWritten, - NULL)) - return CAB_STATUS_CANNOT_WRITE; -#else - BytesWritten = strlen(GetFileName(File->FileName)) + 1; if (fwrite(GetFileName(File->FileName), strlen(GetFileName(File->FileName)) + 1, 1, FileHandle) < 1) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; } -#endif if (SetCont) { @@ -3478,7 +3103,6 @@ ULONG CCabinet::CommitDataBlocks(PCFFOLDER_NODE FolderNode) */ { PCFDATA_NODE DataNode; - ULONG BytesWritten; ULONG BytesRead; ULONG Status; @@ -3503,37 +3127,17 @@ ULONG CCabinet::CommitDataBlocks(PCFFOLDER_NODE FolderNode) return Status; } -#if defined(_WIN32) - if (!WriteFile(FileHandle, &DataNode->Data, - sizeof(CFDATA), (LPDWORD)&BytesWritten, NULL)) - { - DPRINT(MIN_TRACE, ("Cannot write to file.\n")); - return CAB_STATUS_CANNOT_WRITE; - } -#else - BytesWritten = sizeof(CFDATA); if (fwrite(&DataNode->Data, sizeof(CFDATA), 1, FileHandle) < 1) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; } -#endif -#if defined(_WIN32) - if (!WriteFile(FileHandle, InputBuffer, - DataNode->Data.CompSize, (LPDWORD)&BytesWritten, NULL)) - { - DPRINT(MIN_TRACE, ("Cannot write to file.\n")); - return CAB_STATUS_CANNOT_WRITE; - } -#else - BytesWritten = DataNode->Data.CompSize; if (fwrite(InputBuffer, DataNode->Data.CompSize, 1, FileHandle) < 1) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; } -#endif DataNode = DataNode->Next; } @@ -3662,7 +3266,7 @@ void CCabinet::ConvertDateAndTime(time_t* Time, #endif // !_WIN32 -ULONG CCabinet::GetFileTimes(FILEHANDLE FileHandle, PCFFILE_NODE File) +ULONG CCabinet::GetFileTimes(FILE* FileHandle, PCFFILE_NODE File) /* * FUNCTION: Returns file times of a file * ARGUMENTS: @@ -3674,8 +3278,9 @@ ULONG CCabinet::GetFileTimes(FILEHANDLE FileHandle, PCFFILE_NODE File) { #if defined(_WIN32) FILETIME FileTime; + HANDLE FileNo = (HANDLE)_fileno(FileHandle); - if (GetFileTime(FileHandle, NULL, NULL, &FileTime)) + if (GetFileTime(FileNo, NULL, NULL, &FileTime)) FileTimeToDosDateTime(&FileTime, &File->File.FileDate, &File->File.FileTime); diff --git a/sdk/tools/cabman/cabinet.h b/sdk/tools/cabman/cabinet.h index 1a2df3e1d5..02d23d398e 100644 --- a/sdk/tools/cabman/cabinet.h +++ b/sdk/tools/cabman/cabinet.h @@ -8,16 +8,17 @@ #pragma once #if defined(_WIN32) -#define WIN32_LEAN_AND_MEAN -#include <windows.h> + #define WIN32_LEAN_AND_MEAN + #include <windows.h> #else + #include <typedefs.h> + #include <unistd.h> +#endif + #include <errno.h> #include <fcntl.h> #include <sys/types.h> #include <time.h> -#include <typedefs.h> -#include <unistd.h> -#endif #include <stdlib.h> #include <stdio.h> @@ -34,20 +35,23 @@ #define strcasecmp _stricmp #define strdup _strdup - -#define AllocateMemory(size) HeapAlloc(GetProcessHeap(), 0, size) -#define FreeMemory(buffer) HeapFree(GetProcessHeap(), 0, buffer) -#define FILEHANDLE HANDLE -#define CloseFile(handle) CloseHandle(handle) #else #define DIR_SEPARATOR_CHAR '/' #define DIR_SEPARATOR_STRING "/" +#endif // _WIN32 -#define AllocateMemory(size) malloc(size) -#define FreeMemory(buffer) free(buffer) -#define CloseFile(handle) fclose(handle) -#define FILEHANDLE FILE* -#endif +inline LONG GetSizeOfFile(FILE* handle) +{ + LONG size; + LONG currentPos = ftell(handle); + + if (fseek(handle, 0, SEEK_END) != 0) + return (LONG)-1; + + size = ftell(handle); + fseek(handle, 0, SEEK_SET); + return size; +} /* Debugging */ @@ -309,8 +313,7 @@ public: ULONG WriteBlock(PCFDATA Data, void* Buffer, PULONG BytesWritten); private: char FullName[PATH_MAX]; - bool FileCreated; - FILEHANDLE FileHandle; + FILE* FileHandle; }; #endif /* CAB_READ_ONLY */ @@ -437,7 +440,7 @@ private: ULONG WriteDataBlock(); ULONG GetAttributesOnFile(PCFFILE_NODE File); ULONG SetAttributesOnFile(char* FileName, USHORT FileAttributes); - ULONG GetFileTimes(FILEHANDLE FileHandle, PCFFILE_NODE File); + ULONG GetFileTimes(FILE* FileHandle, PCFFILE_NODE File); #if !defined(_WIN32) void ConvertDateAndTime(time_t* Time, PUSHORT DosDate, PUSHORT DosTime); #endif @@ -459,7 +462,7 @@ private: char CabinetReservedFile[PATH_MAX]; void* CabinetReservedFileBuffer; ULONG CabinetReservedFileSize; - FILEHANDLE FileHandle; + FILE* FileHandle; bool FileOpen; CFHEADER CABHeader; ULONG CabinetReserved; @@ -495,7 +498,7 @@ private: bool CreateNewFolder; CCFDATAStorage *ScratchFile; - FILEHANDLE SourceFile; + FILE* SourceFile; bool ContinueFile; ULONG TotalBytesLeft; bool BlockIsSplit; // true if current data block is split diff --git a/sdk/tools/cabman/dfp.cxx b/sdk/tools/cabman/dfp.cxx index ba710b64c5..e78211a06c 100644 --- a/sdk/tools/cabman/dfp.cxx +++ b/sdk/tools/cabman/dfp.cxx @@ -17,40 +17,6 @@ #include "cabman.h" #include "dfp.h" - -#if defined(_WIN32) -#define GetSizeOfFile(handle) _GetSizeOfFile(handle) -static LONG _GetSizeOfFile(FILEHANDLE handle) -{ - ULONG size = GetFileSize(handle, NULL); - if (size == INVALID_FILE_SIZE) - return -1; - - return size; -} -#define ReadFileData(handle, buffer, size, bytesread) _ReadFileData(handle, buffer, size, bytesread) -static BOOL _ReadFileData(FILEHANDLE handle, void* buffer, ULONG size, PULONG bytesread) -{ - return ReadFile(handle, buffer, size, (LPDWORD)bytesread, NULL); -} -#else -#define GetSizeOfFile(handle) _GetSizeOfFile(handle) -static LONG _GetSizeOfFile(FILEHANDLE handle) -{ - LONG size; - fseek(handle, 0, SEEK_END); - size = ftell(handle); - fseek(handle, 0, SEEK_SET); - return size; -} -#define ReadFileData(handle, buffer, size, bytesread) _ReadFileData(handle, buffer, size, bytesread) -static bool _ReadFileData(FILEHANDLE handle, void* buffer, ULONG size, PULONG bytesread) -{ - *bytesread = fread(buffer, 1, size, handle); - return *bytesread == size; -} -#endif - /* CDFParser */ CDFParser::CDFParser() @@ -94,31 +60,31 @@ CDFParser::~CDFParser() PDISK_NUMBER DNNext; if (FileBuffer) - FreeMemory(FileBuffer); + free(FileBuffer); CNNext = CabinetName; while (CNNext != NULL) { CNPrev = CNNext->Next; - FreeMemory(CNNext); + free(CNNext); CNNext = CNPrev; } CNNext = DiskLabel; while (CNNext != NULL) { CNPrev = CNNext->Next; - FreeMemory(CNNext); + free(CNNext); CNNext = CNPrev; } DNNext = MaxDiskSize; while (DNNext != NULL) { DNPrev = DNNext->Next; - FreeMemory(DNNext); + free(DNNext); DNNext = DNPrev; } if (InfFileHandle != NULL) - CloseFile(InfFileHandle); + fclose(InfFileHandle); } void CDFParser::WriteInfLine(char* InfLine) @@ -126,9 +92,6 @@ void CDFParser::WriteInfLine(char* InfLine) char buf[PATH_MAX]; char eolbuf[2]; char* destpath; -#if defined(_WIN32) - ULONG BytesWritten; -#endif if (DontGenerateInf) return; @@ -149,53 +112,28 @@ void CDFParser::WriteInfLine(char* InfLine) strcpy(buf, InfFileName); /* Create .inf file, overwrite if it already exists */ -#if defined(_WIN32) - InfFileHandle = CreateFile(buf, // Create this file - GENERIC_WRITE, // Open for writing - 0, // No sharing - NULL, // No security - CREATE_ALWAYS, // Create or overwrite - FILE_ATTRIBUTE_NORMAL, // Normal file - NULL); // No attribute template - if (InfFileHandle == INVALID_HANDLE_VALUE) - { - DPRINT(MID_TRACE, ("Error creating '%u'.\n", (UINT)GetLastError())); - return; - } -#else /* !_WIN32 */ InfFileHandle = fopen(buf, "wb"); if (InfFileHandle == NULL) { - DPRINT(MID_TRACE, ("Error creating '%i'.\n", errno)); + DPRINT(MID_TRACE, ("Error creating INF file.\n")); return; } -#endif } -#if defined(_WIN32) - if (!WriteFile(InfFileHandle, InfLine, (DWORD)strlen(InfLine), (LPDWORD)&BytesWritten, NULL)) + if (fwrite(InfLine, strlen(InfLine), 1, InfFileHandle) < 1) { - DPRINT(MID_TRACE, ("ERROR WRITING '%u'.\n", (UINT)GetLastError())); + DPRINT(MID_TRACE, ("Error writing INF file.\n")); return; } -#else - if (fwrite(InfLine, strlen(InfLine), 1, InfFileHandle) < 1) - return; -#endif eolbuf[0] = 0x0d; eolbuf[1] = 0x0a; -#if defined(_WIN32) - if (!WriteFile(InfFileHandle, eolbuf, sizeof(eolbuf), (LPDWORD)&BytesWritten, NULL)) + if (fwrite(eolbuf, sizeof(eolbuf), 1, InfFileHandle) < 1) { - DPRINT(MID_TRACE, ("ERROR WRITING '%u'.\n", (UINT)GetLastError())); + DPRINT(MID_TRACE, ("Error writing INF file.\n")); return; } -#else - if (fwrite(eolbuf, 1, sizeof(eolbuf), InfFileHandle) < 1) - return; -#endif } @@ -208,54 +146,43 @@ ULONG CDFParser::Load(char* FileName) * Status of operation */ { - ULONG BytesRead; LONG FileSize; if (FileLoaded) return CAB_STATUS_SUCCESS; - /* Create cabinet file, overwrite if it already exists */ -#if defined(_WIN32) - FileHandle = CreateFile(FileName, // Create this file - GENERIC_READ, // Open for reading - 0, // No sharing - NULL, // No security - OPEN_EXISTING, // Open the file - FILE_ATTRIBUTE_NORMAL, // Normal file - NULL); // No attribute template - if (FileHandle == INVALID_HANDLE_VALUE) - return CAB_STATUS_CANNOT_OPEN; -#else /* !_WIN32 */ + /* Open the directive file */ FileHandle = fopen(FileName, "rb"); if (FileHandle == NULL) + { return CAB_STATUS_CANNOT_OPEN; -#endif + } FileSize = GetSizeOfFile(FileHandle); if (FileSize == -1) { - CloseFile(FileHandle); + fclose(FileHandle); return CAB_STATUS_CANNOT_OPEN; } FileBufferSize = (ULONG)FileSize; - FileBuffer = (char*)AllocateMemory(FileBufferSize); + FileBuffer = (char*)malloc(FileBufferSize); if (!FileBuffer) { - CloseFile(FileHandle); + fclose(FileHandle); return CAB_STATUS_NOMEMORY; } - if (!ReadFileData(FileHandle, FileBuffer, FileBufferSize, &BytesRead)) + if ( fread(FileBuffer, FileBufferSize, 1, FileHandle) < 1 ) { - CloseFile(FileHandle); - FreeMemory(FileBuffer); + fclose(FileHandle); + free(FileBuffer); FileBuffer = NULL; return CAB_STATUS_CANNOT_READ; } - CloseFile(FileHandle); + fclose(FileHandle); FileLoaded = true; @@ -571,7 +498,7 @@ bool CDFParser::SetDiskName(PCABINET_NAME *List, ULONG Number, char* String) CN = CN->Next; } - CN = (PCABINET_NAME)AllocateMemory(sizeof(CABINET_NAME)); + CN = (PCABINET_NAME)malloc(sizeof(CABINET_NAME)); if (!CN) return false; @@ -637,7 +564,7 @@ bool CDFParser::SetDiskNumber(PDISK_NUMBER *List, ULONG Number, ULONG Value) DN = DN->Next; } - DN = (PDISK_NUMBER)AllocateMemory(sizeof(DISK_NUMBER)); + DN = (PDISK_NUMBER)malloc(sizeof(DISK_NUMBER)); if (!DN) return false; diff --git a/sdk/tools/cabman/dfp.h b/sdk/tools/cabman/dfp.h index bfea30f81b..1c509715fb 100644 --- a/sdk/tools/cabman/dfp.h +++ b/sdk/tools/cabman/dfp.h @@ -99,7 +99,7 @@ private: void NextToken(); /* Parsing */ bool FileLoaded; - FILEHANDLE FileHandle; + FILE* FileHandle; char* FileBuffer; ULONG FileBufferSize; ULONG CurrentOffset; @@ -140,7 +140,7 @@ private: ULONG ReservePerDataBlockSize; ULONG ReservePerFolderSize; char SourceDir[256]; - FILEHANDLE InfFileHandle; + FILE* InfFileHandle; bool InfModeEnabled; }; diff --git a/sdk/tools/cabman/mszip.cxx b/sdk/tools/cabman/mszip.cxx index acb9ba02b8..acc6e0ebbc 100644 --- a/sdk/tools/cabman/mszip.cxx +++ b/sdk/tools/cabman/mszip.cxx @@ -21,13 +21,13 @@ voidpf MSZipAlloc(voidpf opaque, uInt items, uInt size) { DPRINT(DEBUG_MEMORY, ("items = (%d) size = (%d)\n", items, size)); - return AllocateMemory(items * size); + return malloc(items * size); } void MSZipFree (voidpf opaque, voidpf address) { DPRINT(DEBUG_MEMORY, ("\n")); - FreeMemory(address); + free(address); }

1 0

03/03: [GDIPLUS] Add it to winsxs. [NTDLL_APITEST] Remove a hack for gdiplus
by Giannis Adamopoulos 27 Jan '18

27 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5b8975211db256faf070c… commit 5b8975211db256faf070c69cda499eb03f8539d8 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Thu Jan 18 19:01:35 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sat Jan 27 02:45:50 2018 +0200 [GDIPLUS] Add it to winsxs. [NTDLL_APITEST] Remove a hack for gdiplus --- boot/bootdata/packages/reactos.dff.in | 1 + dll/win32/gdiplus/CMakeLists.txt | 2 ++ ...ws.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef.manifest | 3 +-- media/systemcompatible.manifest | 5 ++++- modules/rostests/apitests/ntdll/CMakeLists.txt | 1 - modules/rostests/apitests/ntdll/ntdlltest.manifest | 5 ----- sdk/cmake/CMakeMacros.cmake | 2 ++ 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/boot/bootdata/packages/reactos.dff.in b/boot/bootdata/packages/reactos.dff.in index a365760608..652aa91943 100644 --- a/boot/bootdata/packages/reactos.dff.in +++ b/boot/bootdata/packages/reactos.dff.in @@ -75,6 +75,7 @@ Signature = "$ReactOS$" 55 = winsxs\manifests 56 = winsxs\x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef 57 = winsxs\x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef +58 = winsxs\x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef .InfEnd diff --git a/dll/win32/gdiplus/CMakeLists.txt b/dll/win32/gdiplus/CMakeLists.txt index 041f3a66eb..30f07f8226 100644 --- a/dll/win32/gdiplus/CMakeLists.txt +++ b/dll/win32/gdiplus/CMakeLists.txt @@ -36,3 +36,5 @@ add_delay_importlibs(gdiplus windowscodecs) add_importlibs(gdiplus msvcrt shlwapi oleaut32 ole32 user32 gdi32 kernel32 ntdll) add_pch(gdiplus gdiplus_private.h SOURCE) add_cd_file(TARGET gdiplus DESTINATION reactos/system32 FOR all) +add_cd_file(TARGET gdiplus DESTINATION reactos/winsxs/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all) diff --git a/modules/rostests/apitests/ntdll/Microsoft.Windows.GdiPlus.manifest b/dll/win32/gdiplus/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef.manifest similarity index 72% rename from modules/rostests/apitests/ntdll/Microsoft.Windows.GdiPlus.manifest rename to dll/win32/gdiplus/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef.manifest index ba815f4c7b..c88cdba593 100644 --- a/modules/rostests/apitests/ntdll/Microsoft.Windows.GdiPlus.manifest +++ b/dll/win32/gdiplus/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef.manifest @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.0.100.0" processorArchitecture="x86" /> + <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.1.7601.23038" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df"/> <file name="gdiplus.dll"/> </assembly> - \ No newline at end of file diff --git a/media/systemcompatible.manifest b/media/systemcompatible.manifest index e81ccfeeb2..8326faa3f9 100644 --- a/media/systemcompatible.manifest +++ b/media/systemcompatible.manifest @@ -2,7 +2,10 @@ <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <dependency> <dependentAssembly> - <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="5.82.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="*" language="*" /> + <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="5.82.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="x86" language="*" /> + </dependentAssembly> + <dependentAssembly> + <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.1.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="x86" language="*" /> </dependentAssembly> </dependency> </assembly> diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index 3ac0b604f1..3e9756c7f3 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -79,4 +79,3 @@ add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/shell32.dll" SUBDIR testdata add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/test.dll" SUBDIR testdata) add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/ntdlltest.manifest" SUBDIR testdata) -add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/Microsoft.Windows.GdiPlus.manifest" SUBDIR testdata) diff --git a/modules/rostests/apitests/ntdll/ntdlltest.manifest b/modules/rostests/apitests/ntdll/ntdlltest.manifest index 845c27a83a..bb9d1d05d9 100644 --- a/modules/rostests/apitests/ntdll/ntdlltest.manifest +++ b/modules/rostests/apitests/ntdll/ntdlltest.manifest @@ -1,11 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity type="win32" name="ntdll_apitest" version="1.0.0.0"/> - <dependency> - <dependentAssembly> - <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.0.100.0" language="*" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df"/> - </dependentAssembly> - </dependency> <file name="deptest.dll"/> <file name="adllfile.dll"/> </assembly> diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index dc9a58e631..597143838b 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -279,6 +279,8 @@ macro(dir_to_num dir var) set(${var} 56) elseif(${dir} STREQUAL reactos/winsxs/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef) set(${var} 57) + elseif(${dir} STREQUAL reactos/winsxs/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef) + set(${var} 58) else() message(FATAL_ERROR "Wrong destination: ${dir}") endif()

1 0

02/03: [NTDLL_APITEST] Remove one of the hacks for the implicit activation context.
by Giannis Adamopoulos 27 Jan '18

27 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=22317b0ca40a70e76e207… commit 22317b0ca40a70e76e20799cded688d82aebc307 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Thu Jan 18 16:56:16 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sat Jan 27 02:45:50 2018 +0200 [NTDLL_APITEST] Remove one of the hacks for the implicit activation context. --- modules/rostests/apitests/ntdll/ntdlltest.manifest | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modules/rostests/apitests/ntdll/ntdlltest.manifest b/modules/rostests/apitests/ntdll/ntdlltest.manifest index a91a9b68a2..845c27a83a 100644 --- a/modules/rostests/apitests/ntdll/ntdlltest.manifest +++ b/modules/rostests/apitests/ntdll/ntdlltest.manifest @@ -6,11 +6,6 @@ <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.0.100.0" language="*" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df"/> </dependentAssembly> </dependency> - <dependency> - <dependentAssembly> - <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="5.82.0.0" language="*" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df"/> - </dependentAssembly> - </dependency> <file name="deptest.dll"/> <file name="adllfile.dll"/> </assembly>

1 0

01/03: [RTL] actctx: Implement the implicit activation context
by Giannis Adamopoulos 27 Jan '18

27 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1e903d96cbdc78dbc9184… commit 1e903d96cbdc78dbc91843cb599f6c31da627ff3 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Thu Jan 18 16:53:59 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sat Jan 27 02:45:50 2018 +0200 [RTL] actctx: Implement the implicit activation context --- media/CMakeLists.txt | 2 ++ media/systemcompatible.manifest | 8 ++++++++ sdk/lib/rtl/actctx.c | 26 ++++++++++++++++++++++++++ 3 files changed, 36 insertions(+) diff --git a/media/CMakeLists.txt b/media/CMakeLists.txt index 778555daa5..508ab79214 100644 --- a/media/CMakeLists.txt +++ b/media/CMakeLists.txt @@ -12,3 +12,5 @@ add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/networks DESTINATION re add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/protocol DESTINATION reactos/system32/drivers/etc FOR all) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/services DESTINATION reactos/system32/drivers/etc FOR all) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/sounds/ReactOS_LogOn.wav DESTINATION reactos/media FOR all) + +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/systemcompatible.manifest DESTINATION reactos/winsxs/manifests FOR all) \ No newline at end of file diff --git a/media/systemcompatible.manifest b/media/systemcompatible.manifest new file mode 100644 index 0000000000..e81ccfeeb2 --- /dev/null +++ b/media/systemcompatible.manifest @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<dependency> + <dependentAssembly> + <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="5.82.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="*" language="*" /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/sdk/lib/rtl/actctx.c b/sdk/lib/rtl/actctx.c index 6ce1734017..396b442fcd 100644 --- a/sdk/lib/rtl/actctx.c +++ b/sdk/lib/rtl/actctx.c @@ -15,6 +15,7 @@ /* Based on Wine Staging 1.7.37 */ #include <rtl.h> +#include <ntstrsafe.h> #define NDEBUG #include <debug.h> @@ -694,6 +695,7 @@ static const WCHAR wildcardW[] = {'*',0}; static ACTIVATION_CONTEXT_WRAPPED system_actctx = { ACTCTX_MAGIC_MARKER, { 1 } }; static ACTIVATION_CONTEXT *process_actctx = &system_actctx.ActivationContext; +static ACTIVATION_CONTEXT *implicit_actctx = &system_actctx.ActivationContext; static WCHAR *strdupW(const WCHAR* str) { @@ -4657,6 +4659,8 @@ void actctx_init(void) { ACTCTXW ctx; HANDLE handle; + WCHAR buffer[1024]; + NTSTATUS Status; ctx.cbSize = sizeof(ctx); ctx.lpSource = NULL; @@ -4668,6 +4672,22 @@ void actctx_init(void) { process_actctx = check_actctx(handle); } + + ctx.dwFlags = 0; + ctx.hModule = NULL; + ctx.lpResourceName = NULL; + ctx.lpSource = buffer; + RtlStringCchCopyW(buffer, 1024, SharedUserData->NtSystemRoot); + RtlStringCchCatW(buffer, 1024, L"\\winsxs\\manifests\\systemcompatible.manifest"); + Status = RtlCreateActivationContext(0, (PVOID)&ctx, 0, NULL, NULL, &handle); + if (NT_SUCCESS(Status)) + { + implicit_actctx = check_actctx(handle); + } + else + { + DPRINT1("Failed to create the implicit act ctx. Status: 0x%x!!!\n", Status); + } } /* FUNCTIONS ***************************************************************/ @@ -5350,6 +5370,9 @@ NTSTATUS NTAPI RtlFindActivationContextSectionString( ULONG flags, const GUID *g if (status != STATUS_SUCCESS) status = find_string( process_actctx, section_kind, section_name, flags, data ); + if (status != STATUS_SUCCESS) + status = find_string( implicit_actctx, section_kind, section_name, flags, data ); + DPRINT("RtlFindActivationContextSectionString() returns status %x\n", status); return status; } @@ -5390,6 +5413,9 @@ NTSTATUS WINAPI RtlFindActivationContextSectionGuid( ULONG flags, const GUID *ex if (status != STATUS_SUCCESS) status = find_guid( process_actctx, section_kind, guid, flags, data ); + if (status != STATUS_SUCCESS) + status = find_guid( implicit_actctx, section_kind, guid, flags, data ); + return status; }

1 0

01/01: [FREELDR] FreeLdr debug.h does not care about NDEBUG. (#201)
by Serge Gautherie 26 Jan '18

26 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=50afbd48d4c1ffc6d8e2b… commit 50afbd48d4c1ffc6d8e2b98d5000cace3c71aaee Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Jan 27 00:34:21 2018 +0100 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Fri Jan 26 23:34:21 2018 +0000 [FREELDR] FreeLdr debug.h does not care about NDEBUG. (#201) - Remove all "#define NDEBUG". --- boot/freeldr/freeldr/arch/archwsup.c | 2 +- boot/freeldr/freeldr/arch/i386/halstub.c | 2 +- boot/freeldr/freeldr/arch/i386/hardware.c | 1 - boot/freeldr/freeldr/arch/i386/hwapm.c | 1 - boot/freeldr/freeldr/arch/i386/hwdisk.c | 1 - boot/freeldr/freeldr/arch/i386/hwpci.c | 1 - boot/freeldr/freeldr/arch/i386/i386bug.c | 1 - boot/freeldr/freeldr/arch/i386/i386vid.c | 1 - boot/freeldr/freeldr/arch/i386/machpc.c | 1 - boot/freeldr/freeldr/arch/i386/machxbox.c | 1 - boot/freeldr/freeldr/arch/i386/pcdisk.c | 1 - boot/freeldr/freeldr/arch/i386/pcmem.c | 1 - boot/freeldr/freeldr/arch/i386/pcvideo.c | 1 - boot/freeldr/freeldr/arch/i386/xboxdisk.c | 1 - boot/freeldr/freeldr/arch/powerpc/loader.c | 1 - boot/freeldr/freeldr/arch/powerpc/mboot.c | 1 - boot/freeldr/freeldr/disk/disk.c | 1 - boot/freeldr/freeldr/disk/partition.c | 1 - boot/freeldr/freeldr/disk/ramdisk.c | 2 +- boot/freeldr/freeldr/disk/scsiport.c | 1 - boot/freeldr/freeldr/lib/fs/fat.c | 1 - boot/freeldr/freeldr/lib/fs/fs.c | 1 - boot/freeldr/freeldr/lib/fs/pxe.c | 1 - 23 files changed, 3 insertions(+), 23 deletions(-) diff --git a/boot/freeldr/freeldr/arch/archwsup.c b/boot/freeldr/freeldr/arch/archwsup.c index 14c08c293b..cad4226168 100644 --- a/boot/freeldr/freeldr/arch/archwsup.c +++ b/boot/freeldr/freeldr/arch/archwsup.c @@ -9,7 +9,7 @@ /* INCLUDES *******************************************************************/ #include <freeldr.h> -#define NDEBUG + #include <debug.h> /* GLOBALS ********************************************************************/ diff --git a/boot/freeldr/freeldr/arch/i386/halstub.c b/boot/freeldr/freeldr/arch/i386/halstub.c index 2bcff89969..6a43d5e287 100644 --- a/boot/freeldr/freeldr/arch/i386/halstub.c +++ b/boot/freeldr/freeldr/arch/i386/halstub.c @@ -9,7 +9,7 @@ /* INCLUDES ******************************************************************/ #include <ntoskrnl.h> -#define NDEBUG + #include <debug.h> /* FUNCTIONS *****************************************************************/ diff --git a/boot/freeldr/freeldr/arch/i386/hardware.c b/boot/freeldr/freeldr/arch/i386/hardware.c index 62ee77f4de..f9aa78dedb 100644 --- a/boot/freeldr/freeldr/arch/i386/hardware.c +++ b/boot/freeldr/freeldr/arch/i386/hardware.c @@ -21,7 +21,6 @@ #include <freeldr.h> -#define NDEBUG #include <debug.h> DBG_DEFAULT_CHANNEL(HWDETECT); diff --git a/boot/freeldr/freeldr/arch/i386/hwapm.c b/boot/freeldr/freeldr/arch/i386/hwapm.c index 3a7d733bcd..c5a822802c 100644 --- a/boot/freeldr/freeldr/arch/i386/hwapm.c +++ b/boot/freeldr/freeldr/arch/i386/hwapm.c @@ -20,7 +20,6 @@ #include <freeldr.h> -#define NDEBUG #include <debug.h> DBG_DEFAULT_CHANNEL(HWDETECT); diff --git a/boot/freeldr/freeldr/arch/i386/hwdisk.c b/boot/freeldr/freeldr/arch/i386/hwdisk.c index 59b028b86e..f20ee62ce6 100644 --- a/boot/freeldr/freeldr/arch/i386/hwdisk.c +++ b/boot/freeldr/freeldr/arch/i386/hwdisk.c @@ -21,7 +21,6 @@ #include <freeldr.h> -#define NDEBUG #include <debug.h> DBG_DEFAULT_CHANNEL(HWDETECT); diff --git a/boot/freeldr/freeldr/arch/i386/hwpci.c b/boot/freeldr/freeldr/arch/i386/hwpci.c index 17b8e8d3b7..c5bb0061b3 100644 --- a/boot/freeldr/freeldr/arch/i386/hwpci.c +++ b/boot/freeldr/freeldr/arch/i386/hwpci.c @@ -20,7 +20,6 @@ #include <freeldr.h> -#define NDEBUG #include <debug.h> DBG_DEFAULT_CHANNEL(HWDETECT); diff --git a/boot/freeldr/freeldr/arch/i386/i386bug.c b/boot/freeldr/freeldr/arch/i386/i386bug.c index 0d4929b7b9..c5c82af688 100644 --- a/boot/freeldr/freeldr/arch/i386/i386bug.c +++ b/boot/freeldr/freeldr/arch/i386/i386bug.c @@ -1,7 +1,6 @@ #include <freeldr.h> -#define NDEBUG #include <debug.h> typedef struct _FRAME diff --git a/boot/freeldr/freeldr/arch/i386/i386vid.c b/boot/freeldr/freeldr/arch/i386/i386vid.c index 0d5db0abf7..1138321fab 100644 --- a/boot/freeldr/freeldr/arch/i386/i386vid.c +++ b/boot/freeldr/freeldr/arch/i386/i386vid.c @@ -19,7 +19,6 @@ #include <freeldr.h> -#define NDEBUG #include <debug.h> DBG_DEFAULT_CHANNEL(HWDETECT); diff --git a/boot/freeldr/freeldr/arch/i386/machpc.c b/boot/freeldr/freeldr/arch/i386/machpc.c index ec1ab9a91c..c846bf80ae 100644 --- a/boot/freeldr/freeldr/arch/i386/machpc.c +++ b/boot/freeldr/freeldr/arch/i386/machpc.c @@ -19,7 +19,6 @@ #include <freeldr.h> #include <cportlib/cportlib.h> -#define NDEBUG #include <debug.h> DBG_DEFAULT_CHANNEL(HWDETECT); diff --git a/boot/freeldr/freeldr/arch/i386/machxbox.c b/boot/freeldr/freeldr/arch/i386/machxbox.c index 3feac4788a..7dffa2baab 100644 --- a/boot/freeldr/freeldr/arch/i386/machxbox.c +++ b/boot/freeldr/freeldr/arch/i386/machxbox.c @@ -18,7 +18,6 @@ #include <freeldr.h> -#define NDEBUG #include <debug.h> DBG_DEFAULT_CHANNEL(HWDETECT); diff --git a/boot/freeldr/freeldr/arch/i386/pcdisk.c b/boot/freeldr/freeldr/arch/i386/pcdisk.c index 7c282a6f90..d371c44c99 100644 --- a/boot/freeldr/freeldr/arch/i386/pcdisk.c +++ b/boot/freeldr/freeldr/arch/i386/pcdisk.c @@ -21,7 +21,6 @@ #include <freeldr.h> -#define NDEBUG #include <debug.h> DBG_DEFAULT_CHANNEL(DISK); diff --git a/boot/freeldr/freeldr/arch/i386/pcmem.c b/boot/freeldr/freeldr/arch/i386/pcmem.c index 5741a8414c..af4d73cd2c 100644 --- a/boot/freeldr/freeldr/arch/i386/pcmem.c +++ b/boot/freeldr/freeldr/arch/i386/pcmem.c @@ -25,7 +25,6 @@ #include <freeldr.h> #include <arch/pc/x86common.h> -#define NDEBUG #include <debug.h> DBG_DEFAULT_CHANNEL(MEMORY); diff --git a/boot/freeldr/freeldr/arch/i386/pcvideo.c b/boot/freeldr/freeldr/arch/i386/pcvideo.c index bea6a5bb87..97327122ba 100644 --- a/boot/freeldr/freeldr/arch/i386/pcvideo.c +++ b/boot/freeldr/freeldr/arch/i386/pcvideo.c @@ -19,7 +19,6 @@ #include <freeldr.h> #include <suppress.h> -#define NDEBUG #include <debug.h> #define VIDEOPORT_PALETTE_READ 0x03C7 diff --git a/boot/freeldr/freeldr/arch/i386/xboxdisk.c b/boot/freeldr/freeldr/arch/i386/xboxdisk.c index 71b398d61b..dcdf319909 100644 --- a/boot/freeldr/freeldr/arch/i386/xboxdisk.c +++ b/boot/freeldr/freeldr/arch/i386/xboxdisk.c @@ -23,7 +23,6 @@ #include <freeldr.h> -#define NDEBUG #include <debug.h> DBG_DEFAULT_CHANNEL(DISK); diff --git a/boot/freeldr/freeldr/arch/powerpc/loader.c b/boot/freeldr/freeldr/arch/powerpc/loader.c index 24c958a797..c977064165 100644 --- a/boot/freeldr/freeldr/arch/powerpc/loader.c +++ b/boot/freeldr/freeldr/arch/powerpc/loader.c @@ -20,7 +20,6 @@ #define _NTSYSTEM_ #include <freeldr.h> -#define NDEBUG #include <debug.h> #define DbgPrint printf diff --git a/boot/freeldr/freeldr/arch/powerpc/mboot.c b/boot/freeldr/freeldr/arch/powerpc/mboot.c index 07b05713b8..d08e5efece 100644 --- a/boot/freeldr/freeldr/arch/powerpc/mboot.c +++ b/boot/freeldr/freeldr/arch/powerpc/mboot.c @@ -25,7 +25,6 @@ #include "ppcmmu/mmu.h" #include "compat.h" -#define NDEBUG #include <debug.h> /* We'll check this to see if we're in OFW land */ diff --git a/boot/freeldr/freeldr/disk/disk.c b/boot/freeldr/freeldr/disk/disk.c index 012e4fd1d7..46da0be1f7 100644 --- a/boot/freeldr/freeldr/disk/disk.c +++ b/boot/freeldr/freeldr/disk/disk.c @@ -20,7 +20,6 @@ #ifndef _M_ARM #include <freeldr.h> -#define NDEBUG #include <debug.h> DBG_DEFAULT_CHANNEL(DISK); diff --git a/boot/freeldr/freeldr/disk/partition.c b/boot/freeldr/freeldr/disk/partition.c index cf3d8b3929..df2d1a7055 100644 --- a/boot/freeldr/freeldr/disk/partition.c +++ b/boot/freeldr/freeldr/disk/partition.c @@ -25,7 +25,6 @@ #ifndef _M_ARM #include <freeldr.h> -#define NDEBUG #include <debug.h> DBG_DEFAULT_CHANNEL(DISK); diff --git a/boot/freeldr/freeldr/disk/ramdisk.c b/boot/freeldr/freeldr/disk/ramdisk.c index 0afc702aa1..8f2edc6a13 100644 --- a/boot/freeldr/freeldr/disk/ramdisk.c +++ b/boot/freeldr/freeldr/disk/ramdisk.c @@ -10,7 +10,7 @@ /* INCLUDES *******************************************************************/ #include <freeldr.h> -#define NDEBUG + #include <debug.h> /* GLOBALS ********************************************************************/ diff --git a/boot/freeldr/freeldr/disk/scsiport.c b/boot/freeldr/freeldr/disk/scsiport.c index 22cf72e8c3..7f206aafe6 100644 --- a/boot/freeldr/freeldr/disk/scsiport.c +++ b/boot/freeldr/freeldr/disk/scsiport.c @@ -48,7 +48,6 @@ #undef ScsiPortReadRegisterUlong #undef ScsiPortReadRegisterUshort -#define NDEBUG #include <debug.h> #define SCSI_PORT_NEXT_REQUEST_READY 0x0008 diff --git a/boot/freeldr/freeldr/lib/fs/fat.c b/boot/freeldr/freeldr/lib/fs/fat.c index 986f6bf198..6af232b3ac 100644 --- a/boot/freeldr/freeldr/lib/fs/fat.c +++ b/boot/freeldr/freeldr/lib/fs/fat.c @@ -20,7 +20,6 @@ #include <freeldr.h> -#define NDEBUG #include <debug.h> DBG_DEFAULT_CHANNEL(FILESYSTEM); diff --git a/boot/freeldr/freeldr/lib/fs/fs.c b/boot/freeldr/freeldr/lib/fs/fs.c index ff801d0e90..74958d0427 100644 --- a/boot/freeldr/freeldr/lib/fs/fs.c +++ b/boot/freeldr/freeldr/lib/fs/fs.c @@ -22,7 +22,6 @@ #include <freeldr.h> -#define NDEBUG #include <debug.h> DBG_DEFAULT_CHANNEL(FILESYSTEM); diff --git a/boot/freeldr/freeldr/lib/fs/pxe.c b/boot/freeldr/freeldr/lib/fs/pxe.c index c38417503d..ea91710a4f 100644 --- a/boot/freeldr/freeldr/lib/fs/pxe.c +++ b/boot/freeldr/freeldr/lib/fs/pxe.c @@ -19,7 +19,6 @@ #include <freeldr.h> -#define NDEBUG #include <debug.h> #define TAG_PXE_FILE 'FexP'

1 0

01/01: [SNDVOL32] Fix controls' offset (#280)
by toehead2001 26 Jan '18

26 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a30d12dde782424e3cf32… commit a30d12dde782424e3cf324118e44a9293c0b56b3 Author: toehead2001 <toehead2001(a)users.noreply.github.com> AuthorDate: Fri Jan 26 21:30:15 2018 +0000 Commit: Alexander Shaposhnikov <sanchaez(a)reactos.org> CommitDate: Fri Jan 26 23:30:15 2018 +0200 [SNDVOL32] Fix controls' offset (#280) CORE-9108 --- base/applications/sndvol32/dialog.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/base/applications/sndvol32/dialog.c b/base/applications/sndvol32/dialog.c index 857413c374..5c74e22b33 100644 --- a/base/applications/sndvol32/dialog.c +++ b/base/applications/sndvol32/dialog.c @@ -104,7 +104,7 @@ AddDialogControl( default: /* FIXME */ assert(0); - ClassName = 0; + ClassName = NULL; } } else @@ -112,12 +112,15 @@ AddDialogControl( /* class name is encoded as string */ ClassName = (LPWSTR)Offset; - /* adjust offset */ - Offset += wcslen(ClassName) + 1; + /* move offset to the end of class string */ + Offset += wcslen(ClassName); - /* get offset */ + /* get window name */ WindowName = (LPWSTR)(Offset + 1); } + + /* move offset past class type/string */ + Offset++; if (DialogItem->id == MAXWORD) { @@ -176,16 +179,8 @@ AddDialogControl( if (WindowName != NULL) { - /* position offset to start of name */ - Offset++; - - /* move offset past name */ - Offset += wcslen((LPWSTR)Offset) + 1; - } - else - { - /* no name so just adjust offset */ - Offset++; + /* move offset past window name */ + Offset += wcslen(WindowName) + 1; } /* check if there is additional data */ @@ -196,7 +191,8 @@ AddDialogControl( } else { - /* add data offset */ + /* FIXME: Determine whether this should be "Offset += 1 + *Offset" to explicitly skip the data count too. */ + /* skip past additional data */ Offset += *Offset; }

1 0

01/01: [GDI32_APITEST] Add GetTextMetrics tests to gdi32_apitest (#307)
by Katayama Hirofumi MZ 26 Jan '18

26 Jan '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=19f8ed2b7a1698da837a5… commit 19f8ed2b7a1698da837a5aef27ddb66385fc1016 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Jan 27 06:23:00 2018 +0900 Commit: Alexander Shaposhnikov <sanchaez(a)reactos.org> CommitDate: Fri Jan 26 23:23:00 2018 +0200 [GDI32_APITEST] Add GetTextMetrics tests to gdi32_apitest (#307) CORE-13840 --- modules/rostests/apitests/gdi32/CMakeLists.txt | 1 + modules/rostests/apitests/gdi32/GetTextMetrics.c | 518 +++++++++++++++++++++++ modules/rostests/apitests/gdi32/testlist.c | 2 + 3 files changed, 521 insertions(+) diff --git a/modules/rostests/apitests/gdi32/CMakeLists.txt b/modules/rostests/apitests/gdi32/CMakeLists.txt index 75255b3d27..4290fce8d6 100644 --- a/modules/rostests/apitests/gdi32/CMakeLists.txt +++ b/modules/rostests/apitests/gdi32/CMakeLists.txt @@ -53,6 +53,7 @@ list(APPEND SOURCE GetStockObject.c GetTextExtentExPoint.c GetTextFace.c + GetTextMetrics.c MaskBlt.c NtGdiAddFontResource.c OffsetClipRgn.c diff --git a/modules/rostests/apitests/gdi32/GetTextMetrics.c b/modules/rostests/apitests/gdi32/GetTextMetrics.c new file mode 100644 index 0000000000..9fb056f9b9 --- /dev/null +++ b/modules/rostests/apitests/gdi32/GetTextMetrics.c @@ -0,0 +1,518 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Test for GetTextMetrics and GetTextExtentPoint32 + * COPYRIGHT: Copyright 2018 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#include "precomp.h" + +/* #define EMIT_TESTCASES */ + +typedef struct TEST_ENTRY +{ + int line; + LONG lfHeight; + LONG lfWidth; + LONG cxText; + LONG cyText; + LONG tmHeight; + LONG tmAscent; + LONG tmDescent; + LONG tmInternalLeading; + LONG tmExternalLeading; +} TEST_ENTRY; + +#ifdef EMIT_TESTCASES +static const TEST_ENTRY g_test_entries[] = +{ + { __LINE__, 400, 0 }, + { __LINE__, 300, 0 }, + { __LINE__, 200, 0 }, + { __LINE__, 100, 0 }, + { __LINE__, 64, 0 }, + { __LINE__, 32, 0 }, + { __LINE__, 16, 0 }, + { __LINE__, 15, 0 }, + { __LINE__, 14, 0 }, + { __LINE__, 13, 0 }, + { __LINE__, 12, 0 }, + { __LINE__, 11, 0 }, + { __LINE__, 10, 0 }, + { __LINE__, 9, 0 }, + { __LINE__, 8, 0 }, + { __LINE__, 7, 0 }, + { __LINE__, 6, 0 }, + { __LINE__, 5, 0 }, + { __LINE__, 4, 0 }, + { __LINE__, 3, 0 }, + { __LINE__, 2, 0 }, + { __LINE__, 1, 0 }, + { __LINE__, 0, 0 }, + { __LINE__, -1, 0 }, + { __LINE__, -2, 0 }, + { __LINE__, -3, 0 }, + { __LINE__, -4, 0 }, + { __LINE__, -5, 0 }, + { __LINE__, -6, 0 }, + { __LINE__, -7, 0 }, + { __LINE__, -8, 0 }, + { __LINE__, -9, 0 }, + { __LINE__, -10, 0 }, + { __LINE__, -11, 0 }, + { __LINE__, -12, 0 }, + { __LINE__, -13, 0 }, + { __LINE__, -14, 0 }, + { __LINE__, -15, 0 }, + { __LINE__, -16, 0 }, + { __LINE__, -32, 0 }, + { __LINE__, -64, 0 }, + { __LINE__, -100, 0 }, + { __LINE__, -200, 0 }, + { __LINE__, -300, 0 }, + { __LINE__, -400, 0 }, +}; +#define g_test_entry_count _countof(g_test_entries) +#else +static const TEST_ENTRY g_FREEMONO[] = +{ + { __LINE__, 400, 0, 3600, 400, 400, 320, 80, 0, 0 }, + { __LINE__, 300, 0, 2700, 300, 300, 240, 60, 0, 0 }, + { __LINE__, 200, 0, 1800, 200, 200, 160, 40, 0, 0 }, + { __LINE__, 100, 0, 900, 100, 100, 80, 20, 0, 0 }, + { __LINE__, 64, 0, 570, 64, 64, 51, 13, 0, 0 }, + { __LINE__, 32, 0, 285, 32, 32, 26, 6, 0, 0 }, + { __LINE__, 16, 0, 150, 16, 16, 13, 3, 0, 0 }, + { __LINE__, 15, 0, 135, 15, 15, 12, 3, 0, 0 }, + { __LINE__, 14, 0, 120, 14, 14, 11, 3, 0, 0 }, + { __LINE__, 13, 0, 120, 13, 13, 10, 3, 0, 0 }, + { __LINE__, 12, 0, 105, 12, 12, 10, 2, 0, 0 }, + { __LINE__, 11, 0, 105, 11, 11, 9, 2, 0, 0 }, + { __LINE__, 10, 0, 90, 10, 10, 8, 2, 0, 0 }, + { __LINE__, 9, 0, 77, 9, 9, 7, 2, 0, 0 }, + { __LINE__, 8, 0, 75, 8, 8, 6, 2, 0, 0 }, + { __LINE__, 7, 0, 60, 7, 7, 6, 1, 0, 0 }, + { __LINE__, 6, 0, 60, 6, 6, 5, 1, 0, 0 }, + { __LINE__, 5, 0, 45, 5, 5, 4, 1, 0, 0 }, + { __LINE__, 4, 0, 30, 4, 4, 3, 1, 0, 0 }, + { __LINE__, 3, 0, 30, 3, 3, 2, 1, 0, 0 }, + { __LINE__, 2, 0, 15, 2, 2, 2, 0, 0, 0 }, + { __LINE__, 1, 0, 15, 2, 2, 2, 0, 0, 0 }, + { __LINE__, 0, 0, -165, -18, -18, -14, -4, 0, 0 }, + { __LINE__, -1, 0, 15, 2, 2, 2, 0, 0, 0 }, + { __LINE__, -2, 0, 15, 2, 2, 2, 0, 0, 0 }, + { __LINE__, -3, 0, 30, 3, 3, 2, 1, 0, 0 }, + { __LINE__, -4, 0, 30, 4, 4, 3, 1, 0, 0 }, + { __LINE__, -5, 0, 45, 5, 5, 4, 1, 0, 0 }, + { __LINE__, -6, 0, 60, 6, 6, 5, 1, 0, 0 }, + { __LINE__, -7, 0, 60, 7, 7, 6, 1, 0, 0 }, + { __LINE__, -8, 0, 75, 8, 8, 6, 2, 0, 0 }, + { __LINE__, -9, 0, 77, 9, 9, 7, 2, 0, 0 }, + { __LINE__, -10, 0, 90, 10, 10, 8, 2, 0, 0 }, + { __LINE__, -11, 0, 105, 11, 11, 9, 2, 0, 0 }, + { __LINE__, -12, 0, 105, 12, 12, 10, 2, 0, 0 }, + { __LINE__, -13, 0, 120, 13, 13, 10, 3, 0, 0 }, + { __LINE__, -14, 0, 120, 14, 14, 11, 3, 0, 0 }, + { __LINE__, -15, 0, 135, 15, 15, 12, 3, 0, 0 }, + { __LINE__, -16, 0, 150, 16, 16, 13, 3, 0, 0 }, + { __LINE__, -32, 0, 285, 32, 32, 26, 6, 0, 0 }, + { __LINE__, -64, 0, 570, 64, 64, 51, 13, 0, 0 }, + { __LINE__, -100, 0, 900, 100, 100, 80, 20, 0, 0 }, + { __LINE__, -200, 0, 1800, 200, 200, 160, 40, 0, 0 }, + { __LINE__, -300, 0, 2700, 300, 300, 240, 60, 0, 0 }, + { __LINE__, -400, 0, 3600, 400, 400, 320, 80, 0, 0 }, +}; +#define g_FREEMONO_count _countof(g_FREEMONO) + +static const TEST_ENTRY g_DEJAVUSERIF[] = +{ + { __LINE__, 400, 0, 2323, 400, 400, 319, 81, 56, 0 }, + { __LINE__, 300, 0, 1743, 300, 300, 239, 61, 42, 0 }, + { __LINE__, 200, 0, 1162, 200, 200, 159, 41, 28, 0 }, + { __LINE__, 100, 0, 580, 100, 100, 80, 20, 14, 0 }, + { __LINE__, 64, 0, 370, 64, 64, 51, 13, 9, 0 }, + { __LINE__, 32, 0, 190, 32, 32, 26, 6, 4, 0 }, + { __LINE__, 16, 0, 91, 16, 16, 13, 3, 2, 0 }, + { __LINE__, 15, 0, 84, 15, 15, 12, 3, 2, 0 }, + { __LINE__, 14, 0, 82, 14, 14, 11, 3, 2, 0 }, + { __LINE__, 13, 0, 77, 13, 13, 10, 3, 2, 0 }, + { __LINE__, 12, 0, 66, 12, 12, 10, 2, 2, 0 }, + { __LINE__, 11, 0, 63, 11, 11, 9, 2, 2, 0 }, + { __LINE__, 10, 0, 63, 10, 10, 8, 2, 1, 0 }, + { __LINE__, 9, 0, 56, 9, 9, 7, 2, 1, 0 }, + { __LINE__, 8, 0, 49, 8, 8, 6, 2, 1, 0 }, + { __LINE__, 7, 0, 42, 7, 7, 6, 1, 1, 0 }, + { __LINE__, 6, 0, 36, 6, 6, 5, 1, 1, 0 }, + { __LINE__, 5, 0, 26, 5, 5, 4, 1, 1, 0 }, + { __LINE__, 4, 0, 22, 4, 4, 3, 1, 1, 0 }, + { __LINE__, 3, 0, 22, 3, 3, 2, 1, 0, 0 }, + { __LINE__, 2, 0, 15, 2, 2, 2, 0, 0, 0 }, + { __LINE__, 1, 0, 15, 2, 2, 2, 0, 0, 0 }, + { __LINE__, 0, 0, -125, -21, -21, -17, -4, -3, 0 }, + { __LINE__, -1, 0, 15, 2, 2, 2, 0, 0, 0 }, + { __LINE__, -2, 0, 15, 2, 2, 2, 0, 0, 0 }, + { __LINE__, -3, 0, 22, 4, 4, 3, 1, 1, 0 }, + { __LINE__, -4, 0, 26, 5, 5, 4, 1, 1, 0 }, + { __LINE__, -5, 0, 36, 6, 6, 5, 1, 1, 0 }, + { __LINE__, -6, 0, 42, 7, 7, 6, 1, 1, 0 }, + { __LINE__, -7, 0, 49, 8, 8, 6, 2, 1, 0 }, + { __LINE__, -8, 0, 56, 9, 9, 7, 2, 1, 0 }, + { __LINE__, -9, 0, 63, 10, 10, 8, 2, 1, 0 }, + { __LINE__, -10, 0, 66, 11, 11, 9, 2, 1, 0 }, + { __LINE__, -11, 0, 77, 13, 13, 10, 3, 2, 0 }, + { __LINE__, -12, 0, 82, 14, 14, 11, 3, 2, 0 }, + { __LINE__, -13, 0, 84, 15, 15, 12, 3, 2, 0 }, + { __LINE__, -14, 0, 91, 16, 16, 13, 3, 2, 0 }, + { __LINE__, -15, 0, 103, 18, 18, 14, 4, 3, 0 }, + { __LINE__, -16, 0, 114, 19, 19, 15, 4, 3, 0 }, + { __LINE__, -32, 0, 214, 38, 38, 30, 8, 6, 0 }, + { __LINE__, -64, 0, 431, 74, 74, 59, 15, 10, 0 }, + { __LINE__, -100, 0, 674, 117, 117, 93, 24, 17, 0 }, + { __LINE__, -200, 0, 1352, 233, 233, 186, 47, 33, 0 }, + { __LINE__, -300, 0, 2026, 349, 349, 278, 71, 49, 0 }, + { __LINE__, -400, 0, 2702, 465, 465, 371, 94, 65, 0 }, +}; +#define g_DEJAVUSERIF_count _countof(g_DEJAVUSERIF) + +static const TEST_ENTRY g_DEJAVUSANS[] = +{ + { __LINE__, 400, 0, 2286, 400, 400, 319, 81, 56, 0 }, + { __LINE__, 300, 0, 1715, 300, 300, 239, 61, 42, 0 }, + { __LINE__, 200, 0, 1145, 200, 200, 159, 41, 28, 0 }, + { __LINE__, 100, 0, 573, 100, 100, 80, 20, 14, 0 }, + { __LINE__, 64, 0, 366, 64, 64, 51, 13, 9, 0 }, + { __LINE__, 32, 0, 188, 32, 32, 26, 6, 4, 0 }, + { __LINE__, 16, 0, 91, 16, 16, 13, 3, 2, 0 }, + { __LINE__, 15, 0, 84, 15, 15, 12, 3, 2, 0 }, + { __LINE__, 14, 0, 84, 14, 14, 11, 3, 2, 0 }, + { __LINE__, 13, 0, 79, 13, 13, 10, 3, 2, 0 }, + { __LINE__, 12, 0, 62, 12, 12, 10, 2, 2, 0 }, + { __LINE__, 11, 0, 64, 11, 11, 9, 2, 2, 0 }, + { __LINE__, 10, 0, 64, 10, 10, 8, 2, 1, 0 }, + { __LINE__, 9, 0, 54, 9, 9, 7, 2, 1, 0 }, + { __LINE__, 8, 0, 46, 8, 8, 6, 2, 1, 0 }, + { __LINE__, 7, 0, 41, 7, 7, 6, 1, 1, 0 }, + { __LINE__, 6, 0, 35, 6, 6, 5, 1, 1, 0 }, + { __LINE__, 5, 0, 25, 5, 5, 4, 1, 1, 0 }, + { __LINE__, 4, 0, 22, 4, 4, 3, 1, 1, 0 }, + { __LINE__, 3, 0, 22, 3, 3, 2, 1, 0, 0 }, + { __LINE__, 2, 0, 15, 2, 2, 2, 0, 0, 0 }, + { __LINE__, 1, 0, 15, 2, 2, 2, 0, 0, 0 }, + { __LINE__, 0, 0, -116, -21, -21, -17, -4, -3, 0 }, + { __LINE__, -1, 0, 15, 2, 2, 2, 0, 0, 0 }, + { __LINE__, -2, 0, 15, 2, 2, 2, 0, 0, 0 }, + { __LINE__, -3, 0, 22, 4, 4, 3, 1, 1, 0 }, + { __LINE__, -4, 0, 25, 5, 5, 4, 1, 1, 0 }, + { __LINE__, -5, 0, 35, 6, 6, 5, 1, 1, 0 }, + { __LINE__, -6, 0, 41, 7, 7, 6, 1, 1, 0 }, + { __LINE__, -7, 0, 46, 8, 8, 6, 2, 1, 0 }, + { __LINE__, -8, 0, 54, 9, 9, 7, 2, 1, 0 }, + { __LINE__, -9, 0, 64, 10, 10, 8, 2, 1, 0 }, + { __LINE__, -10, 0, 62, 11, 11, 9, 2, 1, 0 }, + { __LINE__, -11, 0, 79, 13, 13, 10, 3, 2, 0 }, + { __LINE__, -12, 0, 84, 14, 14, 11, 3, 2, 0 }, + { __LINE__, -13, 0, 84, 15, 15, 12, 3, 2, 0 }, + { __LINE__, -14, 0, 91, 16, 16, 13, 3, 2, 0 }, + { __LINE__, -15, 0, 98, 18, 18, 14, 4, 3, 0 }, + { __LINE__, -16, 0, 102, 19, 19, 15, 4, 3, 0 }, + { __LINE__, -32, 0, 215, 38, 38, 30, 8, 6, 0 }, + { __LINE__, -64, 0, 423, 74, 74, 59, 15, 10, 0 }, + { __LINE__, -100, 0, 665, 117, 117, 93, 24, 17, 0 }, + { __LINE__, -200, 0, 1331, 233, 233, 186, 47, 33, 0 }, + { __LINE__, -300, 0, 1992, 349, 349, 278, 71, 49, 0 }, + { __LINE__, -400, 0, 2657, 465, 465, 371, 94, 65, 0 }, +}; +#define g_DEJAVUSANS_count _countof(g_DEJAVUSANS) + +static const TEST_ENTRY g_UBUNTUMONO[] = +{ + { __LINE__, 400, 0, 3000, 400, 400, 332, 68, 0, 0 }, + { __LINE__, 300, 0, 2250, 300, 300, 249, 51, 0, 0 }, + { __LINE__, 200, 0, 1500, 200, 200, 166, 34, 1, 0 }, + { __LINE__, 100, 0, 735, 100, 100, 83, 17, 2, 0 }, + { __LINE__, 64, 0, 465, 63, 63, 53, 10, 2, 0 }, + { __LINE__, 32, 0, 240, 31, 31, 26, 5, 0, 0 }, + { __LINE__, 16, 0, 105, 16, 16, 13, 3, 3, 0 }, + { __LINE__, 15, 0, 90, 15, 15, 12, 3, 4, 0 }, + { __LINE__, 14, 0, 75, 14, 14, 11, 3, 5, 0 }, + { __LINE__, 13, 0, 60, 13, 13, 10, 3, 5, 0 }, + { __LINE__, 12, 0, 60, 12, 12, 10, 2, 5, 0 }, + { __LINE__, 11, 0, 60, 11, 11, 9, 2, 4, 0 }, + { __LINE__, 10, 0, 60, 10, 10, 8, 2, 3, 0 }, + { __LINE__, 9, 0, 60, 9, 9, 7, 2, 2, 0 }, + { __LINE__, 8, 0, 60, 8, 8, 7, 1, 1, 0 }, + { __LINE__, 7, 0, 60, 7, 7, 6, 1, 0, 0 }, + { __LINE__, 6, 0, 45, 6, 6, 5, 1, 0, 0 }, + { __LINE__, 5, 0, 45, 5, 5, 4, 1, 0, 0 }, + { __LINE__, 4, 0, 30, 4, 4, 3, 1, 0, 0 }, + { __LINE__, 3, 0, 30, 3, 3, 2, 1, 0, 0 }, + { __LINE__, 2, 0, 15, 2, 2, 2, 0, 0, 0 }, + { __LINE__, 1, 0, 15, 2, 2, 2, 0, 0, 0 }, + { __LINE__, 0, 0, -135, -19, -19, -16, -3, -1, 0 }, + { __LINE__, -1, 0, 15, 2, 2, 2, 0, 0, 0 }, + { __LINE__, -2, 0, 15, 2, 2, 2, 0, 0, 0 }, + { __LINE__, -3, 0, 30, 3, 3, 2, 1, 0, 0 }, + { __LINE__, -4, 0, 30, 4, 4, 3, 1, 0, 0 }, + { __LINE__, -5, 0, 45, 5, 5, 4, 1, 0, 0 }, + { __LINE__, -6, 0, 45, 6, 6, 5, 1, 0, 0 }, + { __LINE__, -7, 0, 60, 7, 7, 6, 1, 0, 0 }, + { __LINE__, -8, 0, 60, 13, 13, 10, 3, 5, 0 }, + { __LINE__, -9, 0, 75, 14, 14, 11, 3, 5, 0 }, + { __LINE__, -10, 0, 75, 14, 14, 11, 3, 4, 0 }, + { __LINE__, -11, 0, 90, 15, 15, 12, 3, 4, 0 }, + { __LINE__, -12, 0, 90, 15, 15, 12, 3, 3, 0 }, + { __LINE__, -13, 0, 105, 16, 16, 13, 3, 3, 0 }, + { __LINE__, -14, 0, 105, 17, 17, 14, 3, 3, 0 }, + { __LINE__, -15, 0, 105, 17, 17, 14, 3, 2, 0 }, + { __LINE__, -16, 0, 120, 18, 18, 15, 3, 2, 0 }, + { __LINE__, -32, 0, 240, 33, 33, 28, 5, 1, 0 }, + { __LINE__, -64, 0, 480, 66, 66, 55, 11, 2, 0 }, + { __LINE__, -100, 0, 750, 101, 101, 84, 17, 1, 0 }, + { __LINE__, -200, 0, 1500, 201, 201, 167, 34, 1, 0 }, + { __LINE__, -300, 0, 2250, 300, 300, 249, 51, 0, 0 }, + { __LINE__, -400, 0, 3000, 400, 400, 332, 68, 0, 0 }, +}; +#define g_UBUNTUMONO_count _countof(g_UBUNTUMONO) + +static const TEST_ENTRY g_MSGOTHIC[] = +{ + { __LINE__, 400, 0, 3000, 400, 400, 344, 56, 0, 0 }, + { __LINE__, 300, 0, 2250, 300, 300, 258, 42, 0, 0 }, + { __LINE__, 200, 0, 1500, 200, 200, 172, 28, 0, 0 }, + { __LINE__, 100, 0, 750, 100, 100, 86, 14, 0, 0 }, + { __LINE__, 64, 0, 480, 64, 64, 55, 9, 0, 0 }, + { __LINE__, 32, 0, 240, 33, 33, 28, 5, 1, 0 }, + { __LINE__, 16, 0, 120, 16, 16, 14, 2, 0, 0 }, + { __LINE__, 15, 0, 120, 15, 15, 13, 2, 0, 0 }, + { __LINE__, 14, 0, 105, 14, 14, 12, 2, 0, 0 }, + { __LINE__, 13, 0, 105, 13, 13, 11, 2, 0, 0 }, + { __LINE__, 12, 0, 90, 12, 12, 10, 2, 0, 0 }, + { __LINE__, 11, 0, 90, 11, 11, 9, 2, 0, 0 }, + { __LINE__, 10, 0, 75, 10, 10, 9, 1, 0, 0 }, + { __LINE__, 9, 0, 75, 9, 9, 8, 1, 0, 0 }, + { __LINE__, 8, 0, 60, 8, 8, 7, 1, 0, 0 }, + { __LINE__, 7, 0, 60, 7, 7, 6, 1, 0, 0 }, + { __LINE__, 6, 0, 45, 6, 6, 5, 1, 0, 0 }, + { __LINE__, 5, 0, 45, 5, 5, 4, 1, 0, 0 }, + { __LINE__, 4, 0, 30, 4, 4, 3, 1, 0, 0 }, + { __LINE__, 3, 0, 30, 3, 3, 3, 0, 0, 0 }, + { __LINE__, 2, 0, 15, 2, 2, 2, 0, 0, 0 }, + { __LINE__, 1, 0, 15, 2, 2, 2, 0, 0, 0 }, + { __LINE__, 0, 0, -135, -18, -18, -15, -3, 0, 0 }, + { __LINE__, -1, 0, 15, 2, 2, 2, 0, 0, 0 }, + { __LINE__, -2, 0, 15, 2, 2, 2, 0, 0, 0 }, + { __LINE__, -3, 0, 30, 3, 3, 3, 0, 0, 0 }, + { __LINE__, -4, 0, 30, 4, 4, 3, 1, 0, 0 }, + { __LINE__, -5, 0, 45, 5, 5, 4, 1, 0, 0 }, + { __LINE__, -6, 0, 45, 6, 6, 5, 1, 0, 0 }, + { __LINE__, -7, 0, 60, 7, 7, 6, 1, 0, 0 }, + { __LINE__, -8, 0, 60, 8, 8, 7, 1, 0, 0 }, + { __LINE__, -9, 0, 75, 9, 9, 8, 1, 0, 0 }, + { __LINE__, -10, 0, 75, 10, 10, 9, 1, 0, 0 }, + { __LINE__, -11, 0, 90, 11, 11, 9, 2, 0, 0 }, + { __LINE__, -12, 0, 90, 12, 12, 10, 2, 0, 0 }, + { __LINE__, -13, 0, 105, 13, 13, 11, 2, 0, 0 }, + { __LINE__, -14, 0, 105, 14, 14, 12, 2, 0, 0 }, + { __LINE__, -15, 0, 120, 15, 15, 13, 2, 0, 0 }, + { __LINE__, -16, 0, 120, 16, 16, 14, 2, 0, 0 }, + { __LINE__, -32, 0, 240, 33, 33, 28, 5, 1, 0 }, + { __LINE__, -64, 0, 480, 64, 64, 55, 9, 0, 0 }, + { __LINE__, -100, 0, 750, 100, 100, 86, 14, 0, 0 }, + { __LINE__, -200, 0, 1500, 200, 200, 172, 28, 0, 0 }, + { __LINE__, -300, 0, 2250, 300, 300, 258, 42, 0, 0 }, + { __LINE__, -400, 0, 3000, 400, 400, 344, 56, 0, 0 }, +}; +#define g_MSGOTHIC_count _countof(g_MSGOTHIC) + +static const TEST_ENTRY g_MSMINCHO[] = +{ + { __LINE__, 400, 0, 3000, 400, 400, 344, 56, 0, 0 }, + { __LINE__, 300, 0, 2250, 300, 300, 258, 42, 0, 0 }, + { __LINE__, 200, 0, 1500, 200, 200, 172, 28, 0, 0 }, + { __LINE__, 100, 0, 750, 100, 100, 86, 14, 0, 0 }, + { __LINE__, 64, 0, 480, 64, 64, 55, 9, 0, 0 }, + { __LINE__, 32, 0, 240, 33, 33, 28, 5, 1, 0 }, + { __LINE__, 16, 0, 120, 16, 16, 14, 2, 0, 0 }, + { __LINE__, 15, 0, 120, 15, 15, 13, 2, 0, 0 }, + { __LINE__, 14, 0, 105, 14, 14, 12, 2, 0, 0 }, + { __LINE__, 13, 0, 105, 13, 13, 11, 2, 0, 0 }, + { __LINE__, 12, 0, 90, 12, 12, 10, 2, 0, 0 }, + { __LINE__, 11, 0, 90, 11, 11, 9, 2, 0, 0 }, + { __LINE__, 10, 0, 75, 10, 10, 9, 1, 0, 0 }, + { __LINE__, 9, 0, 75, 9, 9, 8, 1, 0, 0 }, + { __LINE__, 8, 0, 60, 8, 8, 7, 1, 0, 0 }, + { __LINE__, 7, 0, 60, 7, 7, 6, 1, 0, 0 }, + { __LINE__, 6, 0, 45, 6, 6, 5, 1, 0, 0 }, + { __LINE__, 5, 0, 45, 5, 5, 4, 1, 0, 0 }, + { __LINE__, 4, 0, 30, 4, 4, 3, 1, 0, 0 }, + { __LINE__, 3, 0, 30, 3, 3, 3, 0, 0, 0 }, + { __LINE__, 2, 0, 15, 2, 2, 2, 0, 0, 0 }, + { __LINE__, 1, 0, 15, 2, 2, 2, 0, 0, 0 }, + { __LINE__, 0, 0, -135, -18, -18, -15, -3, 0, 0 }, + { __LINE__, -1, 0, 15, 2, 2, 2, 0, 0, 0 }, + { __LINE__, -2, 0, 15, 2, 2, 2, 0, 0, 0 }, + { __LINE__, -3, 0, 30, 3, 3, 3, 0, 0, 0 }, + { __LINE__, -4, 0, 30, 4, 4, 3, 1, 0, 0 }, + { __LINE__, -5, 0, 45, 5, 5, 4, 1, 0, 0 }, + { __LINE__, -6, 0, 45, 6, 6, 5, 1, 0, 0 }, + { __LINE__, -7, 0, 60, 7, 7, 6, 1, 0, 0 }, + { __LINE__, -8, 0, 60, 8, 8, 7, 1, 0, 0 }, + { __LINE__, -9, 0, 75, 9, 9, 8, 1, 0, 0 }, + { __LINE__, -10, 0, 75, 10, 10, 9, 1, 0, 0 }, + { __LINE__, -11, 0, 90, 11, 11, 9, 2, 0, 0 }, + { __LINE__, -12, 0, 90, 12, 12, 10, 2, 0, 0 }, + { __LINE__, -13, 0, 105, 13, 13, 11, 2, 0, 0 }, + { __LINE__, -14, 0, 105, 14, 14, 12, 2, 0, 0 }, + { __LINE__, -15, 0, 120, 15, 15, 13, 2, 0, 0 }, + { __LINE__, -16, 0, 120, 16, 16, 14, 2, 0, 0 }, + { __LINE__, -32, 0, 240, 33, 33, 28, 5, 1, 0 }, + { __LINE__, -64, 0, 480, 64, 64, 55, 9, 0, 0 }, + { __LINE__, -100, 0, 750, 100, 100, 86, 14, 0, 0 }, + { __LINE__, -200, 0, 1500, 200, 200, 172, 28, 0, 0 }, + { __LINE__, -300, 0, 2250, 300, 300, 258, 42, 0, 0 }, + { __LINE__, -400, 0, 3000, 400, 400, 344, 56, 0, 0 }, +}; +#define g_MSMINCHO_count _countof(g_MSMINCHO) +#endif + +typedef struct FONT_ENTRY +{ + const char *entry_name; + const char *font_name; + const char *font_file; + size_t test_count; + const TEST_ENTRY *tests; +} FONT_ENTRY; + +static FONT_ENTRY g_font_entries[] = +{ +#ifdef EMIT_TESTCASES + { "FREEMONO", "FreeMono", "FreeMono.ttf" }, + { "DEJAVUSERIF", "DejaVu Serif", "DejaVuSerif.ttf" }, + { "DEJAVUSANS", "DejaVu Sans", "DejaVuSans.ttf" }, + { "UBUNTUMONO", "Ubuntu Mono", "UbuntuMono-R.ttf" }, + { "MSGOTHIC", "MS Gothic", "msgothic.ttc" }, + { "MSMINCHO", "MS Mincho", "msmincho.ttc" }, +#else + { "FREEMONO", "FreeMono", "FreeMono.ttf", g_FREEMONO_count, g_FREEMONO }, + { "DEJAVUSERIF", "DejaVu Serif", "DejaVuSerif.ttf", g_DEJAVUSERIF_count, g_DEJAVUSERIF }, + { "DEJAVUSANS", "DejaVu Sans", "DejaVuSans.ttf", g_DEJAVUSANS_count, g_DEJAVUSANS }, + { "UBUNTUMONO", "Ubuntu Mono", "UbuntuMono-R.ttf", g_UBUNTUMONO_count, g_UBUNTUMONO }, + { "MSGOTHIC", "MS Gothic", "msgothic.ttc", g_MSGOTHIC_count, g_MSGOTHIC }, + { "MSMINCHO", "MS Mincho", "msmincho.ttc", g_MSMINCHO_count, g_MSMINCHO }, +#endif +}; +static size_t g_font_entry_count = _countof(g_font_entries); + +START_TEST(GetTextMetrics) +{ + size_t i, k; + LOGFONTA lf; + HFONT hFont; + HDC hDC; + HGDIOBJ hFontOld; + SIZE siz; + TEXTMETRIC tm; + char szPath[MAX_PATH]; + static const char *text = "This is a test."; + + hDC = CreateCompatibleDC(NULL); + for (i = 0; i < g_font_entry_count; ++i) + { + FONT_ENTRY *font = &g_font_entries[i]; + ZeroMemory(&lf, sizeof(lf)); + lf.lfCharSet = DEFAULT_CHARSET; + lstrcpyA(lf.lfFaceName, font->font_name); + + GetWindowsDirectoryA(szPath, MAX_PATH); + lstrcatA(szPath, "\\Fonts\\"); + lstrcatA(szPath, font->font_file); + if (GetFileAttributesA(szPath) == 0xFFFFFFFF) + { + skip("Font file '%s' doesn't exists\n", font->font_file); + continue; + } + +#ifdef EMIT_TESTCASES + printf("static const TEST_ENTRY g_%s[] =\n", font->entry_name); + printf("{\n"); + for (k = 0; k < g_test_entry_count; ++k) + { + const TEST_ENTRY *test = &g_test_entries[k]; + + lf.lfHeight = test->lfHeight; + lf.lfWidth = test->lfWidth; + + hFont = CreateFontIndirectA(&lf); + hFontOld = SelectObject(hDC, hFont); + { + GetTextExtentPoint32A(hDC, text, lstrlenA(text), &siz); + GetTextMetrics(hDC, &tm); + } + SelectObject(hDC, hFontOld); + DeleteObject(hFont); + + printf(" { __LINE__, %ld, %ld, %ld, %ld, %ld, %ld, %ld, %ld, %ld },\n", + lf.lfHeight, lf.lfWidth, + siz.cx, siz.cy, + tm.tmHeight, tm.tmAscent, tm.tmDescent, tm.tmInternalLeading, tm.tmExternalLeading); + } + printf("};\n"); + printf("#define g_%s_count _countof(g_%s)\n\n", font->entry_name, font->entry_name); +#else + for (k = 0; k < font->test_count; ++k) + { + const TEST_ENTRY *test = &font->tests[k]; + + lf.lfHeight = test->lfHeight; + lf.lfWidth = test->lfWidth; + + hFont = CreateFontIndirectA(&lf); + hFontOld = SelectObject(hDC, hFont); + { + GetTextExtentPoint32A(hDC, text, lstrlenA(text), &siz); + GetTextMetrics(hDC, &tm); + } + SelectObject(hDC, hFontOld); + DeleteObject(hFont); + + if (test->cxText > 0) + { + ok_(__FILE__, test->line)(labs(test->cxText - siz.cx) <= 1, "%s (%ld): cxText: labs(%ld - %ld) > 1\n", font->entry_name, test->lfHeight, test->cxText, siz.cx); + ok_(__FILE__, test->line)(labs(test->cxText - siz.cx) == 0, "%s (%ld): cxText: labs(%ld - %ld) != 0\n", font->entry_name, test->lfHeight, test->cxText, siz.cx); + } + if (test->cyText > 0) + { + ok_(__FILE__, test->line)(labs(test->cyText - siz.cy) <= 1, "%s (%ld): cyText: labs(%ld - %ld) > 1\n", font->entry_name, test->lfHeight, test->cyText, siz.cy); + ok_(__FILE__, test->line)(labs(test->cyText - siz.cy) == 0, "%s (%ld): cyText: labs(%ld - %ld) != 0\n", font->entry_name, test->lfHeight, test->cyText, siz.cy); + } + if (test->tmHeight > 0) + { + ok_(__FILE__, test->line)(labs(test->tmHeight - tm.tmHeight) <= 1, "%s (%ld): tmHeight: labs(%ld - %ld) > 1\n", font->entry_name, test->lfHeight, test->tmHeight, tm.tmHeight); + ok_(__FILE__, test->line)(labs(test->tmHeight - tm.tmHeight) == 0, "%s (%ld): tmHeight: labs(%ld - %ld) != 0\n", font->entry_name, test->lfHeight, test->tmHeight, tm.tmHeight); + } + if (test->tmAscent > 0) + { + ok_(__FILE__, test->line)(labs(test->tmAscent - tm.tmAscent) <= 1, "%s (%ld): tmAscent: labs(%ld - %ld) > 1\n", font->entry_name, test->lfHeight, test->tmAscent, tm.tmAscent); + ok_(__FILE__, test->line)(labs(test->tmAscent - tm.tmAscent) == 0, "%s (%ld): tmAscent: labs(%ld - %ld) != 0\n", font->entry_name, test->lfHeight, test->tmAscent, tm.tmAscent); + } + if (test->tmDescent > 0) + { + ok_(__FILE__, test->line)(labs(test->tmDescent - tm.tmDescent) <= 1, "%s (%ld): tmDescent: labs(%ld - %ld) > 1\n", font->entry_name, test->lfHeight, test->tmDescent, tm.tmDescent); + ok_(__FILE__, test->line)(labs(test->tmDescent - tm.tmDescent) == 0, "%s (%ld): tmDescent: labs(%ld - %ld) != 0\n", font->entry_name, test->lfHeight, test->tmDescent, tm.tmDescent); + } + if (test->tmInternalLeading > 0) + { + ok_(__FILE__, test->line)(labs(test->tmInternalLeading - tm.tmInternalLeading) <= 1, "%s (%ld): tmInternalLeading: labs(%ld - %ld) > 1\n", font->entry_name, test->lfHeight, test->tmInternalLeading, tm.tmInternalLeading); + ok_(__FILE__, test->line)(labs(test->tmInternalLeading - tm.tmInternalLeading) == 0, "%s (%ld): tmInternalLeading: labs(%ld - %ld) != 0\n", font->entry_name, test->lfHeight, test->tmInternalLeading, tm.tmInternalLeading); + } + if (test->tmExternalLeading > 0) + { + ok_(__FILE__, test->line)(labs(test->tmExternalLeading - tm.tmExternalLeading) <= 1, "%s (%ld): tmExternalLeading: labs(%ld - %ld) > 1\n", font->entry_name, test->lfHeight, test->tmExternalLeading, tm.tmExternalLeading); + ok_(__FILE__, test->line)(labs(test->tmExternalLeading - tm.tmExternalLeading) == 0, "%s (%ld): tmExternalLeading: labs(%ld - %ld) != 0\n", font->entry_name, test->lfHeight, test->tmExternalLeading, tm.tmExternalLeading); + } + } +#endif + } + DeleteDC(hDC); +} diff --git a/modules/rostests/apitests/gdi32/testlist.c b/modules/rostests/apitests/gdi32/testlist.c index db6ded95cc..c466cde5bd 100644 --- a/modules/rostests/apitests/gdi32/testlist.c +++ b/modules/rostests/apitests/gdi32/testlist.c @@ -54,6 +54,7 @@ extern void func_GetRandomRgn(void); extern void func_GetStockObject(void); extern void func_GetTextExtentExPoint(void); extern void func_GetTextFace(void); +extern void func_GetTextMetrics(void); extern void func_MaskBlt(void); extern void func_NtGdiAddFontResource(void); extern void func_OffsetClipRgn(void); @@ -126,6 +127,7 @@ const struct test winetest_testlist[] = { "GetRandomRgn", func_GetRandomRgn }, { "GetStockObject", func_GetStockObject }, { "GetTextExtentExPoint", func_GetTextExtentExPoint }, + { "GetTextMetrics", func_GetTextMetrics }, { "GetTextFace", func_GetTextFace }, { "MaskBlt", func_MaskBlt }, { "NtGdiAddFontResource", func_NtGdiAddFontResource},

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs