Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 30447: Fix USE_API_SHCREATEDESKTOP = 0 case
by hpoussin＠svn.reactos.org 14 Nov '07

14 Nov '07

Author: hpoussin Date: Wed Nov 14 18:35:58 2007 New Revision: 30447 URL: http://svn.reactos.org/svn/reactos?rev=30447&view=rev Log: Fix USE_API_SHCREATEDESKTOP = 0 case Modified: trunk/reactos/base/shell/explorer-new/desktop.c trunk/reactos/base/shell/explorer-new/undoc.h Modified: trunk/reactos/base/shell/explorer-new/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/de… ============================================================================== --- trunk/reactos/base/shell/explorer-new/desktop.c (original) +++ trunk/reactos/base/shell/explorer-new/desktop.c Wed Nov 14 18:35:58 2007 @@ -136,10 +136,38 @@ /* ****************************************************************************** * NOTE: This could may be reused in a shell implementation of * + * SHCreateShellFolderView(). * + ****************************************************************************** + */ + +HRESULT WINAPI +SHCreateShellFolderView( + const SFV_CREATE *pcsfv, + IShellView **ppsv) +{ + CSFV csfv; + + ZeroMemory(&csfv, sizeof(CSFV)); + csfv.cbSize = sizeof(CSFV); + csfv.pshf = pcsfv->pshf; + csfv.psvOuter = pcsfv->psvOuter; + /* FIXME: handle pcsfv->psfvcb */ + return SHCreateShellFolderViewEx(&csfv, ppsv); +} + + +/* + ****************************************************************************** + * NOTE: This could may be reused in a shell implementation of * * SHCreateDesktop(). * ****************************************************************************** */ +#define IShellView2 IShellView +#define IShellView2_Release(This) IShellView_Release((This)) +#define IShellView2_CreateViewWindow2(This, Params) IShellView_CreateViewWindow((This), (Params)->psvPrev, (Params)->pfs, (Params)->psbOwner, (Params)->prcView, &(Params)->hwndView) + +#include "undoc.h" #define WM_SHELL_ADDDRIVENOTIFY (WM_USER + 0x100) static const IShellBrowserVtbl IDesktopShellBrowserImpl_Vtbl; @@ -590,7 +618,7 @@ &cne); /* Create the tray window */ - This->Tray = CreateTrayWindow(This->hWnd); + This->Tray = CreateTrayWindow(); return This; } @@ -1256,7 +1284,6 @@ volatile DESKCREATEINFO *DeskCreateInfo = (volatile DESKCREATEINFO *)lpParameter; HWND hwndDesktop; IDesktopShellBrowserImpl *pDesktop; - IShellDesktopTray *pSdt; MSG Msg; BOOL Ret; @@ -1274,7 +1301,7 @@ hExplorerInstance, NULL); - DeskCreateInfo->hWndDesktop = hWndDesktop; + DeskCreateInfo->hWndDesktop = hwndDesktop; if (hwndDesktop == NULL) return 1; Modified: trunk/reactos/base/shell/explorer-new/undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/un… ============================================================================== --- trunk/reactos/base/shell/explorer-new/undoc.h (original) +++ trunk/reactos/base/shell/explorer-new/undoc.h Wed Nov 14 18:35:58 2007 @@ -96,7 +96,6 @@ #define IWindowEventHandler_ContainsWindow(T,a) (T)->lpVtbl->ContainsWindow(T,a) #endif -#if USE_API_SHCREATEDESKTOP != 0 #define INTERFACE IShellDesktopTray DECLARE_INTERFACE_(IShellDesktopTray,IUnknown) { @@ -122,6 +121,7 @@ #define IShellDesktopTray_Unknown(T,a,b) (T)->lpVtbl->Unknown(T,a,b) #endif +#if USE_API_SHCREATEDESKTOP != 0 #if 0 HANDLE WINAPI SHCreateDesktop(IShellDesktopTray*); BOOL WINAPI SHDesktopMessageLoop(HANDLE);

1 0

[cwittich] 30446: don't try to copy lpToken when it is NULL
by cwittich＠svn.reactos.org 14 Nov '07

14 Nov '07

Author: cwittich Date: Wed Nov 14 18:02:41 2007 New Revision: 30446 URL: http://svn.reactos.org/svn/reactos?rev=30446&view=rev Log: don't try to copy lpToken when it is NULL Modified: trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/applications/mstsc/settings.c Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c Wed Nov 14 18:02:41 2007 @@ -36,7 +36,7 @@ static WCHAR szFilter[] = L"Remote Desktop Files (*rdp)\0*.rdp\0"; ZeroMemory(&ofn, sizeof(ofn)); - ofn.lStructSize = sizeof(OPENFILENAME); + ofn.lStructSize = sizeof(OPENFILENAMEW); ofn.hwndOwner = pInfo->hGeneralPage; ofn.nMaxFile = MAX_PATH; ofn.nMaxFileTitle = MAX_PATH; @@ -62,7 +62,7 @@ static WCHAR szFilter[] = L"Remote Desktop Files (*rdp)\0*.rdp\0"; ZeroMemory(&ofn, sizeof(ofn)); - ofn.lStructSize = sizeof(OPENFILENAME); + ofn.lStructSize = sizeof(OPENFILENAMEW); ofn.hwndOwner = pInfo->hGeneralPage; ofn.nMaxFile = MAX_PATH; ofn.nMaxFileTitle = MAX_PATH; @@ -1118,7 +1118,7 @@ txtRc.right = bmpRc.right * 0.75; txtRc.bottom = pInfo->headerbitmap.bmHeight * 0.5; - ZeroMemory(&lf, sizeof(LOGFONT)); + ZeroMemory(&lf, sizeof(LOGFONTW)); if (LoadStringW(hInst, IDS_HEADERTEXT1, Modified: trunk/reactos/base/applications/mstsc/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/se… ============================================================================== --- trunk/reactos/base/applications/mstsc/settings.c (original) +++ trunk/reactos/base/applications/mstsc/settings.c Wed Nov 14 18:02:41 2007 @@ -252,13 +252,15 @@ { pRdpSettings->pSettings[i].Type = lpToken[0]; lpToken = wcstok(NULL, szSeps); - pRdpSettings->pSettings[i].Value.i = _wtoi(lpToken); + if (lpToken != NULL) + pRdpSettings->pSettings[i].Value.i = _wtoi(lpToken); } else if (lpToken[0] == L's') { pRdpSettings->pSettings[i].Type = lpToken[0]; lpToken = wcstok(NULL, szSeps); - wcscpy(pRdpSettings->pSettings[i].Value.s, lpToken); + if (lpToken != NULL) + wcscpy(pRdpSettings->pSettings[i].Value.s, lpToken); } bFound = TRUE; }

1 0

[dreimer] 30445: Add a installation selection for GDB.
by dreimer＠svn.reactos.org 14 Nov '07

14 Nov '07

Author: dreimer Date: Wed Nov 14 17:53:51 2007 New Revision: 30445 URL: http://svn.reactos.org/svn/reactos?rev=30445&view=rev Log: Add a installation selection for GDB. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Wed Nov 14 17:53:51 2007 @@ -186,7 +186,15 @@ File /r Root\Tools\cygwin1.dll SectionEnd -Section "relAddr2Line Tool" SEC07 +Section "GDB" SEC07 + SetShellVarContext current + SetOutPath "$INSTDIR\4.1.3\bin" + SetOverwrite try + File /r Root\Tools\gdb.exe + File /r Root\Tools\gdbserver.exe +SectionEnd + +Section "relAddr2Line Tool" SEC08 SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try @@ -198,7 +206,7 @@ File /r Root\Tools\chkslash.exe SectionEnd -Section "Other Tools (chdefdir, chdefgcc and config)" SEC08 +Section "Other Tools (chdefdir, chdefgcc and config)" SEC09 SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try @@ -207,7 +215,7 @@ File /r Root\Config.cmd SectionEnd -Section -StartMenuShortcuts SEC09 +Section -StartMenuShortcuts SEC10 SetShellVarContext current ;; @@ -225,7 +233,7 @@ !insertmacro MUI_STARTMENU_WRITE_END SectionEnd -Section /o "Desktop Shortcuts" SEC10 +Section /o "Desktop Shortcuts" SEC11 SetShellVarContext current ;; @@ -235,7 +243,7 @@ CreateShortCut "$DESKTOP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" SectionEnd -Section /o "Quick Launch Shortcuts" SEC11 +Section /o "Quick Launch Shortcuts" SEC12 SetShellVarContext current ;; @@ -245,7 +253,7 @@ CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" SectionEnd -Section -Post SEC12 +Section -Post SEC13 WriteUninstaller "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" WriteRegStr HKCU "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\RosBE.cmd" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"

1 0

[dreimer] 30444: Update the German Translation and reactivate it.
by dreimer＠svn.reactos.org 14 Nov '07

14 Nov '07

Author: dreimer Date: Wed Nov 14 16:52:45 2007 New Revision: 30444 URL: http://svn.reactos.org/svn/reactos?rev=30444&view=rev Log: Update the German Translation and reactivate it. Modified: trunk/reactos/base/applications/mstsc/lang/de-DE.rc trunk/reactos/base/applications/mstsc/rsrc.rc Modified: trunk/reactos/base/applications/mstsc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/mstsc/lang/de-DE.rc Wed Nov 14 16:52:45 2007 @@ -9,10 +9,10 @@ ICON "", IDC_LOGONICON, 15,19,20,20 LTEXT "Serveradresse eingeben",IDC_STATIC,47,24,81,8 LTEXT "Server:",IDC_STATIC,47,41,25,8 - LTEXT "Benutzername:",IDC_STATIC,47,58,38,8 - COMBOBOX IDC_SERVERCOMBO,79,39,141,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Benutzername:",IDC_STATIC,47,58,50,8 + COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Speichern",IDC_SAVE,67,139,50,14 - PUSHBUTTON "Speichern unter...",IDC_SAVEAS,123,139,50,14 + PUSHBUTTON "Speichern unter",IDC_SAVEAS,120,139,55,14 PUSHBUTTON "Öffnen...",IDC_OPEN,177,139,50,14 ICON "", IDC_CONNICON, 16,114,20,20 LTEXT "Die derzeitigen Verbindungseinstellungen speichern oder vohandene Einstellungen laden.",IDC_STATIC,50,115,172,20 @@ -22,27 +22,28 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "RemoteDesktop Größe",IDC_STATIC,7,7,228,68 + GROUPBOX "Remotedesktop Größe",IDC_STATIC,7,7,228,68 GROUPBOX "Farben",IDC_STATIC,7,83,228,85 ICON "", IDC_REMICON, 15,19,20,20 ICON "", IDC_COLORSICON, 15,98,20,20 - LTEXT "Wählen Sie die Bildschirmgröße von Ihrem RemoteDesktop. Stellen Sie den Regler für Vollbild ganz nach rechts.",IDC_STATIC,53,22,175,21 - CONTROL "",IDC_GEOSLIDER,"msctls_trackbar32",WS_TABSTOP,56,49,124,15 - COMBOBOX IDC_BPPCOMBO,56,102,128,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,13 + LTEXT "Wählen Sie die Bildschirmgröße von Ihrem Remote- desktop. Stellen Sie den Regler für Vollbild nach rechts",IDC_STATIC,53,22,175,21 + CONTROL "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 42, 124, 17 + COMBOBOX IDC_BPPCOMBO,56,102,128,80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,10 LTEXT "Achtung: Die Einstellung auf dem Remotecomputer könnte diese Einstellung überschreiben.",IDC_STATIC,56,143,165,18 - LTEXT "Weniger",IDC_STATIC,35,52,15,8 - LTEXT "Mehr",IDC_STATIC,189,51,17,8 + LTEXT "Weniger",IDC_STATIC,28,42,27,8 + LTEXT "Mehr",IDC_STATIC,189,42,17,8 + LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 10, SS_CENTER END -IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 277 +IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "RemoteDesktop Verbindung" +CAPTION "Remotedesktop Verbindung" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Verbinden",IDOK,147,256,50,14 - PUSHBUTTON "Abbrechen",IDCANCEL,203,256,50,14 - CONTROL "",IDC_TAB,"SysTabControl32",0x0,7,54,246,198 + DEFPUSHBUTTON "Verbinden",IDOK,147,245,50,14 + PUSHBUTTON "Abbrechen",IDCANCEL,203,245,50,14 + CONTROL "",IDC_TAB,"SysTabControl32",0x0,7,50,246,190 END @@ -50,4 +51,13 @@ BEGIN IDS_TAB_GENERAL "Allgemein" IDS_TAB_DISPLAY "Display" + IDS_256COLORS "256 Farben" + IDS_HIGHCOLOR15 "High Color (15 bit)" + IDS_HIGHCOLOR16 "High Color (16 bit)" + IDS_HIGHCOLOR24 "True Color (24 bit)" + IDS_PIXEL "%lux%lu Pixel" + IDS_FULLSCREEN "Vollbild" + IDS_BROWSESERVER "<Nach mehr suchen...>" + IDS_HEADERTEXT1 "Remote Desktop" + IDS_HEADERTEXT2 "Verbindung" END Modified: trunk/reactos/base/applications/mstsc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rs… ============================================================================== --- trunk/reactos/base/applications/mstsc/rsrc.rc (original) +++ trunk/reactos/base/applications/mstsc/rsrc.rc Wed Nov 14 16:52:45 2007 @@ -14,7 +14,7 @@ IDB_HEADER BITMAP "res/header.bmp" IDB_SPECT BITMAP "res/spectrum.bmp" -//#include "lang/de-DE.rc" +#include "lang/de-DE.rc" #include "lang/en-US.rc" //#include "lang/fr-FR.rc" //#include "lang/ru-RU.rc"

1 0

[hpoussin] 30443: Try to be more consistent in unimplemented messages
by hpoussin＠svn.reactos.org 14 Nov '07

14 Nov '07

Author: hpoussin Date: Wed Nov 14 16:14:46 2007 New Revision: 30443 URL: http://svn.reactos.org/svn/reactos?rev=30443&view=rev Log: Try to be more consistent in unimplemented messages Modified: trunk/reactos/dll/win32/hid/precomp.h trunk/reactos/include/reactos/debug.h trunk/reactos/lib/fslib/vfatlib/vfatlib.c trunk/reactos/ntoskrnl/include/internal/debug.h Modified: trunk/reactos/dll/win32/hid/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hid/precomp.h?re… ============================================================================== --- trunk/reactos/dll/win32/hid/precomp.h (original) +++ trunk/reactos/dll/win32/hid/precomp.h Wed Nov 14 16:14:46 2007 @@ -1,5 +1,6 @@ #define WIN32_NO_STATUS #include <windows.h> +#include <debug.h> #define DDKAPI __stdcall #define _HIDPI_ @@ -18,9 +19,4 @@ extern HINSTANCE hDllInstance; extern const GUID HidClassGuid; -#ifndef UNIMPLEMENTED -#define UNIMPLEMENTED \ - DbgPrint("HID: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__) -#endif - /* EOF */ Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h (original) +++ trunk/reactos/include/reactos/debug.h Wed Nov 14 16:14:46 2007 @@ -117,21 +117,6 @@ #define ASSERT_IRQL(x) assert(KeGetCurrentIrql()<=(x)) #define assert_irql(x) assert(KeGetCurrentIrql()<=(x)) -/* Macros expanding to the appropriate inline assembly to raise a breakpoint */ -#if defined(_M_IX86) -#define ASM_BREAKPOINT "\nint $3\n" -#elif defined(_M_ALPHA) -#define ASM_BREAKPOINT "\ncall_pal bpt\n" -#elif defined(_M_MIPS) -#define ASM_BREAKPOINT "\nbreak\n" -#elif defined(__x86_64__) -#define ASM_BREAKPOINT "\nint $3\n" -#elif defined(_M_PPC) -#define ASM_BREAKPOINT "\ntwi 1\n" -#else -#error Unsupported architecture. -#endif - #ifndef KEBUGCHECK #define KEBUGCHECK(a) DbgPrint("KeBugCheck (0x%X) at %s:%i\n", a, __FILE__,__LINE__), KeBugCheck(a) #define KEBUGCHECKEX(a,b,c,d,e) DbgPrint("KeBugCheckEx (0x%X, 0x%X, 0x%X, 0x%X, 0x%X) at %s:%i\n", a, b, c, d, e, __FILE__,__LINE__), KeBugCheckEx(a,b,c,d,e) Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/vfatlib.c (original) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.c Wed Nov 14 16:14:46 2007 @@ -212,7 +212,7 @@ IN BOOLEAN ScanDrive, IN PFMIFSCALLBACK Callback) { - DPRINT1("VfatChkdsk() unimplemented!\n"); + UNIMPLEMENTED; return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/include/internal/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/debug.h (original) +++ trunk/reactos/ntoskrnl/include/internal/debug.h Wed Nov 14 16:14:46 2007 @@ -15,72 +15,19 @@ * Define NASSERT before including this header to disable assertions */ -#ifdef CHECKPOINT -#undef CHECKPOINT -#endif +#include <reactos/debug.h> -#ifdef DPRINT -#undef DPRINT -#endif +#ifndef __NTOSKRNL_DEBUG +#define __NTOSKRNL_DEBUG -#ifndef NDEBUG -#ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */ -#define DPRINT(args...) do { DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0) -#else -#define DPRINT DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint -#endif -#define CHECKPOINT do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0) -#else /* NDEBUG */ -#ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */ -#define DPRINT(args...) -#else -#define DPRINT -#endif -#define CHECKPOINT -#endif /* NDEBUG */ - -#ifndef __INTERNAL_DEBUG -#define __INTERNAL_DEBUG +#include <reactos/debug.h> #if defined(_MSC_VER) && (_MSC_VER < 1300) /* TODO: Verify which version the MS compiler learned the __FUNCTION__ macro */ #define __FUNCTION__ "<unknown>" #endif -#define UNIMPLEMENTED DbgPrint("%s at %s:%d is unimplemented, have a nice day\n",__FUNCTION__,__FILE__,__LINE__); - -#ifdef assert -#undef assert -#endif - -#ifdef DBG - -/* Print if using a "checked" version */ -#ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */ -#define CPRINT(args...) do { DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0) -#else -#define CPRINT DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint -#endif - -#ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */ -#define DPRINT1(args...) do { DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0) -#else -#define DPRINT1 DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint -#endif - -#else /* DBG */ - -#ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */ -#define CPRINT(args...) -#define DPRINT1(args...) -#else -#define CPRINT -#define DPRINT1 -#endif - -#endif /* DBG */ - -#define CHECKPOINT1 do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0) +#define CPRINT DPRINT1 /* * FUNCTION: Assert a maximum value for the current irql @@ -88,9 +35,7 @@ * x = Maximum irql */ #define ASSERT_IRQL_LESS_OR_EQUAL(x) ASSERT(KeGetCurrentIrql()<=(x)) -#define ASSERT_IRQL(x) ASSERT_IRQL_LESS_OR_EQUAL(x) #define ASSERT_IRQL_EQUAL(x) ASSERT(KeGetCurrentIrql()==(x)) #define ASSERT_IRQL_LESS(x) ASSERT(KeGetCurrentIrql()<(x)) -#define assert_irql(x) assert(KeGetCurrentIrql()<=(x)) -#endif /* __INTERNAL_DEBUG */ +#endif /* __NTOSKRNL_DEBUG */

1 0

[gedmurphy] 30442: add part of the patch from bug 2805 with some minor changes See issue #2805 for more details.
by gedmurphy＠svn.reactos.org 14 Nov '07

14 Nov '07

Author: gedmurphy Date: Wed Nov 14 16:05:51 2007 New Revision: 30442 URL: http://svn.reactos.org/svn/reactos?rev=30442&view=rev Log: add part of the patch from bug 2805 with some minor changes See issue #2805 for more details. Modified: trunk/reactos/base/applications/charmap/charmap.c trunk/reactos/base/applications/charmap/map.c Modified: trunk/reactos/base/applications/charmap/charmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/charmap.c (original) +++ trunk/reactos/base/applications/charmap/charmap.c Wed Nov 14 16:05:51 2007 @@ -68,9 +68,8 @@ (WPARAM)hFont, 0); + ZeroMemory(&lf, sizeof(lf)); lf.lfCharSet = DEFAULT_CHARSET; - lf.lfFaceName[0] = L'\0'; // all fonts - lf.lfPitchAndFamily = 0; hdc = GetDC(hwndCombo); @@ -123,6 +122,10 @@ 0, (LPARAM)lpFontName); } + + HeapFree(GetProcessHeap(), + 0, + lpFontName); } } @@ -250,12 +253,23 @@ } return TRUE; } - break; case WM_COMMAND: { switch(LOWORD(wParam)) { + case IDC_FONTMAP: + { + switch (HIWORD(wParam)) + { + case FM_SETCHAR: + AddCharToSelection(GetDlgItem(hDlg, IDC_TEXTBOX), + LOWORD(lParam)); + break; + } + } + break; + case IDC_FONTCOMBO: { if (HIWORD(wParam) == CBN_SELCHANGE) @@ -303,29 +317,6 @@ } break; - case WM_NOTIFY: - { - LPMAPNOTIFY lpnm = (LPMAPNOTIFY)lParam; - - switch (lpnm->hdr.idFrom) - { - case IDC_FONTMAP: - { - switch (lpnm->hdr.code) - { - case FM_SETCHAR: - { - AddCharToSelection(GetDlgItem(hDlg, IDC_TEXTBOX), - lpnm->ch); - } - break; - } - } - break; - } - } - break; - case WM_CLOSE: if (hSmIcon) DestroyIcon(hSmIcon); Modified: trunk/reactos/base/applications/charmap/map.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/map.c (original) +++ trunk/reactos/base/applications/charmap/map.c Wed Nov 14 16:05:51 2007 @@ -211,19 +211,16 @@ if (infoPtr->hParent != NULL) { - MAPNOTIFY mnmh; - - mnmh.hdr.hwndFrom = infoPtr->hMapWnd; - mnmh.hdr.idFrom = GetWindowLongPtr(infoPtr->hMapWnd, - GWLP_ID); - mnmh.hdr.code = code; - - mnmh.ch = ch; - - Ret = SendMessageW(infoPtr->hParent, - WM_NOTIFY, - (WPARAM)mnmh.hdr.idFrom, - (LPARAM)&mnmh); + DWORD dwIdc = GetWindowLongPtr(infoPtr->hMapWnd, GWLP_ID); + /* + * Push directly into the event queue instead of waiting + * the parent to be unlocked. + * High word of LPARAM is still available for future needs... + */ + Ret = PostMessage(infoPtr->hParent, + WM_COMMAND, + MAKELPARAM((WORD)dwIdc, (WORD)code), + (LPARAM)LOWORD(ch)); } return Ret; @@ -509,18 +506,8 @@ } case FM_SETFONT: - { - LPWSTR lpFontName = (LPWSTR)lParam; - - SetFont(infoPtr, - lpFontName); - - HeapFree(GetProcessHeap(), - 0, - lpFontName); - - break; - } + SetFont(infoPtr, (LPWSTR)lParam); + break; case FM_GETCHAR: {

1 0

[hpoussin] 30441: Try to be more consistent in unimplemented messages
by hpoussin＠svn.reactos.org 14 Nov '07

14 Nov '07

Author: hpoussin Date: Wed Nov 14 15:50:12 2007 New Revision: 30441 URL: http://svn.reactos.org/svn/reactos?rev=30441&view=rev Log: Try to be more consistent in unimplemented messages Modified: trunk/reactos/dll/win32/authz/precomp.h trunk/reactos/dll/win32/shell32/dialogs.c trunk/reactos/dll/win32/winscard/precomp.h trunk/reactos/include/reactos/wine/debug.h Modified: trunk/reactos/dll/win32/authz/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/authz/precomp.h?… ============================================================================== --- trunk/reactos/dll/win32/authz/precomp.h (original) +++ trunk/reactos/dll/win32/authz/precomp.h Wed Nov 14 15:50:12 2007 @@ -4,15 +4,7 @@ #define _AUTHZ_ #include <windows.h> #include <authz.h> - -ULONG DbgPrint(PCH Format,...); -#ifndef DPRINT1 -#define DPRINT1 DbgPrint -#endif - -#ifndef UNIMPLEMENTED -#define UNIMPLEMENTED DbgPrint("AUTHZ.DLL: %s is UNIMPLEMENTED!\n", __FUNCTION__) -#endif +#include <debug.h> #if DBG @@ -20,17 +12,11 @@ #define CLIENTCTX_TAG 0x789ABCDE #define VALIDATE_RESMAN_HANDLE(handle) ASSERT(((PAUTHZ_RESMAN)handle)->Tag == RESMAN_TAG) #define VALIDATE_CLIENTCTX_HANDLE(handle) ASSERT(((PAUTHZ_CLIENT_CONTEXT)handle)->Tag == CLIENTCTX_TAG) -#ifndef ASSERT -#define ASSERT(cond) if (!(cond)) { DbgPrint("%s:%i: ASSERTION %s failed!\n", __FILE__, __LINE__, #cond ); } -#endif #else #define VALIDATE_RESMAN_HANDLE(handle) #define VALIDATE_CLIENTCTX_HANDLE(handle) -#ifndef ASSERT -#define ASSERT(cond) -#endif #endif Modified: trunk/reactos/dll/win32/shell32/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs.… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs.c (original) +++ trunk/reactos/dll/win32/shell32/dialogs.c Wed Nov 14 15:50:12 2007 @@ -412,7 +412,7 @@ int WINAPI LogoffWindowsDialog(DWORD uFlags) { - ERR("LogoffWindowsDialog is UNIMPLEMENTED\n"); + UNIMPLEMENTED; ExitWindowsEx(EWX_LOGOFF, 0); return 0; } Modified: trunk/reactos/dll/win32/winscard/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winscard/precomp… ============================================================================== --- trunk/reactos/dll/win32/winscard/precomp.h (original) +++ trunk/reactos/dll/win32/winscard/precomp.h Wed Nov 14 15:50:12 2007 @@ -1,10 +1,5 @@ #include <windows.h> #include <WinSCard.h> - -/* INTERNAL *******************************************************************/ - -ULONG DbgPrint(PCH Format,...); -#define UNIMPLEMENTED \ - DbgPrint("%s:%i: %s() UNIMPLEMENTED!\n", __FILE__, __LINE__, __FUNCTION__) +#include <debug.h> /* EOF */ Modified: trunk/reactos/include/reactos/wine/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/debug… ============================================================================== --- trunk/reactos/include/reactos/wine/debug.h (original) +++ trunk/reactos/include/reactos/wine/debug.h Wed Nov 14 15:50:12 2007 @@ -62,7 +62,7 @@ char name[15]; }; -#define UNIMPLEMENTED WINE_FIXME(" is unimplemented") +#define UNIMPLEMENTED WINE_FIXME("%s is UNIMPLEMENTED!\n", __FUNCTION__) #ifndef WINE_NO_TRACE_MSGS # define __WINE_GET_DEBUGGING_TRACE(dbch) ((dbch)->flags & (1 << __WINE_DBCL_TRACE))

1 0

[hpoussin] 30440: No need to cast variables, as they already are of the right type
by hpoussin＠svn.reactos.org 14 Nov '07

14 Nov '07

Author: hpoussin Date: Wed Nov 14 15:26:39 2007 New Revision: 30440 URL: http://svn.reactos.org/svn/reactos?rev=30440&view=rev Log: No need to cast variables, as they already are of the right type Modified: trunk/reactos/dll/win32/user32/windows/input.c Modified: trunk/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/input.c (original) +++ trunk/reactos/dll/win32/user32/windows/input.c Wed Nov 14 15:26:39 2007 @@ -547,7 +547,7 @@ VkKeyScanExW(WCHAR ch, HKL dwhkl) { - return (SHORT) NtUserVkKeyScanEx((DWORD) ch,(DWORD) dwhkl,(DWORD)NULL); + return (SHORT) NtUserVkKeyScanEx(ch, dwhkl, 0); }

1 0

[hpoussin] 30439: No need to display function name and file/line twice
by hpoussin＠svn.reactos.org 14 Nov '07

14 Nov '07

Author: hpoussin Date: Wed Nov 14 15:25:53 2007 New Revision: 30439 URL: http://svn.reactos.org/svn/reactos?rev=30439&view=rev Log: No need to display function name and file/line twice Modified: trunk/reactos/drivers/network/ndis/include/debug.h Modified: trunk/reactos/drivers/network/ndis/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/debug.h (original) +++ trunk/reactos/drivers/network/ndis/include/debug.h Wed Nov 14 15:25:53 2007 @@ -59,21 +59,12 @@ #define assert_irql(x) ASSERT_IRQL(x) -#ifdef _MSC_VER - #define UNIMPLEMENTED \ - NDIS_DbgPrint(MIN_TRACE, ("The function at (%s:%d) is unimplemented.\n", __FILE__, __LINE__)); - -#else /* _MSC_VER */ - -#define UNIMPLEMENTED \ - NDIS_DbgPrint(MIN_TRACE, ("(%s) at (%s:%d) is unimplemented.\n", __FUNCTION__, __FILE__, __LINE__)); - -#endif /* _MSC_VER */ + NDIS_DbgPrint(MIN_TRACE, ("Unimplemented.\n", __FUNCTION__)); #define CHECKPOINT \ - do { NDIS_DbgPrint(MIN_TRACE, ("(%s:%d)\n", __FILE__, __LINE__)); } while(0); + do { NDIS_DbgPrint(MIN_TRACE, ("\n")); } while(0); #define CP CHECKPOINT

1 0

[hpoussin] 30438: Use Wine debug channel infrastructure. I modified it a bit to match our debug message format To test it, set DEBUGCHANNEL environment variable to what you want to see, and run your program. Syntax: set DEBUGCHANNEL = [[fixme|err|warn|trace]+|-{channel}|all]*
by hpoussin＠svn.reactos.org 14 Nov '07

14 Nov '07

Author: hpoussin Date: Wed Nov 14 15:18:37 2007 New Revision: 30438 URL: http://svn.reactos.org/svn/reactos?rev=30438&view=rev Log: Use Wine debug channel infrastructure. I modified it a bit to match our debug message format To test it, set DEBUGCHANNEL environment variable to what you want to see, and run your program. Syntax: set DEBUGCHANNEL = [[fixme|err|warn|trace]+|-{channel}|all]* Modified: trunk/reactos/include/reactos/wine/debug.h (contents, props changed) trunk/reactos/lib/3rdparty/libwine/debug.c Modified: trunk/reactos/include/reactos/wine/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/debug… ============================================================================== --- trunk/reactos/include/reactos/wine/debug.h (original) +++ trunk/reactos/include/reactos/wine/debug.h Wed Nov 14 15:18:37 2007 @@ -1,68 +1,193 @@ +/* + * Wine debugging interface + * + * Copyright 1999 Patrik Stridvall + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + #ifndef __WINE_DEBUG_H #define __WINE_DEBUG_H -#include "../roscfg.h" #include <stdarg.h> #include <windef.h> -#if !defined(_MSC_VER) -#include <winnt.h> -#endif - -/* Add ROS Master debug functions if not added yet */ -#ifndef __INTERNAL_DEBUG +#ifndef GUID_DEFINED +#include <guiddef.h> +#endif + +#ifdef __WINE_WINE_TEST_H +#error This file should not be used in Wine tests +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +struct _GUID; + +/* + * Internal definitions (do not use these directly) + */ + +enum __wine_debug_class +{ + __WINE_DBCL_FIXME = 0, /* 0x1 */ + __WINE_DBCL_ERR = 1, /* 0x2 */ + __WINE_DBCL_WARN = 2, /* 0x4 */ + __WINE_DBCL_TRACE = 3, /* 0x8 */ + + /* lazy init flag */ #ifdef YDEBUG -#undef NDEBUG + __WINE_DBCL_INIT = 0xf #else -#define NDEBUG -#endif -#include <reactos/debug.h> -#endif - -#ifndef __GNUC__ -#if !defined(_MSC_VER) || _MSC_VER < 8 -#define __FUNCTION__ "" -#endif//_MSC_VER -#define inline __inline -#endif - -ULONG DbgPrint(const char *Format,...); - -struct _GUID; - -/* Exported definitions and macros */ - -/* These function return a printable version of a string, including + __WINE_DBCL_INIT = 0x7 +#endif +}; + +struct __wine_debug_channel +{ + unsigned char flags; + char name[15]; +}; + +#define UNIMPLEMENTED WINE_FIXME(" is unimplemented") + +#ifndef WINE_NO_TRACE_MSGS +# define __WINE_GET_DEBUGGING_TRACE(dbch) ((dbch)->flags & (1 << __WINE_DBCL_TRACE)) +#else +# define __WINE_GET_DEBUGGING_TRACE(dbch) 0 +#endif + +#ifndef WINE_NO_DEBUG_MSGS +# define __WINE_GET_DEBUGGING_WARN(dbch) ((dbch)->flags & (1 << __WINE_DBCL_WARN)) +# define __WINE_GET_DEBUGGING_FIXME(dbch) ((dbch)->flags & (1 << __WINE_DBCL_FIXME)) +#else +# define __WINE_GET_DEBUGGING_WARN(dbch) 0 +# define __WINE_GET_DEBUGGING_FIXME(dbch) 0 +#endif + +/* define error macro regardless of what is configured */ +#define __WINE_GET_DEBUGGING_ERR(dbch) ((dbch)->flags & (1 << __WINE_DBCL_ERR)) + +#define __WINE_GET_DEBUGGING(dbcl,dbch) __WINE_GET_DEBUGGING##dbcl(dbch) + +#define __WINE_IS_DEBUG_ON(dbcl,dbch) \ + (__WINE_GET_DEBUGGING##dbcl(dbch) && (__wine_dbg_get_channel_flags(dbch) & (1 << __WINE_DBCL##dbcl))) + +#ifdef __GNUC__ + +#define __WINE_DPRINTF(dbcl,dbch) \ + do { if(__WINE_GET_DEBUGGING(dbcl,(dbch))) { \ + struct __wine_debug_channel * const __dbch = (dbch); \ + const enum __wine_debug_class __dbcl = __WINE_DBCL##dbcl; \ + __WINE_DBG_LOG + +#define __WINE_DBG_LOG(args...) \ + wine_dbg_log( __dbcl, __dbch, __FILE__, __FUNCTION__, __LINE__, args); } } while(0) + +#define __WINE_PRINTF_ATTR(fmt,args) /*__attribute__((format (printf,fmt,args)))*/ + + +#ifdef WINE_NO_TRACE_MSGS +#define WINE_TRACE(args...) do { } while(0) +#define WINE_TRACE_(ch) WINE_TRACE +#endif + +#ifdef WINE_NO_DEBUG_MSGS +#define WINE_WARN(args...) do { } while(0) +#define WINE_WARN_(ch) WINE_WARN +#define WINE_FIXME(args...) do { } while(0) +#define WINE_FIXME_(ch) WINE_FIXME +#endif + +#elif defined(__SUNPRO_C) + +#define __WINE_DPRINTF(dbcl,dbch) \ + do { if(__WINE_GET_DEBUGGING(dbcl,(dbch))) { \ + struct __wine_debug_channel * const __dbch = (dbch); \ + const enum __WINE_DEBUG_CLASS __dbcl = __WINE_DBCL##dbcl; \ + __WINE_DBG_LOG + +#define __WINE_DBG_LOG(...) \ + wine_dbg_log( __dbcl, __dbch, __func__, __VA_ARGS__); } } while(0) + +#define __WINE_PRINTF_ATTR(fmt,args) + +#ifdef WINE_NO_TRACE_MSGS +#define WINE_TRACE(...) do { } while(0) +#define WINE_TRACE_(ch) WINE_TRACE +#endif + +#ifdef WINE_NO_DEBUG_MSGS +#define WINE_WARN(...) do { } while(0) +#define WINE_WARN_(ch) WINE_WARN +#define WINE_FIXME(...) do { } while(0) +#define WINE_FIXME_(ch) WINE_FIXME +#endif + +#else /* !__GNUC__ && !__SUNPRO_C */ + +#define __WINE_DPRINTF(dbcl,dbch) \ + (!__WINE_GET_DEBUGGING(dbcl,(dbch)) || \ + (wine_dbg_log(__WINE_DBCL##dbcl,(dbch),__FILE__,"",__LINE__,"") == -1)) ? \ + (void)0 : (void)wine_dbg_printf + +#define __WINE_PRINTF_ATTR(fmt, args) + +#endif /* !__GNUC__ && !__SUNPRO_C */ + +struct __wine_debug_functions +{ + char * (*get_temp_buffer)( size_t n ); + void (*release_temp_buffer)( char *buffer, size_t n ); + const char * (*dbgstr_an)( const char * s, int n ); + const char * (*dbgstr_wn)( const WCHAR *s, int n ); + int (*dbg_vprintf)( const char *format, va_list args ); + int (*dbg_vlog)( enum __wine_debug_class cls, struct __wine_debug_channel *channel, + const char *file, const char *function, const int line, const char *format, va_list args ); +}; + +extern unsigned char __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ); +extern int __wine_dbg_set_channel_flags( struct __wine_debug_channel *channel, + unsigned char set, unsigned char clear ); +extern void __wine_dbg_set_functions( const struct __wine_debug_functions *new_funcs, + struct __wine_debug_functions *old_funcs, size_t size ); + +/* + * Exported definitions and macros + */ + +/* These functions return a printable version of a string, including quotes. The string will be valid for some time, but not indefinitely as strings are re-used. */ -extern const char *wine_dbgstr_w( const WCHAR *s ); extern const char *wine_dbgstr_an( const char * s, int n ); -extern const char *wine_dbgstr_wn( const wchar_t *s, int n ); -extern const char *wine_dbgstr_longlong( unsigned long long ll ); -extern const char *wine_dbg_sprintf( const char *format, ... ); - -inline static const char *debugstr_an( const char * s, int n ) { return wine_dbgstr_an( s, n ); } -inline static const char *debugstr_wn( const wchar_t *s, int n ) { return wine_dbgstr_wn( s, n ); } -inline static const char *debugstr_a( const char *s ) { return wine_dbgstr_an( s, 80 ); } -inline static const char *debugstr_w( const wchar_t *s ) { return wine_dbgstr_wn( s, 80 ); } -inline static const char *debugres_a( const char *s ) { return wine_dbgstr_an( s, 80 ); } -inline static const char *debugres_w( const wchar_t *s ) { return wine_dbgstr_wn( s, 80 ); } - -static inline const char *wine_dbgstr_point( const POINT *pt ) -{ - if (!pt) return "(null)"; - return wine_dbg_sprintf( "(%ld,%ld)", pt->x, pt->y ); -} - -static inline const char *wine_dbgstr_size( const SIZE *size ) -{ - if (!size) return "(null)"; - return wine_dbg_sprintf( "(%ld,%ld)", size->cx, size->cy ); -} - -static inline const char *wine_dbgstr_rect( const RECT *rect ) -{ - if (!rect) return "(null)"; - return wine_dbg_sprintf( "(%ld,%ld)-(%ld,%ld)", rect->left, rect->top, rect->right, rect->bottom ); +extern const char *wine_dbgstr_wn( const WCHAR *s, int n ); +extern const char *wine_dbg_sprintf( const char *format, ... ) __WINE_PRINTF_ATTR(1,2); + +extern int wine_dbg_printf( const char *format, ... ) __WINE_PRINTF_ATTR(1,2); +extern int wine_dbg_log( enum __wine_debug_class cls, struct __wine_debug_channel *ch, const char *file, + const char *func, const int line, const char *format, ... ) __WINE_PRINTF_ATTR(6,7); + +static inline const char *wine_dbgstr_a( const char *s ) +{ + return wine_dbgstr_an( s, -1 ); +} + +static inline const char *wine_dbgstr_w( const WCHAR *s ) +{ + return wine_dbgstr_wn( s, -1 ); } static inline const char *wine_dbgstr_guid( const GUID *id ) @@ -75,85 +200,93 @@ id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); } +static inline const char *wine_dbgstr_point( const POINT *pt ) +{ + if (!pt) return "(null)"; + return wine_dbg_sprintf( "(%ld,%ld)", pt->x, pt->y ); +} + +static inline const char *wine_dbgstr_size( const SIZE *size ) +{ + if (!size) return "(null)"; + return wine_dbg_sprintf( "(%ld,%ld)", size->cx, size->cy ); +} + +static inline const char *wine_dbgstr_rect( const RECT *rect ) +{ + if (!rect) return "(null)"; + return wine_dbg_sprintf( "(%ld,%ld)-(%ld,%ld)", rect->left, rect->top, + rect->right, rect->bottom ); +} + +static inline const char *wine_dbgstr_longlong( ULONGLONG ll ) +{ + if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) + return wine_dbg_sprintf( "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll ); + else return wine_dbg_sprintf( "%lx", (unsigned long)ll ); +} + +#ifndef WINE_TRACE +#define WINE_TRACE __WINE_DPRINTF(_TRACE,__wine_dbch___default) +#define WINE_TRACE_(ch) __WINE_DPRINTF(_TRACE,&__wine_dbch_##ch) +#endif +#define WINE_TRACE_ON(ch) __WINE_IS_DEBUG_ON(_TRACE,&__wine_dbch_##ch) + +#ifndef WINE_WARN +#define WINE_WARN __WINE_DPRINTF(_WARN,__wine_dbch___default) +#define WINE_WARN_(ch) __WINE_DPRINTF(_WARN,&__wine_dbch_##ch) +#endif +#define WINE_WARN_ON(ch) __WINE_IS_DEBUG_ON(_WARN,&__wine_dbch_##ch) + +#ifndef WINE_FIXME +#define WINE_FIXME __WINE_DPRINTF(_FIXME,__wine_dbch___default) +#define WINE_FIXME_(ch) __WINE_DPRINTF(_FIXME,&__wine_dbch_##ch) +#endif +#define WINE_FIXME_ON(ch) __WINE_IS_DEBUG_ON(_FIXME,&__wine_dbch_##ch) + +#define WINE_ERR __WINE_DPRINTF(_ERR,__wine_dbch___default) +#define WINE_ERR_(ch) __WINE_DPRINTF(_ERR,&__wine_dbch_##ch) +#define WINE_ERR_ON(ch) __WINE_IS_DEBUG_ON(_ERR,&__wine_dbch_##ch) + +#define WINE_DECLARE_DEBUG_CHANNEL(ch) \ + static struct __wine_debug_channel __wine_dbch_##ch = { ~0, #ch } +#define WINE_DEFAULT_DEBUG_CHANNEL(ch) \ + static struct __wine_debug_channel __wine_dbch_##ch = { ~0, #ch }; \ + static struct __wine_debug_channel * const __wine_dbch___default = &__wine_dbch_##ch + +#define WINE_DPRINTF wine_dbg_printf +#define WINE_MESSAGE wine_dbg_printf + +/* Wine uses shorter names that are very likely to conflict with other software */ + +static inline const char *debugstr_an( const char * s, int n ) { return wine_dbgstr_an( s, n ); } +static inline const char *debugstr_wn( const WCHAR *s, int n ) { return wine_dbgstr_wn( s, n ); } static inline const char *debugstr_guid( const struct _GUID *id ) { return wine_dbgstr_guid(id); } - -#define TRACE DPRINT -#define TRACE_(ch) DPRINT -#ifdef NDEBUG -#define TRACE_ON(ch) 0 -#else -#define TRACE_ON(ch) 1 -#endif - -#define WINE_TRACE DPRINT -#define WINE_TRACE_(ch) DPRINT -#ifdef NDEBUG -#define WINE_TRACE_ON(ch) 0 -#else -#define WINE_TRACE_ON(ch) 1 -#endif - -#define WARN DPRINT -#define WARN_(ch) DPRINT -#ifdef NDEBUG -#define WARN_ON(ch) 0 -#else -#define WARN_ON(ch) 1 -#endif - -#define WINE_WARN DPRINT -#define WINE_WARN_(ch) DPRINT -#ifdef NDEBUG -#define WINE_WARN_ON(ch) 0 -#else -#define WINE_WARN_ON(ch) 1 -#endif - -#ifdef FIXME -#undef FIXME -#endif -#define FIXME DPRINT1 -#define FIXME_(ch) DPRINT1 -#ifdef NDEBUG -#define FIXME_ON(ch) 0 -#else -#define FIXME_ON(ch) 1 -#endif - -#ifdef WINE_FIXME -#undef WINE_FIXME -#endif -#define WINE_FIXME DPRINT1 -#define WINE_FIXME_(ch) DPRINT1 -#ifdef NDEBUG -#define WINE_FIXME_ON(ch) 0 -#else -#define WINE_FIXME_ON(ch) 1 -#endif - -#define ERR DPRINT1 -#define ERR_(ch) DPRINT1 -#ifdef NDEBUG -#define ERR_ON(ch) 0 -#else -#define ERR_ON(ch) 1 -#endif - -#define WINE_ERR DPRINT1 -#define WINE_ERR_(ch) DPRINT1 -#ifdef NDEBUG -#define WINE_ERR_ON(ch) 0 -#else -#define WINE_ERR_ON(ch) 1 -#endif - -#define DECLARE_DEBUG_CHANNEL(ch) -#define DEFAULT_DEBUG_CHANNEL(ch) - -#define WINE_DECLARE_DEBUG_CHANNEL(ch) DECLARE_DEBUG_CHANNEL(ch) -#define WINE_DEFAULT_DEBUG_CHANNEL(ch) DEFAULT_DEBUG_CHANNEL(ch) - -#define DPRINTF DPRINT -#define MESSAGE DPRINT +static inline const char *debugstr_a( const char *s ) { return wine_dbgstr_an( s, -1 ); } +static inline const char *debugstr_w( const WCHAR *s ) { return wine_dbgstr_wn( s, -1 ); } + +#define TRACE WINE_TRACE +#define TRACE_(ch) WINE_TRACE_(ch) +#define TRACE_ON(ch) WINE_TRACE_ON(ch) + +#define WARN WINE_WARN +#define WARN_(ch) WINE_WARN_(ch) +#define WARN_ON(ch) WINE_WARN_ON(ch) + +#define FIXME WINE_FIXME +#define FIXME_(ch) WINE_FIXME_(ch) +#define FIXME_ON(ch) WINE_FIXME_ON(ch) + +#undef ERR /* Solaris got an 'ERR' define in <sys/reg.h> */ +#define ERR WINE_ERR +#define ERR_(ch) WINE_ERR_(ch) +#define ERR_ON(ch) WINE_ERR_ON(ch) + +#define DPRINTF WINE_DPRINTF +#define MESSAGE WINE_MESSAGE + +#ifdef __cplusplus +} +#endif #endif /* __WINE_DEBUG_H */ Propchange: trunk/reactos/include/reactos/wine/debug.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: trunk/reactos/lib/3rdparty/libwine/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/debug… ============================================================================== --- trunk/reactos/lib/3rdparty/libwine/debug.c (original) +++ trunk/reactos/lib/3rdparty/libwine/debug.c Wed Nov 14 15:18:37 2007 @@ -15,125 +15,289 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include "wine/config.h" +#include "wine/port.h" + #include <stdlib.h> #include <stdio.h> -#include <tchar.h> - -#include <wine/config.h> -#include <wine/port.h> -#include <wine/debug.h> - -/* ---------------------------------------------------------------------- */ - -static CRITICAL_SECTION WineDebugCS; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &WineDebugCS, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { 0, 0 } -}; -static CRITICAL_SECTION WineDebugCS = { &critsect_debug, -1, 0, 0, 0, 0 }; -static DWORD WineDebugTlsIndex = TLS_OUT_OF_INDEXES; - -/* ---------------------------------------------------------------------- */ - -struct debug_info -{ - char *str_pos; /* current position in strings buffer */ - char *out_pos; /* current position in output buffer */ - char strings[1024]; /* buffer for temporary strings */ - char output[1024]; /* current output line */ -}; - -static struct debug_info tmp = { tmp.strings, tmp.output }; - -/* get the debug info pointer for the current thread */ -static inline struct debug_info *get_info(void) -{ - struct debug_info *info; - - if (WineDebugTlsIndex == TLS_OUT_OF_INDEXES) - { - EnterCriticalSection(&WineDebugCS); - if (WineDebugTlsIndex == TLS_OUT_OF_INDEXES) - { - DWORD NewTlsIndex = TlsAlloc(); - if (NewTlsIndex == TLS_OUT_OF_INDEXES) +#include <stdarg.h> +#include <string.h> +#include <ctype.h> +#include <excpt.h> + +#define WIN32_NO_STATUS +#include "wine/debug.h" +#include "wine/library.h" + +#include <rtlfuncs.h> +#include <cmfuncs.h> + +#define KEY_QUERY_VALUE 1 +#define REG_SZ 1 + +ULONG +__cdecl +DbgPrint( + IN PCCH Format, + IN ... +); + +static const char * const debug_classes[] = { "fixme", "err", "warn", "trace" }; + +#define MAX_DEBUG_OPTIONS 256 + +static unsigned char default_flags = (1 << __WINE_DBCL_ERR) | (1 << __WINE_DBCL_FIXME); +static int nb_debug_options = -1; +static struct __wine_debug_channel debug_options[MAX_DEBUG_OPTIONS]; + +static struct __wine_debug_functions funcs; + +static void debug_init(void); + +static int cmp_name( const void *p1, const void *p2 ) +{ + const char *name = p1; + const struct __wine_debug_channel *chan = p2; + return strcmp( name, chan->name ); +} + +/* get the flags to use for a given channel, possibly setting them too in case of lazy init */ +unsigned char __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ) +{ + if (nb_debug_options == -1) debug_init(); + + if (nb_debug_options) + { + struct __wine_debug_channel *opt = bsearch( channel->name, debug_options, nb_debug_options, + sizeof(debug_options[0]), cmp_name ); + if (opt) return opt->flags; + } + /* no option for this channel */ + if (channel->flags & (1 << __WINE_DBCL_INIT)) channel->flags = default_flags; + return default_flags; +} + +/* set the flags to use for a given channel; return 0 if the channel is not available to set */ +int __wine_dbg_set_channel_flags( struct __wine_debug_channel *channel, + unsigned char set, unsigned char clear ) +{ + if (nb_debug_options == -1) debug_init(); + + if (nb_debug_options) + { + struct __wine_debug_channel *opt = bsearch( channel->name, debug_options, nb_debug_options, + sizeof(debug_options[0]), cmp_name ); + if (opt) + { + opt->flags = (opt->flags & ~clear) | set; + return 1; + } + } + return 0; +} + +/* add a new debug option at the end of the option list */ +static void add_option( const char *name, unsigned char set, unsigned char clear ) +{ + int min = 0, max = nb_debug_options - 1, pos, res; + + if (!name[0]) /* "all" option */ + { + default_flags = (default_flags & ~clear) | set; + return; + } + if (strlen(name) >= sizeof(debug_options[0].name)) return; + + while (min <= max) + { + pos = (min + max) / 2; + res = strcmp( name, debug_options[pos].name ); + if (!res) + { + debug_options[pos].flags = (debug_options[pos].flags & ~clear) | set; + return; + } + if (res < 0) max = pos - 1; + else min = pos + 1; + } + if (nb_debug_options >= MAX_DEBUG_OPTIONS) return; + + pos = min; + if (pos < nb_debug_options) memmove( &debug_options[pos + 1], &debug_options[pos], + (nb_debug_options - pos) * sizeof(debug_options[0]) ); + strcpy( debug_options[pos].name, name ); + debug_options[pos].flags = (default_flags & ~clear) | set; + nb_debug_options++; +} + +/* parse a set of debugging option specifications and add them to the option list */ +static void parse_options( char *options ) +{ + char *opt, *next; + unsigned int i; + + for (opt = options; opt; opt = next) + { + const char *p; + unsigned char set = 0, clear = 0; + + if ((next = strchr( opt, ',' ))) *next++ = 0; + + p = opt + strcspn( opt, "+-" ); + if (!p[0]) p = opt; /* assume it's a debug channel name */ + + if (p > opt) + { + for (i = 0; i < sizeof(debug_classes)/sizeof(debug_classes[0]); i++) { - LeaveCriticalSection(&WineDebugCS); - return &tmp; + int len = strlen(debug_classes[i]); + if (len != (p - opt)) continue; + if (!memcmp( opt, debug_classes[i], len )) /* found it */ + { + if (*p == '+') set |= 1 << i; + else clear |= 1 << i; + break; + } } - info = HeapAlloc(GetProcessHeap(), 0, sizeof(*info)); - if (!info) - { - LeaveCriticalSection(&WineDebugCS); - TlsFree(NewTlsIndex); - return &tmp; - } - info->str_pos = info->strings; - info->out_pos = info->output; - TlsSetValue(NewTlsIndex, info); - WineDebugTlsIndex = NewTlsIndex; - } - LeaveCriticalSection(&WineDebugCS); - } - - return TlsGetValue(WineDebugTlsIndex); -} - -/* allocate some tmp space for a string */ -static void *gimme1(int n) -{ - struct debug_info *info = get_info(); - char *res = info->str_pos; - - if (res + n >= &info->strings[sizeof(info->strings)]) res = info->strings; - info->str_pos = res + n; - return res; -} - -/* release extra space that we requested in gimme1() */ -static inline void release(void *ptr) -{ - struct debug_info *info; - if (WineDebugTlsIndex == TLS_OUT_OF_INDEXES) - info = &tmp; - else - info = TlsGetValue(WineDebugTlsIndex); - info->str_pos = ptr; -} - -/*********************************************************************** - * wine_dbgstr_an - */ -const char *wine_dbgstr_an(const char *src, int n) -{ + if (i == sizeof(debug_classes)/sizeof(debug_classes[0])) /* bad class name, skip it */ + continue; + } + else + { + if (*p == '-') clear = ~0; + else set = ~0; + } + if (*p == '+' || *p == '-') p++; + if (!p[0]) continue; + + if (!strcmp( p, "all" )) + default_flags = (default_flags & ~clear) | set; + else + add_option( p, set, clear ); + } +} + +/* initialize all options at startup */ +static void debug_init(void) +{ + char *wine_debug; + DWORD dwLength; + + if (nb_debug_options != -1) return; /* already initialized */ + nb_debug_options = 0; + + dwLength = GetEnvironmentVariableA("DEBUGCHANNEL", NULL, 0); + if (dwLength) + { + wine_debug = malloc(dwLength); + if (wine_debug) + { + if (GetEnvironmentVariableA("DEBUGCHANNEL", wine_debug, dwLength) < dwLength) + parse_options(wine_debug); + free(wine_debug); + } + } +} + +/* varargs wrapper for funcs.dbg_vprintf */ +int wine_dbg_printf( const char *format, ... ) +{ + int ret; + va_list valist; + + va_start(valist, format); + ret = funcs.dbg_vprintf( format, valist ); + va_end(valist); + return ret; +} + +/* printf with temp buffer allocation */ +const char *wine_dbg_sprintf( const char *format, ... ) +{ + static const int max_size = 200; + char *ret; + int len; + va_list valist; + + va_start(valist, format); + ret = funcs.get_temp_buffer( max_size ); + len = vsnprintf( ret, max_size, format, valist ); + if (len == -1 || len >= max_size) ret[max_size-1] = 0; + else funcs.release_temp_buffer( ret, len + 1 ); + va_end(valist); + return ret; +} + + +/* varargs wrapper for funcs.dbg_vlog */ +int wine_dbg_log( enum __wine_debug_class cls, struct __wine_debug_channel *channel, + const char *file, const char *func, const int line, const char *format, ... ) +{ + int ret; + va_list valist; + + if (!(__wine_dbg_get_channel_flags( channel ) & (1 << cls))) return -1; + + va_start(valist, format); + ret = funcs.dbg_vlog( cls, channel, file, func, line, format, valist ); + va_end(valist); + return ret; +} + + +/* allocate some tmp string space */ +/* FIXME: this is not 100% thread-safe */ +static char *get_temp_buffer( size_t size ) +{ + static char *list[32]; + static long pos; + char *ret; + int idx; + + idx = interlocked_xchg_add( &pos, 1 ) % (sizeof(list)/sizeof(list[0])); + if ((ret = realloc( list[idx], size ))) list[idx] = ret; + return ret; +} + + +/* release unused part of the buffer */ +static void release_temp_buffer( char *buffer, size_t size ) +{ + /* don't bother doing anything */ +} + + +/* default implementation of wine_dbgstr_an */ +static const char *default_dbgstr_an( const char *str, int n ) +{ + static const char hex[16] = "0123456789abcdef"; char *dst, *res; - - if (!HIWORD(src)) - { - if (!src) return "(null)"; - res = gimme1(6); - sprintf(res, "#%04x", (WORD)(DWORD)(src) ); + size_t size; + + if (!((ULONG_PTR)str >> 16)) + { + if (!str) return "(null)"; + res = funcs.get_temp_buffer( 6 ); + sprintf( res, "#%04x", LOWORD(str) ); return res; } + if (n == -1) n = strlen(str); if (n < 0) n = 0; - else if (n > 200) n = 200; - dst = res = gimme1 (n * 4 + 6); + size = 10 + min( 300, n * 4 ); + dst = res = funcs.get_temp_buffer( size ); *dst++ = '"'; - while (n-- > 0 && *src) - { - unsigned char c = *src++; + while (n-- > 0 && dst <= res + size - 9) + { + unsigned char c = *str++; switch (c) { case '\n': *dst++ = '\\'; *dst++ = 'n'; break; case '\r': *dst++ = '\\'; *dst++ = 'r'; break; case '\t': *dst++ = '\\'; *dst++ = 't'; break; - case '"': *dst++ = '\\'; *dst++ = '"'; break; + case '"': *dst++ = '\\'; *dst++ = '"'; break; case '\\': *dst++ = '\\'; *dst++ = '\\'; break; default: if (c >= ' ' && c <= 126) @@ -141,52 +305,58 @@ else { *dst++ = '\\'; - *dst++ = '0' + ((c >> 6) & 7); - *dst++ = '0' + ((c >> 3) & 7); - *dst++ = '0' + ((c >> 0) & 7); + *dst++ = 'x'; + *dst++ = hex[(c >> 4) & 0x0f]; + *dst++ = hex[c & 0x0f]; } } } *dst++ = '"'; - if (*src) - { - *dst++ = '.'; - *dst++ = '.'; - *dst++ = '.'; - } - *dst++ = '\0'; - release( dst ); + if (n > 0) + { + *dst++ = '.'; + *dst++ = '.'; + *dst++ = '.'; + } + *dst++ = 0; + funcs.release_temp_buffer( res, dst - res ); return res; } -/*********************************************************************** - * wine_dbgstr_wn - */ -const char *wine_dbgstr_wn(const WCHAR *src, int n) + +/* default implementation of wine_dbgstr_wn */ +static const char *default_dbgstr_wn( const WCHAR *str, int n ) { char *dst, *res; - - if (!HIWORD(src)) - { - if (!src) return "(null)"; - res = gimme1(6); - sprintf(res, "#%04x", (WORD)(DWORD)(src) ); + size_t size; + + if (!((ULONG_PTR)str >> 16)) + { + if (!str) return "(null)"; + res = funcs.get_temp_buffer( 6 ); + sprintf( res, "#%04x", LOWORD(str) ); return res; } + if (n == -1) + { + const WCHAR *end = str; + while (*end) end++; + n = end - str; + } if (n < 0) n = 0; - else if (n > 200) n = 200; - dst = res = gimme1(n * 5 + 7); + size = 12 + min( 300, n * 5 ); + dst = res = funcs.get_temp_buffer( n * 5 + 7 ); *dst++ = 'L'; *dst++ = '"'; - while (n-- > 0 && *src) - { - WCHAR c = *src++; + while (n-- > 0 && dst <= res + size - 10) + { + WCHAR c = *str++; switch (c) { case '\n': *dst++ = '\\'; *dst++ = 'n'; break; case '\r': *dst++ = '\\'; *dst++ = 'r'; break; case '\t': *dst++ = '\\'; *dst++ = 't'; break; - case '"': *dst++ = '\\'; *dst++ = '"'; break; + case '"': *dst++ = '\\'; *dst++ = '"'; break; case '\\': *dst++ = '\\'; *dst++ = '\\'; break; default: if (c >= ' ' && c <= 126) @@ -200,37 +370,67 @@ } } *dst++ = '"'; - if (*src) - { - *dst++ = '.'; - *dst++ = '.'; - *dst++ = '.'; - } - *dst++ = '\0'; - release(dst); + if (n > 0) + { + *dst++ = '.'; + *dst++ = '.'; + *dst++ = '.'; + } + *dst++ = 0; + funcs.release_temp_buffer( res, dst - res ); return res; } -const char *wine_dbgstr_longlong( unsigned long long ll ) -{ - if (ll >> 32) return wine_dbg_sprintf( "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll ); - else return wine_dbg_sprintf( "%lx", (unsigned long)ll ); -} - -/* varargs wrapper for __wine_dbg_vsprintf */ -const char *wine_dbg_sprintf( const char *format, ... ) -{ - char* buffer = gimme1(1024); - va_list ap; - - va_start(ap, format); - release(buffer+vsnprintf(buffer, 1024, format, ap)); - va_end(ap); - - return buffer; -} - -const char *wine_dbgstr_w( const WCHAR *s ) -{ - return wine_dbgstr_wn( s, -1 ); -} + +/* default implementation of wine_dbg_vprintf */ +static int default_dbg_vprintf( const char *format, va_list args ) +{ + char buffer[512]; + vsnprintf( buffer, sizeof(buffer), format, args ); + buffer[sizeof(buffer) - 1] = '\0'; + return DbgPrint( buffer ); +} + + +/* default implementation of wine_dbg_vlog */ +static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_channel *channel, + const char *file, const char *func, const int line, const char *format, va_list args ) +{ + int ret = 0; + + if (cls < sizeof(debug_classes)/sizeof(debug_classes[0])) + ret += wine_dbg_printf( "%s:", debug_classes[cls] ); + ret += wine_dbg_printf ( "(%s:%d) ", file, line ); + if (format) + ret += funcs.dbg_vprintf( format, args ); + return ret; +} + +/* wrappers to use the function pointers */ + +const char *wine_dbgstr_an( const char * s, int n ) +{ + return funcs.dbgstr_an(s, n); +} + +const char *wine_dbgstr_wn( const WCHAR *s, int n ) +{ + return funcs.dbgstr_wn(s, n); +} + +void __wine_dbg_set_functions( const struct __wine_debug_functions *new_funcs, + struct __wine_debug_functions *old_funcs, size_t size ) +{ + if (old_funcs) memcpy( old_funcs, &funcs, min(sizeof(funcs),size) ); + if (new_funcs) memcpy( &funcs, new_funcs, min(sizeof(funcs),size) ); +} + +static struct __wine_debug_functions funcs = +{ + get_temp_buffer, + release_temp_buffer, + default_dbgstr_an, + default_dbgstr_wn, + default_dbg_vprintf, + default_dbg_vlog +};

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs