Ros-diffs August 2010

ros-diffs@reactos.org

14 participants
282 discussions

[cgutman] 48400: [AFD]: Revert r42674 and part of r47156

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Aug 1 21:00:40 2010 New Revision: 48400 URL: http://svn.reactos.org/svn/reactos?rev=48400&view=rev Log: [AFD]: Revert r42674 and part of r47156 Modified: trunk/reactos/drivers/network/afd/afd/read.c Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Sun Aug 1 21:00:40 2010 @@ -26,8 +26,28 @@ #include "tdiconn.h" #include "debug.h" -static NTSTATUS RefillSocketBuffer( PAFD_FCB FCB ) { - NTSTATUS Status = STATUS_PENDING; +static VOID HandleEOFOnIrp( PAFD_FCB FCB, NTSTATUS Status, ULONG_PTR Information ) +{ + if( ( Status == STATUS_SUCCESS && !FCB->ReceiveIrp.Iosb.Information ) || + ( !NT_SUCCESS( Status ) ) ) + { + /* The socket has been closed */ + FCB->PollState |= AFD_EVENT_DISCONNECT; + FCB->PollStatus[FD_CLOSE_BIT] = Status; + + PollReeval( FCB->DeviceExt, FCB->FileObject ); + } +} + +static BOOLEAN CantReadMore( PAFD_FCB FCB ) { + UINT BytesAvailable = FCB->Recv.Content - FCB->Recv.BytesUsed; + + return !BytesAvailable && + (FCB->PollState & (AFD_EVENT_CLOSE | AFD_EVENT_DISCONNECT)); +} + +static VOID RefillSocketBuffer( PAFD_FCB FCB ) { + NTSTATUS Status; if( !FCB->ReceiveIrp.InFlightRequest ) { AFD_DbgPrint(MID_TRACE,("Replenishing buffer\n")); @@ -41,25 +61,20 @@ ReceiveComplete, FCB ); - if( ( Status == STATUS_SUCCESS && !FCB->ReceiveIrp.Iosb.Information ) || - ( !NT_SUCCESS( Status ) ) ) - { - /* The socket has been closed */ - FCB->PollState |= AFD_EVENT_DISCONNECT; - FCB->PollStatus[FD_CLOSE_BIT] = Status; - FCB->Overread = TRUE; - Status = STATUS_FILE_CLOSED; - } - else if( Status == STATUS_SUCCESS ) + if( Status == STATUS_SUCCESS && FCB->ReceiveIrp.Iosb.Information ) { FCB->Recv.Content = FCB->ReceiveIrp.Iosb.Information; FCB->PollState |= AFD_EVENT_RECEIVE; FCB->PollStatus[FD_READ_BIT] = STATUS_SUCCESS; + + PollReeval( FCB->DeviceExt, FCB->FileObject ); } - PollReeval( FCB->DeviceExt, FCB->FileObject ); + else + { + /* Check for EOF */ + HandleEOFOnIrp(FCB, Status, FCB->ReceiveIrp.Iosb.Information); + } } - - return Status; } static NTSTATUS TryToSatisfyRecvRequestFromBuffer( PAFD_FCB FCB, @@ -76,22 +91,8 @@ AFD_DbgPrint(MID_TRACE,("Called, BytesAvailable = %d\n", BytesAvailable)); - if( FCB->Overread ) return STATUS_FILE_CLOSED; - if( !BytesAvailable ) { - FCB->Recv.Content = FCB->Recv.BytesUsed = 0; - Status = RefillSocketBuffer( FCB ); - if ( Status != STATUS_SUCCESS ) - return Status; - - /* If RefillSocketBuffer returns STATUS_SUCCESS, we're good to go - * If RefillSocketBuffer returns STATUS_PENDING, then it's waiting on the transport for data - * If RefillSocketBuffer returns STATUS_FILE_CLOSED, then the connection was terminated - */ - - /* Recalculate BytesAvailable based on new data */ - BytesAvailable = FCB->Recv.Content - FCB->Recv.BytesUsed; - ASSERT(BytesAvailable); - } + if( CantReadMore(FCB) ) return STATUS_SUCCESS; + if( !BytesAvailable ) return STATUS_PENDING; Map = (PAFD_MAPBUF)(RecvReq->BufferArray + RecvReq->BufferCount); @@ -156,37 +157,72 @@ AFD_DbgPrint(MID_TRACE,("FCB %x Receive data waiting %d\n", FCB, FCB->Recv.Content)); - /* Try to clear some requests */ - while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { - NextIrpEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_RECV]); - NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); - NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); - RecvReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; - - AFD_DbgPrint(MID_TRACE,("RecvReq @ %x\n", RecvReq)); - - Status = TryToSatisfyRecvRequestFromBuffer( FCB, RecvReq, &TotalBytesCopied ); - - if( Status == STATUS_PENDING ) { - AFD_DbgPrint(MID_TRACE,("Ran out of data for %x\n", NextIrp)); - InsertHeadList(&FCB->PendingIrpList[FUNCTION_RECV], - &NextIrp->Tail.Overlay.ListEntry); - break; - } else { - AFD_DbgPrint(MID_TRACE,("Completing recv %x (%d)\n", NextIrp, - TotalBytesCopied)); - UnlockBuffers( RecvReq->BufferArray, - RecvReq->BufferCount, FALSE ); - NextIrp->IoStatus.Status = Status; - NextIrp->IoStatus.Information = TotalBytesCopied; - if( NextIrp == Irp ) { - RetStatus = Status; - RetBytesCopied = TotalBytesCopied; + if( CantReadMore( FCB ) ) { + /* Success here means that we got an EOF. Complete a pending read + * with zero bytes if we haven't yet overread, then kill the others. + */ + while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { + NextIrpEntry = + RemoveHeadList(&FCB->PendingIrpList[FUNCTION_RECV]); + NextIrp = + CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); + NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); + RecvReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + + AFD_DbgPrint(MID_TRACE,("Completing recv %x (%d)\n", NextIrp, + TotalBytesCopied)); + UnlockBuffers( RecvReq->BufferArray, + RecvReq->BufferCount, FALSE ); + Status = NextIrp->IoStatus.Status = + FCB->Overread ? STATUS_END_OF_FILE : STATUS_SUCCESS; + NextIrp->IoStatus.Information = 0; + if( NextIrp == Irp ) RetStatus = Status; + if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); + FCB->Overread = TRUE; + } + } else { + /* Kick the user that receive would be possible now */ + /* XXX Not implemented yet */ + + AFD_DbgPrint(MID_TRACE,("FCB %x Receive data waiting %d\n", + FCB, FCB->Recv.Content)); + /*OskitDumpBuffer( FCB->Recv.Window, FCB->Recv.Content );*/ + + /* Try to clear some requests */ + while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { + NextIrpEntry = + RemoveHeadList(&FCB->PendingIrpList[FUNCTION_RECV]); + NextIrp = + CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); + NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); + RecvReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + + AFD_DbgPrint(MID_TRACE,("RecvReq @ %x\n", RecvReq)); + + Status = TryToSatisfyRecvRequestFromBuffer + ( FCB, RecvReq, &TotalBytesCopied ); + + if( Status == STATUS_PENDING ) { + AFD_DbgPrint(MID_TRACE,("Ran out of data for %x\n", NextIrp)); + InsertHeadList(&FCB->PendingIrpList[FUNCTION_RECV], + &NextIrp->Tail.Overlay.ListEntry); + break; + } else { + AFD_DbgPrint(MID_TRACE,("Completing recv %x (%d)\n", NextIrp, + TotalBytesCopied)); + UnlockBuffers( RecvReq->BufferArray, + RecvReq->BufferCount, FALSE ); + NextIrp->IoStatus.Status = Status; + NextIrp->IoStatus.Information = TotalBytesCopied; + if( NextIrp == Irp ) { + RetStatus = Status; + RetBytesCopied = TotalBytesCopied; + } + if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); + } } - if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); - (void)IoSetCancelRoutine(NextIrp, NULL); - IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); - } } if( FCB->Recv.Content ) { @@ -249,6 +285,8 @@ SocketStateUnlock( FCB ); return STATUS_INVALID_PARAMETER; } + + HandleEOFOnIrp( FCB, Irp->IoStatus.Status, Irp->IoStatus.Information ); ReceiveActivity( FCB, NULL );

14 years, 4 months

[cgutman] 48399: [DHCPCSVC]: Revert part of r48215

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Aug 1 20:34:10 2010 New Revision: 48399 URL: http://svn.reactos.org/svn/reactos?rev=48399&view=rev Log: [DHCPCSVC]: Revert part of r48215 Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/ad… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c [iso-8859-1] Sun Aug 1 20:34:10 2010 @@ -102,8 +102,7 @@ "SYSTEM\\CurrentControlSet\\Control\\Class\\" "{4D36E972-E325-11CE-BFC1-08002BE10318}"; PCHAR TargetKeyNameStart = - "SYSTEM\\CurrentControlSet\\Services\\"; - PCHAR TargetKeyNameEnd = "\\Parameters\\Tcpip"; + "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\"; PCHAR TargetKeyName = NULL; PCHAR *EnumKeysLinkage = GetSubkeyNames( EnumKeyName, "\\Linkage" ); PCHAR *EnumKeysTop = GetSubkeyNames( EnumKeyName, "" ); @@ -125,10 +124,10 @@ !strcmp( RootDevice, Adapter->DhclientInfo.name ) ) { TargetKeyName = (CHAR*) malloc( strlen( TargetKeyNameStart ) + - strlen( RootDevice ) + strlen( TargetKeyNameEnd ) + 1); + strlen( RootDevice ) + 1); if( !TargetKeyName ) goto cleanup; - sprintf( TargetKeyName, "%s%s%s", - TargetKeyNameStart, RootDevice, TargetKeyNameEnd ); + sprintf( TargetKeyName, "%s%s", + TargetKeyNameStart, RootDevice ); Error = RegCreateKeyExA( HKEY_LOCAL_MACHINE, TargetKeyName, 0, NULL, 0, KEY_READ, NULL, &OutKey, NULL ); break; } else {

14 years, 4 months

[gadamopoulos] 48398: [rtl] - Use __inline instead of __inline__ to fix compilation with msvc

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Aug 1 16:34:22 2010 New Revision: 48398 URL: http://svn.reactos.org/svn/reactos?rev=48398&view=rev Log: [rtl] - Use __inline instead of __inline__ to fix compilation with msvc Modified: trunk/reactos/lib/rtl/bitmap.c Modified: trunk/reactos/lib/rtl/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/bitmap.c?rev=48398… ============================================================================== --- trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] Sun Aug 1 16:34:22 2010 @@ -43,7 +43,7 @@ /* PRIVATE FUNCTIONS ********************************************************/ -static __inline__ +static __inline ULONG RtlpGetLengthOfRunClear( IN PRTL_BITMAP BitMapHeader, @@ -92,7 +92,7 @@ return Length; } -static __inline__ +static __inline ULONG RtlpGetLengthOfRunSet( IN PRTL_BITMAP BitMapHeader,

14 years, 4 months

[gadamopoulos] 48397: [hal] - define REGISTERCALL in order to replace __attribute__((regparm(3))) and fix compilation with msvc. It was used only as an optimization so it is safe to be defined as FASTCALL for msvc. For gcc it is still defined as __attribute__((regparm(3)))

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Aug 1 16:27:48 2010 New Revision: 48397 URL: http://svn.reactos.org/svn/reactos?rev=48397&view=rev Log: [hal] - define REGISTERCALL in order to replace __attribute__((regparm(3))) and fix compilation with msvc. It was used only as an optimization so it is safe to be defined as FASTCALL for msvc. For gcc it is still defined as __attribute__((regparm(3))) Modified: trunk/reactos/hal/halx86/include/halp.h trunk/reactos/hal/halx86/up/pic.c Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Sun Aug 1 16:27:48 2010 @@ -3,6 +3,13 @@ */ #pragma once + + +#ifdef _MSC_VER +#define REGISTERCALL FASTCALL +#else +#define REGISTERCALL __attribute__((regparm(3))) +#endif typedef struct _HAL_BIOS_FRAME { @@ -408,15 +415,14 @@ typedef BOOLEAN -__attribute__((regparm(3))) -(*PHAL_DISMISS_INTERRUPT)( +( REGISTERCALL *PHAL_DISMISS_INTERRUPT)( IN KIRQL Irql, IN ULONG Irq, OUT PKIRQL OldIrql ); BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrqGeneric( IN KIRQL Irql, IN ULONG Irq, @@ -424,7 +430,7 @@ ); BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrq15( IN KIRQL Irql, IN ULONG Irq, @@ -432,7 +438,7 @@ ); BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrq13( IN KIRQL Irql, IN ULONG Irq, @@ -440,7 +446,7 @@ ); BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrq07( IN KIRQL Irql, IN ULONG Irq, @@ -448,7 +454,7 @@ ); BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrqLevel( IN KIRQL Irql, IN ULONG Irq, @@ -456,7 +462,7 @@ ); BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrq15Level( IN KIRQL Irql, IN ULONG Irq, @@ -464,7 +470,7 @@ ); BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrq13Level( IN KIRQL Irql, IN ULONG Irq, @@ -472,7 +478,7 @@ ); BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrq07Level( IN KIRQL Irql, IN ULONG Irq, Modified: trunk/reactos/hal/halx86/up/pic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/pic.c?rev=48… ============================================================================== --- trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] Sun Aug 1 16:27:48 2010 @@ -813,7 +813,7 @@ } BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrqGeneric(IN KIRQL Irql, IN ULONG Irq, OUT PKIRQL OldIrql) @@ -823,7 +823,7 @@ } BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrq15(IN KIRQL Irql, IN ULONG Irq, OUT PKIRQL OldIrql) @@ -859,7 +859,7 @@ BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrq13(IN KIRQL Irql, IN ULONG Irq, OUT PKIRQL OldIrql) @@ -872,7 +872,7 @@ } BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrq07(IN KIRQL Irql, IN ULONG Irq, OUT PKIRQL OldIrql) @@ -956,7 +956,7 @@ } BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrqLevel(IN KIRQL Irql, IN ULONG Irq, OUT PKIRQL OldIrql) @@ -966,7 +966,7 @@ } BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrq15Level(IN KIRQL Irql, IN ULONG Irq, OUT PKIRQL OldIrql) @@ -1001,7 +1001,7 @@ } BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrq13Level(IN KIRQL Irql, IN ULONG Irq, OUT PKIRQL OldIrql) @@ -1014,7 +1014,7 @@ } BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrq07Level(IN KIRQL Irql, IN ULONG Irq, OUT PKIRQL OldIrql) @@ -1252,8 +1252,8 @@ } VOID +DECLSPEC_NORETURN FASTCALL -DECLSPEC_NORETURN HalpApcInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame) { /* Do the work */ @@ -1261,8 +1261,8 @@ } VOID +DECLSPEC_NORETURN FASTCALL -DECLSPEC_NORETURN HalpApcInterruptHandler(IN PKTRAP_FRAME TrapFrame) { /* Set up a fake INT Stack */ @@ -1301,8 +1301,8 @@ } VOID +DECLSPEC_NORETURN FASTCALL -DECLSPEC_NORETURN HalpDispatchInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame) { KIRQL CurrentIrql;

14 years, 4 months

[khornicek] 48396: [WIN32K] Comply with the 32 bit alignment rule. Fixes hatch brushes.

by khornicek＠svn.reactos.org

Author: khornicek Date: Sun Aug 1 13:29:22 2010 New Revision: 48396 URL: http://svn.reactos.org/svn/reactos?rev=48396&view=rev Log: [WIN32K] Comply with the 32 bit alignment rule. Fixes hatch brushes. Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/brush.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/brush.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/brush.c [iso-8859-1] Sun Aug 1 13:29:22 2010 @@ -25,7 +25,7 @@ RGN_ATTR Attr[GDIOBJATTRFREE]; } GDI_OBJ_ATTR_ENTRY, *PGDI_OBJ_ATTR_ENTRY; -static const USHORT HatchBrushes[NB_HATCH_STYLES][8] = +static const ULONG HatchBrushes[NB_HATCH_STYLES][8] = { {0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF}, /* HS_HORIZONTAL */ {0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7}, /* HS_VERTICAL */

14 years, 4 months

[fireball] 48395: - Fix user32 build by merging header updates (44999-48394).

by fireball＠svn.reactos.org

Author: fireball Date: Sun Aug 1 13:20:30 2010 New Revision: 48395 URL: http://svn.reactos.org/svn/reactos?rev=48395&view=rev Log: - Fix user32 build by merging header updates (44999-48394). Modified: branches/arwinss/reactos/dll/win32/version/ (props changed) branches/arwinss/reactos/dll/win32/version/resource.c branches/arwinss/reactos/include/psdk/winnt.h branches/arwinss/reactos/include/psdk/winuser.h (contents, props changed) Propchange: branches/arwinss/reactos/dll/win32/version/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Aug 1 13:20:30 2010 @@ -1,0 +1,2 @@ +/branches/ros-amd64-bringup/reactos/dll/win32/version:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 +/trunk/reactos/dll/win32/version:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605,48386 Modified: branches/arwinss/reactos/dll/win32/version/resource.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/versi… ============================================================================== --- branches/arwinss/reactos/dll/win32/version/resource.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/version/resource.c [iso-8859-1] Sun Aug 1 13:20:30 2010 @@ -66,9 +66,9 @@ while (min <= max) { pos = (min + max) / 2; - if (entry[pos].u1.s2.Id == id) + if (entry[pos].u1.Id == id) return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].u2.s3.OffsetToDirectory); - if (entry[pos].u1.s2.Id > id) max = pos - 1; + if (entry[pos].u1.Id > id) max = pos - 1; else min = pos + 1; } return NULL; Modified: branches/arwinss/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/wi… ============================================================================== --- branches/arwinss/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/psdk/winnt.h [iso-8859-1] Sun Aug 1 13:20:30 2010 @@ -4001,26 +4001,24 @@ WORD NumberOfNamedEntries; WORD NumberOfIdEntries; } IMAGE_RESOURCE_DIRECTORY,*PIMAGE_RESOURCE_DIRECTORY; -_ANONYMOUS_STRUCT typedef struct _IMAGE_RESOURCE_DIRECTORY_ENTRY { - _ANONYMOUS_UNION union { - _ANONYMOUS_STRUCT struct { - DWORD NameOffset:31; - DWORD NameIsString:1; - }DUMMYSTRUCTNAME1; - DWORD Name; - _ANONYMOUS_STRUCT struct { - WORD Id; - WORD __pad; - }DUMMYSTRUCTNAME2; - } DUMMYUNIONNAME1; - _ANONYMOUS_UNION union { - DWORD OffsetToData; - _ANONYMOUS_STRUCT struct { - DWORD OffsetToDirectory:31; - DWORD DataIsDirectory:1; - } DUMMYSTRUCTNAME3; - } DUMMYUNIONNAME2; -} IMAGE_RESOURCE_DIRECTORY_ENTRY,*PIMAGE_RESOURCE_DIRECTORY_ENTRY; + +typedef struct _IMAGE_RESOURCE_DIRECTORY_ENTRY { + _ANONYMOUS_UNION union { + _ANONYMOUS_STRUCT struct { + DWORD NameOffset:31; + DWORD NameIsString:1; + } DUMMYSTRUCTNAME1; + DWORD Name; + WORD Id; + } DUMMYUNIONNAME1; + _ANONYMOUS_UNION union { + DWORD OffsetToData; + _ANONYMOUS_STRUCT struct { + DWORD OffsetToDirectory:31; + DWORD DataIsDirectory:1; + } DUMMYSTRUCTNAME3; + } DUMMYUNIONNAME2; +} IMAGE_RESOURCE_DIRECTORY_ENTRY, *PIMAGE_RESOURCE_DIRECTORY_ENTRY; typedef struct _IMAGE_RESOURCE_DIRECTORY_STRING { WORD Length; Modified: branches/arwinss/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/wi… ============================================================================== --- branches/arwinss/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/psdk/winuser.h [iso-8859-1] Sun Aug 1 13:20:30 2010 @@ -299,6 +299,9 @@ #define ES_LOWERCASE 16 #define ES_MULTILINE 4 #define ES_NOHIDESEL 256 +#ifdef _WINE +#define ES_COMBO 0x200 /* Undocumented. Parent is a combobox */ +#endif #define ES_NUMBER 0x2000 #define ES_OEMCONVERT 0x400 #define ES_PASSWORD 32 @@ -306,7 +309,6 @@ #define ES_RIGHT 2 #define ES_UPPERCASE 8 #define ES_WANTRETURN 4096 -#define ES_COMBO 0x00000200 /* Undocumented. Parent is a combobox */ #define LBS_DISABLENOSCROLL 4096 #define LBS_EXTENDEDSEL 0x800 #define LBS_HASSTRINGS 64 @@ -868,7 +870,7 @@ #define QS_SENDMESSAGE 64 #define QS_TIMER 16 /* Extra (undocumented) queue wake bits - see "Undoc. Windows" */ -#define QS_SMRESULT 0x8000 +#define QS_SMRESULT 0x8000 #define USER_TIMER_MAXIMUM 2147483647 #define USER_TIMER_MINIMUM 10 @@ -1148,8 +1150,8 @@ #define MOUSEEVENTF_RIGHTUP 16 #define MOUSEEVENTF_MIDDLEDOWN 32 #define MOUSEEVENTF_MIDDLEUP 64 -#define MOUSEEVENTF_XDOWN 0x0080 -#define MOUSEEVENTF_XUP 0x0100 +#define MOUSEEVENTF_XDOWN 128 +#define MOUSEEVENTF_XUP 256 #define MOUSEEVENTF_WHEEL 0x0800 #define MOUSEEVENTF_ABSOLUTE 32768 #define PM_NOREMOVE 0 @@ -1211,9 +1213,9 @@ #define SWP_DEFERERASE 8192 #define SWP_ASYNCWINDOWPOS 16384 /* undocumented SWP flags - from SDK 3.1 */ -#define SWP_NOCLIENTSIZE 0x0800 -#define SWP_NOCLIENTMOVE 0x1000 -#define SWP_STATECHANGED 0x8000 +#define SWP_NOCLIENTSIZE 0x0800 +#define SWP_NOCLIENTMOVE 0x1000 +#define SWP_STATECHANGED 0x8000 #define HSHELL_WINDOWCREATED 1 #define HSHELL_WINDOWDESTROYED 2 @@ -1572,7 +1574,9 @@ #define WM_ACTIVATE 6 #define WM_SETFOCUS 7 #define WM_KILLFOCUS 8 +#ifdef _WINE #define WM_SETVISIBLE 9 +#endif #define WM_ENABLE 10 #define WM_SETREDRAW 11 #define WM_SETTEXT 12 @@ -1612,6 +1616,7 @@ #define WM_GETFONT 49 #define WM_SETHOTKEY 50 #define WM_GETHOTKEY 51 +#define WM_ISACTIVEICON 53 #define WM_QUERYPARKICON 54 #define WM_QUERYDRAGICON 55 #define WM_COMPAREITEM 57 @@ -1630,7 +1635,6 @@ #define WM_NOTIFY 78 #define WM_INPUTLANGCHANGEREQUEST 80 #define WM_INPUTLANGCHANGE 81 -#define WM_ISACTIVEICON 0x0035 #define WM_TCARD 82 #define WM_HELP 83 #define WM_USERCHANGED 84 @@ -1722,7 +1726,7 @@ #endif /* _WIN32_WCE */ #endif /* (WINVER >= 0x0500) */ - /* D&D messages */ +/* D&D messages */ #define WM_DROPOBJECT 0x022A #define WM_QUERYDROPOBJECT 0x022B #define WM_BEGINDRAG 0x022C @@ -1730,6 +1734,7 @@ #define WM_DRAGSELECT 0x022E #define WM_DRAGMOVE 0x022F +#define WM_CTLCOLOR 25 #define WM_CTLCOLORMSGBOX 306 #define WM_CTLCOLOREDIT 307 #define WM_CTLCOLORLISTBOX 308 @@ -1738,7 +1743,6 @@ #define WM_CTLCOLORSCROLLBAR 311 #define WM_CTLCOLORSTATIC 312 #define MN_GETHMENU 481 -#define WM_CTLCOLOR 25 #define WM_MOUSEFIRST 512 #define WM_MOUSEMOVE 512 #define WM_LBTRACKPOINT 0x0131 @@ -1831,6 +1835,12 @@ #define WM_PRINT 791 #define WM_PRINTCLIENT 792 #define WM_APPCOMMAND 793 + +#define WM_DWMCOMPOSITIONCHANGED 0x031E +#define WM_DWMNCRENDERINGCHANGED 0x031F +#define WM_DWMCOLORIZATIONCOLORCHANGED 0x0320 +#define WM_DWMWINDOWMAXIMIZEDCHANGE 0x0321 + #define WM_HANDHELDFIRST 856 #define WM_HANDHELDLAST 863 #define WM_AFXFIRST 864 @@ -1906,7 +1916,7 @@ #define CB_SETLOCALE 345 #define CB_SETTOPINDEX 348 #define CB_SHOWDROPDOWN 335 -#define CB_MSGMAX 0x0165 +#define CB_MSGMAX 357 #define CBN_CLOSEUP 8 #define CBN_DBLCLK 2 #define CBN_DROPDOWN 7 @@ -1967,8 +1977,10 @@ #define EN_VSCROLL 1538 #define LB_ADDFILE 406 #define LB_ADDSTRING 384 -#define LB_CARETON 0x01a3 -#define LB_CARETOFF 0x01a4 +#ifdef _WINE +#define LB_CARETON 419 +#define LB_CARETOFF 420 +#endif #define LB_DELETESTRING 386 #define LB_DIR 397 #define LB_FINDSTRING 399 @@ -2017,12 +2029,16 @@ #define SBM_ENABLE_ARROWS 228 #define SBM_GETPOS 225 #define SBM_GETRANGE 227 -#define SBM_SETSCROLLINFO 233 -#define SBM_GETSCROLLINFO 234 -#define SBM_GETSCROLLBARINFO 235 #define SBM_SETPOS 224 #define SBM_SETRANGE 226 #define SBM_SETRANGEREDRAW 230 +#if (_WIN32_WINNT >= 0x0400) +#define SBM_GETSCROLLINFO 234 +#define SBM_SETSCROLLINFO 233 +#endif +#if (_WIN32_WINNT >= 0x0501) +#define SBM_GETSCROLLBARINFO 235 +#endif #define STM_GETICON 369 #define STM_GETIMAGE 371 #define STM_SETICON 368 @@ -2467,8 +2483,18 @@ #define ODS_DISABLED 4 #define ODS_CHECKED 8 #define ODS_FOCUS 16 +#if(WINVER >= 0x0400) #define ODS_DEFAULT 32 #define ODS_COMBOBOXEDIT 4096 +#endif +#if(WINVER >= 0x0500) +#define ODS_HOTLIGHT 0x0040 +#define ODS_INACTIVE 0x0080 +#if(_WIN32_WINNT >= 0x0500) +#define ODS_NOACCEL 0x0100 +#define ODS_NOFOCUSRECT 0x0200 +#endif +#endif #define IDHOT_SNAPWINDOW (-1) #define IDHOT_SNAPDESKTOP (-2) #define DBWF_LPARAMPOINTER 0x8000 @@ -3227,7 +3253,7 @@ int iVertSpacing; int iTitleWrap; LOGFONTA lfFont; -} ICONMETRICSA,*LPICONMETRICSA; +} ICONMETRICSA, *PICONMETRICSA, *LPICONMETRICSA; typedef struct tagICONMETRICSW { UINT cbSize; @@ -3235,7 +3261,7 @@ int iVertSpacing; int iTitleWrap; LOGFONTW lfFont; -} ICONMETRICSW,*LPICONMETRICSW; +} ICONMETRICSW, *PICONMETRICSW, *LPICONMETRICSW; #ifdef UNICODE typedef ICONMETRICSW ICONMETRICS,*LPICONMETRICS; @@ -3891,7 +3917,7 @@ HACCEL WINAPI CreateAcceleratorTableA(LPACCEL,int); HACCEL WINAPI CreateAcceleratorTableW(LPACCEL,int); BOOL WINAPI CreateCaret(HWND,HBITMAP,int,int); -HCURSOR WINAPI CreateCursor(HINSTANCE,int,int,int,int,PCVOID,PCVOID); +HCURSOR WINAPI CreateCursor(HINSTANCE,int,int,int,int,CONST VOID*,CONST VOID*); #if defined(_WINGDI_) && !defined(NOGDI) HDESK WINAPI CreateDesktopA(LPCSTR,LPCSTR,LPDEVMODEA,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES); HDESK WINAPI CreateDesktopW(LPCWSTR,LPCWSTR,LPDEVMODEW,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES); @@ -3904,7 +3930,7 @@ HWND WINAPI CreateDialogIndirectParamW(HINSTANCE,LPCDLGTEMPLATE,HWND,DLGPROC,LPARAM); HWND WINAPI CreateDialogParamA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM); HWND WINAPI CreateDialogParamW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM); -HICON WINAPI CreateIcon(HINSTANCE,INT,INT,BYTE,BYTE,LPCVOID,LPCVOID); +HICON WINAPI CreateIcon(HINSTANCE,int,int,BYTE,BYTE,const BYTE*,const BYTE*); HICON WINAPI CreateIconFromResource(PBYTE,DWORD,BOOL,DWORD); HICON WINAPI CreateIconFromResourceEx(PBYTE,DWORD,BOOL,DWORD,int,int,UINT); HICON WINAPI CreateIconIndirect(PICONINFO); @@ -3994,7 +4020,7 @@ BOOL WINAPI EnumDesktopsA(HWINSTA,DESKTOPENUMPROCA,LPARAM); BOOL WINAPI EnumDesktopsW(HWINSTA,DESKTOPENUMPROCW,LPARAM); BOOL WINAPI EnumDesktopWindows(HDESK,WNDENUMPROC,LPARAM); -BOOL WINAPI EnumDisplayMonitors(HDC,LPRECT,MONITORENUMPROC,LPARAM); +BOOL WINAPI EnumDisplayMonitors(HDC,LPCRECT,MONITORENUMPROC,LPARAM); #if defined(_WINGDI_) && !defined(NOGDI) BOOL WINAPI EnumDisplaySettingsA(LPCSTR,DWORD,PDEVMODEA); BOOL WINAPI EnumDisplaySettingsW(LPCWSTR,DWORD,PDEVMODEW); @@ -4063,7 +4089,7 @@ HDC WINAPI GetDC(HWND); HDC WINAPI GetDCEx(HWND,HRGN,DWORD); HWND WINAPI GetDesktopWindow(void); -DWORD WINAPI GetDialogBaseUnits(void); +LONG WINAPI GetDialogBaseUnits(void); int WINAPI GetDlgCtrlID(HWND); HWND WINAPI GetDlgItem(HWND,int); UINT WINAPI GetDlgItemInt(HWND,int,PBOOL,BOOL); @@ -4137,8 +4163,8 @@ #define GetSysModalWindow() (NULL) HMENU WINAPI GetSystemMenu(HWND,BOOL); int WINAPI GetSystemMetrics(int); -DWORD WINAPI GetTabbedTextExtentA(HDC,LPCSTR,int,int,const INT *); -DWORD WINAPI GetTabbedTextExtentW(HDC,LPCWSTR,int,int,const INT *); +DWORD WINAPI GetTabbedTextExtentA(HDC,LPCSTR,int,int,CONST INT*); +DWORD WINAPI GetTabbedTextExtentW(HDC,LPCWSTR,int,int,CONST INT*); LONG WINAPI GetWindowLongA(HWND,int); LONG WINAPI GetWindowLongW(HWND,int); #ifdef _WIN64 @@ -4278,8 +4304,8 @@ int WINAPI MessageBoxW(HWND,LPCWSTR,LPCWSTR,UINT); int WINAPI MessageBoxExA(HWND,LPCSTR,LPCSTR,UINT,WORD); int WINAPI MessageBoxExW(HWND,LPCWSTR,LPCWSTR,UINT,WORD); -INT WINAPI MessageBoxIndirectA(LPMSGBOXPARAMSA); -INT WINAPI MessageBoxIndirectW(LPMSGBOXPARAMSW); +int WINAPI MessageBoxIndirectA(CONST MSGBOXPARAMSA*); +int WINAPI MessageBoxIndirectW(CONST MSGBOXPARAMSW*); BOOL WINAPI ModifyMenuA(HMENU,UINT,UINT,UINT_PTR,LPCSTR); BOOL WINAPI ModifyMenuW(HMENU,UINT,UINT,UINT_PTR,LPCWSTR); HMONITOR WINAPI MonitorFromPoint(POINT,DWORD); @@ -4320,6 +4346,8 @@ #endif UINT WINAPI PrivateExtractIconsA(LPCSTR,int,int,int,HICON*,UINT*,UINT,UINT); UINT WINAPI PrivateExtractIconsW(LPCWSTR,int,int,int,HICON*,UINT*,UINT,UINT); +UINT WINAPI WINAPI PrivateExtractIconExA(LPCSTR,int,HICON*,HICON*,UINT); +UINT WINAPI WINAPI PrivateExtractIconExW(LPCWSTR,int,HICON*,HICON*,UINT); BOOL WINAPI PtInRect(LPCRECT,POINT); HWND WINAPI RealChildWindowFromPoint(HWND,POINT); UINT WINAPI RealGetWindowClassA(HWND,LPSTR,UINT); @@ -4338,7 +4366,7 @@ BOOL WINAPI RegisterHotKey(HWND,int,UINT,UINT); BOOL WINAPI RegisterLogonProcess(DWORD,BOOL); #if (_WIN32_WINNT >= 0x0501) -BOOL WINAPI RegisterRawInputDevices(PRAWINPUTDEVICE,UINT,UINT); +BOOL WINAPI RegisterRawInputDevices(PCRAWINPUTDEVICE,UINT,UINT); #endif BOOL WINAPI RegisterShellHookWindow(HWND); UINT WINAPI RegisterWindowMessageA(LPCSTR); @@ -4463,13 +4491,13 @@ #endif /* (_WIN32_WINNT >= 0x0500) */ BOOL WINAPI SystemParametersInfoA(UINT,UINT,PVOID,UINT); BOOL WINAPI SystemParametersInfoW(UINT,UINT,PVOID,UINT); -LONG WINAPI TabbedTextOutA(HDC,int,int,LPCSTR,int,int,const INT *,int); -LONG WINAPI TabbedTextOutW(HDC,int,int,LPCWSTR,int,int,const INT *,int); +LONG WINAPI TabbedTextOutA(HDC,int,int,LPCSTR,int,int,CONST INT*,int); +LONG WINAPI TabbedTextOutW(HDC,int,int,LPCWSTR,int,int,CONST INT*,int); WORD WINAPI TileWindows(HWND,UINT,LPCRECT,UINT,const HWND *); -int WINAPI ToAscii(UINT,UINT,const BYTE *,LPWORD,UINT); -int WINAPI ToAsciiEx(UINT,UINT,const BYTE *,LPWORD,UINT,HKL); -INT WINAPI ToUnicode(UINT,UINT,const BYTE *,LPWSTR,int,UINT); -INT WINAPI ToUnicodeEx(UINT,UINT,const BYTE *,LPWSTR,int,UINT,HKL); +int WINAPI ToAscii(UINT,UINT,CONST BYTE*,LPWORD,UINT); +int WINAPI ToAsciiEx(UINT,UINT,CONST BYTE*,LPWORD,UINT,HKL); +int WINAPI ToUnicode(UINT,UINT,CONST BYTE*,LPWSTR,int,UINT); +int WINAPI ToUnicodeEx(UINT,UINT,CONST BYTE*,LPWSTR,int,UINT,HKL); BOOL WINAPI TrackMouseEvent(LPTRACKMOUSEEVENT); BOOL WINAPI TrackPopupMenu(HMENU,UINT,int,int,int,HWND,LPCRECT); BOOL WINAPI TrackPopupMenuEx(HMENU,UINT,int,int,HWND,LPTPMPARAMS); @@ -4494,8 +4522,8 @@ BOOL WINAPI ValidateRect(HWND,LPCRECT); BOOL WINAPI ValidateRgn(HWND,HRGN); SHORT WINAPI VkKeyScanA(CHAR); -WORD WINAPI VkKeyScanExA(CHAR,HKL); -WORD WINAPI VkKeyScanExW(WCHAR,HKL); +SHORT WINAPI VkKeyScanExA(CHAR,HKL); +SHORT WINAPI VkKeyScanExW(WCHAR,HKL); SHORT WINAPI VkKeyScanW(WCHAR); DWORD WINAPI WaitForInputIdle(HANDLE,DWORD); BOOL WINAPI WaitMessage(void); Propchange: branches/arwinss/reactos/include/psdk/winuser.h ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Aug 1 13:20:30 2010 @@ -1,0 +1,2 @@ +/branches/ros-amd64-bringup/reactos/include/psdk/winuser.h:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 +/trunk/reactos/include/psdk/winuser.h:42000-48394

14 years, 4 months

[fireball] 48394: - winent.drv: Fix include paths. - winent.drv: Remove unnecessary included winuser16.h.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Aug 1 12:52:23 2010 New Revision: 48394 URL: http://svn.reactos.org/svn/reactos?rev=48394&view=rev Log: - winent.drv: Fix include paths. - winent.drv: Remove unnecessary included winuser16.h. Modified: branches/arwinss/reactos/dll/win32/winent.drv/clipboard.c branches/arwinss/reactos/dll/win32/winent.drv/main.c branches/arwinss/reactos/dll/win32/winent.drv/mouse.c branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c branches/arwinss/reactos/dll/win32/winent.drv/wnd.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/clipboard.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/clipboard.c [iso-8859-1] Sun Aug 1 12:52:23 2010 @@ -24,7 +24,7 @@ #include <winddi.h> #include <win32k/ntgdityp.h> #include "ntrosgdi.h" -#include "win32k/rosuser.h" +#include "wine/rosuser.h" #include "winent.h" #include "wine/unicode.h" #include "wine/server.h" Modified: branches/arwinss/reactos/dll/win32/winent.drv/main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/main.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/main.c [iso-8859-1] Sun Aug 1 12:52:23 2010 @@ -21,7 +21,7 @@ #include <winddi.h> #include <win32k/ntgdityp.h> #include "ntrosgdi.h" -#include "win32k/rosuser.h" +#include "wine/rosuser.h" #include "winent.h" #include "wine/server.h" #include "wine/debug.h" Modified: branches/arwinss/reactos/dll/win32/winent.drv/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/mouse.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/mouse.c [iso-8859-1] Sun Aug 1 12:52:23 2010 @@ -28,11 +28,10 @@ #include "wingdi.h" #define NTOS_USER_MODE #include <ndk/ntndk.h> -#include "winuser16.h" #include <winddi.h> #include <win32k/ntgdityp.h> #include "ntrosgdi.h" -#include "win32k/rosuser.h" +#include "wine/rosuser.h" #include "winent.h" #include "wine/server.h" #include "wine/debug.h" Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Sun Aug 1 12:52:23 2010 @@ -17,11 +17,10 @@ #include "wingdi.h" #define NTOS_USER_MODE #include <ndk/ntndk.h> -#include "winuser16.h" #include <winddi.h> #include <win32k/ntgdityp.h> #include "ntrosgdi.h" -#include "win32k/rosuser.h" +#include "wine/rosuser.h" #include "winent.h" #include "wine/server.h" #include "wine/debug.h" Modified: branches/arwinss/reactos/dll/win32/winent.drv/wnd.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/wnd.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/wnd.c [iso-8859-1] Sun Aug 1 12:52:23 2010 @@ -20,7 +20,7 @@ #include <winddi.h> #include <win32k/ntgdityp.h> #include "ntrosgdi.h" -#include "win32k/rosuser.h" +#include "wine/rosuser.h" #include "winent.h" #include "wine/server.h" #include "wine/debug.h"

14 years, 4 months

[fireball] 48393: - user32: Fix function definitions to match MS PSDK. To be submitted upstream.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Aug 1 12:50:40 2010 New Revision: 48393 URL: http://svn.reactos.org/svn/reactos?rev=48393&view=rev Log: - user32: Fix function definitions to match MS PSDK. To be submitted upstream. Modified: branches/arwinss/reactos/dll/win32/user32/cursoricon.c branches/arwinss/reactos/dll/win32/user32/dialog.c branches/arwinss/reactos/dll/win32/user32/exticon.c branches/arwinss/reactos/dll/win32/user32/input.c branches/arwinss/reactos/dll/win32/user32/legacy.c branches/arwinss/reactos/dll/win32/user32/misc.c branches/arwinss/reactos/dll/win32/user32/msgbox.c Modified: branches/arwinss/reactos/dll/win32/user32/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/cursoricon.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/cursoricon.c [iso-8859-1] Sun Aug 1 12:50:40 2010 @@ -1496,8 +1496,8 @@ INT nHeight, /* [in] the height of the provided bitmaps */ BYTE bPlanes, /* [in] the number of planes in the provided bitmaps */ BYTE bBitsPixel, /* [in] the number of bits per pixel of the lpXORbits bitmap */ - LPCVOID lpANDbits, /* [in] a monochrome bitmap representing the icon's mask */ - LPCVOID lpXORbits) /* [in] the icon's 'color' bitmap */ + CONST BYTE *lpANDbits, /* [in] a monochrome bitmap representing the icon's mask */ + CONST BYTE *lpXORbits) /* [in] the icon's 'color' bitmap */ { ICONINFO iinfo; HICON hIcon; Modified: branches/arwinss/reactos/dll/win32/user32/dialog.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/dialog.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/dialog.c [iso-8859-1] Sun Aug 1 12:50:40 2010 @@ -1466,9 +1466,9 @@ * GetDialogBaseUnits (USER.243) * GetDialogBaseUnits (USER32.@) */ -DWORD WINAPI GetDialogBaseUnits(void) -{ - static DWORD units; +LONG WINAPI GetDialogBaseUnits(void) +{ + static LONG units; if (!units) { Modified: branches/arwinss/reactos/dll/win32/user32/exticon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/exticon.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/exticon.c [iso-8859-1] Sun Aug 1 12:50:40 2010 @@ -119,9 +119,9 @@ while (min <= max) { pos = (min + max) / 2; - if (entry[pos].u1.s2.Id == id) + if (entry[pos].u1.Id == id) return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].u2.s3.OffsetToDirectory); - if (entry[pos].u1.s2.Id > id) max = pos - 1; + if (entry[pos].u1.Id > id) max = pos - 1; else min = pos + 1; } return NULL; @@ -488,7 +488,7 @@ while(n<iconDirCount && xprdeTmp) { - if(xprdeTmp->u1.s2.Id == iId) + if(xprdeTmp->u1.Id == iId) { nIconIndex = n; break; Modified: branches/arwinss/reactos/dll/win32/user32/input.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/input.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/input.c [iso-8859-1] Sun Aug 1 12:50:40 2010 @@ -384,7 +384,7 @@ /****************************************************************** * RegisterRawInputDevices (USER32.@) */ -BOOL WINAPI DECLSPEC_HOTPATCH RegisterRawInputDevices(PRAWINPUTDEVICE pRawInputDevices, UINT uiNumDevices, UINT cbSize) +BOOL WINAPI DECLSPEC_HOTPATCH RegisterRawInputDevices(PCRAWINPUTDEVICE pRawInputDevices, UINT uiNumDevices, UINT cbSize) { FIXME("(pRawInputDevices=%p, uiNumDevices=%d, cbSize=%d) stub!\n", pRawInputDevices, uiNumDevices, cbSize); @@ -582,7 +582,7 @@ /********************************************************************** * VkKeyScanExA (USER32.@) */ -WORD WINAPI VkKeyScanExA(CHAR cChar, HKL dwhkl) +SHORT WINAPI VkKeyScanExA(CHAR cChar, HKL dwhkl) { WCHAR wChar; @@ -595,7 +595,7 @@ /****************************************************************************** * VkKeyScanExW (USER32.@) */ -WORD WINAPI VkKeyScanExW(WCHAR cChar, HKL dwhkl) +SHORT WINAPI VkKeyScanExW(WCHAR cChar, HKL dwhkl) { return USER_Driver->pVkKeyScanEx(cChar, dwhkl); } Modified: branches/arwinss/reactos/dll/win32/user32/legacy.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/legacy.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/legacy.c [iso-8859-1] Sun Aug 1 12:50:40 2010 @@ -7,7 +7,6 @@ #include "wingdi.h" #include "winerror.h" #include "wine/winbase16.h" -#include "wine/winuser16.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(userlegacy); Modified: branches/arwinss/reactos/dll/win32/user32/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/misc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/misc.c [iso-8859-1] Sun Aug 1 12:50:40 2010 @@ -472,7 +472,7 @@ /*********************************************************************** * EnumDisplayMonitors (USER32.@) */ -BOOL WINAPI EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) +BOOL WINAPI EnumDisplayMonitors( HDC hdc, LPCRECT rect, MONITORENUMPROC proc, LPARAM lp ) { return USER_Driver->pEnumDisplayMonitors( hdc, rect, proc, lp ); } Modified: branches/arwinss/reactos/dll/win32/user32/msgbox.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/msgbox.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/msgbox.c [iso-8859-1] Sun Aug 1 12:50:40 2010 @@ -454,7 +454,7 @@ /************************************************************************** * MessageBoxIndirectA (USER32.@) */ -INT WINAPI MessageBoxIndirectA( LPMSGBOXPARAMSA msgbox ) +INT WINAPI MessageBoxIndirectA( CONST MSGBOXPARAMSA *msgbox ) { MSGBOXPARAMSW msgboxW; UNICODE_STRING textW, captionW, iconW; @@ -501,7 +501,7 @@ /************************************************************************** * MessageBoxIndirectW (USER32.@) */ -INT WINAPI MessageBoxIndirectW( LPMSGBOXPARAMSW msgbox ) +INT WINAPI MessageBoxIndirectW( CONST MSGBOXPARAMSW *msgbox ) { LPVOID tmplate; HRSRC hRes;

14 years, 4 months

[fireball] 48392: - Fix include paths.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Aug 1 12:44:24 2010 New Revision: 48392 URL: http://svn.reactos.org/svn/reactos?rev=48392&view=rev Log: - Fix include paths. Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] Sun Aug 1 12:44:24 2010 @@ -24,8 +24,8 @@ #include <wine/list.h> /* RosGdi syscalls */ -#include <ntrosgdi.h> -#include <win32k/rosuser.h> +#include <wine/ntrosgdi.h> +#include <wine/rosuser.h> /* CSR interaction */ #include <csr.h>

14 years, 4 months

[fireball] 48391: - Move arwinss-specific headers into reactos/wine include directory.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Aug 1 12:42:07 2010 New Revision: 48391 URL: http://svn.reactos.org/svn/reactos?rev=48391&view=rev Log: - Move arwinss-specific headers into reactos/wine include directory. Added: branches/arwinss/reactos/include/reactos/wine/ntrosgdi.h - copied unchanged from r48380, branches/arwinss/reactos/include/psdk/ntrosgdi.h branches/arwinss/reactos/include/reactos/wine/rosuser.h - copied unchanged from r48380, branches/arwinss/reactos/include/reactos/win32k/rosuser.h Removed: branches/arwinss/reactos/include/psdk/ntrosgdi.h branches/arwinss/reactos/include/reactos/win32k/rosuser.h Removed: branches/arwinss/reactos/include/psdk/ntrosgdi.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/nt… ============================================================================== --- branches/arwinss/reactos/include/psdk/ntrosgdi.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/psdk/ntrosgdi.h (removed) @@ -1,173 +1,0 @@ -/* - * NtRosGdi Entrypoints - */ -#ifndef _NTROSGDI_ -#define _NTROSGDI_ - -#ifndef W32KAPI -#define W32KAPI DECLSPEC_ADDRSAFE -#endif - -typedef struct _NTDRV_PDEVICE -{ - HDC hUserDC; - HDC hKernelDC; - HRGN region; /* Device region (visible region & clip region) */ - int cache_index; /* cache of a currently selected font */ -} NTDRV_PDEVICE, *PNTDRV_PDEVICE; - -typedef struct _ROS_DCINFO -{ - WORD dwType; - SIZE szVportExt; - POINT ptVportOrg; - SIZE szWndExt; - POINT ptWndOrg; - XFORM xfWorld2Wnd; - XFORM xfWnd2Vport; -} ROS_DCINFO, *PROS_DCINFO; - -typedef struct -{ - LOGFONTW lf; - XFORM xform; - SIZE devsize; /* size in device coords */ - DWORD hash; -} LFANDSIZE; - -typedef enum { AA_None = 0, AA_Grey, AA_RGB, AA_BGR, AA_VRGB, AA_VBGR, AA_MAXVALUE } AA_Type; - -typedef struct -{ - int xOff; - int yOff; - int width; - int height; - int x; - int y; -} GlyphInfo; - -typedef struct -{ - //GlyphSet glyphset; - //XRenderPictFormat *font_format; - int nrealized; - BOOL *realized; - void **bitmaps; - GlyphInfo *gis; -} gsCacheEntryFormat; - -typedef struct -{ - LFANDSIZE lfsz; - AA_Type aa_default; - gsCacheEntryFormat * format[AA_MAXVALUE]; - INT count; - INT next; -} gsCacheEntry; - -/* bitmap.c */ - -BOOL APIENTRY RosGdiAlphaBlend(HDC devDst, INT xDst, INT yDst, INT widthDst, INT heightDst, - HDC devSrc, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, - BLENDFUNCTION blendfn); -BOOL APIENTRY RosGdiBitBlt( HDC physDevDst, INT xDst, INT yDst, - INT width, INT height, HDC physDevSrc, - INT xSrc, INT ySrc, DWORD rop ); -BOOL APIENTRY RosGdiCreateBitmap( HDC physDev, HBITMAP hBitmap, BITMAP *pBitmap, LPVOID bmBits ); -HBITMAP APIENTRY RosGdiCreateDIBSection( HDC physDev, HBITMAP hbitmap, - const BITMAPINFO *bmi, UINT usage, DIBSECTION *dib ); -BOOL APIENTRY RosGdiDeleteBitmap( HBITMAP hbitmap ); -LONG APIENTRY RosGdiGetBitmapBits( HBITMAP hbitmap, void *buffer, LONG count ); -INT APIENTRY RosGdiGetDIBits( HDC physDev, HBITMAP hbitmap, UINT startscan, UINT lines, - LPVOID bits, BITMAPINFO *info, UINT coloruse, DIBSECTION *dib ); -COLORREF APIENTRY RosGdiGetPixel( HDC physDev, INT x, INT y ); -BOOL APIENTRY RosGdiPatBlt( HDC physDev, INT left, INT top, INT width, INT height, DWORD rop ); -LONG APIENTRY RosGdiSetBitmapBits( HBITMAP hbitmap, const void *bits, LONG count ); -UINT APIENTRY RosGdiSetDIBColorTable( HDC physDev, UINT start, UINT count, const RGBQUAD *colors ); -INT APIENTRY RosGdiSetDIBits( HDC physDev, HBITMAP hbitmap, UINT startscan, - UINT lines, LPCVOID bits, const BITMAPINFO *info, UINT coloruse ); -INT APIENTRY RosGdiSetDIBitsToDevice( HDC physDev, INT xDest, INT yDest, DWORD cx, - DWORD cy, INT xSrc, INT ySrc, - UINT startscan, UINT lines, LPCVOID bits, - const BITMAPINFO *info, UINT coloruse ); -BOOL APIENTRY RosGdiStretchBlt( HDC physDevDst, INT xDst, INT yDst, - INT widthDst, INT heightDst, - HDC physDevSrc, INT xSrc, INT ySrc, - INT widthSrc, INT heightSrc, DWORD rop ); - -/* dc.c */ -BOOL APIENTRY RosGdiCreateDC( PROS_DCINFO dc, HDC *pdev, LPCWSTR driver, LPCWSTR device, - LPCWSTR output, const DEVMODEW* initData ); -BOOL APIENTRY RosGdiDeleteDC( HDC physDev ); -BOOL APIENTRY RosGdiGetDCOrgEx( HDC physDev, LPPOINT lpp ); -BOOL APIENTRY RosGdiPaintRgn( HDC physDev, HRGN hrgn ); -BOOL APIENTRY RosGdiSelectBitmap( HDC physDev, HBITMAP hbitmap, BOOL stock ); -VOID APIENTRY RosGdiSelectBrush( HDC physDev, LOGBRUSH *pLogBrush ); -HFONT APIENTRY RosGdiSelectFont( HDC physDev, HFONT hfont, HANDLE gdiFont ); -VOID APIENTRY RosGdiSelectPen( HDC physDev, LOGPEN *pLogPen, EXTLOGPEN *pExtLogPen ); -COLORREF APIENTRY RosGdiSetBkColor( HDC physDev, COLORREF color ); -COLORREF APIENTRY RosGdiSetDCBrushColor( HDC physDev, COLORREF crColor ); -DWORD APIENTRY RosGdiSetDCOrg( HDC physDev, INT x, INT y ); -VOID APIENTRY RosGdiSetBrushOrg( HDC physDev, INT x, INT y ); -COLORREF APIENTRY RosGdiSetDCPenColor( HDC physDev, COLORREF crColor ); -void APIENTRY RosGdiSetDeviceClipping( HDC physDev, UINT count, PRECTL pRects, PRECTL rcBounds ); -BOOL APIENTRY RosGdiSetDeviceGammaRamp(HDC physDev, LPVOID ramp); -COLORREF APIENTRY RosGdiSetPixel( HDC physDev, INT x, INT y, COLORREF color ); -BOOL APIENTRY RosGdiSetPixelFormat(HDC physDev, - int iPixelFormat, - const PIXELFORMATDESCRIPTOR *ppfd); -COLORREF APIENTRY RosGdiSetTextColor( HDC physDev, COLORREF color ); -VOID APIENTRY RosGdiSetDcRects( HDC physDev, RECT *rcDcRect, RECT *rcVport ); -VOID APIENTRY RosGdiGetDcRects( HDC physDev, RECT *rcDcRect, RECT *rcVport ); -VOID APIENTRY RosGdiGetDC( HDC physDev, HWND hwnd, BOOL clipChildren ); -VOID APIENTRY RosGdiReleaseDC( HDC physDev ); - -/* enum.c */ -int APIENTRY RosGdiChoosePixelFormat(HDC physDev, - const PIXELFORMATDESCRIPTOR *ppfd); -int APIENTRY RosGdiDescribePixelFormat(HDC physDev, - int iPixelFormat, - UINT nBytes, - PIXELFORMATDESCRIPTOR *ppfd); -BOOL APIENTRY RosGdiEnumDeviceFonts( HDC physDev, LPLOGFONTW plf, - FONTENUMPROCW proc, LPARAM lp ); -BOOL APIENTRY RosGdiGetCharWidth( HDC physDev, UINT firstChar, UINT lastChar, - LPINT buffer ); -INT APIENTRY RosGdiGetDeviceCaps( HDC physDev, INT cap ); -BOOL APIENTRY RosGdiGetDeviceGammaRamp(HDC physDev, LPVOID ramp); -BOOL APIENTRY RosGdiGetICMProfile( HDC physDev, LPDWORD size, LPWSTR filename ); -COLORREF APIENTRY RosGdiGetNearestColor( HDC physDev, COLORREF color ); -int APIENTRY RosGdiGetPixelFormat(HDC physDev); -UINT APIENTRY RosGdiGetSystemPaletteEntries( HDC physDev, UINT start, UINT count, - LPPALETTEENTRY entries ); -BOOL APIENTRY RosGdiGetTextExtentExPoint( HDC physDev, LPCWSTR str, INT count, - INT maxExt, LPINT lpnFit, LPINT alpDx, LPSIZE size ); -BOOL APIENTRY RosGdiGetTextMetrics(HDC physDev, TEXTMETRICW *metrics); - -/* misc.c */ -BOOL APIENTRY RosGdiArc( HDC physDev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend, ARCTYPE arc ); -BOOL APIENTRY RosGdiEllipse( HDC physDev, INT left, INT top, INT right, INT bottom ); -INT APIENTRY RosGdiExtEscape( HDC physDev, INT escape, INT in_count, LPCVOID in_data, - INT out_count, LPVOID out_data ); -BOOL APIENTRY RosGdiExtFloodFill( HDC physDev, INT x, INT y, COLORREF color, - UINT fillType ); -BOOL APIENTRY RosGdiExtTextOut( HDC physDev, INT x, INT y, UINT flags, - const RECT *lprect, LPCWSTR wstr, UINT count, - const INT *lpDx, gsCacheEntryFormat *formatEntry, - AA_Type aa_type ); -BOOL APIENTRY RosGdiLineTo( HDC physDev, INT x1, INT y1, INT x2, INT y2 ); -BOOL APIENTRY RosGdiPolyPolygon( HDC physDev, const POINT* pt, const INT* counts, UINT polygons); -BOOL APIENTRY RosGdiPolyPolyline( HDC physDev, const POINT* pt, const DWORD* counts, DWORD polylines ); -BOOL APIENTRY RosGdiPolygon( HDC physDev, const POINT* pt, INT count ); -BOOL APIENTRY RosGdiPolyline( HDC physDev, const POINT* pt, INT count ); -UINT APIENTRY RosGdiRealizeDefaultPalette( HDC physDev ); -UINT APIENTRY RosGdiRealizePalette( HDC physDev, HPALETTE hpal, BOOL primary ); -BOOL APIENTRY RosGdiRectangle(HDC physDev, PRECT rc); -BOOL APIENTRY RosGdiRoundRect( HDC physDev, INT left, INT top, INT right, - INT bottom, INT ell_width, INT ell_height ); -BOOL APIENTRY RosGdiSwapBuffers(HDC physDev); -BOOL APIENTRY RosGdiUnrealizePalette( HPALETTE hpal ); - -#endif Removed: branches/arwinss/reactos/include/reactos/win32k/rosuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/win32k/rosuser.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/win32k/rosuser.h (removed) @@ -1,191 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Win32 Graphical Subsystem (WIN32K) - * FILE: include/win32k/rosuser.h - * PURPOSE: Win32 Shared USER Types for RosUser* - * PROGRAMMER: Aleksey Bragin <aleksey(a)reactos.org> - */ - -/* INCLUDES ******************************************************************/ - -#ifndef __WIN32K_ROSUSER_H -#define __WIN32K_ROSUSER_H - -/* DEFINES *******************************************************************/ - -/* ENUMERATIONS **************************************************************/ - -/* TYPES *********************************************************************/ - -/* FUNCTIONS *****************************************************************/ - -#if 0 -BOOL -NTAPI -RosUserEnumDisplayMonitors( - HDC hdc, - LPRECT rect, - MONITORENUMPROC proc, - LPARAM lp -); - -BOOL -NTAPI -RosUserGetMonitorInfo( - HMONITOR handle, - LPMONITORINFO info -); -#endif - -BOOL NTAPI -RosUserGetCursorPos( LPPOINT pt ); - -BOOL NTAPI -RosUserSetCursorPos( INT x, INT y ); - -BOOL NTAPI -RosUserClipCursor( LPCRECT clip ); - -#if 0 -void NTAPI -RosUserSetCursor( ICONINFO* IconInfo ); - -VOID APIENTRY -RosUserCreateCursorIcon(ICONINFO* IconInfoUnsafe, - HCURSOR Handle); - -VOID APIENTRY -RosUserDestroyCursorIcon(ICONINFO* IconInfoUnsafe, - HCURSOR Handle); -#endif - -VOID -APIENTRY -RosUserSetCursor( ICONINFO* IconInfoUnsafe ); - -LONG -APIENTRY -RosUserChangeDisplaySettings( - PUNICODE_STRING lpszDeviceName, - LPDEVMODEW lpDevMode, - HWND hwnd, - DWORD dwflags, - LPVOID lParam); - -INT -APIENTRY -RosUserEnumDisplayMonitors( - OPTIONAL OUT HMONITOR *hMonitorList, - OPTIONAL OUT PRECTL monitorRectList, - OPTIONAL IN DWORD listSize); - -NTSTATUS -APIENTRY -RosUserEnumDisplaySettings( - PUNICODE_STRING pusDeviceName, - DWORD iModeNum, - LPDEVMODEW lpDevMode, - DWORD dwFlags ); - -BOOL -APIENTRY -RosUserGetMonitorInfo( - IN HMONITOR hMonitor, - OUT LPMONITORINFO pMonitorInfo); - -HKL -APIENTRY -RosUserGetKeyboardLayout( - DWORD dwThreadId); - -BOOL -APIENTRY -RosUserGetKeyboardLayoutName( - LPWSTR lpszName); - -HKL -APIENTRY -RosUserLoadKeyboardLayoutEx( - IN HANDLE Handle, - IN DWORD offTable, - IN PUNICODE_STRING puszKeyboardName, - IN HKL hKL, - IN PUNICODE_STRING puszKLID, - IN DWORD dwKLID, - IN UINT Flags); - -HKL -APIENTRY -RosUserActivateKeyboardLayout( - HKL hKl, - ULONG Flags); - -BOOL -APIENTRY -RosUserUnloadKeyboardLayout( - HKL hKl); - -DWORD -APIENTRY -RosUserVkKeyScanEx( - WCHAR wChar, - HKL hKeyboardLayout, - BOOL UsehKL ); - -DWORD -APIENTRY -RosUserGetKeyNameText( LONG lParam, LPWSTR lpString, int nSize ); - -int -APIENTRY -RosUserToUnicodeEx( - UINT wVirtKey, - UINT wScanCode, - PBYTE lpKeyState, - LPWSTR pwszBuff, - int cchBuff, - UINT wFlags, - HKL dwhkl ); - -UINT -APIENTRY -RosUserMapVirtualKeyEx( UINT Code, UINT Type, DWORD keyboardId, HKL dwhkl ); - -SHORT -APIENTRY -RosUserGetAsyncKeyState( - INT key); - -BOOL -APIENTRY -RosUserSetAsyncKeyboardState(BYTE key_state_table[]); - -BOOL -APIENTRY -RosUserGetAsyncKeyboardState(BYTE key_state_table[]); - -VOID NTAPI -SwmAddWindow(HWND hWnd, RECT *WindowRect, DWORD style, DWORD ex_style); - -VOID NTAPI -SwmAddDesktopWindow(HWND hWnd, UINT Width, UINT Height); - -VOID NTAPI -SwmRemoveWindow(HWND hWnd); - -VOID NTAPI -SwmSetForeground(HWND hWnd); - -VOID NTAPI -SwmPosChanging(HWND hWnd, const RECT *WindowRect); - -VOID NTAPI -SwmPosChanged(HWND hWnd, const RECT *WindowRect, const RECT *OldRect, HWND hWndAfter, UINT SwpFlags); - -HWND NTAPI -SwmGetWindowFromPoint(LONG x, LONG y); - -VOID NTAPI -SwmShowWindow(HWND hWnd, BOOLEAN Show, UINT SwpFlags); - -#endif /* __WIN32K_NTUSER_H */

14 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2010