Ros-diffs January 2011

ros-diffs@reactos.org

20 participants
336 discussions

[fireball] 50364: - Change SWM API to use window id's instead of hwnds. - Deprecate RosGdiReleaseDC, the DC always have a window selected (either root one if it's released, or the one passed via Ge...

by fireball＠svn.reactos.org

Author: fireball Date: Wed Jan 12 10:34:41 2011 New Revision: 50364 URL: http://svn.reactos.org/svn/reactos?rev=50364&view=rev Log: - Change SWM API to use window id's instead of hwnds. - Deprecate RosGdiReleaseDC, the DC always have a window selected (either root one if it's released, or the one passed via GetDC). - Use "good" version of code in RosDrv_GetDC, getting rid of old GetAncestor hack. - Change include order of ntrosgdi.h and rosuser.h. The latter one must always be included before ntrosgdi one. - Kernelmode DC-related changes: * Save DC type, because clipping will be different for memory and window DCs. * Always select a window for OBJ_DC. In the default mode a root window is selected. * Simplify clipping calculations, make them transparent and understandable, remove dummy window hack. - SWM changes: * Add an always existing root_window, which is used now instead of a number of dynamically created desktop windows. * Add SWM window events structures and definitions. Unused now, and future usage is still subject for further experiments. - One problem is introduced, which leads to inability to get a full screen DC (it will be clipped by children). To be fixed by next commits introducing clipping properties. Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c branches/arwinss/reactos/dll/win32/winent.drv/window.c branches/arwinss/reactos/dll/win32/winent.drv/winent.h branches/arwinss/reactos/include/reactos/wine/ntrosgdi.h branches/arwinss/reactos/include/reactos/wine/rosuser.h branches/arwinss/reactos/subsystems/win32/win32k/gdi/bitmap.c branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild 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] Wed Jan 12 10:34:41 2011 @@ -213,10 +213,7 @@ physDev->dc_rect = data->dc_rect; RosGdiSetDcRects(physDev->hKernelDC, NULL, (RECT*)&data->drawable_rect); - if (!data->release) - RosGdiGetDC(physDev->hKernelDC, data->hwnd, data->clip_children); - else - RosGdiReleaseDC(physDev->hKernelDC); + RosGdiGetDC(physDev->hKernelDC, data->drawable, data->clip_children); TRACE( "SET_DRAWABLE hdc %p dc_rect %s drawable_rect %s\n", physDev->hdc, wine_dbgstr_rect(&data->dc_rect), wine_dbgstr_rect(&data->drawable_rect) ); Modified: branches/arwinss/reactos/dll/win32/winent.drv/window.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/window.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/window.c [iso-8859-1] Wed Jan 12 10:34:41 2011 @@ -355,7 +355,7 @@ //GrRaiseWindow(data->whole_window); //changes.stack_mode = Above; //mask |= CWStackMode; - SwmSetForeground(data->hwnd); + SwmSetForeground(data->whole_window); } /* should use stack_mode Below but most window managers don't get it right */ /* and Above with a sibling doesn't work so well either, so we ignore it */ @@ -491,38 +491,31 @@ { int cx, cy; GR_WINDOW_ID client; - - /*attr.bit_gravity = NorthWestGravity; - attr.win_gravity = NorthWestGravity; - attr.backing_store = NotUseful; - attr.event_mask = (ExposureMask | PointerMotionMask | - ButtonPressMask | ButtonReleaseMask | EnterWindowMask); - mask = CWEventMask | CWBitGravity | CWWinGravity | CWBackingStore;*/ + RECT winRect; if ((cx = data->client_rect.right - data->client_rect.left) <= 0) cx = 1; else if (cx > 65535) cx = 65535; if ((cy = data->client_rect.bottom - data->client_rect.top) <= 0) cy = 1; else if (cy > 65535) cy = 65535; - client = (GR_WINDOW_ID)1;//GrNewWindow( data->whole_window, - // data->client_rect.left - data->whole_rect.left, - // data->client_rect.top - data->whole_rect.top, - // cx, cy, 0, RGB(255,255,255), 0 ); - + winRect.left = data->client_rect.left - data->whole_rect.left; + winRect.top = data->client_rect.top - data->whole_rect.top; + winRect.right = winRect.left + cx; + winRect.bottom = winRect.top + cy; + + client = data->whole_window;//SwmNewWindow( data->whole_window, &winRect, data->hwnd, 0 ); if (!client) { return 0; } - //GrSelectEvents(client, GR_EVENT_MASK_EXPOSURE); - if (data->client_window) { - //GrDestroyWindow( data->client_window ); + //SwmDestroyWindow( data->client_window ); } data->client_window = client; - //GrMapWindow( data->client_window ); + //SwmShowWindow( data->client_window, TRUE, 0 ); SetPropA( data->hwnd, client_window_prop, (HANDLE)data->client_window ); return data->client_window; @@ -571,11 +564,6 @@ if (!data->whole_window) goto done; - /* Set override_redirect */ - //props.props = GR_WM_PROPS_NODECORATE; - //props.flags = GR_WM_FLAGS_PROPS; - //GrSetWMProperties(data->whole_window, &props); - if (!create_client_window( data )) { SwmDestroyWindow( data->whole_window ); @@ -625,9 +613,8 @@ /*********************************************************************** * NTDRV_get_client_window * - * Return the X window associated with the client area of a window - */ -#if 0 + * Return the SWM window associated with the client area of a window + */ static GR_WINDOW_ID NTDRV_get_client_window( HWND hwnd ) { struct ntdrv_win_data *data = NTDRV_get_win_data( hwnd ); @@ -639,7 +626,7 @@ } return data->client_window; } -#endif + /*********************************************************************** * NTDRV_GetDC (NTDRV.@) */ @@ -647,8 +634,8 @@ const RECT *top_rect, DWORD flags ) { struct ntdrv_escape_set_drawable escape; - //struct ntdrv_win_data *data = NTDRV_get_win_data( hwnd ); - //HWND parent; + struct ntdrv_win_data *data = NTDRV_get_win_data( hwnd ); + HWND parent; escape.code = NTDRV_SET_DRAWABLE; escape.clip_children = FALSE; @@ -664,7 +651,7 @@ escape.drawable_rect.top = top_rect->top; escape.drawable_rect.right = top_rect->right; escape.drawable_rect.bottom = top_rect->bottom; -#if GOOD_VERSION + if (top == hwnd) { if (flags & DCX_WINDOW) @@ -692,9 +679,6 @@ if (flags & DCX_CLIPCHILDREN) escape.clip_children = TRUE; } -#else - escape.hwnd = GetAncestor(hwnd, GA_ROOT); -#endif TRACE("hdc %x, hwnd %x, top %x\n win_rect %s, top_rect %s\n", hdc, hwnd, top, wine_dbgstr_rect(win_rect), wine_dbgstr_rect(top_rect)); @@ -788,8 +772,7 @@ TRACE("SetFocus %x, desk %x\n", hwnd, GetDesktopWindow()); /* Bring this window to foreground */ - SwmSetForeground(hwnd); - //GrRaiseWindow(data->whole_window); + SwmSetForeground(data->whole_window); } /*********************************************************************** Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] Wed Jan 12 10:34:41 2011 @@ -31,8 +31,8 @@ #include <ndk/ntndk.h> #include <winddi.h> #include <win32k/ntgdityp.h> -#include "ntrosgdi.h" #include "wine/rosuser.h" +#include "wine/ntrosgdi.h" #include "wine/list.h" #include "wine/unicode.h" #include "wine/server.h" Modified: branches/arwinss/reactos/include/reactos/wine/ntrosgdi.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/ntrosgdi.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/ntrosgdi.h [iso-8859-1] Wed Jan 12 10:34:41 2011 @@ -110,7 +110,7 @@ const PIXELFORMATDESCRIPTOR *ppfd); COLORREF APIENTRY RosGdiSetTextColor( HDC physDev, COLORREF color ); VOID APIENTRY RosGdiSetDcRects( HDC physDev, RECT *rcDcRect, RECT *rcVport ); -VOID APIENTRY RosGdiGetDC( HDC physDev, HWND hwnd, BOOL clipChildren ); +VOID APIENTRY RosGdiGetDC( HDC physDev, GR_WINDOW_ID Wid, BOOL clipChildren ); VOID APIENTRY RosGdiReleaseDC( HDC physDev ); /* enum.c */ Modified: branches/arwinss/reactos/include/reactos/wine/rosuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/rosuser.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/rosuser.h [iso-8859-1] Wed Jan 12 10:34:41 2011 @@ -15,11 +15,49 @@ #define SWM_ROOT_WINDOW_ID 1 +#define SWM_EVENT_TYPE_NONE 0 +#define SWM_EVENT_TYPE_EXPOSURE 1 + +/* Event masks */ +#define SWM_EVENTMASK(n) (((ULONG) 1) << (n)) + +#define SWM_EVENT_MASK_NONE SWM_EVENTMASK(SWM_EVENT_TYPE_NONE) +#define SWM_EVENT_MASK_EXPOSURE SWM_EVENTMASK(SWM_EVENT_TYPE_EXPOSURE) + /* ENUMERATIONS **************************************************************/ /* TYPES *********************************************************************/ typedef ULONG_PTR GR_WINDOW_ID; +typedef ULONG SWM_EVENT_TYPE; + +typedef struct +{ + SWM_EVENT_TYPE type; /**< event type */ + GR_WINDOW_ID wid; /**< window id */ + GR_WINDOW_ID otherid; /**< new/old focus id for focus events*/ + /**< for mouse enter only the following are valid:*/ + LONG rootx; /**< root window x coordinate */ + LONG rooty; /**< root window y coordinate */ + LONG x; /**< window x coordinate of mouse */ + LONG y; /**< window y coordinate of mouse */ +} SWM_EVENT_GENERAL; + +typedef struct { + SWM_EVENT_TYPE type; /**< event type */ + GR_WINDOW_ID wid; /**< window id */ + LONG x; /**< window x coordinate of exposure */ + LONG y; /**< window y coordinate of exposure */ + LONG width; /**< width of exposure */ + LONG height; /**< height of exposure */ +} SWM_EVENT_EXPOSURE; + +typedef union +{ + SWM_EVENT_TYPE type; /**< event type */ + SWM_EVENT_GENERAL general; /**< general window events */ + SWM_EVENT_EXPOSURE exposure; /**< exposure events */ +} SWM_EVENT; /* FUNCTIONS *****************************************************************/ @@ -187,7 +225,7 @@ SwmDestroyWindow(GR_WINDOW_ID Wid); VOID NTAPI -SwmSetForeground(HWND hWnd); +SwmSetForeground(GR_WINDOW_ID Wid); VOID NTAPI SwmPosChanged(GR_WINDOW_ID Wid, const RECT *WindowRect, const RECT *OldRect, HWND hWndAfter, UINT SwpFlags); @@ -198,4 +236,10 @@ VOID NTAPI SwmShowWindow(GR_WINDOW_ID Wid, BOOLEAN Show, UINT SwpFlags); +int NTAPI +SwmPeekEvent(SWM_EVENT *ep); + +VOID NTAPI +SwmGetNextEvent(SWM_EVENT *ep); + #endif /* __WIN32K_NTUSER_H */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/bitmap.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/bitmap.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/bitmap.c [iso-8859-1] Wed Jan 12 10:34:41 2011 @@ -303,6 +303,8 @@ { BOOLEAN bRet; PDC pDst; + + DPRINT("PatBlt hdc %x, offs (%d,%d), w %d, h %d\n", physDev, left, top, width, height); /* Get a pointer to the DCs */ pDst = DC_LockDc(physDev); 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] Wed Jan 12 10:34:41 2011 @@ -97,6 +97,8 @@ pNewDC->dclevel.hpal = StockObjects[DEFAULT_PALETTE]; pNewDC->dclevel.ppal = PALETTE_ShareLockPalette(pNewDC->dclevel.hpal); + pNewDC->type = dcType; + if (dcType == OBJ_MEMDC) { DPRINT("Creating a memory DC %x\n", hNewDC); @@ -105,6 +107,8 @@ /* Set DC rectangles */ pNewDC->rcVport.left = 0; pNewDC->rcVport.top = 0; pNewDC->rcVport.right = 1; pNewDC->rcVport.bottom = 1; + + pNewDC->pWindow = NULL; } else { @@ -116,15 +120,19 @@ pNewDC->rcVport.top = 0; pNewDC->rcVport.right = PrimarySurface.gdiinfo.ulHorzRes; pNewDC->rcVport.bottom = PrimarySurface.gdiinfo.ulVertRes; + + pNewDC->pWindow = &SwmRoot; } /* Create an empty combined clipping region */ pNewDC->CombinedClip = EngCreateClip(); - pNewDC->Clipping = create_empty_region(); - pNewDC->pWindow = NULL; + pNewDC->Clipping = NULL; /* Set default palette */ pNewDC->dclevel.hpal = StockObjects[DEFAULT_PALETTE]; + + /* Calculate new combined clipping region */ + RosGdiUpdateClipping(pNewDC, FALSE); /* Give handle to the caller */ *pdev = hNewDC; @@ -407,34 +415,72 @@ return 0; } -VOID APIENTRY RosGdiUpdateClipping(PDC pDC) -{ - struct region *inter; - if (!pDC->pWindow) - { - /* Easy case, just copy the existing clipping region */ +VOID APIENTRY RosGdiUpdateClipping(PDC pDC, BOOLEAN IgnoreVisibility) +{ + struct region *window, *surface; + rectangle_t surfrect = {0,0,0,0}; + + surface = create_empty_region(); + surfrect.right = pDC->dclevel.pSurface->SurfObj.sizlBitmap.cx; + surfrect.bottom = pDC->dclevel.pSurface->SurfObj.sizlBitmap.cy; + set_region_rect(surface, &surfrect); + + if (pDC->type == OBJ_MEMDC) + { + /* underlying surface rect X user clipping (if any) */ if (pDC->CombinedClip) EngDeleteClip(pDC->CombinedClip); - pDC->CombinedClip = IntEngCreateClipRegionFromRegion(pDC->Clipping); + + if (pDC->Clipping) + intersect_region(surface, surface, pDC->Clipping); + + pDC->CombinedClip = IntEngCreateClipRegionFromRegion(surface); } else { - /* Intersect with window's visibility */ - inter = create_empty_region(); - copy_region(inter, pDC->Clipping); + if (!pDC->pWindow) + { + /* Drawing is forbidden */ + if (pDC->CombinedClip) EngDeleteClip(pDC->CombinedClip); + pDC->CombinedClip = EngCreateClip(); + return; + } + + /* window visibility X user clipping (if any) X underlying surface */ /* Acquire SWM lock */ SwmAcquire(); - /* Intersect current clipping region and window's visible region */ - intersect_region(inter, inter, pDC->pWindow->Visible); - - /* Release SWM lock */ - SwmRelease(); - - if (pDC->CombinedClip) EngDeleteClip(pDC->CombinedClip); - pDC->CombinedClip = IntEngCreateClipRegionFromRegion(inter); - free_region(inter); - } + //window = SwmSetClipWindow(pDC->pWindow, NULL, pDC->ExcludeChildren); + window = pDC->pWindow->Visible; + + if (window) + { + /* Intersect window's visible region X underlying surface */ + if (!IgnoreVisibility) + intersect_region(surface, surface, window); + + /* Intersect result X user clipping (if any) */ + if (pDC->Clipping) + intersect_region(surface, surface, pDC->Clipping); + + /* Release SWM lock */ + SwmRelease(); + + if (pDC->CombinedClip) EngDeleteClip(pDC->CombinedClip); + pDC->CombinedClip = IntEngCreateClipRegionFromRegion(surface); + } + else + { + /* Release SWM lock */ + SwmRelease(); + + /* Drawing is forbidden */ + if (pDC->CombinedClip) EngDeleteClip(pDC->CombinedClip); + pDC->CombinedClip = EngCreateClip(); + } + } + + free_region(surface); } void APIENTRY RosGdiSetDeviceClipping( HDC physDev, UINT count, PRECTL pRects, PRECTL rcBounds ) @@ -442,7 +488,7 @@ PDC pDC; RECTL pStackBuf[8]; RECTL *pSafeRects = pStackBuf; - RECTL rcSafeBounds; + RECTL rcSafeBounds = {0}; ULONG i; NTSTATUS Status = STATUS_SUCCESS; @@ -503,19 +549,9 @@ if (pDC->Clipping) free_region(pDC->Clipping); - if (count == 0) - { - /* Set unclipped mode (underlying surface rectangle) */ - RECTL_vSetRect(&rcSafeBounds, - 0, - 0, - pDC->dclevel.pSurface->SurfObj.sizlBitmap.cx, - pDC->dclevel.pSurface->SurfObj.sizlBitmap.cy); - - /* Set the clipping object */ - pDC->Clipping = create_region_from_rects(&rcSafeBounds, 1); - } - else + pDC->Clipping = NULL; + + if (count) { /* Set the clipping object */ pDC->Clipping = create_region_from_rects(pSafeRects, count); @@ -531,7 +567,7 @@ } /* Update the combined clipping */ - RosGdiUpdateClipping(pDC); + RosGdiUpdateClipping(pDC, FALSE); /* Release the object */ DC_UnlockDc(pDC); @@ -593,7 +629,7 @@ DC_UnlockDc(pDC); } -VOID APIENTRY RosGdiGetDC(HDC physDev, HWND hwnd, BOOL clipChildren) +VOID APIENTRY RosGdiGetDC(HDC physDev, GR_WINDOW_ID Wid, BOOL clipChildren) { PDC pDC; @@ -604,16 +640,16 @@ pDC = DC_LockDc(physDev); /* Get a pointer to this window */ - if (hwnd) - pDC->pWindow = SwmFindByHwnd(hwnd); - - /* Handle situation when drawing is forbidden */ - if (!hwnd || !pDC->pWindow) - { - /* Make up a dummy window object which will have empty visibility */ - pDC->pWindow = ExAllocatePool(PagedPool, sizeof(SWM_WINDOW)); - RtlZeroMemory(pDC->pWindow, sizeof(SWM_WINDOW)); - pDC->pWindow->Visible = create_empty_region(); + if (Wid) + { + pDC->pWindow = SwmGetWindowById(Wid); + DPRINT("hdc %x set window hwnd %x\n", physDev, pDC->pWindow->hwnd); + } + else + { + /* Handle situation when drawing is forbidden */ + pDC->pWindow = NULL; + DPRINT("hdc %x, restricting any drawing\n", physDev); } /* Release the object */ @@ -623,6 +659,7 @@ SwmRelease(); } +//FIXME: to be deleted! VOID APIENTRY RosGdiReleaseDC(HDC physDev) { PDC pDC; 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] Wed Jan 12 10:34:41 2011 @@ -21,6 +21,7 @@ PPDEVOBJ ppdev; DCLEVEL dclevel; + ULONG type; COLORREF crForegroundClr; COLORREF crBackgroundClr; @@ -42,7 +43,7 @@ #define DC_UnlockDc(pDC) \ GDIOBJ_UnlockObjByPtr ((PBASEOBJECT)pDC) -VOID APIENTRY RosGdiUpdateClipping(PDC pDC); +VOID APIENTRY RosGdiUpdateClipping(PDC pDC, BOOLEAN IgnoreVisibility); BOOL INTERNAL_CALL DC_Cleanup(PVOID ObjectBody); Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h [iso-8859-1] Wed Jan 12 10:34:41 2011 @@ -1,5 +1,11 @@ #ifndef SWM__H #define SWM__H + +typedef struct _SWM_EVENT_LIST SWM_EVENT_LIST; +struct _SWM_EVENT_LIST { + SWM_EVENT_LIST *next; /* next element in list */ + SWM_EVENT event; /* event */ +}; typedef struct _SWM_WINDOW { @@ -12,6 +18,7 @@ LIST_ENTRY Entry; } SWM_WINDOW, *PSWM_WINDOW; +extern SWM_WINDOW SwmRoot; VOID NTAPI SwmInitialize(); VOID NTAPI GrContextInit(); @@ -19,5 +26,6 @@ VOID NTAPI SwmAcquire(VOID); VOID NTAPI SwmRelease(VOID); HDC SwmGetScreenDC(); +PSWM_WINDOW NTAPI SwmGetWindowById(GR_WINDOW_ID Wid); #endif Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] Wed Jan 12 10:34:41 2011 @@ -24,8 +24,8 @@ #include <wine/list.h> /* RosGdi syscalls */ +#include <wine/rosuser.h> #include <wine/ntrosgdi.h> -#include <wine/rosuser.h> /* CSR interaction */ #include <csr.h> Modified: branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] Wed Jan 12 10:34:41 2011 @@ -31,6 +31,7 @@ LIST_ENTRY SwmWindows; ERESOURCE SwmLock; HDC SwmDc; /* Screen DC for copying operations */ +SWM_WINDOW SwmRoot; /* FUNCTIONS *****************************************************************/ @@ -56,24 +57,11 @@ NTAPI SwmCreateScreenDc() { - PDC pDC; - RECTL rcBounds; - /* Create the display DC */ SwmDc = (HDC)0; RosGdiCreateDC(&SwmDc, NULL, NULL, NULL, NULL, OBJ_DC); - /* Set clipping to full screen */ - pDC = DC_LockDc(SwmDc); - RECTL_vSetRect(&rcBounds, - 0, - 0, - pDC->rcVport.right, - pDC->rcVport.bottom); - IntEngDeleteClipRegion(pDC->CombinedClip); - pDC->CombinedClip = IntEngCreateClipRegion(1, &rcBounds, &rcBounds); - DC_UnlockDc(pDC); - //RosGdiSetDeviceClipping(SwmDc, 1, &rcBounds, &rcBounds); + DPRINT1("Screen hdc is %x\n", SwmDc); /* Make it global */ GDIOBJ_SetOwnership(SwmDc, NULL); @@ -85,6 +73,16 @@ if (!SwmDc) SwmCreateScreenDc(); return SwmDc; +} + +PSWM_WINDOW +NTAPI +SwmGetWindowById(GR_WINDOW_ID Wid) +{ + /* Right now, Wid is a pointer to SWM_WINDOW structure, + except for SWM_ROOT_WINDOW_ID which maps to a root window */ + if (Wid == SWM_ROOT_WINDOW_ID) return &SwmRoot; + return (PSWM_WINDOW)Wid; } VOID @@ -389,6 +387,7 @@ NTAPI SwmAddDesktopWindow(HWND hWnd, UINT Width, UINT Height) { +#if 0 PSWM_WINDOW Desktop; /* Acquire the lock */ @@ -429,6 +428,10 @@ /* Release the lock */ SwmRelease(); +#endif + + SwmRoot.hwnd = hWnd; + SwmInvalidateRegion(&SwmRoot, SwmRoot.Visible, &SwmRoot.Window); } PSWM_WINDOW @@ -470,8 +473,8 @@ /* Acquire the lock */ SwmAcquire(); - /* Allocate entry */ - Win = (PSWM_WINDOW)Wid; + /* Get window pointer */ + Win = SwmGetWindowById(Wid); DPRINT("SwmRemoveWindow %x\n", Win->hwnd); @@ -565,37 +568,31 @@ VOID NTAPI -SwmSetForeground(HWND hWnd) +SwmSetForeground(GR_WINDOW_ID Wid) { PSWM_WINDOW SwmWin; extern struct window *shell_window; + /* Acquire the lock */ + SwmAcquire(); + + /* Get the window pointer */ + SwmWin = SwmGetWindowById(Wid); + /* Check for a shell window */ UserEnterExclusive(); /* Don't allow the shell window to become foreground */ if(shell_window && - (get_window((UINT_PTR)hWnd) == shell_window)) - { + (get_window((UINT_PTR)SwmWin->hwnd) == shell_window)) + { + SwmRelease(); UserLeave(); return; } UserLeave(); - /* Acquire the lock */ - SwmAcquire(); - - /* Allocate entry */ - SwmWin = SwmFindByHwnd(hWnd); - //ASSERT(SwmWin != NULL); - if (!SwmWin) - { - /* Release the lock */ - SwmRelease(); - return; - } - SwmBringToFront(SwmWin); /* Release the lock */ @@ -606,7 +603,7 @@ NTAPI SwmCopyBits(const PSWM_WINDOW SwmWin, const RECT *OldRect) { - RECTL rcBounds; + //RECTL rcBounds; PDC pDC; PLIST_ENTRY Current; struct region *TempRegion, *ParentRegion, *WinRegion = NULL; @@ -627,7 +624,10 @@ rcScreen.top = 0; rcScreen.right = pDC->rcVport.right; rcScreen.bottom = pDC->rcVport.bottom; - set_region_rect(pDC->Clipping, &rcScreen); + + /* Free user clipping, if any */ + if (pDC->Clipping) free_region(pDC->Clipping); + pDC->Clipping = NULL; ParentRegion = create_empty_region(); @@ -659,12 +659,17 @@ Current = Current->Blink; } - /* Remove parts clipped by parents from the window region */ + /* Remove parts clipped by parents from the window region, and set result as a user clipping region */ if (!is_region_empty(ParentRegion)) - subtract_region(pDC->Clipping, pDC->Clipping, ParentRegion); + { + TempRegion = create_empty_region(); + set_region_rect(TempRegion, &rcScreen); + subtract_region(TempRegion, TempRegion, ParentRegion); + pDC->Clipping = TempRegion; + } /* Set DC clipping */ - RosGdiUpdateClipping(pDC); + RosGdiUpdateClipping(pDC, TRUE); /* Get the part which was previously hidden by parent area */ WinRegion = create_empty_region(); @@ -691,14 +696,13 @@ } else { - /* Simple case, use whole viewport as a clipping rect */ - RECTL_vSetRect(&rcBounds, - 0, - 0, - pDC->rcVport.right, - pDC->rcVport.bottom); - IntEngDeleteClipRegion(pDC->CombinedClip); - pDC->CombinedClip = IntEngCreateClipRegion(1, &rcBounds, &rcBounds); + /* Simple case, no clipping */ + + if (pDC->Clipping) free_region(pDC->Clipping); + pDC->Clipping = NULL; + + /* Set DC clipping */ + RosGdiUpdateClipping(pDC, TRUE); } DC_UnlockDc(pDC); @@ -724,7 +728,7 @@ /* Acquire the lock */ SwmAcquire(); - SwmWin = (PSWM_WINDOW)Wid; + SwmWin = SwmGetWindowById(Wid); /* Save parameters */ OldRectSafe.left = OldRect->left; OldRectSafe.top = OldRect->top; @@ -826,7 +830,7 @@ /* Acquire the lock */ SwmAcquire(); - Win = (PSWM_WINDOW)Wid; + Win = SwmGetWindowById(Wid); DPRINT("SwmShowWindow %x, Show %d\n", Win->hwnd, Show); @@ -935,6 +939,18 @@ { DPRINT1("Failure initializing SWM resource!\n"); } + + /* Initialize a root window */ + SwmRoot.Window.left = 0; + SwmRoot.Window.top = 0; + SwmRoot.Window.right = 800; //FIXME! + SwmRoot.Window.bottom = 600; //FIXME! + SwmRoot.Hidden = FALSE; + SwmRoot.Topmost = FALSE; + SwmRoot.Visible = create_empty_region(); + set_region_rect(SwmRoot.Visible, &SwmRoot.Window); + + InsertHeadList(&SwmWindows, &SwmRoot.Entry); } /* EOF */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Wed Jan 12 10:34:41 2011 @@ -133,6 +133,7 @@ </if> </directory> <directory name="swm"> + <file>swmevent.c</file> <file>winman.c</file> </directory> <directory name="wine">

13 years, 8 months

[tkreuzer] 50363: [WIN32K] Don't leak the memory for DIB sections. we set BMF_DONT_FREE in SURFACE_bSetBitmapBits, when the caller provides bits. This needs to be reconsidered.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jan 12 01:01:30 2011 New Revision: 50363 URL: http://svn.reactos.org/svn/reactos?rev=50363&view=rev Log: [WIN32K] Don't leak the memory for DIB sections. we set BMF_DONT_FREE in SURFACE_bSetBitmapBits, when the caller provides bits. This needs to be reconsidered. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Wed Jan 12 01:01:30 2011 @@ -1541,6 +1541,7 @@ bmp->dwOffset = offset; bmp->flags = API_BITMAP; bmp->biClrImportant = bi->biClrImportant; + bmp->SurfObj.fjBitmap &= ~BMF_DONT_FREE; /* HACK */ if(hpal != (HPALETTE)0xFFFFFFFF)

13 years, 8 months

[tkreuzer] 50362: [WIN32K] Don't trat BI_BITFIELDS as compressed format in DIB_CreateDIBSection. Fixes KSStudio. Why it was introduced by r48359? I don't know. It was broken before. I refrain from ...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jan 12 00:26:20 2011 New Revision: 50362 URL: http://svn.reactos.org/svn/reactos?rev=50362&view=rev Log: [WIN32K] Don't trat BI_BITFIELDS as compressed format in DIB_CreateDIBSection. Fixes KSStudio. Why it was introduced by r48359? I don't know. It was broken before. I refrain from making any more comments about that piece of ... code. See issue #5781 for more details. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Wed Jan 12 00:26:20 2011 @@ -1424,7 +1424,7 @@ // Get storage location for DIB bits. Only use biSizeImage if it's valid and // we're dealing with a compressed bitmap. Otherwise, use width * height. - totalSize = bi->biSizeImage && bi->biCompression != BI_RGB + totalSize = bi->biSizeImage && bi->biCompression != BI_RGB && bi->biCompression != BI_BITFIELDS ? bi->biSizeImage : (ULONG)(bm.bmWidthBytes * effHeight); if (section)

13 years, 8 months

[tkreuzer] 50361: [USER32] - Use new wsprintf library, remove old code (536 lines) - Fixes output of %I64, for example dxdiag

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jan 11 19:57:55 2011 New Revision: 50361 URL: http://svn.reactos.org/svn/reactos?rev=50361&view=rev Log: [USER32] - Use new wsprintf library, remove old code (536 lines) - Fixes output of %I64, for example dxdiag Removed: trunk/reactos/dll/win32/user32/misc/wsprintf.c Modified: trunk/reactos/dll/win32/user32/user32.rbuild Removed: trunk/reactos/dll/win32/user32/misc/wsprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/wspr… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/wsprintf.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/wsprintf.c (removed) @@ -1,536 +1,0 @@ -/* - * wsprintf functions - * - * Copyright 1996 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * NOTE: - * This code is duplicated in shlwapi. If you change something here make sure - * to change it in shlwapi too. - */ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS User32 - * PURPOSE: [w]sprintf functions - * FILE: lib/user32/wsprintf.c - * PROGRAMER: Steven Edwards - * REVISION HISTORY: 2003/07/13 Merged from wine user/wsprintf.c - * NOTES: Adapted from Wine - */ - -#include <user32.h> - -#define WINE_NO_TRACE_MSGS -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(string); - - -#define WPRINTF_LEFTALIGN 0x0001 /* Align output on the left ('-' prefix) */ -#define WPRINTF_PREFIX_HEX 0x0002 /* Prefix hex with 0x ('#' prefix) */ -#define WPRINTF_ZEROPAD 0x0004 /* Pad with zeros ('0' prefix) */ -#define WPRINTF_LONG 0x0008 /* Long arg ('l' prefix) */ -#define WPRINTF_SHORT 0x0010 /* Short arg ('h' prefix) */ -#define WPRINTF_UPPER_HEX 0x0020 /* Upper-case hex ('X' specifier) */ -#define WPRINTF_WIDE 0x0040 /* Wide arg ('w' prefix) */ - -typedef enum -{ - WPR_UNKNOWN, - WPR_CHAR, - WPR_WCHAR, - WPR_STRING, - WPR_WSTRING, - WPR_SIGNED, - WPR_UNSIGNED, - WPR_HEXA -} WPRINTF_TYPE; - -typedef struct -{ - UINT flags; - UINT width; - UINT precision; - WPRINTF_TYPE type; -} WPRINTF_FORMAT; - -typedef union { - WCHAR wchar_view; - CHAR char_view; - LPCSTR lpcstr_view; - LPCWSTR lpcwstr_view; - INT int_view; -} WPRINTF_DATA; - -static const CHAR null_stringA[] = "(null)"; -static const WCHAR null_stringW[] = { '(', 'n', 'u', 'l', 'l', ')', 0 }; - -/*********************************************************************** - * WPRINTF_ParseFormatA - * - * Parse a format specification. A format specification has the form: - * - * [-][#][0][width][.precision]type - * - * Return value is the length of the format specification in characters. - */ -static INT WPRINTF_ParseFormatA( LPCSTR format, WPRINTF_FORMAT *res ) -{ - LPCSTR p = format; - - res->flags = 0; - res->width = 0; - res->precision = 0; - if (*p == '-') { res->flags |= WPRINTF_LEFTALIGN; p++; } - if (*p == '#') { res->flags |= WPRINTF_PREFIX_HEX; p++; } - if (*p == '0') { res->flags |= WPRINTF_ZEROPAD; p++; } - while ((*p >= '0') && (*p <= '9')) /* width field */ - { - res->width = res->width * 10 + *p - '0'; - p++; - } - if (*p == '.') /* precision field */ - { - p++; - while ((*p >= '0') && (*p <= '9')) - { - res->precision = res->precision * 10 + *p - '0'; - p++; - } - } - if (*p == 'l') { res->flags |= WPRINTF_LONG; p++; } - else if (*p == 'h') { res->flags |= WPRINTF_SHORT; p++; } - else if (*p == 'w') { res->flags |= WPRINTF_WIDE; p++; } - switch(*p) - { - case 'c': - res->type = (res->flags & WPRINTF_LONG) ? WPR_WCHAR : WPR_CHAR; - break; - case 'C': - res->type = (res->flags & WPRINTF_SHORT) ? WPR_CHAR : WPR_WCHAR; - break; - case 'd': - case 'i': - res->type = WPR_SIGNED; - break; - case 's': - res->type = (res->flags & (WPRINTF_LONG |WPRINTF_WIDE)) ? WPR_WSTRING : WPR_STRING; - break; - case 'S': - res->type = (res->flags & (WPRINTF_SHORT|WPRINTF_WIDE)) ? WPR_STRING : WPR_WSTRING; - break; - case 'u': - res->type = WPR_UNSIGNED; - break; - case 'p': - res->width = 8; - res->flags |= WPRINTF_ZEROPAD; - /* fall through */ - case 'X': - res->flags |= WPRINTF_UPPER_HEX; - /* fall through */ - case 'x': - res->type = WPR_HEXA; - break; - default: /* unknown format char */ - res->type = WPR_UNKNOWN; - p--; /* print format as normal char */ - break; - } - return (INT)(p - format) + 1; -} - - -/*********************************************************************** - * WPRINTF_ParseFormatW - * - * Parse a format specification. A format specification has the form: - * - * [-][#][0][width][.precision]type - * - * Return value is the length of the format specification in characters. - */ -static INT WPRINTF_ParseFormatW( LPCWSTR format, WPRINTF_FORMAT *res ) -{ - LPCWSTR p = format; - - res->flags = 0; - res->width = 0; - res->precision = 0; - if (*p == '-') { res->flags |= WPRINTF_LEFTALIGN; p++; } - if (*p == '#') { res->flags |= WPRINTF_PREFIX_HEX; p++; } - if (*p == '0') { res->flags |= WPRINTF_ZEROPAD; p++; } - while ((*p >= '0') && (*p <= '9')) /* width field */ - { - res->width = res->width * 10 + *p - '0'; - p++; - } - if (*p == '.') /* precision field */ - { - p++; - while ((*p >= '0') && (*p <= '9')) - { - res->precision = res->precision * 10 + *p - '0'; - p++; - } - } - if (*p == 'l') { res->flags |= WPRINTF_LONG; p++; } - else if (*p == 'h') { res->flags |= WPRINTF_SHORT; p++; } - else if (*p == 'w') { res->flags |= WPRINTF_WIDE; p++; } - switch((CHAR)*p) - { - case 'c': - res->type = (res->flags & WPRINTF_SHORT) ? WPR_CHAR : WPR_WCHAR; - break; - case 'C': - res->type = (res->flags & WPRINTF_LONG) ? WPR_WCHAR : WPR_CHAR; - break; - case 'd': - case 'i': - res->type = WPR_SIGNED; - break; - case 's': - res->type = ((res->flags & WPRINTF_SHORT) && !(res->flags & WPRINTF_WIDE)) ? WPR_STRING : WPR_WSTRING; - break; - case 'S': - res->type = (res->flags & (WPRINTF_LONG|WPRINTF_WIDE)) ? WPR_WSTRING : WPR_STRING; - break; - case 'u': - res->type = WPR_UNSIGNED; - break; - case 'p': - res->width = 8; - res->flags |= WPRINTF_ZEROPAD; - /* fall through */ - case 'X': - res->flags |= WPRINTF_UPPER_HEX; - /* fall through */ - case 'x': - res->type = WPR_HEXA; - break; - default: - res->type = WPR_UNKNOWN; - p--; /* print format as normal char */ - break; - } - return (INT)(p - format) + 1; -} - - -/*********************************************************************** - * WPRINTF_GetLen - */ -static UINT WPRINTF_GetLen( WPRINTF_FORMAT *format, WPRINTF_DATA *arg, - LPSTR number, UINT maxlen ) -{ - UINT len; - - if (format->flags & WPRINTF_LEFTALIGN) format->flags &= ~WPRINTF_ZEROPAD; - if (format->width > maxlen) format->width = maxlen; - switch(format->type) - { - case WPR_CHAR: - case WPR_WCHAR: - return (format->precision = 1); - case WPR_STRING: - if (!arg->lpcstr_view) arg->lpcstr_view = null_stringA; - for (len = 0; !format->precision || (len < format->precision); len++) - if (!*(arg->lpcstr_view + len)) break; - if (len > maxlen) len = maxlen; - return (format->precision = len); - case WPR_WSTRING: - if (!arg->lpcwstr_view) arg->lpcwstr_view = null_stringW; - for (len = 0; !format->precision || (len < format->precision); len++) - if (!*(arg->lpcwstr_view + len)) break; - if (len > maxlen) len = maxlen; - return (format->precision = len); - case WPR_SIGNED: - len = sprintf( number, "%d", arg->int_view ); - break; - case WPR_UNSIGNED: - len = sprintf( number, "%u", (UINT)arg->int_view ); - break; - case WPR_HEXA: - len = sprintf( number, - (format->flags & WPRINTF_UPPER_HEX) ? "%X" : "%x", - (UINT)arg->int_view); - break; - default: - return 0; - } - if (len > maxlen) len = maxlen; - if (format->precision < len) format->precision = len; - if (format->precision > maxlen) format->precision = maxlen; - if ((format->flags & WPRINTF_ZEROPAD) && (format->width > format->precision)) - format->precision = format->width; - if (format->flags & WPRINTF_PREFIX_HEX) len += 2; - return len; -} - - -/*********************************************************************** - * wvsnprintfA (internal) - */ -static INT wvsnprintfA( LPSTR buffer, UINT maxlen, LPCSTR spec, __ms_va_list args ) -{ - WPRINTF_FORMAT format; - LPSTR p = buffer; - UINT i, len, sign; - CHAR number[20]; - WPRINTF_DATA argData; - - TRACE("%p %u %s\n", buffer, maxlen, debugstr_a(spec)); - - while (*spec && (maxlen > 1)) - { - if (*spec != '%') { *p++ = *spec++; maxlen--; continue; } - spec++; - if (*spec == '%') { *p++ = *spec++; maxlen--; continue; } - spec += WPRINTF_ParseFormatA( spec, &format ); - - switch(format.type) - { - case WPR_WCHAR: - argData.wchar_view = (WCHAR)va_arg( args, int ); - break; - case WPR_CHAR: - argData.char_view = (CHAR)va_arg( args, int ); - break; - case WPR_STRING: - argData.lpcstr_view = va_arg( args, LPCSTR ); - break; - case WPR_WSTRING: - argData.lpcwstr_view = va_arg( args, LPCWSTR ); - break; - case WPR_HEXA: - case WPR_SIGNED: - case WPR_UNSIGNED: - argData.int_view = va_arg( args, INT ); - break; - default: - argData.wchar_view = 0; - break; - } - - len = WPRINTF_GetLen( &format, &argData, number, maxlen - 1 ); - sign = 0; - if (!(format.flags & WPRINTF_LEFTALIGN)) - for (i = format.precision; i < format.width; i++, maxlen--) - *p++ = ' '; - switch(format.type) - { - case WPR_WCHAR: - *p++ = argData.wchar_view; - break; - case WPR_CHAR: - *p++ = argData.char_view; - break; - case WPR_STRING: - memcpy( p, argData.lpcstr_view, len ); - p += len; - break; - case WPR_WSTRING: - { - LPCWSTR ptr = argData.lpcwstr_view; - for (i = 0; i < len; i++) *p++ = (CHAR)*ptr++; - } - break; - case WPR_HEXA: - if ((format.flags & WPRINTF_PREFIX_HEX) && (maxlen > 3)) - { - *p++ = '0'; - *p++ = (format.flags & WPRINTF_UPPER_HEX) ? 'X' : 'x'; - maxlen -= 2; - len -= 2; - } - /* fall through */ - case WPR_SIGNED: - /* Transfer the sign now, just in case it will be zero-padded*/ - if (number[0] == '-') - { - *p++ = '-'; - sign = 1; - } - /* fall through */ - case WPR_UNSIGNED: - for (i = len; i < format.precision; i++, maxlen--) *p++ = '0'; - memcpy( p, number + sign, len - sign ); - p += len - sign; - break; - case WPR_UNKNOWN: - continue; - } - if (format.flags & WPRINTF_LEFTALIGN) - for (i = format.precision; i < format.width; i++, maxlen--) - *p++ = ' '; - maxlen -= len; - } - *p = 0; - TRACE("%s\n",debugstr_a(buffer)); - return (maxlen > 1) ? (INT)(p - buffer) : -1; -} - - -/*********************************************************************** - * wvsnprintfW (internal) - */ -static INT wvsnprintfW( LPWSTR buffer, UINT maxlen, LPCWSTR spec, __ms_va_list args ) -{ - WPRINTF_FORMAT format; - LPWSTR p = buffer; - UINT i, len, sign; - CHAR number[20]; - WPRINTF_DATA argData; - - TRACE("%p %u %s\n", buffer, maxlen, debugstr_w(spec)); - - while (*spec && (maxlen > 1)) - { - if (*spec != '%') { *p++ = *spec++; maxlen--; continue; } - spec++; - if (*spec == '%') { *p++ = *spec++; maxlen--; continue; } - spec += WPRINTF_ParseFormatW( spec, &format ); - - switch(format.type) - { - case WPR_WCHAR: - argData.wchar_view = (WCHAR)va_arg( args, int ); - break; - case WPR_CHAR: - argData.char_view = (CHAR)va_arg( args, int ); - break; - case WPR_STRING: - argData.lpcstr_view = va_arg( args, LPCSTR ); - break; - case WPR_WSTRING: - argData.lpcwstr_view = va_arg( args, LPCWSTR ); - break; - case WPR_HEXA: - case WPR_SIGNED: - case WPR_UNSIGNED: - argData.int_view = va_arg( args, INT ); - break; - default: - argData.wchar_view = 0; - break; - } - - len = WPRINTF_GetLen( &format, &argData, number, maxlen - 1 ); - sign = 0; - if (!(format.flags & WPRINTF_LEFTALIGN)) - for (i = format.precision; i < format.width; i++, maxlen--) - *p++ = ' '; - switch(format.type) - { - case WPR_WCHAR: - *p++ = argData.wchar_view; - break; - case WPR_CHAR: - *p++ = argData.char_view; - break; - case WPR_STRING: - { - LPCSTR ptr = argData.lpcstr_view; - for (i = 0; i < len; i++) *p++ = (WCHAR)*ptr++; - } - break; - case WPR_WSTRING: - if (len) memcpy( p, argData.lpcwstr_view, len * sizeof(WCHAR) ); - p += len; - break; - case WPR_HEXA: - if ((format.flags & WPRINTF_PREFIX_HEX) && (maxlen > 3)) - { - *p++ = '0'; - *p++ = (format.flags & WPRINTF_UPPER_HEX) ? 'X' : 'x'; - maxlen -= 2; - len -= 2; - } - /* fall through */ - case WPR_SIGNED: - /* Transfer the sign now, just in case it will be zero-padded*/ - if (number[0] == '-') - { - *p++ = '-'; - sign = 1; - } - /* fall through */ - case WPR_UNSIGNED: - for (i = len; i < format.precision; i++, maxlen--) *p++ = '0'; - for (i = sign; i < len; i++) *p++ = (WCHAR)number[i]; - break; - case WPR_UNKNOWN: - continue; - } - if (format.flags & WPRINTF_LEFTALIGN) - for (i = format.precision; i < format.width; i++, maxlen--) - *p++ = ' '; - maxlen -= len; - } - *p = 0; - TRACE("%s\n",debugstr_w(buffer)); - return (maxlen > 1) ? (INT)(p - buffer) : -1; -} - - -/*********************************************************************** - * wvsprintfA (USER32.@) - */ -INT WINAPI wvsprintfA( LPSTR buffer, LPCSTR spec, __ms_va_list args ) -{ - INT res = wvsnprintfA( buffer, 1024, spec, args ); - return ( res == -1 ) ? 1024 : res; -} - - -/*********************************************************************** - * wvsprintfW (USER32.@) - */ -INT WINAPI wvsprintfW( LPWSTR buffer, LPCWSTR spec, __ms_va_list args ) -{ - INT res = wvsnprintfW( buffer, 1024, spec, args ); - return ( res == -1 ) ? 1024 : res; -} - - -/*********************************************************************** - * wsprintfA (USER32.@) - */ -INT WINAPIV wsprintfA( LPSTR buffer, LPCSTR spec, ... ) -{ - __ms_va_list valist; - INT res; - - __ms_va_start( valist, spec ); - res = wvsnprintfA( buffer, 1024, spec, valist ); - __ms_va_end( valist ); - return ( res == -1 ) ? 1024 : res; -} - - -/*********************************************************************** - * wsprintfW (USER32.@) - */ -INT WINAPIV wsprintfW( LPWSTR buffer, LPCWSTR spec, ... ) -{ - __ms_va_list valist; - INT res; - - __ms_va_start( valist, spec ); - res = wvsnprintfW( buffer, 1024, spec, valist ); - __ms_va_end( valist ); - return ( res == -1 ) ? 1024 : res; -} Modified: trunk/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rb… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] Tue Jan 11 19:57:55 2011 @@ -5,6 +5,7 @@ <include base="ReactOS">include/reactos/subsys</include> <include base="ReactOS">include/reactos/wine</include> <library>wine</library> + <library>user32_wsprintf</library> <library>gdi32</library> <library>advapi32</library> <library>imm32</library> @@ -44,7 +45,6 @@ <file>usrapihk.c</file> <file>winhelp.c</file> <file>winsta.c</file> - <file>wsprintf.c</file> </directory> <directory name="windows"> <file>accel.c</file>

13 years, 8 months

[tkreuzer] 50360: [CRT] - Add user32_wsprintf library, with all the wsprintf functions, generated from the same codebase - simplify handling of ll modifier in streamout

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jan 11 19:09:48 2011 New Revision: 50360 URL: http://svn.reactos.org/svn/reactos?rev=50360&view=rev Log: [CRT] - Add user32_wsprintf library, with all the wsprintf functions, generated from the same codebase - simplify handling of ll modifier in streamout Added: trunk/reactos/lib/sdk/crt/printf/wsprintfA.c (with props) trunk/reactos/lib/sdk/crt/printf/wsprintfW.c (with props) trunk/reactos/lib/sdk/crt/printf/wvsnprintfA.c (with props) trunk/reactos/lib/sdk/crt/printf/wvsnprintfW.c (with props) trunk/reactos/lib/sdk/crt/printf/wvsprintfA.c (with props) trunk/reactos/lib/sdk/crt/printf/wvsprintfW.c (with props) Modified: trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/sdk/crt/printf/_sxprintf.c trunk/reactos/lib/sdk/crt/printf/streamout.c Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Tue Jan 11 19:09:48 2011 @@ -548,4 +548,27 @@ <file>undname.c</file> </directory> </module> + +<module name="user32_wsprintf" type="staticlibrary"> + <library>chkstk</library> + <include base="crt">.</include> + <include base="crt">include</include> + <define name="_USER32_WSPRINTF" /> + + <directory name="printf"> + <file>streamout.c</file> + <file>wstreamout.c</file> + <file>wsprintfA.c</file> + <file>wsprintfW.c</file> + <file>wvsprintfA.c</file> + <file>wvsprintfW.c</file> + <file>wvsnprintfA.c</file> + <file>wvsnprintfW.c</file> + </directory> + <directory name="string"> + <file>mbstowcs_nt.c</file> + <file>wcstombs_nt.c</file> + </directory> +</module> + </group> Modified: trunk/reactos/lib/sdk/crt/printf/_sxprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/_sxprin… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/_sxprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/_sxprintf.c [iso-8859-1] Tue Jan 11 19:09:48 2011 @@ -20,7 +20,11 @@ int _cdecl _tstreamout(FILE *stream, const TCHAR *format, va_list argptr); int +#if defined(USER32_WSPRINTF) && defined(_M_IX86) +_stdcall +#else _cdecl +#endif _sxprintf( TCHAR *buffer, #if USE_COUNT Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/streamo… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] Tue Jan 11 19:09:48 2011 @@ -76,6 +76,8 @@ #define get_exp(f) floor(f == 0 ? 0 : (f >= 0 ? log10(f) : log10(-f))) #define round(x) floor((x) + 0.5) + +#ifndef _USER32_WSPRINTF void #ifdef _LIBCNT @@ -218,6 +220,7 @@ while ((unsigned __int64)fpval2); } +#endif static int @@ -226,11 +229,15 @@ /* Check if the buffer is full */ if (stream->_cnt < sizeof(TCHAR)) { +#ifdef _USER32_WSPRINTF + return _TEOF; +#else /* Strings are done now */ if (stream->_flag & _IOSTRG) return _TEOF; /* Flush buffer for files */ return _flsbuf(chr, stream) != _TEOF; +#endif } *(TCHAR*)stream->_ptr = chr; @@ -298,6 +305,11 @@ #define streamout_string streamout_astring #endif +#ifdef _USER32_WSPRINTF +# define USE_MULTISIZE 0 +#else +# define USE_MULTISIZE 1 +#endif int _cdecl @@ -391,7 +403,7 @@ else precision = -1; /* Handle argument size prefix */ - while (1) + do { if (chr == _T('h')) flags |= FLAG_SHORT; else if (chr == _T('w')) flags |= FLAG_WIDECHAR; @@ -399,14 +411,9 @@ else if (chr == _T('F')) flags |= 0; // FIXME: what is that? else if (chr == _T('l')) { - flags |= FLAG_LONG; -#if SUPPORT_LL - if (format[0] == _T('l')) - { - format++; - flags |= FLAG_INT64; - } -#endif + /* Check if this is the 2nd 'l' in a row */ + if (format[-2] == 'l') flags |= FLAG_INT64; + else flags |= FLAG_LONG; } else if (chr == _T('I')) { @@ -430,6 +437,7 @@ else break; chr = *format++; } + while (USE_MULTISIZE); /* Handle the format specifier */ digits = digits_l; @@ -511,6 +519,7 @@ precision = 0; break; +#ifndef _USER32_WSPRINTF case _T('G'): case _T('E'): case _T('A'): @@ -528,6 +537,7 @@ len = _tcslen(string); precision = 0; break; +#endif case _T('d'): case _T('i'): Added: trunk/reactos/lib/sdk/crt/printf/wsprintfA.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/wsprint… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/wsprintfA.c (added) +++ trunk/reactos/lib/sdk/crt/printf/wsprintfA.c [iso-8859-1] Tue Jan 11 19:09:48 2011 @@ -1,0 +1,13 @@ +/* + * COPYRIGHT: GNU GPL, see COPYING in the top level directory + * PROJECT: ReactOS crt library + * FILE: lib/sdk/crt/printf/wsprintfA.c + * PURPOSE: Implementation of wsprintfA + * PROGRAMMER: Timo Kreuzer + */ + +#define _sxprintf wsprintfA +#define USE_COUNT 0 +#define USER32_WSPRINTF + +#include "_sxprintf.c" Propchange: trunk/reactos/lib/sdk/crt/printf/wsprintfA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/printf/wsprintfW.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/wsprint… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/wsprintfW.c (added) +++ trunk/reactos/lib/sdk/crt/printf/wsprintfW.c [iso-8859-1] Tue Jan 11 19:09:48 2011 @@ -1,0 +1,14 @@ +/* + * COPYRIGHT: GNU GPL, see COPYING in the top level directory + * PROJECT: ReactOS crt library + * FILE: lib/sdk/crt/printf/wsprintfW.c + * PURPOSE: Implementation of wsprintfW + * PROGRAMMER: Timo Kreuzer + */ + +#define _sxprintf wsprintfW +#define USE_COUNT 0 +#define _UNICODE +#define USER32_WSPRINTF + +#include "_sxprintf.c" Propchange: trunk/reactos/lib/sdk/crt/printf/wsprintfW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/printf/wvsnprintfA.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/wvsnpri… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/wvsnprintfA.c (added) +++ trunk/reactos/lib/sdk/crt/printf/wvsnprintfA.c [iso-8859-1] Tue Jan 11 19:09:48 2011 @@ -1,0 +1,14 @@ +/* + * COPYRIGHT: GNU GPL, see COPYING in the top level directory + * PROJECT: ReactOS crt library + * FILE: lib/sdk/crt/printf/wvsnprintfA.c + * PURPOSE: Implementation of wvsnprintfA + * PROGRAMMER: Timo Kreuzer + */ + +#define _sxprintf wvsnprintfA +#define USE_COUNT 1 +#define USE_VARARGS 1 +#define USER32_WSPRINTF + +#include "_sxprintf.c" Propchange: trunk/reactos/lib/sdk/crt/printf/wvsnprintfA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/printf/wvsnprintfW.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/wvsnpri… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/wvsnprintfW.c (added) +++ trunk/reactos/lib/sdk/crt/printf/wvsnprintfW.c [iso-8859-1] Tue Jan 11 19:09:48 2011 @@ -1,0 +1,14 @@ +/* + * COPYRIGHT: GNU GPL, see COPYING in the top level directory + * PROJECT: ReactOS crt library + * FILE: lib/sdk/crt/printf/wvsnprintfW.c + * PURPOSE: Implementation of wvsnprintfW + * PROGRAMMER: Timo Kreuzer + */ + +#define _sxprintf wvsnprintfW +#define USE_COUNT 1 +#define USE_VARARGS 1 +#define USER32_WSPRINTF + +#include "_sxprintf.c" Propchange: trunk/reactos/lib/sdk/crt/printf/wvsnprintfW.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/printf/wvsprintfA.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/wvsprin… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/wvsprintfA.c (added) +++ trunk/reactos/lib/sdk/crt/printf/wvsprintfA.c [iso-8859-1] Tue Jan 11 19:09:48 2011 @@ -1,0 +1,14 @@ +/* + * COPYRIGHT: GNU GPL, see COPYING in the top level directory + * PROJECT: ReactOS crt library + * FILE: lib/sdk/crt/printf/wvsprintfA.c + * PURPOSE: Implementation of wvsprintfA + * PROGRAMMER: Timo Kreuzer + */ + +#define _sxprintf wvsprintfA +#define USE_COUNT 0 +#define USE_VARARGS 1 +#define USER32_WSPRINTF + +#include "_sxprintf.c" Propchange: trunk/reactos/lib/sdk/crt/printf/wvsprintfA.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/printf/wvsprintfW.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/wvsprin… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/wvsprintfW.c (added) +++ trunk/reactos/lib/sdk/crt/printf/wvsprintfW.c [iso-8859-1] Tue Jan 11 19:09:48 2011 @@ -1,0 +1,14 @@ +/* + * COPYRIGHT: GNU GPL, see COPYING in the top level directory + * PROJECT: ReactOS crt library + * FILE: lib/sdk/crt/printf/wvsprintfW.c + * PURPOSE: Implementation of wvsprintfW + * PROGRAMMER: Timo Kreuzer + */ + +#define _sxprintf wvsprintfW +#define USE_COUNT 0 +#define USE_VARARGS 1 +#define USER32_WSPRINTF + +#include "_sxprintf.c" Propchange: trunk/reactos/lib/sdk/crt/printf/wvsprintfW.c ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 8 months

[gadamopoulos] 50359: fix build

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Jan 11 19:04:44 2011 New Revision: 50359 URL: http://svn.reactos.org/svn/reactos?rev=50359&view=rev Log: fix build Modified: trunk/reactos/base/shell/explorer/utility/utility.h Modified: trunk/reactos/base/shell/explorer/utility/utility.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/utility.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/utility/utility.h [iso-8859-1] Tue Jan 11 19:04:44 2011 @@ -29,6 +29,7 @@ #define WIN32_LEAN_AND_MEAN #define WIN32_EXTRA_LEAN #include <windows.h> +#include <undocuser.h> // Unicode support #if defined(UNICODE) && !defined(_UNICODE)

13 years, 8 months

[gadamopoulos] 50358: fix build

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Jan 11 18:55:19 2011 New Revision: 50358 URL: http://svn.reactos.org/svn/reactos?rev=50358&view=rev Log: fix build Modified: trunk/reactos/dll/win32/cryptui/main.c Modified: trunk/reactos/dll/win32/cryptui/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/cryptui/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/main.c [iso-8859-1] Tue Jan 11 18:55:19 2011 @@ -27,6 +27,7 @@ #include "winbase.h" #include "winnls.h" #include "winuser.h" +#include "undocuser.h" #include "softpub.h" #include "wingdi.h" #include "richedit.h"

13 years, 8 months

[gadamopoulos] 50357: [undocuser.h] - gather several undocumented definitions for user32 that were defined in several different files, sometimes in the source, sometimes in headers and sometimes de...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Jan 11 18:47:16 2011 New Revision: 50357 URL: http://svn.reactos.org/svn/reactos?rev=50357&view=rev Log: [undocuser.h] - gather several undocumented definitions for user32 that were defined in several different files, sometimes in the source, sometimes in headers and sometimes defined several times here and there This file should not contain internal user32 definitions but undocumented public definitions Added: trunk/reactos/include/reactos/undocuser.h (with props) Modified: trunk/reactos/dll/win32/user32/controls/icontitle.c trunk/reactos/dll/win32/user32/controls/listbox.c trunk/reactos/dll/win32/user32/include/controls.h trunk/reactos/dll/win32/user32/include/message.h trunk/reactos/dll/win32/user32/include/regcontrol.h trunk/reactos/dll/win32/user32/include/user32.h trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/dll/win32/user32/include/window.h trunk/reactos/dll/win32/user32/misc/desktop.c trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/dialog.c trunk/reactos/dll/win32/user32/windows/menu.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/psdk/windowsx.h trunk/reactos/include/psdk/winuser.h trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/caret.h trunk/reactos/subsystems/win32/win32k/include/object.h trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/pch.h Modified: trunk/reactos/dll/win32/user32/controls/icontitle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/icontitle.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/icontitle.c [iso-8859-1] Tue Jan 11 18:47:16 2011 @@ -22,11 +22,6 @@ #include <wine/debug.h> -#ifdef __REACTOS__ -#define MAKEINTATOMW(atom) ((LPCWSTR)((ULONG_PTR)((WORD)(atom)))) -#define ICONTITLE_CLASS_ATOM MAKEINTATOMW(32772) -#endif - static BOOL bMultiLineTitle; static HFONT hIconTitleFont; @@ -35,13 +30,13 @@ */ const struct builtin_class_descr ICONTITLE_builtin_class = { - (LPCWSTR)ICONTITLE_CLASS_ATOM, /* name */ - 0, /* style */ - NULL, /* procA (winproc is Unicode only) */ - IconTitleWndProc, /* procW */ - 0, /* extra */ - IDC_ARROW, /* cursor */ - 0 /* brush */ + WC_ICONTITLE, /* name */ + 0, /* style */ + NULL, /* procA (winproc is Unicode only) */ + IconTitleWndProc, /* procW */ + 0, /* extra */ + IDC_ARROW, /* cursor */ + 0 /* brush */ }; Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] Tue Jan 11 18:47:16 2011 @@ -37,17 +37,6 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(listbox); - -/* Start of hack section -------------------------------- */ - -#define WM_LBTRACKPOINT 0x0131 -#define WS_EX_DRAGDETECT 0x00000002L -#define WM_BEGINDRAG 0x022C - -UINT_PTR WINAPI SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC); -BOOL WINAPI KillSystemTimer(HWND,UINT_PTR); - -/* End of hack section -------------------------------- */ /* Items array granularity */ #define LB_ARRAY_GRANULARITY 16 Modified: trunk/reactos/dll/win32/user32/include/controls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/c… ============================================================================== --- trunk/reactos/dll/win32/user32/include/controls.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/controls.h [iso-8859-1] Tue Jan 11 18:47:16 2011 @@ -1,13 +1,4 @@ #pragma once - -/* Missing from Winuser.h */ -#define ES_COMBO 0x00000200 /* Undocumented. Parent is a combobox */ -#ifndef MAKEINTATOMA -#define MAKEINTATOMA(atom) ((LPCSTR)((ULONG_PTR)((WORD)(atom)))) -#endif -#ifndef WM_ISACTIVEICON -#define WM_ISACTIVEICON 0x0035 -#endif #ifndef HBMMENU_CALLBACK #define HBMMENU_CALLBACK ((HBITMAP) -1) @@ -45,11 +36,6 @@ /* winuser.h */ - -// I dont know where this goes - -#define LB_CARETON 0x01a3 -#define LB_CARETOFF 0x01a4 /* combo box */ @@ -106,7 +92,6 @@ #define LB_ADDSTRING_UPPER 0x1AC #define LB_ADDSTRING_LOWER 0x1AD -#define DESKTOP_CLASS_ATOM MAKEINTATOMA(32769) /* Desktop */ LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ); LRESULT WINAPI User32DefWindowProc(HWND,UINT,WPARAM,LPARAM,BOOL); BOOL WINAPI RegisterClientPFN(VOID); Modified: trunk/reactos/dll/win32/user32/include/message.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/m… ============================================================================== --- trunk/reactos/dll/win32/user32/include/message.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/message.h [iso-8859-1] Tue Jan 11 18:47:16 2011 @@ -11,9 +11,6 @@ BOOL FASTCALL MessageInit(VOID); VOID FASTCALL MessageCleanup(VOID); -#define WM_ALTTABACTIVE 0x0029 -#define WM_SETVISIBLE 0x0009 - static __inline BOOL IsCallProcHandle(IN WNDPROC lpWndProc) { Modified: trunk/reactos/dll/win32/user32/include/regcontrol.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/r… ============================================================================== --- trunk/reactos/dll/win32/user32/include/regcontrol.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/regcontrol.h [iso-8859-1] Tue Jan 11 18:47:16 2011 @@ -9,9 +9,6 @@ * NOTES: */ #pragma once - -#define IS_ATOM(x) \ - (((ULONG_PTR)(x) > 0x0) && ((ULONG_PTR)(x) < 0x10000)) /* Built-in class descriptor */ struct builtin_class_descr Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Tue Jan 11 18:47:16 2011 @@ -33,6 +33,9 @@ #include <win32k/ntuser.h> #include <win32k/callback.h> +/* Undocumented user definitions*/ +#include <undocuser.h> + /* WINE Headers */ #include <wine/unicode.h> @@ -47,60 +50,9 @@ (GetWin32ClientInfo()->pDeskInfo && GetWin32ClientInfo()->pDeskInfo->fsHooks & HOOKID_TO_FLAG(HookId))) /* Temporarily in here for now. */ -typedef struct _USERAPIHOOKINFO -{ - DWORD m_size; - LPCWSTR m_dllname1; - LPCWSTR m_funname1; - LPCWSTR m_dllname2; - LPCWSTR m_funname2; -} USERAPIHOOKINFO,*PUSERAPIHOOKINFO; - -typedef LRESULT(CALLBACK *WNDPROC_OWP)(HWND,UINT,WPARAM,LPARAM,ULONG_PTR,PDWORD); - -typedef struct _UAHOWP -{ - BYTE* MsgBitArray; - DWORD Size; -} UAHOWP, *PUAHOWP; - -typedef struct tagUSERAPIHOOK -{ - DWORD size; - WNDPROC DefWindowProcA; - WNDPROC DefWindowProcW; - UAHOWP DefWndProcArray; - FARPROC GetScrollInfo; - FARPROC SetScrollInfo; - FARPROC EnableScrollBar; - FARPROC AdjustWindowRectEx; - FARPROC SetWindowRgn; - WNDPROC_OWP PreWndProc; - WNDPROC_OWP PostWndProc; - UAHOWP WndProcArray; - WNDPROC_OWP PreDefDlgProc; - WNDPROC_OWP PostDefDlgProc; - UAHOWP DlgProcArray; - FARPROC GetSystemMetrics; - FARPROC SystemParametersInfoA; - FARPROC SystemParametersInfoW; - FARPROC ForceResetUserApiHook; - FARPROC DrawFrameControl; - FARPROC DrawCaption; - FARPROC MDIRedrawFrame; - FARPROC GetRealWindowOwner; -} USERAPIHOOK, *PUSERAPIHOOK; - -typedef enum _UAPIHK -{ - uahLoadInit, - uahStop, - uahShutdown -} UAPIHK, *PUAPIHK; extern RTL_CRITICAL_SECTION gcsUserApiHook; extern USERAPIHOOK guah; -typedef DWORD (CALLBACK * USERAPIHOOKPROC)(UAPIHK State, ULONG_PTR Info); BOOL FASTCALL BeginIfHookedUserApiHook(VOID); BOOL FASTCALL EndUserApiHook(VOID); BOOL FASTCALL IsInsideUserApiHook(VOID); Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Tue Jan 11 18:47:16 2011 @@ -26,6 +26,9 @@ #include "winsta.h" #include "ntwrapper.h" +#define IS_ATOM(x) \ + (((ULONG_PTR)(x) > 0x0) && ((ULONG_PTR)(x) < 0x10000)) + /* One/Two Param Functions */ #define NtUserMsqSetWakeMask(dwWaitMask) \ (HANDLE)NtUserCallOneParam(dwWaitMask, ONEPARAM_ROUTINE_GETINPUTEVENT) Modified: trunk/reactos/dll/win32/user32/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/w… ============================================================================== --- trunk/reactos/dll/win32/user32/include/window.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/window.h [iso-8859-1] Tue Jan 11 18:47:16 2011 @@ -12,8 +12,6 @@ #define NUM_SYSCOLORS 31 -#define IS_ATOM(x) \ - (((ULONG_PTR)(x) > 0x0) && ((ULONG_PTR)(x) < 0x10000)) #define UserHasAnyFrameStyle(Style, ExStyle) \ (((Style) & (WS_THICKFRAME | WS_DLGFRAME | WS_BORDER)) || \ Modified: trunk/reactos/dll/win32/user32/misc/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/desk… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] Tue Jan 11 18:47:16 2011 @@ -20,7 +20,7 @@ #if 0 // Kept for referencing. const struct builtin_class_descr DESKTOP_builtin_class = { - (LPCWSTR) DESKTOP_CLASS_ATOM, /* name */ + WC_DESKTOP, /* name */ CS_DBLCLKS, /* style */ NULL, /* procA (winproc is Unicode only) */ (WNDPROC) DesktopWndProc, /* procW */ Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Tue Jan 11 18:47:16 2011 @@ -15,13 +15,6 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); - -#ifndef WM_SETVISIBLE -#define WM_SETVISIBLE 9 -#endif -#ifndef WM_QUERYDROPOBJECT -#define WM_QUERYDROPOBJECT 0x022B -#endif LRESULT DefWndNCPaint(HWND hWnd, HRGN hRgn, BOOL Active); LRESULT DefWndNCCalcSize(HWND hWnd, BOOL CalcSizeStruct, RECT *Rect); Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Tue Jan 11 18:47:16 2011 @@ -39,17 +39,11 @@ #define DF_END 0x0001 #define DF_OWNERENABLED 0x0002 -#define CW_USEDEFAULT16 ((short)0x8000) #define DWLP_ROS_DIALOGINFO (DWLP_USER+sizeof(ULONG_PTR)) #define GETDLGINFO(hwnd) DIALOG_get_info(hwnd, FALSE) #define SETDLGINFO(hwnd, info) SetWindowLongPtrW((hwnd), DWLP_ROS_DIALOGINFO, (LONG_PTR)(info)) #define GET_WORD(ptr) (*(WORD *)(ptr)) #define GET_DWORD(ptr) (*(DWORD *)(ptr)) -#define MAKEINTATOMA(atom) ((LPCSTR)((ULONG_PTR)((WORD)(atom)))) -#define MAKEINTATOMW(atom) ((LPCWSTR)((ULONG_PTR)((WORD)(atom)))) -#define DIALOG_CLASS_ATOMA MAKEINTATOMA(32770) /* Dialog */ -#define DIALOG_CLASS_ATOMW MAKEINTATOMW(32770) /* Dialog */ - void WINAPI WinPosActivateOtherWindow(HWND hwnd); /* INTERNAL STRUCTS **********************************************************/ @@ -118,7 +112,7 @@ */ const struct builtin_class_descr DIALOG_builtin_class = { - DIALOG_CLASS_ATOMW, /* name */ + WC_DIALOG, /* name */ CS_SAVEBITS | CS_DBLCLKS, /* style */ (WNDPROC) DefDlgProcA, /* procA */ (WNDPROC) DefDlgProcW, /* procW */ @@ -632,7 +626,7 @@ switch(GET_WORD(p)) { case 0x0000: - result->className = DIALOG_CLASS_ATOMW; + result->className = WC_DIALOG; p++; break; case 0xffff: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Tue Jan 11 18:47:16 2011 @@ -65,11 +65,6 @@ #define MENU_BAR_ITEMS_SPACE (12) #define SEPARATOR_HEIGHT (5) #define MENU_TAB_SPACE (8) - -#define MAKEINTATOMA(atom) ((LPCSTR)((ULONG_PTR)((WORD)(atom)))) -#define MAKEINTATOMW(atom) ((LPCWSTR)((ULONG_PTR)((WORD)(atom)))) -#define POPUPMENU_CLASS_ATOMA MAKEINTATOMA(32768) /* PopupMenu */ -#define POPUPMENU_CLASS_ATOMW MAKEINTATOMW(32768) /* PopupMenu */ typedef struct { @@ -86,7 +81,7 @@ */ const struct builtin_class_descr POPUPMENU_builtin_class = { - POPUPMENU_CLASS_ATOMW, /* name */ + WC_MENU, /* name */ CS_SAVEBITS | CS_DBLCLKS, /* style */ (WNDPROC) NULL, /* FIXME - procA */ (WNDPROC) PopupMenuWndProcW, /* FIXME - procW */ @@ -1626,7 +1621,7 @@ if( y < info.rcMonitor.top ) y = info.rcMonitor.top; /* NOTE: In Windows, top menu popup is not owned. */ - MenuInfo.Wnd = CreateWindowExW( 0, POPUPMENU_CLASS_ATOMW, NULL, + MenuInfo.Wnd = CreateWindowExW( 0, WC_MENU, NULL, WS_POPUP, x, y, width, height, hwndOwner, 0, (HINSTANCE) GetWindowLongPtrW(hwndOwner, GWLP_HINSTANCE), (LPVOID) MenuInfo.Self); Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Tue Jan 11 18:47:16 2011 @@ -17,8 +17,6 @@ LRESULT DefWndNCPaint(HWND hWnd, HRGN hRgn, BOOL Active); void MDI_CalcDefaultChildPos( HWND hwndClient, INT total, LPPOINT lpPos, INT delta, UINT *id ); - -#define CW_USEDEFAULT16 0x00008000 /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/include/psdk/windowsx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windowsx.h?re… ============================================================================== --- trunk/reactos/include/psdk/windowsx.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windowsx.h [iso-8859-1] Tue Jan 11 18:47:16 2011 @@ -1,7 +1,6 @@ #ifndef _WINDOWSX_H #define _WINDOWSX_H -#define WM_CTLCOLOR 25 #define Button_Enable(hwndCtl,fEnable) EnableWindow((hwndCtl),(fEnable)) #define Button_GetCheck(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl),BM_GETCHECK,0,0)) #define Button_GetState(hwndCtl) ((int)(DWORD)SendMessage((hwndCtl),BM_GETSTATE,0,0)) Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Tue Jan 11 18:47:16 2011 @@ -18,7 +18,6 @@ #endif -#define WC_DIALOG MAKEINTATOM(0x8002) #define FALT 16 #define FCONTROL 8 #define FNOINVERT 2 @@ -300,9 +299,6 @@ #define ES_LOWERCASE 16 #define ES_MULTILINE 4 #define ES_NOHIDESEL 256 -#ifdef _WINE -#define ES_COMBO 0x200 /* Undocumented. Parent is a combobox */ -#endif #define ES_NUMBER 0x2000 #define ES_OEMCONVERT 0x400 #define ES_PASSWORD 32 @@ -390,7 +386,6 @@ #define WS_EX_COMPOSITED 0x2000000 /* XP */ #define WS_EX_CONTEXTHELP 0x400 #define WS_EX_CONTROLPARENT 0x10000 -#define WS_EX_DRAGDETECT 0x00000002L #define WS_EX_DLGMODALFRAME 1 #define WS_EX_LAYERED 0x80000 /* w2k */ #define WS_EX_LAYOUTRTL 0x400000 /* w98, w2k */ @@ -870,8 +865,6 @@ #endif #define QS_SENDMESSAGE 64 #define QS_TIMER 16 -/* Extra (undocumented) queue wake bits - see "Undoc. Windows" */ -#define QS_SMRESULT 0x8000 #define USER_TIMER_MAXIMUM 2147483647 #define USER_TIMER_MINIMUM 10 @@ -1213,10 +1206,6 @@ #define SWP_NOSENDCHANGING 1024 #define SWP_DEFERERASE 8192 #define SWP_ASYNCWINDOWPOS 16384 -/* undocumented SWP flags - from SDK 3.1 */ -#define SWP_NOCLIENTSIZE 0x0800 -#define SWP_NOCLIENTMOVE 0x1000 -#define SWP_STATECHANGED 0x8000 #define HSHELL_WINDOWCREATED 1 #define HSHELL_WINDOWDESTROYED 2 @@ -1617,8 +1606,6 @@ #define WM_GETFONT 49 #define WM_SETHOTKEY 50 #define WM_GETHOTKEY 51 -#define WM_ISACTIVEICON 53 -#define WM_QUERYPARKICON 54 #define WM_QUERYDRAGICON 55 #define WM_COMPAREITEM 57 #if (WINVER >= 0x0500) @@ -1673,7 +1660,6 @@ #define WM_NCXBUTTONDBLCLK 173 #endif /* (_WIN32_WINNT >= 0x0500) */ -#define WM_KEYF1 0x004d #define WM_KEYFIRST 256 #define WM_KEYDOWN 256 #define WM_KEYUP 257 @@ -1707,7 +1693,6 @@ #define WM_VSCROLL 277 #define WM_INITMENU 278 #define WM_INITMENUPOPUP 279 -#define WM_SYSTIMER 280 #define WM_MENUSELECT 287 #define WM_MENUCHAR 288 #define WM_ENTERIDLE 289 @@ -1727,15 +1712,6 @@ #endif /* _WIN32_WCE */ #endif /* (WINVER >= 0x0500) */ -/* D&D messages */ -#define WM_DROPOBJECT 0x022A -#define WM_QUERYDROPOBJECT 0x022B -#define WM_BEGINDRAG 0x022C -#define WM_DRAGLOOP 0x022D -#define WM_DRAGSELECT 0x022E -#define WM_DRAGMOVE 0x022F - -#define WM_CTLCOLOR 25 #define WM_CTLCOLORMSGBOX 306 #define WM_CTLCOLOREDIT 307 #define WM_CTLCOLORLISTBOX 308 @@ -1746,7 +1722,6 @@ #define MN_GETHMENU 481 #define WM_MOUSEFIRST 512 #define WM_MOUSEMOVE 512 -#define WM_LBTRACKPOINT 0x0131 #define WM_LBUTTONDOWN 513 #define WM_LBUTTONUP 514 #define WM_LBUTTONDBLCLK 515 Added: trunk/reactos/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocuser.… ============================================================================== --- trunk/reactos/include/reactos/undocuser.h (added) +++ trunk/reactos/include/reactos/undocuser.h [iso-8859-1] Tue Jan 11 18:47:16 2011 @@ -1,0 +1,175 @@ +#ifndef _UNDOCUSER_H +#define _UNDOCUSER_H + +/* Built in class atoms */ +#define WC_MENU (MAKEINTATOM(0x8000)) +#define WC_DESKTOP (MAKEINTATOM(0x8001)) +#define WC_DIALOG (MAKEINTATOM(0x8002)) +#define WC_SWITCH (MAKEINTATOM(0x8003)) +#define WC_ICONTITLE (MAKEINTATOM(0x8004)) + +/* Non SDK Styles */ +#define ES_COMBO 0x200 /* Parent is a combobox */ +#define WS_MAXIMIZED WS_MAXIMIZE +#define WS_MINIMIZED WS_MINIMIZE + +/* Non SDK ExStyles */ +#define WS_EX_DRAGDETECT 0x00000002 +#define WS_EX_MAKEVISIBLEWHENUNGHOSTED 0x00000800 +#define WS_EX_FORCELEGACYRESIZENCMETR 0x00800000 +#define WS_EX_UISTATEACTIVE 0x04000000 +#define WS_EX_REDIRECTED 0x20000000 +#define WS_EX_UISTATEKBACCELHIDDEN 0x40000000 +#define WS_EX_UISTATEFOCUSRECTHIDDEN 0x80000000 +#define WS_EX_SETANSICREATOR 0x80000000 // For WNDS_ANSICREATOR + +/* Non SDK Window Message types. */ +#define WM_SETVISIBLE 0x00000009 +#define WM_CTLCOLOR 0x00000019 +#define WM_ALTTABACTIVE 0x00000029 +#define WM_ISACTIVEICON 0x00000035 +#define WM_QUERYPARKICON 0x00000036 +#define WM_CLIENTSHUTDOWN 0x0000003B +#define WM_COPYGLOBALDATA 0x00000049 +#define WM_LOGONNOTIFY 0x0000004c +#define WM_KEYF1 0x0000004d +#define WM_SYSTIMER 0x00000118 +#define WM_LBTRACKPOINT 0x00000131 +#define LB_CARETON 0x000001a3 +#define LB_CARETOFF 0x000001a4 +#define WM_DROPOBJECT 0x0000022A +#define WM_QUERYDROPOBJECT 0x0000022B +#define WM_BEGINDRAG 0x0000022C +#define WM_DRAGLOOP 0x0000022D +#define WM_DRAGSELECT 0x0000022E +#define WM_DRAGMOVE 0x0000022F +#define WM_POPUPSYSTEMMENU 0x00000313 +#define WM_CBT 0x000003FF // ReactOS only. +#define WM_MAXIMUM 0x0001FFFF + +/* Non SDK DCE types.*/ +#define DCX_USESTYLE 0x00010000 +#define DCX_KEEPCLIPRGN 0x00040000 +#define DCX_KEEPLAYOUT 0x40000000 +#define DCX_PROCESSOWNED 0x80000000 + +/* Caret timer ID */ +#define IDCARETTIMER (0xffff) + +/* SetWindowPos undocumented flags */ +#define SWP_NOCLIENTSIZE 0x0800 +#define SWP_NOCLIENTMOVE 0x1000 +#define SWP_STATECHANGED 0x8000 + +/* Non SDK Queue state flags. */ +#define QS_SMRESULT 0x8000 /* see "Undoc. Windows" */ + +// +// Definitions used by WM_CLIENTSHUTDOWN +// +// Client Shutdown messages +#define MCS_SHUTDOWNTIMERS 1 +#define MCS_QUERYENDSESSION 2 +// Client Shutdown returns +#define MCSR_GOODFORSHUTDOWN 1 +#define MCSR_SHUTDOWNFINISHED 2 +#define MCSR_DONOTSHUTDOWN 3 + +// +// Definitions used by WM_LOGONNOTIFY +// +#define LN_START_TASK_MANAGER 0x4 +#define LN_LOCK_WORKSTATION 0x5 +#define LN_UNLOCK_WORKSTATION 0x6 +#define LN_MESSAGE_BEEP 0x9 + +#define CW_USEDEFAULT16 ((short)0x8000) + +#define SBRG_SCROLLBAR 0 /* the scrollbar itself */ +#define SBRG_TOPRIGHTBTN 1 /* the top or right button */ +#define SBRG_PAGEUPRIGHT 2 /* the page up or page right region */ +#define SBRG_SCROLLBOX 3 /* the scroll box */ +#define SBRG_PAGEDOWNLEFT 4 /* the page down or page left region */ +#define SBRG_BOTTOMLEFTBTN 5 /* the bottom or left button */ + + +BOOL WINAPI KillSystemTimer(HWND,UINT_PTR); +UINT_PTR WINAPI SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC); +DWORD_PTR WINAPI SetSysColorsTemp(const COLORREF *, const HBRUSH *, DWORD_PTR); +BOOL WINAPI SetDeskWallPaper(LPCSTR); +VOID WINAPI ScrollChildren(HWND,UINT,WPARAM,LPARAM); +void WINAPI CalcChildScroll(HWND, INT); +BOOL WINAPI RegisterLogonProcess(DWORD,BOOL); +DWORD WINAPI GetAppCompatFlags(HTASK hTask); +DWORD WINAPI GetAppCompatFlags2(HTASK hTask); +LONG WINAPI CsrBroadcastSystemMessageExW(DWORD dwflags, + LPDWORD lpdwRecipients, + UINT uiMessage, + WPARAM wParam, + LPARAM lParam, + PBSMINFO pBSMInfo); +BOOL WINAPI CliImmSetHotKey(DWORD dwID, UINT uModifiers, UINT uVirtualKey, HKL hKl); +HWND WINAPI GetTaskmanWindow(VOID); +HWND WINAPI GetProgmanWindow(VOID); + +// +// User api hook +// + +typedef struct _USERAPIHOOKINFO +{ + DWORD m_size; + LPCWSTR m_dllname1; + LPCWSTR m_funname1; + LPCWSTR m_dllname2; + LPCWSTR m_funname2; +} USERAPIHOOKINFO,*PUSERAPIHOOKINFO; + +typedef enum _UAPIHK +{ + uahLoadInit, + uahStop, + uahShutdown +} UAPIHK, *PUAPIHK; + +typedef DWORD (CALLBACK * USERAPIHOOKPROC)(UAPIHK State, ULONG_PTR Info); + +typedef LRESULT(CALLBACK *WNDPROC_OWP)(HWND,UINT,WPARAM,LPARAM,ULONG_PTR,PDWORD); + +typedef struct _UAHOWP +{ + BYTE* MsgBitArray; + DWORD Size; +} UAHOWP, *PUAHOWP; + +typedef struct tagUSERAPIHOOK +{ + DWORD size; + WNDPROC DefWindowProcA; + WNDPROC DefWindowProcW; + UAHOWP DefWndProcArray; + FARPROC GetScrollInfo; + FARPROC SetScrollInfo; + FARPROC EnableScrollBar; + FARPROC AdjustWindowRectEx; + FARPROC SetWindowRgn; + WNDPROC_OWP PreWndProc; + WNDPROC_OWP PostWndProc; + UAHOWP WndProcArray; + WNDPROC_OWP PreDefDlgProc; + WNDPROC_OWP PostDefDlgProc; + UAHOWP DlgProcArray; + FARPROC GetSystemMetrics; + FARPROC SystemParametersInfoA; + FARPROC SystemParametersInfoW; + FARPROC ForceResetUserApiHook; + FARPROC DrawFrameControl; + FARPROC DrawCaption; + FARPROC MDIRedrawFrame; + FARPROC GetRealWindowOwner; +} USERAPIHOOK, *PUSERAPIHOOK; + +BOOL WINAPI RegisterUserApiHook(PUSERAPIHOOKINFO puah); +BOOL WINAPI UnregisterUserApiHook(VOID); + +#endif Propchange: trunk/reactos/include/reactos/undocuser.h ------------------------------------------------------------------------------ svn:eol-style = native 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] Tue Jan 11 18:47:16 2011 @@ -465,19 +465,6 @@ #define WNDS2_SMALLICONFROMWMQUERYDRAG 0X20000000 #define WNDS2_SHELLHOOKREGISTERED 0X40000000 #define WNDS2_WMCREATEMSGPROCESSED 0X80000000 - -/* Non SDK ExStyles */ -#define WS_EX_MAKEVISIBLEWHENUNGHOSTED 0x00000800 -#define WS_EX_FORCELEGACYRESIZENCMETR 0x00800000 -#define WS_EX_UISTATEACTIVE 0x04000000 -#define WS_EX_REDIRECTED 0X20000000 -#define WS_EX_UISTATEKBACCELHIDDEN 0X40000000 -#define WS_EX_UISTATEFOCUSRECTHIDDEN 0X80000000 -#define WS_EX_SETANSICREATOR 0x80000000 // For WNDS_ANSICREATOR - -/* Non SDK Styles */ -#define WS_MAXIMIZED WS_MAXIMIZE -#define WS_MINIMIZED WS_MINIMIZE /* ExStyles2 */ #define WS_EX2_CLIPBOARDLISTENER 0X00000001 @@ -859,29 +846,6 @@ DWORD dwDispatchCount; SHAREDINFO siClient; } USERCONNECT, *PUSERCONNECT; - -// -// Non SDK Window Message types. -// -#define WM_CLIENTSHUTDOWN 59 -#define WM_COPYGLOBALDATA 73 -#define WM_SYSTIMER 280 -#define WM_POPUPSYSTEMMENU 787 -#define WM_CBT 1023 // ReactOS only. -#define WM_MAXIMUM 0x0001FFFF - -// -// Non SDK DCE types. -// -#define DCX_USESTYLE 0x00010000 -#define DCX_KEEPCLIPRGN 0x00040000 -#define DCX_KEEPLAYOUT 0x40000000 -#define DCX_PROCESSOWNED 0x80000000 - -// -// Non SDK Queue message types. -// -#define QS_SMRESULT 0x8000 DWORD NTAPI Modified: trunk/reactos/subsystems/win32/win32k/include/caret.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/caret.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/caret.h [iso-8859-1] Tue Jan 11 18:47:16 2011 @@ -2,8 +2,6 @@ #include <include/win32.h> #include <include/window.h> - -#define IDCARETTIMER (0xffff) BOOL FASTCALL co_IntDestroyCaret(PTHREADINFO Win32Thread); Modified: trunk/reactos/subsystems/win32/win32k/include/object.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/object.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/object.h [iso-8859-1] Tue Jan 11 18:47:16 2011 @@ -66,8 +66,6 @@ SINGLE_LIST_ENTRY Entry; PVOID obj; } USER_REFERENCE_ENTRY, *PUSER_REFERENCE_ENTRY; - -#include <malloc.h> #define USER_ASSERT(exp,file,line) \ if (!(exp)) {RtlAssert(#exp,(PVOID)file,line,"");} Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Tue Jan 11 18:47:16 2011 @@ -14,9 +14,6 @@ #define NDEBUG #include <debug.h> - -/* dialog resources appear to pass this in 16 bits, handle them properly */ -#define CW_USEDEFAULT16 (0x8000) #define POINT_IN_RECT(p, r) (((r.bottom >= p.y) && (r.top <= p.y))&&((r.left <= p.x )&&( r.right >= p.x ))) Modified: trunk/reactos/subsystems/win32/win32k/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/pc… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] Tue Jan 11 18:47:16 2011 @@ -62,12 +62,14 @@ #include <win32k/ntgdibad.h> #include <ntgdi.h> +/* Undocumented user definitions */ +#include <undocuser.h> + /* Internal Win32K Header */ #include "include/win32kp.h" /* Undocumented stuff */ typedef DRIVEROBJ *PDRIVEROBJ; -#define WM_SYSTIMER 280 #ifndef M_PI #define M_PI 3.14159265358979323846f #define M_PI_2 1.57079632679489661923

13 years, 8 months

[tkreuzer] 50356: [CRT] Remove deprecated <if>.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jan 11 15:17:35 2011 New Revision: 50356 URL: http://svn.reactos.org/svn/reactos?rev=50356&view=rev Log: [CRT] Remove deprecated <if>. Modified: trunk/reactos/lib/sdk/crt/crt.rbuild Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Tue Jan 11 15:17:35 2011 @@ -27,8 +27,6 @@ <define name="_MT" /> <define name="_CRTBLD" /> - <if property="NEWSPRINTF" value="1"> - <define name="USE_NEW_SPRINTF" /> <directory name="printf"> <file>_cprintf.c</file> <file>_snprintf.c</file> @@ -51,7 +49,6 @@ <file>wprintf.c</file> <file>wstreamout.c</file> </directory> - </if> <directory name="conio"> <file>cgets.c</file>

13 years, 8 months

[tkreuzer] 50355: [CRT] Get rid of the old printf code and some unused functions. 3346 lines of code less.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jan 11 13:13:47 2011 New Revision: 50355 URL: http://svn.reactos.org/svn/reactos?rev=50355&view=rev Log: [CRT] Get rid of the old printf code and some unused functions. 3346 lines of code less. Removed: trunk/reactos/lib/rtl/sprintf.c trunk/reactos/lib/rtl/swprintf.c trunk/reactos/lib/sdk/crt/conio/cprintf.c trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c Modified: trunk/reactos/config-arm.template.rbuild trunk/reactos/config.template.rbuild trunk/reactos/lib/rtl/rtl.rbuild trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/sdk/crt/libcntpr.rbuild trunk/reactos/lib/sdk/crt/stdio/file.c trunk/reactos/lib/sdk/crt/string/wcs.c Modified: trunk/reactos/config-arm.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config-arm.template.rbuild… ============================================================================== --- trunk/reactos/config-arm.template.rbuild [iso-8859-1] (original) +++ trunk/reactos/config-arm.template.rbuild [iso-8859-1] Tue Jan 11 13:13:47 2011 @@ -100,9 +100,4 @@ --> <property name="NEWCC" value="0" /> - -<property name="NEWSPRINTF" value="0" /> - </group> Modified: trunk/reactos/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config.template.rbuild?rev… ============================================================================== --- trunk/reactos/config.template.rbuild [iso-8859-1] (original) +++ trunk/reactos/config.template.rbuild [iso-8859-1] Tue Jan 11 13:13:47 2011 @@ -104,9 +104,4 @@ --> <property name="NEWCC" value="0" /> - -<property name="NEWSPRINTF" value="1" /> - </group> Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=503… ============================================================================== --- trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] Tue Jan 11 13:13:47 2011 @@ -95,9 +95,7 @@ <file>security.c</file> <file>slist.c</file> <file>sid.c</file> - <file>sprintf.c</file> <file>srw.c</file> - <file>swprintf.c</file> <file>splaytree.c</file> <file>thread.c</file> <file>time.c</file> Removed: trunk/reactos/lib/rtl/sprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sprintf.c?rev=5035… ============================================================================== --- trunk/reactos/lib/rtl/sprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/sprintf.c (removed) @@ -1,747 +1,0 @@ - -#ifndef USE_NEW_SPRINTF -/* - * PROGRAMMERS: David Welch - * Eric Kohl - * - * TODO: - * - Verify the implementation of '%Z'. - */ - -/* - * linux/lib/vsprintf.c - * - * Copyright (C) 1991, 1992 Linus Torvalds - */ - -/* vsprintf.c -- Lars Wirzenius & Linus Torvalds. */ -/* - * Wirzenius wrote this portably, Torvalds fucked it up :-) - */ - -#include <rtl.h> - -#define ZEROPAD 1 /* pad with zero */ -#define SIGN 2 /* unsigned/signed long */ -#define PLUS 4 /* show plus */ -#define SPACE 8 /* space if plus */ -#define LEFT 16 /* left justified */ -#define SPECIAL 32 /* 0x */ -#define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */ -#define REMOVEHEX 256 /* use 256 as remve 0x frim BASE 16 */ -typedef struct { - unsigned int mantissal:32; - unsigned int mantissah:20; - unsigned int exponent:11; - unsigned int sign:1; -} double_t; - -static -__inline -int -_isinf(double __x) -{ - union - { - double* __x; - double_t* x; - } x; - - x.__x = &__x; - return ( x.x->exponent == 0x7ff && ( x.x->mantissah == 0 && x.x->mantissal == 0 )); -} - -static -__inline -int -_isnan(double __x) -{ - union - { - double* __x; - double_t* x; - } x; - x.__x = &__x; - return ( x.x->exponent == 0x7ff && ( x.x->mantissah != 0 || x.x->mantissal != 0 )); -} - - -static -__inline -int -do_div(long long *n, int base) -{ - int a; - a = ((unsigned long long) *n) % (unsigned) base; - *n = ((unsigned long long) *n) / (unsigned) base; - return a; -} - - -static int skip_atoi(const char **s) -{ - int i=0; - - while (isdigit(**s)) - i = i*10 + *((*s)++) - '0'; - return i; -} - - -static char * -number(char * buf, char * end, long long num, int base, int size, int precision, int type) -{ - char c,sign,tmp[66]; - const char *digits; - const char *small_digits = "0123456789abcdefghijklmnopqrstuvwxyz"; - const char *large_digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - int i; - - digits = (type & LARGE) ? large_digits : small_digits; - if (type & LEFT) - type &= ~ZEROPAD; - if (base < 2 || base > 36) - return 0; - c = (type & ZEROPAD) ? '0' : ' '; - sign = 0; - if (type & SIGN) { - if (num < 0) { - sign = '-'; - num = -num; - size--; - } else if (type & PLUS) { - sign = '+'; - size--; - } else if (type & SPACE) { - sign = ' '; - size--; - } - } - - if ((type & SPECIAL) && ((type & REMOVEHEX) == 0)) { - if (base == 16) - size -= 2; - - } - i = 0; - if ((num == 0) && (precision !=0)) - tmp[i++] = '0'; - else while (num != 0) - tmp[i++] = digits[do_div(&num,base)]; - if (i > precision) - precision = i; - size -= precision; - if (!(type&(ZEROPAD+LEFT))) { - while(size-->0) { - if (buf <= end) - *buf = ' '; - ++buf; - } - } - if (sign) { - if (buf <= end) - *buf = sign; - ++buf; - } - - if ((type & SPECIAL) && ((type & REMOVEHEX) == 0)) { - if (base==16) { - if (buf <= end) - *buf = '0'; - ++buf; - if (buf <= end) - *buf = digits[33]; - ++buf; - } - } - - if (!(type & LEFT)) { - while (size-- > 0) { - if (buf <= end) - *buf = c; - ++buf; - } - } - while (i < precision--) { - if (buf <= end) - *buf = '0'; - ++buf; - } - while (i-- > 0) { - if (buf <= end) - *buf = tmp[i]; - ++buf; - } - while (size-- > 0) { - if (buf <= end) - *buf = ' '; - ++buf; - } - - return buf; -} - -static char * -numberf(char * buf, char * end, double num, int base, int size, int precision, int type) -{ - char c,sign,tmp[66]; - const char *digits; - const char *small_digits = "0123456789abcdefghijklmnopqrstuvwxyz"; - const char *large_digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - int i; - long long x; - - /* FIXME - the float version of number is direcly copy of number - */ - - digits = (type & LARGE) ? large_digits : small_digits; - if (type & LEFT) - type &= ~ZEROPAD; - if (base < 2 || base > 36) - return 0; - c = (type & ZEROPAD) ? '0' : ' '; - sign = 0; - if (type & SIGN) { - if (num < 0) { - sign = '-'; - num = -num; - size--; - } else if (type & PLUS) { - sign = '+'; - size--; - } else if (type & SPACE) { - sign = ' '; - size--; - } - } - if (type & SPECIAL) { - if (base == 16) - size -= 2; - else if (base == 8) - size--; - } - i = 0; - if (num == 0) - tmp[i++] = '0'; - else while (num != 0) - { - x = num; - tmp[i++] = digits[do_div(&x,base)]; -#ifndef _M_ARM // Missing __floatdidf in CeGCC 0.55 -- GCC 4.4 - num=x; -#endif - } - if (i > precision) - precision = i; - size -= precision; - if (!(type&(ZEROPAD+LEFT))) { - while(size-->0) { - if (buf <= end) - *buf = ' '; - ++buf; - } - } - if (sign) { - if (buf <= end) - *buf = sign; - ++buf; - } - if (type & SPECIAL) { - if (base==8) { - if (buf <= end) - *buf = '0'; - ++buf; - } else if (base==16) { - if (buf <= end) - *buf = '0'; - ++buf; - if (buf <= end) - *buf = digits[33]; - ++buf; - } - } - if (!(type & LEFT)) { - while (size-- > 0) { - if (buf <= end) - *buf = c; - ++buf; - } - } - while (i < precision--) { - if (buf <= end) - *buf = '0'; - ++buf; - } - while (i-- > 0) { - if (buf <= end) - *buf = tmp[i]; - ++buf; - } - while (size-- > 0) { - if (buf <= end) - *buf = ' '; - ++buf; - } - return buf; -} - -static char* -string(char* buf, char* end, const char* s, int len, int field_width, int precision, int flags) -{ - int i; - char c; - - c = (flags & ZEROPAD) ? '0' : ' '; - - if (s == NULL) - { - s = "<NULL>"; - len = 6; - } - else - { - if (len == -1) - { - len = 0; - while ((unsigned int)len < (unsigned int)precision && s[len]) - len++; - } - else - { - if ((unsigned int)len > (unsigned int)precision) - len = precision; - } - } - if (!(flags & LEFT)) - while (len < field_width--) - { - if (buf <= end) - *buf = c; - ++buf; - } - for (i = 0; i < len; ++i) - { - if (buf <= end) - *buf = *s++; - ++buf; - } - while (len < field_width--) - { - if (buf <= end) - *buf = ' '; - ++buf; - } - return buf; -} - -static char* -stringw(char* buf, char* end, const wchar_t* sw, int len, int field_width, int precision, int flags) -{ - int i; - char c; - - c = (flags & ZEROPAD) ? '0' : ' '; - - if (sw == NULL) - { - sw = L"<NULL>"; - len = 6; - } - else - { - if (len == -1) - { - len = 0; - while ((unsigned int)len < (unsigned int)precision && sw[len]) - len++; - } - else - { - if ((unsigned int)len > (unsigned int)precision) - len = precision; - } - } - if (!(flags & LEFT)) - while (len < field_width--) - { - if (buf <= end) - *buf = c; - buf++; - } - for (i = 0; i < len; ++i) - { - if (buf <= end) - *buf = (unsigned char)(*sw++); - buf++; - } - while (len < field_width--) - { - if (buf <= end) - *buf = ' '; - buf++; - } - return buf; -} - -/* - * @implemented - */ -int __cdecl _vsnprintf(char *buf, size_t cnt, const char *fmt, va_list args) -{ - int len; - unsigned long long num; - double _double; - - int base; - char *str, *end; - const char *s; - const wchar_t *sw; - - int flags; /* flags to number() */ - - int field_width; /* width of output field */ - int precision; /* min. # of digits for integers; max - number of chars for from string */ - int qualifier; /* 'h', 'l', 'L', 'I' or 'w' for integer fields */ - - /* clear the string buffer with zero so we do not need NULL terment it at end */ - - str = buf; - end = buf + cnt - 1; - if (end < buf - 1) { - end = ((char *) -1); - cnt = end - buf + 1; - } - - for ( ; *fmt ; ++fmt) { - if (*fmt != '%') { - if (str <= end) - *str = *fmt; - ++str; - continue; - } - - /* process flags */ - flags = 0; - repeat: - ++fmt; /* this also skips first '%' */ - switch (*fmt) { - case '-': flags |= LEFT; goto repeat; - case '+': flags |= PLUS; goto repeat; - case ' ': flags |= SPACE; goto repeat; - case '#': flags |= SPECIAL; goto repeat; - case '0': flags |= ZEROPAD; goto repeat; - } - - /* get field width */ - field_width = -1; - if (isdigit(*fmt)) - field_width = skip_atoi(&fmt); - else if (*fmt == '*') { - ++fmt; - /* it's the next argument */ - field_width = va_arg(args, int); - if (field_width < 0) { - field_width = -field_width; - flags |= LEFT; - } - } - - /* get the precision */ - precision = -1; - if (*fmt == '.') { - ++fmt; - if (isdigit(*fmt)) - precision = skip_atoi(&fmt); - else if (*fmt == '*') { - ++fmt; - /* it's the next argument */ - precision = va_arg(args, int); - } - if (precision < 0) - precision = 0; - } - - /* get the conversion qualifier */ - qualifier = -1; - if (*fmt == 'l' && *(fmt+1) == 'l') { - qualifier = 'I'; - fmt += 2; - } else if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || *fmt == 'w') { - qualifier = *fmt; - ++fmt; - } else if (*fmt == 'I' && *(fmt+1) == '6' && *(fmt+2) == '4') { - qualifier = *fmt; - fmt += 3; - } else if (*fmt == 'I' && *(fmt+1) == '3' && *(fmt+2) == '2') { - qualifier = 'l'; - fmt += 3; - } else if (*fmt == 'F' && *(fmt+1) == 'p') { - fmt += 1; - flags |= REMOVEHEX; - } - - /* default base */ - base = 10; - - switch (*fmt) { - case 'c': /* finished */ - if (qualifier == 'l' || qualifier == 'w') { - wchar_t sw1[2]; - /* print unicode string */ - sw1[0] = (wchar_t) va_arg(args, int); - sw1[1] = 0; - str = stringw(str, end, (wchar_t *)&sw1, -1, field_width, precision, flags); - } else { - char s1[2]; - /* print ascii string */ - s1[0] = ( unsigned char) va_arg(args, int); - s1[1] = 0; - str = string(str, end, (char *)&s1, -1, field_width, precision, flags); - } - continue; - - case 'C': /* finished */ - if (!(flags & LEFT)) - while (--field_width > 0) { - if (str <= end) - *str = ' '; - ++str; - } - if (qualifier == 'h') { - if (str <= end) - *str = (unsigned char) va_arg(args, int); - ++str; - } else { - if (str <= end) - *str = (unsigned char)(wchar_t) va_arg(args, int); - ++str; - } - while (--field_width > 0) { - if (str <= end) - *str = ' '; - ++str; - } - continue; - - case 's': /* finished */ - if (qualifier == 'l' || qualifier == 'w') { - /* print unicode string */ - sw = va_arg(args, wchar_t *); - str = stringw(str, end, sw, -1, field_width, precision, flags); - } else { - /* print ascii string */ - s = va_arg(args, char *); - str = string(str, end, s, -1, field_width, precision, flags); - } - continue; - - case 'S': - if (qualifier == 'h') { - /* print ascii string */ - s = va_arg(args, char *); - str = string(str, end, s, -1, field_width, precision, flags); - } else { - /* print unicode string */ - sw = va_arg(args, wchar_t *); - str = stringw(str, end, sw, -1, field_width, precision, flags); - } - continue; - - case 'Z': - if (qualifier == 'w') { - /* print counted unicode string */ - PUNICODE_STRING pus = va_arg(args, PUNICODE_STRING); - if ((pus == NULL) || (pus->Buffer == NULL)) { - sw = NULL; - len = -1; - } else { - sw = pus->Buffer; - len = pus->Length / sizeof(WCHAR); - } - str = stringw(str, end, sw, len, field_width, precision, flags); - } else { - /* print counted ascii string */ - PANSI_STRING pus = va_arg(args, PANSI_STRING); - if ((pus == NULL) || (pus->Buffer == NULL)) { - s = NULL; - len = -1; - } else { - s = pus->Buffer; - len = pus->Length; - } - str = string(str, end, s, len, field_width, precision, flags); - } - continue; - - case 'p': - if ((flags & LARGE) == 0) - flags |= LARGE; - - if (field_width == -1) { - field_width = 2 * sizeof(void *); - flags |= ZEROPAD; - } - str = number(str, end, - (ULONG_PTR) va_arg(args, void *), 16, - field_width, precision, flags); - continue; - - case 'n': - /* FIXME: What does C99 say about the overflow case here? */ - if (qualifier == 'l') { - long * ip = va_arg(args, long *); - *ip = (str - buf); - } else { - int * ip = va_arg(args, int *); - *ip = (str - buf); - } - continue; - - /* float number formats - set up the flags and "break" */ - case 'e': - case 'E': - case 'f': - case 'g': - case 'G': - _double = (double)va_arg(args, double); - if ( _isnan(_double) ) { - s = "Nan"; - len = 3; - while ( len > 0 ) { - if (str <= end) - *str = *s++; - ++str; - len --; - } - } else if ( _isinf(_double) < 0 ) { - s = "-Inf"; - len = 4; - while ( len > 0 ) { - if (str <= end) - *str = *s++; - ++str; - len --; - } - } else if ( _isinf(_double) > 0 ) { - s = "+Inf"; - len = 4; - while ( len > 0 ) { - if (str <= end) - *str = *s++; - ++str; - len --; - } - } else { - if ( precision == -1 ) - precision = 6; - str = numberf(str, end, (int)_double, base, field_width, precision, flags); - } - - continue; - - - /* integer number formats - set up the flags and "break" */ - case 'o': - base = 8; - break; - - case 'b': - base = 2; - break; - - case 'X': - flags |= LARGE; - case 'x': - base = 16; - break; - - case 'd': - case 'i': - flags |= SIGN; - case 'u': - break; - - default: - if (*fmt) { - if (str <= end) - *str = *fmt; - ++str; - } else - --fmt; - continue; - } - - if (qualifier == 'I') - num = va_arg(args, unsigned long long); - else if (qualifier == 'l') { - if (flags & SIGN) - num = va_arg(args, long); - else - num = va_arg(args, unsigned long); - } - else if (qualifier == 'h') { - if (flags & SIGN) - num = va_arg(args, int); - else - num = va_arg(args, unsigned int); - } - else { - if (flags & SIGN) - num = va_arg(args, int); - else - num = va_arg(args, unsigned int); - } - str = number(str, end, num, base, field_width, precision, flags); - } - if (str <= end) - *str = '\0'; - else if (cnt > 0) - /* don't write out a null byte if the buf size is zero */ - *end = '\0'; - return str-buf; -} - - -/* - * @implemented - */ -int sprintf(char * buf, const char *fmt, ...) -{ - va_list args; - int i; - - va_start(args, fmt); - i=_vsnprintf(buf,MAXLONG,fmt,args); - va_end(args); - return i; -} - - -/* - * @implemented - */ -int _snprintf(char * buf, size_t cnt, const char *fmt, ...) -{ - va_list args; - int i; - - va_start(args, fmt); - i=_vsnprintf(buf,cnt,fmt,args); - va_end(args); - return i; -} - - -/* - * @implemented - */ -int __cdecl vsprintf(char *buf, const char *fmt, va_list args) -{ - return _vsnprintf(buf,MAXLONG,fmt,args); -} - -/* EOF */ -#endif - Removed: trunk/reactos/lib/rtl/swprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/swprintf.c?rev=503… ============================================================================== --- trunk/reactos/lib/rtl/swprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/swprintf.c (removed) @@ -1,744 +1,0 @@ -#ifndef USE_NEW_SPRINTF -/* - * PROGRAMMERS: David Welch - * Eric Kohl - * - * TODO: - * - Verify the implementation of '%Z'. - */ - -/* - * linux/lib/vsprintf.c - * - * Copyright (C) 1991, 1992 Linus Torvalds - */ - -/* vsprintf.c -- Lars Wirzenius & Linus Torvalds. */ -/* - * Wirzenius wrote this portably, Torvalds fucked it up :-) - */ - -#include <rtl.h> - -#define ZEROPAD 1 /* pad with zero */ -#define SIGN 2 /* unsigned/signed long */ -#define PLUS 4 /* show plus */ -#define SPACE 8 /* space if plus */ -#define LEFT 16 /* left justified */ -#define SPECIAL 32 /* 0x */ -#define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */ -#define REMOVEHEX 256 /* use 256 as remve 0x frim BASE 16 */ -typedef struct { - unsigned int mantissal:32; - unsigned int mantissah:20; - unsigned int exponent:11; - unsigned int sign:1; -} double_t; - -static -__inline -int -_isinf(double __x) -{ - union - { - double* __x; - double_t* x; - } x; - - x.__x = &__x; - return ( x.x->exponent == 0x7ff && ( x.x->mantissah == 0 && x.x->mantissal == 0 )); -} - -static -__inline -int -_isnan(double __x) -{ - union - { - double* __x; - double_t* x; - } x; - x.__x = &__x; - return ( x.x->exponent == 0x7ff && ( x.x->mantissah != 0 || x.x->mantissal != 0 )); -} - - -static -__inline -int -do_div(long long *n, int base) -{ - int a; - a = ((unsigned long long) *n) % (unsigned) base; - *n = ((unsigned long long) *n) / (unsigned) base; - return a; -} - - -static int skip_atoi(const wchar_t **s) -{ - int i=0; - - while (iswdigit(**s)) - i = i*10 + *((*s)++) - L'0'; - return i; -} - - -static wchar_t * -number(wchar_t * buf, wchar_t * end, long long num, int base, int size, int precision, int type) -{ - wchar_t c, sign, tmp[66]; - const wchar_t *digits; - const wchar_t *small_digits = L"0123456789abcdefghijklmnopqrstuvwxyz"; - const wchar_t *large_digits = L"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - int i; - - digits = (type & LARGE) ? large_digits : small_digits; - if (type & LEFT) - type &= ~ZEROPAD; - if (base < 2 || base > 36) - return 0; - c = (type & ZEROPAD) ? L'0' : L' '; - sign = 0; - if (type & SIGN) { - if (num < 0) { - sign = L'-'; - num = -num; - size--; - } else if (type & PLUS) { - sign = L'+'; - size--; - } else if (type & SPACE) { - sign = ' '; - size--; - } - } - - if ((type & SPECIAL) && ((type & REMOVEHEX) == 0)) { - if (base == 16) - size -= 2; - } - i = 0; - if ((num == 0) && (precision !=0)) - tmp[i++] = L'0'; - else while (num != 0) - tmp[i++] = digits[do_div(&num,base)]; - if (i > precision) - precision = i; - size -= precision; - if (!(type&(ZEROPAD+LEFT))) { - while(size-->0) { - if (buf <= end) - *buf = L' '; - ++buf; - } - } - if (sign) { - if (buf <= end) - *buf = sign; - ++buf; - } - - if ((type & SPECIAL) && ((type & REMOVEHEX) == 0)) { - if (base==16) { - if (buf <= end) - *buf = L'0'; - ++buf; - if (buf <= end) - *buf = digits[33]; - ++buf; - } - } - if (!(type & LEFT)) { - while (size-- > 0) { - if (buf <= end) - *buf = c; - ++buf; - } - } - while (i < precision--) { - if (buf <= end) - *buf = L'0'; - ++buf; - } - while (i-- > 0) { - if (buf <= end) - *buf = tmp[i]; - ++buf; - } - while (size-- > 0) { - if (buf <= end) - *buf = L' '; - ++buf; - } - - - return buf; -} - -static wchar_t * -numberf(wchar_t * buf, wchar_t * end, double num, int base, int size, int precision, int type) -{ - wchar_t c, sign, tmp[66]; - const wchar_t *digits; - const wchar_t *small_digits = L"0123456789abcdefghijklmnopqrstuvwxyz"; - const wchar_t *large_digits = L"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - int i; - long long x; - - /* FIXME - the float version of number is direcly copy of number - */ - - - digits = (type & LARGE) ? large_digits : small_digits; - if (type & LEFT) - type &= ~ZEROPAD; - if (base < 2 || base > 36) - return 0; - c = (type & ZEROPAD) ? L'0' : L' '; - sign = 0; - if (type & SIGN) { - if (num < 0) { - sign = L'-'; - num = -num; - size--; - } else if (type & PLUS) { - sign = L'+'; - size--; - } else if (type & SPACE) { - sign = ' '; - size--; - } - } - if (type & SPECIAL) { - if (base == 16) - size -= 2; - else if (base == 8) - size--; - } - i = 0; - if (num == 0) - tmp[i++] = L'0'; - else while (num != 0) - { - x = num; - tmp[i++] = digits[do_div(&x,base)]; -#ifndef _M_ARM // Missing __floatdidf in CeGCC 0.55 -- GCC 4.4 - num = x; -#endif - } - if (i > precision) - precision = i; - size -= precision; - if (!(type&(ZEROPAD+LEFT))) { - while(size-->0) { - if (buf <= end) - *buf = L' '; - ++buf; - } - } - if (sign) { - if (buf <= end) - *buf = sign; - ++buf; - } - if (type & SPECIAL) { - if (base==8) { - if (buf <= end) - *buf = L'0'; - ++buf; - } else if (base==16) { - if (buf <= end) - *buf = L'0'; - ++buf; - if (buf <= end) - *buf = digits[33]; - ++buf; - } - } - if (!(type & LEFT)) { - while (size-- > 0) { - if (buf <= end) - *buf = c; - ++buf; - } - } - while (i < precision--) { - if (buf <= end) - *buf = L'0'; - ++buf; - } - while (i-- > 0) { - if (buf <= end) - *buf = tmp[i]; - ++buf; - } - while (size-- > 0) { - if (buf <= end) - *buf = L' '; - ++buf; - } - return buf; -} - -static wchar_t* -string(wchar_t* buf, wchar_t* end, const char* s, int len, int field_width, int precision, int flags) -{ - int i; - wchar_t c; - - c = (flags & ZEROPAD) ? L'0' : L' '; - - if (s == NULL) - { - s = "<NULL>"; - len = 6; - } - else - { - if (len == -1) - { - len = 0; - while ((unsigned int)len < (unsigned int)precision && s[len]) - len++; - } - else - { - if ((unsigned int)len > (unsigned int)precision) - len = precision; - } - } - if (!(flags & LEFT)) - while (len < field_width--) - { - if (buf <= end) - *buf = c; - ++buf; - } - for (i = 0; i < len; ++i) - { - if (buf <= end) - *buf = *s++; - ++buf; - } - while (len < field_width--) - { - if (buf <= end) - *buf = L' '; - ++buf; - } - return buf; -} - -static wchar_t* -stringw(wchar_t* buf, wchar_t* end, const wchar_t* sw, int len, int field_width, int precision, int flags) -{ - int i; - wchar_t c; - - c = (flags & ZEROPAD) ? L'0' : L' '; - - if (sw == NULL) - { - sw = L"<NULL>"; - len = 6; - } - else - { - if (len == -1) - { - len = 0; - while ((unsigned int)len < (unsigned int)precision && sw[len]) - len++; - } - else - { - if ((unsigned int)len > (unsigned int)precision) - len = precision; - } - } - if (!(flags & LEFT)) - while (len < field_width--) - { - if (buf <= end) - *buf = c; - buf++; - } - for (i = 0; i < len; ++i) - { - if (buf <= end) - *buf = *sw++; - buf++; - } - while (len < field_width--) - { - if (buf <= end) - *buf = L' '; - buf++; - } - return buf; -} - -/* - * @implemented - */ -int __cdecl _vsnwprintf(wchar_t *buf, size_t cnt, const wchar_t *fmt, va_list args) -{ - int len; - unsigned long long num; - int base; - wchar_t * str, * end; - const char *s; - const wchar_t *sw; - const wchar_t *ss; - double _double; - - int flags; /* flags to number() */ - - int field_width; /* width of output field */ - int precision; /* min. # of digits for integers; max - number of chars for from string */ - int qualifier; /* 'h', 'l', 'L', 'w' or 'I' for integer fields */ - - str = buf; - end = buf + cnt - 1; - if (end < buf - 1) { - end = ((wchar_t *) -1); - cnt = end - buf + 1; - } - - for ( ; *fmt ; ++fmt) { - if (*fmt != L'%') { - if (str <= end) - *str = *fmt; - ++str; - continue; - } - - /* process flags */ - flags = 0; - repeat: - ++fmt; /* this also skips first '%' */ - switch (*fmt) { - case L'-': flags |= LEFT; goto repeat; - case L'+': flags |= PLUS; goto repeat; - case L' ': flags |= SPACE; goto repeat; - case L'#': flags |= SPECIAL; goto repeat; - case L'0': flags |= ZEROPAD; goto repeat; - } - - /* get field width */ - field_width = -1; - if (iswdigit(*fmt)) - field_width = skip_atoi(&fmt); - else if (*fmt == L'*') { - ++fmt; - /* it's the next argument */ - field_width = va_arg(args, int); - if (field_width < 0) { - field_width = -field_width; - flags |= LEFT; - } - } - - /* get the precision */ - precision = -1; - if (*fmt == L'.') { - ++fmt; - if (iswdigit(*fmt)) - precision = skip_atoi(&fmt); - else if (*fmt == L'*') { - ++fmt; - /* it's the next argument */ - precision = va_arg(args, int); - } - if (precision < 0) - precision = 0; - } - - /* get the conversion qualifier */ - qualifier = -1; - if (*fmt == L'l' && *(fmt+1) == L'l') { - qualifier = L'I'; - fmt += 2; - } else if (*fmt == L'h' || *fmt == L'l' || *fmt == L'L' || *fmt == L'w') { - qualifier = *fmt; - ++fmt; - } else if (*fmt == L'I' && *(fmt+1) == L'6' && *(fmt+2) == L'4') { - qualifier = *fmt; - fmt += 3; - } else if (*fmt == L'I' && *(fmt+1) == L'3' && *(fmt+2) == L'2') { - qualifier = L'l'; - fmt += 3; - } else if (*fmt == L'F' && *(fmt+1) == L'p') { - fmt += 1; - flags |= REMOVEHEX; - } - - /* default base */ - base = 10; - - switch (*fmt) { - case L'c': - if (qualifier == 'h' || qualifier == 'w') { - wchar_t sw1[2]; - /* print unicode string */ - sw1[0] = (wchar_t) va_arg(args, int); - sw1[1] = 0; - str = stringw(str, end, (wchar_t *)&sw1, -1, field_width, precision, flags); - } else { - char s1[2]; - /* print ascii string */ - s1[0] = ( unsigned char) va_arg(args, int); - s1[1] = 0; - str = string(str, end, (char *)&s1, -1, field_width, precision, flags); - } - - continue; - - case L'C': - if (!(flags & LEFT)) - while (--field_width > 0) { - if (str <= end) - *str = L' '; - ++str; - } - if (qualifier == 'l' || qualifier == 'w') { - if (str <= end) - *str = (wchar_t) va_arg(args, int); - ++str; - } else { - if (str <= end) - *str = (wchar_t) va_arg(args, int); - ++str; - } - while (--field_width > 0) { - if (str <= end) - *str = L' '; - ++str; - } - continue; - - case L's': - if (qualifier == 'h') { - /* print ascii string */ - s = va_arg(args, char *); - str = string(str, end, s, -1, field_width, precision, flags); - } else { - /* print unicode string */ - sw = va_arg(args, wchar_t *); - str = stringw(str, end, sw, -1, field_width, precision, flags); - } - continue; - - case L'S': - if (qualifier == 'l' || qualifier == 'w') { - /* print unicode string */ - sw = va_arg(args, wchar_t *); - str = stringw(str, end, sw, -1, field_width, precision, flags); - } else { - /* print ascii string */ - s = va_arg(args, char *); - str = string(str, end, s, -1, field_width, precision, flags); - } - continue; - - case L'Z': - if (qualifier == 'h') { - /* print counted ascii string */ - PANSI_STRING pus = va_arg(args, PANSI_STRING); - if ((pus == NULL) || (pus->Buffer == NULL)) { - s = NULL; - len = -1; - } else { - s = pus->Buffer; - len = pus->Length; - } - str = string(str, end, s, len, field_width, precision, flags); - } else { - /* print counted unicode string */ - PUNICODE_STRING pus = va_arg(args, PUNICODE_STRING); - if ((pus == NULL) || (pus->Buffer == NULL)) { - sw = NULL; - len = -1; - } else { - sw = pus->Buffer; - len = pus->Length / sizeof(WCHAR); - } - str = stringw(str, end, sw, len, field_width, precision, flags); - } - continue; - - case L'p': - if ((flags & LARGE) == 0) - flags |= LARGE; - if (field_width == -1) { - field_width = 2*sizeof(void *); - flags |= ZEROPAD; - } - str = number(str, end, - (ULONG_PTR) va_arg(args, void *), 16, - field_width, precision, flags); - continue; - - case L'n': - /* FIXME: What does C99 say about the overflow case here? */ - if (qualifier == 'l') { - long * ip = va_arg(args, long *); - *ip = (str - buf); - } else { - int * ip = va_arg(args, int *); - *ip = (str - buf); - } - continue; - /* float number formats - set up the flags and "break" */ - case 'e': - case 'E': - case 'f': - case 'g': - case 'G': - _double = (double)va_arg(args, double); - - if ( _isnan(_double) ) { - ss = L"Nan"; - len = 3; - while ( len > 0 ) { - if (str <= end) - *str = *ss++; - ++str; - len --; - } - } else if ( _isinf(_double) < 0 ) { - ss = L"-Inf"; - len = 4; - while ( len > 0 ) { - if (str <= end) - *str = *ss++; - ++str; - len --; - } - } else if ( _isinf(_double) > 0 ) { - ss = L"+Inf"; - len = 4; - while ( len > 0 ) { - if (str <= end) - *str = *ss++; - ++str; - len --; - } - } else { - if ( precision == -1 ) - precision = 6; - str = numberf(str, end, _double, base, field_width, precision, flags); - } - - continue; - - - - /* integer number formats - set up the flags and "break" */ - case L'o': - base = 8; - break; - - case L'b': - base = 2; - break; - - case L'X': - flags |= LARGE; - case L'x': - base = 16; - break; - - case L'd': - case L'i': - flags |= SIGN; - case L'u': - break; - - default: - if (*fmt) { - if (str <= end) - *str = *fmt; - ++str; - } else - --fmt; - continue; - } - - if (qualifier == L'I') - num = va_arg(args, unsigned long long); - else if (qualifier == L'l') { - if (flags & SIGN) - num = va_arg(args, long); - else - num = va_arg(args, unsigned long); - } - else if (qualifier == L'h') { - if (flags & SIGN) - num = va_arg(args, int); - else - num = va_arg(args, unsigned int); - } - else { - if (flags & SIGN) - num = va_arg(args, int); - else - num = va_arg(args, unsigned int); - } - str = number(str, end, num, base, field_width, precision, flags); - } - if (str <= end) - *str = L'\0'; - else if (cnt > 0) - /* don't write out a null byte if the buf size is zero */ - *end = L'\0'; - return str-buf; -} - - -/* - * @implemented - */ -int swprintf(wchar_t *buf, const wchar_t *fmt, ...) -{ - va_list args; - int i; - - va_start(args, fmt); - i=_vsnwprintf(buf,MAXLONG,fmt,args); - va_end(args); - return i; -} - - -/* - * @implemented - */ -int __cdecl _snwprintf(wchar_t *buf, size_t cnt, const wchar_t *fmt, ...) -{ - va_list args; - int i; - - va_start(args, fmt); - i=_vsnwprintf(buf,cnt,fmt,args); - va_end(args); - return i; -} - - -/* - * @implemented - */ -int __cdecl vswprintf(wchar_t *buf, const wchar_t *fmt, va_list args) -{ - return _vsnwprintf(buf,MAXLONG,fmt,args); -} - -/* EOF */ -#endif Removed: trunk/reactos/lib/sdk/crt/conio/cprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/conio/cprintf.… ============================================================================== --- trunk/reactos/lib/sdk/crt/conio/cprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/conio/cprintf.c (removed) @@ -1,43 +1,0 @@ -/* - * COPYRIGHT: Winehq - * PROJECT: wine - * FILE: msvcrt/conio/cprintf.c - * PURPOSE: C Runtime - * PROGRAMMER: Magnus Olsen (Imported from wine cvs 2006-05-23) - */ -#ifndef USE_NEW_SPRINTF - -#include <precomp.h> - -/* - * @implemented - */ -int -_cprintf(const char *fmt, ...) -{ - char buf[2048], *mem = buf; - int written, resize = sizeof(buf), retval; - va_list valist; - - va_start( valist, fmt ); - - while ((written = _vsnprintf( mem, resize, fmt, valist )) == -1 || - written > resize) - { - resize = (written == -1 ? resize * 2 : written + 1); - if (mem != buf) - free (mem); - if (!(mem = (char *)malloc(resize))) - return EOF; - - va_end ( valist ); - va_start( valist, fmt ); - } - va_end ( valist ); - retval = _cputs( mem ); - if (mem != buf) - free (mem); - return retval; -} - -#endif Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Tue Jan 11 13:13:47 2011 @@ -55,7 +55,6 @@ <directory name="conio"> <file>cgets.c</file> - <file>cprintf.c</file> <file>cputs.c</file> <file>getch.c</file> <file>getche.c</file> @@ -362,7 +361,6 @@ <file>find64.c</file> <file>findi64.c</file> <file>fmode.c</file> - <file>lnx_sprintf.c</file> <file>perror.c</file> <file>popen.c</file> <file>stat.c</file> Modified: trunk/reactos/lib/sdk/crt/libcntpr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.rbuil… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] Tue Jan 11 13:13:47 2011 @@ -10,8 +10,6 @@ <define name="_CRTBLD" /> <define name="__CRT__NO_INLINE" /> - <if property="NEWSPRINTF" value="1"> - <define name="USE_NEW_SPRINTF" /> <directory name="printf"> <file>_snprintf.c</file> <file>_snwprintf.c</file> @@ -26,7 +24,6 @@ <file>vswprintf.c</file> <file>wstreamout.c</file> </directory> - </if> <if property="ARCH" value="i386"> <define name="__MINGW_IMPORT">"extern __attribute__ ((dllexport))"</define> Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Tue Jan 11 13:13:47 2011 @@ -2783,142 +2783,6 @@ return file; } -#ifndef USE_NEW_SPRINTF -/********************************************************************* - * vfprintf (MSVCRT.@) - */ -int CDECL vfprintf(FILE* file, const char *format, va_list valist) -{ - char buf[2048], *mem = buf; - int written, resize = sizeof(buf), retval; - /* There are two conventions for vsnprintf failing: - * Return -1 if we truncated, or - * Return the number of bytes that would have been written - * The code below handles both cases - */ - while ((written = _vsnprintf(mem, resize, format, valist)) == -1 || - written > resize) - { - resize = (written == -1 ? resize * 2 : written + 1); - if (mem != buf) - free (mem); - if (!(mem = malloc(resize))) - return EOF; - } - retval = fwrite(mem, sizeof(*mem), written, file); - if (mem != buf) - free (mem); - return retval; -} - -/********************************************************************* - * vfwprintf (MSVCRT.@) - * FIXME: - * Is final char included in written (then resize is too big) or not - * (then we must test for equality too)? - */ -int CDECL vfwprintf(FILE* file, const wchar_t *format, va_list valist) -{ - wchar_t buf[2048], *mem = buf; - int written, resize = sizeof(buf) / sizeof(wchar_t), retval; - /* See vfprintf comments */ - while ((written = _vsnwprintf(mem, resize, format, valist)) == -1 || - written > resize) - { - resize = (written == -1 ? resize * 2 : written + sizeof(wchar_t)); - if (mem != buf) - free (mem); - if (!(mem = malloc(resize*sizeof(*mem)))) - return EOF; - } - - /* Check if outputting to a text-file */ - if (fdesc[file->_file].wxflag & WX_TEXT) - { - /* Convert each character and stop at the first invalid character. Behavior verified by tests under WinXP SP2 */ - char chMultiByte[MB_LEN_MAX]; - int nReturn; - wchar_t *p; - - retval = 0; - - for (p = mem; *p; p++) - { - nReturn = wctomb(chMultiByte, *p); - - if(nReturn == -1) - break; - - retval += fwrite(chMultiByte, 1, nReturn, file); - } - } - else - { - retval = fwrite(mem, sizeof(*mem), written, file); - } - - if (mem != buf) - free (mem); - - return retval; -} - -/********************************************************************* - * vprintf (MSVCRT.@) - */ -int CDECL vprintf(const char *format, va_list valist) -{ - return vfprintf(stdout,format,valist); -} - -/********************************************************************* - * vwprintf (MSVCRT.@) - */ -int CDECL vwprintf(const wchar_t *format, va_list valist) -{ - return vfwprintf(stdout,format,valist); -} - -/********************************************************************* - * fprintf (MSVCRT.@) - */ -int CDECL fprintf(FILE* file, const char *format, ...) -{ - va_list valist; - int res; - va_start(valist, format); - res = vfprintf(file, format, valist); - va_end(valist); - return res; -} - -/********************************************************************* - * fwprintf (MSVCRT.@) - */ -int CDECL fwprintf(FILE* file, const wchar_t *format, ...) -{ - va_list valist; - int res; - va_start(valist, format); - res = vfwprintf(file, format, valist); - va_end(valist); - return res; -} - -/********************************************************************* - * printf (MSVCRT.@) - */ -int CDECL printf(const char *format, ...) -{ - va_list valist; - int res; - va_start(valist, format); - res = vfprintf(stdout, format, valist); - va_end(valist); - return res; -} -#endif - /********************************************************************* * ungetc (MSVCRT.@) */ @@ -2955,21 +2819,6 @@ return mwc; } -#ifndef USE_NEW_SPRINTF -/********************************************************************* - * wprintf (MSVCRT.@) - */ -int CDECL wprintf(const wchar_t *format, ...) -{ - va_list valist; - int res; - va_start(valist, format); - res = vwprintf(format, valist); - va_end(valist); - return res; -} -#endif - /********************************************************************* * _getmaxstdio (MSVCRT.@) */ Removed: trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/lnx_spri… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/lnx_sprintf.c (removed) @@ -1,882 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PURPOSE: CRT's vsnprintf - * FILE: lib/sdk/crt/stdio/lnx_printf.c - * PROGRAMERS: David Welch - Eric Kohl - Gregor Schneider - * TODO: - * - Verify the implementation of '%Z'. - */ - -/* - * Parts from linux/lib/vsprintf.c - * Lars Wirzenius & Linus Torvalds - * Wirzenius wrote this portably, Torvalds fucked it up :-) - */ -#ifndef USE_NEW_SPRINTF -#include <precomp.h> - -#include <wchar.h> -#include <tchar.h> - -#define ZEROPAD 1 /* pad with zero */ -#define SIGN 2 /* unsigned/signed */ -#define PLUS 4 /* show plus */ -#define SPACE 8 /* space if plus */ -#define LEFT 16 /* left justified */ -#define SPECIAL 32 /* 0x */ -#define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */ -#define ZEROTRUNC 128 /* truncate zero's */ -#define REMOVEHEX 256 /* remove 0x from BASE 16 */ - -static -__inline -int -do_div(long long *n, int base) -{ - int a; - a = ((unsigned long long) *n) % (unsigned) base; - *n = ((unsigned long long) *n) / (unsigned) base; - return a; -} - - -static int skip_atoi(const char **s) -{ - int i=0; - - while (isdigit(**s)) - i = i*10 + *((*s)++) - '0'; - return i; -} - - -static char * -number(char * buf, char * end, long long num, int base, int size, int precision, int type) -{ - char c,sign,tmp[66]; - const char *digits; - const char *small_digits = "0123456789abcdefghijklmnopqrstuvwxyz"; - const char *large_digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - int i; - - digits = (type & LARGE) ? large_digits : small_digits; - if (type & LEFT) - type &= ~ZEROPAD; - if (base < 2 || base > 36) - return 0; - c = (type & ZEROPAD) ? '0' : ' '; - sign = 0; - if (type & SIGN) { - if (num < 0) { - sign = '-'; - num = -num; - size--; - } else if (type & PLUS) { - sign = '+'; - size--; - } else if (type & SPACE) { - sign = ' '; - size--; - } - } - - if ((type & SPECIAL) && ((type & REMOVEHEX) == 0)) { - if (base == 16) - size -= 2; - } - i = 0; - if ((num == 0) && (precision !=0)) - tmp[i++] = '0'; - else while (num != 0) - tmp[i++] = digits[do_div(&num,base)]; - if (i > precision) - precision = i; - size -= precision; - if (!(type&(ZEROPAD+LEFT))) { - while(size-->0) { - if (buf <= end) - *buf = ' '; - ++buf; - } - } - if (sign) { - if (buf <= end) - *buf = sign; - ++buf; - } - - if ((type & SPECIAL) && ((type & REMOVEHEX) == 0)) { - if (base==16) { - if (buf <= end) - *buf = '0'; - ++buf; - if (buf <= end) - *buf = digits[33]; - ++buf; - } - } - - if (!(type & LEFT)) { - while (size-- > 0) { - if (buf <= end) - *buf = c; - ++buf; - } - } - while (i < precision--) { - if (buf <= end) - *buf = '0'; - ++buf; - } - while (i-- > 0) { - if (buf <= end) - *buf = tmp[i]; - ++buf; - } - while (size-- > 0) { - if (buf <= end) - *buf = ' '; - ++buf; - } - - return buf; -} - -typedef struct { - unsigned int mantissal:32; - unsigned int mantissah:20; - unsigned int exponent:11; - unsigned int sign:1; -} ieee_double_t; - -static __inline void fracrnd(double *number, int prec) -{ - /* Shifts fractional digits to decimal places and compares to round table */ - /* Only suitable to determine the exponent with more precision, not for normal rounding */ - /* Incoming numbers are expected to range from approx -10.0 to 10.0 */ - int lpos = 1, ubound, sign = 1; - long decimal = abs((long)*number); - double frac = (*number - decimal) * 10; - long rt[] = - { - 0, - 9, - 99, - 999, - 9999, - 99999, - 999999, - 9999999, - 99999999, - 999999999 - }; - - if (*number < 0) - { - sign = -1; - } - ubound = min(prec, sizeof(rt)/sizeof(*rt) - 1); - while ((long)frac % 10 != 0 && lpos < ubound) - { - frac *= 10; - lpos++; - } - if (abs((long)frac) == rt[lpos]) - { - *number = sign * (decimal + 1); - } -} - -static char * -numberf(char * buf, char * end, double num, char exp_sign, int size, int precision, int type) -{ - double exponent = 0.0; - double e = 0.0; - long ie; - - int i = 0; - int j = 0; - int ro = 0; - int isize; - - double num2, frac, intr; - double p; - - char c, sign, digits[66]; - char *tmp; - - union - { - double* __n; - ieee_double_t* n; - } n; - - n.__n = &num; - - if ( exp_sign == 'g' || exp_sign == 'G' || exp_sign == 'e' || exp_sign == 'E' ) - { - ie = ((unsigned int)n.n->exponent - (unsigned int)0x3ff); - if (num != 0.0) - { - exponent = ie/3.321928; - } - } - - if ( exp_sign == 'g' || exp_sign == 'G' ) - { - type |= ZEROTRUNC; - if ( exponent < -4 || fabs(exponent) >= precision ) - exp_sign -= 2; // g -> e and G -> E - else - exp_sign = 'f'; - if (type & SPECIAL) precision--; - } - - if ( exp_sign == 'e' || exp_sign == 'E' ) - { - if (num != 0.0) - { - /* Find a suitable exponent */ - frac = modf(exponent, &e); - num2 = num/pow(10.0L, (long double)e); - /* Check if rounding is possible */ - fracrnd(&num2, precision); - if (num2 < 1.0 && num2 > -1.0) - { - e--; - } - else if (num2 <= -10.0 || num2 >= 10.0) - { - e++; - } - } - - /* size-5 because "e+abc" is going to follow */ - buf = numberf(buf, end, num/pow(10.0L,(long double)e), 'f', size-5, precision, type); - isize = 4; - while(*(buf-1) == ' ') - { - isize++; - --buf; - } - - if (buf <= end) - *buf = exp_sign; - ++buf; - size--; - - ie = (long)e; - type = LEFT | SIGN | PLUS; - buf = number(buf, end, ie, 10, isize, 3, type); - return buf; - } - - if ( exp_sign == 'f' ) - { - if (type & LEFT) - type &= ~ZEROPAD; - - c = (type & ZEROPAD) ? '0' : ' '; - sign = 0; - - if (num < 0) - { - sign = '-'; - num = fabs(num); - size--; - } - else if (type & PLUS) - { - sign = '+'; - size--; - } - else if (type & SPACE) - { - sign = ' '; - size--; - } - - frac = modf(num,&intr); - - // # flags forces a . and prevents truncation of trailing zero's - if ( precision > 0 ) - { - i = precision-1; - while ( i >= 0 ) - { - frac*=10.0L; - frac = modf(frac, &p); - digits[i] = (int)p + '0'; - i--; - } - - i = precision; - size -= precision; - } - - if ( precision >= 1 || type & SPECIAL) - { - digits[i++] = '.'; - size--; - } - - ro = 0; - if ( frac > 0.5 ) - { - ro = 1; - } - - if ( intr == 0.0 ) - { - digits[i++] = '0'; - size--; - } - else - { - while ( intr > 0.0 ) - { - p = intr; - intr/=10.0L; - modf(intr, &intr); - - p -= 10.0*intr; - - digits[i++] = (int)p + '0'; - size--; - } - } - - j = 0; - while ( j < i && ro == 1) - { - if ( digits[j] >= '0' && digits[j] <= '8' ) - { - digits[j]++; - ro = 0; - } - else if ( digits[j] == '9' ) - { - digits[j] = '0'; - } - j++; - } - if ( ro == 1 ) - digits[i++] = '1'; - - digits[i] = 0; - - if (!(type & (ZEROPAD+LEFT))) - { - while(size-->0) - { - if (buf <= end) - *buf = ' '; - ++buf; - } - } - if (sign) - { - if (buf <= end) - *buf = sign; - ++buf; - } - - if (!(type & (ZEROPAD+LEFT))) - { - while(size-->0) - { - if (buf <= end) - *buf = ' '; - ++buf; - } - } - - if (!(type & LEFT)) - { - while (size-- > 0) - { - if (buf <= end) - *buf = c; - ++buf; - } - } - - tmp = digits; - if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) ) - { - j = 0; - while ( j < i && ( *tmp == '0' || *tmp == '.' )) - { - tmp++; - i--; - } - } - while (i-- > 0) - { - if (buf <= end) - *buf = tmp[i]; - ++buf; - } - while (size-- > 0) - { - if (buf <= end) - *buf = ' '; - buf++; - } - } - return buf; -} - -static char* -string(char* buf, char* end, const char* s, int len, int field_width, int precision, int flags) -{ - int i; - char c; - - c = (flags & ZEROPAD) ? '0' : ' '; - - if (s == NULL) - { - s = "<NULL>"; - len = 6; - } - else - { - if (len == -1) - { - len = 0; - while ((unsigned int)len < (unsigned int)precision && s[len]) - len++; - } - else - { - if ((unsigned int)len > (unsigned int)precision) - len = precision; - } - } - if (!(flags & LEFT)) - while (len < field_width--) - { - if (buf <= end) - *buf = c; - ++buf; - } - for (i = 0; i < len; ++i) - { - if (buf <= end) - *buf = *s++; - ++buf; - } - while (len < field_width--) - { - if (buf <= end) - *buf = ' '; - ++buf; - } - return buf; -} - -static char* -stringw(char* buf, char* end, const wchar_t* sw, int len, int field_width, int precision, int flags) -{ - int i; - char c; - - c = (flags & ZEROPAD) ? '0' : ' '; - - if (sw == NULL) - { - sw = L"<NULL>"; - len = 6; - } - else - { - if (len == -1) - { - len = 0; - while ((unsigned int)len < (unsigned int)precision && sw[len]) - len++; - } - else - { - if ((unsigned int)len > (unsigned int)precision) - len = precision; - } - } - if (!(flags & LEFT)) - while (len < field_width--) - { - if (buf <= end) - *buf = c; - buf++; - } - for (i = 0; i < len; ++i) - { - if (buf <= end) - *buf = (unsigned char)(*sw++); - buf++; - } - while (len < field_width--) - { - if (buf <= end) - *buf = ' '; - buf++; - } - return buf; -} - -/* - * @implemented - */ -int __cdecl lnx_vsnprintf(char *buf, size_t cnt, const char *fmt, va_list args) -{ - int len; - unsigned long long num; - double _double; - - int base; - char *str, *end; - const char *s; - const wchar_t *sw; - - int flags; /* flags to number() */ - - int field_width; /* width of output field */ - int precision; /* min. # of digits for integers; max - number of chars for from string */ - int qualifier; /* 'h', 'l', 'L', 'I' or 'w' for integer fields */ - - str = buf; - end = buf + cnt - 1; - if (end < buf - 1) { - end = ((char *) -1); - cnt = end - buf + 1; - } - - for ( ; *fmt ; ++fmt) { - if (*fmt != '%') { - if (str <= end) - *str = *fmt; - ++str; - continue; - } - - /* process flags */ - flags = 0; -repeat: - ++fmt; /* this also skips first '%' */ - switch (*fmt) { - case '-': flags |= LEFT; goto repeat; - case '+': flags |= PLUS; goto repeat; - case ' ': flags |= SPACE; goto repeat; - case '#': flags |= SPECIAL; goto repeat; - case '0': flags |= ZEROPAD; goto repeat; - } - - /* get field width */ - field_width = -1; - if (isdigit(*fmt)) - field_width = skip_atoi(&fmt); - else if (*fmt == '*') { - ++fmt; - /* it's the next argument */ - field_width = va_arg(args, int); - if (field_width < 0) { - field_width = -field_width; - flags |= LEFT; - } - } - - /* get the precision */ - precision = -1; - if (*fmt == '.') { - ++fmt; - if (isdigit(*fmt)) - precision = skip_atoi(&fmt); - else if (*fmt == '*') { - ++fmt; - /* it's the next argument */ - precision = va_arg(args, int); - } - if (precision < 0) - precision = 0; - } - - /* get the conversion qualifier */ - qualifier = -1; - if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || *fmt == 'w') { - qualifier = *fmt; - ++fmt; - } else if (*fmt == 'I' && *(fmt+1) == '6' && *(fmt+2) == '4') { - qualifier = *fmt; - fmt += 3; - } else if (*fmt == 'I' && *(fmt+1) == '3' && *(fmt+2) == '2') { - qualifier = 'l'; - fmt += 3; - } else if (*fmt == 'F' && *(fmt+1) == 'p') { - fmt += 1; - flags |= REMOVEHEX; - } - - /* default base */ - base = 10; - - switch (*fmt) { - case 'c': /* finished */ - if (qualifier == 'l' || qualifier == 'w') { - wchar_t sw1[2]; - /* print unicode string */ - sw1[0] = (wchar_t) va_arg(args, int); - sw1[1] = 0; - str = stringw(str, end, (wchar_t *)&sw1, -1, field_width, precision, flags); - } else { - char s1[2]; - /* print ascii string */ - s1[0] = ( unsigned char) va_arg(args, int); - s1[1] = 0; - str = string(str, end, (char *)&s1, -1, field_width, precision, flags); - } - continue; - - case 'C': /* finished */ - if (!(flags & LEFT)) - while (--field_width > 0) { - if (str <= end) - *str = ' '; - ++str; - } - if (qualifier == 'h') { - if (str <= end) - *str = (unsigned char) va_arg(args, int); - ++str; - } else { - if (str <= end) - *str = (unsigned char)(wchar_t) va_arg(args, int); - ++str; - } - while (--field_width > 0) { - if (str <= end) - *str = ' '; - ++str; - } - continue; - - case 's': /* finished */ - if (qualifier == 'l' || qualifier == 'w') { - /* print unicode string */ - sw = va_arg(args, wchar_t *); - str = stringw(str, end, sw, -1, field_width, precision, flags); - } else { - /* print ascii string */ - s = va_arg(args, char *); - str = string(str, end, s, -1, field_width, precision, flags); - } - continue; - - case 'S': - if (qualifier == 'h') { - /* print ascii string */ - s = va_arg(args, char *); - str = string(str, end, s, -1, field_width, precision, flags); - } else { - /* print unicode string */ - sw = va_arg(args, wchar_t *); - str = stringw(str, end, sw, -1, field_width, precision, flags); - } - continue; - - case 'Z': - if (qualifier == 'w') { - /* print counted unicode string */ - PUNICODE_STRING pus = va_arg(args, PUNICODE_STRING); - if ((pus == NULL) || (pus->Buffer == NULL)) { - sw = NULL; - len = -1; - } else { - sw = pus->Buffer; - len = pus->Length / sizeof(WCHAR); - } - str = stringw(str, end, sw, len, field_width, precision, flags); - } else { - /* print counted ascii string */ - PANSI_STRING pus = va_arg(args, PANSI_STRING); - if ((pus == NULL) || (pus->Buffer == NULL)) { - s = NULL; - len = -1; - } else { - s = pus->Buffer; - len = pus->Length; - } - str = string(str, end, s, len, field_width, precision, flags); - } - continue; - - case 'p': - if ((flags & LARGE) == 0) - flags |= LARGE; - - if (field_width == -1) { - field_width = 2 * sizeof(void *); - flags |= ZEROPAD; - } - str = number(str, end, - (uintptr_t) va_arg(args, void *), 16, - field_width, precision, flags); - continue; - - case 'n': - /* FIXME: What does C99 say about the overflow case here? */ - if (qualifier == 'l') { - long * ip = va_arg(args, long *); - *ip = (str - buf); - } else { - int * ip = va_arg(args, int *); - *ip = (str - buf); - } - continue; - - /* float number formats - set up the flags and "break" */ - case 'e': - case 'E': - case 'f': - case 'g': - case 'G': - _double = (double)va_arg(args, double); - if ( _isnan(_double) ) { - s = "Nan"; - len = 3; - while ( len > 0 ) { - if (str <= end) - *str = *s++; - ++str; - len --; - } - } else if ( _isinf(_double) < 0 ) { - s = "-Inf"; - len = 4; - while ( len > 0 ) { - if (str <= end) - *str = *s++; - ++str; - len --; - } - } else if ( _isinf(_double) > 0 ) { - s = "+Inf"; - len = 4; - while ( len > 0 ) { - if (str <= end) - *str = *s++; - ++str; - len --; - } - } else { - if ( precision == -1 ) - precision = 6; - str = numberf(str, end, _double, *fmt, field_width, precision, flags); - } - continue; - - /* integer number formats - set up the flags and "break" */ - case 'o': - base = 8; - break; - - case 'b': - base = 2; - break; - - case 'X': - flags |= LARGE; - case 'x': - base = 16; - break; - - case 'd': - case 'i': - flags |= SIGN; - case 'u': - break; - - default: - if (*fmt) { - if (str <= end) - *str = *fmt; - ++str; - } else - --fmt; - continue; - } - - if (qualifier == 'I') - num = va_arg(args, unsigned long long); - else if (qualifier == 'l') { - if (flags & SIGN) - num = va_arg(args, long); - else - num = va_arg(args, unsigned long); - } - else if (qualifier == 'h') { - if (flags & SIGN) - num = va_arg(args, int); - else - num = va_arg(args, unsigned int); - } - else { - if (flags & SIGN) - num = va_arg(args, int); - else - num = va_arg(args, unsigned int); - } - str = number(str, end, num, base, field_width, precision, flags); - } - if (str <= end) - *str = '\0'; - else if (cnt > 0) - /* don't write out a null byte if the buf size is zero */ - *end = '\0'; - return str-buf; -} - - -/* - * @implemented - */ -int lnx_sprintf(char * buf, const char *fmt, ...) -{ - va_list args; - int i; - - va_start(args, fmt); - i=lnx_vsnprintf(buf,MAXLONG,fmt,args); - va_end(args); - return i; -} - -#if 0 -/* - * @implemented - */ -int _snprintf(char * buf, size_t cnt, const char *fmt, ...) -{ - va_list args; - int i; - - va_start(args, fmt); - i=_vsnprintf(buf,cnt,fmt,args); - va_end(args); - return i; -} - - -/* - * @implemented - */ -int __cdecl vsprintf(char *buf, const char *fmt, va_list args) -{ - return _vsnprintf(buf,MAXLONG,fmt,args); -} -#endif -/* EOF */ -#endif Modified: trunk/reactos/lib/sdk/crt/string/wcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcs.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] Tue Jan 11 13:13:47 2011 @@ -209,677 +209,6 @@ TRACE("returning %g\n", ret); return ret; } - -typedef struct pf_output_t -{ - int used; - int len; - BOOL unicode; - union { - LPWSTR W; - LPSTR A; - } buf; -} pf_output; - -typedef struct pf_flags_t -{ - char Sign, LeftAlign, Alternate, PadZero; - int FieldLength, Precision; - char IntegerLength, IntegerDouble; - char WideString; - char Format; -} pf_flags; - -/* - * writes a string of characters to the output - * returns -1 if the string doesn't fit in the output buffer - * return the length of the string if all characters were written - */ -static inline int pf_output_stringW( pf_output *out, LPCWSTR str, int len ) -{ - int space = out->len - out->used; - - if( len < 0 ) - len = strlenW( str ); - if( out->unicode ) - { - LPWSTR p = out->buf.W + out->used; - - if( space >= len ) - { - memcpy( p, str, len*sizeof(WCHAR) ); - out->used += len; - return len; - } - if( space > 0 ) - memcpy( p, str, space*sizeof(WCHAR) ); - out->used += len; - } - else - { - int n = WideCharToMultiByte( CP_ACP, 0, str, len, NULL, 0, NULL, NULL ); - LPSTR p = out->buf.A + out->used; - - if( space >= n ) - { - WideCharToMultiByte( CP_ACP, 0, str, len, p, n, NULL, NULL ); - out->used += n; - return len; - } - if( space > 0 ) - WideCharToMultiByte( CP_ACP, 0, str, len, p, space, NULL, NULL ); - out->used += n; - } - return -1; -} - -static inline int pf_output_stringA( pf_output *out, LPCSTR str, int len ) -{ - int space = out->len - out->used; - - if( len < 0 ) - len = strlen( str ); - if( !out->unicode ) - { - LPSTR p = out->buf.A + out->used; - - if( space >= len ) - { - memcpy( p, str, len ); - out->used += len; - return len; - } - if( space > 0 ) - memcpy( p, str, space ); - out->used += len; - } - else - { - int n = MultiByteToWideChar( CP_ACP, 0, str, len, NULL, 0 ); - LPWSTR p = out->buf.W + out->used; - - if( space >= n ) - { - MultiByteToWideChar( CP_ACP, 0, str, len, p, n ); - out->used += n; - return len; - } - if( space > 0 ) - MultiByteToWideChar( CP_ACP, 0, str, len, p, space ); - out->used += n; - } - return -1; -} - -/* pf_fill: takes care of signs, alignment, zero and field padding */ -static inline int pf_fill( pf_output *out, int len, pf_flags *flags, char left ) -{ - int i, r = 0; - - if( flags->Sign && !( flags->Format == 'd' || flags->Format == 'i' ) ) - flags->Sign = 0; - - if( left && flags->Sign ) - { - flags->FieldLength--; - if( flags->PadZero ) - r = pf_output_stringA( out, &flags->Sign, 1 ); - } - - if( ( !left && flags->LeftAlign ) || - ( left && !flags->LeftAlign )) - { - for( i=0; (i<(flags->FieldLength-len)) && (r>=0); i++ ) - { - if( left && flags->PadZero ) - r = pf_output_stringA( out, "0", 1 ); - else - r = pf_output_stringA( out, " ", 1 ); - } - } - - if( left && flags->Sign && !flags->PadZero ) - r = pf_output_stringA( out, &flags->Sign, 1 ); - - return r; -} - -static inline int pf_output_format_W( pf_output *out, LPCWSTR str, - int len, pf_flags *flags ) -{ - int r = 0; - - if( len < 0 ) - len = strlenW( str ); - - if (flags->Precision >= 0 && flags->Precision < len) - len = flags->Precision; - - r = pf_fill( out, len, flags, 1 ); - - if( r>=0 ) - r = pf_output_stringW( out, str, len ); - - if( r>=0 ) - r = pf_fill( out, len, flags, 0 ); - - return r; -} - -static inline int pf_output_format_A( pf_output *out, LPCSTR str, - int len, pf_flags *flags ) -{ - int r = 0; - - if( len < 0 ) - len = strlen( str ); - - if (flags->Precision >= 0 && flags->Precision < len) - len = flags->Precision; - - r = pf_fill( out, len, flags, 1 ); - - if( r>=0 ) - r = pf_output_stringA( out, str, len ); - - if( r>=0 ) - r = pf_fill( out, len, flags, 0 ); - - return r; -} - -#ifndef USE_NEW_SPRINTF -static int pf_handle_string_format( pf_output *out, const void* str, int len, - pf_flags *flags, BOOL capital_letter) -{ - if(str == NULL) /* catch NULL pointer */ - return pf_output_format_A( out, "(null)", -1, flags); - - /* prefixes take priority over %c,%s vs. %C,%S, so we handle them first */ - if(flags->WideString || flags->IntegerLength == 'l') - return pf_output_format_W( out, str, len, flags); - if(flags->IntegerLength == 'h') - return pf_output_format_A( out, str, len, flags); - - /* %s,%c -> chars in ansi functions & wchars in unicode - * %S,%C -> wchars in ansi functions & chars in unicode */ - if( capital_letter == out->unicode) /* either both TRUE or both FALSE */ - return pf_output_format_A( out, str, len, flags); - else - return pf_output_format_W( out, str, len, flags); -} - -static inline BOOL pf_is_integer_format( char fmt ) -{ - static const char float_fmts[] = "diouxX"; - if (!fmt) - return FALSE; - return strchr( float_fmts, fmt ) ? TRUE : FALSE; -} - -static inline BOOL pf_is_double_format( char fmt ) -{ - static const char float_fmts[] = "aeEfgG"; - if (!fmt) - return FALSE; - return strchr( float_fmts, fmt ) ? TRUE : FALSE; -} - -static inline BOOL pf_is_valid_format( char fmt ) -{ - static const char float_fmts[] = "acCdeEfgGinouxX"; - if (!fmt) - return FALSE; - return strchr( float_fmts, fmt ) ? TRUE : FALSE; -} - -static void pf_rebuild_format_string( char *p, pf_flags *flags ) -{ - *p++ = '%'; - if( flags->Sign ) - *p++ = flags->Sign; - if( flags->LeftAlign ) - *p++ = flags->LeftAlign; - if( flags->Alternate ) - *p++ = flags->Alternate; - if( flags->PadZero ) - *p++ = flags->PadZero; - if( flags->FieldLength ) - { - lnx_sprintf(p, "%d", flags->FieldLength); - p += strlen(p); - } - if( flags->Precision >= 0 ) - { - lnx_sprintf(p, ".%d", flags->Precision); - p += strlen(p); - } - *p++ = flags->Format; - *p++ = 0; -} - -/* pf_integer_conv: prints x to buf, including alternate formats and - additional precision digits, but not field characters or the sign */ -static void pf_integer_conv( char *buf, unsigned int buf_len, pf_flags *flags, - LONGLONG x ) -{ - unsigned int base; - const char *digits; - - int i, j, k; - char number[40], *tmp = number; - - if( buf_len > sizeof number ) - tmp = HeapAlloc( GetProcessHeap(), 0, buf_len ); - - base = 10; - if( flags->Format == 'o' ) - base = 8; - else if( flags->Format == 'x' || flags->Format == 'X' ) - base = 16; - - if( flags->Format == 'X' ) - digits = "0123456789ABCDEFX"; - else - digits = "0123456789abcdefx"; - - if( x < 0 && ( flags->Format == 'd' || flags->Format == 'i' ) ) - { - x = -x; - flags->Sign = '-'; - } - - /* Do conversion (backwards) */ - i = 0; - if( x == 0 && flags->Precision ) - tmp[i++] = '0'; - else - while( x != 0 ) - { - j = (ULONGLONG) x % base; - x = (ULONGLONG) x / base; - tmp[i++] = digits[j]; - } - k = flags->Precision - i; - while( k-- > 0 ) - tmp[i++] = '0'; - if( flags->Alternate ) - { - if( base == 16 ) - { - tmp[i++] = digits[16]; - tmp[i++] = '0'; - } - else if( base == 8 && tmp[i-1] != '0' ) - tmp[i++] = '0'; - } - - /* Reverse for buf */ - j = 0; - while( i-- > 0 ) - buf[j++] = tmp[i]; - buf[j] = '\0'; - - /* Adjust precision so pf_fill won't truncate the number later */ - flags->Precision = strlen( buf ); - - if( tmp != number ) - HeapFree( GetProcessHeap(), 0, tmp ); - - return; -} - -/********************************************************************* - * pf_vsnprintf (INTERNAL) - * - * implements both A and W vsnprintf functions - */ -static int pf_vsnprintf( pf_output *out, const WCHAR *format, va_list valist ) -{ - int r; - LPCWSTR q, p = format; - pf_flags flags; - - TRACE("format is %s\n",debugstr_w(format)); - while (*p) - { - q = strchrW( p, '%' ); - - /* there's no % characters left, output the rest of the string */ - if( !q ) - { - r = pf_output_stringW(out, p, -1); - if( r<0 ) - return r; - p += r; - continue; - } - - /* there's characters before the %, output them */ - if( q != p ) - { - r = pf_output_stringW(out, p, q - p); - if( r<0 ) - return r; - p = q; - } - - /* we must be at a % now, skip over it */ - assert( *p == '%' ); - p++; - - /* output a single % character */ - if( *p == '%' ) - { - r = pf_output_stringW(out, p++, 1); - if( r<0 ) - return r; - continue; - } - - /* parse the flags */ - memset( &flags, 0, sizeof flags ); - while (*p) - { - if( *p == '+' || *p == ' ' ) - { - if ( flags.Sign != '+' ) - flags.Sign = *p; - } - else if( *p == '-' ) - flags.LeftAlign = *p; - else if( *p == '0' ) - flags.PadZero = *p; - else if( *p == '#' ) - flags.Alternate = *p; - else - break; - p++; - } - - /* deal with the field width specifier */ - flags.FieldLength = 0; - if( *p == '*' ) - { - flags.FieldLength = va_arg( valist, int ); - if (flags.FieldLength < 0) - { - flags.LeftAlign = '-'; - flags.FieldLength = -flags.FieldLength; - } - p++; - } - else while( isdigit(*p) ) - { - flags.FieldLength *= 10; - flags.FieldLength += *p++ - '0'; - } - - /* deal with precision */ - flags.Precision = -1; - if( *p == '.' ) - { - flags.Precision = 0; - p++; - if( *p == '*' ) - { - flags.Precision = va_arg( valist, int ); - p++; - } - else while( isdigit(*p) ) - { - flags.Precision *= 10; - flags.Precision += *p++ - '0'; - } - } - - /* deal with integer width modifier */ - while( *p ) - { - if( *p == 'h' || *p == 'l' || *p == 'L' ) - { - flags.IntegerLength = *p; - p++; - } - else if( *p == 'I' ) - { - if( *(p+1) == '6' && *(p+2) == '4' ) - { - flags.IntegerDouble++; - p += 3; - } - else if( *(p+1) == '3' && *(p+2) == '2' ) - p += 3; - else if( isdigit(*(p+1)) || *(p+1) == 0 ) - break; - else - p++; - } - else if( *p == 'w' ) - flags.WideString = *p++; - else if( *p == 'F' ) - p++; /* ignore */ - else - break; - } - - flags.Format = *p; - r = 0; - - /* output a string */ - if( flags.Format == 's' || flags.Format == 'S' ) - r = pf_handle_string_format( out, va_arg(valist, const void*), -1, - &flags, (flags.Format == 'S') ); - - /* output a single character */ - else if( flags.Format == 'c' || flags.Format == 'C' ) - { - INT ch = va_arg( valist, int ); - - r = pf_handle_string_format( out, &ch, 1, &flags, (flags.Format == 'C') ); - } - - /* output a pointer */ - else if( flags.Format == 'p' ) - { - char pointer[11]; - - flags.PadZero = 0; - if( flags.Alternate ) - lnx_sprintf(pointer, "0X%08lX", va_arg(valist, long)); - else - lnx_sprintf(pointer, "%08lX", va_arg(valist, long)); - r = pf_output_format_A( out, pointer, -1, &flags ); - } - - /* deal with %n */ - else if( flags.Format == 'n' ) - { - int *x = va_arg(valist, int *); - *x = out->used; - } - - /* deal with 64-bit integers */ - else if( pf_is_integer_format( flags.Format ) && flags.IntegerDouble ) - { - char number[40], *x = number; - - /* Estimate largest possible required buffer size: - * Chooses the larger of the field or precision - * Includes extra bytes: 1 byte for null, 1 byte for sign, - 4 bytes for exponent, 2 bytes for alternate formats, 1 byte - for a decimal, and 1 byte for an additional float digit. */ - unsigned x_len = ((flags.FieldLength > flags.Precision) ? - flags.FieldLength : flags.Precision) + 10; - - if( x_len >= sizeof number) - x = HeapAlloc( GetProcessHeap(), 0, x_len ); - - pf_integer_conv( x, x_len, &flags, va_arg(valist, LONGLONG) ); - - r = pf_output_format_A( out, x, -1, &flags ); - if( x != number ) - HeapFree( GetProcessHeap(), 0, x ); - } - - /* deal with integers and floats using libc's printf */ - else if( pf_is_valid_format( flags.Format ) ) - { - char fmt[20], number[40], *x = number; - - /* Estimate largest possible required buffer size: - * Chooses the larger of the field or precision - * Includes extra bytes: 1 byte for null, 1 byte for sign, - 4 bytes for exponent, 2 bytes for alternate formats, 1 byte - for a decimal, and 1 byte for an additional float digit. */ - unsigned x_len = ((flags.FieldLength > flags.Precision) ? - flags.FieldLength : flags.Precision) + 10; - - if( x_len >= sizeof number) - x = HeapAlloc( GetProcessHeap(), 0, x_len ); - - pf_rebuild_format_string( fmt, &flags ); - - if( pf_is_double_format( flags.Format ) ) - lnx_sprintf( x, fmt, va_arg(valist, double) ); - else - lnx_sprintf( x, fmt, va_arg(valist, int) ); - - r = pf_output_stringA( out, x, -1 ); - if( x != number ) - HeapFree( GetProcessHeap(), 0, x ); - } - else - continue; - - if( r<0 ) - return r; - p++; - } - - /* check we reached the end, and null terminate the string */ - assert( *p == 0 ); - pf_output_stringW( out, p, 1 ); - - return out->used - 1; -} - -/********************************************************************* - * _vsnprintf (MSVCRT.@) - */ -int CDECL _vsnprintf( char *str, size_t len, - const char *format, va_list valist ) -{ - DWORD sz; - LPWSTR formatW = NULL; - pf_output out; - int r; - - out.unicode = FALSE; - out.buf.A = str; - out.used = 0; - out.len = len; - - if( format ) - { - sz = MultiByteToWideChar( CP_ACP, 0, format, -1, NULL, 0 ); - formatW = HeapAlloc( GetProcessHeap(), 0, sz*sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, format, -1, formatW, sz ); - } - - r = pf_vsnprintf( &out, formatW, valist ); - - HeapFree( GetProcessHeap(), 0, formatW ); - - return r; -} - -/********************************************************************* - * vsprintf (MSVCRT.@) - */ -int CDECL vsprintf( char *str, const char *format, va_list valist) -{ - return _vsnprintf(str, INT_MAX, format, valist); -} - -/********************************************************************* - * _snprintf (MSVCRT.@) - */ -int CDECL _snprintf(char *str, size_t len, const char *format, ...) -{ - int retval; - va_list valist; - va_start(valist, format); - retval = _vsnprintf(str, len, format, valist); - va_end(valist); - return retval; -} - -/********************************************************************* - * _vsnwsprintf (MSVCRT.@) - */ -int CDECL _vsnwprintf( wchar_t *str, size_t len, - const wchar_t *format, va_list valist ) -{ - pf_output out; - - out.unicode = TRUE; - out.buf.W = str; - out.used = 0; - out.len = len; - - return pf_vsnprintf( &out, format, valist ); -} - -/********************************************************************* - * _snwprintf (MSVCRT.@) - */ -int CDECL _snwprintf( wchar_t *str, size_t len, const wchar_t *format, ...) -{ - int retval; - va_list valist; - va_start(valist, format); - retval = _vsnwprintf(str, len, format, valist); - va_end(valist); - return retval; -} - -/********************************************************************* - * sprintf (MSVCRT.@) - */ -int CDECL sprintf( char *str, const char *format, ... ) -{ - va_list ap; - int r; - - va_start( ap, format ); - r = _vsnprintf( str, INT_MAX, format, ap ); - va_end( ap ); - return r; -} - -/********************************************************************* - * swprintf (MSVCRT.@) - */ -int CDECL swprintf( wchar_t *str, const wchar_t *format, ... ) -{ - va_list ap; - int r; - - va_start( ap, format ); - r = _vsnwprintf( str, INT_MAX, format, ap ); - va_end( ap ); - return r; -} - -/********************************************************************* - * vswprintf (MSVCRT.@) - */ -int CDECL vswprintf( wchar_t* str, const wchar_t* format, va_list args ) -{ - return _vsnwprintf( str, INT_MAX, format, args ); -} -#endif #endif /********************************************************************* @@ -1048,97 +377,6 @@ } #endif -#ifndef __REACTOS__ -/********************************************************************* - * iswalnum (MSVCRT.@) - */ -INT CDECL iswalnum( wchar_t wc ) -{ - return isalnumW( wc ); -} - -/********************************************************************* - * iswalpha (MSVCRT.@) - */ -INT CDECL iswalpha( wchar_t wc ) -{ - return isalphaW( wc ); -} - -/********************************************************************* - * iswcntrl (MSVCRT.@) - */ -INT CDECL iswcntrl( wchar_t wc ) -{ - return iscntrlW( wc ); -} - -/********************************************************************* - * iswdigit (MSVCRT.@) - */ -INT CDECL iswdigit( wchar_t wc ) -{ - return isdigitW( wc ); -} - -/********************************************************************* - * iswgraph (MSVCRT.@) - */ -INT CDECL iswgraph( wchar_t wc ) -{ - return isgraphW( wc ); -} - -/********************************************************************* - * iswlower (MSVCRT.@) - */ -INT CDECL iswlower( wchar_t wc ) -{ - return islowerW( wc ); -} - -/********************************************************************* - * iswprint (MSVCRT.@) - */ -INT CDECL iswprint( wchar_t wc ) -{ - return isprintW( wc ); -} - -/********************************************************************* - * iswpunct (MSVCRT.@) - */ -INT CDECL iswpunct( wchar_t wc ) -{ - return ispunctW( wc ); -} - -/********************************************************************* - * iswspace (MSVCRT.@) - */ -INT CDECL iswspace( wchar_t wc ) -{ - return isspaceW( wc ); -} - -/********************************************************************* - * iswupper (MSVCRT.@) - */ -INT CDECL iswupper( wchar_t wc ) -{ - return isupperW( wc ); -} - -/********************************************************************* - * iswxdigit (MSVCRT.@) - */ -INT CDECL iswxdigit( wchar_t wc ) -{ - return isxdigitW( wc ); -} - -#endif - /********************************************************************* * wcscpy_s (MSVCRT.@) */

13 years, 8 months

← Newer
1
...
20
21
22
23
24
25
26
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2011