Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[tkreuzer] 37472: Move asmmacro.h to ndk, cause we need it outside of ntoskrnl, too.
by tkreuzer＠svn.reactos.org 19 Nov '08

19 Nov '08

Author: tkreuzer Date: Wed Nov 19 15:51:34 2008 New Revision: 37472 URL: http://svn.reactos.org/svn/reactos?rev=37472&view=rev Log: Move asmmacro.h to ndk, cause we need it outside of ntoskrnl, too. Added: branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S (props changed) - copied unchanged from r37469, branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/asmmacro.S Propchange: branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S ------------------------------------------------------------------------------ svn:mergeinfo =

1 0

[cgutman] 37471: - Use ExInterlocked* routines for list manipulation - Store the NdisMiniportBlock in the interrupt and use it in the ISR
by cgutman＠svn.reactos.org 19 Nov '08

19 Nov '08

Author: cgutman Date: Wed Nov 19 15:49:29 2008 New Revision: 37471 URL: http://svn.reactos.org/svn/reactos?rev=37471&view=rev Log: - Use ExInterlocked* routines for list manipulation - Store the NdisMiniportBlock in the interrupt and use it in the ISR Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/config.c branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/config.c [iso-8859-1] Wed Nov 19 15:49:29 2008 @@ -139,7 +139,7 @@ while(!IsListEmpty(&ConfigurationContext->ResourceListHead)) { - Resource = (PMINIPORT_RESOURCE)RemoveTailList(&ConfigurationContext->ResourceListHead); + Resource = (PMINIPORT_RESOURCE)ExInterlockedRemoveHeadList(&ConfigurationContext->ResourceListHead, &ConfigurationContext->ResourceLock); if(Resource->ResourceType == MINIPORT_RESOURCE_TYPE_MEMORY) { NDIS_DbgPrint(MAX_TRACE,("freeing 0x%x\n", Resource->Resource)); Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/io.c [iso-8859-1] Wed Nov 19 15:49:29 2008 @@ -55,26 +55,27 @@ * FUNCTION: Interrupt service routine * ARGUMENTS: * Interrupt = Pointer to interrupt object - * ServiceContext = Pointer to context information (LOGICAL_ADAPTER) + * ServiceContext = Pointer to context information (PNDIS_MINIPORT_INTERRUPT) * RETURNS * TRUE if a miniport controlled device generated the interrupt */ { BOOLEAN InterruptRecognized = FALSE; BOOLEAN QueueMiniportHandleInterrupt = FALSE; - PLOGICAL_ADAPTER Adapter = ServiceContext; - - NDIS_DbgPrint(MAX_TRACE, ("Called. Adapter (0x%X)\n", Adapter)); - - if (Adapter->NdisMiniportBlock.Interrupt->IsrRequested) { - (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ISRHandler)( + PNDIS_MINIPORT_INTERRUPT NdisInterrupt = ServiceContext; + PNDIS_MINIPORT_BLOCK NdisMiniportBlock = NdisInterrupt->Miniport; + + NDIS_DbgPrint(MAX_TRACE, ("Called. Interrupt (0x%X)\n", NdisInterrupt)); + + if (NdisInterrupt->IsrRequested) { + (*NdisMiniportBlock->DriverHandle->MiniportCharacteristics.ISRHandler)( &InterruptRecognized, &QueueMiniportHandleInterrupt, - Adapter->NdisMiniportBlock.MiniportAdapterContext); - - } else if (Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.DisableInterruptHandler) { - (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.DisableInterruptHandler)( - Adapter->NdisMiniportBlock.MiniportAdapterContext); + NdisMiniportBlock->MiniportAdapterContext); + + } else if (NdisMiniportBlock->DriverHandle->MiniportCharacteristics.DisableInterruptHandler) { + (*NdisMiniportBlock->DriverHandle->MiniportCharacteristics.DisableInterruptHandler)( + NdisMiniportBlock->MiniportAdapterContext); QueueMiniportHandleInterrupt = TRUE; InterruptRecognized = TRUE; } @@ -83,7 +84,7 @@ if (QueueMiniportHandleInterrupt) { NDIS_DbgPrint(MAX_TRACE, ("Queuing DPC.\n")); - KeInsertQueueDpc(&Adapter->NdisMiniportBlock.Interrupt->InterruptDpc, NULL, NULL); + KeInsertQueueDpc(&NdisInterrupt->InterruptDpc, NULL, NULL); } NDIS_DbgPrint(MAX_TRACE, ("Leaving.\n")); @@ -777,6 +778,7 @@ Interrupt->SharedInterrupt = SharedInterrupt; Interrupt->IsrRequested = RequestIsr; + Interrupt->Miniport = &Adapter->NdisMiniportBlock; Adapter->NdisMiniportBlock.Interrupt = Interrupt; @@ -786,7 +788,7 @@ NDIS_DbgPrint(MAX_TRACE, ("Connecting to interrupt vector (0x%X) Affinity (0x%X).\n", MappedIRQ, Affinity)); - Status = IoConnectInterrupt(&Interrupt->InterruptObject, ServiceRoutine, Adapter, &Interrupt->DpcCountLock, MappedIRQ, + Status = IoConnectInterrupt(&Interrupt->InterruptObject, ServiceRoutine, Interrupt, &Interrupt->DpcCountLock, MappedIRQ, DIrql, DIrql, InterruptMode, SharedInterrupt, Affinity, FALSE); NDIS_DbgPrint(MAX_TRACE, ("Leaving. Status (0x%X).\n", Status)); Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Wed Nov 19 15:49:29 2008 @@ -1764,17 +1764,12 @@ */ { PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)DeviceObject->DeviceExtension; - KIRQL OldIrql; /* Remove adapter from adapter list for this miniport */ - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.DriverHandle->Lock, &OldIrql); - RemoveEntryList(&Adapter->MiniportListEntry); - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.DriverHandle->Lock, OldIrql); + ExInterlockedRemoveEntryList(&Adapter->MiniportListEntry, &Adapter->NdisMiniportBlock.DriverHandle->Lock); /* Remove adapter from global adapter list */ - KeAcquireSpinLock(&AdapterListLock, &OldIrql); - RemoveEntryList(&Adapter->ListEntry); - KeReleaseSpinLock(&AdapterListLock, OldIrql); + ExInterlockedRemoveEntryList(&Adapter->ListEntry, &AdapterListLock); KeCancelTimer(&Adapter->NdisMiniportBlock.WakeUpDpcTimer.Timer); @@ -2385,6 +2380,7 @@ ExFreePool(Miniport->RegistryPath->Buffer); ExFreePool(Miniport->RegistryPath); + ExInterlockedRemoveEntryList(&Miniport->ListEntry, &MiniportListLock); ExFreePool(Miniport); } Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Wed Nov 19 15:49:29 2008 @@ -432,21 +432,15 @@ * NdisBindingHandle = Handle returned by NdisOpenAdapter */ { - KIRQL OldIrql; PADAPTER_BINDING AdapterBinding = GET_ADAPTER_BINDING(NdisBindingHandle); NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); /* Remove from protocol's bound adapters list */ - KeAcquireSpinLock(&AdapterBinding->ProtocolBinding->Lock, &OldIrql); - RemoveEntryList(&AdapterBinding->ProtocolListEntry); - KeReleaseSpinLock(&AdapterBinding->ProtocolBinding->Lock, OldIrql); + ExInterlockedRemoveEntryList(&AdapterBinding->ProtocolListEntry, &AdapterBinding->ProtocolBinding->Lock); /* Remove protocol from adapter's bound protocols list */ - NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n")); - KeAcquireSpinLock(&AdapterBinding->Adapter->NdisMiniportBlock.Lock, &OldIrql); - RemoveEntryList(&AdapterBinding->AdapterListEntry); - KeReleaseSpinLock(&AdapterBinding->Adapter->NdisMiniportBlock.Lock, OldIrql); + ExInterlockedRemoveEntryList(&AdapterBinding->AdapterListEntry, &AdapterBinding->Adapter->NdisMiniportBlock.Lock); ExFreePool(AdapterBinding); @@ -469,7 +463,6 @@ * NdisProtocolHandle = Handle returned by NdisRegisterProtocol */ { - KIRQL OldIrql; PPROTOCOL_BINDING Protocol = GET_PROTOCOL_BINDING(NdisProtocolHandle); NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); @@ -477,9 +470,7 @@ /* FIXME: Make sure no adapter bindings exist */ /* Remove protocol from global list */ - KeAcquireSpinLock(&ProtocolListLock, &OldIrql); - RemoveEntryList(&Protocol->ListEntry); - KeReleaseSpinLock(&ProtocolListLock, OldIrql); + ExInterlockedRemoveEntryList(&Protocol->ListEntry, &ProtocolListLock); ExFreePool(Protocol);

1 0

[ekohl] 37470: Sync to wine-1.1.1 (Patch 3 of 10): - Rob Shearman <robertshearman@gmail.com> Tue, 1 Jul 2008 widl: Check that the structure has been defined in check_remoting_args.
by ekohl＠svn.reactos.org 19 Nov '08

19 Nov '08

Author: ekohl Date: Wed Nov 19 15:44:03 2008 New Revision: 37470 URL: http://svn.reactos.org/svn/reactos?rev=37470&view=rev Log: Sync to wine-1.1.1 (Patch 3 of 10): - Rob Shearman <robertshearman(a)gmail.com> Tue, 1 Jul 2008 widl: Check that the structure has been defined in check_remoting_args. Modified: trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.y Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… ============================================================================== --- trunk/reactos/tools/widl/parser.tab.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/parser.tab.c [iso-8859-1] Wed Nov 19 15:44:03 2008 @@ -5924,7 +5924,12 @@ type->checked = TRUE; if (is_struct(type->type)) - fields = type->fields_or_args; + { + if (type->defined) + fields = type->fields_or_args; + else + error_loc_info(&var->loc_info, "undefined type declaration %s\n", type->name); + } else if (is_union(type->type)) { if (type->type == RPC_FC_ENCAPSULATED_UNION) Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=37… ============================================================================== --- trunk/reactos/tools/widl/parser.y [iso-8859-1] (original) +++ trunk/reactos/tools/widl/parser.y [iso-8859-1] Wed Nov 19 15:44:03 2008 @@ -2611,7 +2611,12 @@ type->checked = TRUE; if (is_struct(type->type)) - fields = type->fields_or_args; + { + if (type->defined) + fields = type->fields_or_args; + else + error_loc_info(&var->loc_info, "undefined type declaration %s\n", type->name); + } else if (is_union(type->type)) { if (type->type == RPC_FC_ENCAPSULATED_UNION)

1 0

[tkreuzer] 37469: Some asm macros for x64. They allow creating unwind info in a MASM like way, As a general rule for all asm functions changing the stack pointer, use ".proc FunctionName" (without '_' prefix) before the function and ".endproc" after the function and use .allocstack, .pushreg, etc. after the corresponding opcode.
by tkreuzer＠svn.reactos.org 19 Nov '08

19 Nov '08

Author: tkreuzer Date: Wed Nov 19 15:24:52 2008 New Revision: 37469 URL: http://svn.reactos.org/svn/reactos?rev=37469&view=rev Log: Some asm macros for x64. They allow creating unwind info in a MASM like way, As a general rule for all asm functions changing the stack pointer, use ".proc FunctionName" (without '_' prefix) before the function and ".endproc" after the function and use .allocstack, .pushreg, etc. after the corresponding opcode. Added: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/asmmacro.S (with props) Added: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/asmmacro.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/asmmacro.S (added) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/asmmacro.S [iso-8859-1] Wed Nov 19 15:24:52 2008 @@ -1,0 +1,81 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel + * FILE: ntoskrnl/include/amd64/asmmacro.S + * PURPOSE: Macros for x64 assembly + * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +.intel_syntax noprefix +.code64 + +/* Macros for x64 stack unwind OPs */ + +.macro .proc name + .func name + .global _\name + _\name: + .cfi_startproc + .equ cfa_current_offset, -8 +.endm + +.macro .endproc + .cfi_endproc + .endfunc +.endm + +.macro .allocstack size + .cfi_adjust_cfa_offset \size + .set cfa_current_offset, cfa_current_offset - \size +.endm + +.macro .pushframe code + .if (\code == 0) + .cfi_adjust_cfa_offset 0x28 + .set cfa_current_offset, cfa_current_offset - 0x28 + .else + .cfi_adjust_cfa_offset 0x30 + .set cfa_current_offset, cfa_current_offset - 0x30 + .endif +.endm + +.macro .pushreg reg + .cfi_adjust_cfa_offset 8 + .equ cfa_current_offset, cfa_current_offset - 8 + .cfi_offset \reg, cfa_current_offset +.endm + +.macro .savereg reg, offset + // checkme!!! + .cfi_offset \reg, \offset +.endm + +.macro .savexmm128 reg, offset + // checkme!!! + .cfi_offset \reg, \offset +.endm + +.macro .setframe reg, offset + .cfi_def_cfa reg, \offset + .equ cfa_current_offset, \offset +.endm + +.macro .endprolog +.endm + +.macro UNIMPLEMENTED2 line, func + jmp 3f + .equ expr, 12 +1: .asciz "\func" +2: .asciz __FILE__ +3: + sub rsp, 0x20 + lea rcx, _MsgUnimplemented[rip] + lea rdx, 1b[rip] + lea r8, 2b[rip] + mov r9, \line + call _DbgPrint + add rsp, 0x20 +.endm +#define UNIMPLEMENTED UNIMPLEMENTED2 __LINE__, + Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/asmmacro.S ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cfinck] 37468: - Rearrange "host/typedefs.h" to make it look more logical - Fix wrong definition of INT_PTR and UINT_PTR in this file - Revert a hack added to winebuild in r32609 and r37206, which was added to work around these previously buggy definitions
by cfinck＠svn.reactos.org 19 Nov '08

19 Nov '08

Author: cfinck Date: Wed Nov 19 15:05:49 2008 New Revision: 37468 URL: http://svn.reactos.org/svn/reactos?rev=37468&view=rev Log: - Rearrange "host/typedefs.h" to make it look more logical - Fix wrong definition of INT_PTR and UINT_PTR in this file - Revert a hack added to winebuild in r32609 and r37206, which was added to work around these previously buggy definitions Modified: trunk/reactos/include/host/typedefs.h trunk/reactos/tools/winebuild/res32.c Modified: trunk/reactos/include/host/typedefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/typedefs.h?re… ============================================================================== --- trunk/reactos/include/host/typedefs.h [iso-8859-1] (original) +++ trunk/reactos/include/host/typedefs.h [iso-8859-1] Wed Nov 19 15:05:49 2008 @@ -44,32 +44,27 @@ #define ANYSIZE_ARRAY 1 -/* Type definitions */ -typedef void VOID, *PVOID, *HANDLE; -typedef HANDLE HKEY, *PHKEY; -typedef unsigned char UCHAR, *PUCHAR, BYTE, *LPBYTE; +/* Basic types + Emulate a LLP64 memory model using a LP64 compiler */ +typedef void VOID, *PVOID; typedef char CHAR, *PCHAR, *PSTR; -typedef const char CCHAR; -typedef const char *PCSTR, *LPCSTR; +typedef const char CCHAR, *PCSTR, *LPCSTR; +typedef unsigned char UCHAR, *PUCHAR, BYTE, *LPBYTE, BOOLEAN, *PBOOLEAN; typedef short SHORT, *PSHORT; -typedef unsigned short USHORT, *PUSHORT; -typedef unsigned short WORD, *PWORD, *LPWORD; -typedef int LONG, *PLONG, *LPLONG; -typedef unsigned int ULONG, *PULONG, DWORD, *LPDWORD; +typedef unsigned short USHORT, *PUSHORT, WORD, *PWORD, *LPWORD, WCHAR, *PWCHAR, *PWSTR, *LPWSTR; +typedef const unsigned short *PCWSTR, *LPCWSTR; +typedef int INT, LONG, *PLONG, *LPLONG, BOOL; +typedef unsigned int UINT, *PUINT, *LPUINT, ULONG, *PULONG, DWORD, *LPDWORD; +typedef long LONG_PTR, *PLONG_PTR, INT_PTR, *PINT_PTR; +typedef unsigned long ULONG_PTR, DWORD_PTR, *PULONG_PTR, UINT_PTR, *PUINT_PTR; typedef long long LONGLONG; typedef unsigned long long ULONGLONG; -typedef int INT; -typedef unsigned int UINT, *PUINT, *LPUINT, UINT_PTR, *PUINT_PTR; -typedef UCHAR BOOLEAN, *PBOOLEAN; -typedef int BOOL; -typedef long int LONG_PTR, *PLONG_PTR; -typedef long unsigned int ULONG_PTR, DWORD_PTR, *PULONG_PTR; + +/* Derived types */ +typedef PVOID HANDLE, HKEY, *PHKEY; +typedef INT NTSTATUS, POOL_TYPE; +typedef LONG HRESULT; typedef ULONG_PTR SIZE_T, *PSIZE_T; -typedef unsigned short WCHAR, *PWCHAR, *PWSTR, *LPWSTR; -typedef const unsigned short *PCWSTR, *LPCWSTR; -typedef int NTSTATUS; -typedef int POOL_TYPE; -typedef LONG HRESULT; #define MAXUSHORT USHRT_MAX Modified: trunk/reactos/tools/winebuild/res32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/res32.c?re… ============================================================================== --- trunk/reactos/tools/winebuild/res32.c [iso-8859-1] (original) +++ trunk/reactos/tools/winebuild/res32.c [iso-8859-1] Wed Nov 19 15:05:49 2008 @@ -207,7 +207,7 @@ res->data = file_pos - 2*sizeof(DWORD) + hdr_size; get_string( &res->type ); get_string( &res->name ); - if ((ULONG_PTR)file_pos & 2) get_word(); /* align to dword boundary */ + if ((UINT_PTR)file_pos & 2) get_word(); /* align to dword boundary */ get_dword(); /* skip data version */ get_word(); /* skip mem options */ res->lang = get_word();

1 0

[ekohl] 37467: Sync to wine-1.1.1 (Patch 2 of 10): - Rob Shearman <robertshearman@gmail.com> Tue, 1 Jul 2008 widl: Increment the buffer offset by 8 for embedded pointers inside varying arrays in varying structures. The 8 bytes are for the variance and offset and are added just before the array, as seen in the marshalling code in rpcrt4. No offset needs to be added for non-varying structures since the buffer mark is set after the conformance in marshalled or unmarshalled.
by ekohl＠svn.reactos.org 19 Nov '08

19 Nov '08

Author: ekohl Date: Wed Nov 19 15:01:47 2008 New Revision: 37467 URL: http://svn.reactos.org/svn/reactos?rev=37467&view=rev Log: Sync to wine-1.1.1 (Patch 2 of 10): - Rob Shearman <robertshearman(a)gmail.com> Tue, 1 Jul 2008 widl: Increment the buffer offset by 8 for embedded pointers inside varying arrays in varying structures. The 8 bytes are for the variance and offset and are added just before the array, as seen in the marshalling code in rpcrt4. No offset needs to be added for non-varying structures since the buffer mark is set after the conformance in marshalled or unmarshalled. Modified: trunk/reactos/tools/widl/typegen.c Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=3… ============================================================================== --- trunk/reactos/tools/widl/typegen.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typegen.c [iso-8859-1] Wed Nov 19 15:01:47 2008 @@ -1437,6 +1437,14 @@ if (offset_in_memory && offset_in_buffer) { size_t padding; + + if (is_array(v->type) && v->type->length_is) + { + *offset_in_buffer = ROUND_SIZE(*offset_in_buffer, 4); + /* skip over variance and offset in buffer */ + *offset_in_buffer += 8; + } + align = 0; type_memsize(v->type, &align); padding = ROUNDING(*offset_in_memory, align); @@ -1470,19 +1478,13 @@ { size_t offset_in_buffer; size_t offset_in_memory; - size_t conformance = 0; - - if (type->type == RPC_FC_CVSTRUCT) - conformance = 8; - else if (type->type == RPC_FC_CSTRUCT || type->type == RPC_FC_CPSTRUCT) - conformance = 4; /* pass 1: search for single instance of a pointer (i.e. don't descend * into arrays) */ if (!is_array(type)) { offset_in_memory = 0; - offset_in_buffer = conformance; + offset_in_buffer = 0; write_no_repeat_pointer_descriptions( file, type, &offset_in_memory, &offset_in_buffer, typestring_offset); @@ -1490,7 +1492,7 @@ /* pass 2: search for pointers in fixed arrays */ offset_in_memory = 0; - offset_in_buffer = conformance; + offset_in_buffer = 0; write_fixed_array_pointer_descriptions( file, NULL, type, &offset_in_memory, &offset_in_buffer, typestring_offset); @@ -1512,7 +1514,7 @@ /* pass 4: search for pointers in varying arrays */ offset_in_memory = 0; - offset_in_buffer = conformance; + offset_in_buffer = 0; write_varying_array_pointer_descriptions( file, NULL, type, &offset_in_memory, &offset_in_buffer, typestring_offset);

1 0

[ekohl] 37466: Sync to wine-1.1.1 (Patch 1 of 10): - Alexandre Julliard <julliard@winehq.org> Tue, 1 Jul 2008 widl: Add some support for unencapsulated unions that need a conformance descriptor.
by ekohl＠svn.reactos.org 19 Nov '08

19 Nov '08

Author: ekohl Date: Wed Nov 19 14:33:58 2008 New Revision: 37466 URL: http://svn.reactos.org/svn/reactos?rev=37466&view=rev Log: Sync to wine-1.1.1 (Patch 1 of 10): - Alexandre Julliard <julliard(a)winehq.org> Tue, 1 Jul 2008 widl: Add some support for unencapsulated unions that need a conformance descriptor. Modified: trunk/reactos/tools/widl/typegen.c Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=3… ============================================================================== --- trunk/reactos/tools/widl/typegen.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typegen.c [iso-8859-1] Wed Nov 19 14:33:58 2008 @@ -2032,6 +2032,34 @@ error("union switch type must be an integer, char, or enum\n"); } } + else if (is_attr(type->attrs, ATTR_SWITCHTYPE)) + { + static const expr_t dummy_expr; /* FIXME */ + const type_t *st = get_attrp(type->attrs, ATTR_SWITCHTYPE); + + switch (st->type) + { + case RPC_FC_CHAR: + case RPC_FC_SMALL: + case RPC_FC_USMALL: + case RPC_FC_SHORT: + case RPC_FC_USHORT: + case RPC_FC_LONG: + case RPC_FC_ULONG: + case RPC_FC_ENUM16: + case RPC_FC_ENUM32: + print_file(file, 2, "0x%x,\t/* %s */\n", type->type, string_of_type(type->type)); + print_file(file, 2, "0x%x,\t/* Switch type= %s */\n", + st->type, string_of_type(st->type)); + *tfsoff += 2; + break; + default: + error("union switch type must be an integer, char, or enum\n"); + } + + *tfsoff += write_conf_or_var_desc(file, NULL, *tfsoff, st, &dummy_expr ); + } + print_file(file, 2, "NdrFcShort(0x%x),\t/* %d */\n", size, size); print_file(file, 2, "NdrFcShort(0x%x),\t/* %d */\n", nbranch, nbranch); *tfsoff += 4;

1 0

[cfinck] 37465: Dmitry Gorbachev - Fix compiler warnings, treated as errors due to our settings, which are emitted when using GCC 4.3.2 See issue #3849 for more details.
by cfinck＠svn.reactos.org 19 Nov '08

19 Nov '08

Author: cfinck Date: Wed Nov 19 13:59:54 2008 New Revision: 37465 URL: http://svn.reactos.org/svn/reactos?rev=37465&view=rev Log: Dmitry Gorbachev - Fix compiler warnings, treated as errors due to our settings, which are emitted when using GCC 4.3.2 See issue #3849 for more details. Modified: trunk/reactos/tools/cabman/cabinet.cxx trunk/reactos/tools/cdmake/cdmake.c trunk/reactos/tools/rgenstat/rgenstat.c Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.cxx [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/cabinet.cxx [iso-8859-1] Wed Nov 19 13:59:54 2008 @@ -2055,9 +2055,19 @@ return CAB_STATUS_CANNOT_READ; } - GetFileTimes(SrcFile, FileNode); - - GetAttributesOnFile(FileNode); + if (GetFileTimes(SrcFile, FileNode) != CAB_STATUS_SUCCESS) + { + DPRINT(MIN_TRACE, ("Cannot read file times.\n")); + FreeMemory(NewFileName); + return CAB_STATUS_CANNOT_READ; + } + + if (GetAttributesOnFile(FileNode) != CAB_STATUS_SUCCESS) + { + DPRINT(MIN_TRACE, ("Cannot read file attributes.\n")); + FreeMemory(NewFileName); + return CAB_STATUS_CANNOT_READ; + } CloseFile(SrcFile); @@ -3646,7 +3656,8 @@ strcpy(buf, File->FileName); else { - getcwd(buf, sizeof(buf)); + if (!getcwd(buf, sizeof(buf))) + return CAB_STATUS_CANNOT_READ; strcat(buf, DIR_SEPARATOR_STRING); strcat(buf, File->FileName); } @@ -3689,7 +3700,8 @@ strcpy(buf, File->FileName); else { - getcwd(buf, sizeof(buf)); + if (!getcwd(buf, sizeof(buf))) + return CAB_STATUS_CANNOT_READ; strcat(buf, DIR_SEPARATOR_STRING); strcat(buf, File->FileName); } Modified: trunk/reactos/tools/cdmake/cdmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.c?rev=… ============================================================================== --- trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] Wed Nov 19 13:59:54 2008 @@ -882,7 +882,8 @@ } else { - getcwd(buf, sizeof(buf)); + if (!getcwd(buf, sizeof(buf))) + error_exit("Can't get CWD: %s\n", strerror(errno)); strcat(buf, DIR_SEPARATOR_STRING); strcat(buf, source); strcat(buf, entry->d_name); @@ -943,7 +944,8 @@ } else { - getcwd(buf, sizeof(buf)); + if (!getcwd(buf, sizeof(buf))) + error_exit("Can't get CWD: %s\n", strerror(errno)); strcat(buf, DIR_SEPARATOR_STRING); strcat(buf, source); } @@ -994,7 +996,8 @@ } else { - getcwd(buf, sizeof(buf)); + if (!getcwd(buf, sizeof(buf))) + error_exit("Can't get CWD: %s\n", strerror(errno)); strcat(buf, DIR_SEPARATOR_STRING); strcat(buf, source); strcat(buf, entry->d_name); Modified: trunk/reactos/tools/rgenstat/rgenstat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rgenstat/rgenstat.c?… ============================================================================== --- trunk/reactos/tools/rgenstat/rgenstat.c [iso-8859-1] (original) +++ trunk/reactos/tools/rgenstat/rgenstat.c [iso-8859-1] Wed Nov 19 13:59:54 2008 @@ -553,7 +553,11 @@ } else { - getcwd(buf, sizeof(buf)); + if (!getcwd(buf, sizeof(buf))) + { + printf("Can't get CWD: %s\n", strerror(errno)); + return; + } strcat(buf, DIR_SEPARATOR_STRING); strcat(buf, path); strcat(buf, entry->d_name); @@ -611,7 +615,11 @@ } else { - getcwd(buf, sizeof(buf)); + if (!getcwd(buf, sizeof(buf))) + { + printf("Can't get CWD: %s\n", strerror(errno)); + return; + } strcat(buf, DIR_SEPARATOR_STRING); strcat(buf, path); strcat(buf, entry->d_name);

1 0

[sginsberg] 37464: - Remove system_header from basetsd/typs.h, and add 4 missing types
by sginsberg＠svn.reactos.org 19 Nov '08

19 Nov '08

Author: sginsberg Date: Wed Nov 19 13:25:42 2008 New Revision: 37464 URL: http://svn.reactos.org/svn/reactos?rev=37464&view=rev Log: - Remove system_header from basetsd/typs.h, and add 4 missing types Modified: trunk/reactos/include/psdk/basetsd.h trunk/reactos/include/psdk/basetyps.h Modified: trunk/reactos/include/psdk/basetsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetsd.h?rev… ============================================================================== --- trunk/reactos/include/psdk/basetsd.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/basetsd.h [iso-8859-1] Wed Nov 19 13:25:42 2008 @@ -1,8 +1,5 @@ #ifndef _BASETSD_H #define _BASETSD_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif #ifdef __GNUC__ #ifndef __int64 @@ -124,6 +121,8 @@ typedef unsigned __int64 DWORD64, *PDWORD64; typedef unsigned __int64 UINT64, *PUINT64; +typedef signed char INT8, *PINT8; +typedef unsigned char UINT8, *PUINT8; typedef signed short INT16, *PINT16; typedef unsigned short UINT16, *PUINT16; Modified: trunk/reactos/include/psdk/basetyps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetyps.h?re… ============================================================================== --- trunk/reactos/include/psdk/basetyps.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/basetyps.h [iso-8859-1] Wed Nov 19 13:25:42 2008 @@ -1,8 +1,5 @@ #ifndef _BASETYPS_H #define _BASETYPS_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif #ifndef __OBJC__ # ifdef __cplusplus

1 0

[greatlrd] 37463: Fixed one smaller bug in hel DdLock and DdUnlock now the lock and the unlcok using the windows hdc to draw the data on
by greatlrd＠svn.reactos.org 19 Nov '08

19 Nov '08

Author: greatlrd Date: Wed Nov 19 13:04:19 2008 New Revision: 37463 URL: http://svn.reactos.org/svn/reactos?rev=37463&view=rev Log: Fixed one smaller bug in hel DdLock and DdUnlock now the lock and the unlcok using the windows hdc to draw the data on Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c [iso-8859-1] Wed Nov 19 13:04:19 2008 @@ -82,8 +82,8 @@ /* ToDo add support for dwFlags */ - /* Get our hdc for the surface */ - hDC = (HDC)lpLockData->lpDDSurface->lpSurfMore->lpDD_lcl->hDC; + /* Get our hdc for the active windows */ + hDC = GetDC(lpLockData->lpDDSurface->lpSurfMore->lpDD_lcl->hFocusWnd); if (hDC != NULL) { @@ -202,8 +202,8 @@ DX_WINDBG_trace(); - /* Get our hdc for the surface */ - hDC = (HDC) lpUnLockData->lpDDSurface->lpSurfMore->lpDD_lcl->hDC; + /* Get our hdc for the active windows */ + hDC = GetDC(lpUnLockData->lpDDSurface->lpSurfMore->lpDD_lcl->hFocusWnd); if (hDC != NULL) {

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
66
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2008