Ros-diffs December 2016

ros-diffs@reactos.org

10 participants
83 discussions

[gadamopoulos] 73443: [BOOT] LiveCD: Create all profile subdirectories that Shell wants. Patch by Serge Gautherie. CORE-12527

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Dec 9 20:40:52 2016 New Revision: 73443 URL: http://svn.reactos.org/svn/reactos?rev=73443&view=rev Log: [BOOT] LiveCD: Create all profile subdirectories that Shell wants. Patch by Serge Gautherie. CORE-12527 Modified: trunk/reactos/boot/CMakeLists.txt Modified: trunk/reactos/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/CMakeLists.txt?rev=73… ============================================================================== --- trunk/reactos/boot/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/CMakeLists.txt [iso-8859-1] Fri Dec 9 20:40:52 2016 @@ -110,10 +110,33 @@ if(USE_MKISOFS) file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") - # Create the empty Desktop, Favorites, and Start Menu folders + # Create the empty Desktop, Favorites, and Start Menu folders. And many more. + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/All Users/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/All Users/Documents/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/All Users/Documents/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/All Users/Documents/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/All Users/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/All Users/My Documents=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/All Users/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/All Users/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Cookies=${CMAKE_CURRENT_BINARY_DIR}/empty\n") file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Desktop=${CMAKE_CURRENT_BINARY_DIR}/empty\n") file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Local Settings/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Local Settings/History=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Local Settings/Temporary Internet Files=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/NetHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/PrintHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Recent=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/SendTo=${CMAKE_CURRENT_BINARY_DIR}/empty\n") file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Start Menu/Programs=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Start Menu/Programs/Administrative Tools=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") add_custom_target(livecd COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/livecd.iso -iso-level 4 @@ -124,10 +147,33 @@ DEPENDS native-mkisofs VERBATIM) else() - # Create the empty Desktop, Favorites, and Start Menu folders + # Create the empty Desktop, Favorites, and Start Menu folders. And many more. + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/All Users/Application Data\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/All Users/Documents/My Music\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/All Users/Documents/My Pictures\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/All Users/Documents/My Videos\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/All Users/Favorites\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/All Users/My Documents\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/All Users/Start Menu/Programs/StartUp\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/All Users/Templates\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Application Data\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Cookies\n") file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Desktop\n") file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Favorites\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Local Settings/Application Data\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Local Settings/History\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Local Settings/Temporary Internet Files\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/My Music\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/My Pictures\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/My Videos\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/NetHood\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/PrintHood\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Recent\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/SendTo\n") file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Start Menu/Programs\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Start Menu/Programs/Administrative Tools\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Start Menu/Programs/StartUp\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.lst "Profiles/Default User/Templates\n") add_custom_target(livecd COMMAND native-cdmake -j -m -bootdata:2\#p0,e,b${_isoboot_file}\#pEF,e,b${_efisys_file} @${CMAKE_CURRENT_BINARY_DIR}/livecd.lst REACTOS ${REACTOS_BINARY_DIR}/livecd.iso @@ -142,10 +188,33 @@ if(USE_MKISOFS) file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") - # Create the empty Desktop, Favorites, and Start Menu folders + # Create the empty Desktop, Favorites, and Start Menu folders. And many more. + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/Documents/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/Documents/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/Documents/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/My Documents=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Cookies=${CMAKE_CURRENT_BINARY_DIR}/empty\n") file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Desktop=${CMAKE_CURRENT_BINARY_DIR}/empty\n") file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Local Settings/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Local Settings/History=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Local Settings/Temporary Internet Files=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/NetHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/PrintHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Recent=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/SendTo=${CMAKE_CURRENT_BINARY_DIR}/empty\n") file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Start Menu/Programs=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Start Menu/Programs/Administrative Tools=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") add_custom_target(hybridcd COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/hybridcd.iso -iso-level 4 @@ -156,10 +225,33 @@ DEPENDS native-mkisofs bootcd livecd VERBATIM) else() - # Create the empty Desktop, Favorites, and Start Menu folders + # Create the empty Desktop, Favorites, and Start Menu folders. And many more. + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/Application Data\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/Documents/My Music\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/Documents/My Pictures\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/Documents/My Videos\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/Favorites\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/My Documents\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/Start Menu/Programs/StartUp\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/Templates\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Application Data\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Cookies\n") file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Desktop\n") file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Favorites\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Local Settings/Application Data\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Local Settings/History\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Local Settings/Temporary Internet Files\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/My Music\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/My Pictures\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/My Videos\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/NetHood\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/PrintHood\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Recent\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/SendTo\n") file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Start Menu/Programs\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Start Menu/Programs/Administrative Tools\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Start Menu/Programs/StartUp\n") + file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Templates\n") add_custom_target(hybridcd COMMAND native-cdmake -j -m -bootdata:2\#p0,e,b${_isoboot_file}\#pEF,e,b${_efisys_file} @${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst REACTOS ${REACTOS_BINARY_DIR}/hybridcd.iso

8 years

[gadamopoulos] 73442: [SETUPAPI] - Add missing error checks in do_file_copyW. Patch by Carlo Bramini. CORE-12471

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Dec 9 18:39:11 2016 New Revision: 73442 URL: http://svn.reactos.org/svn/reactos?rev=73442&view=rev Log: [SETUPAPI] - Add missing error checks in do_file_copyW. Patch by Carlo Bramini. CORE-12471 Modified: trunk/reactos/dll/win32/setupapi/queue.c Modified: trunk/reactos/dll/win32/setupapi/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/queue.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/queue.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/queue.c [iso-8859-1] Fri Dec 9 18:39:11 2016 @@ -994,16 +994,42 @@ TRACE("copy %s to %s style 0x%x\n",debugstr_w(source),debugstr_w(target),style); + /* Get a temp file name */ + if (!GetTempPathW(sizeof(TempPath) / sizeof(WCHAR), TempPath)) + { + ERR("GetTempPathW error\n"); + return FALSE; + } + if (!GetTempFileNameW(TempPath, L"", 0, TempFile)) + { + ERR("GetTempFileNameW(%s) error\n", debugstr_w(TempPath)); + return FALSE; + } + + /* Try to open the source file */ hSource = LZOpenFileW((LPWSTR)source, &OfStruct, OF_READ); if (hSource < 0) + { + ERR("LZOpenFileW(1) error %d %s\n", (int)hSource, debugstr_w(source)); return FALSE; - - /* Get a temp file name */ - GetTempPathW(sizeof(TempPath) / sizeof(WCHAR), TempPath); - GetTempFileNameW(TempPath, L"", 0, TempFile); + } /* Extract the compressed file to a temp location */ hTemp = LZOpenFileW(TempFile, &OfStruct, OF_CREATE); + if (hTemp < 0) + { + DWORD dwLastError = GetLastError(); + + ERR("LZOpenFileW(2) error %d %s\n", (int)hTemp, debugstr_w(TempFile)); + + /* Close the source handle */ + LZClose(hSource); + + /* Restore error condition triggered by LZOpenFileW */ + SetLastError(dwLastError); + return FALSE; + } + LZCopy(hSource, hTemp); LZClose(hSource); LZClose(hTemp);

8 years

[gadamopoulos] 73441: [USETUP] -Fix setting the language id when compiling for a single language. CORE-10958

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Dec 9 18:30:50 2016 New Revision: 73441 URL: http://svn.reactos.org/svn/reactos?rev=73441&view=rev Log: [USETUP] -Fix setting the language id when compiling for a single language. CORE-10958 Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Fri Dec 9 18:30:50 2016 @@ -662,7 +662,10 @@ /* If there's just a single language in the list skip * the language selection process altogether! */ if (GenericListHasSingleEntry(LanguageList)) + { + LanguageId = (LANGID)(wcstol(SelectedLanguageId, NULL, 16) & 0xFFFF); return INTRO_PAGE; + } DrawGenericList(LanguageList, 2,

8 years

[hbelusca] 73440: [USERENV] - Use a better variable type for the 'Environment' parameter of SetUserEnvironmentVariable, AppendUserEnvironmentVariable, SetUserEnvironment, SetSystemEnvironment, so a...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Dec 8 16:12:59 2016 New Revision: 73440 URL: http://svn.reactos.org/svn/reactos?rev=73440&view=rev Log: [USERENV] - Use a better variable type for the 'Environment' parameter of SetUserEnvironmentVariable, AppendUserEnvironmentVariable, SetUserEnvironment, SetSystemEnvironment, so as to avoid useless casts. - Add old-style parameter annotations for exported functions (at least); - Add an implementation comment about setting HOMEDRIVE/HOMEPATH; - Use ARRAYSIZE() instead of hardcoded buffer sizes; - Don't say that GetShortPathNameW() failed when it succeeds; - Use standard capitalization for hardcoded environment variables. Modified: trunk/reactos/dll/win32/userenv/environment.c Modified: trunk/reactos/dll/win32/userenv/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/environm… ============================================================================== --- trunk/reactos/dll/win32/userenv/environment.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/environment.c [iso-8859-1] Thu Dec 8 16:12:59 2016 @@ -31,15 +31,14 @@ static BOOL -SetUserEnvironmentVariable(LPVOID *Environment, +SetUserEnvironmentVariable(PWSTR* Environment, LPWSTR lpName, LPWSTR lpValue, BOOL bExpand) { NTSTATUS Status; UNICODE_STRING Name; - UNICODE_STRING SrcValue; - UNICODE_STRING DstValue; + UNICODE_STRING SrcValue, DstValue; ULONG Length; PVOID Buffer = NULL; WCHAR ShortName[MAX_PATH]; @@ -59,7 +58,7 @@ return FALSE; } - Status = RtlExpandEnvironmentStrings_U((PWSTR)*Environment, + Status = RtlExpandEnvironmentStrings_U(*Environment, &SrcValue, &DstValue, &Length); @@ -79,13 +78,15 @@ RtlInitUnicodeString(&DstValue, lpValue); } - if (!_wcsicmp(lpName, L"temp") || !_wcsicmp(lpName, L"tmp")) - { - if (GetShortPathNameW(DstValue.Buffer, ShortName, MAX_PATH)) + if (!_wcsicmp(lpName, L"TEMP") || !_wcsicmp(lpName, L"TMP")) + { + if (GetShortPathNameW(DstValue.Buffer, ShortName, ARRAYSIZE(ShortName))) + { + RtlInitUnicodeString(&DstValue, ShortName); + } + else { DPRINT("GetShortPathNameW() failed for %S (Error %lu)\n", DstValue.Buffer, GetLastError()); - - RtlInitUnicodeString(&DstValue, ShortName); } DPRINT("Buffer: %S\n", ShortName); @@ -95,7 +96,7 @@ DPRINT("Value: %wZ\n", &DstValue); - Status = RtlSetEnvironmentVariable((PWSTR*)Environment, + Status = RtlSetEnvironmentVariable(Environment, &Name, &DstValue); @@ -114,13 +115,12 @@ static BOOL -AppendUserEnvironmentVariable(LPVOID *Environment, +AppendUserEnvironmentVariable(PWSTR* Environment, LPWSTR lpName, LPWSTR lpValue) { NTSTATUS Status; - UNICODE_STRING Name; - UNICODE_STRING Value; + UNICODE_STRING Name, Value; RtlInitUnicodeString(&Name, lpName); @@ -132,7 +132,7 @@ Value.Buffer[0] = UNICODE_NULL; - Status = RtlQueryEnvironmentVariable_U((PWSTR)*Environment, + Status = RtlQueryEnvironmentVariable_U(*Environment, &Name, &Value); if (NT_SUCCESS(Status)) @@ -140,7 +140,7 @@ RtlAppendUnicodeToString(&Value, lpValue); - Status = RtlSetEnvironmentVariable((PWSTR*)Environment, + Status = RtlSetEnvironmentVariable(Environment, &Name, &Value); LocalFree(Value.Buffer); @@ -270,7 +270,7 @@ static BOOL -SetUserEnvironment(LPVOID *lpEnvironment, +SetUserEnvironment(PWSTR* Environment, HKEY hKey, LPWSTR lpSubKeyName) { @@ -357,17 +357,17 @@ &dwValueDataLength); if (Error == ERROR_SUCCESS) { - if (!_wcsicmp(lpValueName, L"path")) + if (!_wcsicmp(lpValueName, L"PATH")) { /* Append 'Path' environment variable */ - AppendUserEnvironmentVariable(lpEnvironment, + AppendUserEnvironmentVariable(Environment, lpValueName, lpValueData); } else { /* Set environment variable */ - SetUserEnvironmentVariable(lpEnvironment, + SetUserEnvironmentVariable(Environment, lpValueName, lpValueData, (dwType == REG_EXPAND_SZ)); @@ -393,7 +393,7 @@ static BOOL -SetSystemEnvironment(LPVOID *lpEnvironment) +SetSystemEnvironment(PWSTR* Environment) { LONG Error; HKEY hEnvKey; @@ -477,7 +477,7 @@ if (Error == ERROR_SUCCESS) { /* Set environment variable */ - SetUserEnvironmentVariable(lpEnvironment, + SetUserEnvironmentVariable(Environment, lpValueName, lpValueData, (dwType == REG_EXPAND_SZ)); @@ -502,12 +502,13 @@ BOOL WINAPI -CreateEnvironmentBlock(LPVOID *lpEnvironment, - HANDLE hToken, - BOOL bInherit) +CreateEnvironmentBlock(OUT LPVOID *lpEnvironment, + IN HANDLE hToken, + IN BOOL bInherit) { NTSTATUS Status; LONG lError; + PWSTR* Environment = (PWSTR*)lpEnvironment; DWORD Length; DWORD dwType; HKEY hKey; @@ -525,8 +526,7 @@ return FALSE; } - Status = RtlCreateEnvironment((BOOLEAN)bInherit, - (PWSTR*)lpEnvironment); + Status = RtlCreateEnvironment((BOOLEAN)bInherit, Environment); if (!NT_SUCCESS(Status)) { DPRINT1("RtlCreateEnvironment() failed (Status %lx)\n", Status); @@ -535,63 +535,56 @@ } /* Set 'SystemRoot' variable */ - Length = MAX_PATH; - if (GetEnvironmentVariableW(L"SystemRoot", - Buffer, - Length)) - { - SetUserEnvironmentVariable(lpEnvironment, + Length = ARRAYSIZE(Buffer); + if (GetEnvironmentVariableW(L"SystemRoot", Buffer, Length)) + { + SetUserEnvironmentVariable(Environment, L"SystemRoot", Buffer, FALSE); } /* Set 'SystemDrive' variable */ - if (GetEnvironmentVariableW(L"SystemDrive", - Buffer, - Length)) - { - SetUserEnvironmentVariable(lpEnvironment, + if (GetEnvironmentVariableW(L"SystemDrive", Buffer, Length)) + { + SetUserEnvironmentVariable(Environment, L"SystemDrive", Buffer, FALSE); } /* Set variables from Session Manager */ - if (!SetSystemEnvironment(lpEnvironment)) - { - RtlDestroyEnvironment(*lpEnvironment); + if (!SetSystemEnvironment(Environment)) + { + RtlDestroyEnvironment(*Environment); return FALSE; } /* Set 'COMPUTERNAME' variable */ - Length = MAX_PATH; - if (GetComputerNameW(Buffer, - &Length)) - { - SetUserEnvironmentVariable(lpEnvironment, + Length = ARRAYSIZE(Buffer); + if (GetComputerNameW(Buffer, &Length)) + { + SetUserEnvironmentVariable(Environment, L"COMPUTERNAME", Buffer, FALSE); } /* Set 'ALLUSERSPROFILE' variable */ - Length = MAX_PATH; - if (GetAllUsersProfileDirectoryW(Buffer, - &Length)) - { - SetUserEnvironmentVariable(lpEnvironment, + Length = ARRAYSIZE(Buffer); + if (GetAllUsersProfileDirectoryW(Buffer, &Length)) + { + SetUserEnvironmentVariable(Environment, L"ALLUSERSPROFILE", Buffer, FALSE); } - /* Set 'USERSPROFILE' variable to the default users profile */ - Length = MAX_PATH; - if (GetDefaultUserProfileDirectory(Buffer, - &Length)) - { - SetUserEnvironmentVariable(lpEnvironment, + /* Set 'USERPROFILE' variable to the default users profile */ + Length = ARRAYSIZE(Buffer); + if (GetDefaultUserProfileDirectoryW(Buffer, &Length)) + { + SetUserEnvironmentVariable(Environment, L"USERPROFILE", Buffer, TRUE); @@ -604,7 +597,7 @@ &hKey); if (lError == ERROR_SUCCESS) { - Length = 1024 * sizeof(WCHAR); + Length = sizeof(szValue); lError = RegQueryValueExW(hKey, L"ProgramFilesDir", NULL, @@ -613,13 +606,13 @@ &Length); if (lError == ERROR_SUCCESS) { - SetUserEnvironmentVariable(lpEnvironment, + SetUserEnvironmentVariable(Environment, L"ProgramFiles", szValue, FALSE); } - Length = 1024 * sizeof(WCHAR); + Length = sizeof(szValue); lError = RegQueryValueExW(hKey, L"CommonFilesDir", NULL, @@ -628,7 +621,7 @@ &Length); if (lError == ERROR_SUCCESS) { - SetUserEnvironmentVariable(lpEnvironment, + SetUserEnvironmentVariable(Environment, L"CommonProgramFiles", szValue, FALSE); @@ -637,6 +630,10 @@ RegCloseKey(hKey); } + /* + * If no user token is specified, the system environment variables are set + * and we stop here, otherwise continue setting the user-specific variables. + */ if (hToken == NULL) return TRUE; @@ -644,34 +641,38 @@ if (hKeyUser == NULL) { DPRINT1("GetCurrentUserKey() failed\n"); - RtlDestroyEnvironment(*lpEnvironment); + RtlDestroyEnvironment(*Environment); return FALSE; } /* Set 'USERPROFILE' variable */ - Length = MAX_PATH; + Length = ARRAYSIZE(Buffer); if (GetUserProfileDirectoryW(hToken, Buffer, &Length)) { DWORD MinLen = 2; - SetUserEnvironmentVariable(lpEnvironment, + SetUserEnvironmentVariable(Environment, L"USERPROFILE", Buffer, FALSE); + // FIXME: Strangely enough the following two environment variables + // are not set by userenv.dll in Windows... See r68284 / CORE-9875 + // FIXME2: This is done by msgina.dll !! + /* At least <drive letter>:<path> */ if (Length > MinLen) { /* Set 'HOMEDRIVE' variable */ - StringCchCopyNW(szValue, MAX_PATH, Buffer, MinLen); - SetUserEnvironmentVariable(lpEnvironment, + StringCchCopyNW(szValue, ARRAYSIZE(Buffer), Buffer, MinLen); + SetUserEnvironmentVariable(Environment, L"HOMEDRIVE", szValue, FALSE); /* Set 'HOMEPATH' variable */ - StringCchCopyNW(szValue, MAX_PATH, Buffer + MinLen, Length - MinLen); - SetUserEnvironmentVariable(lpEnvironment, + StringCchCopyNW(szValue, ARRAYSIZE(Buffer), Buffer + MinLen, Length - MinLen); + SetUserEnvironmentVariable(Environment, L"HOMEPATH", szValue, FALSE); @@ -686,44 +687,44 @@ &lpUserName, &lpDomainName)) { + /* Set 'USERNAME' variable */ + SetUserEnvironmentVariable(Environment, + L"USERNAME", + lpUserName, + FALSE); + /* Set 'USERDOMAIN' variable */ - SetUserEnvironmentVariable(lpEnvironment, + SetUserEnvironmentVariable(Environment, L"USERDOMAIN", lpDomainName, FALSE); - /* Set 'USERNAME' variable */ - SetUserEnvironmentVariable(lpEnvironment, - L"USERNAME", - lpUserName, - FALSE); + if (lpUserName != NULL) + LocalFree(lpUserName); + + if (lpDomainName != NULL) + LocalFree(lpDomainName); } /* Set user environment variables */ - SetUserEnvironment(lpEnvironment, + SetUserEnvironment(Environment, hKeyUser, L"Environment"); /* Set user volatile environment variables */ - SetUserEnvironment(lpEnvironment, + SetUserEnvironment(Environment, hKeyUser, L"Volatile Environment"); RegCloseKey(hKeyUser); - if (lpUserName != NULL) - LocalFree(lpUserName); - - if (lpDomainName != NULL) - LocalFree(lpDomainName); - return TRUE; } BOOL WINAPI -DestroyEnvironmentBlock(LPVOID lpEnvironment) +DestroyEnvironmentBlock(IN LPVOID lpEnvironment) { DPRINT("DestroyEnvironmentBlock() called\n");

8 years

[hbelusca] 73439: [USERENV]: Code formatting

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Dec 8 16:08:59 2016 New Revision: 73439 URL: http://svn.reactos.org/svn/reactos?rev=73439&view=rev Log: [USERENV]: Code formatting Modified: trunk/reactos/dll/win32/userenv/environment.c Modified: trunk/reactos/dll/win32/userenv/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/environm… ============================================================================== --- trunk/reactos/dll/win32/userenv/environment.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/environment.c [iso-8859-1] Thu Dec 8 16:08:59 2016 @@ -36,25 +36,23 @@ LPWSTR lpValue, BOOL bExpand) { - WCHAR ShortName[MAX_PATH]; + NTSTATUS Status; UNICODE_STRING Name; UNICODE_STRING SrcValue; UNICODE_STRING DstValue; ULONG Length; - NTSTATUS Status; PVOID Buffer = NULL; + WCHAR ShortName[MAX_PATH]; if (bExpand) { - RtlInitUnicodeString(&SrcValue, - lpValue); + RtlInitUnicodeString(&SrcValue, lpValue); Length = 2 * MAX_PATH * sizeof(WCHAR); DstValue.Length = 0; DstValue.MaximumLength = Length; - DstValue.Buffer = Buffer = LocalAlloc(LPTR, - Length); + DstValue.Buffer = Buffer = LocalAlloc(LPTR, Length); if (DstValue.Buffer == NULL) { DPRINT1("LocalAlloc() failed\n"); @@ -69,15 +67,16 @@ { DPRINT1("RtlExpandEnvironmentStrings_U() failed (Status %lx)\n", Status); DPRINT1("Length %lu\n", Length); + if (Buffer) LocalFree(Buffer); + return FALSE; } } else { - RtlInitUnicodeString(&DstValue, - lpValue); + RtlInitUnicodeString(&DstValue, lpValue); } if (!_wcsicmp(lpName, L"temp") || !_wcsicmp(lpName, L"tmp")) @@ -86,15 +85,13 @@ { DPRINT("GetShortPathNameW() failed for %S (Error %lu)\n", DstValue.Buffer, GetLastError()); - RtlInitUnicodeString(&DstValue, - ShortName); + RtlInitUnicodeString(&DstValue, ShortName); } DPRINT("Buffer: %S\n", ShortName); } - RtlInitUnicodeString(&Name, - lpName); + RtlInitUnicodeString(&Name, lpName); DPRINT("Value: %wZ\n", &DstValue); @@ -121,34 +118,27 @@ LPWSTR lpName, LPWSTR lpValue) { + NTSTATUS Status; UNICODE_STRING Name; UNICODE_STRING Value; - NTSTATUS Status; - - RtlInitUnicodeString(&Name, - lpName); + + RtlInitUnicodeString(&Name, lpName); Value.Length = 0; Value.MaximumLength = 1024 * sizeof(WCHAR); - Value.Buffer = LocalAlloc(LPTR, - 1024 * sizeof(WCHAR)); + Value.Buffer = LocalAlloc(LPTR, Value.MaximumLength); if (Value.Buffer == NULL) - { - return FALSE; - } + return FALSE; + Value.Buffer[0] = UNICODE_NULL; Status = RtlQueryEnvironmentVariable_U((PWSTR)*Environment, &Name, &Value); if (NT_SUCCESS(Status)) - { - RtlAppendUnicodeToString(&Value, - L";"); - } - - RtlAppendUnicodeToString(&Value, - lpValue); + RtlAppendUnicodeToString(&Value, L";"); + + RtlAppendUnicodeToString(&Value, lpValue); Status = RtlSetEnvironmentVariable((PWSTR*)Environment, &Name, @@ -168,12 +158,11 @@ HKEY GetCurrentUserKey(HANDLE hToken) { + LONG Error; UNICODE_STRING SidString; HKEY hKey; - LONG Error; - - if (!GetUserSidStringFromToken(hToken, - &SidString)) + + if (!GetUserSidStringFromToken(hToken, &SidString)) { DPRINT1("GetUserSidFromToken() failed\n"); return NULL; @@ -204,13 +193,13 @@ OUT LPWSTR *UserName, OUT LPWSTR *DomainName) { + BOOL bRet = TRUE; PSID Sid = NULL; LPWSTR lpUserName = NULL; LPWSTR lpDomainName = NULL; DWORD cbUserName = 0; DWORD cbDomainName = 0; SID_NAME_USE SidNameUse; - BOOL bRet = TRUE; Sid = GetUserSid(hToken); if (Sid == NULL) @@ -234,16 +223,14 @@ } } - lpUserName = LocalAlloc(LPTR, - cbUserName * sizeof(WCHAR)); + lpUserName = LocalAlloc(LPTR, cbUserName * sizeof(WCHAR)); if (lpUserName == NULL) { bRet = FALSE; goto done; } - lpDomainName = LocalAlloc(LPTR, - cbDomainName * sizeof(WCHAR)); + lpDomainName = LocalAlloc(LPTR, cbDomainName * sizeof(WCHAR)); if (lpDomainName == NULL) { bRet = FALSE; @@ -287,6 +274,7 @@ HKEY hKey, LPWSTR lpSubKeyName) { + LONG Error; HKEY hEnvKey; DWORD dwValues; DWORD dwMaxValueNameLength; @@ -297,7 +285,6 @@ DWORD i; LPWSTR lpValueName; LPWSTR lpValueData; - LONG Error; Error = RegOpenKeyExW(hKey, lpSubKeyName, @@ -339,16 +326,14 @@ /* Allocate buffers */ dwMaxValueNameLength++; - lpValueName = LocalAlloc(LPTR, - dwMaxValueNameLength * sizeof(WCHAR)); + lpValueName = LocalAlloc(LPTR, dwMaxValueNameLength * sizeof(WCHAR)); if (lpValueName == NULL) { RegCloseKey(hEnvKey); return FALSE; } - lpValueData = LocalAlloc(LPTR, - dwMaxValueDataLength); + lpValueData = LocalAlloc(LPTR, dwMaxValueDataLength); if (lpValueData == NULL) { LocalFree(lpValueName); @@ -410,6 +395,7 @@ BOOL SetSystemEnvironment(LPVOID *lpEnvironment) { + LONG Error; HKEY hEnvKey; DWORD dwValues; DWORD dwMaxValueNameLength; @@ -420,7 +406,6 @@ DWORD i; LPWSTR lpValueName; LPWSTR lpValueData; - LONG Error; Error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment", @@ -460,16 +445,14 @@ /* Allocate buffers */ dwMaxValueNameLength++; - lpValueName = LocalAlloc(LPTR, - dwMaxValueNameLength * sizeof(WCHAR)); + lpValueName = LocalAlloc(LPTR, dwMaxValueNameLength * sizeof(WCHAR)); if (lpValueName == NULL) { RegCloseKey(hEnvKey); return FALSE; } - lpValueData = LocalAlloc(LPTR, - dwMaxValueDataLength); + lpValueData = LocalAlloc(LPTR, dwMaxValueDataLength); if (lpValueData == NULL) { LocalFree(lpValueName); @@ -523,16 +506,16 @@ HANDLE hToken, BOOL bInherit) { - WCHAR Buffer[MAX_PATH]; - WCHAR szValue[1024]; + NTSTATUS Status; + LONG lError; DWORD Length; DWORD dwType; HKEY hKey; HKEY hKeyUser; LPWSTR lpUserName = NULL; LPWSTR lpDomainName = NULL; - NTSTATUS Status; - LONG lError; + WCHAR Buffer[MAX_PATH]; + WCHAR szValue[1024]; DPRINT("CreateEnvironmentBlock() called\n"); @@ -667,9 +650,7 @@ /* Set 'USERPROFILE' variable */ Length = MAX_PATH; - if (GetUserProfileDirectoryW(hToken, - Buffer, - &Length)) + if (GetUserProfileDirectoryW(hToken, Buffer, &Length)) { DWORD MinLen = 2; @@ -765,8 +746,8 @@ OUT LPWSTR lpDest, IN DWORD dwSize) { + BOOL Ret = FALSE; PVOID lpEnvironment; - BOOL Ret = FALSE; if (lpSrc == NULL || lpDest == NULL || dwSize == 0) { @@ -781,14 +762,13 @@ UNICODE_STRING SrcU, DestU; NTSTATUS Status; - /* initialize the strings */ - RtlInitUnicodeString(&SrcU, - lpSrc); + /* Initialize the strings */ + RtlInitUnicodeString(&SrcU, lpSrc); DestU.Length = 0; DestU.MaximumLength = dwSize * sizeof(WCHAR); DestU.Buffer = lpDest; - /* expand the strings */ + /* Expand the strings */ Status = RtlExpandEnvironmentStrings_U((PWSTR)lpEnvironment, &SrcU, &DestU, @@ -817,9 +797,9 @@ OUT LPSTR lpDest, IN DWORD dwSize) { + BOOL Ret = FALSE; DWORD dwSrcLen; LPWSTR lpSrcW = NULL, lpDestW = NULL; - BOOL Ret = FALSE; if (lpSrc == NULL || lpDest == NULL || dwSize == 0) { @@ -844,9 +824,7 @@ lpDestW = (LPWSTR)GlobalAlloc(GMEM_FIXED, dwSize * sizeof(WCHAR)); if (lpDestW == NULL) - { goto Cleanup; - } Ret = ExpandEnvironmentStringsForUserW(hToken, lpSrcW, @@ -869,14 +847,10 @@ Cleanup: if (lpSrcW != NULL) - { GlobalFree((HGLOBAL)lpSrcW); - } if (lpDestW != NULL) - { GlobalFree((HGLOBAL)lpDestW); - } return Ret; }

8 years

[gadamopoulos] 73438: [SHELL32] - CDefView: Remove some todo comments that are done.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Dec 7 15:43:17 2016 New Revision: 73438 URL: http://svn.reactos.org/svn/reactos?rev=73438&view=rev Log: [SHELL32] - CDefView: Remove some todo comments that are done. Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Wed Dec 7 15:43:17 2016 @@ -20,26 +20,16 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * - * FIXME: The order by part of the background context menu should be - * built according to the columns shown. - * * FIXME: CheckToolbar: handle the "new folder" and "folder up" button */ /* TODO: - Load/Save the view state from/into the stream provided by the ShellBrowser. -- Code to merge menus in the shellbrowser is incorrect. -- Move the background context menu creation into shell view. It should store the - shell view HWND to send commands. -- Shell view should do SetCommandTarget on internet toolbar. - When editing starts on item, set edit text to for editing value. -- When shell view is called back for item info, let listview save the value. - Fix shell view to handle view mode popup exec. - The background context menu should have a pidl just like foreground menus. This causes crashes when dynamic handlers try to use the NULL pidl. -- The SHELLDLL_DefView should not be filled with blue unconditionally. This causes - annoying flashing of blue even on XP, and is not correct. - Reorder of columns doesn't work - might be bug in comctl32 */

8 years

[hbelusca] 73437: ReactOS 0.4.3 was released! Tag its repo.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Dec 7 01:05:20 2016 New Revision: 73437 URL: http://svn.reactos.org/svn/reactos?rev=73437&view=rev Log: ReactOS 0.4.3 was released! Tag its repo. Added: tags/ReactOS-0.4.3/ (props changed) - copied from r73436, branches/ros-branch-0_4_3/ Removed: branches/ros-branch-0_4_3/ Propchange: tags/ReactOS-0.4.3/ ------------------------------------------------------------------------------ svn:mergeinfo = /trunk:73043,73072,73075,73077,73112-73114,73117,73128

8 years

[gadamopoulos] 73436: [SHELL32] - Initialize the shell icon cache only when needed or when FileIconInit is called (and not in the DllMain of shell32)

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Dec 7 00:10:43 2016 New Revision: 73436 URL: http://svn.reactos.org/svn/reactos?rev=73436&view=rev Log: [SHELL32] - Initialize the shell icon cache only when needed or when FileIconInit is called (and not in the DllMain of shell32) Modified: trunk/reactos/dll/win32/shell32/iconcache.cpp trunk/reactos/dll/win32/shell32/shell32.cpp trunk/reactos/dll/win32/shell32/wine/shellord.c Modified: trunk/reactos/dll/win32/shell32/iconcache.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/iconcach… ============================================================================== --- trunk/reactos/dll/win32/shell32/iconcache.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/iconcache.cpp [iso-8859-1] Wed Dec 7 00:10:43 2016 @@ -453,6 +453,9 @@ sice.dwSourceIndex = dwSourceIndex; sice.dwFlags = dwFlags; + if (!sic_hdpa) + SIC_Initialize(); + EnterCriticalSection(&SHELL32_SicCS); if (NULL != DPA_GetPtr (sic_hdpa, 0)) @@ -687,6 +690,9 @@ RegCloseKey(hKeyShellIcons); } + if (!sic_hdpa) + SIC_Initialize(); + return SIC_LoadIcon(iconPath, iconIdx, 0); } @@ -698,13 +704,17 @@ * */ BOOL WINAPI Shell_GetImageLists(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList) -{ TRACE("(%p,%p)\n",lpBigList,lpSmallList); +{ + TRACE("(%p,%p)\n",lpBigList,lpSmallList); + + if (!sic_hdpa) + SIC_Initialize(); + if (lpBigList) - { *lpBigList = ShellBigIconList; - } + *lpBigList = ShellBigIconList; + if (lpSmallList) - { *lpSmallList = ShellSmallIconList; - } + *lpSmallList = ShellSmallIconList; return TRUE; } @@ -734,6 +744,9 @@ int iShortcutDefaultIndex = INVALID_INDEX; TRACE("sf=%p pidl=%p %s\n", sh, pidl, bBigIcon?"Big":"Small"); + + if (!sic_hdpa) + SIC_Initialize(); if (SUCCEEDED (sh->GetUIObjectOf(0, 1, &pidl, IID_NULL_PPV_ARG(IExtractIconW, &ei)))) { Modified: trunk/reactos/dll/win32/shell32/shell32.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.cpp [iso-8859-1] Wed Dec 7 00:10:43 2016 @@ -308,7 +308,6 @@ InitCommonControlsEx(&InitCtrls); /* Bad idea, initialization in DllMain! */ - SIC_Initialize(); InitChangeNotifications(); } else if (dwReason == DLL_PROCESS_DETACH) Modified: trunk/reactos/dll/win32/shell32/wine/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shellord.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shellord.c [iso-8859-1] Wed Dec 7 00:10:43 2016 @@ -1292,8 +1292,8 @@ * */ BOOL WINAPI FileIconInit(BOOL bFullInit) -{ FIXME("(%s)\n", bFullInit ? "true" : "false"); - return FALSE; +{ + return SIC_Initialize(); } /*************************************************************************

8 years

[hbelusca] 73435: [SERVICES]: Addendum to r73433 for ScmStartUserModeService: - Use the correct capitalization for the desktop name (to be consistent with all the rest of our code); - Fix DPRINT1 o...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Dec 6 23:01:27 2016 New Revision: 73435 URL: http://svn.reactos.org/svn/reactos?rev=73435&view=rev Log: [SERVICES]: Addendum to r73433 for ScmStartUserModeService: - Use the correct capitalization for the desktop name (to be consistent with all the rest of our code); - Fix DPRINT1 order of arguments; - Reorganize a bit the code to avoid the memory leak if ImpersonateLoggedOnUser fails and the environment block was already allocated (caught by Ged Murphy). CORE-12414 Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Tue Dec 6 23:01:27 2016 @@ -1700,8 +1700,11 @@ ZeroMemory(&ProcessInformation, sizeof(ProcessInformation)); /* Use the interactive desktop if the service is interactive */ + // TODO: We should also check the value "NoInteractiveServices ": + // See https://msdn.microsoft.com/en-us/library/windows/desktop/ms683502(v=vs.85).… + // for more details. if (Service->Status.dwServiceType & SERVICE_INTERACTIVE_PROCESS) - StartupInfo.lpDesktop = L"winsta0\\default"; + StartupInfo.lpDesktop = L"WinSta0\\Default"; if (Service->lpImage->hToken) { @@ -1710,34 +1713,38 @@ if (!CreateEnvironmentBlock(&lpEnvironment, Service->lpImage->hToken, FALSE)) { /* We failed, run the service with the current environment */ - DPRINT1("CreateEnvironmentBlock() failed with error %d, service '%S' will run with the current environment.\n", - Service->lpServiceName, GetLastError()); + DPRINT1("CreateEnvironmentBlock() failed with error %d; service '%S' will run with the current environment.\n", + GetLastError(), Service->lpServiceName); lpEnvironment = NULL; } /* Impersonate the new user */ - if (!ImpersonateLoggedOnUser(Service->lpImage->hToken)) + Result = ImpersonateLoggedOnUser(Service->lpImage->hToken); + if (Result) + { + /* Launch the process in the user's logon session */ + Result = CreateProcessAsUserW(Service->lpImage->hToken, + NULL, + Service->lpImage->pszImagePath, + NULL, + NULL, + FALSE, + CREATE_UNICODE_ENVIRONMENT | DETACHED_PROCESS | CREATE_SUSPENDED, + lpEnvironment, + NULL, + &StartupInfo, + &ProcessInformation); + if (!Result) + dwError = GetLastError(); + + /* Revert the impersonation */ + RevertToSelf(); + } + else { dwError = GetLastError(); - DPRINT1("ImpersonateLoggedOnUser() failed with error %d\n", GetLastError()); - return dwError; - } - - /* Launch the process in the user's logon session */ - Result = CreateProcessAsUserW(Service->lpImage->hToken, - NULL, - Service->lpImage->pszImagePath, - NULL, - NULL, - FALSE, - CREATE_UNICODE_ENVIRONMENT | DETACHED_PROCESS | CREATE_SUSPENDED, - lpEnvironment, - NULL, - &StartupInfo, - &ProcessInformation); - - /* Revert the impersonation */ - RevertToSelf(); + DPRINT1("ImpersonateLoggedOnUser() failed with error %d\n", dwError); + } } else { @@ -1746,8 +1753,8 @@ if (!CreateEnvironmentBlock(&lpEnvironment, NULL, TRUE)) { /* We failed, run the service with the current environment */ - DPRINT1("CreateEnvironmentBlock() failed with error %d, service '%S' will run with the current environment.\n", - Service->lpServiceName, GetLastError()); + DPRINT1("CreateEnvironmentBlock() failed with error %d; service '%S' will run with the current environment.\n", + GetLastError(), Service->lpServiceName); lpEnvironment = NULL; } @@ -1761,6 +1768,8 @@ NULL, &StartupInfo, &ProcessInformation); + if (!Result) + dwError = GetLastError(); } if (lpEnvironment) @@ -1768,8 +1777,8 @@ if (!Result) { - dwError = GetLastError(); - DPRINT1("Starting '%S' failed!\n", Service->lpServiceName); + DPRINT1("Starting '%S' failed with error %d\n", + Service->lpServiceName, dwError); return dwError; }

8 years

[mjansen] 73434: [SHELL32] Don't call CoInitialize in DllMain, bad things happen when calling into dll's that are being loaded! CORE-12443 #comment Please retest!

by mjansen＠svn.reactos.org

Author: mjansen Date: Tue Dec 6 21:18:17 2016 New Revision: 73434 URL: http://svn.reactos.org/svn/reactos?rev=73434&view=rev Log: [SHELL32] Don't call CoInitialize in DllMain, bad things happen when calling into dll's that are being loaded! CORE-12443 #comment Please retest! Modified: trunk/reactos/dll/win32/shell32/folders.cpp trunk/reactos/dll/win32/shell32/shell32.cpp trunk/reactos/dll/win32/shell32/wine/shell32_main.h Modified: trunk/reactos/dll/win32/shell32/folders.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders.… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders.cpp [iso-8859-1] Tue Dec 6 21:18:17 2016 @@ -87,7 +87,7 @@ return S_OK; } -void InitIconOverlays(void) +static void InitIconOverlays(void) { HKEY hKey; DWORD dwIndex, dwResult, dwSize; @@ -161,6 +161,8 @@ if(!SHGetPathFromIDListW(pidl, szPath)) return FALSE; + if (!Handlers) + InitIconOverlays(); HighestPriority = 101; IconIndex = NumIconOverlayHandlers; Modified: trunk/reactos/dll/win32/shell32/shell32.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.cpp [iso-8859-1] Tue Dec 6 21:18:17 2016 @@ -307,9 +307,9 @@ InitCtrls.dwICC = ICC_WIN95_CLASSES | ICC_DATE_CLASSES | ICC_USEREX_CLASSES; InitCommonControlsEx(&InitCtrls); + /* Bad idea, initialization in DllMain! */ SIC_Initialize(); InitChangeNotifications(); - InitIconOverlays(); } else if (dwReason == DLL_PROCESS_DETACH) { Modified: trunk/reactos/dll/win32/shell32/wine/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shell32_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shell32_main.h [iso-8859-1] Tue Dec 6 21:18:17 2016 @@ -109,7 +109,6 @@ /* Change Notification */ void InitChangeNotifications(void) DECLSPEC_HIDDEN; void FreeChangeNotifications(void) DECLSPEC_HIDDEN; -void InitIconOverlays(void); /* file operation */ #define ASK_DELETE_FILE 1

8 years

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2016