Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 37317: - Fix CID 1380 and 1382 (Run 2)
by cgutman＠svn.reactos.org 12 Nov '08

12 Nov '08

Author: cgutman Date: Wed Nov 12 14:26:29 2008 New Revision: 37317 URL: http://svn.reactos.org/svn/reactos?rev=37317&view=rev Log: - Fix CID 1380 and 1382 (Run 2) Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Wed Nov 12 14:26:29 2008 @@ -841,7 +841,7 @@ PTRANSPORT_CONTEXT TranContext; TDI_REQUEST Request; NTSTATUS Status; - ULONG BytesReceived; + ULONG BytesReceived = 0; TI_DbgPrint(DEBUG_IRP, ("Called.\n")); @@ -918,7 +918,7 @@ PTDI_REQUEST_KERNEL_SEND SendInfo; PTRANSPORT_CONTEXT TranContext; NTSTATUS Status; - ULONG BytesSent; + ULONG BytesSent = 0; TI_DbgPrint(DEBUG_IRP, ("Called.\n"));

1 0

[mkupfer] 37316: - add and enable partition creation and file system selection dialog
by mkupfer＠svn.reactos.org 12 Nov '08

12 Nov '08

Author: mkupfer Date: Wed Nov 12 14:00:09 2008 New Revision: 37316 URL: http://svn.reactos.org/svn/reactos?rev=37316&view=rev Log: - add and enable partition creation and file system selection dialog Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc trunk/reactos/base/setup/reactos/reactos.c trunk/reactos/base/setup/reactos/resource.h Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/en… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] Wed Nov 12 14:00:09 2008 @@ -64,6 +64,22 @@ LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180 ,277, 20 END +IDD_PARTITION DIALOGEX DISCARDABLE 0, 0, 145, 90 +STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME +CAPTION "Create Partition" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",IDC_UPDOWN1,"msctls_updown32", WS_VISIBLE,104,22,9,13 + CONTROL "Create and format partition",IDC_STATIC,"Button",BS_GROUPBOX,7,5,129,57 + LTEXT "Size:",IDC_STATIC, 13,24,27,9 + EDITTEXT IDC_PARTSIZE,52,23,53,13, WS_VISIBLE|WS_TABSTOP + LTEXT "GB",IDC_UNIT, 117,24,14,9 + LTEXT "Filesystem:",IDC_STATIC,13,46,35,9 + CONTROL "",IDC_FSTYPE,"ComboBox",WS_VISIBLE|WS_TABSTOP|CBS_DROPDOWNLIST,52,42,79,50 + PUSHBUTTON "&OK",IDOK,35,68,47,15, WS_VISIBLE|WS_TABSTOP + PUSHBUTTON "&Cancel",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP +END + IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME CAPTION "Advanced Partition Settings" Modified: trunk/reactos/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Wed Nov 12 14:00:09 2008 @@ -544,7 +544,30 @@ return FALSE; } - +static INT_PTR CALLBACK +PartitionDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + break; + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDOK: + EndDialog(hwndDlg, IDOK); + break; + case IDCANCEL: + EndDialog(hwndDlg, IDCANCEL); + break; + } + } + return FALSE; +} + static INT_PTR CALLBACK DriveDlgProc(HWND hwndDlg, UINT uMsg, @@ -613,6 +636,11 @@ case IDC_PARTMOREOPTS: DialogBox(hInstance,MAKEINTRESOURCE(IDD_BOOTOPTIONS),hwndDlg,MoreOptDlgProc); break; + case IDC_PARTCREATE: + DialogBox(hInstance,MAKEINTRESOURCE(IDD_PARTITION),hwndDlg,PartitionDlgProc); + break; + case IDC_PARTDELETE: + break; } } Modified: trunk/reactos/base/setup/reactos/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/resourc… ============================================================================== --- trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] Wed Nov 12 14:00:09 2008 @@ -51,6 +51,11 @@ #define IDC_ACTION 2040 #define IDC_PARTMOREOPTS 2041 #define IDD_BOOTOPTIONS 2042 +#define IDD_PARTITION 2043 +#define IDC_UPDOWN1 2044 +#define IDC_PARTSIZE 2045 +#define IDC_UNIT 2046 +#define IDC_FSTYPE 2047 #define IDI_MAIN 3000

1 0

[hyperion] 37315: added include/reactos/libs/pseh/pseh2.h added lib/pseh/framebased-gcchack.c added lib/pseh/i386/framebased-gcchack.S modified lib/pseh/pseh.rbuild Introducing PSEH 2.0. It only wants to be loved. Highlights of this version: - PSEH 2.0 syntax is 99% compatible with native SEH syntax - PSEH 2.0 binary code a vast improvement over 1.1 - no more setjmp, no bogus loops, no weird optimizer behavior PSEH 2.0 is a horrible, GCC-only, x86-only hack. It makes several non-portable assumpt
by hyperion＠svn.reactos.org 12 Nov '08

12 Nov '08

Author: hyperion Date: Wed Nov 12 13:52:16 2008 New Revision: 37315 URL: http://svn.reactos.org/svn/reactos?rev=37315&view=rev Log: added include/reactos/libs/pseh/pseh2.h added lib/pseh/framebased-gcchack.c added lib/pseh/i386/framebased-gcchack.S modified lib/pseh/pseh.rbuild Introducing PSEH 2.0. It only wants to be loved. Highlights of this version: - PSEH 2.0 syntax is 99% compatible with native SEH syntax - PSEH 2.0 binary code a vast improvement over 1.1 - no more setjmp, no bogus loops, no weird optimizer behavior PSEH 2.0 is a horrible, GCC-only, x86-only hack. It makes several non-portable assumptions and hey, did you know __builtin_frame_address(0) is *not* the same thing as EBP? Overall, it must be a world record for compiler abuse PSEH 2.0 is, sadly, not binary-compatible with PSEH 1.1, although I will almost certainly unify the implementation at a later time PSEH 2.0 needs testers. And love. Not implemented yet: returning from a SEH block (i.e. _SEH2_YIELD()) Example of 2.0 syntax (yes, _SEH2_END is unavoidable): _SEH2_TRY { _SEH2_TRY { /* ... */ } _SEH2_EXCEPT((/* ... */)) { /* ... */ } _SEH2_END; } _SEH2_FINALLY { /* ... */ } _SEH2_END; -- Happy early birthday, Aleksey. Added: trunk/reactos/include/reactos/libs/pseh/pseh2.h (with props) trunk/reactos/lib/pseh/framebased-gcchack.c (with props) trunk/reactos/lib/pseh/i386/framebased-gcchack.S (with props) Modified: trunk/reactos/lib/pseh/pseh.rbuild Added: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h (added) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Wed Nov 12 13:52:16 2008 @@ -1,0 +1,359 @@ +/* + Copyright (c) 2008 KJK::Hyperion + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. +*/ + +#ifndef KJK_PSEH2_H_ +#define KJK_PSEH2_H_ + +#ifndef __GNUC__ +#error TODO +#endif + +struct _EXCEPTION_RECORD; +struct _EXCEPTION_POINTERS; +struct _CONTEXT; + +typedef int (__cdecl * _SEHFrameHandler_t) +( + struct _EXCEPTION_RECORD *, + void *, + struct _CONTEXT *, + void * +); + +#if defined(__i386__) +typedef struct __SEHTrampoline +{ + unsigned char STR_MovEcx; + unsigned char STR_Closure[4]; + unsigned char STR_Jmp; + unsigned char STR_Function[4]; +} +_SEHTrampoline_t; + +static +__inline__ +__attribute__((always_inline)) +int _SEHIsTrampoline(_SEHTrampoline_t * trampoline_) +{ + return trampoline_->STR_MovEcx == 0xb9 && trampoline_->STR_Jmp == 0xe9; +} + +static +__inline__ +__attribute__((always_inline)) +void * _SEHFunctionFromTrampoline(_SEHTrampoline_t * trampoline_) +{ + return (void *)(*(int *)(&trampoline_->STR_Function[0]) + (int)(trampoline_ + 1)); +} + +static +__inline__ +__attribute__((always_inline)) +void * _SEHClosureFromTrampoline(_SEHTrampoline_t * trampoline_) +{ + return (void *)*(int *)(&trampoline_->STR_Closure[0]); +} +#else +#error TODO +#endif + +/* A no-op side effect that scares GCC */ +#define __SEH_SIDE_EFFECT __asm__ __volatile__("#") + +/* A no-op without any real side effects, but silences warnings */ +#define __SEH_PRETEND_SIDE_EFFECT (void)0 + +/* Forces GCC to consider the specified label reachable */ +#define __SEH_USE_LABEL(L_) __asm__ __volatile__("# %0\n" : : "i" (&&L_)) + +/* Makes GCC pretend the specified label is reachable, to silence warnings */ +#define __SEH_PRETEND_USE_LABEL(L_) (void)(&&L_) + +/* Forces GCC to emit the specified nested function as a function */ +#define __SEH_USE_NESTED_FUNCTION(F_) (void)(&F_) /* __attribute__((noinline)) seems to do the trick */ + +/* Soft memory barrier */ +#define __SEH_BARRIER __asm__ __volatile__("#":::"memory") + +typedef struct __SEHRegistration +{ + struct __SEHRegistration * SER_Prev; + _SEHFrameHandler_t SER_Handler; +} +_SEHRegistration_t; + +#define __SEH_FORCE_NEST \ + __asm__ __volatile__("#%0" : : "r" (&_SEHFrame)) + +#define __SEH_NESTED_PROLOG \ + __SEH_FORCE_NEST; + +#define __SEH_DECLARE_EXCEPT_PFN(NAME_) int (__cdecl * NAME_)(void *) +#define __SEH_DECLARE_EXCEPT(NAME_) int __cdecl NAME_(void *) +#define __SEH_DEFINE_EXCEPT(NAME_) int __cdecl NAME_(void * _SEHExceptionPointers) + +#define __SEH_DECLARE_FINALLY_PFN(NAME_) void (__cdecl * NAME_)(void) +#define __SEH_DECLARE_FINALLY(NAME_) void __cdecl NAME_(void) +#define __SEH_DEFINE_FINALLY(NAME_) void __cdecl NAME_(void) + +#define __SEH_RETURN_EXCEPT(R_) return (int)(R_) +#define __SEH_RETURN_FINALLY() return + +typedef struct __SEHFrame +{ + _SEHRegistration_t SF_Registration; + volatile struct __SEHTryLevel * volatile SF_TopTryLevel; + void * SF_FramePointer; + void * volatile SF_StackPointer; + volatile unsigned long SF_Code; +} +_SEHFrame_t; + +typedef struct __SEHTryLevel +{ + volatile struct __SEHTryLevel * ST_Next; + void * ST_FramePointer; + void * ST_Filter; + void * ST_Body; +} +_SEHTryLevel_t; + +#define __SEH_BEGIN_TRY \ + { \ + __label__ _SEHBeginTry; \ + __label__ _SEHEndTry; \ + \ + __SEH_USE_LABEL(_SEHBeginTry); \ + __SEH_USE_LABEL(_SEHEndTry); \ + \ + _SEHBeginTry: __SEH_SIDE_EFFECT; \ + { \ + __SEH_BARRIER; + +#define __SEH_END_TRY \ + __SEH_BARRIER; \ + } \ + _SEHEndTry: __SEH_SIDE_EFFECT; \ + } + +#define __SEH_SET_TRYLEVEL(TRYLEVEL_) \ + { \ + __SEH_BARRIER; _SEHFrameP->SF_TopTryLevel = (TRYLEVEL_); __SEH_BARRIER; \ + } + +#define __SEH_ENTER_TRYLEVEL() __SEH_SET_TRYLEVEL(&_SEHTryLevel) +#define __SEH_LEAVE_TRYLEVEL() __SEH_SET_TRYLEVEL(_SEHPrevTryLevelP) + +#define __SEH_END_SCOPE_CHAIN \ + static const int _SEHScopeKind = 1; \ + static _SEHFrame_t * const _SEHFrameP = 0; \ + static _SEHTryLevel_t * const _SEHTryLevelP = 0; + +#define __SEH_BEGIN_SCOPE \ + for(;;) \ + { \ + __label__ _SEHBeginScope; \ + __label__ _SEHEndScope; \ + \ + _SEHBeginScope: __SEH_SIDE_EFFECT; \ + \ + static const int _SEHTopTryLevel = (_SEHScopeKind != 0); \ + _SEHFrame_t * const _SEHCurFrameP = _SEHFrameP; \ + volatile _SEHTryLevel_t * const _SEHPrevTryLevelP = _SEHTryLevelP; \ + \ + (void)_SEHTopTryLevel; \ + (void)_SEHCurFrameP; \ + (void)_SEHPrevTryLevelP; \ + \ + __SEH_USE_LABEL(_SEHBeginScope); \ + __SEH_USE_LABEL(_SEHEndScope); \ + \ + { \ + __label__ _SEHBeforeTry; \ + __label__ _SEHDoTry; \ + __label__ _SEHAfterTry; \ + static const int _SEHScopeKind = 0; \ + _SEHFrame_t _SEHFrame; \ + volatile _SEHTryLevel_t _SEHTryLevel; \ + _SEHFrame_t * const _SEHFrameP = _SEHTopTryLevel ? &_SEHFrame : _SEHCurFrameP; \ + volatile _SEHTryLevel_t * const _SEHTryLevelP = &_SEHTryLevel; \ + \ + (void)_SEHScopeKind; \ + (void)_SEHFrame; \ + (void)_SEHTryLevel; \ + (void)_SEHFrameP; \ + (void)_SEHTryLevelP; \ + \ + _SEHTryLevel.ST_Next = _SEHPrevTryLevelP; \ + goto _SEHBeforeTry; \ + \ + _SEHDoTry:; \ + __SEH_ENTER_TRYLEVEL(); \ + \ + if(_SEHTopTryLevel) \ + { \ + __SEH_BARRIER; __asm__ __volatile__("mov %%ebp, %0\n#%1" : "=m" (_SEHFrame.SF_FramePointer) : "r" (__builtin_frame_address(0))); __SEH_BARRIER; \ + _SEH2EnterFrame(&_SEHFrame); \ + } \ + +#define __SEH_END_SCOPE \ + } \ + \ + _SEHEndScope: __SEH_SIDE_EFFECT; \ + \ + break; \ + } + +#define __SEH_SCOPE_LOCALS \ + __label__ _SEHBeginExcept; \ + __label__ _SEHEndExcept; \ + \ + auto __SEH_DECLARE_EXCEPT(_SEHExcept); \ + auto __SEH_DECLARE_FINALLY(_SEHFinally); + +#define _SEH2_TRY \ + __SEH_BEGIN_SCOPE \ + { \ + __SEH_SCOPE_LOCALS; \ + \ + void _SEHJumpToHandler() { goto _SEHBeginExcept; } \ +\ + __SEH_BEGIN_TRY \ + { + +#define _SEH2_FINALLY \ + } \ + __SEH_END_TRY; \ + \ + goto _SEHAfterTry; \ + _SEHBeforeTry:; \ + \ + __SEH_PRETEND_USE_LABEL(_SEHBeginExcept); \ + __SEH_PRETEND_USE_LABEL(_SEHEndExcept); \ + \ + __SEH_USE_NESTED_FUNCTION(_SEHFinally); \ + \ + _SEHTryLevel.ST_FramePointer = _SEHClosureFromTrampoline((_SEHTrampoline_t *)&_SEHFinally); \ + _SEHTryLevel.ST_Filter = NULL; \ + _SEHTryLevel.ST_Body = _SEHFunctionFromTrampoline((_SEHTrampoline_t *)&_SEHFinally); \ + \ + goto _SEHDoTry; \ + _SEHAfterTry:; \ + \ + if(_SEHTopTryLevel) \ + _SEH2LeaveFrame(); \ + else \ + { \ + __SEH_LEAVE_TRYLEVEL(); \ + } \ + \ + _SEHFinally(); \ + goto _SEHEndExcept; \ + \ + _SEHBeginExcept: __SEH_PRETEND_SIDE_EFFECT; \ + __attribute__((unused)) __SEH_DEFINE_EXCEPT(_SEHExcept) { __SEH_RETURN_EXCEPT(0); } \ + \ + __attribute__((noinline)) __attribute__((used)) __SEH_DEFINE_FINALLY(_SEHFinally) \ + { \ + __SEH_END_SCOPE_CHAIN; \ + \ + (void)_SEHScopeKind; \ + (void)_SEHFrameP; \ + (void)_SEHTryLevelP; \ + \ + __SEH_NESTED_PROLOG; \ + \ + for(;; ({ __SEH_RETURN_FINALLY(); })) \ + { + +#define _SEH2_EXCEPT(E_) \ + } \ + __SEH_END_TRY; \ + \ + goto _SEHAfterTry; \ + \ + _SEHBeforeTry:; \ +\ + __SEH_USE_LABEL(_SEHBeginExcept); \ + __SEH_USE_LABEL(_SEHEndExcept); \ +\ + __SEH_USE_NESTED_FUNCTION(_SEHExcept); \ + \ + _SEHTryLevel.ST_FramePointer = _SEHClosureFromTrampoline((_SEHTrampoline_t *)&_SEHExcept); \ + _SEHTryLevel.ST_Filter = _SEHFunctionFromTrampoline((_SEHTrampoline_t *)&_SEHExcept); \ + _SEHTryLevel.ST_Body = &&_SEHBeginExcept; \ + __SEH_BARRIER; __asm__ __volatile__("mov %%esp, %0" : "=m" (_SEHFrameP->SF_StackPointer)); __SEH_BARRIER; \ +\ + goto _SEHDoTry; \ +\ + __attribute__((noinline)) __attribute__((used)) __SEH_DEFINE_EXCEPT(_SEHExcept) \ + { \ + __SEH_NESTED_PROLOG; \ + __SEH_RETURN_EXCEPT(E_); \ + } \ +\ + __attribute__((unused)) __SEH_DEFINE_FINALLY(_SEHFinally) { __SEH_RETURN_FINALLY(); } \ +\ + _SEHAfterTry:; \ + if(_SEHTopTryLevel) \ + _SEH2LeaveFrame(); \ + else \ + { \ + __SEH_LEAVE_TRYLEVEL(); \ + } \ +\ + goto _SEHEndExcept; \ +\ + _SEHBeginExcept: __SEH_SIDE_EFFECT; \ + { \ + { \ + _SEHFrame_t * const _SEHFrameP = _SEHTopTryLevel ? &_SEHFrame : _SEHCurFrameP; \ + __SEH_BARRIER; + +#define _SEH2_END \ + __SEH_BARRIER; \ + } \ + } \ + _SEHEndExcept: __SEH_SIDE_EFFECT; \ + } \ + __SEH_END_SCOPE; + +#define _SEH2_GetExceptionPointers() ((struct _EXCEPTION_POINTERS *)_SEHExceptionPointers) +#define _SEH2_GetExceptionCode() ((_SEHFrameP)->SF_Code) + +__SEH_END_SCOPE_CHAIN; + +#ifdef __cplusplus +extern "C" +{ +#endif + +extern void __cdecl _SEH2EnterFrame(_SEHFrame_t *); +extern void __cdecl _SEH2LeaveFrame(void); + +#ifdef __cplusplus +} +#endif + +#endif + +/* EOF */ Propchange: trunk/reactos/include/reactos/libs/pseh/pseh2.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/pseh/framebased-gcchack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/framebased-gcchac… ============================================================================== --- trunk/reactos/lib/pseh/framebased-gcchack.c (added) +++ trunk/reactos/lib/pseh/framebased-gcchack.c [iso-8859-1] Wed Nov 12 13:52:16 2008 @@ -1,0 +1,159 @@ +/* + Copyright (c) 2008 KJK::Hyperion + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. +*/ + +#define _NTSYSTEM_ +#define STRICT +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +#include <pseh/pseh2.h> + +#include <excpt.h> + +extern int __SEH2Except(void *, void *, void *); +extern void __SEH2Finally(void *, void *); + +static +__attribute__((always_inline)) +int _SEH2Except(_SEHFrame_t * frame, volatile _SEHTryLevel_t * trylevel, EXCEPTION_POINTERS * ep) +{ + return __SEH2Except(trylevel->ST_Filter, trylevel->ST_FramePointer, ep); +} + +static +__attribute__((noinline)) +void _SEH2Finally(_SEHFrame_t * frame, volatile _SEHTryLevel_t * trylevel) +{ + __SEH2Finally(trylevel->ST_Body, trylevel->ST_FramePointer); +} + +static +void _SEH2LocalUnwind(_SEHFrame_t * frame, volatile _SEHTryLevel_t * dsttrylevel) +{ + volatile _SEHTryLevel_t * trylevel; + + for(trylevel = frame->SF_TopTryLevel; trylevel && trylevel != dsttrylevel; trylevel = trylevel->ST_Next) + { + if(!trylevel->ST_Filter) + _SEH2Finally(frame, trylevel); + } + + frame->SF_TopTryLevel = dsttrylevel; +} + +extern void _SEH2GlobalUnwind(void *); + +static +__attribute__((noreturn)) +void _SEH2Handle(_SEHFrame_t * frame, volatile _SEHTryLevel_t * trylevel) +{ + _SEH2GlobalUnwind(frame); + _SEH2LocalUnwind(frame, trylevel); + + __asm__ __volatile__ + ( + "mov %[frame], %%ebp\n" + "mov %[stack], %%esp\n" + "jmp *%[handler]\n" : + : + [frame] "m" (frame->SF_FramePointer), [stack] "m" (frame->SF_StackPointer), [handler] "r" (trylevel->ST_Body) + ); + + for(;;); +} + +static +int __cdecl _SEH2FrameHandler +( + struct _EXCEPTION_RECORD * ExceptionRecord, + void * EstablisherFrame, + struct _CONTEXT * ContextRecord, + void * DispatcherContext +) +{ + _SEHFrame_t * frame; + + __asm__ __volatile__("cld"); + + frame = EstablisherFrame; + + /* Unwinding */ + if(ExceptionRecord->ExceptionFlags & (4 | 2)) + { + _SEH2LocalUnwind(frame, NULL); + } + /* Handling */ + else + { + int ret = 0; + volatile _SEHTryLevel_t * trylevel; + + frame->SF_Code = ExceptionRecord->ExceptionCode; + + for(trylevel = frame->SF_TopTryLevel; trylevel != NULL; trylevel = trylevel->ST_Next) + { + if(trylevel->ST_Filter) + { + EXCEPTION_POINTERS ep; + + ep.ExceptionRecord = ExceptionRecord; + ep.ContextRecord = ContextRecord; + + ret = _SEH2Except(frame, trylevel, &ep); + + if(ret < 0) + return ExceptionContinueExecution; + else if(ret > 0) + _SEH2Handle(frame, trylevel); + } + } + } + + return ExceptionContinueSearch; +} + +extern +void __cdecl _SEH2EnterFrame(_SEHFrame_t * frame) +{ + frame->SF_Registration.SER_Handler = _SEH2FrameHandler; + frame->SF_Code = 0; + __asm__ __volatile__("movl %%fs:0, %k0\n" : "=q" (frame->SF_Registration.SER_Prev)); + + __SEH_BARRIER; + __asm__ __volatile__("movl %k0, %%fs:0\n" : : "q" (&frame->SF_Registration)); +} + +extern +void __cdecl _SEH2LeaveFrame() +{ + __asm__ __volatile__ + ( + "movl %%fs:0, %%edx\n" + "movl 0(%%edx), %%edx\n" + "movl %%edx, %%fs:0\n" : + : + : + "ecx" + ); +} + +/* EOF */ Propchange: trunk/reactos/lib/pseh/framebased-gcchack.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/pseh/i386/framebased-gcchack.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/framebased-g… ============================================================================== --- trunk/reactos/lib/pseh/i386/framebased-gcchack.S (added) +++ trunk/reactos/lib/pseh/i386/framebased-gcchack.S [iso-8859-1] Wed Nov 12 13:52:16 2008 @@ -1,0 +1,68 @@ +// Copyright (c) 2008 KJK::Hyperion + +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to dos so, subject to the following conditions: + +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. + +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. + +.text +.intel_syntax noprefix + +.globl ___SEH2Except +___SEH2Except: + mov eax, [esp+4] + mov ecx, [esp+8] + + push [esp+12] + call eax + + pop ecx + + ret + +.globl ___SEH2Finally +___SEH2Finally: + mov eax, [esp+4] + mov ecx, [esp+8] + + call eax + + ret + +.globl __SEH2GlobalUnwind +__SEH2GlobalUnwind: + +.extern _RtlUnwind@16 + + push ebx + mov ebx, [esp+8] + push esi + push edi + + push 0 // ReturnValue + push 0 // ExceptionRecord + push .RestoreRegisters // TargetIp + push ebx // TargetFrame + call _RtlUnwind@16 + +.RestoreRegisters: + pop edi + pop esi + pop ebx + + ret + +// EOF Propchange: trunk/reactos/lib/pseh/i386/framebased-gcchack.S ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/pseh/pseh.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/pseh.rbuild?rev=3… ============================================================================== --- trunk/reactos/lib/pseh/pseh.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/pseh.rbuild [iso-8859-1] Wed Nov 12 13:52:16 2008 @@ -4,6 +4,7 @@ <if property="ARCH" value="i386"> <directory name="i386"> <file>framebased.S</file> + <file>framebased-gcchack.S</file> </directory> </if> <if property="ARCH" value="powerpc"> @@ -12,4 +13,5 @@ </directory> </if> <file>framebased.c</file> + <file>framebased-gcchack.c</file> </module>

1 0

[ekohl] 37314: Sync to wine-0.9.61: Oooops, forgot to add these files!! - Rob Shearman <rob@codeweavers.com> Sun, 20 Apr 2008 widl: Stop looping in check_remoting_args when a context_handle or wire_marshal type is found as they are in effect fundamental types. - Rob Shearman <rob@codeweavers.com> Sun, 20 Apr 2008 widl: Check that fields in structures and unions referenced by non-local functions can be marshalled and that their attributes are consistent. -Rob Shearman <rob@codeweavers.com> Sun, 2
by ekohl＠svn.reactos.org 12 Nov '08

12 Nov '08

Author: ekohl Date: Wed Nov 12 13:30:10 2008 New Revision: 37314 URL: http://svn.reactos.org/svn/reactos?rev=37314&view=rev Log: Sync to wine-0.9.61: Oooops, forgot to add these files!! - Rob Shearman <rob(a)codeweavers.com> Sun, 20 Apr 2008 widl: Stop looping in check_remoting_args when a context_handle or wire_marshal type is found as they are in effect fundamental types. - Rob Shearman <rob(a)codeweavers.com> Sun, 20 Apr 2008 widl: Check that fields in structures and unions referenced by non-local functions can be marshalled and that their attributes are consistent. -Rob Shearman <rob(a)codeweavers.com> Sun, 20 Apr 2008 widl: The implicit_handle attribute is allowed with a handle explicitly specified in the function parameters. In that case, that handle is used instead of the implicit handle. Fix the check for the explicit_handle attribute being specified without a handle being specified in the function parameters, even though issuing an error is wrong. (Thanks to Marcus Meissner & Coverity for spotting that the check didn't do what it was supposed to do.) - Rob Shearman <rob(a)codeweavers.com> Sun, 20 Apr 2008 widl: Automatically add "handle_t IDL_handle" parameter to functions with no explicit handle specified whose containing interface has the explicit_handle attribute. - Rob Shearman <rob(a)codeweavers.com> Sun, 20 Apr 2008 widl: Issue an error instead of crashing for dividing by zero in a constant expression. - Rob Shearman <rob(a)codeweavers.com> Sun, 20 Apr 2008 widl: Add support for "->" and "." operators in expressions. - Rob Shearman <rob(a)codeweavers.com> Sun, 20 Apr 2008 widl: Add support for arrays in expressions. - Rob Shearman <rob(a)codeweavers.com> Sun, 20 Apr 2008 widl: Add support for '%' operator in expressions. - Rob Shearman <rob(a)codeweavers.com> Tue, 22 Apr 2008 widl: Fix operator precedence in expressions. - Rob Shearman <rob(a)codeweavers.com> Tue, 22 Apr 2008 widl: Require a constant expression for case statements. - Rob Shearman <rob(a)codeweavers.com> Tue, 22 Apr 2008 widl: Add support for comparison, exclusive or, logical not and positive operators in expressions. - Rob Shearman <rob(a)codeweavers.com> Tue, 22 Apr 2008 widl: Remove EXPR_MEMBERPTR and implement it using EXPR_PPTR and EXPR_MEMBER instead. - Rob Shearman <rob(a)codeweavers.com> Tue, 22 Apr 2008 widl: Don't free input_name in pop_import as we keep pointers to it in the var_t type now. - Rob Shearman <rob(a)codeweavers.com> Tue, 22 Apr 2008 widl: Pass the actual type into check_remoting_fields and check_field_common instead of the type name. - Rob Shearman <rob(a)codeweavers.com> Tue, 22 Apr 2008 widl: Check that expressions resolve so that expressions in generated code will compile. Also check that expressions return the correct type for the attribute. - Rob Shearman <rob(a)codeweavers.com> Tue, 22 Apr 2008 widl: Move expression functions to a new file, expr.c. - Rob Shearman <rob(a)codeweavers.com> Tue, 22 Apr 2008 widl: Use expr_resolve_type to get the type of the identifier in write_conf_or_var_desc. Remove the conversion of pointer types into base types as this was only needed due to lack of proper type resolving. - Rob Shearman <rob(a)codeweavers.com> Tue, 22 Apr 2008 widl: Remove duplicated code in the form of the write_struct_expr function by enhancing write_expr to allow toplevel identifiers to be prefixed by a string, if specified. - Rob Shearman <rob(a)codeweavers.com> Thu, 24 Apr 2008 widl: Implement lcid property on library declarations. - Rob Shearman <rob(a)codeweavers.com> Thu, 24 Apr 2008 widl: Construct the pointer chain while parsing pointers, rather than storing a ptr_level. This method is more flexible and somewhat simpler. - Rob Shearman <rob(a)codeweavers.com> Thu, 24 Apr 2008 widl: Allow NULL to be used in expressions. - Rob Shearman <rob(a)codeweavers.com> Thu, 24 Apr 2008 widl: Create a list of statements in the whole IDL file, instead of just a list of interfaces. - Rob Shearman <rob(a)codeweavers.com> Thu, 24 Apr 2008 widl: Add typedef statements to the statement lists. - Rob Shearman <rob(a)codeweavers.com> Fri, 25 Apr 2008 widl: Consolidate most of the inner loop of reg_typedefs into set_type. - Rob Shearman <rob(a)codeweavers.com> Fri, 25 Apr 2008 widl: Rename pident to declarator and parse the array declarations as part of declarators. This allows arrays to be used in typedefs and const statements. - Rob Shearman <rob(a)codeweavers.com> Fri, 25 Apr 2008 widl: Make the rules for parsing fields in structures, encapsulated unions and non-encapsulated unions more strict. Move the rules in fields that handle empty union cases into separate union rules so that they can't erroneously be accepted for structures or other types of unions. - Rob Shearman <rob(a)codeweavers.com> Fri, 25 Apr 2008 widl: Add support for declaring multiple fields of a structure in one statement. - Rob Shearman <rob(a)codeweavers.com> Fri, 25 Apr 2008 widl: Add support for string literals and wide-string literals in expressions. - Rob Shearman <rob(a)codeweavers.com> Fri, 25 Apr 2008 widl: Create a statement object for import statements. Move the writing of include directives into the generated header into header.c. - Rob Shearman <rob(a)codeweavers.com> Fri, 25 Apr 2008 widl: Move the func_declarator rule entirely into direct_declarator. - Rob Shearman <rob(a)codeweavers.com> Sat, 26 Apr 2008 widl: Add typedefs to typelibs which have the public or uuid attributes, not any other attribute. - Rob Shearman <rob(a)codeweavers.com> Sat, 26 Apr 2008 widl: Support hex digits that use an uppercase 0X prefix. - Rob Shearman <rob(a)codeweavers.com> Sun, 27 Apr 2008 widl: Accept integer constant suffixes in the lexer. - Rob Shearman <rob(a)codeweavers.com> Tue, 29 Apr 2008 widl: Keep const attributes applied to pointers when writing out the type. Use an attribute to store the const qualifier for the pointer and type. Allow multiple type-qualifiers to be applied to a type by adding a declaration-specifier rule that encompasses type-qualifiers and types. - Rob Shearman <rob(a)codeweavers.com> Tue, 29 Apr 2008 widl: Add support for "inline" on function definitions. Fix applying calling convention to function type. - Rob Shearman <rob(a)codeweavers.com> Tue, 29 Apr 2008 widl: Make constdef and externdef take a declarator instead of an ident so that functions and arrays can be defined using the statements. - Rob Shearman <rob(a)codeweavers.com> Tue, 29 Apr 2008 widl: Allow pointer attributes to be applied to function pointers. - Rob Shearman <rob(a)codeweavers.com> Tue, 29 Apr 2008 widl: callback, code, comm_status and in_line are attribute names, not keywords. - Rob Shearman <rob(a)codeweavers.com> Wed, 30 Apr 2008 widl: Prepare for supporting storage classes in declaration statements. Return a decl_spec_t structure from decl_spec rules so that the storage class and type qualifiers can both be returned. - Rob Shearman <rob(a)codeweavers.com> Wed, 30 Apr 2008 widl: Add the parsing of storage classes into declaration-specifiers. Support the static and register keywords. This consolidates externdef and constdef rules into one declaration rule. - Rob Shearman <rob(a)codeweavers.com> Thu, 1 May 2008 widl: Consolidate writing of COM and dispatch interfaces into one function to remove duplicated code. Split up the writing into start and end to eventually support the style MIDL uses where it writes declared types, etc. between the start and end of the interface. Make internal header functions take the file pointer to print to. Don't write interface IDs for non-object interfaces and always write handle declarations even if the interface has no methods, like MIDL does. - Gerald Pfeifer <gerald(a)pfeifer.com> Fri, 2 May 2008 widl: Fix syntax to also work with older versions of bison. Added: trunk/reactos/tools/widl/expr.c (with props) trunk/reactos/tools/widl/expr.h (with props) Added: trunk/reactos/tools/widl/expr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/expr.c?rev=3731… ============================================================================== --- trunk/reactos/tools/widl/expr.c (added) +++ trunk/reactos/tools/widl/expr.c [iso-8859-1] Wed Nov 12 13:30:10 2008 @@ -1,0 +1,815 @@ +/* + * Expression Abstract Syntax Tree Functions + * + * Copyright 2002 Ove Kaaven + * Copyright 2006-2008 Robert Shearman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdio.h> +#include <stdlib.h> +#include <stdarg.h> +#include <assert.h> +#include <ctype.h> +#include <string.h> + +#include "widl.h" +#include "utils.h" +#include "expr.h" +#include "header.h" + +expr_t *make_expr(enum expr_type type) +{ + expr_t *e = xmalloc(sizeof(expr_t)); + e->type = type; + e->ref = NULL; + e->u.lval = 0; + e->is_const = FALSE; + e->cval = 0; + return e; +} + +expr_t *make_exprl(enum expr_type type, long val) +{ + expr_t *e = xmalloc(sizeof(expr_t)); + e->type = type; + e->ref = NULL; + e->u.lval = val; + e->is_const = FALSE; + /* check for numeric constant */ + if (type == EXPR_NUM || type == EXPR_HEXNUM || type == EXPR_TRUEFALSE) + { + /* make sure true/false value is valid */ + assert(type != EXPR_TRUEFALSE || val == 0 || val == 1); + e->is_const = TRUE; + e->cval = val; + } + return e; +} + +expr_t *make_exprd(enum expr_type type, double val) +{ + expr_t *e = xmalloc(sizeof(expr_t)); + e->type = type; + e->ref = NULL; + e->u.dval = val; + e->is_const = TRUE; + e->cval = val; + return e; +} + +expr_t *make_exprs(enum expr_type type, char *val) +{ + expr_t *e; + e = xmalloc(sizeof(expr_t)); + e->type = type; + e->ref = NULL; + e->u.sval = val; + e->is_const = FALSE; + /* check for predefined constants */ + if (type == EXPR_IDENTIFIER) + { + var_t *c = find_const(val, 0); + if (c) + { + e->u.sval = c->name; + free(val); + e->is_const = TRUE; + e->cval = c->eval->cval; + } + } + return e; +} + +expr_t *make_exprt(enum expr_type type, type_t *tref, expr_t *expr) +{ + expr_t *e; + e = xmalloc(sizeof(expr_t)); + e->type = type; + e->ref = expr; + e->u.tref = tref; + e->is_const = FALSE; + /* check for cast of constant expression */ + if (type == EXPR_SIZEOF) + { + switch (tref->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + case RPC_FC_USMALL: + e->is_const = TRUE; + e->cval = 1; + break; + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + e->is_const = TRUE; + e->cval = 2; + break; + case RPC_FC_LONG: + case RPC_FC_ULONG: + case RPC_FC_FLOAT: + case RPC_FC_ERROR_STATUS_T: + e->is_const = TRUE; + e->cval = 4; + break; + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + e->is_const = TRUE; + e->cval = 8; + break; + } + } + if (type == EXPR_CAST && expr->is_const) + { + e->is_const = TRUE; + e->cval = expr->cval; + } + return e; +} + +expr_t *make_expr1(enum expr_type type, expr_t *expr) +{ + expr_t *e; + e = xmalloc(sizeof(expr_t)); + e->type = type; + e->ref = expr; + e->u.lval = 0; + e->is_const = FALSE; + /* check for compile-time optimization */ + if (expr->is_const) + { + e->is_const = TRUE; + switch (type) + { + case EXPR_LOGNOT: + e->cval = !expr->cval; + break; + case EXPR_POS: + e->cval = +expr->cval; + break; + case EXPR_NEG: + e->cval = -expr->cval; + break; + case EXPR_NOT: + e->cval = ~expr->cval; + break; + default: + e->is_const = FALSE; + break; + } + } + return e; +} + +expr_t *make_expr2(enum expr_type type, expr_t *expr1, expr_t *expr2) +{ + expr_t *e; + e = xmalloc(sizeof(expr_t)); + e->type = type; + e->ref = expr1; + e->u.ext = expr2; + e->is_const = FALSE; + /* check for compile-time optimization */ + if (expr1->is_const && expr2->is_const) + { + e->is_const = TRUE; + switch (type) + { + case EXPR_ADD: + e->cval = expr1->cval + expr2->cval; + break; + case EXPR_SUB: + e->cval = expr1->cval - expr2->cval; + break; + case EXPR_MOD: + if (expr2->cval == 0) + { + error_loc("divide by zero in expression\n"); + e->cval = 0; + } + else + e->cval = expr1->cval % expr2->cval; + break; + case EXPR_MUL: + e->cval = expr1->cval * expr2->cval; + break; + case EXPR_DIV: + if (expr2->cval == 0) + { + error_loc("divide by zero in expression\n"); + e->cval = 0; + } + else + e->cval = expr1->cval / expr2->cval; + break; + case EXPR_OR: + e->cval = expr1->cval | expr2->cval; + break; + case EXPR_AND: + e->cval = expr1->cval & expr2->cval; + break; + case EXPR_SHL: + e->cval = expr1->cval << expr2->cval; + break; + case EXPR_SHR: + e->cval = expr1->cval >> expr2->cval; + break; + case EXPR_LOGOR: + e->cval = expr1->cval || expr2->cval; + break; + case EXPR_LOGAND: + e->cval = expr1->cval && expr2->cval; + break; + case EXPR_XOR: + e->cval = expr1->cval ^ expr2->cval; + break; + case EXPR_EQUALITY: + e->cval = expr1->cval == expr2->cval; + break; + case EXPR_INEQUALITY: + e->cval = expr1->cval != expr2->cval; + break; + case EXPR_GTR: + e->cval = expr1->cval > expr2->cval; + break; + case EXPR_LESS: + e->cval = expr1->cval < expr2->cval; + break; + case EXPR_GTREQL: + e->cval = expr1->cval >= expr2->cval; + break; + case EXPR_LESSEQL: + e->cval = expr1->cval <= expr2->cval; + break; + default: + e->is_const = FALSE; + break; + } + } + return e; +} + +expr_t *make_expr3(enum expr_type type, expr_t *expr1, expr_t *expr2, expr_t *expr3) +{ + expr_t *e; + e = xmalloc(sizeof(expr_t)); + e->type = type; + e->ref = expr1; + e->u.ext = expr2; + e->ext2 = expr3; + e->is_const = FALSE; + /* check for compile-time optimization */ + if (expr1->is_const && expr2->is_const && expr3->is_const) + { + e->is_const = TRUE; + switch (type) + { + case EXPR_COND: + e->cval = expr1->cval ? expr2->cval : expr3->cval; + break; + default: + e->is_const = FALSE; + break; + } + } + return e; +} + +struct expression_type +{ + int is_variable; /* is the expression resolved to a variable? */ + int is_temporary; /* should the type be freed? */ + type_t *type; +}; + +static int is_integer_type(const type_t *type) +{ + switch (type->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + case RPC_FC_USMALL: + case RPC_FC_WCHAR: + case RPC_FC_SHORT: + case RPC_FC_USHORT: + case RPC_FC_LONG: + case RPC_FC_ULONG: + case RPC_FC_INT3264: + case RPC_FC_UINT3264: + case RPC_FC_HYPER: + case RPC_FC_ENUM16: + case RPC_FC_ENUM32: + return TRUE; + default: + return FALSE; + } +} + +static void check_scalar_type(const struct expr_loc *expr_loc, + const type_t *cont_type, const type_t *type) +{ + if (!cont_type || (!is_integer_type(type) && !is_ptr(type) && + type->type != RPC_FC_FLOAT && + type->type != RPC_FC_DOUBLE)) + error_loc_info(&expr_loc->v->loc_info, "scalar type required in expression%s%s\n", + expr_loc->attr ? " for attribute " : "", + expr_loc->attr ? expr_loc->attr : ""); +} + +static void check_arithmetic_type(const struct expr_loc *expr_loc, + const type_t *cont_type, const type_t *type) +{ + if (!cont_type || (!is_integer_type(type) && + type->type != RPC_FC_FLOAT && + type->type != RPC_FC_DOUBLE)) + error_loc_info(&expr_loc->v->loc_info, "arithmetic type required in expression%s%s\n", + expr_loc->attr ? " for attribute " : "", + expr_loc->attr ? expr_loc->attr : ""); +} + +static void check_integer_type(const struct expr_loc *expr_loc, + const type_t *cont_type, const type_t *type) +{ + if (!cont_type || !is_integer_type(type)) + error_loc_info(&expr_loc->v->loc_info, "integer type required in expression%s%s\n", + expr_loc->attr ? " for attribute " : "", + expr_loc->attr ? expr_loc->attr : ""); +} + +static type_t *find_identifier(const char *identifier, const type_t *cont_type, int *found_in_cont_type) +{ + type_t *type = NULL; + const var_t *field; + const var_list_t *fields = NULL; + + *found_in_cont_type = 0; + + if (cont_type && (cont_type->type == RPC_FC_FUNCTION || is_struct(cont_type->type))) + fields = cont_type->fields_or_args; + else if (cont_type && is_union(cont_type->type)) + { + if (cont_type->type == RPC_FC_ENCAPSULATED_UNION) + { + const var_t *uv = LIST_ENTRY(list_tail(cont_type->fields_or_args), const var_t, entry); + fields = uv->type->fields_or_args; + } + else + fields = cont_type->fields_or_args; + } + + if (fields) LIST_FOR_EACH_ENTRY( field, fields, const var_t, entry ) + if (field->name && !strcmp(identifier, field->name)) + { + type = field->type; + *found_in_cont_type = 1; + break; + } + + if (!type) + { + var_t *const_var = find_const(identifier, 0); + if (const_var) type = const_var->type; + } + + return type; +} + +static struct expression_type resolve_expression(const struct expr_loc *expr_loc, + const type_t *cont_type, + const expr_t *e) +{ + struct expression_type result; + result.is_variable = FALSE; + result.is_temporary = FALSE; + result.type = NULL; + switch (e->type) + { + case EXPR_VOID: + break; + case EXPR_HEXNUM: + case EXPR_NUM: + case EXPR_TRUEFALSE: + result.is_variable = FALSE; + result.is_temporary = FALSE; + result.type = find_type("int", 0); + break; + case EXPR_STRLIT: + result.is_variable = FALSE; + result.is_temporary = TRUE; + result.type = make_type(RPC_FC_RP, find_type("char", 0)); + break; + case EXPR_WSTRLIT: + result.is_variable = FALSE; + result.is_temporary = TRUE; + result.type = make_type(RPC_FC_RP, find_type("wchar_t", 0)); + break; + case EXPR_DOUBLE: + result.is_variable = FALSE; + result.is_temporary = FALSE; + result.type = find_type("double", 0); + break; + case EXPR_IDENTIFIER: + { + int found_in_cont_type; + result.is_variable = TRUE; + result.is_temporary = FALSE; + result.type = find_identifier(e->u.sval, cont_type, &found_in_cont_type); + if (!result.type) + { + error_loc_info(&expr_loc->v->loc_info, "identifier %s cannot be resolved in expression%s%s\n", + e->u.sval, expr_loc->attr ? " for attribute " : "", + expr_loc->attr ? expr_loc->attr : ""); + } + break; + } + case EXPR_LOGNOT: + result = resolve_expression(expr_loc, cont_type, e->ref); + check_scalar_type(expr_loc, cont_type, result.type); + result.is_variable = FALSE; + result.is_temporary = FALSE; + result.type = find_type("int", 0); + break; + case EXPR_NOT: + result = resolve_expression(expr_loc, cont_type, e->ref); + check_integer_type(expr_loc, cont_type, result.type); + result.is_variable = FALSE; + break; + case EXPR_POS: + case EXPR_NEG: + result = resolve_expression(expr_loc, cont_type, e->ref); + check_arithmetic_type(expr_loc, cont_type, result.type); + result.is_variable = FALSE; + break; + case EXPR_ADDRESSOF: + result = resolve_expression(expr_loc, cont_type, e->ref); + if (!result.is_variable) + error_loc_info(&expr_loc->v->loc_info, "address-of operator applied to non-variable type in expression%s%s\n", + expr_loc->attr ? " for attribute " : "", + expr_loc->attr ? expr_loc->attr : ""); + result.is_variable = FALSE; + result.is_temporary = TRUE; + result.type = make_type(RPC_FC_RP, result.type); + break; + case EXPR_PPTR: + result = resolve_expression(expr_loc, cont_type, e->ref); + if (result.type && is_ptr(result.type)) + result.type = result.type->ref; + else + error_loc_info(&expr_loc->v->loc_info, "dereference operator applied to non-pointer type in expression%s%s\n", + expr_loc->attr ? " for attribute " : "", + expr_loc->attr ? expr_loc->attr : ""); + break; + case EXPR_CAST: + result = resolve_expression(expr_loc, cont_type, e->ref); + result.type = e->u.tref; + break; + case EXPR_SIZEOF: + result.is_variable = FALSE; + result.is_temporary = FALSE; + result.type = find_type("int", 0); + break; + case EXPR_SHL: + case EXPR_SHR: + case EXPR_MOD: + case EXPR_MUL: + case EXPR_DIV: + case EXPR_ADD: + case EXPR_SUB: + case EXPR_AND: + case EXPR_OR: + case EXPR_XOR: + { + struct expression_type result_right; + result = resolve_expression(expr_loc, cont_type, e->ref); + result.is_variable = FALSE; + result_right = resolve_expression(expr_loc, cont_type, e->u.ext); + /* FIXME: these checks aren't strict enough for some of the operators */ + check_scalar_type(expr_loc, cont_type, result.type); + check_scalar_type(expr_loc, cont_type, result_right.type); + break; + } + case EXPR_LOGOR: + case EXPR_LOGAND: + case EXPR_EQUALITY: + case EXPR_INEQUALITY: + case EXPR_GTR: + case EXPR_LESS: + case EXPR_GTREQL: + case EXPR_LESSEQL: + { + struct expression_type result_left, result_right; + result_left = resolve_expression(expr_loc, cont_type, e->ref); + result_right = resolve_expression(expr_loc, cont_type, e->u.ext); + check_scalar_type(expr_loc, cont_type, result_left.type); + check_scalar_type(expr_loc, cont_type, result_right.type); + result.is_variable = FALSE; + result.is_temporary = FALSE; + result.type = find_type("int", 0); + break; + } + case EXPR_MEMBER: + result = resolve_expression(expr_loc, cont_type, e->ref); + if (result.type && (is_struct(result.type->type) || is_union(result.type->type) || result.type->type == RPC_FC_ENUM16 || result.type->type == RPC_FC_ENUM32)) + result = resolve_expression(expr_loc, result.type, e->u.ext); + else + error_loc_info(&expr_loc->v->loc_info, "'.' or '->' operator applied to a type that isn't a structure, union or enumeration in expression%s%s\n", + expr_loc->attr ? " for attribute " : "", + expr_loc->attr ? expr_loc->attr : ""); + break; + case EXPR_COND: + { + struct expression_type result_first, result_second, result_third; + result_first = resolve_expression(expr_loc, cont_type, e->ref); + check_scalar_type(expr_loc, cont_type, result_first.type); + result_second = resolve_expression(expr_loc, cont_type, e->u.ext); + result_third = resolve_expression(expr_loc, cont_type, e->ext2); + /* FIXME: determine the correct return type */ + result = result_second; + result.is_variable = FALSE; + break; + } + case EXPR_ARRAY: + result = resolve_expression(expr_loc, cont_type, e->ref); + if (result.type && is_array(result.type)) + { + struct expression_type index_result; + result.type = result.type->ref; + index_result = resolve_expression(expr_loc, cont_type /* FIXME */, e->u.ext); + if (!index_result.type || !is_integer_type(index_result.type)) + error_loc_info(&expr_loc->v->loc_info, "array subscript not of integral type in expression%s%s\n", + expr_loc->attr ? " for attribute " : "", + expr_loc->attr ? expr_loc->attr : ""); + } + else + error_loc_info(&expr_loc->v->loc_info, "array subscript operator applied to non-array type in expression%s%s\n", + expr_loc->attr ? " for attribute " : "", + expr_loc->attr ? expr_loc->attr : ""); + break; + } + return result; +} + +const type_t *expr_resolve_type(const struct expr_loc *expr_loc, const type_t *cont_type, const expr_t *expr) +{ + struct expression_type expr_type; + expr_type = resolve_expression(expr_loc, cont_type, expr); + return expr_type.type; +} + +void write_expr(FILE *h, const expr_t *e, int brackets, + int toplevel, const char *toplevel_prefix, + const type_t *cont_type) +{ + switch (e->type) + { + case EXPR_VOID: + break; + case EXPR_NUM: + fprintf(h, "%lu", e->u.lval); + break; + case EXPR_HEXNUM: + fprintf(h, "0x%lx", e->u.lval); + break; + case EXPR_DOUBLE: + fprintf(h, "%#.15g", e->u.dval); + break; + case EXPR_TRUEFALSE: + if (e->u.lval == 0) + fprintf(h, "FALSE"); + else + fprintf(h, "TRUE"); + break; + case EXPR_IDENTIFIER: + if (toplevel && toplevel_prefix && cont_type) + { + int found_in_cont_type; + find_identifier(e->u.sval, cont_type, &found_in_cont_type); + if (found_in_cont_type) fprintf(h, "%s", toplevel_prefix); + } + fprintf(h, "%s", e->u.sval); + break; + case EXPR_STRLIT: + fprintf(h, "\"%s\"", e->u.sval); + break; + case EXPR_WSTRLIT: + fprintf(h, "L\"%s\"", e->u.sval); + break; + case EXPR_LOGNOT: + fprintf(h, "!"); + write_expr(h, e->ref, 1, toplevel, toplevel_prefix, cont_type); + break; + case EXPR_NOT: + fprintf(h, "~"); + write_expr(h, e->ref, 1, toplevel, toplevel_prefix, cont_type); + break; + case EXPR_POS: + fprintf(h, "+"); + write_expr(h, e->ref, 1, toplevel, toplevel_prefix, cont_type); + break; + case EXPR_NEG: + fprintf(h, "-"); + write_expr(h, e->ref, 1, toplevel, toplevel_prefix, cont_type); + break; + case EXPR_ADDRESSOF: + fprintf(h, "&"); + write_expr(h, e->ref, 1, toplevel, toplevel_prefix, cont_type); + break; + case EXPR_PPTR: + fprintf(h, "*"); + write_expr(h, e->ref, 1, toplevel, toplevel_prefix, cont_type); + break; + case EXPR_CAST: + fprintf(h, "("); + write_type_decl(h, e->u.tref, NULL); + fprintf(h, ")"); + write_expr(h, e->ref, 1, toplevel, toplevel_prefix, cont_type); + break; + case EXPR_SIZEOF: + fprintf(h, "sizeof("); + write_type_decl(h, e->u.tref, NULL); + fprintf(h, ")"); + break; + case EXPR_SHL: + case EXPR_SHR: + case EXPR_MOD: + case EXPR_MUL: + case EXPR_DIV: + case EXPR_ADD: + case EXPR_SUB: + case EXPR_AND: + case EXPR_OR: + case EXPR_LOGOR: + case EXPR_LOGAND: + case EXPR_XOR: + case EXPR_EQUALITY: + case EXPR_INEQUALITY: + case EXPR_GTR: + case EXPR_LESS: + case EXPR_GTREQL: + case EXPR_LESSEQL: + if (brackets) fprintf(h, "("); + write_expr(h, e->ref, 1, toplevel, toplevel_prefix, cont_type); + switch (e->type) + { + case EXPR_SHL: fprintf(h, " << "); break; + case EXPR_SHR: fprintf(h, " >> "); break; + case EXPR_MOD: fprintf(h, " %% "); break; + case EXPR_MUL: fprintf(h, " * "); break; + case EXPR_DIV: fprintf(h, " / "); break; + case EXPR_ADD: fprintf(h, " + "); break; + case EXPR_SUB: fprintf(h, " - "); break; + case EXPR_AND: fprintf(h, " & "); break; + case EXPR_OR: fprintf(h, " | "); break; + case EXPR_LOGOR: fprintf(h, " || "); break; + case EXPR_LOGAND: fprintf(h, " && "); break; + case EXPR_XOR: fprintf(h, " ^ "); break; + case EXPR_EQUALITY: fprintf(h, " == "); break; + case EXPR_INEQUALITY: fprintf(h, " != "); break; + case EXPR_GTR: fprintf(h, " > "); break; + case EXPR_LESS: fprintf(h, " < "); break; + case EXPR_GTREQL: fprintf(h, " >= "); break; + case EXPR_LESSEQL: fprintf(h, " <= "); break; + default: break; + } + write_expr(h, e->u.ext, 1, toplevel, toplevel_prefix, cont_type); + if (brackets) fprintf(h, ")"); + break; + case EXPR_MEMBER: + if (brackets) fprintf(h, "("); + if (e->ref->type == EXPR_PPTR) + { + write_expr(h, e->ref->ref, 1, toplevel, toplevel_prefix, cont_type); + fprintf(h, "->"); + } + else + { + write_expr(h, e->ref, 1, toplevel, toplevel_prefix, cont_type); + fprintf(h, "."); + } + write_expr(h, e->u.ext, 1, toplevel, toplevel_prefix, cont_type); + if (brackets) fprintf(h, ")"); + break; + case EXPR_COND: + if (brackets) fprintf(h, "("); + write_expr(h, e->ref, 1, toplevel, toplevel_prefix, cont_type); + fprintf(h, " ? "); + write_expr(h, e->u.ext, 1, toplevel, toplevel_prefix, cont_type); + fprintf(h, " : "); + write_expr(h, e->ext2, 1, toplevel, toplevel_prefix, cont_type); + if (brackets) fprintf(h, ")"); + break; + case EXPR_ARRAY: + if (brackets) fprintf(h, "("); + write_expr(h, e->ref, 1, toplevel, toplevel_prefix, cont_type); + fprintf(h, "["); + write_expr(h, e->u.ext, 1, toplevel, toplevel_prefix, cont_type); + fprintf(h, "]"); + if (brackets) fprintf(h, ")"); + break; + } +} + +/* This is actually fairly involved to implement precisely, due to the + effects attributes may have and things like that. Right now this is + only used for optimization, so just check for a very small set of + criteria that guarantee the types are equivalent; assume every thing + else is different. */ +static int compare_type(const type_t *a, const type_t *b) +{ + if (a == b + || (a->name + && b->name + && strcmp(a->name, b->name) == 0)) + return 0; + /* Ordering doesn't need to be implemented yet. */ + return 1; +} + +int compare_expr(const expr_t *a, const expr_t *b) +{ + int ret; + + if (a->type != b->type) + return a->type - b->type; + + switch (a->type) + { + case EXPR_NUM: + case EXPR_HEXNUM: + case EXPR_TRUEFALSE: + return a->u.lval - b->u.lval; + case EXPR_DOUBLE: + return a->u.dval - b->u.dval; + case EXPR_IDENTIFIER: + case EXPR_STRLIT: + case EXPR_WSTRLIT: + return strcmp(a->u.sval, b->u.sval); + case EXPR_COND: + ret = compare_expr(a->ref, b->ref); + if (ret != 0) + return ret; + ret = compare_expr(a->u.ext, b->u.ext); + if (ret != 0) + return ret; + return compare_expr(a->ext2, b->ext2); + case EXPR_OR: + case EXPR_AND: + case EXPR_ADD: + case EXPR_SUB: + case EXPR_MOD: + case EXPR_MUL: + case EXPR_DIV: + case EXPR_SHL: + case EXPR_SHR: + case EXPR_MEMBER: + case EXPR_ARRAY: + case EXPR_LOGOR: + case EXPR_LOGAND: + case EXPR_XOR: + case EXPR_EQUALITY: + case EXPR_INEQUALITY: + case EXPR_GTR: + case EXPR_LESS: + case EXPR_GTREQL: + case EXPR_LESSEQL: + ret = compare_expr(a->ref, b->ref); + if (ret != 0) + return ret; + return compare_expr(a->u.ext, b->u.ext); + case EXPR_CAST: + ret = compare_type(a->u.tref, b->u.tref); + if (ret != 0) + return ret; + /* Fall through. */ + case EXPR_NOT: + case EXPR_NEG: + case EXPR_PPTR: + case EXPR_ADDRESSOF: + case EXPR_LOGNOT: + case EXPR_POS: + return compare_expr(a->ref, b->ref); + case EXPR_SIZEOF: + return compare_type(a->u.tref, b->u.tref); + case EXPR_VOID: + return 0; + } + return -1; +} Propchange: trunk/reactos/tools/widl/expr.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/widl/expr.c ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Added: trunk/reactos/tools/widl/expr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/expr.h?rev=3731… ============================================================================== --- trunk/reactos/tools/widl/expr.h (added) +++ trunk/reactos/tools/widl/expr.h [iso-8859-1] Wed Nov 12 13:30:10 2008 @@ -1,0 +1,40 @@ +/* + * Expression Abstract Syntax Tree Functions + * + * Copyright 2002 Ove Kaaven + * Copyright 2006-2008 Robert Shearman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +struct expr_loc +{ + const var_t *v; + const char *attr; +}; + +extern expr_t *make_expr(enum expr_type type); +extern expr_t *make_exprl(enum expr_type type, long val); +extern expr_t *make_exprd(enum expr_type type, double val); +extern expr_t *make_exprs(enum expr_type type, char *val); +extern expr_t *make_exprt(enum expr_type type, type_t *tref, expr_t *expr); +extern expr_t *make_expr1(enum expr_type type, expr_t *expr); +extern expr_t *make_expr2(enum expr_type type, expr_t *exp1, expr_t *exp2); +extern expr_t *make_expr3(enum expr_type type, expr_t *expr1, expr_t *expr2, expr_t *expr3); + +extern const type_t *expr_resolve_type(const struct expr_loc *expr_loc, const type_t *cont_type, const expr_t *expr); +extern int compare_expr(const expr_t *a, const expr_t *b); + +extern void write_expr(FILE *h, const expr_t *e, int brackets, int toplevel, const char *toplevel_prefix, const type_t *cont_type); Propchange: trunk/reactos/tools/widl/expr.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/tools/widl/expr.h ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision

1 0

[ekohl] 37313: Sync to wine-0.9.61: - Rob Shearman <rob@codeweavers.com> Sun, 20 Apr 2008 widl: Stop looping in check_remoting_args when a context_handle or wire_marshal type is found as they are in effect fundamental types. - Rob Shearman <rob@codeweavers.com> Sun, 20 Apr 2008 widl: Check that fields in structures and unions referenced by non-local functions can be marshalled and that their attributes are consistent. -Rob Shearman <rob@codeweavers.com> Sun, 20 Apr 2008 widl: The implicit_handle
by ekohl＠svn.reactos.org 12 Nov '08

12 Nov '08

Author: ekohl Date: Wed Nov 12 13:26:25 2008 New Revision: 37313 URL: http://svn.reactos.org/svn/reactos?rev=37313&view=rev Log: Sync to wine-0.9.61: - Rob Shearman <rob(a)codeweavers.com> Sun, 20 Apr 2008 widl: Stop looping in check_remoting_args when a context_handle or wire_marshal type is found as they are in effect fundamental types. - Rob Shearman <rob(a)codeweavers.com> Sun, 20 Apr 2008 widl: Check that fields in structures and unions referenced by non-local functions can be marshalled and that their attributes are consistent. -Rob Shearman <rob(a)codeweavers.com> Sun, 20 Apr 2008 widl: The implicit_handle attribute is allowed with a handle explicitly specified in the function parameters. In that case, that handle is used instead of the implicit handle. Fix the check for the explicit_handle attribute being specified without a handle being specified in the function parameters, even though issuing an error is wrong. (Thanks to Marcus Meissner & Coverity for spotting that the check didn't do what it was supposed to do.) - Rob Shearman <rob(a)codeweavers.com> Sun, 20 Apr 2008 widl: Automatically add "handle_t IDL_handle" parameter to functions with no explicit handle specified whose containing interface has the explicit_handle attribute. - Rob Shearman <rob(a)codeweavers.com> Sun, 20 Apr 2008 widl: Issue an error instead of crashing for dividing by zero in a constant expression. - Rob Shearman <rob(a)codeweavers.com> Sun, 20 Apr 2008 widl: Add support for "->" and "." operators in expressions. - Rob Shearman <rob(a)codeweavers.com> Sun, 20 Apr 2008 widl: Add support for arrays in expressions. - Rob Shearman <rob(a)codeweavers.com> Sun, 20 Apr 2008 widl: Add support for '%' operator in expressions. - Rob Shearman <rob(a)codeweavers.com> Tue, 22 Apr 2008 widl: Fix operator precedence in expressions. - Rob Shearman <rob(a)codeweavers.com> Tue, 22 Apr 2008 widl: Require a constant expression for case statements. - Rob Shearman <rob(a)codeweavers.com> Tue, 22 Apr 2008 widl: Add support for comparison, exclusive or, logical not and positive operators in expressions. - Rob Shearman <rob(a)codeweavers.com> Tue, 22 Apr 2008 widl: Remove EXPR_MEMBERPTR and implement it using EXPR_PPTR and EXPR_MEMBER instead. - Rob Shearman <rob(a)codeweavers.com> Tue, 22 Apr 2008 widl: Don't free input_name in pop_import as we keep pointers to it in the var_t type now. - Rob Shearman <rob(a)codeweavers.com> Tue, 22 Apr 2008 widl: Pass the actual type into check_remoting_fields and check_field_common instead of the type name. - Rob Shearman <rob(a)codeweavers.com> Tue, 22 Apr 2008 widl: Check that expressions resolve so that expressions in generated code will compile. Also check that expressions return the correct type for the attribute. - Rob Shearman <rob(a)codeweavers.com> Tue, 22 Apr 2008 widl: Move expression functions to a new file, expr.c. - Rob Shearman <rob(a)codeweavers.com> Tue, 22 Apr 2008 widl: Use expr_resolve_type to get the type of the identifier in write_conf_or_var_desc. Remove the conversion of pointer types into base types as this was only needed due to lack of proper type resolving. - Rob Shearman <rob(a)codeweavers.com> Tue, 22 Apr 2008 widl: Remove duplicated code in the form of the write_struct_expr function by enhancing write_expr to allow toplevel identifiers to be prefixed by a string, if specified. - Rob Shearman <rob(a)codeweavers.com> Thu, 24 Apr 2008 widl: Implement lcid property on library declarations. - Rob Shearman <rob(a)codeweavers.com> Thu, 24 Apr 2008 widl: Construct the pointer chain while parsing pointers, rather than storing a ptr_level. This method is more flexible and somewhat simpler. - Rob Shearman <rob(a)codeweavers.com> Thu, 24 Apr 2008 widl: Allow NULL to be used in expressions. - Rob Shearman <rob(a)codeweavers.com> Thu, 24 Apr 2008 widl: Create a list of statements in the whole IDL file, instead of just a list of interfaces. - Rob Shearman <rob(a)codeweavers.com> Thu, 24 Apr 2008 widl: Add typedef statements to the statement lists. - Rob Shearman <rob(a)codeweavers.com> Fri, 25 Apr 2008 widl: Consolidate most of the inner loop of reg_typedefs into set_type. - Rob Shearman <rob(a)codeweavers.com> Fri, 25 Apr 2008 widl: Rename pident to declarator and parse the array declarations as part of declarators. This allows arrays to be used in typedefs and const statements. - Rob Shearman <rob(a)codeweavers.com> Fri, 25 Apr 2008 widl: Make the rules for parsing fields in structures, encapsulated unions and non-encapsulated unions more strict. Move the rules in fields that handle empty union cases into separate union rules so that they can't erroneously be accepted for structures or other types of unions. - Rob Shearman <rob(a)codeweavers.com> Fri, 25 Apr 2008 widl: Add support for declaring multiple fields of a structure in one statement. - Rob Shearman <rob(a)codeweavers.com> Fri, 25 Apr 2008 widl: Add support for string literals and wide-string literals in expressions. - Rob Shearman <rob(a)codeweavers.com> Fri, 25 Apr 2008 widl: Create a statement object for import statements. Move the writing of include directives into the generated header into header.c. - Rob Shearman <rob(a)codeweavers.com> Fri, 25 Apr 2008 widl: Move the func_declarator rule entirely into direct_declarator. - Rob Shearman <rob(a)codeweavers.com> Sat, 26 Apr 2008 widl: Add typedefs to typelibs which have the public or uuid attributes, not any other attribute. - Rob Shearman <rob(a)codeweavers.com> Sat, 26 Apr 2008 widl: Support hex digits that use an uppercase 0X prefix. - Rob Shearman <rob(a)codeweavers.com> Sun, 27 Apr 2008 widl: Accept integer constant suffixes in the lexer. - Rob Shearman <rob(a)codeweavers.com> Tue, 29 Apr 2008 widl: Keep const attributes applied to pointers when writing out the type. Use an attribute to store the const qualifier for the pointer and type. Allow multiple type-qualifiers to be applied to a type by adding a declaration-specifier rule that encompasses type-qualifiers and types. - Rob Shearman <rob(a)codeweavers.com> Tue, 29 Apr 2008 widl: Add support for "inline" on function definitions. Fix applying calling convention to function type. - Rob Shearman <rob(a)codeweavers.com> Tue, 29 Apr 2008 widl: Make constdef and externdef take a declarator instead of an ident so that functions and arrays can be defined using the statements. - Rob Shearman <rob(a)codeweavers.com> Tue, 29 Apr 2008 widl: Allow pointer attributes to be applied to function pointers. - Rob Shearman <rob(a)codeweavers.com> Tue, 29 Apr 2008 widl: callback, code, comm_status and in_line are attribute names, not keywords. - Rob Shearman <rob(a)codeweavers.com> Wed, 30 Apr 2008 widl: Prepare for supporting storage classes in declaration statements. Return a decl_spec_t structure from decl_spec rules so that the storage class and type qualifiers can both be returned. - Rob Shearman <rob(a)codeweavers.com> Wed, 30 Apr 2008 widl: Add the parsing of storage classes into declaration-specifiers. Support the static and register keywords. This consolidates externdef and constdef rules into one declaration rule. - Rob Shearman <rob(a)codeweavers.com> Thu, 1 May 2008 widl: Consolidate writing of COM and dispatch interfaces into one function to remove duplicated code. Split up the writing into start and end to eventually support the style MIDL uses where it writes declared types, etc. between the start and end of the interface. Make internal header functions take the file pointer to print to. Don't write interface IDs for non-object interfaces and always write handle declarations even if the interface has no methods, like MIDL does. - Gerald Pfeifer <gerald(a)pfeifer.com> Fri, 2 May 2008 widl: Fix syntax to also work with older versions of bison. Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/tools/widl/client.c trunk/reactos/tools/widl/header.c trunk/reactos/tools/widl/header.h trunk/reactos/tools/widl/parser.l trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.tab.h trunk/reactos/tools/widl/parser.y trunk/reactos/tools/widl/parser.yy.c trunk/reactos/tools/widl/proxy.c trunk/reactos/tools/widl/server.c trunk/reactos/tools/widl/typegen.c trunk/reactos/tools/widl/typegen.h trunk/reactos/tools/widl/typelib.c trunk/reactos/tools/widl/typelib.h trunk/reactos/tools/widl/widl.c trunk/reactos/tools/widl/widl.h trunk/reactos/tools/widl/widl.rbuild trunk/reactos/tools/widl/widltypes.h trunk/reactos/tools/widl/write_msft.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… Modified: trunk/reactos/tools/widl/client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/client.c?rev=37… Modified: trunk/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.c?rev=37… Modified: trunk/reactos/tools/widl/header.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.h?rev=37… Modified: trunk/reactos/tools/widl/parser.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.l?rev=37… Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… Modified: trunk/reactos/tools/widl/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.h?re… Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=37… Modified: trunk/reactos/tools/widl/parser.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.yy.c?rev… Modified: trunk/reactos/tools/widl/proxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/proxy.c?rev=373… Modified: trunk/reactos/tools/widl/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/server.c?rev=37… Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=3… Modified: trunk/reactos/tools/widl/typegen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.h?rev=3… Modified: trunk/reactos/tools/widl/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.c?rev=3… Modified: trunk/reactos/tools/widl/typelib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.h?rev=3… Modified: trunk/reactos/tools/widl/widl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.c?rev=3731… Modified: trunk/reactos/tools/widl/widl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.h?rev=3731… Modified: trunk/reactos/tools/widl/widl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.rbuild?rev… Modified: trunk/reactos/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widltypes.h?rev… Modified: trunk/reactos/tools/widl/write_msft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/write_msft.c?re…

1 0

[greatlrd] 37312: port a really old test I have for ddraw.dll, this test testing see if the internal value are right when u create the com interface
by greatlrd＠svn.reactos.org 12 Nov '08

12 Nov '08

Author: greatlrd Date: Wed Nov 12 12:48:24 2008 New Revision: 37312 URL: http://svn.reactos.org/svn/reactos?rev=37312&view=rev Log: port a really old test I have for ddraw.dll, this test testing see if the internal value are right when u create the com interface Added: branches/reactx/rostests/apitests/ddrawapi/ branches/reactx/rostests/apitests/ddrawapi/ddrawapi.c (with props) branches/reactx/rostests/apitests/ddrawapi/ddrawapi.h (with props) branches/reactx/rostests/apitests/ddrawapi/ddrawapi.rbuild (with props) branches/reactx/rostests/apitests/ddrawapi/testlist.c (with props) branches/reactx/rostests/apitests/ddrawapi/tests/ branches/reactx/rostests/apitests/ddrawapi/tests/Test_DirectDrawCreateEx.c (with props) Modified: branches/reactx/rostests/apitests/directory.rbuild Added: branches/reactx/rostests/apitests/ddrawapi/ddrawapi.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/rostests/apitests/ddrawa… ============================================================================== --- branches/reactx/rostests/apitests/ddrawapi/ddrawapi.c (added) +++ branches/reactx/rostests/apitests/ddrawapi/ddrawapi.c [iso-8859-1] Wed Nov 12 12:48:24 2008 @@ -1,0 +1,21 @@ +#include "ddrawapi.h" + +HINSTANCE g_hInstance; + +BOOL +IsFunctionPresent(LPWSTR lpszFunction) +{ + return TRUE; +} + +int APIENTRY +WinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPSTR lpCmdLine, + int nCmdShow) +{ + g_hInstance = hInstance; + return TestMain(L"ddrawapi", L"ddraw.dll"); +} + + Propchange: branches/reactx/rostests/apitests/ddrawapi/ddrawapi.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/reactx/rostests/apitests/ddrawapi/ddrawapi.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/rostests/apitests/ddrawa… ============================================================================== --- branches/reactx/rostests/apitests/ddrawapi/ddrawapi.h (added) +++ branches/reactx/rostests/apitests/ddrawapi/ddrawapi.h [iso-8859-1] Wed Nov 12 12:48:24 2008 @@ -1,0 +1,21 @@ + + +/* Definitions */ +#define WIN32_NO_STATUS +#define NTOS_MODE_USER + +/* SDK/DDK/NDK Headers. */ +#include <windows.h> +#include <stdio.h> +#include <ddraw.h> +#include <ddrawi.h> +#include <d3dhal.h> +#include <ddrawgdi.h> + + + + +#include "../apitest.h" + + + Propchange: branches/reactx/rostests/apitests/ddrawapi/ddrawapi.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/reactx/rostests/apitests/ddrawapi/ddrawapi.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/rostests/apitests/ddrawa… ============================================================================== --- branches/reactx/rostests/apitests/ddrawapi/ddrawapi.rbuild (added) +++ branches/reactx/rostests/apitests/ddrawapi/ddrawapi.rbuild [iso-8859-1] Wed Nov 12 12:48:24 2008 @@ -1,0 +1,16 @@ +<module name="ddrawapi" type="win32cui"> + <include base="ddrawapi">.</include> + <define name="__USE_W32API" /> + <library>apitest</library> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>d3d8thk</library> + <library>dxguid</library> + <library>ddraw</library> + <library>ole32</library> + <library>advapi32</library> + <library>shell32</library> + <file>ddrawapi.c</file> + <file>testlist.c</file> +</module> Propchange: branches/reactx/rostests/apitests/ddrawapi/ddrawapi.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/reactx/rostests/apitests/ddrawapi/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/rostests/apitests/ddrawa… ============================================================================== --- branches/reactx/rostests/apitests/ddrawapi/testlist.c (added) +++ branches/reactx/rostests/apitests/ddrawapi/testlist.c [iso-8859-1] Wed Nov 12 12:48:24 2008 @@ -1,0 +1,44 @@ +#ifndef _DDRAWTESTLIST_H +#define _DDRAWTESTLIST_H + +#include "ddrawapi.h" +void dump_ddrawi_directdraw_int(LPDDRAWI_DIRECTDRAW_INT lpDraw_int); + +/* dump all data struct when this is trun onm usefull when u debug ddraw.dll */ +#define DUMP_ON 1 + +/* include the tests */ +#include "tests/Test_DirectDrawCreateEx.c" + + + + + + + + +/* The List of tests */ +TESTENTRY TestList[] = +{ + { L"DirectDrawCreateEx", Test_DirectDrawCreateEx } +}; + +/* The function that gives us the number of tests */ +INT NumTests(void) +{ + return sizeof(TestList) / sizeof(TESTENTRY); +} + +/* old debug macro and dump data */ + + +void dump_ddrawi_directdraw_int(LPDDRAWI_DIRECTDRAW_INT lpDraw_int) +{ + printf("%08lx pIntDirectDraw7->lpVtbl : 0x%p\n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, lpVtbl), lpDraw_int->lpVtbl); + printf("%08lx pIntDirectDraw7->lpLcl : 0x%p\n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, lpLcl), lpDraw_int->lpLcl ); + printf("%08lx pIntDirectDraw7->lpLink : 0x%p\n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, lpLink), lpDraw_int->lpLink ); + printf("%08lx pIntDirectDraw7->dwIntRefCnt : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, dwIntRefCnt), lpDraw_int->dwIntRefCnt ); +} +#endif + +/* EOF */ Propchange: branches/reactx/rostests/apitests/ddrawapi/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/reactx/rostests/apitests/ddrawapi/tests/Test_DirectDrawCreateEx.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/rostests/apitests/ddrawa… ============================================================================== --- branches/reactx/rostests/apitests/ddrawapi/tests/Test_DirectDrawCreateEx.c (added) +++ branches/reactx/rostests/apitests/ddrawapi/tests/Test_DirectDrawCreateEx.c [iso-8859-1] Wed Nov 12 12:48:24 2008 @@ -1,0 +1,35 @@ + +INT +Test_DirectDrawCreateEx(PTESTINFO pti) +{ + + LPDIRECTDRAW7 DirectDraw7; + LPDDRAWI_DIRECTDRAW_INT pIntDirectDraw7; + HRESULT ret; + + + /* Create DirectDraw7 */ + ret = DirectDrawCreateEx(NULL, (VOID**)&DirectDraw7, &IID_IDirectDraw7, NULL); + pIntDirectDraw7 = (DDRAWI_DIRECTDRAW_INT *)DirectDraw7; + + RTEST(ret == DD_OK); + if (ret == DD_OK) + { + RTEST(pIntDirectDraw7->lpVtbl != NULL); + RTEST(pIntDirectDraw7->lpLcl != NULL); + RTEST(pIntDirectDraw7->lpLink == NULL); + RTEST(pIntDirectDraw7->dwIntRefCnt == 1); + } + +#if DUMP_ON + if (pIntDirectDraw7 != NULL) + { + dump_ddrawi_directdraw_int(pIntDirectDraw7); + } +#endif + + DirectDraw7 = NULL; + pIntDirectDraw7 = NULL; + return APISTATUS_NORMAL; +} + Propchange: branches/reactx/rostests/apitests/ddrawapi/tests/Test_DirectDrawCreateEx.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/reactx/rostests/apitests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/rostests/apitests/direct… ============================================================================== --- branches/reactx/rostests/apitests/directory.rbuild [iso-8859-1] (original) +++ branches/reactx/rostests/apitests/directory.rbuild [iso-8859-1] Wed Nov 12 12:48:24 2008 @@ -10,7 +10,11 @@ <directory name="dciman32api"> <xi:include href="dciman32api/dciman32api.rbuild" /> </directory> - + + <directory name="ddrawapi"> + <xi:include href="ddrawapi/ddrawapi.rbuild" /> + </directory> + <directory name="gdi32api"> <xi:include href="gdi32api/gdi32api.rbuild" /> </directory>

1 0

[greatlrd] 37311: Fix a bug for vista dx. I did have time exam vista for a while now. And it contain the file dxg.sys and it start dx driver almost same way as XP does. and it seam the interface are same.
by greatlrd＠svn.reactos.org 12 Nov '08

12 Nov '08

Author: greatlrd Date: Wed Nov 12 11:53:54 2008 New Revision: 37311 URL: http://svn.reactos.org/svn/reactos?rev=37311&view=rev Log: Fix a bug for vista dx. I did have time exam vista for a while now. And it contain the file dxg.sys and it start dx driver almost same way as XP does. and it seam the interface are same. Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Wed Nov 12 11:53:54 2008 @@ -132,21 +132,13 @@ * no code have been writen for it yet */ - /* FIXME ReactOS does not loading the dxapi.sys or import functions from it yet */ // DxApiGetVersion() - /* Loading the kernel interface of directx for win32k */ - - DPRINT1("Warning: trying loading vista dxkrnl.sys\n"); - ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxkrnl.sys"); - if ( ghDxGraphics == NULL) - { - DPRINT1("Warning: dxkrnl.sys not found\n"); - /* try loading vista dx kernel */ - DPRINT1("Warning: trying loading xp/2003/reactos dxg.sys\n"); - ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxg.sys"); - } + /* Loading the kernel dxg interface of directx for win32k */ + DPRINT1("Warning: trying loading xp/2003/vista/reactos dxg.sys\n"); + ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxg.sys"); + if ( ghDxGraphics == NULL) {

1 0

[dchapyshev] 37310: - Update Russian translation
by dchapyshev＠svn.reactos.org 12 Nov '08

12 Nov '08

Author: dchapyshev Date: Wed Nov 12 11:02:37 2008 New Revision: 37310 URL: http://svn.reactos.org/svn/reactos?rev=37310&view=rev Log: - Update Russian translation Modified: trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc trunk/reactos/base/applications/mmc/lang/ru-RU.rc trunk/reactos/base/setup/reactos/lang/ru-RU.rc trunk/reactos/base/system/regsvr32/lang/ru-RU.rc Modified: trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/ru-RU.rc [iso-8859-1] Wed Nov 12 11:02:37 2008 @@ -200,25 +200,25 @@ IDS_DIRECTPLAY_COL_NAME2 "Ðååñòð" IDS_DIRECTPLAY_COL_NAME3 "Ôàéë" IDS_DIRECTPLAY_COL_NAME4 "Âåðñèÿ" - IDS_DIRECTPLAY8_MODEMSP "DirectPlay8-Modem Service Provider" - IDS_DIRECTPLAY8_SERIALSP "DirectPlay8 Serial Service Provider" - IDS_DIRECTPLAY8_IPXSP "DirectPlay8 IPX Service Provider" - IDS_DIRECTPLAY8_TCPSP "DirectPlay8-TCP/IP Service Provider" + IDS_DIRECTPLAY8_MODEMSP "Ïîñòàâùèê ñëóæáû ìîäåìà DirectPlay8" + IDS_DIRECTPLAY8_SERIALSP "Ïîñòàâùèê ñëóæáû ïîñë. ïîðòà DirectPlay8" + IDS_DIRECTPLAY8_IPXSP "Ïîñòàâùèê ñëóæáû IPX DirectPlay8" + IDS_DIRECTPLAY8_TCPSP "Ïîñòàâùèê ñëóæáû TCP/IP DirectPlay8" IDS_DIRECTPLAY_TCPCONN "Èíòåðíåò-ïîäêëþ÷åíèå TCP/IP äëÿ DirectPlay" IDS_DIRECTPLAY_IPXCONN "IPX ïîäêëþ÷åíèå äëÿ DirectPlay" - IDS_DIRECTPLAY_MODEMCONN "Modem Connection For DirectPlay" - IDS_DIRECTPLAY_SERIALCONN "Serial Connection For DirectPlay" + IDS_DIRECTPLAY_MODEMCONN "Ïîäêëþ÷åíèå ÷åðåç ìîäåì äëÿ DirectPlay" + IDS_DIRECTPLAY_SERIALCONN "Ïîñëåäîâàòåëüíîå ïîäêëþ÷åíèå äëÿ DirectPlay" IDS_REG_SUCCESS "OK" IDS_REG_FAIL "Îøèáêà" IDS_DDTEST_ERROR "Ñáîé â ïðîâåðêå!" IDS_DDTEST_DESCRIPTION "Áóäåò ïðîèçâåäåíà ïðîâåðêà DirecDraw íà ýòîì óñòðîéñòâå. Ïðîäîëæèòü?" - IDS_DDPRIMARY_DESCRIPTION "This test will use DirectDraw to draw on primary surface. Black and white rectangles should be drawn. Continue?" - IDS_DDPRIMARY_RESULT "Did you see black and white rectangles?" - IDS_DDOFFSCREEN_DESCRIPTION "This test will use DirectDraw to draw in an offscreen buffer. Moving white rectangle should be drawn. Continue?" - IDS_DDOFFSCREEN_RESULT "Did you see white moving reactangle?" - IDS_DDFULLSCREEN_DESCRIPTION "This test will use DirectDraw to draw in a fullscreen mode. Moving white rectangle should be drawn. Continue?" - IDS_DDFULLSCREEN_RESULT "Did you see white moving reactangle in a fullscreen mode?" + IDS_DDPRIMARY_DESCRIPTION "This test will use DirectDraw to draw on primary surface. Black and white rectangles should be drawn. Ïðîäîëæèòü?" + IDS_DDPRIMARY_RESULT "Âû âèäåëè ÷åðíûå è áåëûå ïðÿìîóãîëüíèêè?" + IDS_DDOFFSCREEN_DESCRIPTION "This test will use DirectDraw to draw in an offscreen buffer. Moving white rectangle should be drawn. Ïðîäîëæèòü?" + IDS_DDOFFSCREEN_RESULT "Âû âèäåëè ïåðåìåùàþùèéñÿ áåëûé ïðÿìîóãîëüíèê?" + IDS_DDFULLSCREEN_DESCRIPTION "This test will use DirectDraw to draw in a fullscreen mode. Moving white rectangle should be drawn. Ïðîäîëæèòü?" + IDS_DDFULLSCREEN_RESULT "Âû âèäåëè áåëûé ïåðåìåøàþùèéñÿ ïðÿìîóãîëüíèê â ïîëíîýêðàííîì ðåæèìå?" IDS_FORMAT_ADAPTER_MEM "%u Ìá" - IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uÃö)" - IDS_OPTION_NO "No" -END + IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u áèò)(%uÃö)" + IDS_OPTION_NO "Íåò" +END Modified: trunk/reactos/base/applications/mmc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/ru-RU.rc [iso-8859-1] Wed Nov 12 11:02:37 2008 @@ -12,7 +12,7 @@ POPUP "&Ñïðàâêà" BEGIN - MENUITEM "&Î Êîíñîëè óïðàâëåíèÿ ReactOS...", ID_HELP_ABOUT + MENUITEM "&Î ïðîãðàììå...", ID_HELP_ABOUT END END Modified: trunk/reactos/base/setup/reactos/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ru… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] Wed Nov 12 11:02:37 2008 @@ -77,7 +77,7 @@ CONTROL "Óñòàíîâèòü çàãðóç÷èê íà äèñê (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,49,278,11 CONTROL "Íå óñòàíàâëèâàòü çàãðóç÷èê", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,60,278,11 PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Îòìåíà", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/system/regsvr32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… ============================================================================== --- trunk/reactos/base/system/regsvr32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/regsvr32/lang/ru-RU.rc [iso-8859-1] Wed Nov 12 11:02:37 2008 @@ -17,7 +17,7 @@ IDS_SwitchN_NoI, "Íåèçâåñòíûé ïàðàìåòð: /n äîëæåí èñïîëüçîâàòüñÿ ñîâìåñòíî ñ ïàðàìåòðîì /i" -IDS_DllNotLoaded, "LoadLibrary('%s') çàâåðøèëñÿ íåóäà÷åé.\nGetLastError âîçâðàùàåò 0x%08x." +IDS_DllNotLoaded, "Âûçîâ LoadLibrary('%s') çàâåðøèëñÿ íåóäà÷åé.\nÔóíêöèÿ GetLastError âîçâðàòèëà êîä îøèáêè: 0x%08x." IDS_MissingEntry, "%s áûë çàãðóæåí, íî òî÷êà âõîäà %s íå íàéäåíà.\n\n\ %s ìîæåò áûòü íåýêñïîðòèðóåìîé èëè ïîâðåæäåííàÿ âåðñèÿ %s íàõîäèòñÿ â ïàìÿòè. Èñïîëüçóéòå PView, ÷òîáû îáíàðóæèòü è óäàëèòü åãî."

1 0

[mkupfer] 37309: - basic install drive listing code (due to lack of reactos functionality not working yet) - add and enable advanced settings dialog - get install directory from txtsetup.sif - set changed install directory - fix dialog resource for several languages
by mkupfer＠svn.reactos.org 12 Nov '08

12 Nov '08

Author: mkupfer Date: Wed Nov 12 10:08:28 2008 New Revision: 37309 URL: http://svn.reactos.org/svn/reactos?rev=37309&view=rev Log: - basic install drive listing code (due to lack of reactos functionality not working yet) - add and enable advanced settings dialog - get install directory from txtsetup.sif - set changed install directory - fix dialog resource for several languages Modified: trunk/reactos/base/setup/reactos/lang/bg-BG.rc trunk/reactos/base/setup/reactos/lang/cs-CZ.rc trunk/reactos/base/setup/reactos/lang/de-DE.rc trunk/reactos/base/setup/reactos/lang/en-US.rc trunk/reactos/base/setup/reactos/lang/es-ES.rc trunk/reactos/base/setup/reactos/lang/fr-FR.rc trunk/reactos/base/setup/reactos/lang/it-IT.rc trunk/reactos/base/setup/reactos/lang/no-NO.rc trunk/reactos/base/setup/reactos/lang/pl-PL.rc trunk/reactos/base/setup/reactos/lang/ru-RU.rc trunk/reactos/base/setup/reactos/lang/sk-SK.rc trunk/reactos/base/setup/reactos/reactos.c trunk/reactos/base/setup/reactos/reactos.rbuild trunk/reactos/base/setup/reactos/resource.h Modified: trunk/reactos/base/setup/reactos/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/bg… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/bg-BG.rc [iso-8859-1] Wed Nov 12 10:08:28 2008 @@ -76,6 +76,8 @@ CONTROL "Ñëàãàíå íà íà÷àëåí çàðåæäà÷ (MBR) íà òâúðäèÿ äèñê", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "Áåç ñëàãàíå íà íà÷àëåí çàðåæäà÷", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 + PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/cs… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/cs-CZ.rc [iso-8859-1] Wed Nov 12 10:08:28 2008 @@ -78,6 +78,8 @@ CONTROL "Install boot loader on the hard disk (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 + PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/de… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] Wed Nov 12 10:08:28 2008 @@ -76,6 +76,8 @@ CONTROL "Install boot loader on the hard disk (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 + PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/en… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] Wed Nov 12 10:08:28 2008 @@ -76,6 +76,8 @@ CONTROL "Install boot loader on the hard disk (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 + PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/es… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/es-ES.rc [iso-8859-1] Wed Nov 12 10:08:28 2008 @@ -79,6 +79,8 @@ CONTROL "Instalar el cargador de arranque en el disco duro (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "No instalar el cargador de arranque", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 + PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/fr… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/fr-FR.rc [iso-8859-1] Wed Nov 12 10:08:28 2008 @@ -74,6 +74,8 @@ CONTROL "Install boot loader on the hard disk (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 + PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/it… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/it-IT.rc [iso-8859-1] Wed Nov 12 10:08:28 2008 @@ -76,6 +76,8 @@ CONTROL "Installazione del Boot loader sul disco fisso (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "Non installare il Boot loader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 + PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/no… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/no-NO.rc [iso-8859-1] Wed Nov 12 10:08:28 2008 @@ -76,6 +76,8 @@ CONTROL "Installer oppstartslaster på harddiskens (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "Ikke installer oppstartslaster", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 + PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/pl… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/pl-PL.rc [iso-8859-1] Wed Nov 12 10:08:28 2008 @@ -82,6 +82,8 @@ CONTROL "Install boot loader on the hard disk (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 + PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ru… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] Wed Nov 12 10:08:28 2008 @@ -76,6 +76,8 @@ CONTROL "Óñòàíîâèòü çàãðóç÷èê íà äèñê (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,49,278,11 CONTROL "Íå óñòàíàâëèâàòü çàãðóç÷èê", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,60,278,11 + PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/sk… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/sk-SK.rc [iso-8859-1] Wed Nov 12 10:08:28 2008 @@ -81,6 +81,8 @@ CONTROL "Install boot loader on the hard disk (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 + PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Wed Nov 12 10:08:28 2008 @@ -29,6 +29,8 @@ #include <commctrl.h> #include <tchar.h> #include <setupapi.h> +#include <initguid.h> +#include <devguid.h> #include <wine/unicode.h> #include "resource.h" @@ -69,7 +71,7 @@ LONG FormatPart; // type of format the partition LONG SelectedLangId; // selected language (table index) LONG SelectedKBLayout; // selected keyboard layout (table index) - WCHAR InstallationDirectory[MAX_PATH]; // installation directory on hdd + TCHAR InstallDir[MAX_PATH]; // installation directory on hdd LONG SelectedComputer; // selected computer type (table index) LONG SelectedDisplay; // selected display type (table index) LONG SelectedKeyboard; // selected keyboard type (table index) @@ -513,11 +515,46 @@ } static INT_PTR CALLBACK +MoreOptDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + CheckDlgButton(hwndDlg, IDC_INSTFREELDR, BST_CHECKED); + SendMessage(GetDlgItem(hwndDlg, IDC_PATH),WM_SETTEXT, + (WPARAM)0,(LPARAM)SetupData.InstallDir); + break; + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDOK: + SendMessage(GetDlgItem(hwndDlg, IDC_PATH),WM_GETTEXT, + (WPARAM)sizeof(SetupData.InstallDir)/sizeof(TCHAR),(LPARAM)SetupData.InstallDir); + + EndDialog(hwndDlg, IDOK); + break; + case IDCANCEL: + EndDialog(hwndDlg, IDCANCEL); + break; + } + } + return FALSE; +} + + +static INT_PTR CALLBACK DriveDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { + HDEVINFO h; + HWND hList; + SP_DEVINFO_DATA DevInfoData; + DWORD i; switch (uMsg) { case WM_INITDIALOG: @@ -530,15 +567,55 @@ dwStyle = GetWindowLong(hwndControl, GWL_STYLE); SetWindowLong(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); - CheckDlgButton(hwndDlg, IDC_INSTFREELDR, BST_CHECKED); /* Set title font */ /*SendDlgItemMessage(hwndDlg, IDC_STARTTITLE, WM_SETFONT, (WPARAM)hTitleFont, (LPARAM)TRUE);*/ -} - break; + h = SetupDiGetClassDevs(&GUID_DEVCLASS_DISKDRIVE, NULL, NULL, + DIGCF_PRESENT); + if (h != INVALID_HANDLE_VALUE) + { + hList =GetDlgItem(hwndDlg, IDC_PARTITION); + DevInfoData.cbSize = sizeof(SP_DEVINFO_DATA); + for (i=0;SetupDiEnumDeviceInfo(h,i,&DevInfoData);i++) + { + DWORD DataT; + LPTSTR buffer = NULL; + DWORD buffersize = 0; + while (!SetupDiGetDeviceRegistryProperty( + h,&DevInfoData, + SPDRP_DEVICEDESC,&DataT,(PBYTE)buffer, + buffersize,&buffersize)) + { + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + if (buffer) LocalFree(buffer); + buffer = LocalAlloc(LPTR,buffersize * 2); + } else + break; + } + if (buffer) + { + SendMessage(hList,LB_ADDSTRING,(WPARAM)0,(LPARAM)buffer); + LocalFree(buffer); + } + } + SetupDiDestroyDeviceInfoList(h); + } + } + break; + case WM_COMMAND: + { + switch(LOWORD(wParam)) + { + case IDC_PARTMOREOPTS: + DialogBox(hInstance,MAKEINTRESOURCE(IDD_BOOTOPTIONS),hwndDlg,MoreOptDlgProc); + break; + } + + } case WM_NOTIFY: { LPNMHDR lpnm = (LPNMHDR)lParam; @@ -601,6 +678,8 @@ { case PSN_SETACTIVE: PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT ); + // disable all buttons during installation process + // PropSheet_SetWizButtons(GetParent(hwndDlg), 0 ); break; default: break; @@ -827,6 +906,14 @@ while (SetupFindNextLine(&InfContext, &InfContext) && Count < SetupData.KeybCount); } } + // get install directory + if (SetupFindFirstLine(hTxtsetupSif, _T("SetupData"), + _T("DefaultPath"),&InfContext)) + { + SetupGetStringField(&InfContext, 1, + SetupData.InstallDir, + sizeof(SetupData.InstallDir) / sizeof(TCHAR), &LineLength); + } SetupCloseInfFile(hTxtsetupSif); } } @@ -859,6 +946,7 @@ (_tcsicmp(szValue, _T("yes"))==0)) { result = 1; // unattendSetup enabled + // read values and store in SetupData } } Modified: trunk/reactos/base/setup/reactos/reactos.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.rbuild [iso-8859-1] Wed Nov 12 10:08:28 2008 @@ -8,6 +8,7 @@ <library>user32</library> <library>comctl32</library> <library>setupapi</library> + <library>uuid</library> <file>reactos.c</file> <file>reactos.rc</file> </module> Modified: trunk/reactos/base/setup/reactos/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/resourc… ============================================================================== --- trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/resource.h [iso-8859-1] Wed Nov 12 10:08:28 2008 @@ -50,6 +50,7 @@ #define IDS_ABORTSETUP2 2039 #define IDC_ACTION 2040 #define IDC_PARTMOREOPTS 2041 +#define IDD_BOOTOPTIONS 2042 #define IDI_MAIN 3000

1 0

[tkreuzer] 37308: Implement RtlLookupFunctionTable, RtlLookupFunctionEntry and a usermode/kernelmode version of RtlpLookupModuleBase helper function.
by tkreuzer＠svn.reactos.org 12 Nov '08

12 Nov '08

Author: tkreuzer Date: Wed Nov 12 09:24:40 2008 New Revision: 37308 URL: http://svn.reactos.org/svn/reactos?rev=37308&view=rev Log: Implement RtlLookupFunctionTable, RtlLookupFunctionEntry and a usermode/kernelmode version of RtlpLookupModuleBase helper function. Added: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c (with props) Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/rtl/libsupp.c branches/ros-amd64-bringup/reactos/lib/rtl/amd64/stubs.c branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke.h branches/ros-amd64-bringup/reactos/ntoskrnl/rtl/libsupp.c Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] Wed Nov 12 09:24:40 2008 @@ -14,6 +14,8 @@ #include <debug.h> SIZE_T RtlpAllocDeallocQueryBufferSize = PAGE_SIZE; +#define IMAGE_DOS_MAGIC 0x5a4d +#define IMAGE_PE_MAGIC 0x00004550 /* FUNCTIONS ***************************************************************/ @@ -356,6 +358,62 @@ } return NULL; +} + +PVOID +NTAPI +RtlpLookupModuleBase( + PVOID Address) +{ + NTSTATUS Status; + MEMORY_BASIC_INFORMATION MemoryInformation; + ULONG_PTR Base, Limit; + PIMAGE_DOS_HEADER DosHeader; + PIMAGE_NT_HEADERS NtHeader; + + Status = NtQueryVirtualMemory(NtCurrentProcess(), + Address, + MemoryBasicInformation, + &MemoryInformation, + sizeof(MEMORY_BASIC_INFORMATION), + NULL); + if (!NT_SUCCESS(Status)) + { + return NULL; + } + + /* FIXME: remove these checks? */ + Base = (ULONG_PTR)MemoryInformation.BaseAddress; + Limit = Base + MemoryInformation.RegionSize; + if ( ((ULONG_PTR)Address < Base) || + ((ULONG_PTR)Address >= Limit) ) + { + /* WTF? */ + return NULL; + } + + /* Check if we got the right kind of memory */ + if ( (MemoryInformation.State != MEM_COMMIT) || + (MemoryInformation.Type != MEM_IMAGE) ) + { + return NULL; + } + + /* Check DOS magic */ + DosHeader = MemoryInformation.AllocationBase; + if (DosHeader->e_magic != IMAGE_DOS_MAGIC) + { + return NULL; + } + + /* Check NT header */ + NtHeader = (PVOID)((ULONG_PTR)DosHeader + DosHeader->e_lfanew); + if (NtHeader->Signature != IMAGE_PE_MAGIC) + { + return NULL; + } + + return MemoryInformation.AllocationBase; } Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/stubs.c [iso-8859-1] Wed Nov 12 09:24:40 2008 @@ -13,19 +13,6 @@ #include <debug.h> /* PUBLIC FUNCTIONS **********************************************************/ - -/* - * @unimplemented - */ -PVOID -NTAPI -RtlLookupFunctionEntry(IN ULONGLONG ControlPC, - OUT PULONGLONG ImageBase, - OUT PULONGLONG TargetGp) -{ - UNIMPLEMENTED; - return NULL; -} /* * @unimplemented Added: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c (added) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c [iso-8859-1] Wed Nov 12 09:24:40 2008 @@ -1,0 +1,153 @@ +/* COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * PURPOSE: Exception related functions + * PROGRAMMER: Timo Kreuzer + */ + +/* INCLUDES *****************************************************************/ + +#include <rtl.h> + +#define NDEBUG +#include <debug.h> + +#define UNWIND_HISTORY_TABLE_NONE 0 +#define UNWIND_HISTORY_TABLE_GLOBAL 1 +#define UNWIND_HISTORY_TABLE_LOCAL 2 + +PVOID +NTAPI +RtlpLookupModuleBase( + PVOID Address); + +/* FUNCTIONS *****************************************************************/ + +PRUNTIME_FUNCTION +NTAPI +RtlLookupFunctionTable( + IN DWORD64 ControlPc, + OUT PDWORD64 ImageBase, + OUT PULONG Length) +{ + PIMAGE_DOS_HEADER DosHeader; + PIMAGE_NT_HEADERS NtHeader; + PIMAGE_DATA_DIRECTORY Directory; + + /* Find ModuleBase */ + DosHeader = RtlpLookupModuleBase((PVOID)ControlPc); + if (!DosHeader) + { + return NULL; + } + + /* Locate NT header and check number of directories */ + NtHeader = (PVOID)((ULONG64)DosHeader + DosHeader->e_lfanew); + if (NtHeader->OptionalHeader.NumberOfRvaAndSizes + < IMAGE_DIRECTORY_ENTRY_EXCEPTION) + { + return NULL; + } + + /* Locate the exception directory */ + Directory = &NtHeader->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXCEPTION]; + *Length = Directory->Size / sizeof(RUNTIME_FUNCTION); + *ImageBase = (ULONG64)DosHeader; + if (!Directory->VirtualAddress) + { + return NULL; + } + + return (PVOID)((ULONG64)DosHeader + Directory->VirtualAddress); +} + + +// http://msdn.microsoft.com/en-us/library/ms680597(VS.85).aspx +PRUNTIME_FUNCTION +NTAPI +RtlLookupFunctionEntry( + IN DWORD64 ControlPc, + OUT PDWORD64 ImageBase, + OUT PUNWIND_HISTORY_TABLE HistoryTable) +{ + PRUNTIME_FUNCTION FunctionTable, FunctionEntry; + ULONG TableLength; + ULONG IndexLo, IndexHi, IndexMid; + + /* Find the corresponding table */ + FunctionTable = RtlLookupFunctionTable(ControlPc, + ImageBase, + &TableLength); + + /* Fail, if no table is found */ + if (!FunctionTable) + { + return (PVOID)1; + } + + /* Use relative virtual address */ + ControlPc -= *ImageBase; + + /* Do a binary search */ + IndexLo = 0; + IndexHi = TableLength; + + while (IndexHi > IndexLo) + { + IndexMid = (IndexLo + IndexHi) / 2; + FunctionEntry = &FunctionTable[IndexMid]; + + if ( (ControlPc >= FunctionEntry->BeginAddress) && + (ControlPc < FunctionEntry->EndAddress) ) + { + /* ControlPc is within limits, return entry */ + return FunctionEntry; + } + + if (ControlPc < FunctionEntry->BeginAddress) + { + /* Continue search in lower half */ + IndexHi = IndexMid; + } + else + { + /* Continue search in upper half */ + IndexLo = IndexMid + 1; + } + } + + /* Nothing found, return NULL */ + return NULL; +} + + +PEXCEPTION_ROUTINE +NTAPI +RtlVirtualUnwind( + IN ULONG HandlerType, + IN ULONG64 ImageBase, + IN ULONG64 ControlPc, + IN PRUNTIME_FUNCTION FunctionEntry, + IN OUT PCONTEXT ContextRecord, + OUT PVOID *HandlerData, + OUT PULONG64 EstablisherFrame, + IN OUT PKNONVOLATILE_CONTEXT_POINTERS ContextPointers) +{ + UNIMPLEMENTED; + return 0; +} + +VOID +NTAPI +RtlUnwindEx( + IN ULONG64 TargetFrame, + IN ULONG64 TargetIp, + IN PEXCEPTION_RECORD ExceptionRecord, + IN PVOID ReturnValue, + OUT PCONTEXT OriginalContext, + IN PUNWIND_HISTORY_TABLE HistoryTable) +{ + UNIMPLEMENTED; + return; +} + + Propchange: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c ------------------------------------------------------------------------------ svn:mergeinfo = Modified: branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild [iso-8859-1] Wed Nov 12 09:24:40 2008 @@ -39,6 +39,7 @@ <if property="ARCH" value="amd64"> <directory name="amd64"> <file>debug_asm.S</file> + <file>unwind.c</file> <file>stubs.c</file> </directory> <file>mem.c</file> Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c [iso-8859-1] Wed Nov 12 09:24:40 2008 @@ -68,14 +68,10 @@ STUB(KdpGdbStubInit) STUB(KdbpSafeReadMemory) STUB(RtlFillMemoryUlong) -STUB(RtlCaptureContext) -STUB(RtlpGetExceptionAddress) -STUB(RtlDispatchException) STUB(DbgkDebugObjectType) STUB(KdbEnterDebuggerException) STUB(KdbpCliModuleLoaded) STUB(RtlUnwind) -STUB(RtlInitializeContext) STUB(DbgCommandString) STUB(ExAcquireRundownProtection) STUB(ExAcquireRundownProtectionCacheAware) @@ -180,7 +176,6 @@ STUB(RtlCopyMemory) STUB(RtlCopyMemoryNonTemporal) STUB(RtlFillMemory) -STUB(RtlLookupFunctionEntry) STUB(RtlMoveMemory) STUB(RtlOemStringToUnicodeSize) STUB(RtlPcToFileHeader) @@ -196,8 +191,6 @@ STUB(RtlTraceDatabaseValidate) STUB(RtlUnicodeStringToAnsiSize) STUB(RtlUnicodeStringToOemSize) -STUB(RtlUnwindEx) -STUB(RtlVirtualUnwind) STUB(RtlZeroMemory) STUB(SeReportSecurityEvent) STUB(SeSetAuditParameter) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Wed Nov 12 09:24:40 2008 @@ -1047,6 +1047,18 @@ VOID ); +PVOID +NTAPI +KiPcToFileHeader(IN PVOID Eip, + OUT PLDR_DATA_TABLE_ENTRY *LdrEntry, + IN BOOLEAN DriversOnly, + OUT PBOOLEAN InKernel); + +PVOID +NTAPI +KiRosPcToUserFileHeader(IN PVOID Eip, + OUT PLDR_DATA_TABLE_ENTRY *LdrEntry); + #include "ke_x.h" #endif /* __NTOSKRNL_INCLUDE_INTERNAL_KE_H */ Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Wed Nov 12 09:24:40 2008 @@ -27,6 +27,30 @@ SIZE_T RtlpAllocDeallocQueryBufferSize = 128; /* FUNCTIONS *****************************************************************/ + +PVOID +NTAPI +RtlpLookupModuleBase( + PVOID Address) +{ + PLDR_DATA_TABLE_ENTRY LdrEntry; + BOOLEAN InSystem; + PVOID p; + + /* Get the base for this file */ + if ((ULONG_PTR)Address > (ULONG_PTR)MmHighestUserAddress) + { + /* We are in kernel */ + p = KiPcToFileHeader(Address, &LdrEntry, FALSE, &InSystem); + } + else + { + /* We are in user land */ + p = KiRosPcToUserFileHeader(Address, &LdrEntry); + } + + return p; +} VOID NTAPI

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs