Ros-diffs August 2015

ros-diffs@reactos.org

15 participants
301 discussions

[pschweitzer] 68705: [SETUPAPI] Partly sync with Wine 1.7.47: - Implement SetupCloseLog(), SetupOpenLog(), SetupLogErrorA(), SetupLogErrorW() CORE-9924
by pschweitzer＠svn.reactos.org 13 Aug '15

13 Aug '15

Author: pschweitzer Date: Thu Aug 13 09:38:33 2015 New Revision: 68705 URL: http://svn.reactos.org/svn/reactos?rev=68705&view=rev Log: [SETUPAPI] Partly sync with Wine 1.7.47: - Implement SetupCloseLog(), SetupOpenLog(), SetupLogErrorA(), SetupLogErrorW() CORE-9924 Modified: trunk/reactos/dll/win32/setupapi/misc.c trunk/reactos/dll/win32/setupapi/setupapi.spec trunk/reactos/dll/win32/setupapi/setupcab.c trunk/reactos/dll/win32/setupapi/stubs.c Modified: trunk/reactos/dll/win32/setupapi/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/misc.c?… ============================================================================== --- trunk/reactos/dll/win32/setupapi/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/misc.c [iso-8859-1] Thu Aug 13 09:38:33 2015 @@ -27,6 +27,18 @@ /* Unicode constants */ static const WCHAR BackSlash[] = {'\\',0}; static const WCHAR TranslationRegKey[] = {'\\','V','e','r','F','i','l','e','I','n','f','o','\\','T','r','a','n','s','l','a','t','i','o','n',0}; + +/* Handles and critical sections for the SetupLog API */ +static HANDLE setupact = INVALID_HANDLE_VALUE; +static HANDLE setuperr = INVALID_HANDLE_VALUE; +static CRITICAL_SECTION setupapi_cs; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &setupapi_cs, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": setupapi_cs") } +}; +static CRITICAL_SECTION setupapi_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; DWORD GetFunctionPointer( @@ -1964,4 +1976,143 @@ SetLastError(ERROR_SUCCESS); return TRUE; -} +} + +/*********************************************************************** + * SetupCloseLog(SETUPAPI.@) + */ +void WINAPI SetupCloseLog(void) +{ + EnterCriticalSection(&setupapi_cs); + + CloseHandle(setupact); + setupact = INVALID_HANDLE_VALUE; + + CloseHandle(setuperr); + setuperr = INVALID_HANDLE_VALUE; + + LeaveCriticalSection(&setupapi_cs); +} + +/*********************************************************************** + * SetupOpenLog(SETUPAPI.@) + */ +BOOL WINAPI SetupOpenLog(BOOL reserved) +{ + WCHAR path[MAX_PATH]; + + static const WCHAR setupactlog[] = {'\\','s','e','t','u','p','a','c','t','.','l','o','g',0}; + static const WCHAR setuperrlog[] = {'\\','s','e','t','u','p','e','r','r','.','l','o','g',0}; + + EnterCriticalSection(&setupapi_cs); + + if (setupact != INVALID_HANDLE_VALUE && setuperr != INVALID_HANDLE_VALUE) + { + LeaveCriticalSection(&setupapi_cs); + return TRUE; + } + + GetWindowsDirectoryW(path, MAX_PATH); + lstrcatW(path, setupactlog); + + setupact = CreateFileW(path, FILE_GENERIC_WRITE, FILE_SHARE_WRITE | FILE_SHARE_READ, + NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if (setupact == INVALID_HANDLE_VALUE) + { + LeaveCriticalSection(&setupapi_cs); + return FALSE; + } + + SetFilePointer(setupact, 0, NULL, FILE_END); + + GetWindowsDirectoryW(path, MAX_PATH); + lstrcatW(path, setuperrlog); + + setuperr = CreateFileW(path, FILE_GENERIC_WRITE, FILE_SHARE_WRITE | FILE_SHARE_READ, + NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if (setuperr == INVALID_HANDLE_VALUE) + { + CloseHandle(setupact); + setupact = INVALID_HANDLE_VALUE; + LeaveCriticalSection(&setupapi_cs); + return FALSE; + } + + SetFilePointer(setuperr, 0, NULL, FILE_END); + + LeaveCriticalSection(&setupapi_cs); + + return TRUE; +} + +/*********************************************************************** + * SetupLogErrorA(SETUPAPI.@) + */ +BOOL WINAPI SetupLogErrorA(LPCSTR message, LogSeverity severity) +{ + static const char null[] = "(null)"; + BOOL ret; + DWORD written; + DWORD len; + + EnterCriticalSection(&setupapi_cs); + + if (setupact == INVALID_HANDLE_VALUE || setuperr == INVALID_HANDLE_VALUE) + { + SetLastError(ERROR_FILE_INVALID); + ret = FALSE; + goto done; + } + + if (message == NULL) + message = null; + + len = lstrlenA(message); + + ret = WriteFile(setupact, message, len, &written, NULL); + if (!ret) + goto done; + + if (severity >= LogSevMaximum) + { + ret = FALSE; + goto done; + } + + if (severity > LogSevInformation) + ret = WriteFile(setuperr, message, len, &written, NULL); + +done: + LeaveCriticalSection(&setupapi_cs); + return ret; +} + +/*********************************************************************** + * SetupLogErrorW(SETUPAPI.@) + */ +BOOL WINAPI SetupLogErrorW(LPCWSTR message, LogSeverity severity) +{ + LPSTR msg = NULL; + DWORD len; + BOOL ret; + + if (message) + { + len = WideCharToMultiByte(CP_ACP, 0, message, -1, NULL, 0, NULL, NULL); + msg = HeapAlloc(GetProcessHeap(), 0, len); + if (msg == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + WideCharToMultiByte(CP_ACP, 0, message, -1, msg, len, NULL, NULL); + } + + /* This is the normal way to proceed. The log files are ASCII files + * and W is to be converted. + */ + ret = SetupLogErrorA(msg, severity); + + HeapFree(GetProcessHeap(), 0, msg); + return ret; +} Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Thu Aug 13 09:38:33 2015 @@ -452,7 +452,7 @@ @ stdcall SetupInstallServicesFromInfSectionW(long wstr long) @ stdcall SetupIterateCabinetA(str long ptr ptr) @ stdcall SetupIterateCabinetW(wstr long ptr ptr) -@ stub SetupLogErrorA +@ stdcall SetupLogErrorA(str long) @ stdcall SetupLogErrorW(wstr long) @ stub SetupLogFileA @ stub SetupLogFileW Modified: trunk/reactos/dll/win32/setupapi/setupcab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupca… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupcab.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupcab.c [iso-8859-1] Thu Aug 13 09:38:33 2015 @@ -675,6 +675,7 @@ break; case DLL_PROCESS_DETACH: UnloadCABINETDll(); + SetupCloseLog(); break; } Modified: trunk/reactos/dll/win32/setupapi/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/stubs.c [iso-8859-1] Thu Aug 13 09:38:33 2015 @@ -27,32 +27,6 @@ { FIXME("%08x %08x: stub\n", x, y); return FALSE; -} - -/*********************************************************************** - * SetupCloseLog(SETUPAPI.@) - */ -void WINAPI SetupCloseLog(void) -{ - FIXME("() stub\n"); -} - -/*********************************************************************** - * SetupLogErrorW(SETUPAPI.@) - */ -BOOL WINAPI SetupLogErrorW(LPCWSTR MessageString, LogSeverity Severity) -{ - FIXME("(%s, %d) stub\n", debugstr_w(MessageString), Severity); - return TRUE; -} - -/*********************************************************************** - * SetupOpenLog(SETUPAPI.@) - */ -BOOL WINAPI SetupOpenLog(BOOL Reserved) -{ - FIXME("(%d) stub\n", Reserved); - return TRUE; } /***********************************************************************

1 0

[pschweitzer] 68704: [FASTFAT] - Remove some magic values - Fix DPRINTs
by pschweitzer＠svn.reactos.org 12 Aug '15

12 Aug '15

Author: pschweitzer Date: Wed Aug 12 16:47:18 2015 New Revision: 68704 URL: http://svn.reactos.org/svn/reactos?rev=68704&view=rev Log: [FASTFAT] - Remove some magic values - Fix DPRINTs Modified: trunk/reactos/drivers/filesystems/fastfat/fat.c Modified: trunk/reactos/drivers/filesystems/fastfat/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fat.c [iso-8859-1] Wed Aug 12 16:47:18 2015 @@ -40,7 +40,7 @@ ChunkSize = CACHEPAGESIZE(DeviceExt); FATOffset = CurrentCluster * sizeof(ULONG); Offset.QuadPart = ROUND_DOWN(FATOffset, ChunkSize); - if (!CcMapData(DeviceExt->FATFileObject, &Offset, ChunkSize, 1, &Context, &BaseAddress)) + if (!CcMapData(DeviceExt->FATFileObject, &Offset, ChunkSize, MAP_WAIT, &Context, &BaseAddress)) { return STATUS_UNSUCCESSFUL; } @@ -105,7 +105,7 @@ *NextCluster = 0; Offset.QuadPart = 0; - if (!CcMapData(DeviceExt->FATFileObject, &Offset, DeviceExt->FatInfo.FATSectors * DeviceExt->FatInfo.BytesPerSector, 1, &Context, &BaseAddress)) + if (!CcMapData(DeviceExt->FATFileObject, &Offset, DeviceExt->FatInfo.FATSectors * DeviceExt->FatInfo.BytesPerSector, MAP_WAIT, &Context, &BaseAddress)) { return STATUS_UNSUCCESSFUL; } @@ -160,9 +160,9 @@ for (i = StartCluster; i < FatLength;) { Offset.QuadPart = ROUND_DOWN(i * 2, ChunkSize); - if (!CcPinRead(DeviceExt->FATFileObject, &Offset, ChunkSize, 1, &Context, &BaseAddress)) + if (!CcPinRead(DeviceExt->FATFileObject, &Offset, ChunkSize, PIN_WAIT, &Context, &BaseAddress)) { - DPRINT1("CcMapData(Offset %x, Length %u) failed\n", (ULONG)Offset.QuadPart, ChunkSize); + DPRINT1("CcPinRead(Offset %x, Length %u) failed\n", (ULONG)Offset.QuadPart, ChunkSize); return STATUS_UNSUCCESSFUL; } @@ -219,9 +219,9 @@ *Cluster = 0; StartCluster = DeviceExt->LastAvailableCluster; Offset.QuadPart = 0; - if (!CcPinRead(DeviceExt->FATFileObject, &Offset, DeviceExt->FatInfo.FATSectors * DeviceExt->FatInfo.BytesPerSector, 1, &Context, &BaseAddress)) - { - DPRINT1("CcMapData(Offset %x, Length %u) failed\n", (ULONG)Offset.QuadPart, DeviceExt->FatInfo.FATSectors * DeviceExt->FatInfo.BytesPerSector); + if (!CcPinRead(DeviceExt->FATFileObject, &Offset, DeviceExt->FatInfo.FATSectors * DeviceExt->FatInfo.BytesPerSector, PIN_WAIT, &Context, &BaseAddress)) + { + DPRINT1("CcPinRead(Offset %x, Length %u) failed\n", (ULONG)Offset.QuadPart, DeviceExt->FatInfo.FATSectors * DeviceExt->FatInfo.BytesPerSector); return STATUS_UNSUCCESSFUL; } @@ -289,9 +289,9 @@ for (i = StartCluster; i < FatLength;) { Offset.QuadPart = ROUND_DOWN(i * 4, ChunkSize); - if (!CcPinRead(DeviceExt->FATFileObject, &Offset, ChunkSize, 1, &Context, &BaseAddress)) + if (!CcPinRead(DeviceExt->FATFileObject, &Offset, ChunkSize, PIN_WAIT, &Context, &BaseAddress)) { - DPRINT1("CcMapData(Offset %x, Length %u) failed\n", (ULONG)Offset.QuadPart, ChunkSize); + DPRINT1("CcPinRead(Offset %x, Length %u) failed\n", (ULONG)Offset.QuadPart, ChunkSize); return STATUS_UNSUCCESSFUL; } Block = (PULONG)((ULONG_PTR)BaseAddress + (i * 4) % ChunkSize); @@ -342,7 +342,7 @@ PUSHORT CBlock; Offset.QuadPart = 0; - if (!CcMapData(DeviceExt->FATFileObject, &Offset, DeviceExt->FatInfo.FATSectors * DeviceExt->FatInfo.BytesPerSector, 1, &Context, &BaseAddress)) + if (!CcMapData(DeviceExt->FATFileObject, &Offset, DeviceExt->FatInfo.FATSectors * DeviceExt->FatInfo.BytesPerSector, MAP_WAIT, &Context, &BaseAddress)) { return STATUS_UNSUCCESSFUL; } @@ -397,7 +397,7 @@ for (i = 2; i < FatLength; ) { Offset.QuadPart = ROUND_DOWN(i * 2, ChunkSize); - if (!CcMapData(DeviceExt->FATFileObject, &Offset, ChunkSize, 1, &Context, &BaseAddress)) + if (!CcMapData(DeviceExt->FATFileObject, &Offset, ChunkSize, MAP_WAIT, &Context, &BaseAddress)) { return STATUS_UNSUCCESSFUL; } @@ -447,7 +447,7 @@ for (i = 2; i < FatLength; ) { Offset.QuadPart = ROUND_DOWN(i * 4, ChunkSize); - if (!CcMapData(DeviceExt->FATFileObject, &Offset, ChunkSize, 1, &Context, &BaseAddress)) + if (!CcMapData(DeviceExt->FATFileObject, &Offset, ChunkSize, MAP_WAIT, &Context, &BaseAddress)) { DPRINT1("CcMapData(Offset %x, Length %u) failed\n", (ULONG)Offset.QuadPart, ChunkSize); return STATUS_UNSUCCESSFUL; @@ -513,7 +513,7 @@ LARGE_INTEGER Offset; Offset.QuadPart = 0; - if (!CcPinRead(DeviceExt->FATFileObject, &Offset, DeviceExt->FatInfo.FATSectors * DeviceExt->FatInfo.BytesPerSector, 1, &Context, &BaseAddress)) + if (!CcPinRead(DeviceExt->FATFileObject, &Offset, DeviceExt->FatInfo.FATSectors * DeviceExt->FatInfo.BytesPerSector, PIN_WAIT, &Context, &BaseAddress)) { return STATUS_UNSUCCESSFUL; } @@ -562,7 +562,7 @@ ChunkSize = CACHEPAGESIZE(DeviceExt); FATOffset = ClusterToWrite * 2; Offset.QuadPart = ROUND_DOWN(FATOffset, ChunkSize); - if (!CcPinRead(DeviceExt->FATFileObject, &Offset, ChunkSize, 1, &Context, &BaseAddress)) + if (!CcPinRead(DeviceExt->FATFileObject, &Offset, ChunkSize, PIN_WAIT, &Context, &BaseAddress)) { return STATUS_UNSUCCESSFUL; } @@ -598,7 +598,7 @@ FATOffset = (ClusterToWrite * 4); Offset.QuadPart = ROUND_DOWN(FATOffset, ChunkSize); - if (!CcPinRead(DeviceExt->FATFileObject, &Offset, ChunkSize, 1, &Context, &BaseAddress)) + if (!CcPinRead(DeviceExt->FATFileObject, &Offset, ChunkSize, PIN_WAIT, &Context, &BaseAddress)) { return STATUS_UNSUCCESSFUL; }

1 0

[pschweitzer] 68703: [NTFS] Notify when we're done mounting a volume
by pschweitzer＠svn.reactos.org 12 Aug '15

12 Aug '15

Author: pschweitzer Date: Wed Aug 12 12:13:28 2015 New Revision: 68703 URL: http://svn.reactos.org/svn/reactos?rev=68703&view=rev Log: [NTFS] Notify when we're done mounting a volume Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Wed Aug 12 12:13:28 2015 @@ -523,6 +523,8 @@ Vcb->NtfsInfo.VolumeLabel, Vcb->NtfsInfo.VolumeLabelLength); + FsRtlNotifyVolumeEvent(Vcb->StreamFileObject, FSRTL_VOLUME_MOUNT); + Status = STATUS_SUCCESS; ByeBye:

1 0

[tkreuzer] 68702: [WIN23K] Make sure to attach to the specified process before dereferencing ClientInfo, which is a user mode structure. CORE-l0017 #resolve
by tkreuzer＠svn.reactos.org 12 Aug '15

12 Aug '15

Author: tkreuzer Date: Wed Aug 12 10:34:05 2015 New Revision: 68702 URL: http://svn.reactos.org/svn/reactos?rev=68702&view=rev Log: [WIN23K] Make sure to attach to the specified process before dereferencing ClientInfo, which is a user mode structure. CORE-l0017 #resolve Modified: trunk/reactos/win32ss/user/ntuser/message.c Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Wed Aug 12 10:34:05 2015 @@ -2870,6 +2870,7 @@ NTSTATUS Status; HANDLE Handles[3]; LARGE_INTEGER Timeout; + KAPC_STATE ApcState; UserEnterExclusive(); @@ -2915,12 +2916,16 @@ if (dwMilliseconds != INFINITE) Timeout.QuadPart = (LONGLONG) dwMilliseconds * (LONGLONG) -10000; + KeStackAttachProcess(&Process->Pcb, &ApcState); + W32Process->W32PF_flags |= W32PF_WAITFORINPUTIDLE; for (pti = W32Process->ptiList; pti; pti = pti->ptiSibling) { pti->TIF_flags |= TIF_WAITFORINPUTIDLE; pti->pClientInfo->dwTIFlags = pti->TIF_flags; } + + KeUnstackDetachProcess(&ApcState); TRACE("WFII: ppi %p\n", W32Process); TRACE("WFII: waiting for %p\n", Handles[1] );

1 0

[bfreisen] 68701: [MSPAINT_NEW] Add a .hhp with all dependencies explicitly listed to facilitate testing of hhpcomp, which does not track them yet
by bfreisen＠svn.reactos.org 12 Aug '15

12 Aug '15

Author: bfreisen Date: Wed Aug 12 09:13:52 2015 New Revision: 68701 URL: http://svn.reactos.org/svn/reactos?rev=68701&view=rev Log: [MSPAINT_NEW] Add a .hhp with all dependencies explicitly listed to facilitate testing of hhpcomp, which does not track them yet Added: trunk/reactos/base/applications/mspaint_new/help/Paint_all_files.hhp (with props) Added: trunk/reactos/base/applications/mspaint_new/help/Paint_all_files.hhp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/help/Paint_all_files.hhp (added) +++ trunk/reactos/base/applications/mspaint_new/help/Paint_all_files.hhp [iso-8859-1] Wed Aug 12 09:13:52 2015 @@ -0,0 +1,43 @@ +[OPTIONS] +Compatibility=1.1 or later +Compiled file=Paint.chm +Contents file=Table of Contents.hhc +Default topic=usage.html +Display compile progress=No +Language=0x407 Deutsch (Deutschland) +Title=Hilfe zu Paint für ReactOS + + +[FILES] +airbrush.png +appwindow.png +bezier.png +brush.png +color.png +ellipse.png +fill.png +freesel.png +line.png +palette.png +pen.png +rect.png +rectsel.png +rrect.png +rubber.png +settings1.png +settings2.png +settings3.png +settings4.png +settings5.png +settings6.png +settings.html +shape.png +Table of Contents.hhc +text.png +toolbox.png +tools.html +usage.html +zoom.png + +[INFOTYPES] + Propchange: trunk/reactos/base/applications/mspaint_new/help/Paint_all_files.hhp ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[pschweitzer] 68700: [HHPCOMP] Enable build
by pschweitzer＠svn.reactos.org 11 Aug '15

11 Aug '15

Author: pschweitzer Date: Tue Aug 11 21:26:29 2015 New Revision: 68700 URL: http://svn.reactos.org/svn/reactos?rev=68700&view=rev Log: [HHPCOMP] Enable build Modified: trunk/reactos/tools/CMakeLists.txt Modified: trunk/reactos/tools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/CMakeLists.txt?rev=6… ============================================================================== --- trunk/reactos/tools/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/CMakeLists.txt [iso-8859-1] Tue Aug 11 21:26:29 2015 @@ -15,7 +15,7 @@ add_subdirectory(cabman) add_subdirectory(cdmake) -# add_subdirectory(hhpcomp) +add_subdirectory(hhpcomp) add_subdirectory(hpp) add_subdirectory(kbdtool) add_subdirectory(mkhive)

1 0

[pschweitzer] 68699: [HHPCOMP] - Fix warnings
by pschweitzer＠svn.reactos.org 11 Aug '15

11 Aug '15

Author: pschweitzer Date: Tue Aug 11 21:25:08 2015 New Revision: 68699 URL: http://svn.reactos.org/svn/reactos?rev=68699&view=rev Log: [HHPCOMP] - Fix warnings Modified: trunk/reactos/tools/hhpcomp/chmc/chmc.c Modified: trunk/reactos/tools/hhpcomp/chmc/chmc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hhpcomp/chmc/chmc.c?… ============================================================================== --- trunk/reactos/tools/hhpcomp/chmc/chmc.c [iso-8859-1] (original) +++ trunk/reactos/tools/hhpcomp/chmc/chmc.c [iso-8859-1] Tue Aug 11 21:25:08 2015 @@ -994,7 +994,7 @@ UInt64 compressed; chmc_dump( "Aligned data at %d(in compressed stream, %d) (%lu/%lu)\n", - uncomp, comp, lzx_info->done, lzx_info->todo ); + uncomp, comp, (unsigned long)lzx_info->done, (unsigned long)lzx_info->todo ); compressed = comp; @@ -1497,7 +1497,7 @@ chmc_pmgi_add_entry(chm, name, i); } else - BUG_ON("name_len >= 255(%lu) %.*s\n", name_len, 255, + BUG_ON("name_len >= 255(%lu) %.*s\n", (unsigned long)name_len, 255, &pmgl->chunk.data[j]); i++; }

1 0

[pschweitzer] 68698: [HHPCOMP] - Fix warnings
by pschweitzer＠svn.reactos.org 11 Aug '15

11 Aug '15

Author: pschweitzer Date: Tue Aug 11 21:17:30 2015 New Revision: 68698 URL: http://svn.reactos.org/svn/reactos?rev=68698&view=rev Log: [HHPCOMP] - Fix warnings Modified: trunk/reactos/tools/hhpcomp/lzx_compress/lz_nonslide.c Modified: trunk/reactos/tools/hhpcomp/lzx_compress/lz_nonslide.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hhpcomp/lzx_compress… ============================================================================== --- trunk/reactos/tools/hhpcomp/lzx_compress/lz_nonslide.c [iso-8859-1] (original) +++ trunk/reactos/tools/hhpcomp/lzx_compress/lz_nonslide.c [iso-8859-1] Tue Aug 11 21:17:30 2015 @@ -27,6 +27,7 @@ #include <string.h> #include <windows.h> #else + #include <string.h> #include <strings.h> #ifdef DEBUG_PERF #include <sys/time.h>

1 0

[tfaber] 68697: [HHPCOMP] - Fix VC10 build - Don't cast function pointers - Fix warnings
by tfaber＠svn.reactos.org 11 Aug '15

11 Aug '15

Author: tfaber Date: Tue Aug 11 21:16:24 2015 New Revision: 68697 URL: http://svn.reactos.org/svn/reactos?rev=68697&view=rev Log: [HHPCOMP] - Fix VC10 build - Don't cast function pointers - Fix warnings Modified: trunk/reactos/tools/hhpcomp/chmc/chmc.c trunk/reactos/tools/hhpcomp/chmc/err.c Modified: trunk/reactos/tools/hhpcomp/chmc/chmc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hhpcomp/chmc/chmc.c?… ============================================================================== --- trunk/reactos/tools/hhpcomp/chmc/chmc.c [iso-8859-1] (original) +++ trunk/reactos/tools/hhpcomp/chmc/chmc.c [iso-8859-1] Tue Aug 11 21:16:24 2015 @@ -30,10 +30,6 @@ #include <stdlib.h> #include <sys/types.h> #include <sys/stat.h> -#if !defined(__GNUC__) || defined(__MINGW32__) -typedef int (*__compar_fn_t)(const void *, const void *); -#endif - #else #include <unistd.h> #endif @@ -70,10 +66,6 @@ void chmc_entries_free(struct chmcFile *chm); void chmc_entry_destroy(struct chmcTreeNode *node); int chmc_add_tree(struct chmcFile *chm, const char *dir); -static int _add_tree_file( struct dir_tree_global *dtg, - struct dir_tree_local *dtl ); -static int _add_tree_dir(struct dir_tree_global *dtg, - struct dir_tree_local *dtl); struct chmcTreeNode *chmc_add_file(struct chmcFile *chm, const char *filename, UInt16 prefixlen, int sect_id, UChar *buf, UInt64 len); @@ -92,7 +84,7 @@ void chmc_pmgl_done(struct chmcFile *chm); void chmc_entries_qsort(struct chmcFile *chm); -static int _entry_cmp(struct chmcTreeNode **pa, struct chmcTreeNode **pb); +static int _entry_cmp(const void *pva, const void *pvb); struct chmcSection *chmc_section_lookup(struct chmcFile *chm, int id); @@ -1209,12 +1201,14 @@ } qsort(chm->sort_entries, chm->entries_num, sizeof(struct chmcTreeNode *), - (__compar_fn_t) _entry_cmp); -} - -static int _entry_cmp(struct chmcTreeNode **pa, struct chmcTreeNode **pb) -{ - struct chmcTreeNode *a = *pa, *b = *pb; + _entry_cmp); +} + +static int _entry_cmp(const void *pva, const void *pvb) +{ + const struct chmcTreeNode * const *pa = pva; + const struct chmcTreeNode * const *pb = pvb; + const struct chmcTreeNode *a = *pa, *b = *pb; return strcmp( &a->name[a->prefixlen], &b->name[b->prefixlen] ); } Modified: trunk/reactos/tools/hhpcomp/chmc/err.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hhpcomp/chmc/err.c?r… ============================================================================== --- trunk/reactos/tools/hhpcomp/chmc/err.c [iso-8859-1] (original) +++ trunk/reactos/tools/hhpcomp/chmc/err.c [iso-8859-1] Tue Aug 11 21:16:24 2015 @@ -30,8 +30,8 @@ }; static struct chmcErr chmc_err = { - .code = CHMC_NOERR, - .msg[0] = '\0', + CHMC_NOERR, + '\0', }; void chmcerr_clean(void) {

1 0

[bfreisen] 68696: [HHPCOMP] Apply changes proposed by learn_more which supposedly fix the GCCWin build
by bfreisen＠svn.reactos.org 11 Aug '15

11 Aug '15

Author: bfreisen Date: Tue Aug 11 21:06:37 2015 New Revision: 68696 URL: http://svn.reactos.org/svn/reactos?rev=68696&view=rev Log: [HHPCOMP] Apply changes proposed by learn_more which supposedly fix the GCCWin build Modified: trunk/reactos/tools/hhpcomp/chmc/chmc.c trunk/reactos/tools/hhpcomp/utils.cpp Modified: trunk/reactos/tools/hhpcomp/chmc/chmc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hhpcomp/chmc/chmc.c?… ============================================================================== --- trunk/reactos/tools/hhpcomp/chmc/chmc.c [iso-8859-1] (original) +++ trunk/reactos/tools/hhpcomp/chmc/chmc.c [iso-8859-1] Tue Aug 11 21:06:37 2015 @@ -30,7 +30,7 @@ #include <stdlib.h> #include <sys/types.h> #include <sys/stat.h> -#ifndef __GNUC__ +#if !defined(__GNUC__) || defined(__MINGW32__) typedef int (*__compar_fn_t)(const void *, const void *); #endif Modified: trunk/reactos/tools/hhpcomp/utils.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hhpcomp/utils.cpp?re… ============================================================================== --- trunk/reactos/tools/hhpcomp/utils.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/hhpcomp/utils.cpp [iso-8859-1] Tue Aug 11 21:06:37 2015 @@ -22,6 +22,7 @@ #include <stdexcept> #if defined(_WIN32) + #define WIN32_LEAN_AND_MEAN #include <windows.h> // for GetFullPathNameA #else #include <unistd.h>

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2015