Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-27 17:10:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't abuse debug system

Browse source 
svn path=/trunk/; revision=27850
This commit is contained in:
Hervé Poussineau 2007-07-26 15:13:36 +00:00
parent 0cd283447c
commit bc4b14c9c4
50 changed files with 263 additions and 224 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/base/applications/winhelp/winhelp.h
View file

@ -33,8 +33,6 @@
#define BUTTON_CX 6
#define BUTTON_CY 6
#define WINE_WARN DPRINT
#ifndef RC_INVOKED
#include <stdarg.h>

15
reactos/base/applications/winhelp/winhelp.rbuild
View file

@ -5,6 +5,7 @@
<define name="__USE_W32API" />
<define name="_WIN32_IE">0x0600</define>
<define name="_WIN32_WINNT">0x0501</define>
<library>wine</library>
<library>kernel32</library>
<library>user32</library>
<library>gdi32</library>
@ -13,14 +14,12 @@
<library>advapi32</library>
<library>shell32</library>
<library>comctl32</library>
<compilationunit name="unit.c">
<file>callback.c</file>
<file>hlpfile.c</file>
<file>macro.c</file>
<file>string.c</file>
<file>winhelp.c</file>
<file>lex.yy.c</file>
</compilationunit>
<file>callback.c</file>
<file>hlpfile.c</file>
<file>macro.c</file>
<file>string.c</file>
<file>winhelp.c</file>
<file>lex.yy.c</file>
<file>rsrc.rc</file>
</module>
</rbuild>

12
reactos/base/system/winlogon/sas.c
View file

@ -1,7 +1,7 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
* FILE: services/winlogon/sas.c
* PROJECT: ReactOS Winlogon
* FILE: base/system/winlogon/sas.c
* PURPOSE: Secure Attention Sequence
* PROGRAMMERS: Thomas Weidenmueller (w3seek@users.sourceforge.net)
* Hervé Poussineau (hpoussin@reactos.org)
@ -9,11 +9,17 @@
* Created 28/03/2004
*/
/* INCLUDES *****************************************************************/
#include "winlogon.h"
//#define YDEBUG
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(winlogon);
/* GLOBALS ******************************************************************/
#define WINLOGON_SAS_CLASS L"SAS Window class"
#define WINLOGON_SAS_TITLE L"SAS window"
@ -24,6 +30,8 @@
extern BOOL STDCALL SetLogonNotifyWindow(HWND Wnd, HWINSTA WinSta);
#endif
/* FUNCTIONS ****************************************************************/
static BOOL
StartTaskManager(
IN OUT PWLSESSION Session)

10
reactos/base/system/winlogon/screensaver.c
View file

@ -1,16 +1,22 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
* FILE: services/winlogon/screensaver.c
* PROJECT: ReactOS Winlogon
* FILE: base/system/winlogon/screensaver.c
* PURPOSE: Screen saver management
* PROGRAMMERS: Hervé Poussineau (hpoussin@reactos.org)
*/
/* INCLUDES *****************************************************************/
#include "winlogon.h"
#define YDEBUG
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(winlogon);
/* FUNCTIONS ****************************************************************/
#ifndef USE_GETLASTINPUTINFO
static LRESULT CALLBACK
KeyboardActivityProc(

39
reactos/base/system/winlogon/setup.c
View file

@ -1,36 +1,19 @@
/*
* ReactOS kernel
* Copyright (C) 2003 ReactOS Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id$
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS winlogon
* FILE: subsys/system/winlogon/setup.h
* PROJECT: ReactOS Winlogon
* FILE: base/system/winlogon/setup.c
* PURPOSE: Setup support functions
* PROGRAMMER: Eric Kohl
* PROGRAMMERS: Eric Kohl
*/
/* INCLUDES *****************************************************************/
#include "winlogon.h"
#define NDEBUG
#include <debug.h>
//#define YDEBUG
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(winlogon);
/* FUNCTIONS ****************************************************************/
@ -116,7 +99,7 @@ RunSetup (VOID)
DWORD dwSize;
DWORD dwExitCode;
DPRINT ("RunSetup() called\n");
TRACE ("RunSetup() called\n");
dwError = RegOpenKeyExW (HKEY_LOCAL_MACHINE,
L"SYSTEM\\Setup",
@ -154,7 +137,7 @@ RunSetup (VOID)
return FALSE;
}
DPRINT ("Winlogon: Should run '%S' now.\n", CommandLine);
TRACE ("Should run '%S' now.\n", CommandLine);
StartupInfo.cb = sizeof(StartupInfo);
StartupInfo.lpReserved = NULL;
@ -164,7 +147,7 @@ RunSetup (VOID)
StartupInfo.cbReserved2 = 0;
StartupInfo.lpReserved2 = 0;
DPRINT ("Winlogon: Creating new setup process\n");
TRACE ("Creating new setup process\n");
Result = CreateProcessW (NULL,
CommandLine,
@ -178,7 +161,7 @@ RunSetup (VOID)
&ProcessInformation);
if (!Result)
{
DPRINT ("Winlogon: Failed to run setup process\n");
TRACE ("Failed to run setup process\n");
return FALSE;
}
@ -195,7 +178,7 @@ RunSetup (VOID)
SetSetupType (0);
}
DPRINT ("Winlogon: RunSetup() done.\n");
TRACE ("RunSetup() done.\n");
return TRUE;
}

7
reactos/base/system/winlogon/winlogon.c
View file

@ -1,7 +1,7 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS Winlogon
* FILE: services/winlogon/winlogon.c
* FILE: base/system/winlogon/winlogon.c
* PURPOSE: Logon
* PROGRAMMERS: Thomas Weidenmueller (w3seek@users.sourceforge.net)
* Filip Navara
@ -9,11 +9,14 @@
*/
/* INCLUDES *****************************************************************/
#include "winlogon.h"
//#define YDEBUG
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(winlogon);
/* GLOBALS ******************************************************************/
HINSTANCE hAppInstance;
@ -425,7 +428,7 @@ WinMain(
if (!StartLsass())
{
DPRINT1("WL: Failed to start lsass.exe service (error %lu)\n", GetLastError());
ERR("WL: Failed to start lsass.exe service (error %lu)\n", GetLastError());
NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0, 0, 0, OptionOk, &HardErrorResponse);
ExitProcess(1);
}

1
reactos/base/system/winlogon/winlogon.rbuild
View file

@ -4,6 +4,7 @@
<include base="winlogon">.</include>
<define name="__USE_W32API" />
<define name="_WIN32_WINNT">0x0501</define>
<library>wine</library>
<library>ntdll</library>
<library>kernel32</library>
<library>user32</library>

8
reactos/base/system/winlogon/wlx.c
View file

@ -1,7 +1,7 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS Winlogon
* FILE: services/winlogon/wlx.c
* FILE: base/system/winlogon/wlx.c
* PURPOSE: Logon
* PROGRAMMERS: Thomas Weidenmueller (w3seek@users.sourceforge.net)
* Ge van Geldorp (gvg@reactos.com)
@ -15,9 +15,15 @@
//#define YDEBUG
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(winlogon);
/* GLOBALS ******************************************************************/
static DLGPROC PreviousWindowProc;
static UINT_PTR IdTimer;
/* FUNCTIONS ****************************************************************/
static BOOL CALLBACK
DefaultWlxWindowProc(
IN HWND hwndDlg,

6
reactos/dll/win32/advapi32/misc/shutdown.c
View file

@ -11,7 +11,7 @@
*/
#include <advapi32.h>
#include <wine/debug.h>
#include <debug.h>
#define USZ {0,0,0}
@ -150,9 +150,7 @@ BOOL WINAPI InitiateSystemShutdownExW( LPWSTR lpMachineName, LPWSTR lpMessage,
DWORD dwTimeout, BOOL bForceAppsClosed, BOOL bRebootAfterShutdown,
DWORD dwReason)
{
FIXME("%s %s %ld %d %d %ld\n", debugstr_w(lpMachineName),
debugstr_w(lpMessage), dwTimeout, bForceAppsClosed,
bRebootAfterShutdown, dwReason);
UNIMPLEMENTED;
return TRUE;
}

18
reactos/dll/win32/advapi32/reg/reg.c
View file

@ -17,6 +17,8 @@
#define NDEBUG
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(advapi32);
/* DEFINES ******************************************************************/
#define MAX_DEFAULT_HANDLES 6
@ -1668,7 +1670,7 @@ RegDeleteTreeA(IN HKEY hKey,
LONG WINAPI
RegDisableReflectionKey(IN HKEY hBase)
{
DPRINT1("RegDisableReflectionKey(0x%p) UNIMPLEMENTED!\n", hBase);
FIXME("RegDisableReflectionKey(0x%p) UNIMPLEMENTED!\n", hBase);
return ERROR_CALL_NOT_IMPLEMENTED;
}
@ -1681,7 +1683,7 @@ RegDisableReflectionKey(IN HKEY hBase)
LONG WINAPI
RegEnableReflectionKey(IN HKEY hBase)
{
DPRINT1("RegEnableReflectionKey(0x%p) UNIMPLEMENTED!\n", hBase);
FIXME("RegEnableReflectionKey(0x%p) UNIMPLEMENTED!\n", hBase);
return ERROR_CALL_NOT_IMPLEMENTED;
}
@ -3697,8 +3699,8 @@ LONG WINAPI
RegQueryReflectionKey(IN HKEY hBase,
OUT BOOL* bIsReflectionDisabled)
{
DPRINT1("RegQueryReflectionKey(0x%p, 0x%p) UNIMPLEMENTED!\n",
hBase, bIsReflectionDisabled);
FIXME("RegQueryReflectionKey(0x%p, 0x%p) UNIMPLEMENTED!\n",
hBase, bIsReflectionDisabled);
return ERROR_CALL_NOT_IMPLEMENTED;
}
@ -4860,8 +4862,8 @@ RegLoadMUIStringW(IN HKEY hKey,
IN ULONG Reserved,
IN LPCWSTR pszDirectory OPTIONAL)
{
DPRINT1("RegLoadMUIStringW(0x%p, 0x%p, 0x%p, 0x%x, 0x%x, 0x%p) UNIMPLEMENTED!\n",
hKey, pszValue, pszOutBuf, cbOutBuf, Reserved, pszDirectory);
FIXME("RegLoadMUIStringW(0x%p, 0x%p, 0x%p, 0x%x, 0x%x, 0x%p) UNIMPLEMENTED!\n",
hKey, pszValue, pszOutBuf, cbOutBuf, Reserved, pszDirectory);
return ERROR_CALL_NOT_IMPLEMENTED;
}
@ -4879,8 +4881,8 @@ RegLoadMUIStringA(IN HKEY hKey,
IN ULONG Reserved,
IN LPCSTR pszDirectory OPTIONAL)
{
DPRINT1("RegLoadMUIStringA(0x%p, 0x%p, 0x%p, 0x%x, 0x%x, 0x%p) UNIMPLEMENTED!\n",
hKey, pszValue, pszOutBuf, cbOutBuf, Reserved, pszDirectory);
FIXME("RegLoadMUIStringA(0x%p, 0x%p, 0x%p, 0x%x, 0x%x, 0x%p) UNIMPLEMENTED!\n",
hKey, pszValue, pszOutBuf, cbOutBuf, Reserved, pszDirectory);
return ERROR_CALL_NOT_IMPLEMENTED;
}

2
reactos/dll/win32/advapi32/token/token.c
View file

@ -14,6 +14,8 @@
#include <wine/debug.h>
#include <debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(advapi32);
/*
* @implemented
*/

1
reactos/dll/win32/icmp/icmp.rbuild
View file

@ -4,6 +4,7 @@
<include base="ReactOS">include/reactos/wine</include>
<define name="__USE_W32API" />
<define name="_WIN32_WINNT">0x501</define>
<library>wine</library>
<library>kernel32</library>
<library>ws2_32</library>
<library>wine</library>

68
reactos/dll/win32/iphlpapi/ifenum_reactos.c
View file

@ -43,6 +43,8 @@
//#define NDEBUG
#include "debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi);
/* Globals */
const PWCHAR TcpFileName = L"\\Device\\Tcp";
@ -96,7 +98,7 @@ NTSTATUS openTcpFile(PHANDLE tcpFile) {
* string we provided */
if (!NT_SUCCESS(status)) {
DPRINT1("openTcpFile for <%wZ> failed: 0x%lx\n", &fileName, status);
ERR("openTcpFile for <%wZ> failed: 0x%lx\n", &fileName, status);
}
return status;
@ -172,7 +174,7 @@ NTSTATUS tdiGetSetOfThings( HANDLE tcpFile,
if(!NT_SUCCESS(status))
{
DPRINT("IOCTL Failed\n");
ERR("IOCTL Failed\n");
return STATUS_UNSUCCESSFUL;
}
@ -181,7 +183,7 @@ NTSTATUS tdiGetSetOfThings( HANDLE tcpFile,
if( !entitySet ) {
status = STATUS_INSUFFICIENT_RESOURCES;
DPRINT("TdiGetSetOfThings() => %08x\n", (int)status);
WARN("TdiGetSetOfThings() => %08x\n", (int)status);
return status;
}
@ -203,11 +205,11 @@ NTSTATUS tdiGetSetOfThings( HANDLE tcpFile,
if(!status)
{
DPRINT("IOCTL Failed\n");
WARN("IOCTL Failed\n");
return STATUS_UNSUCCESSFUL;
}
DPRINT("TdiGetSetOfThings(): Array changed size: %d -> %d.\n",
WARN("TdiGetSetOfThings(): Array changed size: %d -> %d.\n",
arraySize, allocationSizeForEntityArray );
} while( TRUE ); /* We break if the array we received was the size we
* expected. Therefore, we got here because it wasn't */
@ -215,7 +217,7 @@ NTSTATUS tdiGetSetOfThings( HANDLE tcpFile,
*numEntries = (arraySize - fixedPart) / entrySize;
*tdiEntitySet = entitySet;
DPRINT("TdiGetSetOfThings() => Success: %d things @ %08x\n",
WARN("TdiGetSetOfThings() => Success: %d things @ %08x\n",
(int)*numEntries, (int)entitySet);
return STATUS_SUCCESS;
@ -231,7 +233,7 @@ NTSTATUS tdiGetMibForIfEntity
NTSTATUS status = STATUS_SUCCESS;
DWORD returnSize;
DPRINT("TdiGetMibForIfEntity(tcpFile %x,entityId %x)\n",
WARN("TdiGetMibForIfEntity(tcpFile %x,entityId %x)\n",
(int)tcpFile, (int)ent->tei_instance);
req.ID.toi_class = INFO_CLASS_PROTOCOL;
@ -250,11 +252,11 @@ NTSTATUS tdiGetMibForIfEntity
if(!status)
{
DPRINT("IOCTL Failed\n");
WARN("IOCTL Failed\n");
return STATUS_UNSUCCESSFUL;
}
DPRINT("TdiGetMibForIfEntity() => {\n"
TRACE("TdiGetMibForIfEntity() => {\n"
" if_index ....................... %x\n"
" if_type ........................ %x\n"
" if_mtu ......................... %d\n"
@ -265,7 +267,7 @@ NTSTATUS tdiGetMibForIfEntity
entry->ent.if_mtu,
entry->ent.if_speed,
entry->ent.if_physaddrlen);
DPRINT(" if_physaddr .................... %02x:%02x:%02x:%02x:%02x:%02x\n"
TRACE(" if_physaddr .................... %02x:%02x:%02x:%02x:%02x:%02x\n"
" if_descr ....................... %s\n",
entry->ent.if_physaddr[0] & 0xff,
entry->ent.if_physaddr[1] & 0xff,
@ -274,7 +276,7 @@ NTSTATUS tdiGetMibForIfEntity
entry->ent.if_physaddr[4] & 0xff,
entry->ent.if_physaddr[5] & 0xff,
entry->ent.if_descr);
DPRINT("} status %08x\n",status);
TRACE("} status %08x\n",status);
return status;
}
@ -296,7 +298,7 @@ NTSTATUS tdiGetEntityIDSet( HANDLE tcpFile,
int i;
for( i = 0; i < *numEntities; i++ ) {
DPRINT("%-4d: %04x:%08x\n",
TRACE("%-4d: %04x:%08x\n",
i,
(*entitySet)[i].tei_entity,
(*entitySet)[i].tei_instance );
@ -328,7 +330,7 @@ NTSTATUS tdiGetEntityType( HANDLE tcpFile, TDIEntityID *ent, PULONG type ) {
NTSTATUS status = STATUS_SUCCESS;
DWORD returnSize;
DPRINT("TdiGetEntityType(tcpFile %x,entityId %x)\n",
TRACE("TdiGetEntityType(tcpFile %x,entityId %x)\n",
(DWORD)tcpFile, ent->tei_instance);
req.ID.toi_class = INFO_CLASS_GENERIC;
@ -346,7 +348,7 @@ NTSTATUS tdiGetEntityType( HANDLE tcpFile, TDIEntityID *ent, PULONG type ) {
&returnSize,
NULL );
DPRINT("TdiGetEntityType() => %08x %08x\n", *type, status);
TRACE("TdiGetEntityType() => %08x %08x\n", *type, status);
return (status ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL);
}
@ -386,7 +388,7 @@ static NTSTATUS getInterfaceInfoSet( HANDLE tcpFile,
int curInterf = 0, i;
if (!NT_SUCCESS(status)) {
DPRINT1("getInterfaceInfoSet: tdiGetEntityIDSet() failed: 0x%lx\n", status);
ERR("getInterfaceInfoSet: tdiGetEntityIDSet() failed: 0x%lx\n", status);
return status;
}
@ -401,7 +403,7 @@ static NTSTATUS getInterfaceInfoSet( HANDLE tcpFile,
( tcpFile,
&entIDSet[i],
&infoSetInt[curInterf].if_info );
DPRINT("tdiGetMibForIfEntity: %08x\n", status);
TRACE("tdiGetMibForIfEntity: %08x\n", status);
if( NT_SUCCESS(status) ) {
DWORD numAddrs;
IPAddrEntry *addrs;
@ -414,7 +416,7 @@ static NTSTATUS getInterfaceInfoSet( HANDLE tcpFile,
status = tdiGetIpAddrsForIpEntity
( tcpFile, &ip_ent, &addrs, &numAddrs );
for( j = 0; j < numAddrs && NT_SUCCESS(status); j++ ) {
DPRINT("ADDR %d: index %d (target %d)\n", j, addrs[j].iae_index, infoSetInt[curInterf].if_info.ent.if_index);
TRACE("ADDR %d: index %d (target %d)\n", j, addrs[j].iae_index, infoSetInt[curInterf].if_info.ent.if_index);
if( addrs[j].iae_index ==
infoSetInt[curInterf].if_info.ent.if_index ) {
memcpy( &infoSetInt[curInterf].ip_addr,
@ -452,14 +454,14 @@ static DWORD getNumInterfacesInt(BOOL onlyNonLoopback)
status = openTcpFile( &tcpFile );
if( !NT_SUCCESS(status) ) {
DPRINT("getNumInterfaces: failed %08x\n", status );
WARN("getNumInterfaces: failed %08x\n", status );
return 0;
}
status = tdiGetEntityIDSet( tcpFile, &entitySet, &numEntities );
if( !NT_SUCCESS(status) ) {
DPRINT("getNumInterfaces: failed %08x\n", status );
WARN("getNumInterfaces: failed %08x\n", status );
return 0;
}
@ -470,7 +472,7 @@ static DWORD getNumInterfacesInt(BOOL onlyNonLoopback)
numInterfaces++;
}
DPRINT("getNumInterfaces: success: %d %d %08x\n",
TRACE("getNumInterfaces: success: %d %d %08x\n",
onlyNonLoopback, numInterfaces, status );
closeTcpFile( tcpFile );
@ -507,7 +509,7 @@ DWORD getNthInterfaceEntity( HANDLE tcpFile, DWORD index, TDIEntityID *ent ) {
}
}
DPRINT("Index %d is entity #%d - %04x:%08x\n", index, i,
TRACE("Index %d is entity #%d - %04x:%08x\n", index, i,
entitySet[i].tei_entity, entitySet[i].tei_instance );
if( numInterfaces == index && i < numEntities ) {
@ -619,7 +621,7 @@ InterfaceIndexTable *getInterfaceIndexTableInt( BOOL nonLoopbackOnly ) {
if( NT_SUCCESS(status) ) {
status = getInterfaceInfoSet( tcpFile, &ifInfo, &numInterfaces );
DPRINT("InterfaceInfoSet: %08x, %04x:%08x\n",
TRACE("InterfaceInfoSet: %08x, %04x:%08x\n",
status,
ifInfo->entity_id.tei_entity,
ifInfo->entity_id.tei_instance);
@ -632,13 +634,13 @@ InterfaceIndexTable *getInterfaceIndexTableInt( BOOL nonLoopbackOnly ) {
if (ret) {
ret->numAllocated = numInterfaces;
DPRINT("NumInterfaces = %d\n", numInterfaces);
TRACE("NumInterfaces = %d\n", numInterfaces);
for( i = 0; i < numInterfaces; i++ ) {
DPRINT("Examining interface %d\n", i);
TRACE("Examining interface %d\n", i);
if( !nonLoopbackOnly ||
!isLoopback( tcpFile, &ifInfo[i].entity_id ) ) {
DPRINT("Interface %d matches (%d)\n", i, curInterface);
TRACE("Interface %d matches (%d)\n", i, curInterface);
ret->indexes[curInterface++] =
ifInfo[i].if_info.ent.if_index;
}
@ -678,7 +680,7 @@ NTSTATUS getIPAddrEntryForIf(HANDLE tcpFile,
getInterfaceInfoByIndex( tcpFile, index, ifInfo );
if (!NT_SUCCESS(status)) {
DPRINT1("getIPAddrEntryForIf returning %lx\n", status);
ERR("getIPAddrEntryForIf returning %lx\n", status);
}
return status;
@ -797,7 +799,7 @@ DWORD getInterfaceEntryByName(const char *name, PMIB_IFROW entry)
IFInfo info;
NTSTATUS status = openTcpFile( &tcpFile );
DPRINT("Called.\n");
TRACE("Called.\n");
if( NT_SUCCESS(status) ) {
status = getInterfaceInfoByName( tcpFile, (char *)name, &info );
@ -808,7 +810,7 @@ DWORD getInterfaceEntryByName(const char *name, PMIB_IFROW entry)
sizeof(info.if_info) );
}
DPRINT("entry->bDescr = %s\n", entry->bDescr);
TRACE("entry->bDescr = %s\n", entry->bDescr);
closeTcpFile( tcpFile );
}
@ -822,7 +824,7 @@ DWORD getInterfaceEntryByIndex(DWORD index, PMIB_IFROW entry)
IFInfo info;
NTSTATUS status = openTcpFile( &tcpFile );
DPRINT("Called.\n");
TRACE("Called.\n");
if( NT_SUCCESS(status) ) {
status = getInterfaceInfoByIndex( tcpFile, index, &info );
@ -860,7 +862,7 @@ NTSTATUS addIPAddress( IPAddr Address, IPMask Mask, DWORD IfIndex,
IP_SET_DATA Data;
IO_STATUS_BLOCK Iosb;
DPRINT("Called.\n");
TRACE("Called.\n");
if( !NT_SUCCESS(status) ) return status;
@ -887,7 +889,7 @@ NTSTATUS addIPAddress( IPAddr Address, IPMask Mask, DWORD IfIndex,
}
if (!NT_SUCCESS(status)) {
DPRINT1("addIPAddress for if %d returning 0x%lx\n", IfIndex, status);
ERR("addIPAddress for if %d returning 0x%lx\n", IfIndex, status);
}
return status;
@ -900,7 +902,7 @@ NTSTATUS deleteIpAddress( ULONG NteContext )
NTSTATUS status = openTcpFile( &tcpFile );
IO_STATUS_BLOCK Iosb;
DPRINT("Called.\n");
TRACE("Called.\n");
if( !NT_SUCCESS(status) ) return status;
@ -918,7 +920,7 @@ NTSTATUS deleteIpAddress( ULONG NteContext )
closeTcpFile( tcpFile );
if (!NT_SUCCESS(status)) {
DPRINT1("deleteIpAddress(%lu) returning 0x%lx\n", NteContext, status);
ERR("deleteIpAddress(%lu) returning 0x%lx\n", NteContext, status);
}
return status;

4
reactos/dll/win32/iphlpapi/iphlpapi_main.c
View file

@ -946,7 +946,7 @@ DWORD WINAPI GetInterfaceInfo(PIP_INTERFACE_INFO pIfTable, PULONG dwOutBufLen)
ret = ERROR_INVALID_PARAMETER;
else {
DWORD numNonLoopbackInterfaces = getNumNonLoopbackInterfaces();
DPRINT("numNonLoopbackInterfaces == 0x%x\n", numNonLoopbackInterfaces);
TRACE("numNonLoopbackInterfaces == 0x%x\n", numNonLoopbackInterfaces);
ULONG size = sizeof(IP_INTERFACE_INFO) + (numNonLoopbackInterfaces) *
sizeof(IP_ADAPTER_INDEX_MAP);
@ -956,7 +956,7 @@ DWORD WINAPI GetInterfaceInfo(PIP_INTERFACE_INFO pIfTable, PULONG dwOutBufLen)
}
else {
InterfaceIndexTable *table = getNonLoopbackInterfaceIndexTable();
DPRINT("table->numIndexes == 0x%x\n", table->numIndexes);
TRACE("table->numIndexes == 0x%x\n", table->numIndexes);
if (table) {
size = sizeof(IP_INTERFACE_INFO) + (table->numIndexes) *

24
reactos/dll/win32/iphlpapi/ipstats_reactos.c
View file

@ -26,6 +26,8 @@
#include "ipstats.h"
#include "ifenum.h"
WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi);
#ifndef TCPS_ESTABLISHED
# define TCPS_ESTABLISHED TCP_ESTABLISHED
#endif
@ -81,7 +83,7 @@ BOOL isIpEntity( HANDLE tcpFile, TDIEntityID *ent ) {
&returnedLen,
NULL );
DPRINT("Ent: %04x:d -> %04x\n",
TRACE("Ent: %04x:d -> %04x\n",
ent->tei_entity, ent->tei_instance, entityType );
return NT_SUCCESS(status) && entityType == CL_NL_IP;
@ -99,14 +101,14 @@ NTSTATUS getNthIpEntity( HANDLE tcpFile, DWORD index, TDIEntityID *ent ) {
for( i = 0; i < numEntities; i++ ) {
if( isIpEntity( tcpFile, &entitySet[i] ) ) {
DPRINT("Entity %d is an IP Entity\n", i);
TRACE("Entity %d is an IP Entity\n", i);
if( numRoutes == index ) break;
else numRoutes++;
}
}
if( numRoutes == index && i < numEntities ) {
DPRINT("Index %d is entity #%d - %04x:%08x\n", index, i,
TRACE("Index %d is entity #%d - %04x:%08x\n", index, i,
entitySet[i].tei_entity, entitySet[i].tei_instance );
memcpy( ent, &entitySet[i], sizeof(*ent) );
tdiFreeThingSet( entitySet );
@ -125,7 +127,7 @@ NTSTATUS tdiGetMibForIpEntity
memset( entry, 0, sizeof( *entry ) );
DPRINT("TdiGetMibForIpEntity(tcpFile %x,entityId %x)\n",
TRACE("TdiGetMibForIpEntity(tcpFile %x,entityId %x)\n",
(DWORD)tcpFile, ent->tei_instance);
req.ID.toi_class = INFO_CLASS_PROTOCOL;
@ -142,7 +144,7 @@ NTSTATUS tdiGetMibForIpEntity
&returnSize,
NULL );
DPRINT("TdiGetMibForIpEntity() => {\n"
TRACE("TdiGetMibForIpEntity() => {\n"
" ipsi_forwarding ............ %d\n"
" ipsi_defaultttl ............ %d\n"
" ipsi_inreceives ............ %d\n"
@ -175,7 +177,7 @@ NTSTATUS tdiGetRoutesForIpEntity
( HANDLE tcpFile, TDIEntityID *ent, IPRouteEntry **routes, PDWORD numRoutes ) {
NTSTATUS status = STATUS_SUCCESS;
DPRINT("TdiGetRoutesForIpEntity(tcpFile %x,entityId %x)\n",
TRACE("TdiGetRoutesForIpEntity(tcpFile %x,entityId %x)\n",
(DWORD)tcpFile, ent->tei_instance);
status = tdiGetSetOfThings( tcpFile,
@ -196,7 +198,7 @@ NTSTATUS tdiGetIpAddrsForIpEntity
( HANDLE tcpFile, TDIEntityID *ent, IPAddrEntry **addrs, PDWORD numAddrs ) {
NTSTATUS status;
DPRINT("TdiGetIpAddrsForIpEntity(tcpFile %x,entityId %x)\n",
TRACE("TdiGetIpAddrsForIpEntity(tcpFile %x,entityId %x)\n",
(DWORD)tcpFile, ent->tei_instance);
status = tdiGetSetOfThings( tcpFile,
@ -451,7 +453,7 @@ RouteTable *getRouteTable(void)
if( !NT_SUCCESS(status) )
return 0;
DPRINT("GETTING ROUTE TABLE\n");
TRACE("GETTING ROUTE TABLE\n");
out_route_table = HeapAlloc( GetProcessHeap(), 0,
sizeof(RouteTable) +
@ -466,7 +468,7 @@ RouteTable *getRouteTable(void)
getNthIpEntity( tcpFile, i, &ent );
tdiGetMibForIpEntity( tcpFile, &ent, &snmpInfo );
DPRINT( "%d routes in instance %d\n", snmpInfo.ipsi_numroutes, i );
TRACE( "%d routes in instance %d\n", snmpInfo.ipsi_numroutes, i );
tdiGetRoutesForIpEntity( tcpFile, &ent, &route_set, &numRoutes );
@ -476,7 +478,7 @@ RouteTable *getRouteTable(void)
return 0;
}
DPRINT("Route set returned\n");
TRACE("Route set returned\n");
#if 0
HexDump( route_set,
sizeof( IPRouteEntry ) *
@ -502,7 +504,7 @@ RouteTable *getRouteTable(void)
routesAdded += snmpInfo.ipsi_numroutes;
}
DPRINT("Return: %08x, %08x\n", status, out_route_table);
TRACE("Return: %08x, %08x\n", status, out_route_table);
return out_route_table;
}

8
reactos/dll/win32/iphlpapi/route_reactos.c
View file

@ -61,7 +61,7 @@ DWORD createIpForwardEntry( PMIB_IPFORWARDROW pRoute ) {
TDIEntityID id;
DWORD returnSize = 0;
DPRINT("Called.\n");
TRACE("Called.\n");
if( NT_SUCCESS(status) )
status = getNthIpEntity( tcpFile, 0, &id );
@ -103,7 +103,7 @@ DWORD createIpForwardEntry( PMIB_IPFORWARDROW pRoute ) {
if( tcpFile != INVALID_HANDLE_VALUE )
closeTcpFile( tcpFile );
DPRINT("Returning: %08x (IOCTL was %08x)\n", status, IOCTL_TCP_SET_INFORMATION_EX);
TRACE("Returning: %08x (IOCTL was %08x)\n", status, IOCTL_TCP_SET_INFORMATION_EX);
if( NT_SUCCESS(status) )
return NO_ERROR;
@ -125,7 +125,7 @@ DWORD deleteIpForwardEntry( PMIB_IPFORWARDROW pRoute ) {
TDIEntityID id;
DWORD returnSize = 0;
DPRINT("Called.\n");
TRACE("Called.\n");
if( NT_SUCCESS(status) )
status = getNthIpEntity( tcpFile, 0, &id );
@ -167,7 +167,7 @@ DWORD deleteIpForwardEntry( PMIB_IPFORWARDROW pRoute ) {
if( tcpFile != INVALID_HANDLE_VALUE )
closeTcpFile( tcpFile );
DPRINT("Returning: %08x (IOCTL was %08x)\n", status, IOCTL_TCP_SET_INFORMATION_EX);
TRACE("Returning: %08x (IOCTL was %08x)\n", status, IOCTL_TCP_SET_INFORMATION_EX);
if( NT_SUCCESS(status) )
return NO_ERROR;

2
reactos/dll/win32/kernel32/kernel32.rbuild
View file

@ -110,7 +110,7 @@
<directory name="thread">
<directory name="i386">
<file>fiber.S</file>
<file>thread.S</file>
<file>thread.S</file>
</directory>
</directory>
</module>

10
reactos/dll/win32/kernel32/misc/lcformat.c
View file

@ -3,7 +3,7 @@
*
* Copyright 1995 Martin von Loewis
* Copyright 1998 David Lee Lambert
* Copyright 2000 Julio César Gázquez
* Copyright 2000 Julio César Gázquez
* Copyright 2003 Jon Griffiths
*
* This library is free software; you can redistribute it and/or
@ -32,10 +32,12 @@
#include "wine/config.h"
#include "wine/unicode.h"
#include "wine/debug.h"
#define NDEBUG
#include <debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(nls);
#define TRACE DPRINT
#define WARN DPRINT1
#define FIXME DPRINT1
#define DATE_DATEVARSONLY 0x0100 /* only date stuff: yMdg */
#define TIME_TIMEVARSONLY 0x0200 /* only time stuff: hHmst */

2
reactos/dll/win32/msgina/gui.c
View file

@ -10,6 +10,8 @@
//#define YDEBUG
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(msgina);
typedef struct _DISPLAYSTATUSMSG
{
PGINA_CONTEXT Context;

2
reactos/dll/win32/msgina/msgina.c
View file

@ -29,6 +29,8 @@
//#define YDEBUG
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(msgina);
extern HINSTANCE hDllInstance;
extern GINA_UI GinaGraphicalUI;

1
reactos/dll/win32/msgina/msgina.rbuild
View file

@ -5,6 +5,7 @@
<define name="__REACTOS__" />
<define name="__USE_W32API" />
<library>ntdll</library>
<library>wine</library>
<library>kernel32</library>
<library>advapi32</library>
<library>user32</library>

2
reactos/dll/win32/msgina/tui.c
View file

@ -10,6 +10,8 @@
#define YDEBUG
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(msgina);
static BOOL
TUIInitialize(
IN OUT PGINA_CONTEXT pgContext)

2
reactos/dll/win32/newdev/stubs.c
View file

@ -20,8 +20,6 @@
#include "newdev_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(newdev);
/*
* @unimplemented
*/

2
reactos/dll/win32/rpcrt4/ndr_contexth.c
View file

@ -25,6 +25,8 @@
#include "rpc_binding.h"
#include "ndr_contexth.h"
WINE_DEFAULT_DEBUG_CHANNEL(rpcrt4);
static SContextHandle *CtxList = NULL;
static CRITICAL_SECTION CtxList_cs;

2
reactos/dll/win32/shell32/shfldr_fs.c
View file

@ -1250,7 +1250,7 @@ ISFHelper_fnCopyItems (ISFHelper * iface, IShellFolder * pSFFrom, UINT cidl,
PathAddBackslashA (szDstPath);
_ILSimpleGetText (apidl[i], szDstPath + strlen (szDstPath),
MAX_PATH);
DPRINT1 ("copy %s to %s\n", szSrcPath, szDstPath);
TRACE ("copy %s to %s\n", szSrcPath, szDstPath);
if (fileMoving)
{

14
reactos/dll/win32/shell32/shv_bg_cmenu.c
View file

@ -244,7 +244,7 @@ static BOOL DoLink(LPCSTR pSrcFile, LPCSTR pDstFile)
goto fail;
}
DPRINT1("shortcut point to %s\n", pSrcFile);
TRACE("shortcut point to %s\n", pSrcFile);
hres = IShellLinkA_SetPath(psl, pSrcFile);
@ -270,12 +270,12 @@ static BOOL DoLink(LPCSTR pSrcFile, LPCSTR pDstFile)
hres = IPersistFile_SaveCompleted(pPf, widelink);
IPersistFile_Release(pPf);
IShellLinkA_Release(psl);
DPRINT1("shortcut %s has been created, result=%08lx\n", pDstFile, hres);
TRACE("shortcut %s has been created, result=%08lx\n", pDstFile, hres);
ret = TRUE;
}
else
{
DPRINT1("CoCreateInstance failed, hres=%08lx\n", hres);
ERR("CoCreateInstance failed, hres=%08lx\n", hres);
}
fail:
@ -330,7 +330,7 @@ static BOOL MakeLink(IContextMenu2 *iface)
IShellFolder_QueryInterface(This->pSFParent, &IID_IPersistFolder2, (LPVOID*)&ppfdst);
IShellFolder_QueryInterface(psfFrom, &IID_IPersistFolder2, (LPVOID*)&ppfsrc);
DPRINT1("[%p,%p]\n",ppfdst,ppfsrc);
TRACE("[%p,%p]\n",ppfdst,ppfsrc);
/* do the link/s */
/* hack to get desktop path */
@ -363,7 +363,7 @@ static BOOL MakeLink(IContextMenu2 *iface)
{
_ILSimpleGetText (apidl[i], filename, MAX_PATH);
DPRINT1("filename %s\n", filename);
TRACE("filename %s\n", filename);
lstrcpyA(linkFilename, szDstPath);
PathAddBackslashA(linkFilename);
@ -371,13 +371,13 @@ static BOOL MakeLink(IContextMenu2 *iface)
lstrcatA(linkFilename, filename);
lstrcatA(linkFilename, ".lnk");
DPRINT1("linkFilename %s\n", linkFilename);
TRACE("linkFilename %s\n", linkFilename);
lstrcpyA(srcFilename, szSrcPath);
PathAddBackslashA(srcFilename);
lstrcatA(srcFilename, filename);
DPRINT1("srcFilename %s\n", srcFilename);
TRACE("srcFilename %s\n", srcFilename);
ret = DoLink(srcFilename, linkFilename);

1
reactos/dll/win32/user32/controls/button.c
View file

@ -66,6 +66,7 @@
#include <user32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(button);
/* GetWindowLong offsets for window extra information */
#define STATE_GWL_OFFSET 0

2
reactos/dll/win32/user32/controls/listbox.c
View file

@ -21,6 +21,8 @@
#include <user32.h>
#include <wine/debug.h>
WINE_DECLARE_DEBUG_CHANNEL(combo);
WINE_DEFAULT_DEBUG_CHANNEL(listbox);
/* Start of hack section -------------------------------- */

14
reactos/dll/win32/user32/controls/scrollbar.c
View file

@ -33,7 +33,7 @@
#include <user32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(scrollbar);
/* GLOBAL VARIABLES ***********************************************************/
@ -729,7 +729,7 @@ IntScrollHandleKbdEvent(
WPARAM wParam /* [in] Variable input including enable state */,
LPARAM lParam /* [in] Variable input including input point */)
{
DPRINT("Wnd=%p wParam=%d lParam=%ld\n", Wnd, wParam, lParam);
TRACE("Wnd=%p wParam=%d lParam=%ld\n", Wnd, wParam, lParam);
/* hide caret on first KEYDOWN to prevent flicker */
if (0 == (lParam & PFD_DOUBLEBUFFER_DONTCARE))
@ -1079,7 +1079,7 @@ static void IntScrollCreateScrollBar(
Info.nTrackPos = 0;
NtUserSetScrollInfo(Wnd, SB_CTL, &Info, FALSE);
DPRINT("hwnd=%p lpCreate=%p\n", Wnd, lpCreate);
TRACE("hwnd=%p lpCreate=%p\n", Wnd, lpCreate);
#if 0 /* FIXME */
if (lpCreate->style & WS_DISABLED)
@ -1445,14 +1445,14 @@ ScrollBarWndProc(HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam)
case 0x00ed:
case 0x00ee:
case 0x00ef:
DPRINT("unknown Win32 msg %04x wp=%08x lp=%08lx\n",
WARN("unknown Win32 msg %04x wp=%08x lp=%08lx\n",
Msg, wParam, lParam );
break;
default:
if (WM_USER <= Msg)
{
DPRINT("unknown msg %04x wp=%04x lp=%08lx\n", Msg, wParam, lParam);
WARN("unknown msg %04x wp=%04x lp=%08lx\n", Msg, wParam, lParam);
}
return DefWindowProcW(Wnd, Msg, wParam, lParam );
}
@ -1503,7 +1503,7 @@ GetScrollInfo(HWND Wnd, INT SBType, LPSCROLLINFO Info)
INT STDCALL
GetScrollPos(HWND Wnd, INT Bar)
{
DPRINT("Wnd=%p Bar=%d\n", Wnd, Bar);
TRACE("Wnd=%p Bar=%d\n", Wnd, Bar);
/* Refer SB_CTL requests to the window */
if (SB_CTL == Bar)
@ -1522,7 +1522,7 @@ GetScrollPos(HWND Wnd, INT Bar)
BOOL STDCALL
GetScrollRange(HWND Wnd, int Bar, LPINT MinPos, LPINT MaxPos)
{
DPRINT("Wnd=%x Bar=%d Min=%p Max=%p\n", Wnd, Bar, MinPos, MaxPos);
TRACE("Wnd=%x Bar=%d Min=%p Max=%p\n", Wnd, Bar, MinPos, MaxPos);
/* Refer SB_CTL requests to the window */
if (SB_CTL == Bar)

1
reactos/dll/win32/user32/include/user32.h
View file

@ -9,6 +9,7 @@
/* INCLUDES ******************************************************************/
/* C Headers */
#include <assert.h>
#include <stdio.h>
#include <math.h>

7
reactos/dll/win32/user32/misc/desktop.c
View file

@ -12,6 +12,7 @@
#include <user32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(user32);
#define DESKTOP_CLASS_ATOM MAKEINTATOMA(32769) /* Desktop */
static LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam );
@ -35,7 +36,7 @@ LRESULT
WINAPI
DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam )
{
DPRINT1("Desktop Class Atom!\n");
FIXME("Desktop Class Atom!\n");
if (message == WM_NCCREATE) return TRUE;
return 0; /* all other messages are ignored */
}
@ -126,7 +127,7 @@ SystemParametersInfoA(UINT uiAction,
case SPI_SETSOUNDSENTRY:
{
/* FIXME: Support this accessibility SPI actions */
DPRINT1("FIXME: Unsupported SPI Code: %lx \n",uiAction );
FIXME("FIXME: Unsupported SPI Code: %lx \n",uiAction );
return FALSE;
}
@ -349,7 +350,7 @@ SystemParametersInfoW(UINT uiAction,
case SPI_SETSOUNDSENTRY:
{
/* FIXME: Support this accessibility SPI actions */
DPRINT1("FIXME: Unsupported SPI Code: %lx \n",uiAction );
FIXME("FIXME: Unsupported SPI Code: %lx \n",uiAction );
return FALSE;
}
case SPI_GETDESKWALLPAPER:

3
reactos/dll/win32/user32/misc/display.c
View file

@ -31,6 +31,7 @@
#include <user32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(user32);
#define SIZEOF_DEVMODEA_300 124
#define SIZEOF_DEVMODEA_400 148
@ -368,7 +369,7 @@ GetMonitorInfoA(
NULL, NULL);
if (res == 0)
{
DPRINT("WideCharToMultiByte() failed!\n");
WARN("WideCharToMultiByte() failed!\n");
return FALSE;
}
}

5
reactos/dll/win32/user32/misc/object.c
View file

@ -31,6 +31,7 @@
#include <user32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(user32);
/* FUNCTIONS *****************************************************************/
@ -96,7 +97,7 @@ GetUserObjectInformationA(
LPWSTR buffer;
BOOL ret = TRUE;
DPRINT("GetUserObjectInformationA(%x %d %x %d %x)\n", hObj, nIndex,
TRACE("GetUserObjectInformationA(%x %d %x %d %x)\n", hObj, nIndex,
pvInfo, nLength, lpnLengthNeeded);
if (nIndex != UOI_NAME && nIndex != UOI_TYPE)
@ -143,7 +144,7 @@ GetUserObjectInformationW(
DWORD nLength,
LPDWORD lpnLengthNeeded)
{
DPRINT("GetUserObjectInformationW(%x %d %x %d %x)\n", hObj, nIndex,
TRACE("GetUserObjectInformationW(%x %d %x %d %x)\n", hObj, nIndex,
pvInfo, nLength, lpnLengthNeeded);
return NtUserGetObjectInformation(hObj, nIndex, pvInfo, nLength, lpnLengthNeeded);
}

9
reactos/dll/win32/user32/windows/bitmap.c
View file

@ -31,6 +31,7 @@
#include <user32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(user32);
#include "pshpack1.h"
@ -600,7 +601,7 @@ CopyImage(
if (flags & LR_COPYFROMRESOURCE)
{
DPRINT1("FIXME: The flag LR_COPYFROMRESOURCE is not implemented for bitmaps\n");
FIXME("FIXME: The flag LR_COPYFROMRESOURCE is not implemented for bitmaps\n");
}
if (desiredx == 0) desiredx = ds.dsBm.bmWidth;
@ -771,7 +772,7 @@ CopyImage(
/* FIXME: support loading the image as shared from an instance */
if (!IconMsgDisplayed)
{
DPRINT("FIXME: CopyImage doesn't support IMAGE_ICON correctly!\n");
FIXME("FIXME: CopyImage doesn't support IMAGE_ICON correctly!\n");
IconMsgDisplayed = TRUE;
}
return CopyIcon(hnd);
@ -784,13 +785,13 @@ CopyImage(
/* FIXME: support loading the image as shared from an instance */
if (!IconMsgDisplayed)
{
DPRINT("FIXME: CopyImage doesn't support IMAGE_CURSOR correctly!\n");
FIXME("FIXME: CopyImage doesn't support IMAGE_CURSOR correctly!\n");
IconMsgDisplayed = TRUE;
}
/* Should call CURSORICON_ExtCopy but more testing
* needs to be done before we change this
*/
if (flags) DPRINT1("FIXME: Flags are ignored\n");
if (flags) FIXME("FIXME: Flags are ignored\n");
return CopyCursor(hnd);
}
}

29
reactos/dll/win32/user32/windows/class.c
View file

@ -12,6 +12,7 @@
#include <user32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(user32);
extern BOOL ControlsInitialized;
@ -442,12 +443,12 @@ CreateSmallIcon(HICON StdIcon)
SmallIconHeight = GetSystemMetrics(SM_CYSMICON);
if (! GetIconInfo(StdIcon, &StdInfo))
{
DPRINT1("Failed to get icon info for icon 0x%x\n", StdIcon);
ERR("Failed to get icon info for icon 0x%x\n", StdIcon);
goto cleanup;
}
if (! GetObjectW(StdInfo.hbmMask, sizeof(BITMAP), &StdBitmapInfo))
{
DPRINT1("Failed to get bitmap info for icon 0x%x bitmap 0x%x\n",
ERR("Failed to get bitmap info for icon 0x%x bitmap 0x%x\n",
StdIcon, StdInfo.hbmColor);
goto cleanup;
}
@ -464,71 +465,71 @@ CreateSmallIcon(HICON StdIcon)
hInfoDc = CreateICW(NULL, NULL, NULL, NULL);
if (NULL == hInfoDc)
{
DPRINT1("Failed to create info DC\n");
ERR("Failed to create info DC\n");
goto cleanup;
}
hSourceDc = CreateCompatibleDC(NULL);
if (NULL == hSourceDc)
{
DPRINT1("Failed to create source DC\n");
ERR("Failed to create source DC\n");
goto cleanup;
}
hDestDc = CreateCompatibleDC(NULL);
if (NULL == hDestDc)
{
DPRINT1("Failed to create dest DC\n");
ERR("Failed to create dest DC\n");
goto cleanup;
}
OldSourceBitmap = SelectObject(hSourceDc, StdInfo.hbmColor);
if (NULL == OldSourceBitmap)
{
DPRINT1("Failed to select source color bitmap\n");
ERR("Failed to select source color bitmap\n");
goto cleanup;
}
SmallInfo.hbmColor = CreateCompatibleBitmap(hInfoDc, SmallIconWidth,
SmallIconHeight);
if (NULL == SmallInfo.hbmColor)
{
DPRINT1("Failed to create color bitmap\n");
ERR("Failed to create color bitmap\n");
goto cleanup;
}
OldDestBitmap = SelectObject(hDestDc, SmallInfo.hbmColor);
if (NULL == OldDestBitmap)
{
DPRINT1("Failed to select dest color bitmap\n");
ERR("Failed to select dest color bitmap\n");
goto cleanup;
}
if (! StretchBlt(hDestDc, 0, 0, SmallIconWidth, SmallIconHeight,
hSourceDc, 0, 0, StdBitmapInfo.bmWidth,
StdBitmapInfo.bmHeight, SRCCOPY))
{
DPRINT1("Failed to stretch color bitmap\n");
ERR("Failed to stretch color bitmap\n");
goto cleanup;
}
if (NULL == SelectObject(hSourceDc, StdInfo.hbmMask))
{
DPRINT1("Failed to select source mask bitmap\n");
ERR("Failed to select source mask bitmap\n");
goto cleanup;
}
SmallInfo.hbmMask = CreateBitmap(SmallIconWidth, SmallIconHeight, 1, 1,
NULL);
if (NULL == SmallInfo.hbmMask)
{
DPRINT1("Failed to create mask bitmap\n");
ERR("Failed to create mask bitmap\n");
goto cleanup;
}
if (NULL == SelectObject(hDestDc, SmallInfo.hbmMask))
{
DPRINT1("Failed to select dest mask bitmap\n");
ERR("Failed to select dest mask bitmap\n");
goto cleanup;
}
if (! StretchBlt(hDestDc, 0, 0, SmallIconWidth, SmallIconHeight,
hSourceDc, 0, 0, StdBitmapInfo.bmWidth,
StdBitmapInfo.bmHeight, SRCCOPY))
{
DPRINT1("Failed to stretch mask bitmap\n");
ERR("Failed to stretch mask bitmap\n");
goto cleanup;
}
@ -538,7 +539,7 @@ CreateSmallIcon(HICON StdIcon)
SmallIcon = CreateIconIndirect(&SmallInfo);
if (NULL == SmallIcon)
{
DPRINT1("Failed to create icon\n");
ERR("Failed to create icon\n");
goto cleanup;
}

3
reactos/dll/win32/user32/windows/clipboard.c
View file

@ -17,6 +17,7 @@
#define NDEBUG
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(user32);
#define QUERY_SIZE 0
@ -343,7 +344,7 @@ SetClipboardData(UINT uFormat, HANDLE hMem)
}
else
{
DPRINT1("SetClipboardData failed\n");
ERR("SetClipboardData failed\n");
}
return ret;

7
reactos/dll/win32/user32/windows/defwnd.c
View file

@ -14,6 +14,7 @@
#include <user32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(user32);
#ifndef WM_SETVISIBLE
#define WM_SETVISIBLE 9
@ -964,7 +965,7 @@ static void DefWndPrint( HWND hwnd, HDC hdc, ULONG uFlags)
(uFlags & PRF_OWNED) ||
(uFlags & PRF_NONCLIENT) )
{
DPRINT1("WM_PRINT message with unsupported flags\n");
FIXME("WM_PRINT message with unsupported flags\n");
}
/*
@ -1688,7 +1689,7 @@ DefWindowProcA(HWND hWnd,
case WM_IME_ENDCOMPOSITION:
case WM_IME_SELECT:
case WM_IME_SETCONTEXT:
DPRINT1("FIXME: WM_IME_* conversion isn't implemented yet!");
FIXME("FIXME: WM_IME_* conversion isn't implemented yet!");
/* fall through */
default:
Result = User32DefWindowProc(hWnd, Msg, wParam, lParam, FALSE);
@ -1764,7 +1765,7 @@ DefWindowProcW(HWND hWnd,
case WM_IME_SETCONTEXT:
{
/* FIXME */
DPRINT1("FIXME: WM_IME_SETCONTEXT is not implemented!");
FIXME("FIXME: WM_IME_SETCONTEXT is not implemented!");
Result = 0;
break;
}

9
reactos/dll/win32/user32/windows/dialog.c
View file

@ -34,6 +34,7 @@
#include <user32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(user32);
/* MACROS/DEFINITIONS ********************************************************/
@ -1182,7 +1183,7 @@ static INT DIALOG_DlgDirListW( HWND hDlg, LPWSTR spec, INT idLBox,
((attrib & DDL_POSTMSGS) ? PostMessageW( hwnd, msg, wparam, lparam ) \
: SendMessageW( hwnd, msg, wparam, lparam ))
// DPRINT("%p '%s' %d %d %04x\n",
// TRACE("%p '%s' %d %d %04x\n",
// hDlg, spec ? spec : "NULL", idLBox, idStatic, attrib );
/* If the path exists and is a directory, chdir to it */
@ -1206,7 +1207,7 @@ static INT DIALOG_DlgDirListW( HWND hDlg, LPWSTR spec, INT idLBox,
}
}
DPRINT( "mask=%s\n", spec );
TRACE( "mask=%s\n", spec );
if (idLBox && ((hwnd = GetDlgItem( hDlg, idLBox )) != 0))
{
@ -1287,7 +1288,7 @@ static BOOL DIALOG_DlgDirSelect( HWND hwnd, LPWSTR str, INT len,
BOOL ret;
HWND listbox = GetDlgItem( hwnd, id );
DPRINT("%p '%s' %d\n", hwnd, str, id );
TRACE("%p '%s' %d\n", hwnd, str, id );
if (!listbox) return FALSE;
item = SendMessageW(listbox, combo ? CB_GETCURSEL : LB_GETCURSEL, 0, 0 );
@ -1322,7 +1323,7 @@ static BOOL DIALOG_DlgDirSelect( HWND hwnd, LPWSTR str, INT len,
}
else lstrcpynW( str, ptr, len );
HeapFree( GetProcessHeap(), 0, buffer );
DPRINT("Returning %d '%s'\n", ret, str );
TRACE("Returning %d '%s'\n", ret, str );
return ret;
}

10
reactos/dll/win32/user32/windows/icon.c
View file

@ -31,7 +31,7 @@
#include <user32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(user32);
/* FUNCTIONS *****************************************************************/
@ -242,7 +242,7 @@ CreateIconFromResourceEx(
}
*/
DPRINT("dwVersion, cxDesired, cyDesired are all ignored in this implementation!\n");
TRACE("dwVersion, cxDesired, cyDesired are all ignored in this implementation!\n");
if (! fIcon)
{
@ -505,7 +505,7 @@ CURSORICON_FindBestIcon(LPVOID dir,
}
}
DPRINT("Best Icon: ResId: %d, bits : %d\n", BestEntry, BestBits);
TRACE("Best Icon: ResId: %d, bits : %d\n", BestEntry, BestBits);
return BestEntry;
}
@ -561,7 +561,7 @@ CURSORICON_FindBestCursor(LPVOID dir,
}
}
DPRINT("Best Cursor: ResId: %d, bits : %d\n", BestEntry, BestBits);
TRACE("Best Cursor: ResId: %d, bits : %d\n", BestEntry, BestBits);
return BestEntry;
}
@ -678,7 +678,7 @@ LookupIconIdFromDirectoryEx(PBYTE xdir,
retVal = entry->nID;
}
else
DPRINT1("%s() : Invalid resource directory\n", __FUNCTION__);
WARN("%s() : Invalid resource directory\n", __FUNCTION__);
return retVal;
}

2
reactos/dll/win32/user32/windows/input.c
View file

@ -31,7 +31,7 @@
#include <user32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(user32);
/* GLOBALS *******************************************************************/

69
reactos/dll/win32/user32/windows/menu.c
View file

@ -14,6 +14,7 @@
#include <user32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(user32);
/* internal popup menu window messages */
#define MM_SETMENUHANDLE (WM_USER + 0)
@ -363,7 +364,7 @@ MenuGetBitmapItemSize(PROSMENUITEMINFO lpitem, SIZE *Size, HWND WndOwner)
case (INT_PTR) HBMMENU_POPUP_MAXIMIZE:
case (INT_PTR) HBMMENU_POPUP_MINIMIZE:
default:
DPRINT("Magic menu bitmap not implemented\n");
FIXME("Magic menu bitmap not implemented\n");
return;
}
}
@ -474,7 +475,7 @@ MenuDrawBitmapItem(HDC Dc, PROSMENUITEMINFO Item, const RECT *Rect,
case (INT_PTR) HBMMENU_POPUP_MAXIMIZE:
case (INT_PTR) HBMMENU_POPUP_MINIMIZE:
default:
DPRINT("Magic menu bitmap not implemented\n");
FIXME("Magic menu bitmap not implemented\n");
return;
}
InflateRect(&r, -1, -1);
@ -606,7 +607,7 @@ MenuDrawMenuItem(HWND Wnd, PROSMENUINFO MenuInfo, HWND WndOwner, HDC Dc,
dis.hwndItem = (HWND) MenuInfo->Self;
dis.hDC = Dc;
dis.rcItem = Rect;
DPRINT("Ownerdraw: owner=%p itemID=%d, itemState=%d, itemAction=%d, "
TRACE("Ownerdraw: owner=%p itemID=%d, itemState=%d, itemAction=%d, "
"hwndItem=%p, hdc=%p, rcItem={%ld,%ld,%ld,%ld}\n", Wnd,
dis.itemID, dis.itemState, dis.itemAction, dis.hwndItem,
dis.hDC, dis.rcItem.left, dis.rcItem.top, dis.rcItem.right,
@ -629,7 +630,7 @@ MenuDrawMenuItem(HWND Wnd, PROSMENUINFO MenuInfo, HWND WndOwner, HDC Dc,
return;
}
DPRINT("rect={%ld,%ld,%ld,%ld}\n", Item->Rect.left, Item->Rect.top,
TRACE("rect={%ld,%ld,%ld,%ld}\n", Item->Rect.left, Item->Rect.top,
Item->Rect.right, Item->Rect.bottom);
if (MenuBar && 0 != (Item->fType & MF_SEPARATOR))
@ -887,7 +888,7 @@ MenuDrawPopupMenu(HWND Wnd, HDC Dc, HMENU Menu)
ROSMENUITEMINFO ItemInfo;
UINT u;
DPRINT("wnd=%x dc=%x menu=%x\n", Wnd, Dc, Menu);
TRACE("wnd=%x dc=%x menu=%x\n", Wnd, Dc, Menu);
GetClientRect(Wnd, &Rect);
@ -935,7 +936,7 @@ MenuDrawPopupMenu(HWND Wnd, HDC Dc, HMENU Menu)
static LRESULT WINAPI
PopupMenuWndProcW(HWND Wnd, UINT Message, WPARAM wParam, LPARAM lParam)
{
DPRINT("hwnd=%x msg=0x%04x wp=0x%04x lp=0x%08lx\n", Wnd, Message, wParam, lParam);
TRACE("hwnd=%x msg=0x%04x wp=0x%04x lp=0x%08lx\n", Wnd, Message, wParam, lParam);
switch(Message)
{
@ -1192,7 +1193,7 @@ MenuCalcItemSize(HDC Dc, PROSMENUITEMINFO ItemInfo, PROSMENUINFO MenuInfo, HWND
INT itemheight = 0;
UINT CheckBitmapWidth = GetSystemMetrics(SM_CXMENUCHECK);
DPRINT("dc=%x owner=%x (%d,%d)\n", Dc, WndOwner, OrgX, OrgY);
TRACE("dc=%x owner=%x (%d,%d)\n", Dc, WndOwner, OrgX, OrgY);
MenuCharSize.cx = GdiGetCharDimensions( Dc, NULL, &MenuCharSize.cy );
@ -1231,7 +1232,7 @@ MenuCalcItemSize(HDC Dc, PROSMENUITEMINFO ItemInfo, PROSMENUINFO MenuInfo, HWND
ItemInfo->Rect.bottom += mis.itemHeight;
}
DPRINT("id=%04x size=%dx%d\n", ItemInfo->wID, mis.itemWidth, mis.itemHeight);
TRACE("id=%04x size=%dx%d\n", ItemInfo->wID, mis.itemWidth, mis.itemHeight);
return;
}
@ -1350,7 +1351,7 @@ MenuCalcItemSize(HDC Dc, PROSMENUITEMINFO ItemInfo, PROSMENUINFO MenuInfo, HWND
itemheight = max( itemheight, GetSystemMetrics(SM_CYMENU)-1);
}
ItemInfo->Rect.bottom += itemheight;
DPRINT("(%ld,%ld)-(%ld,%ld)\n", ItemInfo->Rect.left, ItemInfo->Rect.top, ItemInfo->Rect.right, ItemInfo->Rect.bottom);
TRACE("(%ld,%ld)-(%ld,%ld)\n", ItemInfo->Rect.left, ItemInfo->Rect.top, ItemInfo->Rect.right, ItemInfo->Rect.bottom);
}
/***********************************************************************
@ -1478,7 +1479,7 @@ MenuMenuBarCalcSize(HDC Dc, LPRECT Rect, PROSMENUINFO MenuInfo, HWND WndOwner)
return;
}
DPRINT("left=%ld top=%ld right=%ld bottom=%ld\n",
TRACE("left=%ld top=%ld right=%ld bottom=%ld\n",
Rect->left, Rect->top, Rect->right, Rect->bottom);
MenuInfo->Width = Rect->right - Rect->left;
MenuInfo->Height = 0;
@ -1513,7 +1514,7 @@ MenuMenuBarCalcSize(HDC Dc, LPRECT Rect, PROSMENUINFO MenuInfo, HWND WndOwner)
break;
}
DPRINT("calling MENU_CalcItemSize org=(%d, %d)\n", OrgX, OrgY);
TRACE("calling MENU_CalcItemSize org=(%d, %d)\n", OrgX, OrgY);
MenuCalcItemSize(Dc, &ItemInfo, MenuInfo, WndOwner, OrgX, OrgY, TRUE);
if (! MenuSetRosMenuItemInfo(MenuInfo->Self, i, &ItemInfo))
{
@ -1644,7 +1645,7 @@ DrawMenuBarTemp(HWND Wnd, HDC DC, LPRECT Rect, HMENU Menu, HFONT Font)
return GetSystemMetrics(SM_CYMENU);
}
DPRINT("(%x, %x, %p, %x, %x)\n", Wnd, DC, Rect, Menu, Font);
TRACE("(%x, %x, %p, %x, %x)\n", Wnd, DC, Rect, Menu, Font);
FontOld = SelectObject(DC, Font);
@ -1727,7 +1728,7 @@ UINT MenuDrawMenuBar(HDC DC, LPRECT Rect, HWND Wnd, BOOL SuppressDraw)
static BOOL FASTCALL
MenuInitTracking(HWND Wnd, HMENU Menu, BOOL Popup, UINT Flags)
{
DPRINT("Wnd=%p Menu=%p\n", Wnd, Menu);
TRACE("Wnd=%p Menu=%p\n", Wnd, Menu);
HideCaret(0);
@ -1783,7 +1784,7 @@ MenuShowPopup(HWND WndOwner, HMENU Menu, UINT Id,
ROSMENUITEMINFO ItemInfo;
UINT Width, Height;
DPRINT("owner=%x hmenu=%x id=0x%04x x=0x%04x y=0x%04x xa=0x%04x ya=0x%04x\n",
TRACE("owner=%x hmenu=%x id=0x%04x x=0x%04x y=0x%04x xa=0x%04x ya=0x%04x\n",
WndOwner, Menu, Id, X, Y, XAnchor, YAnchor);
if (! MenuGetRosMenuInfo(&MenuInfo, Menu))
@ -1934,7 +1935,7 @@ MenuSelectItem(HWND WndOwner, PROSMENUINFO MenuInfo, UINT Index,
ROSMENUINFO TopMenuInfo;
int Pos;
DPRINT("owner=%x menu=%p index=0x%04x select=0x%04x\n", WndOwner, MenuInfo, Index, SendMenuSelect);
TRACE("owner=%x menu=%p index=0x%04x select=0x%04x\n", WndOwner, MenuInfo, Index, SendMenuSelect);
if (NULL == MenuInfo || 0 == MenuInfo->MenuItemCount || NULL == MenuInfo->Wnd)
{
@ -2038,7 +2039,7 @@ MenuMoveSelection(HWND WndOwner, PROSMENUINFO MenuInfo, INT Offset)
ROSMENUITEMINFO ItemInfo;
INT OrigPos;
DPRINT("hwnd=%x menu=%x off=0x%04x\n", WndOwner, MenuInfo, Offset);
TRACE("hwnd=%x menu=%x off=0x%04x\n", WndOwner, MenuInfo, Offset);
/* Prevent looping */
if (0 == MenuInfo->MenuItemCount || 0 == Offset)
@ -2165,7 +2166,7 @@ MenuShowSubPopup(HWND WndOwner, PROSMENUINFO MenuInfo, BOOL SelectFirst, UINT Fl
HDC Dc;
HMENU Ret;
DPRINT("owner=%x menu=%p 0x%04x\n", WndOwner, MenuInfo, SelectFirst);
TRACE("owner=%x menu=%p 0x%04x\n", WndOwner, MenuInfo, SelectFirst);
if (NO_SELECTED_ITEM == MenuInfo->FocusedItem)
{
@ -2286,7 +2287,7 @@ MenuHideSubPopups(HWND WndOwner, PROSMENUINFO MenuInfo, BOOL SendMenuSelect)
ROSMENUINFO SubMenuInfo;
ROSMENUITEMINFO ItemInfo;
DPRINT("owner=%x menu=%x 0x%04x\n", WndOwner, MenuInfo, SendMenuSelect);
TRACE("owner=%x menu=%x 0x%04x\n", WndOwner, MenuInfo, SendMenuSelect);
if (NULL != MenuInfo && NULL != TopPopup && NO_SELECTED_ITEM != MenuInfo->FocusedItem)
{
@ -2323,7 +2324,7 @@ MenuSwitchTracking(MTRACKER* Mt, PROSMENUINFO PtMenuInfo, UINT Index)
{
ROSMENUINFO TopMenuInfo;
DPRINT("%x menu=%x 0x%04x\n", Mt, PtMenuInfo->Self, Index);
TRACE("%x menu=%x 0x%04x\n", Mt, PtMenuInfo->Self, Index);
if (MenuGetRosMenuInfo(&TopMenuInfo, Mt->TopMenu) &&
Mt->TopMenu != PtMenuInfo->Self &&
@ -2358,7 +2359,7 @@ MenuExecFocusedItem(MTRACKER *Mt, PROSMENUINFO MenuInfo, UINT Flags)
ROSMENUITEMINFO ItemInfo;
UINT wID;
DPRINT("%p menu=%p\n", Mt, MenuInfo);
TRACE("%p menu=%p\n", Mt, MenuInfo);
if (0 == MenuInfo->MenuItemCount || NO_SELECTED_ITEM == MenuInfo->FocusedItem)
{
@ -2372,7 +2373,7 @@ MenuExecFocusedItem(MTRACKER *Mt, PROSMENUINFO MenuInfo, UINT Flags)
return -1;
}
DPRINT("%p %08x %p\n", MenuInfo, ItemInfo.wID, ItemInfo.hSubMenu);
TRACE("%p %08x %p\n", MenuInfo, ItemInfo.wID, ItemInfo.hSubMenu);
if (0 == (ItemInfo.fType & MF_POPUP))
{
@ -2424,7 +2425,7 @@ MenuButtonDown(MTRACKER* Mt, HMENU PtMenu, UINT Flags)
ROSMENUINFO MenuInfo;
ROSMENUITEMINFO Item;
DPRINT("%x PtMenu=%p\n", Mt, PtMenu);
TRACE("%x PtMenu=%p\n", Mt, PtMenu);
if (NULL != PtMenu)
{
@ -2487,7 +2488,7 @@ MenuButtonUp(MTRACKER *Mt, HMENU PtMenu, UINT Flags)
ROSMENUINFO MenuInfo;
ROSMENUITEMINFO ItemInfo;
DPRINT("%p hmenu=%x\n", Mt, PtMenu);
TRACE("%p hmenu=%x\n", Mt, PtMenu);
if (NULL != PtMenu)
{
@ -2720,7 +2721,7 @@ MenuGetStartOfPrevColumn(PROSMENUINFO MenuInfo)
}
MenuCleanupAllRosMenuItemInfo(MenuItems);
DPRINT("ret %d.\n", i );
TRACE("ret %d.\n", i );
return i;
}
@ -2787,7 +2788,7 @@ MenuDoNextMenu(MTRACKER* Mt, UINT Vk)
NextMenu.hwndNext = NULL;
SendMessageW(Mt->OwnerWnd, WM_NEXTMENU, Vk, (LPARAM) &NextMenu);
DPRINT("%p [%p] -> %p [%p]\n",
TRACE("%p [%p] -> %p [%p]\n",
Mt->CurrentMenu, Mt->OwnerWnd, NextMenu.hmenuNext, NextMenu.hwndNext );
if (NULL == NextMenu.hmenuNext || NULL == NextMenu.hwndNext)
@ -2843,7 +2844,7 @@ MenuDoNextMenu(MTRACKER* Mt, UINT Vk)
/* FIXME: Not sure what to do here;
* perhaps try to track NewMenu as a popup? */
DPRINT(" -- got confused.\n");
WARN(" -- got confused.\n");
return FALSE;
}
}
@ -3046,7 +3047,7 @@ MenuKeyRight(MTRACKER *Mt, UINT Flags)
ROSMENUINFO CurrentMenuInfo;
UINT NextCol;
DPRINT("MenuKeyRight called, cur %p, top %p.\n",
TRACE("MenuKeyRight called, cur %p, top %p.\n",
Mt->CurrentMenu, Mt->TopMenu);
if (! MenuGetRosMenuInfo(&MenuInfo, Mt->TopMenu))
@ -3078,7 +3079,7 @@ MenuKeyRight(MTRACKER *Mt, UINT Flags)
/* Check to see if there's another column */
if (NO_SELECTED_ITEM != (NextCol = MenuGetStartOfNextColumn(&CurrentMenuInfo)))
{
DPRINT("Going to %d.\n", NextCol);
TRACE("Going to %d.\n", NextCol);
if (MenuGetRosMenuInfo(&MenuInfo, Mt->CurrentMenu))
{
MenuSelectItem(Mt->OwnerWnd, &MenuInfo, NextCol, TRUE, 0);
@ -3131,7 +3132,7 @@ MenuFindItemByKey(HWND WndOwner, PROSMENUINFO MenuInfo,
LRESULT MenuChar;
UINT i;
DPRINT("\tlooking for '%c' (0x%02x) in [%p]\n", (char) Key, Key, MenuInfo);
TRACE("\tlooking for '%c' (0x%02x) in [%p]\n", (char) Key, Key, MenuInfo);
if (NULL == MenuInfo || ! IsMenu(MenuInfo->Self))
{
@ -3212,7 +3213,7 @@ MenuTrackMenu(HMENU Menu, UINT Flags, INT x, INT y,
Mt.Pt.x = x;
Mt.Pt.y = y;
DPRINT("Menu=%x Flags=0x%08x (%d,%d) Wnd=%x (%ld,%ld)-(%ld,%ld)\n",
TRACE("Menu=%x Flags=0x%08x (%d,%d) Wnd=%x (%ld,%ld)-(%ld,%ld)\n",
Menu, Flags, x, y, Wnd, Rect ? Rect->left : 0, Rect ? Rect->top : 0,
Rect ? Rect->right : 0, Rect ? Rect->bottom : 0);
@ -3560,7 +3561,7 @@ MenuTrackMenu(HMENU Menu, UINT Flags, INT x, INT y,
static BOOL FASTCALL
MenuExitTracking(HWND Wnd)
{
DPRINT("hwnd=%p\n", Wnd);
TRACE("hwnd=%p\n", Wnd);
SendMessageW(Wnd, WM_EXITMENULOOP, 0, 0);
ShowCaret(0);
@ -3574,7 +3575,7 @@ MenuTrackMouseMenuBar(HWND Wnd, ULONG Ht, POINT Pt)
HMENU Menu = (HTSYSMENU == Ht) ? NtUserGetSystemMenu(Wnd, FALSE) : GetMenu(Wnd);
UINT Flags = TPM_ENTERIDLEEX | TPM_BUTTONDOWN | TPM_LEFTALIGN | TPM_LEFTBUTTON;
DPRINT("wnd=%p ht=0x%04x (%ld,%ld)\n", Wnd, Ht, Pt.x, Pt.y);
TRACE("wnd=%p ht=0x%04x (%ld,%ld)\n", Wnd, Ht, Pt.x, Pt.y);
if (IsMenu(Menu))
{
@ -3600,7 +3601,7 @@ MenuTrackKbdMenuBar(HWND hWnd, UINT wParam, WCHAR wChar)
ROSMENUINFO MenuInfo;
UINT wFlags = TPM_ENTERIDLEEX | TPM_LEFTALIGN | TPM_LEFTBUTTON;
DPRINT("hwnd %p wParam 0x%04x wChar 0x%04x\n", hWnd, wParam, wChar);
TRACE("hwnd %p wParam 0x%04x wChar 0x%04x\n", hWnd, wParam, wChar);
/* find window that has a menu */
@ -3857,7 +3858,7 @@ CheckMenuRadioItem(HMENU hmenu,
mi.cbSize = sizeof(MENUINFO);
DPRINT("CheckMenuRadioItem\n");
TRACE("CheckMenuRadioItem\n");
if(idFirst > idLast) return ret;

5
reactos/dll/win32/user32/windows/message.c
View file

@ -11,6 +11,7 @@
#include <user32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(user32);
/* DDE message exchange
*
@ -1143,7 +1144,7 @@ IntCallWindowProcW(BOOL IsAnsiProc,
if (WndProc == NULL)
{
DPRINT("IntCallWindowsProcW() called with WndProc = NULL!\n");
WARN("IntCallWindowsProcW() called with WndProc = NULL!\n");
return FALSE;
}
@ -1185,7 +1186,7 @@ IntCallWindowProcA(BOOL IsAnsiProc,
if (WndProc == NULL)
{
DPRINT("IntCallWindowsProcA() called with WndProc = NULL!\n");
WARN("IntCallWindowsProcA() called with WndProc = NULL!\n");
return FALSE;
}

11
reactos/dll/win32/user32/windows/window.c
View file

@ -14,6 +14,7 @@
#include <user32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(user32);
BOOL ControlsInitialized = FALSE;
@ -30,7 +31,7 @@ User32CallSendAsyncProcForKernel(PVOID Arguments, ULONG ArgumentLength)
{
PSENDASYNCPROC_CALLBACK_ARGUMENTS CallbackArgs;
DPRINT("User32CallSendAsyncProcKernel()\n");
TRACE("User32CallSendAsyncProcKernel()\n");
CallbackArgs = (PSENDASYNCPROC_CALLBACK_ARGUMENTS)Arguments;
if (ArgumentLength != sizeof(WINDOWPROC_CALLBACK_ARGUMENTS))
{
@ -303,7 +304,7 @@ CreateWindowExA(DWORD dwExStyle,
{
if (dwStyle & WS_POPUP)
{
DPRINT1("WS_POPUP with MDIS_ALLCHILDSTYLES is not allowed\n");
WARN("WS_POPUP with MDIS_ALLCHILDSTYLES is not allowed\n");
return(0);
}
dwStyle |= (WS_CHILD | WS_CLIPSIBLINGS);
@ -322,7 +323,7 @@ CreateWindowExA(DWORD dwExStyle,
/* Restore current maximized child */
if((dwStyle & WS_VISIBLE) && IsZoomed(top_child))
{
DPRINT("Restoring current maximized child %p\n", top_child);
TRACE("Restoring current maximized child %p\n", top_child);
SendMessageW( top_child, WM_SETREDRAW, FALSE, 0 );
ShowWindow(top_child, SW_RESTORE);
SendMessageW( top_child, WM_SETREDRAW, TRUE, 0 );
@ -415,7 +416,7 @@ CreateWindowExW(DWORD dwExStyle,
{
if (dwStyle & WS_POPUP)
{
DPRINT1("WS_POPUP with MDIS_ALLCHILDSTYLES is not allowed\n");
WARN("WS_POPUP with MDIS_ALLCHILDSTYLES is not allowed\n");
return(0);
}
dwStyle |= (WS_CHILD | WS_CLIPSIBLINGS);
@ -434,7 +435,7 @@ CreateWindowExW(DWORD dwExStyle,
/* Restore current maximized child */
if((dwStyle & WS_VISIBLE) && IsZoomed(top_child))
{
DPRINT("Restoring current maximized child %p\n", top_child);
TRACE("Restoring current maximized child %p\n", top_child);
SendMessageW( top_child, WM_SETREDRAW, FALSE, 0 );
ShowWindow(top_child, SW_RESTORE);
SendMessageW( top_child, WM_SETREDRAW, TRUE, 0 );

1
reactos/dll/win32/user32/windows/winpos.c
View file

@ -14,6 +14,7 @@
#include <user32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(user32);
/* FUNCTIONS *****************************************************************/

2
reactos/dll/win32/winspool/winspool.rbuild
View file

@ -1,4 +1,4 @@
<module name="winspool" type="win32dll" extension=".drv" baseaddress="${BASEADDRESS_WINSPOOL}" installbase="system32" installname="winspool.drv">
<module name="winspool" type="win32dll" extension=".drv" baseaddress="${BASEADDRESS_WINSPOOL}" installbase="system32" installname="winspool.drv" allowwarnings="true">
<importlibrary definition="winspool.def" />
<include base="winspool">.</include>
<define name="__USE_W32API" />

12
reactos/lib/sdk/crt/wine/heap.c
View file

@ -27,9 +27,7 @@
#include <stdlib.h>
#include <internal/mtdll.h>
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
#include <debug.h>
/* MT */
#define LOCK_HEAP _mlock( _HEAP_LOCK )
@ -48,7 +46,7 @@ static int MSVCRT_new_mode;
void* MSVCRT_operator_new(unsigned long size)
{
void *retval = malloc(size);
TRACE("(%ld) returning %p\n", size, retval);
DPRINT("(%ld) returning %p\n", size, retval);
LOCK_HEAP;
if(!retval && MSVCRT_new_handler)
(*MSVCRT_new_handler)(size);
@ -61,7 +59,7 @@ void* MSVCRT_operator_new(unsigned long size)
*/
void MSVCRT_operator_delete(void *mem)
{
TRACE("(%p)\n", mem);
DPRINT("(%p)\n", mem);
free(mem);
}
@ -101,7 +99,7 @@ MSVCRT_new_handler_func MSVCRT__set_new_handler(MSVCRT_new_handler_func func)
*/
MSVCRT_new_handler_func MSVCRT_set_new_handler(void *func)
{
TRACE("(%p)\n",func);
DPRINT("(%p)\n",func);
MSVCRT__set_new_handler(NULL);
return NULL;
}
@ -124,7 +122,7 @@ int MSVCRT__set_new_mode(int mode)
*/
int _heapadd(void* mem, size_t size)
{
TRACE("(%p,%d) unsupported in Win32\n", mem,size);
DPRINT("(%p,%d) unsupported in Win32\n", mem,size);
*_errno() = ENOSYS;
return -1;
}

6
reactos/lib/sdk/crt/wine/thread.c
View file

@ -24,9 +24,7 @@
#include <malloc.h>
#include <process.h>
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
#include <debug.h>
void _amsg_exit (int errnum);
/* Index to TLS */
@ -92,7 +90,7 @@ unsigned long _beginthread(
{
_beginthread_trampoline_t* trampoline;
TRACE("(%p, %d, %p)\n", start_address, stack_size, arglist);
DPRINT("(%p, %d, %p)\n", start_address, stack_size, arglist);
/* Allocate the trampoline here so that it is still valid when the thread
* starts... typically after this function has returned.

1
reactos/lib/sdk/crt/wine/undname.c
View file

@ -22,6 +22,7 @@
#include "wine/config.h"
#include "wine/port.h"
#include <assert.h>
#include <stdarg.h>
#include "windef.h"

7
reactos/subsystems/win32/win32k/ntuser/class.c
View file

@ -30,8 +30,11 @@
#include <w32k.h>
//#define YDEBUG
#include <wine/debug.h>
#define NDEBUG
#include <debug.h>
#define TRACE DPRINT
#define WARN DPRINT1
#define ERR DPRINT1
/* WINDOWCLASS ***************************************************************/

7
reactos/subsystems/win32/win32k/ntuser/desktop.c
View file

@ -31,8 +31,11 @@
#include <w32k.h>
//#define YDEBUG
#include <wine/debug.h>
#define NDEBUG
#include <debug.h>
#define TRACE DPRINT
#define WARN DPRINT1
#define ERR DPRINT1
static
VOID