Ros-diffs October 2006

ros-diffs@reactos.org

17 participants
357 discussions

[ion] 24563: - Combine PnpInit1/2 since they were called one after the other. - Load RAW driver while loading boot drivers. - Cleanup IoInitSystem a bit more.

by ion＠svn.reactos.org

Author: ion Date: Wed Oct 18 21:46:55 2006 New Revision: 24563 URL: http://svn.reactos.org/svn/reactos?rev=24563&view=rev Log: - Combine PnpInit1/2 since they were called one after the other. - Load RAW driver while loading boot drivers. - Cleanup IoInitSystem a bit more. Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/iomgr/iomgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Wed Oct 18 21:46:55 2006 @@ -918,7 +918,6 @@ * Return Value * None */ - VOID FASTCALL IopInitializeBootDrivers(VOID) @@ -926,6 +925,50 @@ PLIST_ENTRY ListHead, NextEntry; PLDR_DATA_TABLE_ENTRY LdrEntry; UNICODE_STRING NtosSymName = RTL_CONSTANT_STRING(L"ntoskrnl.sym"); + PDEVICE_NODE DeviceNode; + PDRIVER_OBJECT DriverObject; + LDR_DATA_TABLE_ENTRY ModuleObject; + NTSTATUS Status; + + /* Use IopRootDeviceNode for now */ + Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, &DeviceNode); + if (!NT_SUCCESS(Status)) return; + + /* Setup the module object for the RAW FS Driver */ + ModuleObject.DllBase = NULL; + ModuleObject.SizeOfImage = 0; + ModuleObject.EntryPoint = RawFsDriverEntry; + + /* Initialize it */ + Status = IopInitializeDriverModule(DeviceNode, + &ModuleObject, + &DeviceNode->ServiceName, + TRUE, + &DriverObject); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + IopFreeDeviceNode(DeviceNode); + return; + } + + /* Now initialize the associated device */ + Status = IopInitializeDevice(DeviceNode, DriverObject); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + IopFreeDeviceNode(DeviceNode); + return; + } + + /* Start it up */ + Status = IopStartDevice(DeviceNode); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + IopFreeDeviceNode(DeviceNode); + return; + } /* Hack for NTOSKRNL.SYM */ KDB_SYMBOLFILE_HOOK(&NtosSymName); Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Wed Oct 18 21:46:55 2006 @@ -442,9 +442,6 @@ IoInitSystem(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { LARGE_INTEGER ExpireTime; - PDEVICE_NODE DeviceNode; - PDRIVER_OBJECT DriverObject; - LDR_DATA_TABLE_ENTRY ModuleObject; NTSTATUS Status; CHAR Buffer[256]; ANSI_STRING NtBootPath, RootString; @@ -497,65 +494,16 @@ /* Create Object Directories */ if (!IopCreateRootDirectories()) return FALSE; - /* - * Initialize PnP manager - */ + /* Initialize PnP manager */ PnpInit(); - PnpInit2(); - - IoCreateDriverList(); - - KeInitializeSpinLock (&IoStatisticsLock); - - /* Initialize raw filesystem driver */ - - /* Use IopRootDeviceNode for now */ - Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, &DeviceNode); - if (!NT_SUCCESS(Status)) - { - CPRINT("IopCreateDeviceNode() failed with status (%x)\n", Status); - return FALSE; - } - - ModuleObject.DllBase = NULL; - ModuleObject.SizeOfImage = 0; - ModuleObject.EntryPoint = RawFsDriverEntry; - - Status = IopInitializeDriverModule(DeviceNode, - &ModuleObject, - &DeviceNode->ServiceName, - TRUE, - &DriverObject); - if (!NT_SUCCESS(Status)) - { - IopFreeDeviceNode(DeviceNode); - CPRINT("IopInitializeDriver() failed with status (%x)\n", Status); - return FALSE; - } - - Status = IopInitializeDevice(DeviceNode, DriverObject); - if (!NT_SUCCESS(Status)) - { - IopFreeDeviceNode(DeviceNode); - CPRINT("IopInitializeDevice() failed with status (%x)\n", Status); - return FALSE; - } - - Status = IopStartDevice(DeviceNode); - if (!NT_SUCCESS(Status)) - { - IopFreeDeviceNode(DeviceNode); - CPRINT("IopInitializeDevice() failed with status (%x)\n", Status); - return FALSE; - } - - /* - * Initialize PnP root releations - */ + /* Initialize PnP root relations */ IoSynchronousInvalidateDeviceRelations(IopRootDeviceNode-> PhysicalDeviceObject, BusRelations); + + /* Create the group driver list */ + IoCreateDriverList(); /* Load boot start drivers */ IopInitializeBootDrivers(); Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Wed Oct 18 21:46:55 2006 @@ -2610,73 +2610,6 @@ ExFreePool(Data); } -VOID INIT_FUNCTION -PnpInit(VOID) -{ - PDEVICE_OBJECT Pdo; - NTSTATUS Status; - - DPRINT("PnpInit()\n"); - - KeInitializeSpinLock(&IopDeviceTreeLock); - - /* Initialize the Bus Type GUID List */ - IopBusTypeGuidList = ExAllocatePool(PagedPool, sizeof(IO_BUS_TYPE_GUID_LIST)); - RtlZeroMemory(IopBusTypeGuidList, sizeof(IO_BUS_TYPE_GUID_LIST)); - ExInitializeFastMutex(&IopBusTypeGuidList->Lock); - - /* Initialize PnP-Event notification support */ - Status = IopInitPlugPlayEvents(); - if (!NT_SUCCESS(Status)) - { - CPRINT("IopInitPlugPlayEvents() failed\n"); - KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); - } - - /* - * Create root device node - */ - - Status = IopCreateDriverObject(&IopRootDriverObject, NULL, 0, FALSE, NULL, 0); - if (!NT_SUCCESS(Status)) - { - CPRINT("IoCreateDriverObject() failed\n"); - KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); - } - - Status = IoCreateDevice(IopRootDriverObject, 0, NULL, FILE_DEVICE_CONTROLLER, - 0, FALSE, &Pdo); - if (!NT_SUCCESS(Status)) - { - CPRINT("IoCreateDevice() failed\n"); - KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); - } - - Status = IopCreateDeviceNode(NULL, Pdo, &IopRootDeviceNode); - if (!NT_SUCCESS(Status)) - { - CPRINT("Insufficient resources\n"); - KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); - } - - if (!RtlCreateUnicodeString(&IopRootDeviceNode->InstancePath, - L"HTREE\\ROOT\\0")) - { - CPRINT("Failed to create the instance path!\n"); - KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, STATUS_NO_MEMORY, 0, 0, 0); - } - - /* Report the device to the user-mode pnp manager */ - IopQueueTargetDeviceEvent(&GUID_DEVICE_ARRIVAL, - &IopRootDeviceNode->InstancePath); - - IopRootDeviceNode->PhysicalDeviceObject->Flags |= DO_BUS_ENUMERATED_DEVICE; - PnpRootDriverEntry(IopRootDriverObject, NULL); - IopRootDriverObject->DriverExtension->AddDevice( - IopRootDriverObject, - IopRootDeviceNode->PhysicalDeviceObject); -} - static NTSTATUS INIT_FUNCTION IopEnumerateDetectedDevices( IN HANDLE hBaseKey, @@ -3297,17 +3230,79 @@ } VOID INIT_FUNCTION -PnpInit2(VOID) +PnpInit(VOID) { - NTSTATUS Status; - - /* Move information about devices detected by Freeloader to SYSTEM\CurrentControlSet\Root\ */ - Status = IopUpdateRootKey(); - if (!NT_SUCCESS(Status)) - { - CPRINT("IopUpdateRootKey() failed\n"); - KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); - } + PDEVICE_OBJECT Pdo; + NTSTATUS Status; + + DPRINT("PnpInit()\n"); + + KeInitializeSpinLock(&IopDeviceTreeLock); + + /* Initialize the Bus Type GUID List */ + IopBusTypeGuidList = ExAllocatePool(PagedPool, sizeof(IO_BUS_TYPE_GUID_LIST)); + RtlZeroMemory(IopBusTypeGuidList, sizeof(IO_BUS_TYPE_GUID_LIST)); + ExInitializeFastMutex(&IopBusTypeGuidList->Lock); + + /* Initialize PnP-Event notification support */ + Status = IopInitPlugPlayEvents(); + if (!NT_SUCCESS(Status)) + { + CPRINT("IopInitPlugPlayEvents() failed\n"); + KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); + } + + /* + * Create root device node + */ + + Status = IopCreateDriverObject(&IopRootDriverObject, NULL, 0, FALSE, NULL, 0); + if (!NT_SUCCESS(Status)) + { + CPRINT("IoCreateDriverObject() failed\n"); + KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); + } + + Status = IoCreateDevice(IopRootDriverObject, 0, NULL, FILE_DEVICE_CONTROLLER, + 0, FALSE, &Pdo); + if (!NT_SUCCESS(Status)) + { + CPRINT("IoCreateDevice() failed\n"); + KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); + } + + Status = IopCreateDeviceNode(NULL, Pdo, &IopRootDeviceNode); + if (!NT_SUCCESS(Status)) + { + CPRINT("Insufficient resources\n"); + KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); + } + + if (!RtlCreateUnicodeString(&IopRootDeviceNode->InstancePath, + L"HTREE\\ROOT\\0")) + { + CPRINT("Failed to create the instance path!\n"); + KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, STATUS_NO_MEMORY, 0, 0, 0); + } + + /* Report the device to the user-mode pnp manager */ + IopQueueTargetDeviceEvent(&GUID_DEVICE_ARRIVAL, + &IopRootDeviceNode->InstancePath); + + IopRootDeviceNode->PhysicalDeviceObject->Flags |= DO_BUS_ENUMERATED_DEVICE; + PnpRootDriverEntry(IopRootDriverObject, NULL); + IopRootDriverObject->DriverExtension->AddDevice( + IopRootDriverObject, + IopRootDeviceNode->PhysicalDeviceObject); + + /* Move information about devices detected by Freeloader to SYSTEM\CurrentControlSet\Root\ */ + Status = IopUpdateRootKey(); + if (!NT_SUCCESS(Status)) + { + CPRINT("IopUpdateRootKey() failed\n"); + KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); + } } + /* EOF */

18 years, 2 months

[gedmurphy] 24562: To stop the app hanging when enumerating, use a separate thread for enumerating exclusively

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Oct 18 19:50:05 2006 New Revision: 24562 URL: http://svn.reactos.org/svn/reactos?rev=24562&view=rev Log: To stop the app hanging when enumerating, use a separate thread for enumerating exclusively Modified: trunk/reactos/base/applications/devmgmt/mainwnd.c trunk/reactos/base/applications/devmgmt/misc.c trunk/reactos/base/applications/devmgmt/precomp.h Modified: trunk/reactos/base/applications/devmgmt/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/mainwnd.c (original) +++ trunk/reactos/base/applications/devmgmt/mainwnd.c Wed Oct 18 19:50:05 2006 @@ -206,6 +206,9 @@ hTreeView = (HWND *)lpParameter; + if (*hTreeView) + FreeDeviceStrings(*hTreeView); + hRoot = InitTreeView(*hTreeView); if (hRoot) { @@ -411,13 +414,7 @@ case IDC_REFRESH: { - HTREEITEM hRoot; - - FreeDeviceStrings(Info->hTreeView); - - hRoot = InitTreeView(Info->hTreeView); - if (hRoot) - ListDevicesByType(Info->hTreeView, hRoot); + HANDLE DevEnumThread; SendMessage(Info->hTool, TB_SETSTATE, @@ -426,6 +423,21 @@ EnableMenuItem(GetMenu(Info->hMainWnd), IDC_PROP, MF_GRAYED); EnableMenuItem(Info->hShortcutMenu, IDC_PROP, MF_GRAYED); + + /* create seperate thread to emum devices */ + DevEnumThread = CreateThread(NULL, + 0, + DeviceEnumThread, + &Info->hTreeView, + 0, + NULL); + if (!DevEnumThread) + { + DisplayString(_T("Failed to enumerate devices")); + break; + } + + CloseHandle(DevEnumThread); } break; Modified: trunk/reactos/base/applications/devmgmt/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/misc.c (original) +++ trunk/reactos/base/applications/devmgmt/misc.c Wed Oct 18 19:50:05 2006 @@ -248,7 +248,7 @@ 0, NULL ); - MessageBox(NULL, (LPTSTR)lpMsgBuf, _T("Error!"), MB_OK | MB_ICONERROR); + MessageBox(NULL, lpMsgBuf, _T("Error!"), MB_OK | MB_ICONERROR); LocalFree(lpMsgBuf); } Modified: trunk/reactos/base/applications/devmgmt/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/precomp.h (original) +++ trunk/reactos/base/applications/devmgmt/precomp.h Wed Oct 18 19:50:05 2006 @@ -111,10 +111,6 @@ UINT Height); VOID GetError(VOID); - -VOID DisplayString(PTCHAR); - -VOID TimerInfo(LPTSTR); - +VOID DisplayString(LPTSTR); #endif /* __DEVMGMT_PRECOMP_H */

18 years, 2 months

[ion] 24561: - Some stuff I promised James. This is DC_ATTR from Win2K, IIRC (you called it GDI_USER_DATA). It changed a bit in XP, but now you have a working model. Also added some more flags/enums that I knew about and some font structures.

by ion＠svn.reactos.org

Author: ion Date: Wed Oct 18 10:00:31 2006 New Revision: 24561 URL: http://svn.reactos.org/svn/reactos?rev=24561&view=rev Log: - Some stuff I promised James. This is DC_ATTR from Win2K, IIRC (you called it GDI_USER_DATA). It changed a bit in XP, but now you have a working model. Also added some more flags/enums that I knew about and some font structures. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Wed Oct 18 10:00:31 2006 @@ -74,6 +74,25 @@ #define GDI_HANDLE_SET_STOCKOBJ(h) \ ((h) = (HANDLE)(((ULONG_PTR)(h)) | GDI_HANDLE_STOCK_MASK)) +/* DC_ATTR Dirty Flags */ +#define DIRTY_FILL 0x00000001 +#define DIRTY_LINE 0x00000002 +#define DIRTY_TEXT 0x00000004 +#define DIRTY_BACKGROUND 0x00000008 +#define DIRTY_CHARSET 0x00000010 +#define SLOW_WIDTHS 0x00000020 +#define DC_CACHED_TM_VALID 0x00000040 +#define DISPLAY_DC 0x00000080 +#define DIRTY_PTLCURRENT 0x00000100 +#define DIRTY_PTFXCURRENT 0x00000200 +#define DIRTY_STYLESTATE 0x00000400 +#define DC_PLAYMETAFILE 0x00000800 +#define DC_BRUSH_DIRTY 0x00001000 +#define DC_PEN_DIRTY 0x00002000 +#define DC_DIBSECTION 0x00004000 +#define DC_LAST_CLIPRGN_VALID 0x00008000 +#define DC_PRIMARY_DISPLAY 0x00010000 + /* TYPES *********************************************************************/ typedef struct _GDI_TABLE_ENTRY @@ -84,28 +103,62 @@ PVOID UserData; /* Points to the user mode structure, usually NULL though */ } GDI_TABLE_ENTRY, *PGDI_TABLE_ENTRY; +typedef struct _RGNATTR +{ + ULONG AttrFlags; + ULONG Flags; + RECTL Rect; +} RGNATTR,*PRGNATTR; -typedef struct _GDI_USER_DATA +typedef struct _DC_ATTR { - COLORREF PenColor; - COLORREF BrushColor; - INT ROPmode; - INT PolyFillMode; - INT StretchBltMode; - INT BackgroundMode; - COLORREF BackgroundColor; - COLORREF TextColor; - DWORD CodePage; - HCOLORSPACE ColorSpace; - INT TextAlign; /* Text alignment from SetTextAlign() */ - INT CharExtra; /* Spacing from SetTextCharacterExtra() */ - INT BreakExtral; /* SetTextJustification */ - INT BreakCount; /* " */ - INT GraphicsMode; /* Graphics mode */ - INT MapMode; - HFONT hFont; - DWORD Layout; -} GDI_USER_DATA, *PGDI_USER_DATA; - + PVOID pvLDC; + ULONG ulDirty_; + HANDLE hbrush; + HANDLE hpen; + COLORREF crBackgroundClr; + ULONG ulBackgroundClr; + COLORREF crForegroundClr; + ULONG ulForegroundClr; + DWORD iCS_CP; + INT iGraphicsMode; + BYTE jROP2; + BYTE jBkMode; + BYTE jFillMode; + BYTE jStretchBltMode; + POINTL ptlCurrent; + POINTL ptfxCurrent; + LONG lBkMode; + LONG lFillMode; + LONG lStretchBltMode; + FLONG flFontMapper; + LONG lIcmMode; + HANDLE hcmXform; + HCOLORSPACE hColorSpace; + INT IcmBrushColor; + INT IcmPenColor; + FLONG flTextAlign; + LONG lTextAlign; + LONG lTextExtra; + LONG lRelAbs; + LONG lBreakExtra; + LONG cBreak; + HANDLE hlfntNew; + MATRIX_S mxWorldToDevice; + MATRIX_S mxDevicetoWorld; + MATRIX_S mxWorldToPage; + INT iMapMode; + DWORD dwLayout; + LONG lWindowOrgx; + POINTL ptlWindowOrg; + SIZEL szlWindowExt; + POINTL ptlViewportOrg; + SIZEL szlViewportExt; + FLONG flXform; + SIZEL szlVirtualDevicePixel; + SIZEL szlVirtualDeviceMm; + POINTL ptlBrushOrigin; + RGNATTR VisRectRegion; +} DC_ATTR, *PDC_ATTR; #endif Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h Wed Oct 18 10:00:31 2006 @@ -43,27 +43,38 @@ typedef enum _GETDCDWORD { - GdiGetRelAbs = 1, + GdiGetJournal, + GdiGetRelAbs, GdiGetBreakExtra, GdiGerCharBreak, GdiGetArcDirection, GdiGetEMFRestorDc, GdiGetFontLanguageInfo, GdiGetIsMemDc, + GdiGetMapMode, + GdiGetTextCharExtra, } GETDCDWORD, *PGETDCDWORD; typedef enum _GETSETDCDWORD { - GdiGetSetRelAbs = 4, - GdiGetSetMapperFlagsInternal = 7, - GdiGetSetMapMode = 8, - GdiGetSetArcDirection = 9, + GdtGetSetCopyCount = 2, + GdiGetSetTextAlign, + GdiGetSetRelAbs, + GdiGetSetTextCharExtra, + GdiGetSetSelectFont, + GdiGetSetMapperFlagsInternal, + GdiGetSetMapMode, + GdiGetSetArcDirection, } GETSETDCDWORD, *PGETSETDCDWORD; typedef enum _GETDCPOINT { GdiGetViewPortExt = 1, - GdiGetDCOrg = 7, + GdiGetWindowExt, + GdiGetViewPortOrg, + GdiGetWindowOrg, + GdiGetAspectRatioFilter, + GdiGetDCOrg = 6, } GETDCPOINT, *PGETDCPOINT; typedef enum _TRANSFORMTYPE @@ -86,13 +97,50 @@ typedef DWORD CHWIDTHINFO; typedef CHWIDTHINFO *PCHWIDTHINFO; typedef D3DNTHAL_CONTEXTCREATEDATA D3DNTHAL_CONTEXTCREATEI; +typedef LONG FIX; /* FIXME: Unknown; easy to guess, usually based on public types and converted */ typedef struct _WIDTHDATA WIDTHDATA, *PWIDTHDATA; -typedef struct _TMDIFF TMDIFF, *PTMDIFF; -typedef struct _TMW_INTERNAL TMW_INTERNAL, *PTMW_INTERNAL; -typedef struct _ENUMFONTDATAW ENUMFONTDATAW, *PENUMFONTDATAW; typedef struct _DEVCAPS DEVCAPS, *PDEVCAPS; typedef struct _REALIZATION_INFO REALIZATION_INFO, *PREALIZATION_INFO; +/* Font Structures */ +typedef struct _TMDIFF +{ + ULONG cjotma; + CHAR chFirst; + CHAR chLast; + CHAR ChDefault; + CHAR ChBreak; +} TMDIFF, *PTMDIFF; + +typedef struct _TMW_INTERNAL +{ + TEXTMETRICW TextMetric; + TMDIFF Diff; +} TMW_INTERNAL, *PTMW_INTERNAL; + +typedef struct _ENUMFONTDATAW ENUMFONTDATAW, *PENUMFONTDATAW; + +/* Number Representation */ +typedef struct _EFLOAT_S +{ + LONG lMant; + LONG lExp; +} EFLOAT_S; + +/* XFORM Structures */ +typedef struct _MATRIX_S +{ + EFLOAT_S efM11; + EFLOAT_S efM12; + EFLOAT_S efM21; + EFLOAT_S efM22; + EFLOAT_S efDx; + EFLOAT_S efDy; + FIX fxDx; + FIX fxDy; + FLONG flAccel; +} MATRIX_S; + #endif

18 years, 2 months

[jimtabor] 24560: Set GDI_BatchLimit from TEB.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Oct 18 07:55:28 2006 New Revision: 24560 URL: http://svn.reactos.org/svn/reactos?rev=24560&view=rev Log: Set GDI_BatchLimit from TEB. 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 Wed Oct 18 07:55:28 2006 @@ -34,6 +34,7 @@ /* map the gdi handle table to user space */ GdiHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; CurrentProcessId = NtCurrentTeb()->Cid.UniqueProcess; + GDI_BatchLimit = NtCurrentTeb()->GdiBatchCount; }

18 years, 2 months

[jimtabor] 24559: Add more DCDWord constants and two more members in GdiUserData structure.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Oct 18 07:54:35 2006 New Revision: 24559 URL: http://svn.reactos.org/svn/reactos?rev=24559&view=rev Log: Add more DCDWord constants and two more members in GdiUserData structure. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Wed Oct 18 07:54:35 2006 @@ -99,6 +99,8 @@ HCOLORSPACE ColorSpace; INT TextAlign; /* Text alignment from SetTextAlign() */ INT CharExtra; /* Spacing from SetTextCharacterExtra() */ + INT BreakExtral; /* SetTextJustification */ + INT BreakCount; /* " */ INT GraphicsMode; /* Graphics mode */ INT MapMode; HFONT hFont; Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h Wed Oct 18 07:54:35 2006 @@ -44,13 +44,19 @@ typedef enum _GETDCDWORD { GdiGetRelAbs = 1, - GdiGetArcDirection = 4, - GdiGetFontLanguageInfo = 6, - GdiGetIsMemDc = 7, + GdiGetBreakExtra, + GdiGerCharBreak, + GdiGetArcDirection, + GdiGetEMFRestorDc, + GdiGetFontLanguageInfo, + GdiGetIsMemDc, } GETDCDWORD, *PGETDCDWORD; typedef enum _GETSETDCDWORD { + GdiGetSetRelAbs = 4, + GdiGetSetMapperFlagsInternal = 7, + GdiGetSetMapMode = 8, GdiGetSetArcDirection = 9, } GETSETDCDWORD, *PGETSETDCDWORD;

18 years, 2 months

[gedmurphy] 24558: fix a couple of warnings msvc highlighted

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Oct 18 03:11:02 2006 New Revision: 24558 URL: http://svn.reactos.org/svn/reactos?rev=24558&view=rev Log: fix a couple of warnings msvc highlighted Modified: trunk/reactos/base/applications/devmgmt/about.c trunk/reactos/base/applications/devmgmt/enumdevices.c trunk/reactos/base/applications/devmgmt/mainwnd.c trunk/reactos/base/applications/devmgmt/misc.c Modified: trunk/reactos/base/applications/devmgmt/about.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/about.c (original) +++ trunk/reactos/base/applications/devmgmt/about.c Wed Oct 18 03:11:02 2006 @@ -20,12 +20,12 @@ { case WM_INITDIALOG: - hIcon = LoadImage(hInstance, - MAKEINTRESOURCE(IDI_MAIN_ICON), - IMAGE_ICON, - 16, - 16, - 0); + hIcon = (HICON)LoadImage(hInstance, + MAKEINTRESOURCE(IDI_MAIN_ICON), + IMAGE_ICON, + 16, + 16, + 0); SendMessage(hDlg, WM_SETICON, Modified: trunk/reactos/base/applications/devmgmt/enumdevices.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/enumdevices.c (original) +++ trunk/reactos/base/applications/devmgmt/enumdevices.c Wed Oct 18 03:11:02 2006 @@ -235,7 +235,7 @@ { SP_DEVINFO_DATA DeviceInfoData; CONFIGRET cr; - LONG Status, ProblemNumber; + ULONG Status, ProblemNumber; DWORD DevIdSize; *DeviceName = _T('\0'); Modified: trunk/reactos/base/applications/devmgmt/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/mainwnd.c (original) +++ trunk/reactos/base/applications/devmgmt/mainwnd.c Wed Oct 18 03:11:02 2006 @@ -638,9 +638,9 @@ PMAIN_WND_INFO Info; HWND hMainWnd = NULL; - Info = HeapAlloc(ProcessHeap, - HEAP_ZERO_MEMORY, - sizeof(MAIN_WND_INFO)); + Info = (PMAIN_WND_INFO)HeapAlloc(ProcessHeap, + HEAP_ZERO_MEMORY, + sizeof(MAIN_WND_INFO)); if (Info != NULL) { Modified: trunk/reactos/base/applications/devmgmt/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/misc.c (original) +++ trunk/reactos/base/applications/devmgmt/misc.c Wed Oct 18 03:11:02 2006 @@ -28,7 +28,7 @@ /* Find the string table block */ if ((hrSrc = FindResourceW(hInst, lpName, (LPWSTR)RT_STRING)) && (hRes = LoadResource(hInst, hrSrc)) && - (lpStr = LockResource(hRes))) + (lpStr = (LPWSTR)LockResource(hRes))) { UINT x; @@ -212,12 +212,12 @@ /* Add all icons to the image list */ for (i = StartResource; i <= EndResource; i++) { - hBitmap = LoadImage(hInstance, - MAKEINTRESOURCE(i), - IMAGE_BITMAP, - Width, - Height, - LR_LOADTRANSPARENT); + hBitmap = (HBITMAP)LoadImage(hInstance, + MAKEINTRESOURCE(i), + IMAGE_BITMAP, + Width, + Height, + LR_LOADTRANSPARENT); if (hBitmap == NULL) return NULL; @@ -248,13 +248,13 @@ 0, NULL ); - MessageBox(NULL, lpMsgBuf, _T("Error!"), MB_OK | MB_ICONERROR); + MessageBox(NULL, (LPTSTR)lpMsgBuf, _T("Error!"), MB_OK | MB_ICONERROR); LocalFree(lpMsgBuf); } -VOID DisplayString(PTCHAR Msg) +VOID DisplayString(LPTSTR Msg) { MessageBox(NULL, Msg, _T("Note!"), MB_ICONEXCLAMATION|MB_OK); }

18 years, 2 months

[gedmurphy] 24557: - enumerate devices in a separate thread so it doesn't stall opening of the main window - check for problems with devices, e.g. disabled devices (currently missing code to display overlay icons) - enable / disable the properties command dependant on what item is selected - fix a few potential bugs

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Oct 17 19:56:41 2006 New Revision: 24557 URL: http://svn.reactos.org/svn/reactos?rev=24557&view=rev Log: - enumerate devices in a separate thread so it doesn't stall opening of the main window - check for problems with devices, e.g. disabled devices (currently missing code to display overlay icons) - enable / disable the properties command dependant on what item is selected - fix a few potential bugs Modified: trunk/reactos/base/applications/devmgmt/En.rc trunk/reactos/base/applications/devmgmt/devmgmt.c trunk/reactos/base/applications/devmgmt/enumdevices.c trunk/reactos/base/applications/devmgmt/mainwnd.c trunk/reactos/base/applications/devmgmt/misc.c trunk/reactos/base/applications/devmgmt/precomp.h Modified: trunk/reactos/base/applications/devmgmt/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/En.rc (original) +++ trunk/reactos/base/applications/devmgmt/En.rc Tue Oct 17 19:56:41 2006 @@ -8,7 +8,7 @@ BEGIN MENUITEM "Print", IDC_PRINT, GRAYED MENUITEM SEPARATOR - MENUITEM "Properties", IDC_PROP + MENUITEM "Properties", IDC_PROP, GRAYED MENUITEM SEPARATOR MENUITEM "Help", IDC_PROGHELP, GRAYED END @@ -30,7 +30,7 @@ BEGIN POPUP "popup" BEGIN - MENUITEM "Properties", IDC_PROP + MENUITEM "Properties", IDC_PROP, GRAYED MENUITEM SEPARATOR MENUITEM "Help", IDC_PROGHELP END Modified: trunk/reactos/base/applications/devmgmt/devmgmt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/devmgmt.c (original) +++ trunk/reactos/base/applications/devmgmt/devmgmt.c Tue Oct 17 19:56:41 2006 @@ -38,9 +38,6 @@ return 1; } -// FreeConsole(); -// AllocConsole(); - if (InitMainWindowImpl()) { hMainWnd = CreateMainWindow(lpAppName, Modified: trunk/reactos/base/applications/devmgmt/enumdevices.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/enumdevices.c (original) +++ trunk/reactos/base/applications/devmgmt/enumdevices.c Tue Oct 17 19:56:41 2006 @@ -12,21 +12,22 @@ static SP_CLASSIMAGELIST_DATA ImageListData; static HDEVINFO hDevInfo; + VOID -FreeDeviceStrings(HWND hTV) +FreeDeviceStrings(HWND hTreeView) { HTREEITEM hItem; - hItem = TreeView_GetRoot(hTV); + hItem = TreeView_GetRoot(hTreeView); if (hItem) { - hItem = TreeView_GetChild(hTV, + hItem = TreeView_GetChild(hTreeView, hItem); /* loop the parent items */ while (hItem) { - hItem = TreeView_GetChild(hTV, + hItem = TreeView_GetChild(hTreeView, hItem); if (hItem == NULL) break; @@ -43,7 +44,7 @@ //tvItem.pszText = Buf; //tvItem.cchTextMax = 99; - (void)TreeView_GetItem(hTV, &tvItem); + (void)TreeView_GetItem(hTreeView, &tvItem); //MessageBox(NULL, Buf, NULL, 0); @@ -53,7 +54,7 @@ hOldItem = hItem; - hItem = TreeView_GetNextSibling(hTV, + hItem = TreeView_GetNextSibling(hTreeView, hItem); if (hItem == NULL) { @@ -62,9 +63,9 @@ } } - hItem = TreeView_GetParent(hTV, + hItem = TreeView_GetParent(hTreeView, hItem); - hItem = TreeView_GetNextSibling(hTV, + hItem = TreeView_GetNextSibling(hTreeView, hItem); } } @@ -72,7 +73,7 @@ VOID -OpenPropSheet(HWND hTV, +OpenPropSheet(HWND hTreeView, HTREEITEM hItem) { TV_ITEM tvItem; @@ -80,10 +81,10 @@ tvItem.hItem = hItem; tvItem.mask = TVIF_PARAM; - if (TreeView_GetItem(hTV, &tvItem) && + if (TreeView_GetItem(hTreeView, &tvItem) && (LPTSTR)tvItem.lParam != NULL) { - DevicePropertiesExW(hTV, + DevicePropertiesExW(hTreeView, NULL, (LPTSTR)tvItem.lParam, 0, @@ -94,11 +95,12 @@ static HTREEITEM -InsertIntoTreeView(HWND hTV, +InsertIntoTreeView(HWND hTreeView, HTREEITEM hRoot, LPTSTR lpLabel, LPTSTR DeviceID, - INT DevImage) + INT DevImage, + LONG DevProb) { TV_ITEM tvi; TV_INSERTSTRUCT tvins; @@ -113,10 +115,21 @@ tvi.iImage = DevImage; tvi.iSelectedImage = DevImage; + if (DevProb != 0) + { + tvi.stateMask = TVIS_OVERLAYMASK; + + if (DevProb == CM_PROB_DISABLED) + { + /* FIXME: set the overlay icon */ + } + + } + tvins.item = tvi; tvins.hParent = hRoot; - return TreeView_InsertItem(hTV, &tvins); + return TreeView_InsertItem(hTreeView, &tvins); } @@ -214,13 +227,15 @@ } -static INT +static LONG EnumDevices(INT index, LPTSTR DeviceClassName, LPTSTR DeviceName, LPTSTR *DeviceID) { SP_DEVINFO_DATA DeviceInfoData; + CONFIGRET cr; + LONG Status, ProblemNumber; DWORD DevIdSize; *DeviceName = _T('\0'); @@ -276,17 +291,23 @@ NULL)) { /* if the friendly name fails, try the description instead */ - if (!SetupDiGetDeviceRegistryProperty(hDevInfo, - &DeviceInfoData, - SPDRP_DEVICEDESC, - 0, - (BYTE*)DeviceName, - MAX_DEV_LEN, - NULL)) - { - /* if the description fails, just give up! */ - return -2; - } + SetupDiGetDeviceRegistryProperty(hDevInfo, + &DeviceInfoData, + SPDRP_DEVICEDESC, + 0, + (BYTE*)DeviceName, + MAX_DEV_LEN, + NULL); + } + + cr = CM_Get_DevNode_Status_Ex(&Status, + &ProblemNumber, + DeviceInfoData.DevInst, + 0, + NULL); + if (cr == CR_SUCCESS && (Status & DN_HAS_PROBLEM)) + { + return ProblemNumber; } return 0; @@ -294,7 +315,7 @@ VOID -ListDevicesByType(PMAIN_WND_INFO Info, +ListDevicesByType(HWND hTreeView, HTREEITEM hRoot) { HTREEITEM hDevItem; @@ -317,23 +338,26 @@ if ((ClassRet != -1) && (DevExist)) { TCHAR DeviceName[MAX_DEV_LEN]; - INT Ret, DevIndex = 0; + INT DevIndex = 0; + LONG Ret; if (DevDesc[0] != _T('\0')) { - hDevItem = InsertIntoTreeView(Info->hTreeView, + hDevItem = InsertIntoTreeView(hTreeView, hRoot, DevDesc, NULL, - DevImage); + DevImage, + 0); } else { - hDevItem = InsertIntoTreeView(Info->hTreeView, + hDevItem = InsertIntoTreeView(hTreeView, hRoot, DevName, NULL, - DevImage); + DevImage, + 0); } do @@ -342,13 +366,14 @@ DevName, DeviceName, &DeviceID); - if (Ret == 0) + if (Ret >= 0) { - InsertIntoTreeView(Info->hTreeView, + InsertIntoTreeView(hTreeView, hDevItem, DeviceName, DeviceID, - DevImage); + DevImage, + Ret); } DevIndex++; @@ -363,15 +388,15 @@ } /* don't insert classes with no devices */ - if (!TreeView_GetChild(Info->hTreeView, + if (!TreeView_GetChild(hTreeView, hDevItem)) { - (void)TreeView_DeleteItem(Info->hTreeView, + (void)TreeView_DeleteItem(hTreeView, hDevItem); } else { - (void)TreeView_SortChildren(Info->hTreeView, + (void)TreeView_SortChildren(hTreeView, hDevItem, 0); } @@ -381,18 +406,18 @@ } while (ClassRet != -1); - (void)TreeView_Expand(Info->hTreeView, + (void)TreeView_Expand(hTreeView, hRoot, TVE_EXPAND); - (void)TreeView_SortChildren(Info->hTreeView, + (void)TreeView_SortChildren(hTreeView, hRoot, 0); } HTREEITEM -InitTreeView(PMAIN_WND_INFO Info) +InitTreeView(HWND hTreeView) { HTREEITEM hRoot; HBITMAP hComp; @@ -400,7 +425,7 @@ DWORD dwSize = MAX_PATH; INT RootImage; - (void)TreeView_DeleteAllItems(Info->hTreeView); + (void)TreeView_DeleteAllItems(hTreeView); /* get the device image List */ ImageListData.cbSize = sizeof(ImageListData); @@ -415,7 +440,7 @@ DeleteObject(hComp); - (void)TreeView_SetImageList(Info->hTreeView, + (void)TreeView_SetImageList(hTreeView, ImageListData.ImageList, TVSIL_NORMAL); @@ -428,11 +453,12 @@ RootImage = ImageList_GetImageCount(ImageListData.ImageList) - 1; /* insert the root item into the tree */ - hRoot = InsertIntoTreeView(Info->hTreeView, + hRoot = InsertIntoTreeView(hTreeView, NULL, ComputerName, NULL, - RootImage); + RootImage, + 0); return hRoot; } Modified: trunk/reactos/base/applications/devmgmt/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/mainwnd.c (original) +++ trunk/reactos/base/applications/devmgmt/mainwnd.c Tue Oct 17 19:56:41 2006 @@ -15,7 +15,7 @@ /* Toolbar buttons */ TBBUTTON Buttons [] = { /* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ - {TBICON_PROP, IDC_PROP, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* properties */ + {TBICON_PROP, IDC_PROP, TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0}, /* properties */ {TBICON_REFRESH, IDC_REFRESH, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* refresh */ /* Note: First item for a seperator is its width in pixels */ @@ -198,12 +198,30 @@ } - -static VOID +static DWORD WINAPI +DeviceEnumThread(LPVOID lpParameter) +{ + HTREEITEM hRoot; + HWND *hTreeView; + + hTreeView = (HWND *)lpParameter; + + hRoot = InitTreeView(*hTreeView); + if (hRoot) + { + ListDevicesByType(*hTreeView, hRoot); + return 0; + } + + return -1; +} + + +static BOOL InitMainWnd(PMAIN_WND_INFO Info) { + HANDLE DevEnumThread; HMENU hMenu; - HTREEITEM hRoot; if (!CreateToolbar(Info)) DisplayString(_T("error creating toolbar")); @@ -211,7 +229,7 @@ if (!CreateTreeView(Info)) { DisplayString(_T("error creating list view")); - return; + return FALSE; } if (!CreateStatusBar(Info)) @@ -229,10 +247,21 @@ 0); SetMenuDefaultItem(Info->hShortcutMenu, IDC_PROP, FALSE); - /* emum all devices */ - hRoot = InitTreeView(Info); - if (hRoot) - ListDevicesByType(Info, hRoot); + /* create seperate thread to emum devices */ + DevEnumThread = CreateThread(NULL, + 0, + DeviceEnumThread, + &Info->hTreeView, + 0, + NULL); + if (!DevEnumThread) + { + DisplayString(_T("Failed to enumerate devices")); + return FALSE; + } + + CloseHandle(DevEnumThread); + return TRUE; } @@ -273,11 +302,38 @@ OnNotify(PMAIN_WND_INFO Info, LPARAM lParam) { - LPNMHDR pnmhdr = (LPNMHDR)lParam; switch (pnmhdr->code) { + case TVN_SELCHANGED: + { + LPNM_TREEVIEW pnmtv = (LPNM_TREEVIEW)lParam; + + if (!TreeView_GetChild(Info->hTreeView, + pnmtv->itemNew.hItem)) + { + SendMessage(Info->hTool, + TB_SETSTATE, + IDC_PROP, + (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); + + EnableMenuItem(GetMenu(Info->hMainWnd), IDC_PROP, MF_ENABLED); + EnableMenuItem(Info->hShortcutMenu, IDC_PROP, MF_ENABLED); + } + else + { + SendMessage(Info->hTool, + TB_SETSTATE, + IDC_PROP, + (LPARAM)MAKELONG(TBSTATE_INDETERMINATE, 0)); + + EnableMenuItem(GetMenu(Info->hMainWnd), IDC_PROP, MF_GRAYED); + EnableMenuItem(Info->hShortcutMenu, IDC_PROP, MF_GRAYED); + } + } + break; + case NM_DBLCLK: { HTREEITEM hSelected = TreeView_GetSelection(Info->hTreeView); @@ -299,7 +355,7 @@ ScreenToClient(Info->hTreeView, &HitTest.pt)) { if (TreeView_HitTest(Info->hTreeView, &HitTest)) - (void)TreeView_SelectItem(Info->hTreeView, HitTest.hItem); + TreeView_SelectItem(Info->hTreeView, HitTest.hItem); } } break; @@ -329,7 +385,6 @@ case IDC_EXIT: lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_EXIT); break; - } } break; @@ -360,9 +415,17 @@ FreeDeviceStrings(Info->hTreeView); - hRoot = InitTreeView(Info); + hRoot = InitTreeView(Info->hTreeView); if (hRoot) - ListDevicesByType(Info, hRoot); + ListDevicesByType(Info->hTreeView, hRoot); + + SendMessage(Info->hTool, + TB_SETSTATE, + IDC_PROP, + (LPARAM)MAKELONG(TBSTATE_INDETERMINATE, 0)); + + EnableMenuItem(GetMenu(Info->hMainWnd), IDC_PROP, MF_GRAYED); + EnableMenuItem(Info->hShortcutMenu, IDC_PROP, MF_GRAYED); } break; @@ -458,7 +521,8 @@ GWLP_USERDATA, (LONG_PTR)Info); - InitMainWnd(Info); + if (!InitMainWnd(Info)) + SendMessage(hwnd, WM_CLOSE, 0, 0); /* Show the window */ ShowWindow(hwnd, @@ -639,3 +703,4 @@ hInstance); } + Modified: trunk/reactos/base/applications/devmgmt/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/misc.c (original) +++ trunk/reactos/base/applications/devmgmt/misc.c Tue Oct 17 19:56:41 2006 @@ -258,21 +258,3 @@ { MessageBox(NULL, Msg, _T("Note!"), MB_ICONEXCLAMATION|MB_OK); } - - -VOID TimerInfo(LPTSTR text) -{ - static HANDLE hOut = NULL; - DWORD Count; - TCHAR buf[256]; - static DWORD start = 0; - - if (!start) start = GetTickCount(); - - if (!hOut) hOut = GetStdHandle(STD_ERROR_HANDLE); - - if (text) _sntprintf(buf, 256, _T("%s\ttime : %d\n"), text, GetTickCount() - start); - else _sntprintf(buf, 256, _T("time : %d\n"), GetTickCount() - start); - - WriteConsole(hOut, buf, lstrlen(buf)+1, &Count, NULL); -} Modified: trunk/reactos/base/applications/devmgmt/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/… ============================================================================== --- trunk/reactos/base/applications/devmgmt/precomp.h (original) +++ trunk/reactos/base/applications/devmgmt/precomp.h Tue Oct 17 19:56:41 2006 @@ -74,10 +74,10 @@ IN BOOL bShowDevMgr); #endif -VOID FreeDeviceStrings(HWND hTV); -VOID OpenPropSheet(HWND hTV, HTREEITEM hItem); -HTREEITEM InitTreeView(PMAIN_WND_INFO Info); -VOID ListDevicesByType(PMAIN_WND_INFO Info, HTREEITEM hRoot); +VOID FreeDeviceStrings(HWND hTreeView); +VOID OpenPropSheet(HWND hTreeView, HTREEITEM hItem); +HTREEITEM InitTreeView(HWND hTreeView); +VOID ListDevicesByType(HWND hTreeView, HTREEITEM hRoot); /* misc.c */

18 years, 2 months

[greatlrd] 24556: adding windows 28592 (iso-2859-2) latin2 to ansi to utf -8 converter in roswebparser

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Oct 17 19:16:06 2006 New Revision: 24556 URL: http://svn.reactos.org/svn/reactos?rev=24556&view=rev Log: adding windows 28592 (iso-2859-2) latin2 to ansi to utf -8 converter in roswebparser Added: trunk/rosapps/devutils/roswebparser/Windows28592.h (with props) Modified: trunk/rosapps/devutils/roswebparser/utf8.c Added: trunk/rosapps/devutils/roswebparser/Windows28592.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/roswebparser/Wind… ============================================================================== --- trunk/rosapps/devutils/roswebparser/Windows28592.h (added) +++ trunk/rosapps/devutils/roswebparser/Windows28592.h Tue Oct 17 19:16:06 2006 @@ -1,0 +1,33 @@ +/* + * Windows OEM 457 code page table. need by english rc files, area 0x80 to 0x9f should be blank + */ + +unsigned short table_Windows28592[256] = +{ + 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, + 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x000F, 0x0010, 0x0011, 0x0012, 0x0013, + 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B, 0x001C, 0x001D, + 0x001E, 0x001F, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, + 0x0028, 0x0029, 0x002A, 0x002B, 0x002C, 0x002D, 0x002E, 0x002F, 0x0030, 0x0031, + 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003A, 0x003B, + 0x003C, 0x003D, 0x003E, 0x003F, 0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, + 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, + 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, + 0x005A, 0x005B, 0x005C, 0x005D, 0x005E, 0x005F, 0x0060, 0x0061, 0x0062, 0x0063, + 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, + 0x006E, 0x006F, 0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, + 0x0078, 0x0079, 0x007A, 0x007B, 0x007C, 0x007D, 0x007E, 0x007F, 0x0080, 0x0081, + 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088, 0x0089, 0x008A, 0x008B, + 0x008C, 0x008D, 0x008E, 0x008F, 0x0090, 0x0091, 0x0092, 0x0093, 0x0094, 0x0095, + 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x009C, 0x009D, 0x009E, 0x009F, + 0x00A0, 0x0104, 0x02D8, 0x0141, 0x00A4, 0x013D, 0x015A, 0x00A7, 0x00A8, 0x0160, + 0x015E, 0x0164, 0x0179, 0x00AD, 0x017D, 0x017B, 0x00B0, 0x0105, 0x02DB, 0x0142, + 0x00B4, 0x013E, 0x015B, 0x02C7, 0x00B8, 0x0161, 0x015F, 0x0165, 0x017A, 0x02DD, + 0x017E, 0x017C, 0x0154, 0x00C1, 0x00C2, 0x0102, 0x00C4, 0x0139, 0x0106, 0x00C7, + 0x010C, 0x00C9, 0x0118, 0x00CB, 0x011A, 0x00CD, 0x00CE, 0x010E, 0x0110, 0x0143, + 0x0147, 0x00D3, 0x00D4, 0x0150, 0x00D6, 0x00D7, 0x0158, 0x016E, 0x00DA, 0x0170, + 0x00DC, 0x00DD, 0x0162, 0x00DF, 0x0155, 0x00E1, 0x00E2, 0x0103, 0x00E4, 0x013A, + 0x0107, 0x00E7, 0x010D, 0x00E9, 0x0119, 0x00EB, 0x011B, 0x00ED, 0x00EE, 0x010F, + 0x0111, 0x0144, 0x0148, 0x00F3, 0x00F4, 0x0151, 0x00F6, 0x00F7, 0x0159, 0x016F, + 0x00FA, 0x0171, 0x00FC, 0x00FD, 0x0163, 0x02D9}; + Propchange: trunk/rosapps/devutils/roswebparser/Windows28592.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/devutils/roswebparser/utf8.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/roswebparser/utf8… ============================================================================== --- trunk/rosapps/devutils/roswebparser/utf8.c (original) +++ trunk/rosapps/devutils/roswebparser/utf8.c Tue Oct 17 19:16:06 2006 @@ -7,9 +7,10 @@ * All table lookup the ansi char to utf-16 then we calc the utf-8 format. */ -#include "oem437.h" -#include "oem850.h" -#include "Windows28591.h" +#include "oem437.h" /* windows oem 437 */ +#include "oem850.h" /* windows oem 850 */ +#include "Windows28591.h" /* windows 28591 aka ISO-2859-1 (Latin 1) */ +#include "Windows28592.h" /* windows 28592 aka ISO-2859-2 (Latin 2) */ int ansiCodePage(int codepage, unsigned char *inBuffer, unsigned char *outBuffer, int Lenght) { @@ -33,6 +34,10 @@ if (codepage == 28591) { ch = (int) table_Windows28591[ ((unsigned char)inBuffer[t])]; + } + if (codepage == 28592) + { + ch = (int) table_Windows28592[ ((unsigned char)inBuffer[t])]; }

18 years, 2 months

[fireball] 24555: Having two cats with the same name in one repository is too much

by fireball＠svn.reactos.org

Author: fireball Date: Tue Oct 17 19:02:51 2006 New Revision: 24555 URL: http://svn.reactos.org/svn/reactos?rev=24555&view=rev Log: Having two cats with the same name in one repository is too much Modified: trunk/rosapps/sysutils/tcat/cat.rbuild Modified: trunk/rosapps/sysutils/tcat/cat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/tcat/cat.rbuild?r… ============================================================================== --- trunk/rosapps/sysutils/tcat/cat.rbuild (original) +++ trunk/rosapps/sysutils/tcat/cat.rbuild Tue Oct 17 19:02:51 2006 @@ -1,4 +1,4 @@ -<module name="cat" type="win32cui" installbase="system32" installname="cat.exe"> +<module name="tcat" type="win32cui" installbase="system32" installname="tcat.exe"> <define name="__USE_W32API" /> <library>ntdll</library> <library>kernel32</library>

18 years, 2 months

[jimtabor] 24554: Add another member to GdiUserData structure.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Oct 17 09:52:35 2006 New Revision: 24554 URL: http://svn.reactos.org/svn/reactos?rev=24554&view=rev Log: Add another member to GdiUserData structure. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Tue Oct 17 09:52:35 2006 @@ -95,6 +95,7 @@ INT BackgroundMode; COLORREF BackgroundColor; COLORREF TextColor; + DWORD CodePage; HCOLORSPACE ColorSpace; INT TextAlign; /* Text alignment from SetTextAlign() */ INT CharExtra; /* Spacing from SetTextCharacterExtra() */

18 years, 2 months

← Newer
1
...
10
11
12
13
14
15
16
...
36
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 October 2006