November 2012 - Wine-commits

Alexandre Julliard : configure: Remove checks for OpenGL headers that are no longer used.
by Alexandre Julliard 08 Nov '12

08 Nov '12

Module: wine Branch: master Commit: e40b2a1b07368bd49235ad7ea07175652c3bcd56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e40b2a1b07368bd49235ad7ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 8 00:14:44 2012 +0100 configure: Remove checks for OpenGL headers that are no longer used. --- configure | 139 ++++++++++++--------------------------------------- configure.ac | 88 +++++++++++---------------------- include/config.h.in | 18 ------- 3 files changed, 62 insertions(+), 183 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e40b2a1b07368bd49235a…

1 0

Alexandre Julliard : wined3d: Link directly to opengl32.
by Alexandre Julliard 08 Nov '12

08 Nov '12

Module: wine Branch: master Commit: 449deda62fea5f18676e3e109e7f4c4f455b6b40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=449deda62fea5f18676e3e109… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 8 11:56:06 2012 +0100 wined3d: Link directly to opengl32. --- dlls/wined3d/Makefile.in | 2 +- dlls/wined3d/context.c | 34 +++++++++++++++++----------------- dlls/wined3d/directx.c | 41 +++++++++++++++-------------------------- dlls/wined3d/wined3d_gl.h | 18 ------------------ 4 files changed, 33 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=449deda62fea5f18676e3…

1 0

Alexandre Julliard : opengl32: Get rid of the extension removal hack in wglGetProcAddress and clean up the tracing .
by Alexandre Julliard 08 Nov '12

08 Nov '12

Module: wine Branch: master Commit: a3d896897cd4b8966b3b3fa4ba7aa1c1c60cbe02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3d896897cd4b8966b3b3fa4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 8 12:51:42 2012 +0100 opengl32: Get rid of the extension removal hack in wglGetProcAddress and clean up the tracing. --- dlls/opengl32/wgl.c | 97 ++++++++++++++++++--------------------------------- 1 files changed, 34 insertions(+), 63 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index fdb94e4..8fdbf29 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -738,79 +738,50 @@ static BOOL is_extension_supported(const char* extension) /*********************************************************************** * wglGetProcAddress (OPENGL32.@) */ -PROC WINAPI wglGetProcAddress(LPCSTR lpszProc) +PROC WINAPI wglGetProcAddress( LPCSTR name ) { - struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - void **func_ptr; - void *local_func; - OpenGL_extension ext; - const OpenGL_extension *ext_ret; - struct wgl_handle *context = get_current_context_ptr(); + struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + void **func_ptr; + OpenGL_extension ext; + const OpenGL_extension *ext_ret; - TRACE("(%s)\n", lpszProc); + if (!name) return NULL; - if (lpszProc == NULL) - return NULL; - - /* Without an active context opengl32 doesn't know to what - * driver it has to dispatch wglGetProcAddress. - */ - if (!context) - { - WARN("No active WGL context found\n"); - return NULL; - } - - /* Search in the thunks to find the real name of the extension */ - ext.name = lpszProc; - ext_ret = bsearch(&ext, extension_registry, extension_registry_size, - sizeof(OpenGL_extension), compar); - if (!ext_ret) - { - WARN("Extension '%s' not defined in opengl32.dll's function table!\n", lpszProc); - return NULL; - } - - func_ptr = (void **)&funcs->ext + (ext_ret - extension_registry); - if (!*func_ptr) - { - /* Check if the GL extension required by the function is available */ - if(!is_extension_supported(ext_ret->extension)) { - WARN("Extension '%s' required by function '%s' not supported!\n", ext_ret->extension, lpszProc); + /* Without an active context opengl32 doesn't know to what + * driver it has to dispatch wglGetProcAddress. + */ + if (!get_current_context_ptr()) + { + WARN("No active WGL context found\n"); + return NULL; } - local_func = context->funcs->wgl.p_wglGetProcAddress( ext_ret->name ); - - /* After that, look at the extensions defined in the Linux OpenGL library */ - if (local_func == NULL) { - char buf[256]; - void *ret = NULL; - - /* Remove the last 3 letters (EXT, ARB, ...). + ext.name = name; + ext_ret = bsearch(&ext, extension_registry, extension_registry_size, sizeof(ext), compar); + if (!ext_ret) + { + WARN("Function %s unknown\n", name); + return NULL; + } - I know that some extensions have more than 3 letters (MESA, NV, - INTEL, ...), but this is only a stop-gap measure to fix buggy - OpenGL drivers (moreover, it is only useful for old 1.0 apps - that query the glBindTextureEXT extension). - */ - memcpy(buf, ext_ret->name, strlen(ext_ret->name) - 3); - buf[strlen(ext_ret->name) - 3] = '\0'; - TRACE("Extension not found in the Linux OpenGL library, checking against libGL bug with %s..\n", buf); + func_ptr = (void **)&funcs->ext + (ext_ret - extension_registry); + if (!*func_ptr) + { + void *driver_func = funcs->wgl.p_wglGetProcAddress( name ); - ret = GetProcAddress(opengl32_handle, buf); - if (ret != NULL) { - TRACE("Found function in main OpenGL library (%p)!\n", ret); - } else { - WARN("Did not find function %s (%s) in your OpenGL library!\n", lpszProc, ext_ret->name); - } + if (!is_extension_supported(ext_ret->extension)) + WARN("Extension %s required for %s not supported\n", ext_ret->extension, name); - return ret; + if (driver_func == NULL) + { + WARN("Function %s not supported by driver\n", name); + return NULL; + } + *func_ptr = driver_func; } - *func_ptr = local_func; - } - TRACE("returning function (%p)\n", ext_ret->func); - return ext_ret->func; + TRACE("returning %s -> %p\n", name, ext_ret->func); + return ext_ret->func; } /***********************************************************************

1 0

Alexandre Julliard : opengl32: Get rid of wine_ prefix on generated functions.
by Alexandre Julliard 08 Nov '12

08 Nov '12

Module: wine Branch: master Commit: 2480c9395b0b9a14ad1747d2c4621e0cd3a21fca URL: http://source.winehq.org/git/wine.git/?a=commit;h=2480c9395b0b9a14ad1747d2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 8 13:45:03 2012 +0100 opengl32: Get rid of wine_ prefix on generated functions. --- dlls/opengl32/make_opengl | 69 +- dlls/opengl32/opengl32.spec | 722 ++-- dlls/opengl32/opengl_ext.c | 8496 +++++++++++++++++++++--------------------- dlls/opengl32/opengl_norm.c | 670 ++-- dlls/opengl32/wgl.c | 8 +- 5 files changed, 4978 insertions(+), 4987 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2480c9395b0b9a14ad174…

1 0

Henri Verbeet : ddraw: Avoid LPDIRECTDRAW.
by Alexandre Julliard 08 Nov '12

08 Nov '12

Module: wine Branch: master Commit: 99daff8f0349a8a1df316f14c0f471657dc4b4e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99daff8f0349a8a1df316f14c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 7 21:41:12 2012 +0100 ddraw: Avoid LPDIRECTDRAW. --- dlls/ddraw/main.c | 16 ++++++---------- dlls/ddraw/tests/ddrawmodes.c | 2 +- dlls/ddraw/tests/dsurface.c | 2 +- include/amvideo.idl | 6 +++--- include/ddraw.h | 16 ++++++++-------- 5 files changed, 19 insertions(+), 23 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 6d0ddc4..51f9dda 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -270,25 +270,21 @@ DDRAW_Create(const GUID *guid, * Arguments, return values: See DDRAW_Create * ***********************************************************************/ -HRESULT WINAPI DECLSPEC_HOTPATCH -DirectDrawCreate(GUID *GUID, - LPDIRECTDRAW *DD, - IUnknown *UnkOuter) +HRESULT WINAPI DECLSPEC_HOTPATCH DirectDrawCreate(GUID *driver_guid, IDirectDraw **ddraw, IUnknown *outer) { HRESULT hr; - TRACE("driver_guid %s, ddraw %p, outer_unknown %p.\n", - debugstr_guid(GUID), DD, UnkOuter); + TRACE("driver_guid %s, ddraw %p, outer %p.\n", + debugstr_guid(driver_guid), ddraw, outer); wined3d_mutex_lock(); - hr = DDRAW_Create(GUID, (void **) DD, UnkOuter, &IID_IDirectDraw); + hr = DDRAW_Create(driver_guid, (void **)ddraw, outer, &IID_IDirectDraw); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) { - hr = IDirectDraw_Initialize(*DD, GUID); - if (FAILED(hr)) - IDirectDraw_Release(*DD); + if (FAILED(hr = IDirectDraw_Initialize(*ddraw, driver_guid))) + IDirectDraw_Release(*ddraw); } return hr; diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 548ca9b..5068f54 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -29,9 +29,9 @@ #include "wine/test.h" #include "ddraw.h" -static LPDIRECTDRAW lpDD = NULL; static IDirectDrawSurface *lpDDSPrimary; static IDirectDrawSurface *lpDDSBack; +static IDirectDraw *lpDD; static WNDCLASS wc; static HWND hwnd, hwnd2; static int modes_cnt; diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index c9d7d11..c8f90c9 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -31,7 +31,7 @@ static HRESULT (WINAPI *pDirectDrawCreateEx)(GUID *, void **, REFIID, IUnknown *); -static LPDIRECTDRAW lpDD = NULL; +static IDirectDraw *lpDD; static DDCAPS ddcaps; static BOOL CreateDirectDraw(void) diff --git a/include/amvideo.idl b/include/amvideo.idl index 37d06ff..ad92055 100644 --- a/include/amvideo.idl +++ b/include/amvideo.idl @@ -21,7 +21,7 @@ import "objidl.idl"; /* trick widl into thinking that it knows the DirectDraw types * as there is no IDL file for them (yet) */ cpp_quote("#if 0") -typedef void * LPDIRECTDRAW; +typedef void IDirectDraw; typedef void DDSURFACEDESC,DDCAPS; typedef DWORD RGBQUAD; typedef LONGLONG REFERENCE_TIME; @@ -73,8 +73,8 @@ interface IDirectDrawVideo : IUnknown HRESULT GetEmulatedCaps([out] DDCAPS *pCaps); HRESULT GetSurfaceDesc([out] DDSURFACEDESC * pSurfaceDesc); HRESULT GetFourCCCodes([out] DWORD * pCount, [out] DWORD * pCodes); - HRESULT SetDirectDraw([in] LPDIRECTDRAW pDirectDraw); - HRESULT GetDirectDraw([out] LPDIRECTDRAW * ppDirectDraw); + HRESULT SetDirectDraw([in] IDirectDraw *ddraw); + HRESULT GetDirectDraw([out] IDirectDraw **ddraw); HRESULT GetSurfaceType([out] DWORD * pSurfaceType); HRESULT SetDefault(); HRESULT UseScanLine([in] long UseScanLine); diff --git a/include/ddraw.h b/include/ddraw.h index ede7885..8bdb99f 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -1235,7 +1235,7 @@ DECLARE_INTERFACE_(IDirectDrawPalette,IUnknown) /*** IDirectDrawPalette methods ***/ STDMETHOD(GetCaps)(THIS_ LPDWORD lpdwCaps) PURE; STDMETHOD(GetEntries)(THIS_ DWORD dwFlags, DWORD dwBase, DWORD dwNumEntries, LPPALETTEENTRY lpEntries) PURE; - STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, DWORD dwFlags, LPPALETTEENTRY lpDDColorTable) PURE; + STDMETHOD(Initialize)(THIS_ struct IDirectDraw *ddraw, DWORD flags, PALETTEENTRY *color_table) PURE; STDMETHOD(SetEntries)(THIS_ DWORD dwFlags, DWORD dwStartingEntry, DWORD dwCount, LPPALETTEENTRY lpEntries) PURE; }; #undef INTERFACE @@ -1276,7 +1276,7 @@ DECLARE_INTERFACE_(IDirectDrawClipper,IUnknown) /*** IDirectDrawClipper methods ***/ STDMETHOD(GetClipList)(THIS_ LPRECT lpRect, LPRGNDATA lpClipList, LPDWORD lpdwSize) PURE; STDMETHOD(GetHWnd)(THIS_ HWND *lphWnd) PURE; - STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, DWORD dwFlags) PURE; + STDMETHOD(Initialize)(THIS_ struct IDirectDraw *ddraw, DWORD flags) PURE; STDMETHOD(IsClipListChanged)(THIS_ BOOL *lpbChanged) PURE; STDMETHOD(SetClipList)(THIS_ LPRGNDATA lpClipList, DWORD dwFlags) PURE; STDMETHOD(SetHWnd)(THIS_ DWORD dwFlags, HWND hWnd) PURE; @@ -1893,7 +1893,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface,IUnknown) /*50*/ STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE; /*54*/ STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; /*58*/ STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; -/*5c*/ STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, LPDDSURFACEDESC lpDDSurfaceDesc) PURE; +/*5c*/ STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC *surface_desc) PURE; /*60*/ STDMETHOD(IsLost)(THIS) PURE; /*64*/ STDMETHOD(Lock)(THIS_ LPRECT lpDestRect, LPDDSURFACEDESC lpDDSurfaceDesc, DWORD dwFlags, HANDLE hEvent) PURE; /*68*/ STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE; @@ -2027,7 +2027,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface2,IUnknown) STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE; STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; - STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, LPDDSURFACEDESC lpDDSurfaceDesc) PURE; + STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC *surface_desc) PURE; STDMETHOD(IsLost)(THIS) PURE; STDMETHOD(Lock)(THIS_ LPRECT lpDestRect, LPDDSURFACEDESC lpDDSurfaceDesc, DWORD dwFlags, HANDLE hEvent) PURE; STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE; @@ -2173,7 +2173,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface3,IUnknown) STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE; STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC lpDDSurfaceDesc) PURE; - STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, LPDDSURFACEDESC lpDDSurfaceDesc) PURE; + STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC *surface_desc) PURE; STDMETHOD(IsLost)(THIS) PURE; STDMETHOD(Lock)(THIS_ LPRECT lpDestRect, LPDDSURFACEDESC lpDDSurfaceDesc, DWORD dwFlags, HANDLE hEvent) PURE; STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE; @@ -2324,7 +2324,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface4,IUnknown) STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE; STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; - STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; + STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC2 *surface_desc) PURE; STDMETHOD(IsLost)(THIS) PURE; STDMETHOD(Lock)(THIS_ LPRECT lpDestRect, LPDDSURFACEDESC2 lpDDSurfaceDesc, DWORD dwFlags, HANDLE hEvent) PURE; STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE; @@ -2491,7 +2491,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface7,IUnknown) STDMETHOD(GetPalette)(THIS_ IDirectDrawPalette **palette) PURE; STDMETHOD(GetPixelFormat)(THIS_ LPDDPIXELFORMAT lpDDPixelFormat) PURE; STDMETHOD(GetSurfaceDesc)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; - STDMETHOD(Initialize)(THIS_ LPDIRECTDRAW lpDD, LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; + STDMETHOD(Initialize)(THIS_ IDirectDraw *ddraw, DDSURFACEDESC2 *surface_desc) PURE; STDMETHOD(IsLost)(THIS) PURE; STDMETHOD(Lock)(THIS_ LPRECT lpDestRect, LPDDSURFACEDESC2 lpDDSurfaceDesc, DWORD dwFlags, HANDLE hEvent) PURE; STDMETHOD(ReleaseDC)(THIS_ HDC hDC) PURE; @@ -2708,7 +2708,7 @@ DECLARE_INTERFACE_(IDirectDrawGammaControl,IUnknown) #endif -HRESULT WINAPI DirectDrawCreate(GUID*,LPDIRECTDRAW*,IUnknown*); +HRESULT WINAPI DirectDrawCreate(GUID *driver_guid, IDirectDraw **ddraw, IUnknown *outer); HRESULT WINAPI DirectDrawCreateEx(GUID*,LPVOID*,REFIID,IUnknown*); HRESULT WINAPI DirectDrawCreateClipper(DWORD flags, IDirectDrawClipper **clipper, IUnknown *outer);

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3DVERTEXBUFFER7.
by Alexandre Julliard 08 Nov '12

08 Nov '12

Module: wine Branch: master Commit: 98dc4cd43cb674fc09f560f18853316a0f26889c URL: http://source.winehq.org/git/wine.git/?a=commit;h=98dc4cd43cb674fc09f560f18… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 7 21:41:13 2012 +0100 ddraw: Avoid LPDIRECT3DVERTEXBUFFER7. --- dlls/ddraw/tests/d3d.c | 2 +- include/d3d.h | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 147e48c..f1e20fc 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -34,7 +34,7 @@ static LPDIRECT3D7 lpD3D = NULL; static IDirectDrawSurface7 *lpDDS; static IDirectDrawSurface7 *lpDDSdepth; static LPDIRECT3DDEVICE7 lpD3DDevice = NULL; -static LPDIRECT3DVERTEXBUFFER7 lpVBufSrc = NULL; +static IDirect3DVertexBuffer7 *lpVBufSrc; static IDirectDraw *DirectDraw1 = NULL; static IDirectDrawSurface *Surface1 = NULL; diff --git a/include/d3d.h b/include/d3d.h index 64c17c7..d47df27 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -365,7 +365,8 @@ DECLARE_INTERFACE_(IDirect3D7,IUnknown) STDMETHOD(EnumDevices)(THIS_ LPD3DENUMDEVICESCALLBACK7 lpEnumDevicesCallback, LPVOID lpUserArg) PURE; STDMETHOD(CreateDevice)(THIS_ REFCLSID rclsid, IDirectDrawSurface7 *surface, struct IDirect3DDevice7 **device) PURE; - STDMETHOD(CreateVertexBuffer)(THIS_ LPD3DVERTEXBUFFERDESC lpD3DVertBufDesc,LPDIRECT3DVERTEXBUFFER7 *lplpD3DVertBuf,DWORD dwFlags) PURE; + STDMETHOD(CreateVertexBuffer)(THIS_ D3DVERTEXBUFFERDESC *desc, + struct IDirect3DVertexBuffer7 **buffer, DWORD flags) PURE; STDMETHOD(EnumZBufferFormats)(THIS_ REFCLSID riidDevice,LPD3DENUMPIXELFORMATSCALLBACK lpEnumCallback,LPVOID lpContext) PURE; STDMETHOD(EvictManagedTextures)(THIS) PURE; }; @@ -1313,8 +1314,10 @@ DECLARE_INTERFACE_(IDirect3DDevice7,IUnknown) STDMETHOD(GetClipStatus)(THIS_ LPD3DCLIPSTATUS lpD3DClipStatus) PURE; STDMETHOD(DrawPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,DWORD dwFlags) PURE; STDMETHOD(DrawIndexedPrimitiveStrided)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexType,LPD3DDRAWPRIMITIVESTRIDEDDATA lpD3DDrawPrimStrideData,DWORD dwVertexCount,LPWORD lpIndex,DWORD dwIndexCount,DWORD dwFlags) PURE; - STDMETHOD(DrawPrimitiveVB)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,LPDIRECT3DVERTEXBUFFER7 lpD3DVertexBuf,DWORD dwStartVertex,DWORD dwNumVertices,DWORD dwFlags) PURE; - STDMETHOD(DrawIndexedPrimitiveVB)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,LPDIRECT3DVERTEXBUFFER7 lpD3DVertexBuf,DWORD dwStartVertex,DWORD dwNumVertices,LPWORD lpwIndices,DWORD dwIndexCount,DWORD dwFlags) PURE; + STDMETHOD(DrawPrimitiveVB)(THIS_ D3DPRIMITIVETYPE primitive_type, struct IDirect3DVertexBuffer7 *vb, + DWORD start_vertex, DWORD vertex_count, DWORD flags) PURE; + STDMETHOD(DrawIndexedPrimitiveVB)(THIS_ D3DPRIMITIVETYPE primitive_type, struct IDirect3DVertexBuffer7 *vb, + DWORD start_vertex, DWORD vertex_count, WORD *indices, DWORD index_count, DWORD flags) PURE; STDMETHOD(ComputeSphereVisibility)(THIS_ LPD3DVECTOR lpCenters,LPD3DVALUE lpRadii,DWORD dwNumSpheres,DWORD dwFlags,LPDWORD lpdwReturnValues) PURE; STDMETHOD(GetTexture)(THIS_ DWORD stage, IDirectDrawSurface7 **surface) PURE; STDMETHOD(SetTexture)(THIS_ DWORD stage, IDirectDrawSurface7 *surface) PURE; @@ -1499,7 +1502,9 @@ DECLARE_INTERFACE_(IDirect3DVertexBuffer7,IUnknown) /*** IDirect3DVertexBuffer7 methods ***/ STDMETHOD(Lock)(THIS_ DWORD dwFlags,LPVOID *lplpData,LPDWORD lpdwSize) PURE; STDMETHOD(Unlock)(THIS) PURE; - STDMETHOD(ProcessVertices)(THIS_ DWORD dwVertexOp,DWORD dwDestIndex,DWORD dwCount,LPDIRECT3DVERTEXBUFFER7 lpSrcBuffer,DWORD dwSrcIndex,LPDIRECT3DDEVICE7 lpD3DDevice,DWORD dwFlags) PURE; + STDMETHOD(ProcessVertices)(THIS_ DWORD vertex_op, DWORD dst_idx, DWORD count, + IDirect3DVertexBuffer7 *src_buffer, DWORD src_idx, + IDirect3DDevice7 *device, DWORD flags) PURE; STDMETHOD(GetVertexBufferDesc)(THIS_ LPD3DVERTEXBUFFERDESC lpD3DVertexBufferDesc) PURE; STDMETHOD(Optimize)(THIS_ LPDIRECT3DDEVICE7 lpD3DDevice,DWORD dwFlags) PURE; STDMETHOD(ProcessVerticesStrided)(THIS_ DWORD dwVertexOp,DWORD dwDestIndex,DWORD dwCount,LPD3DDRAWPRIMITIVESTRIDEDDATA lpStrideData,DWORD dwVertexTypeDesc,LPDIRECT3DDEVICE7 lpD3DDevice,DWORD dwFlags) PURE;

1 0

Henri Verbeet : wined3d: Use the correct RGTC constant in format_texture_info.
by Alexandre Julliard 08 Nov '12

08 Nov '12

Module: wine Branch: master Commit: b42e02ce9b2979763032d600e1518afccbf4df48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b42e02ce9b2979763032d600e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 7 21:41:14 2012 +0100 wined3d: Use the correct RGTC constant in format_texture_info. --- 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 67cebbe..0624694 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -864,7 +864,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_COMPRESSED, ATI_TEXTURE_COMPRESSION_3DC, NULL}, - {WINED3DFMT_ATI2N, GL_COMPRESSED_RED_GREEN_RGTC2_EXT, GL_COMPRESSED_RED_GREEN_RGTC2_EXT, 0, + {WINED3DFMT_ATI2N, GL_COMPRESSED_RG_RGTC2, GL_COMPRESSED_RG_RGTC2, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_COMPRESSED, ARB_TEXTURE_COMPRESSION_RGTC, NULL},

1 0

Henri Verbeet : wined3d: Introduce a separate function for initializing vs uniform locations.
by Alexandre Julliard 08 Nov '12

08 Nov '12

Module: wine Branch: master Commit: c9f4cfc96a71f543d573e742551e4b08d5be6aae URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9f4cfc96a71f543d573e7425… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 7 21:41:15 2012 +0100 wined3d: Introduce a separate function for initializing vs uniform locations. --- dlls/wined3d/glsl_shader.c | 38 +++++++++++++++++++++++++------------- 1 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 781105b..7e5383b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4696,6 +4696,29 @@ static GLhandleARB find_glsl_vshader(const struct wined3d_context *context, return ret; } +static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info *gl_info, + GLhandleARB program_id, struct glsl_vs_program *vs) +{ + unsigned int i; + char name[32]; + + vs->uniform_f_locations = HeapAlloc(GetProcessHeap(), 0, + sizeof(GLhandleARB) * gl_info->limits.glsl_vs_float_constants); + for (i = 0; i < gl_info->limits.glsl_vs_float_constants; ++i) + { + snprintf(name, sizeof(name), "vs_c[%u]", i); + vs->uniform_f_locations[i] = GL_EXTCALL(glGetUniformLocationARB(program_id, name)); + } + + for (i = 0; i < MAX_CONST_I; ++i) + { + snprintf(name, sizeof(name), "vs_i[%u]", i); + vs->uniform_i_locations[i] = GL_EXTCALL(glGetUniformLocationARB(program_id, name)); + } + + vs->pos_fixup_location = GL_EXTCALL(glGetUniformLocationARB(program_id, "posFixup")); +} + /** Sets the GLSL program ID for the given pixel and vertex shader combination. * It sets the programId on the current StateBlock (because it should be called * inside of the DrawPrimitive() part of the render loop). @@ -4823,18 +4846,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, GL_EXTCALL(glLinkProgramARB(programId)); shader_glsl_validate_link(gl_info, programId); - entry->vs.uniform_f_locations = HeapAlloc(GetProcessHeap(), 0, - sizeof(GLhandleARB) * gl_info->limits.glsl_vs_float_constants); - for (i = 0; i < gl_info->limits.glsl_vs_float_constants; ++i) - { - snprintf(glsl_name, sizeof(glsl_name), "vs_c[%u]", i); - entry->vs.uniform_f_locations[i] = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name)); - } - for (i = 0; i < MAX_CONST_I; ++i) - { - snprintf(glsl_name, sizeof(glsl_name), "vs_i[%u]", i); - entry->vs.uniform_i_locations[i] = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name)); - } + shader_glsl_init_vs_uniform_locations(gl_info, programId, &entry->vs); + entry->ps.uniform_f_locations = HeapAlloc(GetProcessHeap(), 0, sizeof(GLhandleARB) * gl_info->limits.glsl_ps_float_constants); for (i = 0; i < gl_info->limits.glsl_ps_float_constants; ++i) @@ -4871,7 +4884,6 @@ static void set_glsl_shader_program(const struct wined3d_context *context, } } - entry->vs.pos_fixup_location = GL_EXTCALL(glGetUniformLocationARB(programId, "posFixup")); entry->ps.ycorrection_location = GL_EXTCALL(glGetUniformLocationARB(programId, "ycorrection")); checkGLcall("Find glsl program uniform locations");

1 0

Hans Leidekker : msi: Remove a component regardless of its install state, unless it's a permanent component.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: 26299647f7eb6bcb8ffde301d620051575ca854d URL: http://source.winehq.org/git/wine.git/?a=commit;h=26299647f7eb6bcb8ffde301d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 7 15:55:48 2012 +0100 msi: Remove a component regardless of its install state, unless it's a permanent component. --- dlls/msi/action.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index f338f25..88de118 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1982,8 +1982,7 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) continue; } TRACE("nobody wants component %s\n", debugstr_w(component->Component)); - if (component->anyAbsent && - (component->Installed == INSTALLSTATE_LOCAL || component->Installed == INSTALLSTATE_SOURCE)) + if (component->anyAbsent && component->ComponentId) { component->Action = INSTALLSTATE_ABSENT; component->ActionRequest = INSTALLSTATE_ABSENT;

1 0

Hans Leidekker : msi: Make sure either the REINSTALL or the REMOVE property is set when the product is already installed .
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: e2900c23c7f0b143078da780c9a0ff19a895bf45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2900c23c7f0b143078da780c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 7 15:56:14 2012 +0100 msi: Make sure either the REINSTALL or the REMOVE property is set when the product is already installed. --- dlls/msi/action.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 88de118..a180399 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7720,7 +7720,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, static const WCHAR szDisableRollback[] = {'D','I','S','A','B','L','E','R','O','L','L','B','A','C','K',0}; static const WCHAR szAction[] = {'A','C','T','I','O','N',0}; static const WCHAR szInstall[] = {'I','N','S','T','A','L','L',0}; - WCHAR *reinstall = NULL; + WCHAR *reinstall, *remove; BOOL ui_exists; UINT rc; @@ -7771,9 +7771,11 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, msi_apply_transforms( package ); msi_apply_patches( package ); - if (!szCommandLine && msi_get_property_int( package->db, szInstalled, 0 )) + remove = msi_dup_property( package->db, szRemove ); + reinstall = msi_dup_property( package->db, szReinstall ); + if (msi_get_property_int( package->db, szInstalled, 0 ) && !remove && !reinstall) { - TRACE("setting reinstall property\n"); + TRACE("setting REINSTALL property to ALL\n"); msi_set_property( package->db, szReinstall, szAll, -1 ); } @@ -7825,12 +7827,13 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, /* finish up running custom actions */ ACTION_FinishCustomActions(package); - if (package->need_rollback && !(reinstall = msi_dup_property( package->db, szReinstall ))) + if (package->need_rollback && !reinstall) { WARN("installation failed, running rollback script\n"); execute_script( package, SCRIPT_ROLLBACK ); } msi_free( reinstall ); + msi_free( remove ); if (rc == ERROR_SUCCESS && package->need_reboot_at_end) return ERROR_SUCCESS_REBOOT_REQUIRED;

1 0