Ros-diffs August 2017

ros-diffs@reactos.org

22 participants
262 discussions

[hbelusca] 75516: [USETUP]: Sprinkle some INF_FreeData() calls to balance the INF_GetData() / INF_GetDataField() calls. They currently do nothing, since the getter functions don't actually capture ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Aug 9 20:24:24 2017 New Revision: 75516 URL: http://svn.reactos.org/svn/reactos?rev=75516&view=rev Log: [USETUP]: Sprinkle some INF_FreeData() calls to balance the INF_GetData() / INF_GetDataField() calls. They currently do nothing, since the getter functions don't actually capture (copy) the strings but merely return pointers to read-only strings. But the calls are placed here for consistency, because if one day the getters implementation is changed to capture the strings, then it would now be needed to free the allocated buffers. In addition, fix a buggy call to INF_GetData() -- should be instead INF_GetDataField() -- in AddSectionToCopyQueue(). Modified: branches/setup_improvements/base/setup/usetup/interface/devinst.c branches/setup_improvements/base/setup/usetup/interface/usetup.c branches/setup_improvements/base/setup/usetup/settings.c Modified: branches/setup_improvements/base/setup/usetup/interface/devinst.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/interface/devinst.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/interface/devinst.c [iso-8859-1] Wed Aug 9 20:24:24 2017 @@ -73,7 +73,10 @@ && !SetupFindFirstLineW(hInf, L"InputDevicesSupport.Load", Driver, &Context)) { if (!SetupFindFirstLineW(hInf, L"Keyboard.Load", Driver, &Context)) + { + INF_FreeData(Driver); return FALSE; + } keyboardDevice = TRUE; } @@ -87,6 +90,8 @@ if (!FullImagePath) { DPRINT1("RtlAllocateHeap() failed\n"); + INF_FreeData(ImagePath); + INF_FreeData(Driver); return FALSE; } RtlCopyMemory(FullImagePath, PathPrefix.Buffer, PathPrefix.MaximumLength); @@ -102,6 +107,8 @@ { DPRINT1("NtCreateKey('%wZ') failed with status 0x%08x\n", &StringU, Status); RtlFreeHeap(ProcessHeap, 0, FullImagePath); + INF_FreeData(ImagePath); + INF_FreeData(Driver); return FALSE; } @@ -109,38 +116,38 @@ if (Disposition == REG_CREATED_NEW_KEY) { dwValue = 0; - NtSetValueKey( - hService, - &ErrorControlU, - 0, - REG_DWORD, - &dwValue, - sizeof(dwValue)); + NtSetValueKey(hService, + &ErrorControlU, + 0, + REG_DWORD, + &dwValue, + sizeof(dwValue)); + dwValue = 0; - NtSetValueKey( - hService, - &StartU, - 0, - REG_DWORD, - &dwValue, - sizeof(dwValue)); + NtSetValueKey(hService, + &StartU, + 0, + REG_DWORD, + &dwValue, + sizeof(dwValue)); + dwValue = SERVICE_KERNEL_DRIVER; - NtSetValueKey( - hService, - &TypeU, - 0, - REG_DWORD, - &dwValue, - sizeof(dwValue)); + NtSetValueKey(hService, + &TypeU, + 0, + REG_DWORD, + &dwValue, + sizeof(dwValue)); } /* HACK: don't put any path in registry */ - NtSetValueKey( - hService, - &ImagePathU, - 0, - REG_SZ, - ImagePath, - (wcslen(ImagePath) + 1) * sizeof(WCHAR)); + NtSetValueKey(hService, + &ImagePathU, + 0, + REG_SZ, + ImagePath, + (wcslen(ImagePath) + 1) * sizeof(WCHAR)); + + INF_FreeData(ImagePath); if (keyboardDevice) { @@ -154,28 +161,29 @@ } /* Associate device with the service we just filled */ - Status = NtSetValueKey( - hDeviceKey, - &ServiceU, - 0, - REG_SZ, - Driver, - (wcslen(Driver) + 1) * sizeof(WCHAR)); + Status = NtSetValueKey(hDeviceKey, + &ServiceU, + 0, + REG_SZ, + Driver, + (wcslen(Driver) + 1) * sizeof(WCHAR)); if (NT_SUCCESS(Status)) { /* Restart the device, so it will use the driver we registered */ deviceInstalled = ResetDevice(DeviceId); } + INF_FreeData(Driver); + /* HACK: Update driver path */ - NtSetValueKey( - hService, - &ImagePathU, - 0, - REG_SZ, - FullImagePath, - (wcslen(FullImagePath) + 1) * sizeof(WCHAR)); + NtSetValueKey(hService, + &ImagePathU, + 0, + REG_SZ, + FullImagePath, + (wcslen(FullImagePath) + 1) * sizeof(WCHAR)); RtlFreeHeap(ProcessHeap, 0, FullImagePath); + NtClose(hService); return deviceInstalled; Modified: branches/setup_improvements/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/interface/usetup.c [iso-8859-1] Wed Aug 9 20:24:24 2017 @@ -3545,13 +3545,20 @@ { /* FIXME: Handle error! */ DPRINT1("SetupFindFirstLine() failed\n"); + INF_FreeData(FileKeyName); + INF_FreeData(FileKeyValue); + INF_FreeData(TargetFileName); break; } + + INF_FreeData(FileKeyValue); if (!INF_GetData(&DirContext, NULL, &DirKeyValue)) { /* FIXME: Handle error! */ DPRINT1("INF_GetData() failed\n"); + INF_FreeData(FileKeyName); + INF_FreeData(TargetFileName); break; } @@ -3566,6 +3573,10 @@ /* FIXME: Handle error! */ DPRINT1("SetupQueueCopy() failed\n"); } + + INF_FreeData(FileKeyName); + INF_FreeData(TargetFileName); + INF_FreeData(DirKeyValue); } while (SetupFindNextLine(&FilesContext, &FilesContext)); return TRUE; @@ -3609,8 +3620,8 @@ */ do { - /* Get source file name and target directory id */ - if (!INF_GetData(&FilesContext, &FileKeyName, &FileKeyValue)) + /* Get source file name */ + if (!INF_GetDataField(&FilesContext, 0, &FileKeyName)) { /* FIXME: Handle error! */ DPRINT1("INF_GetData() failed\n"); @@ -3622,6 +3633,7 @@ { /* FIXME: Handle error! */ DPRINT1("INF_GetData() failed\n"); + INF_FreeData(FileKeyName); break; } @@ -3638,13 +3650,20 @@ { /* FIXME: Handle error! */ DPRINT1("SetupFindFirstLine() failed\n"); + INF_FreeData(FileKeyName); + INF_FreeData(FileKeyValue); + INF_FreeData(TargetFileName); break; } + + INF_FreeData(FileKeyValue); if (!INF_GetData(&DirContext, NULL, &DirKeyValue)) { /* FIXME: Handle error! */ DPRINT1("INF_GetData() failed\n"); + INF_FreeData(FileKeyName); + INF_FreeData(TargetFileName); break; } @@ -3690,6 +3709,10 @@ /* FIXME: Handle error! */ DPRINT1("SetupQueueCopy() failed\n"); } + + INF_FreeData(FileKeyName); + INF_FreeData(TargetFileName); + INF_FreeData(DirKeyValue); } while (SetupFindNextLine(&FilesContext, &FilesContext)); return TRUE; @@ -3795,6 +3818,7 @@ Status = SetupCreateDirectory(PathBuffer); if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_COLLISION) { + INF_FreeData(DirKeyValue); DPRINT("Creating directory '%S' failed: Status = 0x%08lx", PathBuffer, Status); MUIDisplayError(ERROR_CREATE_DIR, Ir, POPUP_WAIT_ENTER); return FALSE; @@ -3813,11 +3837,14 @@ Status = SetupCreateDirectory(PathBuffer); if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_COLLISION) { + INF_FreeData(DirKeyValue); DPRINT("Creating directory '%S' failed: Status = 0x%08lx", PathBuffer, Status); MUIDisplayError(ERROR_CREATE_DIR, Ir, POPUP_WAIT_ENTER); return FALSE; } } + + INF_FreeData(DirKeyValue); } while (SetupFindNextLine(&DirContext, &DirContext)); return TRUE; @@ -4209,7 +4236,12 @@ DPRINT("Action: %S File: %S Section %S\n", Action, File, Section); if (Action == NULL) + { + INF_FreeData(Action); + INF_FreeData(File); + INF_FreeData(Section); break; // Hackfix + } if (!_wcsicmp(Action, L"AddReg")) Delete = FALSE; @@ -4218,14 +4250,21 @@ else { DPRINT1("Unrecognized registry INF action '%S'\n", Action); + INF_FreeData(Action); + INF_FreeData(File); + INF_FreeData(Section); continue; } + INF_FreeData(Action); + CONSOLE_SetStatusText(MUIGetString(STRING_IMPORTFILE), File); if (!ImportRegistryFile(SourcePath.Buffer, File, Section, LanguageId, Delete)) { DPRINT1("Importing %S failed\n", File); + INF_FreeData(File); + INF_FreeData(Section); MUIDisplayError(ERROR_IMPORT_HIVE, Ir, POPUP_WAIT_ENTER); goto Cleanup; } Modified: branches/setup_improvements/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/settings.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/settings.c [iso-8859-1] Wed Aug 9 20:24:24 2017 @@ -325,6 +325,7 @@ DPRINT("KeyValue: %S\n", KeyValue); if (wcsstr(ComputerIdentifier, KeyValue)) { + INF_FreeData(KeyValue); if (!INF_GetDataField(&Context, 0, &KeyName)) { /* FIXME: Handle error! */ @@ -334,7 +335,9 @@ DPRINT("Computer key: %S\n", KeyName); wcscpy(ComputerKey, KeyName); - } + INF_FreeData(KeyName); + } + INF_FreeData(KeyValue); } while (SetupFindNextLine(&Context, &Context)); List = CreateGenericList(); @@ -349,7 +352,7 @@ do { - if (!INF_GetData (&Context, &KeyName, &KeyValue)) + if (!INF_GetData(&Context, &KeyName, &KeyValue)) { /* FIXME: Handle error! */ DPRINT("INF_GetData() failed\n"); @@ -365,10 +368,13 @@ } wcscpy(UserData, KeyName); + INF_FreeData(KeyName); sprintf(Buffer, "%S", KeyValue); + INF_FreeData(KeyValue); + AppendGenericListEntry(List, Buffer, UserData, - _wcsicmp(KeyName, ComputerKey) ? FALSE : TRUE); + _wcsicmp(UserData, ComputerKey) ? FALSE : TRUE); } while (SetupFindNextLine(&Context, &Context)); return List; @@ -580,6 +586,7 @@ DPRINT("KeyValue: %S\n", KeyValue); if (wcsstr(DisplayIdentifier, KeyValue)) { + INF_FreeData(KeyValue); if (!INF_GetDataField(&Context, 0, &KeyName)) { /* FIXME: Handle error! */ @@ -589,7 +596,9 @@ DPRINT("Display key: %S\n", KeyName); wcscpy(DisplayKey, KeyName); - } + INF_FreeData(KeyName); + } + INF_FreeData(KeyValue); } while (SetupFindNextLine(&Context, &Context)); List = CreateGenericList(); @@ -613,6 +622,7 @@ if (!INF_GetDataField(&Context, 1, &KeyValue)) { DPRINT1("INF_GetDataField() failed\n"); + INF_FreeData(KeyName); break; } @@ -623,16 +633,19 @@ { DPRINT1("RtlAllocateHeap() failed\n"); DestroyGenericList(List, TRUE); + INF_FreeData(KeyValue); + INF_FreeData(KeyName); return NULL; } wcscpy(UserData, KeyName); + INF_FreeData(KeyName); sprintf(Buffer, "%S", KeyValue); - AppendGenericListEntry(List, - Buffer, - UserData, - _wcsicmp(KeyName, DisplayKey) ? FALSE : TRUE); + INF_FreeData(KeyValue); + + AppendGenericListEntry(List, Buffer, UserData, + _wcsicmp(UserData, DisplayKey) ? FALSE : TRUE); } while (SetupFindNextLine(&Context, &Context)); #if 0 @@ -1062,7 +1075,7 @@ } while (SetupFindNextLine(&Context, &Context)); /* Only one language available, make it the default one */ - if(uIndex == 1 && UserData != NULL) + if (uIndex == 1 && UserData != NULL) { DefaultLanguageIndex = 0; wcscpy(DefaultLanguage, UserData); @@ -1235,7 +1248,7 @@ Status = NtOpenKey(&KeyHandle, KEY_SET_VALUE, &ObjectAttributes); - if(!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); return FALSE;

7 years, 4 months

[hbelusca] 75515: [USETUP][SETUPLIB]: Move some INF-related code from usetup to the setuplib. - Move the generic INF_GetDataField() and INF_GetData() helpers to setuplib, and rework them a bit so t...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Aug 9 20:12:00 2017 New Revision: 75515 URL: http://svn.reactos.org/svn/reactos?rev=75515&view=rev Log: [USETUP][SETUPLIB]: Move some INF-related code from usetup to the setuplib. - Move the generic INF_GetDataField() and INF_GetData() helpers to setuplib, and rework them a bit so that they explicitly call setupapi functions (or implementations thereof when being used in usetup); - Rework the headers in accordance; - and Fix compilation in lib/registry.c . Added: branches/setup_improvements/base/setup/lib/infsupp.c (with props) Modified: branches/setup_improvements/base/setup/lib/infsupp.h branches/setup_improvements/base/setup/lib/registry.c branches/setup_improvements/base/setup/usetup/inffile.c branches/setup_improvements/base/setup/usetup/inffile.h branches/setup_improvements/base/setup/usetup/usetup.h Added: branches/setup_improvements/base/setup/lib/infsupp.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/infsupp.c (added) +++ branches/setup_improvements/base/setup/lib/infsupp.c [iso-8859-1] Wed Aug 9 20:12:00 2017 @@ -0,0 +1,119 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Setup Library + * FILE: base/setup/lib/infsupp.c + * PURPOSE: Interfacing with Setup* API .inf files support functions + * PROGRAMMERS: HervÃ© Poussineau + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +/* INCLUDES *****************************************************************/ + +#include "precomp.h" +#include "infsupp.h" + +#define NDEBUG +#include <debug.h> + +/* HELPER FUNCTIONS **********************************************************/ + +BOOLEAN +INF_GetDataField( + IN PINFCONTEXT Context, + IN ULONG FieldIndex, + OUT PWCHAR *Data) +{ +#if 0 + + BOOL Success; + PWCHAR InfData; + DWORD dwSize; + + *Data = NULL; + + Success = SetupGetStringFieldW(Context, + FieldIndex, + NULL, + 0, + &dwSize); + if (!Success) + return FALSE; + + InfData = RtlAllocateHeap(ProcessHeap, 0, dwSize * sizeof(WCHAR)); + if (!InfData) + return FALSE; + + Success = SetupGetStringFieldW(Context, + FieldIndex, + InfData, + dwSize, + NULL); + if (!Success) + { + RtlFreeHeap(ProcessHeap, 0, InfData); + return FALSE; + } + + *Data = InfData; + return TRUE; + +#else + + *Data = (PWCHAR)pSetupGetField(Context, FieldIndex); + return !!*Data; + +#endif +} + +BOOLEAN +INF_GetData( + IN PINFCONTEXT Context, + OUT PWCHAR *Key, + OUT PWCHAR *Data) +{ + BOOL Success; + PWCHAR InfData[2] = {NULL, NULL}; + + if (Key) + *Key = NULL; + + if (Data) + *Data = NULL; + + /* + * Verify that the INF file has only one value field, in addition to its key name. + * Note that SetupGetFieldCount() does not count the key name as a field. + */ + if (SetupGetFieldCount(Context) != 1) + { + DPRINT1("SetupGetFieldCount != 1\n"); + return FALSE; + } + + if (Key) + { + Success = INF_GetDataField(Context, 0, &InfData[0]); + if (!Success) + return FALSE; + } + + if (Data) + { + Success = INF_GetDataField(Context, 1, &InfData[1]); + if (!Success) + { + INF_FreeData(InfData[0]); + return FALSE; + } + } + + if (Key) + *Key = InfData[0]; + + if (Data) + *Data = InfData[1]; + + return TRUE; +} + +/* EOF */ Propchange: branches/setup_improvements/base/setup/lib/infsupp.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/setup_improvements/base/setup/lib/infsupp.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/infsupp.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/infsupp.h [iso-8859-1] Wed Aug 9 20:12:00 2017 @@ -8,39 +8,123 @@ #pragma once -// #ifndef __REACTOS__ +#ifdef __REACTOS__ +#define _SETUPAPI_ +#endif -#define _SETUPAPI_ +// FIXME: Temporary measure until all the users of this header +// (usetup...) use or define SetupAPI-conforming APIs. +#if 0 + #include <setupapi.h> + +#else + +typedef PVOID HINF; +typedef struct _INFCONTEXT +{ + HINF Inf; + HINF CurrentInf; + UINT Section; + UINT Line; +} INFCONTEXT, *PINFCONTEXT; + +// #define SetupCloseInfFile InfCloseFile +VOID +WINAPI +SetupCloseInfFile(HINF InfHandle); + +// #define SetupFindFirstLineW InfpFindFirstLineW +BOOL +WINAPI +SetupFindFirstLineW( + IN HINF InfHandle, + IN PCWSTR Section, + IN PCWSTR Key, + IN OUT PINFCONTEXT Context); + +// #define SetupFindNextLine InfFindNextLine +BOOL +WINAPI +SetupFindNextLine(PINFCONTEXT ContextIn, + PINFCONTEXT ContextOut); + +// #define SetupGetFieldCount InfGetFieldCount +LONG +WINAPI +SetupGetFieldCount(PINFCONTEXT Context); + +// #define SetupGetBinaryField InfGetBinaryField +BOOL +WINAPI +SetupGetBinaryField(PINFCONTEXT Context, + ULONG FieldIndex, + PUCHAR ReturnBuffer, + ULONG ReturnBufferSize, + PULONG RequiredSize); + +// #define SetupGetIntField InfGetIntField +BOOLEAN +WINAPI +SetupGetIntField(PINFCONTEXT Context, + ULONG FieldIndex, + INT *IntegerValue); + +// #define SetupGetMultiSzFieldW InfGetMultiSzField +BOOL +WINAPI +SetupGetMultiSzFieldW(PINFCONTEXT Context, + ULONG FieldIndex, + PWSTR ReturnBuffer, + ULONG ReturnBufferSize, + PULONG RequiredSize); + +// #define SetupGetStringFieldW InfGetStringField +BOOL +WINAPI +SetupGetStringFieldW(PINFCONTEXT Context, + ULONG FieldIndex, + PWSTR ReturnBuffer, + ULONG ReturnBufferSize, + PULONG RequiredSize); + +#endif /* Lower the MAX_INF_STRING_LENGTH value in order to avoid too much stack usage */ #undef MAX_INF_STRING_LENGTH #define MAX_INF_STRING_LENGTH 1024 // Still larger than in infcommon.h -// #else /* __REACTOS__ */ - -// /* Functions from the INFLIB library */ -// #include <infcommon.h> - -#define INF_STYLE_WIN4 0x00000002 +#ifndef INF_STYLE_WIN4 +#define INF_STYLE_WIN4 0x00000002 +#endif #if 0 -/* FIXME: this structure is the one used in inflib, not in setupapi - * Delete it once we don't use inflib anymore */ +typedef PVOID HINF; typedef struct _INFCONTEXT { - PVOID Inf; - PVOID CurrentInf; - PVOID Section; - PVOID Line; -} INFCONTEXT; -#else -C_ASSERT(sizeof(INFCONTEXT) == 2 * sizeof(PVOID) + 2 * sizeof(UINT)); + HINF Inf; + HINF CurrentInf; + UINT Section; + UINT Line; +} INFCONTEXT, *PINFCONTEXT; #endif -// #endif +C_ASSERT(sizeof(INFCONTEXT) == 2 * sizeof(HINF) + 2 * sizeof(UINT)); -/* SetupOpenInfFileW with support for a user-provided LCID */ + +/* + * This function corresponds to an undocumented but exported SetupAPI function + * that exists since WinNT4 and is still present in Win10. + * The returned string pointer is a read-only pointer to a string in the + * maintained INF cache, and is always in UNICODE (on NT systems). + */ +PCWSTR +WINAPI +pSetupGetField(PINFCONTEXT Context, + ULONG FieldIndex); + +/* A version of SetupOpenInfFileW with support for a user-provided LCID */ +// #define SetupOpenInfFileExW InfpOpenInfFileW HINF WINAPI SetupOpenInfFileExW( @@ -50,4 +134,30 @@ IN LCID LocaleId, OUT PUINT ErrorLine); + +/* HELPER FUNCTIONS **********************************************************/ + +FORCEINLINE VOID +INF_FreeData(IN PWCHAR InfData) +{ +#if 0 + if (InfData) + RtlFreeHeap(ProcessHeap, 0, InfData); +#else + UNREFERENCED_PARAMETER(InfData); +#endif +} + +BOOLEAN +INF_GetDataField( + IN PINFCONTEXT Context, + IN ULONG FieldIndex, + OUT PWCHAR *Data); + +BOOLEAN +INF_GetData( + IN PINFCONTEXT Context, + OUT PWCHAR *Key, + OUT PWCHAR *Data); + /* EOF */ Modified: branches/setup_improvements/base/setup/lib/registry.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/registry.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/registry.c [iso-8859-1] Wed Aug 9 20:12:00 2017 @@ -39,7 +39,7 @@ // #ifdef __REACTOS__ -#if 0 +#if 1 // FIXME: Disable if setupapi.h is included in the code... #define FLG_ADDREG_BINVALUETYPE 0x00000001 #define FLG_ADDREG_NOCLOBBER 0x00000002 #define FLG_ADDREG_DELVAL 0x00000004 Modified: branches/setup_improvements/base/setup/usetup/inffile.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/inffile.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/inffile.c [iso-8859-1] Wed Aug 9 20:12:00 2017 @@ -87,17 +87,24 @@ return InfGetFieldCount(Context); } -extern BOOLEAN InfGetIntField(PINFCONTEXT Context, - ULONG FieldIndex, - INT *IntegerValue); -// #define SetupGetIntField InfGetIntField -BOOLEAN -WINAPI -SetupGetIntField(PINFCONTEXT Context, - ULONG FieldIndex, - INT *IntegerValue) -{ - return InfGetIntField(Context, FieldIndex, IntegerValue); +/* + * This function corresponds to an undocumented but exported setupapi API + * that exists since WinNT4 and is still present in Win10. + * The returned string pointer is a read-only pointer to a string in the + * maintained INF cache, and is always in UNICODE (on NT systems). + */ +extern BOOLEAN InfGetDataField(PINFCONTEXT Context, + ULONG FieldIndex, + PWCHAR *Data); +PCWSTR +WINAPI +pSetupGetField(PINFCONTEXT Context, + ULONG FieldIndex) +{ + PWCHAR Data = NULL; + if (!InfGetDataField(Context, FieldIndex, &Data)) + return NULL; + return Data; } extern BOOLEAN InfGetBinaryField(PINFCONTEXT Context, @@ -119,6 +126,19 @@ ReturnBuffer, ReturnBufferSize, RequiredSize); +} + +extern BOOLEAN InfGetIntField(PINFCONTEXT Context, + ULONG FieldIndex, + INT *IntegerValue); +// #define SetupGetIntField InfGetIntField +BOOLEAN +WINAPI +SetupGetIntField(PINFCONTEXT Context, + ULONG FieldIndex, + INT *IntegerValue) +{ + return InfGetIntField(Context, FieldIndex, IntegerValue); } extern BOOLEAN InfGetMultiSzField(PINFCONTEXT Context, @@ -197,102 +217,6 @@ /* HELPER FUNCTIONS **********************************************************/ -BOOLEAN -INF_GetData( - IN PINFCONTEXT Context, - 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__ */ -} - -BOOLEAN -INF_GetDataField( - IN PINFCONTEXT Context, - 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__ */ -} - HINF WINAPI INF_OpenBufferedFileA( IN PSTR FileBuffer, Modified: branches/setup_improvements/base/setup/usetup/inffile.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/inffile.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/inffile.h [iso-8859-1] Wed Aug 9 20:12:00 2017 @@ -27,116 +27,26 @@ #pragma once -#ifndef __REACTOS__ +#ifdef __REACTOS__ -#include <setupapi.h> - -#else /* __REACTOS__ */ +// HACK around the fact INFLIB unconditionally defines MAX_INF_STRING_LENGTH. +#undef MAX_INF_STRING_LENGTH /* Functions from the INFLIB library */ -#include <infcommon.h> +// #include <infcommon.h> +#include <infros.h> -#define INF_STYLE_WIN4 0x00000002 - -/* FIXME: this structure is the one used in inflib, not in setupapi - * Delete it once we don't use inflib anymore */ -typedef struct _INFCONTEXT -{ - HINF Inf; - HINF CurrentInf; - UINT Section; - UINT Line; -} INFCONTEXT; -C_ASSERT(sizeof(INFCONTEXT) == 2 * sizeof(PVOID) + 2 * sizeof(UINT)); +#undef MAX_INF_STRING_LENGTH +#define MAX_INF_STRING_LENGTH 1024 extern VOID InfSetHeap(PVOID Heap); -// #define SetupCloseInfFile InfCloseFile -VOID -WINAPI -SetupCloseInfFile(HINF InfHandle); +#endif /* __REACTOS__ */ -// #define SetupFindFirstLineW InfpFindFirstLineW -BOOL -WINAPI -SetupFindFirstLineW( - IN HINF InfHandle, - IN PCWSTR Section, - IN PCWSTR Key, - IN OUT PINFCONTEXT Context); - -// #define SetupFindNextLine InfFindNextLine -BOOL -WINAPI -SetupFindNextLine(PINFCONTEXT ContextIn, - PINFCONTEXT ContextOut); - -// #define SetupGetFieldCount InfGetFieldCount -LONG -WINAPI -SetupGetFieldCount(PINFCONTEXT Context); - -// #define SetupGetIntField InfGetIntField -BOOLEAN -WINAPI -SetupGetIntField(PINFCONTEXT Context, - ULONG FieldIndex, - INT *IntegerValue); - -// #define SetupGetBinaryField InfGetBinaryField -BOOL -WINAPI -SetupGetBinaryField(PINFCONTEXT Context, - ULONG FieldIndex, - PUCHAR ReturnBuffer, - ULONG ReturnBufferSize, - PULONG RequiredSize); - -// #define SetupGetMultiSzFieldW InfGetMultiSzField -BOOL -WINAPI -SetupGetMultiSzFieldW(PINFCONTEXT Context, - ULONG FieldIndex, - PWSTR ReturnBuffer, - ULONG ReturnBufferSize, - PULONG RequiredSize); - -// #define SetupGetStringFieldW InfGetStringField -BOOL -WINAPI -SetupGetStringFieldW(PINFCONTEXT Context, - ULONG FieldIndex, - PWSTR ReturnBuffer, - ULONG ReturnBufferSize, - PULONG RequiredSize); - -/* SetupOpenInfFileW with support for a user-provided LCID */ -// #define SetupOpenInfFileExW InfpOpenInfFileW -HINF -WINAPI -SetupOpenInfFileExW( - IN PCWSTR FileName, - IN PCWSTR InfClass, - IN DWORD InfStyle, - IN LCID LocaleId, - OUT PUINT ErrorLine); - -#endif /* __REACTOS__ */ +#include <../lib/infsupp.h> /* HELPER FUNCTIONS **********************************************************/ - -BOOLEAN -INF_GetData( - IN PINFCONTEXT Context, - OUT PWCHAR *Key, - OUT PWCHAR *Data); - -BOOLEAN -INF_GetDataField( - IN PINFCONTEXT Context, - IN ULONG FieldIndex, - OUT PWCHAR *Data); HINF WINAPI INF_OpenBufferedFileA( Modified: branches/setup_improvements/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/usetup.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/usetup.h [iso-8859-1] Wed Aug 9 20:12:00 2017 @@ -52,6 +52,7 @@ #include <ndk/rtlfuncs.h> #include <ndk/setypes.h> + /* Setup library headers */ #include <reactos/rosioctl.h> #include <../lib/setuplib.h> @@ -62,7 +63,6 @@ #include "inffile.h" #include "progress.h" #ifdef __REACTOS__ -#include "infros.h" #include "filequeue.h" #endif #include "fslist.h" @@ -72,6 +72,7 @@ #include "genlist.h" #include "host.h" #include "mui.h" + extern HANDLE ProcessHeap; extern BOOLEAN IsUnattendedSetup;

7 years, 4 months

[gadamopoulos] 75514: [UXTHEME] -Implement taking into account the flags set by SetThemeAppProperties. Now the shim that disables themes per application works.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Aug 9 08:14:50 2017 New Revision: 75514 URL: http://svn.reactos.org/svn/reactos?rev=75514&view=rev Log: [UXTHEME] -Implement taking into account the flags set by SetThemeAppProperties. Now the shim that disables themes per application works. Modified: trunk/reactos/dll/win32/uxtheme/system.c trunk/reactos/dll/win32/uxtheme/themehooks.c Modified: trunk/reactos/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] Wed Aug 9 08:14:50 2017 @@ -747,6 +747,18 @@ return NULL; } + if ((flags & OTD_NONCLIENT) && !(dwThemeAppProperties & STAP_ALLOW_NONCLIENT)) + { + SetLastError(E_PROP_ID_UNSUPPORTED); + return NULL; + } + + if (!(flags & OTD_NONCLIENT) && !(dwThemeAppProperties & STAP_ALLOW_CONTROLS)) + { + SetLastError(E_PROP_ID_UNSUPPORTED); + return NULL; + } + if (ThemeFile) { pszAppName = UXTHEME_GetWindowProperty(hwnd, atSubAppName, szAppBuff, sizeof(szAppBuff)/sizeof(szAppBuff[0])); Modified: trunk/reactos/dll/win32/uxtheme/themehooks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/themehoo… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] Wed Aug 9 08:14:50 2017 @@ -98,6 +98,16 @@ if (pwndData == NULL) return NULL; + if (!(GetThemeAppProperties() & STAP_ALLOW_NONCLIENT)) + { + if (pwndData->hthemeWindow) + { + CloseThemeData(pwndData->hthemeWindow); + pwndData->hthemeWindow = NULL; + } + return NULL; + } + /* If the theme data was not cached, open it now */ if (!pwndData->hthemeWindow) pwndData->hthemeWindow = OpenThemeDataEx(hWnd, L"WINDOW", OTD_NONCLIENT); @@ -117,6 +127,16 @@ pwndData = ThemeGetWndData(hWnd); if (pwndData == NULL) return NULL; + + if (!(GetThemeAppProperties() & STAP_ALLOW_NONCLIENT)) + { + if (pwndData->hthemeScrollbar) + { + CloseThemeData(pwndData->hthemeScrollbar); + pwndData->hthemeScrollbar = NULL; + } + return NULL; + } /* If the theme data was not cached, open it now */ if (!pwndData->hthemeScrollbar) @@ -222,7 +242,7 @@ if (pwndData->UpdatingRgn == TRUE) return 0; - if(!IsAppThemed()) + if(!IsAppThemed() || !(GetThemeAppProperties() & STAP_ALLOW_NONCLIENT)) { if(pwndData->HasThemeRgn) { @@ -248,7 +268,7 @@ static LRESULT CALLBACK ThemeDefWindowProcW(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { - if(!IsAppThemed()) + if(!IsAppThemed() || !(GetThemeAppProperties() & STAP_ALLOW_NONCLIENT)) { return g_user32ApiHook.DefWindowProcW(hWnd, Msg, @@ -266,7 +286,7 @@ static LRESULT CALLBACK ThemeDefWindowProcA(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { - if(!IsAppThemed()) + if(!IsAppThemed() || !(GetThemeAppProperties() & STAP_ALLOW_NONCLIENT)) { return g_user32ApiHook.DefWindowProcA(hWnd, Msg, @@ -456,7 +476,7 @@ HBRUSH* phbrush = (HBRUSH*)ret; HTHEME hTheme; - if (!IsAppThemed()) + if(!IsAppThemed() || !(GetThemeAppProperties() & STAP_ALLOW_NONCLIENT)) break; if (!IsThemeDialogTextureEnabled (hWnd)) @@ -507,7 +527,7 @@ BOOL ret; /* Avoid creating a window context if it is not needed */ - if(!IsAppThemed()) + if(!IsAppThemed() || !(GetThemeAppProperties() & STAP_ALLOW_NONCLIENT)) goto dodefault; style = GetWindowLongW(hwnd, GWL_STYLE);

7 years, 4 months

[gadamopoulos] 75513: [UXTHEME_APITEST] -Add tests for SetThemeAppProperties.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Aug 9 07:14:44 2017 New Revision: 75513 URL: http://svn.reactos.org/svn/reactos?rev=75513&view=rev Log: [UXTHEME_APITEST] -Add tests for SetThemeAppProperties. Added: trunk/rostests/apitests/uxtheme/SetThemeAppProperties.c (with props) Modified: trunk/rostests/apitests/uxtheme/CMakeLists.txt trunk/rostests/apitests/uxtheme/testlist.c Modified: trunk/rostests/apitests/uxtheme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/uxtheme/CMakeLis… ============================================================================== --- trunk/rostests/apitests/uxtheme/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/uxtheme/CMakeLists.txt [iso-8859-1] Wed Aug 9 07:14:44 2017 @@ -3,6 +3,7 @@ CloseThemeData.c DrawThemeParentBackground.c SetWindowTheme.c + SetThemeAppProperties.c ../include/msgtrace.c testlist.c) Added: trunk/rostests/apitests/uxtheme/SetThemeAppProperties.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/uxtheme/SetTheme… ============================================================================== --- trunk/rostests/apitests/uxtheme/SetThemeAppProperties.c (added) +++ trunk/rostests/apitests/uxtheme/SetThemeAppProperties.c [iso-8859-1] Wed Aug 9 07:14:44 2017 @@ -0,0 +1,84 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for SetThemeAppProperties + * PROGRAMMERS: Giannis Adamopoulos + */ + +#include <apitest.h> +#include <stdio.h> +#include <windows.h> +#include <uxtheme.h> +#include <vfwmsgs.h> + +START_TEST(SetThemeAppProperties) +{ + BOOL bThemeActive; + HTHEME hTheme; + HWND hWnd; + + bThemeActive = IsThemeActive(); + if (!bThemeActive) + { + skip("No active theme, skipping SetWindowTheme tests\n"); + return; + } + + SetLastError(0xdeadbeef); + + bThemeActive = IsAppThemed(); + ok (bThemeActive == FALSE, "\n"); + ok( GetLastError() == 0, "Expected 0 last error, got 0x%lx\n", GetLastError()); + + SetLastError(0xdeadbeef); + hTheme = OpenThemeData(NULL, L"BUTTON"); + ok (hTheme == NULL, "\n"); + ok( GetLastError() == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED last error, got 0x%lx\n", GetLastError()); + + hWnd = CreateWindowExA(0, "static", "", WS_POPUP, 0,0,100,100,0, 0, 0, NULL); + ok (hWnd != NULL, "\n"); + + SetLastError(0xdeadbeef); + bThemeActive = IsAppThemed(); + ok (bThemeActive == TRUE, "\n"); + ok( GetLastError() == 0, "Expected 0 last error, got 0x%lx\n", GetLastError()); + + SetLastError(0xdeadbeef); + hTheme = OpenThemeData(NULL, L"BUTTON"); + ok (hTheme != NULL, "\n"); + ok( GetLastError() == 0, "Expected 0 last error, got 0x%lx\n", GetLastError()); + + SetLastError(0xdeadbeef); + SetThemeAppProperties(0); + ok( GetLastError() == 0, "Expected 0 last error, got 0x%lx\n", GetLastError()); + + bThemeActive = IsThemeActive(); + ok (bThemeActive == TRUE, "\n"); + + bThemeActive = IsAppThemed(); + ok (bThemeActive == TRUE, "\n"); + + SetLastError(0xdeadbeef); + hTheme = OpenThemeData(NULL, L"BUTTON"); + ok (hTheme == NULL, "\n"); + ok( GetLastError() == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED last error, got 0x%lx\n", GetLastError()); + + SetThemeAppProperties(STAP_ALLOW_NONCLIENT); + + hTheme = OpenThemeDataEx (NULL, L"BUTTON", OTD_NONCLIENT); + ok (hTheme != NULL, "\n"); + SetLastError(0xdeadbeef); + hTheme = OpenThemeDataEx (NULL, L"BUTTON", 0); + ok (hTheme == NULL, "\n"); + ok( GetLastError() == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED last error, got 0x%lx\n", GetLastError()); + + SetThemeAppProperties(STAP_ALLOW_CONTROLS); + + SetLastError(0xdeadbeef); + hTheme = OpenThemeDataEx (NULL, L"BUTTON", OTD_NONCLIENT); + ok (hTheme == NULL, "\n"); + ok( GetLastError() == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED last error, got 0x%lx\n", GetLastError()); + hTheme = OpenThemeDataEx (NULL, L"BUTTON", 0); + ok (hTheme != NULL, "\n"); + +} Propchange: trunk/rostests/apitests/uxtheme/SetThemeAppProperties.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/uxtheme/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/uxtheme/testlist… ============================================================================== --- trunk/rostests/apitests/uxtheme/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/uxtheme/testlist.c [iso-8859-1] Wed Aug 9 07:14:44 2017 @@ -5,6 +5,7 @@ extern void func_CloseThemeData(void); extern void func_DrawThemeParentBackground(void); +extern void func_SetThemeAppProperties(void); extern void func_SetWindowTheme(void); const struct test winetest_testlist[] = @@ -12,5 +13,6 @@ { "CloseThemeData", func_CloseThemeData }, { "DrawThemeParentBackground", func_DrawThemeParentBackground }, { "SetWindowTheme", func_SetWindowTheme }, + { "SetThemeAppProperties", func_SetThemeAppProperties }, { 0, 0 } };

7 years, 4 months

[ashaposhnikov] 75512: [RAPPS] - Refactoring - A template for a future parameters parser

by ashaposhnikov＠svn.reactos.org

Author: ashaposhnikov Date: Tue Aug 8 21:32:11 2017 New Revision: 75512 URL: http://svn.reactos.org/svn/reactos?rev=75512&view=rev Log: [RAPPS] - Refactoring - A template for a future parameters parser Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/aboutdlg.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/settingsdlg.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/aboutdlg.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/aboutdlg.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/aboutdlg.cpp [iso-8859-1] Tue Aug 8 21:32:11 2017 @@ -4,32 +4,21 @@ * FILE: base/applications/rapps/aboutdlg.cpp * PURPOSE: About Dialog * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) + * Alexander Shaposhikov (chaez.san(a)gmail.com) */ #include "defines.h" -static -INT_PTR CALLBACK -AboutDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK AboutDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) { - switch (Msg) + if (Msg == WM_COMMAND && LOWORD(wParam) == IDOK) { - case WM_COMMAND: - { - switch (LOWORD(wParam)) - { - case IDOK: - EndDialog(hDlg, LOWORD(wParam)); - break; - } - } - break; + return EndDialog(hDlg, LOWORD(wParam)); } return FALSE; } -VOID -ShowAboutDialog(VOID) +VOID ShowAboutDialog() { DialogBoxW(hInst, MAKEINTRESOURCEW(IDD_ABOUT_DIALOG), Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] Tue Aug 8 21:32:11 2017 @@ -288,7 +288,10 @@ if (hFind == INVALID_HANDLE_VALUE) { if (GetFileAttributesW(m_szCabPath) == INVALID_FILE_ATTRIBUTES) + { CDownloadManager::DownloadApplicationsDB(APPLICATION_DATABASE_URL); + } + ExtractFilesFromCab(m_szCabPath, m_szAppsPath); hFind = FindFirstFileW(m_szSearchPath.GetString(), &FindFileData); Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1] Tue Aug 8 21:32:11 2017 @@ -43,6 +43,7 @@ #include "rosui.h" #include "dialogs.h" +#include "misc.h" #ifdef USE_CERT_PINNING #define CERT_ISSUER_INFO "BE\r\nGlobalSign nv-sa\r\nGlobalSign Domain Validation CA - SHA256 - G2" @@ -336,8 +337,7 @@ } #endif -inline VOID -MessageBox_LoadString(HWND hMainWnd, INT StringID) +inline VOID MessageBox_LoadString(HWND hMainWnd, INT StringID) { ATL::CString szMsgText; if (szMsgText.LoadStringW(hInst, StringID)) Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp [iso-8859-1] Tue Aug 8 21:32:11 2017 @@ -18,12 +18,12 @@ static HANDLE hLog = NULL; -typedef struct +struct ERF { int erfOper; int erfType; BOOL fError; -} ERF, *PERF; +}; struct FILELIST { @@ -48,9 +48,7 @@ typedef HRESULT(WINAPI *fnExtract)(SESSION *dest, LPCSTR szCabName); fnExtract pfnExtract; - -int -GetWindowWidth(HWND hwnd) +INT GetWindowWidth(HWND hwnd) { RECT Rect; @@ -58,8 +56,7 @@ return (Rect.right - Rect.left); } -int -GetWindowHeight(HWND hwnd) +INT GetWindowHeight(HWND hwnd) { RECT Rect; @@ -67,8 +64,7 @@ return (Rect.bottom - Rect.top); } -int -GetClientWindowWidth(HWND hwnd) +INT GetClientWindowWidth(HWND hwnd) { RECT Rect; @@ -76,8 +72,7 @@ return (Rect.right - Rect.left); } -int -GetClientWindowHeight(HWND hwnd) +INT GetClientWindowHeight(HWND hwnd) { RECT Rect; @@ -85,33 +80,33 @@ return (Rect.bottom - Rect.top); } -VOID -CopyTextToClipboard(LPCWSTR lpszText) -{ +VOID CopyTextToClipboard(LPCWSTR lpszText) +{ + if (!OpenClipboard(NULL)) + { + return; + } + HRESULT hr; - - if (OpenClipboard(NULL)) - { - HGLOBAL ClipBuffer; - WCHAR *Buffer; - DWORD cchBuffer; - - EmptyClipboard(); - cchBuffer = wcslen(lpszText) + 1; - ClipBuffer = GlobalAlloc(GMEM_DDESHARE, cchBuffer * sizeof(WCHAR)); - Buffer = (PWCHAR) GlobalLock(ClipBuffer); - hr = StringCchCopyW(Buffer, cchBuffer, lpszText); - GlobalUnlock(ClipBuffer); - - if (SUCCEEDED(hr)) - SetClipboardData(CF_UNICODETEXT, ClipBuffer); - - CloseClipboard(); - } -} - -VOID -SetWelcomeText(VOID) + HGLOBAL ClipBuffer; + LPWSTR Buffer; + DWORD cchBuffer; + + EmptyClipboard(); + cchBuffer = wcslen(lpszText) + 1; + ClipBuffer = GlobalAlloc(GMEM_DDESHARE, cchBuffer * sizeof(WCHAR)); + + Buffer = (PWCHAR) GlobalLock(ClipBuffer); + hr = StringCchCopyW(Buffer, cchBuffer, lpszText); + GlobalUnlock(ClipBuffer); + + if (SUCCEEDED(hr)) + SetClipboardData(CF_UNICODETEXT, ClipBuffer); + + CloseClipboard(); +} + +VOID SetWelcomeText() { ATL::CStringW szText; @@ -125,12 +120,11 @@ InsertRichEditText(szText, CFM_LINK); } -VOID -ShowPopupMenu(HWND hwnd, UINT MenuID, UINT DefaultItem) +VOID ShowPopupMenu(HWND hwnd, UINT MenuID, UINT DefaultItem) { HMENU hMenu = NULL; HMENU hPopupMenu; - MENUITEMINFO mii; + MENUITEMINFO ItemInfo; POINT pt; if (MenuID) @@ -139,15 +133,20 @@ hPopupMenu = GetSubMenu(hMenu, 0); } else + { hPopupMenu = GetMenu(hwnd); - - ZeroMemory(&mii, sizeof(mii)); - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_STATE; - GetMenuItemInfoW(hPopupMenu, DefaultItem, FALSE, &mii); - - if (!(mii.fState & MFS_GRAYED)) + } + + ZeroMemory(&ItemInfo, sizeof(ItemInfo)); + ItemInfo.cbSize = sizeof(ItemInfo); + ItemInfo.fMask = MIIM_STATE; + + GetMenuItemInfoW(hPopupMenu, DefaultItem, FALSE, &ItemInfo); + + if (!(ItemInfo.fState & MFS_GRAYED)) + { SetMenuDefaultItem(hPopupMenu, DefaultItem, FALSE); + } GetCursorPos(&pt); @@ -155,18 +154,17 @@ TrackPopupMenu(hPopupMenu, 0, pt.x, pt.y, 0, hMainWnd, NULL); if (hMenu) + { DestroyMenu(hMenu); -} - -BOOL -StartProcess(ATL::CStringW &Path, BOOL Wait) -{ - BOOL result = StartProcess(const_cast<LPWSTR>(Path.GetString()), Wait); - return result; -} - -BOOL -StartProcess(LPWSTR lpPath, BOOL Wait) + } +} + +BOOL StartProcess(ATL::CStringW &Path, BOOL Wait) +{ + return StartProcess(const_cast<LPWSTR>(Path.GetString()), Wait);; +} + +BOOL StartProcess(LPWSTR lpPath, BOOL Wait) { PROCESS_INFORMATION pi; STARTUPINFOW si; @@ -184,7 +182,11 @@ } CloseHandle(pi.hThread); - if (Wait) EnableWindow(hMainWnd, FALSE); + + if (Wait) + { + EnableWindow(hMainWnd, FALSE); + } while (Wait) { @@ -194,7 +196,7 @@ while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageW(&msg); } } else @@ -216,8 +218,7 @@ return TRUE; } -BOOL -GetStorageDirectory(ATL::CStringW& Directory) +BOOL GetStorageDirectory(ATL::CStringW& Directory) { if (!SHGetSpecialFolderPathW(NULL, Directory.GetBuffer(MAX_PATH), CSIDL_LOCAL_APPDATA, TRUE)) { @@ -231,14 +232,12 @@ return (CreateDirectoryW(Directory.GetString(), NULL) || GetLastError() == ERROR_ALREADY_EXISTS); } -BOOL -ExtractFilesFromCab(const ATL::CStringW &CabName, const ATL::CStringW &OutputPath) +BOOL ExtractFilesFromCab(const ATL::CStringW &CabName, const ATL::CStringW &OutputPath) { return ExtractFilesFromCab(CabName.GetString(), OutputPath.GetString()); } -BOOL -ExtractFilesFromCab(LPCWSTR lpCabName, LPCWSTR lpOutputPath) +BOOL ExtractFilesFromCab(LPCWSTR lpCabName, LPCWSTR lpOutputPath) { HINSTANCE hCabinetDll; CHAR szCabName[MAX_PATH]; @@ -275,92 +274,67 @@ return FALSE; } -VOID -InitLogs(VOID) -{ - WCHAR szBuf[MAX_PATH] = L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\ReactOS Application Manager"; +VOID InitLogs() +{ + if (!SettingsInfo.bLogEnabled) + { + return; + } + WCHAR szPath[MAX_PATH]; DWORD dwCategoryNum = 1; DWORD dwDisp, dwData; - HKEY hKey; - - if (!SettingsInfo.bLogEnabled) return; - - if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, - szBuf, 0, NULL, - REG_OPTION_NON_VOLATILE, - KEY_WRITE, NULL, &hKey, &dwDisp) != ERROR_SUCCESS) + ATL::CRegKey key; + + if (key.Create(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\ReactOS Application Manager", + REG_NONE, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &dwDisp) != ERROR_SUCCESS) { return; } if (!GetModuleFileNameW(NULL, szPath, _countof(szPath))) - return; - - if (RegSetValueExW(hKey, - L"EventMessageFile", - 0, - REG_EXPAND_SZ, - (LPBYTE) szPath, - (DWORD) (wcslen(szPath) + 1) * sizeof(WCHAR)) != ERROR_SUCCESS) - { - RegCloseKey(hKey); + { return; } dwData = EVENTLOG_ERROR_TYPE | EVENTLOG_WARNING_TYPE | EVENTLOG_INFORMATION_TYPE; - if (RegSetValueExW(hKey, - L"TypesSupported", - 0, - REG_DWORD, - (LPBYTE) &dwData, - sizeof(DWORD)) != ERROR_SUCCESS) - { - RegCloseKey(hKey); - return; - } - - if (RegSetValueExW(hKey, - L"CategoryMessageFile", - 0, - REG_EXPAND_SZ, - (LPBYTE) szPath, - (DWORD) (wcslen(szPath) + 1) * sizeof(WCHAR)) != ERROR_SUCCESS) - { - RegCloseKey(hKey); - return; - } - - if (RegSetValueExW(hKey, - L"CategoryCount", - 0, - REG_DWORD, - (LPBYTE) &dwCategoryNum, - sizeof(DWORD)) != ERROR_SUCCESS) - { - RegCloseKey(hKey); - return; - } - - RegCloseKey(hKey); - - hLog = RegisterEventSourceW(NULL, L"ReactOS Application Manager"); -} - - -VOID -FreeLogs(VOID) -{ - if (hLog) DeregisterEventSource(hLog); -} - - -BOOL -WriteLogMessage(WORD wType, DWORD dwEventID, LPCWSTR lpMsg) -{ - if (!SettingsInfo.bLogEnabled) return TRUE; + if ((key.SetStringValue(L"EventMessageFile", + szPath, + REG_EXPAND_SZ) == ERROR_SUCCESS) + && (key.SetStringValue(L"CategoryMessageFile", + szPath, + REG_EXPAND_SZ) == ERROR_SUCCESS) + && (key.SetDWORDValue(L"TypesSupported", + dwData) == ERROR_SUCCESS) + && (key.SetDWORDValue(L"CategoryCount", + dwCategoryNum) == ERROR_SUCCESS)) + + { + hLog = RegisterEventSourceW(NULL, L"ReactOS Application Manager"); + } + + key.Close(); +} + + +VOID FreeLogs() +{ + if (hLog) + { + DeregisterEventSource(hLog); + } +} + + +BOOL WriteLogMessage(WORD wType, DWORD dwEventID, LPCWSTR lpMsg) +{ + if (!SettingsInfo.bLogEnabled) + { + return TRUE; + } if (!ReportEventW(hLog, wType, 0, dwEventID, NULL, 1, 0, &lpMsg, NULL)) @@ -371,54 +345,51 @@ return TRUE; } -BOOL -GetInstalledVersion_WowUser(_Out_opt_ ATL::CStringW* szVersionResult, - _In_z_ const ATL::CStringW& RegName, - _In_ BOOL IsUserKey, - _In_ REGSAM keyWow) -{ - HKEY hKey; +BOOL GetInstalledVersion_WowUser(ATL::CStringW* szVersionResult, + const ATL::CStringW& RegName, + BOOL IsUserKey, + REGSAM keyWow) +{ BOOL bHasSucceded = FALSE; + ATL::CRegKey key; ATL::CStringW szVersion; ATL::CStringW szPath = L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\" + RegName; - if (RegOpenKeyExW(IsUserKey ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, - szPath.GetString(), 0, keyWow | KEY_READ, - &hKey) == ERROR_SUCCESS) - { - if (szVersionResult != NULL) - { - DWORD dwSize = MAX_PATH * sizeof(WCHAR); - DWORD dwType = REG_SZ; - if (RegQueryValueExW(hKey, - L"DisplayVersion", - NULL, - &dwType, - (LPBYTE) szVersion.GetBuffer(MAX_PATH), + if (key.Open(IsUserKey ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE, + szPath.GetString(), + keyWow | KEY_READ) != ERROR_SUCCESS) + { + return FALSE; + } + + if (szVersionResult != NULL) + { + ULONG dwSize = MAX_PATH * sizeof(WCHAR); + + if (key.QueryStringValue(L"DisplayVersion", + szVersion.GetBuffer(MAX_PATH), &dwSize) == ERROR_SUCCESS) - { - szVersion.ReleaseBuffer(); - *szVersionResult = szVersion; - bHasSucceded = TRUE; - } - else - { - szVersion.ReleaseBuffer(); - } + { + szVersion.ReleaseBuffer(); + *szVersionResult = szVersion; + bHasSucceded = TRUE; } else { - bHasSucceded = TRUE; szVersion.ReleaseBuffer(); } - - } - - RegCloseKey(hKey); + } + else + { + bHasSucceded = TRUE; + szVersion.ReleaseBuffer(); + } + key.Close(); + return bHasSucceded; } -BOOL GetInstalledVersion(ATL::CStringW * pszVersion, const ATL::CStringW & szRegName) +BOOL GetInstalledVersion(ATL::CStringW *pszVersion, const ATL::CStringW &szRegName) { return (!szRegName.IsEmpty() && (GetInstalledVersion_WowUser(pszVersion, szRegName, TRUE, KEY_WOW64_32KEY) Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/settingsdlg.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/settingsdlg.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/settingsdlg.cpp [iso-8859-1] Tue Aug 8 21:32:11 2017 @@ -19,7 +19,7 @@ ChooseFolder(HWND hwnd) { BOOL bRet = FALSE; - BROWSEINFO bi; + BROWSEINFOW bi; ATL::CStringW szBuf; szBuf.LoadStringW(hInst, IDS_CHOOSE_FOLDER_TEXT); @@ -53,8 +53,7 @@ return bRet; } -static VOID -InitSettingsControls(HWND hDlg, PSETTINGS_INFO Info) +static VOID InitSettingsControls(HWND hDlg, PSETTINGS_INFO Info) { SendDlgItemMessageW(hDlg, IDC_SAVE_WINDOW_POS, BM_SETCHECK, Info->bSaveWndPos, 0); SendDlgItemMessageW(hDlg, IDC_UPDATE_AVLIST, BM_SETCHECK, Info->bUpdateAtStart, 0); @@ -76,9 +75,7 @@ SetWindowTextW(GetDlgItem(hDlg, IDC_NO_PROXY_FOR), Info->szNoProxyFor); } -static -INT_PTR CALLBACK -SettingsDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK SettingsDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) { switch (Msg) { @@ -208,8 +205,7 @@ return FALSE; } -VOID -CreateSettingsDlg(HWND hwnd) +VOID CreateSettingsDlg(HWND hwnd) { DialogBoxW(hInst, MAKEINTRESOURCEW(IDD_SETTINGS_DIALOG), Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp [iso-8859-1] Tue Aug 8 21:32:11 2017 @@ -50,10 +50,10 @@ } } -VOID -FillDefaultSettings(PSETTINGS_INFO pSettingsInfo) +VOID FillDefaultSettings(PSETTINGS_INFO pSettingsInfo) { ATL::CStringW szDownloadDir; + pSettingsInfo->bSaveWndPos = TRUE; pSettingsInfo->bUpdateAtStart = FALSE; pSettingsInfo->bLogEnabled = TRUE; @@ -67,7 +67,9 @@ } } else + { szDownloadDir.ReleaseBuffer(); + } szDownloadDir += L"\\RAPPS Downloads"; ATL::CStringW::CopyChars(pSettingsInfo->szDownloadDir, @@ -87,32 +89,26 @@ pSettingsInfo->szNoProxyFor[0] = UNICODE_NULL; } -static BOOL -LoadSettings(VOID) -{ - HKEY hKey; +static BOOL LoadSettings() +{ + ATL::CRegKey RegKey; DWORD dwSize; - - if (RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\ReactOS\\rapps", 0, KEY_READ, &hKey) == ERROR_SUCCESS) + BOOL bResult = FALSE; + if (RegKey.Open(HKEY_CURRENT_USER, L"Software\\ReactOS\\rapps", KEY_READ) == ERROR_SUCCESS) { dwSize = sizeof(SettingsInfo); - if (RegQueryValueExW(hKey, L"Settings", NULL, NULL, (LPBYTE) &SettingsInfo, &dwSize) == ERROR_SUCCESS) - { - RegCloseKey(hKey); - return TRUE; - } - - RegCloseKey(hKey); - } - - return FALSE; -} - -VOID -SaveSettings(HWND hwnd) + bResult = (RegKey.QueryBinaryValue(L"Settings", (PVOID) &SettingsInfo, &dwSize) == ERROR_SUCCESS); + + RegKey.Close(); + } + + return bResult; +} + +VOID SaveSettings(HWND hwnd) { WINDOWPLACEMENT wp; - HKEY hKey; + ATL::CRegKey RegKey; if (SettingsInfo.bSaveWndPos) { @@ -123,35 +119,49 @@ SettingsInfo.Top = wp.rcNormalPosition.top; SettingsInfo.Width = wp.rcNormalPosition.right - wp.rcNormalPosition.left; SettingsInfo.Height = wp.rcNormalPosition.bottom - wp.rcNormalPosition.top; - SettingsInfo.Maximized = (wp.showCmd == SW_MAXIMIZE || (wp.showCmd == SW_SHOWMINIMIZED && (wp.flags & WPF_RESTORETOMAXIMIZED))); - } - - if (RegCreateKeyExW(HKEY_CURRENT_USER, L"Software\\ReactOS\\rapps", 0, NULL, - REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS) - { - RegSetValueExW(hKey, L"Settings", 0, REG_BINARY, (LPBYTE) &SettingsInfo, sizeof(SettingsInfo)); - RegCloseKey(hKey); - } -} - -int WINAPI -wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nShowCmd) -{ - WCHAR szWindowClass[] = L"ROSAPPMGR"; + SettingsInfo.Maximized = (wp.showCmd == SW_MAXIMIZE + || (wp.showCmd == SW_SHOWMINIMIZED + && (wp.flags & WPF_RESTORETOMAXIMIZED))); + } + + if (RegKey.Create(HKEY_CURRENT_USER, L"Software\\ReactOS\\rapps", NULL, + REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, NULL) == ERROR_SUCCESS) + { + RegKey.SetBinaryValue(L"Settings", (const PVOID) &SettingsInfo, sizeof(SettingsInfo)); + RegKey.Close(); + } +} + + +#define CMD_KEY_SETUP L"//SETUP" + +VOID CmdParser(LPWSTR lpCmdLine) +{ + INT argc; + LPWSTR* argv = CommandLineToArgvW(lpCmdLine, &argc); + if (!argv || argc < 2) + { + return; + } + + if (!StrCmpW(argv[0], CMD_KEY_SETUP)) + { + //TODO: call cmd app installation + } +} + +INT WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nShowCmd) +{ + LPCWSTR szWindowClass = L"ROSAPPMGR"; HANDLE hMutex = NULL; HACCEL KeyBrd; MSG Msg; InitializeAtlModule(hInstance, TRUE); - switch (GetUserDefaultUILanguage()) - { - case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT): + if (GetUserDefaultUILanguage() == MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT)) + { SetProcessDefaultLayout(LAYOUT_RTL); - break; - - default: - break; } hInst = hInstance; @@ -178,30 +188,30 @@ InitCommonControls(); hMainWnd = CreateMainWindow(); - if (!hMainWnd) goto Exit; - - /* Maximize it if we must */ - ShowWindow(hMainWnd, (SettingsInfo.bSaveWndPos && SettingsInfo.Maximized ? SW_MAXIMIZE : nShowCmd)); - UpdateWindow(hMainWnd); - - //TODO: get around the ugliness - if (SettingsInfo.bUpdateAtStart) - GetAvailableApps()->UpdateAppsDB(); - - /* Load the menu hotkeys */ - KeyBrd = LoadAcceleratorsW(NULL, MAKEINTRESOURCEW(HOTKEYS)); - - /* Message Loop */ - while (GetMessageW(&Msg, NULL, 0, 0)) - { - if (!TranslateAcceleratorW(hMainWnd, KeyBrd, &Msg)) + if (hMainWnd) + { + /* Maximize it if we must */ + ShowWindow(hMainWnd, (SettingsInfo.bSaveWndPos && SettingsInfo.Maximized ? SW_MAXIMIZE : nShowCmd)); + UpdateWindow(hMainWnd); + + //TODO: get around the ugliness + if (SettingsInfo.bUpdateAtStart) + GetAvailableApps()->UpdateAppsDB(); + + /* Load the menu hotkeys */ + KeyBrd = LoadAcceleratorsW(NULL, MAKEINTRESOURCEW(HOTKEYS)); + + /* Message Loop */ + while (GetMessageW(&Msg, NULL, 0, 0)) { - TranslateMessage(&Msg); - DispatchMessageW(&Msg); + if (!TranslateAcceleratorW(hMainWnd, KeyBrd, &Msg)) + { + TranslateMessage(&Msg); + DispatchMessageW(&Msg); + } } } -Exit: if (hMutex) CloseHandle(hMutex);

7 years, 4 months

[gadamopoulos] 75511: [USER32] -Make it clear when VersionRegisterClass is used. This should be called after a versioned class was not found hence it should appear after some failures in win32k (an...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Aug 8 21:09:51 2017 New Revision: 75511 URL: http://svn.reactos.org/svn/reactos?rev=75511&view=rev Log: [USER32] -Make it clear when VersionRegisterClass is used. This should be called after a versioned class was not found hence it should appear after some failures in win32k (and this is exactly how RegisterClassNameW was designed to be used, after a failure to find a class). Modified: trunk/reactos/win32ss/user/user32/windows/class.c Modified: trunk/reactos/win32ss/user/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] Tue Aug 8 21:09:51 2017 @@ -204,6 +204,8 @@ WCHAR ClassNameBuf[MAX_PATH] = {0}; RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED Frame = { sizeof(Frame), 1 }; + ERR("VersionRegisterClass: Attempting to call RegisterClassNameW in %S\n.", lpLibFileName); + RtlActivateActivationContextUnsafeFast(&Frame, Contex); _SEH2_TRY

7 years, 4 months

[mjansen] 75510: [UNATTEND] Show how to enable the lautus theme in unattended mode.

by mjansen＠svn.reactos.org

Author: mjansen Date: Tue Aug 8 19:43:49 2017 New Revision: 75510 URL: http://svn.reactos.org/svn/reactos?rev=75510&view=rev Log: [UNATTEND] Show how to enable the lautus theme in unattended mode. Modified: trunk/reactos/boot/bootdata/bootcd/unattend.inf Modified: trunk/reactos/boot/bootdata/bootcd/unattend.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcd/unatt… ============================================================================== --- trunk/reactos/boot/bootdata/bootcd/unattend.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootcd/unattend.inf [iso-8859-1] Tue Aug 8 19:43:49 2017 @@ -54,6 +54,8 @@ ; ; [GuiRunOnce] ; %SystemRoot%\system32\cmd.exe +; Enable the next line (+ the GuiRunOnce section) to enable the lautus theme +; "rundll32.exe shell32.dll,Control_RunDLL desk.cpl desk,@Appearance /Action:ActivateMSTheme /file:%SYSTEMROOT%\Resources\themes\lautus\lautus.msstyles" ; enable this section to change resolution / bpp

7 years, 4 months

[hbelusca] 75509: [USETUP]: Comment out SetupQueueCopyWNew() declaration which is not used at all. Remove unnecessary casts in the INF_OpenBufferedFileA() call.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Aug 8 14:07:17 2017 New Revision: 75509 URL: http://svn.reactos.org/svn/reactos?rev=75509&view=rev Log: [USETUP]: Comment out SetupQueueCopyWNew() declaration which is not used at all. Remove unnecessary casts in the INF_OpenBufferedFileA() call. Modified: branches/setup_improvements/base/setup/usetup/filequeue.h branches/setup_improvements/base/setup/usetup/interface/usetup.c Modified: branches/setup_improvements/base/setup/usetup/filequeue.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/filequeue.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/filequeue.h [iso-8859-1] Tue Aug 8 14:07:17 2017 @@ -60,7 +60,7 @@ typedef struct _COPYCONTEXT { LPCWSTR DestinationRootPath; /* Not owned by this structure */ - LPCWSTR InstallPath; /* Not owned by this structure */ + LPCWSTR InstallPath; /* Not owned by this structure */ ULONG TotalOperations; ULONG CompletedOperations; PPROGRESSBAR ProgressBar; @@ -78,6 +78,7 @@ SetupCloseFileQueue( IN HSPFILEQ QueueHandle); +#if 0 // This is the API that is declared in setupapi.h and exported by setupapi.dll BOOL WINAPI SetupQueueCopyWNew( @@ -90,6 +91,7 @@ IN PCWSTR TargetDirectory, IN PCWSTR TargetFileName, IN DWORD CopyStyle); +#endif BOOL SetupQueueCopy( Modified: branches/setup_improvements/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/interface/usetup.c [iso-8859-1] Tue Aug 8 14:07:17 2017 @@ -3906,9 +3906,9 @@ return QUIT_PAGE; } - InfHandle = INF_OpenBufferedFileA((CHAR*) InfFileData, + InfHandle = INF_OpenBufferedFileA((PSTR)InfFileData, InfFileSize, - (const CHAR*) NULL, + NULL, INF_STYLE_WIN4, LanguageId, &ErrorLine);

7 years, 4 months

[hbelusca] 75508: [SETUPLIB]: Introduce defines for size units. [USETUP]: Use them in the code.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Aug 8 14:05:20 2017 New Revision: 75508 URL: http://svn.reactos.org/svn/reactos?rev=75508&view=rev Log: [SETUPLIB]: Introduce defines for size units. [USETUP]: Use them in the code. Modified: branches/setup_improvements/base/setup/lib/setuplib.h branches/setup_improvements/base/setup/usetup/interface/usetup.c branches/setup_improvements/base/setup/usetup/partlist.c Modified: branches/setup_improvements/base/setup/lib/setuplib.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/setuplib.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/setuplib.h [iso-8859-1] Tue Aug 8 14:05:20 2017 @@ -7,6 +7,8 @@ */ #pragma once + +/* INCLUDES *****************************************************************/ /* Needed PSDK headers when using this library */ #if 0 @@ -38,4 +40,14 @@ #include "regutil.h" #include "registry.h" + +/* DEFINES ******************************************************************/ + +#define KB ((ULONGLONG)1024) +#define MB (KB*KB) +#define GB (KB*KB*KB) +// #define TB (KB*KB*KB*KB) +// #define PB (KB*KB*KB*KB*KB) + + /* EOF */ Modified: branches/setup_improvements/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/interface/usetup.c [iso-8859-1] Tue Aug 8 14:05:20 2017 @@ -1649,7 +1649,7 @@ ULONGLONG size; size = PartEntry->SectorCount.QuadPart * PartEntry->DiskEntry->BytesPerSector; - size = (size + 524288) / 1048576; /* in MBytes */ + size = (size + (512 * KB)) / MB; /* in MBytes */ if (size < RequiredPartitionDiskSpace) { @@ -2096,15 +2096,15 @@ DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; #if 0 - if (DiskSize >= 10737418240) /* 10 GB */ - { - DiskSize = DiskSize / 1073741824; + if (DiskSize >= 10 * GB) /* 10 GB */ + { + DiskSize = DiskSize / GB; Unit = MUIGetString(STRING_GB); } else #endif { - DiskSize = DiskSize / 1048576; + DiskSize = DiskSize / MB; if (DiskSize == 0) DiskSize = 1; @@ -2141,7 +2141,7 @@ #if 0 CONSOLE_PrintTextXY(8, 10, "Maximum size of the new partition is %I64u MB", - PartitionList->CurrentPartition->SectorCount * DiskEntry->BytesPerSector / 1048576); + PartitionList->CurrentPartition->SectorCount * DiskEntry->BytesPerSector / MB); #endif CONSOLE_SetStatusText(MUIGetString(STRING_CREATEPARTITION)); @@ -2149,7 +2149,7 @@ PartEntry = PartitionList->CurrentPartition; while (TRUE) { - MaxSize = (PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector) / 1048576; /* in MBytes (rounded) */ + MaxSize = (PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector) / MB; /* in MBytes (rounded) */ if (MaxSize > PARTITION_MAXSIZE) MaxSize = PARTITION_MAXSIZE; @@ -2193,7 +2193,7 @@ else { /* Calculate the sector count from the size in MB */ - SectorCount = PartSize * 1048576 / DiskEntry->BytesPerSector; + SectorCount = PartSize * MB / DiskEntry->BytesPerSector; /* But never get larger than the unpartitioned disk space */ if (SectorCount > PartEntry->SectorCount.QuadPart) @@ -2255,15 +2255,15 @@ DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; #if 0 - if (DiskSize >= 10737418240) /* 10 GB */ - { - DiskSize = DiskSize / 1073741824; + if (DiskSize >= 10 * GB) /* 10 GB */ + { + DiskSize = DiskSize / GB; Unit = MUIGetString(STRING_GB); } else #endif { - DiskSize = DiskSize / 1048576; + DiskSize = DiskSize / MB; if (DiskSize == 0) DiskSize = 1; @@ -2300,7 +2300,7 @@ #if 0 CONSOLE_PrintTextXY(8, 10, "Maximum size of the new partition is %I64u MB", - PartitionList->CurrentPartition->SectorCount * DiskEntry->BytesPerSector / 1048576); + PartitionList->CurrentPartition->SectorCount * DiskEntry->BytesPerSector / MB); #endif CONSOLE_SetStatusText(MUIGetString(STRING_CREATEPARTITION)); @@ -2308,7 +2308,7 @@ PartEntry = PartitionList->CurrentPartition; while (TRUE) { - MaxSize = (PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector) / 1048576; /* in MBytes (rounded) */ + MaxSize = (PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector) / MB; /* in MBytes (rounded) */ if (MaxSize > PARTITION_MAXSIZE) MaxSize = PARTITION_MAXSIZE; @@ -2352,7 +2352,7 @@ else { /* Calculate the sector count from the size in MB */ - SectorCount = PartSize * 1048576 / DiskEntry->BytesPerSector; + SectorCount = PartSize * MB / DiskEntry->BytesPerSector; /* But never get larger than the unpartitioned disk space */ if (SectorCount > PartEntry->SectorCount.QuadPart) @@ -2413,15 +2413,15 @@ DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; #if 0 - if (DiskSize >= 10737418240) /* 10 GB */ - { - DiskSize = DiskSize / 1073741824; + if (DiskSize >= 10 * GB) /* 10 GB */ + { + DiskSize = DiskSize / GB; Unit = MUIGetString(STRING_GB); } else #endif { - DiskSize = DiskSize / 1048576; + DiskSize = DiskSize / MB; if (DiskSize == 0) DiskSize = 1; @@ -2458,7 +2458,7 @@ #if 0 CONSOLE_PrintTextXY(8, 10, "Maximum size of the new partition is %I64u MB", - PartitionList->CurrentPartition->SectorCount * DiskEntry->BytesPerSector / 1048576); + PartitionList->CurrentPartition->SectorCount * DiskEntry->BytesPerSector / MB); #endif CONSOLE_SetStatusText(MUIGetString(STRING_CREATEPARTITION)); @@ -2466,7 +2466,7 @@ PartEntry = PartitionList->CurrentPartition; while (TRUE) { - MaxSize = (PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector) / 1048576; /* in MBytes (rounded) */ + MaxSize = (PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector) / MB; /* in MBytes (rounded) */ if (MaxSize > PARTITION_MAXSIZE) MaxSize = PARTITION_MAXSIZE; @@ -2510,7 +2510,7 @@ else { /* Calculate the sector count from the size in MB */ - SectorCount = PartSize * 1048576 / DiskEntry->BytesPerSector; + SectorCount = PartSize * MB / DiskEntry->BytesPerSector; /* But never get larger than the unpartitioned disk space */ if (SectorCount > PartEntry->SectorCount.QuadPart) @@ -2611,21 +2611,21 @@ PartSize = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; #if 0 - if (PartSize >= 10737418240) /* 10 GB */ - { - PartSize = PartSize / 1073741824; + if (PartSize >= 10 * GB) /* 10 GB */ + { + PartSize = PartSize / GB; Unit = MUIGetString(STRING_GB); } else #endif - if (PartSize >= 10485760) /* 10 MB */ - { - PartSize = PartSize / 1048576; + if (PartSize >= 10 * MB) /* 10 MB */ + { + PartSize = PartSize / MB; Unit = MUIGetString(STRING_MB); } else { - PartSize = PartSize / 1024; + PartSize = PartSize / KB; Unit = MUIGetString(STRING_KB); } @@ -2652,15 +2652,15 @@ DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; #if 0 - if (DiskSize >= 10737418240) /* 10 GB */ - { - DiskSize = DiskSize / 1073741824; + if (DiskSize >= 10 * GB) /* 10 GB */ + { + DiskSize = DiskSize / GB; Unit = MUIGetString(STRING_GB); } else #endif { - DiskSize = DiskSize / 1048576; + DiskSize = DiskSize / MB; if (DiskSize == 0) DiskSize = 1; @@ -2861,27 +2861,27 @@ /* Adjust disk size */ DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; - if (DiskSize >= 10737418240) /* 10 GB */ - { - DiskSize = DiskSize / 1073741824; + if (DiskSize >= 10 * GB) /* 10 GB */ + { + DiskSize = DiskSize / GB; DiskUnit = MUIGetString(STRING_GB); } else { - DiskSize = DiskSize / 1048576; + DiskSize = DiskSize / MB; DiskUnit = MUIGetString(STRING_MB); } /* Adjust partition size */ PartSize = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; - if (PartSize >= 10737418240) /* 10 GB */ - { - PartSize = PartSize / 1073741824; + if (PartSize >= 10 * GB) /* 10 GB */ + { + PartSize = PartSize / GB; PartUnit = MUIGetString(STRING_GB); } else { - PartSize = PartSize / 1048576; + PartSize = PartSize / MB; PartUnit = MUIGetString(STRING_MB); } Modified: branches/setup_improvements/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/partlist.c [iso-8859-1] Tue Aug 8 14:05:20 2017 @@ -292,21 +292,21 @@ { PartSize.QuadPart = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; #if 0 - if (PartSize.QuadPart >= 10737418240) /* 10 GB */ - { - PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, 1073741824); + if (PartSize.QuadPart >= 10 * GB) /* 10 GB */ + { + PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, GB); Unit = MUIGetString(STRING_GB); } else #endif - if (PartSize.QuadPart >= 10485760) /* 10 MB */ - { - PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, 1048576); + if (PartSize.QuadPart >= 10 * MB) /* 10 MB */ + { + PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, MB); Unit = MUIGetString(STRING_MB); } else { - PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, 1024); + PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, KB); Unit = MUIGetString(STRING_KB); } @@ -335,21 +335,21 @@ PartSize.QuadPart = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; #if 0 - if (PartSize.QuadPart >= 10737418240) /* 10 GB */ - { - PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, 1073741824); + if (PartSize.QuadPart >= 10 * GB) /* 10 GB */ + { + PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, GB); Unit = MUIGetString(STRING_GB); } else #endif - if (PartSize.QuadPart >= 10485760) /* 10 MB */ - { - PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, 1048576); + if (PartSize.QuadPart >= 10 * MB) /* 10 MB */ + { + PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, MB); Unit = MUIGetString(STRING_MB); } else { - PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, 1024); + PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, KB); Unit = MUIGetString(STRING_KB); } @@ -442,14 +442,14 @@ coPos.Y = ListUi->Top + 1 + ListUi->Line; DiskSize.QuadPart = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; - if (DiskSize.QuadPart >= 10737418240) /* 10 GB */ - { - DiskSize.QuadPart = RoundingDivide(DiskSize.QuadPart, 1073741824); + if (DiskSize.QuadPart >= 10 * GB) /* 10 GB */ + { + DiskSize.QuadPart = RoundingDivide(DiskSize.QuadPart, GB); Unit = MUIGetString(STRING_GB); } else { - DiskSize.QuadPart = RoundingDivide(DiskSize.QuadPart, 1048576); + DiskSize.QuadPart = RoundingDivide(DiskSize.QuadPart, MB); if (DiskSize.QuadPart == 0) DiskSize.QuadPart = 1; Unit = MUIGetString(STRING_MB);

7 years, 4 months

[hbelusca] 75507: [SETUPLIB]: IniCacheSave(): use the OBJ_CASE_INSENSITIVE flag.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Aug 8 13:54:23 2017 New Revision: 75507 URL: http://svn.reactos.org/svn/reactos?rev=75507&view=rev Log: [SETUPLIB]: IniCacheSave(): use the OBJ_CASE_INSENSITIVE flag. Modified: branches/setup_improvements/base/setup/lib/inicache.c Modified: branches/setup_improvements/base/setup/lib/inicache.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/inicache.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/inicache.c [iso-8859-1] Tue Aug 8 13:54:23 2017 @@ -1057,7 +1057,7 @@ InitializeObjectAttributes(&ObjectAttributes, &Name, - 0, + OBJ_CASE_INSENSITIVE, NULL, NULL);

7 years, 4 months

← Newer
1
...
19
20
21
22
23
24
25
26
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2017