Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 24816: adding some new ddk header, the info are base/got from windows xp ddk kit version 3790.1830
by greatlrd＠svn.reactos.org 23 Nov '06

23 Nov '06

Author: greatlrd Date: Thu Nov 23 23:19:54 2006 New Revision: 24816 URL: http://svn.reactos.org/svn/reactos?rev=24816&view=rev Log: adding some new ddk header, the info are base/got from windows xp ddk kit version 3790.1830 Added: trunk/reactos/include/ddk/objerror.h Modified: trunk/reactos/include/ddk/dmemmgr.h trunk/reactos/include/ddk/ntddbeep.h trunk/reactos/include/ddk/ntddtdi.h trunk/reactos/include/ddk/ntnls.h trunk/reactos/include/ddk/usbiodef.h Modified: trunk/reactos/include/ddk/dmemmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/dmemmgr.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/dmemmgr.h (original) +++ trunk/reactos/include/ddk/dmemmgr.h Thu Nov 23 23:19:54 2006 @@ -25,16 +25,16 @@ #endif #define SURFACEALIGN_DISCARDABLE 0x00000001 -#define VMEMHEAP_LINEAR 0x00000001 -#define VMEMHEAP_RECTANGULAR 0x00000002 -#define VMEMHEAP_ALIGNMENT 0x00000004 +#define VMEMHEAP_LINEAR 0x00000001 +#define VMEMHEAP_RECTANGULAR 0x00000002 +#define VMEMHEAP_ALIGNMENT 0x00000004 typedef struct _VMEML { struct _VMEML *next; FLATPTR ptr; DWORD size; - BOOL bDiscardable; + BOOL bDiscardable; } VMEML, *LPVMEML, *LPLPVMEML; typedef struct _VMEMR @@ -47,16 +47,15 @@ struct _VMEMR *pLeft; struct _VMEMR *pRight; FLATPTR ptr; - DWORD size; - DWORD x; - DWORD y; - DWORD cx; - DWORD cy; - DWORD flags; - FLATPTR pBits; - BOOL bDiscardable; + DWORD size; + DWORD x; + DWORD y; + DWORD cx; + DWORD cy; + DWORD flags; + FLATPTR pBits; + BOOL bDiscardable; } VMEMR, *LPVMEMR, *LPLPVMEMR; - typedef struct _SURFACEALIGNMENT { @@ -64,10 +63,10 @@ { struct { - DWORD dwStartAlignment; - DWORD dwPitchAlignment; - DWORD dwFlags; - DWORD dwReserved2; + DWORD dwStartAlignment; + DWORD dwPitchAlignment; + DWORD dwFlags; + DWORD dwReserved2; } Linear; struct { @@ -81,9 +80,9 @@ typedef struct _HEAPALIGNMENT { - DWORD dwSize; - DDSCAPS ddsCaps; - DWORD dwReserved; + DWORD dwSize; + DDSCAPS ddsCaps; + DWORD dwReserved; SURFACEALIGNMENT ExecuteBuffer; SURFACEALIGNMENT Overlay; SURFACEALIGNMENT Texture; @@ -93,42 +92,40 @@ SURFACEALIGNMENT FlipTarget; } HEAPALIGNMENT, *LPHEAPALIGNMENT; - typedef struct _VMEMHEAP { - DWORD dwFlags; - DWORD stride; - LPVOID freeList; - LPVOID allocList; - DWORD dwTotalSize; + DWORD dwFlags; + DWORD stride; + LPVOID freeList; + LPVOID allocList; + DWORD dwTotalSize; FLATPTR fpGARTLin; FLATPTR fpGARTDev; - DWORD dwCommitedSize; - DWORD dwCoalesceCount; + DWORD dwCommitedSize; + DWORD dwCoalesceCount; HEAPALIGNMENT Alignment; - DDSCAPSEX ddsCapsEx; - DDSCAPSEX ddsCapsExAlt; + DDSCAPSEX ddsCapsEx; + DDSCAPSEX ddsCapsExAlt; #ifndef IS_16 LARGE_INTEGER liPhysAGPBase; #endif - HANDLE hdevAGP; - LPVOID pvPhysRsrv; - BYTE* pAgpCommitMask; - DWORD dwAgpCommitMaskSize; -} VMEMHEAP; - -typedef VMEMHEAP FAR *LPVMEMHEAP; + HANDLE hdevAGP; + LPVOID pvPhysRsrv; + BYTE* pAgpCommitMask; + DWORD dwAgpCommitMaskSize; +} VMEMHEAP, *LPVMEMHEAP; typedef struct _DD_GETHEAPALIGNMENTDATA { - ULONG_PTR dwInstance; - DWORD dwHeap; - HRESULT ddRVal; - VOID* GetHeapAlignment; + ULONG_PTR dwInstance; + DWORD dwHeap; + HRESULT ddRVal; + VOID* GetHeapAlignment; HEAPALIGNMENT Alignment; } DD_GETHEAPALIGNMENTDATA, *PDD_GETHEAPALIGNMENTDATA; extern void WINAPI VidMemFree( LPVMEMHEAP pvmh, FLATPTR ptr); +extern FLATPTR WINAPI VidMemAlloc( LPVMEMHEAP pvmh, DWORD width, DWORD height); extern FLATPTR WINAPI HeapVidMemAllocAligned( @@ -139,9 +136,9 @@ LPLONG lpNewPitch ); -#ifndef __NTDDKCOMP__ -extern FLATPTR WINAPI VidMemAlloc( LPVMEMHEAP pvmh, DWORD width, DWORD height); -#endif + + + #ifdef __cplusplus }; Modified: trunk/reactos/include/ddk/ntddbeep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddbeep.h?rev… ============================================================================== --- trunk/reactos/include/ddk/ntddbeep.h (original) +++ trunk/reactos/include/ddk/ntddbeep.h Thu Nov 23 23:19:54 2006 @@ -1,52 +1,26 @@ -/* - * ntddbeep.h - * - * Beep device IOCTL interface - * - * This file is part of the w32api package. - * - * Contributors: - * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - */ -#ifndef __NTDDBEEP_H -#define __NTDDBEEP_H +#ifndef _NTDDBEEP_ +#define _NTDDBEEP_ -#if __GNUC__ >=3 -#pragma GCC system_header -#endif #ifdef __cplusplus extern "C" { #endif -#define DD_BEEP_DEVICE_NAME "\\Device\\Beep" -#define DD_BEEP_DEVICE_NAME_U L"\\Device\\Beep" +#define DD_BEEP_DEVICE_NAME "\\Device\\Beep" +#define DD_BEEP_DEVICE_NAME_U L"\\Device\\Beep" +#define BEEP_FREQUENCY_MINIMUM 0x25 +#define BEEP_FREQUENCY_MAXIMUM 0x7FFF +#define IOCTL_BEEP_SET CTL_CODE(FILE_DEVICE_BEEP, 0, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_BEEP_SET \ - CTL_CODE(FILE_DEVICE_BEEP, 0, METHOD_BUFFERED, FILE_ANY_ACCESS) - -typedef struct _BEEP_SET_PARAMETERS { - ULONG Frequency; - ULONG Duration; +typedef struct _BEEP_SET_PARAMETERS +{ + ULONG Frequency; + ULONG Duration; } BEEP_SET_PARAMETERS, *PBEEP_SET_PARAMETERS; - -#define BEEP_FREQUENCY_MINIMUM 0x25 -#define BEEP_FREQUENCY_MAXIMUM 0x7FFF #ifdef __cplusplus } #endif +#endif -#endif /* __NTDDBEEP_H */ Modified: trunk/reactos/include/ddk/ntddtdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddtdi.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ntddtdi.h (original) +++ trunk/reactos/include/ddk/ntddtdi.h Thu Nov 23 23:19:54 2006 @@ -1,59 +1,30 @@ -/* - * ntddtdi.h - * - * TDI IOCTL interface - * - * This file is part of the w32api package. - * - * Contributors: - * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - */ -#ifndef __NTDDTDI_H -#define __NTDDTDI_H - -#if __GNUC__ >=3 -#pragma GCC system_header -#endif +#ifndef _NTDDTDI_ +#define _NTDDTDI_ #ifdef __cplusplus extern "C" { #endif -#define DD_TDI_DEVICE_NAME "\\Device\\UNKNOWN" -#define DD_TDI_DEVICE_NAME_U L"\\Device\\UNKNOWN" - -#define _TDI_CONTROL_CODE(Request, Method) \ - CTL_CODE(FILE_DEVICE_TRANSPORT, Request, Method, FILE_ANY_ACCESS) - -#define IOCTL_TDI_ACCEPT _TDI_CONTROL_CODE(0, METHOD_BUFFERED) -#define IOCTL_TDI_CONNECT _TDI_CONTROL_CODE(1, METHOD_BUFFERED) -#define IOCTL_TDI_DISCONNECT _TDI_CONTROL_CODE(2, METHOD_BUFFERED) -#define IOCTL_TDI_LISTEN _TDI_CONTROL_CODE(3, METHOD_BUFFERED) -#define IOCTL_TDI_QUERY_INFORMATION _TDI_CONTROL_CODE(4, METHOD_OUT_DIRECT) -#define IOCTL_TDI_RECEIVE _TDI_CONTROL_CODE(5, METHOD_OUT_DIRECT) -#define IOCTL_TDI_RECEIVE_DATAGRAM _TDI_CONTROL_CODE(6, METHOD_OUT_DIRECT) -#define IOCTL_TDI_SEND _TDI_CONTROL_CODE(7, METHOD_IN_DIRECT) -#define IOCTL_TDI_SEND_DATAGRAM _TDI_CONTROL_CODE(8, METHOD_IN_DIRECT) -#define IOCTL_TDI_SET_EVENT_HANDLER _TDI_CONTROL_CODE(9, METHOD_BUFFERED) -#define IOCTL_TDI_SET_INFORMATION _TDI_CONTROL_CODE(10, METHOD_IN_DIRECT) -#define IOCTL_TDI_ASSOCIATE_ADDRESS _TDI_CONTROL_CODE(11, METHOD_BUFFERED) -#define IOCTL_TDI_DISASSOCIATE_ADDRESS _TDI_CONTROL_CODE(12, METHOD_BUFFERED) -#define IOCTL_TDI_ACTION _TDI_CONTROL_CODE(13, METHOD_OUT_DIRECT) +#define DD_TDI_DEVICE_NAME "\\Device\\UNKNOWN" +#define _TDI_CONTROL_CODE(request,method) CTL_CODE(FILE_DEVICE_TRANSPORT, request, method, FILE_ANY_ACCESS) +#define IOCTL_TDI_ACCEPT _TDI_CONTROL_CODE( 0, METHOD_BUFFERED ) +#define IOCTL_TDI_CONNECT _TDI_CONTROL_CODE( 1, METHOD_BUFFERED ) +#define IOCTL_TDI_DISCONNECT _TDI_CONTROL_CODE( 2, METHOD_BUFFERED ) +#define IOCTL_TDI_LISTEN _TDI_CONTROL_CODE( 3, METHOD_BUFFERED ) +#define IOCTL_TDI_QUERY_INFORMATION _TDI_CONTROL_CODE( 4, METHOD_OUT_DIRECT ) +#define IOCTL_TDI_RECEIVE _TDI_CONTROL_CODE( 5, METHOD_OUT_DIRECT ) +#define IOCTL_TDI_RECEIVE_DATAGRAM _TDI_CONTROL_CODE( 6, METHOD_OUT_DIRECT ) +#define IOCTL_TDI_SEND _TDI_CONTROL_CODE( 7, METHOD_IN_DIRECT ) +#define IOCTL_TDI_SEND_DATAGRAM _TDI_CONTROL_CODE( 8, METHOD_IN_DIRECT ) +#define IOCTL_TDI_SET_EVENT_HANDLER _TDI_CONTROL_CODE( 9, METHOD_BUFFERED ) +#define IOCTL_TDI_SET_INFORMATION _TDI_CONTROL_CODE( 10, METHOD_IN_DIRECT ) +#define IOCTL_TDI_ASSOCIATE_ADDRESS _TDI_CONTROL_CODE( 11, METHOD_BUFFERED ) +#define IOCTL_TDI_DISASSOCIATE_ADDRESS _TDI_CONTROL_CODE( 12, METHOD_BUFFERED ) +#define IOCTL_TDI_ACTION _TDI_CONTROL_CODE( 13, METHOD_OUT_DIRECT ) #ifdef __cplusplus } #endif -#endif /* __NTDDTDI_H */ +#endif Modified: trunk/reactos/include/ddk/ntnls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntnls.h?rev=24… ============================================================================== --- trunk/reactos/include/ddk/ntnls.h (original) +++ trunk/reactos/include/ddk/ntnls.h Thu Nov 23 23:19:54 2006 @@ -1,52 +1,37 @@ -/* - * ntnls.h - * - * Structures and definitions for NLS data types. - * - * This file is part of the w32api package. - * - * Contributors: - * Created by Alex Ionescu <alex(a)relsoft.net> - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - */ -#ifndef __NTNLS_H -#define __NTNLS_H +#ifndef _NTNLS_ +#define _NTNLS_ + +#ifdef __cplusplus +extern "C" { +#endif #define MAXIMUM_LEADBYTES 12 - typedef struct _CPTABLEINFO { - USHORT CodePage; - USHORT MaximumCharacterSize; - USHORT DefaultChar; - USHORT UniDefaultChar; - USHORT TransDefaultChar; - USHORT TransUniDefaultChar; - USHORT DBCSCodePage; - UCHAR LeadByte[MAXIMUM_LEADBYTES]; - PUSHORT MultiByteTable; - PVOID WideCharTable; - PUSHORT DBCSRanges; - PUSHORT DBCSOffsets; + USHORT CodePage; + USHORT MaximumCharacterSize; + USHORT DefaultChar; + USHORT UniDefaultChar; + USHORT TransDefaultChar; + USHORT TransUniDefaultChar; + USHORT DBCSCodePage; + UCHAR LeadByte[MAXIMUM_LEADBYTES]; + PUSHORT MultiByteTable; + PVOID WideCharTable; + PUSHORT DBCSRanges; + PUSHORT DBCSOffsets; } CPTABLEINFO, *PCPTABLEINFO; typedef struct _NLSTABLEINFO { - CPTABLEINFO OemTableInfo; - CPTABLEINFO AnsiTableInfo; - PUSHORT UpperCaseTable; - PUSHORT LowerCaseTable; + CPTABLEINFO OemTableInfo; + CPTABLEINFO AnsiTableInfo; + PUSHORT UpperCaseTable; + PUSHORT LowerCaseTable; } NLSTABLEINFO, *PNLSTABLEINFO; -#endif /* __NTNLS_H */ +#ifdef __cplusplus +} +#endif +#endif Added: trunk/reactos/include/ddk/objerror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/objerror.h?rev… ============================================================================== --- trunk/reactos/include/ddk/objerror.h (added) +++ trunk/reactos/include/ddk/objerror.h Thu Nov 23 23:19:54 2006 @@ -1,0 +1,13 @@ + +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: + * PURPOSE: Directx headers + * PROGRAMMER: Magnus Olsen (greatlrd) + * + */ + +#include <winerror.h> + Modified: trunk/reactos/include/ddk/usbiodef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usbiodef.h?rev… ============================================================================== --- trunk/reactos/include/ddk/usbiodef.h (original) +++ trunk/reactos/include/ddk/usbiodef.h Thu Nov 23 23:19:54 2006 @@ -1,104 +1,52 @@ -/* - * usbiodef.h - * - * USB IOCTL definitions - * - * This file is part of the w32api package. - * - * Contributors: - * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - */ -#ifndef __USBIODEF_H -#define __USBIODEF_H -#if __GNUC__ >=3 -#pragma GCC system_header +#ifndef __USBIODEF_H__ +#define __USBIODEF_H__ + +DEFINE_GUID(GUID_DEVINTERFACE_USB_HUB, 0xF18A0E88, 0xc30C, 0x11D0, 0x88, 0x15, 0x00, 0xA0, 0xC9, 0x06, 0xBE, 0xD8); +DEFINE_GUID(GUID_DEVINTERFACE_USB_DEVICE, 0xA5DCBF10L, 0x6530, 0x11D2, 0x90, 0x1F, 0x00, 0xC0, 0x4F, 0xB9, 0x51, 0xED); +DEFINE_GUID(GUID_DEVINTERFACE_USB_HOST_CONTROLLER, 0x3ABF6F2D, 0x71C4, 0x462A, 0x8A, 0x92, 0x1E, 0x68, 0x61, 0xE6, 0xAF, 0x27); +DEFINE_GUID(GUID_USB_WMI_STD_DATA, 0x4E623B20L, 0xCB14, 0x11D1, 0xB3, 0x31, 0x00, 0xA0, 0xC9, 0x59, 0xBB, 0xD2); +DEFINE_GUID(GUID_USB_WMI_STD_NOTIFICATION, 0x4E623B20L, 0xCB14, 0x11D1, 0xB3, 0x31, 0x00, 0xA0, 0xC9, 0x59, 0xBB, 0xD2); + +#define GUID_CLASS_USBHUB GUID_DEVINTERFACE_USB_HUB +#define GUID_CLASS_USB_DEVICE GUID_DEVINTERFACE_USB_DEVICE +#define GUID_CLASS_USB_HOST_CONTROLLER GUID_DEVINTERFACE_USB_HOST_CONTROLLER +#define HCD_GET_STATS_1 255 +#define HCD_DIAGNOSTIC_MODE_ON 256 +#define HCD_DIAGNOSTIC_MODE_OFF 257 +#define HCD_GET_ROOT_HUB_NAME 258 +#define HCD_GET_DRIVERKEY_NAME 265 +#define HCD_GET_STATS_2 266 +#define HCD_DISABLE_PORT 268 +#define HCD_ENABLE_PORT 269 +#define HCD_USER_REQUEST 270 +#define USB_SUBMIT_URB 0 +#define USB_RESET_PORT 1 +#define USB_GET_ROOTHUB_PDO 3 +#define USB_GET_PORT_STATUS 4 +#define USB_ENABLE_PORT 5 +#define USB_GET_HUB_COUNT 6 +#define USB_CYCLE_PORT 7 +#define USB_GET_HUB_NAME 8 +#define USB_IDLE_NOTIFICATION 9 +#define USB_GET_BUS_INFO 264 +#define USB_GET_CONTROLLER_NAME 265 +#define USB_GET_BUSGUID_INFO 266 +#define USB_GET_PARENT_HUB_INFO 267 +#define USB_GET_DEVICE_HANDLE 268 +#define USB_GET_NODE_INFORMATION 258 +#define USB_GET_NODE_CONNECTION_INFORMATION 259 +#define USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION 260 +#define USB_GET_NODE_CONNECTION_NAME 261 +#define USB_DIAG_IGNORE_HUBS_ON 262 +#define USB_DIAG_IGNORE_HUBS_OFF 263 +#define USB_GET_NODE_CONNECTION_DRIVERKEY_NAME 264 +#define USB_GET_HUB_CAPABILITIES 271 +#define USB_GET_NODE_CONNECTION_ATTRIBUTES 272 +#define USB_HUB_CYCLE_PORT 273 +#define USB_GET_NODE_CONNECTION_INFORMATION_EX 274 +#define FILE_DEVICE_USB FILE_DEVICE_UNKNOWN +#define USB_CTL(id) CTL_CODE(FILE_DEVICE_USB, (id), METHOD_BUFFERED, FILE_ANY_ACCESS) +#define USB_KERNEL_CTL(id) CTL_CODE(FILE_DEVICE_USB, (id), METHOD_NEITHER, FILE_ANY_ACCESS) #endif - -#ifdef __cplusplus -extern "C" { -#endif - -DEFINE_GUID(GUID_DEVINTERFACE_USB_HUB, \ - 0xf18a0e88, 0xc30c, 0x11d0, 0x88, 0x15, 0x00, 0xa0, 0xc9, 0x06, 0xbe, 0xd8); - -DEFINE_GUID(GUID_DEVINTERFACE_USB_DEVICE, - 0xA5DCBF10L, 0x6530, 0x11D2, 0x90, 0x1F, 0x00, 0xC0, 0x4F, 0xB9, 0x51, 0xED); - -DEFINE_GUID(GUID_DEVINTERFACE_USB_HOST_CONTROLLER, - 0x3abf6f2d, 0x71c4, 0x462a, 0x8a, 0x92, 0x1e, 0x68, 0x61, 0xe6, 0xaf, 0x27); - -DEFINE_GUID(GUID_USB_WMI_STD_DATA, - 0x4E623B20L, 0xCB14, 0x11D1, 0xB3, 0x31, 0x00, 0xA0, 0xC9, 0x59, 0xBB, 0xD2); - -DEFINE_GUID(GUID_USB_WMI_STD_NOTIFICATION, - 0x4E623B20L, 0xCB14, 0x11D1, 0xB3, 0x31, 0x00, 0xA0, 0xC9, 0x59, 0xBB, 0xD2); - -#define GUID_CLASS_USBHUB GUID_DEVINTERFACE_USB_HUB -#define GUID_CLASS_USB_DEVICE GUID_DEVINTERFACE_USB_DEVICE -#define GUID_CLASS_USB_HOST_CONTROLLER GUID_DEVINTERFACE_USB_HOST_CONTROLLER - -#define USB_SUBMIT_URB 0 -#define USB_RESET_PORT 1 -#define USB_GET_ROOTHUB_PDO 3 -#define USB_GET_PORT_STATUS 4 -#define USB_ENABLE_PORT 5 -#define USB_GET_HUB_COUNT 6 -#define USB_CYCLE_PORT 7 -#define USB_GET_HUB_NAME 8 -#define USB_IDLE_NOTIFICATION 9 -#define USB_GET_BUS_INFO 264 -#define USB_GET_CONTROLLER_NAME 265 -#define USB_GET_BUSGUID_INFO 266 -#define USB_GET_PARENT_HUB_INFO 267 -#define USB_GET_DEVICE_HANDLE 268 - -#define HCD_GET_STATS_1 255 -#define HCD_DIAGNOSTIC_MODE_ON 256 -#define HCD_DIAGNOSTIC_MODE_OFF 257 -#define HCD_GET_ROOT_HUB_NAME 258 -#define HCD_GET_DRIVERKEY_NAME 265 -#define HCD_GET_STATS_2 266 -#define HCD_DISABLE_PORT 268 -#define HCD_ENABLE_PORT 269 -#define HCD_USER_REQUEST 270 - -#define USB_GET_NODE_INFORMATION 258 -#define USB_GET_NODE_CONNECTION_INFORMATION 259 -#define USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION 260 -#define USB_GET_NODE_CONNECTION_NAME 261 -#define USB_DIAG_IGNORE_HUBS_ON 262 -#define USB_DIAG_IGNORE_HUBS_OFF 263 -#define USB_GET_NODE_CONNECTION_DRIVERKEY_NAME 264 -#define USB_GET_HUB_CAPABILITIES 271 -#define USB_GET_NODE_CONNECTION_ATTRIBUTES 272 - -#define FILE_DEVICE_USB FILE_DEVICE_UNKNOWN - -#define USB_CTL(id) CTL_CODE(FILE_DEVICE_USB, \ - (id), \ - METHOD_BUFFERED, \ - FILE_ANY_ACCESS) - -#define USB_KERNEL_CTL(id) CTL_CODE(FILE_DEVICE_USB, \ - (id), \ - METHOD_NEITHER, \ - FILE_ANY_ACCESS) - -#ifdef __cplusplus -} -#endif - -#endif /* __USBIODEF_H */

1 0

[greatlrd] 24815: adding two new ddk header, the info are base/got from windows xp ddk kit version 3790.1830
by greatlrd＠svn.reactos.org 23 Nov '06

23 Nov '06

Author: greatlrd Date: Thu Nov 23 23:13:17 2006 New Revision: 24815 URL: http://svn.reactos.org/svn/reactos?rev=24815&view=rev Log: adding two new ddk header, the info are base/got from windows xp ddk kit version 3790.1830 Added: trunk/reactos/include/ddk/lmon.h Modified: trunk/reactos/include/ddk/netpnp.h Added: trunk/reactos/include/ddk/lmon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/lmon.h?rev=248… ============================================================================== --- trunk/reactos/include/ddk/lmon.h (added) +++ trunk/reactos/include/ddk/lmon.h Thu Nov 23 23:13:17 2006 @@ -1,0 +1,27 @@ + + +#ifdef UNICODE +#define PORT_INFO_FF PORT_INFO_FFW +#define PPORT_INFO_FF PPORT_INFO_FFW +#define LPPORT_INFO_FF LPPORT_INFO_FFW +#else +#define PORT_INFO_FF PORT_INFO_FFA +#define PPORT_INFO_FF PPORT_INFO_FFA +#define LPPORT_INFO_FF LPPORT_INFO_FFA +#endif + +typedef struct _PORT_INFO_FFW +{ + LPWSTR pName; + DWORD cbMonitorData; + LPBYTE pMonitorData; +} PORT_INFO_FFW, *PPORT_INFO_FFW, *LPPORT_INFO_FFW; + +typedef struct _PORT_INFO_FFA +{ + LPSTR pName; + DWORD cbMonitorData; + LPBYTE pMonitorData; +} PORT_INFO_FFA, *PPORT_INFO_FFA, *LPPORT_INFO_FFA; + + Modified: trunk/reactos/include/ddk/netpnp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/netpnp.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/netpnp.h (original) +++ trunk/reactos/include/ddk/netpnp.h Thu Nov 23 23:13:17 2006 @@ -1,69 +1,39 @@ -/* - * netpnp.h - * - * Network Plug and Play event support - * - * This file is part of the w32api package. - * - * Contributors: - * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - */ +#ifndef __NET_PNP__ +#define __NET_PNP__ -#ifndef __NETPNP_H -#define __NETPNP_H +typedef enum _NET_DEVICE_POWER_STATE +{ + NetDeviceStateUnspecified = 0, + NetDeviceStateD0, + NetDeviceStateD1, + NetDeviceStateD2, + NetDeviceStateD3, + NetDeviceStateMaximum +} NET_DEVICE_POWER_STATE, *PNET_DEVICE_POWER_STATE; -#if __GNUC__ >=3 -#pragma GCC system_header -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -typedef enum _NET_PNP_EVENT_CODE { - NetEventSetPower, - NetEventQueryPower, - NetEventQueryRemoveDevice, - NetEventCancelRemoveDevice, - NetEventReconfigure, - NetEventBindList, - NetEventBindsComplete, - NetEventPnPCapabilities, - NetEventMaximum +typedef enum _NET_PNP_EVENT_CODE +{ + NetEventSetPower, + NetEventQueryPower, + NetEventQueryRemoveDevice, + NetEventCancelRemoveDevice, + NetEventReconfigure, + NetEventBindList, + NetEventBindsComplete, + NetEventPnPCapabilities, + NetEventMaximum } NET_PNP_EVENT_CODE, *PNET_PNP_EVENT_CODE; -typedef struct _NET_PNP_EVENT { - NET_PNP_EVENT_CODE NetEvent; - PVOID Buffer; - ULONG BufferLength; - ULONG_PTR NdisReserved[4]; - ULONG_PTR TransportReserved[4]; - ULONG_PTR TdiReserved[4]; - ULONG_PTR TdiClientReserved[4]; +typedef struct _NET_PNP_EVENT +{ + NET_PNP_EVENT_CODE NetEvent; + PVOID Buffer; + ULONG BufferLength; + ULONG_PTR NdisReserved[4]; + ULONG_PTR TransportReserved[4]; + ULONG_PTR TdiReserved[4]; + ULONG_PTR TdiClientReserved[4]; } NET_PNP_EVENT, *PNET_PNP_EVENT; -typedef enum _NET_DEVICE_POWER_STATE { - NetDeviceStateUnspecified, - NetDeviceStateD0, - NetDeviceStateD1, - NetDeviceStateD2, - NetDeviceStateD3, - NetDeviceStateMaximum -} NET_DEVICE_POWER_STATE, *PNET_DEVICE_POWER_STATE; +#endif -#ifdef __cplusplus -} -#endif - -#endif /* __NETPNP_H */

1 0

[greatlrd] 24814: adding one new ddk header, the info are base/got from windows xp ddk kit version 3790.1830
by greatlrd＠svn.reactos.org 23 Nov '06

23 Nov '06

Author: greatlrd Date: Thu Nov 23 23:09:07 2006 New Revision: 24814 URL: http://svn.reactos.org/svn/reactos?rev=24814&view=rev Log: adding one new ddk header, the info are base/got from windows xp ddk kit version 3790.1830 Added: trunk/reactos/include/ddk/ksdebug.h Added: trunk/reactos/include/ddk/ksdebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ksdebug.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ksdebug.h (added) +++ trunk/reactos/include/ddk/ksdebug.h Thu Nov 23 23:09:07 2006 @@ -1,0 +1,116 @@ + +#if !defined(_KSDEBUG_) +#define _KSDEBUG_ + +#if !defined(REMIND) +#define QUOTE(x) #x +#define QQUOTE(y) QUOTE(y) +#define REMIND(str) __FILE__ "(" QQUOTE(__LINE__) ") : " str +#endif + +#if defined(__cplusplus) +extern "C" { +#endif +#if defined(_NTDDK_) + +#define DEBUGLVL_ERROR 0 +#define DEBUGLVL_TERSE 1 +#define DEBUGLVL_VERBOSE 2 +#define DEBUGLVL_BLAB 3 + + + +#if (DBG) + +#if defined(IRPMJFUNCDESC) +static const PCHAR IrpMjFuncDesc[] = +{ + "IRP_MJ_CREATE", + "IRP_MJ_CREATE_NAMED_PIPE", + "IRP_MJ_CLOSE", + "IRP_MJ_READ", + "IRP_MJ_WRITE", + "IRP_MJ_QUERY_INFORMATION", + "IRP_MJ_SET_INFORMATION", + "IRP_MJ_QUERY_EA", + "IRP_MJ_SET_EA", + "IRP_MJ_FLUSH_BUFFERS", + "IRP_MJ_QUERY_VOLUME_INFORMATION", + "IRP_MJ_SET_VOLUME_INFORMATION", + "IRP_MJ_DIRECTORY_CONTROL", + "IRP_MJ_FILE_SYSTEM_CONTROL", + "IRP_MJ_DEVICE_CONTROL", + "IRP_MJ_INTERNAL_DEVICE_CONTROL", + "IRP_MJ_SHUTDOWN", + "IRP_MJ_LOCK_CONTROL", + "IRP_MJ_CLEANUP", + "IRP_MJ_CREATE_MAILSLOT", + "IRP_MJ_QUERY_SECURITY", + "IRP_MJ_SET_SECURITY", + "IRP_MJ_SET_POWER", + "IRP_MJ_QUERY_POWER" +}; +#endif +#endif + +#if (DBG) + #if !defined( DEBUG_LEVEL ) + #if defined( DEBUG_VARIABLE ) + #if defined( KSDEBUG_INIT ) + ULONG DEBUG_VARIABLE = DEBUGLVL_TERSE; + #else + extern ULONG DEBUG_VARIABLE; + #endif + #else + #define DEBUG_VARIABLE DEBUGLVL_TERSE + #endif + #else + #if defined( DEBUG_VARIABLE ) + #if defined( KSDEBUG_INIT ) + ULONG DEBUG_VARIABLE = DEBUG_LEVEL; + #else + extern ULONG DEBUG_VARIABLE; + #endif + #else + #define DEBUG_VARIABLE DEBUG_LEVEL + #endif + #endif + + #define _DbgPrintFEx(component, lvl, strings) \ + { \ + if ((lvl) <= DEBUG_VARIABLE)\ + {\ + DbgPrintEx(component, lvl, STR_MODULENAME);\ + DbgPrintEx(component, lvl, strings);\ + DbgPrintEx(component, lvl, "\n");\ + if ((lvl) == DEBUGLVL_ERROR)\ + {\ + DbgBreakPoint();\ + } \ + } \ + } + + #define _DbgPrintF(lvl, strings)\ + { \ + if (((lvl)==DEBUG_VARIABLE) || (lvl < DEBUG_VARIABLE))\ + {\ + DbgPrint(STR_MODULENAME);\ + DbgPrint##strings;\ + DbgPrint("\n");\ + if ((lvl) == DEBUGLVL_ERROR)\ + {\ + DbgBreakPoint();\ + } \ + } \ + } +#else + #define _DbgPrintF(lvl, strings) + #define _DbgPrintFEx(component, lvl, strings) +#endif +#endif + + +#if defined(__cplusplus) +} +#endif +#endif

1 0

[greatlrd] 24813: adding two new ddk header, the info are base/got from windows xp ddk kit version 3790.1830
by greatlrd＠svn.reactos.org 23 Nov '06

23 Nov '06

Author: greatlrd Date: Thu Nov 23 23:06:14 2006 New Revision: 24813 URL: http://svn.reactos.org/svn/reactos?rev=24813&view=rev Log: adding two new ddk header, the info are base/got from windows xp ddk kit version 3790.1830 Added: trunk/reactos/include/ddk/dxapi.h trunk/reactos/include/ddk/fltsafe.h Added: trunk/reactos/include/ddk/dxapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/dxapi.h?rev=24… ============================================================================== --- trunk/reactos/include/ddk/dxapi.h (added) +++ trunk/reactos/include/ddk/dxapi.h Thu Nov 23 23:06:14 2006 @@ -1,0 +1,4 @@ + +ULONG DxApiGetVersion(); +ULONG DxApi( IN ULONG dwFunctionNum,IN PVOID lpvInBuffer, IN ULONG cbInBuffer, + IN PVOID lpvOutBuffer, IN ULONG cbOutBuffer); Added: trunk/reactos/include/ddk/fltsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/fltsafe.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/fltsafe.h (added) +++ trunk/reactos/include/ddk/fltsafe.h Thu Nov 23 23:06:14 2006 @@ -1,0 +1,19 @@ + +struct FLOATSAFE +{ + KFLOATING_SAVE FloatSave; + NTSTATUS ntStatus; + + FLOATSAFE::FLOATSAFE(void) + { + ntStatus = KeSaveFloatingPointState(&FloatSave); + } + + FLOATSAFE::~FLOATSAFE(void) + { + if (NT_SUCCESS(ntStatus)) + { + KeRestoreFloatingPointState(&FloatSave); + } + } +};

1 0

[greatlrd] 24812: update : ddk header, the info are base/got from windows xp ddk kit version 3790.1830
by greatlrd＠svn.reactos.org 23 Nov '06

23 Nov '06

Author: greatlrd Date: Thu Nov 23 22:48:12 2006 New Revision: 24812 URL: http://svn.reactos.org/svn/reactos?rev=24812&view=rev Log: update : ddk header, the info are base/got from windows xp ddk kit version 3790.1830 Modified: trunk/reactos/include/ddk/mountdev.h trunk/reactos/include/ddk/mountmgr.h Modified: trunk/reactos/include/ddk/mountdev.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/mountdev.h?rev… ============================================================================== --- trunk/reactos/include/ddk/mountdev.h (original) +++ trunk/reactos/include/ddk/mountdev.h Thu Nov 23 22:48:12 2006 @@ -1,78 +1,42 @@ -/* - * mountdev.h - * - * Mount point manager/mounted devices interface. - * - * This file is part of the w32api package. - * - * Contributors: - * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - */ - -#ifndef __MOUNTDEV_H -#define __MOUNTDEV_H - -#if __GNUC__ >=3 -#pragma GCC system_header -#endif - -#include "mountmgr.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define IOCTL_MOUNTDEV_QUERY_DEVICE_NAME \ - CTL_CODE(MOUNTDEVCONTROLTYPE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define IOCTL_MOUNTDEV_QUERY_UNIQUE_ID \ - CTL_CODE(MOUNTDEVCONTROLTYPE, 0, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define IOCTL_MOUNTDEV_UNIQUE_ID_CHANGE_NOTIFY \ - CTL_CODE(MOUNTDEVCONTROLTYPE, 1, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define IOCTL_MOUNTDEV_QUERY_SUGGESTED_LINK_NAME \ - CTL_CODE(MOUNTDEVCONTROLTYPE, 3, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define IOCTL_MOUNTDEV_LINK_CREATED \ - CTL_CODE(MOUNTDEVCONTROLTYPE, 4, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define IOCTL_MOUNTDEV_LINK_DELETED \ - CTL_CODE(MOUNTDEVCONTROLTYPE, 5, METHOD_BUFFERED, FILE_ANY_ACCESS) -typedef struct _MOUNTDEV_SUGGESTED_LINK_NAME { - BOOLEAN UseOnlyIfThereAreNoOtherLinks; - USHORT NameLength; - WCHAR Name[1]; +#ifndef _MOUNTDEV_ +#define _MOUNTDEV_ + +#include <mountmgr.h> + +#define IOCTL_MOUNTDEV_QUERY_UNIQUE_ID CTL_CODE(MOUNTDEVCONTROLTYPE, 0, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_MOUNTDEV_UNIQUE_ID_CHANGE_NOTIFY CTL_CODE(MOUNTDEVCONTROLTYPE, 1, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_MOUNTDEV_QUERY_SUGGESTED_LINK_NAME CTL_CODE(MOUNTDEVCONTROLTYPE, 3, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_MOUNTDEV_LINK_CREATED CTL_CODE(MOUNTDEVCONTROLTYPE, 4, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_MOUNTDEV_LINK_DELETED CTL_CODE(MOUNTDEVCONTROLTYPE, 5, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_MOUNTDEV_QUERY_STABLE_GUID CTL_CODE(MOUNTDEVCONTROLTYPE, 6, METHOD_BUFFERED, FILE_ANY_ACCESS) + +typedef struct _MOUNTDEV_UNIQUE_ID_CHANGE_NOTIFY_OUTPUT +{ + ULONG Size; + USHORT OldUniqueIdOffset; + USHORT OldUniqueIdLength; + USHORT NewUniqueIdOffset; + USHORT NewUniqueIdLength; +} MOUNTDEV_UNIQUE_ID_CHANGE_NOTIFY_OUTPUT, *PMOUNTDEV_UNIQUE_ID_CHANGE_NOTIFY_OUTPUT; + +typedef struct _MOUNTDEV_SUGGESTED_LINK_NAME +{ + BOOLEAN UseOnlyIfThereAreNoOtherLinks; + USHORT NameLength; + WCHAR Name[1]; } MOUNTDEV_SUGGESTED_LINK_NAME, *PMOUNTDEV_SUGGESTED_LINK_NAME; -typedef struct _MOUNTDEV_UNIQUE_ID { - USHORT UniqueIdLength; - UCHAR UniqueId[1]; +typedef struct _MOUNTDEV_UNIQUE_ID +{ + USHORT UniqueIdLength; + UCHAR UniqueId[1]; } MOUNTDEV_UNIQUE_ID, *PMOUNTDEV_UNIQUE_ID; -typedef struct _MOUNTDEV_UNIQUE_ID_CHANGE_NOTIFY_OUTPUT { - ULONG Size; - USHORT OldUniqueIdOffset; - USHORT OldUniqueIdLength; - USHORT NewUniqueIdOffset; - USHORT NewUniqueIdLength; -} MOUNTDEV_UNIQUE_ID_CHANGE_NOTIFY_OUTPUT; +typedef struct _MOUNTDEV_STABLE_GUID +{ + GUID StableGuid; +} MOUNTDEV_STABLE_GUID, *PMOUNTDEV_STABLE_GUID; -#ifdef __cplusplus -} #endif - -#endif /* __MOUNTDEV_H */ Modified: trunk/reactos/include/ddk/mountmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/mountmgr.h?rev… ============================================================================== --- trunk/reactos/include/ddk/mountmgr.h (original) +++ trunk/reactos/include/ddk/mountmgr.h Thu Nov 23 22:48:12 2006 @@ -1,137 +1,130 @@ -/* - * mountmgr.h - * - * Mount point manager interface. - * - * This file is part of the w32api package. - * - * Contributors: - * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - */ -#ifndef __MOUNTMGR_H -#define __MOUNTMGR_H +#ifndef _MOUNTMGR_ +#define _MOUNTMGR_ -#if __GNUC__ >=3 -#pragma GCC system_header +DEFINE_GUID(MOUNTDEV_MOUNTED_DEVICE_GUID, 0x53F5630D, 0xB6BF, 0x11D0, 0x94, 0xF2, 0x00, 0xA0, 0xC9, 0x1E, 0xFB, 0x8B); + +#define MOUNTMGR_DEVICE_NAME L"\\Device\\MountPointManager" +#define MOUNTMGR_DOS_DEVICE_NAME L"\\\\.\\MountPointManager" +#define MOUNTMGRCONTROLTYPE ((ULONG) 'm') +#define MOUNTDEVCONTROLTYPE ((ULONG) 'M') + +#define IOCTL_MOUNTMGR_CREATE_POINT \ + CTL_CODE(MOUNTMGRCONTROLTYPE, 0, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_MOUNTMGR_DELETE_POINTS \ + CTL_CODE(MOUNTMGRCONTROLTYPE, 1, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_MOUNTMGR_QUERY_POINTS \ + CTL_CODE(MOUNTMGRCONTROLTYPE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_MOUNTMGR_DELETE_POINTS_DBONLY \ + CTL_CODE(MOUNTMGRCONTROLTYPE, 3, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_MOUNTMGR_NEXT_DRIVE_LETTER \ + CTL_CODE(MOUNTMGRCONTROLTYPE, 4, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_MOUNTMGR_AUTO_DL_ASSIGNMENTS \ + CTL_CODE(MOUNTMGRCONTROLTYPE, 5, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_MOUNTMGR_VOLUME_MOUNT_POINT_CREATED \ + CTL_CODE(MOUNTMGRCONTROLTYPE, 6, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_MOUNTMGR_VOLUME_MOUNT_POINT_DELETED \ + CTL_CODE(MOUNTMGRCONTROLTYPE, 7, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_MOUNTMGR_CHANGE_NOTIFY \ + CTL_CODE(MOUNTMGRCONTROLTYPE, 8, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_MOUNTMGR_KEEP_LINKS_WHEN_OFFLINE \ + CTL_CODE(MOUNTMGRCONTROLTYPE, 9, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_MOUNTMGR_CHECK_UNPROCESSED_VOLUMES \ + CTL_CODE(MOUNTMGRCONTROLTYPE, 10, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_MOUNTMGR_VOLUME_ARRIVAL_NOTIFICATION \ + CTL_CODE(MOUNTMGRCONTROLTYPE, 11, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_MOUNTMGR_QUERY_DOS_VOLUME_PATH \ + CTL_CODE(MOUNTMGRCONTROLTYPE, 12, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_MOUNTMGR_QUERY_DOS_VOLUME_PATHS \ + CTL_CODE(MOUNTMGRCONTROLTYPE, 13, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_MOUNTDEV_QUERY_DEVICE_NAME \ + CTL_CODE(MOUNTDEVCONTROLTYPE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS) + +typedef struct _MOUNTDEV_NAME +{ + USHORT NameLength; + WCHAR Name[1]; +} MOUNTDEV_NAME, *PMOUNTDEV_NAME; + +typedef struct _MOUNTMGR_MOUNT_POINT +{ + ULONG SymbolicLinkNameOffset; + USHORT SymbolicLinkNameLength; + ULONG UniqueIdOffset; + USHORT UniqueIdLength; + ULONG DeviceNameOffset; + USHORT DeviceNameLength; +} MOUNTMGR_MOUNT_POINT, *PMOUNTMGR_MOUNT_POINT; + +typedef struct _MOUNTMGR_CREATE_POINT_INPUT +{ + USHORT SymbolicLinkNameOffset; + USHORT SymbolicLinkNameLength; + USHORT DeviceNameOffset; + USHORT DeviceNameLength; +} MOUNTMGR_CREATE_POINT_INPUT, *PMOUNTMGR_CREATE_POINT_INPUT; + +typedef struct _MOUNTMGR_MOUNT_POINTS +{ + ULONG Size; + ULONG NumberOfMountPoints; + MOUNTMGR_MOUNT_POINT MountPoints[1]; +} MOUNTMGR_MOUNT_POINTS, *PMOUNTMGR_MOUNT_POINTS; + +typedef struct _MOUNTMGR_DRIVE_LETTER_INFORMATION +{ + BOOLEAN DriveLetterWasAssigned; + UCHAR CurrentDriveLetter; +} MOUNTMGR_DRIVE_LETTER_INFORMATION, *PMOUNTMGR_DRIVE_LETTER_INFORMATION; + +typedef struct _MOUNTMGR_DRIVE_LETTER_TARGET +{ + USHORT DeviceNameLength; + WCHAR DeviceName[1]; +} MOUNTMGR_DRIVE_LETTER_TARGET, *PMOUNTMGR_DRIVE_LETTER_TARGET; + +typedef struct _MOUNTMGR_CHANGE_NOTIFY_INFO { + ULONG EpicNumber; +} MOUNTMGR_CHANGE_NOTIFY_INFO, *PMOUNTMGR_CHANGE_NOTIFY_INFO; + +typedef struct _MOUNTMGR_VOLUME_MOUNT_POINT +{ + USHORT SourceVolumeNameOffset; + USHORT SourceVolumeNameLength; + USHORT TargetVolumeNameOffset; + USHORT TargetVolumeNameLength; +} MOUNTMGR_VOLUME_MOUNT_POINT, *PMOUNTMGR_VOLUME_MOUNT_POINT; + +typedef struct _MOUNTMGR_TARGET_NAME +{ + USHORT DeviceNameLength; + WCHAR DeviceName[1]; +} MOUNTMGR_TARGET_NAME, *PMOUNTMGR_TARGET_NAME; + +typedef struct _MOUNTMGR_VOLUME_PATHS +{ + ULONG MultiSzLength; + WCHAR MultiSz[1]; +} MOUNTMGR_VOLUME_PATHS, *PMOUNTMGR_VOLUME_PATHS; + +#define MOUNTMGR_IS_DRIVE_LETTER(s) ((s)->Length == 28 && (s)->Buffer[0] == '\\' && (s)->Buffer[1] == 'D' && \ + (s)->Buffer[2] == 'o' && (s)->Buffer[3] == 's' && (s)->Buffer[4] == 'D' && \ + (s)->Buffer[5] == 'e' && \ (s)->Buffer[6] == 'v' && (s)->Buffer[7] == 'i' && \ + (s)->Buffer[8] == 'c' && (s)->Buffer[9] == 'e' && (s)->Buffer[10] == 's' && \ + (s)->Buffer[11] == '\\' && (s)->Buffer[12] >= 'A' && \ + (s)->Buffer[12] <= 'Z' && (s)->Buffer[13] == ':') + +#define MOUNTMGR_IS_VOLUME_NAME(s) (((s)->Length == 96 || ((s)->Length == 98 && (s)->Buffer[48] == '\\')) && \ + (s)->Buffer[0] == '\\'&& ((s)->Buffer[1] == '?' || (s)->Buffer[1] == '\\') && \ + (s)->Buffer[2] == '?' && (s)->Buffer[3] == '\\' && (s)->Buffer[4] == 'V' && \ + (s)->Buffer[5] == 'o' && (s)->Buffer[6] == 'l' && (s)->Buffer[7] == 'u' && \ + (s)->Buffer[8] == 'm' && (s)->Buffer[9] == 'e' && (s)->Buffer[10] == '{' && \ + (s)->Buffer[19] == '-' && (s)->Buffer[24] == '-' && (s)->Buffer[29] == '-' && \ + (s)->Buffer[34] == '-' && (s)->Buffer[47] == '}') + +#define MOUNTMGR_IS_DOS_VOLUME_NAME(s) (MOUNTMGR_IS_VOLUME_NAME(s) && (s)->Length == 96 && (s)->Buffer[1] == '\\') +#define MOUNTMGR_IS_DOS_VOLUME_NAME_WB(s) (MOUNTMGR_IS_VOLUME_NAME(s) && (s)->Length == 98 && (s)->Buffer[1] == '\\') +#define MOUNTMGR_IS_NT_VOLUME_NAME(s) ( MOUNTMGR_IS_VOLUME_NAME(s) && (s)->Length == 96 && (s)->Buffer[1] == '?') +#define MOUNTMGR_IS_NT_VOLUME_NAME_WB(s) (MOUNTMGR_IS_VOLUME_NAME(s) && (s)->Length == 98 && (s)->Buffer[1] == '?') #endif -#ifdef __cplusplus -extern "C" { -#endif - -DEFINE_GUID(MOUNTDEV_MOUNTED_DEVICE_GUID, - 0x53f5630d, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b); - -#define MOUNTMGRCONTROLTYPE ((ULONG)'m') -#define MOUNTDEVCONTROLTYPE ((ULONG)'M') - -#define MOUNTMGR_DEVICE_NAME L"\\Device\\MountPointManager" -#define MOUNTMGR_DOS_DEVICE_NAME L"\\\\.\\MountPointManager" - -#define IOCTL_MOUNTMGR_CREATE_POINT \ - CTL_CODE(MOUNTMGRCONTROLTYPE, 0, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) - -#define IOCTL_MOUNTMGR_QUERY_POINTS \ - CTL_CODE(MOUNTMGRCONTROLTYPE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define IOCTL_MOUNTMGR_DELETE_POINTS \ - CTL_CODE(MOUNTMGRCONTROLTYPE, 1, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) - -#define IOCTL_MOUNTMGR_DELETE_POINTS_DBONLY \ - CTL_CODE(MOUNTMGRCONTROLTYPE, 3, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) - -#define IOCTL_MOUNTMGR_NEXT_DRIVE_LETTER \ - CTL_CODE(MOUNTMGRCONTROLTYPE, 4, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) - -#define IOCTL_MOUNTMGR_AUTO_DL_ASSIGNMENTS \ - CTL_CODE(MOUNTMGRCONTROLTYPE, 5, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) - -#define IOCTL_MOUNTMGR_VOLUME_MOUNT_POINT_CREATED \ - CTL_CODE(MOUNTMGRCONTROLTYPE, 6, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) - -#define IOCTL_MOUNTMGR_VOLUME_MOUNT_POINT_DELETED \ - CTL_CODE(MOUNTMGRCONTROLTYPE, 7, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) - -#define IOCTL_MOUNTMGR_CHANGE_NOTIFY \ - CTL_CODE(MOUNTMGRCONTROLTYPE, 8, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_MOUNTMGR_KEEP_LINKS_WHEN_OFFLINE \ - CTL_CODE(MOUNTMGRCONTROLTYPE, 9, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) - -#define IOCTL_MOUNTMGR_CHECK_UNPROCESSED_VOLUMES \ - CTL_CODE(MOUNTMGRCONTROLTYPE, 10, METHOD_BUFFERED, FILE_READ_ACCESS) - -#define IOCTL_MOUNTMGR_VOLUME_ARRIVAL_NOTIFICATION \ - CTL_CODE(MOUNTMGRCONTROLTYPE, 11, METHOD_BUFFERED, FILE_READ_ACCESS) - - -typedef struct _MOUNTDEV_NAME { - USHORT NameLength; - WCHAR Name[1]; -} MOUNTDEV_NAME, *PMOUNTDEV_NAME; - -typedef struct _MOUNTMGR_CHANGE_NOTIFY_INFO { - ULONG EpicNumber; -} MOUNTMGR_CHANGE_NOTIFY_INFO, *PMOUNTMGR_CHANGE_NOTIFY_INFO; - -typedef struct _MOUNTMGR_CREATE_POINT_INPUT { - USHORT SymbolicLinkNameOffset; - USHORT SymbolicLinkNameLength; - USHORT DeviceNameOffset; - USHORT DeviceNameLength; -} MOUNTMGR_CREATE_POINT_INPUT, *PMOUNTMGR_CREATE_POINT_INPUT; - -typedef struct _MOUNTMGR_DRIVE_LETTER_INFORMATION { - BOOLEAN DriveLetterWasAssigned; - UCHAR CurrentDriveLetter; -} MOUNTMGR_DRIVE_LETTER_INFORMATION, *PMOUNTMGR_DRIVE_LETTER_INFORMATION; - -typedef struct _MOUNTMGR_DRIVE_LETTER_TARGET { - USHORT DeviceNameLength; - WCHAR DeviceName[1]; -} MOUNTMGR_DRIVE_LETTER_TARGET, *PMOUNTMGR_DRIVE_LETTER_TARGET; - -typedef struct _MOUNTMGR_MOUNT_POINT { - ULONG SymbolicLinkNameOffset; - USHORT SymbolicLinkNameLength; - ULONG UniqueIdOffset; - USHORT UniqueIdLength; - ULONG DeviceNameOffset; - USHORT DeviceNameLength; -} MOUNTMGR_MOUNT_POINT, *PMOUNTMGR_MOUNT_POINT; - -typedef struct _MOUNTMGR_MOUNT_POINTS { - ULONG Size; - ULONG NumberOfMountPoints; - MOUNTMGR_MOUNT_POINT MountPoints[1]; -} MOUNTMGR_MOUNT_POINTS, *PMOUNTMGR_MOUNT_POINTS; - -typedef struct _MOUNTMGR_TARGET_NAME { - USHORT DeviceNameLength; - WCHAR DeviceName[1]; -} MOUNTMGR_TARGET_NAME, *PMOUNTMGR_TARGET_NAME; - -typedef struct _MOUNTMGR_VOLUME_MOUNT_POINT { - USHORT SourceVolumeNameOffset; - USHORT SourceVolumeNameLength; - USHORT TargetVolumeNameOffset; - USHORT TargetVolumeNameLength; -} MOUNTMGR_VOLUME_MOUNT_POINT, *PMOUNTMGR_VOLUME_MOUNT_POINT; - -#ifdef __cplusplus -} -#endif - -#endif /* __MOUNTMGR_H */

1 0

[greatlrd] 24811: update : ddk header, the info are base/got from windows xp ddk kit version 3790.1830
by greatlrd＠svn.reactos.org 23 Nov '06

23 Nov '06

Author: greatlrd Date: Thu Nov 23 21:49:17 2006 New Revision: 24811 URL: http://svn.reactos.org/svn/reactos?rev=24811&view=rev Log: update : ddk header, the info are base/got from windows xp ddk kit version 3790.1830 Modified: trunk/reactos/include/ddk/dvp.h Modified: trunk/reactos/include/ddk/dvp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/dvp.h?rev=2481… ============================================================================== --- trunk/reactos/include/ddk/dvp.h (original) +++ trunk/reactos/include/ddk/dvp.h Thu Nov 23 21:49:17 2006 @@ -12,41 +12,59 @@ #ifndef __DVP_INCLUDED__ #define __DVP_INCLUDED__ -DEFINE_GUID( IID_IDDVideoPortContainer, 0x6C142760,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 ); -DEFINE_GUID( IID_IDirectDrawVideoPort, 0xB36D93E0,0x2B43,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56 ); -DEFINE_GUID( IID_IDirectDrawVideoPortNotify, 0xA655FB94,0x0589,0x4E57,0xB3,0x33,0x56,0x7A,0x89,0x46,0x8C,0x88); +#if defined( _WIN32 ) && !defined( _NO_COM ) +DEFINE_GUID( IID_IDDVideoPortContainer, 0x6C142760,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60 ); +DEFINE_GUID( IID_IDirectDrawVideoPort, 0xB36D93E0,0x2B43,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56 ); +DEFINE_GUID( IID_IDirectDrawVideoPortNotify, 0xA655FB94,0x0589,0x4E57,0xB3,0x33,0x56,0x7A,0x89,0x46,0x8C,0x88); DEFINE_GUID( DDVPTYPE_E_HREFH_VREFH, 0x54F39980L,0xDA60,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8); DEFINE_GUID( DDVPTYPE_E_HREFH_VREFL, 0x92783220L,0xDA60,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8); DEFINE_GUID( DDVPTYPE_E_HREFL_VREFH, 0xA07A02E0L,0xDA60,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8); DEFINE_GUID( DDVPTYPE_E_HREFL_VREFL, 0xE09C77E0L,0xDA60,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8); -DEFINE_GUID( DDVPTYPE_CCIR656, 0xFCA326A0L,0xDA60,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8); -DEFINE_GUID( DDVPTYPE_BROOKTREE, 0x1352A560L,0xDA61,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8); -DEFINE_GUID( DDVPTYPE_PHILIPS, 0x332CF160L,0xDA61,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8); - +DEFINE_GUID( DDVPTYPE_CCIR656, 0xFCA326A0L,0xDA60,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8); +DEFINE_GUID( DDVPTYPE_BROOKTREE, 0x1352A560L,0xDA61,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8); +DEFINE_GUID( DDVPTYPE_PHILIPS, 0x332CF160L,0xDA61,0x11CF,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8); +#endif + +#ifndef GUID_DEFS_ONLY +#if defined( _WIN32 ) && !defined( _NO_COM ) +#define COM_NO_WINDOWS_H +#include <objbase.h> +#else +#define IUnknown void +#endif + +#ifndef MAXULONG_PTR +#define ULONG_PTR DWORD +#endif + +#ifdef __cplusplus +extern "C" { +#endif typedef struct _DDVIDEOPORTCONNECT { DWORD dwSize; DWORD dwPortWidth; - GUID guidTypeID; + GUID guidTypeID; DWORD dwFlags; ULONG_PTR dwReserved1; -} DDVIDEOPORTCONNECT; - -typedef struct _DDVIDEOPORTDESC { - DWORD dwSize; - DWORD dwFieldWidth; - DWORD dwVBIWidth; - DWORD dwFieldHeight; - DWORD dwMicrosecondsPerField; - DWORD dwMaxPixelsPerSecond; - DWORD dwVideoPortID; - DWORD dwReserved1; +} DDVIDEOPORTCONNECT, *LPDDVIDEOPORTCONNECT; + +typedef struct _DDVIDEOPORTDESC +{ + DWORD dwSize; + DWORD dwFieldWidth; + DWORD dwVBIWidth; + DWORD dwFieldHeight; + DWORD dwMicrosecondsPerField; + DWORD dwMaxPixelsPerSecond; + DWORD dwVideoPortID; + DWORD dwReserved1; DDVIDEOPORTCONNECT VideoPortType; - ULONG_PTR dwReserved2; - ULONG_PTR dwReserved3; -} DDVIDEOPORTDESC; + ULONG_PTR dwReserved2; + ULONG_PTR dwReserved3; +} DDVIDEOPORTDESC, *LPDDVIDEOPORTDESC; typedef struct _DDVIDEOPORTBANDWIDTH { @@ -57,7 +75,7 @@ DWORD dwYInterpAndColorkey; ULONG_PTR dwReserved1; ULONG_PTR dwReserved2; -} DDVIDEOPORTBANDWIDTH; +} DDVIDEOPORTBANDWIDTH, *LPDDVIDEOPORTBANDWIDTH; typedef struct _DDVIDEOPORTCAPS { @@ -80,189 +98,276 @@ DWORD dwNumPreferredAutoflip; WORD wNumFilterTapsX; WORD wNumFilterTapsY; -} DDVIDEOPORTCAPS; +} DDVIDEOPORTCAPS, *LPDDVIDEOPORTCAPS; typedef struct _DDVIDEOPORTINFO { - DWORD dwSize; - DWORD dwOriginX; - DWORD dwOriginY; - DWORD dwVPFlags; - RECT rCrop; - DWORD dwPrescaleWidth; - DWORD dwPrescaleHeight; + DWORD dwSize; + DWORD dwOriginX; + DWORD dwOriginY; + DWORD dwVPFlags; + RECT rCrop; + DWORD dwPrescaleWidth; + DWORD dwPrescaleHeight; LPDDPIXELFORMAT lpddpfInputFormat; LPDDPIXELFORMAT lpddpfVBIInputFormat; LPDDPIXELFORMAT lpddpfVBIOutputFormat; - DWORD dwVBIHeight; - ULONG_PTR dwReserved1; - ULONG_PTR dwReserved2; -} DDVIDEOPORTINFO; + DWORD dwVBIHeight; + ULONG_PTR dwReserved1; + ULONG_PTR dwReserved2; +} DDVIDEOPORTINFO, *LPDDVIDEOPORTINFO; typedef struct _DDVIDEOPORTSTATUS { - DWORD dwSize; - BOOL bInUse; - DWORD dwFlags; - DWORD dwReserved1; + DWORD dwSize; + BOOL bInUse; + DWORD dwFlags; + DWORD dwReserved1; DDVIDEOPORTCONNECT VideoPortType; - ULONG_PTR dwReserved2; - ULONG_PTR dwReserved3; -} DDVIDEOPORTSTATUS; + ULONG_PTR dwReserved2; + ULONG_PTR dwReserved3; +} DDVIDEOPORTSTATUS, *LPDDVIDEOPORTSTATUS; typedef struct _DDVIDEOPORTNOTIFY { LARGE_INTEGER ApproximateTimeStamp; - LONG lField; - UINT dwSurfaceIndex; - LONG lDone; -} DDVIDEOPORTNOTIFY; - - -#define DDVPCONNECT_DOUBLECLOCK 0x00000001 -#define DDVPCONNECT_VACT 0x00000002 -#define DDVPCONNECT_INVERTPOLARITY 0x00000004 -#define DDVPCONNECT_DISCARDSVREFDATA 0x00000008 -#define DDVPCONNECT_HALFLINE 0x00000010 -#define DDVPCONNECT_INTERLACED 0x00000020 -#define DDVPCONNECT_SHAREEVEN 0x00000040 -#define DDVPCONNECT_SHAREODD 0x00000080 -#define DDVPCAPS_AUTOFLIP 0x00000001 -#define DDVPCAPS_INTERLACED 0x00000002 -#define DDVPCAPS_NONINTERLACED 0x00000004 -#define DDVPCAPS_READBACKFIELD 0x00000008 -#define DDVPCAPS_READBACKLINE 0x00000010 -#define DDVPCAPS_SHAREABLE 0x00000020 -#define DDVPCAPS_SKIPEVENFIELDS 0x00000040 -#define DDVPCAPS_SKIPODDFIELDS 0x00000080 -#define DDVPCAPS_SYNCMASTER 0x00000100 -#define DDVPCAPS_VBISURFACE 0x00000200 -#define DDVPCAPS_COLORCONTROL 0x00000400 -#define DDVPCAPS_OVERSAMPLEDVBI 0x00000800 -#define DDVPCAPS_SYSTEMMEMORY 0x00001000 -#define DDVPCAPS_VBIANDVIDEOINDEPENDENT 0x00002000 -#define DDVPCAPS_HARDWAREDEINTERLACE 0x00004000 -#define DDVPFX_CROPTOPDATA 0x00000001 -#define DDVPFX_CROPX 0x00000002 -#define DDVPFX_CROPY 0x00000004 -#define DDVPFX_INTERLEAVE 0x00000008 -#define DDVPFX_MIRRORLEFTRIGHT 0x00000010 -#define DDVPFX_MIRRORUPDOWN 0x00000020 -#define DDVPFX_PRESHRINKX 0x00000040 -#define DDVPFX_PRESHRINKY 0x00000080 -#define DDVPFX_PRESHRINKXB 0x00000100 -#define DDVPFX_PRESHRINKYB 0x00000200 -#define DDVPFX_PRESHRINKXS 0x00000400 -#define DDVPFX_PRESHRINKYS 0x00000800 -#define DDVPFX_PRESTRETCHX 0x00001000 -#define DDVPFX_PRESTRETCHY 0x00002000 -#define DDVPFX_PRESTRETCHXN 0x00004000 -#define DDVPFX_PRESTRETCHYN 0x00008000 -#define DDVPFX_VBICONVERT 0x00010000 -#define DDVPFX_VBINOSCALE 0x00020000 -#define DDVPFX_IGNOREVBIXCROP 0x00040000 -#define DDVPFX_VBINOINTERLEAVE 0x00080000 -#define DDVP_AUTOFLIP 0x00000001 -#define DDVP_CONVERT 0x00000002 -#define DDVP_CROP 0x00000004 -#define DDVP_INTERLEAVE 0x00000008 -#define DDVP_MIRRORLEFTRIGHT 0x00000010 -#define DDVP_MIRRORUPDOWN 0x00000020 -#define DDVP_PRESCALE 0x00000040 -#define DDVP_SKIPEVENFIELDS 0x00000080 -#define DDVP_SKIPODDFIELDS 0x00000100 -#define DDVP_SYNCMASTER 0x00000200 -#define DDVP_VBICONVERT 0x00000400 -#define DDVP_VBINOSCALE 0x00000800 -#define DDVP_OVERRIDEBOBWEAVE 0x00001000 -#define DDVP_IGNOREVBIXCROP 0x00002000 -#define DDVP_VBINOINTERLEAVE 0x00004000 -#define DDVP_HARDWAREDEINTERLACE 0x00008000 -#define DDVPFORMAT_VIDEO 0x00000001 -#define DDVPFORMAT_VBI 0x00000002 -#define DDVPTARGET_VIDEO 0x00000001 -#define DDVPTARGET_VBI 0x00000002 -#define DDVPWAIT_BEGIN 0x00000001 -#define DDVPWAIT_END 0x00000002 -#define DDVPWAIT_LINE 0x00000003 -#define DDVPFLIP_VIDEO 0x00000001 -#define DDVPFLIP_VBI 0x00000002 -#define DDVPSQ_NOSIGNAL 0x00000001 -#define DDVPSQ_SIGNALOK 0x00000002 -#define DDVPB_VIDEOPORT 0x00000001 -#define DDVPB_OVERLAY 0x00000002 -#define DDVPB_TYPE 0x00000004 -#define DDVPBCAPS_SOURCE 0x00000001 -#define DDVPBCAPS_DESTINATION 0x00000002 -#define DDVPCREATE_VBIONLY 0x00000001 -#define DDVPCREATE_VIDEOONLY 0x00000002 -#define DDVPSTATUS_VBIONLY 0x00000001 -#define DDVPSTATUS_VIDEOONLY 0x00000002 - -typedef struct _DDVIDEOPORTCONNECT *LPDDVIDEOPORTCONNECT; -typedef struct _DDVIDEOPORTCAPS *LPDDVIDEOPORTCAPS; -typedef struct _DDVIDEOPORTDESC *LPDDVIDEOPORTDESC; -typedef struct _DDVIDEOPORTINFO *LPDDVIDEOPORTINFO; -typedef struct _DDVIDEOPORTBANDWIDTH *LPDDVIDEOPORTBANDWIDTH; -typedef struct _DDVIDEOPORTSTATUS *LPDDVIDEOPORTSTATUS; -typedef struct _DDVIDEOPORTNOTIFY *LPDDVIDEOPORTNOTIFY; - -typedef struct IDirectDrawVideoPort* LPDIRECTDRAWVIDEOPORT; -typedef struct IDDVideoPortContainer* LPDDVIDEOPORTCONTAINER; -typedef struct IDirectDrawVideoPortNotify* LPDIRECTDRAWVIDEOPORTNOTIFY; - -typedef HRESULT (FAR PASCAL * LPDDENUMVIDEOCALLBACK)(LPDDVIDEOPORTCAPS, LPVOID); - -#if !defined (_NO_COM) && defined (_WIN32) - -#undef INTERFACE -#define INTERFACE IDDVideoPortContainer -DECLARE_INTERFACE_ (IDDVideoPortContainer, IUnknown) -{ - STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID* ppvObj) PURE; - STDMETHOD_(ULONG,AddRef) (THIS) PURE; - STDMETHOD_(ULONG,Release) (THIS) PURE; - STDMETHOD(CreateVideoPort)(THIS_ DWORD, LPDDVIDEOPORTDESC, LPDIRECTDRAWVIDEOPORT*, IUnknown*) PURE; - STDMETHOD(EnumVideoPorts) (THIS_ DWORD, LPDDVIDEOPORTCAPS, LPVOID, LPDDENUMVIDEOCALLBACK) PURE; - STDMETHOD(GetVideoPortConnectInfo) (THIS_ DWORD, LPDWORD, LPDDVIDEOPORTCONNECT) PURE; - STDMETHOD(QueryVideoPortStatus) (THIS_ DWORD, LPDDVIDEOPORTSTATUS) PURE; + LONG lField; + UINT dwSurfaceIndex; + LONG lDone; +} DDVIDEOPORTNOTIFY, *LPDDVIDEOPORTNOTIFY; + + +#define DDVPD_WIDTH 0x00000001 +#define DDVPD_HEIGHT 0x00000002 +#define DDVPD_ID 0x00000004 +#define DDVPD_CAPS 0x00000008 +#define DDVPD_FX 0x00000010 +#define DDVPD_AUTOFLIP 0x00000020 +#define DDVPD_ALIGN 0x00000040 +#define DDVPD_PREFERREDAUTOFLIP 0x00000080 +#define DDVPD_FILTERQUALITY 0x00000100 +#define DDVPCONNECT_DOUBLECLOCK 0x00000001 +#define DDVPCONNECT_VACT 0x00000002 +#define DDVPCONNECT_INVERTPOLARITY 0x00000004 +#define DDVPCONNECT_DISCARDSVREFDATA 0x00000008 +#define DDVPCONNECT_HALFLINE 0x00000010 +#define DDVPCONNECT_INTERLACED 0x00000020 +#define DDVPCONNECT_SHAREEVEN 0x00000040 +#define DDVPCONNECT_SHAREODD 0x00000080 +#define DDVPCAPS_AUTOFLIP 0x00000001 +#define DDVPCAPS_INTERLACED 0x00000002 +#define DDVPCAPS_NONINTERLACED 0x00000004 +#define DDVPCAPS_READBACKFIELD 0x00000008 +#define DDVPCAPS_READBACKLINE 0x00000010 +#define DDVPCAPS_SHAREABLE 0x00000020 +#define DDVPCAPS_SKIPEVENFIELDS 0x00000040 +#define DDVPCAPS_SKIPODDFIELDS 0x00000080 +#define DDVPCAPS_SYNCMASTER 0x00000100 +#define DDVPCAPS_VBISURFACE 0x00000200 +#define DDVPCAPS_COLORCONTROL 0x00000400 +#define DDVPCAPS_OVERSAMPLEDVBI 0x00000800 +#define DDVPCAPS_SYSTEMMEMORY 0x00001000 +#define DDVPCAPS_VBIANDVIDEOINDEPENDENT 0x00002000 +#define DDVPCAPS_HARDWAREDEINTERLACE 0x00004000 +#define DDVPFX_CROPTOPDATA 0x00000001 +#define DDVPFX_CROPX 0x00000002 +#define DDVPFX_CROPY 0x00000004 +#define DDVPFX_INTERLEAVE 0x00000008 +#define DDVPFX_MIRRORLEFTRIGHT 0x00000010 +#define DDVPFX_MIRRORUPDOWN 0x00000020 +#define DDVPFX_PRESHRINKX 0x00000040 +#define DDVPFX_PRESHRINKY 0x00000080 +#define DDVPFX_PRESHRINKXB 0x00000100 +#define DDVPFX_PRESHRINKYB 0x00000200 +#define DDVPFX_PRESHRINKXS 0x00000400 +#define DDVPFX_PRESHRINKYS 0x00000800 +#define DDVPFX_PRESTRETCHX 0x00001000 +#define DDVPFX_PRESTRETCHY 0x00002000 +#define DDVPFX_PRESTRETCHXN 0x00004000 +#define DDVPFX_PRESTRETCHYN 0x00008000 +#define DDVPFX_VBICONVERT 0x00010000 +#define DDVPFX_VBINOSCALE 0x00020000 +#define DDVPFX_IGNOREVBIXCROP 0x00040000 +#define DDVPFX_VBINOINTERLEAVE 0x00080000 +#define DDVP_AUTOFLIP 0x00000001 +#define DDVP_CONVERT 0x00000002 +#define DDVP_CROP 0x00000004 +#define DDVP_INTERLEAVE 0x00000008 +#define DDVP_MIRRORLEFTRIGHT 0x00000010 +#define DDVP_MIRRORUPDOWN 0x00000020 +#define DDVP_PRESCALE 0x00000040 +#define DDVP_SKIPEVENFIELDS 0x00000080 +#define DDVP_SKIPODDFIELDS 0x00000100 +#define DDVP_SYNCMASTER 0x00000200 +#define DDVP_VBICONVERT 0x00000400 +#define DDVP_VBINOSCALE 0x00000800 +#define DDVP_OVERRIDEBOBWEAVE 0x00001000 +#define DDVP_IGNOREVBIXCROP 0x00002000 +#define DDVP_VBINOINTERLEAVE 0x00004000 +#define DDVP_HARDWAREDEINTERLACE 0x00008000 +#define DDVPFORMAT_VIDEO 0x00000001 +#define DDVPFORMAT_VBI 0x00000002 +#define DDVPTARGET_VIDEO 0x00000001 +#define DDVPTARGET_VBI 0x00000002 +#define DDVPWAIT_BEGIN 0x00000001 +#define DDVPWAIT_END 0x00000002 +#define DDVPWAIT_LINE 0x00000003 +#define DDVPFLIP_VIDEO 0x00000001 +#define DDVPFLIP_VBI 0x00000002 +#define DDVPSQ_NOSIGNAL 0x00000001 +#define DDVPSQ_SIGNALOK 0x00000002 +#define DDVPB_VIDEOPORT 0x00000001 +#define DDVPB_OVERLAY 0x00000002 +#define DDVPB_TYPE 0x00000004 +#define DDVPBCAPS_SOURCE 0x00000001 +#define DDVPBCAPS_DESTINATION 0x00000002 +#define DDVPCREATE_VBIONLY 0x00000001 +#define DDVPCREATE_VIDEOONLY 0x00000002 +#define DDVPSTATUS_VBIONLY 0x00000001 +#define DDVPSTATUS_VIDEOONLY 0x00000002 + +struct IDirectDraw; +struct IDirectDrawSurface; +struct IDirectDrawPalette; +struct IDirectDrawClipper; +typedef struct IDirectDrawVideoPort *LPDIRECTDRAWVIDEOPORT; +typedef struct IDDVideoPortContainer *LPDDVIDEOPORTCONTAINER; +typedef struct IDirectDrawVideoPortNotify *LPDIRECTDRAWVIDEOPORTNOTIFY; + +typedef struct IDDVideoPortContainerVtbl DDVIDEOPORTCONTAINERCALLBACKS; +typedef struct IDirectDrawVideoPortVtbl DIRECTDRAWVIDEOPORTCALLBACKS; +typedef struct IDirectDrawVideoPortNotifyVtbl DIRECTDRAWVIDEOPORTNOTIFYCALLBACKS; + +typedef HRESULT (*LPDDENUMVIDEOCALLBACK)(LPDDVIDEOPORTCAPS, LPVOID); + + + +#if defined( _WIN32 ) && !defined( _NO_COM ) + #undef INTERFACE + #define INTERFACE IDDVideoPortContainer + DECLARE_INTERFACE_( IDDVideoPortContainer, IUnknown ) + { + STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID *ppvObj) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD(CreateVideoPort)(THIS_ DWORD, LPDDVIDEOPORTDESC, LPDIRECTDRAWVIDEOPORT *, IUnknown *) PURE; + STDMETHOD(EnumVideoPorts)(THIS_ DWORD, LPDDVIDEOPORTCAPS, LPVOID,LPDDENUMVIDEOCALLBACK ) PURE; + STDMETHOD(GetVideoPortConnectInfo)(THIS_ DWORD, LPDWORD, LPDDVIDEOPORTCONNECT ) PURE; + STDMETHOD(QueryVideoPortStatus)(THIS_ DWORD, LPDDVIDEOPORTSTATUS ) PURE; + }; + + #if !defined(__cplusplus) || defined(CINTERFACE) + #define IVideoPortContainer_QueryInterface(p, a, b) (p)->lpVtbl->QueryInterface(p, a, b) + #define IVideoPortContainer_AddRef(p) (p)->lpVtbl->AddRef(p) + #define IVideoPortContainer_Release(p) (p)->lpVtbl->Release(p) + #define IVideoPortContainer_CreateVideoPort(p, a, b, c, d) (p)->lpVtbl->CreateVideoPort(p, a, b, c, d) + #define IVideoPortContainer_EnumVideoPorts(p, a, b, c, d) (p)->lpVtbl->EnumVideoPorts(p, a, b, c, d) + #define IVideoPortContainer_GetVideoPortConnectInfo(p, a, b, c) (p)->lpVtbl->GetVideoPortConnectInfo(p, a, b, c) + #define IVideoPortContainer_QueryVideoPortStatus(p, a, b) (p)->lpVtbl->QueryVideoPortStatus(p, a, b) + #else + #define IVideoPortContainer_QueryInterface(p, a, b) (p)->QueryInterface(a, b) + #define IVideoPortContainer_AddRef(p) (p)->AddRef() + #define IVideoPortContainer_Release(p) (p)->Release() + #define IVideoPortContainer_CreateVideoPort(p, a, b, c, d) (p)->CreateVideoPort(a, b, c, d) + #define IVideoPortContainer_EnumVideoPorts(p, a, b, c, d) (p)->EnumVideoPorts(a, b, c, d) + #define IVideoPortContainer_GetVideoPortConnectInfo(p, a, b, c) (p)->GetVideoPortConnectInfo(a, b, c) + #define IVideoPortContainer_QueryVideoPortStatus(p, a, b) (p)->QueryVideoPortStatus(a, b) + #endif +#endif + +#if defined( _WIN32 ) && !defined( _NO_COM ) + #undef INTERFACE + #define INTERFACE IDirectDrawVideoPort + DECLARE_INTERFACE_( IDirectDrawVideoPort, IUnknown ) + { + STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE, DWORD) PURE; + STDMETHOD(GetBandwidthInfo)(THIS_ LPDDPIXELFORMAT, DWORD, DWORD, DWORD, LPDDVIDEOPORTBANDWIDTH) PURE; + STDMETHOD(GetColorControls)(THIS_ LPDDCOLORCONTROL) PURE; + STDMETHOD(GetInputFormats)(THIS_ LPDWORD, LPDDPIXELFORMAT, DWORD) PURE; + STDMETHOD(GetOutputFormats)(THIS_ LPDDPIXELFORMAT, LPDWORD, LPDDPIXELFORMAT, DWORD) PURE; + STDMETHOD(GetFieldPolarity)(THIS_ LPBOOL) PURE; + STDMETHOD(GetVideoLine)(THIS_ LPDWORD) PURE; + STDMETHOD(GetVideoSignalStatus)(THIS_ LPDWORD) PURE; + STDMETHOD(SetColorControls)(THIS_ LPDDCOLORCONTROL) PURE; + STDMETHOD(SetTargetSurface)(THIS_ LPDIRECTDRAWSURFACE, DWORD) PURE; + STDMETHOD(StartVideo)(THIS_ LPDDVIDEOPORTINFO) PURE; + STDMETHOD(StopVideo)(THIS) PURE; + STDMETHOD(UpdateVideo)(THIS_ LPDDVIDEOPORTINFO) PURE; + STDMETHOD(WaitForSync)(THIS_ DWORD, DWORD, DWORD) PURE; + }; + + #if !defined(__cplusplus) || defined(CINTERFACE) + #define IVideoPort_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) + #define IVideoPort_AddRef(p) (p)->lpVtbl->AddRef(p) + #define IVideoPort_Release(p) (p)->lpVtbl->Release(p) + #define IVideoPort_SetTargetSurface(p,a,b) (p)->lpVtbl->SetTargetSurface(p,a,b) + #define IVideoPort_Flip(p,a,b) (p)->lpVtbl->Flip(p,a,b) + #define IVideoPort_GetBandwidthInfo(p,a,b,c,d,e) (p)->lpVtbl->GetBandwidthInfo(p,a,b,c,d,e) + #define IVideoPort_GetColorControls(p,a) (p)->lpVtbl->GetColorControls(p,a) + #define IVideoPort_GetInputFormats(p,a,b,c) (p)->lpVtbl->GetInputFormats(p,a,b,c) + #define IVideoPort_GetOutputFormats(p,a,b,c,d) (p)->lpVtbl->GetOutputFormats(p,a,b,c,d) + #define IVideoPort_GetFieldPolarity(p,a) (p)->lpVtbl->GetFieldPolarity(p,a) + #define IVideoPort_GetVideoLine(p,a) (p)->lpVtbl->GetVideoLine(p,a) + #define IVideoPort_GetVideoSignalStatus(p,a) (p)->lpVtbl->GetVideoSignalStatus(p,a) + #define IVideoPort_SetColorControls(p,a) (p)->lpVtbl->SetColorControls(p,a) + #define IVideoPort_StartVideo(p,a) (p)->lpVtbl->StartVideo(p,a) + #define IVideoPort_StopVideo(p) (p)->lpVtbl->StopVideo(p) + #define IVideoPort_UpdateVideo(p,a) (p)->lpVtbl->UpdateVideo(p,a) + #define IVideoPort_WaitForSync(p,a,b,c) (p)->lpVtbl->WaitForSync(p,a,b,c) + #else + #define IVideoPort_QueryInterface(p,a,b) (p)->QueryInterface(a,b) + #define IVideoPort_AddRef(p) (p)->AddRef() + #define IVideoPort_Release(p) (p)->Release() + #define IVideoPort_SetTargetSurface(p,a,b) (p)->SetTargetSurface(a,b) + #define IVideoPort_Flip(p,a,b) (p)->Flip(a,b) + #define IVideoPort_GetBandwidthInfo(p,a,b,c,d,e) (p)->GetBandwidthInfo(a,b,c,d,e) + #define IVideoPort_GetColorControls(p,a) (p)->GetColorControls(a) + #define IVideoPort_GetInputFormats(p,a,b,c) (p)->GetInputFormats(a,b,c) + #define IVideoPort_GetOutputFormats(p,a,b,c,d) (p)->GetOutputFormats(a,b,c,d) + #define IVideoPort_GetFieldPolarity(p,a) (p)->GetFieldPolarity(a) + #define IVideoPort_GetVideoLine(p,a) (p)->GetVideoLine(a) + #define IVideoPort_GetVideoSignalStatus(p,a) (p)->GetVideoSignalStatus(a) + #define IVideoPort_SetColorControls(p,a) (p)->SetColorControls(a) + #define IVideoPort_StartVideo(p,a) (p)->StartVideo(a) + #define IVideoPort_StopVideo(p) (p)->StopVideo() + #define IVideoPort_UpdateVideo(p,a) (p)->UpdateVideo(a) + #define IVideoPort_WaitForSync(p,a,b,c) (p)->WaitForSync(a,b,c) + #endif +#endif + +#if defined( _WIN32 ) && !defined( _NO_COM ) + #undef INTERFACE + #define INTERFACE IDirectDrawVideoPortNotify + + DECLARE_INTERFACE_( IDirectDrawVideoPortNotify, IUnknown ) + { + STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD(AcquireNotification)(THIS_ HANDLE *, LPDDVIDEOPORTNOTIFY) PURE; + STDMETHOD(ReleaseNotification)(THIS_ HANDLE) PURE; + }; + + #if !defined(__cplusplus) || defined(CINTERFACE) + #define IVideoPortNotify_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) + #define IVideoPortNotify_AddRef(p) (p)->lpVtbl->AddRef(p) + #define IVideoPortNotify_Release(p) (p)->lpVtbl->Release(p) + #define IVideoPortNotify_AcquireNotification(p,a,b) (p)->lpVtbl->AcquireNotification(p,a,b) + #define IVideoPortNotify_ReleaseNotification(p,a) (p)->lpVtbl->ReleaseNotification(p,a) + #else + #define IVideoPortNotify_QueryInterface(p,a,b) (p)->QueryInterface(a,b) + #define IVideoPortNotify_AddRef(p) (p)->AddRef() + #define IVideoPortNotify_Release(p) (p)->Release() + #define IVideoPortNotify_AcquireNotification(p,a,b) (p)->lpVtbl->AcquireNotification(a,b) + #define IVideoPortNotify_ReleaseNotification(p,a) (p)->lpVtbl->ReleaseNotification(a) + #endif +#endif + +#ifdef __cplusplus }; - -#undef INTERFACE -#define INTERFACE IDirectDrawVideoPort -DECLARE_INTERFACE_ (IDirectDrawVideoPort, IUnknown) -{ - STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID* ppvObj) PURE; - STDMETHOD_(ULONG,AddRef) (THIS) PURE; - STDMETHOD_(ULONG,Release) (THIS) PURE; - STDMETHOD(Flip) (THIS_ LPDIRECTDRAWSURFACE, DWORD) PURE; - STDMETHOD(GetBandwidthInfo)(THIS_ LPDDPIXELFORMAT, DWORD, DWORD, DWORD, LPDDVIDEOPORTBANDWIDTH) PURE; - STDMETHOD(GetColorControls) (THIS_ LPDDCOLORCONTROL) PURE; - STDMETHOD(GetInputFormats)(THIS_ LPDWORD, LPDDPIXELFORMAT, DWORD) PURE; - STDMETHOD(GetOutputFormats)(THIS_ LPDDPIXELFORMAT, LPDWORD, LPDDPIXELFORMAT, DWORD) PURE; - STDMETHOD(GetFieldPolarity) (THIS_ LPBOOL) PURE; - STDMETHOD(GetVideoLine) (THIS_ LPDWORD) PURE; - STDMETHOD(GetVideoSignalStatus) (THIS_ LPDWORD) PURE; - STDMETHOD(SetColorControls) (THIS_ LPDDCOLORCONTROL) PURE; - STDMETHOD(SetTargetSurface) (THIS_ LPDIRECTDRAWSURFACE, DWORD) PURE; - STDMETHOD(StartVideo) (THIS_ LPDDVIDEOPORTINFO) PURE; - STDMETHOD(StopVideo) (THIS) PURE; - STDMETHOD(UpdateVideo) (THIS_ LPDDVIDEOPORTINFO) PURE; - STDMETHOD(WaitForSync) (THIS_ DWORD, DWORD, DWORD) PURE; -}; - -#undef INTERFACE -#define INTERFACE IDirectDrawVideoPortNotify -DECLARE_INTERFACE_( IDirectDrawVideoPortNotify, IUnknown ) -{ - STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID* ppvObj) PURE; - STDMETHOD_(ULONG,AddRef) (THIS) PURE; - STDMETHOD_(ULONG,Release) (THIS) PURE; - STDMETHOD(AcquireNotification) (THIS_ HANDLE*, LPDDVIDEOPORTNOTIFY) PURE; - STDMETHOD(ReleaseNotification) (THIS_ HANDLE) PURE; -}; - -#undef INTERFACE - -#endif // !defined (_NO_COM) && defined (_WIN32) -#endif // __DVP_INCLUDED__ +#endif +#endif +#endif

1 0

[greatlrd] 24810: adding three new ddk header, the info are base/got from windows xp ddk kit version 3790.1830
by greatlrd＠svn.reactos.org 23 Nov '06

23 Nov '06

Author: greatlrd Date: Thu Nov 23 21:41:41 2006 New Revision: 24810 URL: http://svn.reactos.org/svn/reactos?rev=24810&view=rev Log: adding three new ddk header, the info are base/got from windows xp ddk kit version 3790.1830 Added: trunk/reactos/include/ddk/isguids.h trunk/reactos/include/ddk/usbprint.h trunk/reactos/include/ddk/warning.h Added: trunk/reactos/include/ddk/isguids.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/isguids.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/isguids.h (added) +++ trunk/reactos/include/ddk/isguids.h Thu Nov 23 21:41:41 2006 @@ -1,0 +1,17 @@ + + +#ifndef _ISGUIDS_H_ +#define _ISGUIDS_H_ + +DEFINE_GUID(CLSID_InternetShortcut, 0xFBF23B40L, 0xE3F0, 0x101B, 0x84, 0x88, 0x00, 0xAA, 0x00, 0x3E, 0x56, 0xF8); +DEFINE_GUID(IID_IUniformResourceLocatorA, 0xFBF23B80L, 0xE3F0, 0x101B, 0x84, 0x88, 0x00, 0xAA, 0x00, 0x3E, 0x56, 0xF8); +DEFINE_GUID(IID_IUniformResourceLocatorW, 0xCABB0DA0L, 0xDA57, 0x11CF, 0x99, 0x74, 0x00, 0x20, 0xAF, 0xD7, 0x97, 0x62); + +#ifdef UNICODE + #define IID_IUniformResourceLocator IID_IUniformResourceLocatorW +#else + #define IID_IUniformResourceLocator IID_IUniformResourceLocatorA +#endif + +#endif + Added: trunk/reactos/include/ddk/usbprint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usbprint.h?rev… ============================================================================== --- trunk/reactos/include/ddk/usbprint.h (added) +++ trunk/reactos/include/ddk/usbprint.h Thu Nov 23 21:41:41 2006 @@ -1,0 +1,17 @@ + +#define USBPRINT_IOCTL_INDEX 0x0000 +#define IOCTL_USBPRINT_GET_LPT_STATUS \ + CTL_CODE(FILE_DEVICE_UNKNOWN, USBPRINT_IOCTL_INDEX+12, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_USBPRINT_GET_1284_ID \ + CTL_CODE(FILE_DEVICE_UNKNOWN, USBPRINT_IOCTL_INDEX+13, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_USBPRINT_VENDOR_SET_COMMAND \ + CTL_CODE(FILE_DEVICE_UNKNOWN, USBPRINT_IOCTL_INDEX+14, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_USBPRINT_VENDOR_GET_COMMAND \ + CTL_CODE(FILE_DEVICE_UNKNOWN, USBPRINT_IOCTL_INDEX+15, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define IOCTL_USBPRINT_SOFT_RESET \ + CTL_CODE(FILE_DEVICE_UNKNOWN, USBPRINT_IOCTL_INDEX+16, METHOD_BUFFERED, FILE_ANY_ACCESS) + Added: trunk/reactos/include/ddk/warning.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/warning.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/warning.h (added) +++ trunk/reactos/include/ddk/warning.h Thu Nov 23 21:41:41 2006 @@ -1,0 +1,5 @@ + +/* FIXME + here we putting #pragma warning and disable or enable them + I known gcc and msvc using diffent pragma and I do not known + the gcc pragma well to achive msvs and gcc compatible with this */

1 0

[greatlrd] 24809: 1. adding two new ddk header, the info are base/got from windows xp ddk kit version 3790.1830 2. change bit of layout in usbkern
by greatlrd＠svn.reactos.org 23 Nov '06

23 Nov '06

Author: greatlrd Date: Thu Nov 23 21:38:19 2006 New Revision: 24809 URL: http://svn.reactos.org/svn/reactos?rev=24809&view=rev Log: 1. adding two new ddk header, the info are base/got from windows xp ddk kit version 3790.1830 2. change bit of layout in usbkern Added: trunk/reactos/include/ddk/diskguid.h trunk/reactos/include/ddk/drivinit.h Modified: trunk/reactos/include/ddk/usbkern.h Added: trunk/reactos/include/ddk/diskguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/diskguid.h?rev… ============================================================================== --- trunk/reactos/include/ddk/diskguid.h (added) +++ trunk/reactos/include/ddk/diskguid.h Thu Nov 23 21:38:19 2006 @@ -1,0 +1,10 @@ + +#ifdef DEFINE_GUID +DEFINE_GUID(PARTITION_ENTRY_UNUSED_GUID, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); // Entry unused +DEFINE_GUID(PARTITION_SYSTEM_GUID, 0xC12A7328, 0xF81F, 0x11D2, 0xBA, 0x4B, 0x00, 0xA0, 0xC9, 0x3E, 0xC9, 0x3B); // EFI system partition +DEFINE_GUID(PARTITION_MSFT_RESERVED_GUID, 0xE3C9E316, 0x0B5C, 0x4DB8, 0x81, 0x7D, 0xF9, 0x2D, 0xF0, 0x02, 0x15, 0xAE); // Microsoft reserved space +DEFINE_GUID(PARTITION_BASIC_DATA_GUID, 0xEBD0A0A2, 0xB9E5, 0x4433, 0x87, 0xC0, 0x68, 0xB6, 0xB7, 0x26, 0x99, 0xC7); // Basic data partition +DEFINE_GUID(PARTITION_LDM_METADATA_GUID, 0x5808C8AA, 0x7E8F, 0x42E0, 0x85, 0xD2, 0xE1, 0xE9, 0x04, 0x34, 0xCF, 0xB3); // Logical Disk Manager metadata partition +DEFINE_GUID(PARTITION_LDM_DATA_GUID, 0xAF9B60A0, 0x1431, 0x4F62, 0xBC, 0x68, 0x33, 0x11, 0x71, 0x4A, 0x69, 0xAD); // Logical Disk Manager data partition +#endif + Added: trunk/reactos/include/ddk/drivinit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/drivinit.h?rev… ============================================================================== --- trunk/reactos/include/ddk/drivinit.h (added) +++ trunk/reactos/include/ddk/drivinit.h Thu Nov 23 21:38:19 2006 @@ -1,0 +1,4 @@ + +/* This are empty and is left for be compatible with building some older windows nt4/2000/2003/XP drivers */ + + Modified: trunk/reactos/include/ddk/usbkern.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usbkern.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/usbkern.h (original) +++ trunk/reactos/include/ddk/usbkern.h Thu Nov 23 21:38:19 2006 @@ -4,14 +4,11 @@ #include "usbiodef.h" -#define IOCTL_INTERNAL_USB_GET_HUB_COUNT \ - USB_KERNEL_CTL(USB_GET_HUB_COUNT) - -#define IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO \ - USB_KERNEL_CTL(USB_GET_ROOTHUB_PDO) +#define IOCTL_INTERNAL_USB_GET_HUB_COUNT USB_KERNEL_CTL(USB_GET_HUB_COUNT) +#define IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO USB_KERNEL_CTL(USB_GET_ROOTHUB_PDO) #define IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE \ - CTL_CODE(FILE_DEVICE_USB, USB_GET_DEVICE_HANDLE, METHOD_NEITHER, FILE_ANY_ACCESS) + CTL_CODE(FILE_DEVICE_USB, USB_GET_DEVICE_HANDLE, METHOD_NEITHER, FILE_ANY_ACCESS) #endif

1 0

[greatlrd] 24808: adding two new ddk header, the info are base/got from windows xp ddk kit version 3790.1830
by greatlrd＠svn.reactos.org 23 Nov '06

23 Nov '06

Author: greatlrd Date: Thu Nov 23 21:35:38 2006 New Revision: 24808 URL: http://svn.reactos.org/svn/reactos?rev=24808&view=rev Log: adding two new ddk header, the info are base/got from windows xp ddk kit version 3790.1830 Added: trunk/reactos/include/ddk/atsmedia.h (with props) trunk/reactos/include/ddk/dderror.h Added: trunk/reactos/include/ddk/atsmedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/atsmedia.h?rev… ============================================================================== --- trunk/reactos/include/ddk/atsmedia.h (added) +++ trunk/reactos/include/ddk/atsmedia.h Thu Nov 23 21:35:38 2006 @@ -1,0 +1,17 @@ + +/* $Id: $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: + * PURPOSE: headers + * PROGRAMMER: Magnus Olsen (greatlrd) + * + */ + +#if !defined(_ATSCMEDIA_) +#define _ATSCMEDIA_ +#define BDANETWORKTYPE_ATSC DEFINE_GUIDNAMED(BDANETWORKTYPE_ATSC) +#define STATIC_BDANETWORKTYPE_ATSC 0x71985F51, 0x1CA1, 0x11D3, 0x9C, 0xC8, 0x0, 0xC0, 0x4F, 0x79, 0x71, 0xE0 +DEFINE_GUIDSTRUCT("71985F51-1CA1-11D3-9CC8-00C04F7971E0", BDANETWORKTYPE_ATSC); +#endif Propchange: trunk/reactos/include/ddk/atsmedia.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/ddk/dderror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/dderror.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/dderror.h (added) +++ trunk/reactos/include/ddk/dderror.h Thu Nov 23 21:35:38 2006 @@ -1,0 +1,20 @@ + +#ifndef _DDERROR_ +#define _DDERROR_ +#define _WINERROR_ +#define NO_ERROR 0 +#define ERROR_INVALID_FUNCTION 1 +#define ERROR_NOT_ENOUGH_MEMORY 8 +#define ERROR_DEV_NOT_EXIST 55 +#define ERROR_INVALID_PARAMETER 87 +#define ERROR_INSUFFICIENT_BUFFER 122 +#define ERROR_INVALID_NAME 123 +#define ERROR_BUSY 170 +#define ERROR_MORE_DATA 234 +#define WAIT_TIMEOUT 258 +#define ERROR_IO_PENDING 997 +#define ERROR_DEVICE_REINITIALIZATION_NEEDED 1164 +#define ERROR_CONTINUE 1246 +#define ERROR_NO_MORE_DEVICES 1248 +#endif +

1 0

[fireball] 24807: Partial shell32 wine-sync
by fireball＠svn.reactos.org 23 Nov '06

23 Nov '06

Author: fireball Date: Thu Nov 23 19:57:58 2006 New Revision: 24807 URL: http://svn.reactos.org/svn/reactos?rev=24807&view=rev Log: Partial shell32 wine-sync Modified: trunk/reactos/dll/win32/shell32/autocomplete.c trunk/reactos/dll/win32/shell32/brsfolder.c trunk/reactos/dll/win32/shell32/changenotify.c trunk/reactos/dll/win32/shell32/control.c trunk/reactos/dll/win32/shell32/pidl.h trunk/reactos/dll/win32/shell32/shlview.c Modified: trunk/reactos/dll/win32/shell32/autocomplete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/autocomp… ============================================================================== --- trunk/reactos/dll/win32/shell32/autocomplete.c (original) +++ trunk/reactos/dll/win32/shell32/autocomplete.c Thu Nov 23 19:57:58 2006 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ /* @@ -174,7 +174,7 @@ IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%lu)\n", This, refCount - 1); + TRACE("(%p)->(%u)\n", This, refCount - 1); return refCount; } @@ -188,7 +188,7 @@ IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%lu)\n", This, refCount + 1); + TRACE("(%p)->(%u)\n", This, refCount + 1); if (!refCount) { TRACE(" destroying IAutoComplete(%p)\n",This); @@ -347,7 +347,7 @@ { IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); - TRACE ("(%p)->(count=%lu)\n", This, This->ref); + TRACE ("(%p)->(count=%u)\n", This, This->ref); return IAutoComplete2_AddRef((IAutoComplete*)This); } @@ -360,7 +360,7 @@ { IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); - TRACE ("(%p)->(count=%lu)\n", This, This->ref); + TRACE ("(%p)->(count=%u)\n", This, This->ref); return IAutoComplete_Release((IAutoComplete*)This); } @@ -425,7 +425,7 @@ IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); - TRACE("(%p) -> (0x%lx)\n", This, dwFlag); + TRACE("(%p) -> (0x%x)\n", This, dwFlag); This->options = dwFlag; Modified: trunk/reactos/dll/win32/shell32/brsfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/brsfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/brsfolder.c (original) +++ trunk/reactos/dll/win32/shell32/brsfolder.c Thu Nov 23 19:57:58 2006 @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * FIXME: * - many memory leaks @@ -64,7 +64,7 @@ static HTREEITEM InsertTreeViewItem( browse_info*, IShellFolder *, LPCITEMIDLIST, LPCITEMIDLIST, IEnumIDList*, HTREEITEM); -const WCHAR szBrowseFolderInfo[] = { +static const WCHAR szBrowseFolderInfo[] = { '_','_','W','I','N','E','_', 'B','R','S','F','O','L','D','E','R','D','L','G','_', 'I','N','F','O',0 @@ -108,7 +108,7 @@ Shell_GetImageList(NULL, &hImageList); if (hImageList) - TreeView_SetImageList( info->hwndTreeView, hImageList, 0 ); + SendMessageW( info->hwndTreeView, TVM_SETIMAGELIST, 0, (LPARAM)hImageList ); /* We want to call InsertTreeViewItem down the code, in order to insert * the root item of the treeview. Due to InsertTreeViewItem's signature, @@ -132,7 +132,7 @@ IShellFolder *lpsfDesktop; hr = SHGetDesktopFolder(&lpsfDesktop); if (!SUCCEEDED(hr)) { - WARN("SHGetDesktopFolder failed! hr = %08lx\n", hr); + WARN("SHGetDesktopFolder failed! hr = %08x\n", hr); return; } hr = IShellFolder_BindToObject(lpsfDesktop, pidlParent, 0, &IID_IShellFolder, (LPVOID*)&lpsfParent); @@ -140,7 +140,7 @@ } if (!SUCCEEDED(hr)) { - WARN("Could not bind to parent shell folder! hr = %08lx\n", hr); + WARN("Could not bind to parent shell folder! hr = %08x\n", hr); return; } @@ -152,7 +152,7 @@ } if (!SUCCEEDED(hr)) { - WARN("Could not bind to root shell folder! hr = %08lx\n", hr); + WARN("Could not bind to root shell folder! hr = %08x\n", hr); IShellFolder_Release(lpsfParent); return; } @@ -160,16 +160,16 @@ flags = BrowseFlagsToSHCONTF( info->lpBrowseInfo->ulFlags ); hr = IShellFolder_EnumObjects( lpsfRoot, info->hWnd, flags, &pEnumChildren ); if (!SUCCEEDED(hr)) { - WARN("Could not get child iterator! hr = %08lx\n", hr); + WARN("Could not get child iterator! hr = %08x\n", hr); IShellFolder_Release(lpsfParent); IShellFolder_Release(lpsfRoot); return; } - TreeView_DeleteAllItems( info->hwndTreeView ); + SendMessageW( info->hwndTreeView, TVM_DELETEITEM, 0, (LPARAM)TVI_ROOT ); item = InsertTreeViewItem( info, lpsfParent, pidlChild, pidlParent, pEnumChildren, TVI_ROOT ); - TreeView_Expand( info->hwndTreeView, item, TVE_EXPAND ); + SendMessageW( info->hwndTreeView, TVM_EXPAND, TVE_EXPAND, (LPARAM)item ); IShellFolder_Release(lpsfRoot); IShellFolder_Release(lpsfParent); @@ -225,14 +225,9 @@ BOOL bSuccess=TRUE; STRRET str; - TRACE("%p %p %lx %p\n", lpsf, lpi, dwFlags, lpFriendlyName); + TRACE("%p %p %x %p\n", lpsf, lpi, dwFlags, lpFriendlyName); if (SUCCEEDED(IShellFolder_GetDisplayNameOf(lpsf, lpi, dwFlags, &str))) - { - if (FAILED(StrRetToStrNW(lpFriendlyName, MAX_PATH, &str, lpi))) - { - bSuccess = FALSE; - } - } + bSuccess = StrRetToStrNW(lpFriendlyName, MAX_PATH, &str, lpi); else bSuccess = FALSE; @@ -359,9 +354,7 @@ done: ReleaseCapture(); SetCursor(LoadCursorW(0, (LPWSTR)IDC_ARROW)); - - if (pidlTemp) - SHFree(pidlTemp); + SHFree(pidlTemp); } static inline BOOL PIDLIsType(LPCITEMIDLIST pidl, PIDLTYPE type) @@ -445,7 +438,8 @@ /* My Computer is already sorted and trying to do a simple text * sort will only mess things up */ if (!_ILIsMyComputer(lptvid->lpi)) - TreeView_SortChildren(info->hwndTreeView, pnmtv->itemNew.hItem, FALSE); + SendMessageW( info->hwndTreeView, TVM_SORTCHILDREN, + FALSE, (LPARAM)pnmtv->itemNew.hItem ); return 0; } @@ -544,6 +538,112 @@ return FALSE; } +static BOOL BrsFolder_OnSetExpanded(browse_info *info, LPVOID selection, + BOOL is_str, HTREEITEM *pItem) +{ + LPITEMIDLIST pidlSelection = (LPITEMIDLIST)selection; + LPCITEMIDLIST pidlCurrent, pidlRoot; + TVITEMEXW item; + BOOL bResult = FALSE; + + /* If 'selection' is a string, convert to a Shell ID List. */ + if (is_str) { + IShellFolder *psfDesktop; + HRESULT hr; + + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED(hr)) + goto done; + + hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, + (LPOLESTR)selection, NULL, &pidlSelection, NULL); + IShellFolder_Release(psfDesktop); + if (FAILED(hr)) + goto done; + } + + /* Move pidlCurrent behind the SHITEMIDs in pidlSelection, which are the root of + * the sub-tree currently displayed. */ + pidlRoot = info->lpBrowseInfo->pidlRoot; + pidlCurrent = pidlSelection; + while (!_ILIsEmpty(pidlRoot) && _ILIsEqualSimple(pidlRoot, pidlCurrent)) { + pidlRoot = ILGetNext(pidlRoot); + pidlCurrent = ILGetNext(pidlCurrent); + } + + /* The given ID List is not part of the SHBrowseForFolder's current sub-tree. */ + if (!_ILIsEmpty(pidlRoot)) + goto done; + + /* Initialize item to point to the first child of the root folder. */ + memset(&item, 0, sizeof(item)); + item.mask = TVIF_PARAM; + item.hItem = TreeView_GetRoot(info->hwndTreeView); + if (item.hItem) + item.hItem = TreeView_GetChild(info->hwndTreeView, item.hItem); + + /* Walk the tree along the nodes corresponding to the remaining ITEMIDLIST */ + while (item.hItem && !_ILIsEmpty(pidlCurrent)) { + LPTV_ITEMDATA pItemData; + + SendMessageW(info->hwndTreeView, TVM_GETITEMW, 0, (LPARAM)&item); + pItemData = (LPTV_ITEMDATA)item.lParam; + + if (_ILIsEqualSimple(pItemData->lpi, pidlCurrent)) { + pidlCurrent = ILGetNext(pidlCurrent); + if (!_ILIsEmpty(pidlCurrent)) { + /* Only expand current node and move on to it's first child, + * if we didn't already reach the last SHITEMID */ + SendMessageW(info->hwndTreeView, TVM_EXPAND, TVE_EXPAND, (LPARAM)item.hItem); + item.hItem = TreeView_GetChild(info->hwndTreeView, item.hItem); + } + } else { + item.hItem = TreeView_GetNextSibling(info->hwndTreeView, item.hItem); + } + } + + if (_ILIsEmpty(pidlCurrent) && item.hItem) + bResult = TRUE; + +done: + if (pidlSelection && pidlSelection != (LPITEMIDLIST)selection) + ILFree(pidlSelection); + + if (pItem) + *pItem = item.hItem; + + return bResult; +} + +static BOOL BrsFolder_OnSetSelectionW(browse_info *info, LPVOID selection, BOOL is_str) { + HTREEITEM hItem; + BOOL bResult; + + bResult = BrsFolder_OnSetExpanded(info, selection, is_str, &hItem); + if (bResult) + SendMessageW(info->hwndTreeView, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hItem ); + return bResult; +} + +static BOOL BrsFolder_OnSetSelectionA(browse_info *info, LPVOID selection, BOOL is_str) { + LPWSTR selectionW = NULL; + BOOL result = FALSE; + int length; + + if (!is_str) + return BrsFolder_OnSetSelectionW(info, selection, is_str); + + if ((length = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)selection, -1, NULL, 0)) && + (selectionW = HeapAlloc(GetProcessHeap(), 0, length * sizeof(WCHAR))) && + MultiByteToWideChar(CP_ACP, 0, (LPCSTR)selection, -1, selectionW, length)) + { + result = BrsFolder_OnSetSelectionW(info, selectionW, is_str); + } + + HeapFree(GetProcessHeap(), 0, selectionW); + return result; +} + /************************************************************************* * BrsFolderDlgProc32 (not an exported API function) */ @@ -588,25 +688,13 @@ break; case BFFM_SETSELECTIONA: - if (wParam) - FIXME("Set selection %s\n", debugstr_a((LPSTR)lParam)); - else - FIXME("Set selection %p\n", (void*)lParam); - break; + return BrsFolder_OnSetSelectionA(info, (LPVOID)lParam, (BOOL)wParam); case BFFM_SETSELECTIONW: - if (wParam) - FIXME("Set selection %s\n", debugstr_w((LPWSTR)lParam)); - else - FIXME("Set selection %p\n", (void*)lParam); - break; + return BrsFolder_OnSetSelectionW(info, (LPVOID)lParam, (BOOL)wParam); case BFFM_SETEXPANDED: /* unicode only */ - if (wParam) - FIXME("Set expanded %s\n", debugstr_w((LPWSTR)lParam)); - else - FIXME("Set expanded %p\n", (void*)lParam); - break; + return BrsFolder_OnSetExpanded(info, (LPVOID)lParam, (BOOL)wParam, NULL); } return FALSE; } @@ -623,7 +711,8 @@ BROWSEINFOW bi; LPITEMIDLIST lpid; INT len; - + LPWSTR title; + TRACE("%p\n", lpbi); bi.hwndOwner = lpbi->hwndOwner; @@ -639,12 +728,13 @@ if (lpbi->lpszTitle) { len = MultiByteToWideChar( CP_ACP, 0, lpbi->lpszTitle, -1, NULL, 0 ); - bi.lpszTitle = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, lpbi->lpszTitle, -1, (LPWSTR)bi.lpszTitle, len ); + title = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, lpbi->lpszTitle, -1, title, len ); } else - bi.lpszTitle = NULL; - + title = NULL; + + bi.lpszTitle = title; bi.ulFlags = lpbi->ulFlags; bi.lpfn = lpbi->lpfn; bi.lParam = lpbi->lParam; @@ -656,7 +746,7 @@ lpbi->pszDisplayName, MAX_PATH, 0, NULL); HeapFree( GetProcessHeap(), 0, bi.pszDisplayName ); } - HeapFree(GetProcessHeap(), 0, (LPVOID)bi.lpszTitle); + HeapFree(GetProcessHeap(), 0, title); lpbi->iImage = bi.iImage; return lpid; } Modified: trunk/reactos/dll/win32/shell32/changenotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/changeno… ============================================================================== --- trunk/reactos/dll/win32/shell32/changenotify.c (original) +++ trunk/reactos/dll/win32/shell32/changenotify.c Thu Nov 23 19:57:58 2006 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdarg.h> @@ -178,6 +178,8 @@ DeleteNode( head ); LeaveCriticalSection(&SHELL32_ChangenotifyCS); + + DeleteCriticalSection(&SHELL32_ChangenotifyCS); } /************************************************************************* @@ -198,7 +200,7 @@ item = SHAlloc(sizeof(NOTIFICATIONLIST)); - TRACE("(%p,0x%08x,0x%08lx,0x%08x,%d,%p) item=%p\n", + TRACE("(%p,0x%08x,0x%08x,0x%08x,%d,%p) item=%p\n", hwnd, fSources, wEventMask, uMsg, cItems, lpItems, item); item->next = NULL; @@ -234,7 +236,7 @@ { LPNOTIFICATIONLIST node; - TRACE("(0x%08lx)\n", hNotify); + TRACE("(0x%08x)\n", hNotify); EnterCriticalSection(&SHELL32_ChangenotifyCS); @@ -253,7 +255,7 @@ BOOL WINAPI SHChangeNotifyUpdateEntryList(DWORD unknown1, DWORD unknown2, DWORD unknown3, DWORD unknown4) { - FIXME("(0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx)\n", + FIXME("(0x%08x, 0x%08x, 0x%08x, 0x%08x)\n", unknown1, unknown2, unknown3, unknown4); return -1; @@ -283,7 +285,7 @@ Pidls[0] = NULL; Pidls[1] = NULL; - TRACE("(0x%08lx,0x%08x,%p,%p):stub.\n", wEventId, uFlags, dwItem1, dwItem2); + TRACE("(0x%08x,0x%08x,%p,%p):stub.\n", wEventId, uFlags, dwItem1, dwItem2); if( ( wEventId & SHCNE_NOITEMEVENTS ) && ( dwItem1 || dwItem2 ) ) { @@ -339,10 +341,10 @@ WCHAR path[MAX_PATH]; if( Pidls[0] && SHGetPathFromIDListW(Pidls[0], path )) - TRACE("notify %08lx on item1 = %s\n", wEventId, debugstr_w(path)); + TRACE("notify %08x on item1 = %s\n", wEventId, debugstr_w(path)); if( Pidls[1] && SHGetPathFromIDListW(Pidls[1], path )) - TRACE("notify %08lx on item2 = %s\n", wEventId, debugstr_w(path)); + TRACE("notify %08x on item2 = %s\n", wEventId, debugstr_w(path)); } EnterCriticalSection(&SHELL32_ChangenotifyCS); @@ -380,7 +382,7 @@ ptr->pidlSignaled = ILClone(Pidls[0]); - TRACE("notifying %s, event %s(%lx) before\n", NodeName( ptr ), DumpEvent( + TRACE("notifying %s, event %s(%x) before\n", NodeName( ptr ), DumpEvent( wEventId ),wEventId ); ptr->wSignalledEvent |= wEventId; @@ -390,7 +392,7 @@ else SendMessageA(ptr->hwnd, ptr->uMsg, (WPARAM)Pidls, wEventId); - TRACE("notifying %s, event %s(%lx) after\n", NodeName( ptr ), DumpEvent( + TRACE("notifying %s, event %s(%x) after\n", NodeName( ptr ), DumpEvent( wEventId ),wEventId ); } @@ -400,8 +402,8 @@ /* if we allocated it, free it. The ANSI flag is also set in its Unicode sibling. */ if ((typeFlag & SHCNF_PATHA) || (typeFlag & SHCNF_PRINTERA)) { - if (Pidls[0]) SHFree((LPITEMIDLIST)Pidls[0]); - if (Pidls[1]) SHFree((LPITEMIDLIST)Pidls[1]); + SHFree((LPITEMIDLIST)Pidls[0]); + SHFree((LPITEMIDLIST)Pidls[1]); } } @@ -419,7 +421,7 @@ int count, SHChangeNotifyEntry *idlist) { - FIXME("(%p,0x%08lx,0x%08lx,0x%08lx,0x%08x,%p):semi stub.\n", + FIXME("(%p,0x%08x,0x%08x,0x%08x,0x%08x,%p):semi stub.\n", hwnd,events1,events2,msg,count,idlist); return (DWORD) SHChangeNotifyRegister(hwnd, events1, events2, msg, count, idlist); @@ -438,7 +440,7 @@ LPNOTIFICATIONLIST node; LPCITEMIDLIST *idlist; - TRACE("%p %08lx %p %p\n", hChange, dwProcessId, lppidls, lpwEventId); + TRACE("%p %08x %p %p\n", hChange, dwProcessId, lppidls, lpwEventId); /* EnterCriticalSection(&SHELL32_ChangenotifyCS); */ @@ -474,7 +476,7 @@ */ DWORD WINAPI NTSHChangeNotifyDeregister(ULONG x1) { - FIXME("(0x%08lx):semi stub.\n",x1); + FIXME("(0x%08x):semi stub.\n",x1); return SHChangeNotifyDeregister( x1 ); } Modified: trunk/reactos/dll/win32/shell32/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/control.… ============================================================================== --- trunk/reactos/dll/win32/shell32/control.c (original) +++ trunk/reactos/dll/win32/shell32/control.c Thu Nov 23 19:57:58 2006 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <assert.h> @@ -163,7 +163,7 @@ #define YICON 32 #define YSTEP 64 -static BOOL Control_Localize(const CPanel* panel, unsigned cx, unsigned cy, +static BOOL Control_Localize(const CPanel* panel, int cx, int cy, CPlApplet** papplet, unsigned* psp) { unsigned i, x = (XSTEP-XICON)/2, y = 0; @@ -228,7 +228,7 @@ unsigned i; CPlApplet* applet; - if (Control_Localize(panel, LOWORD(lParam), HIWORD(lParam), &applet, &i)) { + if (Control_Localize(panel, (short)LOWORD(lParam), (short)HIWORD(lParam), &applet, &i)) { if (up) { if (panel->clkApplet == applet && panel->clkSP == i) { applet->proc(applet->hWnd, CPL_DBLCLK, i, applet->info[i].lData); @@ -352,7 +352,6 @@ unsigned sp = 0; LPWSTR extraPmts = NULL; int quoted = 0; - BOOL spSet = FALSE; buffer = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(wszCmd) + 1) * sizeof(*wszCmd)); if (!buffer) return; @@ -367,10 +366,8 @@ if (beg) { if (*beg == '@') { sp = atoiW(beg + 1); - spSet = TRUE; } else if (*beg == '\0') { sp = 0; - spSet = TRUE; } else { extraPmts = beg; } @@ -384,9 +381,6 @@ while ((ptr = StrChrW(buffer, '"'))) memmove(ptr, ptr+1, lstrlenW(ptr)*sizeof(WCHAR)); - while ((ptr = StrChrW(extraPmts, '"'))) - memmove(ptr, ptr+1, lstrlenW(ptr)*sizeof(WCHAR)); - TRACE("cmd %s, extra %s, sp %d\n", debugstr_w(buffer), debugstr_w(extraPmts), sp); Control_LoadApplet(hWnd, buffer, panel); @@ -399,13 +393,6 @@ WARN("Out of bounds (%u >= %u), setting to 0\n", sp, applet->count); sp = 0; } - - if ((extraPmts)&&(!spSet)) - { - while ((lstrcmpiW(extraPmts, applet->info[sp].szName)) && (sp < applet->count)) - sp++; - } - if (applet->info[sp].dwSize) { if (!applet->proc(applet->hWnd, CPL_STARTWPARMSA, sp, (LPARAM)extraPmts)) applet->proc(applet->hWnd, CPL_DBLCLK, sp, applet->info[sp].lData); @@ -423,7 +410,7 @@ { CPanel panel; - TRACE("(%p, %p, %s, 0x%08lx)\n", + TRACE("(%p, %p, %s, 0x%08x)\n", hWnd, hInst, debugstr_w(cmd), nCmdShow); memset(&panel, 0, sizeof(panel)); @@ -456,7 +443,7 @@ */ HRESULT WINAPI Control_FillCache_RunDLLW(HWND hWnd, HANDLE hModule, DWORD w, DWORD x) { - FIXME("%p %p 0x%08lx 0x%08lx stub\n", hWnd, hModule, w, x); + FIXME("%p %p 0x%08x 0x%08x stub\n", hWnd, hModule, w, x); return 0; } @@ -481,7 +468,7 @@ WORD args[5]; SEGPTR cmdline_seg; - TRACE( "proc %lx hwnd %p inst %p cmdline %s cmdshow %d\n", + TRACE( "proc %x hwnd %p inst %p cmdline %s cmdshow %d\n", proc, hwnd, inst, debugstr_a(cmdline), cmdshow ); cmdline_seg = MapLS( cmdline ); @@ -507,6 +494,6 @@ */ DWORD WINAPI CallCPLEntry16(HMODULE hMod, FARPROC pFunc, DWORD dw3, DWORD dw4, DWORD dw5, DWORD dw6) { - FIXME("(%p, %p, %08lx, %08lx, %08lx, %08lx): stub.\n", hMod, pFunc, dw3, dw4, dw5, dw6); + FIXME("(%p, %p, %08x, %08x, %08x, %08x): stub.\n", hMod, pFunc, dw3, dw4, dw5, dw6); return 0x0deadbee; } Modified: trunk/reactos/dll/win32/shell32/pidl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.h?r… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.h (original) +++ trunk/reactos/dll/win32/shell32/pidl.h Thu Nov 23 19:57:58 2006 @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * NOTES: * @@ -209,6 +209,14 @@ BOOL _ILIsSpecialFolder (LPCITEMIDLIST pidl); BOOL _ILIsPidlSimple (LPCITEMIDLIST pidl); BOOL _ILIsCPanelStruct (LPCITEMIDLIST pidl); +static inline +BOOL _ILIsEqualSimple (LPCITEMIDLIST pidlA, LPCITEMIDLIST pidlB) +{ + return (pidlA->mkid.cb > 0 && !memcmp(pidlA, pidlB, pidlA->mkid.cb)) || + (!pidlA->mkid.cb && !pidlB->mkid.cb); +} +static inline +BOOL _ILIsEmpty (LPCITEMIDLIST pidl) { return _ILIsDesktop(pidl); } /* * simple pidls @@ -240,6 +248,7 @@ /* Other helpers */ LPITEMIDLIST _ILCreateMyComputer (void); +LPITEMIDLIST _ILCreateMyDocuments (void); LPITEMIDLIST _ILCreateIExplore (void); LPITEMIDLIST _ILCreateControlPanel (void); LPITEMIDLIST _ILCreatePrinters (void); Modified: trunk/reactos/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.c (original) +++ trunk/reactos/dll/win32/shell32/shlview.c Thu Nov 23 19:57:58 2006 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * FIXME: The order by part of the background context menu should be * buily according to the columns shown. @@ -146,7 +146,7 @@ #define IDM_VIEW_IDW (FCIDM_SHVIEWFIRST + 0x501) #define IDM_MYFILEITEM (FCIDM_SHVIEWFIRST + 0x502) -#define ID_LISTVIEW 2000 +#define ID_LISTVIEW 1 #define SHV_CHANGE_NOTIFY WM_USER + 0x1111 @@ -156,7 +156,7 @@ #define GET_WM_COMMAND_CMD(wp, lp) HIWORD(wp) /* - Items merged into the toolbar and and the filemenu + Items merged into the toolbar and the filemenu */ typedef struct { int idCommand; @@ -167,7 +167,7 @@ BYTE bStyle; } MYTOOLINFO, *LPMYTOOLINFO; -MYTOOLINFO Tools[] = +static const MYTOOLINFO Tools[] = { { FCIDM_SHVIEW_BIGICON, 0, 0, IDS_VIEW_LARGE, TBSTATE_ENABLED, BTNS_BUTTON }, { FCIDM_SHVIEW_SMALLICON, 0, 0, IDS_VIEW_SMALL, TBSTATE_ENABLED, BTNS_BUTTON }, @@ -222,7 +222,7 @@ { TRACE("ICommDlgBrowser::IncludeObject pidl=%p\n", pidl); ret = ICommDlgBrowser_IncludeObject(This->pCommDlgBrowser, (IShellView*)This, pidl); - TRACE("--0x%08lx\n", ret); + TRACE("--0x%08x\n", ret); } return ret; } @@ -235,7 +235,7 @@ { TRACE("ICommDlgBrowser::OnDefaultCommand\n"); ret = ICommDlgBrowser_OnDefaultCommand(This->pCommDlgBrowser, (IShellView*)This); - TRACE("-- returns %08lx\n", ret); + TRACE("-- returns %08x\n", ret); } return ret; } @@ -342,12 +342,17 @@ This->ListViewSortInfo.nLastHeaderID = -1; if (This->FolderSettings.fFlags & FWF_DESKTOP) { - if (0) /* FIXME: look into registry vale HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced\ListviewShadow and activate drop shadows */ - ListView_SetTextBkColor(This->hWndList, CLR_NONE); + /* + * FIXME: look at the registry value + * HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced\ListviewShadow + * and activate drop shadows if necessary + */ + if (0) + SendMessageW(This->hWndList, LVM_SETTEXTBKCOLOR, 0, CLR_NONE); else - ListView_SetTextBkColor(This->hWndList, GetSysColor(COLOR_DESKTOP)); - - ListView_SetTextColor(This->hWndList, RGB(255,255,255)); + SendMessageW(This->hWndList, LVM_SETTEXTBKCOLOR, 0, GetSysColor(COLOR_DESKTOP)); + + SendMessageW(This->hWndList, LVM_SETTEXTCOLOR, 0, RGB(255,255,255)); } /* UpdateShellSettings(); */ @@ -361,14 +366,14 @@ */ static BOOL ShellView_InitList(IShellViewImpl * This) { - LVCOLUMNA lvColumn; + LVCOLUMNW lvColumn; SHELLDETAILS sd; int i; - char szTemp[50]; + WCHAR szTemp[50]; TRACE("%p\n",This); - ListView_DeleteAllItems(This->hWndList); + SendMessageW(This->hWndList, LVM_DELETEALLITEMS, 0, 0); lvColumn.mask = LVCF_FMT | LVCF_WIDTH | LVCF_TEXT; lvColumn.pszText = szTemp; @@ -381,8 +386,8 @@ break; lvColumn.fmt = sd.fmt; lvColumn.cx = sd.cxChar*8; /* chars->pixel */ - StrRetToStrNA( szTemp, 50, &sd.str, NULL); - ListView_InsertColumnA(This->hWndList, i, &lvColumn); + StrRetToStrNW( szTemp, 50, &sd.str, NULL); + SendMessageW(This->hWndList, LVM_INSERTCOLUMNW, i, (LPARAM) &lvColumn); } } else @@ -390,8 +395,8 @@ FIXME("no SF2\n"); } - ListView_SetImageList(This->hWndList, ShellSmallIconList, LVSIL_SMALL); - ListView_SetImageList(This->hWndList, ShellBigIconList, LVSIL_NORMAL); + SendMessageW(This->hWndList, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)ShellSmallIconList); + SendMessageW(This->hWndList, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)ShellBigIconList); return TRUE; } @@ -522,9 +527,11 @@ LPCITEMIDLIST pidl) { LVITEMA lvItem; - ZeroMemory(&lvItem, sizeof(LVITEMA)); + lvItem.iSubItem = 0; lvItem.mask = LVIF_PARAM; - for(lvItem.iItem = 0; ListView_GetItemA(This->hWndList, &lvItem); lvItem.iItem++) + for(lvItem.iItem = 0; + SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &lvItem); + lvItem.iItem++) { LPITEMIDLIST currentpidl = (LPITEMIDLIST) lvItem.lParam; HRESULT hr = IShellFolder_CompareIDs(This->pSFParent, 0, pidl, currentpidl); @@ -545,9 +552,9 @@ TRACE("(%p)(pidl=%p)\n", This, pidl); - ZeroMemory(&lvItem, sizeof(lvItem)); /* create the listview item*/ lvItem.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM; /*set the mask*/ lvItem.iItem = ListView_GetItemCount(This->hWndList); /*add the item to the end of the list*/ + lvItem.iSubItem = 0; lvItem.lParam = (LPARAM) ILClone(ILFindLastID(pidl)); /*set the item's data*/ lvItem.pszText = LPSTR_TEXTCALLBACKA; /*get text on a callback basis*/ lvItem.iImage = I_IMAGECALLBACK; /*get the image on a callback basis*/ @@ -580,17 +587,16 @@ nItem = LV_FindItemByPidl(This, ILFindLastID(pidlOld)); if ( -1 != nItem ) { - ZeroMemory(&lvItem, sizeof(lvItem)); /* create the listview item*/ lvItem.mask = LVIF_PARAM; /* only the pidl */ lvItem.iItem = nItem; - ListView_GetItemA(This->hWndList, &lvItem); + SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &lvItem); SHFree((LPITEMIDLIST)lvItem.lParam); lvItem.mask = LVIF_PARAM; lvItem.iItem = nItem; lvItem.lParam = (LPARAM) ILClone(ILFindLastID(pidlNew)); /* set the item's data */ - ListView_SetItemA(This->hWndList, &lvItem); - ListView_Update(This->hWndList, nItem); + SendMessageA(This->hWndList, LVM_SETITEMA, 0, (LPARAM) &lvItem); + SendMessageA(This->hWndList, LVM_UPDATE, nItem, 0); return TRUE; /* FIXME: better handling */ } return FALSE; @@ -772,19 +778,21 @@ */ static void ShellView_MergeViewMenu(IShellViewImpl * This, HMENU hSubMenu) -{ MENUITEMINFOA mii; - +{ TRACE("(%p)->(submenu=%p)\n",This,hSubMenu); if(hSubMenu) { /*add a separator at the correct position in the menu*/ + MENUITEMINFOA mii; + static char view[] = "View"; + _InsertMenuItem(hSubMenu, FCIDM_MENU_VIEW_SEP_OPTIONS, FALSE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED); ZeroMemory(&mii, sizeof(mii)); mii.cbSize = sizeof(mii); mii.fMask = MIIM_SUBMENU | MIIM_TYPE | MIIM_DATA; mii.fType = MFT_STRING; - mii.dwTypeData = "View"; + mii.dwTypeData = view; mii.hSubMenu = LoadMenuA(shell32_hInstance, "MENU_001"); InsertMenuItemA(hSubMenu, FCIDM_MENU_VIEW_SEP_OPTIONS, FALSE, &mii); } @@ -803,10 +811,7 @@ LVITEMA lvItem; UINT i = 0; - if (This->apidl) - { - SHFree(This->apidl); - } + SHFree(This->apidl); This->cidl = ListView_GetSelectedCount(This->hWndList); This->apidl = (LPITEMIDLIST*)SHAlloc(This->cidl * sizeof(LPITEMIDLIST)); @@ -817,9 +822,10 @@ { TRACE("-- Items selected =%u\n", This->cidl); - ZeroMemory(&lvItem, sizeof(lvItem)); lvItem.mask = LVIF_STATE | LVIF_PARAM; lvItem.stateMask = LVIS_SELECTED; + lvItem.iItem = 0; + lvItem.iSubItem = 0; while(ListView_GetItemA(This->hWndList, &lvItem) && (i < This->cidl)) { @@ -1191,7 +1197,7 @@ */ static LRESULT ShellView_OnCommand(IShellViewImpl * This,DWORD dwCmdID, DWORD dwCmd, HWND hwndCmd) { - TRACE("(%p)->(0x%08lx 0x%08lx %p) stub\n",This, dwCmdID, dwCmd, hwndCmd); + TRACE("(%p)->(0x%08x 0x%08x %p) stub\n",This, dwCmdID, dwCmd, hwndCmd); switch(dwCmdID) { @@ -1227,11 +1233,11 @@ This->ListViewSortInfo.nHeaderID = (LPARAM) (dwCmdID - 0x30); This->ListViewSortInfo.bIsAscending = TRUE; This->ListViewSortInfo.nLastHeaderID = This->ListViewSortInfo.nHeaderID; - ListView_SortItems(This->hWndList, ShellView_ListViewCompareItems, (LPARAM) (&(This->ListViewSortInfo))); + SendMessageA(This->hWndList, LVM_SORTITEMS, (WPARAM) &This->ListViewSortInfo, (LPARAM)ShellView_ListViewCompareItems); break; default: - TRACE("-- COMMAND 0x%04lx unhandled\n", dwCmdID); + TRACE("-- COMMAND 0x%04x unhandled\n", dwCmdID); } return 0; } @@ -1323,7 +1329,7 @@ } This->ListViewSortInfo.nLastHeaderID = This->ListViewSortInfo.nHeaderID; - ListView_SortItems(lpnmlv->hdr.hwndFrom, ShellView_ListViewCompareItems, (LPARAM) (&(This->ListViewSortInfo))); + SendMessageA(lpnmlv->hdr.hwndFrom, LVM_SORTITEMS, (WPARAM) &This->ListViewSortInfo, (LPARAM)ShellView_ListViewCompareItems); break; case LVN_GETDISPINFOA: @@ -1420,10 +1426,10 @@ WCHAR wszNewName[MAX_PATH]; LVITEMA lvItem; - ZeroMemory(&lvItem, sizeof(LVITEMA)); lvItem.iItem = lpdi->item.iItem; + lvItem.iSubItem = 0; lvItem.mask = LVIF_PARAM; - ListView_GetItemA(This->hWndList, &lvItem); + SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &lvItem); pidl = (LPITEMIDLIST)lpdi->item.lParam; if (!MultiByteToWideChar( CP_ACP, 0, lpdi->item.pszText, -1, wszNewName, MAX_PATH )) @@ -1434,7 +1440,7 @@ { lvItem.mask = LVIF_PARAM; lvItem.lParam = (LPARAM)pidl; - ListView_SetItemA(This->hWndList, &lvItem); + SendMessageA(This->hWndList, LVM_SETITEMA, 0, (LPARAM) &lvItem); return TRUE; } } @@ -1466,8 +1472,8 @@ i = ListView_GetNextItem(This->hWndList, -1, LVNI_SELECTED); - ListView_EnsureVisible(This->hWndList, i, 0); - ListView_EditLabelA(This->hWndList, i); + SendMessageW(This->hWndList, LVM_ENSUREVISIBLE, i, 0); + SendMessageW(This->hWndList, LVM_EDITLABELW, i, 0); } } #if 0 @@ -1503,8 +1509,8 @@ item_index = ListView_GetNextItem(This->hWndList, item_index, LVNI_SELECTED); item.iItem = item_index; - item.mask |= LVIF_PARAM; - ListView_GetItemA(This->hWndList, &item); + item.mask = LVIF_PARAM; + SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &item); /* get item pidl */ pItems[i] = (LPITEMIDLIST)item.lParam; @@ -1544,7 +1550,7 @@ static LRESULT ShellView_OnChange(IShellViewImpl * This, LPITEMIDLIST * Pidls, LONG wEventId) { - TRACE("(%p)(%p,%p,0x%08lx)\n", This, Pidls[0], Pidls[1], wEventId); + TRACE("(%p)(%p,%p,0x%08x)\n", This, Pidls[0], Pidls[1], wEventId); switch(wEventId) { case SHCNE_MKDIR: @@ -1678,7 +1684,7 @@ IShellViewImpl *This = (IShellViewImpl *)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%lu)\n", This, refCount - 1); + TRACE("(%p)->(count=%u)\n", This, refCount - 1); return refCount; } @@ -1690,7 +1696,7 @@ IShellViewImpl *This = (IShellViewImpl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(count=%li)\n", This, refCount + 1); + TRACE("(%p)->(count=%i)\n", This, refCount + 1); if (!refCount) { @@ -1704,8 +1710,7 @@ if(This->pSF2Parent) IShellFolder2_Release(This->pSF2Parent); - if(This->apidl) - SHFree(This->apidl); + SHFree(This->apidl); if(This->pAdvSink) IAdviseSink_Release(This->pAdvSink); @@ -1749,7 +1754,7 @@ #if 0 IShellViewImpl *This = (IShellViewImpl *)iface; - FIXME("(%p)->(%p: hwnd=%x msg=%x lp=%lx wp=%x) stub\n",This,lpmsg, lpmsg->hwnd, lpmsg->message, lpmsg->lParam, lpmsg->wParam); + FIXME("(%p)->(%p: hwnd=%x msg=%x lp=%x wp=%x) stub\n",This,lpmsg, lpmsg->hwnd, lpmsg->message, lpmsg->lParam, lpmsg->wParam); #endif if ((lpmsg->message>=WM_KEYFIRST) && (lpmsg->message>=WM_KEYLAST)) @@ -1817,7 +1822,7 @@ TRACE("(%p)\n",This); - ListView_DeleteAllItems(This->hWndList); + SendMessageW(This->hWndList, LVM_DELETEALLITEMS, 0, 0); ShellView_FillList(This); return S_OK; @@ -1838,7 +1843,7 @@ TRACE("(%p)->(shlview=%p set=%p shlbrs=%p rec=%p hwnd=%p) incomplete\n",This, lpPrevView,lpfs, psb, prcView, phWnd); - TRACE("-- vmode=%x flags=%x left=%li top=%li right=%li bottom=%li\n",lpfs->ViewMode, lpfs->fFlags ,prcView->left,prcView->top, prcView->right, prcView->bottom); + TRACE("-- vmode=%x flags=%x left=%i top=%i right=%i bottom=%i\n",lpfs->ViewMode, lpfs->fFlags ,prcView->left,prcView->top, prcView->right, prcView->bottom); /*set up the member variables*/ This->pShellBrowser = psb; @@ -1878,7 +1883,7 @@ *phWnd = CreateWindowExA(0, SV_CLASS_NAME, NULL, - WS_CHILD | WS_VISIBLE | WS_TABSTOP, + WS_CHILD | WS_TABSTOP, prcView->left, prcView->top, prcView->right - prcView->left, @@ -1892,6 +1897,9 @@ if(!*phWnd) return E_FAIL; + SetWindowPos(*phWnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW); + UpdateWindow(*phWnd); + return S_OK; } @@ -1965,13 +1973,14 @@ LVITEMA lvItem; if(uFlags & SVSI_ENSUREVISIBLE) - ListView_EnsureVisible(This->hWndList, i, 0); - - ZeroMemory(&lvItem, sizeof(LVITEMA)); + SendMessageW(This->hWndList, LVM_ENSUREVISIBLE, i, 0); + lvItem.mask = LVIF_STATE; + lvItem.stateMask = LVIS_SELECTED | LVIS_FOCUSED; lvItem.iItem = 0; - - while(ListView_GetItemA(This->hWndList, &lvItem)) + lvItem.iSubItem = 0; + + while(SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &lvItem)) { if (lvItem.iItem == i) { @@ -1988,13 +1997,13 @@ if (uFlags & SVSI_DESELECTOTHERS) lvItem.state &= ~LVIS_SELECTED; } - ListView_SetItemA(This->hWndList, &lvItem); + SendMessageA(This->hWndList, LVM_SETITEMA, 0, (LPARAM) &lvItem); lvItem.iItem++; } if(uFlags & SVSI_EDIT) - ListView_EditLabelA(This->hWndList, i); + SendMessageW(This->hWndList, LVM_EDITLABELW, i, 0); } return S_OK; @@ -2095,14 +2104,14 @@ UINT i; IShellViewImpl *This = impl_from_IOleCommandTarget(iface); - FIXME("(%p)->(%p(%s) 0x%08lx %p %p\n", + FIXME("(%p)->(%p(%s) 0x%08x %p %p\n", This, pguidCmdGroup, debugstr_guid(pguidCmdGroup), cCmds, prgCmds, pCmdText); if (!prgCmds) return E_POINTER; for (i = 0; i < cCmds; i++) { - FIXME("\tprgCmds[%d].cmdID = %ld\n", i, prgCmds[i].cmdID); + FIXME("\tprgCmds[%d].cmdID = %d\n", i, prgCmds[i].cmdID); prgCmds[i].cmdf = 0; } return OLECMDERR_E_UNKNOWNGROUP; @@ -2123,7 +2132,7 @@ { IShellViewImpl *This = impl_from_IOleCommandTarget(iface); - FIXME("(%p)->(\n\tTarget GUID:%s Command:0x%08lx Opt:0x%08lx %p %p)\n", + FIXME("(%p)->(\n\tTarget GUID:%s Command:0x%08x Opt:0x%08x %p %p)\n", This, debugstr_guid(pguidCmdGroup), nCmdID, nCmdexecopt, pvaIn, pvaOut); if (IsEqualIID(pguidCmdGroup, &CGID_Explorer) && @@ -2167,7 +2176,7 @@ { IShellViewImpl *This = impl_from_IDropTarget(iface); - TRACE("(%p)->(count=%lu)\n",This,This->ref); + TRACE("(%p)->(count=%u)\n",This,This->ref); return IShellFolder_AddRef((IShellFolder*)This); } @@ -2176,7 +2185,7 @@ { IShellViewImpl *This = impl_from_IDropTarget(iface); - TRACE("(%p)->(count=%lu)\n",This,This->ref); + TRACE("(%p)->(count=%u)\n",This,This->ref); return IShellFolder_Release((IShellFolder*)This); } @@ -2249,10 +2258,10 @@ } else { /* Query the relative PIDL of the shellfolder object represented by the currently * dragged over listview-item ... */ - ZeroMemory(&lvItem, sizeof(lvItem)); lvItem.mask = LVIF_PARAM; lvItem.iItem = lResult; - ListView_GetItemA(This->hWndList, &lvItem); + lvItem.iSubItem = 0; + SendMessageA(This->hWndList, LVM_GETITEMA, 0, (LPARAM) &lvItem); /* ... and bind pCurDropTarget to the IDropTarget interface of an UIObject of this object */ hr = IShellFolder_GetUIObjectOf(This->pSFParent, This->hWndList, 1, @@ -2347,7 +2356,7 @@ { IShellViewImpl *This = impl_from_IDropSource(iface); - TRACE("(%p)->(count=%lu)\n",This,This->ref); + TRACE("(%p)->(count=%u)\n",This,This->ref); return IShellFolder_AddRef((IShellFolder*)This); } @@ -2356,7 +2365,7 @@ { IShellViewImpl *This = impl_from_IDropSource(iface); - TRACE("(%p)->(count=%lu)\n",This,This->ref); + TRACE("(%p)->(count=%u)\n",This,This->ref); return IShellFolder_Release((IShellFolder*)This); } @@ -2414,7 +2423,7 @@ { IShellViewImpl *This = impl_from_IViewObject(iface); - TRACE("(%p)->(count=%lu)\n",This,This->ref); + TRACE("(%p)->(count=%u)\n",This,This->ref); return IShellFolder_AddRef((IShellFolder*)This); } @@ -2423,7 +2432,7 @@ { IShellViewImpl *This = impl_from_IViewObject(iface); - TRACE("(%p)->(count=%lu)\n",This,This->ref); + TRACE("(%p)->(count=%u)\n",This,This->ref); return IShellFolder_Release((IShellFolder*)This); } @@ -2498,7 +2507,7 @@ IShellViewImpl *This = impl_from_IViewObject(iface); - FIXME("partial stub: %p %08lx %08lx %p\n", + FIXME("partial stub: %p %08x %08x %p\n", This, aspects, advf, pAdvSink); /* FIXME: we set the AdviseSink, but never use it to send any advice */

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