January 2010 - Wine-commits

Alexandre Julliard : winedos: Merge the XMS handler into int31.c.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 741690faa427022f5e75c7a47be259a7257eb5bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=741690faa427022f5e75c7a47… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 4 13:54:43 2010 +0100 winedos: Merge the XMS handler into int31.c. --- dlls/winedos/Makefile.in | 3 +- dlls/winedos/dosexe.h | 3 - dlls/winedos/int31.c | 100 ++++++++++++++++++++++++++++++++++ dlls/winedos/xms.c | 136 ---------------------------------------------- 4 files changed, 101 insertions(+), 141 deletions(-) diff --git a/dlls/winedos/Makefile.in b/dlls/winedos/Makefile.in index ae340a2..52b8173 100644 --- a/dlls/winedos/Makefile.in +++ b/dlls/winedos/Makefile.in @@ -33,8 +33,7 @@ C_SRCS = \ relay.c \ soundblaster.c \ timer.c \ - vga.c \ - xms.c + vga.c @MAKE_DLL_RULES@ diff --git a/dlls/winedos/dosexe.h b/dlls/winedos/dosexe.h index 5ed8599..52a1988 100644 --- a/dlls/winedos/dosexe.h +++ b/dlls/winedos/dosexe.h @@ -489,7 +489,4 @@ extern char IO_pp_init(void); /* timer.c */ extern void WINAPI DOSVM_Int08Handler(CONTEXT86*); -/* xms.c */ -extern void XMS_Handler(CONTEXT86*); - #endif /* __WINE_DOSEXE_H */ diff --git a/dlls/winedos/int31.c b/dlls/winedos/int31.c index 5093b7a..e8cc47b 100644 --- a/dlls/winedos/int31.c +++ b/dlls/winedos/int31.c @@ -70,6 +70,21 @@ static WORD dpmi_flag; static void* lastvalloced = NULL; static BYTE DPMI_retval; +#include "pshpack1.h" + +typedef struct { + WORD Handle; + DWORD Offset; +} MOVEOFS; + +typedef struct { + DWORD Length; + MOVEOFS Source; + MOVEOFS Dest; +} MOVESTRUCT; + +#include "poppack.h" + /********************************************************************** * DOSVM_IsDos32 * @@ -818,6 +833,91 @@ static void DOSVM_FreeRMCB( CONTEXT86 *context ) } +static BYTE * XMS_Offset( MOVEOFS *ofs ) +{ + if (ofs->Handle) return (BYTE*)GlobalLock16(ofs->Handle)+ofs->Offset; + else return PTR_REAL_TO_LIN(SELECTOROF(ofs->Offset),OFFSETOF(ofs->Offset)); +} + +/********************************************************************** + * XMS_Handler + */ +static void XMS_Handler( CONTEXT86 *context ) +{ + switch(AH_reg(context)) + { + case 0x00: /* Get XMS version number */ + TRACE("get XMS version number\n"); + SET_AX( context, 0x0200 ); /* 2.0 */ + SET_BX( context, 0x0000 ); /* internal revision */ + SET_DX( context, 0x0001 ); /* HMA exists */ + break; + case 0x08: /* Query Free Extended Memory */ + { + MEMORYSTATUS status; + + TRACE("query free extended memory\n"); + GlobalMemoryStatus( &status ); + SET_DX( context, status.dwAvailVirtual >> 10 ); + SET_AX( context, status.dwAvailVirtual >> 10 ); + TRACE("returning largest %dK, total %dK\n", AX_reg(context), DX_reg(context)); + } + break; + case 0x09: /* Allocate Extended Memory Block */ + TRACE("allocate extended memory block (%dK)\n", + DX_reg(context)); + SET_DX( context, GlobalAlloc16(GMEM_MOVEABLE, (DWORD)DX_reg(context)<<10) ); + SET_AX( context, DX_reg(context) ? 1 : 0 ); + if (!DX_reg(context)) SET_BL( context, 0xA0 ); /* out of memory */ + break; + case 0x0a: /* Free Extended Memory Block */ + TRACE("free extended memory block %04x\n",DX_reg(context)); + if(!DX_reg(context) || GlobalFree16(DX_reg(context))) { + SET_AX( context, 0 ); /* failure */ + SET_BL( context, 0xa2 ); /* invalid handle */ + } else + SET_AX( context, 1 ); /* success */ + break; + case 0x0b: /* Move Extended Memory Block */ + { + MOVESTRUCT*move=CTX_SEG_OFF_TO_LIN(context, + context->SegDs,context->Esi); + BYTE*src,*dst; + TRACE("move extended memory block\n"); + src=XMS_Offset(&move->Source); + dst=XMS_Offset(&move->Dest); + memcpy(dst,src,move->Length); + if (move->Source.Handle) GlobalUnlock16(move->Source.Handle); + if (move->Dest.Handle) GlobalUnlock16(move->Dest.Handle); + break; + } + case 0x88: /* Query Any Free Extended Memory */ + { + MEMORYSTATUS status; + SYSTEM_INFO info; + + TRACE("query any free extended memory\n"); + + GlobalMemoryStatus( &status ); + GetSystemInfo( &info ); + context->Eax = status.dwAvailVirtual >> 10; + context->Edx = status.dwAvailVirtual >> 10; + context->Ecx = (DWORD)info.lpMaximumApplicationAddress; + SET_BL( context, 0 ); /* No errors. */ + + TRACE("returning largest %dK, total %dK, highest 0x%x\n", + context->Eax, context->Edx, context->Ecx); + } + break; + default: + INT_BARF( context, 0x31 ); + SET_AX( context, 0x0000 ); /* failure */ + SET_BL( context, 0x80 ); /* function not implemented */ + break; + } +} + + /********************************************************************** * DOSVM_CheckWrappers * diff --git a/dlls/winedos/xms.c b/dlls/winedos/xms.c deleted file mode 100644 index 14e5302..0000000 --- a/dlls/winedos/xms.c +++ /dev/null @@ -1,136 +0,0 @@ -/* - * XMS v2+ emulation - * - * Copyright 1998 Ove Kåven - * - * 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 - * - * Note: This XMS emulation is hooked through the DPMI interrupt. - */ - -#include "config.h" - -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -#include <stdarg.h> -#include <string.h> -#include "windef.h" -#include "winbase.h" -#include "wine/winbase16.h" -#include "dosexe.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(int31); - -#include "pshpack1.h" - -typedef struct { - WORD Handle; - DWORD Offset; -} MOVEOFS; - -typedef struct { - DWORD Length; - MOVEOFS Source; - MOVEOFS Dest; -} MOVESTRUCT; - -#include "poppack.h" - -static BYTE * XMS_Offset( MOVEOFS *ofs ) -{ - if (ofs->Handle) return (BYTE*)GlobalLock16(ofs->Handle)+ofs->Offset; - else return PTR_REAL_TO_LIN(SELECTOROF(ofs->Offset),OFFSETOF(ofs->Offset)); -} - -/********************************************************************** - * XMS_Handler - */ - -void XMS_Handler( CONTEXT86 *context ) -{ - switch(AH_reg(context)) - { - case 0x00: /* Get XMS version number */ - TRACE("get XMS version number\n"); - SET_AX( context, 0x0200 ); /* 2.0 */ - SET_BX( context, 0x0000 ); /* internal revision */ - SET_DX( context, 0x0001 ); /* HMA exists */ - break; - case 0x08: /* Query Free Extended Memory */ - { - MEMORYSTATUS status; - - TRACE("query free extended memory\n"); - GlobalMemoryStatus( &status ); - SET_DX( context, status.dwAvailVirtual >> 10 ); - SET_AX( context, status.dwAvailVirtual >> 10 ); - TRACE("returning largest %dK, total %dK\n", AX_reg(context), DX_reg(context)); - } - break; - case 0x09: /* Allocate Extended Memory Block */ - TRACE("allocate extended memory block (%dK)\n", - DX_reg(context)); - SET_DX( context, GlobalAlloc16(GMEM_MOVEABLE, (DWORD)DX_reg(context)<<10) ); - SET_AX( context, DX_reg(context) ? 1 : 0 ); - if (!DX_reg(context)) SET_BL( context, 0xA0 ); /* out of memory */ - break; - case 0x0a: /* Free Extended Memory Block */ - TRACE("free extended memory block %04x\n",DX_reg(context)); - if(!DX_reg(context) || GlobalFree16(DX_reg(context))) { - SET_AX( context, 0 ); /* failure */ - SET_BL( context, 0xa2 ); /* invalid handle */ - } else - SET_AX( context, 1 ); /* success */ - break; - case 0x0b: /* Move Extended Memory Block */ - { - MOVESTRUCT*move=CTX_SEG_OFF_TO_LIN(context, - context->SegDs,context->Esi); - BYTE*src,*dst; - TRACE("move extended memory block\n"); - src=XMS_Offset(&move->Source); - dst=XMS_Offset(&move->Dest); - memcpy(dst,src,move->Length); - if (move->Source.Handle) GlobalUnlock16(move->Source.Handle); - if (move->Dest.Handle) GlobalUnlock16(move->Dest.Handle); - break; - } - case 0x88: /* Query Any Free Extended Memory */ - { - MEMORYSTATUS status; - SYSTEM_INFO info; - - TRACE("query any free extended memory\n"); - - GlobalMemoryStatus( &status ); - GetSystemInfo( &info ); - context->Eax = status.dwAvailVirtual >> 10; - context->Edx = status.dwAvailVirtual >> 10; - context->Ecx = (DWORD)info.lpMaximumApplicationAddress; - SET_BL( context, 0 ); /* No errors. */ - - TRACE("returning largest %dK, total %dK, highest 0x%x\n", - context->Eax, context->Edx, context->Ecx); - } - break; - default: - INT_BARF( context, 0x31 ); - SET_AX( context, 0x0000 ); /* failure */ - SET_BL( context, 0x80 ); /* function not implemented */ - break; - } -}

1 0

Alexandre Julliard : winedos: Merge the UMB management into dosvm.c.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 9492e1808bdd36274d85ae46354c0d5de0dc503d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9492e1808bdd36274d85ae463… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 4 14:31:01 2010 +0100 winedos: Merge the UMB management into dosvm.c. --- dlls/winedos/Makefile.in | 1 - dlls/winedos/dosexe.h | 5 +- dlls/winedos/dosvm.c | 278 ++++++++++++++++++++++++++++++++++++++++++- dlls/winedos/himem.c | 299 ---------------------------------------------- 4 files changed, 276 insertions(+), 307 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9492e1808bdd36274d85a…

1 0

Alexandre Julliard : winedos: Merge the parallel port device I/ O handling into ioports.c.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: c7a57ee1a17b8b0d5044d2aeaf8413f49c4ffa1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7a57ee1a17b8b0d5044d2aea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 4 16:20:54 2010 +0100 winedos: Merge the parallel port device I/O handling into ioports.c. --- dlls/winedos/Makefile.in | 1 - dlls/winedos/dosexe.h | 5 - dlls/winedos/ioports.c | 309 ++++++++++++++++++++++++++++++++++++++++- dlls/winedos/ppdev.c | 352 ---------------------------------------------- 4 files changed, 306 insertions(+), 361 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c7a57ee1a17b8b0d5044d…

1 0

Alexandre Julliard : winedos: Remove some obsolete comments.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: fd75ec1dfe1b850fcea12d28b31f3f4349eaeb1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd75ec1dfe1b850fcea12d28b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 4 16:29:19 2010 +0100 winedos: Remove some obsolete comments. --- dlls/winedos/dosvm.c | 12 ++++++------ dlls/winedos/fpu.c | 22 +++++++++++----------- dlls/winedos/int09.c | 2 +- dlls/winedos/int13.c | 2 +- dlls/winedos/int15.c | 2 +- dlls/winedos/int16.c | 2 +- dlls/winedos/int25.c | 2 +- dlls/winedos/int26.c | 2 +- dlls/winedos/int2f.c | 2 +- dlls/winedos/int31.c | 2 +- dlls/winedos/int33.c | 2 +- dlls/winedos/int67.c | 2 +- dlls/winedos/ioports.c | 2 +- 13 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/winedos/dosvm.c b/dlls/winedos/dosvm.c index 05c9371..d62a28b 100644 --- a/dlls/winedos/dosvm.c +++ b/dlls/winedos/dosvm.c @@ -275,7 +275,7 @@ void DOSVM_SendQueuedEvents( CONTEXT86 *context ) #ifdef MZ_SUPPORTED /*********************************************************************** - * QueueEvent (WINEDOS.@) + * DOSVM_QueueEvent */ void DOSVM_QueueEvent( INT irq, INT priority, DOSRELAY relay, LPVOID data) { @@ -616,7 +616,7 @@ INT DOSVM_Enter( CONTEXT86 *context ) } /*********************************************************************** - * OutPIC (WINEDOS.@) + * DOSVM_PIC_ioport_out */ void DOSVM_PIC_ioport_out( WORD port, BYTE val) { @@ -668,7 +668,7 @@ void DOSVM_PIC_ioport_out( WORD port, BYTE val) #else /* !MZ_SUPPORTED */ /*********************************************************************** - * Enter (WINEDOS.@) + * DOSVM_Enter */ INT DOSVM_Enter( CONTEXT86 *context ) { @@ -677,17 +677,17 @@ INT DOSVM_Enter( CONTEXT86 *context ) } /*********************************************************************** - * Wait (WINEDOS.@) + * DOSVM_Wait */ void DOSVM_Wait( CONTEXT86 *waitctx ) { } /*********************************************************************** - * OutPIC (WINEDOS.@) + * DOSVM_PIC_ioport_out */ void DOSVM_PIC_ioport_out( WORD port, BYTE val) {} /*********************************************************************** - * QueueEvent (WINEDOS.@) + * DOSVM_QueueEvent */ void DOSVM_QueueEvent( INT irq, INT priority, DOSRELAY relay, LPVOID data) { diff --git a/dlls/winedos/fpu.c b/dlls/winedos/fpu.c index 9643afb..733dfb7 100644 --- a/dlls/winedos/fpu.c +++ b/dlls/winedos/fpu.c @@ -33,7 +33,7 @@ static void FPU_ModifyCode(CONTEXT86 *context, BYTE Opcode); /********************************************************************** - * DOSVM_Int34Handler (WINEDOS16.152) + * DOSVM_Int34Handler * * Handler for int 34 (FLOATING POINT EMULATION - Opcode 0xd8). * @@ -48,7 +48,7 @@ void WINAPI DOSVM_Int34Handler(CONTEXT86 *context) /********************************************************************** - * DOSVM_Int35Handler (WINEDOS16.153) + * DOSVM_Int35Handler * * Handler for int 35 (FLOATING POINT EMULATION - Opcode 0xd9). * @@ -63,7 +63,7 @@ void WINAPI DOSVM_Int35Handler(CONTEXT86 *context) /********************************************************************** - * DOSVM_Int36Handler (WINEDOS16.154) + * DOSVM_Int36Handler * * Handler for int 36 (FLOATING POINT EMULATION - Opcode 0xda). * @@ -78,7 +78,7 @@ void WINAPI DOSVM_Int36Handler(CONTEXT86 *context) /********************************************************************** - * DOSVM_Int37Handler (WINEDOS16.155) + * DOSVM_Int37Handler * * Handler for int 37 (FLOATING POINT EMULATION - Opcode 0xdb). * @@ -93,7 +93,7 @@ void WINAPI DOSVM_Int37Handler(CONTEXT86 *context) /********************************************************************** - * DOSVM_Int38Handler (WINEDOS16.156) + * DOSVM_Int38Handler * * Handler for int 38 (FLOATING POINT EMULATION - Opcode 0xdc). * @@ -111,7 +111,7 @@ void WINAPI DOSVM_Int38Handler(CONTEXT86 *context) /********************************************************************** - * DOSVM_Int39Handler (WINEDOS16.157) + * DOSVM_Int39Handler * * Handler for int 39 (FLOATING POINT EMULATION - Opcode 0xdd). * @@ -126,7 +126,7 @@ void WINAPI DOSVM_Int39Handler(CONTEXT86 *context) /********************************************************************** - * DOSVM_Int3aHandler (WINEDOS16.158) + * DOSVM_Int3aHandler * * Handler for int 3a (FLOATING POINT EMULATION - Opcode 0xde). * @@ -141,7 +141,7 @@ void WINAPI DOSVM_Int3aHandler(CONTEXT86 *context) /********************************************************************** - * DOSVM_Int3bHandler (WINEDOS16.159) + * DOSVM_Int3bHandler * * Handler for int 3B (FLOATING POINT EMULATION - Opcode 0xdf). * @@ -156,7 +156,7 @@ void WINAPI DOSVM_Int3bHandler(CONTEXT86 *context) /********************************************************************** - * DOSVM_Int3cHandler (WINEDOS16.160) + * DOSVM_Int3cHandler * * Handler for int 3C (FLOATING POINT EMULATION - INSTRUCTIONS WITH SEGMENT OVERRIDE). * @@ -179,7 +179,7 @@ void WINAPI DOSVM_Int3cHandler(CONTEXT86 *context) /********************************************************************** - * DOSVM_Int3dHandler (WINEDOS16.161) + * DOSVM_Int3dHandler * * Handler for int 3D (FLOATING POINT EMULATION - Standalone FWAIT). * @@ -193,7 +193,7 @@ void WINAPI DOSVM_Int3dHandler(CONTEXT86 *context) /********************************************************************** - * DOSVM_Int3eHandler (WINEDOS16.162) + * DOSVM_Int3eHandler * * FLOATING POINT EMULATION -- Borland "Shortcut" call. * The two bytes following the int 3E instruction are diff --git a/dlls/winedos/int09.c b/dlls/winedos/int09.c index 0702287..91b7b5e 100644 --- a/dlls/winedos/int09.c +++ b/dlls/winedos/int09.c @@ -141,7 +141,7 @@ static void DOSVM_Int09UpdateKbdStatusFlags(BYTE scan, BOOL extended, BIOSDATA * } /********************************************************************** - * DOSVM_Int09Handler (WINEDOS16.109) + * DOSVM_Int09Handler * * Handler for int 09h. * See http://www.execpc.com/~geezer/osd/kbd/ for a very good description diff --git a/dlls/winedos/int13.c b/dlls/winedos/int13.c index 6b2b00c..b96d5e7 100644 --- a/dlls/winedos/int13.c +++ b/dlls/winedos/int13.c @@ -180,7 +180,7 @@ static void INT13_ReadFloppyParams( CONTEXT86 *context ) /********************************************************************** - * DOSVM_Int13Handler (WINEDOS16.119) + * DOSVM_Int13Handler * * Handler for int 13h (disk I/O). */ diff --git a/dlls/winedos/int15.c b/dlls/winedos/int15.c index 24c9121..bbbef3c 100644 --- a/dlls/winedos/int15.c +++ b/dlls/winedos/int15.c @@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(int); /********************************************************************** - * DOSVM_Int15Handler (WINEDOS16.121) + * DOSVM_Int15Handler * * Handler for int 15h */ diff --git a/dlls/winedos/int16.c b/dlls/winedos/int16.c index 8fa5de0..47c9410 100644 --- a/dlls/winedos/int16.c +++ b/dlls/winedos/int16.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(int); /********************************************************************** - * DOSVM_Int16Handler (WINEDOS16.122) + * DOSVM_Int16Handler * * Handler for int 16h (keyboard) * diff --git a/dlls/winedos/int25.c b/dlls/winedos/int25.c index a0e5b10..c4588a3 100644 --- a/dlls/winedos/int25.c +++ b/dlls/winedos/int25.c @@ -76,7 +76,7 @@ BOOL DOSVM_RawRead(BYTE drive, DWORD begin, DWORD nr_sect, BYTE *dataptr, BOOL f /********************************************************************** - * DOSVM_Int25Handler (WINEDOS16.137) + * DOSVM_Int25Handler * * Handler for int 25h (absolute disk read). */ diff --git a/dlls/winedos/int26.c b/dlls/winedos/int26.c index a203882..6fb780f 100644 --- a/dlls/winedos/int26.c +++ b/dlls/winedos/int26.c @@ -65,7 +65,7 @@ BOOL DOSVM_RawWrite(BYTE drive, DWORD begin, DWORD nr_sect, BYTE *dataptr, BOOL /********************************************************************** - * DOSVM_Int26Handler (WINEDOS16.138) + * DOSVM_Int26Handler * * Handler for int 26h (absolute disk write). */ diff --git a/dlls/winedos/int2f.c b/dlls/winedos/int2f.c index 13b86ee..cab7391 100644 --- a/dlls/winedos/int2f.c +++ b/dlls/winedos/int2f.c @@ -116,7 +116,7 @@ DWORD WINAPI GetVersion16(void) } /********************************************************************** - * DOSVM_Int2fHandler (WINEDOS16.147) + * DOSVM_Int2fHandler * * Handler for int 2fh (multiplex). */ diff --git a/dlls/winedos/int31.c b/dlls/winedos/int31.c index e8cc47b..a0df827 100644 --- a/dlls/winedos/int31.c +++ b/dlls/winedos/int31.c @@ -955,7 +955,7 @@ BOOL DOSVM_CheckWrappers( CONTEXT86 *context ) } /********************************************************************** - * DOSVM_Int31Handler (WINEDOS16.149) + * DOSVM_Int31Handler * * Handler for int 31h (DPMI). */ diff --git a/dlls/winedos/int33.c b/dlls/winedos/int33.c index bacf105..f111f5f 100644 --- a/dlls/winedos/int33.c +++ b/dlls/winedos/int33.c @@ -71,7 +71,7 @@ static void INT33_ResetMouse( CONTEXT86 *context ) /********************************************************************** - * DOSVM_Int33Handler (WINEDOS16.151) + * DOSVM_Int33Handler * * Handler for int 33h (MS MOUSE). */ diff --git a/dlls/winedos/int67.c b/dlls/winedos/int67.c index 34013df..6b461a5 100644 --- a/dlls/winedos/int67.c +++ b/dlls/winedos/int67.c @@ -320,7 +320,7 @@ static void EMS_restore_context( CONTEXT86 *context ) } /********************************************************************** - * DOSVM_Int67Handler (WINEDOS16.203) + * DOSVM_Int67Handler * * Handler for interrupt 67h EMS routines. */ diff --git a/dlls/winedos/ioports.c b/dlls/winedos/ioports.c index 5710046..25e03e8 100644 --- a/dlls/winedos/ioports.c +++ b/dlls/winedos/ioports.c @@ -927,7 +927,7 @@ DWORD WINAPI DOSVM_inport( int port, int size ) /********************************************************************** - * outport (WINEDOS.@) + * DOSVM_outport */ void WINAPI DOSVM_outport( int port, int size, DWORD value ) {

1 0

Alexandre Julliard : winedos: Merge the few definitions from dosvm. h into dosexe.h.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 2ef707cc09d6f1649a5876512cb0a5e194e243bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ef707cc09d6f1649a5876512… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 4 16:37:10 2010 +0100 winedos: Merge the few definitions from dosvm.h into dosexe.h. --- dlls/winedos/dosexe.h | 8 ++++++++ dlls/winedos/dosvm.c | 1 - dlls/winedos/dosvm.h | 33 --------------------------------- dlls/winedos/module.c | 1 - 4 files changed, 8 insertions(+), 35 deletions(-) diff --git a/dlls/winedos/dosexe.h b/dlls/winedos/dosexe.h index 108a603..29cf8a0 100644 --- a/dlls/winedos/dosexe.h +++ b/dlls/winedos/dosexe.h @@ -22,6 +22,7 @@ #define __WINE_DOSEXE_H #include <stdarg.h> +#include <sys/types.h> #include "windef.h" #include "wine/library.h" @@ -34,6 +35,13 @@ struct _DOSEVENT; +typedef struct { + PAPCFUNC proc; + ULONG_PTR arg; +} DOS_SPC; + +extern pid_t dosvm_pid; + /* amount of space reserved for relay stack */ #define DOSVM_RELAY_DATA_SIZE 4096 diff --git a/dlls/winedos/dosvm.c b/dlls/winedos/dosvm.c index d62a28b..fdd677f 100644 --- a/dlls/winedos/dosvm.c +++ b/dlls/winedos/dosvm.c @@ -51,7 +51,6 @@ #include "wincon.h" #include "dosexe.h" -#include "dosvm.h" #include "wine/debug.h" #include "excpt.h" diff --git a/dlls/winedos/dosvm.h b/dlls/winedos/dosvm.h deleted file mode 100644 index 098dacc..0000000 --- a/dlls/winedos/dosvm.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * DOS virtual machine - * - * Copyright 2000 Ove Kåven - * - * 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 - */ - -#ifndef __WINE_DOSVM_H -#define __WINE_DOSVM_H - -#include <sys/types.h> /* pid_t */ - -typedef struct { - PAPCFUNC proc; - ULONG_PTR arg; -} DOS_SPC; - -extern pid_t dosvm_pid; - -#endif /* __WINE_DOSVM_H */ diff --git a/dlls/winedos/module.c b/dlls/winedos/module.c index 51b68e4..a4d9c51 100644 --- a/dlls/winedos/module.c +++ b/dlls/winedos/module.c @@ -47,7 +47,6 @@ #include "winerror.h" #include "wine/debug.h" #include "dosexe.h" -#include "dosvm.h" #include "vga.h" WINE_DEFAULT_DEBUG_CHANNEL(module);

1 0

Gerald Pfeifer : include: Move WINED3DTS_WORLD et al directly into _WINED3DTRANSFORMSTATETYPE.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: feecb8ebaf3ea57e07a770170ee183fb03a82b55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feecb8ebaf3ea57e07a770170… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Jan 3 19:45:41 2010 +0100 include: Move WINED3DTS_WORLD et al directly into _WINED3DTRANSFORMSTATETYPE. --- include/wine/wined3d.idl | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index c91437a..6364f9c 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -716,12 +716,12 @@ typedef enum _WINED3DTRANSFORMSTATETYPE WINED3DTS_TEXTURE5 = 21, WINED3DTS_TEXTURE6 = 22, WINED3DTS_TEXTURE7 = 23, + WINED3DTS_WORLD = 256, /*WINED3DTS_WORLDMATRIX(0)*/ + WINED3DTS_WORLD1 = 257, + WINED3DTS_WORLD2 = 258, + WINED3DTS_WORLD3 = 259, WINED3DTS_FORCE_DWORD = 0x7fffffff } WINED3DTRANSFORMSTATETYPE; -cpp_quote("#define WINED3DTS_WORLD WINED3DTS_WORLDMATRIX(0)") -cpp_quote("#define WINED3DTS_WORLD1 WINED3DTS_WORLDMATRIX(1)") -cpp_quote("#define WINED3DTS_WORLD2 WINED3DTS_WORLDMATRIX(2)") -cpp_quote("#define WINED3DTS_WORLD3 WINED3DTS_WORLDMATRIX(3)") cpp_quote("#define WINED3DTS_WORLDMATRIX(index) (WINED3DTRANSFORMSTATETYPE)(index + 256)") typedef enum _WINED3DBASISTYPE

1 0

Stefan Dösinger : wined3d: Revert the GL usage confusion.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: b9976c3d207d86dcc853f21c82b7e0fe81483825 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9976c3d207d86dcc853f21c8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 17 18:11:20 2009 +0100 wined3d: Revert the GL usage confusion. This is functionally a revert of 8eeb513b1a0e7a4f7963612f0305850499c9ec7d. The language of the extension is slightly confusing to me, but GL_STREAM_*_ARB is more dynamic than GL_DYNAMIC_*_ARB. So use GL_STREAM usage for D3DUSAGE_DYNAMIC buffers and GL_DYNAMIC usage for non-dynamic buffers. --- dlls/wined3d/buffer.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 51e594d..c5b8b44 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -85,13 +85,13 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This) */ if(This->resource.usage & WINED3DUSAGE_DYNAMIC) { - TRACE("Gl usage = GL_DYNAMIC_DRAW\n"); - gl_usage = GL_DYNAMIC_DRAW_ARB; + TRACE("Gl usage = GL_STREAM_DRAW_ARB\n"); + gl_usage = GL_STREAM_DRAW_ARB; } else { - TRACE("Gl usage = GL_STREAM_DRAW\n"); - gl_usage = GL_STREAM_DRAW_ARB; + TRACE("Gl usage = GL_DYNAMIC_DRAW_ARB\n"); + gl_usage = GL_DYNAMIC_DRAW_ARB; } /* Reserve memory for the buffer. The amount of data won't change

1 0

Stefan Dösinger : wined3d: Set WINED3D_BUFFER_CREATEBO in buffer_init().
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 1bd98719e6bcf02185b34ba6246d0aad4570236e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd98719e6bcf02185b34ba62… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 28 00:31:12 2009 +0100 wined3d: Set WINED3D_BUFFER_CREATEBO in buffer_init(). --- dlls/wined3d/buffer.c | 25 +++++++++++++++++++++++++ dlls/wined3d/device.c | 26 ++------------------------ 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index c5b8b44..ceeede0 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1098,6 +1098,7 @@ HRESULT buffer_init(struct wined3d_buffer *buffer, IWineD3DDeviceImpl *device, { const struct GlPixelFormatDesc *format_desc = getFormatDescEntry(format, &device->adapter->gl_info); HRESULT hr; + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; if (!size) { @@ -1119,6 +1120,30 @@ HRESULT buffer_init(struct wined3d_buffer *buffer, IWineD3DDeviceImpl *device, TRACE("size %#x, usage %#x, format %s, memory @ %p, iface @ %p.\n", buffer->resource.size, buffer->resource.usage, debug_d3dformat(buffer->resource.format_desc->format), buffer->resource.allocatedMemory, buffer); + /* Observations show that drawStridedSlow is faster on dynamic VBs than converting + + * drawStridedFast (half-life 2 and others). + * + * Basically converting the vertices in the buffer is quite expensive, and observations + * show that drawStridedSlow is faster than converting + uploading + drawStridedFast. + * Therefore do not create a VBO for WINED3DUSAGE_DYNAMIC buffers. + */ + if (!gl_info->supported[ARB_VERTEX_BUFFER_OBJECT]) + { + TRACE("Not creating a vbo because GL_ARB_vertex_buffer is not supported\n"); + } + else if(buffer->resource.pool == WINED3DPOOL_SYSTEMMEM) + { + TRACE("Not creating a vbo because the vertex buffer is in system memory\n"); + } + else if(buffer->resource.usage & WINED3DUSAGE_DYNAMIC) + { + TRACE("Not creating a vbo because the buffer has dynamic usage\n"); + } + else + { + buffer->flags |= WINED3D_BUFFER_CREATEBO; + } + if (data) { BYTE *ptr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 78db960..34495d3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -520,23 +520,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *ifac TRACE("Created buffer %p.\n", object); *ppVertexBuffer = (IWineD3DBuffer *)object; - /* Observations show that drawStridedSlow is faster on dynamic VBs than converting + - * drawStridedFast (half-life 2). - * - * Basically converting the vertices in the buffer is quite expensive, and observations - * show that drawStridedSlow is faster than converting + uploading + drawStridedFast. - * Therefore do not create a VBO for WINED3DUSAGE_DYNAMIC buffers. - */ - if (!This->adapter->gl_info.supported[ARB_VERTEX_BUFFER_OBJECT]) - { - TRACE("Not creating a vbo because GL_ARB_vertex_buffer is not supported\n"); - } else if(Pool == WINED3DPOOL_SYSTEMMEM) { - TRACE("Not creating a vbo because the vertex buffer is in system memory\n"); - } else if(Usage & WINED3DUSAGE_DYNAMIC) { - TRACE("Not creating a vbo because the buffer has dynamic usage\n"); - } else { - object->flags |= WINED3D_BUFFER_CREATEBO; - } return WINED3D_OK; } @@ -560,7 +543,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateIndexBuffer(IWineD3DDevice *iface } hr = buffer_init(object, This, Length, Usage | WINED3DUSAGE_STATICDECL, - WINED3DFMT_UNKNOWN, Pool, GL_ELEMENT_ARRAY_BUFFER_ARB, NULL, parent, parent_ops); + WINED3DFMT_UNKNOWN, Pool, GL_ELEMENT_ARRAY_BUFFER_ARB, NULL, + parent, parent_ops); if (FAILED(hr)) { WARN("Failed to initialize buffer, hr %#x\n", hr); @@ -570,12 +554,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateIndexBuffer(IWineD3DDevice *iface TRACE("Created buffer %p.\n", object); - if (Pool != WINED3DPOOL_SYSTEMMEM && !(Usage & WINED3DUSAGE_DYNAMIC) - && This->adapter->gl_info.supported[ARB_VERTEX_BUFFER_OBJECT]) - { - object->flags |= WINED3D_BUFFER_CREATEBO; - } - *ppIndexBuffer = (IWineD3DBuffer *) object; return WINED3D_OK;

1 0

Stefan Dösinger : wined3d: Track separate dirty ranges in buffers.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 716520b4b8ba249d1b84266d8222c203a01dfa39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=716520b4b8ba249d1b84266d8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 28 00:33:05 2009 +0100 wined3d: Track separate dirty ranges in buffers. --- dlls/wined3d/buffer.c | 231 +++++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 17 ++- 2 files changed, 158 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=716520b4b8ba249d1b842…

1 0

Stefan Dösinger : wined3d: Add GLintptr and GLsizeiptr .
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 71db272feec0b7b1a37543974adea927a88a89f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71db272feec0b7b1a37543974… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 2 14:17:43 2010 +0100 wined3d: Add GLintptr and GLsizeiptr. --- dlls/wined3d/wined3d_gl.h | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 49f8114..dfc8c74 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -73,6 +73,8 @@ typedef float GLclampf; typedef double GLdouble; typedef double GLclampd; typedef void GLvoid; +typedef ptrdiff_t GLintptr; +typedef ptrdiff_t GLsizeiptr; /* Booleans */ #define GL_FALSE 0x0 @@ -2500,9 +2502,9 @@ typedef void (WINE_GLAPI * PGLFNBINDBUFFERARBPROC) (GLenum target, GLuint buffer typedef void (WINE_GLAPI * PGLFNDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers); typedef void (WINE_GLAPI * PGLFNGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers); typedef GLboolean (WINE_GLAPI * PGLFNISBUFFERARBPROC) (GLuint buffer); -typedef void (WINE_GLAPI * PGLFNBUFFERDATAARBPROC) (GLenum target, ptrdiff_t size, const GLvoid *data, GLenum usage); -typedef void (WINE_GLAPI * PGLFNBUFFERSUBDATAARBPROC) (GLenum target, ptrdiff_t offset, ptrdiff_t size, const GLvoid *data); -typedef void (WINE_GLAPI * PGLFNGETBUFFERSUBDATAARBPROC) (GLenum target, ptrdiff_t offset, ptrdiff_t size, GLvoid *data); +typedef void (WINE_GLAPI * PGLFNBUFFERDATAARBPROC) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage); +typedef void (WINE_GLAPI * PGLFNBUFFERSUBDATAARBPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data); +typedef void (WINE_GLAPI * PGLFNGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data); typedef GLvoid* (WINE_GLAPI * PGLFNMAPBUFFERARBPROC) (GLenum target, GLenum access); typedef GLboolean (WINE_GLAPI * PGLFNUNMAPBUFFERARBPROC) (GLenum target); typedef void (WINE_GLAPI * PGLFNGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params);

1 0