Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 29093: - when converting from a DDB to a DIB, the palette should be the same in the resulting DIB as the original DDB. This fixes the colour issue we had in the taskbar icons. (there's still a bit position problem as highlighted in the 1-4 bitmaps) - Reformat the NtGdiGetDIBitsInternal code to a more readable state. *note, this function needs a considerable work.
by gedmurphy＠svn.reactos.org 18 Sep '07

18 Sep '07

Author: gedmurphy Date: Tue Sep 18 19:24:34 2007 New Revision: 29093 URL: http://svn.reactos.org/svn/reactos?rev=29093&view=rev Log: - when converting from a DDB to a DIB, the palette should be the same in the resulting DIB as the original DDB. This fixes the colour issue we had in the taskbar icons. (there's still a bit position problem as highlighted in the 1-4 bitmaps) - Reformat the NtGdiGetDIBitsInternal code to a more readable state. *note, this function needs a considerable work. 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 (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Tue Sep 18 19:24:34 2007 @@ -348,225 +348,236 @@ UINT MaxBits, UINT MaxInfo) { - BITMAPOBJ *BitmapObj; - SURFOBJ *DestSurfObj; - XLATEOBJ *XlateObj; - HBITMAP DestBitmap; - SIZEL DestSize; - HPALETTE hSourcePalette; - HPALETTE hDestPalette; - PPALGDI SourcePalette; - PPALGDI DestPalette; - ULONG SourcePaletteType; - ULONG DestPaletteType; - PDC Dc; - POINTL SourcePoint; - RECTL DestRect; - ULONG Result = 0; - ULONG Index; - - /* Get handle for the palette in DC. */ - Dc = DC_LockDc(hDC); - if (Dc == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; - } - if (Dc->IsIC) - { - DC_UnlockDc(Dc); - return 0; - } - hSourcePalette = Dc->w.hPalette; - /* FIXME: This is incorrect. hDestPalette should be something other. */ - hDestPalette = Dc->DevInfo->hpalDefault; - DC_UnlockDc(Dc); - - /* Get pointer to the source bitmap object. */ - BitmapObj = BITMAPOBJ_LockBitmap(hBitmap); - if (BitmapObj == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return 0; - } - - if (Bits == NULL) - { - if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) - { - BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info; - coreheader->bcWidth =BitmapObj->SurfObj.sizlBitmap.cx; - coreheader->bcPlanes = 1; - coreheader->bcBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat); - - coreheader->bcHeight = BitmapObj->SurfObj.sizlBitmap.cy; - if (BitmapObj->SurfObj.lDelta > 0) - coreheader->bcHeight = -coreheader->bcHeight; - - Result = BitmapObj->SurfObj.sizlBitmap.cy; - } - - if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) - { - Info->bmiHeader.biWidth = BitmapObj->SurfObj.sizlBitmap.cx; - Info->bmiHeader.biHeight = BitmapObj->SurfObj.sizlBitmap.cy; - /* Report negtive height for top-down bitmaps. */ - if (BitmapObj->SurfObj.lDelta > 0) - Info->bmiHeader.biHeight = -Info->bmiHeader.biHeight; - Info->bmiHeader.biPlanes = 1; - Info->bmiHeader.biBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat); - if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) - { - switch (BitmapObj->SurfObj.iBitmapFormat) + BITMAPOBJ *BitmapObj; + SURFOBJ *DestSurfObj; + XLATEOBJ *XlateObj; + HBITMAP DestBitmap; + SIZEL DestSize; + HPALETTE hSourcePalette; + HPALETTE hDestPalette; + PPALGDI SourcePalette; + PPALGDI DestPalette; + ULONG SourcePaletteType; + ULONG DestPaletteType; + PDC Dc; + POINTL SourcePoint; + RECTL DestRect; + ULONG Result = 0; + ULONG Index; + + /* Get handle for the palette in DC. */ + Dc = DC_LockDc(hDC); + if (Dc == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + if (Dc->IsIC) + { + DC_UnlockDc(Dc); + return 0; + } + + hSourcePalette = Dc->w.hPalette; + hDestPalette = Dc->w.hPalette; // unsure of this (Ged) + DC_UnlockDc(Dc); + + /* Get pointer to the source bitmap object. */ + BitmapObj = BITMAPOBJ_LockBitmap(hBitmap); + if (BitmapObj == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + + if (Bits == NULL) + { + if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info; + coreheader->bcWidth =BitmapObj->SurfObj.sizlBitmap.cx; + coreheader->bcPlanes = 1; + coreheader->bcBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat); + + coreheader->bcHeight = BitmapObj->SurfObj.sizlBitmap.cy; + + if (BitmapObj->SurfObj.lDelta > 0) + coreheader->bcHeight = -coreheader->bcHeight; + + Result = BitmapObj->SurfObj.sizlBitmap.cy; + } + + if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) + { + Info->bmiHeader.biWidth = BitmapObj->SurfObj.sizlBitmap.cx; + Info->bmiHeader.biHeight = BitmapObj->SurfObj.sizlBitmap.cy; + /* Report negtive height for top-down bitmaps. */ + if (BitmapObj->SurfObj.lDelta > 0) + Info->bmiHeader.biHeight = -Info->bmiHeader.biHeight; + Info->bmiHeader.biPlanes = 1; + Info->bmiHeader.biBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat); + if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) { - case BMF_1BPP: case BMF_4BPP: case BMF_8BPP: - case BMF_16BPP: case BMF_24BPP: case BMF_32BPP: - Info->bmiHeader.biCompression = BI_RGB; - break; - case BMF_4RLE: - Info->bmiHeader.biCompression = BI_RLE4; - break; - case BMF_8RLE: - Info->bmiHeader.biCompression = BI_RLE8; - break; - case BMF_JPEG: - Info->bmiHeader.biCompression = BI_JPEG; - break; - case BMF_PNG: - Info->bmiHeader.biCompression = BI_PNG; - break; + switch (BitmapObj->SurfObj.iBitmapFormat) + { + case BMF_1BPP: + case BMF_4BPP: + case BMF_8BPP: + case BMF_16BPP: + case BMF_24BPP: + case BMF_32BPP: + Info->bmiHeader.biCompression = BI_RGB; + break; + case BMF_4RLE: + Info->bmiHeader.biCompression = BI_RLE4; + break; + case BMF_8RLE: + Info->bmiHeader.biCompression = BI_RLE8; + break; + case BMF_JPEG: + Info->bmiHeader.biCompression = BI_JPEG; + break; + case BMF_PNG: + Info->bmiHeader.biCompression = BI_PNG; + break; + } + + Info->bmiHeader.biSizeImage = BitmapObj->SurfObj.cjBits; + Info->bmiHeader.biXPelsPerMeter = 0; /* FIXME */ + Info->bmiHeader.biYPelsPerMeter = 0; /* FIXME */ + Info->bmiHeader.biClrUsed = 0; + Info->bmiHeader.biClrImportant = 1 << Info->bmiHeader.biBitCount; /* FIXME */ + Result = BitmapObj->SurfObj.sizlBitmap.cy; } - Info->bmiHeader.biSizeImage = BitmapObj->SurfObj.cjBits; - Info->bmiHeader.biXPelsPerMeter = 0; /* FIXME */ - Info->bmiHeader.biYPelsPerMeter = 0; /* FIXME */ - Info->bmiHeader.biClrUsed = - Info->bmiHeader.biClrImportant = 1 << Info->bmiHeader.biBitCount; /* FIXME */ - Result = BitmapObj->SurfObj.sizlBitmap.cy; - } - } - } - else - { - if (StartScan > BitmapObj->SurfObj.sizlBitmap.cy) - { - Result = 0; - } - else - { - ScanLines = min(ScanLines, BitmapObj->SurfObj.sizlBitmap.cy - StartScan); - DestSize.cx = BitmapObj->SurfObj.sizlBitmap.cx; - DestSize.cy = ScanLines; - - DestBitmap = NULL; - if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) - { - DestBitmap = EngCreateBitmap(DestSize, - /* DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount), */ - DestSize.cx * (Info->bmiHeader.biBitCount >> 3), /* HACK */ - BitmapFormat(Info->bmiHeader.biBitCount, Info->bmiHeader.biCompression), - 0 < Info->bmiHeader.biHeight ? 0 : BMF_TOPDOWN, - Bits); - } - - if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) - { - BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info; - - DestBitmap = EngCreateBitmap(DestSize, - DIB_GetDIBWidthBytes(DestSize.cx, coreheader->bcBitCount), - BitmapFormat(coreheader->bcBitCount, BI_RGB), - 0 < coreheader->bcHeight ? 0 : BMF_TOPDOWN, - Bits); - } - - if(DestBitmap == NULL) - { - BITMAPOBJ_UnlockBitmap(BitmapObj); - return 0; - } - - DestSurfObj = EngLockSurface((HSURF)DestBitmap); - - SourcePalette = PALETTE_LockPalette(hSourcePalette); - /* FIXME - SourcePalette can be NULL!!! Don't assert here! */ - ASSERT(SourcePalette); - SourcePaletteType = SourcePalette->Mode; - PALETTE_UnlockPalette(SourcePalette); - - DestPalette = PALETTE_LockPalette(hDestPalette); - /* FIXME - DestPalette can be NULL!!!! Don't assert here!!! */ - ASSERT(DestPalette); - DestPaletteType = DestPalette->Mode; - - /* Copy palette. */ - /* FIXME: This is largely incomplete. */ - if (Info->bmiHeader.biBitCount <= 8) - { - if (Usage == DIB_RGB_COLORS) + } + } + else + { + if (StartScan > BitmapObj->SurfObj.sizlBitmap.cy) + { + Result = 0; + } + else + { + ScanLines = min(ScanLines, BitmapObj->SurfObj.sizlBitmap.cy - StartScan); + DestSize.cx = BitmapObj->SurfObj.sizlBitmap.cx; + DestSize.cy = ScanLines; + + DestBitmap = NULL; + if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { - for (Index = 0; - Index < (1 << Info->bmiHeader.biBitCount) && - Index < DestPalette->NumColors; - Index++) - { - Info->bmiColors[Index].rgbRed = - DestPalette->IndexedColors[Index].peRed; - Info->bmiColors[Index].rgbGreen = - DestPalette->IndexedColors[Index].peGreen; - Info->bmiColors[Index].rgbBlue = - DestPalette->IndexedColors[Index].peBlue; - } + BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info; + + DestBitmap = EngCreateBitmap(DestSize, + DIB_GetDIBWidthBytes(DestSize.cx, coreheader->bcBitCount), + BitmapFormat(coreheader->bcBitCount, BI_RGB), + 0 < coreheader->bcHeight ? 0 : BMF_TOPDOWN, + Bits); } - if (Usage == DIB_PAL_COLORS) + + if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) { - DPRINT1("GetDIBits with DIB_PAL_COLORS isn't implemented yet."); + INT one, two, three; + + one = DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount), + two = ((DestSize.cx * Info->bmiHeader.biBitCount + 31) & ~31) >> 3; + three = DestSize.cx * (Info->bmiHeader.biBitCount >> 3); + + DestBitmap = EngCreateBitmap(DestSize, + /* DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount), */ + DestSize.cx * (Info->bmiHeader.biBitCount >> 3), /* HACK */ + BitmapFormat(Info->bmiHeader.biBitCount, Info->bmiHeader.biCompression), + 0 < Info->bmiHeader.biHeight ? 0 : BMF_TOPDOWN, + Bits); } - } - - PALETTE_UnlockPalette(DestPalette); - - XlateObj = IntEngCreateXlate( - DestPaletteType, SourcePaletteType, hDestPalette, hSourcePalette); - - SourcePoint.x = 0; - SourcePoint.y = BitmapObj->SurfObj.sizlBitmap.cy - - (StartScan + ScanLines); - - /* Determine destination rectangle */ - DestRect.top = 0; - DestRect.left = 0; - DestRect.right = DestSize.cx; - DestRect.bottom = DestSize.cy; - - if (EngCopyBits(DestSurfObj, &BitmapObj->SurfObj, - NULL, XlateObj, &DestRect, &SourcePoint)) - { - Result = ScanLines; - } - - EngDeleteXlate(XlateObj); - EngUnlockSurface(DestSurfObj); - } - } - - BITMAPOBJ_UnlockBitmap(BitmapObj); - - return Result; + + if(DestBitmap == NULL) + { + BITMAPOBJ_UnlockBitmap(BitmapObj); + return 0; + } + + DestSurfObj = EngLockSurface((HSURF)DestBitmap); + + SourcePalette = PALETTE_LockPalette(hSourcePalette); + /* FIXME - SourcePalette can be NULL!!! Don't assert here! */ + ASSERT(SourcePalette); + SourcePaletteType = SourcePalette->Mode; + PALETTE_UnlockPalette(SourcePalette); + + DestPalette = PALETTE_LockPalette(hDestPalette); + /* FIXME - DestPalette can be NULL!!!! Don't assert here!!! */ + //ASSERT(DestPalette); + DestPaletteType = DestPalette->Mode; + + /* Copy palette. */ + /* FIXME: This is largely incomplete. */ + if (Info->bmiHeader.biBitCount <= 8) + { + if (Usage == DIB_RGB_COLORS) + { + for (Index = 0; + Index < (1 << Info->bmiHeader.biBitCount) && Index < DestPalette->NumColors; + Index++) + { + Info->bmiColors[Index].rgbRed = DestPalette->IndexedColors[Index].peRed; + Info->bmiColors[Index].rgbGreen = DestPalette->IndexedColors[Index].peGreen; + Info->bmiColors[Index].rgbBlue = DestPalette->IndexedColors[Index].peBlue; + } + } + + if (Usage == DIB_PAL_COLORS) + { + DPRINT1("GetDIBits with DIB_PAL_COLORS isn't implemented yet\n"); + } + } + + PALETTE_UnlockPalette(DestPalette); + + XlateObj = IntEngCreateXlate(DestPaletteType, SourcePaletteType, hDestPalette, hSourcePalette); + + SourcePoint.x = 0; + SourcePoint.y = BitmapObj->SurfObj.sizlBitmap.cy - (StartScan + ScanLines); + + /* Determine destination rectangle */ + DestRect.top = 0; + DestRect.left = 0; + DestRect.right = DestSize.cx; + DestRect.bottom = DestSize.cy; + + if (EngCopyBits(DestSurfObj, + &BitmapObj->SurfObj, + NULL, + XlateObj, + &DestRect, + &SourcePoint)) + { + Result = ScanLines; + } + + EngDeleteXlate(XlateObj); + EngUnlockSurface(DestSurfObj); + } + } + + BITMAPOBJ_UnlockBitmap(BitmapObj); + + return Result; } INT STDCALL NtGdiStretchDIBits(HDC hDC, - INT XDest, - INT YDest, - INT DestWidth, - INT DestHeight, - INT XSrc, - INT YSrc, - INT SrcWidth, - INT SrcHeight, - CONST VOID *Bits, - CONST BITMAPINFO *BitsInfo, - UINT Usage, - DWORD ROP) + INT XDest, + INT YDest, + INT DestWidth, + INT DestHeight, + INT XSrc, + INT YSrc, + INT SrcWidth, + INT SrcHeight, + CONST VOID *Bits, + CONST BITMAPINFO *BitsInfo, + UINT Usage, + DWORD ROP) { HBITMAP hBitmap, hOldBitmap; HDC hdcMem;

1 0

[jimtabor] 29092: - Win32k: Removed NtUserCreateMenu replacing it with NtUserCallNoParam.
by jimtabor＠svn.reactos.org 18 Sep '07

18 Sep '07

Author: jimtabor Date: Tue Sep 18 17:06:27 2007 New Revision: 29092 URL: http://svn.reactos.org/svn/reactos?rev=29092&view=rev Log: - Win32k: Removed NtUserCreateMenu replacing it with NtUserCallNoParam. Modified: trunk/reactos/dll/win32/user32/windows/menu.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/menu.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c Tue Sep 18 17:06:27 2007 @@ -3899,7 +3899,7 @@ CreateMenu(VOID) { MenuLoadBitmaps(); - return NtUserCreateMenu(FALSE); + return (HMENU)NtUserCallNoParam(NOPARAM_ROUTINE_CREATEMENU); } @@ -3910,7 +3910,7 @@ CreatePopupMenu(VOID) { MenuLoadBitmaps(); - return NtUserCreateMenu(TRUE); + return (HMENU)NtUserCallNoParam(NOPARAM_ROUTINE_CREATEMENUPOPUP); } 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 (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Tue Sep 18 17:06:27 2007 @@ -106,10 +106,6 @@ UINT uIDCheckItem, UINT uCheck); -HMENU -NTAPI -NtUserCreateMenu(BOOL PopupMenu); - BOOL NTAPI NtUserDeleteMenu( @@ -440,6 +436,8 @@ WPARAM wParam, LPARAM lParam); +#define NOPARAM_ROUTINE_CREATEMENU 0x0 +#define NOPARAM_ROUTINE_CREATEMENUPOPUP 0x1 #define NOPARAM_ROUTINE_MSQCLEARWAKEMASK 0x3 #define NOPARAM_ROUTINE_REGISTER_PRIMITIVE 0xffff0001 /* Private ROS */ #define NOPARAM_ROUTINE_DESTROY_CARET 0xffff0002 Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Tue Sep 18 17:06:27 2007 @@ -1481,23 +1481,6 @@ return (HMENU)Handle; } - -HMENU STDCALL -NtUserCreateMenu(BOOL PopupMenu) -{ - DECLARE_RETURN(HMENU); - - DPRINT("Enter NtUserCreateMenu\n"); - UserEnterExclusive(); - - RETURN(UserCreateMenu(PopupMenu)); - -CLEANUP: - DPRINT("Leave NtUserCreateMenu, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} - /* Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Tue Sep 18 17:06:27 2007 @@ -86,6 +86,14 @@ switch(Routine) { + case NOPARAM_ROUTINE_CREATEMENU: + Result = (DWORD)UserCreateMenu(FALSE); + break; + + case NOPARAM_ROUTINE_CREATEMENUPOPUP: + Result = (DWORD)UserCreateMenu(TRUE); + break; + case NOPARAM_ROUTINE_DESTROY_CARET: Result = (DWORD)co_IntDestroyCaret(PsGetCurrentThread()->Tcb.Win32Thread); break; 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 (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Tue Sep 18 17:06:27 2007 @@ -4730,29 +4730,29 @@ } case otCursorIcon: { - PCURICON_OBJECT Cursor; - if ((Cursor = UserGetCurIconObject((HCURSOR) handle))) return TRUE; - return FALSE; + PCURICON_OBJECT Cursor; + if ((Cursor = UserGetCurIconObject((HCURSOR) handle))) return TRUE; + return FALSE; } case otHook: { - PHOOK Hook; - if ((Hook = IntGetHookObject((HHOOK) handle))) return TRUE; - return FALSE; + PHOOK Hook; + if ((Hook = IntGetHookObject((HHOOK) handle))) return TRUE; + return FALSE; } case otMonitor: { - PMONITOR_OBJECT Monitor; - if ((Monitor = UserGetMonitorObject((HMONITOR) handle))) return TRUE; - return FALSE; + PMONITOR_OBJECT Monitor; + if ((Monitor = UserGetMonitorObject((HMONITOR) handle))) return TRUE; + return FALSE; } case otCallProc: { - WNDPROC_INFO Proc; - return UserGetCallProcInfo( handle, &Proc ); + WNDPROC_INFO Proc; + return UserGetCallProcInfo( handle, &Proc ); } default: - SetLastWin32Error(ERROR_INVALID_HANDLE); + SetLastWin32Error(ERROR_INVALID_HANDLE); } } else Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Tue Sep 18 17:06:27 2007 @@ -709,7 +709,6 @@ NtGdiUpdateICMRegKey 4 NtUserBuildMenuItemList 4 NtUserCreateCursorIconHandle 2 -NtUserCreateMenu 1 NtUserDestroyCursorIcon 2 NtUserEnumClipboardFormats 1 NtUserGetActiveWindow 0

1 0

[cwittich] 29091: fix a bug in the linux version of OsSupport::createProcess
by cwittich＠svn.reactos.org 18 Sep '07

18 Sep '07

Author: cwittich Date: Tue Sep 18 12:15:47 2007 New Revision: 29091 URL: http://svn.reactos.org/svn/reactos?rev=29091&view=rev Log: fix a bug in the linux version of OsSupport::createProcess Modified: trunk/reactos/tools/sysreg/os_support.cpp Modified: trunk/reactos/tools/sysreg/os_support.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.cp… ============================================================================== --- trunk/reactos/tools/sysreg/os_support.cpp (original) +++ trunk/reactos/tools/sysreg/os_support.cpp Tue Sep 18 12:15:47 2007 @@ -93,7 +93,7 @@ } #else /********************************************************************************************************************/ - OsSupport::ProcessID OsSupport::createProcess(TCHAR *procname, int procargsnum, TCHAR **procargs, bool wait) + OsSupport::ProcessID OsSupport::createProcess(TCHAR *procname, int procargsnum, TCHAR **procargs, bool bWait) { ProcessID pid; @@ -110,7 +110,7 @@ else { /* parent process */ - if (wait) + if (bWait) { waitpid(pid, NULL, WNOHANG); }

1 0

[jimtabor] 29090: - Implement NtUserValidateHandleSecure and most support functions moved from static and added to their respected headers.
by jimtabor＠svn.reactos.org 18 Sep '07

18 Sep '07

Author: jimtabor Date: Tue Sep 18 09:07:49 2007 New Revision: 29090 URL: http://svn.reactos.org/svn/reactos?rev=29090&view=rev Log: - Implement NtUserValidateHandleSecure and most support functions moved from static and added to their respected headers. Modified: trunk/reactos/subsystems/win32/win32k/include/accelerator.h trunk/reactos/subsystems/win32/win32k/include/hook.h trunk/reactos/subsystems/win32/win32k/include/monitor.h trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/include/accelerator.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/accelerator.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/accelerator.h Tue Sep 18 09:07:49 2007 @@ -18,5 +18,6 @@ VOID RegisterThreadAcceleratorTable(struct _ETHREAD *Thread); +PACCELERATOR_TABLE FASTCALL UserGetAccelObject(HACCEL); #endif /* _WIN32K_ACCELERATOR_H */ Modified: trunk/reactos/subsystems/win32/win32k/include/hook.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/hook.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/hook.h Tue Sep 18 09:07:49 2007 @@ -25,6 +25,7 @@ LRESULT FASTCALL co_HOOK_CallHooks(INT HookId, INT Code, WPARAM wParam, LPARAM lParam); VOID FASTCALL HOOK_DestroyThreadHooks(PETHREAD Thread); +PHOOK FASTCALL IntGetHookObject(HHOOK); #endif /* _WIN32K_HOOK_H */ Modified: trunk/reactos/subsystems/win32/win32k/include/monitor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/monitor.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/monitor.h Tue Sep 18 09:07:49 2007 @@ -22,6 +22,7 @@ NTSTATUS IntAttachMonitor(GDIDEVICE *pGdiDevice, ULONG DisplayNumber); NTSTATUS IntDetachMonitor(GDIDEVICE *pGdiDevice); +PMONITOR_OBJECT FASTCALL UserGetMonitorObject(IN HMONITOR); #endif /* _WIN32K_MONITOR_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c Tue Sep 18 09:07:49 2007 @@ -69,7 +69,6 @@ } -static PACCELERATOR_TABLE FASTCALL UserGetAccelObject(HACCEL hAccel) { PACCELERATOR_TABLE Accel; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c Tue Sep 18 09:07:49 2007 @@ -120,7 +120,6 @@ } -static PMONITOR_OBJECT FASTCALL UserGetMonitorObject(IN HMONITOR hMonitor) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Tue Sep 18 09:07:49 2007 @@ -637,17 +637,6 @@ return 0; } -BOOL -STDCALL -NtUserValidateHandleSecure( - HANDLE hHdl, - BOOL Restricted) -{ - UNIMPLEMENTED - - return 0; -} - DWORD STDCALL NtUserWaitForInputIdle( 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 (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Tue Sep 18 09:07:49 2007 @@ -4683,5 +4683,84 @@ return TRUE; } +/* + * NtUserValidateHandleSecure + * + * Status + * @implemented + */ + +BOOL +STDCALL +NtUserValidateHandleSecure( + HANDLE handle, + BOOL Restricted) +{ + if(!Restricted) + { + UINT uType; + { + PUSER_HANDLE_ENTRY entry; + if (!(entry = handle_to_entry(gHandleTable, handle ))) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + uType = entry->type; + } + switch (uType) + { + case otWindow: + { + PWINDOW_OBJECT Window; + if ((Window = UserGetWindowObject((HWND) handle))) return TRUE; + return FALSE; + } + case otMenu: + { + PMENU_OBJECT Menu; + if ((Menu = UserGetMenuObject((HMENU) handle))) return TRUE; + return FALSE; + } + case otAccel: + { + PACCELERATOR_TABLE Accel; + if ((Accel = UserGetAccelObject((HACCEL) handle))) return TRUE; + return FALSE; + } + case otCursorIcon: + { + PCURICON_OBJECT Cursor; + if ((Cursor = UserGetCurIconObject((HCURSOR) handle))) return TRUE; + return FALSE; + } + case otHook: + { + PHOOK Hook; + if ((Hook = IntGetHookObject((HHOOK) handle))) return TRUE; + return FALSE; + } + case otMonitor: + { + PMONITOR_OBJECT Monitor; + if ((Monitor = UserGetMonitorObject((HMONITOR) handle))) return TRUE; + return FALSE; + } + case otCallProc: + { + WNDPROC_INFO Proc; + return UserGetCallProcInfo( handle, &Proc ); + } + default: + SetLastWin32Error(ERROR_INVALID_HANDLE); + } + } + else + { /* Is handle entry restricted? */ + UNIMPLEMENTED + } + return FALSE; +} + /* EOF */

1 0

[silverblade] 29089: Bare-bones foundations of the ReactOS Audio Service. At present it's nothing more than a "mutex service". Some info on the planned implementation is in the included audiosrv.txt file.
by silverblade＠svn.reactos.org 18 Sep '07

18 Sep '07

Author: silverblade Date: Tue Sep 18 06:41:46 2007 New Revision: 29089 URL: http://svn.reactos.org/svn/reactos?rev=29089&view=rev Log: Bare-bones foundations of the ReactOS Audio Service. At present it's nothing more than a "mutex service". Some info on the planned implementation is in the included audiosrv.txt file. Added: trunk/reactos/base/services/audiosrv/ trunk/reactos/base/services/audiosrv/audiosrv.rbuild trunk/reactos/base/services/audiosrv/audiosrv.rc trunk/reactos/base/services/audiosrv/audiosrv.txt trunk/reactos/base/services/audiosrv/main.c Modified: trunk/reactos/base/services/services.rbuild Added: trunk/reactos/base/services/audiosrv/audiosrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/aud… ============================================================================== --- trunk/reactos/base/services/audiosrv/audiosrv.rbuild (added) +++ trunk/reactos/base/services/audiosrv/audiosrv.rbuild Tue Sep 18 06:41:46 2007 @@ -1,0 +1,10 @@ +<module name="audiosrv" type="win32cui" installbase="system32" installname="audiosrv.exe" allowwarnings="true"> + <include base="audiosrv">.</include> + <define name="__USE_W32API" /> + <define name="__REACTOS__" /> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <library>advapi32</library> + <file>main.c</file> + <file>audiosrv.rc</file> +</module> Added: trunk/reactos/base/services/audiosrv/audiosrv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/aud… ============================================================================== --- trunk/reactos/base/services/audiosrv/audiosrv.rc (added) +++ trunk/reactos/base/services/audiosrv/audiosrv.rc Tue Sep 18 06:41:46 2007 @@ -1,0 +1,4 @@ +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Audio Service" +#define REACTOS_STR_INTERNAL_NAME "audiosrv\0" +#define REACTOS_STR_ORIGINAL_FILENAME "audiosrv.dll\0" +#include <reactos/version.rc> Added: trunk/reactos/base/services/audiosrv/audiosrv.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/aud… ============================================================================== --- trunk/reactos/base/services/audiosrv/audiosrv.txt (added) +++ trunk/reactos/base/services/audiosrv/audiosrv.txt Tue Sep 18 06:41:46 2007 @@ -1,0 +1,39 @@ +ReactOS Audio Service (audiosrv.exe) +==================================== + +This is intended to operate in a similar manner to how the Windows Audio +Service does. + +NOTE: The service filename is audiosrv.dll on Windows XP. This shouldn't +have any impact on functionality. + +AudioSrv on Windows creates a mapped file at: +Global\mmGlobalPnpInfo + +This file appears to contain a list of devices that WinMM accesses and +subsequently passes to wdmaud.drv + +It is not necessary to duplicate the exact structure of this mapped +file, since it appears to only be used internally by Windows components. + +The ROS Audio Service (RosAudioSrv) is intended to be able to run +alongside the Windows Audio Service on XP/Vista, so it should be +possible to test in a "known working environment" ;) + +It will create a mutex, to: +1) Allow synchronization when accessing the device list +2) Provide a simple method of identifying if RosAudioSrv is running + +(It might be worth using an event to notify WinMM when things are +happening?) + +The intention is to make RosAudioSrv receive PnP notifications for +relevant audio devices, and also let AudioSrv in Windows do this. Then +it should be possible to create a small application that imitates +WinMM's actions :) + +So far, it doesn't do much... Watch this space! + + +Andrew Greenwood +September 2007 Added: trunk/reactos/base/services/audiosrv/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/mai… ============================================================================== --- trunk/reactos/base/services/audiosrv/main.c (added) +++ trunk/reactos/base/services/audiosrv/main.c Tue Sep 18 06:41:46 2007 @@ -1,0 +1,117 @@ +/* + * PROJECT: ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/services/audiosrv/main.c + * PURPOSE: Audio Service + * COPYRIGHT: Copyright 2007 Andrew Greenwood + */ + +#include <windows.h> + +/* This is currently set to avoid conflicting service names in Windows! */ +#define SERVICE_NAME "RosAudioSrv" + +/* A named mutex is used for synchronizing access to the device list. + If this mutex doesn't exist, it means the audio service isn't running. */ +#define DEVICE_LIST_MUTEX_NAME "Global\\AudioDeviceListSync" + +/* ...and this is where the device list will be available */ +#define DEVICE_LIST_MAPPED_FILENAME "Global\\AudioDeviceList" + + + +/* Prototypes */ + +VOID CALLBACK +ServiceMain(DWORD argc, char** argv); + +VOID WINAPI +ServiceControlHandler(DWORD request); + + +/* Service table */ +SERVICE_TABLE_ENTRY service_table[2] = +{ + { "AudioSrv", (LPSERVICE_MAIN_FUNCTION) ServiceMain }, + { NULL, NULL } +}; + +SERVICE_STATUS_HANDLE service_status_handle; +SERVICE_STATUS service_status; + +/* Synchronization of access to the event list */ +HANDLE device_list_mutex = INVALID_HANDLE_VALUE; + + +/* Implementation */ + +VOID WINAPI +ServiceControlHandler(DWORD request) +{ + switch ( request ) + { + case SERVICE_CONTROL_STOP : + case SERVICE_CONTROL_SHUTDOWN : + { + service_status.dwCurrentState = SERVICE_STOP_PENDING; + SetServiceStatus(service_status_handle, &service_status); + + CloseHandle(device_list_mutex); + + service_status.dwWin32ExitCode = 0; + service_status.dwCurrentState = SERVICE_STOPPED; + + SetServiceStatus(service_status_handle, &service_status); + + return; + } + + + default : + break; + }; + + SetServiceStatus(service_status_handle, &service_status); +} + +VOID CALLBACK +ServiceMain(DWORD argc, char** argv) +{ + service_status_handle = RegisterServiceCtrlHandler(SERVICE_NAME, + ServiceControlHandler); + + /* Set these to defaults */ + service_status.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + service_status.dwServiceSpecificExitCode = 0; + service_status.dwWin32ExitCode = NO_ERROR; + service_status.dwWaitHint = 0; + service_status.dwControlsAccepted = 0; + service_status.dwCheckPoint = 0; + + /* Tell SCM we're starting */ + service_status.dwCurrentState = SERVICE_START_PENDING; + SetServiceStatus(service_status_handle, &service_status); + + /* We should create the mapped section here along with the mutex to + sync access to the device list... */ + + device_list_mutex = CreateMutex(NULL, FALSE, DEVICE_LIST_MUTEX_NAME); + + if ( ! device_list_mutex) + { + service_status.dwCurrentState = SERVICE_STOPPED; + service_status.dwWin32ExitCode = -1; // ok? + SetServiceStatus(service_status_handle, &service_status); + return; + } + + /* Tell SCM we are now running, and we may be stopped */ + service_status.dwCurrentState = SERVICE_RUNNING; + service_status.dwControlsAccepted = SERVICE_ACCEPT_STOP; + SetServiceStatus(service_status_handle, &service_status); +} + +int main() +{ + StartServiceCtrlDispatcher(service_table); +} Modified: trunk/reactos/base/services/services.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/services.rbu… ============================================================================== --- trunk/reactos/base/services/services.rbuild (original) +++ trunk/reactos/base/services/services.rbuild Tue Sep 18 06:41:46 2007 @@ -1,6 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> +<directory name="audiosrv"> + <xi:include href="audiosrv/audiosrv.rbuild" /> +</directory> <directory name="dhcp"> <xi:include href="dhcp/dhcp.rbuild" /> </directory>

1 0

[ekohl] 29088: Merge all settings in a single struct. This is required to implement the administrative options.
by ekohl＠svn.reactos.org 17 Sep '07

17 Sep '07

Author: ekohl Date: Tue Sep 18 02:29:35 2007 New Revision: 29088 URL: http://svn.reactos.org/svn/reactos?rev=29088&view=rev Log: Merge all settings in a single struct. This is required to implement the administrative options. Modified: trunk/reactos/dll/cpl/access/access.c trunk/reactos/dll/cpl/access/access.h trunk/reactos/dll/cpl/access/display.c trunk/reactos/dll/cpl/access/general.c trunk/reactos/dll/cpl/access/keyboard.c trunk/reactos/dll/cpl/access/mouse.c trunk/reactos/dll/cpl/access/sound.c Modified: trunk/reactos/dll/cpl/access/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.c?re… ============================================================================== --- trunk/reactos/dll/cpl/access/access.c (original) +++ trunk/reactos/dll/cpl/access/access.c Tue Sep 18 02:29:35 2007 @@ -26,8 +26,9 @@ {IDI_CPLACCESS, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, SystemApplet} }; + static VOID -InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc) +InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc, PGLOBAL_DATA pGlobalData) { ZeroMemory(psp, sizeof(PROPSHEETPAGE)); psp->dwSize = sizeof(PROPSHEETPAGE); @@ -35,6 +36,7 @@ psp->hInstance = hApplet; psp->pszTemplate = MAKEINTRESOURCE(idDlg); psp->pfnDlgProc = DlgProc; + psp->lParam = (LPARAM)pGlobalData; } @@ -43,11 +45,17 @@ LONG CALLBACK SystemApplet(VOID) { + PGLOBAL_DATA pGlobalData; PROPSHEETPAGE psp[5]; PROPSHEETHEADER psh; TCHAR Caption[1024]; + INT ret; LoadString(hApplet, IDS_CPLSYSTEMNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); + + pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_DATA)); + if (pGlobalData == NULL) + return 0; ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); @@ -60,13 +68,17 @@ psh.nStartPage = 0; psh.ppsp = psp; - InitPropSheetPage(&psp[0], IDD_PROPPAGEKEYBOARD, (DLGPROC)KeyboardPageProc); - InitPropSheetPage(&psp[1], IDD_PROPPAGESOUND, (DLGPROC)SoundPageProc); - InitPropSheetPage(&psp[2], IDD_PROPPAGEDISPLAY, (DLGPROC)DisplayPageProc); - InitPropSheetPage(&psp[3], IDD_PROPPAGEMOUSE, (DLGPROC)MousePageProc); - InitPropSheetPage(&psp[4], IDD_PROPPAGEGENERAL, (DLGPROC)GeneralPageProc); + InitPropSheetPage(&psp[0], IDD_PROPPAGEKEYBOARD, (DLGPROC)KeyboardPageProc, pGlobalData); + InitPropSheetPage(&psp[1], IDD_PROPPAGESOUND, (DLGPROC)SoundPageProc, pGlobalData); + InitPropSheetPage(&psp[2], IDD_PROPPAGEDISPLAY, (DLGPROC)DisplayPageProc, pGlobalData); + InitPropSheetPage(&psp[3], IDD_PROPPAGEMOUSE, (DLGPROC)MousePageProc, pGlobalData); + InitPropSheetPage(&psp[4], IDD_PROPPAGEGENERAL, (DLGPROC)GeneralPageProc, pGlobalData); - return (LONG)(PropertySheet(&psh) != -1); + ret = PropertySheet(&psh); + + HeapFree(GetProcessHeap(), 0, pGlobalData); + + return (LONG)(ret != -1); } /* Control Panel Callback */ Modified: trunk/reactos/dll/cpl/access/access.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.h?re… ============================================================================== --- trunk/reactos/dll/cpl/access/access.h (original) +++ trunk/reactos/dll/cpl/access/access.h Tue Sep 18 02:29:35 2007 @@ -10,6 +10,44 @@ INT idDescription; APPLET_INITPROC AppletProc; } APPLET, *PAPPLET; + + +typedef struct _GLOBAL_DATA +{ + /* keyboard page */ + STICKYKEYS stickyKeys; + STICKYKEYS oldStickyKeys; + FILTERKEYS filterKeys; + FILTERKEYS oldFilterKeys; + TOGGLEKEYS toggleKeys; + TOGGLEKEYS oldToggleKeys; + BOOL bKeyboardPref; + + /* sound page */ + SOUNDSENTRY ssSoundSentry; + BOOL bShowSounds; + + /* display page */ + HIGHCONTRAST highContrast; + UINT uCaretBlinkTime; + UINT uCaretWidth; + BOOL fShowCaret; + RECT rcCaret; + RECT rcOldCaret; + + /* mouse page */ + MOUSEKEYS mouseKeys; + + /* general page */ + ACCESSTIMEOUT accessTimeout; + SERIALKEYS serialKeys; + TCHAR szActivePort[MAX_PATH]; + TCHAR szPort[MAX_PATH]; + BOOL bWarningSounds; + BOOL bSoundOnActivation; + +} GLOBAL_DATA, *PGLOBAL_DATA; + extern HINSTANCE hApplet; Modified: trunk/reactos/dll/cpl/access/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/display.c?r… ============================================================================== --- trunk/reactos/dll/cpl/access/display.c (original) +++ trunk/reactos/dll/cpl/access/display.c Tue Sep 18 02:29:35 2007 @@ -16,15 +16,6 @@ #include "resource.h" #include "access.h" -typedef struct _GLOBAL_DATA -{ - HIGHCONTRAST highContrast; - UINT uCaretBlinkTime; - UINT uCaretWidth; - BOOL fShowCaret; - RECT rcCaret; - RECT rcOldCaret; -} GLOBAL_DATA, *PGLOBAL_DATA; #define ID_BLINK_TIMER 346 @@ -154,7 +145,7 @@ switch (uMsg) { case WM_INITDIALOG: - pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_DATA)); + pGlobalData = (PGLOBAL_DATA)((LPPROPSHEETPAGE)lParam)->lParam; if (pGlobalData == NULL) return FALSE; @@ -290,7 +281,6 @@ case WM_DESTROY: KillTimer(hwndDlg, ID_BLINK_TIMER); - HeapFree(GetProcessHeap(), 0, pGlobalData); break; } Modified: trunk/reactos/dll/cpl/access/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/general.c?r… ============================================================================== --- trunk/reactos/dll/cpl/access/general.c (original) +++ trunk/reactos/dll/cpl/access/general.c Tue Sep 18 02:29:35 2007 @@ -16,17 +16,6 @@ #include <tchar.h> #include "resource.h" #include "access.h" - - -typedef struct _GLOBAL_DATA -{ - ACCESSTIMEOUT accessTimeout; - SERIALKEYS serialKeys; - TCHAR szActivePort[MAX_PATH]; - TCHAR szPort[MAX_PATH]; - BOOL bWarningSounds; - BOOL bSoundOnActivation; -} GLOBAL_DATA, *PGLOBAL_DATA; #define BAUDTICKS 6 @@ -267,7 +256,7 @@ switch (uMsg) { case WM_INITDIALOG: - pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_DATA)); + pGlobalData = (PGLOBAL_DATA)((LPPROPSHEETPAGE)lParam)->lParam; if (pGlobalData == NULL) return FALSE; @@ -367,10 +356,7 @@ return TRUE; } break; - - case WM_DESTROY: - HeapFree(GetProcessHeap(), 0, pGlobalData); - break; } + } return FALSE; } Modified: trunk/reactos/dll/cpl/access/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/keyboard.c?… ============================================================================== --- trunk/reactos/dll/cpl/access/keyboard.c (original) +++ trunk/reactos/dll/cpl/access/keyboard.c Tue Sep 18 02:29:35 2007 @@ -17,17 +17,6 @@ #include "resource.h" #include "access.h" -typedef struct _GLOBAL_DATA -{ - STICKYKEYS stickyKeys; - STICKYKEYS oldStickyKeys; - FILTERKEYS filterKeys; - FILTERKEYS oldFilterKeys; - TOGGLEKEYS toggleKeys; - TOGGLEKEYS oldToggleKeys; - BOOL bKeyboardPref; -} GLOBAL_DATA, *PGLOBAL_DATA; - #define BOUNCETICKS 5 static INT nBounceArray[BOUNCETICKS] = {500, 700, 1000, 1500, 2000}; @@ -666,7 +655,7 @@ switch (uMsg) { case WM_INITDIALOG: - pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_DATA)); + pGlobalData = (PGLOBAL_DATA)((LPPROPSHEETPAGE)lParam)->lParam; if (pGlobalData == NULL) return FALSE; @@ -756,10 +745,6 @@ return TRUE; } break; - - case WM_DESTROY: - HeapFree(GetProcessHeap(), 0, pGlobalData); - break; } return FALSE; Modified: trunk/reactos/dll/cpl/access/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/mouse.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/access/mouse.c (original) +++ trunk/reactos/dll/cpl/access/mouse.c Tue Sep 18 02:29:35 2007 @@ -16,11 +16,6 @@ #include "resource.h" #include "access.h" -typedef struct _GLOBAL_DATA -{ - MOUSEKEYS mouseKeys; -} GLOBAL_DATA, *PGLOBAL_DATA; - #define SPEEDTICKS 9 #define ACCELTICKS 9 @@ -165,7 +160,7 @@ switch (uMsg) { case WM_INITDIALOG: - pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_DATA)); + pGlobalData = (PGLOBAL_DATA)((LPPROPSHEETPAGE)lParam)->lParam; if (pGlobalData == NULL) return FALSE; @@ -218,10 +213,6 @@ return TRUE; } break; - - case WM_DESTROY: - HeapFree(GetProcessHeap(), 0, pGlobalData); - break; } return FALSE; Modified: trunk/reactos/dll/cpl/access/sound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/sound.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/access/sound.c (original) +++ trunk/reactos/dll/cpl/access/sound.c Tue Sep 18 02:29:35 2007 @@ -16,28 +16,21 @@ #include "access.h" -typedef struct _SOUNDDATA -{ - SOUNDSENTRY ssSoundSentry; - BOOL bShowSounds; -} SOUNDDATA, *PSOUNDDATA; - - static VOID -OnInitDialog(HWND hwndDlg, PSOUNDDATA pSoundData) +OnInitDialog(HWND hwndDlg, PGLOBAL_DATA pGlobalData) { TCHAR szBuffer[256]; UINT i; - pSoundData->ssSoundSentry.cbSize = sizeof(SOUNDSENTRY); + pGlobalData->ssSoundSentry.cbSize = sizeof(SOUNDSENTRY); SystemParametersInfo(SPI_GETSOUNDSENTRY, sizeof(SOUNDSENTRY), - &pSoundData->ssSoundSentry, + &pGlobalData->ssSoundSentry, 0); SystemParametersInfo(SPI_GETSHOWSOUNDS, 0, - &pSoundData->bShowSounds, + &pGlobalData->bShowSounds, 0); /* Add strings to the combo-box */ @@ -48,10 +41,10 @@ } /* Select a combo-box item */ - SendDlgItemMessage(hwndDlg, IDC_SENTRY_COMBO, CB_SETCURSEL, pSoundData->ssSoundSentry.iWindowsEffect, 0); + SendDlgItemMessage(hwndDlg, IDC_SENTRY_COMBO, CB_SETCURSEL, pGlobalData->ssSoundSentry.iWindowsEffect, 0); /* Initialize SoundSentry settings */ - if (!(pSoundData->ssSoundSentry.dwFlags & SSF_AVAILABLE)) + if (!(pGlobalData->ssSoundSentry.dwFlags & SSF_AVAILABLE)) { EnableWindow(GetDlgItem(hwndDlg, IDC_SENTRY_BOX), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_SENTRY_TEXT), FALSE); @@ -59,7 +52,7 @@ } else { - if (pSoundData->ssSoundSentry.dwFlags & SSF_SOUNDSENTRYON) + if (pGlobalData->ssSoundSentry.dwFlags & SSF_SOUNDSENTRYON) { CheckDlgButton(hwndDlg, IDC_SENTRY_BOX, BST_CHECKED); } @@ -71,7 +64,7 @@ } /* Initialize ShowSounds settings */ - if (pSoundData->bShowSounds) + if (pGlobalData->bShowSounds) CheckDlgButton(hwndDlg, IDC_SSHOW_BOX, BST_CHECKED); } @@ -83,40 +76,41 @@ WPARAM wParam, LPARAM lParam) { - PSOUNDDATA pSoundData; + PGLOBAL_DATA pGlobalData; - pSoundData = (PSOUNDDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); switch (uMsg) { case WM_INITDIALOG: - pSoundData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SOUNDDATA)); - SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pSoundData); + pGlobalData = (PGLOBAL_DATA)((LPPROPSHEETPAGE)lParam)->lParam; - OnInitDialog(hwndDlg, pSoundData); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + + OnInitDialog(hwndDlg, pGlobalData); break; case WM_COMMAND: switch (LOWORD(wParam)) { case IDC_SENTRY_BOX: - pSoundData->ssSoundSentry.dwFlags ^= SSF_SOUNDSENTRYON; - EnableWindow(GetDlgItem(hwndDlg, IDC_SENTRY_TEXT), (pSoundData->ssSoundSentry.dwFlags & SSF_SOUNDSENTRYON)?TRUE:FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_SENTRY_COMBO), (pSoundData->ssSoundSentry.dwFlags & SSF_SOUNDSENTRYON)?TRUE:FALSE); + pGlobalData->ssSoundSentry.dwFlags ^= SSF_SOUNDSENTRYON; + EnableWindow(GetDlgItem(hwndDlg, IDC_SENTRY_TEXT), (pGlobalData->ssSoundSentry.dwFlags & SSF_SOUNDSENTRYON)?TRUE:FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_SENTRY_COMBO), (pGlobalData->ssSoundSentry.dwFlags & SSF_SOUNDSENTRYON)?TRUE:FALSE); PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; case IDC_SENTRY_COMBO: if (HIWORD(wParam) == CBN_SELENDOK) { - pSoundData->ssSoundSentry.iWindowsEffect = + pGlobalData->ssSoundSentry.iWindowsEffect = (DWORD)SendMessage((HWND)lParam, CB_GETCURSEL, 0, 0); PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } break; case IDC_SSHOW_BOX: - pSoundData->bShowSounds = !pSoundData->bShowSounds; + pGlobalData->bShowSounds = !pGlobalData->bShowSounds; PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; @@ -131,10 +125,10 @@ case PSN_APPLY: SystemParametersInfo(SPI_SETSOUNDSENTRY, sizeof(SOUNDSENTRY), - &pSoundData->ssSoundSentry, + &pGlobalData->ssSoundSentry, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); SystemParametersInfo(SPI_SETSHOWSOUNDS, - pSoundData->bShowSounds, + pGlobalData->bShowSounds, 0, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); return TRUE; @@ -143,10 +137,6 @@ break; } break; - - case WM_DESTROY: - HeapFree(GetProcessHeap(), 0, pSoundData); - break; } return FALSE;

1 0

[jimtabor] 29087: Init stock object buffer only once.
by jimtabor＠svn.reactos.org 17 Sep '07

17 Sep '07

Author: jimtabor Date: Tue Sep 18 02:08:14 2007 New Revision: 29087 URL: http://svn.reactos.org/svn/reactos?rev=29087&view=rev Log: Init stock object buffer only once. Modified: trunk/reactos/dll/win32/gdi32/main/dllmain.c Modified: trunk/reactos/dll/win32/gdi32/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/main/dllma… ============================================================================== --- trunk/reactos/dll/win32/gdi32/main/dllmain.c (original) +++ trunk/reactos/dll/win32/gdi32/main/dllmain.c Tue Sep 18 02:08:14 2007 @@ -10,6 +10,7 @@ #include "precomp.h" extern HGDIOBJ stock_objects[]; +BOOL SetStockObjects = FALSE; /* * GDI32.DLL doesn't have an entry point. The initialization is done by a call @@ -70,7 +71,11 @@ NtCurrentTeb()->GdiBatchCount = 0; #endif // Very simple, the list will fill itself as it is needed. - RtlZeroMemory( &stock_objects, NB_STOCK_OBJECTS); //Assume Ros is dirty. + if(!SetStockObjects) + { + RtlZeroMemory( &stock_objects, NB_STOCK_OBJECTS); //Assume Ros is dirty. + SetStockObjects = TRUE; + } return TRUE; }

1 0

[jimtabor] 29086: Fixed build.
by jimtabor＠svn.reactos.org 17 Sep '07

17 Sep '07

Author: jimtabor Date: Tue Sep 18 01:46:30 2007 New Revision: 29086 URL: http://svn.reactos.org/svn/reactos?rev=29086&view=rev Log: Fixed build. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c Tue Sep 18 01:46:30 2007 @@ -116,7 +116,7 @@ { HWND hWndS = *hWnd; PWINDOW_OBJECT Window = UserGetWindowObject(*hWnd); - PW32CLTINFO_TEB ClientInfo = GetWin32ClientInfo(); + PW32CLIENTINFO ClientInfo = GetWin32ClientInfo(); *hWnd = ClientInfo->hWND; *pWnd = ClientInfo->pvWND; @@ -128,7 +128,7 @@ static VOID IntRestoreTebWndCallback (HWND hWnd, PVOID pWnd) { - PW32CLTINFO_TEB ClientInfo = GetWin32ClientInfo(); + PW32CLIENTINFO ClientInfo = GetWin32ClientInfo(); ClientInfo->hWND = hWnd; ClientInfo->pvWND = pWnd;

1 0

[jimtabor] 29085: Fixed Client Info structure. Moved it to the right file so user apps can access it.
by jimtabor＠svn.reactos.org 17 Sep '07

17 Sep '07

Author: jimtabor Date: Tue Sep 18 01:02:19 2007 New Revision: 29085 URL: http://svn.reactos.org/svn/reactos?rev=29085&view=rev Log: Fixed Client Info structure. Moved it to the right file so user apps can access it. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/misc.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Tue Sep 18 01:02:19 2007 @@ -72,6 +72,21 @@ PDESKTOP Desktop; ULONG_PTR DesktopHeapDelta; } W32THREADINFO, *PW32THREADINFO; + +/* Window Client Information structure */ +typedef struct _W32CLIENTINFO +{ + ULONG Win32ClientInfo0[2]; + ULONG ulWindowsVersion; + ULONG ulAppCompatFlags; + ULONG ulAppCompatFlags2; + ULONG Win32ClientInfo1[5]; + HWND hWND; + PVOID pvWND; + ULONG Win32ClientInfo2[50]; +} W32CLIENTINFO, *PW32CLIENTINFO; + +#define GetWin32ClientInfo() (PW32CLIENTINFO)(NtCurrentTeb()->Win32ClientInfo) PW32THREADINFO GetW32ThreadInfo(VOID); PW32PROCESSINFO GetW32ProcessInfo(VOID); Modified: trunk/reactos/subsystems/win32/win32k/include/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/misc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/misc.h Tue Sep 18 01:02:19 2007 @@ -8,19 +8,4 @@ ULONG FASTCALL IntSystemParametersInfo(UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWinIni); -/* Window Client Information structure */ -typedef struct _W32CLTINFO_TEB -{ - ULONG Win32ClientInfo0[2]; - ULONG ulWindowsVersion; - ULONG ulAppCompatFlags; - ULONG ulAppCompatFlags2; - ULONG Win32ClientInfo1[5]; - HWND hWND; - PVOID pvWND; - ULONG Win32ClientInfo2[50]; -} W32CLTINFO_TEB, *PW32CLTINFO_TEB; - -#define GetWin32ClientInfo() (PW32CLTINFO_TEB)(NtCurrentTeb()->Win32ClientInfo) - #endif /* __WIN32K_MISC_H */

1 0

[fireball] 29084: - Change RtlIsDosDeviceName_U() implementation to a better Wine implementation - Winesync RtlIsNameLegalDOS8Dot3() - "ntdll_winetest.exe path" reduced to 3 failures (which happen on XP too), so considering "path" done 100% now.
by fireball＠svn.reactos.org 17 Sep '07

17 Sep '07

Author: fireball Date: Mon Sep 17 23:51:32 2007 New Revision: 29084 URL: http://svn.reactos.org/svn/reactos?rev=29084&view=rev Log: - Change RtlIsDosDeviceName_U() implementation to a better Wine implementation - Winesync RtlIsNameLegalDOS8Dot3() - "ntdll_winetest.exe path" reduced to 3 failures (which happen on XP too), so considering "path" done 100% now. Modified: trunk/reactos/lib/rtl/dos8dot3.c trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/lib/rtl/dos8dot3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/dos8dot3.c?rev=290… ============================================================================== --- trunk/reactos/lib/rtl/dos8dot3.c (original) +++ trunk/reactos/lib/rtl/dos8dot3.c Mon Sep 17 23:51:32 2007 @@ -238,79 +238,64 @@ IN OUT POEM_STRING AnsiName OPTIONAL, IN OUT PBOOLEAN SpacesFound OPTIONAL) { - PANSI_STRING name = AnsiName; - ANSI_STRING DummyString; - CHAR Buffer[12]; - char *str; - ULONG Length; - ULONG i; - NTSTATUS Status; - BOOLEAN HasSpace = FALSE; - BOOLEAN HasDot = FALSE; - - if (UnicodeName->Length > 24) - { - return(FALSE); /* name too long */ - } - - if (!name) - { - name = &DummyString; - name->Length = 0; - name->MaximumLength = 12; - name->Buffer = Buffer; - } - - Status = RtlUpcaseUnicodeStringToCountedOemString(name, - UnicodeName, - FALSE); - if (!NT_SUCCESS(Status)) - { - return(FALSE); - } - - Length = name->Length; - str = name->Buffer; - - if (!(Length == 1 && *str == '.') && - !(Length == 2 && *str == '.' && *(str + 1) == '.')) - { - for (i = 0; i < Length; i++, str++) - { - switch (*str) - { - case ' ': - HasSpace = TRUE; - break; - - case '.': - if ((HasDot) || /* two or more dots */ - (i == 0) || /* dot is first char */ - (i + 1 == Length) || /* dot is last char */ - (Length - i > 4) || /* more than 3 chars of extension */ - (HasDot == FALSE && i > 8)) /* name is longer than 8 chars */ - return(FALSE); - HasDot = TRUE; - break; - default: - if (RtlpIsShortIllegal(*str)) - { - return(FALSE); - } - } - } - } - - /* Name is longer than 8 chars and does not have an extension */ - if (Length > 8 && HasDot == FALSE) - { - return(FALSE); - } - - if (SpacesFound) - *SpacesFound = HasSpace; - - return(TRUE); + static const char Illegal[] = "*?<>|\"+=,;[]:/\\\345"; + int Dot = -1; + int i; + char Buffer[12]; + OEM_STRING OemString; + BOOLEAN GotSpace = FALSE; + + if (!AnsiName) + { + OemString.Length = sizeof(Buffer); + OemString.MaximumLength = sizeof(Buffer); + OemString.Buffer = Buffer; + AnsiName = &OemString; + } + if (RtlUpcaseUnicodeStringToCountedOemString( AnsiName, UnicodeName, FALSE ) != STATUS_SUCCESS) + return FALSE; + + if (AnsiName->Length > 12) return FALSE; + + /* a starting . is invalid, except for . and .. */ + if (AnsiName->Buffer[0] == '.') + { + if (AnsiName->Length != 1 && (AnsiName->Length != 2 || AnsiName->Buffer[1] != '.')) return FALSE; + if (SpacesFound) *SpacesFound = FALSE; + return TRUE; + } + + for (i = 0; i < AnsiName->Length; i++) + { + switch (AnsiName->Buffer[i]) + { + case ' ': + /* leading/trailing spaces not allowed */ + if (!i || i == AnsiName->Length-1 || AnsiName->Buffer[i+1] == '.') return FALSE; + GotSpace = TRUE; + break; + case '.': + if (Dot != -1) return FALSE; + Dot = i; + break; + default: + if (strchr(Illegal, AnsiName->Buffer[i])) return FALSE; + break; + } + } + /* check file part is shorter than 8, extension shorter than 3 + * dot cannot be last in string + */ + if (Dot == -1) + { + if (AnsiName->Length > 8) return FALSE; + } + else + { + if (Dot > 8 || (AnsiName->Length - Dot > 4) || Dot == AnsiName->Length - 1) return FALSE; + } + if (SpacesFound) *SpacesFound = GotSpace; + return TRUE; } /* Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=29084&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c (original) +++ trunk/reactos/lib/rtl/path.c Mon Sep 17 23:51:32 2007 @@ -91,92 +91,69 @@ * @implemented */ ULONG NTAPI -RtlIsDosDeviceName_U(PWSTR DeviceName) -{ - ULONG Type; - ULONG Length = 0; - ULONG Offset; - PWCHAR wc; - UNICODE_STRING DeviceNameU; - - if (DeviceName == NULL) - { - return 0; - } - - while (DeviceName[Length]) - { - Length++; - } - - Type = RtlDetermineDosPathNameType_U(DeviceName); - if (Type <= 1) - { - return 0; - } - - if (Type == 6) - { - DeviceNameU.Length = DeviceNameU.MaximumLength = Length * sizeof(WCHAR); - DeviceNameU.Buffer = DeviceName; - if (Length == 7 && - RtlEqualUnicodeString(&DeviceNameU, (PUNICODE_STRING)&_condev, TRUE)) - return 0x00080006; - return 0; - } - - /* name can end with ':' */ - if (Length && DeviceName[Length - 1 ] == L':') - { - Length--; - } - - /* there can be spaces or points at the end of name */ - wc = DeviceName + Length - 1; - while (Length && (*wc == L'.' || *wc == L' ')) - { - Length--; - wc--; - } - - /* let's find a beginning of name */ - wc = DeviceName + Length - 1; - while (wc > DeviceName && !IS_PATH_SEPARATOR(*(wc - 1))) - { - wc--; - } - Offset = wc - DeviceName; - Length -= Offset; - DeviceNameU.Length = DeviceNameU.MaximumLength = 3 * sizeof(WCHAR); - DeviceNameU.Buffer = wc; - - /* check for LPTx or COMx */ - if (Length == 4 && wc[3] >= L'0' && wc[3] <= L'9') - { - if (wc[3] == L'0') - { - return 0; - } - - if (RtlEqualUnicodeString(&DeviceNameU, (PUNICODE_STRING)&_lpt, TRUE) || - RtlEqualUnicodeString(&DeviceNameU, (PUNICODE_STRING)&_com, TRUE)) - { - return ((Offset * 2) << 16 ) | 8; - } - return 0; - } - - /* check for PRN,AUX,NUL or CON */ - if (Length == 3 && - (RtlEqualUnicodeString(&DeviceNameU, (PUNICODE_STRING)&_prn, TRUE) || - RtlEqualUnicodeString(&DeviceNameU, (PUNICODE_STRING)&_aux, TRUE) || - RtlEqualUnicodeString(&DeviceNameU, (PUNICODE_STRING)&_nul, TRUE) || - RtlEqualUnicodeString(&DeviceNameU, (PUNICODE_STRING)&_con, TRUE))) - { - return ((Offset * 2) << 16) | 6; - } - - return 0; +RtlIsDosDeviceName_U(PWSTR dos_name) +{ + static const WCHAR consoleW[] = {'\\','\\','.','\\','C','O','N',0}; + static const WCHAR auxW[3] = {'A','U','X'}; + static const WCHAR comW[3] = {'C','O','M'}; + static const WCHAR conW[3] = {'C','O','N'}; + static const WCHAR lptW[3] = {'L','P','T'}; + static const WCHAR nulW[3] = {'N','U','L'}; + static const WCHAR prnW[3] = {'P','R','N'}; + + const WCHAR *start, *end, *p; + + switch(RtlDetermineDosPathNameType_U( dos_name )) + { + case RtlPathTypeUnknown: + case RtlPathTypeUncAbsolute: + return 0; + case RtlPathTypeLocalDevice: + if (!_wcsicmp( dos_name, consoleW )) + return MAKELONG( sizeof(conW), 4 * sizeof(WCHAR) ); /* 4 is length of \\.\ prefix */ + return 0; + default: + break; + } + + end = dos_name + wcslen(dos_name) - 1; + while (end >= dos_name && *end == ':') end--; /* remove all trailing ':' */ + + /* find start of file name */ + for (start = end; start >= dos_name; start--) + { + if (IS_PATH_SEPARATOR(start[0])) break; + /* check for ':' but ignore if before extension (for things like NUL:.txt) */ + if (start[0] == ':' && start[1] != '.') break; + } + start++; + + /* remove extension */ + if ((p = wcschr( start, '.' ))) + { + end = p - 1; + if (end >= dos_name && *end == ':') end--; /* remove trailing ':' before extension */ + } + /* remove trailing spaces */ + while (end >= dos_name && *end == ' ') end--; + + /* now we have a potential device name between start and end, check it */ + switch(end - start + 1) + { + case 3: + if (_wcsnicmp( start, auxW, 3 ) && + _wcsnicmp( start, conW, 3 ) && + _wcsnicmp( start, nulW, 3 ) && + _wcsnicmp( start, prnW, 3 )) break; + return MAKELONG( 3 * sizeof(WCHAR), (start - dos_name) * sizeof(WCHAR) ); + case 4: + if (_wcsnicmp( start, comW, 3 ) && _wcsnicmp( start, lptW, 3 )) break; + if (*end <= '0' || *end > '9') break; + return MAKELONG( 4 * sizeof(WCHAR), (start - dos_name) * sizeof(WCHAR) ); + default: /* can't match anything */ + break; + } + return 0; } @@ -389,7 +366,12 @@ } /* skip to the next component */ while (*p && *p != '\\') p++; - if (*p == '\\') p++; + if (*p == '\\') + { + /* remove last dot in previous dir name */ + if (p > path + mark && p[-1] == '.') memmove( p-1, p, (wcslen(p) + 1) * sizeof(WCHAR) ); + else p++; + } } /* remove trailing spaces and dots (yes, Windows really does that, don't ask) */ @@ -439,7 +421,8 @@ RtlAcquirePebLock(); - cd = &((PCURDIR)&NtCurrentTeb()->ProcessEnvironmentBlock->ProcessParameters->CurrentDirectory.DosPath)->DosPath; + //cd = &((PCURDIR)&NtCurrentTeb()->ProcessEnvironmentBlock->ProcessParameters->CurrentDirectory.DosPath)->DosPath; + cd = &NtCurrentTeb()->ProcessEnvironmentBlock->ProcessParameters->CurrentDirectory.DosPath; switch (type = RtlDetermineDosPathNameType_U(name)) {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs