From 4e2c03644c966a925b036e1bed80fd6f3a61993e Mon Sep 17 00:00:00 2001
From: Chris Morgan <cmorgan@alum.wpi.edu>
Date: Fri, 2 Jan 2004 01:50:50 +0000
Subject: [PATCH] Make the debug mark printing unconditional instead of
 conditional upon the  SHELL debug channel.  Make mark text obvious by
 changing the output text to 'Debug mark requested by user' and adding 'Debug
 mark' to the menu resource text.

---
 dlls/user/resources/user32_Ca.rc | 3 +--
 dlls/user/resources/user32_De.rc | 2 +-
 dlls/user/resources/user32_En.rc | 2 +-
 dlls/user/resources/user32_Fi.rc | 3 +--
 dlls/user/resources/user32_Fr.rc | 2 +-
 dlls/user/resources/user32_Nl.rc | 3 +--
 dlls/user/resources/user32_Pt.rc | 2 +-
 windows/nonclient.c              | 2 +-
 8 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/dlls/user/resources/user32_Ca.rc b/dlls/user/resources/user32_Ca.rc
index d2673c2cc07..b9e6d348799 100644
--- a/dlls/user/resources/user32_Ca.rc
+++ b/dlls/user/resources/user32_Ca.rc
@@ -32,7 +32,7 @@ SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
  MENUITEM SEPARATOR
  MENUITEM "&Quant a WINE...", 61761
  MENUITEM SEPARATOR
- MENUITEM "&Afegir marca en l'historial de depurament", 61762
+ MENUITEM "&Afegir marca 'Debug mark' en l'historial de depurament", 61762
 }
 
 EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
@@ -63,4 +63,3 @@ BEGIN
         PUSHBUTTON "&Si", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
         PUSHBUTTON "&No", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
-
diff --git a/dlls/user/resources/user32_De.rc b/dlls/user/resources/user32_De.rc
index d144bb5d894..da0b2ea184c 100644
--- a/dlls/user/resources/user32_De.rc
+++ b/dlls/user/resources/user32_De.rc
@@ -32,7 +32,7 @@ SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
  MENUITEM SEPARATOR
  MENUITEM "&Über WINE ...", 61761
  MENUITEM SEPARATOR
- MENUITEM "Setze &Marke in die Debug-Ausgabe", 61762
+ MENUITEM "Setze &Marke 'Debug mark' in die Debug-Ausgabe", 61762
 }
 
 EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
diff --git a/dlls/user/resources/user32_En.rc b/dlls/user/resources/user32_En.rc
index b38ccc0acd8..455dfdf2a1c 100644
--- a/dlls/user/resources/user32_En.rc
+++ b/dlls/user/resources/user32_En.rc
@@ -32,7 +32,7 @@ SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
  MENUITEM SEPARATOR
  MENUITEM "&About WINE ...", 61761
  MENUITEM SEPARATOR
- MENUITEM "&Put mark in debug log", 61762
+ MENUITEM "&Put 'Debug mark' in debug log", 61762
 }
 
 EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
diff --git a/dlls/user/resources/user32_Fi.rc b/dlls/user/resources/user32_Fi.rc
index c3725e54608..4488c3bc5d2 100644
--- a/dlls/user/resources/user32_Fi.rc
+++ b/dlls/user/resources/user32_Fi.rc
@@ -32,7 +32,7 @@ SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
  MENUITEM SEPARATOR
  MENUITEM "&Tietoja WINEista...", 61761
  MENUITEM SEPARATOR
- MENUITEM "&Lisää merkki debug lokiin", 61762
+ MENUITEM "&Lisää merkki 'Debug mark' debug lokiin", 61762
 }
 
 EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
@@ -63,4 +63,3 @@ BEGIN
         PUSHBUTTON "&Kyllä", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
         PUSHBUTTON "&Ei", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
-
diff --git a/dlls/user/resources/user32_Fr.rc b/dlls/user/resources/user32_Fr.rc
index cd5fd683267..c6ee1859e59 100644
--- a/dlls/user/resources/user32_Fr.rc
+++ b/dlls/user/resources/user32_Fr.rc
@@ -35,7 +35,7 @@ SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
  MENUITEM SEPARATOR
  MENUITEM "À propos de &Wine ...", 61761
  MENUITEM SEPARATOR
- MENUITEM "Insérer une marque dans le flux de déboguage", 61762
+ MENUITEM "Insérer 'Debug mark' dans le flux de déboguage", 61762
 }
 
 EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
diff --git a/dlls/user/resources/user32_Nl.rc b/dlls/user/resources/user32_Nl.rc
index a8bfc33b3a1..7232d6aafba 100644
--- a/dlls/user/resources/user32_Nl.rc
+++ b/dlls/user/resources/user32_Nl.rc
@@ -32,7 +32,7 @@ SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
  MENUITEM SEPARATOR
  MENUITEM "&Info over WINE ...", 61761
  MENUITEM SEPARATOR
- MENUITEM "&Put mark in debug log", 61762
+ MENUITEM "&Put 'Debug mark' in debug log", 61762
 }
 
 EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
@@ -63,4 +63,3 @@ BEGIN
         PUSHBUTTON "&Ja", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
         PUSHBUTTON "&Nee", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
-
diff --git a/dlls/user/resources/user32_Pt.rc b/dlls/user/resources/user32_Pt.rc
index 138479672cc..d27de8691e2 100644
--- a/dlls/user/resources/user32_Pt.rc
+++ b/dlls/user/resources/user32_Pt.rc
@@ -32,7 +32,7 @@ SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
  MENUITEM SEPARATOR
  MENUITEM "&Sobre o WINE ...", 61761
  MENUITEM SEPARATOR
- MENUITEM "&Put mark in debug log", 61762
+ MENUITEM "&Put 'Debug mark' in debug log", 61762
 }
 
 EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
diff --git a/windows/nonclient.c b/windows/nonclient.c
index bfd1340634e..7d3a79a1de7 100644
--- a/windows/nonclient.c
+++ b/windows/nonclient.c
@@ -2222,7 +2222,7 @@ LONG NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam )
         }
 	else
 	  if (wParam == SC_PUTMARK)
-            TRACE_(shell)("Mark requested by user\n");
+            DPRINTF("Debug mark requested by user\n");
 	break;
 
     case SC_HOTKEY:
-- 
GitLab