May 2013 - Wine-commits - list.winehq.org

Alexandre Julliard : configure: Add explicit install targets in libs/ wine for make_makefiles.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: ce4b6451aabbe83809c7483c748cfa009cc090d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce4b6451aabbe83809c7483c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 10 22:01:44 2013 +0200 configure: Add explicit install targets in libs/wine for make_makefiles. --- configure | 2 +- configure.ac | 2 +- libs/wine/Makefile.in | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/configure b/configure index d4c1f8e..ef38bfd 100755 --- a/configure +++ b/configure @@ -16379,7 +16379,7 @@ wine_fn_config_makefile documentation enable_documentation wine_fn_config_makefile fonts enable_fonts install-lib wine_fn_config_makefile include enable_include install-dev wine_fn_config_makefile libs/port enable_libs_port -wine_fn_config_makefile libs/wine enable_libs_wine +wine_fn_config_makefile libs/wine enable_libs_wine install-dev,install-lib wine_fn_config_makefile libs/wpp enable_libs_wpp wine_fn_config_makefile loader enable_loader install-lib,manpage wine_fn_config_program aspnet_regiis enable_aspnet_regiis install diff --git a/configure.ac b/configure.ac index 6dd2348..b44673e 100644 --- a/configure.ac +++ b/configure.ac @@ -3173,7 +3173,7 @@ WINE_CONFIG_MAKEFILE([documentation]) WINE_CONFIG_MAKEFILE([fonts],,[install-lib]) WINE_CONFIG_MAKEFILE([include],,[install-dev]) WINE_CONFIG_MAKEFILE([libs/port]) -WINE_CONFIG_MAKEFILE([libs/wine]) +WINE_CONFIG_MAKEFILE([libs/wine],,[install-dev,install-lib]) WINE_CONFIG_MAKEFILE([libs/wpp]) WINE_CONFIG_MAKEFILE([loader],,[install-lib,manpage]) WINE_CONFIG_PROGRAM(aspnet_regiis,,[install]) diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index b8dc385..7de7799 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -111,4 +111,8 @@ version.c: dummy $(RELPATH): @cd $(TOOLSDIR)/tools && $(MAKE) relpath$(TOOLSEXT) +# Make sure that make_makefiles sees the install rules +install install-lib:: +install install-dev:: + @LIBWINE_RULES@

1 0

Sam Edwards : winex11: Cache XRandR 1.0 display mode.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: 3fc2bccac25c93f820afab53bddd5b228c169b67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fc2bccac25c93f820afab53b… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Fri May 10 09:51:21 2013 -0600 winex11: Cache XRandR 1.0 display mode. --- dlls/winex11.drv/xrandr.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 5ec8842..36b9fe9 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -68,6 +68,7 @@ static int primary_crtc; static struct x11drv_mode_info *dd_modes; static SizeID *xrandr10_modes; static unsigned int xrandr_mode_count; +static int xrandr_current_mode = -1; static int load_xrandr(void) { @@ -125,6 +126,9 @@ static int xrandr10_get_current_mode(void) unsigned int i; int res = -1; + if (xrandr_current_mode != -1) + return xrandr_current_mode; + sc = pXRRGetScreenInfo (gdi_display, DefaultRootWindow( gdi_display )); size = pXRRConfigCurrentConfiguration (sc, &rot); rate = pXRRConfigCurrentRate (sc); @@ -141,8 +145,10 @@ static int xrandr10_get_current_mode(void) if (res == -1) { ERR("In unknown mode, returning default\n"); - res = 0; + return 0; } + + xrandr_current_mode = res; return res; } @@ -177,6 +183,7 @@ static LONG xrandr10_set_current_mode( int mode ) if (stat == RRSetConfigSuccess) { + xrandr_current_mode = mode; X11DRV_resize_desktop( dd_modes[mode].width, dd_modes[mode].height ); return DISP_CHANGE_SUCCESSFUL; }

1 0

Sam Edwards : winex11: Cache XRandR 1.2 display mode.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: 3a5eef4eed44cb342d3d35d73fe19d2e0109f7ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a5eef4eed44cb342d3d35d73… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Fri May 10 10:03:42 2013 -0600 winex11: Cache XRandR 1.2 display mode. --- dlls/winex11.drv/xrandr.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 36b9fe9..fc09020 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -278,6 +278,9 @@ static int xrandr12_get_current_mode(void) XRRCrtcInfo *crtc_info; int i, ret = -1; + if (xrandr_current_mode != -1) + return xrandr_current_mode; + if (!(resources = pXRRGetScreenResourcesCurrent( gdi_display, root_window ))) { ERR("Failed to get screen resources.\n"); @@ -310,9 +313,10 @@ static int xrandr12_get_current_mode(void) if (ret == -1) { ERR("Unknown mode, returning default.\n"); - ret = 0; + return 0; } + xrandr_current_mode = ret; return ret; } @@ -354,6 +358,7 @@ static LONG xrandr12_set_current_mode( int mode ) return DISP_CHANGE_FAILED; } + xrandr_current_mode = mode; X11DRV_resize_desktop( dd_modes[mode].width, dd_modes[mode].height ); return DISP_CHANGE_SUCCESSFUL; }

1 0

Andrew Eikum : oleaut32: Sanity check some arguments.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: 787ac75045aef3b98af23387fb73b58077637152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=787ac75045aef3b98af23387f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 10 14:31:24 2013 -0500 oleaut32: Sanity check some arguments. --- dlls/oleaut32/typelib.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index d42dd34..8434e56 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5498,6 +5498,9 @@ static HRESULT WINAPI ITypeInfo_fnGetFuncDesc( ITypeInfo2 *iface, UINT index, TRACE("(%p) index %d\n", This, index); + if (!ppFuncDesc) + return E_INVALIDARG; + if (This->TypeAttr.typekind == TKIND_DISPATCH) hr = ITypeInfoImpl_GetInternalDispatchFuncDesc((ITypeInfo *)iface, index, &internal_funcdesc, NULL, @@ -5729,6 +5732,9 @@ static HRESULT WINAPI ITypeInfo_fnGetImplTypeFlags( ITypeInfo2 *iface, TRACE("(%p) index %d\n", This, index); + if(!pImplTypeFlags) + return E_INVALIDARG; + if(This->TypeAttr.typekind == TKIND_DISPATCH && index == 0){ *pImplTypeFlags = 0; return S_OK; @@ -7027,6 +7033,9 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); HRESULT result = E_FAIL; + if(!ppTInfo) + return E_INVALIDARG; + if ((This->hreftype != -1) && (This->hreftype == hRefType)) { *ppTInfo = (ITypeInfo *)&This->ITypeInfo2_iface; @@ -7424,6 +7433,9 @@ static HRESULT WINAPI ITypeInfo2_fnGetCustData( TRACE("%p %s %p\n", This, debugstr_guid(guid), pVarVal); + if(!guid || !pVarVal) + return E_INVALIDARG; + pCData = TLB_get_custdata_by_guid(&This->custdata_list, guid); VariantInit( pVarVal);

1 0

Andrew Eikum : oleaut32: Use containing TypeLib's HelpFile in ITypeInfo:: GetDocumentation.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: 1a00e932ad57dcc91f75c3bdbc8301fc32353f16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a00e932ad57dcc91f75c3bdb… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 10 14:31:29 2013 -0500 oleaut32: Use containing TypeLib's HelpFile in ITypeInfo::GetDocumentation. --- dlls/oleaut32/typelib.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 8434e56..b0a18b9 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6898,7 +6898,7 @@ static HRESULT WINAPI ITypeInfo_fnGetDocumentation( ITypeInfo2 *iface, if(pdwHelpContext) *pdwHelpContext=This->dwHelpContext; if(pBstrHelpFile) - *pBstrHelpFile=SysAllocString(This->DocString);/* FIXME */ + *pBstrHelpFile=SysAllocString(This->pTypeLib->HelpFile); return S_OK; }else {/* for a member */ pFDesc = TLB_get_funcdesc_by_memberid(This->funcdescs, This->TypeAttr.cFuncs, memid); @@ -6919,6 +6919,8 @@ static HRESULT WINAPI ITypeInfo_fnGetDocumentation( ITypeInfo2 *iface, *pBstrDocString=SysAllocString(pVDesc->HelpString); if(pdwHelpContext) *pdwHelpContext=pVDesc->HelpContext; + if(pBstrHelpFile) + *pBstrHelpFile = SysAllocString(This->pTypeLib->HelpFile); return S_OK; } }

1 0

Andrew Eikum : oleaut32: Don' t return bogus pointers if no data is available.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: 5f85b7c8ac9872519f3a43c96d03b5086006506c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f85b7c8ac9872519f3a43c96… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 10 14:31:35 2013 -0500 oleaut32: Don't return bogus pointers if no data is available. --- dlls/oleaut32/typelib.c | 44 +++++++++++++++++++++++++------------------- 1 files changed, 25 insertions(+), 19 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b0a18b9..bb9eaf4 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5330,9 +5330,12 @@ static HRESULT TLB_AllocAndInitFuncDesc( const FUNCDESC *src, FUNCDESC **dest_pt dest->funckind = FUNC_DISPATCH; buffer = (char *)(dest + 1); - dest->lprgscode = (SCODE *)buffer; - memcpy(dest->lprgscode, src->lprgscode, sizeof(*src->lprgscode) * src->cScodes); - buffer += sizeof(*src->lprgscode) * src->cScodes; + if (dest->cScodes) { + dest->lprgscode = (SCODE *)buffer; + memcpy(dest->lprgscode, src->lprgscode, sizeof(*src->lprgscode) * src->cScodes); + buffer += sizeof(*src->lprgscode) * src->cScodes; + } else + dest->lprgscode = NULL; hr = TLB_CopyElemDesc(&src->elemdescFunc, &dest->elemdescFunc, &buffer); if (FAILED(hr)) @@ -5341,23 +5344,26 @@ static HRESULT TLB_AllocAndInitFuncDesc( const FUNCDESC *src, FUNCDESC **dest_pt return hr; } - dest->lprgelemdescParam = (ELEMDESC *)buffer; - buffer += sizeof(ELEMDESC) * src->cParams; - for (i = 0; i < src->cParams; i++) - { - hr = TLB_CopyElemDesc(&src->lprgelemdescParam[i], &dest->lprgelemdescParam[i], &buffer); + if (dest->cParams) { + dest->lprgelemdescParam = (ELEMDESC *)buffer; + buffer += sizeof(ELEMDESC) * src->cParams; + for (i = 0; i < src->cParams; i++) + { + hr = TLB_CopyElemDesc(&src->lprgelemdescParam[i], &dest->lprgelemdescParam[i], &buffer); + if (FAILED(hr)) + break; + } if (FAILED(hr)) - break; - } - if (FAILED(hr)) - { - /* undo the above actions */ - for (i = i - 1; i >= 0; i--) - TLB_FreeElemDesc(&dest->lprgelemdescParam[i]); - TLB_FreeElemDesc(&dest->elemdescFunc); - SysFreeString((BSTR)dest); - return hr; - } + { + /* undo the above actions */ + for (i = i - 1; i >= 0; i--) + TLB_FreeElemDesc(&dest->lprgelemdescParam[i]); + TLB_FreeElemDesc(&dest->elemdescFunc); + SysFreeString((BSTR)dest); + return hr; + } + } else + dest->lprgelemdescParam = NULL; /* special treatment for dispinterfaces: this makes functions appear * to return their [retval] value when it is really returning an

1 0

Marcus Meissner : dinput: GetKeyNameW takes chars not bytes (Coverity).
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: 8990cf091d4de259f941ea1a6bb50becdc44f86e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8990cf091d4de259f941ea1a6… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat May 11 19:27:27 2013 +0200 dinput: GetKeyNameW takes chars not bytes (Coverity). --- dlls/dinput/keyboard.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 8e1d1a4..99697a1 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -439,7 +439,7 @@ static HRESULT WINAPI SysKeyboardWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface scan = DIDFT_GETINSTANCE(pdidoi->dwType); if (scan == DIK_PAUSE || scan == DIK_NUMLOCK) scan ^= 0x80; if (!GetKeyNameTextW((scan & 0x80) << 17 | (scan & 0x7f) << 16, - pdidoi->tszName, sizeof(pdidoi->tszName))) + pdidoi->tszName, sizeof(pdidoi->tszName)/sizeof(pdidoi->tszName[0]))) return DIERR_OBJECTNOTFOUND; _dump_OBJECTINSTANCEW(pdidoi);

1 0

Francois Gouget : comdlg32/tests: Fix compilation on systems that don' t support nameless structs or unions.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: fb9d76816a6fea4957fad8485ff8a2792418d4c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb9d76816a6fea4957fad8485… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 12 13:55:27 2013 +0200 comdlg32/tests: Fix compilation on systems that don't support nameless structs or unions. --- dlls/comdlg32/tests/printdlg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 7acbdb0..83be893 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -255,7 +255,7 @@ static void test_PrintDlgA(void) ok(pDlg->nCopies == 1234 || broken(pDlg->nCopies == 1), "expected nCopies 1234, got %d\n", pDlg->nCopies); ok(pDlg->hDevMode != 0, "hDevMode should not be 0\n"); dm = GlobalLock(pDlg->hDevMode); - ok(dm->dmCopies == 1, "expected dm->dmCopies 1, got %d\n", dm->dmCopies); + ok(S1(U1(*dm)).dmCopies == 1, "expected dm->dmCopies 1, got %d\n", S1(U1(*dm)).dmCopies); GlobalUnlock(pDlg->hDevMode); GlobalFree(pDlg->hDevMode); GlobalFree(pDlg->hDevNames); @@ -269,7 +269,7 @@ static void test_PrintDlgA(void) ok(pDlg->nCopies == 1, "expected nCopies 1, got %d\n", pDlg->nCopies); ok(pDlg->hDevMode != 0, "hDevMode should not be 0\n"); dm = GlobalLock(pDlg->hDevMode); - ok(dm->dmCopies == 1234, "expected dm->dmCopies 1234, got %d\n", dm->dmCopies); + ok(S1(U1(*dm)).dmCopies == 1234, "expected dm->dmCopies 1234, got %d\n", S1(U1(*dm)).dmCopies); GlobalUnlock(pDlg->hDevMode); GlobalFree(pDlg->hDevMode); GlobalFree(pDlg->hDevNames);

1 0

Christian Costa : d3dcompiler: Add a LUT to find compilation targets info.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: 6e77816301dfca0e07de2625daf8b358128ad879 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e77816301dfca0e07de2625d… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun May 12 23:55:51 2013 +0200 d3dcompiler: Add a LUT to find compilation targets info. --- dlls/d3dcompiler_43/compiler.c | 135 ++++++++++++++++++++++++----- dlls/d3dcompiler_43/d3dcompiler_private.h | 3 +- 2 files changed, 115 insertions(+), 23 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 4942985..985fc72 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -490,6 +490,103 @@ HRESULT WINAPI D3DAssemble(const void *data, SIZE_T datasize, const char *filena return hr; } +struct target_info { + const char *name; + enum shader_type type; + DWORD sm_major; + DWORD sm_minor; + DWORD level_major; + DWORD level_minor; + BOOL sw; + BOOL support; +}; + +/* Must be kept sorted for binary search */ +static const struct target_info targets_info[] = { + { "cs_4_0", ST_UNKNOWN, 4, 0, 0, 0, FALSE, FALSE }, + { "cs_4_1", ST_UNKNOWN, 4, 1, 0, 0, FALSE, FALSE }, + { "cs_5_0", ST_UNKNOWN, 5, 0, 0, 0, FALSE, FALSE }, + { "ds_5_0", ST_UNKNOWN, 5, 0, 0, 0, FALSE, FALSE }, + { "fx_2_0", ST_UNKNOWN, 2, 0, 0, 0, FALSE, FALSE }, + { "fx_4_0", ST_UNKNOWN, 4, 0, 0, 0, FALSE, FALSE }, + { "fx_4_1", ST_UNKNOWN, 4, 1, 0, 0, FALSE, FALSE }, + { "fx_5_0", ST_UNKNOWN, 5, 0, 0, 0, FALSE, FALSE }, + { "gs_4_0", ST_UNKNOWN, 4, 0, 0, 0, FALSE, FALSE }, + { "gs_4_1", ST_UNKNOWN, 4, 1, 0, 0, FALSE, FALSE }, + { "gs_5_0", ST_UNKNOWN, 5, 0, 0, 0, FALSE, FALSE }, + { "hs_5_0", ST_UNKNOWN, 5, 0, 0, 0, FALSE, FALSE }, + { "ps.1.0", ST_PIXEL, 1, 0, 0, 0, FALSE, TRUE }, + { "ps.1.1", ST_PIXEL, 1, 1, 0, 0, FALSE, FALSE }, + { "ps.1.2", ST_PIXEL, 1, 2, 0, 0, FALSE, FALSE }, + { "ps.1.3", ST_PIXEL, 1, 3, 0, 0, FALSE, FALSE }, + { "ps.1.4", ST_PIXEL, 1, 4, 0, 0, FALSE, FALSE }, + { "ps.2.0", ST_PIXEL, 2, 0, 0, 0, FALSE, TRUE }, + { "ps.2.a", ST_PIXEL, 2, 1, 0, 0, FALSE, FALSE }, + { "ps.2.b", ST_PIXEL, 2, 2, 0, 0, FALSE, FALSE }, + { "ps.2.sw", ST_PIXEL, 2, 0, 0, 0, TRUE, FALSE }, + { "ps.3.0", ST_PIXEL, 3, 0, 0, 0, FALSE, TRUE }, + { "ps_1_0", ST_PIXEL, 1, 0, 0, 0, FALSE, TRUE }, + { "ps_1_1", ST_PIXEL, 1, 1, 0, 0, FALSE, FALSE }, + { "ps_1_2", ST_PIXEL, 1, 2, 0, 0, FALSE, FALSE }, + { "ps_1_3", ST_PIXEL, 1, 3, 0, 0, FALSE, FALSE }, + { "ps_1_4", ST_PIXEL, 1, 4, 0, 0, FALSE, FALSE }, + { "ps_2_0", ST_PIXEL, 2, 0, 0, 0, FALSE, TRUE }, + { "ps_2_a", ST_PIXEL, 2, 1, 0, 0, FALSE, FALSE }, + { "ps_2_b", ST_PIXEL, 2, 2, 0, 0, FALSE, FALSE }, + { "ps_2_sw", ST_PIXEL, 2, 0, 0, 0, TRUE, FALSE }, + { "ps_3_0", ST_PIXEL, 3, 0, 0, 0, FALSE, TRUE }, + { "ps_3_sw", ST_PIXEL, 3, 0, 0, 0, TRUE, FALSE }, + { "ps_4_0", ST_PIXEL, 4, 0, 0, 0, FALSE, TRUE }, + { "ps_4_0_level_9_0", ST_PIXEL, 4, 0, 9, 0, FALSE, FALSE }, + { "ps_4_0_level_9_1", ST_PIXEL, 4, 0, 9, 1, FALSE, FALSE }, + { "ps_4_0_level_9_3", ST_PIXEL, 4, 0, 9, 3, FALSE, FALSE }, + { "ps_4_1", ST_PIXEL, 4, 1, 0, 0, FALSE, TRUE }, + { "ps_5_0", ST_PIXEL, 5, 0, 0, 0, FALSE, TRUE }, + { "tx_1_0", ST_UNKNOWN, 1, 0, 0, 0, FALSE, FALSE }, + { "vs.1.0", ST_VERTEX, 1, 0, 0, 0, FALSE, TRUE }, + { "vs.1.1", ST_VERTEX, 1, 1, 0, 0, FALSE, TRUE }, + { "vs.2.0", ST_VERTEX, 2, 0, 0, 0, FALSE, TRUE }, + { "vs.2.a", ST_VERTEX, 2, 1, 0, 0, FALSE, FALSE }, + { "vs.2.sw", ST_VERTEX, 2, 0, 0, 0, TRUE, FALSE }, + { "vs.3.0", ST_VERTEX, 3, 0, 0, 0, FALSE, TRUE }, + { "vs.3.sw", ST_VERTEX, 3, 0, 0, 0, TRUE, FALSE }, + { "vs_1_0", ST_VERTEX, 1, 0, 0, 0, FALSE, TRUE }, + { "vs_1_1", ST_VERTEX, 1, 1, 0, 0, FALSE, TRUE }, + { "vs_2_0", ST_VERTEX, 2, 0, 0, 0, FALSE, TRUE }, + { "vs_2_a", ST_VERTEX, 2, 1, 0, 0, FALSE, FALSE }, + { "vs_2_sw", ST_VERTEX, 2, 0, 0, 0, TRUE, FALSE }, + { "vs_3_0", ST_VERTEX, 3, 0, 0, 0, FALSE, TRUE }, + { "vs_3_sw", ST_VERTEX, 3, 0, 0, 0, TRUE, FALSE }, + { "vs_4_0", ST_VERTEX, 4, 0, 0, 0, FALSE, TRUE }, + { "vs_4_0_level_9_0", ST_VERTEX, 4, 0, 9, 0, FALSE, FALSE }, + { "vs_4_0_level_9_1", ST_VERTEX, 4, 0, 9, 1, FALSE, FALSE }, + { "vs_4_0_level_9_3", ST_VERTEX, 4, 0, 9, 3, FALSE, FALSE }, + { "vs_4_1", ST_VERTEX, 4, 1, 0, 0, FALSE, TRUE }, + { "vs_5_0", ST_VERTEX, 5, 0, 0, 0, FALSE, TRUE }, +}; + +static const struct target_info * get_target_info(const char *target) +{ + LONG min = 0; + LONG max = sizeof(targets_info) / sizeof(targets_info[0]) - 1; + LONG cur; + int res; + + while (min <= max) + { + cur = (min + max) / 2; + res = strcmp(target, targets_info[cur].name); + if (res < 0) + max = cur - 1; + else if (res > 0) + min = cur + 1; + else + return &targets_info[cur]; + } + + return NULL; +} + static HRESULT compile_shader(const char *preproc_shader, const char *target, const char *entrypoint, ID3DBlob **shader_blob, ID3DBlob **error_messages) { @@ -500,38 +597,32 @@ static HRESULT compile_shader(const char *preproc_shader, const char *target, co ID3DBlob *buffer; char *pos; enum shader_type shader_type; + const struct target_info *info; TRACE("Preprocessed shader source: %s\n", debugstr_a(preproc_shader)); - TRACE("Parsing compilation target %s.\n", debugstr_a(target)); - if (strlen(target) != 6 || target[1] != 's' || target[2] != '_' || target[4] != '_') + TRACE("Checking compilation target %s\n", debugstr_a(target)); + info = get_target_info(target); + if (!info) { - FIXME("Unknown compilation target %s.\n", debugstr_a(target)); + FIXME("Unknown compilation target %s\n", debugstr_a(target)); return D3DERR_INVALIDCALL; } - - if (target[0] == 'v') - shader_type = ST_VERTEX; - else if (target[0] == 'p') - shader_type = ST_PIXEL; else { - FIXME("Unsupported shader target type %s.\n", debugstr_a(target)); - return D3DERR_INVALIDCALL; + if (!info->support) + { + FIXME("Compilation target %s not yet supported\n", debugstr_a(target)); + return D3DERR_INVALIDCALL; + } + else + { + shader_type = info->type; + major = info->sm_major; + minor = info->sm_minor; + } } - major = target[3] - '0'; - if (major == 0 || major > 5) - { - FIXME("Unsupported shader target major version %d.\n", major); - return D3DERR_INVALIDCALL; - } - minor = target[5] - '0'; - if (minor > 1 || (minor == 1 && (shader_type != ST_VERTEX || major > 1))) - { - FIXME("Unsupported shader target minor version %d.\n", minor); - return D3DERR_INVALIDCALL; - } shader = parse_hlsl_shader(preproc_shader, shader_type, major, minor, entrypoint, &messages); if (messages) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index c8a92f1..d25b4e5 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -49,8 +49,9 @@ const char *debug_d3dcompiler_shader_variable_type(D3D_SHADER_VARIABLE_TYPE t) D enum shader_type { + ST_UNKNOWN, ST_VERTEX, - ST_PIXEL, + ST_PIXEL }; typedef enum BWRITER_COMPARISON_TYPE {

1 0

Christian Costa : d3dcompiler: Add trace to D3DPreprocess.
by Alexandre Julliard 13 May '13

13 May '13

Module: wine Branch: master Commit: af59f19461b8e6e8244d192baa8af1b530a83e16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af59f19461b8e6e8244d192ba… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun May 12 23:56:01 2013 +0200 d3dcompiler: Add trace to D3DPreprocess. --- dlls/d3dcompiler_43/compiler.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 985fc72..ac8fdc5 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -722,6 +722,9 @@ HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename HRESULT hr; ID3DBlob *buffer; + TRACE("data %p, size %lu, filename %s, defines %p, include %p, shader %p, error_messages %p\n", + data, size, debugstr_a(filename), defines, include, shader, error_messages); + if (!data) return E_INVALIDARG;

1 0