Ros-diffs March 2015

ros-diffs@reactos.org

18 participants
496 discussions

[akhaldi] 66623: [RTL] Partly sync actctx.c with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Mar 9 18:08:15 2015 New Revision: 66623 URL: http://svn.reactos.org/svn/reactos?rev=66623&view=rev Log: [RTL] Partly sync actctx.c with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/lib/rtl/actctx.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=66623… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Mon Mar 9 18:08:15 2015 @@ -12,7 +12,7 @@ * Samuel Serapión */ -/* Based on Wine 1.7.17 */ +/* Based on Wine Staging 1.7.37 */ #include <rtl.h> @@ -78,6 +78,7 @@ WCHAR *type; struct assembly_version version; BOOL optional; + BOOL delayed; }; struct strsection_header @@ -582,13 +583,13 @@ static const WCHAR dependentAssemblyW[] = {'d','e','p','e','n','d','e','n','t','A','s','s','e','m','b','l','y',0}; static const WCHAR descriptionW[] = {'d','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR fileW[] = {'f','i','l','e',0}; +static const WCHAR hashW[] = {'h','a','s','h',0}; static const WCHAR noInheritW[] = {'n','o','I','n','h','e','r','i','t',0}; static const WCHAR noInheritableW[] = {'n','o','I','n','h','e','r','i','t','a','b','l','e',0}; static const WCHAR typelibW[] = {'t','y','p','e','l','i','b',0}; static const WCHAR windowClassW[] = {'w','i','n','d','o','w','C','l','a','s','s',0}; static const WCHAR clsidW[] = {'c','l','s','i','d',0}; -static const WCHAR hashW[] = {'h','a','s','h',0}; static const WCHAR hashalgW[] = {'h','a','s','h','a','l','g',0}; static const WCHAR helpdirW[] = {'h','e','l','p','d','i','r',0}; static const WCHAR iidW[] = {'i','i','d',0}; @@ -684,6 +685,7 @@ static const WCHAR g_xmlW[] = {'?','x','m','l',0}; static const WCHAR manifestv1W[] = {'u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','a','s','m','.','v','1',0}; +static const WCHAR manifestv2W[] = {'u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','a','s','m','.','v','2',0}; static const WCHAR manifestv3W[] = {'u','r','n',':','s','c','h','e','m','a','s','-','m','i','c','r','o','s','o','f','t','-','c','o','m',':','a','s','m','.','v','3',0}; static const WCHAR dotManifestW[] = {'.','m','a','n','i','f','e','s','t',0}; @@ -879,6 +881,7 @@ RtlFreeHeap(RtlGetProcessHeap(), 0, entity->u.ifaceps.base); RtlFreeHeap(RtlGetProcessHeap(), 0, entity->u.ifaceps.ps32); RtlFreeHeap(RtlGetProcessHeap(), 0, entity->u.ifaceps.name); + RtlFreeHeap(RtlGetProcessHeap(), 0, entity->u.ifaceps.tlib); break; case ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION: RtlFreeHeap(RtlGetProcessHeap(), 0, entity->u.typelib.tlbid); @@ -1060,6 +1063,7 @@ append_string( ret, versionW2, version ); return ret; } + static ACTIVATION_CONTEXT *check_actctx( HANDLE h ) { ACTIVATION_CONTEXT *ret = NULL, *actctx = h; @@ -1114,6 +1118,14 @@ RtlFreeHeap( RtlGetProcessHeap(), 0, actctx->config.info ); RtlFreeHeap( RtlGetProcessHeap(), 0, actctx->appdir.info ); RtlFreeHeap( RtlGetProcessHeap(), 0, actctx->assemblies ); + RtlFreeHeap( RtlGetProcessHeap(), 0, actctx->dllredirect_section ); + RtlFreeHeap( RtlGetProcessHeap(), 0, actctx->wndclass_section ); + RtlFreeHeap( RtlGetProcessHeap(), 0, actctx->tlib_section ); + RtlFreeHeap( RtlGetProcessHeap(), 0, actctx->comserver_section ); + RtlFreeHeap( RtlGetProcessHeap(), 0, actctx->ifaceps_section ); + RtlFreeHeap( RtlGetProcessHeap(), 0, actctx->clrsurrogate_section ); + RtlFreeHeap( RtlGetProcessHeap(), 0, actctx->progid_section ); + pActual = CONTAINING_RECORD(actctx, ACTIVATION_CONTEXT_WRAPPED, ActivationContext); pActual->MagicMarker = 0; RtlFreeHeap(RtlGetProcessHeap(), 0, pActual); @@ -1891,16 +1903,26 @@ static BOOL parse_description_elem(xmlbuf_t* xmlbuf) { - xmlstr_t elem, content; - UNICODE_STRING elemU; - BOOL end = FALSE, ret = TRUE; - - if (!parse_expect_no_attr(xmlbuf, &end) || end || - !parse_text_content(xmlbuf, &content)) + xmlstr_t elem, content, attr_name, attr_value; + BOOL end = FALSE, ret = TRUE, error = FALSE; + + UNICODE_STRING elem1U, elem2U; + + while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + { + elem1U = xmlstr2unicode(&attr_name); + elem2U = xmlstr2unicode(&attr_value); + DPRINT1("unknown attr %s=%s\n", &elem1U, &elem2U); + } + + if (error) return FALSE; + if (end) return TRUE; + + if (!parse_text_content(xmlbuf, &content)) return FALSE; - elemU = xmlstr2unicode(&content); - DPRINT("Got description %wZ\n", &elemU); + elem1U = xmlstr2unicode(&content); + DPRINT("Got description %wZ\n", &elem1U); while (ret && (ret = next_xml_elem(xmlbuf, &elem))) { @@ -1911,8 +1933,8 @@ } else { - elemU = xmlstr2unicode(&elem); - DPRINT1("unknown elem %wZ\n", &elemU); + elem1U = xmlstr2unicode(&elem); + DPRINT1("unknown elem %wZ\n", &elem1U); ret = parse_unknown_elem(xmlbuf, &elem); } } @@ -2092,13 +2114,31 @@ static BOOL parse_dependent_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, BOOL optional) { struct assembly_identity ai; - xmlstr_t elem; - BOOL end = FALSE, ret = TRUE; - - if (!parse_expect_no_attr(xmlbuf, &end) || end) return end; + xmlstr_t elem, attr_name, attr_value; + BOOL end = FALSE, error = FALSE, ret = TRUE, delayed = FALSE; + + UNICODE_STRING elem1U, elem2U; + + while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + { + static const WCHAR allowDelayedBindingW[] = {'a','l','l','o','w','D','e','l','a','y','e','d','B','i','n','d','i','n','g',0}; + static const WCHAR trueW[] = {'t','r','u','e',0}; + + if (xmlstr_cmp(&attr_name, allowDelayedBindingW)) + delayed = xmlstr_cmp(&attr_value, trueW); + else + { + elem1U = xmlstr2unicode(&attr_name); + elem2U = xmlstr2unicode(&attr_value); + DPRINT1("unknown attr %s=%s\n", &elem1U, &elem2U); + } + } + + if (error || end) return end; memset(&ai, 0, sizeof(ai)); ai.optional = optional; + ai.delayed = delayed; if (!parse_expect_elem(xmlbuf, assemblyIdentityW, asmv1W) || !parse_assembly_identity_elem(xmlbuf, acl->actctx, &ai)) @@ -2297,7 +2337,9 @@ } else if (xmlstr_cmp(&attr_name, xmlnsW)) { - if (!xmlstr_cmp(&attr_value, manifestv1W) && !xmlstr_cmp(&attr_value, manifestv3W)) + if (!xmlstr_cmp(&attr_value, manifestv1W) && + !xmlstr_cmp(&attr_value, manifestv2W) && + !xmlstr_cmp(&attr_value, manifestv3W)) { DPRINT1("wrong namespace %wZ\n", &attr_valueU); return FALSE; @@ -2537,7 +2579,7 @@ static NTSTATUS get_module_filename( HMODULE module, UNICODE_STRING *str, USHORT extra_len ) { NTSTATUS status; - ULONG magic; + ULONG_PTR magic; LDR_DATA_TABLE_ENTRY *pldr; LdrLockLoaderLock(0, NULL, &magic); @@ -2763,8 +2805,8 @@ { static const WCHAR lookup_fmtW[] = {'%','s','_','%','s','_','%','s','_','%','u','.','%','u','.','*','.','*','_', - '*', /* FIXME */ - '.','m','a','n','i','f','e','s','t',0}; + '%','s','_','*','.','m','a','n','i','f','e','s','t',0}; + static const WCHAR wine_trailerW[] = {'d','e','a','d','b','e','e','f','.','m','a','n','i','f','e','s','t'}; WCHAR *lookup, *ret = NULL; UNICODE_STRING lookup_us; @@ -2788,6 +2830,7 @@ FileBothDirectoryInformation, FALSE, &lookup_us, TRUE ); if (io.Status == STATUS_SUCCESS) { + ULONG min_build = ai->version.build, min_revision = ai->version.revision; FILE_BOTH_DIR_INFORMATION *dir_info; WCHAR *tmp; ULONG build, revision; @@ -2811,20 +2854,32 @@ tmp = (WCHAR *)dir_info->FileName + (strchrW(lookup, '*') - lookup); build = atoiW(tmp); - if (build < ai->version.build) continue; + if (build < min_build) continue; tmp = strchrW(tmp, '.') + 1; revision = atoiW(tmp); - if (build == ai->version.build && revision < ai->version.revision) - continue; - ai->version.build = (USHORT)build; - ai->version.revision = (USHORT)revision; - - if ((ret = RtlAllocateHeap( RtlGetProcessHeap(), 0, dir_info->FileNameLength * sizeof(WCHAR) ))) + if (build == min_build && revision < min_revision) continue; + tmp = strchrW(tmp, '_') + 1; + tmp = strchrW(tmp, '_') + 1; + if (dir_info->FileNameLength - (tmp - dir_info->FileName) * sizeof(WCHAR) == sizeof(wine_trailerW) && + !memicmpW( tmp, wine_trailerW, sizeof(wine_trailerW) / sizeof(WCHAR) )) + { + /* prefer a non-Wine manifest if we already have one */ + /* we'll still load the builtin dll if specified through DllOverrides */ + if (ret) continue; + } + else + { + min_build = build; + min_revision = revision; + } + ai->version.build = build; + ai->version.revision = revision; + RtlFreeHeap( RtlGetProcessHeap(), 0, ret ); + if ((ret = RtlAllocateHeap( RtlGetProcessHeap(), 0, dir_info->FileNameLength + sizeof(WCHAR) ))) { memcpy( ret, dir_info->FileName, dir_info->FileNameLength ); ret[dir_info->FileNameLength/sizeof(WCHAR)] = 0; } - break; } } else DPRINT1("no matching file for %S\n", lookup); @@ -2920,7 +2975,7 @@ HANDLE file; DWORD len; - DPRINT( "looking for name=%S version=%u.%u.%u.%u arch=%S\n", + DPRINT1( "looking for name=%S version=%u.%u.%u.%u arch=%S\n", ai->name, ai->version.major, ai->version.minor, ai->version.build, ai->version.revision, ai->arch ); if ((status = lookup_winsxs(acl, ai)) != STATUS_NO_SUCH_FILE) return status; @@ -3006,7 +3061,7 @@ { if (lookup_assembly(acl, &acl->dependencies[i]) != STATUS_SUCCESS) { - if (!acl->dependencies[i].optional) + if (!acl->dependencies[i].optional && !acl->dependencies[i].delayed) { const struct assembly_version *ver = &acl->dependencies[i].version; DPRINT1( "Could not find dependent assembly %S (%u.%u.%u.%u)\n", @@ -3035,7 +3090,7 @@ } else if (flags & (RTL_QUERY_ACTIVATION_CONTEXT_FLAG_IS_ADDRESS | RTL_QUERY_ACTIVATION_CONTEXT_FLAG_IS_HMODULE)) { - ULONG magic; + ULONG_PTR magic; LDR_DATA_TABLE_ENTRY *pldr; if (!*handle) return STATUS_INVALID_PARAMETER; @@ -4584,6 +4639,11 @@ /* FUNCTIONS ***************************************************************/ +/*********************************************************************** + * RtlCreateActivationContext (NTDLL.@) + * + * Create an activation context. + */ NTSTATUS NTAPI RtlCreateActivationContext(IN ULONG Flags, @@ -4633,7 +4693,7 @@ if (pActCtx->dwFlags & ACTCTX_FLAG_HMODULE_VALID) module = pActCtx->hModule; else module = NtCurrentTeb()->ProcessEnvironmentBlock->ImageBaseAddress; - status = get_module_filename(module, &dir, 0); + status = get_module_filename( module, &dir, 0 ); if (!NT_SUCCESS(status)) goto error; if ((p = strrchrW( dir.Buffer, '\\' ))) p[1] = 0; actctx->appdir.info = dir.Buffer; @@ -4782,24 +4842,43 @@ } } #else -VOID -NTAPI -RtlAddRefActivationContext( HANDLE handle ) + +/*********************************************************************** + * RtlAddRefActivationContext (NTDLL.@) + */ +VOID NTAPI RtlAddRefActivationContext( HANDLE handle ) { ACTIVATION_CONTEXT *actctx; - if ((actctx = check_actctx(handle))) actctx_addref(actctx); -} - -VOID -NTAPI -RtlReleaseActivationContext( HANDLE handle ) + if ((actctx = check_actctx( handle ))) actctx_addref( actctx ); +} + + +/****************************************************************** + * RtlReleaseActivationContext (NTDLL.@) + */ +VOID NTAPI RtlReleaseActivationContext( HANDLE handle ) { ACTIVATION_CONTEXT *actctx; - if ((actctx = check_actctx(handle))) actctx_release(actctx); -} + if ((actctx = check_actctx( handle ))) actctx_release( actctx ); +} + #endif + +/****************************************************************** + * RtlZombifyActivationContext (NTDLL.@) + * + */ +NTSTATUS NTAPI RtlZombifyActivationContext(PVOID Context) +{ + UNIMPLEMENTED; + + if (Context == ACTCTX_FAKE_HANDLE) + return STATUS_SUCCESS; + + return STATUS_NOT_IMPLEMENTED; +} NTSTATUS NTAPI RtlActivateActivationContextEx( ULONG flags, PTEB tebAddress, HANDLE handle, PULONG_PTR cookie ) @@ -4821,16 +4900,18 @@ return STATUS_SUCCESS; } - -NTSTATUS -NTAPI RtlActivateActivationContext( ULONG flags, HANDLE handle, PULONG_PTR cookie ) +/****************************************************************** + * RtlActivateActivationContext (NTDLL.@) + */ +NTSTATUS NTAPI RtlActivateActivationContext( ULONG flags, HANDLE handle, PULONG_PTR cookie ) { return RtlActivateActivationContextEx(flags, NtCurrentTeb(), handle, cookie); } -NTSTATUS -NTAPI -RtlDeactivateActivationContext( ULONG flags, ULONG_PTR cookie ) +/*********************************************************************** + * RtlDeactivateActivationContext (NTDLL.@) + */ +NTSTATUS NTAPI RtlDeactivateActivationContext( ULONG flags, ULONG_PTR cookie ) { RTL_ACTIVATION_CONTEXT_STACK_FRAME *frame, *top; @@ -4892,16 +4973,20 @@ RtlFreeHeap(RtlGetProcessHeap(), 0, Stack); } -VOID -NTAPI RtlFreeThreadActivationContextStack(VOID) +/****************************************************************** + * RtlFreeThreadActivationContextStack (NTDLL.@) + */ +VOID NTAPI RtlFreeThreadActivationContextStack(VOID) { RtlFreeActivationContextStack(NtCurrentTeb()->ActivationContextStackPointer); NtCurrentTeb()->ActivationContextStackPointer = NULL; } -NTSTATUS -NTAPI RtlGetActiveActivationContext( HANDLE *handle ) +/****************************************************************** + * RtlGetActiveActivationContext (NTDLL.@) + */ +NTSTATUS NTAPI RtlGetActiveActivationContext( HANDLE *handle ) { if (NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame) { @@ -4915,8 +5000,10 @@ } -BOOLEAN -NTAPI RtlIsActivationContextActive( HANDLE handle ) +/****************************************************************** + * RtlIsActivationContextActive (NTDLL.@) + */ +BOOLEAN NTAPI RtlIsActivationContextActive( HANDLE handle ) { RTL_ACTIVATION_CONTEXT_STACK_FRAME *frame; @@ -4925,11 +5012,16 @@ return FALSE; } -NTSTATUS -NTAPI -RtlQueryInformationActivationContext( ULONG flags, HANDLE handle, PVOID subinst, - ULONG class, PVOID buffer, - SIZE_T bufsize, SIZE_T *retlen ) + +/*********************************************************************** + * RtlQueryInformationActivationContext (NTDLL.@) + * + * Get information about an activation context. + * FIXME: function signature/prototype may be wrong + */ +NTSTATUS NTAPI RtlQueryInformationActivationContext( ULONG flags, HANDLE handle, PVOID subinst, + ULONG class, PVOID buffer, + SIZE_T bufsize, SIZE_T *retlen ) { ACTIVATION_CONTEXT *actctx; NTSTATUS status; @@ -5172,10 +5264,14 @@ return STATUS_SUCCESS; } -NTSTATUS -NTAPI -RtlFindActivationContextSectionString( ULONG flags, const GUID *guid, ULONG section_kind, - const UNICODE_STRING *section_name, PVOID ptr ) +/*********************************************************************** + * RtlFindActivationContextSectionString (NTDLL.@) + * + * Find information about a string in an activation context. + * FIXME: function signature/prototype may be wrong + */ +NTSTATUS NTAPI RtlFindActivationContextSectionString( ULONG flags, const GUID *guid, ULONG section_kind, + const UNICODE_STRING *section_name, PVOID ptr ) { PACTCTX_SECTION_KEYED_DATA data = ptr; NTSTATUS status; @@ -5204,13 +5300,19 @@ return status; } +/*********************************************************************** + * RtlFindActivationContextSectionGuid (NTDLL.@) + * + * Find information about a GUID in an activation context. + * FIXME: function signature/prototype may be wrong + */ NTSTATUS WINAPI RtlFindActivationContextSectionGuid( ULONG flags, const GUID *extguid, ULONG section_kind, const GUID *guid, void *ptr ) { - ACTCTX_SECTION_KEYED_DATA *data = ptr; - NTSTATUS status = STATUS_SXS_KEY_NOT_FOUND; - - if (extguid) + ACTCTX_SECTION_KEYED_DATA *data = ptr; + NTSTATUS status = STATUS_SXS_KEY_NOT_FOUND; + + if (extguid) { DPRINT1("expected extguid == NULL\n"); return STATUS_INVALID_PARAMETER; @@ -5224,7 +5326,7 @@ if (!data || data->cbSize < FIELD_OFFSET(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex) || !guid) return STATUS_INVALID_PARAMETER; - + if (NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame) { ACTIVATION_CONTEXT *actctx = check_actctx(NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame->ActivationContext); @@ -5346,17 +5448,3 @@ return frame; } - - -NTSTATUS -NTAPI -RtlZombifyActivationContext(PVOID Context) -{ - UNIMPLEMENTED; - - if (Context == ACTCTX_FAKE_HANDLE) - return STATUS_SUCCESS; - - return STATUS_NOT_IMPLEMENTED; -} - Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Mar 9 18:08:15 2015 @@ -260,6 +260,8 @@ reactos/lib/3rdparty/strmbase # Synced to Wine-1.7.27 +reactos/lib/rtl/actctx.c # Partly synced with WineStaging-1.7.37 + advapi32 - reactos/dll/win32/advapi32/wine/cred.c # Synced to Wine-1.7.27 reactos/dll/win32/advapi32/wine/crypt.c # Synced to Wine-1.7.27

9 years, 6 months

[akhaldi] 66622: [KERNEL32] Sync GetStringTypeW() with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Mar 9 17:53:20 2015 New Revision: 66622 URL: http://svn.reactos.org/svn/reactos?rev=66622&view=rev Log: [KERNEL32] Sync GetStringTypeW() with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] Mon Mar 9 17:53:20 2015 @@ -1255,6 +1255,11 @@ C2_OTHERNEUTRAL /* LRE, LRO, RLE, RLO, PDF */ }; + if (!src) /* Abort and return FALSE when src is null */ + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } if (count == -1) count = strlenW(src) + 1; switch(type) {

9 years, 6 months

[akhaldi] 66621: [TASKMGR] Do not show negative CPU usage. By Peter Hater. CORE-9050

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Mar 9 17:38:31 2015 New Revision: 66621 URL: http://svn.reactos.org/svn/reactos?rev=66621&view=rev Log: [TASKMGR] Do not show negative CPU usage. By Peter Hater. CORE-9050 Modified: trunk/reactos/base/applications/taskmgr/perfdata.c Modified: trunk/reactos/base/applications/taskmgr/perfdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] Mon Mar 9 17:38:31 2015 @@ -298,6 +298,12 @@ /* CurrentCpuUsage% = 100 - (CurrentCpuIdle * 100) / NumberOfProcessors */ dbIdleTime = 100.0 - dbIdleTime * 100.0 / (double)SystemBasicInfo.NumberOfProcessors; /* + 0.5; */ dbKernelTime = 100.0 - dbKernelTime * 100.0 / (double)SystemBasicInfo.NumberOfProcessors; /* + 0.5; */ + + if (dbIdleTime < 0.0) dbIdleTime = 0.0; + if (dbIdleTime > 100.0) dbIdleTime = 100.0; + if (dbKernelTime < 0.0) dbKernelTime = 0.0; + if (dbKernelTime > 100.0) dbKernelTime = 100.0; + } /* Store new CPU's idle and system time */

9 years, 6 months

[akhaldi] 66620: [KERNEL32_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Mar 9 17:15:16 2015 New Revision: 66620 URL: http://svn.reactos.org/svn/reactos?rev=66620&view=rev Log: [KERNEL32_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Added: trunk/rostests/winetests/kernel32/cpu.c (with props) Modified: trunk/rostests/winetests/kernel32/CMakeLists.txt trunk/rostests/winetests/kernel32/actctx.c trunk/rostests/winetests/kernel32/change.c trunk/rostests/winetests/kernel32/codepage.c trunk/rostests/winetests/kernel32/file.c trunk/rostests/winetests/kernel32/format_msg.c trunk/rostests/winetests/kernel32/loader.c trunk/rostests/winetests/kernel32/locale.c trunk/rostests/winetests/kernel32/module.c trunk/rostests/winetests/kernel32/path.c trunk/rostests/winetests/kernel32/pipe.c trunk/rostests/winetests/kernel32/process.c trunk/rostests/winetests/kernel32/profile.c trunk/rostests/winetests/kernel32/resource.c trunk/rostests/winetests/kernel32/sync.c trunk/rostests/winetests/kernel32/testlist.c trunk/rostests/winetests/kernel32/thread.c trunk/rostests/winetests/kernel32/time.c trunk/rostests/winetests/kernel32/version.c trunk/rostests/winetests/kernel32/virtual.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/CMakeL… Modified: trunk/rostests/winetests/kernel32/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/actctx… Modified: trunk/rostests/winetests/kernel32/change.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/change… Modified: trunk/rostests/winetests/kernel32/codepage.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/codepa… Added: trunk/rostests/winetests/kernel32/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/cpu.c?… Modified: trunk/rostests/winetests/kernel32/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/file.c… Modified: trunk/rostests/winetests/kernel32/format_msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/format… Modified: trunk/rostests/winetests/kernel32/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/loader… Modified: trunk/rostests/winetests/kernel32/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/locale… Modified: trunk/rostests/winetests/kernel32/module.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/module… Modified: trunk/rostests/winetests/kernel32/path.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/path.c… Modified: trunk/rostests/winetests/kernel32/pipe.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/pipe.c… Modified: trunk/rostests/winetests/kernel32/process.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/proces… Modified: trunk/rostests/winetests/kernel32/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/profil… Modified: trunk/rostests/winetests/kernel32/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/resour… Modified: trunk/rostests/winetests/kernel32/sync.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/sync.c… Modified: trunk/rostests/winetests/kernel32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/testli… Modified: trunk/rostests/winetests/kernel32/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/thread… Modified: trunk/rostests/winetests/kernel32/time.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/time.c… Modified: trunk/rostests/winetests/kernel32/version.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/versio… Modified: trunk/rostests/winetests/kernel32/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/virtua…

9 years, 6 months

[tkreuzer] 66619: [WIN32K] Fix another typo in the same line... Spotted by Jerome.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Mar 9 01:11:06 2015 New Revision: 66619 URL: http://svn.reactos.org/svn/reactos?rev=66619&view=rev Log: [WIN32K] Fix another typo in the same line... Spotted by Jerome. Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/bitblt.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] Mon Mar 9 01:11:06 2015 @@ -468,7 +468,7 @@ if (psoMask == NULL) { /* We have no mask, assume the mask is all foreground */ - rop4 = (rop4 & 0xFF) || ((rop4 & 0xFF) << 8); + rop4 = (rop4 & 0xFF) | ((rop4 & 0xFF) << 8); UsesMask = FALSE; } }

9 years, 6 months

[tkreuzer] 66618: [WIN32K] Replace ROUND_UP with ALIGN_UP_BY

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Mar 8 23:37:06 2015 New Revision: 66618 URL: http://svn.reactos.org/svn/reactos?rev=66618&view=rev Log: [WIN32K] Replace ROUND_UP with ALIGN_UP_BY Modified: trunk/reactos/win32ss/gdi/ntgdi/misc.h trunk/reactos/win32ss/user/ntuser/timer.c Modified: trunk/reactos/win32ss/gdi/ntgdi/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/misc.h?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/misc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/misc.h [iso-8859-1] Sun Mar 8 23:37:06 2015 @@ -156,8 +156,3 @@ BOOL NTAPI W32kDosPathNameToNtPathName(PCWSTR, PUNICODE_STRING); -#define ROUND_DOWN(n, align) \ - (((ULONG)n) & ~((align) - 1l)) - -#define ROUND_UP(n, align) \ - ROUND_DOWN(((ULONG)n) + (align) - 1, (align)) Modified: trunk/reactos/win32ss/user/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/timer.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] Sun Mar 8 23:37:06 2015 @@ -347,7 +347,7 @@ case ID_EVENT_SYSTIMER_FLASHWIN: { - FLASHWINFO fwi = + FLASHWINFO fwi = {sizeof(FLASHWINFO), UserHMGetHandle(pWnd), FLASHW_SYSTIMER,0,0}; @@ -602,7 +602,7 @@ ExInitializeFastMutex(Mutex); - BitmapBytes = ROUND_UP(NUM_WINDOW_LESS_TIMERS, sizeof(ULONG) * 8) / 8; + BitmapBytes = ALIGN_UP_BY(NUM_WINDOW_LESS_TIMERS, sizeof(ULONG) * 8) / 8; WindowLessTimersBitMapBuffer = ExAllocatePoolWithTag(NonPagedPool, BitmapBytes, TAG_TIMERBMP); if (WindowLessTimersBitMapBuffer == NULL) {

9 years, 6 months

[tkreuzer] 66617: [WIN32K] Improve the situation with ROP handling, trying to make things clearer.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Mar 8 23:36:49 2015 New Revision: 66617 URL: http://svn.reactos.org/svn/reactos?rev=66617&view=rev Log: [WIN32K] Improve the situation with ROP handling, trying to make things clearer. Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c trunk/reactos/win32ss/gdi/ntgdi/dibobj.c trunk/reactos/win32ss/gdi/ntgdi/intgdi.h Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Sun Mar 8 23:36:49 2015 @@ -151,13 +151,13 @@ HDC hDCSrc, INT XSrc, INT YSrc, - DWORD ROP, + DWORD dwRop, IN DWORD crBackColor, IN FLONG fl) { - DWORD dwTRop; - - if (ROP & CAPTUREBLT) + + if (dwRop & CAPTUREBLT) + { return NtGdiStretchBlt(hDCDest, XDest, YDest, @@ -168,10 +168,11 @@ YSrc, Width, Height, - ROP, + dwRop, crBackColor); - - dwTRop = ROP & ~(NOMIRRORBITMAP|CAPTUREBLT); + } + + dwRop = dwRop & ~(NOMIRRORBITMAP|CAPTUREBLT); /* Forward to NtGdiMaskBlt */ // TODO: What's fl for? LOL not to send this to MaskBit! @@ -186,7 +187,7 @@ NULL, 0, 0, - dwTRop, + MAKEROP4(dwRop, dwRop), crBackColor); } @@ -310,7 +311,7 @@ HBITMAP hbmMask, INT xMask, INT yMask, - DWORD dwRop, + DWORD dwRop4, IN DWORD crBackColor) { PDC DCDest; @@ -325,11 +326,11 @@ EXLATEOBJ exlo; XLATEOBJ *XlateObj = NULL; BOOL UsesSource; - - FIXUP_ROP(dwRop); // FIXME: why do we need this??? - - //DPRINT1("dwRop : 0x%08x\n", dwRop); - UsesSource = ROP_USES_SOURCE(dwRop); + ROP4 rop4; + + rop4 = WIN32_ROP4_TO_ENG_ROP4(dwRop4); + + UsesSource = ROP4_USES_SOURCE(rop4); if (!hdcDest || (UsesSource && !hdcSrc)) { EngSetLastError(ERROR_INVALID_PARAMETER); @@ -337,7 +338,7 @@ } /* Check if we need a mask and have a mask bitmap */ - if (ROP_USES_MASK(dwRop) && (hbmMask != NULL)) + if (ROP4_USES_MASK(rop4) && (hbmMask != NULL)) { /* Reference the mask bitmap */ psurfMask = SURFACE_ShareLockSurface(hbmMask); @@ -481,7 +482,7 @@ &MaskPoint, &DCDest->eboFill.BrushObject, &DCDest->dclevel.pbrFill->ptOrigin, - ROP_TO_ROP4(dwRop)); + rop4); if (UsesSource) EXLATEOBJ_vCleanup(&exlo); @@ -516,7 +517,8 @@ return FALSE; } -BOOL APIENTRY +BOOL +NTAPI GreStretchBltMask( HDC hDCDest, INT XOriginDest, @@ -528,7 +530,7 @@ INT YOriginSrc, INT WidthSrc, INT HeightSrc, - DWORD ROP, + DWORD dwRop4, IN DWORD dwBackColor, HDC hDCMask, INT XOriginMask, @@ -551,10 +553,12 @@ POINTL BrushOrigin; BOOL UsesSource; BOOL UsesMask; - - FIXUP_ROP(ROP); - UsesSource = ROP_USES_SOURCE(ROP); - UsesMask = ROP_USES_MASK(ROP); + ROP4 rop4; + + rop4 = WIN32_ROP4_TO_ENG_ROP4(dwRop4); + + UsesSource = ROP4_USES_SOURCE(rop4); + UsesMask = ROP4_USES_MASK(rop4); if (0 == WidthDest || 0 == HeightDest || 0 == WidthSrc || 0 == HeightSrc) { @@ -692,7 +696,7 @@ BitmapMask ? &MaskPoint : NULL, &DCDest->eboFill.BrushObject, &BrushOrigin, - ROP_TO_ROP4(ROP)); + rop4); if (UsesSource) { EXLATEOBJ_vCleanup(&exlo); @@ -726,10 +730,10 @@ INT YOriginSrc, INT WidthSrc, INT HeightSrc, - DWORD ROP, + DWORD dwRop3, IN DWORD dwBackColor) { - DWORD dwTRop = ROP & ~(NOMIRRORBITMAP|CAPTUREBLT); + dwRop3 = dwRop3 & ~(NOMIRRORBITMAP|CAPTUREBLT); return GreStretchBltMask( hDCDest, @@ -742,7 +746,7 @@ YOriginSrc, WidthSrc, HeightSrc, - dwTRop, + MAKEROP4(dwRop3 & 0xFF0000, dwRop3), dwBackColor, NULL, 0, @@ -757,7 +761,7 @@ INT YLeft, INT Width, INT Height, - DWORD dwRop, + DWORD dwRop3, PEBRUSHOBJ pebo) { RECTL DestRect; @@ -769,8 +773,6 @@ ASSERT(pebo); pbrush = pebo->pbrush; ASSERT(pbrush); - - FIXUP_ROP(dwRop); if (pbrush->flAttrs & BR_IS_NULL) { @@ -817,18 +819,17 @@ psurf = pdc->dclevel.pSurface; - ret = IntEngBitBlt( - &psurf->SurfObj, - NULL, - NULL, - &pdc->co.ClipObj, - NULL, - &DestRect, - NULL, - NULL, - &pebo->BrushObject, - &BrushOrigin, - ROP_TO_ROP4(dwRop)); + ret = IntEngBitBlt(&psurf->SurfObj, + NULL, + NULL, + &pdc->co.ClipObj, + NULL, + &DestRect, + NULL, + NULL, + &pebo->BrushObject, + &BrushOrigin, + WIN32_ROP3_TO_ENG_ROP4(dwRop3)); DC_vFinishBlit(pdc, NULL); @@ -906,15 +907,14 @@ BOOL bResult; PDC pdc; - /* Mask away everything except foreground rop index */ - dwRop = dwRop & 0x00FF0000; - dwRop |= dwRop << 8; + /* Convert the ROP3 to a ROP4 */ + dwRop = MAKEROP4(dwRop & 0xFF0000, dwRop); /* Check if the rop uses a source */ - if (ROP_USES_SOURCE(dwRop)) + if (WIN32_ROP4_USES_SOURCE(dwRop)) { /* This is not possible */ - return 0; + return FALSE; } /* Lock the DC */ Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Sun Mar 8 23:36:49 2015 @@ -1274,10 +1274,6 @@ pdc->pdcattr->crBackgroundClr, pdc->pdcattr->crForegroundClr); - /* Mask away everything except foreground rop index */ - dwRop = dwRop & 0x00FF0000; - dwRop |= dwRop << 8; - /* Perform the stretch operation */ bResult = IntEngStretchBlt(&psurfDst->SurfObj, &psurfTmp->SurfObj, @@ -1290,7 +1286,7 @@ NULL, &pdc->eboFill.BrushObject, NULL, - ROP_TO_ROP4(dwRop)); + WIN32_ROP3_TO_ENG_ROP4(dwRop)); /* Cleanup */ DC_vFinishBlit(pdc, NULL); Modified: trunk/reactos/win32ss/gdi/ntgdi/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/intgdi.h… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/intgdi.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/intgdi.h [iso-8859-1] Sun Mar 8 23:36:49 2015 @@ -1,9 +1,10 @@ #pragma once -#define ROP_USES_SOURCE(Rop) (((((Rop) & 0xCC0000) >> 2) != ((Rop) & 0x330000)) || ((((Rop) & 0xCC000000) >> 2) != ((Rop) & 0x33000000))) -#define ROP_USES_MASK(Rop) (((Rop) & 0xFF000000) != (((Rop) & 0xff0000) << 8)) -#define FIXUP_ROP(Rop) if(((Rop) & 0xFF000000) == 0) Rop = MAKEROP4((Rop), (Rop)) -#define ROP_TO_ROP4(Rop) ((Rop) >> 16) +/* Convert WIN32 ROP into an ENG ROP */ +#define WIN32_ROP3_TO_ENG_ROP4(dwRop4) ((((dwRop4) & 0x00FF0000) >> 16) | (((dwRop4) & 0x00FF0000) >> 8)) +#define WIN32_ROP4_TO_ENG_ROP4(dwRop4) ((dwRop4) >> 16) + +#define WIN32_ROP4_USES_SOURCE(Rop) ((((Rop) & 0xCCCC0000) >> 2) != ((Rop) & 0x33330000)) /* The range of valid ROP2 values is 1 .. 16 */ #define FIXUP_ROP2(rop2) ((((rop2) - 1) & 0xF) + 1)

9 years, 6 months

[tkreuzer] 66616: [WIN32K] - Pass size in bytes to UnsafeSetBitmapBits from NtGdiCreateBitmap - In NtGdiSetBitmapBits check for stock bitmap and non-API bitmap.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Mar 8 23:36:36 2015 New Revision: 66616 URL: http://svn.reactos.org/svn/reactos?rev=66616&view=rev Log: [WIN32K] - Pass size in bytes to UnsafeSetBitmapBits from NtGdiCreateBitmap - In NtGdiSetBitmapBits check for stock bitmap and non-API bitmap. Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitmaps.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] Sun Mar 8 23:36:36 2015 @@ -53,6 +53,8 @@ PUCHAR pjDst, pjSrc; LONG lDeltaDst, lDeltaSrc; ULONG nWidth, nHeight, cBitsPixel; + NT_ASSERT(psurf->flags & API_BITMAP); + NT_ASSERT(psurf->SurfObj.iBitmapFormat <= BMF_32BPP); nWidth = psurf->SurfObj.sizlBitmap.cx; nHeight = psurf->SurfObj.sizlBitmap.cy; @@ -63,8 +65,10 @@ pjSrc = pvBits; lDeltaDst = psurf->SurfObj.lDelta; lDeltaSrc = WIDTH_BYTES_ALIGN16(nWidth, cBitsPixel); - - if (cjBits && (cjBits < (lDeltaSrc * nHeight))) + NT_ASSERT(lDeltaSrc <= abs(lDeltaDst)); + + /* Make sure the buffer is large enough*/ + if (cjBits < (lDeltaSrc * nHeight)) return 0; while (nHeight--) @@ -227,7 +231,7 @@ _SEH2_TRY { ProbeForRead(pUnsafeBits, (SIZE_T)cjSize, 1); - UnsafeSetBitmapBits(psurf, 0, pUnsafeBits); + UnsafeSetBitmapBits(psurf, cjSize, pUnsafeBits); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -568,10 +572,26 @@ return 0; } + if (GDI_HANDLE_IS_STOCKOBJ(hBitmap)) + { + return 0; + } + psurf = SURFACE_ShareLockSurface(hBitmap); if (psurf == NULL) { EngSetLastError(ERROR_INVALID_HANDLE); + return 0; + } + + if (((psurf->flags & API_BITMAP) == 0) || + (psurf->SurfObj.iBitmapFormat > BMF_32BPP)) + { + DPRINT1("Invalid bitmap: iBitmapFormat = %lu, flags = 0x%lx\n", + psurf->SurfObj.iBitmapFormat, + psurf->flags); + EngSetLastError(ERROR_INVALID_HANDLE); + SURFACE_ShareUnlockSurface(psurf); return 0; }

9 years, 6 months

[tkreuzer] 66615: [WIN32K] - Remove wrong flags when initializing a DC - Set DC::prgnattr before potentially passing it to the cleanup function after failure to create a handle. Add a comment that ...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Mar 8 23:36:25 2015 New Revision: 66615 URL: http://svn.reactos.org/svn/reactos?rev=66615&view=rev Log: [WIN32K] - Remove wrong flags when initializing a DC - Set DC::prgnattr before potentially passing it to the cleanup function after failure to create a handle. Add a comment that this is not actually enough. Will be fixed, once we use C++ - Increase GDI object stack levels to 20 Modified: trunk/reactos/win32ss/gdi/ntgdi/dclife.c trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h Modified: trunk/reactos/win32ss/gdi/ntgdi/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dclife.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] Sun Mar 8 23:36:25 2015 @@ -86,15 +86,16 @@ /* Set the actual DC type */ pdc->BaseObject.hHmgr = UlongToHandle(eDcObjType); + pdc->pdcattr = &pdc->dcattr; + /* Insert the object */ if (!GDIOBJ_hInsertObject(&pdc->BaseObject, GDI_OBJ_HMGR_POWNED)) { + /// FIXME: this is broken, since the DC is not initialized yet... DPRINT1("Could not insert DC into handle table.\n"); GDIOBJ_vFreeObject(&pdc->BaseObject); return NULL; } - - pdc->pdcattr = &pdc->dcattr; return pdc; } @@ -177,8 +178,6 @@ pdc->erclBoundsApp.bottom = 0x00000333; // FIXME pdc->erclClip = pdc->erclBounds; pdc->co = gxcoTrivial; - - pdc->fs |= DC_SYNCHRONIZEACCESS | DC_ACCUM_APP | DC_PERMANANT | DC_DISPLAY; } else { @@ -891,11 +890,13 @@ if (!GreDeleteObject(hDC)) { DPRINT1("DC_FreeDC failed\n"); + return FALSE; } } else { DPRINT1("Attempted to Delete 0x%p currently being destroyed!!!\n", hDC); + return FALSE; } return TRUE; Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h [iso-8859-1] Sun Mar 8 23:36:25 2015 @@ -5,7 +5,7 @@ #pragma once -#define GDI_OBJECT_STACK_LEVELS 10 +#define GDI_OBJECT_STACK_LEVELS 20 /* The first 10 entries are never used in windows, they are empty */ static const unsigned RESERVE_ENTRIES_COUNT = 10;

9 years, 6 months

[tkreuzer] 66614: [WIN32K] Make sure a region is reasonably initialized, before potentially passing it to the cleanup function, when failing to create a handle.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Mar 8 23:36:14 2015 New Revision: 66614 URL: http://svn.reactos.org/svn/reactos?rev=66614&view=rev Log: [WIN32K] Make sure a region is reasonably initialized, before potentially passing it to the cleanup function, when failing to create a handle. Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] Sun Mar 8 23:36:14 2015 @@ -2187,13 +2187,6 @@ return NULL; } - if (!GDIOBJ_hInsertObject(&pReg->BaseObject, GDI_OBJ_HMGR_POWNED)) - { - DPRINT1("Could not insert palette into handle table.\n"); - GDIOBJ_vFreeObject(&pReg->BaseObject); - return NULL; - } - //hReg = pReg->BaseObject.hHmgr; if ((nReg == 0) || (nReg == 1)) @@ -2221,6 +2214,19 @@ pReg->rdh.nRgnSize = nReg * sizeof(RECT); pReg->prgnattr = &pReg->rgnattr; + /* Initialize the region attribute */ + pReg->rgnattr.AttrFlags = 0; + pReg->rgnattr.iComplexity = SIMPLEREGION; + pReg->rgnattr.Rect = pReg->rdh.rcBound; + + /* Finally insert the region into the handle table */ + if (!GDIOBJ_hInsertObject(&pReg->BaseObject, GDI_OBJ_HMGR_POWNED)) + { + DPRINT1("Could not insert palette into handle table.\n"); + GDIOBJ_vFreeObject(&pReg->BaseObject); + return NULL; + } + return pReg; } @@ -2232,6 +2238,8 @@ PPROCESSINFO ppi; PRGN_ATTR prgnattr; + NT_ASSERT(prgn->prgnattr == &prgn->rgnattr); + ppi = PsGetCurrentProcessWin32Process(); ASSERT(ppi); @@ -2241,6 +2249,9 @@ DPRINT1("Could not allocate RGN attr\n"); return FALSE; } + + /* Copy the current region attribute */ + *prgnattr = prgn->rgnattr; /* Set the object attribute in the handle table */ prgn->prgnattr = prgnattr; @@ -3928,105 +3939,112 @@ INT APIENTRY NtGdiOffsetRgn( - HRGN hRgn, - INT XOffset, - INT YOffset) -{ - PREGION rgn; - INT ret; - - DPRINT("NtGdiOffsetRgn: hRgn %p Xoffs %d Yoffs %d rgn %p\n", hRgn, XOffset, YOffset, rgn ); - - rgn = REGION_LockRgn(hRgn); - if (rgn == NULL) - { - DPRINT("NtGdiOffsetRgn: hRgn error\n"); + _In_ HRGN hrgn, + _In_ INT cx, + _In_ INT cy) +{ + PREGION prgn; + INT iResult; + + DPRINT("NtGdiOffsetRgn: hrgn %p cx %d cy %d\n", hrgn, cx, cy); + + /* Lock the region */ + prgn = REGION_LockRgn(hrgn); + if (prgn == NULL) + { + DPRINT1("NtGdiOffsetRgn: failed to lock region %p\n", hrgn); return ERROR; } - if (!REGION_bOffsetRgn(rgn, XOffset, YOffset)) - { - ret = ERROR; + /* Call the internal function */ + if (!REGION_bOffsetRgn(prgn, cx, cy)) + { + iResult = ERROR; } else { - ret = REGION_Complexity(rgn); - } - - REGION_UnlockRgn(rgn); - return ret; + iResult = REGION_Complexity(prgn); + } + + /* Unlock and return the result */ + REGION_UnlockRgn(prgn); + return iResult; } BOOL APIENTRY NtGdiPtInRegion( - HRGN hRgn, - INT X, - INT Y) + _In_ HRGN hrgn, + _In_ INT x, + _In_ INT y) { PREGION prgn; - BOOL ret; - - prgn = REGION_LockRgn(hRgn); + BOOL bResult; + + /* Lock the region */ + prgn = REGION_LockRgn(hrgn); if (prgn == NULL) + { + DPRINT1("NtGdiPtInRegion: hrgn error\n"); return FALSE; - - ret = REGION_PtInRegion(prgn, X, Y); - + } + + /* Call the internal function */ + bResult = REGION_PtInRegion(prgn, x, y); + + /* Unlock and return the result */ REGION_UnlockRgn(prgn); - return ret; + return bResult; } BOOL APIENTRY NtGdiRectInRegion( - HRGN hRgn, - LPRECTL unsaferc) -{ - RECTL rc = { 0 }; - NTSTATUS Status = STATUS_SUCCESS; - + _In_ HRGN hrgn, + _In_ LPRECT prclUnsafe) +{ + RECTL rcTemp; + + /* Probe and copy the rect */ _SEH2_TRY { - ProbeForRead(unsaferc, sizeof(RECT), 1); - rc = *unsaferc; + ProbeForRead(prclUnsafe, sizeof(RECT), 1); + rcTemp = *prclUnsafe; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); + DPRINT1("NtGdiRectInRegion: Exception accessing the rect\n"); + return FALSE; } _SEH2_END; - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - DPRINT1("NtGdiRectInRegion: Bogus rc\n"); - return ERROR; - } - - return IntRectInRegion(hRgn, &rc); + /* Call the internal function */ + return IntRectInRegion(hrgn, &rcTemp); } BOOL APIENTRY NtGdiSetRectRgn( - HRGN hRgn, - INT LeftRect, - INT TopRect, - INT RightRect, - INT BottomRect) -{ - PREGION rgn; - - rgn = REGION_LockRgn(hRgn); - if (rgn == NULL) - { - return 0; // Per documentation - } - - REGION_SetRectRgn(rgn, LeftRect, TopRect, RightRect, BottomRect); - - REGION_UnlockRgn(rgn); + _In_ HRGN hrgn, + _In_ INT xLeft, + _In_ INT yTop, + _In_ INT xRight, + _In_ INT yBottom) +{ + PREGION prgn; + + /* Lock the region */ + prgn = REGION_LockRgn(hrgn); + if (prgn == NULL) + { + return FALSE; + } + + /* Call the internal API */ + REGION_SetRectRgn(prgn, xLeft, yTop, xRight, yBottom); + + /* Unlock the region and return success */ + REGION_UnlockRgn(prgn); return TRUE; }

9 years, 6 months

← Newer
1
...
36
37
38
39
40
41
42
...
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 March 2015