From: Francois Gouget <fgouget@codeweavers.com>
Date: Sat, 13 Dec 2003 01:34:40 +0000 (+0000)
Subject: Try not to display uninitialized data in traces (found by Valgrind).
X-Git-Tag: wine-20031212~9
X-Git-Url: http://git.etersoft.ru/projects/?a=commitdiff_plain;h=8f63a714b205600174749d6acab4234596d4663d;p=wine%2Feterwine.git

Try not to display uninitialized data in traces (found by Valgrind).
---

diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c
index 0d80678855..016c109469 100644
--- a/dlls/advapi32/registry.c
+++ b/dlls/advapi32/registry.c
@@ -1013,7 +1013,8 @@ DWORD WINAPI RegQueryValueExW( HKEY hkey, LPCWSTR name, LPDWORD reserved, LPDWOR
     static const int info_size = offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data );
 
     TRACE("(%p,%s,%p,%p,%p,%p=%ld)\n",
-          hkey, debugstr_w(name), reserved, type, data, count, count ? *count : 0 );
+          hkey, debugstr_w(name), reserved, type, data, count,
+          (count && data) ? *count : 0 );
 
     if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER;
     if (!(hkey = get_special_root_hkey( hkey ))) return ERROR_INVALID_HANDLE;
diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c
index f484be17fa..9458b35b25 100644
--- a/dlls/ntdll/resource.c
+++ b/dlls/ntdll/resource.c
@@ -275,7 +275,8 @@ NTSTATUS WINAPI LdrFindResourceDirectory_U( HMODULE hmod, const LDR_RESOURCE_INF
 
     if (info) TRACE( "module %p type %s name %s lang %04lx level %ld\n",
                      hmod, debugstr_w((LPCWSTR)info->Type),
-                     debugstr_w((LPCWSTR)info->Name), info->Language, level );
+                     level > 1 ? debugstr_w((LPCWSTR)info->Name) : "",
+                     level > 2 ? info->Language : 0, level );
 
     __TRY
     {
@@ -302,7 +303,8 @@ NTSTATUS WINAPI LdrFindResource_U( HMODULE hmod, const LDR_RESOURCE_INFO *info,
 
     if (info) TRACE( "module %p type %s name %s lang %04lx level %ld\n",
                      hmod, debugstr_w((LPCWSTR)info->Type),
-                     debugstr_w((LPCWSTR)info->Name), info->Language, level );
+                     level > 1 ? debugstr_w((LPCWSTR)info->Name) : "",
+                     level > 2 ? info->Language : 0, level );
 
     __TRY
     {