Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 26441: implement NtGdiGetSystemPaletteEntries (patch by w3seek)
by cwittich＠svn.reactos.org 20 Apr '07

20 Apr '07

Author: cwittich Date: Sat Apr 21 02:36:57 2007 New Revision: 26441 URL: http://svn.reactos.org/svn/reactos?rev=26441&view=rev Log: implement NtGdiGetSystemPaletteEntries (patch by w3seek) Modified: trunk/reactos/subsystems/win32/win32k/objects/color.c Modified: trunk/reactos/subsystems/win32/win32k/objects/color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/color.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/color.c Sat Apr 21 02:36:57 2007 @@ -309,35 +309,77 @@ UINT Entries, LPPALETTEENTRY pe) { - //UINT i; - //PDC dc; -/* - if (!(dc = AccessUserObject(hdc))) return 0; - - if (!pe) - { - Entries = dc->GDIInfo->ulNumPalReg; - goto done; - } - - if (StartIndex >= dc->GDIInfo->ulNumPalReg) - { - Entries = 0; - goto done; - } - - if (StartIndex + Entries >= dc->GDIInfo->ulNumPalReg) Entries = dc->GDIInfo->ulNumPalReg - StartIndex; - - for (i = 0; i < Entries; i++) - { - *(COLORREF*)(entries + i) = COLOR_GetSystemPaletteEntry(StartIndex + i); - } - - done: -// GDI_ReleaseObj(hdc); - return count; */ - // FIXME UNIMPLEMENTED; - return 0; + PPALGDI palGDI = NULL; + PDC dc = NULL; + UINT EntriesSize = 0; + UINT Ret = 0; + + if (Entries == 0) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return 0; + } + + _SEH_TRY + { + if (pe != NULL) + { + EntriesSize = Entries * sizeof(pe[0]); + if (Entries != EntriesSize / sizeof(pe[0])) + { + /* Integer overflow! */ + SetLastWin32Error(ERROR_INVALID_PARAMETER); + _SEH_LEAVE; + } + + ProbeForWrite(pe, + EntriesSize, + sizeof(UINT)); + } + + if (!(dc = DC_LockDc(hDC))) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + _SEH_LEAVE; + } + + palGDI = PALETTE_LockPalette(dc->w.hPalette); + if (palGDI != NULL) + { + if (pe != NULL) + { + UINT CopyEntries; + + if (StartIndex + Entries < palGDI->NumColors) + CopyEntries = StartIndex + Entries; + else + CopyEntries = palGDI->NumColors - StartIndex; + + memcpy(pe, + palGDI->IndexedColors + StartIndex, + CopyEntries * sizeof(pe[0])); + + Ret = CopyEntries; + } + else + { + Ret = dc->GDIInfo->ulNumPalReg; + } + } + } + _SEH_HANDLE + { + SetLastNtError(_SEH_GetExceptionCode()); + } + _SEH_END; + + if (palGDI != NULL) + PALETTE_UnlockPalette(palGDI); + + if (dc != NULL) + DC_UnlockDc(dc); + + return Ret; } UINT STDCALL NtGdiGetSystemPaletteUse(HDC hDC)

1 0

[jimtabor] 26440: Forgot stubs.c update.
by jimtabor＠svn.reactos.org 20 Apr '07

20 Apr '07

Author: jimtabor Date: Sat Apr 21 01:30:49 2007 New Revision: 26440 URL: http://svn.reactos.org/svn/reactos?rev=26440&view=rev Log: Forgot stubs.c update. Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sat Apr 21 01:30:49 2007 @@ -1690,18 +1690,6 @@ BOOL STDCALL GdiDrawStream(HDC dc, ULONG l, VOID *v) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -HGDIOBJ -STDCALL -GdiFixUpHandle(HGDIOBJ hobj) { UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED);

1 0

[jimtabor] 26439: Implement GdiFixUpHandle, fix handle masking and entry indexing.
by jimtabor＠svn.reactos.org 20 Apr '07

20 Apr '07

Author: jimtabor Date: Sat Apr 21 01:21:15 2007 New Revision: 26439 URL: http://svn.reactos.org/svn/reactos?rev=26439&view=rev Log: Implement GdiFixUpHandle, fix handle masking and entry indexing. Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h trunk/reactos/dll/win32/gdi32/misc/misc.c trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gd… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/gdi32p.h (original) +++ trunk/reactos/dll/win32/gdi32/include/gdi32p.h Sat Apr 21 01:21:15 2007 @@ -114,6 +114,10 @@ PLDC GdiGetLDC(HDC hDC); +HGDIOBJ +STDCALL +GdiFixUpHandle(HGDIOBJ hGO); + BOOL WINAPI CalculateColorTableSize( Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/misc.… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/misc.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/misc.c Sat Apr 21 01:21:15 2007 @@ -32,6 +32,20 @@ HANDLE CurrentProcessId = NULL; DWORD GDI_BatchLimit = 1; + +/* + * @implemented + */ +HGDIOBJ +STDCALL +GdiFixUpHandle(HGDIOBJ hGdiObj) +{ + if (((ULONG_PTR)(hGdiObj)) & GDI_HANDLE_UPPER_MASK ) return hGdiObj; + PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_TO_ENTRY(hGdiObj); + return hGdiObj = (HGDIOBJ)(((LONG_PTR)(hGdiObj)) | + (Entry->Type << 16)); // Rebuild handle for Object +} + /* * @implemented */ @@ -44,7 +58,7 @@ BOOL GdiIsHandleValid(HGDIOBJ hGdiObj) { - PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_GET_INDEX(hGdiObj); + PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_TO_ENTRY(hGdiObj); if(Entry->KernelData != NULL && (Entry->Type & GDI_HANDLE_TYPE_MASK) == (LONG)GDI_HANDLE_GET_TYPE(hGdiObj)) { HANDLE pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1); @@ -58,7 +72,7 @@ BOOL GdiGetHandleUserData(HGDIOBJ hGdiObj, PVOID *UserData) { - PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_GET_INDEX(hGdiObj); + PGDI_TABLE_ENTRY Entry = GdiHandleTable + GDI_HANDLE_TO_ENTRY(hGdiObj); if(Entry->KernelData != NULL && (Entry->Type & GDI_HANDLE_TYPE_MASK) == (LONG)GDI_HANDLE_GET_TYPE(hGdiObj)) { HANDLE pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1); @@ -103,3 +117,5 @@ { return GDI_BatchLimit; } + + 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 Sat Apr 21 01:21:15 2007 @@ -25,6 +25,7 @@ #define GDI_HANDLE_TYPE_MASK 0x007f0000 #define GDI_HANDLE_STOCK_MASK 0x00800000 #define GDI_HANDLE_REUSE_MASK 0xff000000 +#define GDI_HANDLE_UPPER_MASK (GDI_HANDLE_TYPE_MASK|GDI_HANDLE_STOCK_MASK|GDI_HANDLE_REUSE_MASK) #define GDI_HANDLE_REUSECNT_SHIFT 24 /*! \defgroup GDI object types @@ -106,6 +107,11 @@ PVOID UserData; /* Points to the user mode structure, usually NULL though */ } GDI_TABLE_ENTRY, *PGDI_TABLE_ENTRY; + +#define GDI_HANDLE_TO_ENTRY(h) \ + ((((ULONG_PTR)(h)) & GDI_HANDLE_INDEX_MASK) * sizeof(GDI_TABLE_ENTRY)) + + typedef struct _RGNATTR { ULONG AttrFlags;

1 0

[cwittich] 26438: fix compilation of ks and fix some issues with portcls (not all)
by cwittich＠svn.reactos.org 20 Apr '07

20 Apr '07

Author: cwittich Date: Fri Apr 20 20:45:18 2007 New Revision: 26438 URL: http://svn.reactos.org/svn/reactos?rev=26438&view=rev Log: fix compilation of ks and fix some issues with portcls (not all) Modified: trunk/reactos/drivers/ksfilter/ks/allocators.c trunk/reactos/drivers/ksfilter/ks/clocks.c trunk/reactos/drivers/ksfilter/ks/connectivity.c trunk/reactos/drivers/ksfilter/ks/events.c trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/ksfilter/ks/ks.rbuild trunk/reactos/drivers/ksfilter/ks/methods.c trunk/reactos/drivers/ksfilter/ks/misc.c trunk/reactos/drivers/ksfilter/ks/properties.c trunk/reactos/drivers/ksfilter/ks/topology.c trunk/reactos/drivers/ksfilter/ks/worker.c trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h trunk/reactos/include/ddk/ddrawi.h trunk/reactos/include/ddk/portcls.h trunk/reactos/include/ddk/punknown.h trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/drivers/ksfilter/ks/allocators.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/alloca… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/allocators.c (original) +++ trunk/reactos/drivers/ksfilter/ks/allocators.c Fri Apr 20 20:45:18 2007 @@ -2,6 +2,8 @@ Allocator Functions */ +#include <ntddk.h> +#include <debug.h> #include <ks.h> /* Modified: trunk/reactos/drivers/ksfilter/ks/clocks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/clocks… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/clocks.c (original) +++ trunk/reactos/drivers/ksfilter/ks/clocks.c Fri Apr 20 20:45:18 2007 @@ -2,6 +2,8 @@ Clock Functions */ +#include <ntddk.h> +#include <debug.h> #include <ks.h> /* Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/connec… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/connectivity.c (original) +++ trunk/reactos/drivers/ksfilter/ks/connectivity.c Fri Apr 20 20:45:18 2007 @@ -6,6 +6,8 @@ KsHandleSizedListQuery */ +#include <ntddk.h> +#include <debug.h> #include <ks.h> KSDDKAPI NTSTATUS NTAPI Modified: trunk/reactos/drivers/ksfilter/ks/events.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/events… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/events.c (original) +++ trunk/reactos/drivers/ksfilter/ks/events.c Fri Apr 20 20:45:18 2007 @@ -1,3 +1,5 @@ +#include <ntddk.h> +#include <debug.h> #include <ks.h> /* =============================================================== Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c Fri Apr 20 20:45:18 2007 @@ -3,6 +3,8 @@ IRP Helpers */ +#include <ntddk.h> +#include <debug.h> #include <ks.h> #define TAG(A, B, C, D) (IN ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) Modified: trunk/reactos/drivers/ksfilter/ks/ks.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ks.rbu… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ks.rbuild (original) +++ trunk/reactos/drivers/ksfilter/ks/ks.rbuild Fri Apr 20 20:45:18 2007 @@ -6,6 +6,7 @@ <library>ntoskrnl</library> <define name="__USE_W32API" /> <define name="BUILDING_KS" /> + <define name="_NTDDK_" /> <file>ks.rc</file> <file>allocators.c</file> <file>clocks.c</file> Modified: trunk/reactos/drivers/ksfilter/ks/methods.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/method… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/methods.c (original) +++ trunk/reactos/drivers/ksfilter/ks/methods.c Fri Apr 20 20:45:18 2007 @@ -2,6 +2,8 @@ Method Functions */ +#include <ntddk.h> +#include <debug.h> #include <ks.h> /* Modified: trunk/reactos/drivers/ksfilter/ks/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/misc.c… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/misc.c (original) +++ trunk/reactos/drivers/ksfilter/ks/misc.c Fri Apr 20 20:45:18 2007 @@ -1,3 +1,5 @@ +#include <ntddk.h> +#include <debug.h> #include <ks.h> /* =============================================================== Modified: trunk/reactos/drivers/ksfilter/ks/properties.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/proper… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/properties.c (original) +++ trunk/reactos/drivers/ksfilter/ks/properties.c Fri Apr 20 20:45:18 2007 @@ -1,3 +1,5 @@ +#include <ntddk.h> +#include <debug.h> #include <ks.h> /* =============================================================== Modified: trunk/reactos/drivers/ksfilter/ks/topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/topolo… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/topology.c (original) +++ trunk/reactos/drivers/ksfilter/ks/topology.c Fri Apr 20 20:45:18 2007 @@ -1,3 +1,5 @@ +#include <ntddk.h> +#include <debug.h> #include <ks.h> /* =============================================================== Modified: trunk/reactos/drivers/ksfilter/ks/worker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/worker… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/worker.c (original) +++ trunk/reactos/drivers/ksfilter/ks/worker.c Fri Apr 20 20:45:18 2007 @@ -2,6 +2,8 @@ Worker Management Functions */ +#include <ntddk.h> +#include <debug.h> #include <ks.h> /* Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c Fri Apr 20 20:45:18 2007 @@ -8,7 +8,7 @@ * HISTORY: * 27 Jan 07 Created */ -#include <portcls.h> + #include "private.h" /* Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild Fri Apr 20 20:45:18 2007 @@ -3,6 +3,7 @@ <linkerflag>-fno-rtti</linkerflag> <importlibrary definition="portcls.def" /> <define name="__USE_W32API" /> + <define name="_NTDDK_" /> <include base="portcls">../include</include> <library>ntoskrnl</library> <library>ks</library> Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h Fri Apr 20 20:45:18 2007 @@ -6,6 +6,9 @@ #ifndef PORTCLS_PRIVATE_H #define PORTCLS_PRIVATE_H + +#include <ntddk.h> +#include <debug.h> #include <portcls.h> Modified: trunk/reactos/include/ddk/ddrawi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddrawi.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/ddrawi.h (original) +++ trunk/reactos/include/ddk/ddrawi.h Fri Apr 20 20:45:18 2007 @@ -47,7 +47,7 @@ /* more DCICOMMAND escapes */ #ifndef DCICOMMAND -#define DCICOMMAND 3075 +#define DCICOMMAND 3075 #endif #define DDCREATEDRIVEROBJECT 10 @@ -55,7 +55,7 @@ #define DDNEWCALLBACKFNS 12 #define DDVERSIONINFO 13 - + #define DDUNSUPPORTEDMODE ((DWORD) -1) @@ -93,7 +93,7 @@ DEFINE_GUID(GUID_D3DParseUnknownCommandCallback, 0x2e04ffa0, 0x98e4, 0x11d1, 0x8c, 0xe1, 0x0, 0xa0, 0xc9, 0x6, 0x29, 0xa8); DEFINE_GUID(GUID_MotionCompCallbacks, 0xb1122b40, 0x5dA5, 0x11d1, 0x8f, 0xcF, 0x00, 0xc0, 0x4f, 0xc2, 0x9b, 0x4e); DEFINE_GUID(GUID_Miscellaneous2Callbacks, 0x406B2F00, 0x3E5A, 0x11D1, 0xB6, 0x40, 0x00, 0xAA, 0x00, 0xA1, 0xF9, 0x6A); -#endif +#endif #ifndef _WIN32 #undef E_NOTIMPL @@ -202,7 +202,7 @@ union { LPVMEMHEAP lpHeap; DWORD dwHeight; - }; + }; } VIDMEM; @@ -784,7 +784,7 @@ DDHAL_DDEXEBUFCALLBACKS HELDDExeBuf; DDHAL_DDVIDEOPORTCALLBACKS cbDDVideoPortCallbacks; DDHAL_DDVIDEOPORTCALLBACKS HALDDVideoPort; - DDHAL_DDCOLORCONTROLCALLBACKS cbDDColorControlCallbacks; + DDHAL_DDCOLORCONTROLCALLBACKS cbDDColorControlCallbacks; DDHAL_DDCOLORCONTROLCALLBACKS HALDDColorControl; DDHAL_DDMISCELLANEOUSCALLBACKS cbDDMiscellaneousCallbacks; DDHAL_DDMISCELLANEOUSCALLBACKS HALDDMiscellaneous; @@ -933,7 +933,7 @@ { LPDDRAWI_DIRECTDRAW_LCL lpDD; LPDDVIDEOPORTDESC lpDDVideoPortDesc; - HRESULT ddRVal; + HRESULT ddRVal; LPDDHALVPORTCB_CANCREATEVIDEOPORT CanCreateVideoPort; } DDHAL_CANCREATEVPORTDATA; @@ -948,25 +948,25 @@ typedef struct _DDHAL_GETVPORTBANDWIDTHDATA { - LPDDRAWI_DIRECTDRAW_LCL lpDD; - LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; - LPDDPIXELFORMAT lpddpfFormat; + LPDDRAWI_DIRECTDRAW_LCL lpDD; + LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; + LPDDPIXELFORMAT lpddpfFormat; DWORD dwWidth; DWORD dwHeight; - DWORD dwFlags; - LPDDVIDEOPORTBANDWIDTH lpBandwidth; - HRESULT ddRVal; + DWORD dwFlags; + LPDDVIDEOPORTBANDWIDTH lpBandwidth; + HRESULT ddRVal; LPDDHALVPORTCB_GETBANDWIDTH GetVideoPortBandwidth; } DDHAL_GETVPORTBANDWIDTHDATA; typedef struct _DDHAL_GETVPORTINPUTFORMATDATA { - LPDDRAWI_DIRECTDRAW_LCL lpDD; - LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; - DWORD dwFlags; + LPDDRAWI_DIRECTDRAW_LCL lpDD; + LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; + DWORD dwFlags; LPDDPIXELFORMAT lpddpfFormat; DWORD dwNumFormats; - HRESULT ddRVal; + HRESULT ddRVal; LPDDHALVPORTCB_GETINPUTFORMATS GetVideoPortInputFormats; } DDHAL_GETVPORTINPUTFORMATDATA; @@ -995,7 +995,7 @@ { LPDDRAWI_DIRECTDRAW_LCL lpDD; LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; - DWORD dwLine; + DWORD dwLine; HRESULT ddRVal; LPDDHALVPORTCB_GETLINE GetVideoPortLine; } DDHAL_GETVPORTLINEDATA; @@ -1003,7 +1003,7 @@ typedef struct _DDHAL_DESTROYVPORTDATA { LPDDRAWI_DIRECTDRAW_LCL lpDD; - LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; + LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; HRESULT ddRVal; LPDDHALVPORTCB_DESTROYVPORT DestroyVideoPort; } DDHAL_DESTROYVPORTDATA; @@ -1043,40 +1043,40 @@ typedef struct _DDHAL_GETVPORTSIGNALDATA { - LPDDRAWI_DIRECTDRAW_LCL lpDD; + LPDDRAWI_DIRECTDRAW_LCL lpDD; LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; - DWORD dwStatus; - HRESULT ddRVal; + DWORD dwStatus; + HRESULT ddRVal; LPDDHALVPORTCB_GETSIGNALSTATUS GetVideoSignalStatus; } DDHAL_GETVPORTSIGNALDATA; typedef struct _DDHAL_VPORTCOLORDATA { - LPDDRAWI_DIRECTDRAW_LCL lpDD; + LPDDRAWI_DIRECTDRAW_LCL lpDD; LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; - DWORD dwFlags; + DWORD dwFlags; LPDDCOLORCONTROL lpColorData; - HRESULT ddRVal; + HRESULT ddRVal; LPDDHALVPORTCB_COLORCONTROL ColorControl; } DDHAL_VPORTCOLORDATA; typedef struct _DDHAL_FLIPVPORTDATA { - LPDDRAWI_DIRECTDRAW_LCL lpDD; + LPDDRAWI_DIRECTDRAW_LCL lpDD; LPDDRAWI_DDVIDEOPORT_LCL lpVideoPort; - LPDDRAWI_DDRAWSURFACE_LCL lpSurfCurr; - LPDDRAWI_DDRAWSURFACE_LCL lpSurfTarg; - HRESULT ddRVal; - LPDDHALVPORTCB_FLIP FlipVideoPort; + LPDDRAWI_DDRAWSURFACE_LCL lpSurfCurr; + LPDDRAWI_DDRAWSURFACE_LCL lpSurfTarg; + HRESULT ddRVal; + LPDDHALVPORTCB_FLIP FlipVideoPort; } DDHAL_FLIPVPORTDATA; typedef struct _DDHAL_GETVPORTCONNECTDATA { - LPDDRAWI_DIRECTDRAW_LCL lpDD; + LPDDRAWI_DIRECTDRAW_LCL lpDD; DWORD dwPortId; LPDDVIDEOPORTCONNECT lpConnect; DWORD dwNumEntries; - HRESULT ddRVal; + HRESULT ddRVal; LPDDHALVPORTCB_GETVPORTCONNECT GetVideoPortConnectInfo; } DDHAL_GETVPORTCONNECTDATA; @@ -1121,10 +1121,10 @@ } DDHAL_DESTROYDDLOCALDATA; typedef struct _DDHAL_CREATESURFACEEXDATA { - DWORD dwFlags; - LPDDRAWI_DIRECTDRAW_LCL lpDDLcl; - LPDDRAWI_DDRAWSURFACE_LCL lpDDSLcl; - HRESULT ddRVal; + DWORD dwFlags; + LPDDRAWI_DIRECTDRAW_LCL lpDDLcl; + LPDDRAWI_DDRAWSURFACE_LCL lpDDSLcl; + HRESULT ddRVal; } DDHAL_CREATESURFACEEXDATA; typedef struct _DDHAL_GETHEAPALIGNMENTDATA @@ -1139,7 +1139,7 @@ typedef struct _DDMORESURFACECAPS { - DWORD dwSize; + DWORD dwSize; DDSCAPSEX ddsCapsMore; struct tagExtendedHeapRestrictions { @@ -1150,12 +1150,12 @@ typedef struct _DDSTEREOMODE { - DWORD dwSize; + DWORD dwSize; DWORD dwHeight; DWORD dwWidth; DWORD dwBpp; DWORD dwRefreshRate; - BOOL bSupported; + BOOL bSupported; } DDSTEREOMODE, * LPDDSTEREOMODE; @@ -1282,7 +1282,7 @@ #define DDRAWILCL_ATTEMPTEDD3DCONTEXT 0x00040000 #define DDRAWILCL_FPUPRESERVE 0x00080000 #define DDRAWILCL_DX8DRIVER 0x00100000 -#define DDRAWILCL_DIRECTDRAW8 0x00200000 +#define DDRAWILCL_DIRECTDRAW8 0x00200000 typedef struct _DDRAWI_DIRECTDRAW_GBL { @@ -1409,7 +1409,7 @@ LPACCESSRECTLIST lpRectList; DWORD dwBlockSizeY; LONG lSlicePitch; - }; + }; union { LPVMEMHEAP lpVidMemHeap; DWORD dwBlockSizeX; @@ -1426,7 +1426,7 @@ WORD wHeight; WORD wWidth; DWORD dwUsageCount; - ULONG_PTR dwReserved1; + ULONG_PTR dwReserved1; DDPIXELFORMAT ddpfSurface; } DDRAWI_DDRAWSURFACE_GBL; @@ -1567,7 +1567,7 @@ DDCOLORKEY ddckCKDestBlt; DDCOLORKEY ddckCKSrcBlt; ULONG_PTR hDC; - ULONG_PTR dwReserved1; + ULONG_PTR dwReserved1; DDCOLORKEY ddckCKSrcOverlay; DDCOLORKEY ddckCKDestOverlay; LPDDRAWI_DDRAWSURFACE_INT lpSurfaceOverlaying; @@ -1580,40 +1580,40 @@ LONG lOverlayY; } DDRAWI_DDRAWSURFACE_LCL; -#define DDRAWISURF_ATTACHED 0x00000001L +#define DDRAWISURF_ATTACHED 0x00000001L #define DDRAWISURF_IMPLICITCREATE 0x00000002L -#define DDRAWISURF_ISFREE 0x00000004L -#define DDRAWISURF_ATTACHED_FROM 0x00000008L -#define DDRAWISURF_IMPLICITROOT 0x00000010L -#define DDRAWISURF_PARTOFPRIMARYCHAIN 0x00000020L +#define DDRAWISURF_ISFREE 0x00000004L +#define DDRAWISURF_ATTACHED_FROM 0x00000008L +#define DDRAWISURF_IMPLICITROOT 0x00000010L +#define DDRAWISURF_PARTOFPRIMARYCHAIN 0x00000020L #define DDRAWISURF_DATAISALIASED 0x00000040L -#define DDRAWISURF_HASDC 0x00000080L -#define DDRAWISURF_HASCKEYDESTOVERLAY 0x00000100L +#define DDRAWISURF_HASDC 0x00000080L +#define DDRAWISURF_HASCKEYDESTOVERLAY 0x00000100L #define DDRAWISURF_HASCKEYDESTBLT 0x00000200L -#define DDRAWISURF_HASCKEYSRCOVERLAY 0x00000400L +#define DDRAWISURF_HASCKEYSRCOVERLAY 0x00000400L #define DDRAWISURF_HASCKEYSRCBLT 0x00000800L -#define DDRAWISURF_LOCKEXCLUDEDCURSOR 0x00001000L -#define DDRAWISURF_HASPIXELFORMAT 0x00002000L -#define DDRAWISURF_HASOVERLAYDATA 0x00004000L -#define DDRAWISURF_SETGAMMA 0x00008000L +#define DDRAWISURF_LOCKEXCLUDEDCURSOR 0x00001000L +#define DDRAWISURF_HASPIXELFORMAT 0x00002000L +#define DDRAWISURF_HASOVERLAYDATA 0x00004000L +#define DDRAWISURF_SETGAMMA 0x00008000L #define DDRAWISURF_SW_CKEYDESTOVERLAY 0x00010000L -#define DDRAWISURF_SW_CKEYDESTBLT 0x00020000L -#define DDRAWISURF_SW_CKEYSRCOVERLAY 0x00040000L +#define DDRAWISURF_SW_CKEYDESTBLT 0x00020000L +#define DDRAWISURF_SW_CKEYSRCOVERLAY 0x00040000L #define DDRAWISURF_SW_CKEYSRCBLT 0x00080000L #define DDRAWISURF_HW_CKEYDESTOVERLAY 0x00100000L #define DDRAWISURF_HW_CKEYDESTBLT 0x00200000L -#define DDRAWISURF_HW_CKEYSRCOVERLAY 0x00400000L +#define DDRAWISURF_HW_CKEYSRCOVERLAY 0x00400000L #define DDRAWISURF_HW_CKEYSRCBLT 0x00800000L #define DDRAWISURF_INMASTERSPRITELIST 0x01000000L -#define DDRAWISURF_HELCB 0x02000000L -#define DDRAWISURF_FRONTBUFFER 0x04000000L -#define DDRAWISURF_BACKBUFFER 0x08000000L -#define DDRAWISURF_INVALID 0x10000000L -#define DDRAWISURF_DCIBUSY 0x20000000L -#define DDRAWISURF_GETDCNULL 0x40000000L -#define DDRAWISURF_STEREOSURFACELEFT 0x20000000L +#define DDRAWISURF_HELCB 0x02000000L +#define DDRAWISURF_FRONTBUFFER 0x04000000L +#define DDRAWISURF_BACKBUFFER 0x08000000L +#define DDRAWISURF_INVALID 0x10000000L +#define DDRAWISURF_DCIBUSY 0x20000000L +#define DDRAWISURF_GETDCNULL 0x40000000L +#define DDRAWISURF_STEREOSURFACELEFT 0x20000000L #define DDRAWISURF_DRIVERMANAGED 0x40000000L -#define DDRAWISURF_DCILOCK 0x80000000L +#define DDRAWISURF_DCILOCK 0x80000000L /* palettes */ typedef struct _DDRAWI_DDRAWPALETTE_INT { @@ -1676,7 +1676,7 @@ #define D3DFORMAT_OP_SRGBWRITE 0x00100000L #define D3DFORMAT_OP_NOALPHABLEND 0x00200000L #define D3DFORMAT_OP_AUTOGENMIPMAP 0x00400000L -#define D3DFORMAT_OP_VERTEXTEXTURE 0x00800000L +#define D3DFORMAT_OP_VERTEXTEXTURE 0x00800000L #define D3DFORMAT_OP_NOTEXCOORDWRAPNORMIP 0x01000000L #define DELETED_OK 0 #define DELETED_LASTONE 1 @@ -1745,22 +1745,22 @@ typedef struct _DDMCCOMPBUFFERINFO { - DWORD dwSize; - DWORD dwNumCompBuffers; - DWORD dwWidthToCreate; - DWORD dwHeightToCreate; + DWORD dwSize; + DWORD dwNumCompBuffers; + DWORD dwWidthToCreate; + DWORD dwHeightToCreate; DWORD dwBytesToAllocate; - DDSCAPS2 ddCompCaps; - DDPIXELFORMAT ddPixelFormat; + DDSCAPS2 ddCompCaps; + DDPIXELFORMAT ddPixelFormat; } DDMCCOMPBUFFERINFO, *LPDDMCCOMPBUFFERINFO; typedef struct _DDMCBUFFERINFO { - DWORD dwSize; - LPDDRAWI_DDRAWSURFACE_LCL lpCompSurface; - DWORD dwDataOffset; - DWORD dwDataSize; - LPVOID lpPrivate; + DWORD dwSize; + LPDDRAWI_DDRAWSURFACE_LCL lpCompSurface; + DWORD dwDataOffset; + DWORD dwDataSize; + LPVOID lpPrivate; } DDMCBUFFERINFO, *LPDDMCBUFFERINFO; typedef struct _DDHAL_GETDRIVERSTATEDATA { @@ -1789,23 +1789,23 @@ { LPDDRAWI_DIRECTDRAW_LCL lpDD; LPDDRAWI_DDMOTIONCOMP_LCL lpMoComp; - LPDDRAWI_DDRAWSURFACE_LCL lpDestSurface; - DWORD dwInputDataSize; - LPVOID lpInputData; - DWORD dwOutputDataSize; - LPVOID lpOutputData; - HRESULT ddRVal; + LPDDRAWI_DDRAWSURFACE_LCL lpDestSurface; + DWORD dwInputDataSize; + LPVOID lpInputData; + DWORD dwOutputDataSize; + LPVOID lpOutputData; + HRESULT ddRVal; LPDDHALMOCOMPCB_BEGINFRAME BeginMoCompFrame; } DDHAL_BEGINMOCOMPFRAMEDATA; typedef struct _DDHAL_COLORCONTROLDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; - LPDDCOLORCONTROL lpColorData; - DWORD dwFlags; - HRESULT ddRVal; - LPDDHALCOLORCB_COLORCONTROL ColorControl; + LPDDRAWI_DIRECTDRAW_GBL lpDD; + LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; + LPDDCOLORCONTROL lpColorData; + DWORD dwFlags; + HRESULT ddRVal; + LPDDHALCOLORCB_COLORCONTROL ColorControl; } DDHAL_COLORCONTROLDATA; typedef struct _DDHAL_CREATEMOCOMPDATA @@ -1842,52 +1842,52 @@ typedef struct _DDHAL_FLIPTOGDISURFACEDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - DWORD dwToGDI; - DWORD dwReserved; - HRESULT ddRVal; - LPDDHAL_FLIPTOGDISURFACE FlipToGDISurface; + LPDDRAWI_DIRECTDRAW_GBL lpDD; + DWORD dwToGDI; + DWORD dwReserved; + HRESULT ddRVal; + LPDDHAL_FLIPTOGDISURFACE FlipToGDISurface; } DDHAL_FLIPTOGDISURFACEDATA; typedef struct _DDHAL_GETAVAILDRIVERMEMORYDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - DDSCAPS DDSCaps; - DWORD dwTotal; - DWORD dwFree; - HRESULT ddRVal; - LPDDHAL_GETAVAILDRIVERMEMORY GetAvailDriverMemory; - DDSCAPSEX ddsCapsEx; - + LPDDRAWI_DIRECTDRAW_GBL lpDD; + DDSCAPS DDSCaps; + DWORD dwTotal; + DWORD dwFree; + HRESULT ddRVal; + LPDDHAL_GETAVAILDRIVERMEMORY GetAvailDriverMemory; + DDSCAPSEX ddsCapsEx; + } DDHAL_GETAVAILDRIVERMEMORYDATA; typedef struct _DDHAL_GETBLTSTATUSDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; - DWORD dwFlags; - HRESULT ddRVal; - LPDDHALSURFCB_GETBLTSTATUS GetBltStatus; + LPDDRAWI_DIRECTDRAW_GBL lpDD; + LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; + DWORD dwFlags; + HRESULT ddRVal; + LPDDHALSURFCB_GETBLTSTATUS GetBltStatus; } DDHAL_GETBLTSTATUSDATA; typedef struct _DDHAL_GETFLIPSTATUSDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; - DWORD dwFlags; - HRESULT ddRVal; - LPDDHALSURFCB_GETFLIPSTATUS GetFlipStatus; + LPDDRAWI_DIRECTDRAW_GBL lpDD; + LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; + DWORD dwFlags; + HRESULT ddRVal; + LPDDHALSURFCB_GETFLIPSTATUS GetFlipStatus; } DDHAL_GETFLIPSTATUSDATA; typedef struct _DDHAL_GETINTERNALMOCOMPDATA { LPDDRAWI_DIRECTDRAW_LCL lpDD; LPGUID lpGuid; - DWORD dwWidth; - DWORD dwHeight; - DDPIXELFORMAT ddPixelFormat; - DWORD dwScratchMemAlloc; - HRESULT ddRVal; + DWORD dwWidth; + DWORD dwHeight; + DDPIXELFORMAT ddPixelFormat; + DWORD dwScratchMemAlloc; + HRESULT ddRVal; LPDDHALMOCOMPCB_GETINTERNALINFO GetInternalMoCompInfo; } DDHAL_GETINTERNALMOCOMPDATA; @@ -1900,7 +1900,7 @@ DDPIXELFORMAT ddPixelFormat; DWORD dwNumTypesCompBuffs; LPDDMCCOMPBUFFERINFO lpCompBuffInfo; - HRESULT ddRVal; + HRESULT ddRVal; LPDDHALMOCOMPCB_GETCOMPBUFFINFO GetMoCompBuffInfo; } DDHAL_GETMOCOMPCOMPBUFFDATA; @@ -1925,19 +1925,19 @@ typedef struct _DDHAL_GETSCANLINEDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - DWORD dwScanLine; - HRESULT ddRVal; - LPDDHAL_GETSCANLINE GetScanLine; + LPDDRAWI_DIRECTDRAW_GBL lpDD; + DWORD dwScanLine; + HRESULT ddRVal; + LPDDHAL_GETSCANLINE GetScanLine; } DDHAL_GETSCANLINEDATA; typedef struct _DDHAL_QUERYMOCOMPSTATUSDATA { LPDDRAWI_DIRECTDRAW_LCL lpDD; LPDDRAWI_DDMOTIONCOMP_LCL lpMoComp; - LPDDRAWI_DDRAWSURFACE_LCL lpSurface; - DWORD dwFlags; - HRESULT ddRVal; + LPDDRAWI_DDRAWSURFACE_LCL lpSurface; + DWORD dwFlags; + HRESULT ddRVal; LPDDHALMOCOMPCB_QUERYSTATUS QueryMoCompStatus; } DDHAL_QUERYMOCOMPSTATUSDATA; @@ -1945,59 +1945,59 @@ { LPDDRAWI_DIRECTDRAW_LCL lpDD; LPDDRAWI_DDMOTIONCOMP_LCL lpMoComp; - DWORD dwNumBuffers; - LPDDMCBUFFERINFO lpBufferInfo; - DWORD dwFunction; + DWORD dwNumBuffers; + LPDDMCBUFFERINFO lpBufferInfo; + DWORD dwFunction; LPVOID lpInputData; DWORD dwInputDataSize; LPVOID lpOutputData; DWORD dwOutputDataSize; - HRESULT ddRVal; + HRESULT ddRVal; LPDDHALMOCOMPCB_RENDER RenderMoComp; } DDHAL_RENDERMOCOMPDATA; typedef struct _DDHAL_SETCOLORKEYDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; - DWORD dwFlags; - DDCOLORKEY ckNew; - HRESULT ddRVal; - LPDDHALSURFCB_SETCOLORKEY SetColorKey; + LPDDRAWI_DIRECTDRAW_GBL lpDD; + LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; + DWORD dwFlags; + DDCOLORKEY ckNew; + HRESULT ddRVal; + LPDDHALSURFCB_SETCOLORKEY SetColorKey; } DDHAL_SETCOLORKEYDATA; typedef struct _DDHAL_SETOVERLAYPOSITIONDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - LPDDRAWI_DDRAWSURFACE_LCL lpDDSrcSurface; + LPDDRAWI_DIRECTDRAW_GBL lpDD; + LPDDRAWI_DDRAWSURFACE_LCL lpDDSrcSurface; LPDDRAWI_DDRAWSURFACE_LCL lpDDDestSurface; - LONG lXPos; - LONG lYPos; - HRESULT ddRVal; - LPDDHALSURFCB_SETOVERLAYPOSITION SetOverlayPosition; + LONG lXPos; + LONG lYPos; + HRESULT ddRVal; + LPDDHALSURFCB_SETOVERLAYPOSITION SetOverlayPosition; } DDHAL_SETOVERLAYPOSITIONDATA; typedef struct _DDHAL_UPDATEOVERLAYDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; + LPDDRAWI_DIRECTDRAW_GBL lpDD; LPDDRAWI_DDRAWSURFACE_LCL lpDDDestSurface; - RECTL rDest; - LPDDRAWI_DDRAWSURFACE_LCL lpDDSrcSurface; - RECTL rSrc; - DWORD dwFlags; - DDOVERLAYFX overlayFX; - HRESULT ddRVal; + RECTL rDest; + LPDDRAWI_DDRAWSURFACE_LCL lpDDSrcSurface; + RECTL rSrc; + DWORD dwFlags; + DDOVERLAYFX overlayFX; + HRESULT ddRVal; LPDDHALSURFCB_UPDATEOVERLAY UpdateOverlay; } DDHAL_UPDATEOVERLAYDATA; typedef struct _DDHAL_WAITFORVERTICALBLANKDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - DWORD dwFlags; - DWORD bIsInVB; - ULONG_PTR hEvent; - HRESULT ddRVal; - LPDDHAL_WAITFORVERTICALBLANK WaitForVerticalBlank; + LPDDRAWI_DIRECTDRAW_GBL lpDD; + DWORD dwFlags; + DWORD bIsInVB; + ULONG_PTR hEvent; + HRESULT ddRVal; + LPDDHAL_WAITFORVERTICALBLANK WaitForVerticalBlank; } DDHAL_WAITFORVERTICALBLANKDATA; typedef struct _DDHAL_DRVSETCOLORKEYDATA @@ -2011,11 +2011,11 @@ typedef struct _DDMONITORINFO { - WORD Manufacturer; - WORD Product; - DWORD SerialNumber; + WORD Manufacturer; + WORD Product; + DWORD SerialNumber; GUID DeviceIdentifier; - int Mode640x480; + int Mode640x480; int Mode800x600; int Mode1024x768; int Mode1280x1024; @@ -2035,25 +2035,25 @@ typedef struct _DDHAL_UPDATENONLOCALHEAPDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; - DWORD dwHeap; - FLATPTR fpGARTLin; - FLATPTR fpGARTDev; + LPDDRAWI_DIRECTDRAW_GBL lpDD; + DWORD dwHeap; + FLATPTR fpGARTLin; + FLATPTR fpGARTDev; ULONG_PTR ulPolicyMaxBytes; - HRESULT ddRVal; + HRESULT ddRVal; LPDDHAL_UPDATENONLOCALHEAP UpdateNonLocalHeap; } DDHAL_UPDATENONLOCALHEAPDATA; typedef struct _DDHAL_SETCLIPLISTDATA { - LPDDRAWI_DIRECTDRAW_GBL lpDD; + LPDDRAWI_DIRECTDRAW_GBL lpDD; LPDDRAWI_DDRAWSURFACE_LCL lpDDSurface; HRESULT ddRVal; LPDDHALSURFCB_SETCLIPLIST SetClipList; } DDHAL_SETCLIPLISTDATA; typedef struct _DDRAWI_DDMOTIONCOMP_LCL -{ +{ LPDDRAWI_DIRECTDRAW_LCL lpDD; GUID guid; DWORD dwUncompWidth; @@ -2082,58 +2082,58 @@ typedef struct _DDRAWI_DDVIDEOPORT_LCL { - LPDDRAWI_DIRECTDRAW_LCL lpDD; - DDVIDEOPORTDESC ddvpDesc; - DDVIDEOPORTINFO ddvpInfo; - LPDDRAWI_DDRAWSURFACE_INT lpSurface; - LPDDRAWI_DDRAWSURFACE_INT lpVBISurface; - LPDDRAWI_DDRAWSURFACE_INT *lpFlipInts; - DWORD dwNumAutoflip; - DWORD dwProcessID; + LPDDRAWI_DIRECTDRAW_LCL lpDD; + DDVIDEOPORTDESC ddvpDesc; + DDVIDEOPORTINFO ddvpInfo; + LPDDRAWI_DDRAWSURFACE_INT lpSurface; + LPDDRAWI_DDRAWSURFACE_INT lpVBISurface; + LPDDRAWI_DDRAWSURFACE_INT *lpFlipInts; + DWORD dwNumAutoflip; + DWORD dwProcessID; DWORD dwStateFlags; DWORD dwFlags; DWORD dwRefCnt; - FLATPTR fpLastFlip; - ULONG_PTR dwReserved1; - ULONG_PTR dwReserved2; - HANDLE hDDVideoPort; + FLATPTR fpLastFlip; + ULONG_PTR dwReserved1; + ULONG_PTR dwReserved2; + HANDLE hDDVideoPort; DWORD dwNumVBIAutoflip; - LPDDVIDEOPORTDESC lpVBIDesc; + LPDDVIDEOPORTDESC lpVBIDesc; LPDDVIDEOPORTDESC lpVideoDesc; LPDDVIDEOPORTINFO lpVBIInfo; - LPDDVIDEOPORTINFO lpVideoInfo; - DWORD dwVBIProcessID; + LPDDVIDEOPORTINFO lpVideoInfo; + DWORD dwVBIProcessID; LPDDRAWI_DDVIDEOPORT_INT lpVPNotify; } DDRAWI_DDVIDEOPORT_LCL; typedef struct _DDRAWI_DDVIDEOPORT_INT { - LPVOID lpVtbl; - LPDDRAWI_DDVIDEOPORT_LCL lpLcl; - LPDDRAWI_DDVIDEOPORT_INT lpLink; + LPVOID lpVtbl; + LPDDRAWI_DDVIDEOPORT_LCL lpLcl; + LPDDRAWI_DDVIDEOPORT_INT lpLink; DWORD dwIntRefCnt; - DWORD dwFlags; + DWORD dwFlags; } DDRAWI_DDVIDEOPORT_INT; typedef struct _DDRAWI_DDRAWCLIPPER_LCL { DWORD lpClipMore; - LPDDRAWI_DDRAWCLIPPER_GBL lpGbl; - LPDDRAWI_DIRECTDRAW_LCL lpDD_lcl; + LPDDRAWI_DDRAWCLIPPER_GBL lpGbl; + LPDDRAWI_DIRECTDRAW_LCL lpDD_lcl; DWORD dwLocalRefCnt; #ifndef _NO_COM IUnknown *pUnkOuter; #else PVOID *pUnkOuter; #endif - LPDDRAWI_DIRECTDRAW_INT lpDD_int; + LPDDRAWI_DIRECTDRAW_INT lpDD_int; ULONG_PTR dwReserved1; #ifndef _NO_COM - IUnknown * pAddrefedThisOwner; + IUnknown * pAddrefedThisOwner; #else - PVOID pAddrefedThisOwner; + PVOID pAddrefedThisOwner; #endif } DDRAWI_DDRAWCLIPPER_LCL; @@ -2141,18 +2141,18 @@ typedef struct _DDRAWI_DDRAWCLIPPER_GBL { - DWORD dwRefCnt; - DWORD dwFlags; - LPDDRAWI_DIRECTDRAW_GBL lpDD; + DWORD dwRefCnt; + DWORD dwFlags; + LPDDRAWI_DIRECTDRAW_GBL lpDD; DWORD dwProcessId; ULONG_PTR dwReserved1; - ULONG_PTR hWnd; - LPRGNDATA lpStaticClipList; + ULONG_PTR hWnd; + LPRGNDATA lpStaticClipList; } DDRAWI_DDRAWCLIPPER_GBL; typedef BOOL (PASCAL *LPDDHEL_INIT)(LPDDRAWI_DIRECTDRAW_GBL,BOOL); -extern HRESULT DDAPI +extern HRESULT DDAPI LateAllocateSurfaceMem( LPDIRECTDRAWSURFACE lpSurface, DWORD dwPleaseAllocType, @@ -2186,12 +2186,12 @@ typedef DIRECTDRAWSURFACECALLBACKS FAR *LPDIRECTDRAWSURFACECALLBACKS; typedef DIRECTDRAWCALLBACKS FAR *LPDIRECTDRAWCALLBACKS; -HRESULT CALLBACK +HRESULT CALLBACK D3DParseUnknownCommand (LPVOID lpvCommands, LPVOID *lplpvReturnedCommand); #ifdef __cplusplus -} /* extern "C" */ + /* extern "C" */ #endif #endif /* __DDRAWI_INCLUDED__ */ Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h (original) +++ trunk/reactos/include/ddk/portcls.h Fri Apr 20 20:45:18 2007 @@ -127,8 +127,8 @@ #include <windef.h> #include <ks.h> +#include <punknown.h> #include <drmk.h> -#include <punknown.h> /* TODO */ #define PORTCLASSAPI EXTERN_C Modified: trunk/reactos/include/ddk/punknown.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/punknown.h?rev… ============================================================================== --- trunk/reactos/include/ddk/punknown.h (original) +++ trunk/reactos/include/ddk/punknown.h Fri Apr 20 20:45:18 2007 @@ -9,7 +9,6 @@ #define _UNKNOWN_H_ #include <windef.h> -//#include <ntddk.h> #define COM_NO_WINDOWS_H #include <basetyps.h> Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=2643… ============================================================================== --- trunk/reactos/include/psdk/ks.h (original) +++ trunk/reactos/include/psdk/ks.h Fri Apr 20 20:45:18 2007 @@ -1446,7 +1446,7 @@ /* =============================================================== Device Dispatch */ - +#if defined(_NTDDK_) typedef struct { /* TODO */ @@ -1508,12 +1508,12 @@ PFNKSDEVICEQUERYPOWER Querypower; PFNKSDEVICESETPOWER SetPower; } KSDEVICE_DISPATCH, *PKSDEVICE_DISPATCH; - +#endif /* =============================================================== Filter Dispatch */ - +#if defined(_NTDDK_) typedef struct { } KSFILTER, *PKSFILTER; @@ -1568,11 +1568,11 @@ ULONG FilterDescriptorsCount; const KSFILTER_DESCRIPTOR*const* FilterDescriptors; } KSDEVICE_DESCRIPTOR, *PKSDEVICE_DESCRIPTOR; - +#endif /* =============================================================== Minidriver Callbacks */ - +#if defined(_NTDDK_) typedef NTSTATUS (*KStrMethodHandler)( IN PIRP Irp, IN PKSIDENTIFIER Request, @@ -1582,12 +1582,12 @@ IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); - +#endif /* =============================================================== Allocator Functions */ - +#if defined(_NTDDK_) KSDDKAPI NTSTATUS NTAPI KsCreateAllocator( IN HANDLE ConnectionHandle, @@ -1617,12 +1617,12 @@ IN PKSALLOCATOR_FRAMING_EX Framing, IN ULONG BufferSize, IN const KSALLOCATOR_FRAMING_EX* PinFraming); - +#endif /* =============================================================== Clock Functions */ - +#if defined(_NTDDK_) typedef BOOLEAN (*PFNKSSETTIMER)( IN PVOID Context, IN PKTIMER Timer, @@ -1688,14 +1688,14 @@ KsSetDefaultClockTime( IN PKSDEFAULTCLOCK DefaultClock, IN LONGLONG Time); - +#endif /* =============================================================== Method Functions */ /* Method sets - TODO: Make into macros! */ - +#if defined(_NTDDK_) #if 0 VOID KSMETHOD_SET_IRP_STORAGE( @@ -1734,12 +1734,12 @@ OUT PIO_STATUS_BLOCK IoStatus, IN ULONG MethodSetsCount, IN const KSMETHOD_SET* MethodSet); - +#endif /* =============================================================== Property Functions */ - +#if defined(_NTDDK_) KSDDKAPI NTSTATUS NTAPI KsPropertyHandler( IN PIRP Irp, @@ -1770,12 +1770,12 @@ OUT PIO_STATUS_BLOCK IoStatus, IN ULONG PropertySetsCount, IN const KSPROPERTY_SET* PropertySet); - +#endif /* =============================================================== Event Functions */ - +#if defined(_NTDDK_) KSDDKAPI NTSTATUS NTAPI KsGenerateEvent( IN PKSEVENT_ENTRY EntryEvent); @@ -1823,7 +1823,7 @@ IN OUT PLIST_ENTRY EventsList, IN KSEVENTS_LOCKTYPE EVentsFlags, IN PVOID EventsLock); - +#endif /* =============================================================== Topology Functions

1 0

[hpoussin] 26437: Add missing dependancy
by hpoussin＠svn.reactos.org 20 Apr '07

20 Apr '07

Author: hpoussin Date: Fri Apr 20 16:37:53 2007 New Revision: 26437 URL: http://svn.reactos.org/svn/reactos?rev=26437&view=rev Log: Add missing dependancy Modified: trunk/reactos/lib/3rdparty/mingw/mingw.rbuild Modified: trunk/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/mingw.r… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/mingw.rbuild (original) +++ trunk/reactos/lib/3rdparty/mingw/mingw.rbuild Fri Apr 20 16:37:53 2007 @@ -6,6 +6,7 @@ <include base="ReactOS">include/crt</include> <include base="ReactOS">include/psdk</include> <include base="mingw_common">include</include> + <dependency>psdk</dependency> <file>cpu_features.c</file> <file>CRTfmode.c</file> <file>CRTglob.c</file>

1 0

[winesync] 26436: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 20 Apr '07

20 Apr '07

Author: winesync Date: Fri Apr 20 16:23:52 2007 New Revision: 26436 URL: http://svn.reactos.org/svn/reactos?rev=26436&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/ole32/classmoniker.c (with props) trunk/reactos/dll/win32/ole32/enumx.c (with props) trunk/reactos/dll/win32/ole32/enumx.h (with props) trunk/reactos/dll/win32/ole32/ole32_ros.diff (with props) Removed: trunk/reactos/dll/win32/ole32/dcom.h Modified: trunk/reactos/dll/win32/ole32/antimoniker.c trunk/reactos/dll/win32/ole32/bindctx.c trunk/reactos/dll/win32/ole32/clipboard.c trunk/reactos/dll/win32/ole32/compobj.c trunk/reactos/dll/win32/ole32/compobj.spec trunk/reactos/dll/win32/ole32/compobj_private.h trunk/reactos/dll/win32/ole32/compositemoniker.c trunk/reactos/dll/win32/ole32/datacache.c trunk/reactos/dll/win32/ole32/dcom.idl trunk/reactos/dll/win32/ole32/defaulthandler.c trunk/reactos/dll/win32/ole32/dictionary.c trunk/reactos/dll/win32/ole32/dictionary.h trunk/reactos/dll/win32/ole32/errorinfo.c trunk/reactos/dll/win32/ole32/filemoniker.c trunk/reactos/dll/win32/ole32/ftmarshal.c trunk/reactos/dll/win32/ole32/git.c trunk/reactos/dll/win32/ole32/hglobalstream.c trunk/reactos/dll/win32/ole32/ifs.c trunk/reactos/dll/win32/ole32/ifs.h trunk/reactos/dll/win32/ole32/itemmoniker.c trunk/reactos/dll/win32/ole32/marshal.c trunk/reactos/dll/win32/ole32/memlockbytes.c trunk/reactos/dll/win32/ole32/memlockbytes16.c trunk/reactos/dll/win32/ole32/moniker.c trunk/reactos/dll/win32/ole32/moniker.h trunk/reactos/dll/win32/ole32/ole16.c trunk/reactos/dll/win32/ole32/ole2.c trunk/reactos/dll/win32/ole32/ole2_16.c trunk/reactos/dll/win32/ole32/ole2impl.c trunk/reactos/dll/win32/ole32/ole2nls.c trunk/reactos/dll/win32/ole32/ole2stubs.c trunk/reactos/dll/win32/ole32/ole32.rbuild trunk/reactos/dll/win32/ole32/ole32.spec trunk/reactos/dll/win32/ole32/ole32_main.c trunk/reactos/dll/win32/ole32/ole32res.rc trunk/reactos/dll/win32/ole32/oleobj.c trunk/reactos/dll/win32/ole32/oleproxy.c trunk/reactos/dll/win32/ole32/olestd.h trunk/reactos/dll/win32/ole32/regsvr.c trunk/reactos/dll/win32/ole32/rpc.c trunk/reactos/dll/win32/ole32/stg_bigblockfile.c trunk/reactos/dll/win32/ole32/stg_prop.c trunk/reactos/dll/win32/ole32/stg_stream.c trunk/reactos/dll/win32/ole32/storage.c trunk/reactos/dll/win32/ole32/storage32.c trunk/reactos/dll/win32/ole32/storage32.h trunk/reactos/dll/win32/ole32/stubmanager.c trunk/reactos/dll/win32/ole32/usrmarshal.c trunk/reactos/dll/win32/ole32/version.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/ole32/antimoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/antimonike… Modified: trunk/reactos/dll/win32/ole32/bindctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/bindctx.c?… Added: trunk/reactos/dll/win32/ole32/classmoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/classmonik… Modified: trunk/reactos/dll/win32/ole32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/clipboard.… Modified: trunk/reactos/dll/win32/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj.c?… Modified: trunk/reactos/dll/win32/ole32/compobj.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj.sp… Modified: trunk/reactos/dll/win32/ole32/compobj_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj_pr… Modified: trunk/reactos/dll/win32/ole32/compositemoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compositem… Modified: trunk/reactos/dll/win32/ole32/datacache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/datacache.… Removed: trunk/reactos/dll/win32/ole32/dcom.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/dcom.h?rev… Modified: trunk/reactos/dll/win32/ole32/dcom.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/dcom.idl?r… Modified: trunk/reactos/dll/win32/ole32/defaulthandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/defaulthan… Modified: trunk/reactos/dll/win32/ole32/dictionary.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/dictionary… Modified: trunk/reactos/dll/win32/ole32/dictionary.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/dictionary… Added: trunk/reactos/dll/win32/ole32/enumx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/enumx.c?re… Added: trunk/reactos/dll/win32/ole32/enumx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/enumx.h?re… Modified: trunk/reactos/dll/win32/ole32/errorinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/errorinfo.… Modified: trunk/reactos/dll/win32/ole32/filemoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/filemonike… Modified: trunk/reactos/dll/win32/ole32/ftmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ftmarshal.… Modified: trunk/reactos/dll/win32/ole32/git.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/git.c?rev=… Modified: trunk/reactos/dll/win32/ole32/hglobalstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/hglobalstr… Modified: trunk/reactos/dll/win32/ole32/ifs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ifs.c?rev=… Modified: trunk/reactos/dll/win32/ole32/ifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ifs.h?rev=… Modified: trunk/reactos/dll/win32/ole32/itemmoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/itemmonike… Modified: trunk/reactos/dll/win32/ole32/marshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/marshal.c?… Modified: trunk/reactos/dll/win32/ole32/memlockbytes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/memlockbyt… Modified: trunk/reactos/dll/win32/ole32/memlockbytes16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/memlockbyt… Modified: trunk/reactos/dll/win32/ole32/moniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/moniker.c?… Modified: trunk/reactos/dll/win32/ole32/moniker.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/moniker.h?… Modified: trunk/reactos/dll/win32/ole32/ole16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole16.c?re… Modified: trunk/reactos/dll/win32/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2.c?rev… Modified: trunk/reactos/dll/win32/ole32/ole2_16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2_16.c?… Modified: trunk/reactos/dll/win32/ole32/ole2impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2impl.c… Modified: trunk/reactos/dll/win32/ole32/ole2nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2nls.c?… Modified: trunk/reactos/dll/win32/ole32/ole2stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2stubs.… Modified: trunk/reactos/dll/win32/ole32/ole32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.rbui… Modified: trunk/reactos/dll/win32/ole32/ole32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.spec… Modified: trunk/reactos/dll/win32/ole32/ole32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32_main… Added: trunk/reactos/dll/win32/ole32/ole32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32_ros.… Modified: trunk/reactos/dll/win32/ole32/ole32res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32res.r… Modified: trunk/reactos/dll/win32/ole32/oleobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/oleobj.c?r… Modified: trunk/reactos/dll/win32/ole32/oleproxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/oleproxy.c… Modified: trunk/reactos/dll/win32/ole32/olestd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/olestd.h?r… Modified: trunk/reactos/dll/win32/ole32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/regsvr.c?r… Modified: trunk/reactos/dll/win32/ole32/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/rpc.c?rev=… Modified: trunk/reactos/dll/win32/ole32/stg_bigblockfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stg_bigblo… Modified: trunk/reactos/dll/win32/ole32/stg_prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stg_prop.c… Modified: trunk/reactos/dll/win32/ole32/stg_stream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stg_stream… Modified: trunk/reactos/dll/win32/ole32/storage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage.c?… Modified: trunk/reactos/dll/win32/ole32/storage32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage32.… Modified: trunk/reactos/dll/win32/ole32/storage32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage32.… Modified: trunk/reactos/dll/win32/ole32/stubmanager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stubmanage… Modified: trunk/reactos/dll/win32/ole32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/usrmarshal… Modified: trunk/reactos/dll/win32/ole32/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/version.rc…

1 0

[hpoussin] 26435: Process .idl files before source files
by hpoussin＠svn.reactos.org 20 Apr '07

20 Apr '07

Author: hpoussin Date: Fri Apr 20 16:18:10 2007 New Revision: 26435 URL: http://svn.reactos.org/svn/reactos?rev=26435&view=rev Log: Process .idl files before source files Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Fri Apr 20 16:18:10 2007 @@ -583,7 +583,13 @@ if ( parseContext.ifData ) parseContext.ifData->data.compilationUnits.push_back ( pCompilationUnit ); else - non_if_data.compilationUnits.push_back ( pCompilationUnit ); + { + string ext = GetExtension ( e.value ); + if ( !stricmp ( ext.c_str(), ".idl" ) ) + non_if_data.compilationUnits.insert ( non_if_data.compilationUnits.begin(), pCompilationUnit ); + else + non_if_data.compilationUnits.push_back ( pCompilationUnit ); + } } if ( parseContext.ifData ) parseContext.ifData->data.files.push_back ( pFile );

1 0

[hpoussin] 26434: Autosyncing with Wine HEAD
by hpoussin＠svn.reactos.org 20 Apr '07

20 Apr '07

Author: hpoussin Date: Fri Apr 20 15:44:43 2007 New Revision: 26434 URL: http://svn.reactos.org/svn/reactos?rev=26434&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/oleaut32/oleaut32_Eo.rc (with props) trunk/reactos/dll/win32/oleaut32/oleaut32_ros.diff (with props) trunk/reactos/dll/win32/oleaut32/ungif.c (with props) trunk/reactos/dll/win32/oleaut32/ungif.h (with props) Removed: trunk/reactos/dll/win32/oleaut32/Makefile.in trunk/reactos/dll/win32/oleaut32/cursoricon.h Modified: trunk/reactos/dll/win32/oleaut32/connpt.c trunk/reactos/dll/win32/oleaut32/connpt.h trunk/reactos/dll/win32/oleaut32/dispatch.c trunk/reactos/dll/win32/oleaut32/hash.c trunk/reactos/dll/win32/oleaut32/oaidl_p.c trunk/reactos/dll/win32/oleaut32/ole2disp.c trunk/reactos/dll/win32/oleaut32/ole2disp.h trunk/reactos/dll/win32/oleaut32/oleaut.c trunk/reactos/dll/win32/oleaut32/oleaut32.rbuild trunk/reactos/dll/win32/oleaut32/oleaut32.rc trunk/reactos/dll/win32/oleaut32/oleaut32.spec trunk/reactos/dll/win32/oleaut32/oleaut32_Bg.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Cz.rc trunk/reactos/dll/win32/oleaut32/oleaut32_De.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Dk.rc trunk/reactos/dll/win32/oleaut32/oleaut32_En.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Es.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Fr.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Hu.rc trunk/reactos/dll/win32/oleaut32/oleaut32_It.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Ko.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Nl.rc trunk/reactos/dll/win32/oleaut32/oleaut32_No.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Pl.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Pt.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Ru.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Sv.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Th.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Tr.rc trunk/reactos/dll/win32/oleaut32/oleaut32_Uk.rc trunk/reactos/dll/win32/oleaut32/olefont.c trunk/reactos/dll/win32/oleaut32/olepicture.c trunk/reactos/dll/win32/oleaut32/recinfo.c trunk/reactos/dll/win32/oleaut32/regsvr.c trunk/reactos/dll/win32/oleaut32/resource.h trunk/reactos/dll/win32/oleaut32/safearray.c trunk/reactos/dll/win32/oleaut32/stubs.c trunk/reactos/dll/win32/oleaut32/tmarshal.c trunk/reactos/dll/win32/oleaut32/typelib.c trunk/reactos/dll/win32/oleaut32/typelib.h trunk/reactos/dll/win32/oleaut32/typelib16.c trunk/reactos/dll/win32/oleaut32/typelib2.c trunk/reactos/dll/win32/oleaut32/usrmarshal.c trunk/reactos/dll/win32/oleaut32/varformat.c trunk/reactos/dll/win32/oleaut32/variant.c trunk/reactos/dll/win32/oleaut32/variant.h trunk/reactos/dll/win32/oleaut32/vartype.c trunk/reactos/dll/win32/oleaut32/version.rc [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/dll/win32/oleaut32/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/Makefil… Modified: trunk/reactos/dll/win32/oleaut32/connpt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/connpt.… Modified: trunk/reactos/dll/win32/oleaut32/connpt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/connpt.… Removed: trunk/reactos/dll/win32/oleaut32/cursoricon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/cursori… Modified: trunk/reactos/dll/win32/oleaut32/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/dispatc… Modified: trunk/reactos/dll/win32/oleaut32/hash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/hash.c?… Modified: trunk/reactos/dll/win32/oleaut32/oaidl_p.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oaidl_p… Modified: trunk/reactos/dll/win32/oleaut32/ole2disp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/ole2dis… Modified: trunk/reactos/dll/win32/oleaut32/ole2disp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/ole2dis… Modified: trunk/reactos/dll/win32/oleaut32/oleaut.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut.… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Dk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Added: trunk/reactos/dll/win32/oleaut32/oleaut32_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Th.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Added: trunk/reactos/dll/win32/oleaut32/oleaut32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/oleaut32/olefont.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/olefont… Modified: trunk/reactos/dll/win32/oleaut32/olepicture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/olepict… Modified: trunk/reactos/dll/win32/oleaut32/recinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/recinfo… Modified: trunk/reactos/dll/win32/oleaut32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/regsvr.… Modified: trunk/reactos/dll/win32/oleaut32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/resourc… Modified: trunk/reactos/dll/win32/oleaut32/safearray.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/safearr… Modified: trunk/reactos/dll/win32/oleaut32/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/stubs.c… Modified: trunk/reactos/dll/win32/oleaut32/tmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/tmarsha… Modified: trunk/reactos/dll/win32/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… Modified: trunk/reactos/dll/win32/oleaut32/typelib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… Modified: trunk/reactos/dll/win32/oleaut32/typelib16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… Modified: trunk/reactos/dll/win32/oleaut32/typelib2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… Added: trunk/reactos/dll/win32/oleaut32/ungif.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/ungif.c… Added: trunk/reactos/dll/win32/oleaut32/ungif.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/ungif.h… Modified: trunk/reactos/dll/win32/oleaut32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/usrmars… Modified: trunk/reactos/dll/win32/oleaut32/varformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/varform… Modified: trunk/reactos/dll/win32/oleaut32/variant.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/variant… Modified: trunk/reactos/dll/win32/oleaut32/variant.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/variant… Modified: trunk/reactos/dll/win32/oleaut32/vartype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/vartype… Modified: trunk/reactos/dll/win32/oleaut32/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/version…

1 0

[winesync] 26433: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 20 Apr '07

20 Apr '07

Author: winesync Date: Fri Apr 20 15:26:32 2007 New Revision: 26433 URL: http://svn.reactos.org/svn/reactos?rev=26433&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/riched20/clipboard.c (with props) trunk/reactos/dll/win32/riched20/txtsrv.c (with props) trunk/reactos/dll/win32/riched20/version.rc (with props) Removed: trunk/reactos/dll/win32/riched20/Makefile.in Modified: trunk/reactos/dll/win32/riched20/caret.c trunk/reactos/dll/win32/riched20/context.c trunk/reactos/dll/win32/riched20/editor.c trunk/reactos/dll/win32/riched20/editor.h trunk/reactos/dll/win32/riched20/editstr.h trunk/reactos/dll/win32/riched20/list.c trunk/reactos/dll/win32/riched20/paint.c trunk/reactos/dll/win32/riched20/para.c trunk/reactos/dll/win32/riched20/reader.c trunk/reactos/dll/win32/riched20/riched20.rbuild trunk/reactos/dll/win32/riched20/richole.c trunk/reactos/dll/win32/riched20/row.c trunk/reactos/dll/win32/riched20/rtf.h trunk/reactos/dll/win32/riched20/run.c trunk/reactos/dll/win32/riched20/string.c trunk/reactos/dll/win32/riched20/style.c trunk/reactos/dll/win32/riched20/undo.c trunk/reactos/dll/win32/riched20/wrap.c trunk/reactos/dll/win32/riched20/writer.c [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/dll/win32/riched20/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/Makefil… Modified: trunk/reactos/dll/win32/riched20/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/caret.c… Added: trunk/reactos/dll/win32/riched20/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/clipboa… Modified: trunk/reactos/dll/win32/riched20/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/context… Modified: trunk/reactos/dll/win32/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… Modified: trunk/reactos/dll/win32/riched20/editor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… Modified: trunk/reactos/dll/win32/riched20/editstr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editstr… Modified: trunk/reactos/dll/win32/riched20/list.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/list.c?… Modified: trunk/reactos/dll/win32/riched20/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/paint.c… Modified: trunk/reactos/dll/win32/riched20/para.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/para.c?… Modified: trunk/reactos/dll/win32/riched20/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/reader.… Modified: trunk/reactos/dll/win32/riched20/riched20.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/riched2… Modified: trunk/reactos/dll/win32/riched20/richole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/richole… Modified: trunk/reactos/dll/win32/riched20/row.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/row.c?r… Modified: trunk/reactos/dll/win32/riched20/rtf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/rtf.h?r… Modified: trunk/reactos/dll/win32/riched20/run.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/run.c?r… Modified: trunk/reactos/dll/win32/riched20/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/string.… Modified: trunk/reactos/dll/win32/riched20/style.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/style.c… Added: trunk/reactos/dll/win32/riched20/txtsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/txtsrv.… Modified: trunk/reactos/dll/win32/riched20/undo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/undo.c?… Added: trunk/reactos/dll/win32/riched20/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/version… Modified: trunk/reactos/dll/win32/riched20/wrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/wrap.c?… Modified: trunk/reactos/dll/win32/riched20/writer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/writer.…

1 0

[ekohl] 26432: - Fix the "Use default" and "Browse" functions on the pointer page. - Remove useless code.
by ekohl＠svn.reactos.org 20 Apr '07

20 Apr '07

Author: ekohl Date: Fri Apr 20 15:02:35 2007 New Revision: 26432 URL: http://svn.reactos.org/svn/reactos?rev=26432&view=rev Log: - Fix the "Use default" and "Browse" functions on the pointer page. - Remove useless code. Modified: trunk/reactos/dll/cpl/main/mouse.c Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c (original) +++ trunk/reactos/dll/cpl/main/mouse.c Fri Apr 20 15:02:35 2007 @@ -409,95 +409,6 @@ } -#if 0 -static BOOL -ReadActiveCursorScheme(VOID) -{ - HKEY hCuKey; - HKEY hCuCursorKey; - DWORD dwIndex; - TCHAR szValueName[MAX_PATH]; - DWORD dwValueName; - TCHAR szValueData[2000]; - DWORD dwValueData; - LONG dwResult; - - if (RegOpenCurrentUser(KEY_READ, &hCuKey) != ERROR_SUCCESS) - return FALSE; - - if (RegOpenKeyEx(hCuKey, _T("Control Panel\\Cursors"), 0, KEY_READ, &hCuCursorKey) != ERROR_SUCCESS) - { - RegCloseKey(hCuKey); - return FALSE; - } - - memset(g_szArrow, 0x0, sizeof(g_szArrow)); - memset(g_szHelp, 0x0, sizeof(g_szHelp)); - memset(g_szAppStarting, 0x0, sizeof(g_szAppStarting)); - memset(g_szWait, 0x0, sizeof(g_szWait)); - memset(g_szCrosshair, 0x0, sizeof(g_szCrosshair)); - memset(g_szIBeam, 0x0, sizeof(g_szIBeam)); - memset(g_szNWPen, 0x0, sizeof(g_szNWPen)); - memset(g_szNo, 0x0, sizeof(g_szNo)); - memset(g_szSizeNS, 0x0, sizeof(g_szSizeNS)); - memset(g_szSizeWE, 0x0, sizeof(g_szSizeWE)); - memset(g_szSizeNWSE, 0x0, sizeof(g_szSizeNWSE)); - memset(g_szSizeNESW, 0x0, sizeof(g_szSizeNESW)); - memset(g_szSizeAll, 0x0, sizeof(g_szSizeAll)); - memset(g_szUpArrow, 0x0, sizeof(g_szUpArrow)); - memset(g_szHand, 0x0, sizeof(g_szHand)); - - dwIndex = 0; - for (;;) - { - dwValueName = sizeof(szValueName) / sizeof(TCHAR); - dwValueData = sizeof(szValueData) / sizeof(TCHAR); - dwResult = RegEnumValue(hCuCursorKey, dwIndex, szValueName, &dwValueName, NULL, NULL, (LPBYTE)szValueData, &dwValueData); - if (dwResult == ERROR_NO_MORE_ITEMS) - break; - - if (_tcsicmp(_T("Arrow"), szValueName)) - _tcsncpy(g_szArrow, szValueData, MAX_PATH); - else if (_tcsicmp(_T("Help"), szValueName)) - _tcsncpy(g_szHelp, szValueData, MAX_PATH); - else if (_tcsicmp(_T("AppStarting"), szValueName)) - _tcsncpy(g_szAppStarting, szValueData, MAX_PATH); - else if (_tcsicmp(_T("Wait"), szValueName)) - _tcsncpy(g_szWait, szValueData, MAX_PATH); - else if (_tcsicmp(_T("Crosshair"), szValueName)) - _tcsncpy(g_szCrosshair, szValueData, MAX_PATH); - else if (_tcsicmp(_T("IBeam"), szValueName)) - _tcsncpy(g_szIBeam, szValueData, MAX_PATH); - else if (_tcsicmp(_T("NWPen"), szValueName)) - _tcsncpy(g_szNWPen, szValueData, MAX_PATH); - else if (_tcscmp(_T("No"), szValueName)) - _tcsncpy(g_szNo, szValueData, MAX_PATH); - else if (_tcsicmp(_T("SizeNS"), szValueName)) - _tcsncpy(g_szSizeNS, szValueData, MAX_PATH); - else if (_tcsicmp(_T("SizeWE"), szValueName)) - _tcsncpy(g_szSizeWE, szValueData, MAX_PATH); - else if (_tcsicmp(_T("SizeNWSE"), szValueName)) - _tcsncpy(g_szSizeNWSE, szValueData, MAX_PATH); - else if (_tcsicmp(_T("SizeNESW"), szValueName)) - _tcsncpy(g_szSizeNESW, szValueData, MAX_PATH); - else if (_tcsicmp(_T("SizeAll"), szValueName)) - _tcsncpy(g_szSizeAll, szValueData, MAX_PATH); - else if (_tcsicmp(_T("UpArrow"), szValueName)) - _tcsncpy(g_szUpArrow, szValueData, MAX_PATH); - else if (_tcsicmp(_T("Hand"), szValueName)) - _tcsncpy(g_szHand, szValueData, MAX_PATH); - - dwIndex++; - } - - RegCloseKey(hCuCursorKey); - RegCloseKey(hCuKey); - - return TRUE; -} -#endif - - static BOOL EnumerateCursorSchemes(HWND hwndDlg) { @@ -638,14 +549,22 @@ nSel = bInit ? 0 : SendDlgItemMessage(hwndDlg, IDC_LISTBOX_CURSOR, LB_GETCURSEL, 0, 0); - SendDlgItemMessage(hwndDlg, IDC_LISTBOX_CURSOR, LB_RESETCONTENT, 0, 0); - for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++) - { - LoadString(hApplet, index, g_CursorData[i].szCursorName, MAX_PATH); - SendDlgItemMessage(hwndDlg, IDC_LISTBOX_CURSOR, LB_ADDSTRING, 0, (LPARAM)i); - } - - SendDlgItemMessage(hwndDlg, IDC_LISTBOX_CURSOR, LB_SETCURSEL, nSel, 0); + if (bInit) + { + SendDlgItemMessage(hwndDlg, IDC_LISTBOX_CURSOR, LB_RESETCONTENT, 0, 0); + for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++) + { + LoadString(hApplet, index, g_CursorData[i].szCursorName, MAX_PATH); + SendDlgItemMessage(hwndDlg, IDC_LISTBOX_CURSOR, LB_ADDSTRING, 0, (LPARAM)i); + } + + SendDlgItemMessage(hwndDlg, IDC_LISTBOX_CURSOR, LB_SETCURSEL, nSel, 0); + } + else + { + InvalidateRect(GetDlgItem(hwndDlg, IDC_LISTBOX_CURSOR), NULL, FALSE); + } + SendDlgItemMessage(hwndDlg, IDC_IMAGE_CURRENT_CURSOR, STM_SETIMAGE, IMAGE_CURSOR, (LPARAM)g_CursorData[nSel].hCursor); } @@ -746,14 +665,18 @@ g_CursorData[i].szCursorPath[0] = 0; } +#if 0 if (lpName == NULL) { -// for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++) -// { -// g_CursorData[i].hCursor = LoadCursor(NULL, g_CursorData[i].uDefaultCursorId); -// } + for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++) + { + g_CursorData[i].hCursor = LoadCursor(NULL, g_CursorData[i].uDefaultCursorId); + } } else +#endif + + if (lpName != NULL) { LPTSTR pStart = lpName; LPTSTR pEnd = pStart; @@ -988,17 +911,13 @@ case IDC_BUTTON_USE_DEFAULT_CURSOR: hDlgCtrl = GetDlgItem(hwndDlg, IDC_LISTBOX_CURSOR); - lResult = SendMessage(hDlgCtrl, CB_GETCURSEL, 0, 0); - if (lResult != CB_ERR) - { - UINT uIndex; - - /* FIXME */ - uIndex = (UINT)SendMessage(hDlgCtrl, LB_GETITEMDATA, (WPARAM)lResult, 0); - + lResult = SendMessage(hDlgCtrl, LB_GETCURSEL, 0, 0); + if (lResult != LB_ERR) + { /* Clean the path of the currently selected cursor */ - memset(g_CursorData[uIndex].szCursorPath, 0x0, MAX_PATH * sizeof(TCHAR)); - + memset(g_CursorData[lResult].szCursorPath, 0x0, MAX_PATH * sizeof(TCHAR)); + + /* Update cursor list and preview */ ReloadCurrentCursorScheme(); RefreshCursorList(hwndDlg, FALSE); } @@ -1007,19 +926,15 @@ case IDC_BUTTON_BROWSE_CURSOR: memset(buffer, 0x0, sizeof(buffer)); hDlgCtrl = GetDlgItem(hwndDlg, IDC_LISTBOX_CURSOR); - lResult = SendMessage(hDlgCtrl, CB_GETCURSEL, 0, 0); - if (lResult == CB_ERR) - MessageBox(hwndDlg, _T("CB_ERR"), _T(""),MB_ICONERROR); + lResult = SendMessage(hDlgCtrl, LB_GETCURSEL, 0, 0); + if (lResult == LB_ERR) + MessageBox(hwndDlg, _T("LB_ERR"), _T(""),MB_ICONERROR); if (BrowseCursor(buffer, hwndDlg)) { - UINT uIndex; - - /* FIXME */ - uIndex = (UINT)SendMessage(hDlgCtrl, LB_GETITEMDATA, (WPARAM)lResult, 0); - /* Store the new cursor file path */ - _tcsncpy(g_CursorData[uIndex].szCursorPath, buffer, MAX_PATH); - + _tcsncpy(g_CursorData[lResult].szCursorPath, buffer, MAX_PATH); + + /* Update cursor list and preview */ ReloadCurrentCursorScheme(); RefreshCursorList(hwndDlg, FALSE); }

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