Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[weiden] 18799: no need to create a symbolic link in \??

by weiden＠svn.reactos.com

no need to create a symbolic link in \?? Modified: trunk/reactos/drivers/dd/beep/beep.c _____ Modified: trunk/reactos/drivers/dd/beep/beep.c --- trunk/reactos/drivers/dd/beep/beep.c 2005-10-27 20:00:27 UTC (rev 18798) +++ trunk/reactos/drivers/dd/beep/beep.c 2005-10-27 20:04:17 UTC (rev 18799) @@ -243,7 +243,6 @@ PDEVICE_EXTENSION DeviceExtension; PDEVICE_OBJECT DeviceObject; UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\Beep"); - UNICODE_STRING SymlinkName = RTL_CONSTANT_STRING(L"\\??\\Beep"); NTSTATUS Status; DPRINT("Beep Device Driver 0.0.3\n"); @@ -277,10 +276,6 @@ SynchronizationEvent, FALSE); - /* Create the dos device link */ - IoCreateSymbolicLink(&SymlinkName, - &DeviceName); - return(STATUS_SUCCESS); }

18 years, 11 months

[weiden] 18798: fix Beep() to make it work with xp's beep.sys

by weiden＠svn.reactos.com

fix Beep() to make it work with xp's beep.sys Modified: trunk/reactos/lib/kernel32/misc/error.c _____ Modified: trunk/reactos/lib/kernel32/misc/error.c --- trunk/reactos/lib/kernel32/misc/error.c 2005-10-27 19:42:06 UTC (rev 18797) +++ trunk/reactos/lib/kernel32/misc/error.c 2005-10-27 20:00:27 UTC (rev 18798) @@ -42,34 +42,74 @@ Beep (DWORD dwFreq, DWORD dwDuration) { HANDLE hBeep; + UNICODE_STRING BeepDevice; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; BEEP_SET_PARAMETERS BeepSetParameters; - DWORD dwReturned; + NTSTATUS Status; - hBeep = CreateFileW(L"\\\\.\\Beep", - FILE_GENERIC_READ | FILE_GENERIC_WRITE, - 0, - NULL, - OPEN_EXISTING, - 0, - NULL); - if (hBeep == INVALID_HANDLE_VALUE) - return FALSE; + /* check the parameters */ + if ((dwFreq >= 0x25 && dwFreq <= 0x7FFF) || + (dwFreq == 0x0 && dwDuration == 0x0)) + { + /* open the device */ + RtlInitUnicodeString(&BeepDevice, + L"\\Device\\Beep"); - /* Set beep data */ - BeepSetParameters.Frequency = dwFreq; - BeepSetParameters.Duration = dwDuration; + InitializeObjectAttributes(&ObjectAttributes, + &BeepDevice, + 0, + NULL, + NULL); - DeviceIoControl(hBeep, - IOCTL_BEEP_SET, - &BeepSetParameters, - sizeof(BEEP_SET_PARAMETERS), - NULL, - 0, - &dwReturned, - NULL); + Status = NtCreateFile(&hBeep, + FILE_READ_DATA | FILE_WRITE_DATA, + &ObjectAttributes, + &IoStatusBlock, + NULL, + 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_OPEN_IF, + 0, + NULL, + 0); + if (NT_SUCCESS(Status)) + { + /* Set beep data */ + BeepSetParameters.Frequency = dwFreq; + BeepSetParameters.Duration = dwDuration; - CloseHandle (hBeep); + Status = NtDeviceIoControlFile(hBeep, + NULL, + NULL, + NULL, + &IoStatusBlock, + IOCTL_BEEP_SET, + &BeepSetParameters, + sizeof(BEEP_SET_PARAMETERS), + NULL, + 0); + /* do an alertable wait if necessary */ + if (NT_SUCCESS(Status) && + (dwFreq != 0x0 || dwDuration != 0x0) && dwDuration != (DWORD)-1) + { + SleepEx(dwDuration, + TRUE); + } + + NtClose(hBeep); + } + } + else + Status = STATUS_INVALID_PARAMETER; + + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus (Status); + return FALSE; + } + return TRUE; }

18 years, 11 months

[cwittich] 18797: renamed some .S files (msvc fix)

by cwittich＠svn.reactos.com

renamed some .S files (msvc fix) Deleted: trunk/reactos/lib/string/i386/memchr.s Added: trunk/reactos/lib/string/i386/memchr_asm.s Deleted: trunk/reactos/lib/string/i386/memcpy.s Added: trunk/reactos/lib/string/i386/memcpy_asm.s Deleted: trunk/reactos/lib/string/i386/memmove.s Added: trunk/reactos/lib/string/i386/memmove_asm.s Deleted: trunk/reactos/lib/string/i386/memset.s Added: trunk/reactos/lib/string/i386/memset_asm.s Deleted: trunk/reactos/lib/string/i386/strcat.s Added: trunk/reactos/lib/string/i386/strcat_asm.s Deleted: trunk/reactos/lib/string/i386/strchr.s Added: trunk/reactos/lib/string/i386/strchr_asm.s Deleted: trunk/reactos/lib/string/i386/strcmp.s Added: trunk/reactos/lib/string/i386/strcmp_asm.s Deleted: trunk/reactos/lib/string/i386/strcpy.s Added: trunk/reactos/lib/string/i386/strcpy_asm.s Deleted: trunk/reactos/lib/string/i386/strlen.s Added: trunk/reactos/lib/string/i386/strlen_asm.s Deleted: trunk/reactos/lib/string/i386/strncat.s Added: trunk/reactos/lib/string/i386/strncat_asm.s Deleted: trunk/reactos/lib/string/i386/strncmp.s Added: trunk/reactos/lib/string/i386/strncmp_asm.s Deleted: trunk/reactos/lib/string/i386/strncpy.s Added: trunk/reactos/lib/string/i386/strncpy_asm.s Deleted: trunk/reactos/lib/string/i386/strnlen.s Added: trunk/reactos/lib/string/i386/strnlen_asm.s Deleted: trunk/reactos/lib/string/i386/strrchr.s Added: trunk/reactos/lib/string/i386/strrchr_asm.s Deleted: trunk/reactos/lib/string/i386/wcscat.s Added: trunk/reactos/lib/string/i386/wcscat_asm.s Deleted: trunk/reactos/lib/string/i386/wcschr.s Added: trunk/reactos/lib/string/i386/wcschr_asm.s Deleted: trunk/reactos/lib/string/i386/wcscmp.s Added: trunk/reactos/lib/string/i386/wcscmp_asm.s Deleted: trunk/reactos/lib/string/i386/wcscpy.s Added: trunk/reactos/lib/string/i386/wcscpy_asm.s Deleted: trunk/reactos/lib/string/i386/wcslen.s Added: trunk/reactos/lib/string/i386/wcslen_asm.s Deleted: trunk/reactos/lib/string/i386/wcsncat.s Added: trunk/reactos/lib/string/i386/wcsncat_asm.s Deleted: trunk/reactos/lib/string/i386/wcsncmp.s Added: trunk/reactos/lib/string/i386/wcsncmp_asm.s Deleted: trunk/reactos/lib/string/i386/wcsncpy.s Added: trunk/reactos/lib/string/i386/wcsncpy_asm.s Deleted: trunk/reactos/lib/string/i386/wcsnlen.s Added: trunk/reactos/lib/string/i386/wcsnlen_asm.s Deleted: trunk/reactos/lib/string/i386/wcsrchr.s Added: trunk/reactos/lib/string/i386/wcsrchr_asm.s Modified: trunk/reactos/lib/string/string.xml _____ Deleted: trunk/reactos/lib/string/i386/memchr.s --- trunk/reactos/lib/string/i386/memchr.s 2005-10-27 19:33:42 UTC (rev 18796) +++ trunk/reactos/lib/string/i386/memchr.s 2005-10-27 19:42:06 UTC (rev 18797) @@ -1,31 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: lib/string/i386/memchr.s - */ - -/* - * void* memchr(const void* s, int c, size_t n) - */ - -.globl _memchr - -_memchr: - push %ebp - mov %esp,%ebp - push %edi - mov 0x8(%ebp),%edi - mov 0xc(%ebp),%eax - mov 0x10(%ebp),%ecx - cld - repne scasb - je .L1 - mov $1,%edi -.L1: - mov %edi,%eax - dec %eax - pop %edi - leave - ret - _____ Copied: trunk/reactos/lib/string/i386/memchr_asm.s (from rev 18795, trunk/reactos/lib/string/i386/memchr.s) _____ Deleted: trunk/reactos/lib/string/i386/memcpy.s --- trunk/reactos/lib/string/i386/memcpy.s 2005-10-27 19:33:42 UTC (rev 18796) +++ trunk/reactos/lib/string/i386/memcpy.s 2005-10-27 19:42:06 UTC (rev 18797) @@ -1,50 +0,0 @@ -/* - * $Id$ - */ - -/* - * void *memcpy (void *to, const void *from, size_t count) - */ - -.globl _memcpy - -_memcpy: - push %ebp - mov %esp,%ebp - push %esi - push %edi - mov 0x8(%ebp),%edi - mov 0xc(%ebp),%esi - mov 0x10(%ebp),%ecx - cld - cmp $16,%ecx - jb .L1 - mov %ecx,%edx - test $3,%edi - je .L2 -/* - * Make the destination dword aligned - */ - mov %edi,%ecx - and $3,%ecx - sub $5,%ecx - not %ecx - sub %ecx,%edx - rep movsb - mov %edx,%ecx -.L2: - shr $2,%ecx - rep movsl - mov %edx,%ecx - and $3,%ecx -.L1: - test %ecx,%ecx - je .L3 - rep movsb -.L3: - pop %edi - pop %esi - mov 0x8(%ebp),%eax - leave - ret - _____ Copied: trunk/reactos/lib/string/i386/memcpy_asm.s (from rev 18795, trunk/reactos/lib/string/i386/memcpy.s) _____ Deleted: trunk/reactos/lib/string/i386/memmove.s --- trunk/reactos/lib/string/i386/memmove.s 2005-10-27 19:33:42 UTC (rev 18796) +++ trunk/reactos/lib/string/i386/memmove.s 2005-10-27 19:42:06 UTC (rev 18797) @@ -1,116 +0,0 @@ -/* - * $Id$ - */ - -/* - * void *memmove (void *to, const void *from, size_t count) - */ - -.globl _memmove - -_memmove: - push %ebp - mov %esp,%ebp - - push %esi - push %edi - - mov 8(%ebp),%edi - mov 12(%ebp),%esi - mov 16(%ebp),%ecx - - cmp %esi,%edi - jbe .CopyUp - mov %ecx,%eax - add %esi,%eax - cmp %eax,%edi - jb .CopyDown - -.CopyUp: - cld - - cmp $16,%ecx - jb .L1 - mov %ecx,%edx - test $3,%edi - je .L2 -/* - * Make the destination dword aligned - */ - mov %edi,%ecx - and $3,%ecx - sub $5,%ecx - not %ecx - sub %ecx,%edx - rep movsb - mov %edx,%ecx -.L2: - shr $2,%ecx - rep movsl - mov %edx,%ecx - and $3,%ecx -.L1: - test %ecx,%ecx - je .L3 - rep movsb -.L3: - mov 16(%ebp),%eax - pop %edi - pop %esi - leave - ret - -.CopyDown: - std - - add %ecx,%edi - add %ecx,%esi - - cmp $16,%ecx - jb .L4 - mov %ecx,%edx - test $3,%edi - je .L5 - -/* - * Make the destination dword aligned - */ - mov %edi,%ecx - and $3,%ecx - sub %ecx,%edx - dec %esi - dec %edi - rep movsb - mov %edx,%ecx - - sub $3,%esi - sub $3,%edi -.L6: - shr $2,%ecx - rep movsl - mov %edx,%ecx - and $3,%ecx - je .L7 - add $3,%esi - add $3,%edi -.L8: - rep movsb -.L7: - cld - mov 8(%ebp),%eax - pop %edi - pop %esi - leave - ret -.L5: - sub $4,%edi - sub $4,%esi - jmp .L6 - -.L4: - test %ecx,%ecx - je .L7 - dec %esi - dec %edi - jmp .L8 - _____ Copied: trunk/reactos/lib/string/i386/memmove_asm.s (from rev 18795, trunk/reactos/lib/string/i386/memmove.s) _____ Deleted: trunk/reactos/lib/string/i386/memset.s --- trunk/reactos/lib/string/i386/memset.s 2005-10-27 19:33:42 UTC (rev 18796) +++ trunk/reactos/lib/string/i386/memset.s 2005-10-27 19:42:06 UTC (rev 18797) @@ -1,47 +0,0 @@ -/* - * $Id$ - */ - -/* - * void *memset (void *src, int val, size_t count) - */ - -.globl _memset - -_memset: - push %ebp - mov %esp,%ebp - push %edi - mov 0x8(%ebp),%edi - movzb 0xc(%ebp),%eax - mov 0x10(%ebp),%ecx - cld - cmp $16,%ecx - jb .L1 - mov $0x01010101,%edx - mul %edx - mov %ecx,%edx - test $3,%edi - je .L2 - mov %edi,%ecx - and $3,%ecx - sub $5,%ecx - not %ecx - sub %ecx,%edx - rep stosb - mov %edx,%ecx -.L2: - shr $2,%ecx - rep stosl - mov %edx,%ecx - and $3,%ecx -.L1: - test %ecx,%ecx - je .L3 - rep stosb -.L3: - pop %edi - mov 0x8(%ebp),%eax - leave - ret - _____ Copied: trunk/reactos/lib/string/i386/memset_asm.s (from rev 18795, trunk/reactos/lib/string/i386/memset.s) _____ Deleted: trunk/reactos/lib/string/i386/strcat.s --- trunk/reactos/lib/string/i386/strcat.s 2005-10-27 19:33:42 UTC (rev 18796) +++ trunk/reactos/lib/string/i386/strcat.s 2005-10-27 19:42:06 UTC (rev 18797) @@ -1,6 +0,0 @@ -/* $Id$ - */ - -#include "tcscat.h" - -/* EOF */ _____ Copied: trunk/reactos/lib/string/i386/strcat_asm.s (from rev 18795, trunk/reactos/lib/string/i386/strcat.s) _____ Deleted: trunk/reactos/lib/string/i386/strchr.s --- trunk/reactos/lib/string/i386/strchr.s 2005-10-27 19:33:42 UTC (rev 18796) +++ trunk/reactos/lib/string/i386/strchr.s 2005-10-27 19:42:06 UTC (rev 18797) @@ -1,6 +0,0 @@ -/* $Id$ - */ - -#include "tcschr.h" - -/* EOF */ _____ Copied: trunk/reactos/lib/string/i386/strchr_asm.s (from rev 18795, trunk/reactos/lib/string/i386/strchr.s) _____ Deleted: trunk/reactos/lib/string/i386/strcmp.s --- trunk/reactos/lib/string/i386/strcmp.s 2005-10-27 19:33:42 UTC (rev 18796) +++ trunk/reactos/lib/string/i386/strcmp.s 2005-10-27 19:42:06 UTC (rev 18797) @@ -1,6 +0,0 @@ -/* $Id$ - */ - -#include "tcscmp.h" - -/* EOF */ _____ Copied: trunk/reactos/lib/string/i386/strcmp_asm.s (from rev 18795, trunk/reactos/lib/string/i386/strcmp.s) _____ Deleted: trunk/reactos/lib/string/i386/strcpy.s --- trunk/reactos/lib/string/i386/strcpy.s 2005-10-27 19:33:42 UTC (rev 18796) +++ trunk/reactos/lib/string/i386/strcpy.s 2005-10-27 19:42:06 UTC (rev 18797) @@ -1,6 +0,0 @@ -/* $Id$ - */ - -#include "tcscpy.h" - -/* EOF */ _____ Copied: trunk/reactos/lib/string/i386/strcpy_asm.s (from rev 18795, trunk/reactos/lib/string/i386/strcpy.s) _____ Deleted: trunk/reactos/lib/string/i386/strlen.s --- trunk/reactos/lib/string/i386/strlen.s 2005-10-27 19:33:42 UTC (rev 18796) +++ trunk/reactos/lib/string/i386/strlen.s 2005-10-27 19:42:06 UTC (rev 18797) @@ -1,6 +0,0 @@ -/* $Id$ - */ - -#include "tcslen.h" - -/* EOF */ _____ Copied: trunk/reactos/lib/string/i386/strlen_asm.s (from rev 18795, trunk/reactos/lib/string/i386/strlen.s) _____ Deleted: trunk/reactos/lib/string/i386/strncat.s --- trunk/reactos/lib/string/i386/strncat.s 2005-10-27 19:33:42 UTC (rev 18796) +++ trunk/reactos/lib/string/i386/strncat.s 2005-10-27 19:42:06 UTC (rev 18797) @@ -1,6 +0,0 @@ -/* $Id$ - */ - -#include "tcsncat.h" - -/* EOF */ _____ Copied: trunk/reactos/lib/string/i386/strncat_asm.s (from rev 18795, trunk/reactos/lib/string/i386/strncat.s) _____ Deleted: trunk/reactos/lib/string/i386/strncmp.s --- trunk/reactos/lib/string/i386/strncmp.s 2005-10-27 19:33:42 UTC (rev 18796) +++ trunk/reactos/lib/string/i386/strncmp.s 2005-10-27 19:42:06 UTC (rev 18797) @@ -1,6 +0,0 @@ -/* $Id$ - */ - -#include "tcsncmp.h" - -/* EOF */ _____ Copied: trunk/reactos/lib/string/i386/strncmp_asm.s (from rev 18795, trunk/reactos/lib/string/i386/strncmp.s) _____ Deleted: trunk/reactos/lib/string/i386/strncpy.s --- trunk/reactos/lib/string/i386/strncpy.s 2005-10-27 19:33:42 UTC (rev 18796) +++ trunk/reactos/lib/string/i386/strncpy.s 2005-10-27 19:42:06 UTC (rev 18797) @@ -1,6 +0,0 @@ -/* $Id$ - */ - -#include "tcsncpy.h" - -/* EOF */ _____ Copied: trunk/reactos/lib/string/i386/strncpy_asm.s (from rev 18795, trunk/reactos/lib/string/i386/strncpy.s) _____ Deleted: trunk/reactos/lib/string/i386/strnlen.s --- trunk/reactos/lib/string/i386/strnlen.s 2005-10-27 19:33:42 UTC (rev 18796) +++ trunk/reactos/lib/string/i386/strnlen.s 2005-10-27 19:42:06 UTC (rev 18797) @@ -1,6 +0,0 @@ -/* $Id$ - */ - -#include "tcsnlen.h" - -/* EOF */ _____ Copied: trunk/reactos/lib/string/i386/strnlen_asm.s (from rev 18795, trunk/reactos/lib/string/i386/strnlen.s) _____ Deleted: trunk/reactos/lib/string/i386/strrchr.s --- trunk/reactos/lib/string/i386/strrchr.s 2005-10-27 19:33:42 UTC (rev 18796) +++ trunk/reactos/lib/string/i386/strrchr.s 2005-10-27 19:42:06 UTC (rev 18797) @@ -1,6 +0,0 @@ -/* $Id$ - */ - -#include "tcsrchr.h" - -/* EOF */ _____ Copied: trunk/reactos/lib/string/i386/strrchr_asm.s (from rev 18795, trunk/reactos/lib/string/i386/strrchr.s) _____ Deleted: trunk/reactos/lib/string/i386/wcscat.s --- trunk/reactos/lib/string/i386/wcscat.s 2005-10-27 19:33:42 UTC (rev 18796) +++ trunk/reactos/lib/string/i386/wcscat.s 2005-10-27 19:42:06 UTC (rev 18797) @@ -1,7 +0,0 @@ -/* $Id$ - */ - -#define _UNICODE -#include "tcscat.h" - -/* EOF */ _____ Copied: trunk/reactos/lib/string/i386/wcscat_asm.s (from rev 18795, trunk/reactos/lib/string/i386/wcscat.s) _____ Deleted: trunk/reactos/lib/string/i386/wcschr.s --- trunk/reactos/lib/string/i386/wcschr.s 2005-10-27 19:33:42 UTC (rev 18796) +++ trunk/reactos/lib/string/i386/wcschr.s 2005-10-27 19:42:06 UTC (rev 18797) @@ -1,7 +0,0 @@ -/* $Id$ - */ - -#define _UNICODE -#include "tcschr.h" - -/* EOF */ _____ Copied: trunk/reactos/lib/string/i386/wcschr_asm.s (from rev 18795, trunk/reactos/lib/string/i386/wcschr.s) _____ Deleted: trunk/reactos/lib/string/i386/wcscmp.s --- trunk/reactos/lib/string/i386/wcscmp.s 2005-10-27 19:33:42 UTC (rev 18796) +++ trunk/reactos/lib/string/i386/wcscmp.s 2005-10-27 19:42:06 UTC (rev 18797) @@ -1,7 +0,0 @@ -/* $Id$ - */ - -#define _UNICODE -#include "tcscmp.h" - -/* EOF */ _____ Copied: trunk/reactos/lib/string/i386/wcscmp_asm.s (from rev 18795, trunk/reactos/lib/string/i386/wcscmp.s) _____ Deleted: trunk/reactos/lib/string/i386/wcscpy.s --- trunk/reactos/lib/string/i386/wcscpy.s 2005-10-27 19:33:42 UTC (rev 18796) +++ trunk/reactos/lib/string/i386/wcscpy.s 2005-10-27 19:42:06 UTC (rev 18797) @@ -1,7 +0,0 @@ -/* $Id$ - */ - -#define _UNICODE -#include "tcscpy.h" - -/* EOF */ _____ Copied: trunk/reactos/lib/string/i386/wcscpy_asm.s (from rev 18795, trunk/reactos/lib/string/i386/wcscpy.s) _____ Deleted: trunk/reactos/lib/string/i386/wcslen.s --- trunk/reactos/lib/string/i386/wcslen.s 2005-10-27 19:33:42 UTC (rev 18796) +++ trunk/reactos/lib/string/i386/wcslen.s 2005-10-27 19:42:06 UTC (rev 18797) @@ -1,7 +0,0 @@ -/* $Id$ - */ - -#define _UNICODE -#include "tcslen.h" - -/* EOF */ _____ Copied: trunk/reactos/lib/string/i386/wcslen_asm.s (from rev 18795, trunk/reactos/lib/string/i386/wcslen.s) _____ Deleted: trunk/reactos/lib/string/i386/wcsncat.s --- trunk/reactos/lib/string/i386/wcsncat.s 2005-10-27 19:33:42 UTC (rev 18796) +++ trunk/reactos/lib/string/i386/wcsncat.s 2005-10-27 19:42:06 UTC (rev 18797) @@ -1,7 +0,0 @@ -/* $Id$ - */ - -#define _UNICODE -#include "tcsncat.h" - -/* EOF */ _____ Copied: trunk/reactos/lib/string/i386/wcsncat_asm.s (from rev 18795, trunk/reactos/lib/string/i386/wcsncat.s) _____ Deleted: trunk/reactos/lib/string/i386/wcsncmp.s --- trunk/reactos/lib/string/i386/wcsncmp.s 2005-10-27 19:33:42 UTC (rev 18796) +++ trunk/reactos/lib/string/i386/wcsncmp.s 2005-10-27 19:42:06 UTC (rev 18797) @@ -1,7 +0,0 @@ -/* $Id$ - */ - -#define _UNICODE -#include "tcsncmp.h" - -/* EOF */ _____ Copied: trunk/reactos/lib/string/i386/wcsncmp_asm.s (from rev 18795, trunk/reactos/lib/string/i386/wcsncmp.s) _____ Deleted: trunk/reactos/lib/string/i386/wcsncpy.s --- trunk/reactos/lib/string/i386/wcsncpy.s 2005-10-27 19:33:42 UTC (rev 18796) +++ trunk/reactos/lib/string/i386/wcsncpy.s 2005-10-27 19:42:06 UTC (rev 18797) @@ -1,7 +0,0 @@ -/* $Id$ - */ - -#define _UNICODE -#include "tcsncpy.h" - -/* EOF */ _____ Copied: trunk/reactos/lib/string/i386/wcsncpy_asm.s (from rev 18795, trunk/reactos/lib/string/i386/wcsncpy.s) _____ Deleted: trunk/reactos/lib/string/i386/wcsnlen.s --- trunk/reactos/lib/string/i386/wcsnlen.s 2005-10-27 19:33:42 UTC (rev 18796) +++ trunk/reactos/lib/string/i386/wcsnlen.s 2005-10-27 19:42:06 UTC (rev 18797) @@ -1,7 +0,0 @@ -/* $Id$ - */ - -#define _UNICODE -#include "tcsnlen.h" - -/* EOF */ _____ Copied: trunk/reactos/lib/string/i386/wcsnlen_asm.s (from rev 18795, trunk/reactos/lib/string/i386/wcsnlen.s) _____ Deleted: trunk/reactos/lib/string/i386/wcsrchr.s --- trunk/reactos/lib/string/i386/wcsrchr.s 2005-10-27 19:33:42 UTC (rev 18796) +++ trunk/reactos/lib/string/i386/wcsrchr.s 2005-10-27 19:42:06 UTC (rev 18797) @@ -1,7 +0,0 @@ -/* $Id$ - */ - -#define _UNICODE -#include "tcsrchr.h" - -/* EOF */ _____ Copied: trunk/reactos/lib/string/i386/wcsrchr_asm.s (from rev 18795, trunk/reactos/lib/string/i386/wcsrchr.s) _____ Modified: trunk/reactos/lib/string/string.xml --- trunk/reactos/lib/string/string.xml 2005-10-27 19:33:42 UTC (rev 18796) +++ trunk/reactos/lib/string/string.xml 2005-10-27 19:42:06 UTC (rev 18797) @@ -2,30 +2,30 @@ <define name="__NO_CTYPE_INLINES" /> <if property="ARCH" value="i386"> <directory name="i386"> - <file>memchr.s</file> - <file>memcpy.s</file> - <file>memmove.s</file> - <file>memset.s</file> - <file>strcat.s</file> - <file>strchr.s</file> - <file>strcmp.s</file> - <file>strcpy.s</file> - <file>strlen.s</file> - <file>strncat.s</file> - <file>strncmp.s</file> - <file>strncpy.s</file> - <file>strnlen.s</file> - <file>strrchr.s</file> - <file>wcscat.s</file> - <file>wcschr.s</file> - <file>wcscmp.s</file> - <file>wcscpy.s</file> - <file>wcslen.s</file> - <file>wcsncat.s</file> - <file>wcsncmp.s</file> - <file>wcsncpy.s</file> - <file>wcsnlen.s</file> - <file>wcsrchr.s</file> + <file>memchr_asm.s</file> + <file>memcpy_asm.s</file> + <file>memmove_asm.s</file> + <file>memset_asm.s</file> + <file>strcat_asm.s</file> + <file>strchr_asm.s</file> + <file>strcmp_asm.s</file> + <file>strcpy_asm.s</file> + <file>strlen_asm.s</file> + <file>strncat_asm.s</file> + <file>strncmp_asm.s</file> + <file>strncpy_asm.s</file> + <file>strnlen_asm.s</file> + <file>strrchr_asm.s</file> + <file>wcscat_asm.s</file> + <file>wcschr_asm.s</file> + <file>wcscmp_asm.s</file> + <file>wcscpy_asm.s</file> + <file>wcslen_asm.s</file> + <file>wcsncat_asm.s</file> + <file>wcsncmp_asm.s</file> + <file>wcsncpy_asm.s</file> + <file>wcsnlen_asm.s</file> + <file>wcsrchr_asm.s</file> </directory> </if> <ifnot property="ARCH" value="i386">

18 years, 11 months

[cwittich] 18796: renamed some .S files (msvc fix)

by cwittich＠svn.reactos.com

renamed some .S files (msvc fix) Deleted: trunk/reactos/ntoskrnl/ex/i386/interlck.S Added: trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S Deleted: trunk/reactos/ntoskrnl/ke/i386/main.S Added: trunk/reactos/ntoskrnl/ke/i386/main_asm.S Deleted: trunk/reactos/ntoskrnl/ke/i386/usercall.S Added: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml _____ Deleted: trunk/reactos/ntoskrnl/ex/i386/interlck.S --- trunk/reactos/ntoskrnl/ex/i386/interlck.S 2005-10-27 19:13:52 UTC (rev 18795) +++ trunk/reactos/ntoskrnl/ex/i386/interlck.S 2005-10-27 19:33:42 UTC (rev 18796) @@ -1,143 +0,0 @@ -/* $Id: interlck.c 15557 2005-05-28 07:26:38Z hbirr $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ex/i386/interlck.c - * PURPOSE: No purpose listed. - * - * PROGRAMMERS: No programmer listed. - */ - -#ifdef CONFIG_SMP -#define LOCK lock -#else -#define LOCK -#endif - -.global @Exfi386InterlockedIncrementLong@4 -@Exfi386InterlockedIncrementLong@4: - LOCK - addl $1,(%ecx) - lahf - andl $0xC000, %eax - ret - -.global @Exfi386InterlockedDecrementLong@4 -@Exfi386InterlockedDecrementLong@4: - LOCK - subl $1,(%ecx) - lahf - andl $0xC000, %eax - ret - -.global @Exfi386InterlockedExchangeUlong@8 -@Exfi386InterlockedExchangeUlong@8: - LOCK - xchgl %edx,(%ecx) - movl %edx,%eax - ret - -.global _Exi386InterlockedIncrementLong@4 -_Exi386InterlockedIncrementLong@4: - movl 4(%esp),%eax - LOCK - addl $1,(%eax) - lahf - andl $0xC000, %eax - ret $4 - -.global _Exi386InterlockedDecrementLong@4 -_Exi386InterlockedDecrementLong@4: - movl 4(%esp),%eax - LOCK - subl $1,(%eax) - lahf - andl $0xC000, %eax - ret $4 - -.global _Exi386InterlockedExchangeUlong@8 -_Exi386InterlockedExchangeUlong@8: - movl 4(%esp),%edx - movl 8(%esp),%eax - LOCK - xchgl %eax,(%edx) - ret $8 - -.global @InterlockedIncrement@4 -@InterlockedIncrement@4: - movl $1,%eax - LOCK - xaddl %eax,(%ecx) - incl %eax - ret - -.global @InterlockedDecrement@4 -@InterlockedDecrement@4: - movl $-1,%eax - LOCK - xaddl %eax,(%ecx) - decl %eax - ret - -.global @InterlockedExchange@8 -@InterlockedExchange@8: - LOCK - xchgl %edx,(%ecx) - movl %edx,%eax - ret - -.global @InterlockedExchangeAdd@8 -@InterlockedExchangeAdd@8: - LOCK - xaddl %edx,(%ecx) - movl %edx,%eax - ret - -.global @InterlockedClearBit@8 -@InterlockedClearBit@8: - LOCK - btr %edx,(%ecx) - setc %al - ret - -.global @InterlockedCompareExchange@12 -@InterlockedCompareExchange@12: - movl 4(%esp),%eax - LOCK - cmpxchg %edx,(%ecx) - ret $4 - -.global @ExfpInterlockedExchange64@8 -@ExfpInterlockedExchange64@8: - pushl %ebx - pushl %esi - movl %ecx,%esi - movl (%edx),%ebx - movl 4(%edx),%ecx -1: - movl (%esi),%eax - movl 4(%esi),%edx - LOCK - cmpxchg8b (%esi) - jnz 1b - popl %esi - popl %ebx - ret - -.global @ExfInterlockedCompareExchange64@12 -@ExfInterlockedCompareExchange64@12: - pushl %ebx - pushl %esi - movl %ecx,%esi - movl (%edx),%ebx - movl 4(%edx),%ecx - movl 12(%esp),%edx - movl (%edx),%eax - movl 4(%edx),%edx - LOCK - cmpxchg8b (%esi) - popl %esi - popl %ebx - ret $4 - -/* EOF */ _____ Copied: trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S (from rev 18795, trunk/reactos/ntoskrnl/ex/i386/interlck.S) _____ Deleted: trunk/reactos/ntoskrnl/ke/i386/main.S --- trunk/reactos/ntoskrnl/ke/i386/main.S 2005-10-27 19:13:52 UTC (rev 18795) +++ trunk/reactos/ntoskrnl/ke/i386/main.S 2005-10-27 19:33:42 UTC (rev 18796) @@ -1,47 +0,0 @@ -#include <roscfg.h> -#include <ndk/asm.h> -#include <ndk/i386/segment.h> - -#define AP_MAGIC (0x12481020) - -.globl _NtProcessStartup - -_NtProcessStartup: - - /* FIXME: Application processors should have their own GDT/IDT */ - lgdt _KiGdtDescriptor - lidt _KiIdtDescriptor - - /* Load the PCR selector */ - movl $PCR_SELECTOR, %eax - movl %eax, %fs - - cmpl $AP_MAGIC, %ecx - jne .m1 - - pushl $0 - popfl - - /* - * Reserve space for the floating point save area. - */ - subl $SIZEOF_FX_SAVE_AREA, %esp - - /* - * Call the application processor initialization code - */ - pushl $0 - call _KiSystemStartup - -.m1: - /* Load the initial kernel stack */ - lea _kernel_stack, %eax - add $0x1000, %eax - and $0xFFFFE000, %eax - add $(0x3000 - SIZEOF_FX_SAVE_AREA), %eax - movl %eax, %esp - - /* Call the main kernel initialization */ - pushl %edx - pushl %ecx - call __main _____ Copied: trunk/reactos/ntoskrnl/ke/i386/main_asm.S (from rev 18795, trunk/reactos/ntoskrnl/ke/i386/main.S) _____ Deleted: trunk/reactos/ntoskrnl/ke/i386/usercall.S --- trunk/reactos/ntoskrnl/ke/i386/usercall.S 2005-10-27 19:13:52 UTC (rev 18795) +++ trunk/reactos/ntoskrnl/ke/i386/usercall.S 2005-10-27 19:33:42 UTC (rev 18796) @@ -1,53 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ke/i386s/usercall.S - * PURPOSE: User-Mode callbacks and return. - * - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - */ - -/* INCLUDES ******************************************************************/ - -#include <roscfg.h> -.intel_syntax noprefix - -/* GLOBALS ****************************************************************/ -.extern PVOID _SystemDllCallbackDispatcher - -#define CBSTACK_BUFFER_ADDRESS 0x20 -#define CBSTACK_BUFFER_LENGTH 0x24 -/* FUNCTIONS ****************************************************************/ - -/*++ - * KiSwitchToUserMode - * - * The KiSwitchToUserMode routine sets up a Trap Frame and a Callback stack - * for the purpose of switching to user mode. The actual final jump is done - * by KiServiceExit which will treat this as a syscall return. - * - * Params: - * OutputBuffer - Pointer to a caller-allocated buffer where to receive - * the return data from the user-mode function - * - * OutputLength - Size of the Output Buffer described above. - * - * Returns: - * Jumps into KiServiceExit. - * - * Remarks: - * If there is not enough Kernel Stack space, the routine will increase the - * Kernel Stack. - * - * User mode execution resumes at ntdll!KiUserCallbackDispatcher. - * - * This call MUST be paired by interrupt 0x2B or NtCallbackReturn. - * - *--*/ -.globl _KiSwitchToUserMode@8 -.func KiSwitchToUserMode@8 -_KiSwitchToUserMode@8: - -.endfunc - - _____ Copied: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S (from rev 18795, trunk/reactos/ntoskrnl/ke/i386/usercall.S) _____ Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml --- trunk/reactos/ntoskrnl/ntoskrnl.xml 2005-10-27 19:13:52 UTC (rev 18795) +++ trunk/reactos/ntoskrnl/ntoskrnl.xml 2005-10-27 19:33:42 UTC (rev 18796) @@ -23,7 +23,7 @@ <directory name="ke"> <if property="ARCH" value="i386"> <directory name="i386"> - <file first="true">main.S</file> + <file first="true">main_asm.S</file> <file>bios.c</file> <file>brkpoint.S</file> <file>ctxswitch.S</file> @@ -41,7 +41,7 @@ <file>tlbflush.S</file> <file>trap.s</file> <file>tss.c</file> - <file>usercall.S</file> + <file>usercall_asm.S</file> <file>usertrap.c</file> <file>v86m.c</file> <file>v86m_sup.S</file> @@ -119,7 +119,7 @@ <file>atom.c</file> <if property="ARCH" value="i386"> <directory name="i386"> - <file>interlck.S</file> + <file>interlck_asm.S</file> </directory> </if> <file>callback.c</file>

18 years, 11 months

[cwittich] 18795: renamed .S files so msvc does not try to compile the .c files with the same name anymore

by cwittich＠svn.reactos.com

renamed .S files so msvc does not try to compile the .c files with the same name anymore Deleted: trunk/reactos/lib/rtl/i386/chkstk.s Added: trunk/reactos/lib/rtl/i386/chkstk_asm.s Deleted: trunk/reactos/lib/rtl/i386/debug.S Added: trunk/reactos/lib/rtl/i386/debug_asm.S Deleted: trunk/reactos/lib/rtl/i386/except.s Added: trunk/reactos/lib/rtl/i386/except_asm.s Deleted: trunk/reactos/lib/rtl/i386/math.S Added: trunk/reactos/lib/rtl/i386/math_asm.S Deleted: trunk/reactos/lib/rtl/i386/mem.S Added: trunk/reactos/lib/rtl/i386/mem_asm.S Deleted: trunk/reactos/lib/rtl/i386/random.S Added: trunk/reactos/lib/rtl/i386/random_asm.S Modified: trunk/reactos/lib/rtl/rtl.xml _____ Deleted: trunk/reactos/lib/rtl/i386/chkstk.s --- trunk/reactos/lib/rtl/i386/chkstk.s 2005-10-27 19:03:58 UTC (rev 18794) +++ trunk/reactos/lib/rtl/i386/chkstk.s 2005-10-27 19:13:52 UTC (rev 18795) @@ -1,66 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Stack checker - * FILE: lib/ntdll/rtl/i386/chkstk.s - * PROGRAMER: KJK::Hyperion <noog(a)libero.it> - */ - -.globl __chkstk -.globl __alloca_probe - -/* - _chkstk() is called by all stack allocations of more than 4 KB. It grows the - stack in areas of 4 KB each, trying to access each area. This ensures that the - guard page for the stack is hit, and the stack growing triggered - */ -__chkstk: -__alloca_probe: - -/* EAX = size to be allocated */ -/* save the ECX register */ - pushl %ecx - -/* ECX = top of the previous stack frame */ - leal 8(%esp), %ecx - -/* probe the desired memory, page by page */ - cmpl $0x1000, %eax - jge .l_MoreThanAPage - jmp .l_LessThanAPage - -.l_MoreThanAPage: - -/* raise the top of the stack by a page and probe */ - subl $0x1000, %ecx - testl %eax, 0(%ecx) - -/* loop if still more than a page must be probed */ - subl $0x1000, %eax - cmpl $0x1000, %eax - jge .l_MoreThanAPage - -.l_LessThanAPage: - -/* raise the top of the stack by EAX bytes (size % 4096) and probe */ - subl %eax, %ecx - testl %eax, 0(%ecx) - -/* EAX = top of the stack */ - movl %esp, %eax - -/* allocate the memory */ - movl %ecx, %esp - -/* restore ECX */ - movl 0(%eax), %ecx - -/* restore the return address */ - movl 4(%eax), %eax - pushl %eax - -/* return */ - ret - -/* EOF */ _____ Copied: trunk/reactos/lib/rtl/i386/chkstk_asm.s (from rev 18793, trunk/reactos/lib/rtl/i386/chkstk.s) _____ Deleted: trunk/reactos/lib/rtl/i386/debug.S --- trunk/reactos/lib/rtl/i386/debug.S 2005-10-27 19:03:58 UTC (rev 18794) +++ trunk/reactos/lib/rtl/i386/debug.S 2005-10-27 19:13:52 UTC (rev 18795) @@ -1,61 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Run-Time Library - * PURPOSE: Debug Routines - * FILE: lib/rtl/i386/debug.S - * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - */ - -.intel_syntax noprefix - -/* GLOBALS ****************************************************************/ - -.globl _DbgBreakPoint@0 -.globl _DbgBreakPointWithStatus@4 -.globl _DbgUserBreakPoint@0 -.globl _DebugService@20 - -/* FUNCTIONS ***************************************************************/ - -_DbgBreakPoint@0: -_DbgUserBreakPoint@0: - int 3 - ret - -_DbgBreakPointWithStatus@4: - mov eax, [esp+4] - int 3 - ret 4 - -_DebugService@20: - - /* Setup the stack */ - push ebp - mov ebp, esp - - /* Save the registers */ - push ecx - push ebx - push edi - push edi - push ebx - - /* Call the Interrupt */ - mov eax, [ebp+8] - mov ecx, [ebp+12] - mov edx, [ebp+16] - mov ebx, [ebp+20] - mov edi, [ebp+24] - int 0x2D - //int 3 - - /* Restore registers */ - pop ebx - pop edi - pop edi - pop ebx - - /* Return */ - leave - ret 20 - _____ Copied: trunk/reactos/lib/rtl/i386/debug_asm.S (from rev 18793, trunk/reactos/lib/rtl/i386/debug.S) _____ Deleted: trunk/reactos/lib/rtl/i386/except.s --- trunk/reactos/lib/rtl/i386/except.s 2005-10-27 19:03:58 UTC (rev 18794) +++ trunk/reactos/lib/rtl/i386/except.s 2005-10-27 19:13:52 UTC (rev 18795) @@ -1,250 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS NT Library - * FILE: lib/rtl/i386/except.S - * PURPOSE: User-mode exception support for IA-32 - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - * Casper S. Hornstrup (chorns(a)users.sourceforge.net) - */ - -/* INCLUDES ******************************************************************/ - -#include <ndk/asm.h> -#include <ndk/i386/segment.h> -.intel_syntax noprefix - -#define EXCEPTION_UNWINDING 2 -#define EXCEPTION_EXIT_UNWIND 4 -#define EXCEPTION_UNWIND (EXCEPTION_UNWINDING + EXCEPTION_EXIT_UNWIND) - -#define ExceptionContinueExecution 0 -#define ExceptionContinueSearch 1 -#define ExceptionNestedException 2 -#define ExceptionCollidedUnwind 3 - -/* FUNCTIONS ****************************************************************/ - -.globl _RtlpGetExceptionList@0 -_RtlpGetExceptionList@0: - - /* Return the exception list */ - mov eax, [fs:TEB_EXCEPTION_LIST] - ret - -.globl _RtlpSetExceptionList@4 -_RtlpSetExceptionList@4: - - /* Get the new list */ - mov ecx, [esp+4] - mov ecx, [ecx] - - /* Write it */ - mov [fs:TEB_EXCEPTION_LIST], ecx - - /* Return */ - ret 4 - -.globl _RtlpGetExceptionAddress@0 -_RtlpGetExceptionAddress@0: - - /* Return the address from the stack */ - mov eax, [ebp+4] - - /* Return */ - ret - -.globl _RtlCaptureContext@4 -_RtlCaptureContext@4: - - /* Preserve EBX and put the context in it */ - push ebx - mov ebx, [esp+8] - - /* Save the basic register context */ - mov [ebx+CONTEXT_EAX], eax - mov [ebx+CONTEXT_ECX], ecx - mov [ebx+CONTEXT_EDX], edx - mov eax, [esp] /* We pushed EBX, remember? ;) */ - mov [ebx+CONTEXT_EBX], eax - mov [ebx+CONTEXT_ESI], esi - mov [ebx+CONTEXT_EDI], edi - - /* Capture the other regs */ - jmp CaptureRest - -.globl _RtlpCaptureContext@4 -_RtlpCaptureContext@4: - - /* Preserve EBX and put the context in it */ - push ebx - mov ebx, [esp+8] - - /* Clear the basic register context */ - mov dword ptr [ebx+CONTEXT_EAX], 0 - mov dword ptr [ebx+CONTEXT_ECX], 0 - mov dword ptr [ebx+CONTEXT_EDX], 0 - mov dword ptr [ebx+CONTEXT_EBX], 0 - mov dword ptr [ebx+CONTEXT_ESI], 0 - mov dword ptr [ebx+CONTEXT_EDI], 0 - -CaptureRest: - /* Capture the segment registers */ - mov [ebx+CONTEXT_SEGCS], cs - mov [ebx+CONTEXT_SEGDS], ds - mov [ebx+CONTEXT_SEGES], es - mov [ebx+CONTEXT_SEGFS], fs - mov [ebx+CONTEXT_SEGGS], gs - mov [ebx+CONTEXT_SEGSS], ss - - /* Capture flags */ - pushfd - pop [ebx+CONTEXT_EFLAGS] - - /* The return address should be in [ebp+4] */ - mov eax, [ebp+4] - mov [ebx+CONTEXT_EIP], eax - - /* Get EBP */ - mov eax, [ebp+0] - mov [ebx+CONTEXT_EBP], eax - - /* And get ESP */ - lea eax, [ebp+8] - mov [ebx+CONTEXT_ESP], eax - - /* Return to the caller */ - pop ebx - ret 4 - -.globl _RtlpExecuteHandlerForException@20 -_RtlpExecuteHandlerForException@20: - - /* Copy the routine in EDX */ - mov edx, offset _RtlpExceptionProtector - - /* Jump to common routine */ - jmp _RtlpExecuteHandler@20 - -.globl _RtlpExecuteHandlerForUnwind@20 -_RtlpExecuteHandlerForUnwind@20: - - /* Copy the routine in EDX */ - mov edx, offset _RtlpExceptionProtector - - /* Run the common routine */ -_RtlpExecuteHandler@20: - - /* Save non-volatile */ - push ebx - push esi - push edi - - /* Clear registers */ - xor eax, eax - xor ebx, ebx - xor esi, esi - xor edi, edi - - /* Call the 2nd-stage executer */ - push [esp+0x20] - push [esp+0x20] - push [esp+0x20] - push [esp+0x20] - push [esp+0x20] - call _RtlpExecuteHandler2@20 - - /* Restore non-volatile */ - pop edi - pop esi - pop ebx - ret 0x14 - -.globl _RtlpExecuteHandler2@20 -_RtlpExecuteHandler2@20: - - /* Set up stack frame */ - push ebp - mov ebp, esp - - /* Save the Frame */ - push [ebp+0xC] - - /* Push handler address */ - push edx - - /* Push the exception list */ - push [fs:TEB_EXCEPTION_LIST] - - /* Link us to it */ - mov [fs:TEB_EXCEPTION_LIST], esp - - /* Call the handler */ - push [ebp+0x14] - push [ebp+0x10] - push [ebp+0xC] - push [ebp+8] - mov ecx, [ebp+0x18] - call ecx - - /* Unlink us */ - mov esp, [fs:TEB_EXCEPTION_LIST] - - /* Restore it */ - pop [fs:TEB_EXCEPTION_LIST] - - /* Undo stack frame and return */ - mov esp, ebp - pop ebp - ret 0x14 - -_RtlpExceptionProtector: - - /* Assume we'll continue */ - mov eax, ExceptionContinueSearch - - /* Put the exception record in ECX and check the Flags */ - mov ecx, [esp+4] - test dword ptr [ecx+EXCEPTION_RECORD_EXCEPTION_FLAGS], EXCEPTION_UNWIND - jnz return - - /* Save the frame in ECX and Context in EDX */ - mov ecx, [esp+8] - mov edx, [esp+16] - - /* Get the nested frame */ - mov eax, [ecx+8] - - /* Set it as the dispatcher context */ - mov [edx], eax - - /* Return nested exception */ - mov eax, ExceptionNestedException - -return: - ret 16 - -_RtlpUnwindProtector: - /* Assume we'll continue */ - mov eax, ExceptionContinueSearch - - /* Put the exception record in ECX and check the Flags */ - mov ecx, [esp+4] - test dword ptr [ecx+EXCEPTION_RECORD_EXCEPTION_FLAGS], EXCEPTION_UNWIND - jnz .return - - /* Save the frame in ECX and Context in EDX */ - mov ecx, [esp+8] - mov edx, [esp+16] - - /* Get the nested frame */ - mov eax, [ecx+8] - - /* Set it as the dispatcher context */ - mov [edx], eax - - /* Return collided unwind */ - mov eax, ExceptionCollidedUnwind - -.return: - ret 16 - _____ Copied: trunk/reactos/lib/rtl/i386/except_asm.s (from rev 18793, trunk/reactos/lib/rtl/i386/except.s) _____ Deleted: trunk/reactos/lib/rtl/i386/math.S --- trunk/reactos/lib/rtl/i386/math.S 2005-10-27 19:03:58 UTC (rev 18794) +++ trunk/reactos/lib/rtl/i386/math.S 2005-10-27 19:13:52 UTC (rev 18795) @@ -1,631 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Run-Time Library - * FILE: lib/rtl/i386/math.S - * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) - * Eric Kohl (ekohl(a)rz-online.de) - * - * Copyright (C) 2002 Michael Ringgaard. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the project nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* GLOBALS ****************************************************************/ - -.globl __ftol -.globl __aullshr -.globl __allrem -.globl __aulldiv -.globl __allshr -.globl __allshl -.globl __aullrem -.globl __allmul -.globl __alldiv -.globl __aulldvrm -.globl __alldvrm - -/* FUNCTIONS ***************************************************************/ - -/* - * long long - * __alldiv(long long Dividend, long long Divisor); - * - * Parameters: - * [ESP+04h] - long long Dividend - * [ESP+0Ch] - long long Divisor - * Registers: - * Unknown - * Returns: - * EDX:EAX - long long quotient (Dividend/Divisor) - * Notes: - * Routine removes the arguments from the stack. - */ -__alldiv: - call ___divdi3 - ret $0x10 - -/* - * long long - * __allmul(long long Multiplier, long long Multiplicand); - * - * Parameters: - * [ESP+04h] - long long Multiplier - * [ESP+0Ch] - long long Multiplicand - * Registers: - * Unknown - * Returns: - * EDX:EAX - long long product (Multiplier*Multiplicand) - * Notes: - * Routine removes the arguments from the stack. - */ -__allmul: - pushl %ebp - movl %esp, %ebp - pushl %edi - pushl %esi - pushl %ebx - subl $12, %esp - movl 16(%ebp), %ebx - movl 8(%ebp), %eax - mull %ebx - movl 20(%ebp), %ecx - movl %eax, -24(%ebp) - movl 8(%ebp), %eax - movl %edx, %esi - imull %ecx, %eax - addl %eax, %esi - movl 12(%ebp), %eax - imull %eax, %ebx - leal (%ebx,%esi), %eax - movl %eax, -20(%ebp) - movl -24(%ebp), %eax - movl -20(%ebp), %edx - addl $12, %esp - popl %ebx - popl %esi - popl %edi - popl %ebp - ret $0x10 - -/* - * unsigned long long - * __aullrem(unsigned long long Dividend, unsigned long long Divisor); - * - * Parameters: - * [ESP+04h] - unsigned long long Dividend - * [ESP+0Ch] - unsigned long long Divisor - * Registers: - * Unknown - * Returns: - * EDX:EAX - unsigned long long remainder (Dividend%Divisor) - * Notes: - * Routine removes the arguments from the stack. - */ -__aullrem: - call ___umoddi3 - ret $16 - -/* - * long long - * __allshl(long long Value, unsigned char Shift); - * - * Parameters: - * EDX:EAX - signed long long value to be shifted left - * CL - number of bits to shift by - * Registers: - * Destroys CL - * Returns: - * EDX:EAX - shifted value - */ -__allshl: - shldl %cl, %eax, %edx - sall %cl, %eax - andl $32, %ecx - je 1f - movl %eax, %edx - xorl %eax, %eax -1: - ret - -/* - * long long - * __allshr(long long Value, unsigned char Shift); - * - * Parameters: - * EDX:EAX - signed long long value to be shifted right - * CL - number of bits to shift by - * Registers: - * Destroys CL - * Returns: - * EDX:EAX - shifted value - */ -__allshr: - shrdl %cl, %edx, %eax - sarl %cl, %edx - andl $32, %ecx - je 1f - movl %edx, %eax - sarl $31, %edx -1: - ret - -/* - * unsigned long long - * __aulldiv(unsigned long long Dividend, unsigned long long Divisor); - * - * Parameters: - * [ESP+04h] - unsigned long long Dividend - * [ESP+0Ch] - unsigned long long Divisor - * Registers: - * Unknown - * Returns: - * EDX:EAX - unsigned long long quotient (Dividend/Divisor) - * Notes: - * Routine removes the arguments from the stack. - */ -__aulldiv: - call ___udivdi3 - ret $16 - -/* - * unsigned long long - * __aullshr(unsigned long long Value, unsigned char Shift); - * - * Parameters: - * EDX:EAX - unsigned long long value to be shifted right - * CL - number of bits to shift by - * Registers: - * Destroys CL - * Returns: - * EDX:EAX - shifted value - */ -__aullshr: - shrdl %cl, %edx, %eax - shrl %cl, %edx - andl $32, %ecx - je 1f - movl %edx, %eax -1: - ret - -/* - * long long - * __allrem(long long Dividend, long long Divisor); - * - * Parameters: - * [ESP+04h] - long long Dividend - * [ESP+0Ch] - long long Divisor - * Registers: - * Unknown - * Returns: - * EDX:EAX - long long remainder (Dividend/Divisor) - * Notes: - * Routine removes the arguments from the stack. - */ -__allrem: - call ___moddi3 - ret $16 - -.intel_syntax noprefix - -/* - * This routine is called by MSVC-generated code to convert from floating point - * to integer representation. The floating point number to be converted is - * on the top of the floating point stack. - */ -__ftol: - /* Set up stack frame */ - push ebp - mov ebp, esp - - /* Set "round towards zero" mode */ - fstcw [ebp-2] - wait - mov ax, [ebp-2] - or ah, 0xC - mov [ebp-4], ax - fldcw [ebp-4] - - /* Do the conversion */ - fistp qword ptr [ebp-12] - - /* Restore rounding mode */ - fldcw [ebp-2] - - /* Return value */ - mov eax, [ebp-12] - mov edx, [ebp-8] - - /* Remove stack frame and return*/ - leave - ret - -__alldvrm: - push edi - push esi - push ebp - -// Set up the local stack and save the index registers. When this is done -// the stack frame will look as follows (assuming that the expression a/b will -// generate a call to alldvrm(a, b)): -// -// ----------------- -// | | -// |---------------| -// | | -// |--divisor (b)--| -// | | -// |---------------| -// | | -// |--dividend (a)-| -// | | -// |---------------| -// | return addr** | -// |---------------| -// | EDI | -// |---------------| -// | ESI | -// |---------------| -// ESP---->| EBP | -// ----------------- -// - -#define DVNDLO [esp + 16] // stack address of dividend (a) -#define DVNDHI [esp + 20] // stack address of dividend (a) -#define DVSRLO [esp + 24] // stack address of divisor (b) -#define DVSRHI [esp + 28] // stack address of divisor (b) - -// Determine sign of the quotient (edi = 0 if result is positive, non-zero -// otherwise) and make operands positive. -// Sign of the remainder is kept in ebp. - - xor edi,edi // result sign assumed positive - xor ebp,ebp // result sign assumed positive - - mov eax,DVNDHI // hi word of a - or eax,eax // test to see if signed - jge short L1 // skip rest if a is already positive - inc edi // complement result sign flag - inc ebp // complement result sign flag - mov edx,DVNDLO // lo word of a - neg eax // make a positive - neg edx - sbb eax,0 - mov DVNDHI,eax // save positive value - mov DVNDLO,edx -L1: - mov eax,DVSRHI // hi word of b - or eax,eax // test to see if signed - jge short L2 // skip rest if b is already positive - inc edi // complement the result sign flag - mov edx,DVSRLO // lo word of a - neg eax // make b positive - neg edx - sbb eax,0 - mov DVSRHI,eax // save positive value - mov DVSRLO,edx -L2: - -// -// Now do the divide. First look to see if the divisor is less than 4194304K. -// If so, then we can use a simple algorithm with word divides, otherwise -// things get a little more complex. -// -// NOTE - eax currently contains the high order word of DVSR -// - - or eax,eax // check to see if divisor < 4194304K - jnz short L3 // nope, gotta do this the hard way - mov ecx,DVSRLO // load divisor - mov eax,DVNDHI // load high word of dividend - xor edx,edx - div ecx // eax <- high order bits of quotient - mov ebx,eax // save high bits of quotient - mov eax,DVNDLO // edx:eax <- remainder:lo word of dividend - div ecx // eax <- low order bits of quotient - mov esi,eax // ebx:esi <- quotient -// -// Now we need to do a multiply so that we can compute the remainder. -// - mov eax,ebx // set up high word of quotient - mul dword ptr DVSRLO // HIWORD(QUOT) * DVSR - mov ecx,eax // save the result in ecx - mov eax,esi // set up low word of quotient - mul dword ptr DVSRLO // LOWORD(QUOT) * DVSR - add edx,ecx // EDX:EAX = QUOT * DVSR - jmp short L4 // complete remainder calculation - -// -// Here we do it the hard way. Remember, eax contains the high word of DVSR -// - -L3: - mov ebx,eax // ebx:ecx <- divisor - mov ecx,DVSRLO - mov edx,DVNDHI // edx:eax <- dividend - mov eax,DVNDLO -L5: - shr ebx,1 // shift divisor right one bit - rcr ecx,1 - shr edx,1 // shift dividend right one bit - rcr eax,1 - or ebx,ebx - jnz short L5 // loop until divisor < 4194304K - div ecx // now divide, ignore remainder - mov esi,eax // save quotient - -// -// We may be off by one, so to check, we will multiply the quotient -// by the divisor and check the result against the orignal dividend -// Note that we must also check for overflow, which can occur if the -// dividend is close to 2**64 and the quotient is off by 1. -// - - mul dword ptr DVSRHI // QUOT * DVSRHI - mov ecx,eax - mov eax,DVSRLO - mul esi // QUOT * DVSRLO - add edx,ecx // EDX:EAX = QUOT * DVSR - jc short L6 // carry means Quotient is off by 1 - -// -// do long compare here between original dividend and the result of the -// multiply in edx:eax. If original is larger or equal, we are ok, otherwise -// subtract one (1) from the quotient. -// - - cmp edx,DVNDHI // compare hi words of result and original - ja short L6 // if result > original, do subtract - jb short L7 // if result < original, we are ok - cmp eax,DVNDLO // hi words are equal, compare lo words - jbe short L7 // if less or equal we are ok, else subtract -L6: - dec esi // subtract 1 from quotient - sub eax,DVSRLO // subtract divisor from result - sbb edx,DVSRHI -L7: - xor ebx,ebx // ebx:esi <- quotient - -L4: -// -// Calculate remainder by subtracting the result from the original dividend. -// Since the result is already in a register, we will do the subtract in the -// opposite direction and negate the result if necessary. -// - - sub eax,DVNDLO // subtract dividend from result - sbb edx,DVNDHI - -// -// Now check the result sign flag to see if the result is supposed to be positive -// or negative. It is currently negated (because we subtracted in the 'wrong' -// direction), so if the sign flag is set we are done, otherwise we must negate -// the result to make it positive again. -// - - dec ebp // check result sign flag - jns short L9 // result is ok, set up the quotient - neg edx // otherwise, negate the result - neg eax - sbb edx,0 - -// -// Now we need to get the quotient into edx:eax and the remainder into ebx:ecx. -// -L9: - mov ecx,edx - mov edx,ebx - mov ebx,ecx - mov ecx,eax - mov eax,esi - -// -// Just the cleanup left to do. edx:eax contains the quotient. Set the sign -// according to the save value, cleanup the stack, and return. -// - - dec edi // check to see if result is negative - jnz short L8 // if EDI == 0, result should be negative - neg edx // otherwise, negate the result - neg eax - sbb edx,0 - -// -// Restore the saved registers and return. -// - -L8: - pop ebp - pop esi - pop edi - - ret 16 - -__aulldvrm: - -// ulldvrm - unsigned long divide and remainder -// -// Purpose: -// Does a unsigned long divide and remainder of the arguments. Arguments -// are not changed. -// -// Entry: -// Arguments are passed on the stack: -// 1st pushed: divisor (QWORD) -// 2nd pushed: dividend (QWORD) -// -// Exit: -// EDX:EAX contains the quotient (dividend/divisor) -// EBX:ECX contains the remainder (divided % divisor) -// NOTE: this routine removes the parameters from the stack. -// -// Uses: -// ECX -// - push esi - -// Set up the local stack and save the index registers. When this is done -// the stack frame will look as follows (assuming that the expression a/b will -// generate a call to aulldvrm(a, b)): -// -// ----------------- -// | | -// |---------------| -// | | -// |--divisor (b)--| -// | | -// |---------------| -// | | -// |--dividend (a)-| -// | | -// |---------------| -// | return addr** | -// |---------------| -// ESP---->| ESI | -// ----------------- -// - -#undef DVNDLO -#undef DVNDHI -#undef DVSRLO -#undef DVSRHI -#define DVNDLO [esp + 8] // stack address of dividend (a) -#define DVNDHI [esp + 8] // stack address of dividend (a) -#define DVSRLO [esp + 16] // stack address of divisor (b) -#define DVSRHI [esp + 20] // stack address of divisor (b) - -// -// Now do the divide. First look to see if the divisor is less than 4194304K. -// If so, then we can use a simple algorithm with word divides, otherwise -// things get a little more complex. -// - - mov eax,DVSRHI // check to see if divisor < 4194304K - or eax,eax - jnz short .L1 // nope, gotta do this the hard way - mov ecx,DVSRLO // load divisor - mov eax,DVNDHI // load high word of dividend - xor edx,edx - div ecx // get high order bits of quotient - mov ebx,eax // save high bits of quotient - mov eax,DVNDLO // edx:eax <- remainder:lo word of dividend - div ecx // get low order bits of quotient - mov esi,eax // ebx:esi <- quotient - -// -// Now we need to do a multiply so that we can compute the remainder. -// - mov eax,ebx // set up high word of quotient - mul dword ptr DVSRLO // HIWORD(QUOT) * DVSR - mov ecx,eax // save the result in ecx - mov eax,esi // set up low word of quotient - mul dword ptr DVSRLO // LOWORD(QUOT) * DVSR - add edx,ecx // EDX:EAX = QUOT * DVSR - jmp short .L2 // complete remainder calculation - -// -// Here we do it the hard way. Remember, eax contains DVSRHI -// - -.L1: - mov ecx,eax // ecx:ebx <- divisor - mov ebx,DVSRLO - mov edx,DVNDHI // edx:eax <- dividend - mov eax,DVNDLO -.L3: - shr ecx,1 // shift divisor right one bit// hi bit <- 0 - rcr ebx,1 - shr edx,1 // shift dividend right one bit// hi bit <- 0 - rcr eax,1 - or ecx,ecx - jnz short .L3 // loop until divisor < 4194304K - div ebx // now divide, ignore remainder - mov esi,eax // save quotient - -// -// We may be off by one, so to check, we will multiply the quotient -// by the divisor and check the result against the orignal dividend -// Note that we must also check for overflow, which can occur if the -// dividend is close to 2**64 and the quotient is off by 1. -// - - mul dword ptr DVSRHI // QUOT * DVSRHI - mov ecx,eax - mov eax,DVSRLO - mul esi // QUOT * DVSRLO - add edx,ecx // EDX:EAX = QUOT * DVSR - jc short .L4 // carry means Quotient is off by 1 - -// -// do long compare here between original dividend and the result of the -// multiply in edx:eax. If original is larger or equal, we are ok, otherwise -// subtract one (1) from the quotient. -// - - cmp edx,DVNDHI // compare hi words of result and original - ja short .L4 // if result > original, do subtract - jb short .L5 // if result < original, we are ok - cmp eax,DVNDLO // hi words are equal, compare lo words - jbe short .L5 // if less or equal we are ok, else subtract -.L4: - dec esi // subtract 1 from quotient - sub eax,DVSRLO // subtract divisor from result - sbb edx,DVSRHI -.L5: - xor ebx,ebx // ebx:esi <- quotient [truncated at 1000 lines; 460 more skipped]

18 years, 11 months

[gvg] 18794: Sync to Wine-0_9:

by gvg＠svn.reactos.com

Sync to Wine-0_9: Francois Gouget <fgouget(a)free.fr> - Use "static const" rather than "const static" as gcc -W complains about the former. Michal Suchanek <hramrach(a)gmail.com> - Make Czech font selection dialog usable. Modified: trunk/reactos/lib/comdlg32/cdlg_Cs.rc Modified: trunk/reactos/lib/comdlg32/filedlg.c Modified: trunk/reactos/lib/comdlg32/printdlg.c _____ Modified: trunk/reactos/lib/comdlg32/cdlg_Cs.rc --- trunk/reactos/lib/comdlg32/cdlg_Cs.rc 2005-10-27 19:01:29 UTC (rev 18793) +++ trunk/reactos/lib/comdlg32/cdlg_Cs.rc 2005-10-27 19:03:58 UTC (rev 18794) @@ -115,15 +115,35 @@ } -CHOOSE_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 +CHOOSE_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 13, 54, 264, 147 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "PÝsmo" FONT 8, "MS Shell Dlg" { - LTEXT "PÝsmo:", 1088, 6, 6, 40, 9 - LTEXT "", 1089, 60, 6, 150, 9 - DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Storno", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + LTEXT "PÝ&smo:", stc1 ,6,3,40,9 + COMBOBOX cmb1, 6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE + LTEXT "St&yl:",stc2 ,108,3,44,9 + COMBOBOX cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE + LTEXT "&Velikost:",stc3,179,3,30,9 + COMBOBOX cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT + DEFPUSHBUTTON "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Storno",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Pou×Ýt", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Nßpovýda" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP + GROUPBOX "Efekty",grp1,6,72,84,34,WS_GROUP + CHECKBOX "P°eÜ&krtnutÝ", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Podtr×enÝ", chx2, 10,94,50,10, BS_AUTOCHECKBOX + LTEXT "&Barva:", stc4 ,6,110,30,9 + COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Ukßzka",grp2,98,72,120,36,WS_GROUP + CTEXT "P°ÝliÜ ×luØouÞk² k¨? ·pýl ´ßbelskÚ k¾dy",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + LTEXT "Skr&ipt:",stc7 ,98,114,40,9 + COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } _____ Modified: trunk/reactos/lib/comdlg32/filedlg.c --- trunk/reactos/lib/comdlg32/filedlg.c 2005-10-27 19:01:29 UTC (rev 18793) +++ trunk/reactos/lib/comdlg32/filedlg.c 2005-10-27 19:03:58 UTC (rev 18794) @@ -2500,7 +2500,7 @@ */ static inline BOOL FILEDLG95_unixfs_is_rooted_at_desktop(void) { HKEY hKey; - const static WCHAR wszRootedAtDesktop[] = { 'S','o','f','t','w','a','r','e','\\', + static const WCHAR wszRootedAtDesktop[] = { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\ ', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'E','x','p','l','o','r','e','r','\\','D','e','s','k','t','o','p','\\', _____ Modified: trunk/reactos/lib/comdlg32/printdlg.c --- trunk/reactos/lib/comdlg32/printdlg.c 2005-10-27 19:01:29 UTC (rev 18793) +++ trunk/reactos/lib/comdlg32/printdlg.c 2005-10-27 19:03:58 UTC (rev 18794) @@ -1270,10 +1270,10 @@ static LRESULT PRINTDLG_WMInitDialogW(HWND hDlg, WPARAM wParam, PRINT_PTRW* PrintStructures) { - const static WCHAR PD32_COLLATE[] = { 'P', 'D', '3', '2', '_', 'C', 'O', 'L', 'L', 'A', 'T', 'E', 0 }; - const static WCHAR PD32_NOCOLLATE[] = { 'P', 'D', '3', '2', '_', 'N', 'O', 'C', 'O', 'L', 'L', 'A', 'T', 'E', 0 }; - const static WCHAR PD32_PORTRAIT[] = { 'P', 'D', '3', '2', '_', 'P', 'O', 'R', 'T', 'R', 'A', 'I', 'T', 0 }; - const static WCHAR PD32_LANDSCAPE[] = { 'P', 'D', '3', '2', '_', 'L', 'A', 'N', 'D', 'S', 'C', 'A', 'P', 'E', 0 }; + static const WCHAR PD32_COLLATE[] = { 'P', 'D', '3', '2', '_', 'C', 'O', 'L', 'L', 'A', 'T', 'E', 0 }; + static const WCHAR PD32_NOCOLLATE[] = { 'P', 'D', '3', '2', '_', 'N', 'O', 'C', 'O', 'L', 'L', 'A', 'T', 'E', 0 }; + static const WCHAR PD32_PORTRAIT[] = { 'P', 'D', '3', '2', '_', 'P', 'O', 'R', 'T', 'R', 'A', 'I', 'T', 0 }; + static const WCHAR PD32_LANDSCAPE[] = { 'P', 'D', '3', '2', '_', 'L', 'A', 'N', 'D', 'S', 'C', 'A', 'P', 'E', 0 }; LPPRINTDLGW lppd = PrintStructures->lpPrintDlg; DEVNAMES *pdn; DEVMODEW *pdm; @@ -2366,9 +2366,9 @@ } static void _c_size2strW(PageSetupDataW *pda,DWORD size,LPWSTR strout) { - const static WCHAR UNDEF[] = { '<', 'u', 'n', 'd', 'e', 'f', '>', 0 }; - const static WCHAR mm_fmt[] = { '%', '.', '2', 'f', 'm', 'm', 0 }; - const static WCHAR in_fmt[] = { '%', '.', '2', 'f', 'i', 'n', 0 }; + static const WCHAR UNDEF[] = { '<', 'u', 'n', 'd', 'e', 'f', '>', 0 }; + static const WCHAR mm_fmt[] = { '%', '.', '2', 'f', 'm', 'm', 0 }; + static const WCHAR in_fmt[] = { '%', '.', '2', 'f', 'i', 'n', 0 }; lstrcpyW(strout, UNDEF); if (pda->dlga->Flags & PSD_INHUNDREDTHSOFMILLIMETERS) { wsprintfW(strout,mm_fmt,(size*1.0)/100.0); @@ -3182,7 +3182,7 @@ static INT_PTR CALLBACK PageDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { - const static WCHAR __WINE_PAGESETUPDLGDATA[] = + static const WCHAR __WINE_PAGESETUPDLGDATA[] = { '_', '_', 'W', 'I', 'N', 'E', '_', 'P', 'A', 'G', 'E', 'S', 'E', 'T', 'U', 'P', 'D', 'L', 'G', 'D', 'A', 'T', 'A', 0 }; PageSetupDataW *pda;

18 years, 11 months

[gvg] 18793: Sync to Wine-0_9:

by gvg＠svn.reactos.com

Sync to Wine-0_9: Vitaliy Margolen <wine-patch(a)kievinfo.com> - Correct Page Up/Down handling in report mode. - Don't start dragging for a single mouse click. - Don't arrange tabs if there is only one line. Francois Gouget <fgouget(a)free.fr> - Use "static const" rather than "const static" as gcc -W complains about the former. Alexandre Julliard <julliard(a)winehq.org> - Don't register classes is no theme is active to avoid trouble (based on a patch by Vitaliy Margolen). Krzysztof Foltman <wdev(a)foltman.com> - Separators with group style set don't separate toolbar radio groups anymore (which broke tool selection in Front Panel Designer). Troy Rollo <wine(a)troy.rollo.name> - Detect when the notification callback has destroyed the ListView to avoid attempts to access data that is no longer valid. Modified: trunk/reactos/lib/comctl32/listview.c Modified: trunk/reactos/lib/comctl32/rebar.c Modified: trunk/reactos/lib/comctl32/status.c Modified: trunk/reactos/lib/comctl32/tab.c Modified: trunk/reactos/lib/comctl32/theming.c Modified: trunk/reactos/lib/comctl32/toolbar.c _____ Modified: trunk/reactos/lib/comctl32/listview.c --- trunk/reactos/lib/comctl32/listview.c 2005-10-27 18:56:27 UTC (rev 18792) +++ trunk/reactos/lib/comctl32/listview.c 2005-10-27 19:01:29 UTC (rev 18793) @@ -769,10 +769,12 @@ return result; } -static inline LRESULT notify(LISTVIEW_INFO *infoPtr, INT code) +static inline BOOL notify(LISTVIEW_INFO *infoPtr, INT code) { NMHDR nmh; - return notify_hdr(infoPtr, code, &nmh); + HWND hwnd = infoPtr->hwndSelf; + notify_hdr(infoPtr, code, &nmh); + return IsWindow(hwnd); } static inline void notify_itemactivate(LISTVIEW_INFO *infoPtr, LVHITTESTINFO *htInfo) @@ -813,11 +815,12 @@ return notify_hdr(infoPtr, code, (LPNMHDR)plvnm); } -static LRESULT notify_click(LISTVIEW_INFO *infoPtr, INT code, LVHITTESTINFO *lvht) +static BOOL notify_click(LISTVIEW_INFO *infoPtr, INT code, LVHITTESTINFO *lvht) { NMLISTVIEW nmlv; LVITEMW item; - + HWND hwnd = infoPtr->hwndSelf; + TRACE("code=%d, lvht=%s\n", code, debuglvhittestinfo(lvht)); ZeroMemory(&nmlv, sizeof(nmlv)); nmlv.iItem = lvht->iItem; @@ -827,14 +830,16 @@ item.iItem = lvht->iItem; item.iSubItem = 0; if (LISTVIEW_GetItemT(infoPtr, &item, TRUE)) nmlv.lParam = item.lParam; - return notify_listview(infoPtr, code, &nmlv); + notify_listview(infoPtr, code, &nmlv); + return IsWindow(hwnd); } -static void notify_deleteitem(LISTVIEW_INFO *infoPtr, INT nItem) +static BOOL notify_deleteitem(LISTVIEW_INFO *infoPtr, INT nItem) { NMLISTVIEW nmlv; LVITEMW item; - + HWND hwnd = infoPtr->hwndSelf; + ZeroMemory(&nmlv, sizeof (NMLISTVIEW)); nmlv.iItem = nItem; item.mask = LVIF_PARAM; @@ -842,6 +847,7 @@ item.iSubItem = 0; if (LISTVIEW_GetItemT(infoPtr, &item, TRUE)) nmlv.lParam = item.lParam; notify_listview(infoPtr, LVN_DELETEITEM, &nmlv); + return IsWindow(hwnd); } static int get_ansi_notification(INT unicodeNotificationCode) @@ -3014,12 +3020,13 @@ * [I] nItem : item index * * RETURN: - * None + * Whether the window is still valid. */ -static void LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) +static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) { INT nFirst = min(infoPtr->nSelectionMark, nItem); INT nLast = max(infoPtr->nSelectionMark, nItem); + HWND hwndSelf = infoPtr->hwndSelf; NMLVODSTATECHANGE nmlv; LVITEMW item; BOOL bOldChange; @@ -3048,7 +3055,10 @@ nmlv.uOldState = item.state; notify_hdr(infoPtr, LVN_ODSTATECHANGED, (LPNMHDR)&nmlv); + if (!IsWindow(hwndSelf)) + return FALSE; infoPtr->bDoChangeNotify = bOldChange; + return TRUE; } @@ -3279,7 +3289,9 @@ notify_listview(infoPtr, LVN_BEGINDRAG, &nmlv); return 0; - } + } + else + infoPtr->bLButtonDown = FALSE; /* see if we are supposed to be tracking mouse hovering */ if(infoPtr->dwLvExStyle & LVS_EX_TRACKSELECT) { @@ -3400,9 +3412,15 @@ /* send LVN_ITEMCHANGING notification, if the item is not being inserted */ /* and we are _NOT_ virtual (LVS_OWERNDATA), and change notifications */ /* are enabled */ - if(lpItem && !isNew && infoPtr->bDoChangeNotify && - notify_listview(infoPtr, LVN_ITEMCHANGING, &nmlv)) + if(lpItem && !isNew && infoPtr->bDoChangeNotify) + { + HWND hwndSelf = infoPtr->hwndSelf; + + if (notify_listview(infoPtr, LVN_ITEMCHANGING, &nmlv)) return FALSE; + if (!IsWindow(hwndSelf)) + return FALSE; + } /* copy information */ if (lpLVItem->mask & LVIF_TEXT) @@ -3546,6 +3564,7 @@ static BOOL LISTVIEW_SetItemT(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL isW) { UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; + HWND hwndSelf = infoPtr->hwndSelf; LPWSTR pszText = NULL; BOOL bResult, bChanged = FALSE; @@ -3568,6 +3587,8 @@ bResult = set_sub_item(infoPtr, lpLVItem, TRUE, &bChanged); else bResult = set_main_item(infoPtr, lpLVItem, FALSE, TRUE, &bChanged); + if (!IsWindow(hwndSelf)) + return FALSE; /* redraw item, if necessary */ if (bChanged && !infoPtr->bIsDrawing) @@ -4516,7 +4537,7 @@ LISTVIEW_SetItemState(infoPtr, nItem, &item); /* send LVN_DELETEITEM notification. */ - notify_deleteitem(infoPtr, nItem); + if (!notify_deleteitem(infoPtr, nItem)) return FALSE; /* we need to do this here, because we'll be deleting stuff */ if (uView == LVS_SMALLICON || uView == LVS_ICON) @@ -4568,6 +4589,7 @@ */ static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, LPWSTR pszText, BOOL isW) { + HWND hwndSelf = infoPtr->hwndSelf; NMLVDISPINFOW dispInfo; TRACE("(pszText=%s, isW=%d)\n", debugtext_t(pszText, isW), isW); @@ -4585,6 +4607,8 @@ /* Do we need to update the Item Text */ if (!notify_dispinfoT(infoPtr, LVN_ENDLABELEDITW, &dispInfo, isW)) return FALSE; + if (!IsWindow(hwndSelf)) + return FALSE; if (!pszText) return TRUE; if (!(infoPtr->dwStyle & LVS_OWNERDATA)) @@ -4625,6 +4649,7 @@ WCHAR szDispText[DISP_TEXT_SIZE] = { 0 }; NMLVDISPINFOW dispInfo; RECT rect; + HWND hwndSelf = infoPtr->hwndSelf; TRACE("(nItem=%d, isW=%d)\n", nItem, isW); @@ -4662,6 +4687,8 @@ if (notify_dispinfoT(infoPtr, LVN_BEGINLABELEDITW, &dispInfo, isW)) { + if (!IsWindow(hwndSelf)) + return 0; SendMessageW(infoPtr->hwndEdit, WM_CLOSE, 0, 0); infoPtr->hwndEdit = 0; return 0; @@ -6191,6 +6218,7 @@ ITEM_INFO *lpItem; BOOL is_sorted, has_changed; LVITEMW item; + HWND hwndSelf = infoPtr->hwndSelf; TRACE("(lpLVItem=%s, isW=%d)\n", debuglvitem_t(lpLVItem, isW), isW); @@ -6264,6 +6292,8 @@ nmlv.iItem = nItem; nmlv.lParam = lpItem->lParam; notify_listview(infoPtr, LVN_INSERTITEM, &nmlv); + if (!IsWindow(hwndSelf)) + return -1; /* align items (set position of each item) */ if ((uView == LVS_SMALLICON || uView == LVS_ICON)) @@ -7969,6 +7999,7 @@ static LRESULT LISTVIEW_KeyDown(LISTVIEW_INFO *infoPtr, INT nVirtualKey, LONG lKeyData) { UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; + HWND hwndSelf = infoPtr->hwndSelf; INT nItem = -1; NMLVKEYDOWN nmKeyDown; @@ -7978,14 +8009,16 @@ nmKeyDown.wVKey = nVirtualKey; nmKeyDown.flags = 0; notify_hdr(infoPtr, LVN_KEYDOWN, &nmKeyDown.hdr); + if (!IsWindow(hwndSelf)) + return 0; switch (nVirtualKey) { case VK_RETURN: if ((infoPtr->nItemCount > 0) && (infoPtr->nFocusedItem != -1)) { - notify(infoPtr, NM_RETURN); - notify(infoPtr, LVN_ITEMACTIVATE); + if (!notify(infoPtr, NM_RETURN)) return 0; + if (!notify(infoPtr, LVN_ITEMACTIVATE)) return 0; } break; @@ -8017,7 +8050,13 @@ case VK_PRIOR: if (uView == LVS_REPORT) - nItem = infoPtr->nFocusedItem - LISTVIEW_GetCountPerColumn(infoPtr); + { + INT topidx = LISTVIEW_GetTopIndex(infoPtr); + if (infoPtr->nFocusedItem == topidx) + nItem = topidx - LISTVIEW_GetCountPerColumn(infoPtr) + 1; + else + nItem = topidx; + } else nItem = infoPtr->nFocusedItem - LISTVIEW_GetCountPerColumn(infoPtr) * LISTVIEW_GetCountPerRow(infoPtr); @@ -8026,7 +8065,14 @@ case VK_NEXT: if (uView == LVS_REPORT) - nItem = infoPtr->nFocusedItem + LISTVIEW_GetCountPerColumn(infoPtr); + { + INT topidx = LISTVIEW_GetTopIndex(infoPtr); + INT cnt = LISTVIEW_GetCountPerColumn(infoPtr); + if (infoPtr->nFocusedItem == topidx + cnt - 1) + nItem = infoPtr->nFocusedItem + cnt - 1; + else + nItem = topidx + cnt - 1; + } else nItem = infoPtr->nFocusedItem + LISTVIEW_GetCountPerColumn(infoPtr) * LISTVIEW_GetCountPerRow(infoPtr); @@ -8058,7 +8104,7 @@ if (!infoPtr->bFocus) return 0; /* send NM_KILLFOCUS notification */ - notify(infoPtr, NM_KILLFOCUS); + if (!notify(infoPtr, NM_KILLFOCUS)) return 0; /* if we have a focus rectagle, get rid of it */ LISTVIEW_ShowFocusRect(infoPtr, FALSE); @@ -8091,14 +8137,14 @@ TRACE("(key=%hu, X=%hu, Y=%hu)\n", wKey, x, y); /* send NM_RELEASEDCAPTURE notification */ - notify(infoPtr, NM_RELEASEDCAPTURE); + if (!notify(infoPtr, NM_RELEASEDCAPTURE)) return 0; htInfo.pt.x = x; htInfo.pt.y = y; /* send NM_DBLCLK notification */ LISTVIEW_HitTest(infoPtr, &htInfo, TRUE, FALSE); - notify_click(infoPtr, NM_DBLCLK, &htInfo); + if (!notify_click(infoPtr, NM_DBLCLK, &htInfo)) return 0; /* To send the LVN_ITEMACTIVATE, it must be on an Item */ if(htInfo.iItem != -1) notify_itemactivate(infoPtr,&htInfo); @@ -8128,7 +8174,7 @@ TRACE("(key=%hu, X=%hu, Y=%hu)\n", wKey, x, y); /* send NM_RELEASEDCAPTURE notification */ - notify(infoPtr, NM_RELEASEDCAPTURE); + if (!notify(infoPtr, NM_RELEASEDCAPTURE)) return 0; if (!infoPtr->bFocus) SetFocus(infoPtr->hwndSelf); @@ -8171,7 +8217,7 @@ { if (bGroupSelect) { - LISTVIEW_AddGroupSelection(infoPtr, nItem); + if (!LISTVIEW_AddGroupSelection(infoPtr, nItem)) return 0; LISTVIEW_SetItemFocus(infoPtr, nItem); infoPtr->nSelectionMark = nItem; } @@ -8246,7 +8292,7 @@ /* send NM_CLICK notification */ LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, FALSE); - notify_click(infoPtr, NM_CLICK, &lvHitTestInfo); + if (!notify_click(infoPtr, NM_CLICK, &lvHitTestInfo)) return 0; /* set left button flag */ infoPtr->bLButtonDown = FALSE; @@ -8321,6 +8367,7 @@ static LRESULT LISTVIEW_HeaderNotification(LISTVIEW_INFO *infoPtr, const NMHEADERW *lpnmh) { UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; + HWND hwndSelf = infoPtr->hwndSelf; TRACE("(lpnmh=%p)\n", lpnmh); @@ -8334,6 +8381,8 @@ case HDN_ITEMCHANGEDW: case HDN_ITEMCHANGEDA: notify_forward_header(infoPtr, lpnmh); + if (!IsWindow(hwndSelf)) + break; /* Fall through */ case HDN_TRACKW: case HDN_TRACKA: @@ -8564,7 +8613,7 @@ TRACE("(key=%hu,X=%hu,Y=%hu)\n", wKey, x, y); /* send NM_RELEASEDCAPTURE notification */ - notify(infoPtr, NM_RELEASEDCAPTURE); + if (!notify(infoPtr, NM_RELEASEDCAPTURE)) return 0; /* send NM_RDBLCLK notification */ lvHitTestInfo.pt.x = x; @@ -8595,7 +8644,7 @@ TRACE("(key=%hu,X=%hu,Y=%hu)\n", wKey, x, y); /* send NM_RELEASEDCAPTURE notification */ - notify(infoPtr, NM_RELEASEDCAPTURE); + if (!notify(infoPtr, NM_RELEASEDCAPTURE)) return 0; /* make sure the listview control window has the focus */ if (!infoPtr->bFocus) SetFocus(infoPtr->hwndSelf); @@ -8651,7 +8700,7 @@ lvHitTestInfo.pt.x = x; lvHitTestInfo.pt.y = y; LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, FALSE); - notify_click(infoPtr, NM_RCLICK, &lvHitTestInfo); + if (!notify_click(infoPtr, NM_RCLICK, &lvHitTestInfo)) return 0; /* Change to screen coordinate for WM_CONTEXTMENU */ pt = lvHitTestInfo.pt; @@ -8714,7 +8763,7 @@ if (infoPtr->bFocus) return 0; /* send NM_SETFOCUS notification */ - notify(infoPtr, NM_SETFOCUS); + if (!notify(infoPtr, NM_SETFOCUS)) return 0; /* set window focus flag */ infoPtr->bFocus = TRUE; _____ Modified: trunk/reactos/lib/comctl32/rebar.c --- trunk/reactos/lib/comctl32/rebar.c 2005-10-27 18:56:27 UTC (rev 18792) +++ trunk/reactos/lib/comctl32/rebar.c 2005-10-27 19:01:29 UTC (rev 18793) @@ -1277,7 +1277,7 @@ static VOID REBAR_MoveChildWindows (REBAR_INFO *infoPtr, UINT start, UINT endplus) { - const static WCHAR strComboBox[] = { 'C','o','m','b','o','B','o','x',0 }; + static const WCHAR strComboBox[] = { 'C','o','m','b','o','B','o','x',0 }; REBAR_BAND *lpBand; WCHAR szClassName[40]; UINT i; _____ Modified: trunk/reactos/lib/comctl32/status.c --- trunk/reactos/lib/comctl32/status.c 2005-10-27 18:56:27 UTC (rev 18792) +++ trunk/reactos/lib/comctl32/status.c 2005-10-27 19:01:29 UTC (rev 18793) @@ -96,7 +96,7 @@ #define VERT_BORDER 2 #define HORZ_GAP 2 -const static WCHAR themeClass[] = { 'S','t','a','t','u','s',0 }; +static const WCHAR themeClass[] = { 'S','t','a','t','u','s',0 }; /* prototype */ static void _____ Modified: trunk/reactos/lib/comctl32/tab.c --- trunk/reactos/lib/comctl32/tab.c 2005-10-27 18:56:27 UTC (rev 18792) +++ trunk/reactos/lib/comctl32/tab.c 2005-10-27 19:01:29 UTC (rev 18793) @@ -1275,7 +1275,10 @@ infoPtr->uNumRows = curItemRowCount; /* Arrange all tabs evenly if style says so */ - if (!(lStyle & TCS_RAGGEDRIGHT) && ((lStyle & TCS_MULTILINE) || (lStyle & TCS_VERTICAL)) && (infoPtr->uNumItem > 0)) + if (!(lStyle & TCS_RAGGEDRIGHT) && + ((lStyle & TCS_MULTILINE) || (lStyle & TCS_VERTICAL)) && + (infoPtr->uNumItem > 0) && + (infoPtr->uNumRows > 1)) { INT tabPerRow,remTab,iRow; UINT iItm; @@ -2022,7 +2025,7 @@ if ((theme = GetWindowTheme (infoPtr->hwnd)) && ((lStyle & (TCS_VERTICAL | TCS_BOTTOM)) == 0)) { - const static int partIds[8] = { + static const int partIds[8] = { /* Normal item */ TABP_TABITEM, TABP_TABITEMLEFTEDGE, _____ Modified: trunk/reactos/lib/comctl32/theming.c --- trunk/reactos/lib/comctl32/theming.c 2005-10-27 18:56:27 UTC (rev 18792) +++ trunk/reactos/lib/comctl32/theming.c 2005-10-27 19:01:29 UTC (rev 18793) @@ -26,6 +26,7 @@ #include "wingdi.h" #include "winuser.h" #include "comctl32.h" +#include "uxtheme.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(theming); @@ -91,7 +92,7 @@ MAKE_SUBCLASS_PROC(3) MAKE_SUBCLASS_PROC(4) -const static WNDPROC subclassProcs[NUM_SUBCLASSES] = { +static const WNDPROC subclassProcs[NUM_SUBCLASSES] = { subclass_proc0, subclass_proc1, subclass_proc2, @@ -113,6 +114,8 @@ static const WCHAR refDataPropName[] = { 'C','C','3','2','T','h','e','m','i','n','g','D','a','t','a',0 }; + if (!IsThemeActive()) return; + atSubclassProp = GlobalAddAtomW (subclassPropName); atRefDataProp = GlobalAddAtomW (refDataPropName); @@ -154,6 +157,9 @@ void THEMING_Uninitialize (void) { int i; + + if (!atSubclassProp) return; /* not initialized */ + for (i = 0; i < NUM_SUBCLASSES; i++) { UnregisterClassW (subclasses[i].className, NULL); _____ Modified: trunk/reactos/lib/comctl32/toolbar.c --- trunk/reactos/lib/comctl32/toolbar.c 2005-10-27 18:56:27 UTC (rev 18792) +++ trunk/reactos/lib/comctl32/toolbar.c 2005-10-27 19:01:29 UTC (rev 18793) @@ -1854,7 +1854,7 @@ nRunIndex = nIndex - 1; while (nRunIndex >= 0) { btnPtr = &infoPtr->buttons[nRunIndex]; - if ((btnPtr->fsStyle & BTNS_CHECKGROUP) == BTNS_CHECKGROUP) { + if ((btnPtr->fsStyle & BTNS_GROUP) == BTNS_GROUP) { if (btnPtr->fsState & TBSTATE_CHECKED) return nRunIndex; } @@ -1867,7 +1867,7 @@ nRunIndex = nIndex + 1; while (nRunIndex < infoPtr->nNumButtons) { btnPtr = &infoPtr->buttons[nRunIndex]; - if ((btnPtr->fsStyle & BTNS_CHECKGROUP) == BTNS_CHECKGROUP) { + if ((btnPtr->fsStyle & BTNS_GROUP) == BTNS_GROUP) { if (btnPtr->fsState & TBSTATE_CHECKED) return nRunIndex; }

18 years, 11 months

[gvg] 18792: Sync to Wine-0_9:

by gvg＠svn.reactos.com

Sync to Wine-0_9: Alexandre Julliard <julliard(a)winehq.org> - Default search path for an include file should be based on the path of the parent source file, not the current directory. - Add current directory to default include path. - Set the version we report in wmc and wrc from the global Wine version. - Put Wine version information in all the man pages. Deleted: trunk/reactos/tools/wrc/Makefile.in Modified: trunk/reactos/tools/wrc/wrc.c Modified: trunk/reactos/tools/wrc/wrc.h Deleted: trunk/reactos/tools/wrc/wrc.man _____ Deleted: trunk/reactos/tools/wrc/Makefile.in --- trunk/reactos/tools/wrc/Makefile.in 2005-10-27 18:32:01 UTC (rev 18791) +++ trunk/reactos/tools/wrc/Makefile.in 2005-10-27 18:56:27 UTC (rev 18792) @@ -1,52 +0,0 @@ -DEFS = -DINCLUDEDIR="\"$(includedir)\"" -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -LEXOPT = -Cf #-w -b -EXEEXT = @EXEEXT@ - -PROGRAMS = wrc$(EXEEXT) -MODULE = none - -C_SRCS = \ - dumpres.c \ - genres.c \ - newstruc.c \ - readres.c \ - translation.c \ - utils.c \ - wrc.c \ - writeres.c - -EXTRA_SRCS = parser.y parser.l -EXTRA_OBJS = parser.tab.o @LEX_OUTPUT_ROOT@.o - -all: $(PROGRAMS) - -@MAKE_RULES@ - -wrc$(EXEEXT): $(OBJS) $(LIBDIR)/wpp/libwpp.a - $(CC) $(CFLAGS) -o $@ $(OBJS) -L$(LIBDIR) -lwpp -lwine_unicode -lwine_port $(LEXLIB) $(LDFLAGS) - -parser.tab.c parser.tab.h: parser.y - $(BISON) -d -t $(SRCDIR)/parser.y -o parser.tab.c - -# hack to allow parallel make -parser.tab.h: parser.tab.c -parser.tab.o: parser.tab.h - -@LEX_OUTPUT_ROOT@.c: parser.l - $(LEX) $(LEXOPT) -d -8 $(SRCDIR)/parser.l - -@LEX_OUTPUT_ROOT@.o: parser.tab.h - -install:: $(PROGRAMS) - $(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext) - $(INSTALL_DATA) $(SRCDIR)/wrc.man $(mandir)/man$(prog_manext)/wrc.$(prog_manext) - $(INSTALL_PROGRAM) wrc$(EXEEXT) $(bindir)/wrc$(EXEEXT) - -uninstall:: - $(RM) $(bindir)/wrc$(EXEEXT) $(mandir)/man$(prog_manext)/wrc.$(prog_manext) - -### Dependencies: _____ Modified: trunk/reactos/tools/wrc/wrc.c --- trunk/reactos/tools/wrc/wrc.c 2005-10-27 18:32:01 UTC (rev 18791) +++ trunk/reactos/tools/wrc/wrc.c 2005-10-27 18:56:27 UTC (rev 18792) @@ -102,7 +102,7 @@ "with -o, then the output is written to \"wrc.tab.res\"\n" ; -static const char version_string[] = "Wine Resource Compiler Version " WRC_FULLVERSION "\n" +static const char version_string[] = "Wine Resource Compiler version " PACKAGE_VERSION "\n" "Copyright 1998-2000 Bertho A. Stultiens\n" " 1994 Martin von Loewis\n"; @@ -197,6 +197,32 @@ { 0, 0, 0, 0 } }; +static void set_version_defines(void) +{ + char *version = xstrdup( PACKAGE_VERSION ); + char *major, *minor, *patchlevel; + char buffer[100]; + + if ((minor = strchr( version, '.' ))) + { + major = version; + *minor++ = 0; + if ((patchlevel = strchr( minor, '.' ))) *patchlevel++ = 0; + } + else /* pre 0.9 version */ + { + major = NULL; + patchlevel = version; + } + sprintf( buffer, "__WRC__=%s", major ? major : "0" ); + wpp_add_cmdline_define(buffer); + sprintf( buffer, "__WRC_MINOR__=%s", minor ? minor : "0" ); + wpp_add_cmdline_define(buffer); + sprintf( buffer, "__WRC_PATCHLEVEL__=%s", patchlevel ? patchlevel : "0" ); + wpp_add_cmdline_define(buffer); + free( version ); +} + int main(int argc,char *argv[]) { extern char* optarg; @@ -214,14 +240,12 @@ now = time(NULL); /* Set the default defined stuff */ - wpp_add_cmdline_define("__WRC__=" WRC_EXP_STRINGIZE(WRC_MAJOR_VERSION)); - wpp_add_cmdline_define("__WRC_MINOR__=" WRC_EXP_STRINGIZE(WRC_MINOR_VERSION)); - wpp_add_cmdline_define("__WRC_MICRO__=" WRC_EXP_STRINGIZE(WRC_MICRO_VERSION)); - wpp_add_cmdline_define("__WRC_PATCH__=" WRC_EXP_STRINGIZE(WRC_MICRO_VERSION)); - + set_version_defines(); wpp_add_cmdline_define("RC_INVOKED=1"); wpp_add_cmdline_define("__WIN32__=1"); wpp_add_cmdline_define("__FLAT__=1"); + /* Microsoft RC always searches current directory */ + wpp_add_include_path("."); /* First rebuild the commandline to put in destination */ /* Could be done through env[], but not all OS-es support it */ _____ Modified: trunk/reactos/tools/wrc/wrc.h --- trunk/reactos/tools/wrc/wrc.h 2005-10-27 18:32:01 UTC (rev 18791) +++ trunk/reactos/tools/wrc/wrc.h 2005-10-27 18:56:27 UTC (rev 18792) @@ -25,17 +25,6 @@ #include "wrctypes.h" -#define WRC_MAJOR_VERSION 1 -#define WRC_MINOR_VERSION 1 -#define WRC_MICRO_VERSION 9 -#define WRC_RELEASEDATE "(31-Dec-2000)" - -#define WRC_STRINGIZE(a) #a -#define WRC_EXP_STRINGIZE(a) WRC_STRINGIZE(a) -#define WRC_VERSIONIZE(a,b,c) WRC_STRINGIZE(a) "." WRC_STRINGIZE(b) "." WRC_STRINGIZE(c) -#define WRC_VERSION WRC_VERSIONIZE(WRC_MAJOR_VERSION, WRC_MINOR_VERSION, WRC_MICRO_VERSION) -#define WRC_FULLVERSION WRC_VERSION " " WRC_RELEASEDATE - /* From wrc.c */ extern int debuglevel; #define DEBUGLEVEL_NONE 0x0000 _____ Deleted: trunk/reactos/tools/wrc/wrc.man --- trunk/reactos/tools/wrc/wrc.man 2005-10-27 18:32:01 UTC (rev 18791) +++ trunk/reactos/tools/wrc/wrc.man 2005-10-27 18:56:27 UTC (rev 18792) @@ -1,199 +0,0 @@ -.TH WRC 1 "August 24, 2000" "Version 1.1.8" "Wine Resource Compiler" -.SH NAME -wrc \- Wine Resource Compiler -.SH SYNOPSIS -.BI "wrc " "[options] " "[inputfile]" -.SH DESCRIPTION -.B wrc -compiles resources from \fBinputfile\fR -into win16 and win32 compatible binary format. -.PP -The source\-file is preprocessed with a builtin ANSI\-C compatible -preprocessor before the resources are compiled. See \fBPREPROCESSOR\fR -below. -.PP -.B wrc -takes only one \fBinputfile\fR as argument. The resources are read from -standard input if no inputfile is given. If the output file is not -specified with \fI-o\fR, then \fBwrc\fR will write the output to -\fBinputfile.res\fR with \fB.rc\fR stripped, or to \fBwrc.tab.res\fR if -no inputfile was given. -.SH OPTIONS -.TP -.I \fB\-\-debug\fR=\fInn\fR -Set debug level to \fInn\fR. The value is a bitmask consisting of -1=verbose, 2=dump internals, 4=resource parser trace, 8=preprocessor -messages, 16=preprocessor scanner and 32=preprocessor parser trace. -.TP -.I \fB\-\-endianess\fR=\fIe\fR -Win32 only; set output byte\-ordering, where \fIe\fR is one of n[ative], -l[ittle] or b[ig]. Only resources in source-form can be reorderd. Native -ordering depends on the system on which \fBwrc\fR was built. You can see -the native ordering by typing \fIwrc \-h\fR. -.TP -.I \fB\-D\fR, \fB\-\-define\fR=\fIid[=val]\fR -Define preprocessor identifier \fIid\fR to (optionally) value \fIval\fR. -See also -.B PREPROCESSOR -below. -.TP -.I \fB\-E\fR -Preprocess only. The output is written to standard output if no -outputfile was selected. The output is compatible with what gcc would -generate. -.TP -.I \fB\-F\fR, \fB\-\-target\fR -Ignored for compatibility with \fIwindres\fR. -.TP -.I \fB\-h\fR, \fB\-\-help\fR -Prints a summary message and exits. -.TP -.I \fB\-i\fR, \fB\-\-input\fR=\fIfile\fR -The name of the input file. If this option is not used, then \fBwrc\fR -will use the first non-option argument as the input file name. If there -are no non-option arguments, then \fBwrc\fR will read from standard input. -.TP -.I \fB\-I\fR, \fB\-\-include\-dir\fR=\fIfile\fR -Add \fIpath\fR to include search directories. \fIPath\fR may contain -multiple directories, separated with ':'. It is allowed to specify -\fI\-I\fR multiple times. Include files are searched in the order in -with the \fI\-I\fR options were specified. -.br -The search is compatible with gcc, in which '<>' quoted filenames are -searched exclusively via the \fI\-I\fR set path, whereas the '""' quoted -filenames are first tried to be opened in the current directory. Also -resource statements with file references are located in the same way. -.TP -.I \fB\-J\fR, \fB\-\-input\-format\fR=\fIformat\fR -Sets the input format. Valid options are 'rc' or 'rc16'. Setting the -input to 'rc16' disables the recognition of win32 keywords. -.TP -.I \fB\-l\fR, \fB\-\-language\fR=\fIlan\fR -Set default language to \fIlan\fR. Default is the neutral language 0 -(i.e. "LANGUAGE 0, 0"). -.TP -.I \fB\-\-nostdinc\fR -Do not search the standard include path, look for include files only -in the directories explicitly specified with the \fI\-I\fR option. -.TP -.I \fB\-\-no\-use\-temp\-file\fR -Ignored for compatibility with \fIwindres\fR. -.TP -.I \fB\-o\fR, \fB\-fo\fR, \fB\-\-output\fR=\fIfile\fR -Write output to \fIfile\fR. Default is \fBinputfile.res\fR -with \fB.rc\fR stripped or \fBwrc.tab.res\fR if input is read -from standard input. -.TP -.I \fB\-O\fR, \fB\-\-output\-format\fR=\fIformat\fR -Sets the output format. The supported formats are 'res' and 'res16'. -If this option is not specified, format defaults to 'res'. -.TP -.I \fB\-\-pedantic\fR -Enable pedantic warnings. Notably redefinition of #define statements can -be discovered with this option. -.TP -.I \fB\-r\fR -Ignored for compatibility with \fIrc\fR. -.TP -.I \fB\-\-preprocessor\fR=\fIprogram\fR -This option may be used to specify the preprocessor to use, including any -leading arguments. If not specified, \fBwrc\fR uses its builtin processor. -To disable preprocessing, use \fB--preprocessor=cat\fR. -.TP -.I \fB\-U\fR, \fB\-\-undefine\fR=\fIid\fR -Undefine preprocessor identifier \fIid\fR. Please note that only macros -defined up to this point are undefined by this command. However, these -include the special macros defined automatically by \fIwrc\fR. -See also -.B PREPROCESSOR -below. -.TP -.I \fB\-\-use\-temp\-file\fR -Ignored for compatibility with \fIwindres\fR. -.TP -.I \fB\-v\fR, \fB\-\-verbose\fR -Turns on verbose mode (equivalent to -d 1). -.TP -.I \fB\-\-version\fR -Print version end exit. -.SH PREPROCESSOR -The preprocessor is ANSI\-C compatible with some of the extensions of -the gcc preprocessor. -.PP -The preprocessor recognizes these directives: #include, #define (both -simple and macro), #undef, #if, #ifdef, #ifndef, #elif, #else, #endif, -#error, #warning, #line, # (both null\- and line\-directive), #pragma -(ignored), #ident (ignored). -.PP -The preprocessor sets by default several defines: -.br -RC_INVOKED set to 1 -.br -__WRC__ Major version of wrc -.br -__WRC_MINOR__ Minor version of wrc -.br -__WRC_MICRO__ Patch level -.br -__WRC_PATCH__ Same as __WRC_MICRO__ -.PP -Win32 compilation mode also sets __WIN32__ to 1 and __FLAT__ to 1. -.PP -Special macros __FILE__, __LINE__, __TIME__ and __DATE__ are also -recognized and expand to their respective equivalent. -.SH "LANGUAGE SUPPORT" -Language, version and characteristics can be bound to all resource types that -have inline data, such as RCDATA. This is an extension to Microsoft's resource -compiler, which lacks this support completely. Only VERSIONINFO cannot have -version and characteristics attached, but languages are propagated properly if -you declare it correctly before the VERSIONINFO resource starts. -.PP -Example: -.PP -1 RCDATA DISCARDABLE -.br -LANGUAGE 1, 0 -.br -VERSION 312 -.br -CHARACTERISTICS 876 -.br -{ -.br - 1, 2, 3, 4, 5, "and whatever more data you want" -.br - '00 01 02 03 04 05 06 07 08' -.br -} -.SH AUTHORS -.B wrc -was written by Bertho A. Stultiens and is a nearly complete rewrite of -the first wine resource compiler (1994) by Martin von Loewis. -Additional resource\-types were contributed Ulrich Czekalla and Albert -den Haan. Many cleanups by Dimitrie O. Paun in 2002-2003. -Bugfixes have been contributed by many Wine developers. -.SH BUGS -\- The preprocessor recognizes variable argument macros, but does not -expanded them correctly. -.br -\- Error reporting should be more precise, as currently the column and -line number reported are those of the next token. -.br -\- Default memory options should differ between win16 and win32. -.PP -There is no support for: -.br -\- RT_DLGINCLUDE, RT_VXD, RT_PLUGPLAY and RT_HTML (unknown format) -.br -\- PUSHBOX control is unsupported due to lack of original functionality. -.PP -Fonts are parsed and generated, but there is no support for the -generation of the FONTDIR yet. The user must supply the FONTDIR -resource in the source to match the FONT resources. -.SH AVAILABILITY -.B wrc -is part of the Wine distribution, which is available through -WineHQ, the Wine development headquarters, at -.I http://www.winehq.org/. -.SH "SEE ALSO" -.BR wine (1)

18 years, 11 months

[gvg] 18791: Sync to Wine-0_9:

by gvg＠svn.reactos.com

Sync to Wine-0_9: Robert Lunnon <bobl(a)optushome.com.au> - Remove SVR4 specific pseudo-ops. Alexandre Julliard <julliard(a)winehq.org> - Put Wine version information in all the man pages. - Fixed some nroff warnings. - Added global rules for man pages. Simon Richter <Simon.Richter(a)hogyros.de> - Fix winebuild's ppc assembly generation. Modified: trunk/reactos/tools/winebuild/Makefile.in Modified: trunk/reactos/tools/winebuild/import.c Modified: trunk/reactos/tools/winebuild/utils.c Modified: trunk/reactos/tools/winebuild/winebuild.man.in _____ Modified: trunk/reactos/tools/winebuild/Makefile.in --- trunk/reactos/tools/winebuild/Makefile.in 2005-10-27 18:18:40 UTC (rev 18790) +++ trunk/reactos/tools/winebuild/Makefile.in 2005-10-27 18:32:01 UTC (rev 18791) @@ -5,6 +5,7 @@ EXEEXT = @EXEEXT@ PROGRAMS = winebuild$(EXEEXT) +MANPAGES = winebuild.man MODULE = none C_SRCS = \ @@ -18,17 +19,14 @@ spec32.c \ utils.c -all: $(PROGRAMS) winebuild.man +all: $(PROGRAMS) $(MANPAGES) @MAKE_RULES@ winebuild$(EXEEXT): $(OBJS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBPORT) $(LDFLAGS) -winebuild.man: winebuild.man.in - sed -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' $(SRCDIR)/winebuild.man.in >$@ || ($(RM) $@ && false) - -install:: $(PROGRAMS) winebuild.man +install:: $(PROGRAMS) $(MANPAGES) $(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext) $(INSTALL_PROGRAM) winebuild$(EXEEXT) $(bindir)/winebuild$(EXEEXT) $(INSTALL_DATA) winebuild.man $(mandir)/man$(prog_manext)/winebuild.$(prog_manext) @@ -36,7 +34,4 @@ uninstall:: $(RM) $(bindir)/winebuild$(EXEEXT) $(mandir)/man$(prog_manext)/winebuild.$(prog_manext) -clean:: - $(RM) winebuild.man - ### Dependencies: _____ Modified: trunk/reactos/tools/winebuild/import.c --- trunk/reactos/tools/winebuild/import.c 2005-10-27 18:18:40 UTC (rev 18790) +++ trunk/reactos/tools/winebuild/import.c 2005-10-27 18:32:01 UTC (rev 18791) @@ -720,7 +720,7 @@ } else { - fprintf( outfile, "\tlis %s, (%s+%d)@hi\n", ppc_reg(9), table, pos ); + fprintf( outfile, "\tlis %s, (%s+%d)@h\n", ppc_reg(9), table, pos ); fprintf( outfile, "\tla %s, (%s+%d)@l(%s)\n", ppc_reg(8), table, pos, ppc_reg(9) ); } fprintf( outfile, "\tlwz %s, 0(%s)\n", ppc_reg(7), ppc_reg(8) ); _____ Modified: trunk/reactos/tools/winebuild/utils.c --- trunk/reactos/tools/winebuild/utils.c 2005-10-27 18:18:40 UTC (rev 18790) +++ trunk/reactos/tools/winebuild/utils.c 2005-10-27 18:32:01 UTC (rev 18791) @@ -515,9 +515,6 @@ case PLATFORM_WINDOWS: sprintf( buffer, ".def _%s; .scl 2; .type 32; .endef", func ); break; - case PLATFORM_SVR4: - sprintf( buffer, ".type %s,2", func ); - break; default: sprintf( buffer, ".type %s,@function", func ); break; @@ -574,7 +571,6 @@ switch (target_platform) { case PLATFORM_APPLE: - case PLATFORM_SVR4: return ".asciz"; default: return ".string"; @@ -585,7 +581,6 @@ { switch (target_platform) { - case PLATFORM_SVR4: return ".half"; default: return ".short"; } } _____ Modified: trunk/reactos/tools/winebuild/winebuild.man.in --- trunk/reactos/tools/winebuild/winebuild.man.in 2005-10-27 18:18:40 UTC (rev 18790) +++ trunk/reactos/tools/winebuild/winebuild.man.in 2005-10-27 18:32:01 UTC (rev 18791) @@ -1,5 +1,5 @@ .\" -*- nroff -*- -.TH WINEBUILD 1 "September 2005" "@PACKAGE_STRING@" "Wine dll builder" +.TH WINEBUILD 1 "October 2005" "@PACKAGE_STRING@" "Wine Developers Manual" .SH NAME winebuild \- Wine dll builder .SH SYNOPSIS @@ -20,10 +20,10 @@ .TP .BI \--dll Build an assembly file from a .spec file (see \fBSPEC FILE SYNTAX\fR -for details), or from a standard Windows .def file. The -.spec/.def file is specified via the -E option. The resulting file -must be assembled and linked to the other object files to build a -working Wine dll. In this mode, the +for details), or from a standard Windows .def file. The .spec/.def +file is specified via the -E option. The resulting file must be +assembled and linked to the other object files to build a working Wine +dll. In this mode, the .I input files should be the list of all object files that will be linked into the final dll, to allow

18 years, 11 months

[mf] 18790: update change list for 0.2.8 release

by mf＠svn.reactos.com

update change list for 0.2.8 release Modified: trunk/reactos/subsys/system/explorer/doc/changes.txt _____ Modified: trunk/reactos/subsys/system/explorer/doc/changes.txt --- trunk/reactos/subsys/system/explorer/doc/changes.txt 2005-10-27 18:06:50 UTC (rev 18789) +++ trunk/reactos/subsys/system/explorer/doc/changes.txt 2005-10-27 18:18:40 UTC (rev 18790) @@ -162,3 +162,5 @@ m. fuchs use GET_X_LPARAM macro in WM_MOUSEMOVE handlers m. fuchs leave TrackStartmenu() function when executing any start menu command 06.10.2005 m. fuchs implemented command line parser for Explorer +09.10.2005 m. fuchs Fix for Bugzilla Entry 330: Correctly handle WM_COMMAND messages in web windows without web control + m. fuchs replace "search computer" start menu entry by a "not yet implemented" message

18 years, 11 months

← Newer
1
...
10
11
12
13
14
15
16
...
74
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 October 2005