wine-commits September 2013

wine-commits@winehq.org

2 participants
645 discussions

Jacek Caban : mshtml: Added IHTMLStyle6::outline property implementation.
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: 6d13dd697c99ebf6fa603c637234a09b14315720 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d13dd697c99ebf6fa603c637… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 30 16:05:34 2013 +0200 mshtml: Added IHTMLStyle6::outline property implementation. --- dlls/mshtml/htmlstyle.c | 5 ++++- dlls/mshtml/htmlstyle.h | 2 ++ dlls/mshtml/htmlstyle3.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 39 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 053c326..5ed2f93 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -135,6 +135,8 @@ static const WCHAR attrMarginTop[] = {'m','a','r','g','i','n','-','t','o','p',0}; static const WCHAR attrMinHeight[] = {'m','i','n','-','h','e','i','g','h','t',0}; +static const WCHAR attrOutline[] = + {'o','u','t','l','i','n','e',0}; static const WCHAR attrOverflow[] = {'o','v','e','r','f','l','o','w',0}; static const WCHAR attrOverflowX[] = @@ -241,6 +243,7 @@ static const style_tbl_entry_t style_tbl[] = { {attrMarginRight, DISPID_IHTMLSTYLE_MARGINRIGHT}, {attrMarginTop, DISPID_IHTMLSTYLE_MARGINTOP}, {attrMinHeight, DISPID_IHTMLSTYLE4_MINHEIGHT}, + {attrOutline, DISPID_IHTMLSTYLE6_OUTLINE}, {attrOverflow, DISPID_IHTMLSTYLE_OVERFLOW}, {attrOverflowX, DISPID_IHTMLSTYLE2_OVERFLOWX}, {attrOverflowY, DISPID_IHTMLSTYLE2_OVERFLOWY}, @@ -464,7 +467,7 @@ static HRESULT nsstyle_to_bstr(const WCHAR *val, DWORD flags, BSTR *p) DWORD len; if(!*val) { - *p = NULL; + *p = (flags & ATTR_NO_NULL) ? SysAllocStringLen(NULL, 0) : NULL; return S_OK; } diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 4f2e5ab..646375f 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -83,6 +83,7 @@ typedef enum { STYLEID_MARGIN_RIGHT, STYLEID_MARGIN_TOP, STYLEID_MIN_HEIGHT, + STYLEID_OUTLINE, STYLEID_OVERFLOW, STYLEID_OVERFLOW_X, STYLEID_OVERFLOW_Y, @@ -123,3 +124,4 @@ HRESULT get_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, #define ATTR_STR_TO_INT 0x0004 #define ATTR_HEX_INT 0x0008 #define ATTR_REMOVE_COMMA 0x0010 +#define ATTR_NO_NULL 0x0020 diff --git a/dlls/mshtml/htmlstyle3.c b/dlls/mshtml/htmlstyle3.c index 912d80c..116181c 100644 --- a/dlls/mshtml/htmlstyle3.c +++ b/dlls/mshtml/htmlstyle3.c @@ -702,15 +702,19 @@ static HRESULT WINAPI HTMLStyle6_get_counterReset(IHTMLStyle6 *iface, BSTR *p) static HRESULT WINAPI HTMLStyle6_put_outline(IHTMLStyle6 *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle6(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_nsstyle_attr(This->nsstyle, STYLEID_OUTLINE, v, 0); } static HRESULT WINAPI HTMLStyle6_get_outline(IHTMLStyle6 *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle6(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr(This->nsstyle, STYLEID_OUTLINE, p, ATTR_NO_NULL); } static HRESULT WINAPI HTMLStyle6_put_outlineWidth(IHTMLStyle6 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index e42bcb7..71eb955 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -37,6 +37,13 @@ static int strcmp_wa(LPCWSTR strw, const char *stra) return lstrcmpA(stra, buf); } +static BOOL wstr_contains(const WCHAR *strw, const char *stra) +{ + CHAR buf[512]; + WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); + return strstr(buf, stra) != NULL; +} + static BSTR a2bstr(const char *str) { BSTR ret; @@ -464,11 +471,35 @@ static void test_style4(IHTMLStyle4 *style4) VariantClear(&vdefault); } +static void test_style6(IHTMLStyle6 *style) +{ + BSTR str; + HRESULT hres; + + str = (void*)0xdeadbeef; + hres = IHTMLStyle6_get_outline(style, &str); + ok(hres == S_OK, "get_outline failed: %08x\n", hres); + ok(str && !*str, "outline = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = a2bstr("1px"); + hres = IHTMLStyle6_put_outline(style, str); + ok(hres == S_OK, "put_outline failed: %08x\n", hres); + SysFreeString(str); + + str = (void*)0xdeadbeef; + hres = IHTMLStyle6_get_outline(style, &str); + ok(hres == S_OK, "get_outline failed: %08x\n", hres); + ok(wstr_contains(str, "1px"), "outline = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); +} + static void test_body_style(IHTMLStyle *style) { IHTMLStyle2 *style2; IHTMLStyle3 *style3; IHTMLStyle4 *style4; + IHTMLStyle6 *style6; VARIANT_BOOL b; VARIANT v; BSTR str; @@ -2064,6 +2095,14 @@ static void test_body_style(IHTMLStyle *style) test_style4(style4); IHTMLStyle4_Release(style4); } + + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle6, (void**)&style6); + if(SUCCEEDED(hres)) { + test_style6(style6); + IHTMLStyle6_Release(style6); + }else { + win_skip("IHTMLStyle6 not available\n"); + } } #define test_style_filter(a,b) _test_style_filter(__LINE__,a,b)

1 0

Jacek Caban : mshtml: Added IHTMLEventObj::y implementation.
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: 93f9d824ebecccccb0f135c324dc35eaad352fbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=93f9d824ebecccccb0f135c32… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 30 14:18:14 2013 +0200 mshtml: Added IHTMLEventObj::y implementation. --- dlls/mshtml/htmlevent.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index ec56029..a7b2969 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -646,10 +646,24 @@ static HRESULT WINAPI HTMLEventObj_get_x(IHTMLEventObj *iface, LONG *p) static HRESULT WINAPI HTMLEventObj_get_y(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); + LONG y = 0; - FIXME("(%p)->(%p)\n", This, p); + TRACE("(%p)->(%p)\n", This, p); + + if(This->nsevent) { + nsIDOMUIEvent *ui_event; + nsresult nsres; - *p = -1; + nsres = nsIDOMEvent_QueryInterface(This->nsevent, &IID_nsIDOMUIEvent, (void**)&ui_event); + if(NS_SUCCEEDED(nsres)) { + /* NOTE: pageY is not exactly right here. */ + nsres = nsIDOMUIEvent_GetPageY(ui_event, &y); + assert(nsres == NS_OK); + nsIDOMUIEvent_Release(ui_event); + } + } + + *p = y; return S_OK; }

1 0

Jacek Caban : mshtml: Added IHTMLEventObj::x implementation.
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: c24767262b296514c42defe14de2a4a4637b1f03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c24767262b296514c42defe14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 30 14:18:04 2013 +0200 mshtml: Added IHTMLEventObj::x implementation. --- dlls/mshtml/htmlevent.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 9ea1708..ec56029 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -621,10 +622,24 @@ static HRESULT WINAPI HTMLEventObj_get_reason(IHTMLEventObj *iface, LONG *p) static HRESULT WINAPI HTMLEventObj_get_x(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); + LONG x = 0; - FIXME("(%p)->(%p)\n", This, p); + TRACE("(%p)->(%p)\n", This, p); - *p = -1; + if(This->nsevent) { + nsIDOMUIEvent *ui_event; + nsresult nsres; + + nsres = nsIDOMEvent_QueryInterface(This->nsevent, &IID_nsIDOMUIEvent, (void**)&ui_event); + if(NS_SUCCEEDED(nsres)) { + /* NOTE: pageX is not exactly right here. */ + nsres = nsIDOMUIEvent_GetPageX(ui_event, &x); + assert(nsres == NS_OK); + nsIDOMUIEvent_Release(ui_event); + } + } + + *p = x; return S_OK; }

1 0

Ken Thomases : winemac: Let Wine always drive window minimization; Cocoa just requests it.
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: 54291ad3d10aa75671811afd15578f7a9e8278b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54291ad3d10aa75671811afd1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Sep 30 10:29:23 2013 -0500 winemac: Let Wine always drive window minimization; Cocoa just requests it. --- dlls/winemac.drv/cocoa_window.h | 1 - dlls/winemac.drv/cocoa_window.m | 37 +++++++---------------- dlls/winemac.drv/event.c | 10 +++--- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/macdrv_cocoa.h | 2 +- dlls/winemac.drv/window.c | 61 ++++++++++++++++++++++++++------------- 6 files changed, 59 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=54291ad3d10aa75671811…

1 0

Dmitry Timoshkov : ntdll: Unify the checks for asynchronous NtReadFile behaviour.
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: fe3bc8c574a63b2e37cfe18803c150c54ca2e34d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe3bc8c574a63b2e37cfe1880… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 30 20:19:34 2013 +0900 ntdll: Unify the checks for asynchronous NtReadFile behaviour. --- dlls/ntdll/file.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 13bcb3c..62ae135 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -587,7 +587,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, ULONG total = 0; enum server_fd_type type; ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_user; - BOOL send_completion = FALSE; + BOOL send_completion = FALSE, async_read; TRACE("(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p),partial stub!\n", hFile,hEvent,apc,apc_user,io_status,buffer,length,offset,key); @@ -604,9 +604,11 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, goto done; } + async_read = !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)); + if (type == FD_TYPE_FILE) { - if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && (!offset || offset->QuadPart < 0)) + if (async_read && (!offset || offset->QuadPart < 0)) { status = STATUS_INVALID_PARAMETER; goto done; @@ -623,7 +625,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, goto done; } } - if (options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) + if (!async_read) /* update file pointer position */ lseek( unix_handle, offset->QuadPart + result, SEEK_SET ); @@ -634,7 +636,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, } else if (type == FD_TYPE_SERIAL) { - if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && (!offset || offset->QuadPart < 0)) + if (async_read && (!offset || offset->QuadPart < 0)) { status = STATUS_INVALID_PARAMETER; goto done; @@ -675,7 +677,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, goto done; } - if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT))) + if (async_read) { async_fileio_read *fileio; BOOL avail_mode;

1 0

Sebastian Lackner : winex11: Call destroy_gl_drawable before destroying the window.
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: e915cfd4e7ca78369a17172891b5a5f8e442d880 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e915cfd4e7ca78369a1717289… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Sep 28 04:35:17 2013 +0200 winex11: Call destroy_gl_drawable before destroying the window. --- dlls/winex11.drv/window.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 1ff36eb..741a303 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1598,6 +1598,8 @@ void CDECL X11DRV_DestroyWindow( HWND hwnd ) struct x11drv_thread_data *thread_data = x11drv_thread_data(); struct x11drv_win_data *data; + destroy_gl_drawable( hwnd ); + if (!(data = get_win_data( hwnd ))) return; destroy_whole_window( data, FALSE ); @@ -1609,7 +1611,6 @@ void CDECL X11DRV_DestroyWindow( HWND hwnd ) XDeleteContext( gdi_display, (XID)hwnd, win_data_context ); release_win_data( data ); HeapFree( GetProcessHeap(), 0, data ); - destroy_gl_drawable( hwnd ); }

1 0

Dmitry Timoshkov : ntdll: Don't use asynchronous file IO in the loader.
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: c7afb0bb882fd0ca6656b9c6a503b4465916a927 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7afb0bb882fd0ca6656b9c6a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 30 20:19:39 2013 +0900 ntdll: Don't use asynchronous file IO in the loader. --- dlls/ntdll/loader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index b3abad0..b1c7600 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1881,7 +1881,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, attr.ObjectName = &nt_name; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, 0 )) *handle = 0; + if (NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE )) *handle = 0; goto found; } @@ -1916,7 +1916,7 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, attr.ObjectName = &nt_name; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, 0 )) *handle = 0; + if (NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE )) *handle = 0; } found: RtlFreeUnicodeString( &nt_name );

1 0

Dmitry Timoshkov : ntdll: Unify the checks for asynchronous NtWriteFile behaviour.
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: 5e5fb99755aa8f8ca6ffae2a451ebdeb45e05403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e5fb99755aa8f8ca6ffae2a4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Sep 30 20:19:20 2013 +0900 ntdll: Unify the checks for asynchronous NtWriteFile behaviour. --- dlls/ntdll/file.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 1cc8f87..13bcb3c 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -950,7 +950,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, ULONG total = 0; enum server_fd_type type; ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_user; - BOOL send_completion = FALSE; + BOOL send_completion = FALSE, async_write; TRACE("(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p)!\n", hFile,hEvent,apc,apc_user,io_status,buffer,length,offset,key); @@ -967,9 +967,11 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, goto done; } + async_write = !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)); + if (type == FD_TYPE_FILE) { - if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && (!offset || offset->QuadPart < 0)) + if (async_write && (!offset || offset->QuadPart < 0)) { status = STATUS_INVALID_PARAMETER; goto done; @@ -1007,7 +1009,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, } } - if (options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) + if (!async_write) /* update file pointer position */ lseek( unix_handle, off + result, SEEK_SET ); @@ -1018,7 +1020,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, } else if (type == FD_TYPE_SERIAL) { - if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && + if (async_write && (!offset || (offset->QuadPart < 0 && offset->QuadPart != (LONGLONG)-1 /* FILE_WRITE_TO_END_OF_FILE */))) { status = STATUS_INVALID_PARAMETER; @@ -1055,7 +1057,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, goto done; } - if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT))) + if (async_write) { async_fileio_write *fileio;

1 0

Thomas Faber : mmdevapi: Fix build with MSVC.
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: 513f8286cbeff8d7e226229b8fb08bc8ea963a31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=513f8286cbeff8d7e226229b8… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Mon Sep 30 14:13:13 2013 +0200 mmdevapi: Fix build with MSVC. --- dlls/mmdevapi/devenum.c | 3 ++- dlls/mmdevapi/mmdevapi.h | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 21a3530..eebf4ed 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -569,7 +569,8 @@ static HRESULT WINAPI MMDevice_Activate(IMMDevice *iface, REFIID riid, DWORD cls { /* ::Load cannot assume the interface stays alive after the function returns, * so just create the interface on the stack, saves a lot of complicated code */ - IPropertyBagImpl bag = { { &PB_Vtbl }, This->devguid }; + IPropertyBagImpl bag = { { &PB_Vtbl } }; + bag.devguid = This->devguid; hr = IPersistPropertyBag_Load(ppb, &bag.IPropertyBag_iface, NULL); IPersistPropertyBag_Release(ppb); if (FAILED(hr)) diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h index c511240..2a04780 100644 --- a/dlls/mmdevapi/mmdevapi.h +++ b/dlls/mmdevapi/mmdevapi.h @@ -41,18 +41,18 @@ typedef struct _DriverFuncs { * If multiple drivers think they are valid, they will return a * priority value reflecting the likelihood that they are actually * valid. See enum _DriverPriority. */ - int WINAPI (*pGetPriority)(void); + int (WINAPI *pGetPriority)(void); /* ids gets an array of human-friendly endpoint names * keys gets an array of driver-specific stuff that is used * in GetAudioEndpoint to identify the endpoint * it is the caller's responsibility to free both arrays, and * all of the elements in both arrays with HeapFree() */ - HRESULT WINAPI (*pGetEndpointIDs)(EDataFlow flow, WCHAR ***ids, + HRESULT (WINAPI *pGetEndpointIDs)(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num, UINT *default_index); - HRESULT WINAPI (*pGetAudioEndpoint)(void *key, IMMDevice *dev, + HRESULT (WINAPI *pGetAudioEndpoint)(void *key, IMMDevice *dev, IAudioClient **out); - HRESULT WINAPI (*pGetAudioSessionManager)(IMMDevice *device, + HRESULT (WINAPI *pGetAudioSessionManager)(IMMDevice *device, IAudioSessionManager2 **out); } DriverFuncs;

1 0

Rico Schüller : d3dx9: Handle FX/ TX blobs in D3DXFindShaderComment().
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: e615c67bc72ed1dafc6584a15380561b96c5ee68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e615c67bc72ed1dafc6584a15… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Sep 30 01:19:00 2013 +0200 d3dx9: Handle FX/TX blobs in D3DXFindShaderComment(). --- dlls/d3dx9_36/shader.c | 14 +++++++++++++- dlls/d3dx9_36/tests/shader.c | 40 ++++++++++++++++++++++++++++++++++------ 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 2ff967c..460fe5a 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -154,6 +154,7 @@ const char * WINAPI D3DXGetVertexShaderProfile(struct IDirect3DDevice9 *device) HRESULT WINAPI D3DXFindShaderComment(const DWORD *byte_code, DWORD fourcc, const void **data, UINT *size) { const DWORD *ptr = byte_code; + DWORD version; TRACE("byte_code %p, fourcc %x, data %p, size %p\n", byte_code, fourcc, data, size); @@ -161,7 +162,18 @@ HRESULT WINAPI D3DXFindShaderComment(const DWORD *byte_code, DWORD fourcc, const if (size) *size = 0; if (!byte_code) return D3DERR_INVALIDCALL; - if (!is_valid_bytecode(*byte_code)) return D3DXERR_INVALIDDATA; + + version = *ptr >> 16; + if (version != 0x4658 /* FX */ + && version != 0x5458 /* TX */ + && version != 0x7ffe + && version != 0x7fff + && version != 0xfffe /* VS */ + && version != 0xffff) /* PS */ + { + WARN("Invalid data supplied\n"); + return D3DXERR_INVALIDDATA; + } while (*++ptr != D3DSIO_END) { diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 02e69af..c19617f 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -20,12 +20,23 @@ #include "wine/test.h" #include "d3dx9.h" +#define FCC_TEXT MAKEFOURCC('T','E','X','T') +#define FCC_CTAB MAKEFOURCC('C','T','A','B') + static const DWORD shader_zero[] = {0x0}; static const DWORD shader_invalid[] = {0xeeee0100}; static const DWORD shader_empty[] = {0xfffeffff, 0x0000ffff}; +static const DWORD simple_fx[] = {0x46580000, 0x0002fffe, FCC_TEXT, 0x00000000, 0x0000ffff}; + +static const DWORD simple_tx[] = {0x54580000, 0x0002fffe, FCC_TEXT, 0x00000000, 0x0000ffff}; + +static const DWORD simple_7ffe[] = {0x7ffe0000, 0x0002fffe, FCC_TEXT, 0x00000000, 0x0000ffff}; + +static const DWORD simple_7fff[] = {0x7fff0000, 0x0002fffe, FCC_TEXT, 0x00000000, 0x0000ffff}; + static const DWORD simple_vs[] = { 0xfffe0101, /* vs_1_1 */ 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position0 v0 */ @@ -44,9 +55,6 @@ static const DWORD simple_ps[] = { 0x00000005, 0x800f0000, 0xb0e40000, 0x80e40000, /* mul r0, t0, r0 */ 0x0000ffff}; /* END */ -#define FCC_TEXT MAKEFOURCC('T','E','X','T') -#define FCC_CTAB MAKEFOURCC('C','T','A','B') - static const DWORD shader_with_ctab[] = { 0xfffe0300, /* vs_3_0 */ 0x0002fffe, FCC_TEXT, 0x00000000, /* TEXT comment */ @@ -320,7 +328,7 @@ static void test_find_shader_comment(void) hr = D3DXFindShaderComment(shader_with_ctab, MAKEFOURCC('C','T','A','B'), &data, NULL); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); - ok(data == shader_with_ctab + 6, "Got result %p, expected %p.\n", data, shader_with_ctab + 6); + ok(data == shader_with_ctab + 6, "Got result %p, expected %p\n", data, shader_with_ctab + 6); hr = D3DXFindShaderComment(shader_with_ctab, 0, &data, &size); ok(hr == S_FALSE, "Got result %x, expected 1 (S_FALSE)\n", hr); @@ -334,8 +342,8 @@ static void test_find_shader_comment(void) hr = D3DXFindShaderComment(shader_with_ctab, MAKEFOURCC('C','T','A','B'), &data, &size); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); - ok(data == shader_with_ctab + 6, "Got result %p, expected %p.\n", data, shader_with_ctab + 6); - ok(size == 28, "Got result %d, expected 28\n", size); + ok(data == shader_with_ctab + 6, "Got result %p, expected %p\n", data, shader_with_ctab + 6); + ok(size == 28, "Got result %u, expected 28\n", size); hr = D3DXFindShaderComment(shader_zero, MAKEFOURCC('C','T','A','B'), &data, &size); ok(hr == D3DXERR_INVALIDDATA, "Got result %x, expected %x (D3DXERR_INVALIDDATA)\n", hr, D3DXERR_INVALIDDATA); @@ -351,6 +359,26 @@ static void test_find_shader_comment(void) ok(hr == S_FALSE, "Got result %x, expected %x (S_FALSE)\n", hr, S_FALSE); ok(!data, "Got %p, expected NULL\n", data); ok(!size, "Got %u, expected 0\n", size); + + hr = D3DXFindShaderComment(simple_fx, FCC_TEXT, &data, &size); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + ok(data == simple_fx + 3, "Got result %p, expected %p\n", data, simple_fx + 3); + ok(size == 4, "Got result %u, expected 4\n", size); + + hr = D3DXFindShaderComment(simple_tx, FCC_TEXT, &data, &size); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + ok(data == simple_tx + 3, "Got result %p, expected %p\n", data, simple_tx + 3); + ok(size == 4, "Got result %u, expected 4\n", size); + + hr = D3DXFindShaderComment(simple_7ffe, FCC_TEXT, &data, &size); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + ok(data == simple_7ffe + 3, "Got result %p, expected %p\n", data, simple_7ffe + 3); + ok(size == 4, "Got result %u, expected 4\n", size); + + hr = D3DXFindShaderComment(simple_7fff, FCC_TEXT, &data, &size); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + ok(data == simple_7fff + 3, "Got result %p, expected %p\n", data, simple_7fff + 3); + ok(size == 4, "Got result %u, expected 4\n", size); } static void test_get_shader_constant_table_ex(void)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2013