Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 28450: Win32 User32 rewrite example.
by jimtabor＠svn.reactos.org 22 Aug '07

22 Aug '07

Author: jimtabor Date: Wed Aug 22 06:54:22 2007 New Revision: 28450 URL: http://svn.reactos.org/svn/reactos?rev=28450&view=rev Log: Win32 User32 rewrite example. Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c Wed Aug 22 06:54:22 2007 @@ -5006,6 +5006,30 @@ NULL != Tpm ? &Tpm->rcExclude : NULL); } +// +// Example for the Win32/User32 rewrite. +// Def = TrackPopupMenuEx@24=NtUserTrackPopupMenuEx@24 +// +// +BOOL +STDCALL +NEWTrackPopupMenu( + HMENU Menu, + UINT Flags, + int x, + int y, + int Reserved, + HWND Wnd, + CONST RECT *Rect) +{ + return NtUserTrackPopupMenuEx( Menu, + Flags, + x, + y, + Wnd, + NULL); // LPTPMPARAMS is null +} + /* * @implemented

1 0

[jimtabor] 28449: Cleanup, dont call inside SEH with SEH. IntGdiModifyWorldTransform calls DC_UpdateXforms which calls DCU_UpdateUserXForms and it calls SEH. Moved NtGdiFlush to dcutil.c
by jimtabor＠svn.reactos.org 21 Aug '07

21 Aug '07

Author: jimtabor Date: Wed Aug 22 03:27:44 2007 New Revision: 28449 URL: http://svn.reactos.org/svn/reactos?rev=28449&view=rev Log: Cleanup, dont call inside SEH with SEH. IntGdiModifyWorldTransform calls DC_UpdateXforms which calls DCU_UpdateUserXForms and it calls SEH. Moved NtGdiFlush to dcutil.c Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/dcutil.c trunk/reactos/subsystems/win32/win32k/objects/paintobj.c trunk/reactos/subsystems/win32/win32k/objects/path.c Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c Wed Aug 22 03:27:44 2007 @@ -200,7 +200,6 @@ SetLastWin32Error(ERROR_INVALID_PARAMETER); return FALSE; } - DC_UpdateXforms(pDc); return TRUE; } @@ -445,8 +444,6 @@ { ProbeForRead(UnsafeXForm, sizeof(XFORM), 1); RtlCopyMemory(&SafeXForm, UnsafeXForm, sizeof(XFORM)); - - Ret = IntGdiModifyWorldTransform(dc, &SafeXForm, Mode); } _SEH_HANDLE { @@ -454,7 +451,8 @@ } _SEH_END; - DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); + // Safe to handle kernel mode data. + Ret = IntGdiModifyWorldTransform(dc, &SafeXForm, Mode); DC_UnlockDc(dc); return Ret; } @@ -503,7 +501,6 @@ dc->Dc_Attr.ptlViewportOrg.x += XOffset; dc->Dc_Attr.ptlViewportOrg.y += YOffset; DC_UpdateXforms(dc); - DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); DC_UnlockDc(dc); return TRUE; } @@ -554,7 +551,6 @@ dc->Dc_Attr.ptlWindowOrg.y += YOffset; DC_UpdateXforms(dc); - DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); DC_UnlockDc(dc); return TRUE; @@ -683,7 +679,6 @@ } DC_UpdateXforms(dc); - DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); } return PrevMapMode; @@ -756,7 +751,6 @@ DC_UpdateXforms(dc); - DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); DC_UnlockDc(dc); return TRUE; @@ -808,7 +802,6 @@ dc->Dc_Attr.ptlViewportOrg.y = Y; DC_UpdateXforms(dc); - DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); DC_UnlockDc(dc); return TRUE; @@ -872,7 +865,6 @@ dc->Dc_Attr.szlWindowExt.cy = YExtent; DC_UpdateXforms(dc); - DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); DC_UnlockDc(dc); return TRUE; @@ -924,7 +916,6 @@ dc->Dc_Attr.ptlWindowOrg.y = Y; DC_UpdateXforms(dc); - DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); DC_UnlockDc(dc); return TRUE; Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Wed Aug 22 03:27:44 2007 @@ -2540,6 +2540,7 @@ /* Create inverse of world-to-viewport transformation */ dc->w.vport2WorldValid = DC_InvertXform(&dc->w.xformWorld2Vport, &dc->w.xformVport2World); + DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); } BOOL FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcutil.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcutil.c Wed Aug 22 03:27:44 2007 @@ -47,3 +47,11 @@ return TRUE; } + +VOID +APIENTRY +NtGdiFlush(VOID) +{ + UNIMPLEMENTED; +} + Modified: trunk/reactos/subsystems/win32/win32k/objects/paintobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/paintobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/paintobj.c Wed Aug 22 03:27:44 2007 @@ -23,13 +23,6 @@ #define NDEBUG #include <debug.h> -VOID -APIENTRY -NtGdiFlush(VOID) -{ - UNIMPLEMENTED; -} - DWORD APIENTRY NtGdiGetBoundsRect( Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c Wed Aug 22 03:27:44 2007 @@ -453,7 +453,6 @@ dc->Dc_Attr.iGraphicsMode = GM_ADVANCED; IntGdiModifyWorldTransform( dc, &xform, MWT_MAX+1 ); dc->Dc_Attr.iGraphicsMode = graphicsMode; -// DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); return TRUE; } return FALSE;

1 0

[fireball] 28448: - Allow pci read/writes during proving BAR's size operation (fixes a read/write of 0xFFFFFF.. memory addresses).
by fireball＠svn.reactos.org 21 Aug '07

21 Aug '07

Author: fireball Date: Tue Aug 21 23:56:22 2007 New Revision: 28448 URL: http://svn.reactos.org/svn/reactos?rev=28448&view=rev Log: - Allow pci read/writes during proving BAR's size operation (fixes a read/write of 0xFFFFFF.. memory addresses). Modified: branches/olpc/hal/halx86/generic/olpcpci.c Modified: branches/olpc/hal/halx86/generic/olpcpci.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/hal/halx86/generic/olpcpci… ============================================================================== --- branches/olpc/hal/halx86/generic/olpcpci.c (original) +++ branches/olpc/hal/halx86/generic/olpcpci.c Tue Aug 21 23:56:22 2007 @@ -172,6 +172,7 @@ static ULONG zero_loc = 0; static int bar_probing = 0; /* Set after a write of ~0 to a BAR */ +static ULONG bar_offset = 0; /* what bar */ static ULONG *hdr_addr(const ULONG *hdr, int reg) { @@ -188,7 +189,17 @@ * BAR0), and don't skip the size mask area. */ - addr = (ULONG)hdr + reg + (bar_probing ? -0x10 : 0x20); + if (bar_probing && (bar_offset == reg)) + { + addr = (ULONG)hdr + reg + (bar_probing ? -0x10 : 0x20); + + /* Reset probing for this bar */ + bar_probing = 0; + } + else + { + addr = (ULONG)hdr + reg + 0x20; + } if ( ((ULONG)addr - (ULONG)hdr) >= 0x90 ) { @@ -196,7 +207,6 @@ (ULONG)addr - (ULONG)hdr, bar_probing, reg); } - bar_probing = 0; return (ULONG *)addr; } @@ -261,7 +271,7 @@ } } - ASSERT(len == 1 || len == 2 || len == 4) + ASSERT(len == 1 || len == 2 || len == 4); RtlCopyMemory(value, addr, len); } @@ -274,14 +284,18 @@ * Mostly we just discard writes, but if the write is a size probe * (i.e. writing ~0 to a BAR), we remember it and arrange to return * the appropriate size mask on the next read. This is cheating - * to some extent, because it depends on the fact that the next - * access after such a write will always be a read to the same BAR. + * to some extent, but it's possible to do intermediate read/writes + * when probing BAR's size now. */ if ((reg >= 0x10) && (reg < 0x2c)) { /* Write is to a BAR */ if (*(PULONG)value == ~0) + { + //DbgPrint("OLPC PCI: Probing bar size, devfn %x, reg %x\n", devfn.u.AsULONG, reg); bar_probing = 1; + bar_offset = reg; + } } else { /* * No warning on writes to ROM BAR, CMD, LATENCY_TIMER, @@ -289,6 +303,8 @@ */ if ((reg != 0x30) && (reg != 0x04) && (reg != 0x0d) && (reg != 0x0c) && (reg != 0x44)) + { DbgPrint("OLPC PCI: Config write to devfn %x reg %x value %x\n", devfn, reg, *value); + } } }

1 0

[janderwald] 28447: - Some typos and fixes for greek resource file for ncpa by Apostolos Alexiadis aka Apal (djapal at gmail dot com) See issue #2582 for more details.
by janderwald＠svn.reactos.org 21 Aug '07

21 Aug '07

Author: janderwald Date: Tue Aug 21 20:34:23 2007 New Revision: 28447 URL: http://svn.reactos.org/svn/reactos?rev=28447&view=rev Log: - Some typos and fixes for greek resource file for ncpa by Apostolos Alexiadis aka Apal (djapal at gmail dot com) See issue #2582 for more details. Added: trunk/reactos/dll/cpl/ncpa/lang/el-GR.rc (with props) Modified: trunk/reactos/dll/cpl/ncpa/ncpa.rc Added: trunk/reactos/dll/cpl/ncpa/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/el-GR.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/el-GR.rc (added) +++ trunk/reactos/dll/cpl/ncpa/lang/el-GR.rc Tue Aug 21 20:34:23 2007 @@ -1,0 +1,122 @@ +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Éäéüôçôåò äéêôýïõ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ðñïóáñìïãåßò Äéêôýïõ",-1,9,9,217,8 + LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&ÐñïóèÞêç",IDC_ADD,9,100,60,14 + PUSHBUTTON "&Áöáßñåóç",IDC_REMOVE,72,100,60,14 + PUSHBUTTON "&Éäéüôçôåò",IDC_PROPERTIES,179,100,60,14 +END + +IDD_NETPROPERTIES DIALOG DISCARDABLE 0, 0, 246, 228 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÃåíéêÜ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Óýíäåóç ìå ÷ñÞóç:", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP + PUSHBUTTON "&Äéáìüñöùóç", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "Ôá óôïé÷åßá ðïõ åßíáé åðéëåãìÝíá, ÷ñçóéìïðïéïýíôáé áðü áõôÞ ôç óýíäåóç:", -1, 9, 59, 217, 8 + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT + PUSHBUTTON "&ÅãêáôÜóôáóç", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&ÁðåãêáôÜóôáóç", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Éäéüôçôåò", IDC_PROPERTIES, 174, 130, 65, 14 + GROUPBOX "ÐåñéãñáöÞ", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "Component Description goes here...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "ÅìöÜíéóç åéêïíéäßïõ óôçí taskbar üôáí åßíáé óõíäåäåìÝíï", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP +END + + +IDD_CARDPROPERTIES DIALOG DISCARDABLE 0, 0, 200,180 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÃåíéêÜ" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Óýíäåóç", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "ÊáôÜóôáóç:", -1, 19, 20, 60, 8 + LTEXT "ÄéÜñêåéá:", -1, 19, 34, 60, 8 + LTEXT "Ôá÷ýôçôá:", -1, 19, 48, 60, 8 + GROUPBOX "Åíåñãçôéêüôçôá", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "ÁðåóôÜëëçóáí", -1, 26, 90, 60, 8 + ICON IDI_HORIZONTAL, -1, 90, 85, 18, 20 + ICON IDI_NETSTAT, -1, 110, 85, 18, 20 + ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 + LTEXT "ÅëÞöèçóáí", -1, 149, 90, 37, 8 + LTEXT "ÐáêÝôá:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + ICON IDI_VERTICAL, -1, 110, 108, 18, 20 + RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + PUSHBUTTON "&Éäéüôçôåò", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Áðåíåñãïðïßçóç", IDC_ENDISABLE, 66, 150, 50, 14 +END + +IDD_CARDSUPPORT DIALOG DISCARDABLE 0, 0, 200,180 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÕðïóôÞñéîç" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "ÊáôÜóôáóç Óýíäåóçò", -1, 9, 8, 200, 88, BS_GROUPBOX + LTEXT "Ôýðïò Äéåýèõíóçò:", -1, 22, 20, 80, 8 + LTEXT "Äéåýèõíóç IP:", -1, 22, 34, 80, 8 + LTEXT "Subnet Mask:", -1, 22, 48, 80, 8 + LTEXT "Default Gateway:", -1, 22, 62, 80, 8 + + RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8 + RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 + RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 + RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8 + + PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14 +END + +IDD_TCPIPPROPERTIES DIALOG DISCARDABLE 0, 0, 246, 228 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ÃåíéêÜ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ìðïñåßôå íá ïñßóåôå ôéò IP ðáñáìÝôñïõò áõôüìáôá, åÜí ôï äßêôõü óáò õðïóôçñßæåé áõôÞî ôç äõíáôüôçôá. ÅéäÜëëùò èá ðñÝðåé íá ñùôÞóåôå ôïí äéá÷åéñéóôÞ äéêôýïõ óáò ãéá ôéò for the êáôÜëëçëåò ñõèìßóåéò IP.", -1, 9, 9, 228, 27 + CONTROL "Íá ãßíåôáé åýñåóç ôçò äéåýèõíóçò IP áõôüìáôá", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 + GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX + CONTROL "&Use the following IP address:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 105, 12 + LTEXT "Äéåýèõíóç IP:", -1, 14, 75, 135, 8 + CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP,150,75-2,80,12 + LTEXT "Subnet mask:", -1, 14, 90, 135, 8 + CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",WS_TABSTOP,150,90-2,80,12 + LTEXT "Default gateway:", -1, 14, 105, 135, 8 + CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",WS_TABSTOP,150,105-2,80,12 + CONTROL "Íá ãßíåôáé åýñåóç ôçò äéåýèõíóçò ôïõ DNS äéáêïìéóôÞ áõôüìáôá", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12 + GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX + CONTROL "&×ñÞóç ôùí ðáñáêÜôù äéåõèýóåùí DNS äéáêïìéóôþí", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 142, 12 + LTEXT "ÐñïôéìçôÝïò DNS äéáêïìéóôÞò:", -1, 14, 171, 135, 8 + CONTROL "",IDC_DNS1,"SysIPAddress32",WS_TABSTOP,150,171-2,80,12 + LTEXT "ÅðéðëÝïí DNS äéáêïìéóôÞò:", -1, 14, 186, 135, 8 + CONTROL "",IDC_DNS2,"SysIPAddress32",WS_TABSTOP,150,186-2,80,12 + PUSHBUTTON "&Ãéá Ðñï÷ùñçìÝíïõò", IDC_ADVANCED, 186, 209, 50, 14, WS_DISABLED | WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Éäéüôçôåò Äéêôýïõ" + IDS_CPLSYSTEMDESCRIPTION "Ðáñáìåôñïðïéåß ôéò éäéüôçôåò äéêôýïõ." +END + +STRINGTABLE +BEGIN + IDS_ASSIGNED_DHCP "Ïñßóôçêå áðü ôï DHCP" + IDS_ASSIGNED_MANUAL "Ïñßóôçêå ÷åéñïêßíçôá" +END + +STRINGTABLE +BEGIN + IDS_ERROR "ÓöÜëìá" + IDS_ENTER_VALID_IPADDRESS "ÐñÝðåé íá åéóÜãåôå ìéá Ýãêõñç äéåýèõíóç IP" + IDS_ENTER_VALID_SUBNET "ÐñÝðåé íá åéóÜãåôå Ýíá Ýãêõñï subnet mask" + IDS_CANNOT_LOAD_CONFIG "Unable to load current config data" + IDS_CANNOT_CREATE_PROPSHEET "Unable to create property sheet" + IDS_OUT_OF_MEMORY "Out of memory" + IDS_CANNOT_SAVE_CHANGES "Äåí Þôáí äõíáôÞ ç áðïèÞêåõóç ôùí áëëáãþí óáò" +END Propchange: trunk/reactos/dll/cpl/ncpa/lang/el-GR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/ncpa/ncpa.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ncpa.rc (original) +++ trunk/reactos/dll/cpl/ncpa/ncpa.rc Tue Aug 21 20:34:23 2007 @@ -17,6 +17,7 @@ #include "lang/cs-CZ.rc" #include "lang/da-DK.rc" #include "lang/de-DE.rc" +#include "lang/el-GR.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fr-FR.rc"

1 0

[jimtabor] 28446: - Removed NtGdiSetMapMode from w32ksvc.db and updated ntgdibad.h. - Moved NtGdiSetMapMode to an internal function. - Changed NtGdiPaintRgn and added IntdiPaintRgn. - Cleaned up win32k path.c. - Connected the gdi32 parts.
by jimtabor＠svn.reactos.org 21 Aug '07

21 Aug '07

Author: jimtabor Date: Tue Aug 21 13:28:51 2007 New Revision: 28446 URL: http://svn.reactos.org/svn/reactos?rev=28446&view=rev Log: - Removed NtGdiSetMapMode from w32ksvc.db and updated ntgdibad.h. - Moved NtGdiSetMapMode to an internal function. - Changed NtGdiPaintRgn and added IntdiPaintRgn. - Cleaned up win32k path.c. - Connected the gdi32 parts. Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/include/coord.h trunk/reactos/subsystems/win32/win32k/include/region.h trunk/reactos/subsystems/win32/win32k/objects/coord.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/path.c trunk/reactos/subsystems/win32/win32k/objects/region.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Tue Aug 21 13:28:51 2007 @@ -555,7 +555,7 @@ SetLayout@8 SetLayoutWidth@12 SetMagicColors@12 -SetMapMode@8=NtGdiSetMapMode@8 +SetMapMode@8 SetMapperFlags@8 SetMetaFileBitsEx@8 SetMetaRgn@4 Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c Tue Aug 21 13:28:51 2007 @@ -932,3 +932,18 @@ { return NtUserSelectPalette(hDC, hPal, bForceBackground); } + +/* + * @implemented + */ +INT +STDCALL +SetMapMode( + HDC hdc, + INT Mode + ) +{ + return GetAndSetDCDWord( hdc, GdiGetSetMapMode, Mode, 0, 0, 0 ); +} + + Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Tue Aug 21 13:28:51 2007 @@ -643,14 +643,6 @@ LPWSTR Filename); /* Needs to be done in user-mode, using shared GDI Object Attributes. */ -int -STDCALL -NtGdiSetMapMode ( - HDC hDC, - int MapMode - ); - -/* Needs to be done in user-mode, using shared GDI Object Attributes. */ DWORD STDCALL NtGdiSetMapperFlags(HDC hDC, Modified: trunk/reactos/subsystems/win32/win32k/include/coord.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/coord.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/coord.h Tue Aug 21 13:28:51 2007 @@ -21,6 +21,8 @@ FASTCALL IntLPtoDP ( PDC dc, LPPOINT Points, INT Count ); +int STDCALL IntGdiSetMapMode(PDC, int); + BOOL FASTCALL IntGdiModifyWorldTransform(PDC pDc, Modified: trunk/reactos/subsystems/win32/win32k/include/region.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/region.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/region.h Tue Aug 21 13:28:51 2007 @@ -17,5 +17,7 @@ HRGN FASTCALL RGNDATA_AllocRgn(INT n); BOOL INTERNAL_CALL RGNDATA_Cleanup(PVOID ObjectBody); +BOOL FASTCALL IntGdiPaintRgn(PDC, HRGN ); + #endif Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c Tue Aug 21 13:28:51 2007 @@ -454,6 +454,7 @@ } _SEH_END; + DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); DC_UnlockDc(dc); return Ret; } @@ -621,18 +622,10 @@ int STDCALL -NtGdiSetMapMode(HDC hDC, +IntGdiSetMapMode(PDC dc, int MapMode) { int PrevMapMode; - PDC dc; - - dc = DC_LockDc(hDC); - if (!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; - } PrevMapMode = dc->Dc_Attr.iMapMode; @@ -692,8 +685,6 @@ DC_UpdateXforms(dc); DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); } - - DC_UnlockDc(dc); return PrevMapMode; } Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Aug 21 13:28:51 2007 @@ -2269,8 +2269,7 @@ case GdiGetSetMapperFlagsInternal: break; case GdiGetSetMapMode: - SafeResult = dc->Dc_Attr.iMapMode; - dc->Dc_Attr.iMapMode = dwIn; + SafeResult = IntGdiSetMapMode( dc, dwIn); break; case GdiGetSetArcDirection: if (dwIn != AD_COUNTERCLOCKWISE && dwIn != AD_CLOCKWISE) Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c Tue Aug 21 13:28:51 2007 @@ -412,11 +412,11 @@ */ /* Save the information about the old mapping mode */ - mapMode = NtGdiGetMapMode( dc->hSelf ); - NtGdiGetViewportExtEx( dc->hSelf, &ptViewportExt ); - NtGdiGetViewportOrgEx( dc->hSelf, &ptViewportOrg ); - NtGdiGetWindowExtEx( dc->hSelf, &ptWindowExt ); - NtGdiGetWindowOrgEx( dc->hSelf, &ptWindowOrg ); + mapMode = dc->Dc_Attr.iMapMode; + ptViewportExt = dc->Dc_Attr.szlViewportExt; + ptViewportOrg = dc->Dc_Attr.ptlViewportOrg; + ptWindowExt = dc->Dc_Attr.szlWindowExt; + ptWindowOrg = dc->Dc_Attr.ptlWindowOrg; /* Save world transform * NB: The Windows documentation on world transforms would lead one to @@ -424,32 +424,36 @@ * tests show that resetting the graphics mode to GM_COMPATIBLE does * not reset the world transform. */ - NtGdiGetTransform( dc->hSelf, GdiWorldSpaceToPageSpace, &xform ); - + xform = dc->w.xformWorld2Wnd; + /* Set MM_TEXT */ - NtGdiSetMapMode( dc->hSelf, MM_TEXT ); - NtGdiSetViewportOrgEx( dc->hSelf, 0, 0, NULL ); - NtGdiSetWindowOrgEx( dc->hSelf, 0, 0, NULL ); - graphicsMode = NtGdiGetGraphicsMode( dc->hSelf ); - NtGdiSetGraphicsMode( dc->hSelf, GM_ADVANCED ); - NtGdiModifyWorldTransform( dc->hSelf, &xform, MWT_IDENTITY ); - NtGdiSetGraphicsMode( dc->hSelf, graphicsMode ); + IntGdiSetMapMode( dc, MM_TEXT ); + dc->Dc_Attr.ptlViewportOrg.x = 0; + dc->Dc_Attr.ptlViewportOrg.y = 0; + dc->Dc_Attr.ptlWindowOrg.x = 0; + dc->Dc_Attr.ptlWindowOrg.y = 0; + + graphicsMode = dc->Dc_Attr.iGraphicsMode; + dc->Dc_Attr.iGraphicsMode = GM_ADVANCED; + IntGdiModifyWorldTransform( dc, &xform, MWT_IDENTITY ); + dc->Dc_Attr.iGraphicsMode = graphicsMode; /* Paint the region */ - NtGdiPaintRgn( dc->hSelf, hrgn ); + IntGdiPaintRgn( dc, hrgn ); NtGdiDeleteObject( hrgn ); /* Restore the old mapping mode */ - NtGdiSetMapMode( dc->hSelf, mapMode ); - NtGdiSetViewportExtEx( dc->hSelf, ptViewportExt.cx, ptViewportExt.cy, NULL ); - NtGdiSetViewportOrgEx( dc->hSelf, ptViewportOrg.x, ptViewportOrg.y, NULL ); - NtGdiSetWindowExtEx( dc->hSelf, ptWindowExt.cx, ptWindowExt.cy, NULL ); - NtGdiSetWindowOrgEx( dc->hSelf, ptWindowOrg.x, ptWindowOrg.y, NULL ); + IntGdiSetMapMode( dc, mapMode ); + dc->Dc_Attr.szlViewportExt = ptViewportExt; + dc->Dc_Attr.ptlViewportOrg = ptViewportOrg; + dc->Dc_Attr.szlWindowExt = ptWindowExt; + dc->Dc_Attr.ptlWindowOrg = ptWindowOrg; /* Go to GM_ADVANCED temporarily to restore the world transform */ - graphicsMode = NtGdiGetGraphicsMode( dc->hSelf ); - NtGdiSetGraphicsMode( dc->hSelf, GM_ADVANCED ); - NtGdiModifyWorldTransform( dc->hSelf, &xform, MWT_MAX+1 ); - NtGdiSetGraphicsMode( dc->hSelf, graphicsMode ); + graphicsMode = dc->Dc_Attr.iGraphicsMode; + dc->Dc_Attr.iGraphicsMode = GM_ADVANCED; + IntGdiModifyWorldTransform( dc, &xform, MWT_MAX+1 ); + dc->Dc_Attr.iGraphicsMode = graphicsMode; +// DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); return TRUE; } return FALSE; @@ -1623,7 +1627,7 @@ IntDPtoLP(dc, &pt, 1); IntGdiMoveToEx(dc, pt.x, pt.y, NULL); } - + DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); DPRINT("Leave %s, ret=%d\n", __FUNCTION__, ret); return ret; } Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c Tue Aug 21 13:28:51 2007 @@ -2524,13 +2524,11 @@ } BOOL -STDCALL -NtGdiPaintRgn(HDC hDC, - HRGN hRgn) +FASTCALL +IntGdiPaintRgn(PDC dc, HRGN hRgn) { //RECT box; - HRGN tmpVisRgn; //, prevVisRgn; - DC *dc = DC_LockDc(hDC); + HRGN tmpVisRgn; //, prevVisRgn; PROSRGNDATA visrgn; CLIPOBJ* ClipRegion; BOOL bRet = FALSE; @@ -2595,9 +2593,22 @@ NtGdiDeleteObject( tmpVisRgn ); // Fill the region + return TRUE; +} + +BOOL +STDCALL +NtGdiPaintRgn(HDC hDC, + HRGN hRgn) +{ + DC *dc = DC_LockDc(hDC); + + BOOL Ret = IntGdiPaintRgn(dc, hRgn); + DC_UnlockDc( dc ); - return TRUE; -} + return Ret; +} + BOOL STDCALL Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Tue Aug 21 13:28:51 2007 @@ -698,7 +698,6 @@ NtGdiSetEnhMetaFileBits 2 NtGdiSetGraphicsMode 2 NtGdiSetICMProfile 2 -NtGdiSetMapMode 2 NtGdiSetMapperFlags 2 NtGdiSetPaletteEntries 4 NtGdiSetPixelV 4

1 0

[jimtabor] 28445: Sorry missed this one. Turn it off.
by jimtabor＠svn.reactos.org 21 Aug '07

21 Aug '07

Author: jimtabor Date: Tue Aug 21 11:45:02 2007 New Revision: 28445 URL: http://svn.reactos.org/svn/reactos?rev=28445&view=rev Log: Sorry missed this one. Turn it off. Modified: trunk/reactos/dll/win32/gdi32/objects/coord.c Modified: trunk/reactos/dll/win32/gdi32/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/co… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/coord.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/coord.c Tue Aug 21 11:45:02 2007 @@ -121,7 +121,7 @@ STDCALL LPtoDP ( HDC hDC, LPPOINT Points, INT Count ) { -//#if 0 +#if 0 INT i; PDC_ATTR Dc_Attr; @@ -130,16 +130,16 @@ if (Dc_Attr->flXform & ( PAGE_XLATE_CHANGED | // Check for Changes and Updates PAGE_EXTENTS_CHANGED | WORLD_XFORM_CHANGED )) -//#endif +#endif return NtGdiTransformPoints( hDC, Points, Points, Count, GdiLpToDp); // LPtoDP mode -//#if 0 +#if 0 else { for ( i = 0; i < Count; i++ ) CoordCnvP ( &Dc_Attr->mxWorldToDevice, &Points[i] ); } return TRUE; -//#endif +#endif }

1 0

[jimtabor] 28444: Turn Dc_Attr off.
by jimtabor＠svn.reactos.org 21 Aug '07

21 Aug '07

Author: jimtabor Date: Tue Aug 21 11:21:26 2007 New Revision: 28444 URL: http://svn.reactos.org/svn/reactos?rev=28444&view=rev Log: Turn Dc_Attr off. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Aug 21 11:21:26 2007 @@ -2328,7 +2328,7 @@ PDC NewDC; HDC hDC; PWSTR Buf = NULL; - PDC_ATTR DC_Attr = NULL; +// PDC_ATTR DC_Attr = NULL; if (Driver != NULL) { @@ -2349,7 +2349,7 @@ } return NULL; } -//#if 0 +#if 0 PVOID NewMem = NULL; ULONG MemSize = sizeof(DC_ATTR); //PAGE_SIZE it will allocate that size NTSTATUS Status = ZwAllocateVirtualMemory(NtCurrentProcess(), @@ -2375,16 +2375,16 @@ } } KeLeaveCriticalRegion(); -//#endif +#endif NewDC = DC_LockDc(hDC); /* FIXME - Handle NewDC == NULL! */ -//#if 0 +#if 0 if(NewMem) { NewDC->pDc_Attr = NewMem; // Store pointer DC_Attr = NewMem; } -//#endif +#endif if (Driver != NULL) { RtlCopyMemory(&NewDC->DriverName, Driver, sizeof(UNICODE_STRING)); @@ -2401,27 +2401,27 @@ NewDC->w.xformVport2World = NewDC->w.xformWorld2Wnd; NewDC->w.vport2WorldValid = TRUE; - XForm2MatrixS( &DC_Attr->mxWorldToDevice, &NewDC->w.xformWorld2Vport); - XForm2MatrixS( &DC_Attr->mxDevicetoWorld, &NewDC->w.xformVport2World); - XForm2MatrixS( &DC_Attr->mxWorldToPage, &NewDC->w.xformWorld2Wnd); +// XForm2MatrixS( &DC_Attr->mxWorldToDevice, &NewDC->w.xformWorld2Vport); +// XForm2MatrixS( &DC_Attr->mxDevicetoWorld, &NewDC->w.xformVport2World); +// XForm2MatrixS( &DC_Attr->mxWorldToPage, &NewDC->w.xformWorld2Wnd); // Setup syncing bits for the dcattr data packets. - NewDC->Dc_Attr.flXform = DEVICE_TO_PAGE_INVALID; - DC_Attr->flXform = NewDC->Dc_Attr.flXform; - NewDC->Dc_Attr.ulDirty_ = 0; // Server side - DC_Attr->ulDirty_ = 0; // Client side +// NewDC->Dc_Attr.flXform = DEVICE_TO_PAGE_INVALID; +// DC_Attr->flXform = NewDC->Dc_Attr.flXform; +// NewDC->Dc_Attr.ulDirty_ = 0; // Server side +// DC_Attr->ulDirty_ = 0; // Client side NewDC->Dc_Attr.iMapMode = MM_TEXT; - DC_Attr->iMapMode = MM_TEXT; +// DC_Attr->iMapMode = MM_TEXT; NewDC->Dc_Attr.szlWindowExt.cx = 1; // Float to Int,,, WRONG! NewDC->Dc_Attr.szlWindowExt.cy = 1; NewDC->Dc_Attr.szlViewportExt.cx = 1; NewDC->Dc_Attr.szlViewportExt.cy = 1; - DC_Attr->szlWindowExt.cx = 1; - DC_Attr->szlWindowExt.cy = 1; - DC_Attr->szlViewportExt.cx = 1; - DC_Attr->szlViewportExt.cy = 1; +// DC_Attr->szlWindowExt.cx = 1; +// DC_Attr->szlWindowExt.cy = 1; +// DC_Attr->szlViewportExt.cx = 1; +// DC_Attr->szlViewportExt.cy = 1; NewDC->Dc_Attr.crForegroundClr = 0; @@ -2429,11 +2429,11 @@ NewDC->Dc_Attr.ulBackgroundClr = 0xffffff; NewDC->Dc_Attr.crBackgroundClr = 0xffffff; - DC_Attr->ulBackgroundClr = 0xffffff; - DC_Attr->crBackgroundClr = 0xffffff; +// DC_Attr->ulBackgroundClr = 0xffffff; +// DC_Attr->crBackgroundClr = 0xffffff; NewDC->Dc_Attr.hlfntNew = NtGdiGetStockObject(SYSTEM_FONT); - DC_Attr->hlfntNew = NewDC->Dc_Attr.hlfntNew; // It's a service to the user. +// DC_Attr->hlfntNew = NewDC->Dc_Attr.hlfntNew; // It's a service to the user. TextIntRealizeFont(NewDC->Dc_Attr.hlfntNew); NewDC->w.hPalette = NtGdiGetStockObject(DEFAULT_PALETTE); @@ -2473,7 +2473,7 @@ VOID FASTCALL DC_FreeDC(HDC DCToFree) { -//#if 0 +#if 0 KeEnterCriticalRegion(); { INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)DCToFree); @@ -2493,7 +2493,7 @@ } } KeLeaveCriticalRegion(); -//#endif +#endif if (!GDIOBJ_FreeObj(GdiHandleTable, DCToFree, GDI_OBJECT_TYPE_DC)) { DPRINT("DC_FreeDC failed\n");

1 0

[jimtabor] 28443: Turn off copy to user for now.
by jimtabor＠svn.reactos.org 21 Aug '07

21 Aug '07

Author: jimtabor Date: Tue Aug 21 10:47:49 2007 New Revision: 28443 URL: http://svn.reactos.org/svn/reactos?rev=28443&view=rev Log: Turn off copy to user for now. Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcutil.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcutil.c Tue Aug 21 10:47:49 2007 @@ -9,6 +9,7 @@ FASTCALL DCU_UpdateUserXForms(PDC pDC, ULONG uMask) { +#if 0 PDC_ATTR DC_Attr = pDC->pDc_Attr; if (!uMask) return FALSE; @@ -42,6 +43,7 @@ return FALSE; } } +#endif return TRUE; }

1 0

[jimtabor] 28442: - Started the use of DC_ATTR. Created dcutil.c to handle xfers. I choose XForms this time and still trouble shooting it. If anyone wants to join in and help. Optimize syncing the data packets, add more, etc. Don't be shy! - Removed NtGdiGetWorldTransform from w32ksvc.db and updated ntgdibad.h. - Implemented GetTransform redirect to NtGdiGetTransform. - Connected the gdi32 parts.
by jimtabor＠svn.reactos.org 21 Aug '07

21 Aug '07

Author: jimtabor Date: Tue Aug 21 09:01:00 2007 New Revision: 28442 URL: http://svn.reactos.org/svn/reactos?rev=28442&view=rev Log: - Started the use of DC_ATTR. Created dcutil.c to handle xfers. I choose XForms this time and still trouble shooting it. If anyone wants to join in and help. Optimize syncing the data packets, add more, etc. Don't be shy! - Removed NtGdiGetWorldTransform from w32ksvc.db and updated ntgdibad.h. - Implemented GetTransform redirect to NtGdiGetTransform. - Connected the gdi32 parts. Added: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c - copied, changed from r28441, trunk/reactos/subsystems/win32/win32k/objects/font.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/coord.c trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/coord.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/path.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db trunk/reactos/subsystems/win32/win32k/win32k.rbuild Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Tue Aug 21 09:01:00 2007 @@ -453,13 +453,13 @@ GetTextFaceAliasW@12 GetTextMetricsA@8 GetTextMetricsW@8 -GetTransform@12 +GetTransform@12=NtGdiGetTransform@12 GetViewportExtEx@8 GetViewportOrgEx@8 GetWinMetaFileBits@20 GetWindowExtEx@8 GetWindowOrgEx@8 -GetWorldTransform@8=NtGdiGetWorldTransform@8 +GetWorldTransform@8 HT_Get8BPPFormatPalette@16 HT_Get8BPPMaskPalette@24 IntersectClipRect@20=NtGdiIntersectClipRect@20 Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Tue Aug 21 09:01:00 2007 @@ -1863,18 +1863,6 @@ int STDCALL GetTextFaceAliasW(HDC hdc,int cChar,LPWSTR pszOut) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL -GetTransform(HDC hdc, DWORD iXform, LPXFORM pxf) { UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); Modified: trunk/reactos/dll/win32/gdi32/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/co… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/coord.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/coord.c Tue Aug 21 09:01:00 2007 @@ -103,7 +103,7 @@ if (Dc_Attr->flXform & ( DEVICE_TO_WORLD_INVALID | // Force a full recalibration! PAGE_XLATE_CHANGED | // Changes or Updates have been made, PAGE_EXTENTS_CHANGED | // do processing in kernel space. - WORLD_XFORM_CHANGED ) + WORLD_XFORM_CHANGED )) #endif return NtGdiTransformPoints( hDC, Points, Points, Count, GdiDpToLp); // DPtoLP mode. #if 0 @@ -121,7 +121,7 @@ STDCALL LPtoDP ( HDC hDC, LPPOINT Points, INT Count ) { -#if 0 +//#if 0 INT i; PDC_ATTR Dc_Attr; @@ -129,17 +129,25 @@ if (Dc_Attr->flXform & ( PAGE_XLATE_CHANGED | // Check for Changes and Updates PAGE_EXTENTS_CHANGED | - WORLD_XFORM_CHANGED ) -#endif + WORLD_XFORM_CHANGED )) +//#endif return NtGdiTransformPoints( hDC, Points, Points, Count, GdiLpToDp); // LPtoDP mode -#if 0 +//#if 0 else { for ( i = 0; i < Count; i++ ) CoordCnvP ( &Dc_Attr->mxWorldToDevice, &Points[i] ); } return TRUE; -#endif +//#endif +} + + +BOOL +STDCALL +GetWorldTransform( HDC hDC, LPXFORM lpXform ) +{ + return NtGdiGetTransform( hDC, GdiWorldSpaceToPageSpace, lpXform); } Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Tue Aug 21 09:01:00 2007 @@ -465,14 +465,6 @@ /* Needs to be done in user-mode. */ BOOL STDCALL NtGdiGetWindowOrgEx(HDC hDC, LPPOINT windowOrg); -/* Use NtGdiGetTransform with GdiWorldSpaceToPageSpace */ -BOOL -STDCALL -NtGdiGetWorldTransform ( - HDC hDC, - LPXFORM Xform - ); - /* Needs to be done in user-mode. */ BOOL STDCALL Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Tue Aug 21 09:01:00 2007 @@ -153,6 +153,8 @@ VOID FASTCALL DC_UpdateXforms(PDC dc); BOOL FASTCALL DC_InvertXform(const XFORM *xformSrc, XFORM *xformDest); +BOOL FASTCALL DCU_UpdateUserXForms(PDC, ULONG); + VOID FASTCALL IntGetViewportExtEx(PDC dc, LPSIZE pt); VOID FASTCALL IntGetViewportOrgEx(PDC dc, LPPOINT pt); VOID FASTCALL IntGetWindowExtEx(PDC dc, LPSIZE pt); Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c Tue Aug 21 09:01:00 2007 @@ -194,7 +194,6 @@ case MWT_MAX+1: // Must be MWT_SET???? pDc->w.xformWorld2Wnd = *lpXForm; // Do it like Wine. - DC_UpdateXforms(pDc); // Good wine port here too. break; default: @@ -203,7 +202,6 @@ } DC_UpdateXforms(pDc); - DC_UnlockDc(pDc); return TRUE; } @@ -229,8 +227,9 @@ BOOL STDCALL -NtGdiGetWorldTransform(HDC hDC, - LPXFORM XForm) +NtGdiGetTransform(HDC hDC, + DWORD iXform, + LPXFORM XForm) { PDC dc; NTSTATUS Status = STATUS_SUCCESS; @@ -253,7 +252,14 @@ ProbeForWrite(XForm, sizeof(XFORM), 1); - *XForm = dc->w.xformWorld2Wnd; + switch(iXform) + { + case GdiWorldSpaceToPageSpace: + *XForm = dc->w.xformWorld2Wnd; + break; + default: + break; + } } _SEH_HANDLE { @@ -403,7 +409,10 @@ SetLastNtError(Status); return FALSE; } - +// +// If we are getting called that means User XForms is a mess! +// + DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); DC_UnlockDc(dc); ExFreePool(Points); return TRUE; @@ -436,7 +445,7 @@ { ProbeForRead(UnsafeXForm, sizeof(XFORM), 1); RtlCopyMemory(&SafeXForm, UnsafeXForm, sizeof(XFORM)); - + Ret = IntGdiModifyWorldTransform(dc, &SafeXForm, Mode); } _SEH_HANDLE @@ -493,7 +502,7 @@ dc->Dc_Attr.ptlViewportOrg.x += XOffset; dc->Dc_Attr.ptlViewportOrg.y += YOffset; DC_UpdateXforms(dc); - + DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); DC_UnlockDc(dc); return TRUE; } @@ -544,6 +553,7 @@ dc->Dc_Attr.ptlWindowOrg.y += YOffset; DC_UpdateXforms(dc); + DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); DC_UnlockDc(dc); return TRUE; @@ -680,6 +690,7 @@ } DC_UpdateXforms(dc); + DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); } DC_UnlockDc(dc); @@ -732,7 +743,7 @@ Size->cx = dc->Dc_Attr.szlViewportExt.cx; Size->cy = dc->Dc_Attr.szlViewportExt.cy; - dc->Dc_Attr.szlViewportExt.cx = XExtent; + dc->Dc_Attr.szlViewportExt.cx = XExtent; dc->Dc_Attr.szlViewportExt.cy = YExtent; if (dc->Dc_Attr.iMapMode == MM_ISOTROPIC) @@ -754,6 +765,7 @@ DC_UpdateXforms(dc); + DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); DC_UnlockDc(dc); return TRUE; @@ -805,6 +817,7 @@ dc->Dc_Attr.ptlViewportOrg.y = Y; DC_UpdateXforms(dc); + DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); DC_UnlockDc(dc); return TRUE; @@ -868,6 +881,7 @@ dc->Dc_Attr.szlWindowExt.cy = YExtent; DC_UpdateXforms(dc); + DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); DC_UnlockDc(dc); return TRUE; @@ -919,6 +933,7 @@ dc->Dc_Attr.ptlWindowOrg.y = Y; DC_UpdateXforms(dc); + DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); DC_UnlockDc(dc); return TRUE; Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Aug 21 09:01:00 2007 @@ -1327,6 +1327,7 @@ newdc->w.xformWorld2Vport = dc->w.xformWorld2Vport; newdc->w.xformVport2World = dc->w.xformVport2World; newdc->w.vport2WorldValid = dc->w.vport2WorldValid; + DCU_UpdateUserXForms(newdc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); newdc->Dc_Attr.ptlWindowOrg.x = dc->Dc_Attr.ptlWindowOrg.x; newdc->Dc_Attr.ptlWindowOrg.y = dc->Dc_Attr.ptlWindowOrg.y; newdc->Dc_Attr.szlWindowExt.cx = dc->Dc_Attr.szlWindowExt.cx; @@ -1409,7 +1410,7 @@ dc->w.xformWorld2Vport = dcs->w.xformWorld2Vport; dc->w.xformVport2World = dcs->w.xformVport2World; dc->w.vport2WorldValid = dcs->w.vport2WorldValid; - + DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED ); dc->Dc_Attr.ptlWindowOrg.x = dcs->Dc_Attr.ptlWindowOrg.x; dc->Dc_Attr.ptlWindowOrg.y = dcs->Dc_Attr.ptlWindowOrg.y; dc->Dc_Attr.szlWindowExt.cx = dcs->Dc_Attr.szlWindowExt.cx; @@ -2327,7 +2328,7 @@ PDC NewDC; HDC hDC; PWSTR Buf = NULL; -// PDC_ATTR DC_Attr = NULL; + PDC_ATTR DC_Attr = NULL; if (Driver != NULL) { @@ -2348,7 +2349,7 @@ } return NULL; } -#if 0 +//#if 0 PVOID NewMem = NULL; ULONG MemSize = sizeof(DC_ATTR); //PAGE_SIZE it will allocate that size NTSTATUS Status = ZwAllocateVirtualMemory(NtCurrentProcess(), @@ -2374,69 +2375,66 @@ } } KeLeaveCriticalRegion(); -#endif +//#endif NewDC = DC_LockDc(hDC); /* FIXME - Handle NewDC == NULL! */ -#if 0 +//#if 0 if(NewMem) { NewDC->pDc_Attr = NewMem; // Store pointer DC_Attr = NewMem; } -#endif +//#endif if (Driver != NULL) { RtlCopyMemory(&NewDC->DriverName, Driver, sizeof(UNICODE_STRING)); NewDC->DriverName.Buffer = Buf; } -// gxf_long a; -// a.f = 1.0f; - NewDC->w.xformWorld2Wnd.eM11 = 1.0f; -// DC_Attr->mxWorldToPage.efM11.lExp = XFPEXP(a); -// DC_Attr->mxWorldToPage.efM11.lMant = XFPMANT(a); - - NewDC->w.xformWorld2Wnd.eM12 = 0.0f; //Already Zero! + NewDC->w.xformWorld2Wnd.eM12 = 0.0f; NewDC->w.xformWorld2Wnd.eM21 = 0.0f; - NewDC->w.xformWorld2Wnd.eM22 = 1.0f; -// DC_Attr->mxWorldToPage.efM22.lExp = XFPEXP(a); -// DC_Attr->mxWorldToPage.efM22.lMant = XFPMANT(a); - - NewDC->w.xformWorld2Wnd.eDx = 0.0f; //Already Zero! + NewDC->w.xformWorld2Wnd.eDx = 0.0f; NewDC->w.xformWorld2Wnd.eDy = 0.0f; - NewDC->w.xformWorld2Vport = NewDC->w.xformWorld2Wnd; -// DC_Attr->mxWorldToDevice = DC_Attr->mxWorldToPage; - NewDC->w.xformVport2World = NewDC->w.xformWorld2Wnd; -// DC_Attr->mxDevicetoWorld = DC_Attr->mxWorldToPage; - NewDC->w.vport2WorldValid = TRUE; -// DC_Attr->flXform = DEVICE_TO_PAGE_INVALID; // More research. + + XForm2MatrixS( &DC_Attr->mxWorldToDevice, &NewDC->w.xformWorld2Vport); + XForm2MatrixS( &DC_Attr->mxDevicetoWorld, &NewDC->w.xformVport2World); + XForm2MatrixS( &DC_Attr->mxWorldToPage, &NewDC->w.xformWorld2Wnd); + +// Setup syncing bits for the dcattr data packets. + NewDC->Dc_Attr.flXform = DEVICE_TO_PAGE_INVALID; + DC_Attr->flXform = NewDC->Dc_Attr.flXform; + NewDC->Dc_Attr.ulDirty_ = 0; // Server side + DC_Attr->ulDirty_ = 0; // Client side NewDC->Dc_Attr.iMapMode = MM_TEXT; -// DC_Attr->iMapMode = MM_TEXT; - - -//// HELP! FLOAT to INT !!!!!!!!! - NewDC->Dc_Attr.szlWindowExt.cx = 1.0f; - NewDC->Dc_Attr.szlWindowExt.cy = 1.0f; - NewDC->Dc_Attr.szlViewportExt.cx = 1.0f; - NewDC->Dc_Attr.szlViewportExt.cy = 1.0f; + DC_Attr->iMapMode = MM_TEXT; + + NewDC->Dc_Attr.szlWindowExt.cx = 1; // Float to Int,,, WRONG! + NewDC->Dc_Attr.szlWindowExt.cy = 1; + NewDC->Dc_Attr.szlViewportExt.cx = 1; + NewDC->Dc_Attr.szlViewportExt.cy = 1; + DC_Attr->szlWindowExt.cx = 1; + DC_Attr->szlWindowExt.cy = 1; + DC_Attr->szlViewportExt.cx = 1; + DC_Attr->szlViewportExt.cy = 1; + NewDC->Dc_Attr.crForegroundClr = 0; -// NewDC->pDc_Attr->ulForegroundClr = 0; // Already Zero -// NewDC->pDc_Attr->crForegroundClr = 0; - + NewDC->Dc_Attr.ulForegroundClr = 0; + + NewDC->Dc_Attr.ulBackgroundClr = 0xffffff; NewDC->Dc_Attr.crBackgroundClr = 0xffffff; -// DC_Attr->ulBackgroundClr = 0xffffff; -// DC_Attr->crBackgroundClr = 0xffffff; + DC_Attr->ulBackgroundClr = 0xffffff; + DC_Attr->crBackgroundClr = 0xffffff; NewDC->Dc_Attr.hlfntNew = NtGdiGetStockObject(SYSTEM_FONT); + DC_Attr->hlfntNew = NewDC->Dc_Attr.hlfntNew; // It's a service to the user. TextIntRealizeFont(NewDC->Dc_Attr.hlfntNew); -// DC_Attr->hlfntNew = NtGdiGetStockObject(SYSTEM_FONT); NewDC->w.hPalette = NtGdiGetStockObject(DEFAULT_PALETTE); @@ -2475,7 +2473,7 @@ VOID FASTCALL DC_FreeDC(HDC DCToFree) { -#if 0 +//#if 0 KeEnterCriticalRegion(); { INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)DCToFree); @@ -2495,7 +2493,7 @@ } } KeLeaveCriticalRegion(); -#endif +//#endif if (!GDIOBJ_FreeObj(GdiHandleTable, DCToFree, GDI_OBJECT_TYPE_DC)) { DPRINT("DC_FreeDC failed\n"); Copied: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c (from r28441, trunk/reactos/subsystems/win32/win32k/objects/font.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/font.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcutil.c Tue Aug 21 09:01:00 2007 @@ -1,2 +1,47 @@ -/* EMPTY FOR NOW */ -/* Hope I didn't delete existing defs!! Check CVS version of this file.. */ + +#include <w32k.h> + +#define NDEBUG +#include <debug.h> + + +BOOL +FASTCALL +DCU_UpdateUserXForms(PDC pDC, ULONG uMask) +{ + PDC_ATTR DC_Attr = pDC->pDc_Attr; + + if (!uMask) return FALSE; + + if (!DC_Attr) return FALSE; + else + { + NTSTATUS Status = STATUS_SUCCESS; + _SEH_TRY + { + ProbeForWrite(DC_Attr, + sizeof(DC_ATTR), + 1); + if (uMask & WORLD_XFORM_CHANGED) + XForm2MatrixS( &DC_Attr->mxWorldToDevice, &pDC->w.xformWorld2Vport); + + if (uMask & DEVICE_TO_WORLD_INVALID) + XForm2MatrixS( &DC_Attr->mxDevicetoWorld, &pDC->w.xformVport2World); + + if (uMask & WORLD_TO_PAGE_IDENTITY) + XForm2MatrixS( &DC_Attr->mxWorldToPage, &pDC->w.xformWorld2Wnd); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return FALSE; + } + } + return TRUE; +} + Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c Tue Aug 21 09:01:00 2007 @@ -424,7 +424,7 @@ * tests show that resetting the graphics mode to GM_COMPATIBLE does * not reset the world transform. */ - NtGdiGetWorldTransform( dc->hSelf, &xform ); + NtGdiGetTransform( dc->hSelf, GdiWorldSpaceToPageSpace, &xform ); /* Set MM_TEXT */ NtGdiSetMapMode( dc->hSelf, MM_TEXT ); Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Tue Aug 21 09:01:00 2007 @@ -214,7 +214,7 @@ NtGdiGetTextExtentExW 8 NtGdiGetTextFaceW 4 NtGdiGetTextMetricsW 3 -# NtGdiGetTransform 3 +NtGdiGetTransform 3 # NtGdiGetUFI 6 # NtGdiGetEmbUFI 7 # NtGdiGetUFIPathname 10 @@ -806,7 +806,6 @@ NtGdiGetTextAlign 1 NtGdiGetTextColor 1 NtGdiGetTextExtentPoint32 4 -NtGdiGetWorldTransform 2 NtGdiMoveToEx 4 NtGdiOffsetViewportOrgEx 4 NtGdiOffsetWindowOrgEx 4 Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild Tue Aug 21 09:01:00 2007 @@ -140,6 +140,7 @@ <file>color.c</file> <file>coord.c</file> <file>dc.c</file> + <file>dcutil.c</file> <file>dibobj.c</file> <file>fillshap.c</file> <file>gdiobj.c</file>

1 0

[jimtabor] 28441: Bug patch 2382 by Zavyalov Alexey. GetCurrencyFormatW() added superfluous group sign in negative numbers and reformatting code.
by jimtabor＠svn.reactos.org 20 Aug '07

20 Aug '07

Author: jimtabor Date: Tue Aug 21 02:55:48 2007 New Revision: 28441 URL: http://svn.reactos.org/svn/reactos?rev=28441&view=rev Log: Bug patch 2382 by Zavyalov Alexey. GetCurrencyFormatW() added superfluous group sign in negative numbers and reformatting code. Modified: trunk/reactos/dll/win32/kernel32/misc/lcformat.c Modified: trunk/reactos/dll/win32/kernel32/misc/lcformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/lc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lcformat.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/lcformat.c Tue Aug 21 02:55:48 2007 @@ -1355,290 +1355,370 @@ LPCWSTR lpszValue, const CURRENCYFMTW *lpFormat, LPWSTR lpCurrencyStr, int cchOut) { - static const BYTE NLS_NegCyFormats[16] = - { - CF_PARENS|CF_CY_LEFT, /* ($1.1) */ - CF_MINUS_LEFT|CF_MINUS_BEFORE|CF_CY_LEFT, /* -$1.1 */ - CF_MINUS_LEFT|CF_CY_LEFT, /* $-1.1 */ - CF_MINUS_RIGHT|CF_CY_LEFT, /* $1.1- */ - CF_PARENS|CF_CY_RIGHT, /* (1.1$) */ - CF_MINUS_LEFT|CF_CY_RIGHT, /* -1.1$ */ - CF_MINUS_RIGHT|CF_MINUS_BEFORE|CF_CY_RIGHT, /* 1.1-$ */ - CF_MINUS_RIGHT|CF_CY_RIGHT, /* 1.1$- */ - CF_MINUS_LEFT|CF_CY_RIGHT|CF_CY_SPACE, /* -1.1 $ */ - CF_MINUS_LEFT|CF_MINUS_BEFORE|CF_CY_LEFT|CF_CY_SPACE, /* -$ 1.1 */ - CF_MINUS_RIGHT|CF_CY_RIGHT|CF_CY_SPACE, /* 1.1 $- */ - CF_MINUS_RIGHT|CF_CY_LEFT|CF_CY_SPACE, /* $ 1.1- */ - CF_MINUS_LEFT|CF_CY_LEFT|CF_CY_SPACE, /* $ -1.1 */ - CF_MINUS_RIGHT|CF_MINUS_BEFORE|CF_CY_RIGHT|CF_CY_SPACE, /* 1.1- $ */ - CF_PARENS|CF_CY_LEFT|CF_CY_SPACE, /* ($ 1.1) */ - CF_PARENS|CF_CY_RIGHT|CF_CY_SPACE, /* (1.1 $) */ - }; - static const BYTE NLS_PosCyFormats[4] = - { - CF_CY_LEFT, /* $1.1 */ - CF_CY_RIGHT, /* 1.1$ */ - CF_CY_LEFT|CF_CY_SPACE, /* $ 1.1 */ - CF_CY_RIGHT|CF_CY_SPACE, /* 1.1 $ */ - }; - WCHAR szBuff[128], *szOut = szBuff + sizeof(szBuff) / sizeof(WCHAR) - 1; - WCHAR szNegBuff[8]; - const WCHAR *lpszNeg = NULL, *lpszNegStart, *szSrc, *lpszCy, *lpszCyStart; - DWORD dwState = 0, dwDecimals = 0, dwGroupCount = 0, dwCurrentGroupCount = 0, dwFmt; - INT iRet; - - TRACE("(0x%04lx,0x%08lx,%S,%p,%p,%d)\n", lcid, dwFlags, lpszValue, - lpFormat, lpCurrencyStr, cchOut); - - if(NLS_isSystemLocale(lcid)) - { - lcid = NLS_getDefaultLocale(lcid); - } - else if(!IsValidLocale(lcid, 0)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - if (!lpszValue || cchOut < 0 || (cchOut > 0 && !lpCurrencyStr) || - (lpFormat && (dwFlags || !lpFormat->lpDecimalSep || !lpFormat->lpThousandSep || - !lpFormat->lpCurrencySymbol || lpFormat->NegativeOrder > 15 || - lpFormat->PositiveOrder > 3))) - { -GetCurrencyFormatW_Error: - SetLastError(lpFormat && dwFlags ? ERROR_INVALID_FLAGS : ERROR_INVALID_PARAMETER); - return 0; - } - - if (!lpFormat) - { - const NLS_FORMAT_NODE *node = NLS_GetFormats(lcid, dwFlags); - - if (!node) - goto GetCurrencyFormatW_Error; - lpFormat = &node->cyfmt; - lpszNegStart = lpszNeg = GetNegative(node); - } - else - { - GetLocaleInfoW(lcid, LOCALE_SNEGATIVESIGN|(dwFlags & LOCALE_NOUSEROVERRIDE), - szNegBuff, sizeof(szNegBuff)/sizeof(WCHAR)); - lpszNegStart = lpszNeg = szNegBuff; - } - dwFlags &= (LOCALE_NOUSEROVERRIDE|LOCALE_USE_CP_ACP); - - lpszNeg = lpszNeg + strlenW(lpszNeg) - 1; - lpszCyStart = lpFormat->lpCurrencySymbol; - lpszCy = lpszCyStart + strlenW(lpszCyStart) - 1; - - /* Format the currency backwards into a temporary buffer */ - - szSrc = lpszValue; - *szOut-- = '\0'; - - /* Check the number for validity */ - while (*szSrc) - { - if (*szSrc >= '0' && *szSrc <= '9') - { - dwState |= NF_DIGITS; - if (dwState & NF_ISREAL) - dwDecimals++; - } - else if (*szSrc == '-') - { - if (dwState) - goto GetCurrencyFormatW_Error; /* '-' not first character */ - dwState |= NF_ISNEGATIVE; - } - else if (*szSrc == '.') - { - if (dwState & NF_ISREAL) - goto GetCurrencyFormatW_Error; /* More than one '.' */ - dwState |= NF_ISREAL; + static const BYTE NLS_NegCyFormats[16] = + { + CF_PARENS|CF_CY_LEFT, /* ($1.1) */ + CF_MINUS_LEFT|CF_MINUS_BEFORE|CF_CY_LEFT, /* -$1.1 */ + CF_MINUS_LEFT|CF_CY_LEFT, /* $-1.1 */ + CF_MINUS_RIGHT|CF_CY_LEFT, /* $1.1- */ + CF_PARENS|CF_CY_RIGHT, /* (1.1$) */ + CF_MINUS_LEFT|CF_CY_RIGHT, /* -1.1$ */ + CF_MINUS_RIGHT|CF_MINUS_BEFORE|CF_CY_RIGHT, /* 1.1-$ */ + CF_MINUS_RIGHT|CF_CY_RIGHT, /* 1.1$- */ + CF_MINUS_LEFT|CF_CY_RIGHT|CF_CY_SPACE, /* -1.1 $ */ + CF_MINUS_LEFT|CF_MINUS_BEFORE|CF_CY_LEFT|CF_CY_SPACE, /* -$ 1.1 */ + CF_MINUS_RIGHT|CF_CY_RIGHT|CF_CY_SPACE, /* 1.1 $- */ + CF_MINUS_RIGHT|CF_CY_LEFT|CF_CY_SPACE, /* $ 1.1- */ + CF_MINUS_LEFT|CF_CY_LEFT|CF_CY_SPACE, /* $ -1.1 */ + CF_MINUS_RIGHT|CF_MINUS_BEFORE|CF_CY_RIGHT|CF_CY_SPACE, /* 1.1- $ */ + CF_PARENS|CF_CY_LEFT|CF_CY_SPACE, /* ($ 1.1) */ + CF_PARENS|CF_CY_RIGHT|CF_CY_SPACE, /* (1.1 $) */ + }; + static const BYTE NLS_PosCyFormats[4] = + { + CF_CY_LEFT, /* $1.1 */ + CF_CY_RIGHT, /* 1.1$ */ + CF_CY_LEFT|CF_CY_SPACE, /* $ 1.1 */ + CF_CY_RIGHT|CF_CY_SPACE, /* 1.1 $ */ + }; + + WCHAR szBuff[128], *szOut = szBuff + sizeof(szBuff) / sizeof(WCHAR) - 1; + WCHAR szNegBuff[8]; + const WCHAR *lpszNeg = NULL, *lpszNegStart, *szSrc, *lpszCy, *lpszCyStart; + DWORD dwState = 0, dwDecimals = 0, dwGroupCount = 0, dwCurrentGroupCount = 0, dwFmt; + INT iRet; + + DPRINT1("GetCurrencyFormatW(0x%04lx,0x%08lx,%S,%p,%p,%d)\n", + lcid, + dwFlags, + lpszValue, + lpFormat, + lpCurrencyStr, + cchOut); + + if(NLS_isSystemLocale(lcid)) + { + lcid = NLS_getDefaultLocale(lcid); + } + else if(!IsValidLocale(lcid, 0)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (!lpszValue || cchOut < 0 || (cchOut > 0 && !lpCurrencyStr) || + (lpFormat && (dwFlags || !lpFormat->lpDecimalSep || !lpFormat->lpThousandSep || + !lpFormat->lpCurrencySymbol || lpFormat->NegativeOrder > 15 || + lpFormat->PositiveOrder > 3))) + { + SetLastError(lpFormat && dwFlags ? ERROR_INVALID_FLAGS : ERROR_INVALID_PARAMETER); + return 0; + } + + if (!lpFormat) + { + const NLS_FORMAT_NODE *node = NLS_GetFormats(lcid, dwFlags); + + if (!node) + { + SetLastError(lpFormat && dwFlags ? ERROR_INVALID_FLAGS : ERROR_INVALID_PARAMETER); + return 0; + } + lpFormat = &node->cyfmt; + lpszNegStart = lpszNeg = GetNegative(node); } else - goto GetCurrencyFormatW_Error; /* Invalid char */ - szSrc++; - } - szSrc--; /* Point to last character */ - - if (!(dwState & NF_DIGITS)) - goto GetCurrencyFormatW_Error; /* No digits */ - - if (dwState & NF_ISNEGATIVE) - dwFmt = NLS_NegCyFormats[lpFormat->NegativeOrder]; - else - dwFmt = NLS_PosCyFormats[lpFormat->PositiveOrder]; - - /* Add any trailing negative or currency signs */ - if (dwFmt & CF_PARENS) - *szOut-- = ')'; - - while (dwFmt & (CF_MINUS_RIGHT|CF_CY_RIGHT)) - { - switch (dwFmt & (CF_MINUS_RIGHT|CF_MINUS_BEFORE|CF_CY_RIGHT)) - { - case CF_MINUS_RIGHT: - case CF_MINUS_RIGHT|CF_CY_RIGHT: - while (lpszNeg >= lpszNegStart) - *szOut-- = *lpszNeg--; - dwFmt &= ~CF_MINUS_RIGHT; - break; - - case CF_CY_RIGHT: - case CF_MINUS_BEFORE|CF_CY_RIGHT: - case CF_MINUS_RIGHT|CF_MINUS_BEFORE|CF_CY_RIGHT: - while (lpszCy >= lpszCyStart) - *szOut-- = *lpszCy--; - if (dwFmt & CF_CY_SPACE) - *szOut-- = ' '; - dwFmt &= ~(CF_CY_RIGHT|CF_MINUS_BEFORE); - break; - } - } - - /* Copy all digits up to the decimal point */ - if (!lpFormat->NumDigits) - { - if (dwState & NF_ISREAL) - { - while (*szSrc != '.') /* Don't write any decimals or a separator */ - { - if (*szSrc >= '5' || (*szSrc == '4' && (dwState & NF_ROUND))) - dwState |= NF_ROUND; + { + GetLocaleInfoW(lcid, + LOCALE_SNEGATIVESIGN | (dwFlags & LOCALE_NOUSEROVERRIDE), + szNegBuff, + sizeof(szNegBuff)/sizeof(WCHAR)); + lpszNegStart = lpszNeg = szNegBuff; + } + + dwFlags &= (LOCALE_NOUSEROVERRIDE|LOCALE_USE_CP_ACP); + + lpszNeg = lpszNeg + strlenW(lpszNeg) - 1; + lpszCyStart = lpFormat->lpCurrencySymbol; + lpszCy = lpszCyStart + strlenW(lpszCyStart) - 1; + + /* Format the currency backwards into a temporary buffer */ + + szSrc = lpszValue; + *szOut-- = '\0'; + + /* Check the number for validity */ + while (*szSrc) + { + if (*szSrc >= '0' && *szSrc <= '9') + { + dwState |= NF_DIGITS; + if (dwState & NF_ISREAL) + { + dwDecimals++; + } + } + else if (*szSrc == '-') + { + if (dwState) // '-' not first character + { + SetLastError(lpFormat && dwFlags ? ERROR_INVALID_FLAGS : ERROR_INVALID_PARAMETER); + return 0; + } + dwState |= NF_ISNEGATIVE; + } + else if (*szSrc == '.') + { + if (dwState & NF_ISREAL) // More than one '.' + { + SetLastError(lpFormat && dwFlags ? ERROR_INVALID_FLAGS : ERROR_INVALID_PARAMETER); + return 0; + } + dwState |= NF_ISREAL; + } + else // Invalid char + { + SetLastError(lpFormat && dwFlags ? ERROR_INVALID_FLAGS : ERROR_INVALID_PARAMETER); + return 0; + } + szSrc++; + } // while (*szSrc) + + szSrc--; // Point to last character + + if (!(dwState & NF_DIGITS)) // No digits + { + SetLastError(lpFormat && dwFlags ? ERROR_INVALID_FLAGS : ERROR_INVALID_PARAMETER); + return 0; + } + + // Sel fmt table + dwFmt = (dwState & NF_ISNEGATIVE)?NLS_NegCyFormats[lpFormat->NegativeOrder]: + NLS_PosCyFormats[lpFormat->PositiveOrder]; + + // Add any trailing negative or currency signs + if (dwFmt & CF_PARENS) + { + *szOut-- = ')'; + } + + while (dwFmt & (CF_MINUS_RIGHT|CF_CY_RIGHT)) + { + switch (dwFmt & (CF_MINUS_RIGHT|CF_MINUS_BEFORE|CF_CY_RIGHT)) + { + case CF_MINUS_RIGHT: // Add right negative sign + case CF_MINUS_RIGHT|CF_CY_RIGHT: + while (lpszNeg >= lpszNegStart) + { + *szOut-- = *lpszNeg--; + } + dwFmt &= ~CF_MINUS_RIGHT; + break; + + case CF_CY_RIGHT: // Add right currency sign + case CF_MINUS_BEFORE|CF_CY_RIGHT: + case CF_MINUS_RIGHT|CF_MINUS_BEFORE|CF_CY_RIGHT: + while (lpszCy >= lpszCyStart) + { + *szOut-- = *lpszCy--; + } + if (dwFmt & CF_CY_SPACE) + { + *szOut-- = ' '; + } + dwFmt &= ~(CF_CY_RIGHT|CF_MINUS_BEFORE); + break; + } + } + + // Copy all digits up to the decimal point + if (!lpFormat->NumDigits) + { + if (dwState & NF_ISREAL) + { + while (*szSrc != '.') // Don't write any decimals or a separator + { + if (*szSrc >= '5' || (*szSrc == '4' && (dwState & NF_ROUND))) + { + dwState |= NF_ROUND; + } + else + { + dwState &= ~NF_ROUND; + } + szSrc--; + } + szSrc--; + } + } + else + { + LPWSTR lpszDec = lpFormat->lpDecimalSep + strlenW(lpFormat->lpDecimalSep) - 1; + + if (dwDecimals <= lpFormat->NumDigits) + { + dwDecimals = lpFormat->NumDigits - dwDecimals; + while (dwDecimals--) + { + *szOut-- = '0'; // Pad to correct number of dp + } + } else - dwState &= ~NF_ROUND; - szSrc--; - } - szSrc--; - } - } - else - { - LPWSTR lpszDec = lpFormat->lpDecimalSep + strlenW(lpFormat->lpDecimalSep) - 1; - - if (dwDecimals <= lpFormat->NumDigits) - { - dwDecimals = lpFormat->NumDigits - dwDecimals; - while (dwDecimals--) - *szOut-- = '0'; /* Pad to correct number of dp */ - } - else - { - dwDecimals -= lpFormat->NumDigits; - /* Skip excess decimals, and determine if we have to round the number */ - while (dwDecimals--) - { - if (*szSrc >= '5' || (*szSrc == '4' && (dwState & NF_ROUND))) - dwState |= NF_ROUND; + { + dwDecimals -= lpFormat->NumDigits; + // Skip excess decimals, and determine if we have to round the number + while (dwDecimals--) + { + if (*szSrc >= '5' || (*szSrc == '4' && (dwState & NF_ROUND))) + { + dwState |= NF_ROUND; + } + else + { + dwState &= ~NF_ROUND; + } + szSrc--; + } + } + + if (dwState & NF_ISREAL) + { + while (*szSrc != '.') + { + if (dwState & NF_ROUND) + { + if (*szSrc == '9') + { + *szOut-- = '0'; // continue rounding + } + else + { + dwState &= ~NF_ROUND; + *szOut-- = (*szSrc)+1; + } + szSrc--; + } + else + { + *szOut-- = *szSrc--; /* Write existing decimals */ + } + } + szSrc--; // Skip '.' + } + + while (lpszDec >= lpFormat->lpDecimalSep) + { + *szOut-- = *lpszDec--; // Write decimal separator + } + } // if (!lpFormat->NumDigits) + + dwGroupCount = lpFormat->Grouping; + // FIXME: windows XP support complicated grouping ie: "2;3;0" + + // Write the remaining whole number digits, including grouping chars + while (szSrc >= lpszValue && *szSrc >= '0' && *szSrc <= '9') + { + if (dwState & NF_ROUND) + { + if (*szSrc == '9') + { + *szOut-- = '0'; // continue rounding + } + else + { + dwState &= ~NF_ROUND; + *szOut-- = (*szSrc)+1; + } + szSrc--; + } else - dwState &= ~NF_ROUND; - szSrc--; - } - } - - if (dwState & NF_ISREAL) - { - while (*szSrc != '.') - { - if (dwState & NF_ROUND) - { - if (*szSrc == '9') - *szOut-- = '0'; /* continue rounding */ - else - { - dwState &= ~NF_ROUND; - *szOut-- = (*szSrc)+1; - } - szSrc--; + *szOut-- = *szSrc--; + + dwState |= NF_DIGITS_OUT; + dwCurrentGroupCount++; + if (szSrc >= lpszValue && dwCurrentGroupCount == dwGroupCount) + { + // Group sep string + LPWSTR lpszGrp = lpFormat->lpThousandSep + + strlenW(lpFormat->lpThousandSep) - 1; + + while (lpszGrp >= lpFormat->lpThousandSep) + { + *szOut-- = *lpszGrp--; // Write grouping char + } + + dwCurrentGroupCount = 0; + } + } + + // Correct negative result, delete unnecessary group sep + if(dwState & NF_ISNEGATIVE) + { + szOut += strlenW(lpFormat->lpThousandSep); + } + + if (dwState & NF_ROUND) + { + *szOut-- = '1'; // e.g. .6 > 1.0 + } + else if (!(dwState & NF_DIGITS_OUT) && lpFormat->LeadingZero) + { + *szOut-- = '0'; // Add leading 0 if we have no digits before the decimal point + } + + // Add any leading negative or currency sign + while (dwFmt & (CF_MINUS_LEFT|CF_CY_LEFT)) + { + switch (dwFmt & (CF_MINUS_LEFT|CF_MINUS_BEFORE|CF_CY_LEFT)) + { + case CF_MINUS_LEFT: // Add left negative sign + case CF_MINUS_LEFT|CF_CY_LEFT: + while (lpszNeg >= lpszNegStart) + { + *szOut-- = *lpszNeg--; + } + dwFmt &= ~CF_MINUS_LEFT; + break; + + case CF_CY_LEFT: // Add left currency sign + case CF_CY_LEFT|CF_MINUS_BEFORE: + case CF_MINUS_LEFT|CF_MINUS_BEFORE|CF_CY_LEFT: + if (dwFmt & CF_CY_SPACE) + { + *szOut-- = ' '; + } + while (lpszCy >= lpszCyStart) + { + *szOut-- = *lpszCy--; + } + dwFmt &= ~(CF_CY_LEFT|CF_MINUS_BEFORE); + break; + } + } + + // Add left bracket + if (dwFmt & CF_PARENS) + { + *szOut-- = '('; + } + szOut++; + + iRet = strlenW(szOut) + 1; + if (cchOut) + { + if (iRet <= cchOut) + { + memcpy(lpCurrencyStr, szOut, iRet * sizeof(WCHAR)); } else - *szOut-- = *szSrc--; /* Write existing decimals */ - } - szSrc--; /* Skip '.' */ - } - while (lpszDec >= lpFormat->lpDecimalSep) - *szOut-- = *lpszDec--; /* Write decimal separator */ - } - - dwGroupCount = lpFormat->Grouping; - - /* Write the remaining whole number digits, including grouping chars */ - while (szSrc >= lpszValue && *szSrc >= '0' && *szSrc <= '9') - { - if (dwState & NF_ROUND) - { - if (*szSrc == '9') - *szOut-- = '0'; /* continue rounding */ - else - { - dwState &= ~NF_ROUND; - *szOut-- = (*szSrc)+1; - } - szSrc--; - } - else - *szOut-- = *szSrc--; - - dwState |= NF_DIGITS_OUT; - dwCurrentGroupCount++; - if (szSrc >= lpszValue && dwCurrentGroupCount == dwGroupCount) - { - LPWSTR lpszGrp = lpFormat->lpThousandSep + strlenW(lpFormat->lpThousandSep) - 1; - - while (lpszGrp >= lpFormat->lpThousandSep) - *szOut-- = *lpszGrp--; /* Write grouping char */ - - dwCurrentGroupCount = 0; - } - } - if (dwState & NF_ROUND) - *szOut-- = '1'; /* e.g. .6 > 1.0 */ - else if (!(dwState & NF_DIGITS_OUT) && lpFormat->LeadingZero) - *szOut-- = '0'; /* Add leading 0 if we have no digits before the decimal point */ - - /* Add any leading negative or currency sign */ - while (dwFmt & (CF_MINUS_LEFT|CF_CY_LEFT)) - { - switch (dwFmt & (CF_MINUS_LEFT|CF_MINUS_BEFORE|CF_CY_LEFT)) - { - case CF_MINUS_LEFT: - case CF_MINUS_LEFT|CF_CY_LEFT: - while (lpszNeg >= lpszNegStart) - *szOut-- = *lpszNeg--; - dwFmt &= ~CF_MINUS_LEFT; - break; - - case CF_CY_LEFT: - case CF_CY_LEFT|CF_MINUS_BEFORE: - case CF_MINUS_LEFT|CF_MINUS_BEFORE|CF_CY_LEFT: - if (dwFmt & CF_CY_SPACE) - *szOut-- = ' '; - while (lpszCy >= lpszCyStart) - *szOut-- = *lpszCy--; - dwFmt &= ~(CF_CY_LEFT|CF_MINUS_BEFORE); - break; - } - } - if (dwFmt & CF_PARENS) - *szOut-- = '('; - szOut++; - - iRet = strlenW(szOut) + 1; - if (cchOut) - { - if (iRet <= cchOut) - memcpy(lpCurrencyStr, szOut, iRet * sizeof(WCHAR)); - else - { - memcpy(lpCurrencyStr, szOut, cchOut * sizeof(WCHAR)); - lpCurrencyStr[cchOut - 1] = '\0'; - SetLastError(ERROR_INSUFFICIENT_BUFFER); - iRet = 0; - } - } - return iRet; + { + memcpy(lpCurrencyStr, szOut, cchOut * sizeof(WCHAR)); + lpCurrencyStr[cchOut - 1] = '\0'; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + iRet = 0; + } + } + return iRet; } /* FIXME: Everything below here needs to move somewhere else along with the

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