Ros-diffs May 2018

ros-diffs@reactos.org

23 participants
218 discussions

01/01: [IPHLPAPI] ipstats_reactos: Review all TRACE/WARN calls
by Serge Gautherie 17 May '18

17 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c9359221c9bcf5549fb8… commit 6c9359221c9bcf5549fb8693834de51ab509cdee Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Feb 24 16:16:26 2018 +0100 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Thu May 17 17:11:17 2018 +0100 [IPHLPAPI] ipstats_reactos: Review all TRACE/WARN calls - Improve/Promote failures to ERR. - Improve other TRACE calls. --- dll/win32/iphlpapi/ipstats_reactos.c | 86 +++++++++++++++++------------------- 1 file changed, 41 insertions(+), 45 deletions(-) diff --git a/dll/win32/iphlpapi/ipstats_reactos.c b/dll/win32/iphlpapi/ipstats_reactos.c index ed95d42705..a886931a8b 100644 --- a/dll/win32/iphlpapi/ipstats_reactos.c +++ b/dll/win32/iphlpapi/ipstats_reactos.c @@ -81,8 +81,8 @@ NTSTATUS getNthIpEntity( HANDLE tcpFile, DWORD index, TDIEntityID *ent ) { } if( numRoutes == index && i < numEntities ) { - TRACE("Index %d is entity #%d - %04x:%08x\n", index, i, - entitySet[i].tei_entity, entitySet[i].tei_instance ); + TRACE("Index %lu is entity #%d - %04x:%08x\n", index, i, + entitySet[i].tei_entity, entitySet[i].tei_instance); memcpy( ent, &entitySet[i], sizeof(*ent) ); tdiFreeThingSet( entitySet ); return STATUS_SUCCESS; @@ -100,8 +100,8 @@ NTSTATUS tdiGetMibForIpEntity memset( entry, 0, sizeof( *entry ) ); - TRACE("TdiGetMibForIpEntity(tcpFile %x,entityId %x)\n", - (DWORD)tcpFile, ent->tei_instance); + TRACE("TdiGetMibForIpEntity(tcpFile 0x%p, entityId 0x%x)\n", + tcpFile, ent->tei_instance); req.ID.toi_class = INFO_CLASS_PROTOCOL; req.ID.toi_type = INFO_TYPE_PROVIDER; @@ -117,31 +117,31 @@ NTSTATUS tdiGetMibForIpEntity &returnSize, NULL ); - TRACE("TdiGetMibForIpEntity() => {\n" - " ipsi_forwarding ............ %d\n" - " ipsi_defaultttl ............ %d\n" - " ipsi_inreceives ............ %d\n" - " ipsi_indelivers ............ %d\n" - " ipsi_outrequests ........... %d\n" - " ipsi_routingdiscards ....... %d\n" - " ipsi_outdiscards ........... %d\n" - " ipsi_outnoroutes ........... %d\n" - " ipsi_numif ................. %d\n" - " ipsi_numaddr ............... %d\n" - " ipsi_numroutes ............. %d\n" - "} status %08x\n", - entry->ipsi_forwarding, - entry->ipsi_defaultttl, - entry->ipsi_inreceives, - entry->ipsi_indelivers, - entry->ipsi_outrequests, - entry->ipsi_routingdiscards, - entry->ipsi_outdiscards, - entry->ipsi_outnoroutes, - entry->ipsi_numif, - entry->ipsi_numaddr, - entry->ipsi_numroutes, - status); + TRACE("TdiGetMibForIpEntity() => status = 0x%08lx, entry = {\n" + " ipsi_forwarding ............ %lu\n" + " ipsi_defaultttl ............ %lu\n" + " ipsi_inreceives ............ %lu\n" + " ipsi_indelivers ............ %lu\n" + " ipsi_outrequests ........... %lu\n" + " ipsi_routingdiscards ....... %lu\n" + " ipsi_outdiscards ........... %lu\n" + " ipsi_outnoroutes ........... %lu\n" + " ipsi_numif ................. %lu\n" + " ipsi_numaddr ............... %lu\n" + " ipsi_numroutes ............. %lu\n" + "}\n", + status, + entry->ipsi_forwarding, + entry->ipsi_defaultttl, + entry->ipsi_inreceives, + entry->ipsi_indelivers, + entry->ipsi_outrequests, + entry->ipsi_routingdiscards, + entry->ipsi_outdiscards, + entry->ipsi_outnoroutes, + entry->ipsi_numif, + entry->ipsi_numaddr, + entry->ipsi_numroutes); return status; } @@ -150,8 +150,8 @@ NTSTATUS tdiGetRoutesForIpEntity ( HANDLE tcpFile, TDIEntityID *ent, IPRouteEntry **routes, PDWORD numRoutes ) { NTSTATUS status = STATUS_SUCCESS; - TRACE("TdiGetRoutesForIpEntity(tcpFile %x,entityId %x)\n", - (DWORD)tcpFile, ent->tei_instance); + TRACE("TdiGetRoutesForIpEntity(tcpFile 0x%p, entityId 0x%x)\n", + tcpFile, ent->tei_instance); status = tdiGetSetOfThings( tcpFile, INFO_CLASS_PROTOCOL, @@ -171,8 +171,8 @@ NTSTATUS tdiGetIpAddrsForIpEntity ( HANDLE tcpFile, TDIEntityID *ent, IPAddrEntry **addrs, PDWORD numAddrs ) { NTSTATUS status; - TRACE("TdiGetIpAddrsForIpEntity(tcpFile %x,entityId %x)\n", - (DWORD)tcpFile, ent->tei_instance); + TRACE("TdiGetIpAddrsForIpEntity(tcpFile 0x%p, entityId 0x%x)\n", + tcpFile, ent->tei_instance); status = tdiGetSetOfThings( tcpFile, INFO_CLASS_PROTOCOL, @@ -367,16 +367,14 @@ DWORD getNumRoutes(void) TRACE("called.\n"); status = openTcpFile( &tcpFile, FILE_READ_DATA ); - if( !NT_SUCCESS(status) ) { - TRACE("failure: %08x\n", (int)status ); + ERR("openTcpFile returned 0x%08lx\n", status); return 0; } status = tdiGetEntityIDSet( tcpFile, &entitySet, &numEntities ); - if( !NT_SUCCESS(status) ) { - TRACE("failure: %08x\n", (int)status ); + ERR("tdiGetEntityIDSet returned 0x%08lx\n", status); closeTcpFile( tcpFile ); return 0; } @@ -387,7 +385,7 @@ DWORD getNumRoutes(void) memset( &isnmp, 0, sizeof( isnmp ) ); status = tdiGetMibForIpEntity( tcpFile, &entitySet[i], &isnmp ); if( !NT_SUCCESS(status) ) { - WARN("tdiGetMibForIpEntity failed for i = %d", i); + ERR("tdiGetMibForIpEntity returned 0x%08lx, for i = %d", status, i); numRoutes = 0; break; } @@ -395,7 +393,7 @@ DWORD getNumRoutes(void) } } - TRACE("numRoutes: %d\n", (int)numRoutes); + TRACE("numRoutes = %lu\n", numRoutes); tdiFreeThingSet( entitySet ); closeTcpFile( tcpFile ); @@ -454,7 +452,7 @@ RouteTable *getRouteTable(void) return 0; } - TRACE( "%d routes in instance %d\n", numRoutes, i ); + TRACE("%lu routes in instance %d\n", numRoutes, i); #if 0 HexDump( route_set, sizeof( IPRouteEntry ) * @@ -482,7 +480,7 @@ RouteTable *getRouteTable(void) closeTcpFile( tcpFile ); - TRACE("Return: %08x, %08x\n", status, out_route_table); + TRACE("status = 0x%08lx, out_route_table = 0x%p\n", status, out_route_table); return out_route_table; } @@ -500,9 +498,8 @@ DWORD getNumArpEntries(void) TRACE("called.\n"); status = openTcpFile( &tcpFile, FILE_READ_DATA ); - if( !NT_SUCCESS(status) ) { - TRACE("failure: %08x\n", (int)status ); + ERR("openTcpFile returned 0x%08lx\n", status); return 0; } @@ -552,9 +549,8 @@ PMIB_IPNETTABLE getArpTable(void) totalNumber = getNumArpEntries(); status = openTcpFile( &tcpFile, FILE_READ_DATA ); - if( !NT_SUCCESS(status) ) { - TRACE("failure: %08x\n", (int)status ); + ERR("openTcpFile returned 0x%08lx\n", status); return 0; }

1 0

01/01: [CHARMAP]Code improvements (#436)
by Baruch Rutman 17 May '18

17 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf34d6bf8b0e1d243020b… commit bf34d6bf8b0e1d243020b67a0fb3ca6206e77b6b Author: Baruch Rutman <peterooch(a)gmail.com> AuthorDate: Thu May 17 18:18:57 2018 +0300 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Thu May 17 16:18:57 2018 +0100 [CHARMAP]Code improvements (#436) * [CHARMAP][GETUNAME] Code improvements Based on the code from nls2txt, switches the linking from dynamic to static, also simplifies the code. --- base/applications/charmap/CMakeLists.txt | 2 +- base/applications/charmap/charmap.c | 31 ++++--------------------------- base/applications/charmap/precomp.h | 2 ++ 3 files changed, 7 insertions(+), 28 deletions(-) diff --git a/base/applications/charmap/CMakeLists.txt b/base/applications/charmap/CMakeLists.txt index e576b741e1..d2e497554e 100644 --- a/base/applications/charmap/CMakeLists.txt +++ b/base/applications/charmap/CMakeLists.txt @@ -10,6 +10,6 @@ list(APPEND SOURCE add_rc_deps(charmap.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/charmap.ico) add_executable(charmap ${SOURCE} charmap.rc) set_module_type(charmap win32gui UNICODE) -add_importlibs(charmap advapi32 user32 gdi32 comctl32 msvcrt kernel32) +add_importlibs(charmap getuname advapi32 user32 gdi32 comctl32 msvcrt kernel32) add_pch(charmap precomp.h SOURCE) add_cd_file(TARGET charmap DESTINATION reactos/system32 FOR all) diff --git a/base/applications/charmap/charmap.c b/base/applications/charmap/charmap.c index 35cc8e6f9f..218f8512c5 100644 --- a/base/applications/charmap/charmap.c +++ b/base/applications/charmap/charmap.c @@ -25,10 +25,6 @@ HICON hSmIcon; HICON hBgIcon; SETTINGS Settings; -/* GetUName prototype */ -typedef int (WINAPI * GETUNAME)(WORD wCharCode, LPWSTR lpbuf); -GETUNAME GetUName; - /* Font-enumeration callback */ static int @@ -165,7 +161,7 @@ CopyCharacters(HWND hDlg) // Test if the whose text is unselected if(dwStart == dwEnd) { - + // Select the whole text SendMessageW(hText, EM_SETSEL, 0, -1); @@ -268,12 +264,9 @@ UpdateStatusBar(WCHAR wch) WCHAR buff[MAX_PATH]; WCHAR szDesc[MAX_PATH]; - if (GetUName) - { - GetUName(wch, szDesc); - wsprintfW(buff, L"U+%04X: %s", wch, szDesc); - SendMessageW(hStatusWnd, SB_SETTEXT, 0, (LPARAM)buff); - } + GetUName(wch, szDesc); + wsprintfW(buff, L"U+%04X: %s", wch, szDesc); + SendMessageW(hStatusWnd, SB_SETTEXT, 0, (LPARAM)buff); } static @@ -593,7 +586,6 @@ wWinMain(HINSTANCE hInst, INT Ret = 1; HMODULE hRichEd20; MSG Msg; - HINSTANCE hGetUName = NULL; hInstance = hInst; @@ -612,18 +604,6 @@ wWinMain(HINSTANCE hInst, iccx.dwICC = ICC_TAB_CLASSES; InitCommonControlsEx(&iccx); - /* Loading the GetUName function */ - hGetUName = LoadLibraryW(L"getuname.dll"); - if (hGetUName != NULL) - { - GetUName = (GETUNAME) GetProcAddress(hGetUName, "GetUName"); - if (GetUName == NULL) - { - FreeLibrary(hGetUName); - hGetUName = NULL; - } - } - if (RegisterMapClasses(hInstance)) { hRichEd20 = LoadLibraryW(L"RICHED20.DLL"); @@ -649,8 +629,5 @@ wWinMain(HINSTANCE hInst, UnregisterMapClasses(hInstance); } - if (hGetUName != NULL) - FreeLibrary(hGetUName); - return Ret; } diff --git a/base/applications/charmap/precomp.h b/base/applications/charmap/precomp.h index 0ade7aa1e7..132f275d4e 100644 --- a/base/applications/charmap/precomp.h +++ b/base/applications/charmap/precomp.h @@ -73,6 +73,8 @@ VOID ShowAboutDlg(HWND hWndParent); BOOL RegisterMapClasses(HINSTANCE hInstance); VOID UnregisterMapClasses(HINSTANCE hInstance); +int WINAPI GetUName(IN WORD wCharCode, OUT LPWSTR lpBuf); + /* charmap.c */ VOID UpdateStatusBar(WCHAR wch); extern VOID ChangeMapFont(HWND hDlg);

1 0

01/01: [KMTEST] Check/Wait for start/stop of services to complete
by Serge Gautherie 17 May '18

17 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0c683c264c7c908e4bcc9… commit 0c683c264c7c908e4bcc971d0a904afb2dad6b41 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Tue Jan 16 05:47:34 2018 +0100 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Thu May 17 16:17:36 2018 +0100 [KMTEST] Check/Wait for start/stop of services to complete This is cleaner behavior and lets report failures. - Create KmtEnsureServiceState(), called at end of KmtStartService() and KmtStopService(). - Create KmtGetServiceStateAsString(), called from KmtEnsureServiceState(). ROSTESTS-263 --- modules/rostests/kmtests/kmtest/service.c | 111 +++++++++++++++++++++++++++++- 1 file changed, 109 insertions(+), 2 deletions(-) diff --git a/modules/rostests/kmtests/kmtest/service.c b/modules/rostests/kmtests/kmtest/service.c index cc2e91a96e..7427fbfdd3 100644 --- a/modules/rostests/kmtests/kmtest/service.c +++ b/modules/rostests/kmtests/kmtest/service.c @@ -4,6 +4,7 @@ * PURPOSE: Kernel-Mode Test Suite loader service control functions * COPYRIGHT: Copyright 2011-2018 Thomas Faber <thomas.faber(a)reactos.org> * Copyright 2017 Ged Murphy <gedmurphy(a)reactos.org> + * Copyright 2018 Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> */ #include <kmt_test.h> @@ -11,7 +12,7 @@ #include <assert.h> -#define SERVICE_ACCESS (SERVICE_START | SERVICE_STOP | DELETE) +#define SERVICE_ACCESS (SERVICE_QUERY_STATUS | SERVICE_START | SERVICE_STOP | DELETE) /* * This is an internal function not meant for use by the kmtests app, @@ -101,6 +102,104 @@ KmtCreateService( ServiceHandle); } +/** + * @name KmtGetServiceStateAsString + * + * @param ServiceState + * Service state as a number + * + * @return Service state as a string + */ +static +PCSTR +KmtGetServiceStateAsString( + IN DWORD ServiceState) +{ + switch(ServiceState) + { + case SERVICE_STOPPED: + return "STOPPED"; + case SERVICE_START_PENDING: + return "START_PENDING"; + case SERVICE_STOP_PENDING: + return "STOP_PENDING"; + case SERVICE_RUNNING: + return "RUNNING"; + case SERVICE_CONTINUE_PENDING: + return "CONTINUE_PENDING"; + case SERVICE_PAUSE_PENDING: + return "PAUSE_PENDING"; + case SERVICE_PAUSED: + return "PAUSED"; + default: + ok(FALSE, "Unknown service state = %lu\n", ServiceState); + return "(Unknown)"; + } +} + +/** + * @name KmtEnsureServiceState + * + * @param ServiceName + * Name of the service to check, + * or NULL + * @param ServiceHandle + * Handle to the service + * @param ExpectedServiceState + * State which the service should be in + * + * @return Win32 error code + */ +static +DWORD +KmtEnsureServiceState( + IN PCWSTR ServiceName OPTIONAL, + IN SC_HANDLE ServiceHandle, + IN DWORD ExpectedServiceState) +{ + DWORD Error = ERROR_SUCCESS; + SERVICE_STATUS ServiceStatus; + DWORD StartTime = GetTickCount(); + DWORD Timeout = 10 * 1000; + PCWSTR ServiceNameOut = ServiceName ? ServiceName : L"(handle only, no name)"; + + assert(ServiceHandle); + assert(ExpectedServiceState); + + if (!QueryServiceStatus(ServiceHandle, &ServiceStatus)) + error_goto(Error, cleanup); + + while (ServiceStatus.dwCurrentState != ExpectedServiceState) + { + // NB: ServiceStatus.dwWaitHint and ServiceStatus.dwCheckPoint logic could be added, if need be. + + Sleep(1 * 1000); + + if (!QueryServiceStatus(ServiceHandle, &ServiceStatus)) + error_goto(Error, cleanup); + + if (GetTickCount() - StartTime >= Timeout) + break; + } + + if (ServiceStatus.dwCurrentState != ExpectedServiceState) + { + ok(FALSE, "Service = %ls, state = %lu %s (!= %lu %s), waitHint = %lu, checkPoint = %lu\n", + ServiceNameOut, + ServiceStatus.dwCurrentState, KmtGetServiceStateAsString(ServiceStatus.dwCurrentState), + ExpectedServiceState, KmtGetServiceStateAsString(ExpectedServiceState), + ServiceStatus.dwWaitHint, ServiceStatus.dwCheckPoint); + goto cleanup; + } + + trace("Service = %ls, state = %lu %s\n", + ServiceNameOut, + ExpectedServiceState, KmtGetServiceStateAsString(ExpectedServiceState)); + +cleanup: + return Error; +} + /** * @name KmtStartService * @@ -133,6 +232,10 @@ KmtStartService( if (!StartService(*ServiceHandle, 0, NULL)) error_goto(Error, cleanup); + Error = KmtEnsureServiceState(ServiceName, *ServiceHandle, SERVICE_RUNNING); + if (Error) + goto cleanup; + cleanup: return Error; } @@ -228,6 +331,10 @@ KmtStopService( if (!ControlService(*ServiceHandle, SERVICE_CONTROL_STOP, &ServiceStatus)) error_goto(Error, cleanup); + Error = KmtEnsureServiceState(ServiceName, *ServiceHandle, SERVICE_STOPPED); + if (Error) + goto cleanup; + cleanup: return Error; } @@ -340,4 +447,4 @@ KmtpCreateService( cleanup: return Error; -} \ No newline at end of file +}

1 0

03/03: Fixed typo
by Peter Wathall 17 May '18

17 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ae9cc6bb520ba0ec547b5… commit ae9cc6bb520ba0ec547b51780cc98b556f676175 Author: Peter Wathall <PeterWathall(a)users.noreply.github.com> AuthorDate: Mon Apr 30 00:17:19 2018 +0000 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Thu May 17 16:15:25 2018 +0100 Fixed typo --- drivers/usb/usbhub/usbhub.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/usbhub/usbhub.c b/drivers/usb/usbhub/usbhub.c index fbb9811b6f..da2b80dbe2 100644 --- a/drivers/usb/usbhub/usbhub.c +++ b/drivers/usb/usbhub/usbhub.c @@ -1,10 +1,10 @@ /* * PROJECT: ReactOS Universal Serial Bus Hub Driver * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbhub/fdo.c + * FILE: drivers/usb/usbhub/usbhub.c * PURPOSE: UsbHub Driver * PROGRAMMERS: - * Herv� Poussineau (hpoussin(a)reactos.org) + * Hervé Poussineau (hpoussin(a)reactos.org) * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) */

1 0

02/03: Fixed typo
by Peter Wathall 17 May '18

17 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6412253d440525c785d20… commit 6412253d440525c785d206de1874762df4eef075 Author: Peter Wathall <PeterWathall(a)users.noreply.github.com> AuthorDate: Mon Apr 30 00:17:01 2018 +0000 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Thu May 17 16:15:25 2018 +0100 Fixed typo --- drivers/usb/usbhub/pdo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/usbhub/pdo.c b/drivers/usb/usbhub/pdo.c index cadb5c7857..b39098f9f8 100644 --- a/drivers/usb/usbhub/pdo.c +++ b/drivers/usb/usbhub/pdo.c @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Universal Serial Bus Hub Driver * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbhub/fdo.c + * FILE: drivers/usb/usbhub/pdo.c * PURPOSE: Handle PDO * PROGRAMMERS: * Hervé Poussineau (hpoussin(a)reactos.org)

1 0

01/03: Fixed typo
by Peter Wathall 17 May '18

17 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3a3a4f797067fc145eb7e… commit 3a3a4f797067fc145eb7e9f7603d06f2ae54d50e Author: Peter Wathall <PeterWathall(a)users.noreply.github.com> AuthorDate: Mon Apr 30 00:16:45 2018 +0000 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Thu May 17 16:15:25 2018 +0100 Fixed typo --- drivers/usb/usbhub/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/usbhub/misc.c b/drivers/usb/usbhub/misc.c index 405fde8eba..33eacbe8b1 100644 --- a/drivers/usb/usbhub/misc.c +++ b/drivers/usb/usbhub/misc.c @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Universal Serial Bus Hub Driver * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbhub/fdo.c + * FILE: drivers/usb/usbhub/misc.c * PURPOSE: Misc helper functions * PROGRAMMERS: * Michael Martin (michael.martin(a)reactos.org)

1 0

01/01: [FASTFAT] Deny dismounting system volume or a volume with a pagefile
by Pierre Schweitzer 16 May '18

16 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d37280efaab68188e55f4… commit d37280efaab68188e55f4db3ef2882e54fff3163 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed May 16 21:44:47 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed May 16 21:45:35 2018 +0200 [FASTFAT] Deny dismounting system volume or a volume with a pagefile --- drivers/filesystems/fastfat/create.c | 2 ++ drivers/filesystems/fastfat/fsctl.c | 10 ++++++++++ drivers/filesystems/fastfat/vfat.h | 1 + 3 files changed, 13 insertions(+) diff --git a/drivers/filesystems/fastfat/create.c b/drivers/filesystems/fastfat/create.c index 7ecc0ffae1..d9efa96828 100644 --- a/drivers/filesystems/fastfat/create.c +++ b/drivers/filesystems/fastfat/create.c @@ -778,6 +778,7 @@ VfatCreateFile( if (PagingFileCreate) { pFcb->Flags |= FCB_IS_PAGE_FILE; + SetFlag(DeviceExt->Flags, VCB_IS_SYS_OR_HAS_PAGE); } } else @@ -897,6 +898,7 @@ VfatCreateFile( else { pFcb->Flags |= FCB_IS_PAGE_FILE; + SetFlag(DeviceExt->Flags, VCB_IS_SYS_OR_HAS_PAGE); } } else diff --git a/drivers/filesystems/fastfat/fsctl.c b/drivers/filesystems/fastfat/fsctl.c index abd772648a..778a2bce8b 100644 --- a/drivers/filesystems/fastfat/fsctl.c +++ b/drivers/filesystems/fastfat/fsctl.c @@ -777,6 +777,10 @@ VfatMount( } VolumeFcb->Flags |= VCB_IS_DIRTY; + if (BooleanFlagOn(Vpb->RealDevice->Flags, DO_SYSTEM_BOOT_PARTITION)) + { + SetFlag(DeviceExt->Flags, VCB_IS_SYS_OR_HAS_PAGE); + } FsRtlNotifyVolumeEvent(DeviceExt->FATFileObject, FSRTL_VOLUME_MOUNT); FsRtlNotifyInitializeSync(&DeviceExt->NotifySync); @@ -1174,6 +1178,12 @@ VfatDismountVolume( return STATUS_ACCESS_DENIED; } + /* Deny dismount of boot volume */ + if (BooleanFlagOn(DeviceExt->Flags, VCB_IS_SYS_OR_HAS_PAGE)) + { + return STATUS_ACCESS_DENIED; + } + /* Race condition? */ if (BooleanFlagOn(DeviceExt->Flags, VCB_DISMOUNT_PENDING)) { diff --git a/drivers/filesystems/fastfat/vfat.h b/drivers/filesystems/fastfat/vfat.h index cb38b16699..e58b61bb57 100644 --- a/drivers/filesystems/fastfat/vfat.h +++ b/drivers/filesystems/fastfat/vfat.h @@ -239,6 +239,7 @@ typedef union _DIR_ENTRY DIR_ENTRY, *PDIR_ENTRY; #define VCB_VOLUME_LOCKED 0x0001 #define VCB_DISMOUNT_PENDING 0x0002 #define VCB_IS_FATX 0x0004 +#define VCB_IS_SYS_OR_HAS_PAGE 0x0008 #define VCB_IS_DIRTY 0x4000 /* Volume is dirty */ #define VCB_CLEAR_DIRTY 0x8000 /* Clean dirty flag at shutdown */

1 0

01/01: [USETUP] Remove the WIN32 support because usetup is a native-only application
by Eric Kohl 15 May '18

15 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7c3cff3a6859cabadb7df… commit 7c3cff3a6859cabadb7df300bbf5a86cd53c04a2 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue May 15 23:35:17 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue May 15 23:35:17 2018 +0200 [USETUP] Remove the WIN32 support because usetup is a native-only application --- base/setup/usetup/CMakeLists.txt | 6 +- base/setup/usetup/bootsup.c | 12 ---- base/setup/usetup/{native/utils => }/console.c | 2 +- base/setup/usetup/{native/utils => }/console.h | 5 +- base/setup/usetup/consup.c | 2 +- base/setup/usetup/filesup.c | 19 +----- base/setup/usetup/fslist.c | 10 ++- base/setup/usetup/inffile.c | 85 ------------------------- base/setup/usetup/inffile.h | 8 --- base/setup/usetup/{native/utils => }/keytrans.c | 2 +- base/setup/usetup/{native/utils => }/keytrans.h | 2 +- base/setup/usetup/native/console.c | 7 -- base/setup/usetup/native/fslist.c | 31 --------- base/setup/usetup/native/host_native.h | 5 -- base/setup/usetup/registry.c | 43 ------------- base/setup/usetup/usetup.c | 5 -- base/setup/usetup/usetup.h | 7 -- base/setup/usetup/usetup.rc | 4 +- 18 files changed, 18 insertions(+), 237 deletions(-) diff --git a/base/setup/usetup/CMakeLists.txt b/base/setup/usetup/CMakeLists.txt index 8ca8471f5e..8dff7a5ab1 100644 --- a/base/setup/usetup/CMakeLists.txt +++ b/base/setup/usetup/CMakeLists.txt @@ -8,14 +8,11 @@ include_directories( ${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers) list(APPEND SOURCE - native/utils/keytrans.c - native/utils/console.c - native/fslist.c - native/console.c bootsup.c cabinet.c chkdsk.c cmdcons.c + console.c consup.c devinst.c drivesup.c @@ -26,6 +23,7 @@ list(APPEND SOURCE genlist.c inffile.c inicache.c + keytrans.c mui.c partlist.c progress.c diff --git a/base/setup/usetup/bootsup.c b/base/setup/usetup/bootsup.c index f6818293e7..75319fba95 100644 --- a/base/setup/usetup/bootsup.c +++ b/base/setup/usetup/bootsup.c @@ -2249,7 +2249,6 @@ InstallFatBootcodeToPartition( PUNICODE_STRING DestinationArcPath, UCHAR PartitionType) { -#ifdef __REACTOS__ NTSTATUS Status; BOOLEAN DoesFreeLdrExist; WCHAR SrcPath[MAX_PATH]; @@ -2494,9 +2493,6 @@ InstallFatBootcodeToPartition( } return STATUS_SUCCESS; -#else - return STATUS_NOT_IMPLEMENTED; -#endif } static @@ -2507,7 +2503,6 @@ InstallExt2BootcodeToPartition( PUNICODE_STRING DestinationArcPath, UCHAR PartitionType) { -#ifdef __REACTOS__ NTSTATUS Status; BOOLEAN DoesFreeLdrExist; WCHAR SrcPath[MAX_PATH]; @@ -2613,9 +2608,6 @@ InstallExt2BootcodeToPartition( } return STATUS_SUCCESS; -#else - return STATUS_NOT_IMPLEMENTED; -#endif } @@ -2666,7 +2658,6 @@ InstallFatBootcodeToFloppy( PUNICODE_STRING SourceRootPath, PUNICODE_STRING DestinationArcPath) { -#ifdef __REACTOS__ NTSTATUS Status; UNICODE_STRING FloppyDevice = RTL_CONSTANT_STRING(L"\\Device\\Floppy0"); WCHAR SrcPath[MAX_PATH]; @@ -2725,9 +2716,6 @@ InstallFatBootcodeToFloppy( } return STATUS_SUCCESS; -#else - return STATUS_NOT_IMPLEMENTED; -#endif } /* EOF */ diff --git a/base/setup/usetup/native/utils/console.c b/base/setup/usetup/console.c similarity index 99% rename from base/setup/usetup/native/utils/console.c rename to base/setup/usetup/console.c index 2ab380a0bc..858e83433e 100644 --- a/base/setup/usetup/native/utils/console.c +++ b/base/setup/usetup/console.c @@ -19,7 +19,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/native/utils/console.c + * FILE: base/setup/usetup/console.c * PURPOSE: Console support functions * PROGRAMMER: Eric Kohl */ diff --git a/base/setup/usetup/native/utils/console.h b/base/setup/usetup/console.h similarity index 96% rename from base/setup/usetup/native/utils/console.h rename to base/setup/usetup/console.h index 567d657b88..8578afc11d 100644 --- a/base/setup/usetup/native/utils/console.h +++ b/base/setup/usetup/console.h @@ -19,7 +19,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/native/utils/console.h + * FILE: base/setup/usetup/console.h * PURPOSE: Console support functions * PROGRAMMER: Eric Kohl */ @@ -124,7 +124,6 @@ WriteConsoleOutputCharacterW( BOOL WINAPI SetConsoleOutputCP( - IN UINT wCodePageID -); + IN UINT wCodePageID); /* EOF */ diff --git a/base/setup/usetup/consup.c b/base/setup/usetup/consup.c index 0fbf4daf9f..cec8c5ab5e 100644 --- a/base/setup/usetup/consup.c +++ b/base/setup/usetup/consup.c @@ -46,7 +46,7 @@ CONSOLE_Init( VOID) { CONSOLE_SCREEN_BUFFER_INFO csbi; - if (!HOST_InitConsole()) + if (!AllocConsole()) return FALSE; StdInput = GetStdHandle(STD_INPUT_HANDLE); diff --git a/base/setup/usetup/filesup.c b/base/setup/usetup/filesup.c index 8007756191..568525d095 100644 --- a/base/setup/usetup/filesup.c +++ b/base/setup/usetup/filesup.c @@ -264,7 +264,6 @@ SetupCopyFile( SIZE_T SourceSectionSize = 0; LARGE_INTEGER ByteOffset; -#ifdef __REACTOS__ RtlInitUnicodeString(&FileName, SourceFileName); @@ -285,20 +284,6 @@ SetupCopyFile( DPRINT1("NtOpenFile failed: %x, %wZ\n", Status, &FileName); goto done; } -#else - FileHandleSource = CreateFileW(SourceFileName, - GENERIC_READ, - FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - 0, - NULL); - if (FileHandleSource == INVALID_HANDLE_VALUE) - { - Status = STATUS_UNSUCCESSFUL; - goto done; - } -#endif Status = NtQueryInformationFile(FileHandleSource, &IoStatusBlock, @@ -496,7 +481,7 @@ done: return Status; } -#ifdef __REACTOS__ + NTSTATUS SetupExtractFile( PWCHAR CabinetFileName, @@ -574,7 +559,7 @@ SetupExtractFile( return STATUS_SUCCESS; } -#endif + BOOLEAN DoesFileExist( diff --git a/base/setup/usetup/fslist.c b/base/setup/usetup/fslist.c index 99fe2f8460..0b190d4a8b 100644 --- a/base/setup/usetup/fslist.c +++ b/base/setup/usetup/fslist.c @@ -33,7 +33,7 @@ /* FUNCTIONS ****************************************************************/ VOID -FS_AddProvider( +AddProvider( IN OUT PFILE_SYSTEM_LIST List, IN LPCWSTR FileSystemName, IN FORMATEX FormatFunc, @@ -175,12 +175,16 @@ CreateFileSystemList( List->Selected = NULL; InitializeListHead(&List->ListHead); - HOST_CreateFileSystemList(List); + AddProvider(List, L"FAT", VfatFormat, VfatChkdsk); +#if 0 + AddProvider(List, L"EXT2", Ext2Format, Ext2Chkdsk); + AddProvider(List, L"NTFS", NtfsFormat, NtfsChkdsk); +#endif if (!ForceFormat) { /* Add 'Keep' provider */ - FS_AddProvider(List, NULL, NULL, NULL); + AddProvider(List, NULL, NULL, NULL); } /* Search for ForceFileSystem in list */ diff --git a/base/setup/usetup/inffile.c b/base/setup/usetup/inffile.c index 73ab536a4b..10adbcf5c2 100644 --- a/base/setup/usetup/inffile.c +++ b/base/setup/usetup/inffile.c @@ -33,8 +33,6 @@ /* FUNCTIONS *****************************************************************/ -#ifdef __REACTOS__ - BOOL WINAPI InfpFindFirstLineW( @@ -81,7 +79,6 @@ InfpOpenInfFileW( return hInf; } -#endif /* __REACTOS__ */ BOOLEAN @@ -90,54 +87,7 @@ INF_GetData( OUT PWCHAR *Key, OUT PWCHAR *Data) { -#ifdef __REACTOS__ return InfGetData(Context, Key, Data); -#else - static PWCHAR pLastCallData[4] = { NULL, NULL, NULL, NULL }; - static DWORD currentIndex = 0; - DWORD dwSize, i; - BOOL ret; - - currentIndex ^= 2; - - if (Key) - *Key = NULL; - - if (Data) - *Data = NULL; - - if (SetupGetFieldCount(Context) != 1) - return FALSE; - - for (i = 0; i <= 1; i++) - { - ret = SetupGetStringFieldW(Context, - i, - NULL, - 0, - &dwSize); - if (!ret) - return FALSE; - - HeapFree(GetProcessHeap(), 0, pLastCallData[i + currentIndex]); - pLastCallData[i + currentIndex] = HeapAlloc(GetProcessHeap(), 0, dwSize * sizeof(WCHAR)); - ret = SetupGetStringFieldW(Context, - i, - pLastCallData[i + currentIndex], - dwSize, - NULL); - if (!ret) - return FALSE; - } - - if (Key) - *Key = pLastCallData[0 + currentIndex]; - - if (Data) - *Data = pLastCallData[1 + currentIndex]; - - return TRUE; -#endif /* !__REACTOS__ */ } @@ -147,38 +97,7 @@ INF_GetDataField( IN ULONG FieldIndex, OUT PWCHAR *Data) { -#ifdef __REACTOS__ return InfGetDataField(Context, FieldIndex, Data); -#else - static PWCHAR pLastCallsData[] = { NULL, NULL, NULL }; - static DWORD NextIndex = 0; - DWORD dwSize; - BOOL ret; - - *Data = NULL; - - ret = SetupGetStringFieldW(Context, - FieldIndex, - NULL, - 0, - &dwSize); - if (!ret) - return FALSE; - - HeapFree(GetProcessHeap(), 0, pLastCallsData[NextIndex]); - pLastCallsData[NextIndex] = HeapAlloc(GetProcessHeap(), 0, dwSize * sizeof(WCHAR)); - ret = SetupGetStringFieldW(Context, - FieldIndex, - pLastCallsData[NextIndex], - dwSize, - NULL); - if (!ret) - return FALSE; - - *Data = pLastCallsData[NextIndex]; - NextIndex = (NextIndex + 1) % (sizeof(pLastCallsData) / sizeof(pLastCallsData[0])); - return TRUE; -#endif /* !__REACTOS__ */ } @@ -191,7 +110,6 @@ INF_OpenBufferedFileA( IN LCID LocaleId, OUT PUINT ErrorLine) { -#ifdef __REACTOS__ HINF hInf = NULL; ULONG ErrorLineUL; NTSTATUS Status; @@ -206,9 +124,6 @@ INF_OpenBufferedFileA( return INVALID_HANDLE_VALUE; return hInf; -#else - return INVALID_HANDLE_VALUE; -#endif /* !__REACTOS__ */ } /* EOF */ diff --git a/base/setup/usetup/inffile.h b/base/setup/usetup/inffile.h index 039fbef353..9ce8ce0b2c 100644 --- a/base/setup/usetup/inffile.h +++ b/base/setup/usetup/inffile.h @@ -26,12 +26,6 @@ #pragma once -#ifndef __REACTOS__ - -#include <setupapi.h> - -#else /* __REACTOS__ */ - #include <infcommon.h> #define SetupFindFirstLineW InfpFindFirstLineW @@ -69,8 +63,6 @@ InfpOpenInfFileW( IN LCID LocaleId, OUT PUINT ErrorLine); -#endif /* __REACTOS__ */ - BOOLEAN INF_GetData( IN PINFCONTEXT Context, diff --git a/base/setup/usetup/native/utils/keytrans.c b/base/setup/usetup/keytrans.c similarity index 99% rename from base/setup/usetup/native/utils/keytrans.c rename to base/setup/usetup/keytrans.c index 61279634b3..0c85cb7e83 100644 --- a/base/setup/usetup/native/utils/keytrans.c +++ b/base/setup/usetup/keytrans.c @@ -19,7 +19,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/native/utils/keytrans.c + * FILE: base/setup/usetup/keytrans.c * PURPOSE: Console support functions: keyboard translation * PROGRAMMER: Tinus * diff --git a/base/setup/usetup/native/utils/keytrans.h b/base/setup/usetup/keytrans.h similarity index 94% rename from base/setup/usetup/native/utils/keytrans.h rename to base/setup/usetup/keytrans.h index 893a6995e5..788d7ed151 100644 --- a/base/setup/usetup/native/utils/keytrans.h +++ b/base/setup/usetup/keytrans.h @@ -18,7 +18,7 @@ */ /* COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS text-mode setup - * FILE: base/setup/usetup/native/utils/keytrans.h + * FILE: base/setup/usetup/keytrans.h * PURPOSE: Keyboard translation functionality * PROGRAMMER: Tinus */ diff --git a/base/setup/usetup/native/console.c b/base/setup/usetup/native/console.c deleted file mode 100644 index 963caa72f0..0000000000 --- a/base/setup/usetup/native/console.c +++ /dev/null @@ -1,7 +0,0 @@ -#include <usetup.h> - -BOOLEAN -NATIVE_InitConsole(VOID) -{ - return (BOOLEAN)AllocConsole(); -} diff --git a/base/setup/usetup/native/fslist.c b/base/setup/usetup/native/fslist.c deleted file mode 100644 index 4d9b655936..0000000000 --- a/base/setup/usetup/native/fslist.c +++ /dev/null @@ -1,31 +0,0 @@ -#include <usetup.h> - -BOOLEAN -NATIVE_CreateFileSystemList( - IN PFILE_SYSTEM_LIST List) -{ - FS_AddProvider(List, L"FAT", VfatFormat, VfatChkdsk); -#if 0 - FS_AddProvider(List, L"EXT2", Ext2Format, Ext2Chkdsk); - FS_AddProvider(List, L"NTFS", NtfsFormat, NtfsChkdsk); -#endif - return TRUE; -} - - -BOOLEAN -NATIVE_FormatPartition( - IN PFILE_SYSTEM_ITEM FileSystem, - IN PCUNICODE_STRING DriveRoot, - IN PFMIFSCALLBACK Callback) -{ - NTSTATUS Status; - - Status = FileSystem->FormatFunc((PUNICODE_STRING)DriveRoot, - FMIFS_HARDDISK, /* MediaFlag */ - NULL, /* Label */ - FileSystem->QuickFormat, /* QuickFormat */ - 0, /* ClusterSize */ - Callback); /* Callback */ - return NT_SUCCESS(Status); -} diff --git a/base/setup/usetup/native/host_native.h b/base/setup/usetup/native/host_native.h deleted file mode 100644 index df3ad98ddc..0000000000 --- a/base/setup/usetup/native/host_native.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#define SetupInitDefaultQueueCallback(a) NULL -#define SetupDefaultQueueCallbackW(a, b, c, d) TRUE -#define SetupTermDefaultQueueCallback(a) diff --git a/base/setup/usetup/registry.c b/base/setup/usetup/registry.c index 4bbc4f8aa1..2c7ada697d 100644 --- a/base/setup/usetup/registry.c +++ b/base/setup/usetup/registry.c @@ -31,7 +31,6 @@ #define NDEBUG #include <debug.h> -#ifdef __REACTOS__ #define FLG_ADDREG_BINVALUETYPE 0x00000001 #define FLG_ADDREG_NOCLOBBER 0x00000002 #define FLG_ADDREG_DELVAL 0x00000004 @@ -45,7 +44,6 @@ #define FLG_ADDREG_TYPE_DWORD (0x00010000 | FLG_ADDREG_BINVALUETYPE) #define FLG_ADDREG_TYPE_NONE (0x00020000 | FLG_ADDREG_BINVALUETYPE) #define FLG_ADDREG_TYPE_MASK (0xFFFF0000 | FLG_ADDREG_BINVALUETYPE) -#endif #ifdef _M_IX86 #define Architecture L"x86" @@ -324,16 +322,12 @@ do_reg_operation(HANDLE KeyHandle, DPRINT("setting dword %wZ to %lx\n", ValueName, dw); -#ifdef __REACTOS__ NtSetValueKey (KeyHandle, ValueName, 0, Type, (PVOID)&dw, sizeof(ULONG)); -#else - RegSetValueExW(KeyHandle, ValueName, 0, Type, (const UCHAR*)&dw, sizeof(ULONG)); -#endif } else { @@ -341,29 +335,21 @@ do_reg_operation(HANDLE KeyHandle, if (Str) { -#ifdef __REACTOS__ NtSetValueKey (KeyHandle, ValueName, 0, Type, (PVOID)Str, Size * sizeof(WCHAR)); -#else - RegSetValueExW(KeyHandle, ValueName, 0, Type, (const UCHAR*)Str, Size * sizeof(WCHAR)); -#endif } else { -#ifdef __REACTOS__ NtSetValueKey (KeyHandle, ValueName, 0, Type, (PVOID)&EmptyStr, sizeof(WCHAR)); -#else - RegSetValueExW(KeyHandle, ValueName, 0, Type, (const UCHAR*)&EmptyStr, sizeof(WCHAR)); -#endif } } RtlFreeHeap (ProcessHeap, 0, Str); @@ -385,16 +371,12 @@ do_reg_operation(HANDLE KeyHandle, SetupGetBinaryField (Context, 5, Data, Size, NULL); } -#ifdef __REACTOS__ NtSetValueKey (KeyHandle, ValueName, 0, Type, (PVOID)Data, Size); -#else - RegSetValueExW(KeyHandle, ValueName, 0, Type, (const UCHAR*)Data, Size); -#endif RtlFreeHeap (ProcessHeap, 0, Data); } @@ -402,7 +384,6 @@ do_reg_operation(HANDLE KeyHandle, return TRUE; } -#ifdef __REACTOS__ NTSTATUS CreateNestedKey (PHANDLE KeyHandle, ACCESS_MASK DesiredAccess, @@ -494,7 +475,6 @@ CreateNestedKey (PHANDLE KeyHandle, return Status; } -#endif /*********************************************************************** * registry_callback @@ -543,7 +523,6 @@ registry_callback(HINF hInf, PCWSTR Section, BOOLEAN Delete) DPRINT("Flags: %lx\n", Flags); -#ifdef __REACTOS__ RtlInitUnicodeString (&Name, Buffer); @@ -575,26 +554,6 @@ registry_callback(HINF hInf, PCWSTR Section, BOOLEAN Delete) continue; } } -#else - if (Delete || (Flags & FLG_ADDREG_OVERWRITEONLY)) - { - LONG rc = RegOpenKeyW(NULL, Buffer, &KeyHandle); - if (rc != ERROR_SUCCESS) - { - DPRINT("RegOpenKeyW(%S) failed (error %lu)\n", Buffer, rc); - continue; /* ignore if it doesn't exist */ - } - } - else - { - LONG rc = RegCreateKeyW(NULL, Buffer, &KeyHandle); - if (rc != ERROR_SUCCESS) - { - DPRINT("RegCreateKeyW(%S) failed (error %lu)\n", Buffer, rc); - continue; - } - } -#endif /* get value name */ if (SetupGetStringFieldW (&Context, 3, Buffer, MAX_INF_STRING_LENGTH, NULL)) @@ -615,9 +574,7 @@ registry_callback(HINF hInf, PCWSTR Section, BOOLEAN Delete) return FALSE; } -#ifdef __REACTOS__ NtClose (KeyHandle); -#endif } } diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 5b5ac583d3..71dc354ae0 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -3886,7 +3886,6 @@ PrepareCopyPage(PINPUT_RECORD Ir) wcscat(PathBuffer, L"\\"); wcscat(PathBuffer, KeyValue); -#ifdef __REACTOS__ CabinetInitialize(); CabinetSetEventHandlers(NULL, NULL, NULL); CabinetSetCabinetName(PathBuffer); @@ -3929,7 +3928,6 @@ PrepareCopyPage(PINPUT_RECORD Ir) /* FIXME: show an error dialog */ return QUIT_PAGE; } -#endif } while (SetupFindNextLine(&CabinetsContext, &CabinetsContext)); return FILE_COPY_PAGE; @@ -4960,8 +4958,6 @@ RunUSetup(VOID) } -#ifdef __REACTOS__ - VOID NTAPI NtProcessStartup(PPEB Peb) { @@ -4971,6 +4967,5 @@ NtProcessStartup(PPEB Peb) InfSetHeap(ProcessHeap); RunUSetup(); } -#endif /* __REACTOS__ */ /* EOF */ diff --git a/base/setup/usetup/usetup.h b/base/setup/usetup/usetup.h index 181c1b40a3..37cae20f7f 100644 --- a/base/setup/usetup/usetup.h +++ b/base/setup/usetup/usetup.h @@ -63,17 +63,14 @@ #include "inffile.h" #include "inicache.h" #include "progress.h" -#ifdef __REACTOS__ #include "infros.h" #include "filequeue.h" -#endif #include "registry.h" #include "fslist.h" #include "partlist.h" #include "cabinet.h" #include "filesup.h" #include "genlist.h" -#include "host.h" #include "mui.h" #include "errorcode.h" @@ -84,8 +81,6 @@ extern UNICODE_STRING SourcePath; extern BOOLEAN IsUnattendedSetup; extern PWCHAR SelectedLanguageId; -#ifdef __REACTOS__ - extern VOID InfSetHeap(PVOID Heap); extern VOID InfCloseFile(HINF InfHandle); extern BOOLEAN InfFindNextLine(PINFCONTEXT ContextIn, @@ -112,8 +107,6 @@ extern BOOLEAN InfGetStringField(PINFCONTEXT Context, #define SetupGetMultiSzFieldW InfGetMultiSzField #define SetupGetStringFieldW InfGetStringField -#endif /* __REACTOS__ */ - #ifndef _PAGE_NUMBER_DEFINED #define _PAGE_NUMBER_DEFINED typedef enum _PAGE_NUMBER diff --git a/base/setup/usetup/usetup.rc b/base/setup/usetup/usetup.rc index 3eb82aea53..d7347f31b9 100644 --- a/base/setup/usetup/usetup.rc +++ b/base/setup/usetup/usetup.rc @@ -1,6 +1,4 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Setup" #define REACTOS_STR_INTERNAL_NAME "usetup" -#define REACTOS_STR_ORIGINAL_FILENAME "usetup.dll" -#ifdef __REACTOS__ +#define REACTOS_STR_ORIGINAL_FILENAME "usetup.exe" #include <reactos/version.rc> -#endif

1 0

01/01: [USETUP] Disable install path test that may tests
by Eric Kohl 15 May '18

15 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4038773f45d2c0747b7e2… commit 4038773f45d2c0747b7e213cd4fd249162c84dd2 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue May 15 22:58:34 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue May 15 22:58:34 2018 +0200 [USETUP] Disable install path test that may tests --- base/setup/usetup/filesup.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base/setup/usetup/filesup.c b/base/setup/usetup/filesup.c index a325df8e2a..8007756191 100644 --- a/base/setup/usetup/filesup.c +++ b/base/setup/usetup/filesup.c @@ -142,12 +142,12 @@ IsValidPath( // TODO: Add check for 8.3 too. /* Path must be at least 2 characters long */ - if (Length < 2) - return FALSE; +// if (Length < 2) +// return FALSE; /* Path must start with a backslash */ - if (InstallDir[0] != L'\\') - return FALSE; +// if (InstallDir[0] != L'\\') +// return FALSE; /* Path must not end with a backslash */ if (InstallDir[Length - 1] == L'\\')

1 0

01/01: [USETUP] Remove unused VolumeLabel and FileSystemName from the PARTENTRY type
by Eric Kohl 15 May '18

15 May '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1b323ff2f4ad43a1d2f92… commit 1b323ff2f4ad43a1d2f9216fa9db8a2ff468a688 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue May 15 20:02:04 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue May 15 20:02:04 2018 +0200 [USETUP] Remove unused VolumeLabel and FileSystemName from the PARTENTRY type --- base/setup/usetup/partlist.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/base/setup/usetup/partlist.h b/base/setup/usetup/partlist.h index bf2bca235e..c42335a70a 100644 --- a/base/setup/usetup/partlist.h +++ b/base/setup/usetup/partlist.h @@ -63,8 +63,6 @@ typedef struct _PARTENTRY ULONG PartitionIndex; CHAR DriveLetter; - CHAR VolumeLabel[17]; - CHAR FileSystemName[9]; BOOLEAN LogicalPartition;

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
22
Older →

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 May 2018