Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[weiden] 19382: disable defining ntstatus codes in windows.h/winnt.h when using ndk

by weiden＠svn.reactos.com

disable defining ntstatus codes in windows.h/winnt.h when using ndk Modified: trunk/rosapps/sysutils/ctm/ctm.c Modified: trunk/rosapps/sysutils/tlist/tlist.c Modified: trunk/rosapps/tests/apc/apc.c Modified: trunk/rosapps/tests/atomtest/atomtest.c Modified: trunk/rosapps/tests/diskspeed/diskspeed.c Modified: trunk/rosapps/tests/hivetest/hivetest.c Modified: trunk/rosapps/tests/isotest/isotest.c Modified: trunk/rosapps/tests/suspend/suspend.c Modified: trunk/rosapps/tests/terminate/terminate.c Modified: trunk/rosapps/tests/threadwait/threadwait.c _____ Modified: trunk/rosapps/sysutils/ctm/ctm.c --- trunk/rosapps/sysutils/ctm/ctm.c 2005-11-20 17:52:53 UTC (rev 19381) +++ trunk/rosapps/sysutils/ctm/ctm.c 2005-11-20 18:54:55 UTC (rev 19382) @@ -32,6 +32,7 @@ #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows //headers +#define WIN32_NO_STATUS #include <windows.h> #include <stdlib.h> _____ Modified: trunk/rosapps/sysutils/tlist/tlist.c --- trunk/rosapps/sysutils/tlist/tlist.c 2005-11-20 17:52:53 UTC (rev 19381) +++ trunk/rosapps/sysutils/tlist/tlist.c 2005-11-20 18:54:55 UTC (rev 19382) @@ -5,6 +5,7 @@ * Copyright (c) 2000,2001 Emanuele Aliberti */ #include <reactos/buildno.h> +#define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> _____ Modified: trunk/rosapps/tests/apc/apc.c --- trunk/rosapps/tests/apc/apc.c 2005-11-20 17:52:53 UTC (rev 19381) +++ trunk/rosapps/tests/apc/apc.c 2005-11-20 18:54:55 UTC (rev 19382) @@ -1,5 +1,6 @@ #include <stdio.h> #include <string.h> +#define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> _____ Modified: trunk/rosapps/tests/atomtest/atomtest.c --- trunk/rosapps/tests/atomtest/atomtest.c 2005-11-20 17:52:53 UTC (rev 19381) +++ trunk/rosapps/tests/atomtest/atomtest.c 2005-11-20 18:54:55 UTC (rev 19382) @@ -1,5 +1,6 @@ #include <stdio.h> #include <string.h> +#define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> _____ Modified: trunk/rosapps/tests/diskspeed/diskspeed.c --- trunk/rosapps/tests/diskspeed/diskspeed.c 2005-11-20 17:52:53 UTC (rev 19381) +++ trunk/rosapps/tests/diskspeed/diskspeed.c 2005-11-20 18:54:55 UTC (rev 19382) @@ -10,7 +10,7 @@ #include <stdio.h> #include <stdlib.h> - +#define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> _____ Modified: trunk/rosapps/tests/hivetest/hivetest.c --- trunk/rosapps/tests/hivetest/hivetest.c 2005-11-20 17:52:53 UTC (rev 19381) +++ trunk/rosapps/tests/hivetest/hivetest.c 2005-11-20 18:54:55 UTC (rev 19382) @@ -1,7 +1,7 @@ #include <stdarg.h> #include <string.h> #include <stdio.h> - +#define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> _____ Modified: trunk/rosapps/tests/isotest/isotest.c --- trunk/rosapps/tests/isotest/isotest.c 2005-11-20 17:52:53 UTC (rev 19381) +++ trunk/rosapps/tests/isotest/isotest.c 2005-11-20 18:54:55 UTC (rev 19382) @@ -2,6 +2,7 @@ * isotest - display cdrom information */ +#define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> _____ Modified: trunk/rosapps/tests/suspend/suspend.c --- trunk/rosapps/tests/suspend/suspend.c 2005-11-20 17:52:53 UTC (rev 19381) +++ trunk/rosapps/tests/suspend/suspend.c 2005-11-20 18:54:55 UTC (rev 19382) @@ -1,5 +1,5 @@ #define UNICODE - +#define WIN32_NO_STATUS #include <windows.h> #include <stdio.h> #define NTOS_MODE_USER _____ Modified: trunk/rosapps/tests/terminate/terminate.c --- trunk/rosapps/tests/terminate/terminate.c 2005-11-20 17:52:53 UTC (rev 19381) +++ trunk/rosapps/tests/terminate/terminate.c 2005-11-20 18:54:55 UTC (rev 19382) @@ -1,5 +1,5 @@ #define UNICODE - +#define WIN32_NO_STATUS #include <windows.h> #include <stdio.h> #define NTOS_MODE_USER _____ Modified: trunk/rosapps/tests/threadwait/threadwait.c --- trunk/rosapps/tests/threadwait/threadwait.c 2005-11-20 17:52:53 UTC (rev 19381) +++ trunk/rosapps/tests/threadwait/threadwait.c 2005-11-20 18:54:55 UTC (rev 19382) @@ -4,6 +4,7 @@ * Purpose: Probe for PsUnblockThread crash due to double-acquire spin lock. */ +#define WIN32_NO_STATUS #include <windows.h> #include <stdio.h>

18 years, 10 months

[greatlrd] 19381: auxMessage

by greatlrd＠svn.reactos.com

auxMessage implement GetDeviceCapabilities GetDeviceCount modMessage implement GetDeviceCapabilities Modified: trunk/reactos/lib/mmdrv/auxil.c Modified: trunk/reactos/lib/mmdrv/midi.c Modified: trunk/reactos/lib/mmdrv/mmddk.h Modified: trunk/reactos/lib/mmdrv/mmdef.h Modified: trunk/reactos/lib/mmdrv/utils.c Modified: trunk/reactos/lib/mmdrv/wave.c Modified: trunk/reactos/lib/mmdrv/wave.h _____ Modified: trunk/reactos/lib/mmdrv/auxil.c --- trunk/reactos/lib/mmdrv/auxil.c 2005-11-20 17:51:09 UTC (rev 19380) +++ trunk/reactos/lib/mmdrv/auxil.c 2005-11-20 17:52:53 UTC (rev 19381) @@ -9,13 +9,14 @@ * UPDATE HISTORY: * Mar 16, 2004: Created skeleton implementation */ - #include "mmdrv.h" +#include "wave.h" + #define NDEBUG #include <debug.h> -APIENTRY DWORD auxMessage(UINT uDevice, +APIENTRY DWORD auxMessage(UINT dwId, UINT uMessage, DWORD dwUser, DWORD dwParam1, @@ -28,14 +29,21 @@ switch (uMessage) { case AUXDM_GETDEVCAPS: - return 0; + DPRINT("AUXDM_GETDEVCAPS"); + return GetDeviceCapabilities(dwId, AuxDevice, (LPBYTE)dwParam1, (DWORD)dwParam2); + case AUXDM_GETNUMDEVS: - return 0; + DPRINT("AUXDM_GETNUMDEVS"); + return GetDeviceCount(AuxDevice); + case AUXDM_GETVOLUME: return 0; + case AUXDM_SETVOLUME: return 0; } return MMSYSERR_NOERROR; } + + _____ Modified: trunk/reactos/lib/mmdrv/midi.c --- trunk/reactos/lib/mmdrv/midi.c 2005-11-20 17:51:09 UTC (rev 19380) +++ trunk/reactos/lib/mmdrv/midi.c 2005-11-20 17:52:53 UTC (rev 19381) @@ -10,6 +10,7 @@ */ #include "mmdrv.h" +#include "wave.h" #define NDEBUG #include <debug.h> @@ -233,7 +234,7 @@ case MODM_GETDEVCAPS: DPRINT("MODM_GETDEVCAPS"); - return MMSYSERR_NOTSUPPORTED; + return GetDeviceCapabilities(ID, MidiOutDevice, (LPBYTE)Param1, (DWORD)Param2); case MODM_OPEN : return OpenMidiDevice(MidiOutDevice, ID, User, Param1, Param2); _____ Modified: trunk/reactos/lib/mmdrv/mmddk.h --- trunk/reactos/lib/mmdrv/mmddk.h 2005-11-20 17:51:09 UTC (rev 19380) +++ trunk/reactos/lib/mmdrv/mmddk.h 2005-11-20 17:52:53 UTC (rev 19381) @@ -29,6 +29,8 @@ #include <mmsystem.h> #include <winbase.h> + + #define MAX_MIDIINDRV (16) /* For now I'm making 16 the maximum number of midi devices one can * have. This should be more than enough for everybody. But as a purist, _____ Modified: trunk/reactos/lib/mmdrv/mmdef.h --- trunk/reactos/lib/mmdrv/mmdef.h 2005-11-20 17:51:09 UTC (rev 19380) +++ trunk/reactos/lib/mmdrv/mmdef.h 2005-11-20 17:52:53 UTC (rev 19381) @@ -52,6 +52,7 @@ #define IOCTL_SOUND_BASE FILE_DEVICE_SOUND #define IOCTL_WAVE_BASE 0x0000 #define IOCTL_MIDI_BASE 0x0080 +#define IOCTL_AUX_BASE 0x0100 // Wave device driver IOCTLs @@ -84,4 +85,10 @@ #define IOCTL_MIDI_CACHE_PATCHES CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0008, METHOD_BUFFERED, FILE_WRITE_ACCESS) #define IOCTL_MIDI_CACHE_DRUM_PATCHES CTL_CODE(IOCTL_SOUND_BASE, IOCTL_MIDI_BASE + 0x0009, METHOD_BUFFERED, FILE_WRITE_ACCESS) +// AUX device driver IOCTLs +#define IOCTL_AUX_GET_CAPABILITIES CTL_CODE(IOCTL_SOUND_BASE, IOCTL_AUX_BASE + 0x0001, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_AUX_SET_VOLUME CTL_CODE(IOCTL_SOUND_BASE, IOCTL_AUX_BASE + 0x0002, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_AUX_GET_VOLUME CTL_CODE(IOCTL_SOUND_BASE, IOCTL_AUX_BASE + 0x0003, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_SOUND_GET_CHANGED_VOLUME CTL_CODE(IOCTL_SOUND_BASE, IOCTL_AUX_BASE + 0x0004, METHOD_BUFFERED, FILE_READ_ACCESS) + #endif _____ Modified: trunk/reactos/lib/mmdrv/utils.c --- trunk/reactos/lib/mmdrv/utils.c 2005-11-20 17:51:09 UTC (rev 19380) +++ trunk/reactos/lib/mmdrv/utils.c 2005-11-20 17:52:53 UTC (rev 19381) @@ -82,8 +82,12 @@ case MidiInDevice : wsprintf(DeviceName, L"\\\\.%ls%d", MIDI_IN_DEVICE_NAME_U + strlen("\\Device"), ID); break; + case AuxDevice : + wsprintf(DeviceName, L"\\\\.%ls%d", AUX_DEVICE_NAME_U + strlen("\\Device"), ID); + break; default : // Aux - wsprintf(DeviceName, L"\\\\.%ls%d", AUX_DEVICE_NAME_U + strlen("\\Device"), ID); + DPRINT("No Auido Device Found"); + return MMSYSERR_BADDEVICEID; /* Maybe we should change error code */ }; DPRINT("Attempting to open %S\n", DeviceName); _____ Modified: trunk/reactos/lib/mmdrv/wave.c --- trunk/reactos/lib/mmdrv/wave.c 2005-11-20 17:51:09 UTC (rev 19380) +++ trunk/reactos/lib/mmdrv/wave.c 2005-11-20 17:52:53 UTC (rev 19381) @@ -23,13 +23,9 @@ * ============================ */ -static MMRESULT GetDeviceCapabilities(DWORD ID, UINT DeviceType, +MMRESULT GetDeviceCapabilities(DWORD ID, UINT DeviceType, LPBYTE pCaps, DWORD Size) { - // FIXME: Implement :) -// return sndGetData(DeviceType, id, dwSize, lpCaps, -// IOCTL_WAVE_GET_CAPABILITIES); - HANDLE DeviceHandle = NULL; MMRESULT Result = MMSYSERR_NOERROR; DWORD BytesReturned = 0; @@ -46,12 +42,32 @@ // Setting the overlapped parameter (last) to null means we // wait until the operation completes. // + - Result = DeviceIoControl(DeviceHandle, IOCTL_WAVE_GET_CAPABILITIES, + if (DeviceType == WaveOutDevice) + { + Result = DeviceIoControl(DeviceHandle, IOCTL_WAVE_GET_CAPABILITIES, NULL, 0, (LPVOID)pCaps, Size, &BytesReturned, NULL) ? MMSYSERR_NOERROR : TranslateStatus(); + } + else if (DeviceType == MidiOutDevice) + { + Result = DeviceIoControl(DeviceHandle, IOCTL_MIDI_GET_CAPABILITIES, + NULL, 0, (LPVOID)pCaps, Size, + &BytesReturned, NULL) ? MMSYSERR_NOERROR : TranslateStatus(); + } + else if (DeviceType == AuxDevice) + { + Result = DeviceIoControl(DeviceHandle, IOCTL_AUX_GET_CAPABILITIES, + NULL, 0, (LPVOID)pCaps, Size, + &BytesReturned, NULL) ? MMSYSERR_NOERROR : TranslateStatus(); + } + + + + // Close the handle and return the result code // CloseHandle(DeviceHandle); _____ Modified: trunk/reactos/lib/mmdrv/wave.h --- trunk/reactos/lib/mmdrv/wave.h 2005-11-20 17:51:09 UTC (rev 19380) +++ trunk/reactos/lib/mmdrv/wave.h 2005-11-20 17:52:53 UTC (rev 19381) @@ -78,3 +78,6 @@ HANDLE ThreadHandle; // Handle for thread termination ONLY MMRESULT AuxReturnCode; // Return code from Aux task }WAVEALLOC, *PWAVEALLOC; + +MMRESULT GetDeviceCapabilities(DWORD ID, UINT DeviceType, + LPBYTE pCaps, DWORD Size);

18 years, 10 months

[gvg] 19380: Implement hardware breakpoints and watchpoints

by gvg＠svn.reactos.com

Implement hardware breakpoints and watchpoints Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c _____ Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c --- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2005-11-20 17:48:30 UTC (rev 19379) +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c 2005-11-20 17:51:09 UTC (rev 19380) @@ -320,12 +320,29 @@ static volatile BOOLEAN GspMemoryError = FALSE; static volatile void *GspAccessLocation = NULL; +static CHAR +GspReadMemSafe(PCHAR Address) +{ + CHAR ch; + if (NULL == Address) + { + GspMemoryError = TRUE; + return '\0'; + } + + GspAccessLocation = Address; + ch = *Address; + GspAccessLocation = NULL; + + return ch; +} + /* Convert the memory pointed to by Address into hex, placing result in Buffer */ /* Return a pointer to the last char put in Buffer (null) */ /* If MayFault is TRUE, then we should set GspMemoryError in response to a fault; if FALSE treat a fault like any other fault in the stub. */ -PCHAR +static PCHAR GspMem2Hex(PCHAR Address, PCHAR Buffer, LONG Count, @@ -334,92 +351,127 @@ ULONG i; CHAR ch; - if (NULL == Address && MayFault) - { - GspMemoryError = TRUE; - return Buffer; - } - for (i = 0; i < (ULONG) Count; i++) { if (MayFault) { - GspAccessLocation = Address; + ch = GspReadMemSafe(Address); + if (GspMemoryError) + { + return Buffer; + } } - ch = *Address; - GspAccessLocation = NULL; - if (MayFault && GspMemoryError) + else { - return Buffer; + ch = *Address; } *Buffer++ = HexChars[(ch >> 4) & 0xf]; *Buffer++ = HexChars[ch & 0xf]; Address++; } + *Buffer = 0; return Buffer; } - -/* Convert the hex array pointed to by Buffer into binary to be placed at Address */ -/* Return a pointer to the character AFTER the last byte read from Buffer */ -PCHAR -GspHex2Mem(PCHAR Buffer, - PCHAR Address, +static ULONG +GspWriteMem(PCHAR Address, ULONG Count, - BOOLEAN MayFault) + BOOLEAN MayFault, + CHAR (*GetContent)(PVOID Context, ULONG Offset), + PVOID Context) { - PCHAR current; - PCHAR page; - ULONG countinpage; + PCHAR Current; + PCHAR Page; + ULONG CountInPage; ULONG i; CHAR ch; - ULONG oldprot = 0; + ULONG OldProt = 0; - current = Address; - while ( current < Address + Count ) + Current = Address; + while (Current < Address + Count) { - page = (PCHAR)PAGE_ROUND_DOWN(current); - if (Address + Count <= page + PAGE_SIZE) + Page = (PCHAR)PAGE_ROUND_DOWN(Current); + if (Address + Count <= Page + PAGE_SIZE) { /* Fits in this page */ - countinpage = Count; + CountInPage = Count; } else { /* Flows into next page, handle only current page in this iteration */ - countinpage = PAGE_SIZE - (Address - page); + CountInPage = PAGE_SIZE - (Address - Page); } if (MayFault) { - oldprot = MmGetPageProtect(NULL, Address); + OldProt = MmGetPageProtect(NULL, Address); MmSetPageProtect(NULL, Address, PAGE_EXECUTE_READWRITE); } - for (i = 0; i < countinpage && ! GspMemoryError; i++) + for (i = 0; i < CountInPage && ! GspMemoryError; i++) { - ch = (CHAR)(HexValue(*Buffer++) << 4); - ch = (CHAR)(ch + HexValue(*Buffer++)); + ch = (*GetContent)(Context, Current - Address); - GspAccessLocation = current; - *current = ch; - GspAccessLocation = NULL; - current++; + if (MayFault) + { + GspAccessLocation = Current; + } + *Current = ch; + if (MayFault) + { + GspAccessLocation = NULL; + } + Current++; } if (MayFault) { - MmSetPageProtect(NULL, page, oldprot); + MmSetPageProtect(NULL, Page, OldProt); if (GspMemoryError) { - return Buffer; + return Current - Address; } } } - return Buffer; + return Current - Address; } +static CHAR +GspHex2MemGetContent(PVOID Context, ULONG Offset) +{ + return (CHAR)((HexValue(*((PCHAR) Context + 2 * Offset)) << 4) + + HexValue(*((PCHAR) Context + 2 * Offset + 1))); +} +/* Convert the hex array pointed to by Buffer into binary to be placed at Address */ +/* Return a pointer to the character AFTER the last byte read from Buffer */ +static PCHAR +GspHex2Mem(PCHAR Buffer, + PCHAR Address, + ULONG Count, + BOOLEAN MayFault) +{ + Count = GspWriteMem(Address, Count, MayFault, GspHex2MemGetContent, Buffer); + + return Buffer + 2 * Count; +} + +static CHAR +GspWriteMemSafeGetContent(PVOID Context, ULONG Offset) +{ + ASSERT(0 == Offset); + + return *((PCHAR) Context); +} + +static void +GspWriteMemSafe(PCHAR Address, + CHAR Ch) +{ + GspWriteMem(Address, 1, TRUE, GspWriteMemSafeGetContent, &Ch); +} + + /* This function takes the 386 exception vector and attempts to translate this number into a unix compatible signal value */ ULONG @@ -922,186 +974,329 @@ } } +#define DR7_L0 0x00000001 /* Local breakpoint 0 enable */ +#define DR7_G0 0x00000002 /* Global breakpoint 0 enable */ +#define DR7_L1 0x00000004 /* Local breakpoint 1 enable */ +#define DR7_G1 0x00000008 /* Global breakpoint 1 enable */ +#define DR7_L2 0x00000010 /* Local breakpoint 2 enable */ +#define DR7_G2 0x00000020 /* Global breakpoint 2 enable */ +#define DR7_L3 0x00000040 /* Local breakpoint 3 enable */ +#define DR7_G3 0x00000080 /* Global breakpoint 3 enable */ +#define DR7_LE 0x00000100 /* Local exact breakpoint enable (old) */ +#define DR7_GE 0x00000200 /* Global exact breakpoint enable (old) */ +#define DR7_GD 0x00002000 /* General detect enable */ +#define DR7_TYPE0_MASK 0x00030000 /* Breakpoint 0 condition */ +#define DR7_LEN0_MASK 0x000c0000 /* Breakpoint 0 length */ +#define DR7_TYPE1_MASK 0x00300000 /* Breakpoint 1 condition */ +#define DR7_LEN1_MASK 0x00c00000 /* Breakpoint 1 length */ +#define DR7_TYPE2_MASK 0x03000000 /* Breakpoint 2 condition */ +#define DR7_LEN2_MASK 0x0c000000 /* Breakpoint 2 length */ +#define DR7_TYPE3_MASK 0x30000000 /* Breakpoint 3 condition */ +#define DR7_LEN3_MASK 0xc0000000 /* Breakpoint 3 length */ +#define DR7_GLOBAL_ENABLE(Bp) (2 << (2 * (Bp))) +#define DR7_TYPE(Bp, Type) ((Type) << (16 + 4 * (Bp))) +#define DR7_LEN(Bp, Len) ((Len) << (18 + 4 * (Bp))) -typedef struct _GsHwBreakPoint +#define I386_BP_TYPE_EXECUTE 0 +#define I386_BP_TYPE_DATA_WRITE 1 +#define I386_BP_TYPE_DATA_READWRITE 3 + +#define I386_OPCODE_INT3 0xcc + +#define GDB_ZTYPE_MEMORY_BREAKPOINT 0 +#define GDB_ZTYPE_HARDWARE_BREAKPOINT 1 +#define GDB_ZTYPE_WRITE_WATCHPOINT 2 +#define GDB_ZTYPE_READ_WATCHPOINT 3 +#define GDB_ZTYPE_ACCESS_WATCHPOINT 4 + +typedef struct _GSPHWBREAKPOINT { - BOOLEAN Enabled; ULONG Type; + ULONG_PTR Address; ULONG Length; - ULONG Address; -} GsHwBreakPoint; +} GSPHWBREAKPOINT; -#if defined(__GNUC__) -GsHwBreakPoint GspBreakpoints[4] = +#define MAX_HW_BREAKPOINTS 4 +static unsigned GspHwBreakpointCount = 0; +static GSPHWBREAKPOINT GspHwBreakpoints[MAX_HW_BREAKPOINTS]; + +typedef struct _GSPSWBREAKPOINT { - { Enabled : FALSE }, - { Enabled : FALSE }, - { Enabled : FALSE }, - { Enabled : FALSE } -}; -#else -GsHwBreakPoint GspBreakpoints[4] = -{ - { FALSE }, - { FALSE }, - { FALSE }, - { FALSE } -}; -#endif + ULONG_PTR Address; + CHAR PrevContent; + BOOLEAN Active; +} GSPSWBREAKPOINT; -VOID -GspCorrectHwBreakpoint() +#define MAX_SW_BREAKPOINTS 64 +static unsigned GspSwBreakpointCount = 0; +static GSPSWBREAKPOINT GspSwBreakpoints[MAX_SW_BREAKPOINTS]; + +static void +GspSetHwBreakpoint(ULONG Type, ULONG_PTR Address, ULONG Length) { - ULONG BreakpointNumber; - BOOLEAN CorrectIt; - BOOLEAN Bit; - ULONG dr7_; + DPRINT("GspSetHwBreakpoint(%lu, 0x%p, %lu)\n", Type, Address, Length); -#if defined(__GNUC__) - asm volatile ( - "movl %%db7, %0\n" : "=r" (dr7_) : ); - do + if (GDB_ZTYPE_READ_WATCHPOINT == Type) { - ULONG addr0, addr1, addr2, addr3; - - asm volatile ( - "movl %%db0, %0\n" - "movl %%db1, %1\n" - "movl %%db2, %2\n" - "movl %%db3, %3\n" - : "=r" (addr0), "=r" (addr1), - "=r" (addr2), "=r" (addr3) : ); - } while (FALSE); -#elif defined(_MSC_VER) - __asm + DPRINT1("Read watchpoint not supported\n"); + strcpy(GspOutBuffer, "E22"); + } + else if (GDB_ZTYPE_HARDWARE_BREAKPOINT == Type && 1 != Length) { - mov eax, dr7; mov dr7_, eax; - mov eax, dr0; mov addr0, eax; - mov eax, dr1; mov addr1, eax; - mov eax, dr2; mov addr2, eax; - mov eax, dr3; mov addr3, eax; + DPRINT1("Invalid length %lu for hardware breakpoint\n", Length); + strcpy(GspOutBuffer, "E22"); } -#else -#error Unknown compiler for inline assembler -#endif - CorrectIt = FALSE; - for (BreakpointNumber = 0; BreakpointNumber < 3; BreakpointNumber++) + else if (1 != Length && 2 != Length && 4 != Length) { - Bit = 2 << (BreakpointNumber << 1); - if (!(dr7_ & Bit) && GspBreakpoints[BreakpointNumber].Enabled) + DPRINT1("Invalid length %lu for GDB Z type %lu\n", Length, Type); + strcpy(GspOutBuffer, "E22"); + } + else if (0 != (Address & (Length - 1))) + { + DPRINT1("Invalid alignment for address 0x%p and length %d\n", + Address, Length); + strcpy(GspOutBuffer, "E22"); + } + else if (MAX_HW_BREAKPOINTS == GspHwBreakpointCount) + { + DPRINT1("Trying to set too many hardware breakpoints\n"); + strcpy(GspOutBuffer, "E22"); + } + else + { + DPRINT("Stored at index %u\n", GspHwBreakpointCount); + GspHwBreakpoints[GspHwBreakpointCount].Type = Type; + GspHwBreakpoints[GspHwBreakpointCount].Address = Address; + GspHwBreakpoints[GspHwBreakpointCount].Length = Length; + GspHwBreakpointCount++; + strcpy(GspOutBuffer, "OK"); + } +} + +static void +GspRemoveHwBreakpoint(ULONG Type, ULONG_PTR Address, ULONG Length) +{ + unsigned Index; + + DPRINT("GspRemoveHwBreakpoint(%lu, 0x%p, %lu)\n", Type, Address, Length); + for (Index = 0; Index < GspHwBreakpointCount; Index++) + { + if (GspHwBreakpoints[Index].Type == Type && + GspHwBreakpoints[Index].Address == Address && + GspHwBreakpoints[Index].Length == Length) { - CorrectIt = TRUE; - dr7_ |= Bit; - dr7_ &= ~(0xf0000 << (BreakpointNumber << 2)); - dr7_ |= (((GspBreakpoints[BreakpointNumber].Length << 2) | - GspBreakpoints[BreakpointNumber].Type) << 16) << (BreakpointNumber << 2); - switch (BreakpointNumber) + DPRINT("Found match at index %u\n", Index); + if (Index + 1 < GspHwBreakpointCount) { -#if defined(__GNUC__) - case 0: - asm volatile ("movl %0, %%dr0\n" - : : "r" (GspBreakpoints[BreakpointNumber].Address) ); - break; + memmove(GspHwBreakpoints + Index, + GspHwBreakpoints + (Index + 1), + (GspHwBreakpointCount - Index - 1) * + sizeof(GSPHWBREAKPOINT)); + } + GspHwBreakpointCount--; + strcpy(GspOutBuffer, "OK"); + return; + } + } - case 1: - asm volatile ("movl %0, %%dr1\n" - : : "r" (GspBreakpoints[BreakpointNumber].Address) ); - break; + DPRINT1("Not found\n"); + strcpy(GspOutBuffer, "E22"); +} - case 2: - asm volatile ("movl %0, %%dr2\n" - : : "r" (GspBreakpoints[BreakpointNumber].Address) ); - break; +static void +GspSetSwBreakpoint(ULONG_PTR Address) +{ + DPRINT("GspSetSwBreakpoint(0x%p)\n", Address); - case 3: - asm volatile ("movl %0, %%dr3\n" - : : "r" (GspBreakpoints[BreakpointNumber].Address) ); - break; -#elif defined(_MSC_VER) - case 0: - { - ULONG addr = GspBreakpoints[BreakpointNumber].Address; - __asm mov eax, addr; - __asm mov dr0, eax; - } - break; - case 1: - { - ULONG addr = GspBreakpoints[BreakpointNumber].Address; - __asm mov eax, addr; - __asm mov dr1, eax; - } - break; - case 2: - { - ULONG addr = GspBreakpoints[BreakpointNumber].Address; - __asm mov eax, addr; - __asm mov dr2, eax; - } - break; - case 3: - { - ULONG addr = GspBreakpoints[BreakpointNumber].Address; - __asm mov eax, addr; - __asm mov dr3, eax; - } - break; -#else -#error Unknown compiler for inline assembler -#endif + if (MAX_SW_BREAKPOINTS == GspSwBreakpointCount) + { + DPRINT1("Trying to set too many software breakpoints\n"); + strcpy(GspOutBuffer, "E22"); + } + else + { + DPRINT("Stored at index %u\n", GspSwBreakpointCount); + GspSwBreakpoints[GspSwBreakpointCount].Address = Address; + GspSwBreakpoints[GspSwBreakpointCount].Active = FALSE; + GspSwBreakpointCount++; + strcpy(GspOutBuffer, "OK"); + } +} + +static void +GspRemoveSwBreakpoint(ULONG_PTR Address) +{ + unsigned Index; + + DPRINT("GspRemoveSwBreakpoint(0x%p)\n", Address); + for (Index = 0; Index < GspSwBreakpointCount; Index++) + { + if (GspSwBreakpoints[Index].Address == Address) + { + DPRINT("Found match at index %u\n", Index); + ASSERT(! GspSwBreakpoints[Index].Active); + if (Index + 1 < GspSwBreakpointCount) + { + memmove(GspSwBreakpoints + Index, + GspSwBreakpoints + (Index + 1), + (GspSwBreakpointCount - Index - 1) * + sizeof(GSPSWBREAKPOINT)); } + GspSwBreakpointCount--; + strcpy(GspOutBuffer, "OK"); + return; } - else if ((dr7_ & Bit) && !GspBreakpoints[BreakpointNumber].Enabled) - { - CorrectIt = TRUE; - dr7_ &= ~Bit; - dr7_ &= ~(0xf0000 << (BreakpointNumber << 2)); - } } - if (CorrectIt) + + DPRINT1("Not found\n"); + strcpy(GspOutBuffer, "E22"); +} + +static void +GspLoadHwBreakpoint(PKTRAP_FRAME TrapFrame, + unsigned BpIndex, + ULONG_PTR Address, + ULONG Length, + ULONG Type) +{ + DPRINT("GspLoadHwBreakpoint(0x%p, %d, 0x%p, %d)\n", TrapFrame, BpIndex, + Address, Type); + + /* Set the DR7_Gx bit to globally enable the breakpoint */ + TrapFrame->Dr7 |= DR7_GLOBAL_ENABLE(BpIndex) | + DR7_LEN(BpIndex, Length) | + DR7_TYPE(BpIndex, Type); + + switch (BpIndex) { -#if defined(__GNUC__) - asm volatile ( "movl %0, %%db7\n" : : "r" (dr7_)); -#elif defined(_MSC_VER) - __asm mov eax, dr7_; - __asm mov dr7, eax; -#else -#error Unknown compiler for inline assembler -#endif + case 0: + DPRINT("Setting DR0 to 0x%p\n", Address); + TrapFrame->Dr0 = Address; + break; + + case 1: + DPRINT("Setting DR1 to 0x%p\n", Address); + TrapFrame->Dr1 = Address; + break; + + case 2: + DPRINT("Setting DR2 to 0x%p\n", Address); + TrapFrame->Dr2 = Address; + break; + + case 3: + DPRINT("Setting DR3 to 0x%p\n", Address); + TrapFrame->Dr3 = Address; + break; } } -ULONG -GspRemoveHwBreakpoint(ULONG BreakpointNumber) +static void +GspLoadBreakpoints(PKTRAP_FRAME TrapFrame) { - if (!GspBreakpoints[BreakpointNumber].Enabled) + unsigned Index; + ULONG i386Type; + + DPRINT("GspLoadBreakpoints\n"); + DPRINT("DR7 on entry: 0x%08x\n", TrapFrame->Dr7); + /* Remove all breakpoints */ + TrapFrame->Dr7 &= ~(DR7_L0 | DR7_L1 | DR7_L2 | DR7_L3 | + DR7_G0 | DR7_G1 | DR7_G2 | DR7_G3 | + DR7_TYPE0_MASK | DR7_LEN0_MASK | + DR7_TYPE1_MASK | DR7_LEN1_MASK | + DR7_TYPE2_MASK | DR7_LEN2_MASK | + DR7_TYPE3_MASK | DR7_LEN3_MASK); + + for (Index = 0; Index < GspHwBreakpointCount; Index++) { - return -1; + switch(GspHwBreakpoints[Index].Type) + { + case GDB_ZTYPE_HARDWARE_BREAKPOINT: + i386Type = I386_BP_TYPE_EXECUTE; + break; + case GDB_ZTYPE_WRITE_WATCHPOINT: + i386Type = I386_BP_TYPE_DATA_WRITE; + break; + case GDB_ZTYPE_ACCESS_WATCHPOINT: + i386Type = I386_BP_TYPE_DATA_READWRITE; + break; + default: + ASSERT(FALSE); + i386Type = I386_BP_TYPE_EXECUTE; + break; + } + + GspLoadHwBreakpoint(TrapFrame, Index, GspHwBreakpoints[Index].Address, + GspHwBreakpoints[Index].Length - 1, i386Type); } - GspBreakpoints[BreakpointNumber].Enabled = 0; - return 0; + + for (Index = 0; Index < GspSwBreakpointCount; Index++) + { + if (GspHwBreakpointCount + Index < MAX_HW_BREAKPOINTS) + { + DPRINT("Implementing software interrupt using hardware register\n"); + GspLoadHwBreakpoint(TrapFrame, GspHwBreakpointCount + Index, + GspSwBreakpoints[Index].Address, 0, + I386_BP_TYPE_EXECUTE); + GspSwBreakpoints[Index].Active = FALSE; + } + else + { + DPRINT("Using real software breakpoint\n"); + GspMemoryError = FALSE; + GspSwBreakpoints[Index].PrevContent = GspReadMemSafe((PCHAR) GspSwBreakpoints[Index].Address); + if (! GspMemoryError) + { + GspWriteMemSafe((PCHAR) GspSwBreakpoints[Index].Address, I386_OPCODE_INT3); + } + GspSwBreakpoints[Index].Active = ! GspMemoryError; + if (GspMemoryError) + { + DPRINT1("Failed to set software breakpoint at 0x%p\n", + GspSwBreakpoints[Index].Address); + } + else + { + DPRINT("Successfully set software breakpoint at 0x%p\n", + GspSwBreakpoints[Index].Address); + DPRINT1("Successfully set software breakpoint at 0x%p\n", GspSwBreakpoints[Index].Address); + } + } + } + + DPRINT("Final DR7 value 0x%08x\n", TrapFrame->Dr7); } +static void +GspUnloadBreakpoints(PKTRAP_FRAME TrapFrame) +{ + unsigned Index; -ULONG -GspSetHwBreakpoint(ULONG BreakpointNumber, - ULONG Type, - ULONG Length, - ULONG Address) -{ - if (GspBreakpoints[BreakpointNumber].Enabled) + DPRINT("GspUnloadHwBreakpoints\n"); + + for (Index = 0; Index < GspSwBreakpointCount; Index++) { - return -1; + if (GspSwBreakpoints[Index].Active) + { + GspMemoryError = FALSE; + GspWriteMemSafe((PCHAR) GspSwBreakpoints[Index].Address, + GspSwBreakpoints[Index].PrevContent); + GspSwBreakpoints[Index].Active = FALSE; + if (GspMemoryError) + { + DPRINT1("Failed to remove software breakpoint from 0x%p\n", + GspSwBreakpoints[Index].Address); + } + else + { + DPRINT("Successfully removed software breakpoint from 0x%p\n", + GspSwBreakpoints[Index].Address); + } + } } - GspBreakpoints[BreakpointNumber].Enabled = TRUE; - GspBreakpoints[BreakpointNumber].Type = Type; - GspBreakpoints[BreakpointNumber].Length = Length; - GspBreakpoints[BreakpointNumber].Address = Address; - return 0; } - -static BOOL gdb_attached_yet = FALSE; +static BOOLEAN gdb_attached_yet = FALSE; /* * This function does all command procesing for interfacing to gdb. */ @@ -1119,14 +1314,6 @@ PCHAR ptr; /* FIXME: Stop on other CPUs too */ - /* Disable hardware debugging while we are inside the stub */ -#if defined(__GNUC__) - __asm__("movl %0,%%db7" : /* no output */ : "r" (0)); -#elif defined(_MSC_VER) - __asm mov eax, 0 __asm mov dr7, eax -#else -#error Unknown compiler for inline assembler -#endif if (STATUS_ACCESS_VIOLATION == (NTSTATUS) ExceptionRecord->ExceptionCode && NULL != GspAccessLocation && @@ -1139,9 +1326,22 @@ } else { + DPRINT("Thread %p entering stub\n", PsGetCurrentThread()); /* Can only debug 1 thread at a time... */ ExAcquireFastMutex(&GspLock); + DPRINT("Thread %p acquired mutex\n", PsGetCurrentThread()); + /* Disable hardware debugging while we are inside the stub */ +#if defined(__GNUC__) + __asm__("movl %0,%%db7" : /* no output */ : "r" (0)); +#elif defined(_MSC_VER) + __asm mov eax, 0 __asm mov dr7, eax +#else +#error Unknown compiler for inline assembler +#endif + + GspUnloadBreakpoints(TrapFrame); + /* Make sure we're debugging the current thread. */ if (NULL != GspDbgThread) { @@ -1371,7 +1571,7 @@ { if (dr6_ & (1 << BreakpointNumber)) { - if (GspBreakpoints[BreakpointNumber].Type == 0) + if (GspHwBreakpoints[BreakpointNumber].Type == 0) { /* Set restore flag */ Context->EFlags |= 0x10000; @@ -1380,7 +1580,7 @@ } } } - GspCorrectHwBreakpoint(); + GspLoadBreakpoints(TrapFrame); #if defined(__GNUC__) asm volatile ("movl %0, %%db6\n" : : "r" (0)); #elif defined(_MSC_VER) @@ -1395,7 +1595,9 @@ GspDbgThread = NULL; } + DPRINT("Thread %p releasing mutex\n", PsGetCurrentThread()); ExReleaseFastMutex(&GspLock); + DPRINT("Thread %p leaving stub\n", PsGetCurrentThread()); return kdContinue; break; } @@ -1417,46 +1619,46 @@ GspQueryThreadStatus(ptr); break; - case 'Y': + case 'Z': { - LONG Number; - LONG Length; LONG Type; LONG Address; + LONG Length; - ptr = &GspOutBuffer[1]; - GspHex2Long(&ptr, &Number); - ptr++; GspHex2Long(&ptr, &Type); ptr++; + GspHex2Long(&ptr, &Address); + ptr++; GspHex2Long(&ptr, &Length); - ptr++; - GspHex2Long(&ptr, &Address); - if (GspSetHwBreakpoint(Number & 0x3, Type & 0x3 , Length & 0x3, Address) == 0) + if (0 == Type) { - strcpy(GspOutBuffer, "OK"); + GspSetSwBreakpoint((ULONG_PTR) Address); } else { - strcpy(GspOutBuffer, "E"); + GspSetHwBreakpoint(Type, (ULONG_PTR) Address, Length); } break; } - /* Remove hardware breakpoint */ - case 'y': + case 'z': { - LONG Number; + LONG Type; + LONG Address; + LONG Length; - ptr = &GspOutBuffer[1]; - GspHex2Long(&ptr, &Number); - if (GspRemoveHwBreakpoint(Number & 0x3) == 0) + GspHex2Long(&ptr, &Type); + ptr++; + GspHex2Long(&ptr, &Address); + ptr++; + GspHex2Long(&ptr, &Length); + if (0 == Type) { - strcpy(GspOutBuffer, "OK"); + GspRemoveSwBreakpoint((ULONG_PTR) Address); } else { - strcpy(GspOutBuffer, "E"); + GspRemoveHwBreakpoint(Type, (ULONG_PTR) Address, Length); } break; } @@ -1466,7 +1668,7 @@ } /* reply to the request */ - GspPutPacket(&GspOutBuffer[0]); + GspPutPacket(GspOutBuffer); } /* not reached */

18 years, 10 months

[gvg] 19379: Update status

by gvg＠svn.reactos.com

Update status Modified: trunk/reactos/media/doc/README.WINE _____ Modified: trunk/reactos/media/doc/README.WINE --- trunk/reactos/media/doc/README.WINE 2005-11-20 17:48:07 UTC (rev 19378) +++ trunk/reactos/media/doc/README.WINE 2005-11-20 17:48:30 UTC (rev 19379) @@ -26,49 +26,52 @@ work to import a new dll. The following build tools are shared with Wine. -reactos/tools/unicode # Synced to Wine-0_9 -reactos/tools/wpp # Synced to Wine-0_9 +reactos/tools/unicode # Synced to Wine-0_9_1 +reactos/tools/wpp # Synced to Wine-0_9_1 reactos/tools/bin2res # Resource to binary converter -reactos/tools/winebuild # Synced to Wine-0_9 +reactos/tools/winebuild # Synced to Wine-0_9_1 reactos/tools/wmc # Wine Message Compiler -reactos/tools/wrc # Synced to Wine-20050930 -reactos/tools/widl # Forked at Wine-0_9 +reactos/tools/wrc # Synced to Wine-0_9_1 +reactos/tools/widl # Forked at Wine-20050930 The following libraries are shared with Wine. -reactos/lib/cabinet # Synced to Wine-0_9 -reactos/lib/comctl32 # Synced to Wine-0_9 -reactos/lib/comdlg32 # Synced to Wine-0_9 +reactos/lib/cabinet # Synced to Wine-0_9_1 +reactos/lib/comctl32 # Synced to Wine-0_9_1 +reactos/lib/comdlg32 # Synced to Wine-0_9_1 +reactos/lib/crypt32 # Synced to Wine-0_9_1 reactos/lib/dbghelp # -reactos/lib/dinput # Synced to Wine-0_9 -reactos/lib/dinput8 # Synced to Wine-0_9 -reactos/lib/icmp # Synced to Wine-0_9 +reactos/lib/dinput # Synced to Wine-0_9_1 +reactos/lib/dinput8 # Synced to Wine-0_9_1 +reactos/lib/dplay # Synced to Wine-0_9_1 +reactos/lib/dplayx # Synced to Wine-0_9_1 +reactos/lib/icmp # Synced to Wine-0_9_1 reactos/lib/iphlpapi # Out of sync reactos/lib/imagehlp # Patches for BindImage need review and submission to winehq. reactos/lib/msvcrt20 # Out of sync -reactos/lib/mpr # Synced to Wine-0_9 +reactos/lib/mpr # Synced to Wine-0_9_1 reactos/lib/msacm # Out of sync -reactos/lib/msimg32 # Synced to Wine-0_9 -reactos/lib/msi # Synced to Wine-0_9 +reactos/lib/msimg32 # Synced to Wine-0_9_1 +reactos/lib/msi # Synced to Wine-0_9_1 reactos/lib/msvideo # Out of sync reactos/lib/netapi32 # Out of sync -reactos/lib/objsel # Synced to Wine-0_9 -reactos/lib/odbc32 # In sync. Depends on port of Linux ODBC. -reactos/lib/ole32 # Synced to Wine-20050830 -reactos/lib/oleaut32 # Synced to Wine-0_9 -reactos/lib/oledlg # Synced to Wine-0_9 -reactos/lib/olepro32 # Synced to Wine-0_9 -reactos/lib/riched20 # Synced to Wine-0_9 -reactos/lib/richedit # Synced to Wine-0_9 -reactos/lib/rpcrt4 # Synced to Wine-0_9 +reactos/lib/objsel # Synced to Wine-0_9_1 +reactos/lib/odbc32 # Out of sync. Depends on port of Linux ODBC. +reactos/lib/ole32 # Synced to Wine-0_9_1 +reactos/lib/oleaut32 # Synced to Wine-0_9_1 +reactos/lib/oledlg # Synced to Wine-0_9_1 +reactos/lib/olepro32 # Synced to Wine-0_9_1 +reactos/lib/riched20 # Synced to Wine-0_9_1 +reactos/lib/richedit # Synced to Wine-0_9_1 +reactos/lib/rpcrt4 # Synced to Wine-0_9_1 reactos/lib/setupapi # Forked at Wine-20050524 -reactos/lib/shell32 # Synced to Wine-0_9 -reactos/lib/shdocvw # Synced to Wine-0_9 -reactos/lib/shfolder # Synced to Wine-0_9 -reactos/lib/shlwapi # Synced to Wine-0_9 +reactos/lib/shell32 # Synced to Wine-0_9_1 +reactos/lib/shdocvw # Synced to Wine-0_9_1 +reactos/lib/shfolder # Synced to Wine-0_9_1 +reactos/lib/shlwapi # Synced to Wine-0_9_1 reactos/lib/twain # Out of sync -reactos/lib/urlmon # Synced to Wine-0_9 -reactos/lib/uxtheme # Synced to Wine-0_9 +reactos/lib/urlmon # Synced to Wine-0_9_1 +reactos/lib/uxtheme # Synced to Wine-0_9_1 reactos/lib/version # Out of sync reactos/lib/wininet # Out of sync reactos/lib/winmm # Forked at Wine-20050628 @@ -78,7 +81,7 @@ ReactOS shares the following programs with Winehq. reactos/subsys/system/regedit # Out of sync reactos/subsys/system/expand # Out of sync -reactos/subsys/system/msiexec # Synced to Wine-0_9 +reactos/subsys/system/msiexec # Synced to Wine-0_9_1 In addition the following libs, dlls and source files are mostly based on code ported from Winehq CVS. If you are looking to update something in these files

18 years, 10 months

[gvg] 19378: Tag Wine-0_9_1, drop old tags

by gvg＠svn.reactos.com

Tag Wine-0_9_1, drop old tags Deleted: vendor/wine/dlls/cabinet/Wine-0_9/ Added: vendor/wine/dlls/cabinet/Wine-0_9_1/ Deleted: vendor/wine/dlls/comctl32/Wine-0_9/ Added: vendor/wine/dlls/comctl32/Wine-0_9_1/ Deleted: vendor/wine/dlls/commdlg/Wine-0_9/ Added: vendor/wine/dlls/commdlg/Wine-0_9_1/ Added: vendor/wine/dlls/crypt32/Wine-0_9_1/ Deleted: vendor/wine/dlls/dinput/Wine-0_9/ Added: vendor/wine/dlls/dinput/Wine-0_9_1/ Deleted: vendor/wine/dlls/dinput8/Wine-0_9/ Added: vendor/wine/dlls/dinput8/Wine-0_9_1/ Added: vendor/wine/dlls/dplay/Wine-0_9_1/ Added: vendor/wine/dlls/dplayx/Wine-0_9_1/ Deleted: vendor/wine/dlls/dsound/Wine-0_9/ Added: vendor/wine/dlls/dsound/Wine-0_9_1/ Deleted: vendor/wine/dlls/icmp/Wine-0_9/ Added: vendor/wine/dlls/icmp/Wine-0_9_1/ Deleted: vendor/wine/dlls/midimap/Wine-0_9/ Added: vendor/wine/dlls/midimap/Wine-0_9_1/ Deleted: vendor/wine/dlls/mpr/Wine-0_9/ Added: vendor/wine/dlls/mpr/Wine-0_9_1/ Deleted: vendor/wine/dlls/msi/Wine-0_9/ Added: vendor/wine/dlls/msi/Wine-0_9_1/ Deleted: vendor/wine/dlls/msimg32/Wine-0_9/ Added: vendor/wine/dlls/msimg32/Wine-0_9_1/ Deleted: vendor/wine/dlls/objsel/Wine-0_9/ Added: vendor/wine/dlls/objsel/Wine-0_9_1/ Deleted: vendor/wine/dlls/ole32/Wine-0_9/ Added: vendor/wine/dlls/ole32/Wine-0_9_1/ Deleted: vendor/wine/dlls/ole32/Wine-20050830/ Deleted: vendor/wine/dlls/oleaut32/Wine-0_9/ Added: vendor/wine/dlls/oleaut32/Wine-0_9_1/ Deleted: vendor/wine/dlls/oledlg/Wine-0_9/ Added: vendor/wine/dlls/oledlg/Wine-0_9_1/ Deleted: vendor/wine/dlls/olepro32/Wine-0_9/ Added: vendor/wine/dlls/olepro32/Wine-0_9_1/ Deleted: vendor/wine/dlls/riched20/Wine-0_9/ Added: vendor/wine/dlls/riched20/Wine-0_9_1/ Deleted: vendor/wine/dlls/richedit/Wine-0_9/ Added: vendor/wine/dlls/richedit/Wine-0_9_1/ Deleted: vendor/wine/dlls/rpcrt4/Wine-0_9/ Added: vendor/wine/dlls/rpcrt4/Wine-0_9_1/ Deleted: vendor/wine/dlls/shdocvw/Wine-0_9/ Added: vendor/wine/dlls/shdocvw/Wine-0_9_1/ Deleted: vendor/wine/dlls/shell32/Wine-0_9/ Added: vendor/wine/dlls/shell32/Wine-0_9_1/ Deleted: vendor/wine/dlls/shfolder/Wine-0_9/ Added: vendor/wine/dlls/shfolder/Wine-0_9_1/ Deleted: vendor/wine/dlls/shlwapi/Wine-0_9/ Added: vendor/wine/dlls/shlwapi/Wine-0_9_1/ Deleted: vendor/wine/dlls/urlmon/Wine-0_9/ Added: vendor/wine/dlls/urlmon/Wine-0_9_1/ Deleted: vendor/wine/dlls/uxtheme/Wine-0_9/ Added: vendor/wine/dlls/uxtheme/Wine-0_9_1/ Deleted: vendor/wine/libs/unicode/Wine-0_9/ Added: vendor/wine/libs/unicode/Wine-0_9_1/ Deleted: vendor/wine/libs/wpp/Wine-0_9/ Added: vendor/wine/libs/wpp/Wine-0_9_1/ Deleted: vendor/wine/programs/msiexec/Wine-0_9/ Added: vendor/wine/programs/msiexec/Wine-0_9_1/ Deleted: vendor/wine/tools/winebuild/Wine-0_9/ Added: vendor/wine/tools/winebuild/Wine-0_9_1/ Deleted: vendor/wine/tools/wrc/Wine-0_9/ Added: vendor/wine/tools/wrc/Wine-0_9_1/ _____ Copied: vendor/wine/dlls/cabinet/Wine-0_9_1 (from rev 19377, vendor/wine/dlls/cabinet/current) _____ Copied: vendor/wine/dlls/comctl32/Wine-0_9_1 (from rev 19377, vendor/wine/dlls/comctl32/current) _____ Copied: vendor/wine/dlls/commdlg/Wine-0_9_1 (from rev 19377, vendor/wine/dlls/commdlg/current) _____ Copied: vendor/wine/dlls/crypt32/Wine-0_9_1 (from rev 19377, vendor/wine/dlls/crypt32/current) _____ Copied: vendor/wine/dlls/dinput/Wine-0_9_1 (from rev 19377, vendor/wine/dlls/dinput/current) _____ Copied: vendor/wine/dlls/dinput8/Wine-0_9_1 (from rev 19377, vendor/wine/dlls/dinput8/current) _____ Copied: vendor/wine/dlls/dplay/Wine-0_9_1 (from rev 19377, vendor/wine/dlls/dplay/current) _____ Copied: vendor/wine/dlls/dplayx/Wine-0_9_1 (from rev 19377, vendor/wine/dlls/dplayx/current) _____ Copied: vendor/wine/dlls/dsound/Wine-0_9_1 (from rev 19377, vendor/wine/dlls/dsound/current) _____ Copied: vendor/wine/dlls/icmp/Wine-0_9_1 (from rev 19377, vendor/wine/dlls/icmp/current) _____ Copied: vendor/wine/dlls/midimap/Wine-0_9_1 (from rev 19377, vendor/wine/dlls/midimap/current) _____ Copied: vendor/wine/dlls/mpr/Wine-0_9_1 (from rev 19377, vendor/wine/dlls/mpr/current) _____ Copied: vendor/wine/dlls/msi/Wine-0_9_1 (from rev 19377, vendor/wine/dlls/msi/current) _____ Copied: vendor/wine/dlls/msimg32/Wine-0_9_1 (from rev 19377, vendor/wine/dlls/msimg32/current) _____ Copied: vendor/wine/dlls/objsel/Wine-0_9_1 (from rev 19377, vendor/wine/dlls/objsel/current) _____ Copied: vendor/wine/dlls/ole32/Wine-0_9_1 (from rev 19377, vendor/wine/dlls/ole32/current) _____ Copied: vendor/wine/dlls/oleaut32/Wine-0_9_1 (from rev 19377, vendor/wine/dlls/oleaut32/current) _____ Copied: vendor/wine/dlls/oledlg/Wine-0_9_1 (from rev 19377, vendor/wine/dlls/oledlg/current) _____ Copied: vendor/wine/dlls/olepro32/Wine-0_9_1 (from rev 19377, vendor/wine/dlls/olepro32/current) _____ Copied: vendor/wine/dlls/riched20/Wine-0_9_1 (from rev 19377, vendor/wine/dlls/riched20/current) _____ Copied: vendor/wine/dlls/richedit/Wine-0_9_1 (from rev 19377, vendor/wine/dlls/richedit/current) _____ Copied: vendor/wine/dlls/rpcrt4/Wine-0_9_1 (from rev 19377, vendor/wine/dlls/rpcrt4/current) _____ Copied: vendor/wine/dlls/shdocvw/Wine-0_9_1 (from rev 19377, vendor/wine/dlls/shdocvw/current) _____ Copied: vendor/wine/dlls/shell32/Wine-0_9_1 (from rev 19377, vendor/wine/dlls/shell32/current) _____ Copied: vendor/wine/dlls/shfolder/Wine-0_9_1 (from rev 19377, vendor/wine/dlls/shfolder/current) _____ Copied: vendor/wine/dlls/shlwapi/Wine-0_9_1 (from rev 19377, vendor/wine/dlls/shlwapi/current) _____ Copied: vendor/wine/dlls/urlmon/Wine-0_9_1 (from rev 19377, vendor/wine/dlls/urlmon/current) _____ Copied: vendor/wine/dlls/uxtheme/Wine-0_9_1 (from rev 19377, vendor/wine/dlls/uxtheme/current) _____ Copied: vendor/wine/libs/unicode/Wine-0_9_1 (from rev 19377, vendor/wine/libs/unicode/current) _____ Copied: vendor/wine/libs/wpp/Wine-0_9_1 (from rev 19377, vendor/wine/libs/wpp/current) _____ Copied: vendor/wine/programs/msiexec/Wine-0_9_1 (from rev 19377, vendor/wine/programs/msiexec/current) _____ Copied: vendor/wine/tools/winebuild/Wine-0_9_1 (from rev 19377, vendor/wine/tools/winebuild/current) _____ Copied: vendor/wine/tools/wrc/Wine-0_9_1 (from rev 19377, vendor/wine/tools/wrc/current)

18 years, 10 months

[gvg] 19377: SVN maintenance

by gvg＠svn.reactos.com

SVN maintenance Property changes on: trunk/reactos/lib/dplay ___________________________________________________________________ Name: svn:ignore + GNUmakefile Property changes on: trunk/reactos/lib/dplayx ___________________________________________________________________ Name: svn:ignore + GNUmakefile

18 years, 10 months

[ion] 19376: Beware of the alt+fs slippery finger

by ion＠svn.reactos.com

Beware of the alt+fs slippery finger Modified: trunk/reactos/include/ndk/rtltypes.h _____ Modified: trunk/reactos/include/ndk/rtltypes.h --- trunk/reactos/include/ndk/rtltypes.h 2005-11-20 17:16:11 UTC (rev 19375) +++ trunk/reactos/include/ndk/rtltypes.h 2005-11-20 17:42:44 UTC (rev 19376) @@ -34,7 +34,7 @@ #define EXCEPTION_UNWINDING 0x02 #define EXCEPTION_EXIT_UNWIND 0x04 #define EXCEPTION_STACK_INVALID 0x8 -#define EXCEPTION_NESTED_CALL 0x10F +#define EXCEPTION_NESTED_CALL 0x10 #define EXCEPTION_TARGET_UNWIND 0x20 #define EXCEPTION_COLLIDED_UNWIND 0x20

18 years, 10 months

[ion] 19375: - Update NDK with proper (when possible) RTL structure names that were previously "under review".

by ion＠svn.reactos.com

- Update NDK with proper (when possible) RTL structure names that were previously "under review". - Update relevant source files to new names. Modified: trunk/reactos/include/ndk/extypes.h Modified: trunk/reactos/include/ndk/fixmes.txt Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/ndk/umfuncs.h Modified: trunk/reactos/lib/kernel32/misc/toolhelp.c Modified: trunk/reactos/lib/ntdll/ldr/utils.c Modified: trunk/reactos/lib/rtl/dbgbuffer.c Modified: trunk/reactos/lib/rtl/path.c _____ Modified: trunk/reactos/include/ndk/extypes.h --- trunk/reactos/include/ndk/extypes.h 2005-11-20 15:50:47 UTC (rev 19374) +++ trunk/reactos/include/ndk/extypes.h 2005-11-20 17:16:11 UTC (rev 19375) @@ -12,7 +12,6 @@ /* DEPENDENCIES **************************************************************/ #include <cfg.h> -/* FIXME: this needs be implemented in the w32api ddk */ #if defined(_MSC_VER) && !defined(NTOS_MODE_USER) #include <ntimage.h> #endif _____ Modified: trunk/reactos/include/ndk/fixmes.txt --- trunk/reactos/include/ndk/fixmes.txt 2005-11-20 15:50:47 UTC (rev 19374) +++ trunk/reactos/include/ndk/fixmes.txt 2005-11-20 17:16:11 UTC (rev 19375) @@ -26,7 +26,7 @@ - Object Directory + implementation doesn't match NT (Alex) [obtypes.h] Priority 3: - - Some RTL Structures need review (Alex) [rtltypes.h] + - FIXED: Some RTL Structures need review (Alex) [rtltypes.h] - Pushlock support is needed to fix EPROCESS (Alex) [pstypes.h] - MADDRESS_SPACE must be converted into the NT Type (Alex) [pstypes.h, mmtypes.h] _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-11-20 15:50:47 UTC (rev 19374) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-11-20 17:16:11 UTC (rev 19375) @@ -1703,7 +1703,7 @@ * Debug Info Functions */ NTSYSAPI -PDEBUG_BUFFER +PRTL_DEBUG_BUFFER NTAPI RtlCreateQueryDebugBuffer( IN ULONG Size, @@ -1713,7 +1713,7 @@ NTSYSAPI NTSTATUS NTAPI -RtlDestroyQueryDebugBuffer(IN PDEBUG_BUFFER DebugBuffer); +RtlDestroyQueryDebugBuffer(IN PRTL_DEBUG_BUFFER DebugBuffer); NTSYSAPI NTSTATUS @@ -1721,7 +1721,7 @@ RtlQueryProcessDebugInformation( IN ULONG ProcessId, IN ULONG DebugInfoClassMask, - IN OUT PDEBUG_BUFFER DebugBuffer + IN OUT PRTL_DEBUG_BUFFER DebugBuffer ); /* _____ Modified: trunk/reactos/include/ndk/rtltypes.h --- trunk/reactos/include/ndk/rtltypes.h 2005-11-20 15:50:47 UTC (rev 19374) +++ trunk/reactos/include/ndk/rtltypes.h 2005-11-20 17:16:11 UTC (rev 19375) @@ -34,7 +34,7 @@ #define EXCEPTION_UNWINDING 0x02 #define EXCEPTION_EXIT_UNWIND 0x04 #define EXCEPTION_STACK_INVALID 0x8 -#define EXCEPTION_NESTED_CALL 0x10 +#define EXCEPTION_NESTED_CALL 0x10F #define EXCEPTION_TARGET_UNWIND 0x20 #define EXCEPTION_COLLIDED_UNWIND 0x20 @@ -228,13 +228,13 @@ ((L1)->LowPart == (L2)->LowPart)) #endif -/* FIXME: Rename these */ -#define PDI_MODULES 0x01 /* The loaded modules of the process */ -#define PDI_BACKTRACE 0x02 /* The heap stack back traces */ -#define PDI_HEAPS 0x04 /* The heaps of the process */ -#define PDI_HEAP_TAGS 0x08 /* The heap tags */ -#define PDI_HEAP_BLOCKS 0x10 /* The heap blocks */ -#define PDI_LOCKS 0x20 /* The locks created by the process */ +/* RTL Debug Queries */ +#define RTL_DEBUG_QUERY_MODULES 0x01 +#define RTL_DEBUG_QUERY_BACKTRACES 0x02 +#define RTL_DEBUG_QUERY_HEAPS 0x04 +#define RTL_DEBUG_QUERY_HEAP_TAGS 0x08 +#define RTL_DEBUG_QUERY_HEAP_BLOCKS 0x10 +#define RTL_DEBUG_QUERY_LOCKS 0x20 /* RTL Handle Flags */ #define RTL_HANDLE_VALID 0x1 @@ -267,7 +267,7 @@ } RTL_GENERIC_COMPARE_RESULTS; #endif -typedef enum +typedef enum _RTL_PATH_TYPE { INVALID_PATH = 0, UNC_PATH, /* "//foo" */ @@ -277,7 +277,7 @@ RELATIVE_PATH, /* "foo" */ DEVICE_PATH, /* "//./foo" */ UNC_DOT_PATH /* "//." */ -} DOS_PATHNAME_TYPE; +} RTL_PATH_TYPE; /* FUNCTION TYPES ************************************************************/ #ifndef NTOS_MODE_USER @@ -426,24 +426,24 @@ typedef struct _COMPRESSED_DATA_INFO { - USHORT CompressionFormatAndEngine; - UCHAR CompressionUnitShift; - UCHAR ChunkShift; - UCHAR ClusterShift; - UCHAR Reserved; - USHORT NumberOfChunks; - ULONG CompressedChunkSizes[ANYSIZE_ARRAY]; + USHORT CompressionFormatAndEngine; + UCHAR CompressionUnitShift; + UCHAR ChunkShift; + UCHAR ClusterShift; + UCHAR Reserved; + USHORT NumberOfChunks; + ULONG CompressedChunkSizes[ANYSIZE_ARRAY]; } COMPRESSED_DATA_INFO, *PCOMPRESSED_DATA_INFO; typedef struct _GENERATE_NAME_CONTEXT { - USHORT Checksum; + USHORT Checksum; BOOLEAN CheckSumInserted; - UCHAR NameLength; - WCHAR NameBuffer[8]; - ULONG ExtensionLength; - WCHAR ExtensionBuffer[4]; - ULONG LastIndexValue; + UCHAR NameLength; + WCHAR NameBuffer[8]; + ULONG ExtensionLength; + WCHAR ExtensionBuffer[4]; + ULONG LastIndexValue; } GENERATE_NAME_CONTEXT, *PGENERATE_NAME_CONTEXT; typedef struct _RTL_SPLAY_LINKS @@ -549,29 +549,8 @@ ACCESS_MASK AccessMask; } ACE, *PACE; -/* FIXME: Review definitions and give these guys a better name */ -typedef struct _DEBUG_BUFFER +typedef struct _RTL_PROCESS_MODULE_INFORMATION { - HANDLE SectionHandle; - PVOID SectionBase; - PVOID RemoteSectionBase; - ULONG SectionBaseDelta; - HANDLE EventPairHandle; - ULONG Unknown[2]; - HANDLE RemoteThreadHandle; - ULONG InfoClassMask; - ULONG SizeOfInfo; - ULONG AllocatedSize; - ULONG SectionSize; - PVOID ModuleInformation; - PVOID BackTraceInformation; - PVOID HeapInformation; - PVOID LockInformation; - PVOID Reserved[8]; -} DEBUG_BUFFER, *PDEBUG_BUFFER; - -typedef struct _DEBUG_MODULE_INFORMATION -{ ULONG Reserved[2]; PVOID Base; ULONG Size; @@ -581,10 +560,16 @@ USHORT LoadCount; USHORT ModuleNameOffset; CHAR ImageName[256]; -} DEBUG_MODULE_INFORMATION, *PDEBUG_MODULE_INFORMATION; +} RTL_PROCESS_MODULE_INFORMATION, *PRTL_PROCESS_MODULE_INFORMATION; -typedef struct _DEBUG_HEAP_INFORMATION +typedef struct _RTL_PROCESS_MODULES { + ULONG ModuleCount; + RTL_PROCESS_MODULE_INFORMATION ModuleEntry[1]; +} RTL_PROCESS_MODULES, *PRTL_PROCESS_MODULES; + +typedef struct _RTL_PROCESS_HEAP_INFORMATION +{ PVOID Base; ULONG Flags; USHORT Granularity; @@ -596,10 +581,16 @@ ULONG Reserved[7]; PVOID Tags; PVOID Blocks; -} DEBUG_HEAP_INFORMATION, *PDEBUG_HEAP_INFORMATION; +} RTL_PROCESS_HEAP_INFORMATION, *PRTL_PROCESS_HEAP_INFORMATION; -typedef struct _DEBUG_LOCK_INFORMATION +typedef struct _RTL_PROCESS_HEAPS { + ULONG HeapCount; + RTL_PROCESS_HEAP_INFORMATION HeapEntry[1]; +} RTL_PROCESS_HEAPS, *PRTL_PROCESS_HEAPS; + +typedef struct _RTL_PROCESS_LOCK_INFORMATION +{ PVOID Address; USHORT Type; USHORT CreatorBackTraceIndex; @@ -610,8 +601,46 @@ ULONG RecursionCount; ULONG NumberOfSharedWaiters; ULONG NumberOfExclusiveWaiters; -} DEBUG_LOCK_INFORMATION, *PDEBUG_LOCK_INFORMATION; +} RTL_PROCESS_LOCK_INFORMATION, *PRTL_PROCESS_LOCK_INFORMATION; +typedef struct _RTL_PROCESS_LOCKS +{ + ULONG LockCount; + RTL_PROCESS_LOCK_INFORMATION LockEntry[1]; +} RTL_PROCESS_LOCKS, *PRTL_PROCESS_LOCKS; + +typedef struct _RTL_PROCESS_BACKTRACE_INFORMATION +{ + /* FIXME */ + ULONG Unknown; +} RTL_PROCESS_BACKTRACE_INFORMATION, *PRTL_PROCESS_BACKTRACE_INFORMATION; + +typedef struct _RTL_PROCESS_BACKTRACES +{ + ULONG BackTraceCount; + RTL_PROCESS_BACKTRACE_INFORMATION BackTraceEntry[1]; +} RTL_PROCESS_BACKTRACES, *PRTL_PROCESS_BACKTRACES; + +typedef struct _RTL_DEBUG_BUFFER +{ + HANDLE SectionHandle; + PVOID SectionBase; + PVOID RemoteSectionBase; + ULONG SectionBaseDelta; + HANDLE EventPairHandle; + ULONG Unknown[2]; + HANDLE RemoteThreadHandle; + ULONG InfoClassMask; + ULONG SizeOfInfo; + ULONG AllocatedSize; + ULONG SectionSize; + PRTL_PROCESS_MODULES ModuleInformation; + PRTL_PROCESS_BACKTRACES BackTraceInformation; + PRTL_PROCESS_HEAPS HeapInformation; + PRTL_PROCESS_LOCKS LockInformation; + PVOID Reserved[8]; +} RTL_DEBUG_BUFFER, *PRTL_DEBUG_BUFFER; + typedef struct _RTL_HANDLE_TABLE_ENTRY { ULONG Flags; @@ -629,25 +658,6 @@ PRTL_HANDLE_TABLE_ENTRY MaxReservedHandles; } RTL_HANDLE_TABLE, *PRTL_HANDLE_TABLE; -typedef struct _LOCK_INFORMATION -{ - ULONG LockCount; - DEBUG_LOCK_INFORMATION LockEntry[1]; -} LOCK_INFORMATION, *PLOCK_INFORMATION; - -typedef struct _HEAP_INFORMATION -{ - ULONG HeapCount; - DEBUG_HEAP_INFORMATION HeapEntry[1]; -} HEAP_INFORMATION, *PHEAP_INFORMATION; - -typedef struct _MODULE_INFORMATION -{ - ULONG ModuleCount; - DEBUG_MODULE_INFORMATION ModuleEntry[1]; -} MODULE_INFORMATION, *PMODULE_INFORMATION; -/* END REVIEW AREA */ - typedef struct _EXCEPTION_REGISTRATION_RECORD { struct _EXCEPTION_REGISTRATION_RECORD *Next; @@ -729,8 +739,8 @@ ULONG ExclusiveWaiters; LONG NumberActive; HANDLE OwningThread; - ULONG TimeoutBoost; /* ?? */ - PVOID DebugInfo; /* ?? */ + ULONG TimeoutBoost; + PVOID DebugInfo; } RTL_RESOURCE, *PRTL_RESOURCE; typedef struct _RTL_MESSAGE_RESOURCE_ENTRY @@ -757,7 +767,7 @@ { USHORT HeaderSize; USHORT CodePage; - USHORT MaximumCharacterSize; /* SBCS = 1, DBCS = 2 */ + USHORT MaximumCharacterSize; USHORT DefaultChar; USHORT UniDefaultChar; USHORT TransDefaultChar; _____ Modified: trunk/reactos/include/ndk/umfuncs.h --- trunk/reactos/include/ndk/umfuncs.h 2005-11-20 15:50:47 UTC (rev 19374) +++ trunk/reactos/include/ndk/umfuncs.h 2005-11-20 17:16:11 UTC (rev 19375) @@ -212,7 +212,7 @@ NTSTATUS NTAPI LdrQueryProcessModuleInformation( - IN PMODULE_INFORMATION ModuleInformation OPTIONAL, + IN PRTL_PROCESS_MODULES ModuleInformation OPTIONAL, IN ULONG Size OPTIONAL, OUT PULONG ReturnedSize ); _____ Modified: trunk/reactos/lib/kernel32/misc/toolhelp.c --- trunk/reactos/lib/kernel32/misc/toolhelp.c 2005-11-20 15:50:47 UTC (rev 19374) +++ trunk/reactos/lib/kernel32/misc/toolhelp.c 2005-11-20 17:16:11 UTC (rev 19375) @@ -92,8 +92,8 @@ /* INTERNAL FUNCTIONS *********************************************************/ static VOID -TH32FreeAllocatedResources(PDEBUG_BUFFER HeapDebug, - PDEBUG_BUFFER ModuleDebug, +TH32FreeAllocatedResources(PRTL_DEBUG_BUFFER HeapDebug, + PRTL_DEBUG_BUFFER ModuleDebug, PVOID ProcThrdInfo, ULONG ProcThrdInfoSize) { @@ -118,8 +118,8 @@ static NTSTATUS TH32CreateSnapshot(DWORD dwFlags, DWORD th32ProcessID, - PDEBUG_BUFFER *HeapDebug, - PDEBUG_BUFFER *ModuleDebug, + PRTL_DEBUG_BUFFER *HeapDebug, + PRTL_DEBUG_BUFFER *ModuleDebug, PVOID *ProcThrdInfo, ULONG *ProcThrdInfoSize) { @@ -139,7 +139,7 @@ if(*HeapDebug != NULL) { Status = RtlQueryProcessDebugInformation(th32ProcessID, - PDI_HEAPS, + RTL_DEBUG_QUERY_HEAPS, *HeapDebug); } else @@ -156,7 +156,7 @@ if(*ModuleDebug != NULL) { Status = RtlQueryProcessDebugInformation(th32ProcessID, - PDI_MODULES, + RTL_DEBUG_QUERY_MODULES, *ModuleDebug); } else @@ -221,8 +221,8 @@ static NTSTATUS TH32CreateSnapshotSectionInitialize(DWORD dwFlags, DWORD th32ProcessID, - PDEBUG_BUFFER HeapDebug, - PDEBUG_BUFFER ModuleDebug, + PRTL_DEBUG_BUFFER HeapDebug, + PRTL_DEBUG_BUFFER ModuleDebug, PVOID ProcThrdInfo, HANDLE *SectionHandle) { @@ -239,8 +239,8 @@ ULONG ViewSize, i; ULONG nProcesses = 0, nThreads = 0, nHeaps = 0, nModules = 0; ULONG RequiredSnapshotSize = sizeof(TH32SNAPSHOT); - PHEAP_INFORMATION hi = NULL; - PMODULE_INFORMATION mi = NULL; + PRTL_PROCESS_HEAPS hi = NULL; + PRTL_PROCESS_MODULES mi = NULL; NTSTATUS Status = STATUS_SUCCESS; /* @@ -248,7 +248,7 @@ */ if(dwFlags & TH32CS_SNAPHEAPLIST) { - hi = (PHEAP_INFORMATION)HeapDebug->HeapInformation; + hi = (PRTL_PROCESS_HEAPS)HeapDebug->HeapInformation; nHeaps = hi->HeapCount; RequiredSnapshotSize += nHeaps * sizeof(HEAPLIST32); } @@ -258,7 +258,7 @@ */ if(dwFlags & TH32CS_SNAPMODULE) { - mi = (PMODULE_INFORMATION)ModuleDebug->ModuleInformation; + mi = (PRTL_PROCESS_MODULES)ModuleDebug->ModuleInformation; nModules = mi->ModuleCount; RequiredSnapshotSize += nModules * sizeof(MODULEENTRY32W); } @@ -1113,7 +1113,7 @@ STDCALL CreateToolhelp32Snapshot(DWORD dwFlags, DWORD th32ProcessID) { - PDEBUG_BUFFER HeapDebug, ModuleDebug; + PRTL_DEBUG_BUFFER HeapDebug, ModuleDebug; PVOID ProcThrdInfo; ULONG ProcThrdInfoSize; NTSTATUS Status; _____ Modified: trunk/reactos/lib/ntdll/ldr/utils.c --- trunk/reactos/lib/ntdll/ldr/utils.c 2005-11-20 15:50:47 UTC (rev 19374) +++ trunk/reactos/lib/ntdll/ldr/utils.c 2005-11-20 17:16:11 UTC (rev 19375) @@ -2643,14 +2643,14 @@ * @implemented */ NTSTATUS NTAPI -LdrQueryProcessModuleInformation(IN PMODULE_INFORMATION ModuleInformation OPTIONAL, +LdrQueryProcessModuleInformation(IN PRTL_PROCESS_MODULES ModuleInformation OPTIONAL, IN ULONG Size OPTIONAL, OUT PULONG ReturnedSize) { PLIST_ENTRY ModuleListHead; PLIST_ENTRY Entry; PLDR_DATA_TABLE_ENTRY Module; - PDEBUG_MODULE_INFORMATION ModulePtr = NULL; + PRTL_PROCESS_MODULE_INFORMATION ModulePtr = NULL; NTSTATUS Status = STATUS_SUCCESS; ULONG UsedSize = sizeof(ULONG); ANSI_STRING AnsiString; @@ -2710,7 +2710,7 @@ ModulePtr++; ModuleInformation->ModuleCount++; } - UsedSize += sizeof(DEBUG_MODULE_INFORMATION); + UsedSize += sizeof(RTL_PROCESS_MODULE_INFORMATION); Entry = Entry->Flink; } _____ Modified: trunk/reactos/lib/rtl/dbgbuffer.c --- trunk/reactos/lib/rtl/dbgbuffer.c 2005-11-20 15:50:47 UTC (rev 19374) +++ trunk/reactos/lib/rtl/dbgbuffer.c 2005-11-20 17:16:11 UTC (rev 19375) @@ -16,12 +16,12 @@ /* * @unimplemented */ -PDEBUG_BUFFER NTAPI +PRTL_DEBUG_BUFFER NTAPI RtlCreateQueryDebugBuffer(IN ULONG Size, IN BOOLEAN EventPair) { NTSTATUS Status; - PDEBUG_BUFFER Buf = NULL; + PRTL_DEBUG_BUFFER Buf = NULL; ULONG SectionSize = 100 * PAGE_SIZE; Status = NtAllocateVirtualMemory( NtCurrentProcess(), @@ -47,7 +47,7 @@ * @unimplemented */ NTSTATUS NTAPI -RtlDestroyQueryDebugBuffer(IN PDEBUG_BUFFER Buf) +RtlDestroyQueryDebugBuffer(IN PRTL_DEBUG_BUFFER Buf) { NTSTATUS Status = STATUS_SUCCESS; @@ -71,7 +71,7 @@ */ NTSTATUS NTAPI RtlpQueryRemoteProcessModules(HANDLE ProcessHandle, - IN PMODULE_INFORMATION ModuleInformation OPTIONAL, + IN PRTL_PROCESS_MODULES ModuleInformation OPTIONAL, IN ULONG Size OPTIONAL, OUT PULONG ReturnedSize) { @@ -81,7 +81,7 @@ PLIST_ENTRY pleListHead; PLIST_ENTRY pleCurEntry; - PDEBUG_MODULE_INFORMATION ModulePtr = NULL; + PRTL_PROCESS_MODULE_INFORMATION ModulePtr = NULL; NTSTATUS Status = STATUS_SUCCESS; ULONG UsedSize = sizeof(ULONG); ANSI_STRING AnsiString; @@ -209,7 +209,7 @@ ModulePtr++; ModuleInformation->ModuleCount++; } - UsedSize += sizeof(DEBUG_MODULE_INFORMATION); + UsedSize += sizeof(RTL_PROCESS_MODULE_INFORMATION); /* address of the next module in the list */ pleCurEntry = lmModule.InLoadOrderModuleList.Flink; @@ -230,13 +230,13 @@ NTSTATUS NTAPI RtlQueryProcessDebugInformation(IN ULONG ProcessId, IN ULONG DebugInfoMask, - IN OUT PDEBUG_BUFFER Buf) + IN OUT PRTL_DEBUG_BUFFER Buf) { NTSTATUS Status = STATUS_SUCCESS; ULONG Pid = (ULONG) NtCurrentTeb()->Cid.UniqueProcess; Buf->InfoClassMask = DebugInfoMask; - Buf->SizeOfInfo = sizeof(DEBUG_BUFFER); + Buf->SizeOfInfo = sizeof(RTL_DEBUG_BUFFER); DPRINT("QueryProcessDebugInformation Start\n"); @@ -252,13 +252,13 @@ else if (Pid == ProcessId) { - if (DebugInfoMask & PDI_MODULES) + if (DebugInfoMask & RTL_DEBUG_QUERY_MODULES) { - PMODULE_INFORMATION Mp; + PRTL_PROCESS_MODULES Mp; ULONG ReturnSize = 0; ULONG MSize; - Mp = (PMODULE_INFORMATION)(Buf + Buf->SizeOfInfo); + Mp = (PRTL_PROCESS_MODULES)(Buf + Buf->SizeOfInfo); /* I like this better than the do & while loop. */ Status = LdrQueryProcessModuleInformation( NULL, @@ -272,22 +272,22 @@ return Status; } - MSize = Mp->ModuleCount * (sizeof(MODULE_INFORMATION) + 8); + MSize = Mp->ModuleCount * (sizeof(RTL_PROCESS_MODULES) + 8); Buf->ModuleInformation = Mp; Buf->SizeOfInfo = Buf->SizeOfInfo + MSize; } - if (DebugInfoMask & PDI_HEAPS) + if (DebugInfoMask & RTL_DEBUG_QUERY_HEAPS) { - PHEAP_INFORMATION Hp; + PRTL_PROCESS_HEAPS Hp; ULONG HSize; - Hp = (PHEAP_INFORMATION)(Buf + Buf->SizeOfInfo); - HSize = sizeof(HEAP_INFORMATION); - if (DebugInfoMask & PDI_HEAP_TAGS) + Hp = (PRTL_PROCESS_HEAPS)(Buf + Buf->SizeOfInfo); + HSize = sizeof(RTL_PROCESS_HEAPS); + if (DebugInfoMask & RTL_DEBUG_QUERY_HEAP_TAGS) { } - if (DebugInfoMask & PDI_HEAP_BLOCKS) + if (DebugInfoMask & RTL_DEBUG_QUERY_HEAP_BLOCKS) { } Buf->HeapInformation = Hp; @@ -295,13 +295,13 @@ } - if (DebugInfoMask & PDI_LOCKS) + if (DebugInfoMask & RTL_DEBUG_QUERY_LOCKS) { - PLOCK_INFORMATION Lp; + PRTL_PROCESS_LOCKS Lp; ULONG LSize; - Lp = (PLOCK_INFORMATION)(Buf + Buf->SizeOfInfo); - LSize = sizeof(LOCK_INFORMATION); + Lp = (PRTL_PROCESS_LOCKS)(Buf + Buf->SizeOfInfo); + LSize = sizeof(RTL_PROCESS_LOCKS); Buf->LockInformation = Lp; Buf->SizeOfInfo = Buf->SizeOfInfo + LSize; } @@ -334,13 +334,13 @@ return Status; } - if (DebugInfoMask & PDI_MODULES) + if (DebugInfoMask & RTL_DEBUG_QUERY_MODULES) { - PMODULE_INFORMATION Mp; + PRTL_PROCESS_MODULES Mp; ULONG ReturnSize = 0; ULONG MSize; - Mp = (PMODULE_INFORMATION)(Buf + Buf->SizeOfInfo); + Mp = (PRTL_PROCESS_MODULES)(Buf + Buf->SizeOfInfo); Status = RtlpQueryRemoteProcessModules( hProcess, NULL, @@ -356,22 +356,22 @@ return Status; } - MSize = Mp->ModuleCount * (sizeof(MODULE_INFORMATION) + 8); + MSize = Mp->ModuleCount * (sizeof(RTL_PROCESS_MODULES) + 8); Buf->ModuleInformation = Mp; Buf->SizeOfInfo = Buf->SizeOfInfo + MSize; } - if (DebugInfoMask & PDI_HEAPS) + if (DebugInfoMask & RTL_DEBUG_QUERY_HEAPS) { - PHEAP_INFORMATION Hp; + PRTL_PROCESS_HEAPS Hp; ULONG HSize; - Hp = (PHEAP_INFORMATION)(Buf + Buf->SizeOfInfo); - HSize = sizeof(HEAP_INFORMATION); - if (DebugInfoMask & PDI_HEAP_TAGS) + Hp = (PRTL_PROCESS_HEAPS)(Buf + Buf->SizeOfInfo); + HSize = sizeof(RTL_PROCESS_HEAPS); + if (DebugInfoMask & RTL_DEBUG_QUERY_HEAP_TAGS) { } - if (DebugInfoMask & PDI_HEAP_BLOCKS) + if (DebugInfoMask & RTL_DEBUG_QUERY_HEAP_BLOCKS) { } Buf->HeapInformation = Hp; @@ -379,13 +379,13 @@ } - if (DebugInfoMask & PDI_LOCKS) + if (DebugInfoMask & RTL_DEBUG_QUERY_LOCKS) { - PLOCK_INFORMATION Lp; + PRTL_PROCESS_LOCKS Lp; ULONG LSize; - Lp = (PLOCK_INFORMATION)(Buf + Buf->SizeOfInfo); - LSize = sizeof(LOCK_INFORMATION); + Lp = (PRTL_PROCESS_LOCKS)(Buf + Buf->SizeOfInfo); + LSize = sizeof(RTL_PROCESS_LOCKS); Buf->LockInformation = Lp; Buf->SizeOfInfo = Buf->SizeOfInfo + LSize; } _____ Modified: trunk/reactos/lib/rtl/path.c --- trunk/reactos/lib/rtl/path.c 2005-11-20 15:50:47 UTC (rev 19374) +++ trunk/reactos/lib/rtl/path.c 2005-11-20 17:16:11 UTC (rev 19375) @@ -498,7 +498,7 @@ ULONG size) { ULONG reqsize = 0, mark = 0, dep = 0, deplen; - DOS_PATHNAME_TYPE type; + RTL_PATH_TYPE type; LPWSTR ins_str = NULL; LPCWSTR ptr; const UNICODE_STRING* cd;

18 years, 10 months

[sgasiorek] 19374: polish resource

by sgasiorek＠svn.reactos.com

polish resource Added: trunk/reactos/boot/freeldr/fdebug/Pl.rc Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.rc _____ Added: trunk/reactos/boot/freeldr/fdebug/Pl.rc --- trunk/reactos/boot/freeldr/fdebug/Pl.rc 2005-11-20 15:43:38 UTC (rev 19373) +++ trunk/reactos/boot/freeldr/fdebug/Pl.rc 2005-11-20 15:50:47 UTC (rev 19374) @@ -0,0 +1,200 @@ +/////////////////////////////////////////////////////////////////////// ////// +// Polish (P.L.) resources +// 2005 Emil Kaczmarek +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +#pragma code_page(1250) +#endif //_WIN32 + +/////////////////////////////////////////////////////////////////////// ////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_FDEBUG ICON DISCARDABLE "fdebug.ico" + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDC_FDEBUG MENU DISCARDABLE +BEGIN + POPUP "&Plik" + BEGIN + MENUITEM "P&o??cz", ID_FILE_CONNECT + MENUITEM "&Roz??cz", ID_FILE_DISCONNECT, GRAYED + MENUITEM SEPARATOR + MENUITEM "Ro&zpocznij zrzut", ID_FILE_STARTCAPTURE + MENUITEM "Za&trzymaj zrzut", ID_FILE_STOPCAPTURE, GRAYED + MENUITEM SEPARATOR + MENUITEM "Lo&kalne Echo", ID_FILE_LOCALECHO + MENUITEM SEPARATOR + MENUITEM "&Wyj£cie", IDM_EXIT + END + POPUP "Po&moc" + BEGIN + MENUITEM "&O ...", IDM_ABOUT + END +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// Accelerator +// + +IDC_FDEBUG ACCELERATORS MOVEABLE PURE +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + + +#ifdef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// TEXTINCLUDE +// + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""resource.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +#endif // APSTUDIO_INVOKED + + +/////////////////////////////////////////////////////////////////////// ////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_ABOUTBOX, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 252 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_CONNECTION, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 189 + TOPMARGIN, 7 + BOTTOMMARGIN, 93 + END + + IDD_CAPTURE, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 244 + TOPMARGIN, 7 + BOTTOMMARGIN, 88 + END +END +#endif // APSTUDIO_INVOKED + + +/////////////////////////////////////////////////////////////////////// ////// +// +// Dialog +// + +IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "O debuggerze FreeLoadera" +FONT 8, "Tahoma" +BEGIN + CONTROL "FreeLoader Debugger v1.0\nCopyright (C) 2003\nby Brian Palmer (brianp(a)reactos.org)", + IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, + 122,26 + DEFPUSHBUTTON "OK",IDOK,183,189,44,14,WS_GROUP + ICON IDI_FDEBUG,IDC_STATIC,19,30,20,20 + EDITTEXT IDC_LICENSE_EDIT,53,63,174,107,ES_MULTILINE | + ES_READONLY | WS_VSCROLL +END + +IDD_CONNECTION DIALOG DISCARDABLE 0, 0, 196, 100 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Opcje po??czenia" +FONT 8, "Tahoma" +BEGIN + LTEXT "Wprowadf port COM (np. COM1):",IDC_STATIC,7,7,108,8 + EDITTEXT IDC_COMPORT,7,17,182,14,ES_AUTOHSCROLL + LTEXT "Wprowadf szybko£µ portu w baudach (np. 115200):",IDC_STATIC,7,38,114, + 8 + EDITTEXT IDC_BAUTRATE,7,48,182,14,ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,45,79,50,14 + PUSHBUTTON "Cofnij",IDCANCEL,100,79,50,14 +END + +IDD_CAPTURE DIALOG DISCARDABLE 0, 0, 251, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Przechwyµ plik" +FONT 8, "Tahoma" +BEGIN + LTEXT "Nazwa pliku zrzutu:",IDC_STATIC,7,17,62,8 + EDITTEXT IDC_CAPTUREFILENAME,7,26,181,14,ES_AUTOHSCROLL + PUSHBUTTON "Przeg&l?daj",IDC_BROWSE,194,26,50,14 + DEFPUSHBUTTON "OK",IDOK,139,74,50,14 + PUSHBUTTON "Cofnij",IDCANCEL,194,74,50,14 +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "fdebug" + IDS_HELLO "Hello World!" + IDC_FDEBUG "FDEBUG" +END + +STRINGTABLE DISCARDABLE +BEGIN + + IDS_LICENSE "Ten program nale?y do wolnego oprogramowania; mo?esz go rozpowszechniaµ i/lub modyfikowaµ w zgodzie z zasadami licencji GNU GPL w formie w jakiej zosta?y opublikowane przez fundacjÛ Free Software Foundation; albo w wersji drugiej Licencji albo (tu masz wyb¾r) w jakiejkolwiek p¾fniejszej wersji.\r\n\r\nRozpowszechniaj?c ten program mamy nadziejÛ, ?e bÛdzie u?yteczny, ale BEZ »ADNEJ GWARANCJI; nawet bez zak?adanej gwarancji HANDLOWOîCI a w szczeg¾lnym przypadku zdatno£ci. Aby poznaµ wiÛcej szczeg¾?¾w zajrzyj do licencji GNU.\r\n\r\nKopia licencji GNU GPL powinna byµ dostarczona razem z tym programem; je£li tak nie jest, napisz list do funfacji na adres: Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." + + END + +#endif // English (U.S.) resources +/////////////////////////////////////////////////////////////////////// ////// + + + +#ifndef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +/////////////////////////////////////////////////////////////////////// ////// +#endif // not APSTUDIO_INVOKED + _____ Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.rc --- trunk/reactos/boot/freeldr/fdebug/fdebug.rc 2005-11-20 15:43:38 UTC (rev 19373) +++ trunk/reactos/boot/freeldr/fdebug/fdebug.rc 2005-11-20 15:50:47 UTC (rev 19374) @@ -17,4 +17,4 @@ #include "En.rc" #include "Ja.rc" - +#include "Pl.rc"

18 years, 10 months

[gvg] 19373: Revert to Wine code to facilitate future syncs. Thanks to Thomas for making

by gvg＠svn.reactos.com

Revert to Wine code to facilitate future syncs. Thanks to Thomas for making this possible. Modified: trunk/reactos/lib/crypt32/cert.c Deleted: trunk/reactos/lib/crypt32/crypt32.def Modified: trunk/reactos/lib/crypt32/crypt32.xml Modified: trunk/reactos/lib/crypt32/encode.c Modified: trunk/reactos/lib/crypt32/main.c Deleted: trunk/reactos/lib/crypt32/precomp.h Modified: trunk/reactos/lib/crypt32/protectdata.c _____ Modified: trunk/reactos/lib/crypt32/cert.c --- trunk/reactos/lib/crypt32/cert.c 2005-11-20 15:27:07 UTC (rev 19372) +++ trunk/reactos/lib/crypt32/cert.c 2005-11-20 15:43:38 UTC (rev 19373) @@ -1,6 +1,5 @@ /* - * Copyright 2002 - Mike McCormack for CodeWeavers + * Copyright 2002 Mike McCormack for CodeWeavers * Copyright 2004,2005 Juan Lang * * This library is free software; you can redistribute it and/or @@ -28,18 +27,20 @@ * registering and enumerating physical stores and locations.) * - Many flags, options and whatnot are unimplemented. */ +#include <assert.h> +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "winreg.h" +#include "winuser.h" +#include "wincrypt.h" +#include "wine/debug.h" +#include "wine/list.h" +#include "excpt.h" +#include "wine/exception.h" +#include "crypt32_private.h" -#include "precomp.h" - -#define NONAMELESSUNION - -static _SEH_FILTER(page_fault) -{ - if (_SEH_GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) - return _SEH_EXECUTE_HANDLER; - return _SEH_CONTINUE_SEARCH; -} - WINE_DEFAULT_DEBUG_CHANNEL(crypt); #define WINE_CRYPTCERTSTORE_MAGIC 0x74726563 @@ -313,14 +314,12 @@ DWORD cbElement, DWORD dwContextTypeFlags, DWORD *pdwContentType); /* filter for page-fault exceptions */ -/* static WINE_EXCEPTION_FILTER(page_fault) { if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) return EXCEPTION_EXECUTE_HANDLER; return EXCEPTION_CONTINUE_SEARCH; } -*/ static void CRYPT_InitStore(WINECRYPT_CERTSTORE *store, HCRYPTPROV hCryptProv, DWORD dwFlags, CertStoreType type) @@ -341,7 +340,6 @@ * be a PWINE_CERT_CONTEXT, and increments pCertContext's reference count. * Also sets the hCertStore member of the reference to store. */ - static void CRYPT_InitCertRef(PWINE_CERT_CONTEXT_REF ref, PWINE_CERT_CONTEXT context, HCERTSTORE store) { @@ -2664,7 +2662,7 @@ return NULL; } - _SEH_TRY + __TRY { const WINE_CONTEXT_INTERFACE *contextInterface = NULL; const WINE_CERT_PROP_HEADER *hdr = NULL; @@ -2821,12 +2819,12 @@ } } } - _SEH_EXCEPT(page_fault) + __EXCEPT(page_fault) { SetLastError(STATUS_ACCESS_VIOLATION); context = NULL; } - _SEH_END + __ENDTRY return context; } @@ -3313,15 +3311,6 @@ return ret; } -BOOL WINAPI CryptEncryptMessage( PCRYPT_ENCRYPT_MESSAGE_PARA pEncryptMessagePara, - DWORD dwCert, PCCERT_CONTEXT pccertCert[], - const BYTE* pbEncrypted, DWORD dwEncrypted, - BYTE* pbBlob, DWORD* dwEncryptedBlob) -{ - UNIMPLEMENTED; - return FALSE; -} - HCRYPTOIDFUNCSET WINAPI CryptInitOIDFunctionSet(LPCSTR pszFuncName, DWORD dwFlags) { FIXME("stub: %s %lx\n", debugstr_a(pszFuncName), dwFlags); @@ -3334,42 +3323,3 @@ FIXME("stub: %lx %s %s\n", dwEncodingType, debugstr_a(pszFuncName), debugstr_w(pwszDll)); return FALSE; } - -DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, - DWORD dwType, DWORD dwFlags, - LPVOID pvType, LPWSTR pszName, - DWORD dwName) -{ - UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; -} - -DWORD WINAPI CertGetNameStringA(PCCERT_CONTEXT pCertContext, - DWORD dwType, DWORD dwFlags, - LPVOID pvType, LPSTR pszName, - DWORD dwName) -{ - UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; -} - - -DWORD WINAPI CertNameToStrA(DWORD dwCertEncoding, - PCERT_NAME_BLOB pCertName, - DWORD dwType, LPSTR psz, - DWORD dwSZ) -{ - UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; -} - -DWORD WINAPI CertNameToStrW(DWORD dwCertEncoding, - PCERT_NAME_BLOB pCertName, - DWORD dwType, LPWSTR psz, - DWORD dwSZ) -{ - UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; -} - - _____ Deleted: trunk/reactos/lib/crypt32/crypt32.def --- trunk/reactos/lib/crypt32/crypt32.def 2005-11-20 15:27:07 UTC (rev 19372) +++ trunk/reactos/lib/crypt32/crypt32.def 2005-11-20 15:43:38 UTC (rev 19373) @@ -1,105 +0,0 @@ -LIBRARY CRYPT32.DLL -EXPORTS - -CertAddEncodedCRLToStore@24 @1022 - -CertAddSerializedElementToStore@32 @1028 -CertAddStoreToCollection@16 @1029 -CertAlgIdToOID@4 @1030 -CertCloseStore@8 @1031 - -CertDeleteCRLFromStore@4 @1044 - -CertDeleteCertificateFromStore@4 @1046 - -CertFindAttribute@12 @1062 - -CertFindCertificateInStore@24 @1066 - -CertFindExtension@12 @1068 -CertFindRDNAttr@8 @1069 - -CertFreeCRLContext@4 @1072 -CertFreeCTLContext@4 @1073 - -CertFreeCertificateContext@4 @1076 - -CertGetCTLContextProperty@16 @1079 - -CertGetCertificateContextProperty@16 @1081 - -CertGetNameStringA@24 @1085 -CertGetNameStringW@24 @1086 - -CertNameToStrA@20 @1093 -CertNameToStrW@20 @1094 -CertOIDToAlgId@4 @1095 - -CertOpenSystemStoreA@8 @1097 -CertOpenSystemStoreW@8 @1098 - -CertRemoveStoreFromCollection@8 @1104 - -CertSerializeCTLStoreElement@16 @1108 -CertSerializeCertificateStoreElement@16 @1109 - -CertSetCTLContextProperty@16 @1111 -CertSetCertificateContextProperty@16 @1113 - -CertVerifyTimeValidity@8 @1126 - -CryptDecodeObjectEx@32 @1138 - -CryptEncodeObject@20 @1141 - -CryptEncryptMessage@28 @1143 - -CryptExportPublicKeyInfo@20 @1149 -CryptExportPublicKeyInfoEx@32 @1150 - -CryptGetOIDFunctionValue@28 @1163 -CryptHashCertificate@28 @1164 - -CryptImportPublicKeyInfo@16 @1169 -CryptImportPublicKeyInfoEx@28 @1170 - -CryptMemAlloc@4 @1175 -CryptMemFree@4 @1176 -CryptMemRealloc@8 @1177 - -CryptProtectData@28 @1193 - -CryptRegisterDefaultOIDFunction@16 @1195 -CryptRegisterOIDFunction@20 @1196 - -CryptSIPAddProvider@4 @1198 - -CryptSIPLoad@12 @1201 -CryptSIPRemoveProvider@4 @1203 - -CryptSIPRetrieveSubjectGuid@12 @1205 - -CryptSetOIDFunctionValue@28 @1210 - -CryptSignCertificate@36 @1214 - -CryptUnprotectData@28 @1221 - -CryptUnregisterOIDFunction@12 @1223 - -CryptVerifyCertificateSignature@20 -CryptVerifyCertificateSignatureEx@32 @1226 - -I_CryptCreateLruCache@8 @1240 - -I_CryptDetachTls@4 @1242 - -I_CryptFindLruEntryData@4 @1247 - -I_CryptFlushLruCache@4 @1249 -I_CryptFreeLruCache@4 @1250 -I_CryptFreeTls@8 @1251 - -I_CryptGetTls@4 @1260 - -I_CryptSetTls@8 @1268 \ No newline at end of file _____ Modified: trunk/reactos/lib/crypt32/crypt32.xml --- trunk/reactos/lib/crypt32/crypt32.xml 2005-11-20 15:27:07 UTC (rev 19372) +++ trunk/reactos/lib/crypt32/crypt32.xml 2005-11-20 15:43:38 UTC (rev 19373) @@ -1,9 +1,9 @@ <module name="crypt32" type="win32dll" baseaddress="${BASEADDRESS_CRYPT32}" installbase="system32" installname="crypt32.dll"> - <importlibrary definition="crypt32.def" /> + <importlibrary definition="crypt32.spec.def" /> <include base="crypt32">.</include> + <include base="ReactOS">include/wine</include> <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x501</define> - <library>pseh</library> <library>ntdll</library> <library>kernel32</library> <library>wine</library> @@ -13,5 +13,5 @@ <file>cert.c</file> <file>protectdata.c</file> <file>crypt32.rc</file> - <pch>precomp.h</pch> + <file>crypt32.spec</file> </module> _____ Modified: trunk/reactos/lib/crypt32/encode.c --- trunk/reactos/lib/crypt32/encode.c 2005-11-20 15:27:07 UTC (rev 19372) +++ trunk/reactos/lib/crypt32/encode.c 2005-11-20 15:43:38 UTC (rev 19373) @@ -31,15 +31,21 @@ * MSDN, especially: * http://msdn.microsoft.com/library/en-us/seccrypto/security/constants_for _cryptencodeobject_and_cryptdecodeobject.asp */ +#include <assert.h> +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> -#include "precomp.h" +#define NONAMELESSUNION -static _SEH_FILTER(page_fault) -{ - if (_SEH_GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) - return _SEH_EXECUTE_HANDLER; - return _SEH_CONTINUE_SEARCH; -} +#include "windef.h" +#include "winbase.h" +#include "excpt.h" +#include "wincrypt.h" +#include "winreg.h" +#include "snmp.h" +#include "wine/debug.h" +#include "wine/exception.h" /* This is a bit arbitrary, but to set some limit: */ #define MAX_ENCODED_LEN 0x02000000 @@ -47,7 +53,6 @@ /* a few asn.1 tags we need */ #define ASN_BOOL (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x01) #define ASN_BITSTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x03) -//#define ASN_OCTETSTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x04) #define ASN_ENUMERATED (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x0a) #define ASN_SETOF (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x11) #define ASN_NUMERICSTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x12) @@ -168,6 +173,14 @@ DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo); +/* filter for page-fault exceptions */ +static WINE_EXCEPTION_FILTER(page_fault) +{ + if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) + return EXCEPTION_EXECUTE_HANDLER; + return EXCEPTION_CONTINUE_SEARCH; +} + static char *CRYPT_GetKeyName(DWORD dwEncodingType, LPCSTR pszFuncName, LPCSTR pszOID) { @@ -716,7 +729,7 @@ { BOOL ret; - _SEH_TRY + __TRY { const CERT_PUBLIC_KEY_INFO *info = (const CERT_PUBLIC_KEY_INFO *)pvStructInfo; @@ -731,12 +744,12 @@ sizeof(items) / sizeof(items[0]), dwFlags, pEncodePara, pbEncoded, pcbEncoded); } - _SEH_EXCEPT(page_fault) + __EXCEPT(page_fault) { SetLastError(STATUS_ACCESS_VIOLATION); ret = FALSE; } - _SEH_END + __ENDTRY return ret; } @@ -746,7 +759,7 @@ { BOOL ret; - _SEH_TRY + __TRY { const CERT_SIGNED_CONTENT_INFO *info = (const CERT_SIGNED_CONTENT_INFO *)pvStructInfo; @@ -762,12 +775,12 @@ sizeof(items) / sizeof(items[0]), dwFlags, pEncodePara, pbEncoded, pcbEncoded); } - _SEH_EXCEPT(page_fault) + __EXCEPT(page_fault) { SetLastError(STATUS_ACCESS_VIOLATION); ret = FALSE; } - _SEH_END + __ENDTRY return ret; } @@ -781,7 +794,7 @@ { BOOL ret; - _SEH_TRY + __TRY { const CERT_INFO *info = (const CERT_INFO *)pvStructInfo; struct AsnEncodeSequenceItem items[10] = { @@ -831,12 +844,12 @@ ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, cItem, dwFlags, pEncodePara, pbEncoded, pcbEncoded); } - _SEH_EXCEPT(page_fault) + __EXCEPT(page_fault) { SetLastError(STATUS_ACCESS_VIOLATION); ret = FALSE; } - _SEH_END + __ENDTRY return ret; } @@ -941,7 +954,7 @@ { BOOL ret; - _SEH_TRY + __TRY { const CRL_INFO *info = (const CRL_INFO *)pvStructInfo; struct AsnEncodeSequenceItem items[7] = { @@ -975,12 +988,12 @@ ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, cItem, dwFlags, pEncodePara, pbEncoded, pcbEncoded); } - _SEH_EXCEPT(page_fault) + __EXCEPT(page_fault) { SetLastError(STATUS_ACCESS_VIOLATION); ret = FALSE; } - _SEH_END + __ENDTRY return ret; } @@ -1019,7 +1032,7 @@ { BOOL ret; - _SEH_TRY + __TRY { DWORD bytesNeeded, dataLen, lenBytes, i; const CERT_EXTENSIONS *exts = (const CERT_EXTENSIONS *)pvStructInfo; @@ -1059,12 +1072,12 @@ } } } - _SEH_EXCEPT(page_fault) + __EXCEPT(page_fault) { SetLastError(STATUS_ACCESS_VIOLATION); ret = FALSE; } - _SEH_END + __ENDTRY return ret; } @@ -1308,7 +1321,7 @@ BOOL ret; CRYPT_DER_BLOB *blobs = NULL; - _SEH_TRY + __TRY { DWORD bytesNeeded = 0, lenBytes, i; @@ -1376,12 +1389,12 @@ CryptMemFree(blobs[i].pbData); } } - _SEH_EXCEPT(page_fault) + __EXCEPT(page_fault) { SetLastError(STATUS_ACCESS_VIOLATION); return FALSE; } - _SEH_END + __ENDTRY CryptMemFree(blobs); return ret; } @@ -1392,7 +1405,7 @@ { BOOL ret; - _SEH_TRY + __TRY { const CERT_NAME_INFO *info = (const CERT_NAME_INFO *)pvStructInfo; DWORD bytesNeeded = 0, lenBytes, size, i; @@ -1438,12 +1451,12 @@ } } } - _SEH_EXCEPT(page_fault) + __EXCEPT(page_fault) { SetLastError(STATUS_ACCESS_VIOLATION); ret = FALSE; } - _SEH_END + __ENDTRY return ret; } @@ -1490,15 +1503,15 @@ case CERT_ALT_NAME_RFC822_NAME: case CERT_ALT_NAME_DNS_NAME: case CERT_ALT_NAME_URL: - if (entry->pwszURL) + if (entry->u.pwszURL) { DWORD i; /* Not + 1: don't encode the NULL-terminator */ - dataLen = lstrlenW(entry->pwszURL); + dataLen = lstrlenW(entry->u.pwszURL); for (i = 0; ret && i < dataLen; i++) { - if (entry->pwszURL[i] > 0x7f) + if (entry->u.pwszURL[i] > 0x7f) { SetLastError(CRYPT_E_INVALID_IA5_STRING); ret = FALSE; @@ -1510,7 +1523,7 @@ dataLen = 0; break; case CERT_ALT_NAME_IP_ADDRESS: - dataLen = entry->IPAddress.cbData; + dataLen = entry->u.IPAddress.cbData; break; case CERT_ALT_NAME_REGISTERED_ID: /* FIXME: encode OID */ @@ -1550,11 +1563,11 @@ DWORD i; for (i = 0; i < dataLen; i++) - *pbEncoded++ = (BYTE)entry->pwszURL[i]; + *pbEncoded++ = (BYTE)entry->u.pwszURL[i]; break; } case CERT_ALT_NAME_IP_ADDRESS: - memcpy(pbEncoded, entry->IPAddress.pbData, dataLen); + memcpy(pbEncoded, entry->u.IPAddress.pbData, dataLen); break; } if (ret) @@ -1571,7 +1584,7 @@ { BOOL ret; - _SEH_TRY + __TRY { const CERT_ALT_NAME_INFO *info = (const CERT_ALT_NAME_INFO *)pvStructInfo; @@ -1635,12 +1648,12 @@ } } } - _SEH_EXCEPT(page_fault) + __EXCEPT(page_fault) { SetLastError(STATUS_ACCESS_VIOLATION); ret = FALSE; } - _SEH_END + __ENDTRY return ret; } @@ -1650,7 +1663,7 @@ { BOOL ret; - _SEH_TRY + __TRY { const CERT_BASIC_CONSTRAINTS2_INFO *info = (const CERT_BASIC_CONSTRAINTS2_INFO *)pvStructInfo; @@ -1672,12 +1685,12 @@ ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, cItem, dwFlags, pEncodePara, pbEncoded, pcbEncoded); } - _SEH_EXCEPT(page_fault) + __EXCEPT(page_fault) { SetLastError(STATUS_ACCESS_VIOLATION); ret = FALSE; } - _SEH_END + __ENDTRY return ret; } @@ -1687,7 +1700,7 @@ { BOOL ret; - _SEH_TRY + __TRY { const BLOBHEADER *hdr = (const BLOBHEADER *)pvStructInfo; @@ -1713,12 +1726,12 @@ pcbEncoded); } } - _SEH_EXCEPT(page_fault) + __EXCEPT(page_fault) { SetLastError(STATUS_ACCESS_VIOLATION); ret = FALSE; } - _SEH_END + __ENDTRY return ret; } @@ -1728,7 +1741,7 @@ { BOOL ret; - _SEH_TRY + __TRY { const CRYPT_DATA_BLOB *blob = (const CRYPT_DATA_BLOB *)pvStructInfo; DWORD bytesNeeded, lenBytes; @@ -1758,12 +1771,12 @@ } } } - _SEH_EXCEPT(page_fault) + __EXCEPT(page_fault) { SetLastError(STATUS_ACCESS_VIOLATION); ret = FALSE; } - _SEH_END + __ENDTRY TRACE("returning %d (%08lx)\n", ret, GetLastError()); return ret; } @@ -1774,7 +1787,7 @@ { BOOL ret; - _SEH_TRY + __TRY { const CRYPT_BIT_BLOB *blob = (const CRYPT_BIT_BLOB *)pvStructInfo; DWORD bytesNeeded, lenBytes, dataBytes; @@ -1829,12 +1842,12 @@ } } } - _SEH_EXCEPT(page_fault) + __EXCEPT(page_fault) { SetLastError(STATUS_ACCESS_VIOLATION); ret = FALSE; } - _SEH_END + __ENDTRY return ret; } @@ -1844,7 +1857,7 @@ { BOOL ret; - _SEH_TRY + __TRY { const CRYPT_BIT_BLOB *blob = (const CRYPT_BIT_BLOB *)pvStructInfo; CRYPT_BIT_BLOB newBlob = { blob->cbData, NULL, blob->cUnusedBits }; @@ -1868,12 +1881,12 @@ &newBlob, dwFlags, pEncodePara, pbEncoded, pcbEncoded); CryptMemFree(newBlob.pbData); } - _SEH_EXCEPT(page_fault) + __EXCEPT(page_fault) { SetLastError(STATUS_ACCESS_VIOLATION); ret = FALSE; } - _SEH_END + __ENDTRY return ret; } @@ -1893,7 +1906,7 @@ { BOOL ret; - _SEH_TRY + __TRY { DWORD significantBytes, lenBytes; BYTE padByte = 0, bytesNeeded; @@ -1967,12 +1980,12 @@ } } } - _SEH_EXCEPT(page_fault) + __EXCEPT(page_fault) { SetLastError(STATUS_ACCESS_VIOLATION); ret = FALSE; } - _SEH_END + __ENDTRY return ret; } @@ -1982,7 +1995,7 @@ { BOOL ret; - _SEH_TRY + __TRY { DWORD significantBytes, lenBytes; BYTE bytesNeeded; @@ -2038,12 +2051,12 @@ } } } - _SEH_EXCEPT(page_fault) + __EXCEPT(page_fault) { SetLastError(STATUS_ACCESS_VIOLATION); ret = FALSE; } - _SEH_END + __ENDTRY return ret; } @@ -2074,7 +2087,7 @@ { BOOL ret; - _SEH_TRY + __TRY { SYSTEMTIME sysTime; /* sorry, magic number: enough for tag, len, YYMMDDHHMMSSZ\0. I use a @@ -2117,12 +2130,12 @@ } } } - _SEH_EXCEPT(page_fault) + __EXCEPT(page_fault) { SetLastError(STATUS_ACCESS_VIOLATION); ret = FALSE; } - _SEH_END + __ENDTRY return ret; } @@ -2132,7 +2145,7 @@ { BOOL ret; - _SEH_TRY + __TRY { SYSTEMTIME sysTime; /* sorry, magic number: enough for tag, len, YYYYMMDDHHMMSSZ\0. I use a @@ -2166,12 +2179,12 @@ } } } - _SEH_EXCEPT(page_fault) + __EXCEPT(page_fault) { SetLastError(STATUS_ACCESS_VIOLATION); ret = FALSE; } - _SEH_END + __ENDTRY return ret; } @@ -2181,7 +2194,7 @@ { BOOL ret; - _SEH_TRY + __TRY { SYSTEMTIME sysTime; @@ -2196,12 +2209,12 @@ lpszStructType, pvStructInfo, dwFlags, pEncodePara, pbEncoded, pcbEncoded); } - _SEH_EXCEPT(page_fault) + __EXCEPT(page_fault) { SetLastError(STATUS_ACCESS_VIOLATION); ret = FALSE; } - _SEH_END + __ENDTRY return ret; } @@ -2211,7 +2224,7 @@ { BOOL ret; - _SEH_TRY + __TRY { DWORD bytesNeeded, dataLen, lenBytes, i; const CRYPT_SEQUENCE_OF_ANY *seq = @@ -2245,12 +2258,12 @@ } } } - _SEH_EXCEPT(page_fault) + __EXCEPT(page_fault) { SetLastError(STATUS_ACCESS_VIOLATION); ret = FALSE; } - _SEH_END + __ENDTRY return ret; } @@ -2823,7 +2836,7 @@ TRACE("%p, %ld, %08lx, %p, %p, %ld\n", pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, *pcbStructInfo); - _SEH_TRY + __TRY { struct AsnDecodeSequenceItem items[] = { { offsetof(CERT_SIGNED_CONTENT_INFO, ToBeSigned), @@ -2844,12 +2857,12 @@ sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, NULL); } - _SEH_EXCEPT(page_fault) + __EXCEPT(page_fault) { SetLastError(STATUS_ACCESS_VIOLATION); ret = FALSE; } - _SEH_END + __ENDTRY return ret; } @@ -2935,7 +2948,7 @@ TRACE("%p, %ld, %08lx, %p, %p, %ld\n", pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, *pcbStructInfo); - _SEH_TRY + __TRY { struct AsnDecodeSequenceItem items[] = { { offsetof(CERT_INFO, dwVersion), CRYPT_AsnDecodeCertVersion, @@ -2972,12 +2985,12 @@ sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, NULL); } - _SEH_EXCEPT(page_fault) + __EXCEPT(page_fault) { SetLastError(STATUS_ACCESS_VIOLATION); ret = FALSE; } - _SEH_END + __ENDTRY return ret; } @@ -3124,7 +3137,7 @@ TRACE("%p, %ld, %08lx, %p, %p, %ld\n", pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, *pcbStructInfo); - _SEH_TRY + __TRY { struct AsnDecodeSequenceItem items[] = { { offsetof(CRL_INFO, dwVersion), CRYPT_AsnDecodeCertVersion, @@ -3152,12 +3165,12 @@ sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, NULL); } - _SEH_EXCEPT(page_fault) + __EXCEPT(page_fault) { SetLastError(STATUS_ACCESS_VIOLATION); ret = FALSE; } - _SEH_END + __ENDTRY TRACE("Returning %d (%08lx)\n", ret, GetLastError()); return ret; @@ -3323,7 +3336,7 @@ { BOOL ret = TRUE; - _SEH_TRY + __TRY { ret = CRYPT_AsnDecodeExtensionsInternal(dwCertEncodingType, lpszStructType, pbEncoded, cbEncoded, @@ -3348,12 +3361,12 @@ } } } - _SEH_EXCEPT(page_fault) + __EXCEPT(page_fault) { SetLastError(STATUS_ACCESS_VIOLATION); ret = FALSE; } - _SEH_END + __ENDTRY return ret; } @@ -3366,7 +3379,7 @@ TRACE("%p, %ld, %08lx, %p, %ld\n", pbEncoded, cbEncoded, dwFlags, pszObjId, *pcbObjId); - _SEH_TRY + __TRY { if (pbEncoded[0] == ASN_OBJECTIDENTIFIER) { @@ -3463,12 +3476,12 @@ ret = FALSE; } } - _SEH_EXCEPT(page_fault) + __EXCEPT(page_fault) { SetLastError(STATUS_ACCESS_VIOLATION); ret = FALSE; } - _SEH_END + __ENDTRY return ret; } @@ -3481,7 +3494,7 @@ { BOOL ret = TRUE; - _SEH_TRY + __TRY { DWORD dataLen; @@ -3565,12 +3578,12 @@ } } } - _SEH_EXCEPT(page_fault) + __EXCEPT(page_fault) { SetLastError(STATUS_ACCESS_VIOLATION); ret = FALSE; } - _SEH_END + __ENDTRY return ret; } @@ -3582,7 +3595,7 @@ { BOOL ret; - _SEH_TRY + __TRY { if (pbEncoded[0] == (ASN_CONSTRUCTOR | ASN_SEQUENCE)) { @@ -3694,12 +3707,12 @@ ret = FALSE; } } - _SEH_EXCEPT(page_fault) + __EXCEPT(page_fault) { SetLastError(STATUS_ACCESS_VIOLATION); ret = FALSE; [truncated at 1000 lines; 626 more skipped]

18 years, 10 months

← Newer
1
...
39
40
41
42
43
44
45
...
88
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005