Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[sserapion] 37392: - Use TARGET_CPPFLAGS, needs latest ROSBE. - Link crt runtime to dlls too.

by sserapion＠svn.reactos.org

Author: sserapion Date: Mon Nov 17 00:08:13 2008 New Revision: 37392 URL: http://svn.reactos.org/svn/reactos?rev=37392&view=rev Log: - Use TARGET_CPPFLAGS, needs latest ROSBE. - Link crt runtime to dlls too. Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Mon Nov 17 00:08:13 2008 @@ -1915,8 +1915,7 @@ { if ( module.cplusplus ) { - // HACK: use host headers when building C++ - globalCflags += " $(HOST_CPPFLAGS)"; + globalCflags += " $(TARGET_CPPFLAGS)"; } else globalCflags += " -nostdinc"; @@ -2684,8 +2683,8 @@ { if ( module.IsDLL () ) { - //pLibrary = new Library ( module, "__mingw_dllmain" ); - //module.non_if_data.libraries.insert ( module.non_if_data.libraries.begin(), pLibrary ); + pLibrary = new Library ( module, "mingw_dllmain" ); + module.non_if_data.libraries.insert ( module.non_if_data.libraries.begin(), pLibrary ); } else {

15 years, 10 months

[sserapion] 37391: - call __main (C++ initialization) gcc inserts this call automatically for a function called "main", but not for "wmain" fixes explorer - support pseudo runtime relocation v2. - re-enable commented out code for security cookies. - rename entry point __tmainCRTStartup. - gccmain.c re-add comment explaining this file's purpose.

by sserapion＠svn.reactos.org

Author: sserapion Date: Sun Nov 16 23:51:18 2008 New Revision: 37391 URL: http://svn.reactos.org/svn/reactos?rev=37391&view=rev Log: - call __main (C++ initialization) gcc inserts this call automatically for a function called "main", but not for "wmain" fixes explorer - support pseudo runtime relocation v2. - re-enable commented out code for security cookies. - rename entry point __tmainCRTStartup. - gccmain.c re-add comment explaining this file's purpose. Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp8.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllargv.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc-list.c (with props) Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllmain.c Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt0_w.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gccmain.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc.c Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp8.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp8.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp8.c [iso-8859-1] Sun Nov 16 23:51:18 2008 @@ -1,0 +1,5 @@ +extern void (*_imp___fpreset)(void) ; +void _fpreset (void) +{ (*_imp___fpreset)(); } + +void __attribute__ ((alias ("_fpreset"))) fpreset(void); Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp8.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt0_w.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt0_w.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt0_w.c [iso-8859-1] Sun Nov 16 23:51:18 2008 @@ -2,8 +2,13 @@ int WINAPI wWinMain(HINSTANCE hInstance,HINSTANCE hPrevInstance,LPWSTR lpCmdLine,int nShowCmd); - +void __main(void); int wmain (int flags, wchar_t **cmdline, wchar_t **inst) { +#ifdef __GNUC__ + /* C++ initialization. (gcc inserts this call automatically for + * a function called "main", but not for "wmain") */ + __main(); +#endif return (int) wWinMain ((HINSTANCE) inst, NULL, (LPWSTR) cmdline,(DWORD) flags); } Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] Sun Nov 16 23:51:18 2008 @@ -1,5 +1,5 @@ #undef CRTDLL -#define _DLL +//#define _DLL #define SPECIAL_CRTEXE @@ -31,7 +31,7 @@ #define SPACECHAR _T(' ') #define DQUOTECHAR _T('\"') -_CRTIMP void __setusermatherr(int (__cdecl *)(struct _exception *)); +__declspec(dllimport) void __setusermatherr(int (__cdecl *)(struct _exception *)); extern int *_imp___fmode; extern int *_imp___commode; @@ -68,9 +68,9 @@ static char **envp; #endif -static int argret=0; +static int argret; static int mainret=0; -static int managedapp=0; +static int managedapp; static int has_cctor = 0; static _startupinfo startinfo; @@ -102,8 +102,10 @@ *_imp___fmode = _fmode; *_imp___commode = _commode; -#ifndef WPRFLAG - _dowildcard = 1; +#ifdef WPRFLAG + _wsetargv(); +#else + _setargv(); #endif if (! __defaultmatherr) @@ -119,15 +121,15 @@ pre_cpp_init (void) { startinfo.newmode = _newmode; + #ifdef WPRFLAG argret = __wgetmainargs(&argc,&argv,&envp,_dowildcard,&startinfo); #else argret = __getmainargs(&argc,&argv,&envp,_dowildcard,&startinfo); #endif - -} - -static int __mingw_CRTStartup (void); +} + +static int __tmainCRTStartup (void); #ifdef WPRFLAG int wWinMainCRTStartup (void) @@ -136,8 +138,8 @@ #endif { mingw_app_type = 1; - //__security_init_cookie (); - return __mingw_CRTStartup (); + __security_init_cookie (); + return __tmainCRTStartup (); } #ifdef WPRFLAG @@ -147,26 +149,25 @@ #endif { mingw_app_type = 0; - //__security_init_cookie (); - return __mingw_CRTStartup (); + __security_init_cookie (); + return __tmainCRTStartup (); } __declspec(noinline) int -__mingw_CRTStartup (void) +__tmainCRTStartup (void) { _TCHAR *lpszCommandLine = NULL; STARTUPINFO StartupInfo; BOOL inDoubleQuote = FALSE; memset (&StartupInfo, 0, sizeof (STARTUPINFO)); - int nested = FALSE; - + if (mingw_app_type) GetStartupInfo (&StartupInfo); { -#if 0 //not ready for this yet void *lock_free = NULL; void *fiberid = ((PNT_TIB)NtCurrentTeb())->StackBase; + int nested = FALSE; while((lock_free = InterlockedCompareExchangePointer ((volatile PVOID *) &__native_startup_lock, fiberid, 0)) != 0) { @@ -177,7 +178,6 @@ } Sleep(1000); } -#endif if (__native_startup_state == __initializing) { _amsg_exit (31); @@ -404,7 +404,7 @@ static LONG __mingw_vex(EXCEPTION_POINTERS * exception_data) { /* TODO this is not chainablem, therefore need rewrite. Disabled the ill code. */ - + #if 0 #ifdef _WIN64 __asm__ __volatile__ ( "movq %gs:0,%rax" "\n\t" @@ -421,6 +421,7 @@ "jmp *4(%eax)\n\r" "l1:\n\t" "nop\n"); +#endif #endif return _gnu_exception_handler(exception_data); } Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllargv.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllargv.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllargv.c [iso-8859-1] Sun Nov 16 23:51:18 2008 @@ -1,0 +1,30 @@ +#ifdef CRTDLL +#undef CRTDLL +#endif + +#include "internal.h" + +extern int _dowildcard; + +#ifdef WPRFLAG +int __CRTDECL +_wsetargv (void) +#else +int __CRTDECL +_setargv (void) +#endif +{ + return 0; +} + +#ifdef WPRFLAG +int __CRTDECL +__wsetargv (void) +#else +int __CRTDECL +__setargv (void) +#endif +{ + _dowildcard = 1; + return 0; +} Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllargv.c ------------------------------------------------------------------------------ svn:eol-style = native Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllmain.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllmain.c (removed) @@ -1,9 +1,0 @@ -#define _DECL_DLLMAIN -#define _WINDOWS_ -#include <windows.h> -#include <process.h> - -BOOL WINAPI DllMain(HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved) -{ - return TRUE; -} Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gccmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gccmain.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gccmain.c [iso-8859-1] Sun Nov 16 23:51:18 2008 @@ -1,3 +1,15 @@ +/* + * gccmain.c + * This file has no copyright assigned and is placed in the Public Domain. + * This file is a part of the mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER within the package. + * + * A separate version of __main, __do_global_ctors and __do_global_dtors for + * Mingw32 for use with Cygwin32 b19. Hopefully this object file will only + * be linked if the libgcc.a doesn't include __main, __do_global_dtors and + * __do_global_ctors. + * + */ #include <windows.h> #include <stdlib.h> #include <setjmp.h> @@ -6,7 +18,7 @@ extern func_ptr __CTOR_LIST__[]; extern func_ptr __DTOR_LIST__[]; -//static HMODULE hMsvcrt = NULL; +static HMODULE hMsvcrt = NULL; typedef void __cdecl flongjmp(jmp_buf _Buf,int _Value); @@ -22,11 +34,11 @@ (*(p)) (); p++; } - //if (hMsvcrt) - // { - // FreeLibrary (hMsvcrt); - // hMsvcrt = NULL; - // } + if (hMsvcrt) + { + FreeLibrary (hMsvcrt); + hMsvcrt = NULL; + } } void @@ -35,10 +47,10 @@ unsigned long nptrs = (unsigned long) (ptrdiff_t) __CTOR_LIST__[0]; unsigned long i; - //if (!hMsvcrt) { - // hMsvcrt = LoadLibrary ("msvcrt.dll"); - // fctMsvcrtLongJmp = (flongjmp *) GetProcAddress( hMsvcrt, "longjmp"); - //} + if (!hMsvcrt) { + hMsvcrt = LoadLibrary ("msvcrt.dll"); + fctMsvcrtLongJmp = (flongjmp *) GetProcAddress( hMsvcrt, "longjmp"); + } if (nptrs == (unsigned long) -1) { Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Sun Nov 16 23:51:18 2008 @@ -4,6 +4,7 @@ <module name="mingw_common" type="staticlibrary" isstartuplib="true" underscoresymbols="true" crt="dll"> <importlibrary definition="moldname-msvcrt.def" dllname="msvcrt.dll" /> <include base="mingw_common">include</include> + <library>kernel32</library> <file>_newmode.c</file> <file>_wgetopt.c</file> <file>argv.c</file> @@ -12,17 +13,17 @@ <file>charmax.c</file> <file>cinitexe.c</file> <file>CRT_fp10.c</file> - <file>crtdll.c</file> + <file>CRT_fp8.c</file> <file>dllentry.c</file> - <file>dllmain.c</file> <file>gccmain.c</file> <file>getopt.c</file> -  + <file>gs_support.c</file> <file>merr.c</file> <file>mingw_helpers.c</file> <file>natstart.c</file> <file>pesect.c</file> <file>pseudo-reloc.c</file> + <file>pseudo-reloc-list.c</file> <file>tlssup.c</file> <file>wildcard.c</file> <file>xncommod.c</file> @@ -33,16 +34,18 @@ <include base="mingw_common">include</include> <file>crt0_c.c</file> <file>crtexe.c</file> + <file>dllargv.c</file> </module> <module name="mingw_wmain" type="staticlibrary" isstartuplib="true" allowwarnings="true" unicode="yes" crt="dll"> <include base="mingw_common">include</include> <define name="WPRFLAG"/> <file>crt0_w.c</file> <file>crtexe.c</file> + <file>dllargv.c</file> </module> <module name="mingw_dllmain" type="staticlibrary" isstartuplib="true" crt="dll"> <include base="mingw_common">include</include> - <file>dllentry.c</file> - <file>dllmain.c</file> + <file>dllargv.c</file> + <file>crtdll.c</file> </module> </group> Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc-list.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc-list.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc-list.c [iso-8859-1] Sun Nov 16 23:51:18 2008 @@ -1,0 +1,2 @@ +char __RUNTIME_PSEUDO_RELOC_LIST_END__ = 0; +char __RUNTIME_PSEUDO_RELOC_LIST__ = 0; Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc-list.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc.c [iso-8859-1] Sun Nov 16 23:51:18 2008 @@ -1,50 +1,127 @@ -/* pseudo-reloc.c - - Written by Egor Duda <deo(a)logos-m.ru> - THIS SOFTWARE IS NOT COPYRIGHTED - - This source code is offered for use in the public domain. You may - use, modify or distribute it freely. - - This code is distributed in the hope that it will be useful but - WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY - DISCLAMED. This includes but is not limited to warrenties of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -*/ - /* Only necesary on x86 and amd64 targets */ #if defined(__i386__) || defined(__x86_64__) - #include <windows.h> +#include <stdio.h> extern char __RUNTIME_PSEUDO_RELOC_LIST__; extern char __RUNTIME_PSEUDO_RELOC_LIST_END__; extern char _image_base__; -typedef struct - { - DWORD addend; - DWORD target; - } -runtime_pseudo_reloc; +typedef struct { + DWORD addend; + DWORD target; +} runtime_pseudo_reloc_item_v1; + +typedef struct { + DWORD sym; + DWORD target; + DWORD flags; +} runtime_pseudo_reloc_item_v2; + +typedef struct { + DWORD magic1; + DWORD magic2; + DWORD version; +} runtime_pseudo_reloc_v2; + +#define RP_VERSION_V1 0 +#define RP_VERSION_V2 1 static void -do_pseudo_reloc (void* start, void* end, void* base) +do_pseudo_reloc (void* start,void *end,void *base) { - ptrdiff_t reloc_target; - runtime_pseudo_reloc* r; - for (r = (runtime_pseudo_reloc*) start; r < (runtime_pseudo_reloc*) end; r++) + ptrdiff_t addr_imp, reldata; + ptrdiff_t reloc_target = (ptrdiff_t) ((char *)end - (char*)start); + runtime_pseudo_reloc_v2 *v2_hdr = (runtime_pseudo_reloc_v2 *) start; + runtime_pseudo_reloc_item_v2 *r; + + if (reloc_target < 8) + return; + /* Check if this is old version pseudo relocation version. */ + if (reloc_target >= 12 + && v2_hdr->magic1 == 0 && v2_hdr->magic2 == 0 + && v2_hdr->version == RP_VERSION_V1) + v2_hdr++; + if (v2_hdr->magic1 != 0 || v2_hdr->magic2 != 0) + { + runtime_pseudo_reloc_item_v1 *o; + for (o = (runtime_pseudo_reloc_item_v1 *) v2_hdr; o < (runtime_pseudo_reloc_item_v1 *)end; o++) + { + reloc_target = (ptrdiff_t) base + o->target; + *((DWORD*) reloc_target) += o->addend; + } + return; + } + /* Check if this is a known version. */ + if (v2_hdr->version != RP_VERSION_V2) + { + fprintf (stderr, "pseudo_relocation protocol version %d is unknown to this runtime.\n", + (int) v2_hdr->version); + return; + } + /* Walk over header. */ + r = (runtime_pseudo_reloc_item_v2 *) &v2_hdr[1]; + + for (; r < (runtime_pseudo_reloc_item_v2 *) end; r++) { reloc_target = (ptrdiff_t) base + r->target; - *((ptrdiff_t*) reloc_target) += r->addend; + addr_imp = (ptrdiff_t) base + r->sym; + addr_imp = *((ptrdiff_t *) addr_imp); + + switch ((r->flags&0xff)) + { + case 8: + reldata = (ptrdiff_t) (*((unsigned char *)reloc_target)); + if ((reldata&0x80) != 0) + reldata |= ~((ptrdiff_t) 0xff); + break; + case 16: + reldata = (ptrdiff_t) (*((unsigned short *)reloc_target)); + if ((reldata&0x8000) != 0) + reldata |= ~((ptrdiff_t) 0xffff); + break; + case 32: + reldata = (ptrdiff_t) (*((unsigned int *)reloc_target)); +#ifdef _WIN64 + if ((reldata&0x80000000) != 0) + reldata |= ~((ptrdiff_t) 0xffffffff); +#endif + break; +#ifdef _WIN64 + case 64: + reldata = (ptrdiff_t) (*((unsigned long long *)reloc_target)); + break; +#endif + default: + reldata=0; + fprintf(stderr, "Unknown pseudo relocation bit size %d\n",(int) (r->flags & 0xff)); + break; + } + reldata -= ((ptrdiff_t) base + r->sym); + reldata += addr_imp; + switch ((r->flags & 0xff)) + { + case 8: + *((unsigned char*)reloc_target)=(unsigned char) reldata; + break; + case 16: + *((unsigned short*)reloc_target)=(unsigned short) reldata; + break; + case 32: + *((unsigned int*)reloc_target)=(unsigned int) reldata; + break; +#ifdef _WIN64 + case 64: + *((unsigned long long*)reloc_target)=(unsigned long long) reldata; + break; +#endif + } } } void _pei386_runtime_relocator () { - do_pseudo_reloc (&__RUNTIME_PSEUDO_RELOC_LIST__, - &__RUNTIME_PSEUDO_RELOC_LIST_END__, - &_image_base__); + do_pseudo_reloc (&__RUNTIME_PSEUDO_RELOC_LIST__,&__RUNTIME_PSEUDO_RELOC_LIST_END__,&_image_base__); } #endif

15 years, 10 months

[fireball] 37390: Daniel Zimmerman - Fix random widl crashes when compiling on Vista x86. Patch from Wine bugzilla: http://bugs.winehq.org/show_bug.cgi?id=16084 . See issue #3877 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Nov 16 10:24:23 2008 New Revision: 37390 URL: http://svn.reactos.org/svn/reactos?rev=37390&view=rev Log: Daniel Zimmerman - Fix random widl crashes when compiling on Vista x86. Patch from Wine bugzilla: http://bugs.winehq.org/show_bug.cgi?id=16084 . See issue #3877 for more details. Modified: trunk/reactos/tools/widl/typegen.c Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=3… ============================================================================== --- trunk/reactos/tools/widl/typegen.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typegen.c [iso-8859-1] Sun Nov 16 10:24:23 2008 @@ -3091,7 +3091,7 @@ size += get_size_procformatstring(stmt->u.lib->stmts, pred) - 1; continue; } - else if (stmt->type != STMT_TYPE && stmt->u.type->type != RPC_FC_IP) + else if (stmt->type != STMT_TYPE || stmt->u.type->type != RPC_FC_IP) continue; iface = stmt->u.type;

15 years, 10 months

[dreimer] 37389: Changed the default values of config to the previous setting instead of the real default one if you don't type in anything for a setting. Fixed sSVN.ps1. Works now. Left TODO: reladdr2line

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Nov 16 08:46:40 2008 New Revision: 37389 URL: http://svn.reactos.org/svn/reactos?rev=37389&view=rev Log: Changed the default values of config to the previous setting instead of the real default one if you don't type in anything for a setting. Fixed sSVN.ps1. Works now. Left TODO: reladdr2line Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Sun Nov 16 08:46:40 2008 @@ -8,8 +8,8 @@ # function UP { - "Local Revision: $OFFSVN" - "Online HEAD Revision: $ONSVN" + "Local $OFFSVN" + "Online HEAD $ONSVN" "" if ($OFFSVN -lt $ONSVN) { "Your tree is not up to date. Do you want to update it?" @@ -76,8 +76,8 @@ $host.ui.RawUI.WindowTitle = "SVN Status" "This might take a while, so please be patient." "" - $OFFSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info" | find "Revision:" - $ONSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info svn://svn.reactos.org/reactos/trunk/reactos" | find "Revision:" + $OFFSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info" | findstr "Revision:" + $ONSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info svn://svn.reactos.org/reactos/trunk/reactos" | findstr "Revision:" UP } Modified: trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Con… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] Sun Nov 16 08:46:40 2008 @@ -136,7 +136,7 @@ echo Right now: %OARCH% set /p OARCH_CH= if "%OARCH_CH%" == "" ( - set OARCH_CH=pentium + set OARCH_CH=%OARCH% ) cls @@ -152,7 +152,7 @@ echo Right now: %OPTIMIZE% set /p OPTIMIZE_CH="(0), (1), (2), (3), (4), (5)" if "%OPTIMIZE_CH%" == "" ( - set OPTIMIZE_CH=1 + set OPTIMIZE_CH=%OPTIMIZE% ) cls @@ -164,7 +164,7 @@ echo Right now: %KDBG% set /p KDBG_CH="(0), (1)" if "%KDBG_CH%" == "" ( - set KDBG_CH=1 + set KDBG_CH=%KDBG% ) cls @@ -177,7 +177,7 @@ echo Right now: %DBG% set /p DBG_CH="(0), (1)" if "%DBG_CH%" == "" ( - set DBG_CH=1 + set DBG_CH=%DBG% ) cls @@ -190,7 +190,7 @@ echo Right now: %GDB% set /p GDB_CH="(0), (1)" if "%GDB_CH%" == "" ( - set GDB_CH=0 + set GDB_CH=%GDB% ) cls @@ -205,7 +205,7 @@ echo Right now: %NSWPAT% set /p NSWPAT_CH="(0), (1)" if "%NSWPAT_CH%" == "" ( - set NSWPAT_CH=0 + set NSWPAT_CH=%NSWPAT% ) cls @@ -222,7 +222,7 @@ echo Right now: %WINKD% set /p WINKD_CH="(0), (1)" if "%WINKD_CH%" == "" ( - set WINKD_CH=0 + set WINKD_CH=%WINKD% ) cls

15 years, 10 months

[sginsberg] 37388: - STDCALL -> NTAPI

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sun Nov 16 07:42:56 2008 New Revision: 37388 URL: http://svn.reactos.org/svn/reactos?rev=37388&view=rev Log: - STDCALL -> NTAPI Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] Sun Nov 16 07:42:56 2008 @@ -43,11 +43,6 @@ #include "scsiport_int.h" -#ifdef _MSC_VER - #define STDCALL - #define DDKAPI -#endif - ULONG InternalDebugLevel = 0x00; /* TYPES *********************************************************************/ @@ -63,29 +58,29 @@ IN ULONG BusNumber, IN OUT PPCI_SLOT_NUMBER NextSlotNumber); -static NTSTATUS STDCALL +static NTSTATUS NTAPI ScsiPortCreateClose(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); static DRIVER_DISPATCH ScsiPortDispatchScsi; -static NTSTATUS STDCALL +static NTSTATUS NTAPI ScsiPortDispatchScsi(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -static NTSTATUS STDCALL +static NTSTATUS NTAPI ScsiPortDeviceControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); static DRIVER_STARTIO ScsiPortStartIo; -static VOID STDCALL +static VOID NTAPI ScsiPortStartIo(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -static BOOLEAN STDCALL +static BOOLEAN NTAPI ScsiPortStartPacket(IN OUT PVOID Context); IO_ALLOCATION_ACTION -STDCALL +NTAPI SpiAdapterControl(PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID MapRegisterBase, PVOID Context); @@ -121,22 +116,22 @@ IN UCHAR Lun, IN UCHAR QueueTag); -static BOOLEAN STDCALL +static BOOLEAN NTAPI ScsiPortIsr(IN PKINTERRUPT Interrupt, IN PVOID ServiceContext); -static VOID STDCALL +static VOID NTAPI ScsiPortDpcForIsr(IN PKDPC Dpc, IN PDEVICE_OBJECT DpcDeviceObject, IN PIRP DpcIrp, IN PVOID DpcContext); -static VOID STDCALL +static VOID NTAPI ScsiPortIoTimer(PDEVICE_OBJECT DeviceObject, PVOID Context); IO_ALLOCATION_ACTION -STDCALL +NTAPI ScsiPortAllocateAdapterChannel(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID MapRegisterBase, @@ -154,22 +149,22 @@ IN PSCSI_REQUEST_BLOCK Srb); static IO_COMPLETION_ROUTINE SpiCompletionRoutine; -NTSTATUS STDCALL +NTSTATUS NTAPI SpiCompletionRoutine(PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID Context); static VOID -STDCALL +NTAPI SpiProcessCompletedRequest(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, IN PSCSI_REQUEST_BLOCK_INFO SrbInfo, OUT PBOOLEAN NeedToCallStartIo); -VOID STDCALL +VOID NTAPI SpiGetNextRequestFromLun(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, IN PSCSI_PORT_LUN_EXTENSION LunExtension); -VOID STDCALL +VOID NTAPI SpiMiniportTimerDpc(IN struct _KDPC *Dpc, IN PVOID DeviceObject, IN PVOID SystemArgument1, @@ -182,7 +177,7 @@ PPORT_CONFIGURATION_INFORMATION ConfigInfo, BOOLEAN FirstCall); -NTSTATUS STDCALL +NTSTATUS NTAPI SpQueryDeviceCallout(IN PVOID Context, IN PUNICODE_STRING PathName, IN INTERFACE_TYPE BusType, @@ -246,7 +241,7 @@ * Status. */ -NTSTATUS STDCALL +NTSTATUS NTAPI DriverEntry(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) { @@ -303,7 +298,7 @@ /* * @unimplemented */ -VOID STDCALL +VOID NTAPI ScsiPortCompleteRequest(IN PVOID HwDeviceExtension, IN UCHAR PathId, IN UCHAR TargetId, @@ -317,7 +312,7 @@ /* * @unimplemented */ -VOID STDCALL +VOID NTAPI ScsiPortFlushDma(IN PVOID HwDeviceExtension) { DPRINT("ScsiPortFlushDma()\n"); @@ -328,7 +323,7 @@ /* * @implemented */ -VOID STDCALL +VOID NTAPI ScsiPortFreeDeviceBase(IN PVOID HwDeviceExtension, IN PVOID MappedAddress) { @@ -380,7 +375,7 @@ /* * @implemented */ -ULONG STDCALL +ULONG NTAPI ScsiPortGetBusData(IN PVOID DeviceExtension, IN ULONG BusDataType, IN ULONG SystemIoBusNumber, @@ -409,7 +404,7 @@ /* * @implemented */ -ULONG STDCALL +ULONG NTAPI ScsiPortSetBusDataByOffset(IN PVOID DeviceExtension, IN ULONG BusDataType, IN ULONG SystemIoBusNumber, @@ -430,7 +425,7 @@ /* * @implemented */ -PVOID STDCALL +PVOID NTAPI ScsiPortGetDeviceBase(IN PVOID HwDeviceExtension, IN INTERFACE_TYPE BusType, IN ULONG SystemIoBusNumber, @@ -489,7 +484,7 @@ /* * @unimplemented */ -PVOID STDCALL +PVOID NTAPI ScsiPortGetLogicalUnit(IN PVOID HwDeviceExtension, IN UCHAR PathId, IN UCHAR TargetId, @@ -532,7 +527,7 @@ /* * @implemented */ -SCSI_PHYSICAL_ADDRESS STDCALL +SCSI_PHYSICAL_ADDRESS NTAPI ScsiPortGetPhysicalAddress(IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb OPTIONAL, IN PVOID VirtualAddress, @@ -598,7 +593,7 @@ /* * @unimplemented */ -PSCSI_REQUEST_BLOCK STDCALL +PSCSI_REQUEST_BLOCK NTAPI ScsiPortGetSrb(IN PVOID DeviceExtension, IN UCHAR PathId, IN UCHAR TargetId, @@ -614,7 +609,7 @@ /* * @implemented */ -PVOID STDCALL +PVOID NTAPI ScsiPortGetUncachedExtension(IN PVOID HwDeviceExtension, IN PPORT_CONFIGURATION_INFORMATION ConfigInfo, IN ULONG NumberOfBytes) @@ -796,7 +791,7 @@ /* * @implemented */ -PVOID STDCALL +PVOID NTAPI ScsiPortGetVirtualAddress(IN PVOID HwDeviceExtension, IN SCSI_PHYSICAL_ADDRESS PhysicalAddress) { @@ -917,7 +912,7 @@ * @implemented */ -ULONG STDCALL +ULONG NTAPI ScsiPortInitialize(IN PVOID Argument1, IN PVOID Argument2, IN struct _HW_INITIALIZATION_DATA *HwInitializationData, @@ -1715,7 +1710,7 @@ /* * @unimplemented */ -VOID STDCALL +VOID NTAPI ScsiPortIoMapTransfer(IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb, IN PVOID LogicalAddress, @@ -1728,7 +1723,7 @@ /* * @unimplemented */ -VOID STDCALL +VOID NTAPI ScsiPortLogError(IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb OPTIONAL, IN UCHAR PathId, @@ -1752,7 +1747,7 @@ /* * @implemented */ -VOID STDCALL +VOID NTAPI ScsiPortMoveMemory(OUT PVOID Destination, IN PVOID Source, IN ULONG Length) @@ -1902,7 +1897,7 @@ /* * @implemented */ -BOOLEAN STDCALL +BOOLEAN NTAPI ScsiPortValidateRange(IN PVOID HwDeviceExtension, IN INTERFACE_TYPE BusType, IN ULONG SystemIoBusNumber, @@ -2300,7 +2295,7 @@ * Status. */ -static NTSTATUS STDCALL +static NTSTATUS NTAPI ScsiPortCreateClose(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -2412,7 +2407,7 @@ * NTSTATUS */ -static NTSTATUS STDCALL +static NTSTATUS NTAPI ScsiPortDispatchScsi(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -2653,7 +2648,7 @@ * NTSTATUS */ -static NTSTATUS STDCALL +static NTSTATUS NTAPI ScsiPortDeviceControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -2727,7 +2722,7 @@ } -static VOID STDCALL +static VOID NTAPI ScsiPortStartIo(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -2905,7 +2900,7 @@ } -static BOOLEAN STDCALL +static BOOLEAN NTAPI ScsiPortStartPacket(IN OUT PVOID Context) { PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; @@ -3060,7 +3055,7 @@ } IO_ALLOCATION_ACTION -STDCALL +NTAPI SpiAdapterControl(PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID MapRegisterBase, @@ -4042,7 +4037,7 @@ static VOID -STDCALL +NTAPI SpiProcessCompletedRequest(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, IN PSCSI_REQUEST_BLOCK_INFO SrbInfo, OUT PBOOLEAN NeedToCallStartIo) @@ -4359,7 +4354,7 @@ } NTSTATUS -STDCALL +NTAPI SpiCompletionRoutine(PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID Context) @@ -4414,7 +4409,7 @@ return STATUS_MORE_PROCESSING_REQUIRED; } -static BOOLEAN STDCALL +static BOOLEAN NTAPI ScsiPortIsr(IN PKINTERRUPT Interrupt, IN PVOID ServiceContext) { @@ -4444,7 +4439,7 @@ } BOOLEAN -STDCALL +NTAPI SpiSaveInterruptData(IN PVOID Context) { PSCSI_PORT_SAVE_INTERRUPT InterruptContext = Context; @@ -4562,7 +4557,7 @@ } VOID -STDCALL +NTAPI SpiGetNextRequestFromLun(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, IN PSCSI_PORT_LUN_EXTENSION LunExtension) { @@ -4669,7 +4664,7 @@ // IN PIRP DpcIrp // IN PVOID DpcContext // -static VOID STDCALL +static VOID NTAPI ScsiPortDpcForIsr(IN PKDPC Dpc, IN PDEVICE_OBJECT DpcDeviceObject, IN PIRP DpcIrp, @@ -4869,7 +4864,7 @@ } BOOLEAN -STDCALL +NTAPI SpiProcessTimeout(PVOID ServiceContext) { PDEVICE_OBJECT DeviceObject = (PDEVICE_OBJECT)ServiceContext; @@ -4915,7 +4910,7 @@ BOOLEAN -STDCALL +NTAPI SpiResetBus(PVOID ServiceContext) { PRESETBUS_PARAMS ResetParams = (PRESETBUS_PARAMS)ServiceContext; @@ -4948,7 +4943,7 @@ // IN PVOID Context the Controller extension for the // controller the device is on // -static VOID STDCALL +static VOID NTAPI ScsiPortIoTimer(PDEVICE_OBJECT DeviceObject, PVOID Context) { @@ -5472,7 +5467,7 @@ } VOID -STDCALL +NTAPI SpiMiniportTimerDpc(IN struct _KDPC *Dpc, IN PVOID DeviceObject, IN PVOID SystemArgument1, @@ -6064,7 +6059,7 @@ } NTSTATUS -STDCALL +NTAPI SpQueryDeviceCallout(IN PVOID Context, IN PUNICODE_STRING PathName, IN INTERFACE_TYPE BusType, @@ -6085,7 +6080,7 @@ } IO_ALLOCATION_ACTION -STDCALL +NTAPI ScsiPortAllocateAdapterChannel(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID MapRegisterBase, @@ -6148,7 +6143,7 @@ /* * @implemented */ -ULONG STDCALL +ULONG NTAPI ScsiPortConvertPhysicalAddressToUlong(IN SCSI_PHYSICAL_ADDRESS Address) { DPRINT("ScsiPortConvertPhysicalAddressToUlong()\n");

15 years, 10 months

[dchapyshev] 37387: - Implement GetCPInfo. Now this function passes all Wine tests

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sun Nov 16 06:15:55 2008 New Revision: 37387 URL: http://svn.reactos.org/svn/reactos?rev=37387&view=rev Log: - Implement GetCPInfo. Now this function passes all Wine tests Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/la… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/lang.c [iso-8859-1] Sun Nov 16 06:15:55 2008 @@ -1238,29 +1238,54 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL -GetCPInfo ( - UINT CodePage, - LPCPINFO CodePageInfo - ) -{ - unsigned i; - - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - - CodePageInfo->MaxCharSize = 1; - CodePageInfo->DefaultChar[0] = '?'; - for (i = 1; i < MAX_DEFAULTCHAR; i++) - { - CodePageInfo->DefaultChar[i] = 0; - } - for (i = 0; i < MAX_LEADBYTES; i++) - { - CodePageInfo->LeadByte[i] = 0; - } +GetCPInfo(UINT CodePage, + LPCPINFO CodePageInfo) +{ + PCODEPAGE_ENTRY CodePageEntry; + + if (!CodePageInfo) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + CodePageEntry = IntGetCodePageEntry(CodePage); + if (CodePageEntry == NULL) + { + switch(CodePage) + { + case CP_UTF7: + case CP_UTF8: + CodePageInfo->DefaultChar[0] = 0x3f; + CodePageInfo->DefaultChar[1] = 0; + CodePageInfo->LeadByte[0] = CodePageInfo->LeadByte[1] = 0; + CodePageInfo->MaxCharSize = (CodePage == CP_UTF7) ? 5 : 4; + return TRUE; + } + + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + if (CodePageEntry->CodePageTable.DefaultChar & 0xff00) + { + CodePageInfo->DefaultChar[0] = (CodePageEntry->CodePageTable.DefaultChar & 0xff00) >> 8; + CodePageInfo->DefaultChar[1] = CodePageEntry->CodePageTable.DefaultChar & 0x00ff; + } + else + { + CodePageInfo->DefaultChar[0] = CodePageEntry->CodePageTable.DefaultChar & 0xff; + CodePageInfo->DefaultChar[1] = 0; + } + + if ((CodePageInfo->MaxCharSize = CodePageEntry->CodePageTable.MaximumCharacterSize) == 2) + memcpy(CodePageInfo->LeadByte, CodePageEntry->CodePageTable.LeadByte, sizeof(CodePageInfo->LeadByte)); + else + CodePageInfo->LeadByte[0] = CodePageInfo->LeadByte[1] = 0; return TRUE; }

15 years, 10 months

[greatlrd] 37386: 1. Fixed one Crash in DdBlt when the Dest was NULL we should return invaild param 2. Move include of pseh header to rosdraw.h 3. Ported partly old code for Hel DdBlt for ddraw 4. Fixed Bug in Hel startup process, but the code is not finish

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Nov 16 05:04:11 2008 New Revision: 37386 URL: http://svn.reactos.org/svn/reactos?rev=37386&view=rev Log: 1. Fixed one Crash in DdBlt when the Dest was NULL we should return invaild param 2. Move include of pseh header to rosdraw.h 3. Ported partly old code for Hel DdBlt for ddraw 4. Fixed Bug in Hel startup process, but the code is not finish Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c branches/reactx/reactos/dll/directx/ddraw/main.c branches/reactx/reactos/dll/directx/ddraw/rosdraw.h branches/reactx/reactos/dll/directx/ddraw/startup.c Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c [iso-8859-1] Sun Nov 16 05:04:11 2008 @@ -17,7 +17,38 @@ DWORD CALLBACK HelDdSurfBlt(LPDDHAL_BLTDATA lpBltData) { - DX_STUB; + + if (lpBltData->dwFlags & DDBLT_COLORFILL) + { + + HBRUSH hbr = CreateSolidBrush(lpBltData->bltFX.dwFillColor ); + + FillRect( (HDC)lpBltData->lpDDDestSurface->lpSurfMore->lpDD_lcl->hDC, + (CONST RECT *)&lpBltData->rDest, + hbr); + + DeleteObject(hbr); + + lpBltData->ddRVal = DD_OK; + } + + else if (lpBltData->dwFlags & DDBLT_ROP) + { + + BitBlt( (HDC)lpBltData->lpDDDestSurface->lpSurfMore->lpDD_lcl->hDC, + lpBltData->rDest.top, + lpBltData->rDest.left, + lpBltData->rDest.right, + lpBltData->rDest.bottom, + (HDC)lpBltData->lpDDSrcSurface->lpSurfMore->lpDD_lcl->hDC, + lpBltData->rSrc.top, + lpBltData->rSrc.right, + lpBltData->bltFX.dwROP); + + lpBltData->ddRVal = DD_OK; + } + + return DDHAL_DRIVER_HANDLED; } DWORD CALLBACK HelDdSurfDestroySurface(LPDDHAL_DESTROYSURFACEDATA lpDestroySurfaceData) Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] Sun Nov 16 05:04:11 2008 @@ -11,6 +11,7 @@ #include "rosdraw.h" + /* FIXME adding hal and hel stub DestroySurface; SetClipList; @@ -272,117 +273,132 @@ return This->dwIntRefCnt; } + HRESULT WINAPI Main_DDrawSurface_Blt(LPDDRAWI_DDRAWSURFACE_INT ThisDest, LPRECT rdst, - LPDDRAWI_DDRAWSURFACE_INT ThisSrc, LPRECT rsrc, DWORD dwFlags, LPDDBLTFX lpbltfx) -{ - - DDHAL_BLTDATA mDdBlt; - - DX_WINDBG_trace(); - - if (( ThisDest->lpLcl->lpGbl->lpDD->lpDDCBtmp->HALDDSurface.dwFlags - & DDHAL_SURFCB32_BLT) != DDHAL_SURFCB32_BLT) - { - return DDERR_GENERIC; - } - - ZeroMemory(&mDdBlt, sizeof(DDHAL_BLTDATA)); - ZeroMemory(&mDdBlt.bltFX, sizeof(DDBLTFX)); - - if (!DdResetVisrgn( ThisDest->lpLcl->lpSurfMore->slist[0], NULL)) - { - DX_STUB_str("DdResetVisrgn failed"); + LPDDRAWI_DDRAWSURFACE_INT ThisSrc, LPRECT rsrc, DWORD dwFlags, LPDDBLTFX lpbltfx) +{ + DDHAL_BLTDATA mDdBlt; + + DX_WINDBG_trace(); + + if (ThisDest == NULL) + { + return DDERR_INVALIDPARAMS; + } + + /* Zero out members in DDHAL_BLTDATA */ + ZeroMemory(&mDdBlt, sizeof(DDHAL_BLTDATA)); + ZeroMemory(&mDdBlt.bltFX, sizeof(DDBLTFX)); + + /* Check if we got HAL support for this api */ + if (( ThisDest->lpLcl->lpGbl->lpDD->lpDDCBtmp->HALDDSurface.dwFlags & + DDHAL_SURFCB32_BLT) == DDHAL_SURFCB32_BLT) + { + mDdBlt.Blt = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpGbl->lpDDCBtmp->HALDDSurface.Blt; + } + /* Check if we got HEL support for this api */ + else if (( ThisDest->lpLcl->lpGbl->lpDD->lpDDCBtmp->HELDDSurface.dwFlags & + DDHAL_SURFCB32_BLT) == DDHAL_SURFCB32_BLT) + { + mDdBlt.Blt = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpGbl->lpDDCBtmp->HELDDSurface.Blt; + } + + /* check see if we got any of them */ + if (mDdBlt.Blt == NULL) + { + return DDERR_GENERIC; + } + + /* Prepare for draw, if we do not rest the DdResetVisrgn some graphice card will not draw on the screen */ + if (!DdResetVisrgn( ThisDest->lpLcl->lpSurfMore->slist[0], NULL)) + { + DX_STUB_str("DdResetVisrgn failed"); + } + + mDdBlt.lpDD = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpGbl; + mDdBlt.lpDDDestSurface = ThisDest->lpLcl->lpSurfMore->slist[0]; + ThisDest->lpLcl->lpSurfMore->slist[0]->hDC = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->hDC; + + /* Setup Src */ + if (( ThisSrc != NULL ) ) + { + + mDdBlt.lpDDSrcSurface = ThisSrc->lpLcl->lpSurfMore->slist[0]; + ThisSrc->lpLcl->lpSurfMore->slist[0]->hDC = ThisSrc->lpLcl->lpSurfMore->lpDD_lcl->hDC; + + if (rsrc != NULL) + { + memmove(&mDdBlt.rSrc, rsrc, sizeof (RECTL)); + } + else + { + if(!GetWindowRect((HWND)ThisSrc->lpLcl->lpSurfMore->lpDD_lcl->hWnd, + (RECT *)&mDdBlt.rSrc)) + { + DX_STUB_str("GetWindowRect failed"); + } + } + + /* FIXME + * compare so we do not write to far + * ThisDest->lpLcl->lpGbl->wWidth; <- surface max width + * ThisDest->lpLcl->lpGbl->wHeight <- surface max heght + * ThisDest->lpLcl->lpGbl->lPitch <- surface bpp + */ + + } + + /* Setup dest */ + if (rdst != NULL) + { + memmove(&mDdBlt.rDest, rdst, sizeof (RECTL)); + } + else + { + if (!GetWindowRect((HWND)ThisDest->lpLcl->lpSurfMore->lpDD_lcl->hWnd, + (RECT *)&mDdBlt.rDest)) + { + DX_STUB_str("GetWindowRect failed"); + } + } + + /* FIXME + * compare so we do not write to far + * ThisDest->lpLcl->lpGbl->wWidth; <- surface max width + * ThisDest->lpLcl->lpGbl->wHeight <- surface max heght + * ThisDest->lpLcl->lpGbl->lPitch <- surface bpp + */ + + + /* setup bltFX */ + if (lpbltfx != NULL) + { + memmove(&mDdBlt.bltFX, lpbltfx, sizeof (DDBLTFX)); + } + + /* setup value that are not config yet */ + mDdBlt.dwFlags = dwFlags; + mDdBlt.IsClipped = FALSE; + mDdBlt.bltFX.dwSize = sizeof(DDBLTFX); + + + /* FIXME + BltData.dwRectCnt + BltData.dwROPFlags + BltData.IsClipped + BltData.prDestRects + BltData.rOrigDest + BltData.rOrigSrc + BltData.ddRVal + */ + + if (mDdBlt.Blt(&mDdBlt) != DDHAL_DRIVER_HANDLED) + { + DX_STUB_str("mDdBlt DDHAL_DRIVER_HANDLED"); + return DDERR_NOBLTHW; } - mDdBlt.lpDD = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpGbl; - mDdBlt.Blt = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpGbl->lpDDCBtmp->HALDDSurface.Blt; - mDdBlt.lpDDDestSurface = ThisDest->lpLcl->lpSurfMore->slist[0]; - - ThisDest->lpLcl->lpSurfMore->slist[0]->hDC = - ThisDest->lpLcl->lpSurfMore->lpDD_lcl->hDC; - - /* Setup Src */ - if (ThisSrc != NULL) - { - mDdBlt.lpDDSrcSurface = ThisSrc->lpLcl->lpSurfMore->slist[0]; - - ThisSrc->lpLcl->lpSurfMore->slist[0]->hDC = - ThisSrc->lpLcl->lpSurfMore->lpDD_lcl->hDC; - - if (rsrc != NULL) - { - memmove(&mDdBlt.rSrc, rsrc, sizeof (RECTL)); - } - else - { - if(!GetWindowRect((HWND)ThisSrc->lpLcl->lpSurfMore->lpDD_lcl->hWnd, - (RECT *)&mDdBlt.rSrc)) - { - DX_STUB_str("GetWindowRect failed"); - } - } - - /* FIXME - * compare so we do not write to far - * ThisDest->lpLcl->lpGbl->wWidth; <- surface max width - * ThisDest->lpLcl->lpGbl->wHeight <- surface max heght - * ThisDest->lpLcl->lpGbl->lPitch <- surface bpp - */ - - } - - /* Setup dest */ - if (rdst != NULL) - { - memmove(&mDdBlt.rDest, rdst, sizeof (RECTL)); - } - else - { - if(!GetWindowRect((HWND)ThisDest->lpLcl->lpSurfMore->lpDD_lcl->hWnd, - (RECT *)&mDdBlt.rDest)) - { - DX_STUB_str("GetWindowRect failed"); - } - - } - - /* FIXME - * compare so we do not write to far - * ThisDest->lpLcl->lpGbl->wWidth; <- surface max width - * ThisDest->lpLcl->lpGbl->wHeight <- surface max heght - * ThisDest->lpLcl->lpGbl->lPitch <- surface bpp - */ - - - /* setup bltFX */ - if (lpbltfx != NULL) - { - memmove(&mDdBlt.bltFX, lpbltfx, sizeof (DDBLTFX)); - } - - /* setup value that are not config yet */ - mDdBlt.dwFlags = dwFlags; - mDdBlt.IsClipped = FALSE; - mDdBlt.bltFX.dwSize = sizeof(DDBLTFX); - - - /* FIXME - BltData.dwRectCnt - BltData.dwROPFlags - BltData.IsClipped - BltData.prDestRects - BltData.rOrigDest - BltData.rOrigSrc - BltData.ddRVal - */ - - if (mDdBlt.Blt(&mDdBlt) != DDHAL_DRIVER_HANDLED) - { - DX_STUB_str("mDdBlt DDHAL_DRIVER_HANDLED"); - return DDERR_NOBLTHW; - } - - return mDdBlt.ddRVal; + return mDdBlt.ddRVal; } Modified: branches/reactx/reactos/dll/directx/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/main.c [iso-8859-1] Sun Nov 16 05:04:11 2008 @@ -13,9 +13,6 @@ #include "rosdraw.h" HMODULE hDllModule = 0; -/* PSEH for SEH Support */ -#include <pseh/pseh.h> - CRITICAL_SECTION ddcs; // This function is exported by the dll @@ -99,7 +96,7 @@ */ DX_WINDBG_trace(); - _SEH_TRY + _SEH_TRY { /* check if pUnkOuter is null or not */ if (pUnkOuter) Modified: branches/reactx/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/rosdraw.h [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/rosdraw.h [iso-8859-1] Sun Nov 16 05:04:11 2008 @@ -1,13 +1,20 @@ #ifndef __DDRAW_PRIVATE #define __DDRAW_PRIVATE +#define WIN32_NO_STATUS +#define NTOS_MODE_USER + /********* Includes *********/ #include <windows.h> +#include <ndk/ntndk.h> + + #include <stdio.h> #include <ddraw.h> #include <ddrawi.h> #include <d3dhal.h> #include <ddrawgdi.h> +#include <pseh/pseh.h> #include "Ddraw/ddraw.h" #include "Surface/surface.h" Modified: branches/reactx/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/startup.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/startup.c [iso-8859-1] Sun Nov 16 05:04:11 2008 @@ -190,9 +190,6 @@ ddgbl.lpDriverHandle = &ddgbl; ddgbl.hDDVxd = -1; - - - if (reenable == FALSE) { if ((!IsBadReadPtr(This->lpLink,sizeof(LPDIRECTDRAW))) && (This->lpLink == NULL)) @@ -236,8 +233,6 @@ RtlCopyMemory(&ddgbl.cObsolete,&"DISPLAY",7); RtlCopyMemory(&ddgbl.cDriverName,&"DISPLAY",7); dwFlags |= DDRAWI_DISPLAYDRV | DDRAWI_GDIDRV; - - } else if (lpGuid == (LPGUID) DDCREATE_HARDWAREONLY) { @@ -289,7 +284,6 @@ /* Startup HEL and HAL */ This->lpLcl->lpDDCB = This->lpLcl->lpGbl->lpDDCBtmp; This->lpLcl->dwProcessId = GetCurrentProcessId(); - switch (devicetypes) { case 2: @@ -305,8 +299,9 @@ default: hal_ret = StartDirectDrawHal(iface, reenable); hel_ret = StartDirectDrawHel(iface, reenable); - } - + break; + } +DX_STUB_str("here\n"); if (hal_ret!=DD_OK) { if (hel_ret!=DD_OK) @@ -362,18 +357,34 @@ { LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; - This->lpLcl->lpGbl->lpDDCBtmp->HELDD.CanCreateSurface = HelDdCanCreateSurface; - This->lpLcl->lpGbl->lpDDCBtmp->HELDD.CreateSurface = HelDdCreateSurface; - This->lpLcl->lpGbl->lpDDCBtmp->HELDD.CreatePalette = HelDdCreatePalette; - This->lpLcl->lpGbl->lpDDCBtmp->HELDD.DestroyDriver = HelDdDestroyDriver; - This->lpLcl->lpGbl->lpDDCBtmp->HELDD.FlipToGDISurface = HelDdFlipToGDISurface; - This->lpLcl->lpGbl->lpDDCBtmp->HELDD.GetScanLine = HelDdGetScanLine; - This->lpLcl->lpGbl->lpDDCBtmp->HELDD.SetColorKey = HelDdSetColorKey; - This->lpLcl->lpGbl->lpDDCBtmp->HELDD.SetExclusiveMode = HelDdSetExclusiveMode; - This->lpLcl->lpGbl->lpDDCBtmp->HELDD.SetMode = HelDdSetMode; - This->lpLcl->lpGbl->lpDDCBtmp->HELDD.WaitForVerticalBlank = HelDdWaitForVerticalBlank; - - This->lpLcl->lpGbl->lpDDCBtmp->HELDD.dwFlags = DDHAL_CB32_CANCREATESURFACE | + if (reenable == FALSE) + { + if (ddgbl.lpDDCBtmp == NULL) + { + DxHeapMemAlloc(ddgbl.lpDDCBtmp, sizeof(DDHAL_CALLBACKS)); + if ( ddgbl.lpDDCBtmp == NULL) + { + return DD_FALSE; + } + } + } + else + { + RtlZeroMemory(ddgbl.lpDDCBtmp,sizeof(DDHAL_CALLBACKS)); + } + + ddgbl.lpDDCBtmp->HELDD.CanCreateSurface = HelDdCanCreateSurface; + ddgbl.lpDDCBtmp->HELDD.CreateSurface = HelDdCreateSurface; + ddgbl.lpDDCBtmp->HELDD.CreatePalette = HelDdCreatePalette; + ddgbl.lpDDCBtmp->HELDD.DestroyDriver = HelDdDestroyDriver; + ddgbl.lpDDCBtmp->HELDD.FlipToGDISurface = HelDdFlipToGDISurface; + ddgbl.lpDDCBtmp->HELDD.GetScanLine = HelDdGetScanLine; + ddgbl.lpDDCBtmp->HELDD.SetColorKey = HelDdSetColorKey; + ddgbl.lpDDCBtmp->HELDD.SetExclusiveMode = HelDdSetExclusiveMode; + ddgbl.lpDDCBtmp->HELDD.SetMode = HelDdSetMode; + ddgbl.lpDDCBtmp->HELDD.WaitForVerticalBlank = HelDdWaitForVerticalBlank; + + ddgbl.lpDDCBtmp->HELDD.dwFlags = DDHAL_CB32_CANCREATESURFACE | DDHAL_CB32_CREATESURFACE | DDHAL_CB32_CREATEPALETTE | DDHAL_CB32_DESTROYDRIVER | @@ -384,23 +395,23 @@ DDHAL_CB32_SETMODE | DDHAL_CB32_WAITFORVERTICALBLANK ; - This->lpLcl->lpGbl->lpDDCBtmp->HELDD.dwSize = sizeof(This->lpLcl->lpDDCB->HELDD); - - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.AddAttachedSurface = HelDdSurfAddAttachedSurface; - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.Blt = HelDdSurfBlt; - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.DestroySurface = HelDdSurfDestroySurface; - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.Flip = HelDdSurfFlip; - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.GetBltStatus = HelDdSurfGetBltStatus; - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.GetFlipStatus = HelDdSurfGetFlipStatus; - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.Lock = HelDdSurfLock; - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.reserved4 = HelDdSurfreserved4; - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.SetClipList = HelDdSurfSetClipList; - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.SetColorKey = HelDdSurfSetColorKey; - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.SetOverlayPosition = HelDdSurfSetOverlayPosition; - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.SetPalette = HelDdSurfSetPalette; - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.Unlock = HelDdSurfUnlock; - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.UpdateOverlay = HelDdSurfUpdateOverlay; - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.dwFlags = DDHAL_SURFCB32_ADDATTACHEDSURFACE | + ddgbl.lpDDCBtmp->HELDD.dwSize = sizeof(This->lpLcl->lpDDCB->HELDD); + + ddgbl.lpDDCBtmp->HELDDSurface.AddAttachedSurface = HelDdSurfAddAttachedSurface; + ddgbl.lpDDCBtmp->HELDDSurface.Blt = HelDdSurfBlt; + ddgbl.lpDDCBtmp->HELDDSurface.DestroySurface = HelDdSurfDestroySurface; + ddgbl.lpDDCBtmp->HELDDSurface.Flip = HelDdSurfFlip; + ddgbl.lpDDCBtmp->HELDDSurface.GetBltStatus = HelDdSurfGetBltStatus; + ddgbl.lpDDCBtmp->HELDDSurface.GetFlipStatus = HelDdSurfGetFlipStatus; + ddgbl.lpDDCBtmp->HELDDSurface.Lock = HelDdSurfLock; + ddgbl.lpDDCBtmp->HELDDSurface.reserved4 = HelDdSurfreserved4; + ddgbl.lpDDCBtmp->HELDDSurface.SetClipList = HelDdSurfSetClipList; + ddgbl.lpDDCBtmp->HELDDSurface.SetColorKey = HelDdSurfSetColorKey; + ddgbl.lpDDCBtmp->HELDDSurface.SetOverlayPosition = HelDdSurfSetOverlayPosition; + ddgbl.lpDDCBtmp->HELDDSurface.SetPalette = HelDdSurfSetPalette; + ddgbl.lpDDCBtmp->HELDDSurface.Unlock = HelDdSurfUnlock; + ddgbl.lpDDCBtmp->HELDDSurface.UpdateOverlay = HelDdSurfUpdateOverlay; + ddgbl.lpDDCBtmp->HELDDSurface.dwFlags = DDHAL_SURFCB32_ADDATTACHEDSURFACE | DDHAL_SURFCB32_BLT | DDHAL_SURFCB32_DESTROYSURFACE | DDHAL_SURFCB32_FLIP | @@ -415,7 +426,7 @@ DDHAL_SURFCB32_UNLOCK | DDHAL_SURFCB32_UPDATEOVERLAY; - This->lpLcl->lpGbl->lpDDCBtmp->HELDDSurface.dwSize = sizeof(This->lpLcl->lpDDCB->HELDDSurface); + ddgbl.lpDDCBtmp->HELDDSurface.dwSize = sizeof(This->lpLcl->lpDDCB->HELDDSurface); /* This->lpLcl->lpDDCB->HELDDPalette.DestroyPalette = HelDdPalDestroyPalette;

15 years, 10 months

[jimtabor] 37385: - Fix AlphaBlend checks that pass wine bitmap gdi32 crosstests. Tested in 16 and 24 bit mode Qemu and 32 bit mode hardware, with our AlphaBlend rendering demo program.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Nov 15 20:19:43 2008 New Revision: 37385 URL: http://svn.reactos.org/svn/reactos?rev=37385&view=rev Log: - Fix AlphaBlend checks that pass wine bitmap gdi32 crosstests. Tested in 16 and 24 bit mode Qemu and 32 bit mode hardware, with our AlphaBlend rendering demo program. Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Sat Nov 15 20:19:43 2008 @@ -96,11 +96,24 @@ DestRect.top = YOriginDest; DestRect.right = XOriginDest + WidthDest; DestRect.bottom = YOriginDest + HeightDest; + IntLPtoDP(DCDest, (LPPOINT)&DestRect, 2); SourceRect.left = XOriginSrc; SourceRect.top = YOriginSrc; SourceRect.right = XOriginSrc + WidthSrc; SourceRect.bottom = YOriginSrc + HeightSrc; + IntLPtoDP(DCSrc, (LPPOINT)&SourceRect, 2); + + if (!DestRect.right || + !DestRect.bottom || + !SourceRect.right || + !SourceRect.bottom) + { + if (hDCSrc != hDCDest) + DC_UnlockDc(DCSrc); + DC_UnlockDc(DCDest); + return TRUE; + } /* Determine surfaces to be used in the bitblt */ BitmapDest = BITMAPOBJ_LockBitmap(DCDest->w.hBitmap);

15 years, 10 months

[jimtabor] 37384: - Sorry for the misunderstanding, , , fix typo, see bug report 3863.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Nov 15 19:49:23 2008 New Revision: 37384 URL: http://svn.reactos.org/svn/reactos?rev=37384&view=rev Log: - Sorry for the misunderstanding,,, fix typo, see bug report 3863. Modified: trunk/reactos/dll/win32/gdi32/objects/path.c Modified: trunk/reactos/dll/win32/gdi32/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/path.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/path.c [iso-8859-1] Sat Nov 15 19:49:23 2008 @@ -100,7 +100,7 @@ { INT retValue = -1; - if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_METADC) + if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) { SetLastError(ERROR_INVALID_PARAMETER); }

15 years, 10 months

[pschweitzer] 37383: Fixed typo, spotted by Sylvain

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Nov 15 17:05:06 2008 New Revision: 37383 URL: http://svn.reactos.org/svn/reactos?rev=37383&view=rev Log: Fixed typo, spotted by Sylvain Modified: branches/pierre-fsd/drivers/filesystems/fs_rec/ext2.c Modified: branches/pierre-fsd/drivers/filesystems/fs_rec/ext2.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/fs_rec/ext2.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/fs_rec/ext2.c [iso-8859-1] Sat Nov 15 17:05:06 2008 @@ -97,7 +97,7 @@ /* Load the file system */ Status = FsRecLoadFileSystem(DeviceObject, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Ext2"); + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\Ext2fs"); break; default:

15 years, 10 months

← Newer
1
...
37
38
39
40
41
42
43
...
66
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2008