Ros-diffs May 2014

ros-diffs@reactos.org

14 participants
437 discussions

[tkreuzer] 63513: [CMLIB] Fix build (and warnings)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat May 31 15:34:21 2014 New Revision: 63513 URL: http://svn.reactos.org/svn/reactos?rev=63513&view=rev Log: [CMLIB] Fix build (and warnings) Modified: trunk/reactos/lib/cmlib/hivewrt.c Modified: trunk/reactos/lib/cmlib/hivewrt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivewrt.c?rev=63… ============================================================================== --- trunk/reactos/lib/cmlib/hivewrt.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivewrt.c [iso-8859-1] Sat May 31 15:34:21 2014 @@ -14,8 +14,8 @@ PHHIVE RegistryHive) { ULONG FileOffset; - UINT BufferSize; - UINT BitmapSize; + UINT32 BufferSize; + UINT32 BitmapSize; PUCHAR Buffer; PUCHAR Ptr; ULONG BlockIndex; @@ -42,7 +42,7 @@ BufferSize = HV_LOG_HEADER_SIZE + sizeof(ULONG) + BitmapSize; BufferSize = ROUND_UP(BufferSize, HV_BLOCK_SIZE); - DPRINT("Bitmap size %lu buffer size: %lu\n", BitmapSize, BufferSize); + DPRINT("Bitmap size %u buffer size: %u\n", BitmapSize, BufferSize); Buffer = RegistryHive->Allocate(BufferSize, TRUE, TAG_CM); if (Buffer == NULL)

10 years, 6 months

[tkreuzer] 63512: [HOST] Try to fix some host warnings.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat May 31 15:29:10 2014 New Revision: 63512 URL: http://svn.reactos.org/svn/reactos?rev=63512&view=rev Log: [HOST] Try to fix some host warnings. Modified: trunk/reactos/lib/cmlib/hivewrt.c trunk/reactos/tools/geninc/geninc.c trunk/reactos/tools/log2lines/cmd.c trunk/reactos/tools/log2lines/match.c trunk/reactos/tools/obj2bin/obj2bin.c Modified: trunk/reactos/lib/cmlib/hivewrt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivewrt.c?rev=63… ============================================================================== --- trunk/reactos/lib/cmlib/hivewrt.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivewrt.c [iso-8859-1] Sat May 31 15:29:10 2014 @@ -14,8 +14,8 @@ PHHIVE RegistryHive) { ULONG FileOffset; - ULONG BufferSize; - ULONG BitmapSize; + UINT BufferSize; + UINT BitmapSize; PUCHAR Buffer; PUCHAR Ptr; ULONG BlockIndex; Modified: trunk/reactos/tools/geninc/geninc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/geninc/geninc.c?rev=… ============================================================================== --- trunk/reactos/tools/geninc/geninc.c [iso-8859-1] (original) +++ trunk/reactos/tools/geninc/geninc.c [iso-8859-1] Sat May 31 15:29:10 2014 @@ -5,19 +5,16 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <stdint.h> #define IMAGE_FILE_MACHINE_I386 0x014c #define IMAGE_FILE_MACHINE_AMD64 0x8664 #define IMAGE_FILE_MACHINE_ARMNT 0x01c4 -#ifdef _WIN32 +#ifdef _MSC_VER #define PRIx64 "I64x" -typedef unsigned __int16 uint16_t; -typedef unsigned __int32 uint32_t; -typedef unsigned __int64 uint64_t; #else -#include <stdint.h> -#define PRIx64 "llx" +#include <inttypes.h> #define _stricmp strcasecmp #endif Modified: trunk/reactos/tools/log2lines/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/log2lines/cmd.c?rev=… ============================================================================== --- trunk/reactos/tools/log2lines/cmd.c [iso-8859-1] (original) +++ trunk/reactos/tools/log2lines/cmd.c [iso-8859-1] Sat May 31 15:29:10 2014 @@ -20,7 +20,7 @@ * is inserted, so the string looks right on the console but still * contains the original string, plus other garbage: */ -static char +static char *backSpaceEdit(char *s) { char c; @@ -58,7 +58,7 @@ *sw = x; changed = 1; } - } + } if (desc) { esclog(outFile, "%s is %d (%s)\n", desc, *sw, changed ? "changed":"unchanged"); @@ -90,14 +90,14 @@ changed = 1; } } - } + } if (desc) { esclog(outFile, "%s is \"%s\" (%s)\n", desc, sw, changed ? "changed":"unchanged"); if (!arg) esclog(outFile, "(readonly)\n"); } - + return changed; } @@ -132,14 +132,14 @@ } } } - } + } if (desc) { esclog(outFile, "%s is \"%s\" (%s)\n", desc, *psw, changed ? "changed":"unchanged"); if (!arg) esclog(outFile, "(readonly)\n"); } - + return changed; } @@ -155,7 +155,7 @@ if(( s = strchr(arg, ':') )) { *s = ' '; - if ( (cnt = sscanf(arg,"%20s %lx", Image, &Offset)) == 2) + if ( (cnt = sscanf(arg,"%20s %x", Image, &Offset)) == 2) { if (( plm = entry_lookup(&cache, Image) )) { @@ -292,7 +292,7 @@ { memset(&summ, 0, sizeof(SUMM)); esclog(outFile, "Statistics cleared\n"); - } + } else stat_print(outFile, &summ); break; Modified: trunk/reactos/tools/log2lines/match.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/log2lines/match.c?re… ============================================================================== --- trunk/reactos/tools/log2lines/match.c [iso-8859-1] (original) +++ trunk/reactos/tools/log2lines/match.c [iso-8859-1] Sat May 31 15:29:10 2014 @@ -32,8 +32,8 @@ { static int state = 0; char Image[NAMESIZE]; - DWORD Base; - DWORD Size; + UINT Base; + UINT Size; PLIST_MEMBER plm; int cnt; @@ -48,13 +48,13 @@ switch (state) { case 1: - if ( (cnt = sscanf(Line,"%lx %lx %20s", &Base, &Size, Image)) == 3 ) + if ( (cnt = sscanf(Line,"%x %x %20s", &Base, &Size, Image)) == 3 ) { if (( plm = entry_lookup(&cache, Image) )) { plm->RelBase = Base; plm->Size = Size; - l2l_dbg(1, "Relocated: %s %08x -> %08x\n", Image, plm->ImageBase, plm->RelBase); + l2l_dbg(1, "Relocated: %s %p -> %p\n", Image, (void*)plm->ImageBase, (void*)plm->RelBase); } return 0; } Modified: trunk/reactos/tools/obj2bin/obj2bin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/obj2bin/obj2bin.c?re… ============================================================================== --- trunk/reactos/tools/obj2bin/obj2bin.c [iso-8859-1] (original) +++ trunk/reactos/tools/obj2bin/obj2bin.c [iso-8859-1] Sat May 31 15:29:10 2014 @@ -52,8 +52,8 @@ break; default: - printf("Unknown relocatation type %d, address 0x%lx\n", - pReloc->Type, pReloc->VirtualAddress); + printf("Unknown relocatation type %u, address 0x%x\n", + pReloc->Type, (unsigned)pReloc->VirtualAddress); } pReloc++; @@ -99,7 +99,7 @@ if (!pData) { fclose(pSourceFile); - fprintf(stderr, "Failed to allocate %ld bytes\n", nFileSize); + fprintf(stderr, "Failed to allocate %lu bytes\n", nFileSize); return -3; } @@ -108,7 +108,7 @@ { free(pData); fclose(pSourceFile); - fprintf(stderr, "Failed to read %ld bytes from source file\n", nFileSize); + fprintf(stderr, "Failed to read %lu bytes from source file\n", nFileSize); return -4; } @@ -147,8 +147,8 @@ { free(pData); fclose(pDestFile); - fprintf(stderr, "Failed to write %ld bytes to destination file\n", - pSectionHeader->SizeOfRawData); + fprintf(stderr, "Failed to write %u bytes to destination file\n", + (unsigned int)pSectionHeader->SizeOfRawData); return -6; }

10 years, 6 months

[akhaldi] 63511: [GECKO] * Introduce a faster and smaller build without dependency on exports that do not exist in native. [MSVCRT] * Get rid of some exports that do not exist in native. CORE-8174

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat May 31 14:51:36 2014 New Revision: 63511 URL: http://svn.reactos.org/svn/reactos?rev=63511&view=rev Log: [GECKO] * Introduce a faster and smaller build without dependency on exports that do not exist in native. [MSVCRT] * Get rid of some exports that do not exist in native. CORE-8174 Modified: trunk/reactos/dll/cpl/appwiz/addons.c trunk/reactos/dll/win32/msvcrt/msvcrt.spec Modified: trunk/reactos/dll/cpl/appwiz/addons.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/addons.c?re… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/addons.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/addons.c [iso-8859-1] Sat May 31 14:51:36 2014 @@ -30,7 +30,7 @@ #ifdef __i386__ #define ARCH_STRING "x86" -#define GECKO_SHA "b4923c0565e6cbd20075a0d4119ce3b48424f962" +#define GECKO_SHA "f6984567b24fef7b0be79837e04d3a913af1a88c" #else #define ARCH_STRING "" #define GECKO_SHA "???" Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Sat May 31 14:51:36 2014 @@ -894,13 +894,3 @@ # Functions not exported in native dll: @ cdecl -arch=i386 -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler -# Gecko -@ cdecl _controlfp_s(ptr long long) -@ varargs _snwprintf_s(ptr long long ptr) -@ cdecl _vsnprintf_s(ptr long long str ptr) -@ cdecl _vsnwprintf_s(ptr long long wstr ptr) -@ cdecl _wcslwr_s(wstr long) -@ cdecl _wfopen_s(ptr wstr wstr) -@ cdecl fopen_s(ptr str str) -@ cdecl strtok_s(ptr str ptr) -@ varargs swprintf_s(ptr long wstr)

10 years, 6 months

[akhaldi] 63510: [NET] * Fix MSVC build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat May 31 14:24:26 2014 New Revision: 63510 URL: http://svn.reactos.org/svn/reactos?rev=63510&view=rev Log: [NET] * Fix MSVC build. Modified: trunk/reactos/base/applications/network/net/resource.h Modified: trunk/reactos/base/applications/network/net/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/resource.h [iso-8859-1] Sat May 31 14:24:26 2014 @@ -3,4 +3,4 @@ #define IDS_ACCOUNTS_SYNTAX 100 #define IDS_ACCOUNTS_HELP 101 #define IDS_CONTINUE_SYNTAX 102 -#define IDS_CONTINUE_HELP 103 +#define IDS_CONTINUE_HELP 103

10 years, 6 months

[ekohl] 63509: [NET] - Fix an off-by-one bug in the ACCOUNTS command. - Improve input validation for the ACCOUNTS command. - Add the /help option to the CONTINUE command. - Add version resource and...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat May 31 08:32:54 2014 New Revision: 63509 URL: http://svn.reactos.org/svn/reactos?rev=63509&view=rev Log: [NET] - Fix an off-by-one bug in the ACCOUNTS command. - Improve input validation for the ACCOUNTS command. - Add the /help option to the CONTINUE command. - Add version resource and start to move texts into resources. Added: trunk/reactos/base/applications/network/net/lang/ (with props) trunk/reactos/base/applications/network/net/lang/en-US.rc (with props) trunk/reactos/base/applications/network/net/net.rc (with props) trunk/reactos/base/applications/network/net/resource.h (with props) Modified: trunk/reactos/base/applications/network/net/CMakeLists.txt trunk/reactos/base/applications/network/net/cmdAccounts.c trunk/reactos/base/applications/network/net/cmdContinue.c trunk/reactos/base/applications/network/net/help.c trunk/reactos/base/applications/network/net/main.c trunk/reactos/base/applications/network/net/net.h Modified: trunk/reactos/base/applications/network/net/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/CMakeLists.txt [iso-8859-1] Sat May 31 08:32:54 2014 @@ -12,8 +12,8 @@ help.c net.h) -add_executable(net ${SOURCE}) +add_executable(net ${SOURCE} net.rc) set_module_type(net win32cui UNICODE) -add_importlibs(net advapi32 netapi32 msvcrt kernel32 ntdll) +add_importlibs(net advapi32 netapi32 msvcrt kernel32 user32 ntdll) add_pch(net net.h SOURCE) add_cd_file(TARGET net DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/network/net/cmdAccounts.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdAccounts.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdAccounts.c [iso-8859-1] Sat May 31 08:32:54 2014 @@ -18,33 +18,34 @@ PUSER_MODALS_INFO_1 Info1 = NULL; PUSER_MODALS_INFO_3 Info3 = NULL; NT_PRODUCT_TYPE ProductType; - LPWSTR p, perr; + LPWSTR p; + LPWSTR endptr; DWORD ParamErr; ULONG value; INT i; BOOL Modified = FALSE; // BOOL Domain = FALSE; NET_API_STATUS Status; - - for (i = 3; i < argc; i++) - { - if (wcsicmp(argv[i], L"help") == 0) + INT result = 0; + + for (i = 2; i < argc; i++) + { + if (_wcsicmp(argv[i], L"help") == 0) { /* Print short syntax help */ - puts("NET ACCOUNTS [/FORCELOGOFF:{Minutes|NO}] [/MINPWLEN:Length]"); - puts(" [/MAXPWAGE:{Days|UNLIMITED}] [/MINPWAGE:Days]"); - puts(" [/UNIQUEPW:Count] [/DOMAIN]"); + PrintResourceString(IDS_ACCOUNTS_SYNTAX); return 0; } - if (wcsicmp(argv[i], L"/help") == 0) - { - /* FIXME: Print long help text*/ + if (_wcsicmp(argv[i], L"/help") == 0) + { + /* Print full help text*/ + PrintResourceString(IDS_ACCOUNTS_HELP); return 0; } /* - if (wcsicmp(argv[i], L"/domain") == 0) + if (_wcsicmp(argv[i], L"/domain") == 0) { Domain = TRUE; } @@ -55,7 +56,7 @@ if (Status != NERR_Success) goto done; - for (i = 3; i < argc; i++) + for (i = 2; i < argc; i++) { if (_wcsnicmp(argv[i], L"/forcelogoff:", 13) == 0) { @@ -67,7 +68,13 @@ } else { - value = wcstoul(p, &perr, 10); + value = wcstoul(p, &endptr, 10); + if (*endptr != 0) + { + printf("You entered an invalid value for the /FORCELOGOFF option.\n"); + result = 1; + goto done; + } Info0->usrmod0_force_logoff = value * 60; Modified = TRUE; @@ -76,7 +83,14 @@ else if (_wcsnicmp(argv[i], L"/minpwlen:", 10) == 0) { p = &argv[i][10]; - value = wcstoul(p, &perr, 10); + value = wcstoul(p, &endptr, 10); + if (*endptr != 0) + { + printf("You entered an invalid value for the /MINPWLEN option.\n"); + result = 1; + goto done; + } + Info0->usrmod0_min_passwd_len = value; Modified = TRUE; } @@ -91,7 +105,13 @@ } else { - value = wcstoul(p, &perr, 10); + value = wcstoul(p, &endptr, 10); + if (*endptr != 0) + { + printf("You entered an invalid value for the /MAXPWAGE option.\n"); + result = 1; + goto done; + } Info0->usrmod0_max_passwd_age = value * 86400; Modified = TRUE; @@ -100,7 +120,13 @@ else if (_wcsnicmp(argv[i], L"/minpwage:", 10) == 0) { p = &argv[i][10]; - value = wcstoul(p, &perr, 10); + value = wcstoul(p, &endptr, 10); + if (*endptr != 0) + { + printf("You entered an invalid value for the /MINPWAGE option.\n"); + result = 1; + goto done; + } Info0->usrmod0_min_passwd_age = value * 86400; Modified = TRUE; @@ -108,7 +134,13 @@ else if (_wcsnicmp(argv[i], L"/uniquepw:", 10) == 0) { p = &argv[i][10]; - value = wcstoul(p, &perr, 10); + value = wcstoul(p, &endptr, 10); + if (*endptr != 0) + { + printf("You entered an invalid value for the /UNIQUEPW option.\n"); + result = 1; + goto done; + } Info0->usrmod0_password_hist_len = value; Modified = TRUE; @@ -149,7 +181,12 @@ else printf("%lu\n", Info0->usrmod0_password_hist_len); - printf("Lockout threshold: %lu\n", Info3->usrmod3_lockout_threshold); + printf("Lockout threshold: "); + if (Info3->usrmod3_lockout_threshold == 0) + printf("Never\n"); + else + printf("%lu\n", Info3->usrmod3_lockout_threshold); + printf("Lockout duration (in minutes): %lu\n", Info3->usrmod3_lockout_duration / 60); printf("Lockout observation window (in minutes): %lu\n", Info3->usrmod3_lockout_observation_window / 60); @@ -186,7 +223,7 @@ if (Info0 != NULL) NetApiBufferFree(Info0); - return 0; + return result; } /* EOF */ Modified: trunk/reactos/base/applications/network/net/cmdContinue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdContinue.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/cmdContinue.c [iso-8859-1] Sat May 31 08:32:54 2014 @@ -15,11 +15,21 @@ SC_HANDLE hService = NULL; SERVICE_STATUS status; INT nError = 0; + INT i; if (argc != 3) { - puts("Usage: NET CONTINUE <Service Name>"); + PrintResourceString(IDS_CONTINUE_SYNTAX); return 1; + } + + for (i = 2; i < argc; i++) + { + if (_wcsicmp(argv[i], L"/help") == 0) + { + PrintResourceString(IDS_CONTINUE_HELP); + return 1; + } } hManager = OpenSCManager(NULL, SERVICES_ACTIVE_DATABASE, SC_MANAGER_ENUMERATE_SERVICE); Modified: trunk/reactos/base/applications/network/net/help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/help.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/help.c [iso-8859-1] Sat May 31 08:32:54 2014 @@ -18,8 +18,7 @@ if (_wcsicmp(argv[2],L"ACCOUNTS")==0) { - puts("ACCOUNTS"); - puts("help text"); + PrintResourceString(IDS_ACCOUNTS_HELP); return 0; } @@ -39,8 +38,7 @@ if (_wcsicmp(argv[2],L"CONTINUE")==0) { - puts("CONTINUE"); - puts("help text"); + PrintResourceString(IDS_CONTINUE_HELP); return 0; } Propchange: trunk/reactos/base/applications/network/net/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat May 31 08:32:54 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/base/applications/network/net/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/base/applications/network/net/lang/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/base/applications/network/net/lang/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/applications/network/net/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/lang/en-US.rc (added) +++ trunk/reactos/base/applications/network/net/lang/en-US.rc [iso-8859-1] Sat May 31 08:32:54 2014 @@ -0,0 +1,11 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_ACCOUNTS_SYNTAX "Usage:\nNET ACCOUNTS [/FORCELOGOFF:{Minutes|NO}] [/MINPWLEN:Length]\n\ + [/MAXPWAGE:{Days|UNLIMITED}] [/MINPWAGE:Days]\n\ + [/UNIQUEPW:Count] [/DOMAIN]\n" + IDS_ACCOUNTS_HELP "ACCOUNTS\nhelp text" + IDS_CONTINUE_SYNTAX "Usage:\nNET CONTINUE <Service Name>" + IDS_CONTINUE_HELP "CONTINUE\nhelp text" +END Propchange: trunk/reactos/base/applications/network/net/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/network/net/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/main.c [iso-8859-1] Sat May 31 08:32:54 2014 @@ -8,6 +8,8 @@ */ #include "net.h" + +#define MAX_BUFFER_SIZE 4096 typedef struct _COMMAND { @@ -43,6 +45,22 @@ {NULL, NULL} }; + +VOID +PrintResourceString( + INT resID, + ...) +{ + WCHAR szMsgBuf[MAX_BUFFER_SIZE]; + va_list arg_ptr; + + va_start(arg_ptr, resID); + LoadStringW(GetModuleHandle(NULL), resID, szMsgBuf, MAX_BUFFER_SIZE); + vwprintf(szMsgBuf, arg_ptr); + va_end(arg_ptr); +} + + int wmain(int argc, WCHAR **argv) { PCOMMAND cmdptr; Modified: trunk/reactos/base/applications/network/net/net.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/net.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/net/net.h [iso-8859-1] Sat May 31 08:32:54 2014 @@ -13,12 +13,20 @@ #include <windef.h> #include <winbase.h> +#include <winuser.h> #include <winsvc.h> #include <stdio.h> #include <stdlib.h> #include <limits.h> #include <lm.h> #include <ndk/rtlfuncs.h> + +#include "resource.h" + +VOID +PrintResourceString( + INT resID, + ...); VOID help(VOID); INT unimplemented(INT argc, WCHAR **argv); Added: trunk/reactos/base/applications/network/net/net.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/net.rc (added) +++ trunk/reactos/base/applications/network/net/net.rc [iso-8859-1] Sat May 31 08:32:54 2014 @@ -0,0 +1,17 @@ +#include <windef.h> + +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Net Command" +#define REACTOS_STR_INTERNAL_NAME "net" +#define REACTOS_STR_ORIGINAL_FILENAME "net.exe" +#include <reactos/version.rc> + +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif Propchange: trunk/reactos/base/applications/network/net/net.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/network/net/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/resource.h (added) +++ trunk/reactos/base/applications/network/net/resource.h [iso-8859-1] Sat May 31 08:32:54 2014 @@ -0,0 +1,6 @@ +#pragma once + +#define IDS_ACCOUNTS_SYNTAX 100 +#define IDS_ACCOUNTS_HELP 101 +#define IDS_CONTINUE_SYNTAX 102 +#define IDS_CONTINUE_HELP 103 Propchange: trunk/reactos/base/applications/network/net/resource.h ------------------------------------------------------------------------------ svn:eol-style = native

10 years, 6 months

[aandrejevic] 63508: [NTOSKRNL] Don't allow saving keys which are located directly in the master hive.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat May 31 01:17:00 2014 New Revision: 63508 URL: http://svn.reactos.org/svn/reactos?rev=63508&view=rev Log: [NTOSKRNL] Don't allow saving keys which are located directly in the master hive. Modified: trunk/reactos/ntoskrnl/config/cmapi.c Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] Sat May 31 01:17:00 2014 @@ -2307,6 +2307,13 @@ goto Cleanup; } + if (Kcb->KeyHive == &CmiVolatileHive->Hive) + { + /* Keys that are directly in the master hive can't be saved */ + Status = STATUS_ACCESS_DENIED; + goto Cleanup; + } + /* Create a new hive that will hold the key */ Status = CmpInitializeHive(&KeyHive, HINIT_CREATE,

10 years, 6 months

[aandrejevic] 63507: [NTDLL_APITESTS] Add tests for NtSaveKey.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat May 31 01:14:02 2014 New Revision: 63507 URL: http://svn.reactos.org/svn/reactos?rev=63507&view=rev Log: [NTDLL_APITESTS] Add tests for NtSaveKey. Added: trunk/rostests/apitests/ntdll/NtSaveKey.c (with props) Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Sat May 31 01:14:02 2014 @@ -11,6 +11,7 @@ NtProtectVirtualMemory.c NtQuerySystemEnvironmentValue.c NtQueryVolumeInformationFile.c + NtSaveKey.c RtlBitmap.c RtlDetermineDosPathNameType.c RtlDoesFileExists.c Added: trunk/rostests/apitests/ntdll/NtSaveKey.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtSaveKey.… ============================================================================== --- trunk/rostests/apitests/ntdll/NtSaveKey.c (added) +++ trunk/rostests/apitests/ntdll/NtSaveKey.c [iso-8859-1] Sat May 31 01:14:02 2014 @@ -0,0 +1,131 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for NtSaveKey + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <ndk/rtlfuncs.h> +#include <ndk/cmfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/setypes.h> + +static +NTSTATUS +OpenRegistryKeyHandle(PHANDLE KeyHandle, + ACCESS_MASK AccessMask, + PWCHAR RegistryPath) +{ + UNICODE_STRING KeyName; + OBJECT_ATTRIBUTES Attributes; + + RtlInitUnicodeString(&KeyName, RegistryPath); + InitializeObjectAttributes(&Attributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + return NtOpenKey(KeyHandle, AccessMask, &Attributes); +} + +START_TEST(NtSaveKey) +{ + NTSTATUS Status; + HANDLE KeyHandle; + HANDLE FileHandle; + BOOLEAN OldPrivilegeStatus; + + /* Open the file */ + FileHandle = CreateFileW(L"saved_key.dat", + GENERIC_READ | GENERIC_WRITE, + 0, + NULL, + CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE, + NULL); + if (FileHandle == INVALID_HANDLE_VALUE) + { + skip("CreateFileW failed with error: %lu\n", GetLastError()); + return; + } + + /* Try saving HKEY_LOCAL_MACHINE\Hardware */ + Status = OpenRegistryKeyHandle(&KeyHandle, KEY_READ, L"\\Registry\\Machine\\Hardware"); + if (!NT_SUCCESS(Status)) + { + skip("NtOpenKey failed with status: 0x%08lX\n", Status); + NtClose(FileHandle); + return; + } + + Status = NtSaveKey(KeyHandle, FileHandle); + ok_ntstatus(Status, STATUS_PRIVILEGE_NOT_HELD); + + NtClose(KeyHandle); + + /* Set the SeBackupPrivilege */ + Status = RtlAdjustPrivilege(SE_BACKUP_PRIVILEGE, + TRUE, + FALSE, + &OldPrivilegeStatus); + if (!NT_SUCCESS(Status)) + { + skip("RtlAdjustPrivilege failed with status: 0x%08lX\n", (ULONG)Status); + NtClose(FileHandle); + return; + } + + /* Try saving HKEY_LOCAL_MACHINE\Hardware again */ + Status = OpenRegistryKeyHandle(&KeyHandle, KEY_READ, L"\\Registry\\Machine\\Hardware"); + if (!NT_SUCCESS(Status)) + { + skip("NtOpenKey failed with status: 0x%08lX\n", Status); + goto Cleanup; + } + + Status = NtSaveKey(KeyHandle, FileHandle); + ok_ntstatus(Status, STATUS_SUCCESS); + + NtClose(KeyHandle); + + /* Try saving HKEY_LOCAL_MACHINE */ + Status = OpenRegistryKeyHandle(&KeyHandle, KEY_READ, L"\\Registry\\Machine"); + if (!NT_SUCCESS(Status)) + { + skip("NtOpenKey failed with status: 0x%08lX\n", Status); + goto Cleanup; + } + + Status = NtSaveKey(KeyHandle, FileHandle); + ok_ntstatus(Status, STATUS_ACCESS_DENIED); + + NtClose(KeyHandle); + + /* Try saving HKEY_USERS */ + Status = OpenRegistryKeyHandle(&KeyHandle, KEY_READ, L"\\Registry\\User"); + if (!NT_SUCCESS(Status)) + { + skip("NtOpenKey failed with status: 0x%08lX\n", Status); + goto Cleanup; + } + + Status = NtSaveKey(KeyHandle, FileHandle); + ok_ntstatus(Status, STATUS_ACCESS_DENIED); + + NtClose(KeyHandle); + +Cleanup: + + /* Restore the SeBackupPrivilege */ + RtlAdjustPrivilege(SE_BACKUP_PRIVILEGE, + OldPrivilegeStatus, + FALSE, + &OldPrivilegeStatus); + + /* Close the file handle */ + NtClose(FileHandle); +} Propchange: trunk/rostests/apitests/ntdll/NtSaveKey.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Sat May 31 01:14:02 2014 @@ -14,6 +14,7 @@ extern void func_NtProtectVirtualMemory(void); extern void func_NtQuerySystemEnvironmentValue(void); extern void func_NtQueryVolumeInformationFile(void); +extern void func_NtSaveKey(void); extern void func_NtSystemInformation(void); extern void func_RtlBitmap(void); extern void func_RtlDetermineDosPathNameType(void); @@ -43,6 +44,7 @@ { "NtProtectVirtualMemory", func_NtProtectVirtualMemory }, { "NtQuerySystemEnvironmentValue", func_NtQuerySystemEnvironmentValue }, { "NtQueryVolumeInformationFile", func_NtQueryVolumeInformationFile }, + { "NtSaveKey", func_NtSaveKey}, { "NtSystemInformation", func_NtSystemInformation }, { "RtlBitmapApi", func_RtlBitmap }, { "RtlDetermineDosPathNameType", func_RtlDetermineDosPathNameType },

10 years, 6 months

[hbelusca] 63506: [NTOS:CM] Replace a hardcoded value with something more readable.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri May 30 21:47:22 2014 New Revision: 63506 URL: http://svn.reactos.org/svn/reactos?rev=63506&view=rev Log: [NTOS:CM] Replace a hardcoded value with something more readable. Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c trunk/reactos/ntoskrnl/config/cmparse.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/include/internal/cm.h Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkcbncb.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] Fri May 30 21:47:22 2014 @@ -1164,7 +1164,7 @@ { /* Get the key body */ KeyBody = CONTAINING_RECORD(NextEntry, CM_KEY_BODY, KeyBodyList); - ASSERT(KeyBody->Type == '20yk'); + ASSERT(KeyBody->Type == CM_KEY_BODY_TYPE); /* Check for notifications */ if (KeyBody->NotifyBlock) Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c [iso-8859-1] Fri May 30 21:47:22 2014 @@ -286,7 +286,7 @@ /* Setup the key body */ KeyBody = (PCM_KEY_BODY)(*Object); - KeyBody->Type = '20yk'; + KeyBody->Type = CM_KEY_BODY_TYPE; KeyBody->KeyControlBlock = NULL; /* Check if we had a class */ @@ -691,7 +691,7 @@ /* Get the key body and fill it out */ KeyBody = (PCM_KEY_BODY)(*Object); KeyBody->KeyControlBlock = Kcb; - KeyBody->Type = '20yk'; + KeyBody->Type = CM_KEY_BODY_TYPE; KeyBody->ProcessID = PsGetCurrentProcessId(); KeyBody->NotifyBlock = NULL; Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Fri May 30 21:47:22 2014 @@ -129,7 +129,7 @@ CmpLockRegistry(); /* Make sure this is a valid key body */ - if (KeyBody->Type == '20yk') + if (KeyBody->Type == CM_KEY_BODY_TYPE) { /* Get the KCB */ Kcb = KeyBody->KeyControlBlock; @@ -166,7 +166,7 @@ if (SystemHandleCount > 1) return; /* Make sure we're a valid key body */ - if (KeyBody->Type == '20yk') + if (KeyBody->Type == CM_KEY_BODY_TYPE) { /* Don't do anything if we don't have a notify block */ if (!KeyBody->NotifyBlock) return; @@ -1056,7 +1056,7 @@ /* Initialize the object */ RootKey->KeyControlBlock = Kcb; - RootKey->Type = '20yk'; + RootKey->Type = CM_KEY_BODY_TYPE; RootKey->NotifyBlock = NULL; RootKey->ProcessID = PsGetCurrentProcessId(); Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Fri May 30 21:47:22 2014 @@ -59,6 +59,11 @@ #define CM_KCB_NO_DELAY_CLOSE 0x20 #define CM_KCB_INVALID_CACHED_INFO 0x40 #define CM_KCB_READ_ONLY_KEY 0x80 + +// +// CM_KEY_BODY Types +// +#define CM_KEY_BODY_TYPE 0x6B793032 // // CM_KEY_VALUE Types

10 years, 6 months

[hbelusca] 63505: [NTOS:CM] - Add a DPRINT1 in CmCheckRegistry because it is unimplemented, and give the CheckFlags value to CmCheckRegistry, when it is called in CmpInitializeHive. - Give the Chec...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri May 30 20:40:02 2014 New Revision: 63505 URL: http://svn.reactos.org/svn/reactos?rev=63505&view=rev Log: [NTOS:CM] - Add a DPRINT1 in CmCheckRegistry because it is unimplemented, and give the CheckFlags value to CmCheckRegistry, when it is called in CmpInitializeHive. - Give the CheckFlags value to CmpInitializeHive, when it is called in CmpInitHiveFromFile. - Really mention that the CmCreateRootNode call is a HACK for ROS. Modified: trunk/reactos/ntoskrnl/config/cmcheck.c trunk/reactos/ntoskrnl/config/cminit.c trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/config/cmcheck.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmcheck.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmcheck.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmcheck.c [iso-8859-1] Fri May 30 20:40:02 2014 @@ -22,5 +22,6 @@ IN ULONG Flags) { /* FIXME: HACK! */ + DPRINT1("CmCheckRegistry(0x%p, %lu) is UNIMPLEMENTED!\n", RegistryHive, Flags); return 0; } Modified: trunk/reactos/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] Fri May 30 20:40:02 2014 @@ -214,7 +214,8 @@ (OperationType == HINIT_MAPFILE)) { /* Verify integrity */ - if (CmCheckRegistry((PCMHIVE)Hive, TRUE)) + ULONG CheckStatus = CmCheckRegistry(Hive, CheckFlags); + if (CheckStatus != 0) { /* Cleanup allocations and fail */ ExFreePoolWithTag(Hive->FlusherLock, TAG_CM); Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Fri May 30 20:40:02 2014 @@ -358,7 +358,7 @@ LogHandle, NULL, HiveName, - 0); + CheckFlags); if (!NT_SUCCESS(Status)) { /* Fail */ @@ -370,7 +370,7 @@ /* Success, return hive */ *Hive = NewHive; - /* ROS: Init root key cell and prepare the hive */ + /* HACK: ROS: Init root key cell and prepare the hive */ if (Operation == HINIT_CREATE) CmCreateRootNode(&NewHive->Hive, L""); /* Duplicate the hive name */

10 years, 6 months

[dquintana] 63504: [SHELL32] * The CDefView should not process the backspace key directly. It's already handled by the accelerators. [BROWSEUI] * Allow the docked toolbars to translate accelerators...

by dquintana＠svn.reactos.org

Author: dquintana Date: Fri May 30 18:00:31 2014 New Revision: 63504 URL: http://svn.reactos.org/svn/reactos?rev=63504&view=rev Log: [SHELL32] * The CDefView should not process the backspace key directly. It's already handled by the accelerators. [BROWSEUI] * Allow the docked toolbars to translate accelerators. * CAddressEditBox: Cancel accelerators without modifiers while focused. [RSHELL] * Cancel accelerators while a popup is open, and ignore them otherwise. Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/dll/win32/browseui/addressband.cpp branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp branches/shell-experiments/dll/win32/browseui/toolsband.cpp branches/shell-experiments/dll/win32/shell32/shlview.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Fri May 30 18:00:31 2014 @@ -1095,14 +1095,15 @@ HRESULT STDMETHODCALLTYPE CMenuBand::HasFocusIO() { - UNIMPLEMENTED; - return S_OK; + if (m_popupBar) + return S_OK; + return S_FALSE; } HRESULT STDMETHODCALLTYPE CMenuBand::TranslateAcceleratorIO(LPMSG lpMsg) { - UNIMPLEMENTED; - return S_OK; + // TODO: Alt down -> toggle menu focus + return S_FALSE; } HRESULT STDMETHODCALLTYPE CMenuBand::IsDirty() Modified: branches/shell-experiments/dll/win32/browseui/addressband.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/addressband.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/addressband.cpp [iso-8859-1] Fri May 30 18:00:31 2014 @@ -301,7 +301,22 @@ HRESULT STDMETHODCALLTYPE CAddressBand::TranslateAcceleratorIO(LPMSG lpMsg) { - // incomplete + if (lpMsg->hwnd == fEditControl) + { + switch (lpMsg->message) + { + case WM_SYSKEYDOWN: + case WM_SYSKEYUP: + case WM_SYSCOMMAND: + case WM_SYSDEADCHAR: + case WM_SYSCHAR: + return S_FALSE; + } + + TranslateMessage(lpMsg); + DispatchMessage(lpMsg); + return S_OK; + } return S_FALSE; } @@ -510,6 +525,7 @@ DbgPrint("ERROR %d\n", GetLastError()); } + SendMessage(m_hWnd, CB_SETCURSEL, -1, 0); SendMessage(m_hWnd, CB_SETCURSEL, oldIndex, 0); //fAddressEditBox->SetCurrentDir(index); Modified: branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] Fri May 30 18:00:31 2014 @@ -91,7 +91,6 @@ HRESULT STDMETHODCALLTYPE CAddressEditBox::ParseNow(long paramC) { - WCHAR address[4096]; ULONG eaten; ULONG attributes; HRESULT hr; @@ -102,11 +101,34 @@ IUnknown_GetWindow(pisb, &topLevelWindow); - GetWindowText(fCombobox.m_hWnd, address, 4095); + LPWSTR input; + int inputLength = GetWindowTextLength(fCombobox.m_hWnd) + 2; + + input = new WCHAR[inputLength]; + GetWindowText(fCombobox.m_hWnd, input, inputLength); + + LPWSTR address; + int addressLength = ExpandEnvironmentStrings(input, NULL, 0); + + if (addressLength <= 0) + { + address = input; + } + else + { + addressLength += 2; + address = new WCHAR[addressLength]; + ExpandEnvironmentStrings(input, address, 0); + } CComPtr<IShellFolder> psfDesktop; hr = SHGetDesktopFolder(&psfDesktop); hr = psfDesktop->ParseDisplayName(topLevelWindow, NULL, address, &eaten, &pidlLastParsed, &attributes); + + if (address != input) + delete [] address; + delete [] input; + return hr; } Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Fri May 30 18:00:31 2014 @@ -72,6 +72,28 @@ extern HRESULT CreateBrandBand(REFIID riid, void **ppv); extern HRESULT CreateBandProxy(REFIID riid, void **ppv); extern HRESULT CreateAddressBand(REFIID riid, void **ppv); + +HRESULT IUnknown_HasFocusIO(IUnknown * punk) +{ + CComPtr<IInputObject> pio; + HRESULT hr; + hr = punk->QueryInterface(IID_PPV_ARG(IInputObject, &pio)); + if (FAILED(hr)) + return hr; + return pio->HasFocusIO(); +} + +HRESULT IUnknown_TranslateAcceleratorIO(IUnknown * punk, MSG * pmsg) +{ + CComPtr<IInputObject> pio; + HRESULT hr; + if (!punk) + return E_FAIL; + hr = punk->QueryInterface(IID_PPV_ARG(IInputObject, &pio)); + if (FAILED(hr)) + return hr; + return pio->TranslateAcceleratorIO(pmsg); +} typedef HRESULT(*PMENUBAND_CONSTRUCTOR)(REFIID riid, void **ppv); @@ -740,12 +762,46 @@ HRESULT STDMETHODCALLTYPE CInternetToolbar::HasFocusIO() { - return E_NOTIMPL; + HRESULT hr = S_FALSE; + + if (fMenuBar) + hr = IUnknown_HasFocusIO(fMenuBar); + if (hr != S_FALSE) + return hr; + + if (fControlsBar) + hr = IUnknown_HasFocusIO(fControlsBar); + if (hr != S_FALSE) + return hr; + + if (fNavigationBar) + hr = IUnknown_HasFocusIO(fNavigationBar); + if (hr != S_FALSE) + return hr; + + return S_FALSE; } HRESULT STDMETHODCALLTYPE CInternetToolbar::TranslateAcceleratorIO(LPMSG lpMsg) { - return E_NOTIMPL; + HRESULT hr = S_FALSE; + + if (fMenuBar) + hr = IUnknown_TranslateAcceleratorIO(fMenuBar, lpMsg); + if (hr == S_OK) + return hr; + + if (fControlsBar) + hr = IUnknown_TranslateAcceleratorIO(fControlsBar, lpMsg); + if (hr == S_OK) + return hr; + + if (fNavigationBar) + hr = IUnknown_TranslateAcceleratorIO(fNavigationBar, lpMsg); + if (hr == S_OK) + return hr; + + return S_FALSE; } HRESULT STDMETHODCALLTYPE CInternetToolbar::GetWindow(HWND *lphwnd) Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Fri May 30 18:00:31 2014 @@ -2539,8 +2539,16 @@ return E_NOTIMPL; } +extern HRESULT IUnknown_HasFocusIO(IUnknown * punk); +extern HRESULT IUnknown_TranslateAcceleratorIO(IUnknown * punk, MSG * pmsg); HRESULT STDMETHODCALLTYPE CShellBrowser::v_MayTranslateAccelerator(MSG *pmsg) { + for (int i = 0; i < 3; i++) + { + if (IUnknown_TranslateAcceleratorIO(fClientBars[i].clientBar, pmsg) == S_OK) + return S_OK; + } + if (fCurrentShellView->TranslateAcceleratorW(pmsg) != S_OK) { if (TranslateAcceleratorSB(pmsg, 0) != S_OK) Modified: branches/shell-experiments/dll/win32/browseui/toolsband.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/toolsband.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/toolsband.cpp [iso-8859-1] Fri May 30 18:00:31 2014 @@ -386,12 +386,12 @@ HRESULT STDMETHODCALLTYPE CToolsBand::HasFocusIO() { - return E_NOTIMPL; + return S_FALSE; } HRESULT STDMETHODCALLTYPE CToolsBand::TranslateAcceleratorIO(LPMSG lpMsg) { - return E_NOTIMPL; + return S_FALSE; } HRESULT STDMETHODCALLTYPE CToolsBand::UIActivateIO(BOOL fActivate, LPMSG lpMsg) Modified: branches/shell-experiments/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] Fri May 30 18:00:31 2014 @@ -1793,25 +1793,6 @@ return FALSE; } - case LVN_KEYDOWN: - { - LPNMLVKEYDOWN plvKeyDown = (LPNMLVKEYDOWN) lpnmh; - - /* initiate a rename of the selected file or directory */ - if (plvKeyDown->wVKey == VK_BACK) - { - LPSHELLBROWSER lpSb; - if ((lpSb = (LPSHELLBROWSER)SendMessageW(m_hWndParent, CWM_GETISHELLBROWSER, 0, 0))) - { - lpSb->BrowseObject(NULL, SBSP_PARENT); - } - } - - else - FIXME("LVN_KEYDOWN key=0x%08x\n", plvKeyDown->wVKey); - } - break; - default: TRACE("-- %p WM_COMMAND %x unhandled\n", this, lpnmh->code); break;

10 years, 6 months

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