Author: cmihail Date: Fri Sep 9 10:17:07 2011 New Revision: 53652
URL: http://svn.reactos.org/svn/reactos?rev=53652&view=rev Log: [shell32.dll] - Remove DbgPrint calls and replace some of them with TRACE calls.
Modified: branches/shell32_new-bringup/dll/win32/shell32/shfldr_desktop.cpp branches/shell32_new-bringup/dll/win32/shell32/shfldr_mycomp.cpp branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp branches/shell32_new-bringup/dll/win32/shell32/shlfileop.cpp branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp
Modified: branches/shell32_new-bringup/dll/win32/shell32/shfldr_desktop.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/sh... ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shfldr_desktop.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shfldr_desktop.cpp [iso-8859-1] Fri Sep 9 10:17:07 2011 @@ -140,7 +140,6 @@ static WCHAR MyDocumentsClassString[] = L"{450D8FBA-AD25-11D0-98A8-0800361B1103}";
TRACE("(%p)->(flags=0x%08x)\n", this, dwFlags); - DbgPrint("[shell32, CDesktopFolderEnum::Initialize] Called with flags = %d\n", dwFlags);
/* enumerate the root folders */ if (dwFlags & SHCONTF_FOLDERS) @@ -339,7 +338,6 @@ else if( (pidlTemp = SHELL32_CreatePidlFromBindCtx(pbc, lpszDisplayName)) ) { *ppidl = pidlTemp; - DbgPrint("[shell32, CDesktopFolder::ParseDisplayName] 1 *ppidl = 0x%x\n", *ppidl); return S_OK; } else @@ -406,7 +404,6 @@ HRESULT hResult;
TRACE ("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", this, hwndOwner, dwFlags, ppEnumIDList); - DbgPrint("[shell32, CDesktopFolder::EnumObjects] Called with flags = %d\n", dwFlags);
if (ppEnumIDList == NULL) return E_POINTER;
Modified: branches/shell32_new-bringup/dll/win32/shell32/shfldr_mycomp.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/sh... ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shfldr_mycomp.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shfldr_mycomp.cpp [iso-8859-1] Fri Sep 9 10:17:07 2011 @@ -77,8 +77,6 @@
HRESULT WINAPI CDrivesFolderEnum::Initialize(HWND hwndOwner, DWORD dwFlags) { - DbgPrint("[shell32, CDrivesFolderEnum::Initialize] Called with flags = %d\n", dwFlags); - if (CreateMyCompEnumList(dwFlags) == FALSE) return E_FAIL; return S_OK; @@ -98,8 +96,6 @@ BOOL ret = TRUE;
TRACE("(%p)->(flags=0x%08x)\n", this, dwFlags); - - DbgPrint("[shell32, CDrivesFolderEnum::CreateMyCompEnumList] Called with flags = %d\n", dwFlags);
/* enumerate the folders */ if (dwFlags & SHCONTF_FOLDERS) @@ -260,8 +256,6 @@
TRACE ("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", this, hwndOwner, dwFlags, ppEnumIDList);
- DbgPrint("[shell32, CDrivesFolder::EnumObjects] Called with flags = %d\n", dwFlags); - if (ppEnumIDList == NULL) return E_POINTER;
@@ -277,8 +271,6 @@ delete theEnumerator; return hResult; } - - DbgPrint("[shell32, CDrivesFolder::EnumObjects] Calling theEnumerator->Initialize\n");
hResult = theEnumerator->Initialize (hwndOwner, dwFlags); if (FAILED (hResult))
Modified: branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/sh... ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp [iso-8859-1] Fri Sep 9 10:17:07 2011 @@ -457,9 +457,6 @@ if (psei->fMask & SEE_MASK_NO_CONSOLE) dwCreationFlags |= CREATE_NEW_CONSOLE;
- //DbgPrint("[shell32, SHELL_ExecuteW] CreateProcessW cmd = %ws\n", (LPWSTR)lpCmd); - //DbgBreakPoint(); - if (CreateProcessW(NULL, (LPWSTR)lpCmd, NULL, NULL, FALSE, dwCreationFlags, env, lpDirectory, &startup, &info)) { @@ -804,7 +801,6 @@ SHELL_ArgifyW(lpResult, resultLen, command, xlpFile, pidl, args, &finishedLen); if (finishedLen > resultLen) ERR("Argify buffer not large enough.. truncated\n"); - DbgPrint("[shell32, SHELL_FindExecutable] Remove double quotation marks and command line arguments\n"); /* Remove double quotation marks and command line arguments */ if (*lpResult == '"') {
Modified: branches/shell32_new-bringup/dll/win32/shell32/shlfileop.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/sh... ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shlfileop.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shlfileop.cpp [iso-8859-1] Fri Sep 9 10:17:07 2011 @@ -307,8 +307,6 @@ HICON hIcon; int ret;
- DbgPrint("[shell32, SHELL_ConfirmDialogW] Called\n"); - assert(nKindOfDialog >= 0 && nKindOfDialog < 32); if (op && (op->dwYesToAllMask & (1 << nKindOfDialog))) return TRUE; @@ -744,8 +742,6 @@ BOOL ret; DWORD attribs;
- DbgPrint("[shell32, SHNotifyCopyFileW] Called\n"); - TRACE("(%s %s %s)\n", debugstr_w(src), debugstr_w(dest), bFailIfExists ? "failIfExists" : "");
/* Destination file may already exist with read only attribute */ @@ -756,10 +752,9 @@ if (GetFileAttributesW(dest) & FILE_ATTRIBUTE_READONLY) { SetFileAttributesW(dest, attribs & ~FILE_ATTRIBUTE_READONLY); - DbgPrint("[shell32, SHNotifyCopyFileW] Something went really WRONG...%ls, we still have FILE_ATTRIBUTE_READONLY\n", dest); if (GetFileAttributesW(dest) & FILE_ATTRIBUTE_READONLY) { - DbgPrint("[shell32, SHNotifyCopyFileW] STILL SHIT\n"); + TRACE("[shell32, SHNotifyCopyFileW] STILL SHIT\n"); } }
@@ -1407,7 +1402,6 @@ { if (!copy_file_to_file(op, entryToCopy->szFullPath, fileDest->szFullPath)) { - DbgPrint("[shell32, copy_files] copy_file_to_file failed\n"); op->req->fAnyOperationsAborted = TRUE; return ERROR_CANCELLED; }
Modified: branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/sh... ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp [iso-8859-1] Fri Sep 9 10:17:07 2011 @@ -906,8 +906,6 @@
TRACE("%p\n",this);
- DbgPrint("[shell32, CDefView::OnCreate] Called\n"); - if(CreateList()) { if(InitList()) @@ -2192,8 +2190,6 @@
TRACE("(%p)->(shlview=%p set=%p shlbrs=%p rec=%p hwnd=%p) incomplete\n",this, lpPrevView,lpfs, psb, prcView, phWnd);
- DbgPrint("[shell32, CDefView::CreateViewWindow] Called lpfs = 0x%x, psb = 0x%x\n", lpfs, psb); - if (lpfs != NULL) TRACE("-- vmode=%x flags=%x\n", lpfs->ViewMode, lpfs->fFlags); if (prcView != NULL) @@ -2216,8 +2212,6 @@ { TRACE("-- CommDlgBrowser\n"); } - - DbgPrint("[shell32, CDefView::CreateViewWindow] About to call the create function\n");
Create(hWndParent, prcView, NULL, WS_CHILD | WS_TABSTOP, 0, 0U); if (m_hWnd == NULL)