Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[jimtabor] 42716: - Fix define types.
by jimtabor＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: jimtabor Date: Sat Aug 15 23:28:02 2009 New Revision: 42716 URL: http://svn.reactos.org/svn/reactos?rev=42716&view=rev Log: - Fix define types. Modified: trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sat Aug 15 23:28:02 2009 @@ -350,8 +350,8 @@ #define WS_EX_UISTATEFOCUSRECTHIDDEN 0X80000000 /* Non SDK Styles */ -#define WS_MAXIMIZED 0X01000000 -#define WS_MINIMIZED 0X20000000 +#define WS_MAXIMIZED WS_MAXIMIZE +#define WS_MINIMIZED WS_MINIMIZE /* ExStyles2 */ #define WS_EX2_CLIPBOARDLISTENER 0X00000001

1 0

[hpoussin] 42715: Try to fix build after r42706
by hpoussin＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: hpoussin Date: Sat Aug 15 22:47:58 2009 New Revision: 42715 URL: http://svn.reactos.org/svn/reactos?rev=42715&view=rev Log: Try to fix build after r42706 Modified: trunk/reactos/include/psdk/commctrl.h Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re… ============================================================================== --- trunk/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/commctrl.h [iso-8859-1] Sat Aug 15 22:47:58 2009 @@ -394,15 +394,7 @@ /* UpDown */ #define UPDOWN_CLASSA "msctls_updown32" -#if defined(__GNUC__) -# define UPDOWN_CLASSW (const WCHAR []){ 'm','s','c','t','l','s','_', \ - 'u','p','d','o','w','n','3','2',0 } -#elif defined(_MSC_VER) # define UPDOWN_CLASSW L"msctls_updown32" -#else -static const WCHAR UPDOWN_CLASSW[] = { 'm','s','c','t','l','s','_', - 'u','p','d','o','w','n','3','2',0 }; -#endif #define UPDOWN_CLASS WINELIB_NAME_AW(UPDOWN_CLASS) typedef struct _UDACCEL @@ -463,15 +455,7 @@ /* Progress Bar */ #define PROGRESS_CLASSA "msctls_progress32" -#if defined(__GNUC__) -# define PROGRESS_CLASSW (const WCHAR []){ 'm','s','c','t','l','s','_', \ - 'p','r','o','g','r','e','s','s','3','2',0 } -#elif defined(_MSC_VER) # define PROGRESS_CLASSW L"msctls_progress32" -#else -static const WCHAR PROGRESS_CLASSW[] = { 'm','s','c','t','l','s','_', - 'p','r','o','g','r','e','s','s','3','2',0 }; -#endif #define PROGRESS_CLASS WINELIB_NAME_AW(PROGRESS_CLASS) #define PBM_SETRANGE (WM_USER+1) @@ -720,13 +704,7 @@ /* Header control */ #define WC_HEADERA "SysHeader32" -#if defined(__GNUC__) -# define WC_HEADERW (const WCHAR []){ 'S','y','s','H','e','a','d','e','r','3','2',0 } -#elif defined(_MSC_VER) # define WC_HEADERW L"SysHeader32" -#else -static const WCHAR WC_HEADERW[] = { 'S','y','s','H','e','a','d','e','r','3','2',0 }; -#endif #define WC_HEADER WINELIB_NAME_AW(WC_HEADER) #define HDS_HORZ 0x0000 @@ -1035,13 +1013,7 @@ /* Win32 5.1 Button Theme */ #define WC_BUTTONA "Button" -#if defined(__GNUC__) -# define WC_BUTTONW (const WCHAR []){ 'B','u','t','t','o','n',0 } -#elif defined(_MSC_VER) # define WC_BUTTONW L"Button" -#else -static const WCHAR WC_BUTTONW[] = { 'B','u','t','t','o','n',0 }; -#endif #define WC_BUTTON WINELIB_NAME_AW(WC_BUTTON) #define BCN_FIRST (0U-1250U) @@ -1060,15 +1032,8 @@ /* Toolbar */ #define TOOLBARCLASSNAMEA "ToolbarWindow32" -#if defined(__GNUC__) -# define TOOLBARCLASSNAMEW (const WCHAR []){ 'T','o','o','l','b','a','r', \ - 'W','i','n','d','o','w','3','2',0 } -#elif defined(_MSC_VER) # define TOOLBARCLASSNAMEW L"ToolbarWindow32" -#else -static const WCHAR TOOLBARCLASSNAMEW[] = { 'T','o','o','l','b','a','r', - 'W','i','n','d','o','w','3','2',0 }; -#endif + #define TOOLBARCLASSNAME WINELIB_NAME_AW(TOOLBARCLASSNAME) #define CMB_MASKED 0x02 @@ -1627,16 +1592,27 @@ /* Tool tips */ #define TOOLTIPS_CLASSA "tooltips_class32" -#if defined(__GNUC__) -# define TOOLTIPS_CLASSW (const WCHAR []){ 't','o','o','l','t','i','p','s','_', \ - 'c','l','a','s','s','3','2',0 } -#elif defined(_MSC_VER) # define TOOLTIPS_CLASSW L"tooltips_class32" -#else -static const WCHAR TOOLTIPS_CLASSW[] = { 't','o','o','l','t','i','p','s','_', - 'c','l','a','s','s','3','2',0 }; -#endif #define TOOLTIPS_CLASS WINELIB_NAME_AW(TOOLTIPS_CLASS) + +#if (_WIN32_WINNT >= 0x501) +#define BUTTON_IMAGELIST_ALIGN_LEFT 0 +#define BUTTON_IMAGELIST_ALIGN_RIGHT 1 +#define BUTTON_IMAGELIST_ALIGN_TOP 2 +#define BUTTON_IMAGELIST_ALIGN_BOTTOM 3 +#define BUTTON_IMAGELIST_ALIGN_CENTER 4 + +typedef struct +{ + HIMAGELIST himl; + RECT margin; + UINT uAlign; +} BUTTON_IMAGELIST, *PBUTTON_IMAGELIST; + +#define BCM_FIRST 0x1600 +#define BCM_GETIDEALSIZE (BCM_FIRST + 1) +#define BCM_SETIMAGELIST (BCM_FIRST + 2) +#endif /* _WIN32_WINNT */ #define INFOTIPSIZE 1024

1 0

[sginsberg] 42714: - Attempt to fix user32 build after 42706 -- user32 needs those undocumented TB_* too
by sginsberg＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: sginsberg Date: Sat Aug 15 22:11:04 2009 New Revision: 42714 URL: http://svn.reactos.org/svn/reactos?rev=42714&view=rev Log: - Attempt to fix user32 build after 42706 -- user32 needs those undocumented TB_* too Modified: trunk/reactos/include/psdk/commctrl.h Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re… ============================================================================== --- trunk/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/commctrl.h [iso-8859-1] Sat Aug 15 22:11:04 2009 @@ -1231,14 +1231,14 @@ #define TB_GETSTRING WINELIB_NAME_AW(TB_GETSTRING) /* undocumented messages in Toolbar */ -#ifdef __WINESRC__ +/* #ifdef __WINESRC__ */ #define TB_UNKWN45D (WM_USER+93) #define TB_SETHOTITEM2 (WM_USER+94) #define TB_SETLISTGAP (WM_USER+96) #define TB_GETIMAGELISTCOUNT (WM_USER+98) #define TB_GETIDEALSIZE (WM_USER+99) #define TB_UNKWN464 (WM_USER+100) -#endif +/* #endif */ #define TB_GETMETRICS (WM_USER+101) #define TB_SETMETRICS (WM_USER+102)

1 0

[mkupfer] 42713: German translation of ReactOS Applications Manager
by mkupfer＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: mkupfer Date: Sat Aug 15 21:42:57 2009 New Revision: 42713 URL: http://svn.reactos.org/svn/reactos?rev=42713&view=rev Log: German translation of ReactOS Applications Manager Added: trunk/reactos/base/applications/rapps/lang/de-DE.rc (with props) Modified: trunk/reactos/base/applications/rapps/rsrc.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Added: trunk/reactos/base/applications/rapps/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/de-DE.rc (added) +++ trunk/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] Sat Aug 15 21:42:57 2009 @@ -1,0 +1,167 @@ +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN + +IDR_MAINMENU MENU +BEGIN + POPUP "&Datei" + BEGIN + MENUITEM "&Einstellungen", ID_SETTINGS, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Beenden", ID_EXIT + END + POPUP "&Programme" + BEGIN + MENUITEM "&Installieren", ID_INSTALL + MENUITEM "&Deinstallieren",ID_UNINSTALL + MENUITEM "&Ändern", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Aktualisieren", ID_REFRESH + END + POPUP "Hilfe" + BEGIN + MENUITEM "Hilfe", ID_HELP, GRAYED + MENUITEM "Über", ID_ABOUT + END +END + +IDR_LINKMENU MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Öffne den Link in einem Browser", ID_OPEN_LINK + MENUITEM "&Kopiere den Link in die Zwischenablage", ID_COPY_LINK + END +END + +IDR_APPLICATIONMENU MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM "&Installieren", ID_INSTALL + MENUITEM "&Deinstallieren", ID_UNINSTALL + MENUITEM "&Ändern", ID_MODIFY + MENUITEM SEPARATOR + MENUITEM "&Aktualisieren", ID_REFRESH + END +END + +IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE 0, 0, 386, 231 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Einstellungen" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "OK", IDOK, 255, 212, 60, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 320, 212, 60, 14 +END + +IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE 0, 0, 386, 231 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Herunterladen und installieren" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "OK", IDOK, 255, 212, 60, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 320, 212, 60, 14 +END + +IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +CAPTION "Herunterladen..." +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 + LTEXT "", IDC_DOWNLOAD_STATUS, 10, 30, 200, 10, SS_CENTER + PUSHBUTTON "Abbrechen", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP +END + +IDD_ABOUT_DIALOG DIALOGEX 22, 16, 190, 66 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +CAPTION "Über" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ReactOS Applications Manager\nCopyright (C) 2009\nby Dmitry Chapyshev (dmitry(a)reactos.org)", IDC_STATIC, 48, 7, 130, 39 + PUSHBUTTON "Schließen", IDOK, 133, 46, 50, 14 + ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_INSTALL "Installieren" + IDS_TOOLTIP_UNINSTALL "Deinstallieren" + IDS_TOOLTIP_MODIFY "Ändern" + IDS_TOOLTIP_SETTINGS "Einstellungen" + IDS_TOOLTIP_REFRESH "Aktualisieren" + IDS_TOOLTIP_EXIT "Beenden" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_NAME "Name" + IDS_APP_INST_VERSION "Version" + IDS_APP_DESCRIPTION "Beschreibung" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INFO_VERSION "\nVersion: " + IDS_INFO_DESCRIPTION "\nBeschreibung: " + IDS_INFO_PUBLISHER "\nPublisher: " + IDS_INFO_HELPLINK "\nHilfe-Link: " + IDS_INFO_HELPPHONE "\nHilfe-Telefonnr.: " + IDS_INFO_README "\nReadme: " + IDS_INFO_REGOWNER "\nregistrierter Eigentümer: " + IDS_INFO_PRODUCTID "\nProdukt-ID: " + IDS_INFO_CONTACT "\nKontaktt: " + IDS_INFO_UPDATEINFO "\nUpdate Information: " + IDS_INFO_INFOABOUT "\nInformation über: " + IDS_INFO_COMMENTS "\nKommentare: " + IDS_INFO_INSTLOCATION "\nInstallationsort: " + IDS_INFO_INSTALLSRC "\nInstallationsquelle: " + IDS_INFO_UNINSTALLSTR "\nDeinstallationsstring: " + IDS_INFO_MODIFYPATH "\nÄnderungspfad: " + IDS_INFO_INSTALLDATE "\nInstallationsdatum: " +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_AINFO_VERSION "\nVersion: " + IDS_AINFO_DESCRIPTION "\nBeschreibung: " + IDS_AINFO_SIZE "\nGröße: " + IDS_AINFO_URLSITE "\nHomepage: " + IDS_AINFO_LICENCE "\nLizenz: " +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CAT_AUDIO "Audio" + IDS_CAT_DEVEL "Entwicklung" + IDS_CAT_DRIVERS "Treiber" + IDS_CAT_EDU "Edutainment" + IDS_CAT_ENGINEER "Technische Anwendungen" + IDS_CAT_FINANCE "Finanzen" + IDS_CAT_GAMES "Spiele & Spaß" + IDS_CAT_GRAPHICS "Grafik" + IDS_CAT_INTERNET "Internet & Netzwerk" + IDS_CAT_LIBS "Bibliotheken" + IDS_CAT_OFFICE "Büro" + IDS_CAT_OTHER "Sonstiges" + IDS_CAT_SCIENCE "Wissenschaft" + IDS_CAT_TOOLS "Werkzeuge" + IDS_CAT_VIDEO "Video" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "ReactOS Anwendungsmanager" + IDS_SEARCH_TEXT "Suche..." + IDS_INSTALL "Installieren" + IDS_UNINSTALL "Deinstallieren" + IDS_MODIFY "Ändern" + IDS_APPS_COUNT "Anzahl der Anwendungen: %d" + IDS_WELCOME_TITLE "Willkommen zum ReactOS Anwendungsmanager!\n\n" + IDS_WELCOME_TEXT "Wählen Sie links eine Kategorie und dann eine Anwendung um sie zu installieren oder zu deinstallieren.\nReactOS Webseite: " + IDS_WELCOME_URL "http://www.reactos.org" + IDS_INSTALLED "Installiert" + IDS_AVAILABLEFORINST "Zur Installation verfügbar" + IDS_UPDATES "Updates" + IDS_APPLICATIONS "Anwendungen" + IDS_DOWNLOAD_FOLDER "Downloads" +END Propchange: trunk/reactos/base/applications/rapps/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/rapps/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/rs… ============================================================================== --- trunk/reactos/base/applications/rapps/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rsrc.rc [iso-8859-1] Sat Aug 15 21:42:57 2009 @@ -1,4 +1,5 @@ #include "lang/en-US.rc" +#include "lang/de-DE.rc" #include "lang/no-NO.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] Sat Aug 15 21:42:57 2009 @@ -262,7 +262,7 @@ BEGIN IDS_SHORT_CMD "Eingabeaufforderung.lnk" IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" - IDS_SHORT_DOWNLOADER "ReactOS Applications Manager.lnk" + IDS_SHORT_DOWNLOADER "ReactOS Anwendungsmanager.lnk" IDS_SHORT_SERVICE "Dienste-Manager.lnk" IDS_SHORT_DEVICE "Geräte-Manager.lnk" IDS_SHORT_MPLAY32 "Multimedia Player.lnk"

1 0

[fireball] 42712: - Implement GetSystemPaletteEntries.
by fireball＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: fireball Date: Sat Aug 15 20:25:13 2009 New Revision: 42712 URL: http://svn.reactos.org/svn/reactos?rev=42712&view=rev Log: - Implement GetSystemPaletteEntries. Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c branches/arwinss/reactos/subsystems/win32/win32k/gdi/enum.c branches/arwinss/reactos/subsystems/win32/win32k/gre/palobj.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Sat Aug 15 20:25:13 2009 @@ -363,10 +363,9 @@ } UINT CDECL RosDrv_GetSystemPaletteEntries( NTDRV_PDEVICE *physDev, UINT start, UINT count, - LPPALETTEENTRY entries ) -{ - UNIMPLEMENTED; - return 0; + LPPALETTEENTRY entries ) +{ + return RosGdiGetSystemPaletteEntries(physDev->hKernelDC, start, count, entries); } BOOL CDECL RosDrv_GetTextExtentExPoint( NTDRV_PDEVICE *physDev, LPCWSTR str, INT count, Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/enum.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/enum.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/enum.c [iso-8859-1] Sat Aug 15 20:25:13 2009 @@ -86,11 +86,25 @@ return 0; } -UINT APIENTRY RosGdiGetSystemPaletteEntries( HDC physDev, UINT start, UINT count, - LPPALETTEENTRY entries ) +UINT APIENTRY RosGdiGetSystemPaletteEntries( HDC hDC, UINT uStart, UINT uCount, + LPPALETTEENTRY lpEntries ) { - UNIMPLEMENTED; - return 0; + UINT uRes = 0; + NTSTATUS Status = STATUS_SUCCESS; + + /* Call GRE function fully wrapped into SEH */ + _SEH2_TRY + { + uRes = GreGetSystemPaletteEntries(hDC, uStart, uCount, lpEntries); + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) return 0; + + return uRes; } BOOL APIENTRY RosGdiGetTextExtentExPoint( HDC physDev, LPCWSTR str, INT count, Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/palobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/palobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/palobj.c [iso-8859-1] Sat Aug 15 20:25:13 2009 @@ -231,11 +231,7 @@ UINT EntriesSize = 0; UINT Ret = 0; - if (Entries == 0) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return 0; - } + if (!Entries) return 0; if (pe != NULL) { @@ -243,16 +239,12 @@ if (Entries != EntriesSize / sizeof(pe[0])) { /* Integer overflow! */ - SetLastWin32Error(ERROR_INVALID_PARAMETER); return 0; } } if (!(dc = DC_Lock(hDC))) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); return 0; - } palGDI = PALETTE_LockPalette(dc->hPalette); if (palGDI != NULL)

1 0

[fireball] 42711: - Implement system palette based on palette.c from r41760 (pre-Timo rewrite, to be compatible with other existing stuff).
by fireball＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: fireball Date: Sat Aug 15 20:10:34 2009 New Revision: 42711 URL: http://svn.reactos.org/svn/reactos?rev=42711&view=rev Log: - Implement system palette based on palette.c from r41760 (pre-Timo rewrite, to be compatible with other existing stuff). Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c branches/arwinss/reactos/subsystems/win32/win32k/gre/palobj.c branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h branches/arwinss/reactos/subsystems/win32/win32k/include/palobj.h branches/arwinss/reactos/subsystems/win32/win32k/main/init.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Sat Aug 15 20:10:34 2009 @@ -143,6 +143,9 @@ /* Create an empty combined clipping region */ pNewDC->CombinedClip = EngCreateClip(); + + /* Set default palette */ + pNewDC->hPalette = hSystemPal; /* Give handle to the caller */ *pdev = hNewDC; Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/palobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/palobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/palobj.c [iso-8859-1] Sat Aug 15 20:10:34 2009 @@ -14,6 +14,84 @@ #define NDEBUG #include <debug.h> +/* GLOBALS *******************************************************************/ +HGDIOBJ hSystemPal; + +#define NB_RESERVED_COLORS 20 /* number of fixed colors in system palette */ +#define PC_SYS_USED 0x80 /* palentry is used (both system and logical) */ + +const PALETTEENTRY COLOR_sysPalTemplate[NB_RESERVED_COLORS] = +{ + // first 10 entries in the system palette + // red green blue flags + { 0x00, 0x00, 0x00, PC_SYS_USED }, + { 0x80, 0x00, 0x00, PC_SYS_USED }, + { 0x00, 0x80, 0x00, PC_SYS_USED }, + { 0x80, 0x80, 0x00, PC_SYS_USED }, + { 0x00, 0x00, 0x80, PC_SYS_USED }, + { 0x80, 0x00, 0x80, PC_SYS_USED }, + { 0x00, 0x80, 0x80, PC_SYS_USED }, + { 0xc0, 0xc0, 0xc0, PC_SYS_USED }, + { 0xc0, 0xdc, 0xc0, PC_SYS_USED }, + { 0xa6, 0xca, 0xf0, PC_SYS_USED }, + + // ... c_min/2 dynamic colorcells + // ... gap (for sparse palettes) + // ... c_min/2 dynamic colorcells + + { 0xff, 0xfb, 0xf0, PC_SYS_USED }, + { 0xa0, 0xa0, 0xa4, PC_SYS_USED }, + { 0x80, 0x80, 0x80, PC_SYS_USED }, + { 0xff, 0x00, 0x00, PC_SYS_USED }, + { 0x00, 0xff, 0x00, PC_SYS_USED }, + { 0xff, 0xff, 0x00, PC_SYS_USED }, + { 0x00, 0x00, 0xff, PC_SYS_USED }, + { 0xff, 0x00, 0xff, PC_SYS_USED }, + { 0x00, 0xff, 0xff, PC_SYS_USED }, + { 0xff, 0xff, 0xff, PC_SYS_USED } // last 10 +}; + +const PALETTEENTRY* FASTCALL COLOR_GetSystemPaletteTemplate(void) +{ + return (const PALETTEENTRY*)&COLOR_sysPalTemplate; +} + +/* PRIVATE FUNCTIONS *********************************************************/ +/* + * @implemented + */ +HPALETTE APIENTRY +GrepCreatePalette( IN LPLOGPALETTE pLogPal, IN UINT cEntries ) +{ + PPALETTE PalGDI; + HPALETTE NewPalette; + + pLogPal->palNumEntries = cEntries; + NewPalette = PALETTE_AllocPalette( PAL_INDEXED, + cEntries, + (PULONG)pLogPal->palPalEntry, + 0, 0, 0); + + if (NewPalette == NULL) + { + return NULL; + } + + PalGDI = (PPALETTE) PALETTE_LockPalette(NewPalette); + if (PalGDI != NULL) + { + PALETTE_ValidateFlags(PalGDI->IndexedColors, PalGDI->NumColors); + //PalGDI->logicalToSystem = NULL; + PALETTE_UnlockPalette(PalGDI); + } + else + { + /* FIXME - Handle PalGDI == NULL!!!! */ + DPRINT1("Warning: PalGDI is NULL!\n"); + } + return NewPalette; +} + /* PUBLIC FUNCTIONS **********************************************************/ HPALETTE @@ -105,6 +183,108 @@ return NewPalette; } +// Create the system palette +VOID APIENTRY +PALETTE_Init(VOID) +{ + int i; + PLOGPALETTE palPtr; + + const PALETTEENTRY* __sysPalTemplate = (const PALETTEENTRY*)COLOR_GetSystemPaletteTemplate(); + + // create default palette (20 system colors) + palPtr = ExAllocatePoolWithTag(PagedPool, + sizeof(LOGPALETTE) + + (NB_RESERVED_COLORS * sizeof(PALETTEENTRY)), + TAG_PALETTE); + if (!palPtr) + { + hSystemPal = 0; + return; + } + + palPtr->palVersion = 0x300; + palPtr->palNumEntries = NB_RESERVED_COLORS; + for (i=0; i<NB_RESERVED_COLORS; i++) + { + palPtr->palPalEntry[i].peRed = __sysPalTemplate[i].peRed; + palPtr->palPalEntry[i].peGreen = __sysPalTemplate[i].peGreen; + palPtr->palPalEntry[i].peBlue = __sysPalTemplate[i].peBlue; + palPtr->palPalEntry[i].peFlags = 0; + } + + hSystemPal = GrepCreatePalette(palPtr,NB_RESERVED_COLORS); + ExFreePoolWithTag(palPtr, TAG_PALETTE); + + /* Convert it to a stock object */ + GDIOBJ_ConvertToStockObj(&hSystemPal); +} + +UINT APIENTRY +GreGetSystemPaletteEntries(HDC hDC, + UINT StartIndex, + UINT Entries, + LPPALETTEENTRY pe) +{ + PPALETTE palGDI = NULL; + PDC dc = NULL; + UINT EntriesSize = 0; + UINT Ret = 0; + + if (Entries == 0) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return 0; + } + + if (pe != NULL) + { + EntriesSize = Entries * sizeof(pe[0]); + if (Entries != EntriesSize / sizeof(pe[0])) + { + /* Integer overflow! */ + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return 0; + } + } + + if (!(dc = DC_Lock(hDC))) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + + palGDI = PALETTE_LockPalette(dc->hPalette); + if (palGDI != NULL) + { + if (pe != NULL) + { + if (StartIndex >= palGDI->NumColors) + Entries = 0; + else if (Entries > palGDI->NumColors - StartIndex) + Entries = palGDI->NumColors - StartIndex; + + memcpy(pe, + palGDI->IndexedColors + StartIndex, + Entries * sizeof(pe[0])); + + Ret = Entries; + } + else + { + Ret = dc->pPDevice->GDIInfo.ulNumPalReg; + } + } + + if (palGDI != NULL) + PALETTE_UnlockPalette(palGDI); + + if (dc != NULL) + DC_Unlock(dc); + + return Ret; +} + RGBQUAD * NTAPI DIB_MapPaletteColors(PDC dc, CONST BITMAPINFO* lpbmi) @@ -114,7 +294,7 @@ USHORT *lpIndex; PPALETTE palGDI; - palGDI = NULL;//PALETTE_LockPalette(dc->hPalette); + palGDI = PALETTE_LockPalette(dc->hPalette); UNIMPLEMENTED; if (NULL == palGDI) { @@ -219,5 +399,11 @@ return hPal; } +VOID FASTCALL PALETTE_ValidateFlags(PALETTEENTRY* lpPalE, INT size) +{ + int i = 0; + for (; i<size ; i++) + lpPalE[i].peFlags = PC_SYS_USED | (lpPalE[i].peFlags & 0x07); +} /* EOF */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Sat Aug 15 20:10:34 2009 @@ -12,6 +12,7 @@ PBRUSHGDI pLineBrush; COLORREF crForegroundClr; COLORREF crBackgroundClr; + HPALETTE hPalette; /* Origins and extents */ RECT rcDcRect; /* Relative to Vport */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/palobj.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/palobj.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/palobj.h [iso-8859-1] Sat Aug 15 20:10:34 2009 @@ -17,6 +17,8 @@ //HDEV hPDev; } PALETTE, *PPALETTE; +HGDIOBJ hSystemPal; + HPALETTE FASTCALL PALETTE_AllocPalette(ULONG Mode, ULONG NumColors, ULONG *Colors, @@ -27,6 +29,12 @@ HPALETTE FASTCALL PALETTE_AllocPaletteIndexedRGB(ULONG NumColors, CONST RGBQUAD *Colors); + +UINT APIENTRY +GreGetSystemPaletteEntries(HDC hDC, + UINT StartIndex, + UINT Entries, + LPPALETTEENTRY pe); RGBQUAD * NTAPI DIB_MapPaletteColors(PDC dc, CONST BITMAPINFO* lpbmi); @@ -41,6 +49,9 @@ GDIOBJ_FreeObjByHandle(hPalette, GDI_OBJECT_TYPE_PALETTE); } +VOID FASTCALL PALETTE_ValidateFlags(PALETTEENTRY* lpPalE, INT size); +VOID APIENTRY PALETTE_Init(VOID); + #define PALETTE_LockPalette(hPalette) ((PPALETTE)GDIOBJ_LockObj((HGDIOBJ)hPalette, GDI_OBJECT_TYPE_PALETTE)) #define PALETTE_UnlockPalette(pPalette) GDIOBJ_UnlockObjByPtr((PBASEOBJECT)pPalette) Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] Sat Aug 15 20:10:34 2009 @@ -355,6 +355,7 @@ /* Create stock objects */ CreateStockBitmap(); + PALETTE_Init(); /* Init video driver implementation */ InitDcImpl();

1 0

[fireball] 42710: - Totally get rid of 16 bit global heap functions.
by fireball＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: fireball Date: Sat Aug 15 18:58:58 2009 New Revision: 42710 URL: http://svn.reactos.org/svn/reactos?rev=42710&view=rev Log: - Totally get rid of 16 bit global heap functions. Modified: branches/arwinss/reactos/dll/win32/user32/controls.h branches/arwinss/reactos/dll/win32/user32/defdlg.c branches/arwinss/reactos/dll/win32/user32/legacy.c branches/arwinss/reactos/dll/win32/user32/menu.c branches/arwinss/reactos/dll/win32/user32/static.c branches/arwinss/reactos/dll/win32/user32/uitools.c branches/arwinss/reactos/dll/win32/user32/winproc.c Modified: branches/arwinss/reactos/dll/win32/user32/controls.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/controls.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/controls.h [iso-8859-1] Sat Aug 15 18:58:58 2009 @@ -160,7 +160,7 @@ UINT yBaseUnit; INT idResult; /* EndDialog() result / default pushbutton ID */ UINT flags; /* EndDialog() called for this dialog */ - HGLOBAL16 hDialogHeap; + HGLOBAL hDialogHeap; } DIALOGINFO; #define DF_END 0x0001 Modified: branches/arwinss/reactos/dll/win32/user32/defdlg.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/defdlg.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/defdlg.c [iso-8859-1] Sat Aug 15 18:58:58 2009 @@ -237,8 +237,8 @@ /* Free dialog heap (if created) */ if (dlgInfo->hDialogHeap) { - GlobalUnlock16(dlgInfo->hDialogHeap); - GlobalFree16(dlgInfo->hDialogHeap); + GlobalUnlock(dlgInfo->hDialogHeap); + GlobalFree(dlgInfo->hDialogHeap); } if (dlgInfo->hUserFont) DeleteObject( dlgInfo->hUserFont ); if (dlgInfo->hMenu) DestroyMenu( dlgInfo->hMenu ); Modified: branches/arwinss/reactos/dll/win32/user32/legacy.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/legacy.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/legacy.c [iso-8859-1] Sat Aug 15 18:58:58 2009 @@ -14,81 +14,6 @@ RosUserConnectCsrss(); WINE_DEFAULT_DEBUG_CHANNEL(userlegacy); - -void WINAPI DbgBreakPoint(void); - -LPVOID -WINAPI -GlobalLock16(HGLOBAL16 h) -{ - UNIMPLEMENTED; - return NULL; -} - -BOOL16 -WINAPI -GlobalUnlock16(HGLOBAL16 h) -{ - UNIMPLEMENTED; - return FALSE; -} - -HGLOBAL16 -WINAPI -GlobalAlloc16(UINT16 u, DWORD d) -{ - UNIMPLEMENTED; - DbgBreakPoint(); - return 0; -} - -HGLOBAL16 -WINAPI -GlobalFree16(HGLOBAL16 h) -{ - UNIMPLEMENTED; - return 0; -} - -DWORD -WINAPI -GlobalSize16(HGLOBAL16 h) -{ - UNIMPLEMENTED; - return 0; -} - -SEGPTR -WINAPI -LocalLock16(HLOCAL16 h) -{ - UNIMPLEMENTED; - return 0; -} - -BOOL16 -WINAPI -LocalUnlock16(HLOCAL16 h) -{ - UNIMPLEMENTED; - return FALSE; -} - -LPVOID -WINAPI -LockResource16(HGLOBAL16 h) -{ - UNIMPLEMENTED; - return NULL; -} - -BOOL16 -WINAPI -FreeResource16(HGLOBAL16 h) -{ - UNIMPLEMENTED; - return FALSE; -} VOID WINAPI Modified: branches/arwinss/reactos/dll/win32/user32/menu.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/menu.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/menu.c [iso-8859-1] Sat Aug 15 18:58:58 2009 @@ -5351,13 +5351,13 @@ INT WINAPI TranslateAcceleratorA( HWND hWnd, HACCEL hAccel, LPMSG msg ) { /* YES, Accel16! */ - LPACCEL16 lpAccelTbl; + LPACCEL lpAccelTbl; int i; WPARAM wParam; if (!hWnd || !msg) return 0; - if (!hAccel || !(lpAccelTbl = (LPACCEL16) LockResource16(LOWORD(hAccel)))) + if (!hAccel || !(lpAccelTbl = (LPACCEL) LockResource(hAccel))) { WARN_(accel)("invalid accel handle=%p\n", hAccel); return 0; Modified: branches/arwinss/reactos/dll/win32/user32/static.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/static.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/static.c [iso-8859-1] Sat Aug 15 18:58:58 2009 @@ -151,7 +151,7 @@ CURSORICONINFO * info; if ((style & SS_TYPEMASK) != SS_ICON) return 0; - info = hicon ? GlobalLock16(HICON_16(hicon)) : NULL; + info = hicon ? GlobalLock(hicon) : NULL; if (hicon && !info) { WARN("hicon != 0, but info == 0\n"); return 0; @@ -174,7 +174,7 @@ SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); } } - if (info) GlobalUnlock16(HICON_16(hicon)); + if (info) GlobalUnlock(hicon); return prevIcon; } @@ -803,7 +803,7 @@ GetClientRect( hwnd, &rc ); hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); hIcon = (HICON)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET ); - info = hIcon ? GlobalLock16(HICON_16(hIcon)) : NULL; + info = hIcon ? GlobalLock(hIcon) : NULL; if (!hIcon || !info) { FillRect(hdc, &rc, hbrush); @@ -823,7 +823,7 @@ DrawIconEx( hdc, iconRect.left, iconRect.top, hIcon, iconRect.right - iconRect.left, iconRect.bottom - iconRect.top, 0, NULL, DI_NORMAL ); } - if (info) GlobalUnlock16(HICON_16(hIcon)); + if (info) GlobalUnlock(hIcon); } static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) Modified: branches/arwinss/reactos/dll/win32/user32/uitools.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/uitools.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/uitools.c [iso-8859-1] Sat Aug 15 18:58:58 2009 @@ -1612,11 +1612,11 @@ break; case DST_ICON: - ici = GlobalLock16((HGLOBAL16)lp); + ici = GlobalLock((HGLOBAL)lp); if(!ici) return FALSE; s.cx = ici->nWidth; s.cy = ici->nHeight; - GlobalUnlock16((HGLOBAL16)lp); + GlobalUnlock((HGLOBAL)lp); break; case DST_BITMAP: Modified: branches/arwinss/reactos/dll/win32/user32/winproc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/winproc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/winproc.c [iso-8859-1] Sat Aug 15 18:58:58 2009 @@ -739,7 +739,7 @@ } - +#if 0 static UINT_PTR convert_handle_16_to_32(HANDLE16 src, unsigned int flags) { HANDLE dst; @@ -773,6 +773,7 @@ return dst; } +#endif /**********************************************************************

1 0

[sginsberg] 42709: - Convert tditest to PSEH instead of a broken MSVC SEH attempt - Teach man how to use "subroutines"
by sginsberg＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: sginsberg Date: Sat Aug 15 18:40:51 2009 New Revision: 42709 URL: http://svn.reactos.org/svn/reactos?rev=42709&view=rev Log: - Convert tditest to PSEH instead of a broken MSVC SEH attempt - Teach man how to use "subroutines" Modified: trunk/rosapps/applications/net/tditest/tditest/tditest.c trunk/rosapps/applications/sysutils/man/man.c Modified: trunk/rosapps/applications/net/tditest/tditest/tditest.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/tditest/t… ============================================================================== --- trunk/rosapps/applications/net/tditest/tditest/tditest.c [iso-8859-1] (original) +++ trunk/rosapps/applications/net/tditest/tditest/tditest.c [iso-8859-1] Sat Aug 15 18:40:51 2009 @@ -10,6 +10,7 @@ * 26-Nov-2003 Vizzini Updated to run properly on Win2ksp4 */ #include <tditest.h> +#include <pseh/pseh2.h> #if DBG @@ -544,22 +545,18 @@ return STATUS_INSUFFICIENT_RESOURCES; } -#ifdef _MSC_VER - try - { -#endif - MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); -#ifdef _MSC_VER - } - except(EXCEPTION_EXECUTE_HANDLER) - { - TDI_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); - IoFreeMdl(Mdl); - IoFreeIrp(Irp); - ExFreePool(ConnectInfo); - return STATUS_UNSUCCESSFUL; - } -#endif + _SEH2_TRY + { + MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + TDI_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); + IoFreeMdl(Mdl); + IoFreeIrp(Irp); + ExFreePool(ConnectInfo); + return STATUS_UNSUCCESSFUL; + } _SEH2_END; TdiBuildSendDatagram( Irp, /* I/O Request Packet */ @@ -675,23 +672,19 @@ return STATUS_INSUFFICIENT_RESOURCES; } -#ifdef _MSC_VER - try - { -#endif - MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); -#ifdef _MSC_VER - } - except (EXCEPTION_EXECUTE_HANDLER) - { - TDI_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); - IoFreeMdl(Mdl); - IoFreeIrp(Irp); - ExFreePool(MdlBuffer); - ExFreePool(ReceiveInfo); - return STATUS_INSUFFICIENT_RESOURCES; - } -#endif + _SEH2_TRY + { + MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + TDI_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); + IoFreeMdl(Mdl); + IoFreeIrp(Irp); + ExFreePool(MdlBuffer); + ExFreePool(ReceiveInfo); + return STATUS_INSUFFICIENT_RESOURCES; + } _SEH2_END; TdiBuildReceiveDatagram( Irp, /* I/O Request Packet */ Modified: trunk/rosapps/applications/sysutils/man/man.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/man/… ============================================================================== --- trunk/rosapps/applications/sysutils/man/man.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/man/man.c [iso-8859-1] Sat Aug 15 18:40:51 2009 @@ -119,48 +119,51 @@ return element; } -int -AnalyzeFile() -{ - char *cur_string=(char*)malloc(sizeof(char)*MAXLINE); +void sh_outp(char *cur_string) +{ + int symbol; + putchar('\n'); + putchar('\n'); + for(symbol=3;putchar(cur_string[symbol]); symbol++); +} + +void th_outp(char *cur_string, char *THtag) +{ + int symbol; + putchar('\n'); + putchar('\n'); + putchar('\t'); + putchar('\t'); + SetCl(ITALIC); + for(symbol=3;putchar(THtag[symbol]); symbol++); + putchar('\n'); + SetCl(NORMAL); +} + +void text_outp(char *cur_string) +{ + char TagFlag=0; int symbol=0; - char *THtag=(char*)malloc(sizeof(char)*MAXLINE); - - - void sh_outp(void) - { - putchar('\n'); - putchar('\n'); - for(symbol=3;putchar(cur_string[symbol]); symbol++); - } - - void th_outp(void) - { - putchar('\n'); - putchar('\n'); - putchar('\t'); - putchar('\t'); - SetCl(ITALIC); - for(symbol=3;putchar(THtag[symbol]); symbol++); - putchar('\n'); - SetCl(NORMAL); - } - - void text_outp(void) - { - char TagFlag=0; - symbol=0; - - if(cur_string[0]=='.') - while(cur_string[symbol]!=' ') - symbol++; - - if(symbol) TagFlag=1; - - for(;cur_string[symbol]!='\n'; symbol++) + + if(cur_string[0]=='.') + while(cur_string[symbol]!=' ') + symbol++; + + if(symbol) TagFlag=1; + + for(;cur_string[symbol]!='\n'; symbol++) putchar(cur_string[symbol]); putchar(' '); - } +} + +int +AnalyzeFile() +{ + char *cur_string=(char*)malloc(sizeof(char)*MAXLINE); + char *THtag=(char*)malloc(sizeof(char)*MAXLINE); + + + while(fgets(cur_string,MAXLINE,manfile)) @@ -169,7 +172,7 @@ (cur_string[2]=='H')) // .SH tag { SetCl(BOLD); - sh_outp(); + sh_outp(cur_string); SetCl(NORMAL); } else @@ -177,7 +180,7 @@ (cur_string[2]==' ')) // .I tag { SetCl(ITALIC); - text_outp(); + text_outp(cur_string); SetCl(NORMAL); } else @@ -195,7 +198,7 @@ (cur_string[2]==' ')) // .B tag { SetCl(BOLD); - text_outp(); + text_outp(cur_string); SetCl(NORMAL); } else @@ -206,8 +209,8 @@ putchar(' '); } - else text_outp(); // print plane text - th_outp(); + else text_outp(cur_string); // print plane text + th_outp(cur_string, THtag); /* END of TAGs processing */ return 0; }

1 0

[fireball] 42708: - Fix a typo.
by fireball＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: fireball Date: Sat Aug 15 18:32:20 2009 New Revision: 42708 URL: http://svn.reactos.org/svn/reactos?rev=42708&view=rev Log: - Fix a typo. Modified: trunk/rostests/dibtests/icontest/icontest.c Modified: trunk/rostests/dibtests/icontest/icontest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/icontest/icontes… ============================================================================== --- trunk/rostests/dibtests/icontest/icontest.c [iso-8859-1] (original) +++ trunk/rostests/dibtests/icontest/icontest.c [iso-8859-1] Sat Aug 15 18:32:20 2009 @@ -9,7 +9,7 @@ const char titleMask[] = "Mask(AND image)"; const char titleXor[] = "XOR(color image)"; const char file[] = "Icon from file:"; -const char res[] = "Icon from Resorce:"; +const char res[] = "Icon from Resource:"; const char cursor[] = "Current Cursor:"; const char cursormask[] = "Cursor Mask Bitmap"; const char cursorcolor[] = "Cursor Color Bitmap";

1 0

[sginsberg] 42707: - gdi32: Don't use typeof -- MSVC does not implement it. Also fix an unitialized variable warning spotted by MSVC. - user32: Properly stub out 16-bit code -- fixes several warnings (more remain) - winent/winex11: Fix some const warnings in MSVC, and use redefine for WINVER and _WIN32_WINNT
by sginsberg＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: sginsberg Date: Sat Aug 15 18:23:21 2009 New Revision: 42707 URL: http://svn.reactos.org/svn/reactos?rev=42707&view=rev Log: - gdi32: Don't use typeof -- MSVC does not implement it. Also fix an unitialized variable warning spotted by MSVC. - user32: Properly stub out 16-bit code -- fixes several warnings (more remain) - winent/winex11: Fix some const warnings in MSVC, and use redefine for WINVER and _WIN32_WINNT Modified: branches/arwinss/reactos/dll/win32/gdi32/freetype.c branches/arwinss/reactos/dll/win32/gdi32/gdi32.rbuild branches/arwinss/reactos/dll/win32/gdi32/regglue.c branches/arwinss/reactos/dll/win32/user32/driver.c branches/arwinss/reactos/dll/win32/user32/edit.c branches/arwinss/reactos/dll/win32/user32/spy.c branches/arwinss/reactos/dll/win32/user32/user_main.c branches/arwinss/reactos/dll/win32/winent.drv/font.c branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rbuild Modified: branches/arwinss/reactos/dll/win32/gdi32/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/freetype.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/freetype.c [iso-8859-1] Sat Aug 15 18:23:21 2009 @@ -160,32 +160,31 @@ static void *ft_handle = NULL; -#define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL // FIXME: MSVC does not implement typeof -MAKE_FUNCPTR(FT_Vector_Unit); -MAKE_FUNCPTR(FT_Done_Face); -MAKE_FUNCPTR(FT_Get_Char_Index); -MAKE_FUNCPTR(FT_Get_Module); -MAKE_FUNCPTR(FT_Get_Sfnt_Name); -MAKE_FUNCPTR(FT_Get_Sfnt_Name_Count); -MAKE_FUNCPTR(FT_Get_Sfnt_Table); -MAKE_FUNCPTR(FT_Init_FreeType); -MAKE_FUNCPTR(FT_Load_Glyph); -MAKE_FUNCPTR(FT_Matrix_Multiply); +static void (*pFT_Vector_Unit)(FT_Vector*, FT_Angle) = NULL; +static FT_Error (*pFT_Done_Face)(FT_Face) = NULL; +static FT_UInt (*pFT_Get_Char_Index)(FT_Face, FT_ULong) = NULL; +static FT_Module (*pFT_Get_Module)(FT_Library, const char*) = NULL; +static FT_Error (*pFT_Get_Sfnt_Name)(FT_Face, FT_UInt, FT_SfntName*) = NULL; +static FT_UInt (*pFT_Get_Sfnt_Name_Count)(FT_Face) = NULL; +static void* (*pFT_Get_Sfnt_Table)(FT_Face, FT_Sfnt_Tag) = NULL; +static FT_Error (*pFT_Init_FreeType)(FT_Library*) = NULL; +static FT_Error (*pFT_Load_Glyph)(FT_Face, FT_UInt, FT_Int32) = NULL; +static void (*pFT_Matrix_Multiply)(const FT_Matrix*, FT_Matrix*) = NULL; #ifdef FT_MULFIX_INLINED #define pFT_MulFix FT_MULFIX_INLINED #else -MAKE_FUNCPTR(FT_MulFix); +static FT_Long (*pFT_MulFix)(FT_Long, FT_Long) = NULL; #endif -MAKE_FUNCPTR(FT_New_Face); -MAKE_FUNCPTR(FT_New_Memory_Face); -MAKE_FUNCPTR(FT_Outline_Get_Bitmap); -MAKE_FUNCPTR(FT_Outline_Transform); -MAKE_FUNCPTR(FT_Outline_Translate); -MAKE_FUNCPTR(FT_Select_Charmap); -MAKE_FUNCPTR(FT_Set_Charmap); -MAKE_FUNCPTR(FT_Set_Pixel_Sizes); -MAKE_FUNCPTR(FT_Vector_Transform); -MAKE_FUNCPTR(FT_Render_Glyph); +static FT_Error (*pFT_New_Face)(FT_Library, const char*, FT_Long, FT_Face*) = NULL; +static FT_Error (*pFT_New_Memory_Face)(FT_Library, const FT_Byte*, FT_Long, FT_Long, FT_Face*) = NULL; +static FT_Error (*pFT_Outline_Get_Bitmap)(FT_Library, FT_Outline*, const FT_Bitmap*) = NULL; +static void (*pFT_Outline_Transform)(const FT_Outline*, const FT_Matrix*) = NULL; +static void (*pFT_Outline_Translate)(const FT_Outline*, FT_Pos, FT_Pos) = NULL; +static FT_Error (*pFT_Select_Charmap)(FT_Face, FT_Encoding) = NULL; +static FT_Error (*pFT_Set_Charmap)(FT_Face, FT_CharMap) = NULL; +static FT_Error (*pFT_Set_Pixel_Sizes)(FT_Face, FT_UInt, FT_UInt) = NULL; +static void (*pFT_Vector_Transform)(FT_Vector*, const FT_Matrix*) = NULL; +static FT_Error (*pFT_Render_Glyph)(FT_GlyphSlot, FT_Render_Mode) = NULL; static void (*pFT_Library_Version)(FT_Library,FT_Int*,FT_Int*,FT_Int*); static FT_Error (*pFT_Load_Sfnt_Table)(FT_Face,FT_ULong,FT_Long,FT_Byte*,FT_ULong*); static FT_ULong (*pFT_Get_First_Char)(FT_Face,FT_UInt*); @@ -195,11 +194,21 @@ static FT_Error (*pFT_Library_SetLcdFilter)(FT_Library, FT_LcdFilter); #endif #ifdef HAVE_FREETYPE_FTWINFNT_H -MAKE_FUNCPTR(FT_Get_WinFNT_Header); +static FT_Error (*pFT_Get_WinFNT_Header)(FT_Face, FT_WinFNT_HeaderRec*) = NULL; #endif #ifdef SONAME_LIBFONTCONFIG #include <fontconfig/fontconfig.h> +static = NULL; +static = NULL; +static = NULL; +static = NULL; +static = NULL; +static = NULL; +static = NULL; +static = NULL; +static = NULL; +static = NULL; MAKE_FUNCPTR(FcConfigGetCurrent); MAKE_FUNCPTR(FcFontList); MAKE_FUNCPTR(FcFontSetDestroy); @@ -212,8 +221,6 @@ MAKE_FUNCPTR(FcPatternGetBool); MAKE_FUNCPTR(FcPatternGetString); #endif - -#undef MAKE_FUNCPTR #ifndef FT_MAKE_TAG #define FT_MAKE_TAG( ch0, ch1, ch2, ch3 ) \ Modified: branches/arwinss/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] Sat Aug 15 18:23:21 2009 @@ -1,4 +1,4 @@ -<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes" allowwarnings="true"> +<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes"> <importlibrary definition="gdi32.spec" /> <include base="gdi32">include</include> <include base="ReactOS">include/reactos/wine</include> Modified: branches/arwinss/reactos/dll/win32/gdi32/regglue.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/regglue.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/regglue.c [iso-8859-1] Sat Aug 15 18:23:21 2009 @@ -1338,7 +1338,7 @@ static const int info_size = offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data ); TRACE("(%p,%s,%p,%p,%p,%p=%d)\n", - hkey, debugstr_w(name), reserved, type, data, count, + hkeyorg, debugstr_w(name), reserved, type, data, count, (count && data) ? *count : 0 ); if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER; Modified: branches/arwinss/reactos/dll/win32/user32/driver.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/driver.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/driver.c [iso-8859-1] Sat Aug 15 18:23:21 2009 @@ -36,7 +36,9 @@ static const USER_DRIVER *load_driver(void) { char buffer[MAX_PATH], libname[32], *name, *next; +#if 0 HKEY hkey; +#endif void *ptr; HMODULE graphics_driver; USER_DRIVER *driver, *prev; Modified: branches/arwinss/reactos/dll/win32/user32/edit.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/edit.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/edit.c [iso-8859-1] Sat Aug 15 18:23:21 2009 @@ -1133,8 +1133,6 @@ */ static void EDIT_LockBuffer(EDITSTATE *es) { - HINSTANCE16 hInstance = GetWindowLongPtrW( es->hwndSelf, GWLP_HINSTANCE ); - if (!es->text) { CHAR *textA = NULL; UINT countA = 0; @@ -1217,7 +1215,9 @@ CHAR *textA = NULL; UINT countA = 0; UINT countW = get_text_length(es) + 1; - HANDLE16 oldDS = 0; +#ifndef __REACTOS__ + HANDLE16 oldDS = 0; +#endif if(es->hloc32A) { @@ -3037,29 +3037,6 @@ /********************************************************************* * - * EM_SETTABSTOPS16 - * - */ -static BOOL EDIT_EM_SetTabStops16(EDITSTATE *es, INT count, const INT16 *tabs) -{ - if (!(es->style & ES_MULTILINE)) - return FALSE; - HeapFree(GetProcessHeap(), 0, es->tabs); - es->tabs_count = count; - if (!count) - es->tabs = NULL; - else { - INT i; - es->tabs = HeapAlloc(GetProcessHeap(), 0, count * sizeof(INT)); - for (i = 0 ; i < count ; i++) - es->tabs[i] = *tabs++; - } - return TRUE; -} - - -/********************************************************************* - * * EM_SETWORDBREAKPROC * */ @@ -3071,25 +3048,6 @@ es->word_break_proc = wbp; es->word_break_proc16 = NULL; - if ((es->style & ES_MULTILINE) && !(es->style & ES_AUTOHSCROLL)) { - EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); - EDIT_UpdateText(es, NULL, TRUE); - } -} - - -/********************************************************************* - * - * EM_SETWORDBREAKPROC16 - * - */ -static void EDIT_EM_SetWordBreakProc16(EDITSTATE *es, EDITWORDBREAKPROC16 wbp) -{ - if (es->word_break_proc16 == wbp) - return; - - es->word_break_proc = NULL; - es->word_break_proc16 = wbp; if ((es->style & ES_MULTILINE) && !(es->style & ES_AUTOHSCROLL)) { EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); EDIT_UpdateText(es, NULL, TRUE); @@ -4378,7 +4336,7 @@ * * The Following code is to handle inline editing from IMEs */ - +#if 0 static void EDIT_GetCompositionStr(HIMC hIMC, LPARAM CompFlag, EDITSTATE *es) { LONG buflen; @@ -4484,6 +4442,7 @@ HeapFree(GetProcessHeap(),0,lpResultStr); } +#endif static void EDIT_ImeComposition(HWND hwnd, LPARAM CompFlag, EDITSTATE *es) { Modified: branches/arwinss/reactos/dll/win32/user32/spy.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/spy.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/spy.c [iso-8859-1] Sat Aug 15 18:23:21 2009 @@ -2658,10 +2658,14 @@ { int i; UINT j; +#if 0 char buffer[1024]; +#endif const SPY_NOTIFY *p; const USER_MSG *q; +#if 0 HKEY hkey; +#endif if (!TRACE_ON(message)) return TRUE; Modified: branches/arwinss/reactos/dll/win32/user32/user_main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/user_main.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/user_main.c [iso-8859-1] Sat Aug 15 18:23:21 2009 @@ -155,7 +155,9 @@ static const WCHAR *get_default_desktop(void) { static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',0}; +#if 0 static const WCHAR desktopW[] = {'D','e','s','k','t','o','p',0}; +#endif static const WCHAR explorerW[] = {'\\','E','x','p','l','o','r','e','r',0}; static const WCHAR app_defaultsW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\', @@ -164,7 +166,9 @@ WCHAR *p, *appname = buffer; const WCHAR *ret = defaultW; DWORD len; +#if 0 HKEY tmpkey, appkey; +#endif len = (GetModuleFileNameW( 0, buffer, MAX_PATH )); if (!len || len >= MAX_PATH) return ret; @@ -264,10 +268,10 @@ */ static BOOL process_attach(void) { +#ifndef __REACTOS__ HINSTANCE16 instance; /* Create USER heap */ -#ifndef __REACTOS__ if ((instance = LoadLibrary16( "USER.EXE" )) >= 32) USER_HeapSel = instance | 7; else { Modified: branches/arwinss/reactos/dll/win32/winent.drv/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] Sat Aug 15 18:23:21 2009 @@ -633,7 +633,7 @@ pen = CreatePen(PS_NULL, 0, 0); oldPen = SelectObject(physDev->hUserDC, pen); - RosGdiRectangle(physDev->hKernelDC, lprect); + RosGdiRectangle(physDev->hKernelDC, (RECT*)lprect); DeleteObject(SelectObject(physDev->hUserDC, oldBrush)); DeleteObject(SelectObject(physDev->hUserDC, oldPen)); Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Sat Aug 15 18:23:21 2009 @@ -247,7 +247,7 @@ if (in_count >= sizeof(struct ntdrv_escape_set_drawable)) { const struct ntdrv_escape_set_drawable *data = in_data; - RosGdiSetDcRects(physDev->hKernelDC, &data->dc_rect, &data->drawable_rect); + RosGdiSetDcRects(physDev->hKernelDC, (RECT*)&data->dc_rect, (RECT*)&data->drawable_rect); TRACE( "SET_DRAWABLE hdc %p dc_rect %s drawable_rect %s\n", physDev->hUserDC, wine_dbgstr_rect(&data->dc_rect), wine_dbgstr_rect(&data->drawable_rect) ); return TRUE; Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Sat Aug 15 18:23:21 2009 @@ -158,7 +158,7 @@ INT CDECL RosDrv_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, LPWSTR str, int size, UINT flags, HKL layout ) { - return RosUserToUnicodeEx(virt, scan, state, str, size, flags, layout); + return RosUserToUnicodeEx(virt, scan, (BYTE*)state, str, size, flags, layout); } BOOL CDECL RosDrv_UnloadKeyboardLayout( HKL layout ) @@ -876,7 +876,7 @@ } } - RosDrv_UpdateZOrder(hwnd, visible_rect); + RosDrv_UpdateZOrder(hwnd, (RECT*)visible_rect); } /* EOF */ Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild [iso-8859-1] Sat Aug 15 18:23:21 2009 @@ -1,9 +1,9 @@ -<module name="winent" type="win32dll" baseaddress="${BASEADDRESS_WINENT}" installbase="system32" installname="winent.drv" allowwarnings="true"> +<module name="winent" type="win32dll" baseaddress="${BASEADDRESS_WINENT}" installbase="system32" installname="winent.drv"> <importlibrary definition="winent.drv.spec" /> <include base="winent">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="WINVER">0x0600</define> - <define name="_WIN32_WINNT">0x0501</define> + <redefine name="WINVER">0x0600</redefine> + <redefine name="_WIN32_WINNT">0x0501</redefine> <define name="__WINESRC__" /> <define name="_WINE" /> <file>font.c</file> Modified: branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rbuild [iso-8859-1] Sat Aug 15 18:23:21 2009 @@ -2,8 +2,8 @@ <importlibrary definition="winex11.drv.spec" /> <include base="winex11">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="WINVER">0x0600</define> - <define name="_WIN32_WINNT">0x0501</define> + <redefine name="WINVER">0x0600</redefine> + <redefine name="_WIN32_WINNT">0x0501</redefine> <define name="__WINESRC__" /> <define name="_WINE" /> <file>bitblt.c</file>

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
66
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2009