[fireball] 32222: Kamil Hornicek <tykef@atlas.cz> - Convert advapi32 to use wine-style debug macros.
Author: fireball Date: Fri Feb 8 20:04:39 2008 New Revision: 32222
URL: http://svn.reactos.org/svn/reactos?rev=32222&view=rev Log: Kamil Hornicek tykef@atlas.cz - Convert advapi32 to use wine-style debug macros.
Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c trunk/reactos/dll/win32/advapi32/misc/hwprofiles.c trunk/reactos/dll/win32/advapi32/misc/logon.c trunk/reactos/dll/win32/advapi32/misc/msi.c trunk/reactos/dll/win32/advapi32/reg/reg.c trunk/reactos/dll/win32/advapi32/sec/ac.c trunk/reactos/dll/win32/advapi32/sec/audit.c trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/dll/win32/advapi32/sec/misc.c trunk/reactos/dll/win32/advapi32/sec/sec.c trunk/reactos/dll/win32/advapi32/sec/trustee.c trunk/reactos/dll/win32/advapi32/service/eventlog.c trunk/reactos/dll/win32/advapi32/service/scm.c trunk/reactos/dll/win32/advapi32/service/sctrl.c trunk/reactos/dll/win32/advapi32/token/token.c
Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/cr... ============================================================================== --- trunk/reactos/dll/win32/advapi32/crypt/crypt.c (original) +++ trunk/reactos/dll/win32/advapi32/crypt/crypt.c Fri Feb 8 20:04:39 2008 @@ -29,8 +29,9 @@ #include "crypt.h" #include <winefs.h>
-#define NDEBUG -#include <debug.h> +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(crypt); +
/* * Note: this code is harmless on little-endian machines. @@ -174,7 +175,7 @@ return FALSE; }
- DPRINT1("FIXME (%s, %p): not verifying image\n", lpszImage, pData); + FIXME("(%s, %p): not verifying image\n", lpszImage, pData);
return TRUE; } @@ -202,7 +203,7 @@ if ( !(provider->hModule = LoadLibraryW(pImage)) ) { errorcode = (GetLastError() == ERROR_FILE_NOT_FOUND) ? NTE_PROV_DLL_NOT_FOUND : NTE_PROVIDER_DLL_FAIL; - DPRINT("Failed to load dll %S\n", pImage); + FIXME("Failed to load dll %S\n", pImage); goto error; } provider->dwMagic = MAGIC_CRYPTPROV; @@ -292,7 +293,7 @@ static const WCHAR typeW[] = {'T','y','p','e',0}; static const WCHAR imagepathW[] = {'I','m','a','g','e',' ','P','a','t','h',0};
- DPRINT("(%p, %S, %S, %d, %08x)\n", phProv, pszContainer, + TRACE("(%p, %S, %S, %d, %08x)\n", phProv, pszContainer, pszProvider, dwProvType, dwFlags);
if (dwProvType < 1 || dwProvType > MAXPROVTYPES) @@ -313,7 +314,7 @@ * then try the machine default CSP */ if ( !(keyname = CRYPT_GetTypeKeyName(dwProvType, TRUE)) ) { - DPRINT("No provider registered for crypto provider type %d.\n", dwProvType); + WARN("No provider registered for crypto provider type %d.\n", dwProvType); SetLastError(NTE_PROV_TYPE_NOT_DEF); return FALSE; } @@ -321,13 +322,13 @@ { CRYPT_Free(keyname); if ( !(keyname = CRYPT_GetTypeKeyName(dwProvType, FALSE)) ) { - DPRINT("No type registered for crypto provider type %d.\n", dwProvType); + TRACE("No type registered for crypto provider type %d.\n", dwProvType); RegCloseKey(key); SetLastError(NTE_PROV_TYPE_NOT_DEF); goto error; } if (RegOpenKeyW(HKEY_LOCAL_MACHINE, keyname, &key)) { - DPRINT("Did not find registry entry of crypto provider for %S.\n", keyname); + TRACE("Did not find registry entry of crypto provider for %S.\n", keyname); CRYPT_Free(keyname); RegCloseKey(key); SetLastError(NTE_PROV_TYPE_NOT_DEF); @@ -338,7 +339,7 @@ r = RegQueryValueExW(key, nameW, NULL, &keytype, NULL, &len); if( r != ERROR_SUCCESS || !len || keytype != REG_SZ) { - DPRINT("error %d reading size of 'Name' from registry\n", r ); + TRACE("error %d reading size of 'Name' from registry\n", r ); RegCloseKey(key); SetLastError(NTE_PROV_TYPE_ENTRY_BAD); goto error; @@ -352,7 +353,7 @@ r = RegQueryValueExW(key, nameW, NULL, NULL, (LPBYTE)provname, &len); if( r != ERROR_SUCCESS ) { - DPRINT("error %d reading 'Name' from registry\n", r ); + TRACE("error %d reading 'Name' from registry\n", r ); RegCloseKey(key); SetLastError(NTE_PROV_TYPE_ENTRY_BAD); goto error; @@ -384,7 +385,7 @@ } if (type != dwProvType) { - DPRINT("Crypto provider has wrong type (%d vs expected %d).\n", type, dwProvType); + TRACE("Crypto provider has wrong type (%d vs expected %d).\n", type, dwProvType); SetLastError(NTE_PROV_TYPE_NO_MATCH); goto error; } @@ -392,7 +393,7 @@ r = RegQueryValueExW(key, imagepathW, NULL, &keytype, NULL, &len); if ( r != ERROR_SUCCESS || keytype != REG_SZ) { - DPRINT("error %d reading size of 'Image Path' from registry\n", r ); + TRACE("error %d reading size of 'Image Path' from registry\n", r ); RegCloseKey(key); SetLastError(NTE_PROV_TYPE_ENTRY_BAD); goto error; @@ -406,7 +407,7 @@ r = RegQueryValueExW(key, imagepathW, NULL, NULL, (LPBYTE)temp, &len); if( r != ERROR_SUCCESS ) { - DPRINT("error %d reading 'Image Path' from registry\n", r ); + TRACE("error %d reading 'Image Path' from registry\n", r ); RegCloseKey(key); SetLastError(NTE_PROV_TYPE_ENTRY_BAD); goto error; @@ -493,7 +494,7 @@ PWSTR pProvider = NULL, pContainer = NULL; BOOL ret = FALSE;
- DPRINT("(%p, %s, %s, %d, %08x)\n", phProv, pszContainer, + TRACE("(%p, %s, %s, %d, %08x)\n", phProv, pszContainer, pszProvider, dwProvType, dwFlags);
if ( !CRYPT_ANSIToUnicode(pszContainer, &pContainer, -1) ) @@ -535,7 +536,7 @@ { PCRYPTPROV pProv = (PCRYPTPROV)hProv;
- DPRINT("(0x%lx, %p, %08lx)\n", hProv, pdwReserved, dwFlags); + TRACE("(0x%lx, %p, %08lx)\n", hProv, pdwReserved, dwFlags);
if (!pProv) { @@ -565,7 +566,7 @@ PCRYPTPROV pProv = (PCRYPTPROV)hProv; BOOL ret = TRUE;
- DPRINT("(0x%lx, %08ld)\n", hProv, dwFlags); + TRACE("(0x%lx, %08ld)\n", hProv, dwFlags);
if (!pProv) { @@ -610,7 +611,7 @@ { PCRYPTPROV prov = (PCRYPTPROV)hProv;
- DPRINT("(0x%lx, %ld, %p)\n", hProv, dwLen, pbBuffer); + TRACE("(0x%lx, %ld, %p)\n", hProv, dwLen, pbBuffer);
if (!hProv) CRYPT_ReturnLastError(ERROR_INVALID_HANDLE); @@ -644,7 +645,7 @@ PCRYPTKEY key = (PCRYPTKEY)hKey; PCRYPTHASH hash;
- DPRINT("(0x%lx, 0x%x, 0x%lx, %08lx, %p)\n", hProv, Algid, hKey, dwFlags, phHash); + TRACE("(0x%lx, 0x%x, 0x%lx, %08lx, %p)\n", hProv, Algid, hKey, dwFlags, phHash);
if (!prov) CRYPT_ReturnLastError(ERROR_INVALID_HANDLE); @@ -695,7 +696,7 @@ PCRYPTKEY key = (PCRYPTKEY)hKey; PCRYPTHASH hash = (PCRYPTHASH)hHash;
- DPRINT("(0x%lx, 0x%lx, %d, %08lx, %p, %p)\n", hKey, hHash, Final, dwFlags, pbData, pdwDataLen); + TRACE("(0x%lx, 0x%lx, %d, %08lx, %p, %p)\n", hKey, hHash, Final, dwFlags, pbData, pdwDataLen);
if (!key || !pbData || !pdwDataLen) CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); @@ -728,7 +729,7 @@ PCRYPTHASH hash = (PCRYPTHASH)hBaseData; PCRYPTKEY key;
- DPRINT("(0x%lx, 0x%08x, 0x%lx, 0x%08lx, %p)\n", hProv, Algid, hBaseData, dwFlags, phKey); + TRACE("(0x%lx, 0x%08x, 0x%lx, 0x%08lx, %p)\n", hProv, Algid, hBaseData, dwFlags, phKey);
if (!prov || !hash) CRYPT_ReturnLastError(ERROR_INVALID_HANDLE); @@ -768,7 +769,7 @@ PCRYPTPROV prov; BOOL ret;
- DPRINT("(0x%lx)\n", hHash); + TRACE("(0x%lx)\n", hHash);
if (!hash) CRYPT_ReturnLastError(ERROR_INVALID_HANDLE); @@ -797,7 +798,7 @@ PCRYPTPROV prov; BOOL ret;
- DPRINT("(0x%lx)\n", hKey); + TRACE("(0x%lx)\n", hKey);
if (!key) CRYPT_ReturnLastError(ERROR_INVALID_HANDLE); @@ -829,7 +830,7 @@ PCRYPTPROV prov; PCRYPTHASH orghash, newhash;
- DPRINT("(0x%lx, %p, %08ld, %p)\n", hHash, pdwReserved, dwFlags, phHash); + TRACE("(0x%lx, %p, %08ld, %p)\n", hHash, pdwReserved, dwFlags, phHash);
orghash = (PCRYPTHASH)hHash; if (!orghash || pdwReserved || !phHash) @@ -872,7 +873,7 @@ PCRYPTPROV prov; PCRYPTKEY orgkey, newkey;
- DPRINT("(0x%lx, %p, %08ld, %p)\n", hKey, pdwReserved, dwFlags, phKey); + TRACE("(0x%lx, %p, %08ld, %p)\n", hKey, pdwReserved, dwFlags, phKey);
orgkey = (PCRYPTKEY)hKey; if (!orgkey || pdwReserved || !phKey) @@ -925,7 +926,7 @@ PCRYPTKEY key = (PCRYPTKEY)hKey; PCRYPTHASH hash = (PCRYPTHASH)hHash;
- DPRINT("(0x%lx, 0x%lx, %d, %08ld, %p, %p, %ld)\n", hKey, hHash, Final, dwFlags, pbData, pdwDataLen, dwBufLen); + TRACE("(0x%lx, 0x%lx, %d, %08ld, %p, %p, %ld)\n", hKey, hHash, Final, dwFlags, pbData, pdwDataLen, dwBufLen);
if (!key || !pdwDataLen) CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); @@ -962,7 +963,7 @@ { HKEY hKey;
- DPRINT("(%ld, %p, %ld, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags, + TRACE("(%ld, %p, %ld, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags, pdwProvType, pszProvName, pcbProvName);
if (pdwReserved || !pcbProvName) @@ -1026,7 +1027,7 @@ DWORD strlen; BOOL ret; /* = FALSE; */
- DPRINT("(%ld, %p, %08ld, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags, + TRACE("(%ld, %p, %08ld, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags, pdwProvType, pszProvName, pcbProvName);
strlen = *pcbProvName * sizeof(WCHAR); @@ -1072,7 +1073,7 @@ PSTR keyname, ch; DWORD result;
- DPRINT("(%ld, %p, %08ld, %p, %p, %p)\n", dwIndex, pdwReserved, + TRACE("(%ld, %p, %08ld, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags, pdwProvType, pszTypeName, pcbTypeName);
if (pdwReserved || !pdwProvType || !pcbTypeName) @@ -1123,7 +1124,7 @@ DWORD strlen; BOOL ret;
- DPRINT("(%ld, %p, %08ld, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags, + TRACE("(%ld, %p, %08ld, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags, pdwProvType, pszTypeName, pcbTypeName); strlen = *pcbTypeName / sizeof(WCHAR); if (pszTypeName && !(str = CRYPT_Alloc(strlen))) @@ -1165,7 +1166,7 @@ PCRYPTPROV prov; PCRYPTKEY key = (PCRYPTKEY)hKey, expkey = (PCRYPTKEY)hExpKey;
- DPRINT("(0x%lx, 0x%lx, %ld, %08ld, %p, %p)\n", hKey, hExpKey, dwBlobType, dwFlags, pbData, pdwDataLen); + TRACE("(0x%lx, 0x%lx, %ld, %08ld, %p, %p)\n", hKey, hExpKey, dwBlobType, dwFlags, pbData, pdwDataLen);
if (!key || !pdwDataLen) CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); @@ -1195,7 +1196,7 @@ PCRYPTPROV prov = (PCRYPTPROV)hProv; PCRYPTKEY key;
- DPRINT("(0x%lx, %d, %08ld, %p)\n", hProv, Algid, dwFlags, phKey); + TRACE("(0x%lx, %d, %08ld, %p)\n", hProv, Algid, dwFlags, phKey);
if (!prov) CRYPT_ReturnLastError(ERROR_INVALID_HANDLE); @@ -1300,7 +1301,7 @@ DWORD strlen; BOOL ret = FALSE;
- DPRINT("(%d, %p, %08x, %p, %p)\n", dwProvType, pdwReserved, dwFlags, pszProvName, pcbProvName); + TRACE("(%d, %p, %08x, %p, %p)\n", dwProvType, pdwReserved, dwFlags, pszProvName, pcbProvName);
CryptGetDefaultProviderW(dwProvType, pdwReserved, dwFlags, NULL, &strlen); if ( pszProvName && !(str = CRYPT_Alloc(strlen)) ) @@ -1349,7 +1350,7 @@ PCRYPTPROV prov; PCRYPTHASH hash = (PCRYPTHASH)hHash;
- DPRINT("(0x%lx, %ld, %p, %p, %08ld)\n", hHash, dwParam, pbData, pdwDataLen, dwFlags); + TRACE("(0x%lx, %ld, %p, %p, %08ld)\n", hHash, dwParam, pbData, pdwDataLen, dwFlags);
if (!hash || !pdwDataLen) CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); @@ -1384,7 +1385,7 @@ PCRYPTPROV prov; PCRYPTKEY key = (PCRYPTKEY)hKey;
- DPRINT("(0x%lx, %ld, %p, %p, %08ld)\n", hKey, dwParam, pbData, pdwDataLen, dwFlags); + TRACE("(0x%lx, %ld, %p, %p, %08ld)\n", hKey, dwParam, pbData, pdwDataLen, dwFlags);
if (!key || !pdwDataLen) CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); @@ -1418,7 +1419,7 @@ { PCRYPTPROV prov = (PCRYPTPROV)hProv;
- DPRINT("(0x%lx, %ld, %p, %p, %08ld)\n", hProv, dwParam, pbData, pdwDataLen, dwFlags); + TRACE("(0x%lx, %ld, %p, %p, %08ld)\n", hProv, dwParam, pbData, pdwDataLen, dwFlags);
return prov->pFuncs->pCPGetProvParam(prov->hPrivate, dwParam, pbData, pdwDataLen, dwFlags); } @@ -1442,7 +1443,7 @@ PCRYPTPROV prov = (PCRYPTPROV)hProv; PCRYPTKEY key;
- DPRINT("(0x%lx, %ld, %p)\n", hProv, dwKeySpec, phUserKey); + TRACE("(0x%lx, %ld, %p)\n", hProv, dwKeySpec, phUserKey);
if (!prov) CRYPT_ReturnLastError(ERROR_INVALID_HANDLE); @@ -1485,7 +1486,7 @@ PCRYPTHASH hash = (PCRYPTHASH)hHash; PCRYPTPROV prov;
- DPRINT("(0x%lx, %p, %ld, %08ld)\n", hHash, pbData, dwDataLen, dwFlags); + TRACE("(0x%lx, %p, %ld, %08ld)\n", hHash, pbData, dwDataLen, dwFlags);
if (!hash) CRYPT_ReturnLastError(ERROR_INVALID_HANDLE); @@ -1514,7 +1515,7 @@ PCRYPTKEY key = (PCRYPTKEY)hKey; PCRYPTPROV prov;
- DPRINT("(0x%lx, 0x%lx, %08ld)\n", hHash, hKey, dwFlags); + TRACE("(0x%lx, 0x%lx, %08ld)\n", hHash, hKey, dwFlags);
if (!hash || !key) CRYPT_ReturnLastError(ERROR_INVALID_HANDLE); @@ -1544,7 +1545,7 @@ PCRYPTPROV prov = (PCRYPTPROV)hProv; PCRYPTKEY pubkey = (PCRYPTKEY)hPubKey, importkey;
- DPRINT("(0x%lx, %p, %ld, 0x%lx, %08ld, %p)\n", hProv, pbData, dwDataLen, hPubKey, dwFlags, phKey); + TRACE("(0x%lx, %p, %ld, 0x%lx, %08ld, %p)\n", hProv, pbData, dwDataLen, hPubKey, dwFlags, phKey);
if (!prov || !pbData || !dwDataLen || !phKey) CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); @@ -1602,11 +1603,11 @@ PCRYPTHASH hash = (PCRYPTHASH)hHash; PCRYPTPROV prov;
- DPRINT("(0x%lx, %ld, %08ld, %p, %p)\n", hHash, dwKeySpec, dwFlags, pbSignature, pdwSigLen); + TRACE("(0x%lx, %ld, %08ld, %p, %p)\n", hHash, dwKeySpec, dwFlags, pbSignature, pdwSigLen); if (sDescription) { /* http://msdn.microsoft.com/library/default.asp?url=/library/en-us/seccrypto/s... */ - DPRINT("The sDescription parameter is not supported (and no longer used). Ignoring.\n"); + WARN("The sDescription parameter is not supported (and no longer used). Ignoring.\n"); }
if (!hash) @@ -1640,7 +1641,7 @@ PCRYPTPROV prov; PCRYPTHASH hash = (PCRYPTHASH)hHash;
- DPRINT("(0x%lx, %ld, %p, %08ld)\n", hHash, dwParam, pbData, dwFlags); + TRACE("(0x%lx, %ld, %p, %08ld)\n", hHash, dwParam, pbData, dwFlags);
if (!hash || !pbData) CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); @@ -1670,7 +1671,7 @@ PCRYPTPROV prov; PCRYPTKEY key = (PCRYPTKEY)hKey;
- DPRINT("(0x%lx, %ld, %p, %08ld)\n", hKey, dwParam, pbData, dwFlags); + TRACE("(0x%lx, %ld, %p, %08ld)\n", hKey, dwParam, pbData, dwFlags);
if (!key || !pbData) CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); @@ -1695,7 +1696,7 @@ */ BOOL WINAPI CryptSetProviderA (LPCSTR pszProvName, DWORD dwProvType) { - DPRINT("(%s, %ld)\n", pszProvName, dwProvType); + TRACE("(%s, %ld)\n", pszProvName, dwProvType); return CryptSetProviderExA(pszProvName, dwProvType, NULL, CRYPT_USER_DEFAULT); }
@@ -1706,7 +1707,7 @@ */ BOOL WINAPI CryptSetProviderW (LPCWSTR pszProvName, DWORD dwProvType) { - DPRINT("(%S, %ld)\n", pszProvName, dwProvType); + TRACE("(%S, %ld)\n", pszProvName, dwProvType); return CryptSetProviderExW(pszProvName, dwProvType, NULL, CRYPT_USER_DEFAULT); }
@@ -1731,7 +1732,7 @@ PWSTR keyname; static const WCHAR nameW[] = {'N','a','m','e',0};
- DPRINT("(%S, %d, %p, %08x)\n", pszProvName, dwProvType, pdwReserved, dwFlags); + TRACE("(%S, %d, %p, %08x)\n", pszProvName, dwProvType, pdwReserved, dwFlags);
if (!pszProvName || pdwReserved) { @@ -1811,7 +1812,7 @@ BOOL ret = FALSE; PWSTR str = NULL;
- DPRINT("(%s, %d, %p, %08x)\n", pszProvName, dwProvType, pdwReserved, dwFlags); + TRACE("(%s, %d, %p, %08x)\n", pszProvName, dwProvType, pdwReserved, dwFlags);
if (CRYPT_ANSIToUnicode(pszProvName, &str, -1)) { @@ -1840,14 +1841,14 @@ { PCRYPTPROV prov = (PCRYPTPROV)hProv;
- DPRINT("(0x%lx, %ld, %p, %08ld)\n", hProv, dwParam, pbData, dwFlags); + TRACE("(0x%lx, %ld, %p, %08ld)\n", hProv, dwParam, pbData, dwFlags);
if (!prov) CRYPT_ReturnLastError(ERROR_INVALID_HANDLE); if (dwFlags & PP_USE_HARDWARE_RNG) { - DPRINT1("PP_USE_HARDWARE_RNG: What do I do with this?\n"); - DPRINT1("\tLetting the CSP decide.\n"); + FIXME("PP_USE_HARDWARE_RNG: What do I do with this?\n"); + FIXME("\tLetting the CSP decide.\n"); } if (dwFlags & PP_CLIENT_HWND) { @@ -1897,11 +1898,11 @@ PCRYPTKEY key = (PCRYPTKEY)hPubKey; PCRYPTPROV prov;
- DPRINT("(0x%lx, %p, %ld, 0x%lx, %08ld)\n", hHash, pbSignature, + TRACE("(0x%lx, %p, %ld, 0x%lx, %08ld)\n", hHash, pbSignature, dwSigLen, hPubKey, dwFlags); if (sDescription) { - DPRINT("The sDescription parameter is not supported (and no longer used). Ignoring.\n"); + WARN("The sDescription parameter is not supported (and no longer used). Ignoring.\n"); }
if (!hash || !key) @@ -1922,7 +1923,7 @@ LPCWSTR sDescription, DWORD dwFlags) { - OutputDebugStringA ("ADVAPI32!CryptVerifySignatureW not implemented!"); + FIXME("ADVAPI32!CryptVerifySignatureW not implemented!"); return FALSE; }
@@ -1943,7 +1944,7 @@ */ NTSTATUS WINAPI SystemFunction040(PVOID memory, ULONG length, ULONG flags) /* RtlEncryptMemory */ { - DPRINT1("(%p, %lx, %lx): stub [RtlEncryptMemory]\n", memory, length, flags); + FIXME("(%p, %lx, %lx): stub [RtlEncryptMemory]\n", memory, length, flags); return STATUS_SUCCESS; }
@@ -1959,7 +1960,7 @@ */ NTSTATUS WINAPI SystemFunction041(PVOID memory, ULONG length, ULONG flags) /* RtlDecryptMemory */ { - DPRINT1("(%p, %lx, %lx): stub [RtlDecryptMemory]\n", memory, length, flags); + FIXME("(%p, %lx, %lx): stub [RtlDecryptMemory]\n", memory, length, flags); return STATUS_SUCCESS; }
@@ -1972,7 +1973,7 @@ PENCRYPTION_CERTIFICATE_LIST pencryption_certificate_list ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); return ERROR_CALL_NOT_IMPLEMENTED; }
@@ -1984,7 +1985,7 @@ PENCRYPTION_CERTIFICATE_HASH_LIST pencryption_certificate_hash_list ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); return ERROR_CALL_NOT_IMPLEMENTED; }
@@ -1996,7 +1997,7 @@ LPDWORD lpStatus ) { - DPRINT1("%s(%S) not implemented!\n", __FUNCTION__, lpFileName); + FIXME("%s(%S) not implemented!\n", __FUNCTION__, lpFileName); if (!lpStatus) return FALSE; *lpStatus = FILE_SYSTEM_NOT_SUPPORT; @@ -2016,6 +2017,8 @@ NTSTATUS Status; BOOL ret = FALSE;
+ TRACE("(%s, %p)\n", lpFileName, lpStatus); + FileName.Buffer = NULL;
Status = RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName); @@ -2040,7 +2043,7 @@ PENCRYPTION_CERTIFICATE_HASH_LIST* pencryption_certificate_hash_list ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); return ERROR_CALL_NOT_IMPLEMENTED; }
@@ -2052,7 +2055,7 @@ PENCRYPTION_CERTIFICATE_HASH_LIST pencryption_certificate_hash_list ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); return; }
@@ -2065,7 +2068,7 @@ PENCRYPTION_CERTIFICATE_HASH_LIST* pencryption_certificate_hash_list ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); return ERROR_CALL_NOT_IMPLEMENTED; }
@@ -2077,9 +2080,10 @@ BOOL Disable ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; }
+
Modified: trunk/reactos/dll/win32/advapi32/misc/hwprofiles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/hwp... ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/hwprofiles.c (original) +++ trunk/reactos/dll/win32/advapi32/misc/hwprofiles.c Fri Feb 8 20:04:39 2008 @@ -10,7 +10,8 @@ */
#include <advapi32.h> -#include <debug.h> +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(advapi);
/****************************************************************************** * GetCurrentHwProfileA [ADVAPI32.@] @@ -35,7 +36,7 @@ BOOL bResult; NTSTATUS Status;
- DPRINT("GetCurrentHwProfileA() called\n"); + TRACE("GetCurrentHwProfileA() called\n");
bResult = GetCurrentHwProfileW(&ProfileInfo); if (bResult == FALSE) @@ -91,7 +92,7 @@ DWORD dwLength; DWORD dwConfigId;
- DPRINT("GetCurrentHwProfileW() called\n"); + TRACE("GetCurrentHwProfileW() called\n");
if (lpHwProfileInfo == NULL) {
Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/log... ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/logon.c (original) +++ trunk/reactos/dll/win32/advapi32/misc/logon.c Fri Feb 8 20:04:39 2008 @@ -7,8 +7,9 @@ */
#include <advapi32.h> -#define NDEBUG -#include <debug.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(advapi);
/* FUNCTIONS ***************************************************************/ @@ -216,7 +217,7 @@ KEY_READ, &hUsersKey)) { - DPRINT1 ("Failed to open Users key! (Error %lu)\n", GetLastError()); + ERR("Failed to open Users key! (Error %lu)\n", GetLastError()); return FALSE; }
@@ -229,12 +230,12 @@ { if (GetLastError () == ERROR_FILE_NOT_FOUND) { - DPRINT1 ("Invalid user name!\n"); + ERR("Invalid user name!\n"); SetLastError (ERROR_NO_SUCH_USER); } else { - DPRINT1 ("Failed to open user key! (Error %lu)\n", GetLastError()); + ERR("Failed to open user key! (Error %lu)\n", GetLastError()); }
RegCloseKey (hUsersKey); @@ -252,19 +253,19 @@ NULL, &dwLength)) { - DPRINT1 ("Failed to read the SID size! (Error %lu)\n", GetLastError()); + ERR("Failed to read the SID size! (Error %lu)\n", GetLastError()); RegCloseKey (hUserKey); return FALSE; }
/* Allocate sid buffer */ - DPRINT ("Required SID buffer size: %lu\n", dwLength); + TRACE("Required SID buffer size: %lu\n", dwLength); lpSid = (PSID)RtlAllocateHeap (RtlGetProcessHeap (), 0, dwLength); if (lpSid == NULL) { - DPRINT1 ("Failed to allocate SID buffer!\n"); + ERR("Failed to allocate SID buffer!\n"); RegCloseKey (hUserKey); return FALSE; } @@ -277,7 +278,7 @@ (LPBYTE)lpSid, &dwLength)) { - DPRINT1 ("Failed to read the SID! (Error %lu)\n", GetLastError()); + ERR("Failed to read the SID! (Error %lu)\n", GetLastError()); RtlFreeHeap (RtlGetProcessHeap (), 0, lpSid); @@ -300,7 +301,7 @@ DWORD dwLength; HKEY hDomainKey;
- DPRINT("SamGetDomainSid() called\n"); + TRACE("SamGetDomainSid() called\n");
if (Sid != NULL) *Sid = NULL; @@ -312,7 +313,7 @@ KEY_READ, &hDomainKey)) { - DPRINT1("Failed to open the account domain key! (Error %lu)\n", GetLastError()); + ERR("Failed to open the account domain key! (Error %lu)\n", GetLastError()); return FALSE; }
@@ -325,19 +326,19 @@ NULL, &dwLength)) { - DPRINT1("Failed to read the SID size! (Error %lu)\n", GetLastError()); + ERR("Failed to read the SID size! (Error %lu)\n", GetLastError()); RegCloseKey(hDomainKey); return FALSE; }
/* Allocate sid buffer */ - DPRINT("Required SID buffer size: %lu\n", dwLength); + TRACE("Required SID buffer size: %lu\n", dwLength); lpSid = (PSID)RtlAllocateHeap(RtlGetProcessHeap(), 0, dwLength); if (lpSid == NULL) { - DPRINT1("Failed to allocate SID buffer!\n"); + ERR("Failed to allocate SID buffer!\n"); RegCloseKey(hDomainKey); return FALSE; } @@ -350,7 +351,7 @@ (LPBYTE)lpSid, &dwLength)) { - DPRINT1("Failed to read the SID! (Error %lu)\n", GetLastError()); + ERR("Failed to read the SID! (Error %lu)\n", GetLastError()); RtlFreeHeap(RtlGetProcessHeap(), 0, lpSid); @@ -362,7 +363,7 @@
*Sid = lpSid;
- DPRINT("SamGetDomainSid() done\n"); + TRACE("SamGetDomainSid() done\n");
return TRUE; } @@ -480,7 +481,7 @@ TokenGroups->Groups[GroupCount].Attributes = SE_GROUP_ENABLED | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_MANDATORY; GroupCount++; #else - DPRINT1("Not adding user to Administrators group\n"); + TRACE("Not adding user to Administrators group\n"); #endif
/* Member of 'Users' */ @@ -674,7 +675,7 @@ /* Get the user SID from the registry */ if (!SamGetUserSid (lpszUsername, &UserSid)) { - DPRINT1 ("SamGetUserSid() failed\n"); + ERR("SamGetUserSid() failed\n"); return FALSE; }
@@ -710,7 +711,7 @@ if (! LookupPrivilegeValueW(NULL, DefaultPrivs[i].PrivName, &TokenPrivileges->Privileges[TokenPrivileges->PrivilegeCount].Luid)) { - DPRINT1("Can't set privilege %S\n", DefaultPrivs[i].PrivName); + WARN("Can't set privilege %S\n", DefaultPrivs[i].PrivName); } else {
Modified: trunk/reactos/dll/win32/advapi32/misc/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/msi... ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/msi.c (original) +++ trunk/reactos/dll/win32/advapi32/misc/msi.c Fri Feb 8 20:04:39 2008 @@ -9,8 +9,14 @@
#include <advapi32.h>
-#define NDEBUG -#include <debug.h> +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(advapi); +#ifndef _UNICODE +#define debugstr_aw debugstr_a +#else +#define debugstr_aw debugstr_w +#endif +
typedef UINT (WINAPI *fnMsiProvideComponentFromDescriptor)(LPCWSTR,LPWSTR,DWORD*,DWORD*);
@@ -22,7 +28,7 @@ HMODULE hmsi; UINT r = ERROR_CALL_NOT_IMPLEMENTED;
- DPRINT("%S %p %p\n", szDescriptor, szCommandLine, pcchCommandLine); + TRACE("%S %p %p\n", szDescriptor, szCommandLine, pcchCommandLine);
hmsi = LoadLibraryW( szMsi ); if (!hmsi)
Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg.... ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c Fri Feb 8 20:04:39 2008 @@ -14,10 +14,9 @@ /* INCLUDES *****************************************************************/
#include <advapi32.h> -#define NDEBUG #include <wine/debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(advapi32); +WINE_DEFAULT_DEBUG_CHANNEL(reg);
/* DEFINES ******************************************************************/
Modified: trunk/reactos/dll/win32/advapi32/sec/ac.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/ac.c... ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/ac.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/ac.c Fri Feb 8 20:04:39 2008 @@ -7,9 +7,9 @@ */
#include <advapi32.h> - -#define NDEBUG -#include <debug.h> +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(advapi);
/* --- ACL --- */
@@ -1078,7 +1078,7 @@ IN PTRUSTEE_W pTrustee, OUT PACCESS_MASK pAccessRights) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); return ERROR_CALL_NOT_IMPLEMENTED; }
@@ -1123,7 +1123,7 @@ OUT PACCESS_MASK pSuccessfulAuditedRights, OUT PACCESS_MASK pFailedAuditRights) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); return ERROR_CALL_NOT_IMPLEMENTED; }
Modified: trunk/reactos/dll/win32/advapi32/sec/audit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/audi... ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/audit.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/audit.c Fri Feb 8 20:04:39 2008 @@ -12,9 +12,9 @@ /* INCLUDES *****************************************************************/
#include <advapi32.h> - -#define NDEBUG -#include <debug.h> +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(advapi);
/* FUNCTIONS ****************************************************************/
@@ -530,7 +530,7 @@ OUT LPDWORD AccessStatusList, OUT LPBOOL pfGenerateOnClose) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -558,7 +558,7 @@ OUT LPDWORD AccessStatusList, OUT LPBOOL pfGenerateOnClose) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -585,7 +585,7 @@ OUT LPDWORD AccessStatusList, OUT LPBOOL pfGenerateOnClose) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -612,7 +612,7 @@ OUT LPDWORD AccessStatusList, OUT LPBOOL pfGenerateOnClose) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -639,7 +639,7 @@ OUT LPBOOL AccessStatus, OUT LPBOOL pfGenerateOnClose) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -666,7 +666,7 @@ OUT LPBOOL AccessStatus, OUT LPBOOL pfGenerateOnClose) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; }
Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa.... ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c Fri Feb 8 20:04:39 2008 @@ -12,9 +12,9 @@ */
#include <advapi32.h> - -#define NDEBUG -#include <debug.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(advapi);
static handle_t LSABindingHandle = NULL;
@@ -29,7 +29,7 @@ status = RpcBindingFree(Handle); if (status) { - DPRINT1("RpcBindingFree returned 0x%x\n", status); + TRACE("RpcBindingFree returned 0x%x\n", status); } }
@@ -51,7 +51,7 @@ &pszStringBinding); if (status) { - DPRINT1("RpcStringBindingCompose returned 0x%x\n", status); + TRACE("RpcStringBindingCompose returned 0x%x\n", status); return; }
@@ -60,13 +60,13 @@ &Handle); if (status) { - DPRINT1("RpcBindingFromStringBinding returned 0x%x\n", status); + TRACE("RpcBindingFromStringBinding returned 0x%x\n", status); }
status = RpcStringFreeW(&pszStringBinding); if (status) { - DPRINT1("RpcStringFree returned 0x%x\n", status); + TRACE("RpcStringFree returned 0x%x\n", status); }
if (InterlockedCompareExchangePointer(&LSABindingHandle, @@ -84,7 +84,7 @@ NTSTATUS STDCALL LsaClose(LSA_HANDLE ObjectHandle) { - DPRINT("LsaClose(0x%p) called\n", ObjectHandle); + TRACE("LsaClose(0x%p) called\n", ObjectHandle);
LSAHandleBind();
@@ -99,7 +99,7 @@ NTSTATUS STDCALL LsaDelete(LSA_HANDLE ObjectHandle) { - DPRINT("LsaDelete(0x%p) called\n", ObjectHandle); + TRACE("LsaDelete(0x%p) called\n", ObjectHandle);
LSAHandleBind();
@@ -295,7 +295,7 @@ PLSA_REFERENCED_DOMAIN_LIST LocalDomains; PLSA_TRANSLATED_NAME LocalNames;
- DPRINT("LsaLookupSids(): stub. Always returning 'Administrator'\n"); + WARN("LsaLookupSids(): stub. Always returning 'Administrator'\n"); if (Count != 1) return STATUS_NONE_MAPPED; LocalDomains = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(LSA_TRANSLATED_SID)); @@ -354,7 +354,7 @@ static int count = 0; if (count++ < 20) { - DPRINT("LsaOpenPolicy - stub\n"); + FIXME("%s() not implemented!\n", __FUNCTION__); } return STATUS_SUCCESS; } @@ -407,7 +407,7 @@ POLICY_INFORMATION_CLASS pic, PVOID *Buffer) { - DPRINT1("(%p,0x%08x,%p):LsaQueryInformationPolicy stub\n", + TRACE("(%p,0x%08x,%p):LsaQueryInformationPolicy stub\n", PolicyHandle, pic, Buffer);
if (!Buffer) @@ -464,7 +464,7 @@ } if (useDefault) RtlCreateUnicodeStringFromAsciiz(&(xdi->ppdi.Name), "DOMAIN"); - DPRINT1("setting domain to \n"); + TRACE("setting domain to \n");
xdi->ppdi.Sid = &(xdi->sid); xdi->sid.Revision = SID_REVISION; @@ -485,7 +485,7 @@ case PolicyDnsDomainInformation: case PolicyEfsInformation: { - DPRINT1("category not implemented\n"); + FIXME("category not implemented\n"); return FALSE; } } @@ -639,7 +639,7 @@ PUNICODE_STRING *UserName, PUNICODE_STRING *DomainName) { - DPRINT1("LsaGetUserName not implemented\n"); + FIXME("%s() not implemented!\n", __FUNCTION__);
return STATUS_NOT_IMPLEMENTED; } @@ -653,7 +653,7 @@ DWORD Unknonw1, DWORD Unknonw2) { - DPRINT1("LsaQueryInfoTrustedDomain not implemented\n"); + FIXME("%s() not implemented!\n", __FUNCTION__);;
return STATUS_NOT_IMPLEMENTED; }
Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/misc... ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/misc.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/misc.c Fri Feb 8 20:04:39 2008 @@ -6,9 +6,9 @@ */
#include <advapi32.h> - -#define NDEBUG -#include <debug.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(advapi);
/* Needed for LookupAccountNameW implementation from Wine */
@@ -208,7 +208,7 @@ #if DBG else { - DPRINT1("Failed to initialize ntmarta.dll! Error: 0x%x", ErrorCode); + ERR("Failed to initialize ntmarta.dll! Error: 0x%x", ErrorCode); } #endif } @@ -326,7 +326,7 @@ HANDLE FileHandle; NTSTATUS Status;
- DPRINT("GetFileSecurityW() called\n"); + TRACE("GetFileSecurityW() called\n");
if (RequestedInformation & (OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION)) @@ -344,7 +344,7 @@ NULL, NULL)) { - DPRINT("Invalid path\n"); + ERR("Invalid path\n"); SetLastError(ERROR_INVALID_NAME); return FALSE; } @@ -368,7 +368,7 @@
if (!NT_SUCCESS(Status)) { - DPRINT("NtOpenFile() failed (Status %lx)\n", Status); + ERR("NtOpenFile() failed (Status %lx)\n", Status); SetLastError(RtlNtStatusToDosError(Status)); return FALSE; } @@ -382,7 +382,7 @@
if (!NT_SUCCESS(Status)) { - DPRINT("NtQuerySecurityObject() failed (Status %lx)\n", Status); + ERR("NtQuerySecurityObject() failed (Status %lx)\n", Status); SetLastError(RtlNtStatusToDosError(Status)); return FALSE; } @@ -468,7 +468,7 @@ HANDLE FileHandle; NTSTATUS Status;
- DPRINT("SetFileSecurityW() called\n"); + TRACE("SetFileSecurityW() called\n");
if (SecurityInformation & (OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION)) @@ -491,7 +491,7 @@ NULL, NULL)) { - DPRINT("Invalid path\n"); + ERR("Invalid path\n"); SetLastError(ERROR_INVALID_NAME); return FALSE; } @@ -515,7 +515,7 @@
if (!NT_SUCCESS(Status)) { - DPRINT("NtOpenFile() failed (Status %lx)\n", Status); + ERR("NtOpenFile() failed (Status %lx)\n", Status); SetLastError(RtlNtStatusToDosError(Status)); return FALSE; } @@ -527,7 +527,7 @@
if (!NT_SUCCESS(Status)) { - DPRINT("NtSetSecurityObject() failed (Status %lx)\n", Status); + ERR("NtSetSecurityObject() failed (Status %lx)\n", Status); SetLastError(RtlNtStatusToDosError(Status)); return FALSE; } @@ -1155,7 +1155,7 @@ static const WCHAR dm[] = {'D','O','M','A','I','N',0}; unsigned int i;
- DPRINT("%s %s %p %p %p %p %p - stub\n", lpSystemName, lpAccountName, + TRACE("%s %s %p %p %p %p %p - stub\n", lpSystemName, lpAccountName, Sid, cbSid, ReferencedDomainName, cchReferencedDomainName, peUse);
for (i = 0; i < (sizeof(ACCOUNT_SIDS) / sizeof(ACCOUNT_SIDS[0])); i++) @@ -1306,7 +1306,7 @@
if (NULL != SystemName && L'\0' != *SystemName) { - DPRINT1("LookupPrivilegeValueW: not implemented for remote system\n"); + FIXME("LookupPrivilegeValueW: not implemented for remote system\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -1321,7 +1321,7 @@ } }
- DPRINT1("LookupPrivilegeValueW: no such privilege %S\n", PrivName); + WARN("LookupPrivilegeValueW: no such privilege %S\n", PrivName); SetLastError(ERROR_NO_SUCH_PRIVILEGE); return FALSE; } @@ -1339,7 +1339,7 @@ LPDWORD cbDisplayName, LPDWORD lpLanguageId) { - DPRINT1("LookupPrivilegeDisplayNameA: stub\n"); + FIXME("%s() not implemented!\n", __FUNCTION__); SetLastError (ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -1357,7 +1357,7 @@ LPDWORD cbDisplayName, LPDWORD lpLanguageId) { - DPRINT1("LookupPrivilegeDisplayNameW: stub\n"); + FIXME("%s() not implemented!\n", __FUNCTION__); SetLastError (ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -1374,7 +1374,7 @@ LPSTR lpName, LPDWORD cbName) { - DPRINT1("LookupPrivilegeNameA: stub\n"); + FIXME("%s() not implemented!\n", __FUNCTION__); SetLastError (ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -1391,7 +1391,7 @@ LPWSTR lpName, LPDWORD cbName) { - DPRINT1("LookupPrivilegeNameW: stub\n"); + FIXME("%s() not implemented!\n", __FUNCTION__); SetLastError (ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -1863,7 +1863,7 @@ LPSTR *lppGroup ) { - DPRINT1("GetSecurityInfoExA stub!\n"); + FIXME("%s() not implemented!\n", __FUNCTION__); return ERROR_BAD_PROVIDER; }
@@ -1883,7 +1883,7 @@ LPWSTR *lppGroup ) { - DPRINT1("GetSecurityInfoExW stub!\n"); + FIXME("%s() not implemented!\n", __FUNCTION__); return ERROR_BAD_PROVIDER; }
@@ -1899,7 +1899,7 @@ IO_STATUS_BLOCK StatusBlock; NTSTATUS Status;
- DPRINT("ImpersonateNamedPipeClient() called\n"); + TRACE("ImpersonateNamedPipeClient() called\n");
Status = NtFsControlFile(hNamedPipe, NULL, @@ -1963,7 +1963,7 @@ HANDLE Token, PGENERIC_MAPPING GenericMapping) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); return FALSE; }
@@ -1982,7 +1982,7 @@ HANDLE Token, PGENERIC_MAPPING GenericMapping) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); return FALSE; }
Modified: trunk/reactos/dll/win32/advapi32/sec/sec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sec.... ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sec.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/sec.c Fri Feb 8 20:04:39 2008 @@ -12,9 +12,9 @@ */
#include <advapi32.h> - -#define NDEBUG -#include <debug.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(advapi);
/* * @implemented @@ -569,7 +569,7 @@ */ BOOL WINAPI DecryptFileW(LPCWSTR lpFileName, DWORD dwReserved) { - DPRINT1("%s(%S) not implemented!\n", __FUNCTION__, lpFileName); + FIXME("%s(%S) not implemented!\n", __FUNCTION__, lpFileName); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -602,7 +602,7 @@ */ BOOL WINAPI EncryptFileW(LPCWSTR lpFileName) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -637,7 +637,7 @@ LPWSTR* lpwstr, PULONG pulong) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -649,7 +649,7 @@ LPSTR* lpstr, PULONG pulong) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); + FIXME("%s() not implemented!\n", __FUNCTION__); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; }
Modified: trunk/reactos/dll/win32/advapi32/sec/trustee.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/trus... ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/trustee.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/trustee.c Fri Feb 8 20:04:39 2008 @@ -8,8 +8,9 @@
#include <advapi32.h>
-#define NDEBUG -#include <debug.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(advapi);
/****************************************************************************** @@ -132,7 +133,7 @@ VOID WINAPI BuildTrusteeWithSidA(PTRUSTEE_A pTrustee, PSID pSid) { - DPRINT("%p %p\n", pTrustee, pSid); + TRACE("%p %p\n", pTrustee, pSid);
pTrustee->pMultipleTrustee = NULL; pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; @@ -148,7 +149,7 @@ VOID WINAPI BuildTrusteeWithSidW(PTRUSTEE_W pTrustee, PSID pSid) { - DPRINT("%p %p\n", pTrustee, pSid); + TRACE("%p %p\n", pTrustee, pSid);
pTrustee->pMultipleTrustee = NULL; pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; @@ -164,7 +165,7 @@ VOID WINAPI BuildTrusteeWithNameA(PTRUSTEE_A pTrustee, LPSTR name) { - DPRINT("%p %s\n", pTrustee, name); + TRACE("%p %s\n", pTrustee, name);
pTrustee->pMultipleTrustee = NULL; pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; @@ -180,7 +181,7 @@ VOID WINAPI BuildTrusteeWithNameW(PTRUSTEE_W pTrustee, LPWSTR name) { - DPRINT("%p %s\n", pTrustee, name); + TRACE("%p %s\n", pTrustee, name);
pTrustee->pMultipleTrustee = NULL; pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; @@ -200,7 +201,7 @@ { DWORD ObjectsPresent = 0;
- DPRINT("%p %p 0x%08x %p %p %s\n", pTrustee, pObjName, + TRACE("%p %p 0x%08x %p %p %s\n", pTrustee, pObjName, ObjectType, ObjectTypeName, InheritedObjectTypeName, Name);
/* Fill the OBJECTS_AND_NAME structure */ @@ -238,7 +239,7 @@ { DWORD ObjectsPresent = 0;
- DPRINT("%p %p 0x%08x %p %p %s\n", pTrustee, pObjName, + TRACE("%p %p 0x%08x %p %p %s\n", pTrustee, pObjName, ObjectType, ObjectTypeName, InheritedObjectTypeName, Name);
/* Fill the OBJECTS_AND_NAME structure */ @@ -275,7 +276,7 @@ { DWORD ObjectsPresent = 0;
- DPRINT("%p %p %p %p %p\n", pTrustee, pObjSid, pObjectGuid, pInheritedObjectGuid, pSid); + TRACE("%p %p %p %p %p\n", pTrustee, pObjSid, pObjectGuid, pInheritedObjectGuid, pSid);
/* Fill the OBJECTS_AND_SID structure */ if (pObjectGuid != NULL) @@ -321,7 +322,7 @@ { DWORD ObjectsPresent = 0;
- DPRINT("%p %p %p %p %p\n", pTrustee, pObjSid, pObjectGuid, pInheritedObjectGuid, pSid); + TRACE("%p %p %p %p %p\n", pTrustee, pObjSid, pObjectGuid, pInheritedObjectGuid, pSid);
/* Fill the OBJECTS_AND_SID structure */ if (pObjectGuid != NULL)
Modified: trunk/reactos/dll/win32/advapi32/service/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service/... ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/eventlog.c (original) +++ trunk/reactos/dll/win32/advapi32/service/eventlog.c Fri Feb 8 20:04:39 2008 @@ -22,9 +22,10 @@ */
#include <advapi32.h> -#define NDEBUG -#include <debug.h> - +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(advapi); +WINE_DECLARE_DEBUG_CHANNEL(eventlog);
typedef struct _LOG_INFO { @@ -45,7 +46,7 @@ NTSTATUS Status; ANSI_STRING BackupFileName;
- DPRINT("%p, %s\n", hEventLog, lpBackupFileName); + TRACE("%p, %s\n", hEventLog, lpBackupFileName);
RtlInitAnsiString(&BackupFileName, lpBackupFileName);
@@ -84,7 +85,7 @@ NTSTATUS Status; UNICODE_STRING BackupFileName;
- DPRINT("%p, %s\n", hEventLog, lpBackupFileName); + TRACE("%p, %s\n", hEventLog, lpBackupFileName);
RtlInitUnicodeString(&BackupFileName, lpBackupFileName);
@@ -120,7 +121,7 @@ NTSTATUS Status; ANSI_STRING BackupFileName;
- DPRINT("%p, %s\n", hEventLog, lpBackupFileName); + TRACE("%p, %s\n", hEventLog, lpBackupFileName);
RtlInitAnsiString(&BackupFileName, lpBackupFileName);
@@ -156,7 +157,7 @@ NTSTATUS Status; UNICODE_STRING BackupFileName;
- DPRINT("%p, %s\n", hEventLog, lpBackupFileName); + TRACE("%p, %s\n", hEventLog, lpBackupFileName);
RtlInitUnicodeString(&BackupFileName, lpBackupFileName);
@@ -190,7 +191,7 @@ PLOG_INFO pLog; NTSTATUS Status;
- DPRINT("%p", hEventLog); + TRACE("%p", hEventLog);
pLog = (PLOG_INFO)hEventLog; if (!pLog) @@ -238,7 +239,7 @@ PLOG_INFO pLog; NTSTATUS Status;
- DPRINT("%p\n", hEventLog); + TRACE("%p\n", hEventLog);
pLog = (PLOG_INFO)hEventLog; if (!pLog) @@ -272,7 +273,7 @@ NTSTATUS Status; long Records;
- DPRINT("%p, %p\n", hEventLog, NumberOfRecords); + TRACE("%p, %p\n", hEventLog, NumberOfRecords);
pLog = (PLOG_INFO)hEventLog; if (!pLog) @@ -311,7 +312,7 @@ NTSTATUS Status; long Oldest;
- DPRINT("%p, %p\n", hEventLog, OldestRecord); + TRACE("%p, %p\n", hEventLog, OldestRecord);
pLog = (PLOG_INFO)hEventLog; if (!pLog) @@ -365,7 +366,7 @@ UNICODE_STRING FileName; HANDLE Handle;
- DPRINT("%s, %s\n", lpUNCServerName, lpFileName); + TRACE("%s, %s\n", lpUNCServerName, lpFileName);
if (!RtlCreateUnicodeStringFromAsciiz(&UNCServerName, lpUNCServerName)) { @@ -407,7 +408,7 @@ UNICODE_STRING UNCServerName; UNICODE_STRING FileName;
- DPRINT("%s, %s\n", lpUNCServerName, lpFileName); + TRACE("%s, %s\n", lpUNCServerName, lpFileName);
RtlInitUnicodeString(&UNCServerName, lpUNCServerName); RtlInitUnicodeString(&FileName, lpFileName); @@ -511,7 +512,7 @@ UNICODE_STRING UNCServerName; UNICODE_STRING SourceName;
- DPRINT("%s, %s\n", lpUNCServerName, lpSourceName); + TRACE("%s, %s\n", lpUNCServerName, lpSourceName);
RtlInitUnicodeString(&UNCServerName, lpUNCServerName); RtlInitUnicodeString(&SourceName, lpSourceName); @@ -583,7 +584,7 @@ NTSTATUS Status; long bytesRead, minNumberOfBytesNeeded;
- DPRINT("%p, %lu, %lu, %p, %lu, %p, %p\n", + TRACE("%p, %lu, %lu, %p, %lu, %p, %p\n", hEventLog, dwReadFlags, dwRecordOffset, lpBuffer, nNumberOfBytesToRead, pnBytesRead, pnMinNumberOfBytesNeeded);
@@ -640,7 +641,7 @@ NTSTATUS Status; long bytesRead, minNumberOfBytesNeeded;
- DPRINT("%p, %lu, %lu, %p, %lu, %p, %p\n", + TRACE("%p, %lu, %lu, %p, %lu, %p, %p\n", hEventLog, dwReadFlags, dwRecordOffset, lpBuffer, nNumberOfBytesToRead, pnBytesRead, pnMinNumberOfBytesNeeded);
@@ -683,7 +684,7 @@ UNICODE_STRING SourceName; HANDLE Handle;
- DPRINT("%s, %s\n", lpUNCServerName, lpSourceName); + TRACE("%s, %s\n", lpUNCServerName, lpSourceName);
if (!RtlCreateUnicodeStringFromAsciiz(&UNCServerName, lpUNCServerName)) { @@ -728,7 +729,7 @@ UNICODE_STRING UNCServerName; UNICODE_STRING SourceName;
- DPRINT("%s, %s\n", lpUNCServerName, lpSourceName); + TRACE("%s, %s\n", lpUNCServerName, lpSourceName);
RtlInitUnicodeString(&UNCServerName, lpUNCServerName); RtlInitUnicodeString(&SourceName, lpSourceName); @@ -892,7 +893,7 @@ UNICODE_STRING *Strings; WORD i;
- DPRINT("%p, %u, %u, %lu, %p, %u, %lu, %p, %p\n", + TRACE("%p, %u, %u, %lu, %p, %u, %lu, %p, %p\n", hEventLog, wType, wCategory, dwEventID, lpUserSid, wNumStrings, dwDataSize, lpStrings, lpRawData);
@@ -955,23 +956,23 @@ switch (wType) { case EVENTLOG_SUCCESS: - DPRINT1("Success: %S\n", lpStrings[i]); + TRACE_(eventlog)("Success: %S\n", lpStrings[i]); break;
case EVENTLOG_ERROR_TYPE: - DPRINT1("Error: %S\n", lpStrings[i]); + ERR_(eventlog)("Error: %S\n", lpStrings[i]); break;
case EVENTLOG_WARNING_TYPE: - DPRINT1("Warning: %S\n", lpStrings[i]); + WARN_(eventlog)("Warning: %S\n", lpStrings[i]); break;
case EVENTLOG_INFORMATION_TYPE: - DPRINT1("Info: %S\n", lpStrings[i]); + TRACE_(eventlog)("Info: %S\n", lpStrings[i]); break;
default: - DPRINT1("Type %hu: %S\n", wType, lpStrings[i]); + TRACE_(eventlog)("Type %hu: %S\n", wType, lpStrings[i]); break; } }
Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service/... ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c Fri Feb 8 20:04:39 2008 @@ -14,8 +14,10 @@
#include <advapi32.h>
-#define NDEBUG -#include <debug.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(advapi); +
/* FUNCTIONS *****************************************************************/
@@ -38,7 +40,7 @@ &pszStringBinding); if (status) { - DPRINT1("RpcStringBindingCompose returned 0x%x\n", status); + TRACE("RpcStringBindingCompose returned 0x%x\n", status); return; }
@@ -47,13 +49,13 @@ &BindingHandle); if (status) { - DPRINT1("RpcBindingFromStringBinding returned 0x%x\n", status); + TRACE("RpcBindingFromStringBinding returned 0x%x\n", status); }
status = RpcStringFreeW(&pszStringBinding); if (status) { - DPRINT1("RpcStringFree returned 0x%x\n", status); + TRACE("RpcStringFree returned 0x%x\n", status); } }
@@ -70,7 +72,7 @@ status = RpcBindingFree(&BindingHandle); if (status) { - DPRINT1("RpcBindingFree returned 0x%x\n", status); + TRACE("RpcBindingFree returned 0x%x\n", status); } } #endif @@ -89,7 +91,7 @@ DWORD lpInfoSize; DWORD dwError;
- DPRINT("ChangeServiceConfig2A() called\n"); + TRACE("ChangeServiceConfig2A() called\n");
/* Determine the length of the lpInfo parameter */ switch (dwInfoLevel) @@ -103,7 +105,7 @@ break;
default: - DPRINT1("Unknown info level 0x%lx\n", dwInfoLevel); + WARN("Unknown info level 0x%lx\n", dwInfoLevel); SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -120,7 +122,7 @@ lpInfoSize); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrChangeServiceConfig2A() failed (Error %lu)\n", dwError); + ERR("ScmrChangeServiceConfig2A() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -143,7 +145,7 @@ DWORD dwInfoSize; DWORD dwError;
- DPRINT("ChangeServiceConfig2W() called\n"); + TRACE("ChangeServiceConfig2W() called\n");
switch (dwInfoLevel) { @@ -178,7 +180,7 @@ break;
default: - DPRINT1("Unknown info level 0x%lx\n", dwInfoLevel); + WARN("Unknown info level 0x%lx\n", dwInfoLevel); SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -195,7 +197,7 @@ dwInfoSize); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrChangeServiceConfig2W() failed (Error %lu)\n", dwError); + ERR("ScmrChangeServiceConfig2W() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -204,7 +206,7 @@ if (lpSendData != NULL) HeapFree(GetProcessHeap(), 0, lpSendData);
- DPRINT("ChangeServiceConfig2W() done\n"); + TRACE("ChangeServiceConfig2W() done\n");
return TRUE; } @@ -233,7 +235,7 @@ DWORD dwLength; LPSTR lpStr;
- DPRINT("ChangeServiceConfigA() called\n"); + TRACE("ChangeServiceConfigA() called\n");
/* Calculate the Dependencies length*/ if (lpDependencies != NULL) @@ -269,7 +271,7 @@ (LPSTR)lpDisplayName); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrChangeServiceConfigA() failed (Error %lu)\n", dwError); + ERR("ScmrChangeServiceConfigA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -301,7 +303,7 @@ DWORD dwLength; LPWSTR lpStr;
- DPRINT("ChangeServiceConfigW() called\n"); + TRACE("ChangeServiceConfigW() called\n");
/* Calculate the Dependencies length*/ if (lpDependencies != NULL) @@ -337,7 +339,7 @@ (LPWSTR)lpDisplayName); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrChangeServiceConfigW() failed (Error %lu)\n", dwError); + ERR("ScmrChangeServiceConfigW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -356,7 +358,7 @@ { DWORD dwError;
- DPRINT("CloseServiceHandle() called\n"); + TRACE("CloseServiceHandle() called\n");
HandleBind();
@@ -365,12 +367,12 @@ (unsigned int)hSCObject); if (dwError) { - DPRINT1("ScmrCloseServiceHandle() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } - - DPRINT("CloseServiceHandle() done\n"); + ERR("ScmrCloseServiceHandle() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + TRACE("CloseServiceHandle() done\n");
return TRUE; } @@ -388,7 +390,7 @@ { DWORD dwError;
- DPRINT("ControlService(%x, %x, %p)\n", + TRACE("ControlService(%x, %x, %p)\n", hService, dwControl, lpServiceStatus);
HandleBind(); @@ -400,12 +402,12 @@ lpServiceStatus); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrControlService() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } - - DPRINT("ControlService() done\n"); + ERR("ScmrControlService() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + TRACE("ControlService() done\n");
return TRUE; } @@ -422,7 +424,7 @@ IN DWORD dwInfoLevel, IN OUT PVOID pControlParams) { - DPRINT1("ControlServiceEx(0x%p, 0x%x, 0x%x, 0x%p) UNIMPLEMENTED!\n", + FIXME("ControlServiceEx(0x%p, 0x%x, 0x%x, 0x%p) UNIMPLEMENTED!\n", hService, dwControl, dwInfoLevel, pControlParams); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -621,7 +623,7 @@ DWORD dwLength; LPWSTR lpStr;
- DPRINT("CreateServiceW() called\n"); + TRACE("CreateServiceW() called\n");
/* Calculate the Dependencies length*/ if (lpDependencies != NULL) @@ -660,7 +662,7 @@ (unsigned long *)&hService); if (dwError != ERROR_SUCCESS) { - DPRINT("ScmrCreateServiceW() failed (Error %lu)\n", dwError); + ERR("ScmrCreateServiceW() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } @@ -679,7 +681,7 @@ { DWORD dwError;
- DPRINT("DeleteService(%x)\n", hService); + TRACE("DeleteService(%x)\n", hService);
HandleBind();
@@ -688,7 +690,7 @@ (unsigned int)hService); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrDeleteService() failed (Error %lu)\n", dwError); + ERR("ScmrDeleteService() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -714,7 +716,7 @@ DWORD dwError = ERROR_SUCCESS; DWORD dwCount;
- DPRINT("EnumServicesStatusA() called\n"); + TRACE("EnumServicesStatusA() called\n");
HandleBind();
@@ -742,12 +744,12 @@
if (dwError != ERROR_SUCCESS) { - DPRINT("ScmrEnumDependentServicesA() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } - - DPRINT("EnumDependentServicesA() done\n"); + ERR("ScmrEnumDependentServicesA() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + TRACE("EnumDependentServicesA() done\n");
return TRUE; } @@ -770,7 +772,7 @@ DWORD dwError = ERROR_SUCCESS; DWORD dwCount;
- DPRINT("EnumServicesStatusW() called\n"); + TRACE("EnumServicesStatusW() called\n");
HandleBind();
@@ -798,12 +800,12 @@
if (dwError != ERROR_SUCCESS) { - DPRINT("ScmrEnumDependentServicesW() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } - - DPRINT("EnumDependentServicesW() done\n"); + ERR("ScmrEnumDependentServicesW() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + TRACE("EnumDependentServicesW() done\n");
return TRUE; } @@ -827,7 +829,7 @@ LPDWORD lpResumeHandle, LPCWSTR lpGroup) { - DPRINT1("EnumServiceGroupW is unimplemented\n"); + FIXME("EnumServiceGroupW is unimplemented\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -852,7 +854,7 @@ DWORD dwError = ERROR_SUCCESS; DWORD dwCount;
- DPRINT("EnumServicesStatusA() called\n"); + TRACE("EnumServicesStatusA() called\n");
HandleBind();
@@ -882,12 +884,12 @@
if (dwError != ERROR_SUCCESS) { - DPRINT("ScmrEnumServicesStatusA() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } - - DPRINT("EnumServicesStatusA() done\n"); + ERR("ScmrEnumServicesStatusA() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + TRACE("EnumServicesStatusA() done\n");
return TRUE; } @@ -912,7 +914,7 @@ DWORD dwError = ERROR_SUCCESS; DWORD dwCount;
- DPRINT("EnumServicesStatusW() called\n"); + TRACE("EnumServicesStatusW() called\n");
HandleBind();
@@ -942,12 +944,12 @@
if (dwError != ERROR_SUCCESS) { - DPRINT("ScmrEnumServicesStatusW() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } - - DPRINT("EnumServicesStatusW() done\n"); + ERR("ScmrEnumServicesStatusW() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + TRACE("EnumServicesStatusW() done\n");
return TRUE; } @@ -974,7 +976,7 @@ DWORD dwError = ERROR_SUCCESS; DWORD dwCount;
- DPRINT("EnumServicesStatusExA() called\n"); + TRACE("EnumServicesStatusExA() called\n");
HandleBind();
@@ -992,7 +994,7 @@
if (dwError == ERROR_MORE_DATA) { - DPRINT("Required buffer size %ul\n", *pcbBytesNeeded); + WARN("Required buffer size %ul\n", *pcbBytesNeeded); SetLastError(dwError); return FALSE; } @@ -1014,12 +1016,12 @@ } else { - DPRINT1("ScmrEnumServicesStatusExA() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } - - DPRINT("EnumServicesStatusExA() done\n"); + ERR("ScmrEnumServicesStatusExA() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + TRACE("EnumServicesStatusExA() done\n");
return TRUE; } @@ -1046,7 +1048,7 @@ DWORD dwError = ERROR_SUCCESS; DWORD dwCount;
- DPRINT("EnumServicesStatusExW() called\n"); + TRACE("EnumServicesStatusExW() called\n");
HandleBind();
@@ -1064,7 +1066,7 @@
if (dwError == ERROR_MORE_DATA) { - DPRINT("Required buffer size %ul\n", *pcbBytesNeeded); + WARN("Required buffer size %ul\n", *pcbBytesNeeded); SetLastError(dwError); return FALSE; } @@ -1086,12 +1088,12 @@ } else { - DPRINT1("ScmrEnumServicesStatusExW() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } - - DPRINT("EnumServicesStatusExW() done\n"); + ERR("ScmrEnumServicesStatusExW() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + TRACE("EnumServicesStatusExW() done\n");
return TRUE; } @@ -1110,7 +1112,7 @@ { DWORD dwError;
- DPRINT("GetServiceDisplayNameA() called\n"); + TRACE("GetServiceDisplayNameA() called\n");
HandleBind();
@@ -1121,7 +1123,7 @@ lpcchBuffer); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrGetServiceDisplayNameA() failed (Error %lu)\n", dwError); + ERR("ScmrGetServiceDisplayNameA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1145,7 +1147,7 @@ { DWORD dwError;
- DPRINT("GetServiceDisplayNameW() called\n"); + TRACE("GetServiceDisplayNameW() called\n");
HandleBind();
@@ -1156,7 +1158,7 @@ lpcchBuffer); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrGetServiceDisplayNameW() failed (Error %lu)\n", dwError); + ERR("ScmrGetServiceDisplayNameW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1180,7 +1182,7 @@ { DWORD dwError;
- DPRINT("GetServiceKeyNameA() called\n"); + TRACE("GetServiceKeyNameA() called\n");
HandleBind();
@@ -1191,7 +1193,7 @@ lpcchBuffer); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrGetServiceKeyNameA() failed (Error %lu)\n", dwError); + ERR("ScmrGetServiceKeyNameA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1215,7 +1217,7 @@ { DWORD dwError;
- DPRINT("GetServiceKeyNameW() called\n"); + TRACE("GetServiceKeyNameW() called\n");
HandleBind();
@@ -1226,7 +1228,7 @@ lpcchBuffer); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrGetServiceKeyNameW() failed (Error %lu)\n", dwError); + ERR("ScmrGetServiceKeyNameW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1248,7 +1250,7 @@ SC_LOCK hLock; DWORD dwError;
- DPRINT("LockServiceDatabase(%x)\n", hSCManager); + TRACE("LockServiceDatabase(%x)\n", hSCManager);
HandleBind();
@@ -1258,12 +1260,12 @@ (unsigned int *)&hLock); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrLockServiceDatabase() failed (Error %lu)\n", dwError); + ERR("ScmrLockServiceDatabase() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; }
- DPRINT("hLock = %p\n", hLock); + TRACE("hLock = %p\n", hLock);
return hLock; } @@ -1274,7 +1276,7 @@ { HANDLE hEvent;
- DPRINT("WaitForSCManager() called\n"); + TRACE("WaitForSCManager() called\n");
/* Try to open the existing event */ hEvent = OpenEventW(SYNCHRONIZE, @@ -1305,7 +1307,7 @@ WaitForSingleObject(hEvent, 180000); CloseHandle(hEvent);
- DPRINT("ScmWaitForSCManager() done\n"); + TRACE("ScmWaitForSCManager() done\n"); }
@@ -1322,7 +1324,7 @@ SC_HANDLE hScm = NULL; DWORD dwError;
- DPRINT("OpenSCManagerA(%s, %s, %lx)\n", + TRACE("OpenSCManagerA(%s, %s, %lx)\n", lpMachineName, lpDatabaseName, dwDesiredAccess);
WaitForSCManager(); @@ -1337,12 +1339,12 @@ (unsigned long*)&hScm); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrOpenSCManagerA() failed (Error %lu)\n", dwError); + ERR("ScmrOpenSCManagerA() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; }
- DPRINT("hScm = %p\n", hScm); + TRACE("hScm = %p\n", hScm);
return hScm; } @@ -1361,7 +1363,7 @@ SC_HANDLE hScm = NULL; DWORD dwError;
- DPRINT("OpenSCManagerW(%S, %S, %lx)\n", + TRACE("OpenSCManagerW(%S, %S, %lx)\n", lpMachineName, lpDatabaseName, dwDesiredAccess);
WaitForSCManager(); @@ -1376,12 +1378,12 @@ (unsigned long*)&hScm); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrOpenSCManagerW() failed (Error %lu)\n", dwError); + ERR("ScmrOpenSCManagerW() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; }
- DPRINT("hScm = %p\n", hScm); + TRACE("hScm = %p\n", hScm);
return hScm; } @@ -1400,7 +1402,7 @@ SC_HANDLE hService = NULL; DWORD dwError;
- DPRINT("OpenServiceA(%p, %s, %lx)\n", + TRACE("OpenServiceA(%p, %s, %lx)\n", hSCManager, lpServiceName, dwDesiredAccess);
HandleBind(); @@ -1413,12 +1415,12 @@ (unsigned long*)&hService); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrOpenServiceA() failed (Error %lu)\n", dwError); + ERR("ScmrOpenServiceA() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; }
- DPRINT("hService = %p\n", hService); + TRACE("hService = %p\n", hService);
return hService; } @@ -1437,7 +1439,7 @@ SC_HANDLE hService = NULL; DWORD dwError;
- DPRINT("OpenServiceW(%p, %S, %lx)\n", + TRACE("OpenServiceW(%p, %S, %lx)\n", hSCManager, lpServiceName, dwDesiredAccess);
HandleBind(); @@ -1450,12 +1452,12 @@ (unsigned long*)&hService); if (dwError != ERROR_SUCCESS) { - DPRINT("ScmrOpenServiceW() failed (Error %lu)\n", dwError); + ERR("ScmrOpenServiceW() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; }
- DPRINT("hService = %p\n", hService); + TRACE("hService = %p\n", hService);
return hService; } @@ -1474,7 +1476,7 @@ { DWORD dwError;
- DPRINT("QueryServiceConfigA(%p, %p, %lu, %p)\n", + TRACE("QueryServiceConfigA(%p, %p, %lu, %p)\n", hService, lpServiceConfig, cbBufSize, pcbBytesNeeded);
HandleBind(); @@ -1487,7 +1489,7 @@ pcbBytesNeeded); if (dwError != ERROR_SUCCESS) { - DPRINT("ScmrQueryServiceConfigA() failed (Error %lu)\n", dwError); + ERR("ScmrQueryServiceConfigA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1518,7 +1520,7 @@ (LPSTR)((ULONG_PTR)lpServiceConfig + (ULONG_PTR)lpServiceConfig->lpDisplayName);
- DPRINT("QueryServiceConfigA() done\n"); + TRACE("QueryServiceConfigA() done\n");
return TRUE; } @@ -1537,7 +1539,7 @@ { DWORD dwError;
- DPRINT("QueryServiceConfigW(%p, %p, %lu, %p)\n", + TRACE("QueryServiceConfigW(%p, %p, %lu, %p)\n", hService, lpServiceConfig, cbBufSize, pcbBytesNeeded);
HandleBind(); @@ -1550,7 +1552,7 @@ pcbBytesNeeded); if (dwError != ERROR_SUCCESS) { - DPRINT("ScmrQueryServiceConfigW() failed (Error %lu)\n", dwError); + ERR("ScmrQueryServiceConfigW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1581,7 +1583,7 @@ (LPWSTR)((ULONG_PTR)lpServiceConfig + (ULONG_PTR)lpServiceConfig->lpDisplayName);
- DPRINT("QueryServiceConfigW() done\n"); + TRACE("QueryServiceConfigW() done\n");
return TRUE; } @@ -1601,7 +1603,7 @@ { DWORD dwError;
- DPRINT("QueryServiceConfig2A(%p, %lu, %p, %lu, %p)\n", + TRACE("QueryServiceConfig2A(%p, %lu, %p, %lu, %p)\n", hService, dwInfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded);
HandleBind(); @@ -1615,7 +1617,7 @@ pcbBytesNeeded); if (dwError != ERROR_SUCCESS) { - DPRINT("ScmrQueryServiceConfig2A() failed (Error %lu)\n", dwError); + ERR("ScmrQueryServiceConfig2A() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1651,12 +1653,12 @@ break;
default: - DPRINT1("Unknown info level 0x%lx\n", dwInfoLevel); + ERR("Unknown info level 0x%lx\n", dwInfoLevel); SetLastError(ERROR_INVALID_PARAMETER); return FALSE; }
- DPRINT("QueryServiceConfig2A() done\n"); + TRACE("QueryServiceConfig2A() done\n");
return TRUE; } @@ -1676,7 +1678,7 @@ { DWORD dwError;
- DPRINT("QueryServiceConfig2W(%p, %lu, %p, %lu, %p)\n", + TRACE("QueryServiceConfig2W(%p, %lu, %p, %lu, %p)\n", hService, dwInfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded);
HandleBind(); @@ -1690,7 +1692,7 @@ pcbBytesNeeded); if (dwError != ERROR_SUCCESS) { - DPRINT("ScmrQueryServiceConfig2W() failed (Error %lu)\n", dwError); + ERR("ScmrQueryServiceConfig2W() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1726,12 +1728,12 @@ break;
default: - DPRINT1("Unknown info level 0x%lx\n", dwInfoLevel); + WARN("Unknown info level 0x%lx\n", dwInfoLevel); SetLastError(ERROR_INVALID_PARAMETER); return FALSE; }
- DPRINT("QueryServiceConfig2W() done\n"); + TRACE("QueryServiceConfig2W() done\n");
return TRUE; } @@ -1750,7 +1752,7 @@ { DWORD dwError;
- DPRINT("QueryServiceLockStatusA() called\n"); + TRACE("QueryServiceLockStatusA() called\n");
HandleBind();
@@ -1762,7 +1764,7 @@ pcbBytesNeeded); if (dwError != ERROR_SUCCESS) { - DPRINT("ScmrQueryServiceLockStatusA() failed (Error %lu)\n", dwError); + ERR("ScmrQueryServiceLockStatusA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1773,7 +1775,7 @@ (LPSTR)((UINT_PTR)lpLockStatus + (UINT_PTR)lpLockStatus->lpLockOwner); }
- DPRINT("QueryServiceLockStatusA() done\n"); + TRACE("QueryServiceLockStatusA() done\n");
return TRUE; } @@ -1792,7 +1794,7 @@ { DWORD dwError;
- DPRINT("QueryServiceLockStatusW() called\n"); + TRACE("QueryServiceLockStatusW() called\n");
HandleBind();
@@ -1804,7 +1806,7 @@ pcbBytesNeeded); if (dwError != ERROR_SUCCESS) { - DPRINT("ScmrQueryServiceLockStatusW() failed (Error %lu)\n", dwError); + ERR("ScmrQueryServiceLockStatusW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1815,7 +1817,7 @@ (LPWSTR)((UINT_PTR)lpLockStatus + (UINT_PTR)lpLockStatus->lpLockOwner); }
- DPRINT("QueryServiceLockStatusW() done\n"); + TRACE("QueryServiceLockStatusW() done\n");
return TRUE; } @@ -1835,7 +1837,7 @@ { DWORD dwError;
- DPRINT("QueryServiceObjectSecurity(%p, %lu, %p)\n", + TRACE("QueryServiceObjectSecurity(%p, %lu, %p)\n", hService, dwSecurityInformation, lpSecurityDescriptor);
HandleBind(); @@ -1849,7 +1851,7 @@ pcbBytesNeeded); if (dwError != ERROR_SUCCESS) { - DPRINT1("QueryServiceObjectSecurity() failed (Error %lu)\n", dwError); + ERR("QueryServiceObjectSecurity() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1912,7 +1914,7 @@
if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrServiceObjectSecurity() failed (Error %lu)\n", dwError); + ERR("ScmrServiceObjectSecurity() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1932,7 +1934,7 @@ { DWORD dwError;
- DPRINT("QueryServiceStatus(%p, %p)\n", + TRACE("QueryServiceStatus(%p, %p)\n", hService, lpServiceStatus);
HandleBind(); @@ -1943,7 +1945,7 @@ lpServiceStatus); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrQueryServiceStatus() failed (Error %lu)\n", dwError); + ERR("ScmrQueryServiceStatus() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -1966,7 +1968,7 @@ { DWORD dwError;
- DPRINT("QueryServiceStatusEx() called\n"); + TRACE("QueryServiceStatusEx() called\n");
HandleBind();
@@ -1979,7 +1981,7 @@ pcbBytesNeeded); if (dwError != ERROR_SUCCESS) { - DPRINT("ScmrQueryServiceStatusEx() failed (Error %lu)\n", dwError); + ERR("ScmrQueryServiceStatusEx() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -2011,7 +2013,7 @@ dwBufSize += (strlen(lpServiceArgVectors[i]) + 1); } dwBufSize++; - DPRINT1("dwBufSize: %lu\n", dwBufSize); + TRACE("dwBufSize: %lu\n", dwBufSize);
lpBuffer = HeapAlloc(GetProcessHeap(), 0, dwBufSize); if (lpBuffer == NULL) @@ -2040,7 +2042,7 @@
if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrStartServiceA() failed (Error %lu)\n", dwError); + ERR("ScmrStartServiceA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -2071,7 +2073,7 @@ dwBufSize += ((wcslen(lpServiceArgVectors[i]) + 1) * sizeof(WCHAR)); } dwBufSize += sizeof(WCHAR); - DPRINT("dwBufSize: %lu\n", dwBufSize); + TRACE("dwBufSize: %lu\n", dwBufSize);
lpBuffer = HeapAlloc(GetProcessHeap(), 0, dwBufSize); if (lpBuffer == NULL) @@ -2098,7 +2100,7 @@
if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrStartServiceW() failed (Error %lu)\n", dwError); + ERR("ScmrStartServiceW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -2117,7 +2119,7 @@ { DWORD dwError;
- DPRINT("UnlockServiceDatabase(%x)\n", ScLock); + TRACE("UnlockServiceDatabase(%x)\n", ScLock);
HandleBind();
@@ -2126,7 +2128,7 @@ (unsigned int)ScLock); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrUnlockServiceDatabase() failed (Error %lu)\n", dwError); + ERR("ScmrUnlockServiceDatabase() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; } @@ -2145,7 +2147,7 @@ { DWORD dwError;
- DPRINT1("NotifyBootConfigStatus()\n"); + TRACE("NotifyBootConfigStatus()\n");
HandleBind();
@@ -2154,7 +2156,7 @@ BootAcceptable); if (dwError != ERROR_SUCCESS) { - DPRINT1("NotifyBootConfigStatus() failed (Error %lu)\n", dwError); + ERR("NotifyBootConfigStatus() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; }
Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service/... ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c Fri Feb 8 20:04:39 2008 @@ -13,9 +13,9 @@ /* INCLUDES ******************************************************************/
#include <advapi32.h> - -#define NDEBUG -#include <debug.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(advapi);
/* TYPES *********************************************************************/ @@ -79,19 +79,19 @@
lpService = (PACTIVE_SERVICE)Context;
- DPRINT("ScServiceMainStub() called\n"); + TRACE("ScServiceMainStub() called\n");
/* Count arguments */ lpPtr = lpService->Arguments; while (*lpPtr) { - DPRINT("arg: %S\n", lpPtr); + TRACE("arg: %S\n", lpPtr); dwLen = wcslen(lpPtr) + 1; dwArgCount++; dwLength += dwLen; lpPtr += dwLen; } - DPRINT("dwArgCount: %ld\ndwLength: %ld\n", dwArgCount, dwLength); + TRACE("dwArgCount: %ld\ndwLength: %ld\n", dwArgCount, dwLength);
/* Build the argument vector and call the main service routine */ if (lpService->bUnicode) @@ -219,7 +219,7 @@
if (!NT_SUCCESS(Status)) { - DPRINT1("RtlQueryRegistryValues() failed (Status %lx)\n", Status); + ERR("RtlQueryRegistryValues() failed (Status %lx)\n", Status); return RtlNtStatusToDosError(Status); }
@@ -227,7 +227,7 @@
if (!WaitNamedPipeW(NtControlPipeName, 15000)) { - DPRINT1("WaitNamedPipe(%S) failed (Error %lu)\n", NtControlPipeName, GetLastError()); + ERR("WaitNamedPipe(%S) failed (Error %lu)\n", NtControlPipeName, GetLastError()); return ERROR_FAILED_SERVICE_CONTROLLER_CONNECT; }
@@ -240,7 +240,7 @@ NULL); if (*hPipe == INVALID_HANDLE_VALUE) { - DPRINT1("CreateFileW() failed (Error %lu)\n", GetLastError()); + ERR("CreateFileW() failed (Error %lu)\n", GetLastError()); return ERROR_FAILED_SERVICE_CONTROLLER_CONNECT; }
@@ -259,7 +259,7 @@ &dwBytesWritten, NULL);
- DPRINT("Sent SERVICE_HANDLE %lu\n", lpActiveServices->hService); + TRACE("Sent SERVICE_HANDLE %lu\n", lpActiveServices->hService);
return ERROR_SUCCESS; } @@ -272,15 +272,15 @@ HANDLE ThreadHandle; DWORD ThreadId;
- DPRINT("ScStartService() called\n"); - DPRINT("client handle: %lu\n", ControlPacket->hClient); - DPRINT("Size: %lu\n", ControlPacket->dwSize); - DPRINT("Service: %S\n", &ControlPacket->szArguments[0]); + TRACE("ScStartService() called\n"); + TRACE("client handle: %lu\n", ControlPacket->hClient); + TRACE("Size: %lu\n", ControlPacket->dwSize); + TRACE("Service: %S\n", &ControlPacket->szArguments[0]);
lpService = (PACTIVE_SERVICE)ControlPacket->hClient; if (lpService == NULL) { - DPRINT1("Service not found\n"); + TRACE("Service not found\n"); return ERROR_SERVICE_DOES_NOT_EXIST; }
@@ -316,14 +316,14 @@ { PACTIVE_SERVICE lpService;
- DPRINT("ScControlService() called\n"); - DPRINT("Size: %lu\n", ControlPacket->dwSize); - DPRINT("Service: %S\n", &ControlPacket->szArguments[0]); + TRACE("ScControlService() called\n"); + TRACE("Size: %lu\n", ControlPacket->dwSize); + TRACE("Service: %S\n", &ControlPacket->szArguments[0]);
lpService = (PACTIVE_SERVICE)ControlPacket->hClient; if (lpService == NULL) { - DPRINT1("Service not found\n"); + TRACE("Service not found\n"); return ERROR_SERVICE_DOES_NOT_EXIST; }
@@ -344,7 +344,7 @@ lpService->Arguments); }
- DPRINT("ScControlService() done\n"); + TRACE("ScControlService() done\n");
return ERROR_SUCCESS; } @@ -360,7 +360,7 @@ BOOL bResult; DWORD dwRunningServices = 0;
- DPRINT("ScDispatcherLoop() called\n"); + TRACE("ScDispatcherLoop() called\n");
ControlPacket = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -378,7 +378,7 @@ NULL); if (bResult == FALSE) { - DPRINT1("Pipe read failed (Error: %lu)\n", GetLastError()); + ERR("Pipe read failed (Error: %lu)\n", GetLastError()); return FALSE; }
@@ -386,19 +386,19 @@ switch (ControlPacket->dwControl) { case SERVICE_CONTROL_START: - DPRINT("Start command - recieved SERVICE_CONTROL_START\n"); + TRACE("Start command - recieved SERVICE_CONTROL_START\n"); if (ScStartService(ControlPacket) == ERROR_SUCCESS) dwRunningServices++; break;
case SERVICE_CONTROL_STOP: - DPRINT("Stop command - recieved SERVICE_CONTROL_STOP\n"); + TRACE("Stop command - recieved SERVICE_CONTROL_STOP\n"); if (ScControlService(ControlPacket) == ERROR_SUCCESS) dwRunningServices--; break;
default: - DPRINT("Unknown command %lu", ControlPacket->dwControl); + TRACE("Unknown command %lu", ControlPacket->dwControl); continue; }
@@ -463,7 +463,7 @@ Service->HandlerFunction = lpHandlerProc; Service->HandlerFunctionEx = NULL;
- DPRINT("RegisterServiceCtrlHandler returning %lu\n", Service->hService); + TRACE("RegisterServiceCtrlHandler returning %lu\n", Service->hService);
return (SERVICE_STATUS_HANDLE)Service->hService; } @@ -522,7 +522,7 @@ Service->HandlerFunctionEx = lpHandlerProc; Service->HandlerContext = lpContext;
- DPRINT("RegisterServiceCtrlHandlerEx returning %lu", Service->hService); + TRACE("RegisterServiceCtrlHandlerEx returning %lu", Service->hService);
return (SERVICE_STATUS_HANDLE)Service->hService; } @@ -555,8 +555,8 @@ { DWORD dwError;
- DPRINT("SetServiceStatus() called\n"); - DPRINT("hServiceStatus %lu\n", hServiceStatus); + TRACE("SetServiceStatus() called\n"); + TRACE("hServiceStatus %lu\n", hServiceStatus);
HandleBind();
@@ -566,12 +566,12 @@ lpServiceStatus); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrSetServiceStatus() failed (Error %lu)\n", dwError); + ERR("ScmrSetServiceStatus() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; }
- DPRINT("SetServiceStatus() done (ret %lu)\n", dwError); + TRACE("SetServiceStatus() done (ret %lu)\n", dwError);
return TRUE; } @@ -590,7 +590,7 @@ DWORD dwError; PUCHAR lpMessageBuffer;
- DPRINT("StartServiceCtrlDispatcherA() called\n"); + TRACE("StartServiceCtrlDispatcherA() called\n");
i = 0; while (lpServiceStartTable[i].lpServiceProc != NULL) @@ -668,7 +668,7 @@ DWORD dwError; PUCHAR lpMessageBuffer;
- DPRINT("StartServiceCtrlDispatcherW() called\n"); + TRACE("StartServiceCtrlDispatcherW() called\n");
i = 0; while (lpServiceStartTable[i].lpServiceProc != NULL)
Modified: trunk/reactos/dll/win32/advapi32/token/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/token/to... ============================================================================== --- trunk/reactos/dll/win32/advapi32/token/token.c (original) +++ trunk/reactos/dll/win32/advapi32/token/token.c Fri Feb 8 20:04:39 2008 @@ -9,9 +9,9 @@ */
#include <advapi32.h> - -#define NDEBUG -#include <debug.h> +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(advapi);
/* * @implemented @@ -381,7 +381,7 @@
if (!DupRet) { - DPRINT1("Failed to duplicate the primary token!\n"); + WARN("Failed to duplicate the primary token!\n"); return FALSE; }
@@ -670,3 +670,4 @@ return PSiteSid; }
+
-
fireball＠svn.reactos.org