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

Francois Gouget : crypt32/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard June 18, 2007

June 18, 2007

Module: wine Branch: master Commit: fe40b2d85ff7105af8a78de341749187284a95eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe40b2d85ff7105af8a78de34… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jun 17 12:19:28 2007 +0200 crypt32/tests: Fix compilation on systems that don't support nameless unions. --- dlls/crypt32/tests/encode.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 5f79639..af08b77 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -4410,7 +4410,7 @@ static void test_encodeAuthorityKeyId2(DWORD dwEncoding) "Expected E_INVALIDARG, got %08x\n", GetLastError()); /* With an issuer name */ entry.dwAltNameChoice = CERT_ALT_NAME_URL; - entry.pwszURL = (LPWSTR)url; + U(entry).pwszURL = (LPWSTR)url; ret = CryptEncodeObjectEx(dwEncoding, X509_AUTHORITY_KEY_ID2, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); @@ -4497,7 +4497,7 @@ static void test_decodeAuthorityKeyId2(DWORD dwEncoding) ok(info->AuthorityCertIssuer.rgAltEntry[0].dwAltNameChoice == CERT_ALT_NAME_URL, "Expected CERT_ALT_NAME_URL, got %d\n", info->AuthorityCertIssuer.rgAltEntry[0].dwAltNameChoice); - ok(!lstrcmpW(info->AuthorityCertIssuer.rgAltEntry[0].pwszURL, + ok(!lstrcmpW(U(info->AuthorityCertIssuer.rgAltEntry[0]).pwszURL, url), "Unexpected URL\n"); ok(info->AuthorityCertSerialNumber.cbData == 0, "Expected no serial number\n");

1 0

Andrew Talbot : msi: Name all or none of the formal arguments in function prototypes.
by Alexandre Julliard June 18, 2007

June 18, 2007

Module: wine Branch: master Commit: 19ef864058f4580161255798ed16de42c2fa546c URL: http://source.winehq.org/git/wine.git/?a=commit;h=19ef864058f4580161255798e… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jun 16 18:05:32 2007 +0100 msi: Name all or none of the formal arguments in function prototypes. --- dlls/msi/dialog.c | 2 +- dlls/msi/msipriv.h | 24 ++++++++++++------------ dlls/msi/query.h | 2 +- dlls/msi/sql.y | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 73aec69..964d334 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -151,7 +151,7 @@ static UINT msi_dialog_checkbox_handler( msi_dialog *, msi_control *, WPARAM ); static void msi_dialog_checkbox_sync_state( msi_dialog *, msi_control * ); static UINT msi_dialog_button_handler( msi_dialog *, msi_control *, WPARAM ); static UINT msi_dialog_edit_handler( msi_dialog *, msi_control *, WPARAM ); -static UINT msi_dialog_radiogroup_handler( msi_dialog *, msi_control *, WPARAM param ); +static UINT msi_dialog_radiogroup_handler( msi_dialog *, msi_control *, WPARAM ); static UINT msi_dialog_evaluate_control_conditions( msi_dialog *dialog ); static LRESULT WINAPI MSIRadioGroup_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); static MSIFEATURE *msi_seltree_get_selected_feature( msi_control *control ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 1f2677c..fd61b5c 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -126,7 +126,7 @@ typedef struct tagMSIVIEWOPS * To get a string value, query the database's string table with * the integer value returned from this function. */ - UINT (*fetch_int)( struct tagMSIVIEW *, UINT row, UINT col, UINT *val ); + UINT (*fetch_int)( struct tagMSIVIEW *view, UINT row, UINT col, UINT *val ); /* * fetch_stream - gets a stream from {row,col} in the table @@ -134,29 +134,29 @@ typedef struct tagMSIVIEWOPS * This function is similar to fetch_int, except fetches a * stream instead of an integer. */ - UINT (*fetch_stream)( struct tagMSIVIEW *, UINT row, UINT col, IStream **stm ); + UINT (*fetch_stream)( struct tagMSIVIEW *view, UINT row, UINT col, IStream **stm ); /* * set_row - sets values in a row as specified by mask * * Similar semantics to fetch_int */ - UINT (*set_row)( struct tagMSIVIEW *, UINT row, MSIRECORD *rec, UINT mask ); + UINT (*set_row)( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask ); /* * Inserts a new row into the database from the records contents */ - UINT (*insert_row)( struct tagMSIVIEW *, MSIRECORD *, BOOL temporary ); + UINT (*insert_row)( struct tagMSIVIEW *view, MSIRECORD *record, BOOL temporary ); /* * execute - loads the underlying data into memory so it can be read */ - UINT (*execute)( struct tagMSIVIEW *, MSIRECORD * ); + UINT (*execute)( struct tagMSIVIEW *view, MSIRECORD *record ); /* * close - clears the data read by execute from memory */ - UINT (*close)( struct tagMSIVIEW * ); + UINT (*close)( struct tagMSIVIEW *view ); /* * get_dimensions - returns the number of rows or columns in a table. @@ -164,7 +164,7 @@ typedef struct tagMSIVIEWOPS * The number of rows can only be queried after the execute method * is called. The number of columns can be queried at any time. */ - UINT (*get_dimensions)( struct tagMSIVIEW *, UINT *rows, UINT *cols ); + UINT (*get_dimensions)( struct tagMSIVIEW *view, UINT *rows, UINT *cols ); /* * get_column_info - returns the name and type of a specific column @@ -173,12 +173,12 @@ typedef struct tagMSIVIEWOPS * the caller. * The column information can be queried at any time. */ - UINT (*get_column_info)( struct tagMSIVIEW *, UINT n, LPWSTR *name, UINT *type ); + UINT (*get_column_info)( struct tagMSIVIEW *view, UINT n, LPWSTR *name, UINT *type ); /* * modify - not yet implemented properly */ - UINT (*modify)( struct tagMSIVIEW *, MSIMODIFY, MSIRECORD * ); + UINT (*modify)( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, MSIRECORD *record ); /* * delete - destroys the structure completely @@ -196,7 +196,7 @@ typedef struct tagMSIVIEWOPS * position in the iteration. It must be initialised to zero before the * first call and continued to be passed in to subsequent calls. */ - UINT (*find_matching_rows)( struct tagMSIVIEW *, UINT col, UINT val, UINT *row, MSIITERHANDLE *handle ); + UINT (*find_matching_rows)( struct tagMSIVIEW *view, UINT col, UINT val, UINT *row, MSIITERHANDLE *handle ); } MSIVIEWOPS; struct tagMSIVIEW @@ -565,7 +565,7 @@ extern void msi_table_set_strref(UINT bytes_per_strref); extern BOOL TABLE_Exists( MSIDATABASE *db, LPCWSTR name ); extern MSICONDITION MSI_DatabaseIsTablePersistent( MSIDATABASE *db, LPCWSTR table ); -extern UINT read_raw_stream_data( MSIDATABASE*, LPCWSTR stname, +extern UINT read_raw_stream_data( MSIDATABASE *db, LPCWSTR stname, USHORT **pdata, UINT *psz ); extern UINT read_stream_data( IStorage *stg, LPCWSTR stname, USHORT **pdata, UINT *psz ); @@ -637,7 +637,7 @@ extern UINT MSI_SetInstallLevel( MSIPACKAGE *package, int iInstallLevel ); /* package internals */ extern MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *, LPCWSTR ); -extern UINT MSI_OpenPackageW( LPCWSTR szPackage, MSIPACKAGE ** ); +extern UINT MSI_OpenPackageW( LPCWSTR szPackage, MSIPACKAGE **pPackage ); extern UINT MSI_SetTargetPathW( MSIPACKAGE *, LPCWSTR, LPCWSTR ); extern UINT MSI_SetPropertyW( MSIPACKAGE *, LPCWSTR, LPCWSTR ); extern INT MSI_ProcessMessage( MSIPACKAGE *, INSTALLMESSAGE, MSIRECORD * ); diff --git a/dlls/msi/query.h b/dlls/msi/query.h index 48a1823..ef2e8a6 100644 --- a/dlls/msi/query.h +++ b/dlls/msi/query.h @@ -114,7 +114,7 @@ UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table, UINT INSERT_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table, column_info *columns, column_info *values, BOOL temp ); -UINT UPDATE_CreateView( MSIDATABASE *db, MSIVIEW **, LPCWSTR table, +UINT UPDATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table, column_info *list, struct expr *expr ); UINT DELETE_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table ); diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index a7180e9..902b08b 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -64,7 +64,7 @@ static struct expr * EXPR_complex( void *info, struct expr *l, UINT op, struct e static struct expr * EXPR_unary( void *info, struct expr *l, UINT op ); static struct expr * EXPR_column( void *info, const column_info *column ); static struct expr * EXPR_ival( void *info, int val ); -static struct expr * EXPR_sval( void *info, const struct sql_str * ); +static struct expr * EXPR_sval( void *info, const struct sql_str *str ); static struct expr * EXPR_wildcard( void *info ); %}

1 0

H. Verbeet : wined3d: Only set GL_SHADER_OPERATION_NV to GL_NONE for mapped stages.
by Alexandre Julliard June 18, 2007

June 18, 2007

Module: wine Branch: master Commit: 9f8083c6465cccb57db7c887622c87f91af860f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f8083c6465cccb57db7c8876… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jun 18 00:10:54 2007 +0200 wined3d: Only set GL_SHADER_OPERATION_NV to GL_NONE for mapped stages. --- dlls/wined3d/state.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 54c62e4..a244d3a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1674,9 +1674,9 @@ static void tex_colorop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D glDisable(GL_TEXTURE_CUBE_MAP_ARB); checkGLcall("glDisable(GL_TEXTURE_CUBE_MAP_ARB)"); } - } - if(GL_SUPPORT(NV_TEXTURE_SHADER2)) { - glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_NONE); + if(GL_SUPPORT(NV_TEXTURE_SHADER2)) { + glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, GL_NONE); + } } /* All done */ return;

1 0

H. Verbeet : wined3d: Mask texture stage state arguments with WINED3DTA_SELECTMASK when comparing them .
by Alexandre Julliard June 18, 2007

June 18, 2007

Module: wine Branch: master Commit: b16dbf46da304f24163c21b072740e55fc34ea35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b16dbf46da304f24163c21b07… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sun Jun 17 23:39:24 2007 +0200 wined3d: Mask texture stage state arguments with WINED3DTA_SELECTMASK when comparing them. --- dlls/wined3d/utils.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d592bc4..65bff5c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -834,9 +834,12 @@ static BOOL is_invalid_op(IWineD3DDeviceImpl *This, int stage, WINED3DTEXTUREOP if (op == WINED3DTOP_DISABLE) return FALSE; if (This->stateBlock->textures[stage]) return FALSE; - if (arg1 == WINED3DTA_TEXTURE && op != WINED3DTOP_SELECTARG2) return TRUE; - if (arg2 == WINED3DTA_TEXTURE && op != WINED3DTOP_SELECTARG1) return TRUE; - if (arg3 == WINED3DTA_TEXTURE && (op == WINED3DTOP_MULTIPLYADD || op == WINED3DTOP_LERP)) return TRUE; + if ((arg1 & WINED3DTA_SELECTMASK) == WINED3DTA_TEXTURE + && op != WINED3DTOP_SELECTARG2) return TRUE; + if ((arg2 & WINED3DTA_SELECTMASK) == WINED3DTA_TEXTURE + && op != WINED3DTOP_SELECTARG1) return TRUE; + if ((arg3 & WINED3DTA_SELECTMASK) == WINED3DTA_TEXTURE + && (op == WINED3DTOP_MULTIPLYADD || op == WINED3DTOP_LERP)) return TRUE; return FALSE; }

1 0

Alexandre Julliard : kernel32: Fix VxD open code for the new NtCreateFile syntax for Unix files.
by Alexandre Julliard June 18, 2007

June 18, 2007

Module: wine Branch: master Commit: 8e53a00282befd209f5fdd2c6aa2e4085b659a37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e53a00282befd209f5fdd2c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 18 12:53:27 2007 +0200 kernel32: Fix VxD open code for the new NtCreateFile syntax for Unix files. --- dlls/kernel32/vxd.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/vxd.c b/dlls/kernel32/vxd.c index 875aeed..106b086 100644 --- a/dlls/kernel32/vxd.c +++ b/dlls/kernel32/vxd.c @@ -91,6 +91,7 @@ static CRITICAL_SECTION vxd_section = { &critsect_debug, -1, 0, 0, 0, 0 }; /* create a file handle to represent a VxD, by opening a dummy file in the wineserver directory */ static HANDLE open_vxd_handle( LPCWSTR name ) { + static const WCHAR prefixW[] = {'\\','?','?','\\','u','n','i','x'}; const char *dir = wine_get_server_dir(); int len; HANDLE ret; @@ -100,14 +101,16 @@ static HANDLE open_vxd_handle( LPCWSTR name ) IO_STATUS_BLOCK io; len = MultiByteToWideChar( CP_UNIXCP, 0, dir, -1, NULL, 0 ); - nameW.Length = (len + 1 + strlenW( name )) * sizeof(WCHAR); + nameW.Length = sizeof(prefixW) + (len + strlenW( name )) * sizeof(WCHAR); nameW.MaximumLength = nameW.Length + sizeof(WCHAR); - if (!(nameW.Buffer = HeapAlloc( GetProcessHeap(), 0, nameW.Length ))) + if (!(nameW.Buffer = HeapAlloc( GetProcessHeap(), 0, nameW.MaximumLength ))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return 0; } - MultiByteToWideChar( CP_UNIXCP, 0, dir, -1, nameW.Buffer, len ); + memcpy( nameW.Buffer, prefixW, sizeof(prefixW) ); + MultiByteToWideChar( CP_UNIXCP, 0, dir, -1, nameW.Buffer + sizeof(prefixW)/sizeof(WCHAR), len ); + len += sizeof(prefixW) / sizeof(WCHAR); nameW.Buffer[len-1] = '/'; strcpyW( nameW.Buffer + len, name );

1 0

Alexandre Julliard : winedos: Fix the device open code for the new NtCreateFile syntax for Unix files.
by Alexandre Julliard June 18, 2007

June 18, 2007

Module: wine Branch: master Commit: b8d1560ac30ef3ea49de62210bb03d3bfeeaa4ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8d1560ac30ef3ea49de62210… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 18 12:53:40 2007 +0200 winedos: Fix the device open code for the new NtCreateFile syntax for Unix files. --- dlls/winedos/int21.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winedos/int21.c b/dlls/winedos/int21.c index c4b8f4f..7e080e0 100644 --- a/dlls/winedos/int21.c +++ b/dlls/winedos/int21.c @@ -845,6 +845,7 @@ static BOOL INT21_SetCurrentDirectory( CONTEXT86 *context ) */ static HANDLE INT21_CreateMagicDeviceHandle( LPCWSTR name ) { + static const WCHAR prefixW[] = {'\\','?','?','\\','u','n','i','x'}; const char *dir = wine_get_server_dir(); int len; HANDLE ret; @@ -854,14 +855,16 @@ static HANDLE INT21_CreateMagicDeviceHandle( LPCWSTR name ) IO_STATUS_BLOCK io; len = MultiByteToWideChar( CP_UNIXCP, 0, dir, -1, NULL, 0 ); - nameW.Length = (len + 1 + strlenW( name )) * sizeof(WCHAR); + nameW.Length = sizeof(prefixW) + (len + strlenW( name )) * sizeof(WCHAR); nameW.MaximumLength = nameW.Length + sizeof(WCHAR); - if (!(nameW.Buffer = HeapAlloc( GetProcessHeap(), 0, nameW.Length ))) + if (!(nameW.Buffer = HeapAlloc( GetProcessHeap(), 0, nameW.MaximumLength ))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return 0; } - MultiByteToWideChar( CP_UNIXCP, 0, dir, -1, nameW.Buffer, len ); + memcpy( nameW.Buffer, prefixW, sizeof(prefixW) ); + MultiByteToWideChar( CP_UNIXCP, 0, dir, -1, nameW.Buffer + sizeof(prefixW)/sizeof(WCHAR), len ); + len += sizeof(prefixW) / sizeof(WCHAR); nameW.Buffer[len-1] = '/'; strcpyW( nameW.Buffer + len, name );

1 0

Evan Stade : gdiplus: Implemented GdipDrawBezier.
by Alexandre Julliard June 18, 2007

June 18, 2007

Module: wine Branch: master Commit: 8b9f5342b4ba291ab311f7c2b5a4d554083ab900 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b9f5342b4ba291ab311f7c2b… Author: Evan Stade <estade(a)gmail.com> Date: Fri Jun 15 21:27:38 2007 -0700 gdiplus: Implemented GdipDrawBezier. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 24 ++++++++++++++++++++++++ include/gdiplusflat.h | 2 ++ 3 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index c7a4dc1..483c3f4 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -144,7 +144,7 @@ @ stub GdipDisposeImageAttributes @ stub GdipDrawArc @ stub GdipDrawArcI -@ stub GdipDrawBezier +@ stdcall GdipDrawBezier(ptr ptr long long long long long long long long) @ stub GdipDrawBezierI @ stub GdipDrawBeziers @ stub GdipDrawBeziersI diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 674bede..b45293f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -27,6 +27,11 @@ #include "gdiplus_private.h" #include "wine/debug.h" +static inline INT roundr(REAL x) +{ + return (INT) floor(x+0.5); +} + GpStatus WINGDIPAPI GdipCreateFromHDC(HDC hdc, GpGraphics **graphics) { if(hdc == NULL) @@ -66,6 +71,25 @@ GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics) return Ok; } +GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics *graphics, GpPen *pen, REAL x1, + REAL y1, REAL x2, REAL y2, REAL x3, REAL y3, REAL x4, REAL y4) +{ + HGDIOBJ old_pen; + POINT pt[4] = {{roundr(x1), roundr(y1)}, {roundr(x2), roundr(y2)}, + {roundr(x3), roundr(y3)}, {roundr(x4), roundr(y4)}}; + + if(!graphics || !pen) + return InvalidParameter; + + old_pen = SelectObject(graphics->hdc, pen->gdipen); + + PolyBezier(graphics->hdc, pt, 4); + + SelectObject(graphics->hdc, old_pen); + + return Ok; +} + GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics *graphics, GpPen *pen, INT x1, INT y1, INT x2, INT y2) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 7ccae0f..3220cb2 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -31,6 +31,8 @@ GpStatus WINGDIPAPI GdipDeletePen(GpPen*); GpStatus WINGDIPAPI GdipCreateFromHDC(HDC,GpGraphics**); GpStatus WINGDIPAPI GdipCreateFromHWND(HWND,GpGraphics**); GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *); +GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL, + REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics*,GpPen*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics*,GpPen*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipFillPie(GpGraphics*,GpBrush*,REAL,REAL,REAL,REAL,REAL,REAL);

1 0

Stefan Dösinger : d3d9: Hold the lock in Pixelshader functions.
by Alexandre Julliard June 18, 2007

June 18, 2007

Module: wine Branch: master Commit: 5194ce19727f0409f1c0f0ccdca194c770c9f215 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5194ce19727f0409f1c0f0ccd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 12 10:11:21 2007 +0200 d3d9: Hold the lock in Pixelshader functions. --- dlls/d3d9/pixelshader.c | 53 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 47 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/pixelshader.c b/dlls/d3d9/pixelshader.c index a6a635e..8eeb3d6 100644 --- a/dlls/d3d9/pixelshader.c +++ b/dlls/d3d9/pixelshader.c @@ -56,7 +56,9 @@ static ULONG WINAPI IDirect3DPixelShader9Impl_Release(LPDIRECT3DPIXELSHADER9 ifa TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { + EnterCriticalSection(&d3d9_cs); IWineD3DPixelShader_Release(This->wineD3DPixelShader); + LeaveCriticalSection(&d3d9_cs); IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); } @@ -70,17 +72,24 @@ static HRESULT WINAPI IDirect3DPixelShader9Impl_GetDevice(LPDIRECT3DPIXELSHADER9 TRACE("(%p) : Relay\n", This); + EnterCriticalSection(&d3d9_cs); IWineD3DPixelShader_GetDevice(This->wineD3DPixelShader, &myDevice); IWineD3DDevice_GetParent(myDevice, (IUnknown **)ppDevice); IWineD3DDevice_Release(myDevice); + LeaveCriticalSection(&d3d9_cs); TRACE("(%p) returning (%p)\n", This, *ppDevice); return D3D_OK; } static HRESULT WINAPI IDirect3DPixelShader9Impl_GetFunction(LPDIRECT3DPIXELSHADER9 iface, VOID* pData, UINT* pSizeOfData) { IDirect3DPixelShader9Impl *This = (IDirect3DPixelShader9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DPixelShader_GetFunction(This->wineD3DPixelShader, pData, pSizeOfData); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DPixelShader_GetFunction(This->wineD3DPixelShader, pData, pSizeOfData); + LeaveCriticalSection(&d3d9_cs); + return hr; } @@ -118,7 +127,9 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreatePixelShader(LPDIRECT3DDEVICE9 iface, C object->ref = 1; object->lpVtbl = &Direct3DPixelShader9_Vtbl; + EnterCriticalSection(&d3d9_cs); hrc = IWineD3DDevice_CreatePixelShader(This->WineD3DDevice, pFunction, &object->wineD3DPixelShader , (IUnknown *)object); + LeaveCriticalSection(&d3d9_cs); if (hrc != D3D_OK) { /* free up object */ @@ -139,7 +150,10 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShader(LPDIRECT3DDEVICE9 iface, IDir IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; IDirect3DPixelShader9Impl *shader = (IDirect3DPixelShader9Impl *)pShader; TRACE("(%p) Relay\n", This); + + EnterCriticalSection(&d3d9_cs); IWineD3DDevice_SetPixelShader(This->WineD3DDevice, shader == NULL ? NULL :shader->wineD3DPixelShader); + LeaveCriticalSection(&d3d9_cs); return D3D_OK; } @@ -154,6 +168,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShader(LPDIRECT3DDEVICE9 iface, IDir return D3DERR_INVALIDCALL; } + EnterCriticalSection(&d3d9_cs); hrc = IWineD3DDevice_GetPixelShader(This->WineD3DDevice, &object); if (hrc == D3D_OK && object != NULL) { hrc = IWineD3DPixelShader_GetParent(object, (IUnknown **)ppShader); @@ -161,6 +176,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShader(LPDIRECT3DDEVICE9 iface, IDir } else { *ppShader = NULL; } + LeaveCriticalSection(&d3d9_cs); TRACE("(%p) : returning %p\n", This, *ppShader); return hrc; @@ -168,8 +184,13 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShader(LPDIRECT3DDEVICE9 iface, IDir HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShaderConstantF(LPDIRECT3DDEVICE9 iface, UINT Register, CONST float* pConstantData, UINT Vector4fCount) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_SetPixelShaderConstantF(This->WineD3DDevice, Register, pConstantData, Vector4fCount); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DDevice_SetPixelShaderConstantF(This->WineD3DDevice, Register, pConstantData, Vector4fCount); + LeaveCriticalSection(&d3d9_cs); + return hr; } HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShaderConstantF(LPDIRECT3DDEVICE9 iface, UINT Register, float* pConstantData, UINT Vector4fCount) { @@ -180,24 +201,44 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShaderConstantF(LPDIRECT3DDEVICE9 if HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShaderConstantI(LPDIRECT3DDEVICE9 iface, UINT Register, CONST int* pConstantData, UINT Vector4iCount) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_SetPixelShaderConstantI(This->WineD3DDevice, Register, pConstantData, Vector4iCount); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DDevice_SetPixelShaderConstantI(This->WineD3DDevice, Register, pConstantData, Vector4iCount); + LeaveCriticalSection(&d3d9_cs); + return hr; } HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShaderConstantI(LPDIRECT3DDEVICE9 iface, UINT Register, int* pConstantData, UINT Vector4iCount) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_GetPixelShaderConstantI(This->WineD3DDevice, Register, pConstantData, Vector4iCount); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DDevice_GetPixelShaderConstantI(This->WineD3DDevice, Register, pConstantData, Vector4iCount); + LeaveCriticalSection(&d3d9_cs); + return hr; } HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShaderConstantB(LPDIRECT3DDEVICE9 iface, UINT Register, CONST BOOL* pConstantData, UINT BoolCount) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_SetPixelShaderConstantB(This->WineD3DDevice, Register, pConstantData, BoolCount); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DDevice_SetPixelShaderConstantB(This->WineD3DDevice, Register, pConstantData, BoolCount); + LeaveCriticalSection(&d3d9_cs); + return hr; } HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShaderConstantB(LPDIRECT3DDEVICE9 iface, UINT Register, BOOL* pConstantData, UINT BoolCount) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DDevice_GetPixelShaderConstantB(This->WineD3DDevice, Register, pConstantData, BoolCount); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3DDevice_GetPixelShaderConstantB(This->WineD3DDevice, Register, pConstantData, BoolCount); + LeaveCriticalSection(&d3d9_cs); + return hr; }

1 0

Stefan Dösinger : d3d9: Hold the lock in IDirect3D9 methods.
by Alexandre Julliard June 18, 2007

June 18, 2007

Module: wine Branch: master Commit: 66821059b4704991fbd84c59625507c7a13a53a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66821059b4704991fbd84c596… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jun 10 17:32:37 2007 +0200 d3d9: Hold the lock in IDirect3D9 methods. --- dlls/d3d9/directx.c | 93 +++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 82 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 699daff..acc95ce 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -57,7 +57,9 @@ static ULONG WINAPI IDirect3D9Impl_Release(LPDIRECT3D9 iface) { TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { + EnterCriticalSection(&d3d9_cs); IWineD3D_Release(This->WineD3D); + LeaveCriticalSection(&d3d9_cs); HeapFree(GetProcessHeap(), 0, This); } @@ -67,17 +69,30 @@ static ULONG WINAPI IDirect3D9Impl_Release(LPDIRECT3D9 iface) { /* IDirect3D9 Interface follow: */ static HRESULT WINAPI IDirect3D9Impl_RegisterSoftwareDevice(LPDIRECT3D9 iface, void* pInitializeFunction) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; - return IWineD3D_RegisterSoftwareDevice(This->WineD3D, pInitializeFunction); + HRESULT hr; + TRACE("(%p)->(%p)\n", This, pInitializeFunction); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3D_RegisterSoftwareDevice(This->WineD3D, pInitializeFunction); + LeaveCriticalSection(&d3d9_cs); + return hr; } static UINT WINAPI IDirect3D9Impl_GetAdapterCount(LPDIRECT3D9 iface) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; - return IWineD3D_GetAdapterCount(This->WineD3D); + HRESULT hr; + TRACE("%p\n", This); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3D_GetAdapterCount(This->WineD3D); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3D9Impl_GetAdapterIdentifier(LPDIRECT3D9 iface, UINT Adapter, DWORD Flags, D3DADAPTER_IDENTIFIER9* pIdentifier) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; WINED3DADAPTER_IDENTIFIER adapter_id; + HRESULT hr; /* dx8 and dx9 have different structures to be filled in, with incompatible layouts so pass in pointers to the places to be filled via an internal @@ -93,27 +108,41 @@ static HRESULT WINAPI IDirect3D9Impl_GetAdapterIdentifier(LPDIRECT3D9 iface, UIN adapter_id.DeviceIdentifier = &pIdentifier->DeviceIdentifier; adapter_id.WHQLLevel = &pIdentifier->WHQLLevel; - return IWineD3D_GetAdapterIdentifier(This->WineD3D, Adapter, Flags, &adapter_id); + EnterCriticalSection(&d3d9_cs); + hr = IWineD3D_GetAdapterIdentifier(This->WineD3D, Adapter, Flags, &adapter_id); + LeaveCriticalSection(&d3d9_cs); + return hr; } static UINT WINAPI IDirect3D9Impl_GetAdapterModeCount(LPDIRECT3D9 iface, UINT Adapter, D3DFORMAT Format) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; + HRESULT hr; + TRACE("(%p)->(%d, %d\n", This, Adapter, Format); /* Others than that not supported by d3d9, but reported by wined3d for ddraw. Filter them out */ if(Format != D3DFMT_X8R8G8B8 && Format != D3DFMT_R5G6B5) { return 0; } - return IWineD3D_GetAdapterModeCount(This->WineD3D, Adapter, Format); + EnterCriticalSection(&d3d9_cs); + hr = IWineD3D_GetAdapterModeCount(This->WineD3D, Adapter, Format); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3D9Impl_EnumAdapterModes(LPDIRECT3D9 iface, UINT Adapter, D3DFORMAT Format, UINT Mode, D3DDISPLAYMODE* pMode) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; + HRESULT hr; + TRACE("(%p)->(%d, %d, %d, %p)\n", This, Adapter, Format, Mode, pMode); /* We can't pass this to WineD3D, otherwise it'll think it came from D3D8 or DDraw. It's supposed to fail anyway, so no harm returning failure. */ if(Format != WINED3DFMT_X8R8G8B8 && Format != WINED3DFMT_R5G6B5) return D3DERR_INVALIDCALL; - return IWineD3D_EnumAdapterModes(This->WineD3D, Adapter, Format, Mode, (WINED3DDISPLAYMODE *) pMode); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3D_EnumAdapterModes(This->WineD3D, Adapter, Format, Mode, (WINED3DDISPLAYMODE *) pMode); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3D9Impl_GetAdapterDisplayMode(LPDIRECT3D9 iface, UINT Adapter, D3DDISPLAYMODE* pMode) { @@ -125,38 +154,69 @@ static HRESULT WINAPI IDirect3D9Impl_CheckDeviceType(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE CheckType, D3DFORMAT DisplayFormat, D3DFORMAT BackBufferFormat, BOOL Windowed) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; - return IWineD3D_CheckDeviceType(This->WineD3D, Adapter, CheckType, DisplayFormat, + HRESULT hr; + TRACE("(%p)->(%d, %d, %d, %d, %s\n", This, Adapter, CheckType, DisplayFormat, + BackBufferFormat, Windowed ? "true" : "false"); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3D_CheckDeviceType(This->WineD3D, Adapter, CheckType, DisplayFormat, BackBufferFormat, Windowed); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3D9Impl_CheckDeviceFormat(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT AdapterFormat, DWORD Usage, D3DRESOURCETYPE RType, D3DFORMAT CheckFormat) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; - return IWineD3D_CheckDeviceFormat(This->WineD3D, Adapter, DeviceType, AdapterFormat, + HRESULT hr; + TRACE("%p\n", This); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3D_CheckDeviceFormat(This->WineD3D, Adapter, DeviceType, AdapterFormat, Usage, RType, CheckFormat); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3D9Impl_CheckDeviceMultiSampleType(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT SurfaceFormat, BOOL Windowed, D3DMULTISAMPLE_TYPE MultiSampleType, DWORD* pQualityLevels) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; - return IWineD3D_CheckDeviceMultiSampleType(This->WineD3D, Adapter, DeviceType, SurfaceFormat, + HRESULT hr; + TRACE("%p\n", This); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3D_CheckDeviceMultiSampleType(This->WineD3D, Adapter, DeviceType, SurfaceFormat, Windowed, MultiSampleType, pQualityLevels); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3D9Impl_CheckDepthStencilMatch(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT AdapterFormat, D3DFORMAT RenderTargetFormat, D3DFORMAT DepthStencilFormat) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; - return IWineD3D_CheckDepthStencilMatch(This->WineD3D, Adapter, DeviceType, AdapterFormat, + HRESULT hr; + TRACE("%p\n", This); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3D_CheckDepthStencilMatch(This->WineD3D, Adapter, DeviceType, AdapterFormat, RenderTargetFormat, DepthStencilFormat); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3D9Impl_CheckDeviceFormatConversion(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT SourceFormat, D3DFORMAT TargetFormat) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; - return IWineD3D_CheckDeviceFormatConversion(This->WineD3D, Adapter, DeviceType, SourceFormat, + HRESULT hr; + TRACE("%p\n", This); + + EnterCriticalSection(&d3d9_cs); + hr = IWineD3D_CheckDeviceFormatConversion(This->WineD3D, Adapter, DeviceType, SourceFormat, TargetFormat); + LeaveCriticalSection(&d3d9_cs); + return hr; } static HRESULT WINAPI IDirect3D9Impl_GetDeviceCaps(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DCAPS9* pCaps) { @@ -174,7 +234,9 @@ static HRESULT WINAPI IDirect3D9Impl_GetDeviceCaps(LPDIRECT3D9 iface, UINT Adapt return D3DERR_INVALIDCALL; /*well this is what MSDN says to return*/ } D3D9CAPSTOWINECAPS(pCaps, pWineCaps) + EnterCriticalSection(&d3d9_cs); hrc = IWineD3D_GetDeviceCaps(This->WineD3D, Adapter, DeviceType, pWineCaps); + LeaveCriticalSection(&d3d9_cs); HeapFree(GetProcessHeap(), 0, pWineCaps); /* Some functionality is implemented in d3d9.dll, not wined3d.dll. Add the needed caps */ @@ -185,7 +247,13 @@ static HRESULT WINAPI IDirect3D9Impl_GetDeviceCaps(LPDIRECT3D9 iface, UINT Adapt static HMONITOR WINAPI IDirect3D9Impl_GetAdapterMonitor(LPDIRECT3D9 iface, UINT Adapter) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; - return IWineD3D_GetAdapterMonitor(This->WineD3D, Adapter); + HMONITOR ret; + TRACE("%p\n", This); + + EnterCriticalSection(&d3d9_cs); + ret = IWineD3D_GetAdapterMonitor(This->WineD3D, Adapter); + LeaveCriticalSection(&d3d9_cs); + return ret; } /* Internal function called back during the CreateDevice to create a render target */ @@ -348,11 +416,13 @@ static HRESULT WINAPI IDirect3D9Impl_CreateDevice(LPDIRECT3D9 iface, UINT Adapte *ppReturnedDeviceInterface = (IDirect3DDevice9 *)object; /* Allocate an associated WineD3DDevice object */ + EnterCriticalSection(&d3d9_cs); hr =IWineD3D_CreateDevice(This->WineD3D, Adapter, DeviceType, hFocusWindow, BehaviourFlags, &object->WineD3DDevice, (IUnknown *)object); if (hr != D3D_OK) { HeapFree(GetProcessHeap(), 0, object); *ppReturnedDeviceInterface = NULL; + LeaveCriticalSection(&d3d9_cs); return hr; } @@ -404,6 +474,7 @@ static HRESULT WINAPI IDirect3D9Impl_CreateDevice(LPDIRECT3D9 iface, UINT Adapte * can be used without further checking */ object->convertedDecls = HeapAlloc(GetProcessHeap(), 0, 0); + LeaveCriticalSection(&d3d9_cs); return hr; }

1 0

Stefan Dösinger : d3d9: Hold the lock in cubetexture methods.
by Alexandre Julliard June 18, 2007

June 18, 2007

Module: wine Branch: master Commit: ea3076b0f72c4d3de7b0f49101e36d6606d4af3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea3076b0f72c4d3de7b0f4910… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 12 00:39:26 2007 +0200 d3d9: Hold the lock in cubetexture methods. --- dlls/d3d9/cubetexture.c | 125 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 109 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ea3076b0f72c4d3de7b0f…

1 0