January 2010 - Wine-Commits

Alexandre Julliard : winedos: Merge the XMS handler into int31.c.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

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

Josselin Bardet : msiexec: Support of /package option.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: 2b07ae5e6f0b4720096afb203b52d70c2d1da020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b07ae5e6f0b4720096afb203… Author: Josselin Bardet <namjos(a)gmail.com> Date: Sun Jan 3 11:06:36 2010 +0100 msiexec: Support of /package option. --- programs/msiexec/msiexec.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 9221fa2..fe19d98 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -47,6 +47,7 @@ static const char UsageStr[] = " Install a product:\n" " msiexec {package|productcode} [property]\n" " msiexec /i {package|productcode} [property]\n" +" msiexec /package {package|productcode} [property]\n" " msiexec /a package [property]\n" " Repair an installation:\n" " msiexec /f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" @@ -562,12 +563,13 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine { FunctionUnregServer = TRUE; } - else if(msi_option_prefix(argvW[i], "i")) + else if(msi_option_prefix(argvW[i], "i") || msi_option_prefix(argvW[i], "package")) { LPWSTR argvWi = argvW[i]; + int argLen = (msi_option_prefix(argvW[i], "i") ? 2 : 8); FunctionInstall = TRUE; - if(lstrlenW(argvWi) > 2) - argvWi += 2; + if(lstrlenW(argvW[i]) > argLen) + argvWi += argLen; else { i++;

1 0

Alexandre Julliard : wrc: Merge the dialog and dialogex structures.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: 0fb8203654036e3889615fad25b9cb0a4a268b3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fb8203654036e3889615fad2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 4 12:23:37 2010 +0100 wrc: Merge the dialog and dialogex structures. --- tools/wrc/dumpres.c | 55 --------------- tools/wrc/genres.c | 176 ++++++++++++---------------------------------- tools/wrc/newstruc.c | 1 - tools/wrc/newstruc.h | 1 - tools/wrc/parser.y | 149 ++++------------------------------------ tools/wrc/translation.c | 66 ++---------------- tools/wrc/wrctypes.h | 24 +------ 7 files changed, 68 insertions(+), 404 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0fb8203654036e3889615…

1 0

Alexandre Julliard : wrc: Merge the menu and menuex structures.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: 82f910eb62009effe7b02f796acbd7b5829eb85d URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f910eb62009effe7b02f796… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 4 12:41:16 2010 +0100 wrc: Merge the menu and menuex structures. --- tools/wrc/dumpres.c | 22 ------------- tools/wrc/genres.c | 76 +++++++++++++++------------------------------- tools/wrc/newstruc.c | 1 - tools/wrc/newstruc.h | 1 - tools/wrc/parser.y | 9 ++--- tools/wrc/translation.c | 17 ---------- tools/wrc/wrctypes.h | 11 +----- 7 files changed, 31 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82f910eb62009effe7b02…

1 0

Alexandre Julliard : winedos: Internal functions don't need to be WINAPI.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: 58cd87abb146001a4a855f8cfa792ff60154e230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58cd87abb146001a4a855f8cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 4 13:44:22 2010 +0100 winedos: Internal functions don't need to be WINAPI. --- dlls/winedos/dosaspi.c | 4 +- dlls/winedos/dosexe.h | 47 ++++++++++++++++++++++----------------------- dlls/winedos/dosvm.c | 18 ++++++++-------- dlls/winedos/int09.c | 7 +---- dlls/winedos/int10.c | 2 +- dlls/winedos/int16.c | 4 +- dlls/winedos/int21.c | 14 +------------ dlls/winedos/int31.c | 2 +- dlls/winedos/int33.c | 4 +- dlls/winedos/int67.c | 2 +- dlls/winedos/interrupts.c | 2 +- dlls/winedos/module.c | 20 +++++++++--------- dlls/winedos/timer.c | 2 +- dlls/winedos/xms.c | 2 +- 14 files changed, 57 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=58cd87abb146001a4a855…

1 0

Stefan Dösinger : wined3d: Track separate dirty ranges in buffers.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

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: Implement subrange flushing with GL_APPLE_flush_buffer_range.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

Module: wine Branch: master Commit: a756caac0ca3dcd80019b56422779c59394fdfd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a756caac0ca3dcd80019b5642… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 17 22:44:07 2009 +0100 wined3d: Implement subrange flushing with GL_APPLE_flush_buffer_range. --- dlls/wined3d/buffer.c | 24 +++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 57dca35..20201b1 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -95,6 +95,7 @@ static inline BOOL buffer_is_fully_dirty(struct wined3d_buffer *This) static void buffer_create_buffer_object(struct wined3d_buffer *This) { GLenum error, gl_usage; + const struct wined3d_gl_info *gl_info = &This->resource.device->adapter->gl_info; TRACE("Creating an OpenGL vertex buffer object for IWineD3DVertexBuffer %p Usage(%s)\n", This, debug_d3dusage(This->resource.usage)); @@ -149,6 +150,13 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This) { TRACE("Gl usage = GL_DYNAMIC_DRAW_ARB\n"); gl_usage = GL_DYNAMIC_DRAW_ARB; + + if(gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) + { + GL_EXTCALL(glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)); + checkGLcall("glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)"); + This->flags |= WINED3D_BUFFER_FLUSH; + } } /* Reserve memory for the buffer. The amount of data won't change @@ -1061,6 +1069,7 @@ static HRESULT STDMETHODCALLTYPE buffer_Map(IWineD3DBuffer *iface, UINT offset, static HRESULT STDMETHODCALLTYPE buffer_Unmap(IWineD3DBuffer *iface) { struct wined3d_buffer *This = (struct wined3d_buffer *)iface; + ULONG i; TRACE("(%p)\n", This); @@ -1094,6 +1103,18 @@ static HRESULT STDMETHODCALLTYPE buffer_Unmap(IWineD3DBuffer *iface) context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD); ENTER_GL(); GL_EXTCALL(glBindBufferARB(This->buffer_type_hint, This->buffer_object)); + + if(This->flags & WINED3D_BUFFER_FLUSH) + { + for(i = 0; i < This->modified_areas; i++) + { + GL_EXTCALL(glFlushMappedBufferRangeAPPLE(This->buffer_type_hint, + This->maps[i].offset, + This->maps[i].size)); + checkGLcall("glFlushMappedBufferRangeAPPLE"); + } + } + GL_EXTCALL(glUnmapBufferARB(This->buffer_type_hint)); LEAVE_GL(); context_release(context); @@ -1175,7 +1196,8 @@ 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); - dynamic_buffer_ok = FALSE; /* TODO: GL_APPLE_map_buffer_range, GL_ARB_map_buffer_range */ + /* TODO: GL_ARB_map_buffer_range */ + dynamic_buffer_ok = gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]; /* Observations show that drawStridedSlow is faster on dynamic VBs than converting + * drawStridedFast (half-life 2 and others). diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f0e0fd3..de0bcdc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2368,6 +2368,7 @@ struct wined3d_map_range #define WINED3D_BUFFER_HASDESC 0x02 /* A vertex description has been found */ #define WINED3D_BUFFER_CREATEBO 0x04 /* Attempt to create a buffer object next PreLoad */ #define WINED3D_BUFFER_DOUBLEBUFFER 0x08 /* Use a vbo and local allocated memory */ +#define WINED3D_BUFFER_FLUSH 0x10 /* Manual unmap flushing */ struct wined3d_buffer {

1 0

Stefan Dösinger : wined3d: Revert the GL usage confusion.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

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: Add GLintptr and GLsizeiptr .
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

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

Gerald Pfeifer : include: Move WINED3DTS_WORLD et al directly into _WINED3DTRANSFORMSTATETYPE.
by Alexandre Julliard Jan. 4, 2010

Jan. 4, 2010

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