Ros-diffs April 2014

ros-diffs@reactos.org

15 participants
492 discussions

[tfaber] 62968: [SHELL32] - Import SHCreateQueryCancelAutoPlayMoniker from Wine. Fixes crash in shell32_winetest:shellole

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Apr 25 21:24:53 2014 New Revision: 62968 URL: http://svn.reactos.org/svn/reactos?rev=62968&view=rev Log: [SHELL32] - Import SHCreateQueryCancelAutoPlayMoniker from Wine. Fixes crash in shell32_winetest:shellole Modified: trunk/reactos/dll/win32/shell32/shellole.cpp trunk/reactos/dll/win32/shell32/stubs.cpp trunk/reactos/include/psdk/shlobj.h Modified: trunk/reactos/dll/win32/shell32/shellole.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellole… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellole.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellole.cpp [iso-8859-1] Fri Apr 25 21:24:53 2014 @@ -710,3 +710,14 @@ hres = pps->WriteMultiple(cpspec, rgpspec, rgvar, propidNameFirst); return hres; } + +/************************************************************************* + * SHCreateQueryCancelAutoPlayMoniker [SHELL32.@] + */ +HRESULT WINAPI SHCreateQueryCancelAutoPlayMoniker(IMoniker **moniker) +{ + TRACE("%p\n", moniker); + + if (!moniker) return E_INVALIDARG; + return CreateClassMoniker(CLSID_QueryCancelAutoPlay, moniker); +} Modified: trunk/reactos/dll/win32/shell32/stubs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/stubs.cp… ============================================================================== --- trunk/reactos/dll/win32/shell32/stubs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/stubs.cpp [iso-8859-1] Fri Apr 25 21:24:53 2014 @@ -668,17 +668,6 @@ /* * Unimplemented */ -EXTERN_C HRESULT -WINAPI -SHCreateQueryCancelAutoPlayMoniker(IMoniker **ppmoniker) -{ - FIXME("SHCreateQueryCancelAutoPlayMoniker() stub\n"); - return E_FAIL; -} - -/* - * Unimplemented - */ EXTERN_C BOOL WINAPI SHCreateProcessAsUserW(PSHCREATEPROCESSINFOW pscpi) @@ -692,9 +681,9 @@ */ EXTERN_C BOOL WINAPI -SHChangeNotifySuspendResume(BOOL bSuspend, - LPITEMIDLIST pidl, - BOOL bRecursive, +SHChangeNotifySuspendResume(BOOL bSuspend, + LPITEMIDLIST pidl, + BOOL bRecursive, DWORD dwReserved) { FIXME("SHChangeNotifySuspendResume() stub\n"); Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Fri Apr 25 21:24:53 2014 @@ -101,6 +101,7 @@ HPSXA WINAPI SHCreatePropSheetExtArray(_In_ HKEY, _In_opt_ LPCWSTR, UINT); HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY,LPCWSTR,UINT,IDataObject*); +HRESULT WINAPI SHCreateQueryCancelAutoPlayMoniker(IMoniker**); HRESULT WINAPI

10 years, 8 months

[tfaber] 62967: [CRT] - Sync get_this_pointer with Wine. Fixes crash in msvcrt_winetest:cpp - Sync undname.c with Wine. Fixes assertion failure in msvcrt_winetest:cpp

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Apr 25 20:01:08 2014 New Revision: 62967 URL: http://svn.reactos.org/svn/reactos?rev=62967&view=rev Log: [CRT] - Sync get_this_pointer with Wine. Fixes crash in msvcrt_winetest:cpp - Sync undname.c with Wine. Fixes assertion failure in msvcrt_winetest:cpp Modified: trunk/reactos/lib/sdk/crt/except/cpp.c trunk/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h trunk/reactos/lib/sdk/crt/include/internal/wine/msvcrt.h trunk/reactos/lib/sdk/crt/wine/undname.c Modified: trunk/reactos/lib/sdk/crt/except/cpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/cpp.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/cpp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/cpp.c [iso-8859-1] Fri Apr 25 20:01:08 2014 @@ -604,7 +604,7 @@ * Is this '.' really part of the mangled name, or has it some other meaning ? */ char* name = __unDName(0, _this->mangled + 1, 0, - MSVCRT_malloc, MSVCRT_free, 0x2800); + MSVCRT_malloc, MSVCRT_free, UNDNAME_NO_ARGUMENTS | UNDNAME_32_BIT_DECODE); if (name) { size_t len = strlen(name); Modified: trunk/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h [iso-8859-1] Fri Apr 25 20:01:08 2014 @@ -164,20 +164,21 @@ /* compute the this pointer for a base class of a given type */ static inline void *get_this_pointer( const this_ptr_offsets *off, void *object ) { - void *this_ptr; - int *offset_ptr; + if (!object) return NULL; - if (!object) return NULL; - this_ptr = (char *)object + off->this_offset; if (off->vbase_descr >= 0) { + int *offset_ptr; + /* move this ptr to vbase descriptor */ - this_ptr = (char *)this_ptr + off->vbase_descr; + object = (char *)object + off->vbase_descr; /* and fetch additional offset from vbase descriptor */ - offset_ptr = (int *)(*(char **)this_ptr + off->vbase_offset); - this_ptr = (char *)this_ptr + *offset_ptr; + offset_ptr = (int *)(*(char **)object + off->vbase_offset); + object = (char *)object + *offset_ptr; } - return this_ptr; + + object = (char *)object + off->this_offset; + return object; } #endif /* __MSVCRT_CPPEXCEPT_H */ Modified: trunk/reactos/lib/sdk/crt/include/internal/wine/msvcrt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/wine/msvcrt.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/include/internal/wine/msvcrt.h [iso-8859-1] Fri Apr 25 20:01:08 2014 @@ -81,9 +81,6 @@ typedef void* (__cdecl *malloc_func_t)(size_t); typedef void (__cdecl *free_func_t)(void*); -extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t,unsigned short int); -extern char* __cdecl __unDNameEx(char *,const char*,int,malloc_func_t,free_func_t,void *,unsigned short int); - /* Setup and teardown multi threaded locks */ extern void msvcrt_init_mt_locks(void); extern void msvcrt_free_mt_locks(void); @@ -119,6 +116,28 @@ #define MSVCRT__OUT_TO_MSGBOX 2 #define MSVCRT__REPORT_ERRMODE 3 +extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t,unsigned short int); + +/* __unDName/__unDNameEx flags */ +#define UNDNAME_COMPLETE (0x0000) +#define UNDNAME_NO_LEADING_UNDERSCORES (0x0001) /* Don't show __ in calling convention */ +#define UNDNAME_NO_MS_KEYWORDS (0x0002) /* Don't show calling convention at all */ +#define UNDNAME_NO_FUNCTION_RETURNS (0x0004) /* Don't show function/method return value */ +#define UNDNAME_NO_ALLOCATION_MODEL (0x0008) +#define UNDNAME_NO_ALLOCATION_LANGUAGE (0x0010) +#define UNDNAME_NO_MS_THISTYPE (0x0020) +#define UNDNAME_NO_CV_THISTYPE (0x0040) +#define UNDNAME_NO_THISTYPE (0x0060) +#define UNDNAME_NO_ACCESS_SPECIFIERS (0x0080) /* Don't show access specifier (public/protected/private) */ +#define UNDNAME_NO_THROW_SIGNATURES (0x0100) +#define UNDNAME_NO_MEMBER_TYPE (0x0200) /* Don't show static/virtual specifier */ +#define UNDNAME_NO_RETURN_UDT_MODEL (0x0400) +#define UNDNAME_32_BIT_DECODE (0x0800) +#define UNDNAME_NAME_ONLY (0x1000) /* Only report the variable/method name */ +#define UNDNAME_NO_ARGUMENTS (0x2000) /* Don't show method arguments */ +#define UNDNAME_NO_SPECIAL_SYMS (0x4000) +#define UNDNAME_NO_COMPLEX_TYPE (0x8000) + typedef void (*float_handler)(int, int); void _default_handler(int signal); typedef struct _sig_element Modified: trunk/reactos/lib/sdk/crt/wine/undname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wine/undname.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/wine/undname.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/wine/undname.c [iso-8859-1] Fri Apr 25 20:01:08 2014 @@ -33,25 +33,6 @@ * - back-port this new code into tools/winedump/msmangle.c */ -#define UNDNAME_COMPLETE (0x0000) -#define UNDNAME_NO_LEADING_UNDERSCORES (0x0001) /* Don't show __ in calling convention */ -#define UNDNAME_NO_MS_KEYWORDS (0x0002) /* Don't show calling convention at all */ -#define UNDNAME_NO_FUNCTION_RETURNS (0x0004) /* Don't show function/method return value */ -#define UNDNAME_NO_ALLOCATION_MODEL (0x0008) -#define UNDNAME_NO_ALLOCATION_LANGUAGE (0x0010) -#define UNDNAME_NO_MS_THISTYPE (0x0020) -#define UNDNAME_NO_CV_THISTYPE (0x0040) -#define UNDNAME_NO_THISTYPE (0x0060) -#define UNDNAME_NO_ACCESS_SPECIFIERS (0x0080) /* Don't show access specifier (public/protected/private) */ -#define UNDNAME_NO_THROW_SIGNATURES (0x0100) -#define UNDNAME_NO_MEMBER_TYPE (0x0200) /* Don't show static/virtual specifier */ -#define UNDNAME_NO_RETURN_UDT_MODEL (0x0400) -#define UNDNAME_32_BIT_DECODE (0x0800) -#define UNDNAME_NAME_ONLY (0x1000) /* Only report the variable/method name */ -#define UNDNAME_NO_ARGUMENTS (0x2000) /* Don't show method arguments */ -#define UNDNAME_NO_SPECIAL_SYMS (0x4000) -#define UNDNAME_NO_COMPLEX_TYPE (0x8000) - /* How data types modifiers are stored: * M (in the following definitions) is defined for * 'A', 'B', 'C' and 'D' as follows @@ -267,7 +248,7 @@ { case 's': t = va_arg(args, char*); if (t) len += (int)strlen(t); break; case 'c': (void)va_arg(args, int); len++; break; - default: i--; /* fall thru */ + default: i--; /* fall through */ case '%': len++; break; } } @@ -294,7 +275,7 @@ case 'c': *p++ = (char)va_arg(args, int); break; - default: i--; /* fall thru */ + default: i--; /* fall through */ case '%': *p++ = '%'; break; } } @@ -348,7 +329,7 @@ if (*sym->current != '@') return NULL; ptr = und_alloc(sym, 17); - sprintf(ptr, "%s%d", sgn ? "-" : "", ret); + sprintf(ptr, "%s%u", sgn ? "-" : "", ret); sym->current++; } else return NULL; @@ -423,7 +404,12 @@ *ptr_modif = NULL; if (*sym->current == 'E') { - *ptr_modif = "__ptr64"; + if (!(sym->flags & UNDNAME_NO_MS_KEYWORDS)) + { + *ptr_modif = "__ptr64"; + if (sym->flags & UNDNAME_NO_LEADING_UNDERSCORES) + *ptr_modif = *ptr_modif + 2; + } sym->current++; } switch (*sym->current++) @@ -446,7 +432,13 @@ if (*sym->current == 'E') { - ptr_modif = " __ptr64"; + if (!(sym->flags & UNDNAME_NO_MS_KEYWORDS)) + { + if (sym->flags & UNDNAME_NO_LEADING_UNDERSCORES) + ptr_modif = " ptr64"; + else + ptr_modif = " __ptr64"; + } sym->current++; } @@ -556,8 +548,10 @@ struct array array_pmt; sym->names.start = sym->names.num; - if (!(name = get_literal_string(sym))) + if (!(name = get_literal_string(sym))) { + sym->names.start = start_mark; return FALSE; + } str_array_init(&array_pmt); args = get_args(sym, &array_pmt, FALSE, '<', '>'); if (args != NULL) @@ -1082,6 +1076,7 @@ { char accmem; const char* access = NULL; + int access_id = -1; const char* member_type = NULL; struct datatype_t ct_ret; const char* call_conv; @@ -1089,7 +1084,7 @@ const char* exported; const char* args_str = NULL; const char* name = NULL; - BOOL ret = FALSE; + BOOL ret = FALSE, has_args = TRUE, has_ret = TRUE; unsigned mark; struct array array_pmt; @@ -1120,50 +1115,104 @@ * 'X' public: thunk * 'Y' * 'Z' + * "$0" private: thunk vtordisp + * "$1" private: thunk vtordisp + * "$2" protected: thunk vtordisp + * "$3" protected: thunk vtordisp + * "$4" public: thunk vtordisp + * "$5" public: thunk vtordisp + * "$B" vcall thunk + * "$R" thunk vtordispex */ accmem = *sym->current++; - if (accmem < 'A' || accmem > 'Z') goto done; - - if (!(sym->flags & UNDNAME_NO_ACCESS_SPECIFIERS)) - { - switch ((accmem - 'A') / 8) - { - case 0: access = "private: "; break; - case 1: access = "protected: "; break; - case 2: access = "public: "; break; - } - } - if (!(sym->flags & UNDNAME_NO_MEMBER_TYPE)) - { - if (accmem <= 'X') - { - switch ((accmem - 'A') % 8) - { - case 2: case 3: member_type = "static "; break; - case 4: case 5: member_type = "virtual "; break; - case 6: case 7: - access = str_printf(sym, "[thunk]:%s", access); - member_type = "virtual "; - break; - } - } - } + if (accmem == '$') + { + if (*sym->current >= '0' && *sym->current <= '5') + access_id = (*sym->current - '0') / 2; + else if (*sym->current == 'R') + access_id = (sym->current[1] - '0') / 2; + else if (*sym->current != 'B') + goto done; + } + else if (accmem >= 'A' && accmem <= 'Z') + access_id = (accmem - 'A') / 8; + else + goto done; + + switch (access_id) + { + case 0: access = "private: "; break; + case 1: access = "protected: "; break; + case 2: access = "public: "; break; + } + if (accmem == '$' || (accmem - 'A') % 8 == 6 || (accmem - 'A') % 8 == 7) + access = str_printf(sym, "[thunk]:%s", access ? access : " "); + + if (accmem == '$' && *sym->current != 'B') + member_type = "virtual "; + else if (accmem <= 'X') + { + switch ((accmem - 'A') % 8) + { + case 2: case 3: member_type = "static "; break; + case 4: case 5: case 6: case 7: member_type = "virtual "; break; + } + } + + if (sym->flags & UNDNAME_NO_ACCESS_SPECIFIERS) + access = NULL; + if (sym->flags & UNDNAME_NO_MEMBER_TYPE) + member_type = NULL; name = get_class_string(sym, 0); - if ((accmem - 'A') % 8 == 6 || (accmem - '8') % 8 == 7) /* a thunk */ + if (accmem == '$' && *sym->current == 'B') /* vcall thunk */ + { + const char *n; + + sym->current++; + n = get_number(sym); + + if(!n || *sym->current++ != 'A') goto done; + name = str_printf(sym, "%s{%s,{flat}}' }'", name, n); + has_args = FALSE; + has_ret = FALSE; + } + else if (accmem == '$' && *sym->current == 'R') /* vtordispex thunk */ + { + const char *n1, *n2, *n3, *n4; + + sym->current += 2; + n1 = get_number(sym); + n2 = get_number(sym); + n3 = get_number(sym); + n4 = get_number(sym); + + if(!n1 || !n2 || !n3 || !n4) goto done; + name = str_printf(sym, "%s`vtordispex{%s,%s,%s,%s}' ", name, n1, n2, n3, n4); + } + else if (accmem == '$') /* vtordisp thunk */ + { + const char *n1, *n2; + + sym->current++; + n1 = get_number(sym); + n2 = get_number(sym); + + if (!n1 || !n2) goto done; + name = str_printf(sym, "%s`vtordisp{%s,%s}' ", name, n1, n2); + } + else if ((accmem - 'A') % 8 == 6 || (accmem - 'A') % 8 == 7) /* a thunk */ name = str_printf(sym, "%s`adjustor{%s}' ", name, get_number(sym)); - if (accmem <= 'X') - { - if (((accmem - 'A') % 8) != 2 && ((accmem - 'A') % 8) != 3) - { - const char *ptr_modif; - /* Implicit 'this' pointer */ - /* If there is an implicit this pointer, const modifier follows */ - if (!get_modifier(sym, &modifier, &ptr_modif)) goto done; - if (modifier || ptr_modif) modifier = str_printf(sym, "%s %s", modifier, ptr_modif); - } + if (has_args && (accmem == '$' || + (accmem <= 'X' && (accmem - 'A') % 8 != 2 && (accmem - 'A') % 8 != 3))) + { + const char *ptr_modif; + /* Implicit 'this' pointer */ + /* If there is an implicit this pointer, const modifier follows */ + if (!get_modifier(sym, &modifier, &ptr_modif)) goto done; + if (modifier || ptr_modif) modifier = str_printf(sym, "%s %s", modifier, ptr_modif); } if (!get_calling_convention(*sym->current++, &call_conv, &exported, @@ -1173,18 +1222,18 @@ str_array_init(&array_pmt); /* Return type, or @ if 'void' */ - if (*sym->current == '@') + if (has_ret && *sym->current == '@') { ct_ret.left = "void"; ct_ret.right = NULL; sym->current++; } - else + else if (has_ret) { if (!demangle_datatype(sym, &ct_ret, &array_pmt, FALSE)) goto done; } - if (sym->flags & UNDNAME_NO_FUNCTION_RETURNS) + if (!has_ret || sym->flags & UNDNAME_NO_FUNCTION_RETURNS) ct_ret.left = ct_ret.right = NULL; if (cast_op) { @@ -1193,8 +1242,9 @@ } mark = sym->stack.num; - if (!(args_str = get_args(sym, &array_pmt, TRUE, '(', ')'))) goto done; + if (has_args && !(args_str = get_args(sym, &array_pmt, TRUE, '(', ')'))) goto done; if (sym->flags & UNDNAME_NAME_ONLY) args_str = modifier = NULL; + if (sym->flags & UNDNAME_NO_THISTYPE) modifier = NULL; sym->stack.num = mark; /* Note: '()' after 'Z' means 'throws', but we don't care here @@ -1208,23 +1258,6 @@ ret = TRUE; done: return ret; -} - -/****************************************************************** - * handle_template - * Does the final parsing and handling for a name with templates - */ -static BOOL handle_template(struct parsed_symbol* sym) -{ - const char* name; - const char* args; - - assert(*sym->current == '$'); - sym->current++; - if (!(name = get_literal_string(sym))) return FALSE; - if (!(args = get_args(sym, NULL, FALSE, '<', '>'))) return FALSE; - sym->result = str_printf(sym, "%s%s", name, args); - return TRUE; } /******************************************************************* @@ -1460,10 +1493,8 @@ /* Function/Data type and access level */ if (*sym->current >= '0' && *sym->current <= '9') ret = handle_data(sym); - else if (*sym->current >= 'A' && *sym->current <= 'Z') + else if ((*sym->current >= 'A' && *sym->current <= 'Z') || *sym->current == '$') ret = handle_method(sym, do_after == 3); - else if (*sym->current == '$') - ret = handle_template(sym); else ret = FALSE; done: if (ret) assert(sym->result);

10 years, 8 months

[cwittich] 62966: [fastfat] fix typo in comment

by cwittich＠svn.reactos.org

Author: cwittich Date: Fri Apr 25 17:09:37 2014 New Revision: 62966 URL: http://svn.reactos.org/svn/reactos?rev=62966&view=rev Log: [fastfat] fix typo in comment Modified: trunk/reactos/drivers/filesystems/fastfat/create.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Fri Apr 25 17:09:37 2014 @@ -550,7 +550,7 @@ if (!NT_SUCCESS(Status) && ParentFcb == NULL) { - DPRINT1("VfatOpenFile faild for '%wZ', status %x\n", &PathNameU, Status); + DPRINT1("VfatOpenFile failed for '%wZ', status %x\n", &PathNameU, Status); return Status; }

10 years, 8 months

[tfaber] 62965: [WIN32K] - Avoid assigning a nonvolatile variable inside a try block. Spotted by Timo. CORE-8094

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Apr 25 12:34:17 2014 New Revision: 62965 URL: http://svn.reactos.org/svn/reactos?rev=62965&view=rev Log: [WIN32K] - Avoid assigning a nonvolatile variable inside a try block. Spotted by Timo. CORE-8094 Modified: trunk/reactos/win32ss/user/ntuser/winsta.c Modified: trunk/reactos/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] Fri Apr 25 12:34:17 2014 @@ -736,6 +736,9 @@ } Exit: + if (Status == STATUS_SUCCESS && nLength < nDataSize) + Status = STATUS_BUFFER_TOO_SMALL; + _SEH2_TRY { if (nLengthNeeded) @@ -745,10 +748,7 @@ if (Status == STATUS_SUCCESS) { TRACE("Trying to copy data to caller (len = %lu, len needed = %lu)\n", nLength, nDataSize); - if (nLength >= nDataSize) - RtlCopyMemory(pvInformation, pvData, nDataSize); - else - Status = STATUS_BUFFER_TOO_SMALL; + RtlCopyMemory(pvInformation, pvData, nDataSize); } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)

10 years, 8 months

[tfaber] 62964: [USER32_APITEST] - Add parameter checks for GetUserObjectInformationW CORE-8094

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Apr 25 11:24:41 2014 New Revision: 62964 URL: http://svn.reactos.org/svn/reactos?rev=62964&view=rev Log: [USER32_APITEST] - Add parameter checks for GetUserObjectInformationW CORE-8094 Added: trunk/rostests/apitests/user32/GetUserObjectInformation.c (with props) Modified: trunk/rostests/apitests/user32/CMakeLists.txt trunk/rostests/apitests/user32/testlist.c Modified: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeList… ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Fri Apr 25 11:24:41 2014 @@ -12,6 +12,7 @@ GetKeyState.c GetPeekMessage.c GetSystemMetrics.c + GetUserObjectInformation.c InitializeLpkHooks.c LoadImage.c LookupIconIdFromDirectoryEx.c Added: trunk/rostests/apitests/user32/GetUserObjectInformation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/GetUserOb… ============================================================================== --- trunk/rostests/apitests/user32/GetUserObjectInformation.c (added) +++ trunk/rostests/apitests/user32/GetUserObjectInformation.c [iso-8859-1] Fri Apr 25 11:24:41 2014 @@ -0,0 +1,185 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for GetUserObjectInformation + * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <apitest.h> +#include <winuser.h> +#include <ndk/mmfuncs.h> +#include <ndk/pstypes.h> + +static +BOOLEAN +CheckBuffer( + PVOID Buffer, + SIZE_T Size, + UCHAR Value) +{ + PUCHAR Array = Buffer; + SIZE_T i; + + for (i = 0; i < Size; i++) + if (Array[i] != Value) + { + trace("Expected %x, found %x at offset %lu\n", Value, Array[i], (ULONG)i); + return FALSE; + } + return TRUE; +} + +static +PVOID +AllocateGuarded( + SIZE_T SizeRequested) +{ + NTSTATUS Status; + SIZE_T Size = PAGE_ROUND_UP(SizeRequested + PAGE_SIZE); + PVOID VirtualMemory = NULL; + PCHAR StartOfBuffer; + + Status = NtAllocateVirtualMemory(NtCurrentProcess(), &VirtualMemory, 0, &Size, MEM_RESERVE, PAGE_NOACCESS); + + if (!NT_SUCCESS(Status)) + return NULL; + + Size -= PAGE_SIZE; + if (Size) + { + Status = NtAllocateVirtualMemory(NtCurrentProcess(), &VirtualMemory, 0, &Size, MEM_COMMIT, PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + Size = 0; + Status = NtFreeVirtualMemory(NtCurrentProcess(), &VirtualMemory, &Size, MEM_RELEASE); + ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); + return NULL; + } + } + + StartOfBuffer = VirtualMemory; + StartOfBuffer += Size - SizeRequested; + + return StartOfBuffer; +} + +static +VOID +FreeGuarded( + PVOID Pointer) +{ + NTSTATUS Status; + PVOID VirtualMemory = (PVOID)PAGE_ROUND_DOWN((SIZE_T)Pointer); + SIZE_T Size = 0; + + Status = NtFreeVirtualMemory(NtCurrentProcess(), &VirtualMemory, &Size, MEM_RELEASE); + ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); +} + +#define NOTSET 1234 + +#define TestUserObjectInfo(Handle, Index, Buffer, Length, Ret, Error, LengthNeeded) do \ + { \ + DWORD _LengthNeeded = NOTSET; \ + DECLSPEC_ALIGN(16) CHAR _LengthBuffer[2 * sizeof(DWORD)]; \ + DWORD _Error; \ + BOOL _Ret; \ + \ + SetLastError(0xdeadbeef); \ + _Ret = GetUserObjectInformationW(Handle, Index, Buffer, Length, NULL); \ + _Error = GetLastError(); \ + ok(_Ret == (Ret), "Ret = %d\n", _Ret); \ + ok(_Error == (Error), "Error = %lu\n", _Error); \ + \ + SetLastError(0xdeadbeef); \ + _Ret = GetUserObjectInformationW(Handle, Index, Buffer, Length, &_LengthNeeded);\ + _Error = GetLastError(); \ + ok(_Ret == (Ret), "Ret = %d\n", _Ret); \ + ok(_Error == (Error), "Error = %lu\n", _Error); \ + ok(_LengthNeeded == (LengthNeeded), "LengthNeeded = %lu\n", _LengthNeeded); \ + \ + SetLastError(0xdeadbeef); \ + *(PDWORD)&_LengthBuffer[1] = NOTSET; \ + _Ret = GetUserObjectInformationW(Handle, Index, Buffer, Length, \ + (PDWORD)&_LengthBuffer[1]); \ + _Error = GetLastError(); \ + ok(_Ret == (Ret), "Ret = %d\n", _Ret); \ + ok(_Error == (Error), "Error = %lu\n", _Error); \ + _LengthNeeded = *(PDWORD)&_LengthBuffer[1]; \ + ok(_LengthNeeded == (LengthNeeded), "LengthNeeded = %lu\n", _LengthNeeded); \ + \ + SetLastError(0xdeadbeef); \ + _Ret = GetUserObjectInformationW(Handle, Index, Buffer, Length, (PVOID)-4); \ + _Error = GetLastError(); \ + ok(_Ret == FALSE, "Ret = %d\n", _Ret); \ + ok(_Error == ERROR_NOACCESS, "Error = %lu\n", _Error); \ + } while (0) + +START_TEST(GetUserObjectInformation) +{ + USEROBJECTFLAGS UserObjectFlags; + PWCHAR Buffer; + ULONG BufferSize = 64 * sizeof(WCHAR); + HDESK Desktop; + BOOLEAN Check; + + Buffer = AllocateGuarded(BufferSize); + + TestUserObjectInfo(NULL, 5, NULL, 0, FALSE, ERROR_INVALID_HANDLE, 0); + TestUserObjectInfo(NULL, UOI_FLAGS, NULL, 0, FALSE, ERROR_INVALID_HANDLE, 0); + TestUserObjectInfo(NULL, UOI_FLAGS, (PVOID)1, 0, FALSE, ERROR_INVALID_HANDLE, 0); + TestUserObjectInfo(NULL, UOI_FLAGS, NULL, 1, FALSE, ERROR_NOACCESS, NOTSET); + TestUserObjectInfo(NULL, UOI_FLAGS, (PVOID)1, 1, FALSE, ERROR_NOACCESS, NOTSET); + TestUserObjectInfo(NULL, UOI_FLAGS, &UserObjectFlags, sizeof(UserObjectFlags), FALSE, ERROR_INVALID_HANDLE, 0); + + TestUserObjectInfo(NULL, UOI_TYPE, NULL, 0, FALSE, ERROR_INVALID_HANDLE, 0); + TestUserObjectInfo(NULL, UOI_TYPE, (PVOID)1, 0, FALSE, ERROR_INVALID_HANDLE, 0); + TestUserObjectInfo(NULL, UOI_TYPE, NULL, 1, FALSE, ERROR_NOACCESS, NOTSET); + TestUserObjectInfo(NULL, UOI_TYPE, (PVOID)1, 1, FALSE, ERROR_NOACCESS, NOTSET); + TestUserObjectInfo(NULL, UOI_TYPE, Buffer, BufferSize, FALSE, ERROR_INVALID_HANDLE, 0); + + Desktop = GetThreadDesktop(GetCurrentThreadId()); + if (!Desktop) + { + skip("Failed to get desktop handle\n"); + return; + } + + TestUserObjectInfo(Desktop, 5, NULL, 0, FALSE, ERROR_INVALID_PARAMETER, 0); + TestUserObjectInfo(Desktop, UOI_FLAGS, NULL, 0, FALSE, ERROR_INSUFFICIENT_BUFFER, sizeof(USEROBJECTFLAGS)); + TestUserObjectInfo(Desktop, UOI_FLAGS, (PVOID)1, 0, FALSE, ERROR_INSUFFICIENT_BUFFER, sizeof(USEROBJECTFLAGS)); + TestUserObjectInfo(Desktop, UOI_FLAGS, NULL, 1, FALSE, ERROR_NOACCESS, NOTSET); + TestUserObjectInfo(Desktop, UOI_FLAGS, (PVOID)1, 1, FALSE, ERROR_NOACCESS, NOTSET); + TestUserObjectInfo(Desktop, UOI_FLAGS, &UserObjectFlags, sizeof(UserObjectFlags), TRUE, 0xdeadbeef, sizeof(USEROBJECTFLAGS)); + + TestUserObjectInfo(Desktop, UOI_TYPE, NULL, 0, FALSE, ERROR_INSUFFICIENT_BUFFER, sizeof(L"Desktop")); + TestUserObjectInfo(Desktop, UOI_TYPE, (PVOID)1, 0, FALSE, ERROR_INSUFFICIENT_BUFFER, sizeof(L"Desktop")); + TestUserObjectInfo(Desktop, UOI_TYPE, NULL, 1, FALSE, ERROR_NOACCESS, NOTSET); + TestUserObjectInfo(Desktop, UOI_TYPE, (PVOID)1, 1, FALSE, ERROR_NOACCESS, NOTSET); + RtlFillMemory(Buffer, BufferSize, 0x55); + TestUserObjectInfo(Desktop, UOI_TYPE, Buffer, sizeof(L"Desktop") - 2, FALSE, ERROR_INSUFFICIENT_BUFFER, sizeof(L"Desktop")); + Check = CheckBuffer(Buffer, BufferSize, 0x55); + ok(Check == TRUE, "CheckBuffer failed\n"); + RtlFillMemory(Buffer, BufferSize, 0x55); + TestUserObjectInfo(Desktop, UOI_TYPE, Buffer, sizeof(L"Desktop") - 1, FALSE, ERROR_INSUFFICIENT_BUFFER, sizeof(L"Desktop")); + Check = CheckBuffer(Buffer, BufferSize, 0x55); + ok(Check == TRUE, "CheckBuffer failed\n"); + RtlFillMemory(Buffer, BufferSize, 0x55); + TestUserObjectInfo(Desktop, UOI_TYPE, Buffer, sizeof(L"Desktop"), TRUE, 0xdeadbeef, sizeof(L"Desktop")); + ok(wcscmp(Buffer, L"Desktop") == 0, "Buffer '%ls'\n", Buffer); + Check = CheckBuffer(Buffer + sizeof("Desktop"), BufferSize - sizeof(L"Desktop"), 0x55); + ok(Check == TRUE, "CheckBuffer failed\n"); + RtlFillMemory(Buffer, BufferSize, 0x55); + TestUserObjectInfo(Desktop, UOI_TYPE, Buffer, BufferSize, TRUE, 0xdeadbeef, sizeof(L"Desktop")); + ok(wcscmp(Buffer, L"Desktop") == 0, "Buffer '%ls'\n", Buffer); + Check = CheckBuffer(Buffer + sizeof("Desktop"), BufferSize - sizeof(L"Desktop"), 0x55); + ok(Check == TRUE, "CheckBuffer failed\n"); + + FreeGuarded(Buffer); + + BufferSize = sizeof(L"Desktop"); + Buffer = AllocateGuarded(BufferSize); + TestUserObjectInfo(Desktop, UOI_TYPE, Buffer, BufferSize, TRUE, 0xdeadbeef, sizeof(L"Desktop")); + TestUserObjectInfo(Desktop, UOI_TYPE, Buffer, BufferSize + 1, FALSE, ERROR_NOACCESS, NOTSET); + FreeGuarded(Buffer); +} Propchange: trunk/rostests/apitests/user32/GetUserObjectInformation.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/testlist.… ============================================================================== --- trunk/rostests/apitests/user32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/testlist.c [iso-8859-1] Fri Apr 25 11:24:41 2014 @@ -14,6 +14,7 @@ extern void func_GetKeyState(void); extern void func_GetPeekMessage(void); extern void func_GetSystemMetrics(void); +extern void func_GetUserObjectInformation(void); extern void func_InitializeLpkHooks(void); extern void func_LoadImage(void); extern void func_LookupIconIdFromDirectoryEx(void); @@ -40,6 +41,7 @@ { "GetKeyState", func_GetKeyState }, { "GetPeekMessage", func_GetPeekMessage }, { "GetSystemMetrics", func_GetSystemMetrics }, + { "GetUserObjectInformation", func_GetUserObjectInformation }, { "InitializeLpkHooks", func_InitializeLpkHooks }, { "LoadImage", func_LoadImage }, { "LookupIconIdFromDirectoryEx", func_LookupIconIdFromDirectoryEx },

10 years, 8 months

[tfaber] 62963: [WIN32K] - Correctly treat nLengthNeeded as optional in NtUserGetObjectInformation, and access it only within SEH. Fixes crash in user32_winetest:winstation CORE-8094

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Apr 25 11:23:16 2014 New Revision: 62963 URL: http://svn.reactos.org/svn/reactos?rev=62963&view=rev Log: [WIN32K] - Correctly treat nLengthNeeded as optional in NtUserGetObjectInformation, and access it only within SEH. Fixes crash in user32_winetest:winstation CORE-8094 Modified: trunk/reactos/win32ss/user/ntuser/winsta.c Modified: trunk/reactos/win32ss/user/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winsta… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winsta.c [iso-8859-1] Fri Apr 25 11:23:16 2014 @@ -641,6 +641,19 @@ PVOID pvData = NULL; DWORD nDataSize = 0; + _SEH2_TRY + { + if (nLengthNeeded) + ProbeForWrite(nLengthNeeded, sizeof(*nLengthNeeded), 1); + ProbeForWrite(pvInformation, nLength, 1); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + return FALSE; + } + _SEH2_END; + /* try windowstation */ TRACE("Trying to open window station %p\n", hObject); Status = ObReferenceObjectByHandle( @@ -665,8 +678,7 @@ if (!NT_SUCCESS(Status)) { ERR("Failed: 0x%x\n", Status); - SetLastNtError(Status); - return FALSE; + goto Exit; } TRACE("WinSta or Desktop opened!!\n"); @@ -723,16 +735,27 @@ break; } - /* try to copy data to caller */ - if (Status == STATUS_SUCCESS) - { - TRACE("Trying to copy data to caller (len = %lu, len needed = %lu)\n", nLength, nDataSize); - *nLengthNeeded = nDataSize; - if (nLength >= nDataSize) - Status = MmCopyToCaller(pvInformation, pvData, nDataSize); - else - Status = STATUS_BUFFER_TOO_SMALL; - } +Exit: + _SEH2_TRY + { + if (nLengthNeeded) + *nLengthNeeded = nDataSize; + + /* try to copy data to caller */ + if (Status == STATUS_SUCCESS) + { + TRACE("Trying to copy data to caller (len = %lu, len needed = %lu)\n", nLength, nDataSize); + if (nLength >= nDataSize) + RtlCopyMemory(pvInformation, pvData, nDataSize); + else + Status = STATUS_BUFFER_TOO_SMALL; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; /* release objects */ if (WinStaObject != NULL)

10 years, 8 months

[dquintana] 62962: [RSHELL] * Fix compiling with the system classes selected instead of the custom ones. CORE-7586

by dquintana＠svn.reactos.org

Author: dquintana Date: Fri Apr 25 10:45:28 2014 New Revision: 62962 URL: http://svn.reactos.org/svn/reactos?rev=62962&view=rev Log: [RSHELL] * Fix compiling with the system classes selected instead of the custom ones. CORE-7586 Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp branches/shell-experiments/base/shell/rshell/CMenuSite.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 Apr 25 10:45:28 2014 @@ -35,6 +35,7 @@ extern "C" HRESULT WINAPI CMenuBand_Constructor(REFIID riid, LPVOID *ppv) { + HRESULT hr; #if USE_SYSTEM_MENUBAND hr = CoCreateInstance(CLSID_MenuBand, NULL, @@ -48,13 +49,13 @@ if (!site) return E_OUTOFMEMORY; - HRESULT hr = site->QueryInterface(riid, ppv); + hr = site->QueryInterface(riid, ppv); if (FAILED_UNEXPECTEDLY(hr)) site->Release(); +#endif return hr; -#endif } CMenuBand::CMenuBand() : @@ -308,6 +309,7 @@ return S_OK; } + HRESULT STDMETHODCALLTYPE CMenuBand::GetBandInfo( DWORD dwBandID, DWORD dwViewMode, @@ -337,20 +339,20 @@ if (m_dwFlags & SMINIT_VERTICAL) { - pdbi->ptMinSize.x = max(minStatic.cx, minStatic.cx) + 20; - pdbi->ptMinSize.y = minStatic.cy + minStatic.cy; + pdbi->ptMinSize.x = max(minStatic.cx, minShlFld.cx) + 20; + pdbi->ptMinSize.y = minStatic.cy + minShlFld.cy; pdbi->ptMaxSize.x = max(maxStatic.cx, maxShlFld.cx) + 20; pdbi->ptMaxSize.y = maxStatic.cy + maxShlFld.cy; pdbi->dwModeFlags = DBIMF_VARIABLEHEIGHT; } else { - pdbi->ptMinSize.x = minStatic.cx + minStatic.cx; - pdbi->ptMinSize.y = max(minStatic.cy, minStatic.cy); + pdbi->ptMinSize.x = minStatic.cx + minShlFld.cx; + pdbi->ptMinSize.y = max(minStatic.cy, minShlFld.cy); pdbi->ptMaxSize.x = maxStatic.cx + maxShlFld.cx; pdbi->ptMaxSize.y = max(maxStatic.cy, maxShlFld.cy); } - pdbi->ptIntegral.x = max(intStatic.cx, intStatic.cx); + pdbi->ptIntegral.x = max(intStatic.cx, intShlFld.cx); pdbi->ptIntegral.y = max(intStatic.cy, intShlFld.cy); pdbi->ptActual = pdbi->ptMinSize; @@ -469,7 +471,7 @@ { _KeyboardItemChange(VK_HOME); } - else if (nCmdexecopt == -2) // last + else // last { _KeyboardItemChange(VK_END); } Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Fri Apr 25 10:45:28 2014 @@ -30,6 +30,7 @@ extern "C" HRESULT WINAPI CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv) { + HRESULT hr; #if USE_SYSTEM_MENUDESKBAR hr = CoCreateInstance(CLSID_MenuDeskBar, NULL, @@ -43,13 +44,13 @@ if (!deskbar) return E_OUTOFMEMORY; - HRESULT hr = deskbar->QueryInterface(riid, ppv); + hr = deskbar->QueryInterface(riid, ppv); if (FAILED_UNEXPECTEDLY(hr)) deskbar->Release(); +#endif return hr; -#endif } CMenuDeskBar::CMenuDeskBar() : Modified: branches/shell-experiments/base/shell/rshell/CMenuSite.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuSite.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuSite.cpp [iso-8859-1] Fri Apr 25 10:45:28 2014 @@ -28,6 +28,7 @@ extern "C" HRESULT WINAPI CMenuSite_Constructor(REFIID riid, LPVOID *ppv) { + HRESULT hr; #if USE_SYSTEM_MENUSITE hr = CoCreateInstance(CLSID_MenuBandSite, NULL, @@ -41,13 +42,13 @@ if (!site) return E_OUTOFMEMORY; - HRESULT hr = site->QueryInterface(riid, ppv); + hr = site->QueryInterface(riid, ppv); if (FAILED_UNEXPECTEDLY(hr)) site->Release(); +#endif return hr; -#endif } CMenuSite::CMenuSite() :

10 years, 8 months

[dquintana] 62961: [BROWSEUI] * Reenable the brand box on file browser windows. * Fix an invalid usage of a null HWND. * Implement size calculation of the standard toolbar. CORE-7330

by dquintana＠svn.reactos.org

Author: dquintana Date: Fri Apr 25 10:44:36 2014 New Revision: 62961 URL: http://svn.reactos.org/svn/reactos?rev=62961&view=rev Log: [BROWSEUI] * Reenable the brand box on file browser windows. * Fix an invalid usage of a null HWND. * Implement size calculation of the standard toolbar. CORE-7330 Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp branches/shell-experiments/dll/win32/browseui/internettoolbar.h branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp branches/shell-experiments/dll/win32/browseui/toolsband.cpp 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 Apr 25 10:44:36 2014 @@ -817,7 +817,7 @@ HRESULT STDMETHODCALLTYPE CInternetToolbar::InitNew() { CComPtr<IShellMenu> menuBar; - //CComPtr<IUnknown> logoBar; + CComPtr<IUnknown> logoBar; CComPtr<IUnknown> toolsBar; CComPtr<IUnknown> navigationBar; CComPtr<IOleWindow> menuOleWindow; @@ -825,6 +825,7 @@ CComPtr<IOleWindow> navigationOleWindow; HRESULT hResult; + /* Create and attach the menubar to the rebar */ hResult = CreateMenuBar(&menuBar); if (FAILED(hResult)) return hResult; @@ -835,15 +836,15 @@ hResult = menuOleWindow->GetWindow(&fMenuBandWindow); fMenuBar.Attach(menuBar.Detach()); // transfer the ref count - /* FIXME + /* Create and attach the brand/logo to the rebar */ hResult = CreateBrandBand(&logoBar); if (FAILED(hResult)) return hResult; AddDockItem(logoBar, ITBBID_BRANDBAND, CDockSite::ITF_NOGRIPPER | CDockSite::ITF_NOTITLE | CDockSite::ITF_FIXEDSIZE); fLogoBar.Attach(logoBar.Detach()); // transfer the ref count - */ - + + /* Create and attach the standard toolbar to the rebar */ hResult = CreateToolsBar(&toolsBar); if (FAILED(hResult)) return hResult; @@ -856,6 +857,7 @@ if (FAILED(hResult)) return hResult; + /* Create and attach the address/navigation toolbar to the rebar */ hResult = CreateAddressBand(&navigationBar); if (FAILED(hResult)) return hResult; Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.h [iso-8859-1] Fri Apr 25 10:44:36 2014 @@ -87,7 +87,7 @@ CComPtr<IShellMenu> fMenuBar; // the menu rebar HWND fMenuBandWindow; HWND fNavigationWindow; - //CComPtr<IUnknown> fLogoBar; // the reactos logo + CComPtr<IUnknown> fLogoBar; // the reactos logo CComPtr<IUnknown> fControlsBar; // navigation controls CComPtr<IUnknown> fNavigationBar; // address bar CComObject<CMenuCallback> fMenuCallback; 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 Apr 25 10:44:36 2014 @@ -1305,11 +1305,10 @@ RECT statusRect; RECT toolbarRect; int x; - HRESULT hResult; GetClientRect(&clientRect); - if (fStatusBarVisible) + if (fStatusBarVisible && fStatusBar) { ::GetWindowRect(fStatusBar, &statusRect); ::SetWindowPos(fStatusBar, NULL, clientRect.left, clientRect.bottom - (statusRect.bottom - statusRect.top), @@ -1320,14 +1319,9 @@ for (x = 0; x < 3; x++) { - CComPtr<IOleWindow> oleWindow; - if (fClientBars[x].hwnd == NULL && fClientBars[x].clientBar != NULL) { - hResult = fClientBars[x].clientBar->QueryInterface( - IID_IOleWindow, reinterpret_cast<void **>(&oleWindow)); - if (SUCCEEDED(hResult)) - hResult = oleWindow->GetWindow(&fClientBars[x].hwnd); + IUnknown_GetWindow(fClientBars[x].clientBar, &fClientBars[x].hwnd); } if (fClientBars[x].hwnd != NULL) { 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 Apr 25 10:44:36 2014 @@ -24,10 +24,9 @@ #include "precomp.h" -/* -TODO: - **Fix GetBandInfo to calculate size correctly -*/ +/* FIXME, I can't include windowsx because it conflicts with some #defines */ +#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) +#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) class CToolsBand : public CWindowImpl<CToolsBand, CWindow, CControlWinTraits>, @@ -108,25 +107,43 @@ HRESULT STDMETHODCALLTYPE CToolsBand::GetBandInfo(DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO* pdbi) { + RECT actualRect; + POINTL actualSize; + POINTL idealSize; + POINTL maxSize; + POINTL itemSize; + + ::GetWindowRect(m_hWnd, &actualRect); + actualSize.x = actualRect.right - actualRect.left; + actualSize.y = actualRect.bottom - actualRect.top; + + /* Obtain the ideal size, to be used as min and max */ + SendMessageW(m_hWnd, TB_AUTOSIZE, 0, 0); + SendMessageW(m_hWnd, TB_GETMAXSIZE, 0, reinterpret_cast<LPARAM>(&maxSize)); + + idealSize = maxSize; + SendMessageW(m_hWnd, TB_GETIDEALSIZE, FALSE, reinterpret_cast<LPARAM>(&idealSize)); + + /* Obtain the button size, to be used as the integral size */ + DWORD size = SendMessageW(m_hWnd, TB_GETBUTTONSIZE, 0, 0); + itemSize.x = GET_X_LPARAM(size); + itemSize.y = GET_Y_LPARAM(size); + if (pdbi->dwMask & DBIM_MINSIZE) { - pdbi->ptMinSize.x = 400; - pdbi->ptMinSize.y = 38; + pdbi->ptMinSize = idealSize; } if (pdbi->dwMask & DBIM_MAXSIZE) { - pdbi->ptMaxSize.x = 0; - pdbi->ptMaxSize.y = 0; + pdbi->ptMaxSize = maxSize; } if (pdbi->dwMask & DBIM_INTEGRAL) { - pdbi->ptIntegral.x = 0; - pdbi->ptIntegral.y = 0; + pdbi->ptIntegral = itemSize; } if (pdbi->dwMask & DBIM_ACTUAL) { - pdbi->ptActual.x = 400; - pdbi->ptActual.y = 38; + pdbi->ptActual = actualSize; } if (pdbi->dwMask & DBIM_TITLE) wcscpy(pdbi->wszTitle, L"");

10 years, 8 months

[pschweitzer] 62960: [KMTESTS:IO] Complete a bit more IoCreateFile tests, taking into account relatives. A side note (related to first commit - actually to these test as a whole): It's pretty unfor...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Apr 24 20:50:32 2014 New Revision: 62960 URL: http://svn.reactos.org/svn/reactos?rev=62960&view=rev Log: [KMTESTS:IO] Complete a bit more IoCreateFile tests, taking into account relatives. A side note (related to first commit - actually to these test as a whole): It's pretty unfortunate that they work (on my Windows 2K3). They just expose a totally different behavior than expected reading R. Nagar (pp 478 - 479). The experimental behavior also being different from behavior expected from IFS samples provided by MS. Perhaps some magic in the callpath between IopParseDevice return and IoCreateFile return? Modified: trunk/rostests/kmtests/ntos_io/IoCreateFile.c Modified: trunk/rostests/kmtests/ntos_io/IoCreateFile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_io/IoCreateF… ============================================================================== --- trunk/rostests/kmtests/ntos_io/IoCreateFile.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_io/IoCreateFile.c [iso-8859-1] Thu Apr 24 20:50:32 2014 @@ -23,8 +23,8 @@ NTSTATUS Status; IO_STATUS_BLOCK IoStatusBlock; OBJECT_ATTRIBUTES ObjectAttributes; - PFILE_OBJECT ParentFileObject, TargetFileObject; HANDLE ParentHandle, SystemRootHandle, TargetHandle; + PFILE_OBJECT ParentFileObject, TargetFileObject, SystemRootFileObject; UNREFERENCED_PARAMETER(Context); @@ -117,6 +117,7 @@ * CCB must be != NULL, otherwise it means open failed */ ok(ParentFileObject != TargetFileObject, "Diverted file object must be different\n"); + ok_eq_pointer(ParentFileObject->RelatedFileObject, NULL); ok_eq_pointer(ParentFileObject->FsContext, TargetFileObject->FsContext); ok(ParentFileObject->FsContext2 != 0x0, "Parent must be open!\n"); ok(ParentFileObject->FsContext2 != TargetFileObject->FsContext2, "Parent open must have its own context!\n"); @@ -184,6 +185,20 @@ ok(ParentFileObject->FsContext2 != 0x0, "Parent must be open!\n"); ok(ParentFileObject->FsContext2 != TargetFileObject->FsContext2, "Parent open must have its own context!\n"); ok_eq_long(RtlCompareUnicodeString(&ParentFileObject->FileName, &TargetFileObject->FileName, FALSE), 0); + Status = ObReferenceObjectByHandle(SystemRootHandle, + FILE_READ_DATA, + IoFileObjectType, + KernelMode, + (PVOID *)&SystemRootFileObject, + NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + if (Status == STATUS_SUCCESS) + { + ok_eq_pointer(ParentFileObject->RelatedFileObject, SystemRootFileObject); + ok(ParentFileObject->RelatedFileObject != TargetFileObject, "File objects must be different\n"); + ok(SystemRootFileObject != TargetFileObject, "File objects must be different\n"); + ObDereferenceObject(SystemRootFileObject); + } ObDereferenceObject(ParentFileObject); } ok_eq_long(IoStatusBlock.Information, FILE_EXISTS); @@ -233,6 +248,7 @@ if (Status == STATUS_SUCCESS) { ok(ParentFileObject != TargetFileObject, "Diverted file object must be different\n"); + ok_eq_pointer(ParentFileObject->RelatedFileObject, NULL); ok_eq_pointer(ParentFileObject->FsContext, TargetFileObject->FsContext); ok(ParentFileObject->FsContext2 != 0x0, "Parent must be open!\n"); ok(ParentFileObject->FsContext2 != TargetFileObject->FsContext2, "Parent open must have its own context!\n"); @@ -298,6 +314,20 @@ ok(ParentFileObject->FsContext2 != 0x0, "Parent must be open!\n"); ok(ParentFileObject->FsContext2 != TargetFileObject->FsContext2, "Parent open must have its own context!\n"); ok_eq_long(RtlCompareUnicodeString(&ParentFileObject->FileName, &TargetFileObject->FileName, FALSE), 0); + Status = ObReferenceObjectByHandle(SystemRootHandle, + FILE_READ_DATA, + IoFileObjectType, + KernelMode, + (PVOID *)&SystemRootFileObject, + NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + if (Status == STATUS_SUCCESS) + { + ok_eq_pointer(ParentFileObject->RelatedFileObject, SystemRootFileObject); + ok(ParentFileObject->RelatedFileObject != TargetFileObject, "File objects must be different\n"); + ok(SystemRootFileObject != TargetFileObject, "File objects must be different\n"); + ObDereferenceObject(SystemRootFileObject); + } ObDereferenceObject(ParentFileObject); } ok_eq_long(IoStatusBlock.Information, FILE_DOES_NOT_EXIST);

10 years, 8 months

[dquintana] 62959: [RSHELL] * Implement selecting the first/last item, and make the menu system choose to select the first item when opening a submenu with the keyboard.

by dquintana＠svn.reactos.org

Author: dquintana Date: Thu Apr 24 17:42:16 2014 New Revision: 62959 URL: http://svn.reactos.org/svn/reactos?rev=62959&view=rev Log: [RSHELL] * Implement selecting the first/last item, and make the menu system choose to select the first item when opening a submenu with the keyboard. Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuBand.h branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp branches/shell-experiments/base/shell/rshell/CMenuToolbars.h 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] Thu Apr 24 17:42:16 2014 @@ -461,6 +461,18 @@ } else if (nCmdID == 19) // popup-related { + return S_FALSE; + } + else if (nCmdID == 5) // select an item + { + if (nCmdexecopt == 0) // first + { + _KeyboardItemChange(VK_HOME); + } + else if (nCmdexecopt == -2) // last + { + _KeyboardItemChange(VK_END); + } return S_FALSE; } @@ -794,14 +806,14 @@ if (!tb) { // If no hot item was selected choose the appropriate toolbar - if (change == VK_UP) + if (change == VK_UP || change == VK_END) { if (m_staticToolbar) tb = m_staticToolbar; else tb = m_SFToolbar; } - else if (change == VK_DOWN) + else if (change == VK_DOWN || change == VK_HOME) { if (m_SFToolbar) tb = m_SFToolbar; @@ -882,7 +894,7 @@ return m_subMenuParent->OnSelect(MPOS_CANCELLEVEL); case MPOS_SELECTRIGHT: - if (m_hotBar && m_hotItem >= 0 && m_hotBar->PopupItem(m_hotItem) == S_OK) + if (m_hotBar && m_hotItem >= 0 && m_hotBar->PopupItem(m_hotItem, TRUE) == S_OK) return S_FALSE; if (m_parentBand) return m_parentBand->_MenuItemHotTrack(VK_RIGHT); @@ -895,6 +907,8 @@ return S_OK; return m_subMenuParent->OnSelect(changeType); } + + return S_OK; } HRESULT CMenuBand::_CancelCurrentPopup() @@ -906,7 +920,7 @@ return hr; } -HRESULT CMenuBand::_OnPopupSubMenu(IShellMenu * childShellMenu, POINTL * pAt, RECTL * pExclude) +HRESULT CMenuBand::_OnPopupSubMenu(IShellMenu * childShellMenu, POINTL * pAt, RECTL * pExclude, BOOL keyInitiated) { HRESULT hr = 0; IBandSite* pBandSite; @@ -942,7 +956,12 @@ else IUnknown_SetSite(popup, m_site); - popup->Popup(pAt, pExclude, MPPF_RIGHT); + DWORD flags = MPPF_RIGHT; + + if (keyInitiated && m_dwFlags & SMINIT_VERTICAL) + flags |= MPPF_INITIALSELECT; + + popup->Popup(pAt, pExclude, flags); return S_OK; } Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.h [iso-8859-1] Thu Apr 24 17:42:16 2014 @@ -182,7 +182,7 @@ HRESULT _ChangePopupItem(CMenuToolbarBase * tb, INT id); HRESULT _MenuItemHotTrack(DWORD changeType); HRESULT _CancelCurrentPopup(); - HRESULT _OnPopupSubMenu(IShellMenu * childShellMenu, POINTL * pAt, RECTL * pExclude); + HRESULT _OnPopupSubMenu(IShellMenu * childShellMenu, POINTL * pAt, RECTL * pExclude, BOOL mouseInitiated); HRESULT _DisableMouseTrack(BOOL bDisable); HRESULT _SetChildBand(CMenuBand * child); HRESULT _SetParentBand(CMenuBand * parent); Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Thu Apr 24 17:42:16 2014 @@ -370,6 +370,13 @@ UIActivateIO(TRUE, NULL); + if (dwFlags & (MPPF_INITIALSELECT | MPPF_FINALSELECT)) + { + const int CMD_SELECT = 5; + int CMD_SELECT_OPTS = dwFlags & MPPF_INITIALSELECT ? 0 : -2; + IUnknown_QueryServiceExec(m_Client, SID_SMenuBandChild, &CLSID_MenuBand, CMD_SELECT, CMD_SELECT_OPTS, NULL, NULL); + } + return S_OK; } Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Thu Apr 24 17:42:16 2014 @@ -558,7 +558,7 @@ return S_FALSE; // Returns S_FALSE if the current item did not show a submenu - HRESULT hr = PopupItem(m_hotItem); + HRESULT hr = PopupItem(m_hotItem, FALSE); if (hr != S_FALSE) return hr; @@ -613,7 +613,7 @@ if (m_isTrackingPopup && !(m_initFlags & SMINIT_VERTICAL)) { // If the menubar has an open submenu, switch to the new item's submenu immediately - PopupItem(m_hotItem); + PopupItem(m_hotItem, FALSE); } else if (dwFlags & HICF_MOUSE) { @@ -709,7 +709,7 @@ return m_menuBand->_ChangeHotItem(this, btn.idCommand, mouse ? HICF_MOUSE : 0); } -HRESULT CMenuToolbarBase::PopupSubMenu(UINT iItem, UINT index, IShellMenu* childShellMenu) +HRESULT CMenuToolbarBase::PopupSubMenu(UINT iItem, UINT index, IShellMenu* childShellMenu, BOOL keyInitiated) { // Calculate the submenu position and exclude area RECT rc = { 0 }; @@ -743,7 +743,7 @@ m_isTrackingPopup = TRUE; m_menuBand->_ChangePopupItem(this, iItem); - m_menuBand->_OnPopupSubMenu(childShellMenu, &pt, &rcl); + m_menuBand->_OnPopupSubMenu(childShellMenu, &pt, &rcl, keyInitiated); return S_OK; } @@ -816,7 +816,7 @@ INT iItem = (INT)wParam; - if (PopupItem(iItem) == S_OK) + if (PopupItem(iItem, FALSE) == S_OK) { TRACE("PopupItem returned S_OK\n"); return S_FALSE; @@ -1056,7 +1056,7 @@ return m_menuBand->_CancelCurrentPopup(); } -HRESULT CMenuToolbarBase::PopupItem(INT iItem) +HRESULT CMenuToolbarBase::PopupItem(INT iItem, BOOL keyInitiated) { INT index; DWORD_PTR dwData; @@ -1086,7 +1086,7 @@ m_menuBand->_ChangeHotItem(this, iItem, 0); } - return InternalPopupItem(iItem, index, dwData); + return InternalPopupItem(iItem, index, dwData, keyInitiated); } CMenuStaticToolbar::CMenuStaticToolbar(CMenuBand *menuBand) : @@ -1209,7 +1209,7 @@ return m_menuBand->_CallCBWithItemId(iItem, SMC_EXEC, 0, 0); } -HRESULT CMenuStaticToolbar::InternalPopupItem(INT iItem, INT index, DWORD_PTR dwData) +HRESULT CMenuStaticToolbar::InternalPopupItem(INT iItem, INT index, DWORD_PTR dwData, BOOL keyInitiated) { SMINFO * nfo = reinterpret_cast<SMINFO*>(dwData); if (!nfo) @@ -1226,7 +1226,7 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; - return PopupSubMenu(iItem, index, shellMenu); + return PopupSubMenu(iItem, index, shellMenu, keyInitiated); } } @@ -1376,7 +1376,7 @@ return m_menuBand->_CallCBWithItemPidl(reinterpret_cast<LPITEMIDLIST>(data), SMC_SFEXEC, 0, 0); } -HRESULT CMenuSFToolbar::InternalPopupItem(INT iItem, INT index, DWORD_PTR dwData) +HRESULT CMenuSFToolbar::InternalPopupItem(INT iItem, INT index, DWORD_PTR dwData, BOOL keyInitiated) { HRESULT hr; UINT uId; @@ -1410,7 +1410,7 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; - return PopupSubMenu(iItem, index, shellMenu); + return PopupSubMenu(iItem, index, shellMenu, keyInitiated); } HRESULT CMenuSFToolbar::InternalHasSubMenu(INT iItem, INT index, DWORD_PTR dwData) Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.h [iso-8859-1] Thu Apr 24 17:42:16 2014 @@ -71,7 +71,7 @@ HRESULT ChangeHotItem(CMenuToolbarBase * toolbar, INT item, DWORD dwFlags); HRESULT ChangePopupItem(CMenuToolbarBase * toolbar, INT item); - HRESULT PopupSubMenu(UINT itemId, UINT index, IShellMenu* childShellMenu); + HRESULT PopupSubMenu(UINT itemId, UINT index, IShellMenu* childShellMenu, BOOL keyInitiated); HRESULT PopupSubMenu(UINT itemId, UINT index, HMENU menu); HRESULT TrackContextMenu(IContextMenu* contextMenu, POINT pt); @@ -92,7 +92,7 @@ virtual HRESULT FillToolbar(BOOL clearFirst=FALSE) = 0; HRESULT CancelCurrentPopup(); - HRESULT PopupItem(INT iItem); + HRESULT PopupItem(INT iItem, BOOL keyInitiated); HRESULT GetDataFromId(INT iItem, INT* pIndex, DWORD_PTR* pData); HRESULT KillPopupTimer(); @@ -102,7 +102,7 @@ virtual HRESULT InternalGetTooltip(INT iItem, INT index, DWORD_PTR dwData, LPWSTR pszText, INT cchTextMax) = 0; virtual HRESULT InternalExecuteItem(INT iItem, INT index, DWORD_PTR dwData) = 0; - virtual HRESULT InternalPopupItem(INT iItem, INT index, DWORD_PTR dwData) = 0; + virtual HRESULT InternalPopupItem(INT iItem, INT index, DWORD_PTR dwData, BOOL keyInitiated) = 0; virtual HRESULT InternalHasSubMenu(INT iItem, INT index, DWORD_PTR dwData) = 0; virtual HRESULT InternalContextMenu(INT iItem, INT index, DWORD_PTR dwData, POINT pt) = 0; @@ -144,7 +144,7 @@ virtual HRESULT InternalGetTooltip(INT iItem, INT index, DWORD_PTR dwData, LPWSTR pszText, INT cchTextMax); virtual HRESULT InternalExecuteItem(INT iItem, INT index, DWORD_PTR dwData); - virtual HRESULT InternalPopupItem(INT iItem, INT index, DWORD_PTR dwData); + virtual HRESULT InternalPopupItem(INT iItem, INT index, DWORD_PTR dwData, BOOL keyInitiated); virtual HRESULT InternalHasSubMenu(INT iItem, INT index, DWORD_PTR dwData); virtual HRESULT InternalContextMenu(INT iItem, INT index, DWORD_PTR dwData, POINT pt); }; @@ -171,7 +171,7 @@ virtual HRESULT InternalGetTooltip(INT iItem, INT index, DWORD_PTR dwData, LPWSTR pszText, INT cchTextMax); virtual HRESULT InternalExecuteItem(INT iItem, INT index, DWORD_PTR dwData); - virtual HRESULT InternalPopupItem(INT iItem, INT index, DWORD_PTR dwData); + virtual HRESULT InternalPopupItem(INT iItem, INT index, DWORD_PTR dwData, BOOL keyInitiated); virtual HRESULT InternalHasSubMenu(INT iItem, INT index, DWORD_PTR dwData); virtual HRESULT InternalContextMenu(INT iItem, INT index, DWORD_PTR dwData, POINT pt); };

10 years, 8 months

← Newer
1
...
10
11
12
13
14
15
16
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2014