wine-commits October 2010

wine-commits@winehq.org

2 participants
1174 discussions

Sven Baars : ipconfig: Update the Dutch translation.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: 5fb9e9081ab06cd8792f962902a3d7fd3f6b8a1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb9e9081ab06cd8792f96290… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Oct 8 22:09:23 2010 +0200 ipconfig: Update the Dutch translation. --- programs/ipconfig/Nl.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/Nl.rc b/programs/ipconfig/Nl.rc index 66c126f..0891188 100644 --- a/programs/ipconfig/Nl.rc +++ b/programs/ipconfig/Nl.rc @@ -44,4 +44,5 @@ STRINGTABLE STRING_DHCP_ENABLED, "DHCP geactiveerd" STRING_YES, "Ja" STRING_NO, "Nee" + STRING_DEFAULT_GATEWAY, "Standaard gateway" }

1 0

Alexandre Julliard : jscript: Remove an incorrect and unnecessary error check.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: 33d091fef60ffc10f8e2b1704a848a85c19cc7aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d091fef60ffc10f8e2b1704… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 9 16:48:23 2010 +0200 jscript: Remove an incorrect and unnecessary error check. --- dlls/jscript/error.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index a8f1dcd..20911a8 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -105,8 +105,6 @@ static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, msg = NULL; }else { ret = SysAllocString(object_errorW); - if(!V_BSTR(retv)) - hres = E_OUTOFMEMORY; } }

1 0

Alexandre Julliard : jscript: Add a missing terminator to a string constant .
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: 58825125ced5e2dbcbf189e86fe06ec88cebcc4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=58825125ced5e2dbcbf189e86… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 9 16:10:56 2010 +0200 jscript: Add a missing terminator to a string constant. --- dlls/jscript/dispex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 368cb6e..0e823d3 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -804,7 +804,7 @@ HRESULT init_dispex_from_constr(jsdisp_t *dispex, script_ctx_t *ctx, const built dispex_prop_t *prop; HRESULT hres; - static const WCHAR constructorW[] = {'c','o','n','s','t','r','u','c','t','o','r'}; + static const WCHAR constructorW[] = {'c','o','n','s','t','r','u','c','t','o','r',0}; static const WCHAR prototypeW[] = {'p','r','o','t','o','t','y','p','e',0}; hres = find_prop_name_prot(constr, prototypeW, &prop);

1 0

Alexandre Julliard : user32/tests: Test GetIconInfoExW too since the A version is broken on Win64.
by Alexandre Julliard 11 Oct '10

11 Oct '10

Module: wine Branch: master Commit: d1df0c42eab7c35471f407068fafcb7a4f421ce4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1df0c42eab7c35471f407068… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 9 14:20:34 2010 +0200 user32/tests: Test GetIconInfoExW too since the A version is broken on Win64. --- dlls/user32/tests/cursoricon.c | 30 +++++++++++++++++++++++------- 1 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index cc00ac0..446bdf9 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -66,6 +66,9 @@ static HANDLE child_process; static BOOL (WINAPI *pGetCursorInfo)(CURSORINFO *); static BOOL (WINAPI *pGetIconInfoExA)(HICON,ICONINFOEXA *); +static BOOL (WINAPI *pGetIconInfoExW)(HICON,ICONINFOEXW *); + +static const int is_win64 = (sizeof(void *) > sizeof(int)); static LRESULT CALLBACK callback_child(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { @@ -948,14 +951,26 @@ static void test_LoadImage(void) ok(handle != NULL, "LoadImage() failed.\n"); if (pGetIconInfoExA) { - ICONINFOEXA infoex; - infoex.cbSize = sizeof(infoex); - ret = pGetIconInfoExA( handle, &infoex ); + ICONINFOEXA infoexA; + ICONINFOEXW infoexW; + infoexA.cbSize = sizeof(infoexA); + ret = pGetIconInfoExA( handle, &infoexA ); ok( ret, "GetIconInfoEx failed err %d\n", GetLastError() ); - todo_wine ok( infoex.wResID == (UINT_PTR)IDI_HAND, "GetIconInfoEx wrong resid %x\n", infoex.wResID ); - todo_wine ok( GetModuleHandleA(infoex.szModName) == GetModuleHandleA("user32.dll"), - "GetIconInfoEx wrong module %s\n", infoex.szModName ); - ok( infoex.szResName[0] == 0, "GetIconInfoEx wrong name %s\n", infoex.szResName ); + todo_wine ok( infoexA.wResID == (UINT_PTR)IDI_HAND, "GetIconInfoEx wrong resid %x\n", infoexA.wResID ); + /* the A version is broken on 64-bit, it truncates the string after the first char */ + if (is_win64 && infoexA.szModName[0] && infoexA.szModName[1] == 0) + trace( "GetIconInfoExA broken on Win64\n" ); + else + todo_wine ok( GetModuleHandleA(infoexA.szModName) == GetModuleHandleA("user32.dll"), + "GetIconInfoEx wrong module %s\n", infoexA.szModName ); + ok( infoexA.szResName[0] == 0, "GetIconInfoEx wrong name %s\n", infoexA.szResName ); + infoexW.cbSize = sizeof(infoexW); + ret = pGetIconInfoExW( handle, &infoexW ); + ok( ret, "GetIconInfoEx failed err %d\n", GetLastError() ); + todo_wine ok( infoexW.wResID == (UINT_PTR)IDI_HAND, "GetIconInfoEx wrong resid %x\n", infoexW.wResID ); + todo_wine ok( GetModuleHandleW(infoexW.szModName) == GetModuleHandleA("user32.dll"), + "GetIconInfoEx wrong module %s\n", wine_dbgstr_w(infoexW.szModName) ); + ok( infoexW.szResName[0] == 0, "GetIconInfoEx wrong name %s\n", wine_dbgstr_w(infoexW.szResName) ); } SetLastError(0xdeadbeef); DestroyIcon(handle); @@ -1794,6 +1809,7 @@ START_TEST(cursoricon) { pGetCursorInfo = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetCursorInfo" ); pGetIconInfoExA = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetIconInfoExA" ); + pGetIconInfoExW = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetIconInfoExW" ); test_argc = winetest_get_mainargs(&test_argv); if (test_argc >= 3)

1 0

Frédéric Delanoy : French translation for release 1.2.1
by Jeremy Newman 08 Oct '10

08 Oct '10

Module: website Branch: master Commit: 36051798673361fa71eeeee3b5bc18f948bb7554 URL: http://source.winehq.org/git/website.git/?a=commit;h=36051798673361fa71eeee… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 8 20:05:51 2010 +0200 French translation for release 1.2.1 --- news/fr/2010100801.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/fr/2010100801.xml b/news/fr/2010100801.xml new file mode 100644 index 0000000..ce9c6cb --- /dev/null +++ b/news/fr/2010100801.xml @@ -0,0 +1,16 @@ +<news> +<date>8 octobre 2010</date> +<title>Sortie de Wine 1.2.1</title> +<body> + La version de maintenance 1.2.1 de Wine est à présent disponible. + <a href="{$root}/announce/1.2.1">Nouveautés</a> de cette version : +<ul> + <li>Mises à jour de traductions.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.2.1.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Alexandre Julliard : wininet: Load X509_STORE_CTX_get_ex_data from libcrypto not libssl.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: 0cc9c52f8c5ad5e1f821177f165fbb72be90d2d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cc9c52f8c5ad5e1f821177f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 8 19:15:45 2010 +0200 wininet: Load X509_STORE_CTX_get_ex_data from libcrypto not libssl. --- dlls/wininet/netconnection.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index a1c3090..16b534b 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -152,7 +152,6 @@ MAKE_FUNCPTR(SSL_CTX_set_default_verify_paths); MAKE_FUNCPTR(SSL_CTX_set_verify); MAKE_FUNCPTR(SSL_get_current_cipher); MAKE_FUNCPTR(SSL_CIPHER_get_bits); -MAKE_FUNCPTR(X509_STORE_CTX_get_ex_data); /* OpenSSL's libcrypto functions that we use */ MAKE_FUNCPTR(BIO_new_fp); @@ -162,6 +161,7 @@ MAKE_FUNCPTR(CRYPTO_set_locking_callback); MAKE_FUNCPTR(ERR_free_strings); MAKE_FUNCPTR(ERR_get_error); MAKE_FUNCPTR(ERR_error_string); +MAKE_FUNCPTR(X509_STORE_CTX_get_ex_data); MAKE_FUNCPTR(i2d_X509); MAKE_FUNCPTR(sk_num); MAKE_FUNCPTR(sk_value); @@ -431,7 +431,6 @@ DWORD NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) DYNSSL(SSL_CTX_set_verify); DYNSSL(SSL_get_current_cipher); DYNSSL(SSL_CIPHER_get_bits); - DYNSSL(X509_STORE_CTX_get_ex_data); #undef DYNSSL #define DYNCRYPTO(x) \ @@ -449,6 +448,7 @@ DWORD NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) DYNCRYPTO(ERR_free_strings); DYNCRYPTO(ERR_get_error); DYNCRYPTO(ERR_error_string); + DYNCRYPTO(X509_STORE_CTX_get_ex_data); DYNCRYPTO(i2d_X509); DYNCRYPTO(sk_num); DYNCRYPTO(sk_value);

1 0

Jacek Caban : urlmon: Skip more tests on too old IEs.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: 61cd0648f2f508c0bbe4d6c3bcef69da0f6e5e7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=61cd0648f2f508c0bbe4d6c3b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 8 17:49:04 2010 +0200 urlmon: Skip more tests on too old IEs. --- dlls/urlmon/tests/stream.c | 5 +++++ dlls/urlmon/tests/url.c | 5 +++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/stream.c b/dlls/urlmon/tests/stream.c index 329addb..fc3f639 100644 --- a/dlls/urlmon/tests/stream.c +++ b/dlls/urlmon/tests/stream.c @@ -370,6 +370,11 @@ static void test_URLOpenStreamW(void) START_TEST(stream) { + if(!GetProcAddress(GetModuleHandleA("urlmon.dll"), "CompareSecurityIds")) { + win_skip("Too old IE\n"); + return; + } + create_file(); test_URLOpenBlockingStreamW(); test_URLOpenStreamW(); diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 0db6dff..9bd25a7 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -3141,6 +3141,11 @@ START_TEST(url) hurlmon = GetModuleHandle("urlmon.dll"); pCreateAsyncBindCtxEx = (void*) GetProcAddress(hurlmon, "CreateAsyncBindCtxEx"); + if(!GetProcAddress(hurlmon, "CompareSecurityIds")) { + win_skip("Too old IE\n"); + return; + } + complete_event = CreateEvent(NULL, FALSE, FALSE, NULL); complete_event2 = CreateEvent(NULL, FALSE, FALSE, NULL); thread_id = GetCurrentThreadId();

1 0

Henri Verbeet : wined3d: SM4 immediate constants are typeless.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: 1fe1676ae9dfd1664683d507986e3882423b496c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fe1676ae9dfd1664683d5079… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 8 13:12:18 2010 +0200 wined3d: SM4 immediate constants are typeless. --- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/shader.c | 4 ++-- dlls/wined3d/shader_sm4.c | 12 ++++++------ dlls/wined3d/wined3d_private.h | 12 +++--------- 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8e9795e..0b5bb36 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1477,11 +1477,11 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3DSPR_IMMCONST: switch (reg->immconst_type) { - case WINED3D_IMMCONST_FLOAT: + case WINED3D_IMMCONST_SCALAR: sprintf(register_name, "%.8e", *(const float *)reg->immconst_data); break; - case WINED3D_IMMCONST_FLOAT4: + case WINED3D_IMMCONST_VEC4: sprintf(register_name, "vec4(%.8e, %.8e, %.8e, %.8e)", *(const float *)&reg->immconst_data[0], *(const float *)&reg->immconst_data[1], *(const float *)&reg->immconst_data[2], *(const float *)&reg->immconst_data[3]); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 075c204..bc39b3b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1033,11 +1033,11 @@ static void shader_dump_register(const struct wined3d_shader_register *reg, TRACE("("); switch (reg->immconst_type) { - case WINED3D_IMMCONST_FLOAT: + case WINED3D_IMMCONST_SCALAR: TRACE("%.8e", *(const float *)reg->immconst_data); break; - case WINED3D_IMMCONST_FLOAT4: + case WINED3D_IMMCONST_VEC4: TRACE("%.8e, %.8e, %.8e, %.8e", *(const float *)&reg->immconst_data[0], *(const float *)&reg->immconst_data[1], *(const float *)&reg->immconst_data[2], *(const float *)&reg->immconst_data[3]); diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index ecd1ec3..a438614 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -90,8 +90,8 @@ enum wined3d_sm4_register_type enum wined3d_sm4_immconst_type { - WINED3D_SM4_IMMCONST_FLOAT = 0x1, - WINED3D_SM4_IMMCONST_FLOAT4 = 0x2, + WINED3D_SM4_IMMCONST_SCALAR = 0x1, + WINED3D_SM4_IMMCONST_VEC4 = 0x2, }; struct wined3d_sm4_data @@ -354,14 +354,14 @@ static void shader_sm4_read_src_param(void *data, const DWORD **ptr, struct wine switch(immconst_type) { - case WINED3D_SM4_IMMCONST_FLOAT: - src_param->reg.immconst_type = WINED3D_IMMCONST_FLOAT; + case WINED3D_SM4_IMMCONST_SCALAR: + src_param->reg.immconst_type = WINED3D_IMMCONST_SCALAR; memcpy(src_param->reg.immconst_data, *ptr, 1 * sizeof(DWORD)); *ptr += 1; break; - case WINED3D_SM4_IMMCONST_FLOAT4: - src_param->reg.immconst_type = WINED3D_IMMCONST_FLOAT4; + case WINED3D_SM4_IMMCONST_VEC4: + src_param->reg.immconst_type = WINED3D_IMMCONST_VEC4; memcpy(src_param->reg.immconst_data, *ptr, 4 * sizeof(DWORD)); *ptr += 4; break; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 467eb28..3651c32 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -313,8 +313,8 @@ typedef enum _WINED3DSHADER_PARAM_REGISTER_TYPE enum wined3d_immconst_type { - WINED3D_IMMCONST_FLOAT, - WINED3D_IMMCONST_FLOAT4, + WINED3D_IMMCONST_SCALAR, + WINED3D_IMMCONST_VEC4, }; #define WINED3DSP_NOSWIZZLE (0 | (1 << 2) | (2 << 4) | (3 << 6)) @@ -2821,13 +2821,7 @@ static inline BOOL shader_is_scalar(const struct wined3d_shader_register *reg) } case WINED3DSPR_IMMCONST: - switch(reg->immconst_type) - { - case WINED3D_IMMCONST_FLOAT: - return TRUE; - default: - return FALSE; - } + return reg->immconst_type == WINED3D_IMMCONST_SCALAR; default: return FALSE;

1 0

Henri Verbeet : wined3d: The SM4 sincos opcode has two destination arguments.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: 3e45fe7488f72e4247aaeb72829b227e6cabf188 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e45fe7488f72e4247aaeb728… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 8 13:12:17 2010 +0200 wined3d: The SM4 sincos opcode has two destination arguments. --- dlls/wined3d/shader_sm4.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index ea845dc..ecd1ec3 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -145,7 +145,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_MUL, WINED3DSIH_MUL, 1, 2}, {WINED3D_SM4_OP_RET, WINED3DSIH_RET, 0, 0}, {WINED3D_SM4_OP_RSQ, WINED3DSIH_RSQ, 1, 1}, - {WINED3D_SM4_OP_SINCOS, WINED3DSIH_SINCOS, 1, 2}, + {WINED3D_SM4_OP_SINCOS, WINED3DSIH_SINCOS, 2, 1}, }; static const WINED3DSHADER_PARAM_REGISTER_TYPE register_type_table[] =

1 0

Henri Verbeet : wined3d: Recognize the SM4 imul opcode.
by Alexandre Julliard 08 Oct '10

08 Oct '10

Module: wine Branch: master Commit: d369136a9664900d7bea3b47a7fb835e158a35b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d369136a9664900d7bea3b47a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 8 13:12:16 2010 +0200 wined3d: Recognize the SM4 imul opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7c10407..c053e7f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4966,6 +4966,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IF */ NULL /* Hardcoded into the shader */, /* WINED3DSIH_IFC */ shader_hw_ifc, /* WINED3DSIH_IGE */ NULL, + /* WINED3DSIH_IMUL */ NULL, /* WINED3DSIH_LABEL */ shader_hw_label, /* WINED3DSIH_LIT */ shader_hw_map2gl, /* WINED3DSIH_LOG */ shader_hw_log_pow, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d24260d..8e9795e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5024,6 +5024,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IF */ shader_glsl_if, /* WINED3DSIH_IFC */ shader_glsl_ifc, /* WINED3DSIH_IGE */ NULL, + /* WINED3DSIH_IMUL */ NULL, /* WINED3DSIH_LABEL */ shader_glsl_label, /* WINED3DSIH_LIT */ shader_glsl_lit, /* WINED3DSIH_LOG */ shader_glsl_log, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 682188e..075c204 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -70,6 +70,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IF */ "if", /* WINED3DSIH_IFC */ "ifc", /* WINED3DSIH_IGE */ "ige", + /* WINED3DSIH_IMUL */ "imul", /* WINED3DSIH_LABEL */ "label", /* WINED3DSIH_LIT */ "lit", /* WINED3DSIH_LOG */ "log", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 7ab6c1a..ea845dc 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -63,6 +63,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_IADD = 0x1e, WINED3D_SM4_OP_IF = 0x1f, WINED3D_SM4_OP_IGE = 0x21, + WINED3D_SM4_OP_IMUL = 0x26, WINED3D_SM4_OP_LOG = 0x2f, WINED3D_SM4_OP_LOOP = 0x30, WINED3D_SM4_OP_LT = 0x31, @@ -132,6 +133,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_IADD, WINED3DSIH_IADD, 1, 2}, {WINED3D_SM4_OP_IF, WINED3DSIH_IF, 0, 1}, {WINED3D_SM4_OP_IGE, WINED3DSIH_IGE, 1, 2}, + {WINED3D_SM4_OP_IMUL, WINED3DSIH_IMUL, 2, 2}, {WINED3D_SM4_OP_LOG, WINED3DSIH_LOG, 1, 1}, {WINED3D_SM4_OP_LOOP, WINED3DSIH_LOOP, 0, 0}, {WINED3D_SM4_OP_LT, WINED3DSIH_LT, 1, 2}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bb719ca..467eb28 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -438,6 +438,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IF, WINED3DSIH_IFC, WINED3DSIH_IGE, + WINED3DSIH_IMUL, WINED3DSIH_LABEL, WINED3DSIH_LIT, WINED3DSIH_LOG,

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 October 2010