April 2013 - Wine-commits - list.winehq.org

Nikolay Sivov : msdaps: Implement IRowsetNotify stub/proxy methods.
by Alexandre Julliard 10 Apr '13

10 Apr '13

Module: wine Branch: master Commit: 69008be65ddd8e46eaeac49b0a2395a9733a326a URL: http://source.winehq.org/git/wine.git/?a=commit;h=69008be65ddd8e46eaeac49b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 10 08:16:05 2013 +0400 msdaps: Implement IRowsetNotify stub/proxy methods. --- dlls/msdaps/usrmarshal.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 39e4e4b..85b2606 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -971,39 +971,39 @@ HRESULT __RPC_STUB IDBAsynchStatus_GetStatus_Stub(IDBAsynchStatus* This, HCHAPTE HRESULT CALLBACK IRowsetNotify_OnRowChange_Proxy(IRowsetNotify* This, IRowset *rowset, DBCOUNTITEM rows, HROW *hrows, DBREASON reason, DBEVENTPHASE phase, BOOL cantdeny) { - FIXME("(%p)->(%p %ld %p %d %d %d): stub\n", This, rowset, rows, hrows, reason, phase, cantdeny); - return E_NOTIMPL; + TRACE("(%p)->(%p %ld %p %d %d %d)\n", This, rowset, rows, hrows, reason, phase, cantdeny); + return IRowsetNotify_RemoteOnRowChange_Proxy(This, rowset, rows, hrows, reason, phase, cantdeny); } HRESULT __RPC_STUB IRowsetNotify_OnRowChange_Stub(IRowsetNotify* This, IRowset *rowset, DBCOUNTITEM rows, HROW *hrows, DBREASON reason, DBEVENTPHASE phase, BOOL cantdeny) { - FIXME("(%p)->(%p %ld %p %d %d %d): stub\n", This, rowset, rows, hrows, reason, phase, cantdeny); - return E_NOTIMPL; + TRACE("(%p)->(%p %ld %p %d %d %d)\n", This, rowset, rows, hrows, reason, phase, cantdeny); + return IRowsetNotify_OnRowChange(This, rowset, rows, hrows, reason, phase, cantdeny); } HRESULT CALLBACK IRowsetNotify_OnFieldChange_Proxy(IRowsetNotify* This, IRowset *rowset, HROW row, DBORDINAL ccols, DBORDINAL *columns, DBREASON reason, DBEVENTPHASE phase, BOOL cantdeny) { - FIXME("(%p)->(%p %lx %ld %p %d %d %d): stub\n", This, rowset, row, ccols, columns, reason, phase, cantdeny); - return E_NOTIMPL; + TRACE("(%p)->(%p %lx %ld %p %d %d %d)\n", This, rowset, row, ccols, columns, reason, phase, cantdeny); + return IRowsetNotify_RemoteOnFieldChange_Proxy(This, rowset, row, ccols, columns, reason, phase, cantdeny); } HRESULT __RPC_STUB IRowsetNotify_OnFieldChange_Stub(IRowsetNotify* This, IRowset *rowset, HROW row, DBORDINAL ccols, DBORDINAL *columns, DBREASON reason, DBEVENTPHASE phase, BOOL cantdeny) { - FIXME("(%p)->(%p %lx %ld %p %d %d %d): stub\n", This, rowset, row, ccols, columns, reason, phase, cantdeny); - return E_NOTIMPL; + TRACE("(%p)->(%p %lx %ld %p %d %d %d)\n", This, rowset, row, ccols, columns, reason, phase, cantdeny); + return IRowsetNotify_OnFieldChange(This, rowset, row, ccols, columns, reason, phase, cantdeny); } HRESULT CALLBACK IRowsetNotify_OnRowsetChange_Proxy(IRowsetNotify* This, IRowset *rowset, DBREASON reason, DBEVENTPHASE phase, BOOL cantdeny) { - FIXME("(%p)->(%p %d %d %d): stub\n", This, rowset, reason, phase, cantdeny); - return E_NOTIMPL; + TRACE("(%p)->(%p %d %d %d)\n", This, rowset, reason, phase, cantdeny); + return IRowsetNotify_RemoteOnRowsetChange_Proxy(This, rowset, reason, phase, cantdeny); } HRESULT __RPC_STUB IRowsetNotify_OnRowsetChange_Stub(IRowsetNotify* This, IRowset *rowset, DBREASON reason, DBEVENTPHASE phase, BOOL cantdeny) { - FIXME("(%p)->(%p %d %d %d): stub\n", This, rowset, reason, phase, cantdeny); - return E_NOTIMPL; + TRACE("(%p)->(%p %d %d %d)\n", This, rowset, reason, phase, cantdeny); + return IRowsetNotify_OnRowsetChange(This, rowset, reason, phase, cantdeny); }

1 0

Sergey Guralnik : extrac32: Use own parser for command line.
by Alexandre Julliard 10 Apr '13

10 Apr '13

Module: wine Branch: master Commit: c7d2b1d5ccd9d2c1df317e03ea4ae35941c169a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7d2b1d5ccd9d2c1df317e03e… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Tue Apr 9 14:15:01 2013 +0300 extrac32: Use own parser for command line. --- programs/extrac32/extrac32.c | 102 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 100 insertions(+), 2 deletions(-) diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c index addd732..111d2a7 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -82,6 +82,98 @@ static void copy_file(LPCWSTR source, LPCWSTR destination) CopyFileW(source, destination, FALSE); } +static LPWSTR *get_extrac_args(LPWSTR cmdline, int *pargc) +{ + enum {OUTSIDE_ARG, INSIDE_ARG, INSIDE_QUOTED_ARG} state; + LPWSTR str; + int argc; + LPWSTR *argv; + int max_argc = 16; + BOOL new_arg; + + WINE_TRACE("cmdline: %s\n", wine_dbgstr_w(cmdline)); + str = HeapAlloc(GetProcessHeap(), 0, (strlenW(cmdline) + 1) * sizeof(WCHAR)); + if(!str) return NULL; + strcpyW(str, cmdline); + argv = HeapAlloc(GetProcessHeap(), 0, (max_argc + 1) * sizeof(LPWSTR)); + if(!argv) + { + HeapFree(GetProcessHeap(), 0, str); + return NULL; + } + + /* Split command line to separate arg-strings and fill argv */ + state = OUTSIDE_ARG; + argc = 0; + while(*str) + { + new_arg = FALSE; + /* Check character */ + if(isspaceW(*str)) /* white space */ + { + if(state == INSIDE_ARG) + { + state = OUTSIDE_ARG; + *str = 0; + } + } + else if(*str == '"') /* double quote */ + switch(state) + { + case INSIDE_QUOTED_ARG: + state = OUTSIDE_ARG; + *str = 0; + break; + case INSIDE_ARG: + *str = 0; + /* Fall through */ + case OUTSIDE_ARG: + if(!*++str) continue; + state = INSIDE_QUOTED_ARG; + new_arg = TRUE; + break; + } + else /* regular character */ + if(state == OUTSIDE_ARG) + { + state = INSIDE_ARG; + new_arg = TRUE; + } + + /* Add new argv entry, if need */ + if(new_arg) + { + if(argc >= max_argc - 1) + { + /* Realloc argv here because there always should be + at least one reserved cell for terminating NULL */ + max_argc *= 2; + argv = HeapReAlloc(GetProcessHeap(), 0, argv, + (max_argc + 1) * sizeof(LPWSTR)); + if(!argv) + { + HeapFree(GetProcessHeap(), 0, str); + return NULL; + } + } + argv[argc++] = str; + } + + str++; + } + + argv[argc] = NULL; + *pargc = argc; + + if(TRACE_ON(extrac32)) + { + int i; + for(i = 0; i < argc; i++) + WINE_TRACE("arg %d: %s\n", i, wine_dbgstr_w(argv[i])); + } + return argv; +} + int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int show) { LPWSTR *argv; @@ -93,11 +185,17 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho LPCWSTR cabfile = NULL; path[0] = 0; - argv = CommandLineToArgvW(cmdline, &argc); + + /* Do not use CommandLineToArgvW() or __wgetmainargs() to parse + * command line for this program. It should treat each quote as argument + * delimiter. This doesn't match with behavior of mentioned functions. + * Do not use args provided by wmain() for the same reason. + */ + argv = get_extrac_args(cmdline, &argc); if(!argv) { - WINE_ERR("Bad command line arguments\n"); + WINE_ERR("Command line parsing failed\n"); return 0; }

1 0

Matteo Bruni : wined3d: Remove useless glClearxxx calls.
by Alexandre Julliard 10 Apr '13

10 Apr '13

Module: wine Branch: master Commit: 46fa0448d9f668611383e722f5016669edcdfbdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=46fa0448d9f668611383e722f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 10 01:35:39 2013 +0200 wined3d: Remove useless glClearxxx calls. --- dlls/wined3d/context.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index cf65225..90038ca 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1464,14 +1464,6 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, gl_info->gl_ops.gl.p_glGetIntegerv(GL_AUX_BUFFERS, &ret->aux_buffers); TRACE("Setting up the screen\n"); - /* Clear the screen */ - gl_info->gl_ops.gl.p_glClearColor(1.0f, 0.0f, 0.0f, 0.0f); - checkGLcall("glClearColor"); - gl_info->gl_ops.gl.p_glClearIndex(0); - gl_info->gl_ops.gl.p_glClearDepth(1); - gl_info->gl_ops.gl.p_glClearStencil(0xffff); - - checkGLcall("glClear"); gl_info->gl_ops.gl.p_glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, GL_TRUE); checkGLcall("glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, GL_TRUE);");

1 0

Matteo Bruni : wined3d: Reset all the dummy textures to 0 on destroy.
by Alexandre Julliard 10 Apr '13

10 Apr '13

Module: wine Branch: master Commit: a0c06a94aa8a9068e346299427dc8e935151df2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0c06a94aa8a9068e34629942… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 10 01:35:40 2013 +0200 wined3d: Reset all the dummy textures to 0 on destroy. --- dlls/wined3d/device.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e4b970c..f94d77a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -982,10 +982,10 @@ static void destroy_dummy_textures(struct wined3d_device *device, const struct w gl_info->gl_ops.gl.p_glDeleteTextures(count, device->dummy_texture_2d); checkGLcall("glDeleteTextures(count, device->dummy_texture_2d)"); - memset(device->dummy_texture_cube, 0, gl_info->limits.textures * sizeof(*device->dummy_texture_cube)); - memset(device->dummy_texture_3d, 0, gl_info->limits.textures * sizeof(*device->dummy_texture_3d)); - memset(device->dummy_texture_rect, 0, gl_info->limits.textures * sizeof(*device->dummy_texture_rect)); - memset(device->dummy_texture_2d, 0, gl_info->limits.textures * sizeof(*device->dummy_texture_2d)); + memset(device->dummy_texture_cube, 0, count * sizeof(*device->dummy_texture_cube)); + memset(device->dummy_texture_3d, 0, count * sizeof(*device->dummy_texture_3d)); + memset(device->dummy_texture_rect, 0, count * sizeof(*device->dummy_texture_rect)); + memset(device->dummy_texture_2d, 0, count * sizeof(*device->dummy_texture_2d)); } static LONG fullscreen_style(LONG style)

1 0

Matteo Bruni : wined3d: Fix typo, really check whether color fixups are supported.
by Alexandre Julliard 10 Apr '13

10 Apr '13

Module: wine Branch: master Commit: 0d563a69dd171c1ca80ecbc410c41b0814b6d522 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d563a69dd171c1ca80ecbc41… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 10 01:35:41 2013 +0200 wined3d: Fix typo, really check whether color fixups are supported. --- dlls/wined3d/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7c508ee..d2ada07 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1724,7 +1724,7 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ for (i = 0; i < sizeof(formats) / sizeof(*formats); ++i) { - struct wined3d_format *format = &gl_info->formats[idx]; + struct wined3d_format *format = &gl_info->formats[i]; if (!(format->flags & WINED3DFMT_FLAG_TEXTURE)) continue;

1 0

Matteo Bruni : wined3d: Avoid redundant glDrawBuffer() calls.
by Alexandre Julliard 10 Apr '13

10 Apr '13

Module: wine Branch: master Commit: 075fa6547c0edf2b1b2c1cabae7731fdc1308cc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=075fa6547c0edf2b1b2c1caba… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 10 01:35:42 2013 +0200 wined3d: Avoid redundant glDrawBuffer() calls. --- dlls/wined3d/context.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 90038ca..516e8c2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1897,13 +1897,16 @@ static void context_apply_draw_buffers(struct wined3d_context *context, DWORD rt void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) { const struct wined3d_gl_info *gl_info = context->gl_info; + DWORD *current_mask = context->current_fbo ? &context->current_fbo->rt_mask : &context->draw_buffers_mask; + DWORD new_mask = context_generate_rt_mask(buffer); + + if (new_mask == *current_mask) + return; gl_info->gl_ops.gl.p_glDrawBuffer(buffer); checkGLcall("glDrawBuffer()"); - if (context->current_fbo) - context->current_fbo->rt_mask = context_generate_rt_mask(buffer); - else - context->draw_buffers_mask = context_generate_rt_mask(buffer); + + *current_mask = new_mask; } /* Context activation is done by the caller. */

1 0

Alexandre Julliard : ddraw: De-duplicate display modes even when returning the refresh rate.
by Alexandre Julliard 10 Apr '13

10 Apr '13

Module: wine Branch: master Commit: 74f496d9bb00bd8c64b0de48528a0f2ed5b111a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74f496d9bb00bd8c64b0de485… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 9 21:27:57 2013 +0200 ddraw: De-duplicate display modes even when returning the refresh rate. --- dlls/ddraw/ddraw.c | 73 +++++++++++++++++++-------------------------------- 1 files changed, 27 insertions(+), 46 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 266c779..a459e5f 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2069,7 +2069,7 @@ static HRESULT WINAPI ddraw7_EnumDisplayModes(IDirectDraw7 *iface, DWORD Flags, struct wined3d_display_mode mode; unsigned int modenum, fmt; DDSURFACEDESC2 callback_sd; - unsigned enum_mode_count = 0, enum_mode_array_size = 0; + unsigned enum_mode_count = 0, enum_mode_array_size = 16; DDPIXELFORMAT pixelformat; static const enum wined3d_format_id checkFormatList[] = @@ -2085,18 +2085,10 @@ static HRESULT WINAPI ddraw7_EnumDisplayModes(IDirectDraw7 *iface, DWORD Flags, if (!cb) return DDERR_INVALIDPARAMS; + enum_modes = HeapAlloc(GetProcessHeap(), 0, sizeof(*enum_modes) * enum_mode_array_size); + if (!enum_modes) return DDERR_OUTOFMEMORY; + wined3d_mutex_lock(); - if(!(Flags & DDEDM_REFRESHRATES)) - { - enum_mode_array_size = 16; - enum_modes = HeapAlloc(GetProcessHeap(), 0, sizeof(*enum_modes) * enum_mode_array_size); - if (!enum_modes) - { - ERR("Out of memory\n"); - wined3d_mutex_unlock(); - return DDERR_OUTOFMEMORY; - } - } pixelformat.dwSize = sizeof(pixelformat); for(fmt = 0; fmt < (sizeof(checkFormatList) / sizeof(checkFormatList[0])); fmt++) @@ -2105,6 +2097,9 @@ static HRESULT WINAPI ddraw7_EnumDisplayModes(IDirectDraw7 *iface, DWORD Flags, while (wined3d_enum_adapter_modes(ddraw->wined3d, WINED3DADAPTER_DEFAULT, checkFormatList[fmt], WINED3D_SCANLINE_ORDERING_UNKNOWN, modenum++, &mode) == WINED3D_OK) { + BOOL found = FALSE; + unsigned i; + PixelFormat_WineD3DtoDD(&pixelformat, mode.format_id); if (DDSD) { @@ -2119,27 +2114,18 @@ static HRESULT WINAPI ddraw7_EnumDisplayModes(IDirectDraw7 *iface, DWORD Flags, continue; } - if(!(Flags & DDEDM_REFRESHRATES)) + /* DX docs state EnumDisplayMode should return only unique modes */ + for (i = 0; i < enum_mode_count; i++) { - /* DX docs state EnumDisplayMode should return only unique modes. If DDEDM_REFRESHRATES is not set, refresh - * rate doesn't matter when determining if the mode is unique. So modes only differing in refresh rate have - * to be reduced to a single unique result in such case. - */ - BOOL found = FALSE; - unsigned i; - - for (i = 0; i < enum_mode_count; i++) + if (enum_modes[i].width == mode.width && enum_modes[i].height == mode.height + && enum_modes[i].format_id == mode.format_id + && (enum_modes[i].refresh_rate == mode.refresh_rate || !(Flags & DDEDM_REFRESHRATES))) { - if (enum_modes[i].width == mode.width && enum_modes[i].height == mode.height - && enum_modes[i].format_id == mode.format_id) - { - found = TRUE; - break; - } + found = TRUE; + break; } - - if(found) continue; } + if(found) continue; memset(&callback_sd, 0, sizeof(callback_sd)); callback_sd.dwSize = sizeof(callback_sd); @@ -2169,28 +2155,23 @@ static HRESULT WINAPI ddraw7_EnumDisplayModes(IDirectDraw7 *iface, DWORD Flags, return DD_OK; } - if(!(Flags & DDEDM_REFRESHRATES)) + if (enum_mode_count == enum_mode_array_size) { - if (enum_mode_count == enum_mode_array_size) + struct wined3d_display_mode *new_enum_modes; + + enum_mode_array_size *= 2; + new_enum_modes = HeapReAlloc(GetProcessHeap(), 0, enum_modes, + sizeof(*new_enum_modes) * enum_mode_array_size); + if (!new_enum_modes) { - struct wined3d_display_mode *new_enum_modes; - - enum_mode_array_size *= 2; - new_enum_modes = HeapReAlloc(GetProcessHeap(), 0, enum_modes, - sizeof(*new_enum_modes) * enum_mode_array_size); - if (!new_enum_modes) - { - ERR("Out of memory\n"); - HeapFree(GetProcessHeap(), 0, enum_modes); - wined3d_mutex_unlock(); - return DDERR_OUTOFMEMORY; - } - - enum_modes = new_enum_modes; + HeapFree(GetProcessHeap(), 0, enum_modes); + wined3d_mutex_unlock(); + return DDERR_OUTOFMEMORY; } - enum_modes[enum_mode_count++] = mode; + enum_modes = new_enum_modes; } + enum_modes[enum_mode_count++] = mode; } }

1 0

Michael Stefaniuc : dplayx: Get rid of the unused DirectPlayLobby{2, 3}Data fields.
by Alexandre Julliard 10 Apr '13

10 Apr '13

Module: wine Branch: master Commit: d73231575f521e7de6af445c3e9426b7bf6dc69b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d73231575f521e7de6af445c3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 9 22:31:20 2013 +0200 dplayx: Get rid of the unused DirectPlayLobby{2,3}Data fields. --- dlls/dplayx/dplobby.c | 66 +----------------------------------------------- 1 files changed, 2 insertions(+), 64 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 46a2168..904fbcd 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -85,22 +85,10 @@ typedef struct tagDirectPlayLobbyData DPQ_HEAD( DPLMSG ) msgs; /* List of messages received */ } DirectPlayLobbyData; -typedef struct tagDirectPlayLobby2Data -{ - BOOL dummy; -} DirectPlayLobby2Data; - -typedef struct tagDirectPlayLobby3Data -{ - BOOL dummy; -} DirectPlayLobby3Data; - #define DPL_IMPL_FIELDS \ LONG ulInterfaceRef; \ DirectPlayLobbyIUnknownData* unk; \ - DirectPlayLobbyData* dpl; \ - DirectPlayLobby2Data* dpl2; \ - DirectPlayLobby3Data* dpl3; + DirectPlayLobbyData* dpl; struct IDirectPlayLobbyImpl { @@ -188,50 +176,6 @@ static BOOL DPL_DestroyLobby1( LPVOID lpDPL ) return TRUE; } -static BOOL DPL_CreateLobby2( LPVOID lpDPL ) -{ - IDirectPlayLobby2AImpl *This = lpDPL; - - This->dpl2 = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->dpl2) ) ); - if ( This->dpl2 == NULL ) - { - return FALSE; - } - - return TRUE; -} - -static BOOL DPL_DestroyLobby2( LPVOID lpDPL ) -{ - IDirectPlayLobby2AImpl *This = lpDPL; - - HeapFree( GetProcessHeap(), 0, This->dpl2 ); - - return TRUE; -} - -static BOOL DPL_CreateLobby3( LPVOID lpDPL ) -{ - IDirectPlayLobby3AImpl *This = lpDPL; - - This->dpl3 = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->dpl3) ) ); - if ( This->dpl3 == NULL ) - { - return FALSE; - } - - return TRUE; -} - -static BOOL DPL_DestroyLobby3( LPVOID lpDPL ) -{ - IDirectPlayLobby3AImpl *This = lpDPL; - - HeapFree( GetProcessHeap(), 0, This->dpl3 ); - - return TRUE; -} - /* The COM interface for upversioning an interface * We've been given a GUID (riid) and we need to replace the present @@ -310,9 +254,7 @@ HRESULT DPL_CreateInterface /* Initialize it */ if ( DPL_CreateIUnknown( *ppvObj ) && - DPL_CreateLobby1( *ppvObj ) && - DPL_CreateLobby2( *ppvObj ) && - DPL_CreateLobby3( *ppvObj ) + DPL_CreateLobby1( *ppvObj ) ) { IDirectPlayLobby_AddRef( (LPDIRECTPLAYLOBBY)*ppvObj ); @@ -320,8 +262,6 @@ HRESULT DPL_CreateInterface } /* Initialize failed, destroy it */ - DPL_DestroyLobby3( *ppvObj ); - DPL_DestroyLobby2( *ppvObj ); DPL_DestroyLobby1( *ppvObj ); DPL_DestroyIUnknown( *ppvObj ); HeapFree( GetProcessHeap(), 0, *ppvObj ); @@ -432,8 +372,6 @@ static ULONG WINAPI DPL_Release /* Deallocate if this is the last reference to the object */ if( ulObjRefCount == 0 ) { - DPL_DestroyLobby3( This ); - DPL_DestroyLobby2( This ); DPL_DestroyLobby1( This ); DPL_DestroyIUnknown( This ); }

1 0

Michael Stefaniuc : dplayx: Remove the duplicated IDirectPlayLobby{2, 3}Impl structs.
by Alexandre Julliard 10 Apr '13

10 Apr '13

Module: wine Branch: master Commit: dffc8fc5d1b0d2b9679466818b6cd2cbf006edae URL: http://source.winehq.org/git/wine.git/?a=commit;h=dffc8fc5d1b0d2b9679466818… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 9 22:32:53 2013 +0200 dplayx: Remove the duplicated IDirectPlayLobby{2,3}Impl structs. --- dlls/dplayx/dplobby.c | 64 +++++++++++------------------------------------- 1 files changed, 15 insertions(+), 49 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 904fbcd..74b5c08 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -40,10 +40,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay); */ typedef struct IDirectPlayLobbyImpl IDirectPlayLobbyAImpl; typedef struct IDirectPlayLobbyImpl IDirectPlayLobbyWImpl; -typedef struct IDirectPlayLobby2Impl IDirectPlayLobby2AImpl; -typedef struct IDirectPlayLobby2Impl IDirectPlayLobby2WImpl; -typedef struct IDirectPlayLobby3Impl IDirectPlayLobby3AImpl; -typedef struct IDirectPlayLobby3Impl IDirectPlayLobby3WImpl; +typedef struct IDirectPlayLobbyImpl IDirectPlayLobby2AImpl; +typedef struct IDirectPlayLobbyImpl IDirectPlayLobby2WImpl; +typedef struct IDirectPlayLobbyImpl IDirectPlayLobby3AImpl; +typedef struct IDirectPlayLobbyImpl IDirectPlayLobby3WImpl; /* Forward declarations for this module helper methods */ HRESULT DPL_CreateCompoundAddress ( LPCDPCOMPOUNDADDRESSELEMENT lpElements, DWORD dwElementCount, @@ -85,28 +85,13 @@ typedef struct tagDirectPlayLobbyData DPQ_HEAD( DPLMSG ) msgs; /* List of messages received */ } DirectPlayLobbyData; -#define DPL_IMPL_FIELDS \ - LONG ulInterfaceRef; \ - DirectPlayLobbyIUnknownData* unk; \ - DirectPlayLobbyData* dpl; - -struct IDirectPlayLobbyImpl -{ - const IDirectPlayLobbyVtbl *lpVtbl; - DPL_IMPL_FIELDS -}; - -struct IDirectPlayLobby2Impl +typedef struct IDirectPlayLobbyImpl { - const IDirectPlayLobby2Vtbl *lpVtbl; - DPL_IMPL_FIELDS -}; - -struct IDirectPlayLobby3Impl -{ - const IDirectPlayLobby3Vtbl *lpVtbl; - DPL_IMPL_FIELDS -}; + const void *lpVtbl; + LONG ulInterfaceRef; + DirectPlayLobbyIUnknownData* unk; + DirectPlayLobbyData* dpl; +} IDirectPlayLobbyImpl; /* Forward declarations of virtual tables */ static const IDirectPlayLobbyVtbl directPlayLobbyWVT; @@ -203,46 +188,26 @@ static BOOL DPL_DestroyLobby1( LPVOID lpDPL ) HRESULT DPL_CreateInterface ( REFIID riid, LPVOID* ppvObj ) { - TRACE( " for %s\n", debugstr_guid( riid ) ); + IDirectPlayLobbyImpl *This; - *ppvObj = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof( IDirectPlayLobbyWImpl ) ); + TRACE( " for %s\n", debugstr_guid( riid ) ); - if( *ppvObj == NULL ) - { + This = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *This ) ); + if ( !This ) return DPERR_OUTOFMEMORY; - } if( IsEqualGUID( &IID_IDirectPlayLobby, riid ) ) - { - IDirectPlayLobbyWImpl *This = *ppvObj; This->lpVtbl = &directPlayLobbyWVT; - } else if( IsEqualGUID( &IID_IDirectPlayLobbyA, riid ) ) - { - IDirectPlayLobbyAImpl *This = *ppvObj; This->lpVtbl = &directPlayLobbyAVT; - } else if( IsEqualGUID( &IID_IDirectPlayLobby2, riid ) ) - { - IDirectPlayLobby2WImpl *This = *ppvObj; This->lpVtbl = &directPlayLobby2WVT; - } else if( IsEqualGUID( &IID_IDirectPlayLobby2A, riid ) ) - { - IDirectPlayLobby2AImpl *This = *ppvObj; This->lpVtbl = &directPlayLobby2AVT; - } else if( IsEqualGUID( &IID_IDirectPlayLobby3, riid ) ) - { - IDirectPlayLobby3WImpl *This = *ppvObj; This->lpVtbl = &directPlayLobby3WVT; - } else if( IsEqualGUID( &IID_IDirectPlayLobby3A, riid ) ) - { - IDirectPlayLobby3AImpl *This = *ppvObj; This->lpVtbl = &directPlayLobby3AVT; - } else { /* Unsupported interface */ @@ -253,6 +218,7 @@ HRESULT DPL_CreateInterface } /* Initialize it */ + *ppvObj = This; if ( DPL_CreateIUnknown( *ppvObj ) && DPL_CreateLobby1( *ppvObj ) )

1 0

Stefan Dösinger : wined3d: Put local constants into the shader code in ARB shaders.
by Alexandre Julliard 09 Apr '13

09 Apr '13

Module: wine Branch: master Commit: 8c2874ee99ac4029a201d63a8a12f46288bebc84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c2874ee99ac4029a201d63a8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 2 14:54:02 2013 +0200 wined3d: Put local constants into the shader code in ARB shaders. --- dlls/wined3d/arb_program_shader.c | 83 +++++++------------------------------ 1 files changed, 15 insertions(+), 68 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b069335..7e695fd 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -9,7 +9,7 @@ * Copyright 2006 Ivan Gyurdiev * Copyright 2006 Jason Green * Copyright 2006 Henri Verbeet - * Copyright 2007-2008 Stefan Dösinger for CodeWeavers + * Copyright 2007-2011, 2013 Stefan Dösinger for CodeWeavers * Copyright 2009 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -753,36 +753,13 @@ static void shader_arb_update_float_pixel_constants(struct wined3d_device *devic priv->highest_dirty_ps_const = max(priv->highest_dirty_ps_const, start + count); } -static DWORD *local_const_mapping(const struct wined3d_shader *shader) -{ - const struct wined3d_shader_lconst *lconst; - DWORD *ret; - DWORD idx = 0; - - if (shader->load_local_constsF || list_empty(&shader->constantsF)) - return NULL; - - ret = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD) * shader->limits.constant_float); - if (!ret) - { - ERR("Out of memory\n"); - return NULL; - } - - LIST_FOR_EACH_ENTRY(lconst, &shader->constantsF, struct wined3d_shader_lconst, entry) - { - ret[lconst->idx] = idx++; - } - return ret; -} - /* Generate the variable & register declarations for the ARB_vertex_program output target */ -static DWORD shader_generate_arb_declarations(const struct wined3d_shader *shader, +static void shader_generate_arb_declarations(const struct wined3d_shader *shader, const struct wined3d_shader_reg_maps *reg_maps, struct wined3d_shader_buffer *buffer, - const struct wined3d_gl_info *gl_info, const DWORD *lconst_map, - DWORD *num_clipplanes, const struct shader_arb_ctx_priv *ctx) + const struct wined3d_gl_info *gl_info, DWORD *num_clipplanes, + const struct shader_arb_ctx_priv *ctx) { - DWORD i, next_local = 0; + DWORD i; char pshader = shader_is_pshader_version(reg_maps->shader_version.type); const struct wined3d_shader_lconst *lconst; unsigned max_constantsF; @@ -874,16 +851,14 @@ static DWORD shader_generate_arb_declarations(const struct wined3d_shader *shade } } - /* Load local constants using the program-local space, - * this avoids reloading them each time the shader is used - */ - if (lconst_map) + if (!shader->load_local_constsF) { LIST_FOR_EACH_ENTRY(lconst, &shader->constantsF, struct wined3d_shader_lconst, entry) { - shader_addline(buffer, "PARAM C%u = program.local[%u];\n", lconst->idx, - lconst_map[lconst->idx]); - next_local = max(next_local, lconst_map[lconst->idx] + 1); + const float *value; + value = (const float *)lconst->value; + shader_addline(buffer, "PARAM C%u = {%.8e, %.8e, %.8e, %.8e};\n", lconst->idx, + value[0], value[1], value[2], value[3]); } } @@ -924,8 +899,6 @@ static DWORD shader_generate_arb_declarations(const struct wined3d_shader *shade } } } - - return next_local; } static const char * const shift_tab[] = { @@ -3586,11 +3559,10 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, const struct arb_ps_compile_args *args, struct arb_ps_compiled_shader *compiled) { const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; - const struct wined3d_shader_lconst *lconst; const DWORD *function = shader->function; GLuint retval; char fragcolor[16]; - DWORD *lconst_map = local_const_mapping(shader), next_local; + DWORD next_local = 0; struct shader_arb_ctx_priv priv_ctx; BOOL dcl_td = FALSE; BOOL want_nv_prog = FALSE; @@ -3748,8 +3720,7 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, } /* Base Declarations */ - next_local = shader_generate_arb_declarations(shader, reg_maps, - buffer, gl_info, lconst_map, NULL, &priv_ctx); + shader_generate_arb_declarations(shader, reg_maps, buffer, gl_info, NULL, &priv_ctx); for (i = 0, map = reg_maps->bumpmat; map; map >>= 1, ++i) { @@ -3910,18 +3881,6 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, if (!native) WARN("Program exceeds native resource limits.\n"); } - /* Load immediate constants */ - if (lconst_map) - { - LIST_FOR_EACH_ENTRY(lconst, &shader->constantsF, struct wined3d_shader_lconst, entry) - { - const float *value = (const float *)lconst->value; - GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, lconst_map[lconst->idx], value)); - checkGLcall("glProgramLocalParameter4fvARB"); - } - HeapFree(GetProcessHeap(), 0, lconst_map); - } - return retval; } @@ -4177,10 +4136,9 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, const struct arb_vshader_private *shader_data = shader->backend_data; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; struct shader_arb_priv *priv = shader->device->shader_priv; - const struct wined3d_shader_lconst *lconst; const DWORD *function = shader->function; GLuint ret; - DWORD next_local, *lconst_map = local_const_mapping(shader); + DWORD next_local = 0; struct shader_arb_ctx_priv priv_ctx; unsigned int i; GLint errPos; @@ -4228,8 +4186,8 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, shader_addline(buffer, "TEMP TB;\n"); /* Base Declarations */ - next_local = shader_generate_arb_declarations(shader, reg_maps, buffer, - gl_info, lconst_map, &priv_ctx.vs_clipplanes, &priv_ctx); + shader_generate_arb_declarations(shader, reg_maps, buffer, gl_info, + &priv_ctx.vs_clipplanes, &priv_ctx); for(i = 0; i < MAX_CONST_I; i++) { @@ -4321,18 +4279,7 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, GL_EXTCALL(glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB, &native)); checkGLcall("glGetProgramivARB()"); if (!native) WARN("Program exceeds native resource limits.\n"); - - /* Load immediate constants */ - if (lconst_map) - { - LIST_FOR_EACH_ENTRY(lconst, &shader->constantsF, struct wined3d_shader_lconst, entry) - { - const float *value = (const float *)lconst->value; - GL_EXTCALL(glProgramLocalParameter4fvARB(GL_VERTEX_PROGRAM_ARB, lconst_map[lconst->idx], value)); - } - } } - HeapFree(GetProcessHeap(), 0, lconst_map); return ret; }

1 0