wine-commits January 2010

wine-commits@winehq.org

3 participants
615 discussions

Josselin Bardet : msiexec: Support of /package option.
by Alexandre Julliard 04 Jan '10

04 Jan '10

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 : wpp: Reset the line position when parsing a new file.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 2b5d06afb9847d09ed6e9e721a93740f1e7c2828 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b5d06afb9847d09ed6e9e721… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 4 13:00:43 2010 +0100 wpp: Reset the line position when parsing a new file. --- libs/wpp/wpp.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libs/wpp/wpp.c b/libs/wpp/wpp.c index bce968a..47989f1 100644 --- a/libs/wpp/wpp.c +++ b/libs/wpp/wpp.c @@ -168,6 +168,8 @@ int wpp_parse( const char *input, FILE *output ) int ret; pp_status.input = NULL; + pp_status.line_number = 0; + pp_status.char_number = 0; pp_status.state = 0; ret = pp_push_define_state();

1 0

Alexandre Julliard : wrc: Merge the menu and menuex structures.
by Alexandre Julliard 04 Jan '10

04 Jan '10

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 : wrc: Merge the menuitem and menuitemex structures.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 1b305dd2dff07ed6a9621af48d42cf0bc5a62d76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b305dd2dff07ed6a9621af48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 4 12:31:22 2010 +0100 wrc: Merge the menuitem and menuitemex structures. --- tools/wrc/dumpres.c | 73 ++++++------------------- tools/wrc/genres.c | 4 +- tools/wrc/newstruc.c | 1 - tools/wrc/newstruc.h | 1 - tools/wrc/parser.y | 24 ++------ tools/wrc/translation.c | 135 +++++++++++++++++++---------------------------- tools/wrc/wrctypes.h | 24 +++------ 7 files changed, 88 insertions(+), 174 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b305dd2dff07ed6a9621…

1 0

Alexandre Julliard : wrc: Merge the dialog and dialogex structures.
by Alexandre Julliard 04 Jan '10

04 Jan '10

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

Stefan Dösinger : wined3d: Implement subrange flushing with GL_APPLE_flush_buffer_range.
by Alexandre Julliard 04 Jan '10

04 Jan '10

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: Prepare for dynamic vertex buffers.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 5296d5b0168aaa3de7efbdbb9a946acaf392d7af URL: http://source.winehq.org/git/wine.git/?a=commit;h=5296d5b0168aaa3de7efbdbb9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 28 00:36:17 2009 +0100 wined3d: Prepare for dynamic vertex buffers. --- dlls/wined3d/buffer.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 020d0b4..57dca35 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -805,9 +805,10 @@ static void STDMETHODCALLTYPE buffer_PreLoad(IWineD3DBuffer *iface) ++This->decl_change_count; This->draw_count = 0; - if (This->decl_change_count > VB_MAXDECLCHANGES) + if (This->decl_change_count > VB_MAXDECLCHANGES || + (This->conversion_map && (This->resource.usage & WINED3DUSAGE_DYNAMIC))) { - FIXME("Too many declaration changes, stopping converting\n"); + FIXME("Too many declaration changes or converting dynamic buffer, stopping converting\n"); IWineD3DBuffer_UnLoad(iface); This->flags &= ~WINED3D_BUFFER_CREATEBO; @@ -1152,6 +1153,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; + BOOL dynamic_buffer_ok; if (!size) { @@ -1173,6 +1175,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 */ + /* Observations show that drawStridedSlow is faster on dynamic VBs than converting + * drawStridedFast (half-life 2 and others). * @@ -1188,9 +1192,9 @@ HRESULT buffer_init(struct wined3d_buffer *buffer, IWineD3DDeviceImpl *device, { TRACE("Not creating a vbo because the vertex buffer is in system memory\n"); } - else if(buffer->resource.usage & WINED3DUSAGE_DYNAMIC) + else if(!dynamic_buffer_ok && (buffer->resource.usage & WINED3DUSAGE_DYNAMIC)) { - TRACE("Not creating a vbo because the buffer has dynamic usage\n"); + TRACE("Not creating a vbo because the buffer has dynamic usage and no GL support\n"); } else {

1 0

Stefan Dösinger : wined3d: Add GL_APPLE_flush_buffer_range.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: ccc26a9e01ff0714aa3b151fc267dedd10c7eb07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccc26a9e01ff0714aa3b151fc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 2 14:20:59 2010 +0100 wined3d: Add GL_APPLE_flush_buffer_range. --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_gl.h | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c4c272a..0267443 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -46,6 +46,7 @@ static const struct { {"GL_APPLE_flush_render", APPLE_FLUSH_RENDER, 0 }, {"GL_APPLE_ycbcr_422", APPLE_YCBCR_422, 0 }, {"GL_APPLE_float_pixels", APPLE_FLOAT_PIXELS, 0 }, + {"GL_APPLE_flush_buffer_range", APPLE_FLUSH_BUFFER_RANGE, 0 }, /* ATI */ {"GL_ATI_separate_stencil", ATI_SEPARATE_STENCIL, 0 }, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index dfc8c74..d6d9794 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3263,6 +3263,15 @@ typedef void (WINE_GLAPI *PGLFNSETFRAGMENTSHADERCONSTANTATI) (GLuint dst, const #define GL_MAX_PROGRAM_CALL_DEPTH_NV 0x88F5 #endif +/* GL_APPLE_flush_buffer_range */ +#ifndef GL_APPLE_flush_buffer_range +#define GL_APPLE_flush_buffer_range +#define GL_BUFFER_SERIALIZED_MODIFY_APPLE 0x8A12 +#define GL_BUFFER_FLUSHING_UNMAP_APPLE 0x8A13 +typedef void (WINE_GLAPI *PGLFNBUFFERPARAMETERIAPPLE) (GLenum target, GLenum pname, GLint param); +typedef void (WINE_GLAPI *PGLFNFLUSHMAPPEDBUFFERRANGEAPPLE) (GLenum target, GLintptr offset, GLsizeiptr size); +#endif + /* GL_VERSION_2_0 */ #ifndef GL_VERSION_2_0 #define GL_VERSION_2_0 1 @@ -3572,6 +3581,7 @@ typedef enum _GL_SupportedExt { APPLE_FLUSH_RENDER, APPLE_YCBCR_422, APPLE_FLOAT_PIXELS, + APPLE_FLUSH_BUFFER_RANGE, /* SGI */ SGI_VIDEO_SYNC, SGIS_GENERATE_MIPMAP, @@ -3920,7 +3930,11 @@ typedef enum _GL_SupportedExt { USE_GL_FUNC(PGLFNALPHAFRAGMENTOP1ATI, glAlphaFragmentOp1ATI, ATI_FRAGMENT_SHADER, NULL )\ USE_GL_FUNC(PGLFNALPHAFRAGMENTOP2ATI, glAlphaFragmentOp2ATI, ATI_FRAGMENT_SHADER, NULL )\ USE_GL_FUNC(PGLFNALPHAFRAGMENTOP3ATI, glAlphaFragmentOp3ATI, ATI_FRAGMENT_SHADER, NULL )\ - USE_GL_FUNC(PGLFNSETFRAGMENTSHADERCONSTANTATI, glSetFragmentShaderConstantATI, ATI_FRAGMENT_SHADER, NULL ) + USE_GL_FUNC(PGLFNSETFRAGMENTSHADERCONSTANTATI, glSetFragmentShaderConstantATI, ATI_FRAGMENT_SHADER, NULL )\ + /* GL_APPLE_flush_buffer_range */ \ + USE_GL_FUNC(PGLFNBUFFERPARAMETERIAPPLE, glBufferParameteriAPPLE, APPLE_FLUSH_BUFFER_RANGE,NULL)\ + USE_GL_FUNC(PGLFNFLUSHMAPPEDBUFFERRANGEAPPLE, glFlushMappedBufferRangeAPPLE, APPLE_FLUSH_BUFFER_RANGE,NULL) + /**************************************************** * OpenGL WGL defines and functions pointer

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

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

← Newer
1
...
55
56
57
58
59
60
61
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2010