July 2011 - Wine-commits - list.winehq.org

Frédéric Delanoy : msi: Remove dead assignment ( Clang).
by Alexandre Julliard 06 Jul '11

06 Jul '11

Module: wine Branch: master Commit: 99e422c9756ef96feb835a4b44c083c103cdb614 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99e422c9756ef96feb835a4b4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 6 10:34:47 2011 +0200 msi: Remove dead assignment (Clang). --- dlls/msi/database.c | 6 ++---- dlls/msi/registry.c | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 2c45a7a..ff9ac81 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -1519,7 +1519,7 @@ static LPWSTR create_diff_row_query(MSIDATABASE *merge, MSIQUERY *view, LPWSTR table, MSIRECORD *rec) { LPWSTR query = NULL, clause = NULL; - LPWSTR ptr = NULL, val; + LPWSTR val; LPCWSTR setptr; DWORD size = 1, oldsize; LPCWSTR key; @@ -1542,7 +1542,6 @@ static LPWSTR create_diff_row_query(MSIDATABASE *merge, MSIQUERY *view, if (!clause) goto done; - ptr = clause; count = MSI_RecordGetFieldCount(keys); for (i = 1; i <= count; i++) { @@ -1563,8 +1562,7 @@ static LPWSTR create_diff_row_query(MSIDATABASE *merge, MSIQUERY *view, goto done; } - ptr = clause + oldsize - 1; - sprintfW(ptr, setptr, key, val); + sprintfW(clause + oldsize - 1, setptr, key, val); msi_free(val); } diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 353cb6d..e5d2c51 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1769,7 +1769,6 @@ static UINT msi_check_product_patches(LPCWSTR prodcode, LPCWSTR usersid, if (res != ERROR_SUCCESS) goto done; - ptr = patches; for (ptr = patches; *ptr && r == ERROR_NO_MORE_ITEMS; ptr += lstrlenW(ptr) + 1) { if (!unsquash_guid(ptr, patch))

1 0

Alexandre Julliard : winex11: Set the reported screen bpp based on the available pixmap formats.
by Alexandre Julliard 06 Jul '11

06 Jul '11

Module: wine Branch: master Commit: 2e4b0b1ef42dbf662d69c4e07b3ce0ecc9ef103d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e4b0b1ef42dbf662d69c4e07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 6 12:38:31 2011 +0200 winex11: Set the reported screen bpp based on the available pixmap formats. --- dlls/winex11.drv/dib.c | 4 ++-- dlls/winex11.drv/init.c | 4 +--- dlls/winex11.drv/x11drv.h | 3 +-- dlls/winex11.drv/x11drv_main.c | 38 ++++++++++++++------------------------ 4 files changed, 18 insertions(+), 31 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index c7758e6..226c416 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -5053,7 +5053,7 @@ HGLOBAL X11DRV_DIB_CreateDIBFromPixmap(Pixmap pixmap, HDC hdc) if (!XGetGeometry(gdi_display, pixmap, &root, &x, &y, &width, &height, &border_width, &depth)) depth = 0; wine_tsx11_unlock(); - if (!depth) return 0; + if (!pixmap_formats[depth]) return 0; TRACE("\tPixmap properties: width=%d, height=%d, depth=%d\n", width, height, depth); @@ -5062,7 +5062,7 @@ HGLOBAL X11DRV_DIB_CreateDIBFromPixmap(Pixmap pixmap, HDC hdc) * Create an HBITMAP with the same dimensions and BPP as the pixmap, * and make it a container for the pixmap passed. */ - if (!(hBmp = CreateBitmap( width, height, 1, depth_to_bpp(depth), NULL ))) return 0; + if (!(hBmp = CreateBitmap( width, height, 1, pixmap_formats[depth]->bits_per_pixel, NULL ))) return 0; /* force bitmap to be owned by a screen DC */ hdcMem = CreateCompatibleDC( hdc ); diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 8de1dd6..b9c1c1c 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -240,10 +240,8 @@ INT CDECL X11DRV_GetDeviceCaps( X11DRV_PDEVICE *physDev, INT cap ) * BITSPIXEL: 8 -> COLORRES: 18 * BITSPIXEL: 16 -> COLORRES: 16 * BITSPIXEL: 24 -> COLORRES: 24 - * (note that depth_to_bpp never chooses a bpp of 24) * BITSPIXEL: 32 -> COLORRES: 24 */ - return (screen_bpp <= 8) ? 18 : - (screen_bpp == 32) ? 24 : screen_bpp; + return (screen_bpp <= 8) ? 18 : min( 24, screen_bpp ); case RASTERCAPS: return (RC_BITBLT | RC_BANDING | RC_SCALING | RC_BITMAP64 | RC_DI_BITMAP | RC_DIBTODEV | RC_BIGFONT | RC_STRETCHBLT | RC_STRETCHDIB | RC_DEVBITS | diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 5a5d109..c4125ec 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -503,8 +503,6 @@ extern COLORREF X11DRV_PALETTE_GetColor( X11DRV_PDEVICE *physDev, COLORREF color extern int X11DRV_PALETTE_LookupPixel(ColorShifts *shifts, COLORREF color) DECLSPEC_HIDDEN; extern void X11DRV_PALETTE_ComputeColorShifts(ColorShifts *shifts, unsigned long redMask, unsigned long greenMask, unsigned long blueMask) DECLSPEC_HIDDEN; -extern unsigned int depth_to_bpp( unsigned int depth ) DECLSPEC_HIDDEN; - /* GDI escapes */ #define X11DRV_ESCAPE 6789 @@ -589,6 +587,7 @@ static inline size_t get_property_size( int format, unsigned long count ) } extern Visual *visual DECLSPEC_HIDDEN; +extern XPixmapFormatValues **pixmap_formats DECLSPEC_HIDDEN; extern Window root_window DECLSPEC_HIDDEN; extern int clipping_cursor DECLSPEC_HIDDEN; extern unsigned int screen_width DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 9b01829..8e2082d 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -69,6 +69,7 @@ static CRITICAL_SECTION X11DRV_CritSection = { &critsect_debug, -1, 0, 0, 0, 0 } static Screen *screen; Visual *visual; +XPixmapFormatValues **pixmap_formats; unsigned int screen_width; unsigned int screen_height; unsigned int screen_bpp; @@ -324,33 +325,21 @@ void CDECL wine_tsx11_unlock(void) /*********************************************************************** - * depth_to_bpp - * - * Convert X11-reported depth to the BPP value that Windows apps expect to see. + * init_pixmap_formats */ -unsigned int depth_to_bpp( unsigned int depth ) +static void init_pixmap_formats( Display *display ) { - switch (depth) + int i, count, max = 32; + XPixmapFormatValues *formats = XListPixmapFormats( display, &count ); + + for (i = 0; i < count; i++) { - case 1: - case 8: - return depth; - case 15: - case 16: - return 16; - case 24: - /* This is not necessarily right. X11 always has 24 bits per pixel, but it can run - * with 24 bit framebuffers and 32 bit framebuffers. It doesn't make any difference - * for windowing, but gl applications can get visuals with alpha channels. So we - * should check the framebuffer and/or opengl formats available to find out what the - * framebuffer actually does - */ - case 32: - return 32; - default: - FIXME( "Unexpected X11 depth %d bpp, what to report to app?\n", depth ); - return depth; + TRACE( "depth %u, bpp %u, pad %u\n", + formats[i].depth, formats[i].bits_per_pixel, formats[i].scanline_pad ); + if (formats[i].depth > max) max = formats[i].depth; } + pixmap_formats = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pixmap_formats) * (max + 1) ); + for (i = 0; i < count; i++) pixmap_formats[formats[i].depth] = &formats[i]; } @@ -579,7 +568,8 @@ static BOOL process_attach(void) } } if (!screen_depth) screen_depth = DefaultDepthOfScreen( screen ); - screen_bpp = depth_to_bpp( screen_depth ); + init_pixmap_formats( display ); + screen_bpp = pixmap_formats[screen_depth]->bits_per_pixel; XInternAtoms( display, (char **)atom_names, NB_XATOMS - FIRST_XATOM, False, X11DRV_Atoms );

1 0

Charles Welton : d3dx9: Implement Begin and End methods.
by Alexandre Julliard 06 Jul '11

06 Jul '11

Module: wine Branch: master Commit: 8ce0495359b4eca7f894a4aa3fcb8bf32ea70fef URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ce0495359b4eca7f894a4aa3… Author: Charles Welton <charleswfb(a)gmail.com> Date: Wed Jun 29 19:08:20 2011 -0300 d3dx9: Implement Begin and End methods. --- dlls/d3dx9_36/line.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 69 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/line.c b/dlls/d3dx9_36/line.c index cf49642..2a9d6e9 100644 --- a/dlls/d3dx9_36/line.c +++ b/dlls/d3dx9_36/line.c @@ -29,6 +29,7 @@ typedef struct ID3DXLineImpl { LONG ref; IDirect3DDevice9 *device; + IDirect3DStateBlock9 *state; } ID3DXLineImpl; static inline ID3DXLineImpl *impl_from_ID3DXLine(ID3DXLine *iface) @@ -100,9 +101,62 @@ static HRESULT WINAPI ID3DXLineImpl_Begin(ID3DXLine* iface) { ID3DXLineImpl *This = impl_from_ID3DXLine(iface); - FIXME("(%p)->(): stub\n", This); + HRESULT hr; + D3DXMATRIX identity, projection; + D3DVIEWPORT9 vp; - return E_NOTIMPL; + TRACE ("(%p)->()\n", This); + + if (This->state != NULL) /* We already began. Return error. */ + return D3DERR_INVALIDCALL; + + hr = IDirect3DDevice9_CreateStateBlock(This->device, D3DSBT_ALL, &This->state); + if (FAILED(hr)) return D3DXERR_INVALIDDATA; + + hr = IDirect3DDevice9_GetViewport(This->device, &vp); + if (FAILED(hr)) goto failed; + + D3DXMatrixIdentity(&identity); + D3DXMatrixOrthoOffCenterLH(&projection, + 0.0, vp.Width, /* Min and max x */ + vp.Height, 0.0, /* Min and max y. Screen y is on top so this is inverted */ + 0.0, 1.0); /* Min and max z */ + + hr = IDirect3DDevice9_SetTransform(This->device, D3DTS_WORLD, &identity); + if (FAILED(hr)) goto failed; + + hr = IDirect3DDevice9_SetTransform(This->device, D3DTS_VIEW, &identity); + if (FAILED(hr)) goto failed; + + hr = IDirect3DDevice9_SetTransform(This->device, D3DTS_PROJECTION, &projection); + if (FAILED(hr)) goto failed; + + /* Windows sets similar states so we do the same */ + + hr = IDirect3DDevice9_SetRenderState(This->device, D3DRS_LIGHTING, FALSE); + if (FAILED(hr)) goto failed; + + hr = IDirect3DDevice9_SetRenderState(This->device, D3DRS_FOGENABLE, FALSE); + if (FAILED(hr)) goto failed; + + hr = IDirect3DDevice9_SetRenderState(This->device, D3DRS_SHADEMODE, D3DSHADE_FLAT); + if (FAILED(hr)) goto failed; + + hr = IDirect3DDevice9_SetRenderState(This->device, D3DRS_ALPHABLENDENABLE, TRUE); + if (FAILED(hr)) goto failed; + + hr = IDirect3DDevice9_SetRenderState(This->device, D3DRS_SRCBLEND, D3DBLEND_SRCALPHA); + if (FAILED(hr)) goto failed; + + hr = IDirect3DDevice9_SetRenderState(This->device, D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA); + if (FAILED(hr)) goto failed; + + return D3D_OK; +failed: + IDirect3DStateBlock9_Apply(This->state); + IDirect3DStateBlock9_Release(This->state); + This->state = NULL; + return D3DXERR_INVALIDDATA; } static HRESULT WINAPI ID3DXLineImpl_Draw(ID3DXLine* iface, CONST D3DXVECTOR2* vertexlist, DWORD vertexlistcount, D3DCOLOR color) @@ -218,9 +272,19 @@ static HRESULT WINAPI ID3DXLineImpl_End(ID3DXLine* iface) { ID3DXLineImpl *This = impl_from_ID3DXLine(iface); - FIXME("(%p)->(): stub\n", This); + HRESULT hr; - return E_NOTIMPL; + TRACE ("(%p)->()\n", This); + + if (This->state == NULL) /* We haven't begun yet. */ + return D3DERR_INVALIDCALL; + + hr = IDirect3DStateBlock9_Apply(This->state); + IDirect3DStateBlock9_Release(This->state); + This->state = NULL; + + if (FAILED(hr)) return D3DXERR_INVALIDDATA; + else return D3D_OK; } static HRESULT WINAPI ID3DXLineImpl_OnLostDevice(ID3DXLine* iface) @@ -285,6 +349,7 @@ HRESULT WINAPI D3DXCreateLine(LPDIRECT3DDEVICE9 device, LPD3DXLINE* line) object->ID3DXLine_iface.lpVtbl = &ID3DXLine_Vtbl; object->ref = 1; object->device = device; + object->state = NULL; /* We only initialize it on Begin */ IDirect3DDevice9_AddRef(device); *line = &object->ID3DXLine_iface;

1 0

Charles Welton : d3dx9: Implemented tests for ID3DXLine' s Begin and End methods.
by Alexandre Julliard 06 Jul '11

06 Jul '11

Module: wine Branch: master Commit: 84c50bdd3370da6fb7b5082cd3f6f536a221a7a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84c50bdd3370da6fb7b5082cd… Author: Charles Welton <charleswfb(a)gmail.com> Date: Wed Jun 29 19:08:38 2011 -0300 d3dx9: Implemented tests for ID3DXLine's Begin and End methods. --- dlls/d3dx9_36/tests/line.c | 62 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/line.c b/dlls/d3dx9_36/tests/line.c index 7523e1f..e03fce5 100644 --- a/dlls/d3dx9_36/tests/line.c +++ b/dlls/d3dx9_36/tests/line.c @@ -19,13 +19,54 @@ #include "wine/test.h" #include "d3dx9.h" +#define admitted_error 0.0001f + +#define relative_error(exp, out) ((exp == 0.0f) ? fabs(exp - out) : (fabs(1.0f - out/ exp) )) + +static inline BOOL compare_matrix(const D3DXMATRIX *m1, const D3DXMATRIX *m2) +{ + int i, j; + + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + if (relative_error(U(*m1).m[i][j], U(*m2).m[i][j]) > admitted_error) + return FALSE; + } + } + + return TRUE; +} + +#define expect_mat(expectedmat, gotmat) \ +do { \ + const D3DXMATRIX *__m1 = (expectedmat); \ + const D3DXMATRIX *__m2 = (gotmat); \ + ok(compare_matrix(__m1, __m2), "Expected matrix=\n(%f,%f,%f,%f\n %f,%f,%f,%f\n %f,%f,%f,%f\n %f,%f,%f,%f\n)\n\n" \ + "Got matrix=\n(%f,%f,%f,%f\n %f,%f,%f,%f\n %f,%f,%f,%f\n %f,%f,%f,%f)\n", \ + U(*__m1).m[0][0], U(*__m1).m[0][1], U(*__m1).m[0][2], U(*__m1).m[0][3], \ + U(*__m1).m[1][0], U(*__m1).m[1][1], U(*__m1).m[1][2], U(*__m1).m[1][3], \ + U(*__m1).m[2][0], U(*__m1).m[2][1], U(*__m1).m[2][2], U(*__m1).m[2][3], \ + U(*__m1).m[3][0], U(*__m1).m[3][1], U(*__m1).m[3][2], U(*__m1).m[3][3], \ + U(*__m2).m[0][0], U(*__m2).m[0][1], U(*__m2).m[0][2], U(*__m2).m[0][3], \ + U(*__m2).m[1][0], U(*__m2).m[1][1], U(*__m2).m[1][2], U(*__m2).m[1][3], \ + U(*__m2).m[2][0], U(*__m2).m[2][1], U(*__m2).m[2][2], U(*__m2).m[2][3], \ + U(*__m2).m[3][0], U(*__m2).m[3][1], U(*__m2).m[3][2], U(*__m2).m[3][3]); \ +} while(0) + static void test_create_line(IDirect3DDevice9* device) { HRESULT hr; LPD3DXLINE line = NULL; LPDIRECT3DDEVICE9 return_device; + D3DXMATRIX world, identity, result; + FLOAT r11, r12, r13, r14; ULONG ref; + /* Arbitrary values for matrix tests. */ + r11 = 0.1421; r12 = 0.2114; r13 = 0.8027; r14 = 0.4587; + hr = D3DXCreateLine(NULL, &line); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3D_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); @@ -47,6 +88,27 @@ static void test_create_line(IDirect3DDevice9* device) ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); ok(return_device == device, "Expected line device %p, got %p\n", device, return_device); + D3DXMatrixIdentity(&world); + D3DXMatrixIdentity(&identity); + world._11 = r11; world._12 = r12; world._13 = r13; world._14 = r14; + + hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &world); + ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); + + hr = ID3DXLine_Begin(line); + ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); + + hr = IDirect3DDevice9_GetTransform(device, D3DTS_WORLD, &result); + ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); + expect_mat(&identity, &result); + + hr = ID3DXLine_End(line); + ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); + + hr = IDirect3DDevice9_GetTransform(device, D3DTS_WORLD, &result); + ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); + expect_mat(&world, &result); + ref = IDirect3DDevice9_Release(return_device); ok(ref == 2, "Got %x references to device %p, expected 2\n", ref, return_device);

1 0

Alistair Leslie-Hughes : oleaut32: COM Cleanup ICreateTypeLib2Imp.
by Alexandre Julliard 06 Jul '11

06 Jul '11

Module: wine Branch: master Commit: 1bd8d40675d078834724d4a8291bde179e65b7ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd8d40675d078834724d4a82… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 27 22:24:09 2011 +1000 oleaut32: COM Cleanup ICreateTypeLib2Imp. --- dlls/oleaut32/typelib2.c | 91 ++++++++++++++++++++++++---------------------- 1 files changed, 48 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1bd8d40675d078834724d…

1 0

Michael Stefaniuc : d3d9: Use unsafe_impl_from_IDirect3DVertexShader9 for an app provided iface.
by Alexandre Julliard 06 Jul '11

06 Jul '11

Module: wine Branch: master Commit: f12cbfb509a830f713ae145248fc9a379ffea903 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f12cbfb509a830f713ae14524… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 6 13:20:37 2011 +0200 d3d9: Use unsafe_impl_from_IDirect3DVertexShader9 for an app provided iface. --- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/device.c | 3 ++- dlls/d3d9/shader.c | 14 ++++++++++++++ 3 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index db059bf..78e497f 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -416,6 +416,7 @@ typedef struct IDirect3DVertexShader9Impl { HRESULT vertexshader_init(IDirect3DVertexShader9Impl *shader, IDirect3DDevice9Impl *device, const DWORD *byte_code) DECLSPEC_HIDDEN; +IDirect3DVertexShader9Impl *unsafe_impl_from_IDirect3DVertexShader9(IDirect3DVertexShader9 *iface) DECLSPEC_HIDDEN; #define D3D9_MAX_VERTEX_SHADER_CONSTANTF 256 #define D3D9_MAX_SIMULTANEOUS_RENDERTARGETS 4 diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ed5abd4..46f71ca 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2298,13 +2298,14 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShader(IDirect3DDevice9Ex *i IDirect3DVertexShader9 *shader) { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); + IDirect3DVertexShader9Impl *shader_obj = unsafe_impl_from_IDirect3DVertexShader9(shader); HRESULT hr; TRACE("iface %p, shader %p.\n", iface, shader); wined3d_mutex_lock(); hr = wined3d_device_set_vertex_shader(This->wined3d_device, - shader ? ((IDirect3DVertexShader9Impl *)shader)->wined3d_shader : NULL); + shader_obj ? shader_obj->wined3d_shader : NULL); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/shader.c b/dlls/d3d9/shader.c index 31ccfaa..a063b0c 100644 --- a/dlls/d3d9/shader.c +++ b/dlls/d3d9/shader.c @@ -23,6 +23,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); +static inline IDirect3DVertexShader9Impl *impl_from_IDirect3DVertexShader9(IDirect3DVertexShader9 *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DVertexShader9Impl, lpVtbl); +} + static HRESULT WINAPI d3d9_vertexshader_QueryInterface(IDirect3DVertexShader9 *iface, REFIID riid, void **object) { TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); @@ -151,6 +156,15 @@ HRESULT vertexshader_init(IDirect3DVertexShader9Impl *shader, IDirect3DDevice9Im return D3D_OK; } +IDirect3DVertexShader9Impl *unsafe_impl_from_IDirect3DVertexShader9(IDirect3DVertexShader9 *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d9_vertexshader_vtbl); + + return impl_from_IDirect3DVertexShader9(iface); +} + static inline IDirect3DPixelShader9Impl *impl_from_IDirect3DPixelShader9(IDirect3DPixelShader9 *iface) { return CONTAINING_RECORD(iface, IDirect3DPixelShader9Impl, IDirect3DPixelShader9_iface);

1 0

Michael Stefaniuc : d3d9: COM cleanup for the IDirect3DVertexShader9 iface.
by Alexandre Julliard 06 Jul '11

06 Jul '11

Module: wine Branch: master Commit: bb4f75059214a8b002b629a9ea471ca2a56ec36a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb4f75059214a8b002b629a9e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 6 13:23:44 2011 +0200 d3d9: COM cleanup for the IDirect3DVertexShader9 iface. --- dlls/d3d9/d3d9_private.h | 3 +-- dlls/d3d9/device.c | 2 +- dlls/d3d9/shader.c | 15 +++++++++------ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 78e497f..7cd11ee 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -407,8 +407,7 @@ HRESULT vertexdeclaration_init(IDirect3DVertexDeclaration9Impl *declaration, * IDirect3DVertexShader implementation structure */ typedef struct IDirect3DVertexShader9Impl { - /* IUnknown fields */ - const IDirect3DVertexShader9Vtbl *lpVtbl; + IDirect3DVertexShader9 IDirect3DVertexShader9_iface; LONG ref; struct wined3d_shader *wined3d_shader; IDirect3DDevice9Ex *parentDevice; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 46f71ca..8646eb2 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2289,7 +2289,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexShader(IDirect3DDevice9Ex } TRACE("Created vertex shader %p.\n", object); - *shader = (IDirect3DVertexShader9 *)object; + *shader = &object->IDirect3DVertexShader9_iface; return D3D_OK; } diff --git a/dlls/d3d9/shader.c b/dlls/d3d9/shader.c index a063b0c..7da93c0 100644 --- a/dlls/d3d9/shader.c +++ b/dlls/d3d9/shader.c @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static inline IDirect3DVertexShader9Impl *impl_from_IDirect3DVertexShader9(IDirect3DVertexShader9 *iface) { - return CONTAINING_RECORD(iface, IDirect3DVertexShader9Impl, lpVtbl); + return CONTAINING_RECORD(iface, IDirect3DVertexShader9Impl, IDirect3DVertexShader9_iface); } static HRESULT WINAPI d3d9_vertexshader_QueryInterface(IDirect3DVertexShader9 *iface, REFIID riid, void **object) @@ -48,7 +48,7 @@ static HRESULT WINAPI d3d9_vertexshader_QueryInterface(IDirect3DVertexShader9 *i static ULONG WINAPI d3d9_vertexshader_AddRef(IDirect3DVertexShader9 *iface) { - IDirect3DVertexShader9Impl *shader = (IDirect3DVertexShader9Impl *)iface; + IDirect3DVertexShader9Impl *shader = impl_from_IDirect3DVertexShader9(iface); ULONG refcount = InterlockedIncrement(&shader->ref); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -66,7 +66,7 @@ static ULONG WINAPI d3d9_vertexshader_AddRef(IDirect3DVertexShader9 *iface) static ULONG WINAPI d3d9_vertexshader_Release(IDirect3DVertexShader9 *iface) { - IDirect3DVertexShader9Impl *shader = (IDirect3DVertexShader9Impl *)iface; + IDirect3DVertexShader9Impl *shader = impl_from_IDirect3DVertexShader9(iface); ULONG refcount = InterlockedDecrement(&shader->ref); TRACE("%p decreasing refcount to %u.\n", iface, refcount); @@ -88,9 +88,11 @@ static ULONG WINAPI d3d9_vertexshader_Release(IDirect3DVertexShader9 *iface) static HRESULT WINAPI d3d9_vertexshader_GetDevice(IDirect3DVertexShader9 *iface, IDirect3DDevice9 **device) { + IDirect3DVertexShader9Impl *shader = impl_from_IDirect3DVertexShader9(iface); + TRACE("iface %p, device %p.\n", iface, device); - *device = (IDirect3DDevice9 *)((IDirect3DVertexShader9Impl *)iface)->parentDevice; + *device = (IDirect3DDevice9 *)shader->parentDevice; IDirect3DDevice9_AddRef(*device); TRACE("Returning device %p.\n", *device); @@ -101,12 +103,13 @@ static HRESULT WINAPI d3d9_vertexshader_GetDevice(IDirect3DVertexShader9 *iface, static HRESULT WINAPI d3d9_vertexshader_GetFunction(IDirect3DVertexShader9 *iface, void *data, UINT *data_size) { + IDirect3DVertexShader9Impl *shader = impl_from_IDirect3DVertexShader9(iface); HRESULT hr; TRACE("iface %p, data %p, data_size %p.\n", iface, data, data_size); wined3d_mutex_lock(); - hr = wined3d_shader_get_byte_code(((IDirect3DVertexShader9Impl *)iface)->wined3d_shader, data, data_size); + hr = wined3d_shader_get_byte_code(shader->wined3d_shader, data, data_size); wined3d_mutex_unlock(); return hr; @@ -138,7 +141,7 @@ HRESULT vertexshader_init(IDirect3DVertexShader9Impl *shader, IDirect3DDevice9Im HRESULT hr; shader->ref = 1; - shader->lpVtbl = &d3d9_vertexshader_vtbl; + shader->IDirect3DVertexShader9_iface.lpVtbl = &d3d9_vertexshader_vtbl; wined3d_mutex_lock(); hr = wined3d_shader_create_vs(device->wined3d_device, byte_code, NULL,

1 0

Michael Stefaniuc : d3d9: Use unsafe_impl_from_IDirect3DVertexBuffer9 for app provided ifaces.
by Alexandre Julliard 06 Jul '11

06 Jul '11

Module: wine Branch: master Commit: 2b3a364e9a804c8217720d2b8a43c3cc5eea0457 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b3a364e9a804c8217720d2b8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 6 13:27:01 2011 +0200 d3d9: Use unsafe_impl_from_IDirect3DVertexBuffer9 for app provided ifaces. --- dlls/d3d9/buffer.c | 9 +++++++++ dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/device.c | 5 +++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 6e91b00..11fdab4 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -300,6 +300,15 @@ HRESULT vertexbuffer_init(IDirect3DVertexBuffer9Impl *buffer, IDirect3DDevice9Im return D3D_OK; } +IDirect3DVertexBuffer9Impl *unsafe_impl_from_IDirect3DVertexBuffer9(IDirect3DVertexBuffer9 *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d9_vertexbuffer_vtbl); + + return impl_from_IDirect3DVertexBuffer9(iface); +} + static inline IDirect3DIndexBuffer9Impl *impl_from_IDirect3DIndexBuffer9(IDirect3DIndexBuffer9 *iface) { return CONTAINING_RECORD(iface, IDirect3DIndexBuffer9Impl, IDirect3DIndexBuffer9_iface); diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 7cd11ee..9cb33c8 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -262,6 +262,7 @@ typedef struct IDirect3DVertexBuffer9Impl HRESULT vertexbuffer_init(IDirect3DVertexBuffer9Impl *buffer, IDirect3DDevice9Impl *device, UINT size, UINT usage, DWORD fvf, D3DPOOL pool) DECLSPEC_HIDDEN; +IDirect3DVertexBuffer9Impl *unsafe_impl_from_IDirect3DVertexBuffer9(IDirect3DVertexBuffer9 *iface) DECLSPEC_HIDDEN; /* --------------------- */ /* IDirect3DIndexBuffer9 */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8646eb2..924d43e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2049,9 +2049,9 @@ static HRESULT WINAPI IDirect3DDevice9Impl_ProcessVertices(IDirect3DDevice9Ex *i IDirect3DVertexDeclaration9 *pVertexDecl, DWORD Flags) { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); + IDirect3DVertexBuffer9Impl *dest = unsafe_impl_from_IDirect3DVertexBuffer9(pDestBuffer); IDirect3DVertexDeclaration9Impl *Decl = (IDirect3DVertexDeclaration9Impl *) pVertexDecl; HRESULT hr; - IDirect3DVertexBuffer9Impl *dest = (IDirect3DVertexBuffer9Impl *) pDestBuffer; TRACE("iface %p, src_start_idx %u, dst_idx %u, vertex_count %u, dst_buffer %p, declaration %p, flags %#x.\n", iface, SrcStartIndex, DestIndex, VertexCount, pDestBuffer, pVertexDecl, Flags); @@ -2446,6 +2446,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetStreamSource(IDirect3DDevice9Ex *i UINT StreamNumber, IDirect3DVertexBuffer9 *pStreamData, UINT OffsetInBytes, UINT Stride) { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); + IDirect3DVertexBuffer9Impl *streamdata = unsafe_impl_from_IDirect3DVertexBuffer9(pStreamData); HRESULT hr; TRACE("iface %p, stream_idx %u, buffer %p, offset %u, stride %u.\n", @@ -2453,7 +2454,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetStreamSource(IDirect3DDevice9Ex *i wined3d_mutex_lock(); hr = wined3d_device_set_stream_source(This->wined3d_device, StreamNumber, - pStreamData ? ((IDirect3DVertexBuffer9Impl *)pStreamData)->wineD3DVertexBuffer : NULL, + streamdata ? streamdata->wineD3DVertexBuffer : NULL, OffsetInBytes, Stride); wined3d_mutex_unlock();

1 0

Michael Stefaniuc : d3d9: COM cleanup for the IDirect3DVertexBuffer9 iface.
by Alexandre Julliard 06 Jul '11

06 Jul '11

Module: wine Branch: master Commit: 17eccaffbfa2d0be1b7c0f3d91cf14761366876d URL: http://source.winehq.org/git/wine.git/?a=commit;h=17eccaffbfa2d0be1b7c0f3d9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 6 13:29:02 2011 +0200 d3d9: COM cleanup for the IDirect3DVertexBuffer9 iface. --- dlls/d3d9/buffer.c | 42 ++++++++++++++++++++++++++---------------- dlls/d3d9/d3d9_private.h | 6 ++---- dlls/d3d9/device.c | 2 +- 3 files changed, 29 insertions(+), 21 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 11fdab4..84ee9a1 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static inline IDirect3DVertexBuffer9Impl *impl_from_IDirect3DVertexBuffer9(IDirect3DVertexBuffer9 *iface) { - return CONTAINING_RECORD(iface, IDirect3DVertexBuffer9Impl, lpVtbl); + return CONTAINING_RECORD(iface, IDirect3DVertexBuffer9Impl, IDirect3DVertexBuffer9_iface); } static HRESULT WINAPI d3d9_vertexbuffer_QueryInterface(IDirect3DVertexBuffer9 *iface, REFIID riid, void **object) @@ -50,7 +50,7 @@ static HRESULT WINAPI d3d9_vertexbuffer_QueryInterface(IDirect3DVertexBuffer9 *i static ULONG WINAPI d3d9_vertexbuffer_AddRef(IDirect3DVertexBuffer9 *iface) { - IDirect3DVertexBuffer9Impl *buffer = (IDirect3DVertexBuffer9Impl *)iface; + IDirect3DVertexBuffer9Impl *buffer = impl_from_IDirect3DVertexBuffer9(iface); ULONG refcount = InterlockedIncrement(&buffer->ref); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -68,7 +68,7 @@ static ULONG WINAPI d3d9_vertexbuffer_AddRef(IDirect3DVertexBuffer9 *iface) static ULONG WINAPI d3d9_vertexbuffer_Release(IDirect3DVertexBuffer9 *iface) { - IDirect3DVertexBuffer9Impl *buffer = (IDirect3DVertexBuffer9Impl *)iface; + IDirect3DVertexBuffer9Impl *buffer = impl_from_IDirect3DVertexBuffer9(iface); ULONG refcount = InterlockedDecrement(&buffer->ref); TRACE("%p decreasing refcount to %u.\n", iface, refcount); @@ -88,11 +88,14 @@ static ULONG WINAPI d3d9_vertexbuffer_Release(IDirect3DVertexBuffer9 *iface) return refcount; } -static HRESULT WINAPI d3d9_vertexbuffer_GetDevice(IDirect3DVertexBuffer9 *iface, IDirect3DDevice9 **device) +static HRESULT WINAPI d3d9_vertexbuffer_GetDevice(IDirect3DVertexBuffer9 *iface, + IDirect3DDevice9 **device) { + IDirect3DVertexBuffer9Impl *buffer = impl_from_IDirect3DVertexBuffer9(iface); + TRACE("iface %p, device %p.\n", iface, device); - *device = (IDirect3DDevice9 *)((IDirect3DVertexBuffer9Impl *)iface)->parentDevice; + *device = (IDirect3DDevice9 *)buffer->parentDevice; IDirect3DDevice9_AddRef(*device); TRACE("Returning device %p.\n", *device); @@ -154,12 +157,13 @@ static HRESULT WINAPI d3d9_vertexbuffer_FreePrivateData(IDirect3DVertexBuffer9 * static DWORD WINAPI d3d9_vertexbuffer_SetPriority(IDirect3DVertexBuffer9 *iface, DWORD priority) { + IDirect3DVertexBuffer9Impl *buffer = impl_from_IDirect3DVertexBuffer9(iface); DWORD previous; TRACE("iface %p, priority %u.\n", iface, priority); wined3d_mutex_lock(); - previous = wined3d_buffer_set_priority(((IDirect3DVertexBuffer9Impl *)iface)->wineD3DVertexBuffer, priority); + previous = wined3d_buffer_set_priority(buffer->wineD3DVertexBuffer, priority); wined3d_mutex_unlock(); return previous; @@ -167,12 +171,13 @@ static DWORD WINAPI d3d9_vertexbuffer_SetPriority(IDirect3DVertexBuffer9 *iface, static DWORD WINAPI d3d9_vertexbuffer_GetPriority(IDirect3DVertexBuffer9 *iface) { + IDirect3DVertexBuffer9Impl *buffer = impl_from_IDirect3DVertexBuffer9(iface); DWORD priority; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - priority = wined3d_buffer_get_priority(((IDirect3DVertexBuffer9Impl *)iface)->wineD3DVertexBuffer); + priority = wined3d_buffer_get_priority(buffer->wineD3DVertexBuffer); wined3d_mutex_unlock(); return priority; @@ -180,10 +185,12 @@ static DWORD WINAPI d3d9_vertexbuffer_GetPriority(IDirect3DVertexBuffer9 *iface) static void WINAPI d3d9_vertexbuffer_PreLoad(IDirect3DVertexBuffer9 *iface) { + IDirect3DVertexBuffer9Impl *buffer = impl_from_IDirect3DVertexBuffer9(iface); + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - wined3d_buffer_preload(((IDirect3DVertexBuffer9Impl *)iface)->wineD3DVertexBuffer); + wined3d_buffer_preload(buffer->wineD3DVertexBuffer); wined3d_mutex_unlock(); } @@ -194,17 +201,17 @@ static D3DRESOURCETYPE WINAPI d3d9_vertexbuffer_GetType(IDirect3DVertexBuffer9 * return D3DRTYPE_VERTEXBUFFER; } -static HRESULT WINAPI d3d9_vertexbuffer_Lock(IDirect3DVertexBuffer9 *iface, - UINT offset, UINT size, void **data, DWORD flags) +static HRESULT WINAPI d3d9_vertexbuffer_Lock(IDirect3DVertexBuffer9 *iface, UINT offset, UINT size, + void **data, DWORD flags) { + IDirect3DVertexBuffer9Impl *buffer = impl_from_IDirect3DVertexBuffer9(iface); HRESULT hr; TRACE("iface %p, offset %u, size %u, data %p, flags %#x.\n", iface, offset, size, data, flags); wined3d_mutex_lock(); - hr = wined3d_buffer_map(((IDirect3DVertexBuffer9Impl *)iface)->wineD3DVertexBuffer, - offset, size, (BYTE **)data, flags); + hr = wined3d_buffer_map(buffer->wineD3DVertexBuffer, offset, size, (BYTE **)data, flags); wined3d_mutex_unlock(); return hr; @@ -212,18 +219,21 @@ static HRESULT WINAPI d3d9_vertexbuffer_Lock(IDirect3DVertexBuffer9 *iface, static HRESULT WINAPI d3d9_vertexbuffer_Unlock(IDirect3DVertexBuffer9 *iface) { + IDirect3DVertexBuffer9Impl *buffer = impl_from_IDirect3DVertexBuffer9(iface); + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - wined3d_buffer_unmap(((IDirect3DVertexBuffer9Impl *)iface)->wineD3DVertexBuffer); + wined3d_buffer_unmap(buffer->wineD3DVertexBuffer); wined3d_mutex_unlock(); return D3D_OK; } -static HRESULT WINAPI d3d9_vertexbuffer_GetDesc(IDirect3DVertexBuffer9 *iface, D3DVERTEXBUFFER_DESC *desc) +static HRESULT WINAPI d3d9_vertexbuffer_GetDesc(IDirect3DVertexBuffer9 *iface, + D3DVERTEXBUFFER_DESC *desc) { - IDirect3DVertexBuffer9Impl *buffer = (IDirect3DVertexBuffer9Impl *)iface; + IDirect3DVertexBuffer9Impl *buffer = impl_from_IDirect3DVertexBuffer9(iface); struct wined3d_resource_desc wined3d_desc; struct wined3d_resource *wined3d_resource; @@ -280,7 +290,7 @@ HRESULT vertexbuffer_init(IDirect3DVertexBuffer9Impl *buffer, IDirect3DDevice9Im { HRESULT hr; - buffer->lpVtbl = &d3d9_vertexbuffer_vtbl; + buffer->IDirect3DVertexBuffer9_iface.lpVtbl = &d3d9_vertexbuffer_vtbl; buffer->ref = 1; buffer->fvf = fvf; diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 9cb33c8..fb6e7e6 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -251,10 +251,8 @@ HRESULT surface_init(IDirect3DSurface9Impl *surface, IDirect3DDevice9Impl *devic */ typedef struct IDirect3DVertexBuffer9Impl { - /* IUnknown fields */ - const IDirect3DVertexBuffer9Vtbl *lpVtbl; - LONG ref; - + IDirect3DVertexBuffer9 IDirect3DVertexBuffer9_iface; + LONG ref; struct wined3d_buffer *wineD3DVertexBuffer; IDirect3DDevice9Ex *parentDevice; DWORD fvf; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 924d43e..0f33a27 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -853,7 +853,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexBuffer(IDirect3DDevice9Ex } TRACE("Created vertex buffer %p.\n", object); - *buffer = (IDirect3DVertexBuffer9 *)object; + *buffer = &object->IDirect3DVertexBuffer9_iface; return D3D_OK; }

1 0

André Hentschel : user32: Remove dead initializations (clang).
by Alexandre Julliard 06 Jul '11

06 Jul '11

Module: wine Branch: master Commit: 5ca020b9d8c0cf994cae6642d8f0ee0302068aea URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ca020b9d8c0cf994cae6642d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 5 21:37:39 2011 +0200 user32: Remove dead initializations (clang). --- dlls/user32/edit.c | 4 ++-- dlls/user32/tests/menu.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 8f59d95..87f8682 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -2063,8 +2063,8 @@ static INT EDIT_PaintText(EDITSTATE *es, HDC dc, INT x, INT y, INT line, INT col */ static void EDIT_PaintLine(EDITSTATE *es, HDC dc, INT line, BOOL rev) { - INT s = es->selection_start; - INT e = es->selection_end; + INT s; + INT e; INT li; INT ll; INT x; diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index e29039a..823e19e 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -1082,7 +1082,7 @@ static void test_menu_iteminfo( void ) void *txt, *init, *empty, *string; HBITMAP hbm = CreateBitmap(1,1,1,1,NULL); char stringA[0x80]; - HMENU hmenu, submenu=CreateMenu(); + HMENU hmenu, submenu; HBITMAP dummy_hbm = (HBITMAP)(ULONG_PTR)0xdeadbeef; do {

1 0