October 2011 - Wine-commits

Henri Verbeet : wined3d: Return WINED3DERR_NOTFOUND if the render target is NULL in wined3d_device_get_render_target ().
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: 739a9d980503dfcbfa8856d7458539283c776a4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=739a9d980503dfcbfa8856d74… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 9 19:01:18 2011 +0200 wined3d: Return WINED3DERR_NOTFOUND if the render target is NULL in wined3d_device_get_render_target(). This is similar to how wined3d_device_get_depth_stencil() works. --- dlls/d3d9/device.c | 19 +++++++------------ dlls/wined3d/device.c | 8 +++++--- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2c67391..33c443a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1142,24 +1142,19 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderTarget(IDirect3DDevice9Ex *i } wined3d_mutex_lock(); - hr = wined3d_device_get_render_target(This->wined3d_device, RenderTargetIndex, &wined3d_surface); - - if (FAILED(hr)) - { - FIXME("Call to IWineD3DDevice_GetRenderTarget failed, hr %#x\n", hr); - } - else if (!wined3d_surface) - { - *ppRenderTarget = NULL; - } - else + if (SUCCEEDED(hr)) { *ppRenderTarget = wined3d_surface_get_parent(wined3d_surface); IDirect3DSurface9_AddRef(*ppRenderTarget); wined3d_surface_decref(wined3d_surface); } - + else + { + if (hr != WINED3DERR_NOTFOUND) + WARN("Failed to get render target %u, hr %#x.\n", RenderTargetIndex, hr); + *ppRenderTarget = NULL; + } wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8e4d827..f291a7a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5119,11 +5119,13 @@ HRESULT CDECL wined3d_device_get_render_target(struct wined3d_device *device, } *render_target = device->fb.render_targets[render_target_idx]; - if (*render_target) - wined3d_surface_incref(*render_target); - TRACE("Returning render target %p.\n", *render_target); + if (!*render_target) + return WINED3DERR_NOTFOUND; + + wined3d_surface_incref(*render_target); + return WINED3D_OK; }

1 0

Henri Verbeet : d3d9/tests: Add a test for IDirect3DDevice9:: GetRenderTarget().
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: 1226ffe062fc67344b3a7c0009954c88e4ce4c6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1226ffe062fc67344b3a7c000… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 9 19:01:19 2011 +0200 d3d9/tests: Add a test for IDirect3DDevice9::GetRenderTarget(). --- dlls/d3d9/tests/device.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index bf15792..affbe08 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1758,6 +1758,56 @@ cleanup: if(hwnd) DestroyWindow(hwnd); } +static void test_get_rt(void) +{ + IDirect3DSurface9 *backbuffer, *rt; + IDirect3DDevice9 *device; + IDirect3D9 *d3d9; + D3DCAPS9 caps; + HWND window; + HRESULT hr; + ULONG ref; + UINT i; + + if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D9 object, skipping tests.\n"); + return; + } + + window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 128, 128, 0, 0, 0, 0); + device = create_device(d3d9, window, window, TRUE); + if (!device) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &backbuffer); + ok(SUCCEEDED(hr), "Failed to get backbuffer, hr %#x.\n", hr); + ok(!!backbuffer, "Got a NULL backbuffer.\n"); + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + + for (i = 1; i < caps.NumSimultaneousRTs; ++i) + { + rt = backbuffer; + hr = IDirect3DDevice9_GetRenderTarget(device, i, &rt); + ok(hr == D3DERR_NOTFOUND, "IDirect3DDevice9_GetRenderTarget returned %#x.\n", hr); + ok(!rt, "Got rt %p.\n", rt); + } + + IDirect3DSurface9_Release(backbuffer); + + ref = IDirect3DDevice9_Release(device); + ok(!ref, "The device was not properly freed: refcount %u.\n", ref); +done: + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + /* Test what happens when IDirect3DDevice9_DrawIndexedPrimitive is called without a valid index buffer set. */ static void test_draw_indexed(void) { @@ -3119,6 +3169,7 @@ START_TEST(device) test_scene(); test_limits(); test_depthstenciltest(); + test_get_rt(); test_draw_indexed(); test_null_stream(); test_lights();

1 0

Henri Verbeet : winex11: Print the GL renderer and version when complaining about software / indirect rendering.
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: dbe058249f7bcfce26cf6bfcaeb849064c9b9ae4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbe058249f7bcfce26cf6bfca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 9 19:01:20 2011 +0200 winex11: Print the GL renderer and version when complaining about software / indirect rendering. --- dlls/winex11.drv/opengl.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index a4ed5eb..78a717d 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -299,6 +299,7 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) { int screen = DefaultScreen(gdi_display); Window win = 0, root = 0; + const char *gl_renderer; const char* str; XVisualInfo *vis; GLXContext ctx = NULL; @@ -349,6 +350,7 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) ERR_(winediag)( "Unable to activate OpenGL context, most likely your OpenGL drivers haven't been installed correctly\n" ); goto done; } + gl_renderer = (const char *)pglGetString(GL_RENDERER); WineGLInfo.glVersion = (const char *) pglGetString(GL_VERSION); str = (const char *) pglGetString(GL_EXTENSIONS); WineGLInfo.glExtensions = HeapAlloc(GetProcessHeap(), 0, strlen(str)+1); @@ -369,7 +371,7 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) WineGLInfo.glxDirect = pglXIsDirect(gdi_display, ctx); TRACE("GL version : %s.\n", WineGLInfo.glVersion); - TRACE("GL renderer : %s.\n", pglGetString(GL_RENDERER)); + TRACE("GL renderer : %s.\n", gl_renderer); TRACE("GLX version : %d.%d.\n", WineGLInfo.glxVersion[0], WineGLInfo.glxVersion[1]); TRACE("Server GLX version : %s.\n", WineGLInfo.glxServerVersion); TRACE("Server GLX vendor: : %s.\n", WineGLInfo.glxServerVendor); @@ -387,7 +389,9 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) * Detect a local X11 server by checking whether the X11 socket is a Unix socket. */ if(!getsockname(fd, (struct sockaddr *)&uaddr, &uaddrlen) && uaddr.sun_family == AF_UNIX) - ERR_(winediag)("Direct rendering is disabled, most likely your OpenGL drivers haven't been installed correctly\n"); + ERR_(winediag)("Direct rendering is disabled, most likely your OpenGL drivers " + "haven't been installed correctly (using GL renderer %s, version %s).\n", + debugstr_a(gl_renderer), debugstr_a(WineGLInfo.glVersion)); } else { @@ -400,9 +404,10 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) * to load a DRI module 'Software Rasterizer' is returned. When Mesa is compiled as a OpenGL reference driver * it shows 'Mesa X11'. */ - const char *gl_renderer = (const char *)pglGetString(GL_RENDERER); if(!strcmp(gl_renderer, "Software Rasterizer") || !strcmp(gl_renderer, "Mesa X11")) - ERR_(winediag)("The Mesa OpenGL driver is using software rendering, most likely your OpenGL drivers haven't been installed correctly\n"); + ERR_(winediag)("The Mesa OpenGL driver is using software rendering, most likely your OpenGL " + "drivers haven't been installed correctly (using GL renderer %s, version %s).\n", + debugstr_a(gl_renderer), debugstr_a(WineGLInfo.glVersion)); } ret = TRUE;

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_primitive_type() const.
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: 39a8ed3a00d15face31d02e4548b58a1ab0826d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39a8ed3a00d15face31d02e45… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 9 19:01:22 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_primitive_type() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f291a7a..6f754f5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4109,7 +4109,7 @@ void CDECL wined3d_device_set_primitive_type(struct wined3d_device *device, device->updateStateBlock->state.gl_primitive_type = gl_primitive_type_from_d3d(primitive_type); } -void CDECL wined3d_device_get_primitive_type(struct wined3d_device *device, +void CDECL wined3d_device_get_primitive_type(const struct wined3d_device *device, WINED3DPRIMITIVETYPE *primitive_type) { TRACE("device %p, primitive_type %p\n", device, primitive_type); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8a38668..eb270e7 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2230,7 +2230,8 @@ float __cdecl wined3d_device_get_npatch_mode(struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_palette_entries(struct wined3d_device *device, UINT palette_idx, PALETTEENTRY *entries); struct wined3d_shader * __cdecl wined3d_device_get_pixel_shader(const struct wined3d_device *device); -void __cdecl wined3d_device_get_primitive_type(struct wined3d_device *device, WINED3DPRIMITIVETYPE *primitive_topology); +void __cdecl wined3d_device_get_primitive_type(const struct wined3d_device *device, + WINED3DPRIMITIVETYPE *primitive_topology); HRESULT __cdecl wined3d_device_get_ps_consts_b(const struct wined3d_device *device, UINT start_register, BOOL *constants, UINT bool_count); HRESULT __cdecl wined3d_device_get_ps_consts_f(const struct wined3d_device *device,

1 0

Charles Davis : wldap32: Silence a compiler warning.
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: ad72c422ff186cbfd952569ccf077238a277f4ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad72c422ff186cbfd952569cc… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Sun Oct 9 13:07:52 2011 -0600 wldap32: Silence a compiler warning. --- dlls/wldap32/parse.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wldap32/parse.c b/dlls/wldap32/parse.c index 1d65e40..62ffdba 100644 --- a/dlls/wldap32/parse.c +++ b/dlls/wldap32/parse.c @@ -442,7 +442,7 @@ INT CDECL ldap_parse_vlv_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control, #ifdef HAVE_LDAP_PARSE_VLV_CONTROL if (!(ret = ldap_parse_vlv_control( ld, controlU, &pos, &count, - context, errcode ))) + (struct berval **)context, errcode ))) { *targetpos = pos; *listcount = count;

1 0

Bernhard Loos : server: If a debugger is attached to a process, child processes shouldn't get debugged.
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: e7ec00d22cfcaedbccad499f503c50efc8125117 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7ec00d22cfcaedbccad499f5… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Sun Oct 9 23:26:03 2011 +0200 server: If a debugger is attached to a process, child processes shouldn't get debugged. --- server/debugger.c | 1 + server/process.c | 6 +++--- server/process.h | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/server/debugger.c b/server/debugger.c index 35cb3e3..5c0e2c8 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -485,6 +485,7 @@ int debugger_detach( struct process *process, struct thread *debugger ) /* remove relationships between process and its debugger */ process->debugger = NULL; + process->debug_children = 0; if (!set_process_debug_flag( process, 0 )) clear_error(); /* ignore error */ /* from this function */ diff --git a/server/process.c b/server/process.c index c88c89b..de3b594 100644 --- a/server/process.c +++ b/server/process.c @@ -322,7 +322,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit process->priority = PROCESS_PRIOCLASS_NORMAL; process->suspend = 0; process->is_system = 0; - process->create_flags = 0; + process->debug_children = 0; process->console = NULL; process->startup_state = STARTUP_IN_PROGRESS; process->startup_info = NULL; @@ -937,7 +937,7 @@ DECL_HANDLER(new_process) if (!(thread = create_process( socket_fd, current, req->inherit_all ))) goto done; process = thread->process; - process->create_flags = req->create_flags; + process->debug_children = !(req->create_flags & DEBUG_ONLY_THIS_PROCESS); process->startup_info = (struct startup_info *)grab_object( info ); /* connect to the window station */ @@ -972,7 +972,7 @@ DECL_HANDLER(new_process) /* attach to the debugger if requested */ if (req->create_flags & (DEBUG_PROCESS | DEBUG_ONLY_THIS_PROCESS)) set_process_debugger( process, current ); - else if (parent->debugger && !(parent->create_flags & DEBUG_ONLY_THIS_PROCESS)) + else if (parent->debugger && parent->debug_children) set_process_debugger( process, parent->debugger ); if (!(req->create_flags & CREATE_NEW_PROCESS_GROUP)) diff --git a/server/process.h b/server/process.h index da51a0e..93ec6c7 100644 --- a/server/process.h +++ b/server/process.h @@ -66,8 +66,8 @@ struct process affinity_t affinity; /* process affinity mask */ int priority; /* priority class */ int suspend; /* global process suspend count */ - int is_system; /* is it a system process? */ - unsigned int create_flags; /* process creation flags */ + unsigned int is_system:1; /* is it a system process? */ + unsigned int debug_children:1;/* also debug all child processes */ struct list locks; /* list of file locks owned by the process */ struct list classes; /* window classes owned by the process */ struct console_input*console; /* console input */

1 0

Michael Stefaniuc : shell32: Merge enumidlist.h into the main header file.
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: 61c8da18ef237084bd91f9e6b0f1cda449758df9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61c8da18ef237084bd91f9e6b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 10 00:49:06 2011 +0200 shell32: Merge enumidlist.h into the main header file. --- dlls/shell32/cpanelfolder.c | 1 - dlls/shell32/enumidlist.c | 2 +- dlls/shell32/enumidlist.h | 30 ------------------------------ dlls/shell32/recyclebin.c | 1 - dlls/shell32/shell32_main.h | 10 ++++++++++ dlls/shell32/shfldr_desktop.c | 1 - dlls/shell32/shfldr_fs.c | 1 - dlls/shell32/shfldr_mycomp.c | 1 - dlls/shell32/shfldr_netplaces.c | 1 - 9 files changed, 11 insertions(+), 37 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 611be0f..d6c8f5c 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -42,7 +42,6 @@ #include "commctrl.h" #include "cpanel.h" -#include "enumidlist.h" #include "pidl.h" #include "undocshell.h" #include "shell32_main.h" diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c index c3d363c..643e039 100644 --- a/dlls/shell32/enumidlist.c +++ b/dlls/shell32/enumidlist.c @@ -32,7 +32,7 @@ #include "shlwapi.h" #include "pidl.h" -#include "enumidlist.h" +#include "shell32_main.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/dlls/shell32/enumidlist.h b/dlls/shell32/enumidlist.h deleted file mode 100644 index 3fb27d0..0000000 --- a/dlls/shell32/enumidlist.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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 __ENUMIDLIST_H__ -#define __ENUMIDLIST_H__ - -#include "shlobj.h" - -/* Creates an IEnumIDList; add LPITEMIDLISTs to it with AddToEnumList. */ -LPENUMIDLIST IEnumIDList_Constructor(void) DECLSPEC_HIDDEN; -BOOL AddToEnumList(IEnumIDList *list, LPITEMIDLIST pidl) DECLSPEC_HIDDEN; - -/* Enumerates the folders and/or files (depending on dwFlags) in lpszPath and - * adds them to the already-created list. - */ -BOOL CreateFolderEnumList(IEnumIDList *list, LPCWSTR lpszPath, DWORD dwFlags) DECLSPEC_HIDDEN; - -#endif /* ndef __ENUMIDLIST_H__ */ diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 4a8cec4..44e99fc 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -41,7 +41,6 @@ #include "wine/debug.h" #include "shell32_main.h" -#include "enumidlist.h" #include "xdg.h" #include "pidl.h" diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 96b3098..9359a3a 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -204,4 +204,14 @@ HRESULT SHELL_RegisterShellFolders(void) DECLSPEC_HIDDEN; /* Detect Shell Links */ BOOL SHELL_IsShortcut(LPCITEMIDLIST) DECLSPEC_HIDDEN; + +/* Creates an IEnumIDList; add LPITEMIDLISTs to it with AddToEnumList. */ +LPENUMIDLIST IEnumIDList_Constructor(void) DECLSPEC_HIDDEN; +BOOL AddToEnumList(IEnumIDList *list, LPITEMIDLIST pidl) DECLSPEC_HIDDEN; + +/* Enumerates the folders and/or files (depending on dwFlags) in lpszPath and + * adds them to the already-created list. + */ +BOOL CreateFolderEnumList(IEnumIDList *list, LPCWSTR lpszPath, DWORD dwFlags) DECLSPEC_HIDDEN; + #endif diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 9bf08ef..808b920 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -42,7 +42,6 @@ #include "ole2.h" #include "shlguid.h" -#include "enumidlist.h" #include "pidl.h" #include "undocshell.h" #include "shell32_main.h" diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 969f18d..dd0231a 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -42,7 +42,6 @@ #include "ole2.h" #include "shlguid.h" -#include "enumidlist.h" #include "pidl.h" #include "undocshell.h" #include "shell32_main.h" diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index b9cbea4..265c5a4 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -39,7 +39,6 @@ #include "wingdi.h" #include "pidl.h" #include "shlguid.h" -#include "enumidlist.h" #include "undocshell.h" #include "shell32_main.h" #include "shresdef.h" diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index 0ab0470..4c95d3e 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -38,7 +38,6 @@ #include "winreg.h" #include "pidl.h" -#include "enumidlist.h" #include "undocshell.h" #include "shell32_main.h" #include "shresdef.h"

1 0

Michael Stefaniuc : shell32: Pass an object instead of an iface to a helper function.
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: a6e4c721a2b58371864865f68030b936bc83a5ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6e4c721a2b58371864865f68… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 10 00:52:43 2011 +0200 shell32: Pass an object instead of an iface to a helper function. --- dlls/shell32/enumidlist.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c index 643e039..2eb0ff8 100644 --- a/dlls/shell32/enumidlist.c +++ b/dlls/shell32/enumidlist.c @@ -164,14 +164,8 @@ BOOL CreateFolderEnumList( return succeeded; } -/************************************************************************** -* DeleteList() -*/ -static BOOL DeleteList( - IEnumIDList * iface) +static BOOL DeleteList(IEnumIDListImpl *This) { - IEnumIDListImpl *This = (IEnumIDListImpl *)iface; - LPENUMLIST pDelete; TRACE("(%p)->()\n",This); @@ -263,7 +257,7 @@ static ULONG WINAPI IEnumIDList_fnRelease( if (!refCount) { TRACE(" destroying IEnumIDList(%p)\n",This); - DeleteList((IEnumIDList*)This); + DeleteList(This); HeapFree(GetProcessHeap(),0,This); } return refCount;

1 0

Michael Stefaniuc : shell32: Basic COM cleanup for the IEnumIDList iface.
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: b8638ef9ef0615bf2c8c75b00c131875aa3d9542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8638ef9ef0615bf2c8c75b00… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 10 00:53:53 2011 +0200 shell32: Basic COM cleanup for the IEnumIDList iface. --- dlls/shell32/enumidlist.c | 72 ++++++++++++++++++++------------------------ 1 files changed, 33 insertions(+), 39 deletions(-) diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c index 2eb0ff8..02868db 100644 --- a/dlls/shell32/enumidlist.c +++ b/dlls/shell32/enumidlist.c @@ -45,7 +45,7 @@ typedef struct tagENUMLIST typedef struct { - const IEnumIDListVtbl *lpVtbl; + IEnumIDList IEnumIDList_iface; LONG ref; LPENUMLIST mpFirst; LPENUMLIST mpLast; @@ -180,6 +180,11 @@ static BOOL DeleteList(IEnumIDListImpl *This) return TRUE; } +static inline IEnumIDListImpl *impl_from_IEnumIDList(IEnumIDList *iface) +{ + return CONTAINING_RECORD(iface, IEnumIDListImpl, IEnumIDList_iface); +} + /************************************************************************** * IEnumIDList_Folder_Constructor * @@ -193,22 +198,22 @@ IEnumIDList * IEnumIDList_Constructor(void) if (lpeidl) { lpeidl->ref = 1; - lpeidl->lpVtbl = &eidlvt; + lpeidl->IEnumIDList_iface.lpVtbl = &eidlvt; } + else + return NULL; + TRACE("-- (%p)->()\n",lpeidl); - return (IEnumIDList*)lpeidl; + return &lpeidl->IEnumIDList_iface; } /************************************************************************** - * EnumIDList_QueryInterface + * IEnumIDList::QueryInterface */ -static HRESULT WINAPI IEnumIDList_fnQueryInterface( - IEnumIDList * iface, - REFIID riid, - LPVOID *ppvObj) +static HRESULT WINAPI IEnumIDList_fnQueryInterface(IEnumIDList *iface, REFIID riid, void **ppvObj) { - IEnumIDListImpl *This = (IEnumIDListImpl *)iface; + IEnumIDListImpl *This = impl_from_IEnumIDList(iface); TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj); @@ -232,12 +237,11 @@ static HRESULT WINAPI IEnumIDList_fnQueryInterface( } /****************************************************************************** - * IEnumIDList_fnAddRef + * IEnumIDList::AddRef */ -static ULONG WINAPI IEnumIDList_fnAddRef( - IEnumIDList * iface) +static ULONG WINAPI IEnumIDList_fnAddRef(IEnumIDList *iface) { - IEnumIDListImpl *This = (IEnumIDListImpl *)iface; + IEnumIDListImpl *This = impl_from_IEnumIDList(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(%u)\n", This, refCount - 1); @@ -245,12 +249,11 @@ static ULONG WINAPI IEnumIDList_fnAddRef( return refCount; } /****************************************************************************** - * IEnumIDList_fnRelease + * IEnumIDList::Release */ -static ULONG WINAPI IEnumIDList_fnRelease( - IEnumIDList * iface) +static ULONG WINAPI IEnumIDList_fnRelease(IEnumIDList *iface) { - IEnumIDListImpl *This = (IEnumIDListImpl *)iface; + IEnumIDListImpl *This = impl_from_IEnumIDList(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(%u)\n", This, refCount + 1); @@ -264,16 +267,13 @@ static ULONG WINAPI IEnumIDList_fnRelease( } /************************************************************************** - * IEnumIDList_fnNext + * IEnumIDList::Next */ -static HRESULT WINAPI IEnumIDList_fnNext( - IEnumIDList * iface, - ULONG celt, - LPITEMIDLIST * rgelt, - ULONG *pceltFetched) +static HRESULT WINAPI IEnumIDList_fnNext(IEnumIDList *iface, ULONG celt, LPITEMIDLIST *rgelt, + ULONG *pceltFetched) { - IEnumIDListImpl *This = (IEnumIDListImpl *)iface; + IEnumIDListImpl *This = impl_from_IEnumIDList(iface); ULONG i; HRESULT hr = S_OK; @@ -313,12 +313,11 @@ static HRESULT WINAPI IEnumIDList_fnNext( } /************************************************************************** -* IEnumIDList_fnSkip +* IEnumIDList::Skip */ -static HRESULT WINAPI IEnumIDList_fnSkip( - IEnumIDList * iface,ULONG celt) +static HRESULT WINAPI IEnumIDList_fnSkip(IEnumIDList *iface, ULONG celt) { - IEnumIDListImpl *This = (IEnumIDListImpl *)iface; + IEnumIDListImpl *This = impl_from_IEnumIDList(iface); DWORD dwIndex; HRESULT hr = S_OK; @@ -335,32 +334,27 @@ static HRESULT WINAPI IEnumIDList_fnSkip( return hr; } /************************************************************************** -* IEnumIDList_fnReset +* IEnumIDList::Reset */ -static HRESULT WINAPI IEnumIDList_fnReset( - IEnumIDList * iface) +static HRESULT WINAPI IEnumIDList_fnReset(IEnumIDList *iface) { - IEnumIDListImpl *This = (IEnumIDListImpl *)iface; + IEnumIDListImpl *This = impl_from_IEnumIDList(iface); TRACE("(%p)\n",This); This->mpCurrent = This->mpFirst; return S_OK; } /************************************************************************** -* IEnumIDList_fnClone +* IEnumIDList::Clone */ -static HRESULT WINAPI IEnumIDList_fnClone( - IEnumIDList * iface,LPENUMIDLIST * ppenum) +static HRESULT WINAPI IEnumIDList_fnClone(IEnumIDList *iface, IEnumIDList **ppenum) { - IEnumIDListImpl *This = (IEnumIDListImpl *)iface; + IEnumIDListImpl *This = impl_from_IEnumIDList(iface); TRACE("(%p)->() to (%p)->() E_NOTIMPL\n",This,ppenum); return E_NOTIMPL; } -/************************************************************************** - * IEnumIDList_fnVTable - */ static const IEnumIDListVtbl eidlvt = { IEnumIDList_fnQueryInterface,

1 0

Michael Stefaniuc : shell32: Avoid the forward declaration of the IEnumIDList vtbl.
by Alexandre Julliard 10 Oct '11

10 Oct '11

Module: wine Branch: master Commit: 8d1fc3b48667f0f45f9fbaebb855fae71e4f4457 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d1fc3b48667f0f45f9fbaebb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 10 00:55:51 2011 +0200 shell32: Avoid the forward declaration of the IEnumIDList vtbl. --- dlls/shell32/enumidlist.c | 42 +++++++++++++++++------------------------- 1 files changed, 17 insertions(+), 25 deletions(-) diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c index 02868db..f04ddd5 100644 --- a/dlls/shell32/enumidlist.c +++ b/dlls/shell32/enumidlist.c @@ -53,8 +53,6 @@ typedef struct } IEnumIDListImpl; -static const IEnumIDListVtbl eidlvt; - /************************************************************************** * AddToEnumList() */ @@ -186,29 +184,6 @@ static inline IEnumIDListImpl *impl_from_IEnumIDList(IEnumIDList *iface) } /************************************************************************** - * IEnumIDList_Folder_Constructor - * - */ - -IEnumIDList * IEnumIDList_Constructor(void) -{ - IEnumIDListImpl *lpeidl = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, sizeof(IEnumIDListImpl)); - - if (lpeidl) - { - lpeidl->ref = 1; - lpeidl->IEnumIDList_iface.lpVtbl = &eidlvt; - } - else - return NULL; - - TRACE("-- (%p)->()\n",lpeidl); - - return &lpeidl->IEnumIDList_iface; -} - -/************************************************************************** * IEnumIDList::QueryInterface */ static HRESULT WINAPI IEnumIDList_fnQueryInterface(IEnumIDList *iface, REFIID riid, void **ppvObj) @@ -365,3 +340,20 @@ static const IEnumIDListVtbl eidlvt = IEnumIDList_fnReset, IEnumIDList_fnClone, }; + +IEnumIDList *IEnumIDList_Constructor(void) +{ + IEnumIDListImpl *lpeidl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*lpeidl)); + + if (lpeidl) + { + lpeidl->ref = 1; + lpeidl->IEnumIDList_iface.lpVtbl = &eidlvt; + } + else + return NULL; + + TRACE("-- (%p)->()\n",lpeidl); + + return &lpeidl->IEnumIDList_iface; +}

1 0