June 2013 - Wine-Commits - list.winehq.org

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMVISUALARRAY.
by Alexandre Julliard June 6, 2013

June 6, 2013

Module: wine Branch: master Commit: 861b1053e231d894bcee2fab6e758910a520abf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=861b1053e231d894bcee2fab6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 6 10:51:50 2013 +0200 d3drm: Avoid LPDIRECT3DRMVISUALARRAY. --- dlls/d3drm/frame.c | 3 +-- dlls/d3drm/tests/d3drm.c | 14 +++++++------- include/d3drmobj.h | 4 ++-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 7af3da1..88540f0 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -819,8 +819,7 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_GetOrientation(IDirect3DRMFrame2 *if return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMFrame2Impl_GetVisuals(IDirect3DRMFrame2* iface, - LPDIRECT3DRMVISUALARRAY *visuals) +static HRESULT WINAPI IDirect3DRMFrame2Impl_GetVisuals(IDirect3DRMFrame2 *iface, IDirect3DRMVisualArray **visuals) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); IDirect3DRMVisualArrayImpl* obj; diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index ea8301f..34b0fd0 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -915,7 +915,7 @@ static void test_Frame(void) IDirect3DRMMeshBuilder *mesh_builder; IDirect3DRMVisual *visual1; IDirect3DRMVisual *visual_tmp; - LPDIRECT3DRMVISUALARRAY pVisualArray; + IDirect3DRMVisualArray *visual_array; IDirect3DRMLight *light1; IDirect3DRMLight *light_tmp; LPDIRECT3DRMLIGHTARRAY pLightArray; @@ -1154,18 +1154,18 @@ static void test_Frame(void) CHECK_REFCOUNT(pFrameP1, 3); CHECK_REFCOUNT(visual1, 2); - pVisualArray = NULL; - hr = IDirect3DRMFrame_GetVisuals(pFrameP1, &pVisualArray); + visual_array = NULL; + hr = IDirect3DRMFrame_GetVisuals(pFrameP1, &visual_array); ok(hr == D3DRM_OK, "Cannot get visuals (hr = %x)\n", hr); - if (pVisualArray) + if (visual_array) { - count = IDirect3DRMVisualArray_GetSize(pVisualArray); + count = IDirect3DRMVisualArray_GetSize(visual_array); ok(count == 1, "count = %u\n", count); - hr = IDirect3DRMVisualArray_GetElement(pVisualArray, 0, &visual_tmp); + hr = IDirect3DRMVisualArray_GetElement(visual_array, 0, &visual_tmp); ok(hr == D3DRM_OK, "Cannot get element (hr = %x)\n", hr); ok(visual_tmp == visual1, "visual_tmp = %p\n", visual_tmp); IDirect3DRMVisual_Release(visual_tmp); - IDirect3DRMVisualArray_Release(pVisualArray); + IDirect3DRMVisualArray_Release(visual_array); } /* Delete Visual */ diff --git a/include/d3drmobj.h b/include/d3drmobj.h index d4f463a..0253b89 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -1117,7 +1117,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame,IDirect3DRMVisual) STDMETHOD(GetTransform)(THIS_ D3DRMMATRIX4D return_matrix) PURE; STDMETHOD(GetVelocity)(THIS_ IDirect3DRMFrame *reference, D3DVECTOR *return_velocity, BOOL with_rotation) PURE; STDMETHOD(GetOrientation)(THIS_ IDirect3DRMFrame *reference, D3DVECTOR *dir, D3DVECTOR *up) PURE; - STDMETHOD(GetVisuals)(THIS_ LPDIRECT3DRMVISUALARRAY *visuals) PURE; + STDMETHOD(GetVisuals)(THIS_ struct IDirect3DRMVisualArray **visuals) PURE; STDMETHOD(GetTextureTopology)(THIS_ BOOL *wrap_u, BOOL *wrap_v) PURE; STDMETHOD(InverseTransform)(THIS_ D3DVECTOR *d, D3DVECTOR *s) PURE; STDMETHOD(Load)(THIS_ LPVOID filename, LPVOID name, D3DRMLOADOPTIONS loadflags, D3DRMLOADTEXTURECALLBACK, @@ -1350,7 +1350,7 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame) STDMETHOD(GetTransform)(THIS_ D3DRMMATRIX4D return_matrix) PURE; STDMETHOD(GetVelocity)(THIS_ IDirect3DRMFrame *reference, D3DVECTOR *return_velocity, BOOL with_rotation) PURE; STDMETHOD(GetOrientation)(THIS_ IDirect3DRMFrame *reference, D3DVECTOR *dir, D3DVECTOR *up) PURE; - STDMETHOD(GetVisuals)(THIS_ LPDIRECT3DRMVISUALARRAY *visuals) PURE; + STDMETHOD(GetVisuals)(THIS_ struct IDirect3DRMVisualArray **visuals) PURE; STDMETHOD(GetTextureTopology)(THIS_ BOOL *wrap_u, BOOL *wrap_v) PURE; STDMETHOD(InverseTransform)(THIS_ D3DVECTOR *d, D3DVECTOR *s) PURE; STDMETHOD(Load)(THIS_ LPVOID filename, LPVOID name, D3DRMLOADOPTIONS loadflags, D3DRMLOADTEXTURECALLBACK,

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMANIMATIONARRAY.
by Alexandre Julliard June 6, 2013

June 6, 2013

Module: wine Branch: master Commit: 0330ae84a7edca6b9c9c76fd851ef4df8c582ef8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0330ae84a7edca6b9c9c76fd8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 6 10:51:49 2013 +0200 d3drm: Avoid LPDIRECT3DRMANIMATIONARRAY. --- include/d3drmobj.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 268e67b..d4f463a 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -4036,7 +4036,7 @@ DECLARE_INTERFACE_(IDirect3DRMAnimationSet2, IDirect3DRMObject) D3DRMLOADTEXTURE3CALLBACK cb, void *ctx, IDirect3DRMFrame3 *parent_frame)PURE; STDMETHOD(DeleteAnimation)(THIS_ IDirect3DRMAnimation2 *animation) PURE; STDMETHOD(SetTime)(THIS_ D3DVALUE time) PURE; - STDMETHOD(GetAnimations)(THIS_ LPDIRECT3DRMANIMATIONARRAY *) PURE; + STDMETHOD(GetAnimations)(THIS_ struct IDirect3DRMAnimationArray **array) PURE; }; #undef INTERFACE

1 0

Henri Verbeet : wined3d: Allow surface flags to be passed to texture creation functions.
by Alexandre Julliard June 6, 2013

June 6, 2013

Module: wine Branch: master Commit: d6bc4fe71aa35cd531769a0d4d2ee8f22f13f748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6bc4fe71aa35cd531769a0d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 6 10:51:47 2013 +0200 wined3d: Allow surface flags to be passed to texture creation functions. --- dlls/d3d10core/device.c | 8 ++++---- dlls/d3d10core/texture.c | 2 +- dlls/d3d8/d3d8_private.h | 4 ++-- dlls/d3d8/device.c | 38 +++++++++++++++++++------------------- dlls/d3d8/surface.c | 10 ++-------- dlls/d3d8/texture.c | 12 ++++++++++-- dlls/d3d9/d3d9_private.h | 4 ++-- dlls/d3d9/device.c | 42 +++++++++++++++++++++++------------------- dlls/d3d9/surface.c | 10 ++-------- dlls/d3d9/texture.c | 12 ++++++++++-- dlls/ddraw/ddraw.c | 32 +++++++++++++++++++------------- dlls/ddraw/ddraw_private.h | 4 ++-- dlls/ddraw/surface.c | 17 +++++------------ dlls/wined3d/texture.c | 28 ++++++++++++++++------------ dlls/wined3d/wined3d.spec | 4 ++-- include/wine/wined3d.h | 9 ++++++--- 16 files changed, 125 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d6bc4fe71aa35cd531769…

1 0

Henri Verbeet : wined3d: Pass a wined3d_resource_desc structure to wined3d_texture_create_3d().
by Alexandre Julliard June 6, 2013

June 6, 2013

Module: wine Branch: master Commit: 91096dd7ad75111ba4d01383cd8bf704e48adc2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=91096dd7ad75111ba4d01383c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 6 10:51:46 2013 +0200 wined3d: Pass a wined3d_resource_desc structure to wined3d_texture_create_3d(). --- dlls/d3d10core/texture.c | 18 +++++++++--- dlls/d3d8/texture.c | 17 +++++++++-- dlls/d3d9/texture.c | 17 +++++++++-- dlls/wined3d/texture.c | 65 +++++++++++++++++--------------------------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 5 +-- 6 files changed, 70 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=91096dd7ad75111ba4d01…

1 0

Alistair Leslie-Hughes : dbs.idl: Add missing DBROWSTATUSENUM values.
by Alexandre Julliard June 6, 2013

June 6, 2013

Module: wine Branch: master Commit: d25be83c0a599d912a77fe3923e66976f36a00b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d25be83c0a599d912a77fe392… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 5 09:28:47 2013 +1000 dbs.idl: Add missing DBROWSTATUSENUM values. --- include/dbs.idl | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/include/dbs.idl b/include/dbs.idl index a517bf2..ee8eacf 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -500,9 +500,26 @@ typedef DWORD DBROWSTATUS; enum DBROWSTATUSENUM { - DBROWSTATUS_S_OK = 0, - /* FIXME */ - DBROWSTATUS_E_FAIL = 19, + DBROWSTATUS_S_OK, + DBROWSTATUS_S_LOCKUPGRADED, + DBROWSTATUS_S_MULTIPLECHANGES, + DBROWSTATUS_S_PENDINGCHANGES, + DBROWSTATUS_E_CANCELED, + DBROWSTATUS_E_CANTLOCKROW, + DBROWSTATUS_E_CANTRELEASE, + DBROWSTATUS_E_CONCURRENCYVIOLATION, + DBROWSTATUS_E_DELETED, + DBROWSTATUS_E_PENDINGINSERT, + DBROWSTATUS_E_NEWLYINSERTED, + DBROWSTATUS_E_INTEGRITYVIOLATION, + DBROWSTATUS_E_INVALID, + DBROWSTATUS_E_MAXPENDCHANGESEXCEEDED, + DBROWSTATUS_E_OBJECTOPEN, + DBROWSTATUS_E_OUTOFMEMORY, + DBROWSTATUS_E_PERMISSIONDENIED, + DBROWSTATUS_E_LIMITREACHED, + DBROWSTATUS_E_SCHEMAVIOLATION, + DBROWSTATUS_E_FAIL, };

1 0

Henri Verbeet : d3d9: Create textures for swapchain surfaces.
by Alexandre Julliard June 6, 2013

June 6, 2013

Module: wine Branch: master Commit: 93b76d9a9c5e85757812142d22e5042d9b46aedc URL: http://source.winehq.org/git/wine.git/?a=commit;h=93b76d9a9c5e85757812142d2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 6 10:51:48 2013 +0200 d3d9: Create textures for swapchain surfaces. --- dlls/d3d9/device.c | 41 ++++++++++++++++++++++++++++++----------- 1 files changed, 30 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1a4d29f..49de853 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -557,6 +557,21 @@ static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource) { struct d3d9_surface *surface; + if (desc.resource_type == WINED3D_RTYPE_TEXTURE) + { + IUnknown *parent = wined3d_resource_get_parent(resource); + IDirect3DBaseTexture9 *texture; + + if (SUCCEEDED(IUnknown_QueryInterface(parent, &IID_IDirect3DBaseTexture9, (void **)&texture))) + { + IDirect3DBaseTexture9_Release(texture); + WARN("Texture %p (resource %p) in pool D3DPOOL_DEFAULT blocks the Reset call.\n", texture, resource); + return D3DERR_INVALIDCALL; + } + + return D3D_OK; + } + if (desc.resource_type != WINED3D_RTYPE_SURFACE) { WARN("Resource %p in pool D3DPOOL_DEFAULT blocks the Reset call.\n", resource); @@ -3302,29 +3317,33 @@ static HRESULT CDECL device_parent_create_swapchain_surface(struct wined3d_devic void *container_parent, const struct wined3d_resource_desc *desc, struct wined3d_surface **surface) { struct d3d9_device *device = device_from_device_parent(device_parent); + struct wined3d_resource_desc texture_desc; struct d3d9_surface *d3d_surface; + struct wined3d_texture *texture; HRESULT hr; TRACE("device_parent %p, container_parent %p, desc %p, surface %p.\n", device_parent, container_parent, desc, surface); - if (FAILED(hr = d3d9_device_create_surface(device, desc->width, desc->height, - d3dformat_from_wined3dformat(desc->format), WINED3D_SURFACE_MAPPABLE, (IDirect3DSurface9 **)&d3d_surface, - desc->usage, desc->pool, desc->multisample_type, desc->multisample_quality))) + if (container_parent == device_parent) + container_parent = &device->IDirect3DDevice9Ex_iface; + + texture_desc = *desc; + texture_desc.resource_type = WINED3D_RTYPE_TEXTURE; + if (FAILED(hr = wined3d_texture_create_2d(device->wined3d_device, &texture_desc, 1, + WINED3D_SURFACE_MAPPABLE, container_parent, &d3d9_null_wined3d_parent_ops, &texture))) { - WARN("Failed to create surface, hr %#x.\n", hr); + WARN("Failed to create texture, hr %#x.\n", hr); return hr; } - *surface = d3d_surface->wined3d_surface; + *surface = wined3d_surface_from_resource(wined3d_texture_get_sub_resource(texture, 0)); wined3d_surface_incref(*surface); + wined3d_texture_decref(texture); - if (container_parent == device_parent) - d3d_surface->container = (IUnknown *)&device->IDirect3DDevice9Ex_iface; - else - d3d_surface->container = container_parent; - /* Implicit surfaces are created with an refcount of 0 */ - IDirect3DSurface9_Release(&d3d_surface->IDirect3DSurface9_iface); + d3d_surface = wined3d_surface_get_parent(*surface); + d3d_surface->forwardReference = NULL; + d3d_surface->parent_device = &device->IDirect3DDevice9Ex_iface; return hr; }

1 0

Hans Leidekker : user32: Fix icon extraction from non-native PE executables .
by Alexandre Julliard June 6, 2013

June 6, 2013

Module: wine Branch: master Commit: ba40509f90ac45a78a4eee018a5b19162aaded9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba40509f90ac45a78a4eee018… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 6 19:30:05 2013 +0200 user32: Fix icon extraction from non-native PE executables. --- dlls/user32/exticon.c | 87 +++++++++--------------------------------------- 1 files changed, 17 insertions(+), 70 deletions(-) diff --git a/dlls/user32/exticon.c b/dlls/user32/exticon.c index 5b9d681..0dbbef1 100644 --- a/dlls/user32/exticon.c +++ b/dlls/user32/exticon.c @@ -420,47 +420,19 @@ static UINT ICO_ExtractIconExW( /* exe/dll */ else if( sig == IMAGE_NT_SIGNATURE ) { - LPBYTE idata,igdata; - PIMAGE_DOS_HEADER dheader; - PIMAGE_NT_HEADERS pe_header; - PIMAGE_SECTION_HEADER pe_sections; - const IMAGE_RESOURCE_DIRECTORY *rootresdir,*iconresdir,*icongroupresdir; - const IMAGE_RESOURCE_DATA_ENTRY *idataent,*igdataent; - const IMAGE_RESOURCE_DIRECTORY_ENTRY *xresent; - UINT i, j; - - dheader = (PIMAGE_DOS_HEADER)peimage; - pe_header = (PIMAGE_NT_HEADERS)(peimage+dheader->e_lfanew); /* it is a pe header, USER32_GetResourceTable checked that */ - pe_sections = (PIMAGE_SECTION_HEADER)(((char*)pe_header) + sizeof(DWORD) + sizeof(IMAGE_FILE_HEADER) - + pe_header->FileHeader.SizeOfOptionalHeader); - rootresdir = NULL; - - /* search for the root resource directory */ - for (i=0;i<pe_header->FileHeader.NumberOfSections;i++) - { - if (pe_sections[i].Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA) - continue; - if (fsizel < pe_sections[i].PointerToRawData+pe_sections[i].SizeOfRawData) { - FIXME("File %s too short (section is at %d bytes, real size is %d)\n", - debugstr_w(lpszExeFileName), - pe_sections[i].PointerToRawData+pe_sections[i].SizeOfRawData, - fsizel - ); - goto end; - } - /* FIXME: doesn't work when the resources are not in a separate section */ - if (pe_sections[i].VirtualAddress == pe_header->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress) - { - rootresdir = (PIMAGE_RESOURCE_DIRECTORY)(peimage+pe_sections[i].PointerToRawData); - break; - } - } - - if (!rootresdir) - { - WARN("haven't found section for resource directory.\n"); - goto end; /* failure */ - } + BYTE *idata, *igdata; + const IMAGE_RESOURCE_DIRECTORY *rootresdir, *iconresdir, *icongroupresdir; + const IMAGE_RESOURCE_DATA_ENTRY *idataent, *igdataent; + const IMAGE_RESOURCE_DIRECTORY_ENTRY *xresent; + ULONG size; + UINT i; + + rootresdir = RtlImageDirectoryEntryToData((HMODULE)peimage, FALSE, IMAGE_DIRECTORY_ENTRY_RESOURCE, &size); + if (!rootresdir) + { + WARN("haven't found section for resource directory.\n"); + goto end; + } /* search for the group icon directory */ if (!(icongroupresdir = find_entry_by_id(rootresdir, LOWORD(RT_GROUP_ICON), rootresdir))) @@ -529,24 +501,8 @@ static UINT ICO_ExtractIconExW( igdataent = (const IMAGE_RESOURCE_DATA_ENTRY*)resdir; /* lookup address in mapped image for virtual address */ - igdata = NULL; - - for (j=0;j<pe_header->FileHeader.NumberOfSections;j++) - { - if (igdataent->OffsetToData < pe_sections[j].VirtualAddress) - continue; - if (igdataent->OffsetToData+igdataent->Size > pe_sections[j].VirtualAddress+pe_sections[j].SizeOfRawData) - continue; - - if (igdataent->OffsetToData-pe_sections[j].VirtualAddress+pe_sections[j].PointerToRawData+igdataent->Size > fsizel) { - FIXME("overflow in PE lookup (%s has len %d, have offset %d), short file?\n", debugstr_w(lpszExeFileName), fsizel, - igdataent->OffsetToData - pe_sections[j].VirtualAddress + pe_sections[j].PointerToRawData + igdataent->Size); - goto end; /* failure */ - } - igdata = peimage+(igdataent->OffsetToData-pe_sections[j].VirtualAddress+pe_sections[j].PointerToRawData); - } - - if (!igdata) + igdata = RtlImageRvaToVa(RtlImageNtHeader((HMODULE)peimage), (HMODULE)peimage, igdataent->OffsetToData, NULL); + if (!igdata) { FIXME("no matching real address for icongroup!\n"); goto end; /* failure */ @@ -573,18 +529,9 @@ static UINT ICO_ExtractIconExW( } xresdir = find_entry_default(xresdir, rootresdir); idataent = (const IMAGE_RESOURCE_DATA_ENTRY*)xresdir; - idata = NULL; - /* map virtual to address in image */ - for (j=0;j<pe_header->FileHeader.NumberOfSections;j++) - { - if (idataent->OffsetToData < pe_sections[j].VirtualAddress) - continue; - if (idataent->OffsetToData+idataent->Size > pe_sections[j].VirtualAddress+pe_sections[j].SizeOfRawData) - continue; - idata = peimage+(idataent->OffsetToData-pe_sections[j].VirtualAddress+pe_sections[j].PointerToRawData); - } - if (!idata) + idata = RtlImageRvaToVa(RtlImageNtHeader((HMODULE)peimage), (HMODULE)peimage, idataent->OffsetToData, NULL); + if (!idata) { WARN("no matching real address found for icondata!\n"); RetPtr[i]=0;

1 0

Hans Leidekker : wine.inf: Install WBEM executables in system32/wbem.
by Alexandre Julliard June 6, 2013

June 6, 2013

Module: wine Branch: master Commit: 8c23dc98b3d376cf6fa05a8ed8057a5d661c041a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c23dc98b3d376cf6fa05a8ed… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 6 14:04:36 2013 +0200 wine.inf: Install WBEM executables in system32/wbem. --- tools/wine.inf.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 14fde79..c82173d 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2534,6 +2534,9 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,shdocvw.dll 11,gecko\plugin,npmshtml.dll 11,wbem,mofcomp.exe +11,wbem,wbemprox.dll +11,wbem,wmic.exe +11,wbem,wmiutils.dll 16422,Internet Explorer,iexplore.exe 11,,*

1 0

Alexandre Julliard : explorer: Don' t worry about desktop launchers in non-desktop mode.
by Alexandre Julliard June 6, 2013

June 6, 2013

Module: wine Branch: master Commit: 9eb3f6a3db3d93a734a3514179013d69ca5b003d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eb3f6a3db3d93a734a351417… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 6 10:46:17 2013 +0200 explorer: Don't worry about desktop launchers in non-desktop mode. --- programs/explorer/desktop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index c975e23..33b58dc 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -769,7 +769,7 @@ void manage_desktop( WCHAR *arg ) initialize_display_settings( hwnd ); initialize_appbar(); initialize_systray( graphics_driver, using_root ); - initialize_launchers( hwnd ); + if (!using_root) initialize_launchers( hwnd ); if ((shell32 = LoadLibraryA( "shell32.dll" )) && (pShellDDEInit = (void *)GetProcAddress( shell32, (LPCSTR)188)))

1 0

Francois Gouget : wined3d: Make state_fog_vertexpart() static.
by Alexandre Julliard June 6, 2013

June 6, 2013

Module: wine Branch: master Commit: 145c417e98e173e73de10dc77e7fd1a19e46843f URL: http://source.winehq.org/git/wine.git/?a=commit;h=145c417e98e173e73de10dc77… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 6 10:16:49 2013 +0200 wined3d: Make state_fog_vertexpart() static. --- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1204744..491ee91 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -946,7 +946,7 @@ static void state_stencilwrite(struct wined3d_context *context, const struct win checkGLcall("glStencilMask"); } -void state_fog_vertexpart(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void state_fog_vertexpart(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f10bd70..6539548 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2626,8 +2626,6 @@ void state_clipping(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void light(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; -void state_fog_vertexpart(struct wined3d_context *context, - const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void vertexdeclaration(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void clipplane(struct wined3d_context *context,

1 0