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

Henri Verbeet : wined3d: Add support for immediate constants to shader_dump_register().
by Alexandre Julliard May 7, 2009

May 7, 2009

Module: wine Branch: master Commit: 690d666de5fb263c9ecb3837a6fc4f9a1ece3001 URL: http://source.winehq.org/git/wine.git/?a=commit;h=690d666de5fb263c9ecb3837a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 6 17:59:22 2009 +0200 wined3d: Add support for immediate constants to shader_dump_register(). --- dlls/wined3d/baseshader.c | 33 ++++++++++++++++++++++++++++++--- 1 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 52dd4cb..19bd0c3 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -667,6 +667,7 @@ static void shader_dump_decl_usage(const struct wined3d_shader_semantic *semanti } static void shader_dump_register(WINED3DSHADER_PARAM_REGISTER_TYPE register_type, UINT register_idx, + enum wined3d_immconst_type immconst_type, const DWORD *immconst_data, const struct wined3d_shader_src_param *rel_addr, const struct wined3d_shader_version *shader_version) { static const char * const rastout_reg_names[] = {"oPos", "oFog", "oPts"}; @@ -747,12 +748,37 @@ static void shader_dump_register(WINED3DSHADER_PARAM_REGISTER_TYPE register_type TRACE("p"); break; + case WINED3DSPR_IMMCONST: + TRACE("l"); + break; + default: TRACE("unhandled_rtype(%#x)", register_type); break; } - if (register_type != WINED3DSPR_RASTOUT && register_type != WINED3DSPR_MISCTYPE) + if (register_type == WINED3DSPR_IMMCONST) + { + TRACE("("); + switch (immconst_type) + { + case WINED3D_IMMCONST_FLOAT: + TRACE("%.8e", *(float *)immconst_data); + break; + + case WINED3D_IMMCONST_FLOAT4: + TRACE("%.8e, %.8e, %.8e, %.8e", + *(float *)&immconst_data[0], *(float *)&immconst_data[1], + *(float *)&immconst_data[2], *(float *)&immconst_data[3]); + break; + + default: + TRACE("<unhandled immconst_type %#x>", immconst_type); + break; + } + TRACE(")"); + } + else if (register_type != WINED3DSPR_RASTOUT && register_type != WINED3DSPR_MISCTYPE) { if (rel_addr) { @@ -770,7 +796,7 @@ void shader_dump_dst_param(const struct wined3d_shader_dst_param *param, { DWORD write_mask = param->write_mask; - shader_dump_register(param->register_type, param->register_idx, param->rel_addr, shader_version); + shader_dump_register(param->register_type, param->register_idx, 0, NULL, param->rel_addr, shader_version); if (write_mask != WINED3DSP_WRITEMASK_ALL) { @@ -804,7 +830,8 @@ void shader_dump_src_param(const struct wined3d_shader_src_param *param, if (src_modifier == WINED3DSPSM_ABS || src_modifier == WINED3DSPSM_ABSNEG) TRACE("abs("); - shader_dump_register(param->register_type, param->register_idx, param->rel_addr, shader_version); + shader_dump_register(param->register_type, param->register_idx, + param->immconst_type, param->immconst_data, param->rel_addr, shader_version); if (src_modifier) {

1 0

Vincent Povirk : gdiplus: Stub GdipSetRenderingOrigin.
by Alexandre Julliard May 7, 2009

May 7, 2009

Module: wine Branch: master Commit: 27b47ead7eb4f0909b57ea592d0d3e8d4054a728 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27b47ead7eb4f0909b57ea592… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 6 16:03:27 2009 -0500 gdiplus: Stub GdipSetRenderingOrigin. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 6b6bc79..c53456c 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -582,7 +582,7 @@ @ stdcall GdipSetPenWidth(ptr long) @ stdcall GdipSetPixelOffsetMode(ptr long) @ stdcall GdipSetPropertyItem(ptr ptr) -@ stub GdipSetRenderingOrigin +@ stdcall GdipSetRenderingOrigin(ptr long long) @ stdcall GdipSetSmoothingMode(ptr long) @ stdcall GdipSetSolidFillColor(ptr ptr) @ stdcall GdipSetStringFormatAlign(ptr long) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 9ba7d47..68d71c5 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3241,6 +3241,18 @@ GpStatus WINGDIPAPI GdipSetPixelOffsetMode(GpGraphics *graphics, PixelOffsetMode return Ok; } +GpStatus WINGDIPAPI GdipSetRenderingOrigin(GpGraphics *graphics, INT x, INT y) +{ + static int calls; + + TRACE("(%p,%i,%i)\n", graphics, x, y); + + if (!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics *graphics, SmoothingMode mode) { TRACE("(%p, %d)\n", graphics, mode);

1 0

Henri Verbeet : wined3d: Store the shader version in the frontend' s private data.
by Alexandre Julliard May 7, 2009

May 7, 2009

Module: wine Branch: master Commit: 5c63d93e18f050dc9912fd385e4d5a9d52765967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c63d93e18f050dc9912fd385… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 6 17:59:21 2009 +0200 wined3d: Store the shader version in the frontend's private data. --- dlls/wined3d/baseshader.c | 38 +++++++++++++++++++------------------- dlls/wined3d/shader_sm1.c | 27 +++++++++++++++++---------- dlls/wined3d/shader_sm4.c | 13 ++++++++----- dlls/wined3d/wined3d_private.h | 11 +++++------ 4 files changed, 49 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c63d93e18f050dc9912f…

1 0

Henri Verbeet : wined3d: Increase the size of glsl_src_param_t.param_str.
by Alexandre Julliard May 7, 2009

May 7, 2009

Module: wine Branch: master Commit: 69861b8fed3268edc9b331d47cff92bf15dcc034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69861b8fed3268edc9b331d47… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 6 17:59:22 2009 +0200 wined3d: Increase the size of glsl_src_param_t.param_str. It constains the register name plus potential modifiers, so it should be larger than reg_name instead of smaller. --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 82caaa3..628aff5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -53,7 +53,7 @@ typedef struct { typedef struct { char reg_name[150]; - char param_str[100]; + char param_str[200]; } glsl_src_param_t; typedef struct {

1 0

Henri Verbeet : wined3d: Improve shader_sm4_read_opcode() to handle some simple opcodes.
by Alexandre Julliard May 7, 2009

May 7, 2009

Module: wine Branch: master Commit: 94cf6186587252c3730d59ba8a6173fc9413fdd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94cf6186587252c3730d59ba8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 6 17:59:21 2009 +0200 wined3d: Improve shader_sm4_read_opcode() to handle some simple opcodes. --- dlls/wined3d/shader_sm4.c | 58 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 53 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 5ec8688..9a5707a 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -40,6 +40,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); #define WINED3D_SM4_SWIZZLE_SHIFT 4 #define WINED3D_SM4_SWIZZLE_MASK (0xff << WINED3D_SM4_SWIZZLE_SHIFT) +enum wined3d_sm4_opcode +{ + WINED3D_SM4_OP_ADD = 0x00, + WINED3D_SM4_OP_EXP = 0x19, + WINED3D_SM4_OP_MOV = 0x36, + WINED3D_SM4_OP_MUL = 0x38, + WINED3D_SM4_OP_RET = 0x3e, + WINED3D_SM4_OP_SINCOS = 0x4d, +}; + enum wined3d_sm4_register_type { WINED3D_SM4_RT_TEMP = 0x0, @@ -59,6 +69,24 @@ struct wined3d_sm4_data const DWORD *end; }; +struct wined3d_sm4_opcode_info +{ + enum wined3d_sm4_opcode opcode; + enum WINED3D_SHADER_INSTRUCTION_HANDLER handler_idx; + UINT dst_count; + UINT src_count; +}; + +static const struct wined3d_sm4_opcode_info opcode_table[] = +{ + {WINED3D_SM4_OP_ADD, WINED3DSIH_ADD, 1, 2}, + {WINED3D_SM4_OP_EXP, WINED3DSIH_EXP, 1, 1}, + {WINED3D_SM4_OP_MOV, WINED3DSIH_MOV, 1, 1}, + {WINED3D_SM4_OP_MUL, WINED3DSIH_MUL, 1, 2}, + {WINED3D_SM4_OP_RET, WINED3DSIH_RET, 0, 0}, + {WINED3D_SM4_OP_SINCOS, WINED3DSIH_SINCOS, 1, 2}, +}; + static const WINED3DSHADER_PARAM_REGISTER_TYPE register_type_table[] = { /* WINED3D_SM4_RT_TEMP */ WINED3DSPR_TEMP, @@ -68,6 +96,18 @@ static const WINED3DSHADER_PARAM_REGISTER_TYPE register_type_table[] = /* WINED3D_SM4_RT_IMMCONST */ WINED3DSPR_IMMCONST, }; +static const struct wined3d_sm4_opcode_info *get_opcode_info(enum wined3d_sm4_opcode opcode) +{ + unsigned int i; + + for (i = 0; i < sizeof(opcode_table) / sizeof(*opcode_table); ++i) + { + if (opcode == opcode_table[i].opcode) return &opcode_table[i]; + } + + return NULL; +} + static void *shader_sm4_init(const DWORD *byte_code) { struct wined3d_sm4_data *priv = HeapAlloc(GetProcessHeap(), 0, sizeof(*priv)); @@ -99,18 +139,26 @@ static void shader_sm4_read_header(void *data, const DWORD **ptr, DWORD *shader_ static void shader_sm4_read_opcode(void *data, const DWORD **ptr, struct wined3d_shader_instruction *ins, UINT *param_size, DWORD shader_version) { + const struct wined3d_sm4_opcode_info *opcode_info; DWORD token = *(*ptr)++; DWORD opcode = token & WINED3D_SM4_OPCODE_MASK; - FIXME("Unrecognized opcode %#x, token 0x%08x\n", opcode, token); + *param_size = ((token & WINED3D_SM4_INSTRUCTION_LENGTH_MASK) >> WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT) - 1; - ins->handler_idx = WINED3DSIH_TABLE_SIZE; + opcode_info = get_opcode_info(opcode); + if (!opcode_info) + { + FIXME("Unrecognized opcode %#x, token 0x%08x\n", opcode, token); + ins->handler_idx = WINED3DSIH_TABLE_SIZE; + return; + } + + ins->handler_idx = opcode_info->handler_idx; ins->flags = 0; ins->coissue = 0; ins->predicate = 0; - ins->dst_count = 0; - ins->src_count = 0; - *param_size = ((token & WINED3D_SM4_INSTRUCTION_LENGTH_MASK) >> WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT) - 1; + ins->dst_count = opcode_info->dst_count; + ins->src_count = opcode_info->src_count; } static void shader_sm4_read_src_param(const DWORD **ptr, struct wined3d_shader_src_param *src_param,

1 0

Henri Verbeet : wined3d: Create a struct wined3d_shader_version to store version information.
by Alexandre Julliard May 7, 2009

May 7, 2009

Module: wine Branch: master Commit: 65622a052c58683e6309c6663fd6322da26344df URL: http://source.winehq.org/git/wine.git/?a=commit;h=65622a052c58683e6309c6663… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 6 17:59:21 2009 +0200 wined3d: Create a struct wined3d_shader_version to store version information. The version tokens in SM1-3 and SM4 are similar, but not the same. --- dlls/wined3d/arb_program_shader.c | 51 +++--- dlls/wined3d/baseshader.c | 48 +++--- dlls/wined3d/glsl_shader.c | 71 ++++---- dlls/wined3d/pixelshader.c | 31 ++-- dlls/wined3d/shader_sm1.c | 337 +++++++++++++++++++------------------ dlls/wined3d/shader_sm4.c | 36 ++++- dlls/wined3d/vertexshader.c | 20 ++- dlls/wined3d/wined3d_private.h | 38 +++- 8 files changed, 350 insertions(+), 282 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=65622a052c58683e6309c…

1 0

André Hentschel : website: update winelib-page
by Jeremy Newman May 6, 2009

May 6, 2009

Module: website Branch: master Commit: 74ba1a03e3dac23bbeaa231effe019c4e940b4a7 URL: http://source.winehq.org/git/website.git/?a=commit;h=74ba1a03e3dac23bbeaa23… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed May 6 19:03:48 2009 +0200 website: update winelib-page --- templates/en/winelib.template | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/templates/en/winelib.template b/templates/en/winelib.template index 7a8a78f..90ee874 100644 --- a/templates/en/winelib.template +++ b/templates/en/winelib.template @@ -67,6 +67,8 @@ If you know of applications that should be listed here, please send your suggestions to <a href="mailto:dpaun(a)rogers.com">Dimi</a>. Currently, we have: <ul> + <li><a href="#winvi">WinVi</a> + <li><a href="#upp">Ultimate++</a> <li><a href="#abiword">AbiWord</a> <li><a href="#winamp">WinAMP</a> <li><a href="#openoffice">OpenOffice</a> @@ -94,7 +96,16 @@ <li> DONE: the Winelib platform has been included in the official application build system <li> ABANDONED: the application has been deem unsuitable for porting using Winelib </ul> - + + <a name="winvi"></a><h3 class=works>WinVi</h3> + <ul> + <li>worker: <a href="http://wiki.winehq.org/AndreHentschel">André Hentschel</a> + <li>status: Some GUI-specific differences to the original + <li>updated: May 02, 2009 + <li>homepage: <a href="http://www.winvi.de">www.winvi.de</a> + </ul> + Beside the 32-Bit winelib port it is the first application ported to 64-Bit winelib and still runs. + <a name="upp"></a><h3 class=todo>Ultimate++</h3> It seems to have a MinGW build system since Nov 2004. <ul>

1 0

Maik Schulz : updated german download.template with new Solaris information
by Maik Schulz May 6, 2009

May 6, 2009

Module: website Branch: master Commit: 6086e287fd10f35db0a8f5461cd19ce6257d64fe URL: http://source.winehq.org/git/website.git/?a=commit;h=6086e287fd10f35db0a8f5… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Wed May 6 18:25:36 2009 +0200 updated german download.template with new Solaris information --- templates/de/download.template | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index 70fd6e6..054b250 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -117,7 +117,7 @@ erbeten hat, dass sie die Wine-Website hosten. </td> <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=8…">Mandriva</a> binär .rpms für Mandriva Linux 2006, 2007 und 2008. Lade das 2008.1 Package herunter, falls Du eine - 2008.1 Version von Mandriva nutzt, z.B. 2008 Spring. Lade das 2008.0 Package herunter, falls du die erste + 2008.1 Version von Mandriva nutzt, z.B. 2008 Spring. Lade das 2008.0 Package herunter, falls Du die erste Mandriva Version aus 2008 nutzt.</td> <td><a href="mailto:marco(a)mandrivaclub.nl">Marco Meijer</a></td> </tr> @@ -150,14 +150,22 @@ erbeten hat, dass sie die Wine-Website hosten. </tr> <tr bgcolor="#ffffff"> - <td align="center"><a href="http://ocean1.ee.duth.gr/SolarisX/"> - <img src="{$root}/images/distro/sun.png" width="50" height="50" alt="Sun Solaris" border="0"></a> + <td align="center"><a href="http://www.sunfreepacks.com/listing/?limit=1000&offset=0"> + <img src="{$root}/images/distro/solaris.png" width="50" height="50" alt="Solaris 10" border="0"></a> </td> - <td> <a href="http://ocean1.ee.duth.gr/SolarisX/">Solaris</a> - binär und Quellcode für Solaris 10 und 11</td> + <td> <a href="http://www.sunfreepacks.com/listing/?limit=1000&offset=0">Solaris 10, SXCE</a> + ASwine, ASwine-SXCE binär .pkg für Solaris 10 und SXCE x86</td> <td><a href="mailto:asyropoulos(a)yahoo.com">Apostolos Syropoulos</a></td> </tr> + <tr bgcolor="#ffffff"> + <td align="center"><a href="http://pkg.opensolaris.org/contrib/en/catalog.shtml"> + <img src="{$root}/images/distro/opensolaris.png" width="50" height="50" alt="OpenSolaris" border="0"></a> + </td> + <td> <a href="http://pkg.opensolaris.org/contrib/en/catalog.shtml">OpenSolaris</a> + binär .pkg für OpenSolaris x86</td> + <td><a href="mailto:asyropoulos(a)yahoo.com">Apostolos Syropoulos</a></td> + </tr> <tr bgcolor="#ffffff"> <td align="center"><a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=1…">

1 0

Maik Schulz : german translation for release 1.1.20 news item
by Maik Schulz May 6, 2009

May 6, 2009

Module: website Branch: master Commit: 66dff7dab39c94052fae08b1bb1d61eefde511d8 URL: http://source.winehq.org/git/website.git/?a=commit;h=66dff7dab39c94052fae08… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Mon Apr 27 21:55:38 2009 +0200 german translation for release 1.1.20 news item --- news/de/2009042401.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/de/2009042401.xml b/news/de/2009042401.xml new file mode 100644 index 0000000..01683bc --- /dev/null +++ b/news/de/2009042401.xml @@ -0,0 +1,16 @@ +<news> +<date>24. April 2009</date> +<title>Wine 1.1.20 Freigegeben</title> +<body> + Die Entwicklungsversion 1.1.20 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.1.20">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Anzeige eines Dialogs bei Anwendungsabstürzen.</li> + <li>Stark verbesserte OLE kopieren/einfügen Unterstützung.</li> + <li>Diverse Listview-Verbesserungen.</li> + <li>Weitere Aufräumarbeiten am Direct3D Quellcode.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.20.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Maik Schulz : Merge branch 'master' of mschulz@winehq.org:/home/winehq/opt/ source/git/website
by Maik Schulz May 6, 2009

May 6, 2009

Module: website Branch: master Commit: 52d6de43c39daceeceed97759a6b7b8b31e9309c URL: http://source.winehq.org/git/website.git/?a=commit;h=52d6de43c39daceeceed97… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Wed May 6 17:31:35 2009 +0200 Merge branch 'master' of mschulz(a)winehq.org:/home/winehq/opt/source/git/website ---

1 0