May 2009 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Merge wined3d_private_types.h into wined3d_private .h.
by Alexandre Julliard May 1, 2009

May 1, 2009

Module: wine Branch: master Commit: 7420a96736b5328b83890bfbc387612cc7649efb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7420a96736b5328b83890bfbc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 1 09:13:54 2009 +0200 wined3d: Merge wined3d_private_types.h into wined3d_private.h. --- dlls/wined3d/wined3d_private.h | 212 ++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private_types.h | 228 ---------------------------------- 2 files changed, 201 insertions(+), 239 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7420a96736b5328b83890…

1 0

Henri Verbeet : wined3d: Merge shader_dump_arr_entry() into shader_dump_register().
by Alexandre Julliard May 1, 2009

May 1, 2009

Module: wine Branch: master Commit: 752d80400d66614c0d5ecc24fbc7486ed6cdd0cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=752d80400d66614c0d5ecc24f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 1 09:13:53 2009 +0200 wined3d: Merge shader_dump_arr_entry() into shader_dump_register(). --- dlls/wined3d/baseshader.c | 56 ++++++++++++++++++-------------------------- 1 files changed, 23 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index acc4b71..cc7bf88 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -911,34 +911,21 @@ static void shader_dump_decl_usage(const struct wined3d_shader_semantic *semanti } } -static void shader_dump_arr_entry(const struct wined3d_shader_src_param *rel_addr, - UINT register_idx, DWORD shader_version) -{ - if (rel_addr) - { - TRACE("["); - shader_dump_src_param(rel_addr, shader_version); - TRACE(" + "); - } - TRACE("%u", register_idx); - if (rel_addr) TRACE("]"); -} - static void shader_dump_register(WINED3DSHADER_PARAM_REGISTER_TYPE register_type, UINT register_idx, const struct wined3d_shader_src_param *rel_addr, DWORD shader_version) { static const char * const rastout_reg_names[] = {"oPos", "oFog", "oPts"}; static const char * const misctype_reg_names[] = {"vPos", "vFace"}; + UINT offset = register_idx; switch (register_type) { case WINED3DSPR_TEMP: - TRACE("r%u", register_idx); + TRACE("r"); break; case WINED3DSPR_INPUT: TRACE("v"); - shader_dump_arr_entry(rel_addr, register_idx, shader_version); break; case WINED3DSPR_CONST: @@ -946,11 +933,11 @@ static void shader_dump_register(WINED3DSHADER_PARAM_REGISTER_TYPE register_type case WINED3DSPR_CONST3: case WINED3DSPR_CONST4: TRACE("c"); - shader_dump_arr_entry(rel_addr, shader_get_float_offset(register_type, register_idx), shader_version); + offset = shader_get_float_offset(register_type, register_idx); break; case WINED3DSPR_TEXTURE: /* vs: case WINED3DSPR_ADDR */ - TRACE("%c%u", (shader_is_pshader_version(shader_version) ? 't' : 'a'), register_idx); + TRACE("%c", shader_is_pshader_version(shader_version) ? 't' : 'a'); break; case WINED3DSPR_RASTOUT: @@ -958,7 +945,7 @@ static void shader_dump_register(WINED3DSHADER_PARAM_REGISTER_TYPE register_type break; case WINED3DSPR_COLOROUT: - TRACE("oC%u", register_idx); + TRACE("oC"); break; case WINED3DSPR_DEPTHOUT: @@ -966,35 +953,26 @@ static void shader_dump_register(WINED3DSHADER_PARAM_REGISTER_TYPE register_type break; case WINED3DSPR_ATTROUT: - TRACE("oD%u", register_idx); + TRACE("oD"); break; case WINED3DSPR_TEXCRDOUT: /* Vertex shaders >= 3.0 use general purpose output registers * (WINED3DSPR_OUTPUT), which can include an address token */ - if (WINED3DSHADER_VERSION_MAJOR(shader_version) >= 3) - { - TRACE("o"); - shader_dump_arr_entry(rel_addr, register_idx, shader_version); - } - else - { - TRACE("oT%u", register_idx); - } + if (WINED3DSHADER_VERSION_MAJOR(shader_version) >= 3) TRACE("o"); + else TRACE("oT"); break; case WINED3DSPR_CONSTINT: TRACE("i"); - shader_dump_arr_entry(rel_addr, register_idx, shader_version); break; case WINED3DSPR_CONSTBOOL: TRACE("b"); - shader_dump_arr_entry(rel_addr, register_idx, shader_version); break; case WINED3DSPR_LABEL: - TRACE("l%u", register_idx); + TRACE("l"); break; case WINED3DSPR_LOOP: @@ -1002,7 +980,7 @@ static void shader_dump_register(WINED3DSHADER_PARAM_REGISTER_TYPE register_type break; case WINED3DSPR_SAMPLER: - TRACE("s%u", register_idx); + TRACE("s"); break; case WINED3DSPR_MISCTYPE: @@ -1011,13 +989,25 @@ static void shader_dump_register(WINED3DSHADER_PARAM_REGISTER_TYPE register_type break; case WINED3DSPR_PREDICATE: - TRACE("p%u", register_idx); + TRACE("p"); break; default: TRACE("unhandled_rtype(%#x)", register_type); break; } + + if (register_type != WINED3DSPR_RASTOUT && register_type != WINED3DSPR_MISCTYPE) + { + if (rel_addr) + { + TRACE("["); + shader_dump_src_param(rel_addr, shader_version); + TRACE(" + "); + } + TRACE("%u", offset); + if (rel_addr) TRACE("]"); + } } static void shader_dump_dst_param(const struct wined3d_shader_dst_param *param, DWORD shader_version)

1 0

Damjan Jovanovic : wine.inf: Add more file type descriptions.
by Alexandre Julliard May 1, 2009

May 1, 2009

Module: wine Branch: master Commit: 6144104f24700862c05b616efca9da2f38102368 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6144104f24700862c05b616ef… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri May 1 10:11:07 2009 +0200 wine.inf: Add more file type descriptions. --- tools/wine.inf.in | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index fb7c68c..f42dea8 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -121,21 +121,27 @@ HKCR,.wav,"Content Type",2,"audio/wav" HKCR,.xml,,2,"xmlfile" HKCR,.xml,"Content Type",2,"text/xml" HKCR,.xsl,"Content Type",2,"text/xsl" +HKCR,chm.file,,2,"Compiled HTML Help File" HKCR,chm.file\shell\open\command,,2,"%11%\hh.exe %1" +HKCR,cplfile,,2,"Control Panel Item" HKCR,cplfile\shell\cplopen,,2,"Open with Control Panel" HKCR,cplfile\shell\cplopen\command,,2,"rundll32.exe shell32.dll,Control_RunDLL ""%1"",%*" +HKCR,exefile,,2,"Application" HKCR,exefile\DefaultIcon,,2,"%1" HKCR,exefile\shell\open\command,,2,"""%1"" %*" HKCR,folder\shell\open\ddeexec,,2,"[ViewFolder("%l", %I, %S)]" HKCR,folder\shell\open\ddeexec,"NoActivateHandler",2,"" HKCR,folder\shell\open\ddeexec\application,,2,"Folders" +HKCR,hlpfile,,2,"Help File" HKCR,hlpfile\shell\open\command,,2,"%11%\winhlp32.exe %1" HKCR,htmlfile\shell\open\command,,2,"%11%\winebrowser.exe -nohome" HKCR,htmlfile\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," HKCR,htmlfile\shell\open\ddeexec,"NoActivateHandler",2,"" HKCR,htmlfile\shell\open\ddeexec\Application,,2,"IExplore" HKCR,htmlfile\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" +HKCR,inffile,,2,"Setup Information" HKCR,inffile\shell\install\command,,2,"%11%\rundll32.exe setupapi,InstallHinfSection DefaultInstall 132 %1" +HKCR,inifile,,2,"Configuration Settings" HKCR,inifile\shell\open\command,,2,"%11%\notepad.exe %1" HKCR,inifile\shell\print\command,,2,"%11%\notepad.exe /p %1" HKCR,lnkfile,,2,"Shortcut" @@ -144,16 +150,20 @@ HKCR,lnkfile,"IsShortcut",2,"yes" HKCR,lnkfile\CLSID,,2,"{00021401-0000-0000-C000-000000000046}" HKCR,lnkfile\shellex\IconHandler,,2,"{00021401-0000-0000-C000-000000000046}" HKCR,lnkfile\shellex\ContextMenuHandlers\{00021401-0000-0000-C000-000000000046},,0x10, +HKCR,Msi.Package,,2,"Windows Installer Package" HKCR,Msi.Package\DefaultIcon,,2,"msiexec.exe" HKCR,Msi.Package\shell\Open\command,,2,"msiexec /i ""%1""" HKCR,Msi.Package\shell\Repair\command,,2,"msiexec /f ""%1""" HKCR,Msi.Package\shell\Uninstall\command,,2,"msiexec /x ""%1""" +HKCR,rtffile,,2,"Rich Text Document" HKCR,rtffile\shell\open\command,,2,"%11%\wordpad.exe %1" HKCR,rtffile\shell\print\command,,2,"%11%\wordpad.exe /p %1" +HKCR,txtfile,,2,"Text Document" HKCR,txtfile\shell\open\command,,2,"%11%\notepad.exe %1" HKCR,txtfile\shell\print\command,,2,"%11%\notepad.exe /p %1" HKCR,wrifile\shell\open\command,,2,"%11%\wordpad.exe %1" HKCR,wrifile\shell\print\command,,2,"%11%\wordpad.exe /p %1" +HKCR,xmlfile,,2,"XML Document" HKCR,xmlfile\shell\open\command,,2,"%11%\winebrowser.exe -nohome" HKCR,xmlfile\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," HKCR,xmlfile\shell\open\ddeexec,"NoActivateHandler",2,""

1 0