wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

Andrew Nguyen : ole32: Validate pointer parameters in MkParseDisplayName.
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: 7bdf023e69331c63eaa15c3808c97888e6d9c2a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bdf023e69331c63eaa15c380… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Thu May 20 10:35:27 2010 -0500 ole32: Validate pointer parameters in MkParseDisplayName. --- dlls/ole32/moniker.c | 8 +++++++- dlls/ole32/tests/moniker.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 2fb03ae..b0030de 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -1109,7 +1109,13 @@ HRESULT WINAPI MkParseDisplayName(LPBC pbc, LPCOLESTR szDisplayName, TRACE("(%p, %s, %p, %p)\n", pbc, debugstr_w(szDisplayName), pchEaten, ppmk); - if (!(IsValidInterface((LPUNKNOWN) pbc))) + if (!pbc || !IsValidInterface((LPUNKNOWN) pbc)) + return E_INVALIDARG; + + if (!szDisplayName || !*szDisplayName) + return E_INVALIDARG; + + if (!pchEaten || !ppmk) return E_INVALIDARG; *pchEaten = 0; diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index b4e3e2f..4432f99 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -814,12 +814,53 @@ static void test_MkParseDisplayName(void) static const WCHAR wszDisplayNameProgId1[] = {'S','t','d','F','o','n','t',':',0}; static const WCHAR wszDisplayNameProgId2[] = {'@','S','t','d','F','o','n','t',0}; static const WCHAR wszDisplayNameProgIdFail[] = {'S','t','d','F','o','n','t',0}; + static const WCHAR wszEmpty[] = {0}; char szDisplayNameFile[256]; WCHAR wszDisplayNameFile[256]; + int i; + + const struct + { + LPBC *ppbc; + LPCOLESTR szDisplayName; + LPDWORD pchEaten; + LPMONIKER *ppmk; + } invalid_parameters[] = + { + {NULL, NULL, NULL, NULL}, + {NULL, NULL, NULL, &pmk}, + {NULL, NULL, &eaten, NULL}, + {NULL, NULL, &eaten, &pmk}, + {NULL, wszEmpty, NULL, NULL}, + {NULL, wszEmpty, NULL, &pmk}, + {NULL, wszEmpty, &eaten, NULL}, + {NULL, wszEmpty, &eaten, &pmk}, + {&pbc, NULL, NULL, NULL}, + {&pbc, NULL, NULL, &pmk}, + {&pbc, NULL, &eaten, NULL}, + {&pbc, NULL, &eaten, &pmk}, + {&pbc, wszEmpty, NULL, NULL}, + {&pbc, wszEmpty, NULL, &pmk}, + {&pbc, wszEmpty, &eaten, NULL}, + {&pbc, wszEmpty, &eaten, &pmk}, + }; hr = CreateBindCtx(0, &pbc); ok_ole_success(hr, CreateBindCtx); + for (i = 0; i < sizeof(invalid_parameters)/sizeof(invalid_parameters[0]); i++) + { + eaten = 0xdeadbeef; + pmk = (IMoniker *)0xdeadbeef; + hr = MkParseDisplayName(invalid_parameters[i].ppbc ? *invalid_parameters[i].ppbc : NULL, + invalid_parameters[i].szDisplayName, + invalid_parameters[i].pchEaten, + invalid_parameters[i].ppmk); + ok(hr == E_INVALIDARG, "[%d] MkParseDisplayName should have failed with E_INVALIDARG instead of 0x%08x\n", i, hr); + ok(eaten == 0xdeadbeef, "[%d] Processed character count should have been 0xdeadbeef instead of %u\n", i, eaten); + ok(pmk == (IMoniker *)0xdeadbeef, "[%d] Output moniker pointer should have been 0xdeadbeef instead of %p\n", i, pmk); + } + hr = MkParseDisplayName(pbc, wszNonExistentProgId, &eaten, &pmk); ok(hr == MK_E_SYNTAX || hr == MK_E_CANTOPENFILE /* Win9x */, "MkParseDisplayName should have failed with MK_E_SYNTAX or MK_E_CANTOPENFILE instead of 0x%08x\n", hr);

1 0

Austin English : ntdll: Add stub for NtRaiseHardError.
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: c4ea80cf9becae4a63f74ab818df26b69c55d911 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4ea80cf9becae4a63f74ab81… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 20 12:30:46 2010 -0500 ntdll: Add stub for NtRaiseHardError. --- dlls/ntdll/error.c | 11 +++++++++++ dlls/ntdll/ntdll.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/error.c b/dlls/ntdll/error.c index 4c7d5a7..5537c87 100644 --- a/dlls/ntdll/error.c +++ b/dlls/ntdll/error.c @@ -128,6 +128,17 @@ DWORD WINAPI RtlGetLastWin32Error(void) return NtCurrentTeb()->LastErrorValue; } +/********************************************************************** + * NtRaiseHardError (NTDLL.@) + */ +NTSTATUS WINAPI NtRaiseHardError( NTSTATUS ErrorStatus, ULONG NumberOfParameters, + PUNICODE_STRING UnicodeStringParameterMask, PVOID *Paramaters, + HARDERROR_RESPONSE_OPTION ResponseOption, PHARDERROR_RESPONSE Response ) +{ + FIXME(": stub. Errorstatus was %08x\n", ErrorStatus); + return STATUS_NOT_IMPLEMENTED; +} + /*********************************************************************** * RtlSetLastWin32Error (NTDLL.@) * RtlRestoreLastWin32Error (NTDLL.@) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 241f3d8..37e0cca 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -275,7 +275,7 @@ @ stdcall NtQueryVolumeInformationFile(long ptr ptr long long) @ stdcall NtQueueApcThread(long ptr long long long) @ stdcall NtRaiseException(ptr ptr long) -@ stub NtRaiseHardError +@ stdcall NtRaiseHardError(long long ptr ptr long long) @ stdcall NtReadFile(long long ptr ptr ptr ptr long ptr ptr) @ stdcall NtReadFileScatter(long long ptr ptr ptr ptr long ptr ptr) @ stub NtReadRequestData

1 0

Aric Stewart : usp10: Correct Left and Right confusions for Arabic joining and shaping.
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: e276fbc22284135019c15bba055ad943328a4b01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e276fbc22284135019c15bba0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 21 10:08:30 2010 -0500 usp10: Correct Left and Right confusions for Arabic joining and shaping. --- dlls/usp10/shape.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index bccb1fd..71022ef 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -51,8 +51,8 @@ enum joining_types { enum joined_forms { Xn=0, - Xl, Xr, + Xl, Xm }; @@ -448,12 +448,12 @@ static CHAR neighbour_joining_type(int i, int delta, const CHAR* context_type, I static inline BOOL right_join_causing(CHAR joining_type) { - return (joining_type == jtR || joining_type == jtD || joining_type == jtC); + return (joining_type == jtL || joining_type == jtD || joining_type == jtC); } static inline BOOL left_join_causing(CHAR joining_type) { - return (joining_type == jtL || joining_type == jtD || joining_type == jtC); + return (joining_type == jtR || joining_type == jtD || joining_type == jtC); } /* SHAPE_ShapeArabicGlyphs @@ -470,13 +470,13 @@ void SHAPE_ShapeArabicGlyphs(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WC if (!psa->fLogicalOrder && psa->fRTL) { - dirR = -1; - dirL = 1; + dirR = 1; + dirL = -1; } else { - dirR = 1; - dirL = -1; + dirR = -1; + dirL = 1; } if (!psc->GSUB_Table)

1 0

Matteo Bruni : d3dx9: Shader assembler ps_2_x support.
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: 5786d3a0c776a320e7f91f461ce05779562772fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5786d3a0c776a320e7f91f461… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Thu May 20 01:14:25 2010 +0200 d3dx9: Shader assembler ps_2_x support. --- dlls/d3dx9_36/asmparser.c | 229 ++++++++++++++++++++++++++- dlls/d3dx9_36/asmshader.y | 6 +- dlls/d3dx9_36/bytecodewriter.c | 335 +++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/d3dx9_36_private.h | 6 + dlls/d3dx9_36/tests/asm.c | 13 ++- 5 files changed, 579 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5786d3a0c776a320e7f91…

1 0

Matteo Bruni : d3dx9: Add some more tests on register number checking.
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: ce3e846f3bfb2d162d2d90b27c0da74e5b48b408 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce3e846f3bfb2d162d2d90b27… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Fri May 21 16:25:38 2010 +0200 d3dx9: Add some more tests on register number checking. --- dlls/d3dx9_36/tests/asm.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 68d634f..c91cae9 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -747,6 +747,11 @@ static void vs_2_0_test(void) { "ret\n", {0xfffe0200, 0x01000019, 0xa0e41003, 0x0000001c, 0x0100001e, 0xa0e41003, 0x0000001c, 0x0000ffff} }, + { /* shader 29: labels up to 2047 are accepted even in vs_2_0 */ + "vs_2_0\n" + "call l2047\n", + {0xfffe0200, 0x01000019, 0xa0e417ff, 0x0000ffff} + }, }; exec_tests("vs_2_0", tests, sizeof(tests) / sizeof(tests[0])); @@ -1088,6 +1093,13 @@ static void vs_3_0_test(void) { {0xfffe0300, 0x05000051, 0xa00f0000, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f000000, 0x0000ffff} }, + { /* shader 14: no register number checks with relative addressing */ + "vs_3_0\n" + "add r0, v20[aL], r2\n", + {0xfffe0300, 0x04000002, 0x800f0000, 0x90e42014, 0xf0e40800, 0x80e40002, + 0x0000ffff} + }, + }; exec_tests("vs_3_0", tests, sizeof(tests) / sizeof(tests[0])); @@ -1255,6 +1267,21 @@ static void failure_test(void) { /* shader 27: oC3 is the max in >= ps_2_0 */ "ps_3_0\n" "add oC4, r0, r1\n", + /* shader 28: register v17 doesn't exist */ + "vs_3_0\n" + "add r0, r0, v17\n", + /* shader 29: register o13 doesn't exist */ + "vs_3_0\n" + "add o13, r0, r1\n", + /* shader 30: label > 2047 not allowed */ + "vs_3_0\n" + "call l2048\n", + /* shader 31: s20 register does not exist */ + "ps_3_0\n" + "texld r0, r1, s20\n", + /* shader 32: t5 not allowed in ps_1_3 */ + "ps_1_3\n" + "tex t5\n", }; HRESULT hr; unsigned int i;

1 0

Matteo Bruni : d3dx9: Shader assembler vs_2_x support.
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: 5050f7c8d2cbd965c15501f73d199ee989ef452e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5050f7c8d2cbd965c15501f73… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Sun May 16 20:57:52 2010 +0200 d3dx9: Shader assembler vs_2_x support. --- dlls/d3dx9_36/asmparser.c | 259 +++++++++++++++++++++ dlls/d3dx9_36/asmshader.y | 6 +- dlls/d3dx9_36/bytecodewriter.c | 473 +++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/d3dx9_36_private.h | 11 + dlls/d3dx9_36/tests/asm.c | 12 +- 5 files changed, 753 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5050f7c8d2cbd965c1550…

1 0

Matteo Bruni : d3dx9: Check for oCx register number.
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: 961db7964d89e7650a5618a53c5a3cf94b28515a URL: http://source.winehq.org/git/wine.git/?a=commit;h=961db7964d89e7650a5618a53… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Fri May 21 15:53:44 2010 +0200 d3dx9: Check for oCx register number. --- dlls/d3dx9_36/asmparser.c | 2 +- dlls/d3dx9_36/tests/asm.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/asmparser.c b/dlls/d3dx9_36/asmparser.c index 3062639..dfd0936 100644 --- a/dlls/d3dx9_36/asmparser.c +++ b/dlls/d3dx9_36/asmparser.c @@ -259,7 +259,7 @@ static const struct allowed_reg_type ps_3_reg_allowed[] = { { BWRITERSPR_MISCTYPE, 2 }, /* vPos and vFace */ { BWRITERSPR_LOOP, 1 }, { BWRITERSPR_LABEL, 2048 }, - { BWRITERSPR_COLOROUT, ~0U }, + { BWRITERSPR_COLOROUT, 4 }, { BWRITERSPR_DEPTHOUT, 1 }, { ~0U, 0 } /* End tag */ }; diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 79c6c07..0b8cd3e 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -1146,6 +1146,11 @@ static void ps_3_0_test(void) { "texkill v0\n", {0xffff0300, 0x01000041, 0x900f0000, 0x0000ffff} }, + { /* shader 11 */ + "ps_3_0\n" + "add oC3, r0, r1\n", + {0xffff0300, 0x03000002, 0x800f0803, 0x80e40000, 0x80e40001, 0x0000ffff} + }, }; exec_tests("ps_3_0", tests, sizeof(tests) / sizeof(tests[0])); @@ -1236,6 +1241,12 @@ static void failure_test(void) { /* shader 25: _x4 instruction modified not allowed in > ps_1_x */ "ps_3_0\n" "add_x4 r0, r0, r1\n", + /* shader 26: there aren't oCx registers in ps_1_x */ + "ps_1_3\n" + "add oC0, r0, r1\n", + /* shader 27: oC3 is the max in >= ps_2_0 */ + "ps_3_0\n" + "add oC4, r0, r1\n", }; HRESULT hr; unsigned int i;

1 0

Matteo Bruni : d3dx9: Use separate opcodes for TEXLDP and TEXLDB.
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: a9118ba1715c3a4833d3e45f19a69d418e8417bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9118ba1715c3a4833d3e45f1… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Fri May 21 14:56:43 2010 +0200 d3dx9: Use separate opcodes for TEXLDP and TEXLDB. There is no reason we have to strictly follow D3D bytecode format in our intermediate representation. --- dlls/d3dx9_36/asmshader.y | 4 ++-- dlls/d3dx9_36/asmutils.c | 8 ++++---- dlls/d3dx9_36/bytecodewriter.c | 4 ++-- dlls/d3dx9_36/d3dx9_36_private.h | 5 ++--- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx9_36/asmshader.y b/dlls/d3dx9_36/asmshader.y index 0949ee3..8be8328 100644 --- a/dlls/d3dx9_36/asmshader.y +++ b/dlls/d3dx9_36/asmshader.y @@ -724,12 +724,12 @@ instruction: INSTR_ADD omods dreg ',' sregs | INSTR_TEXLDP omods dreg ',' sregs { TRACE("TEXLDP\n"); - asm_ctx.funcs->instr(&asm_ctx, BWRITERSIO_TEX | ( BWRITERSI_TEXLD_PROJECT << BWRITER_OPCODESPECIFICCONTROL_SHIFT ), $2.mod, $2.shift, 0, &$3, &$5, 2); + asm_ctx.funcs->instr(&asm_ctx, BWRITERSIO_TEXLDP, $2.mod, $2.shift, 0, &$3, &$5, 2); } | INSTR_TEXLDB omods dreg ',' sregs { TRACE("TEXLDB\n"); - asm_ctx.funcs->instr(&asm_ctx, BWRITERSIO_TEX | ( BWRITERSI_TEXLD_BIAS << BWRITER_OPCODESPECIFICCONTROL_SHIFT ), $2.mod, $2.shift, 0, &$3, &$5, 2); + asm_ctx.funcs->instr(&asm_ctx, BWRITERSIO_TEXLDB, $2.mod, $2.shift, 0, &$3, &$5, 2); } | INSTR_DSX omods dreg ',' sregs { diff --git a/dlls/d3dx9_36/asmutils.c b/dlls/d3dx9_36/asmutils.c index e000a5f..bd6bcea 100644 --- a/dlls/d3dx9_36/asmutils.c +++ b/dlls/d3dx9_36/asmutils.c @@ -209,8 +209,8 @@ DWORD d3d9_opcode(DWORD bwriter_opcode) { case BWRITERSIO_COMMENT: return D3DSIO_COMMENT; case BWRITERSIO_END: return D3DSIO_END; - case BWRITERSIO_TEX | ( BWRITERSI_TEXLD_PROJECT << BWRITER_OPCODESPECIFICCONTROL_SHIFT ): return D3DSIO_TEX | D3DSI_TEXLD_PROJECT; - case BWRITERSIO_TEX | ( BWRITERSI_TEXLD_BIAS << BWRITER_OPCODESPECIFICCONTROL_SHIFT ): return D3DSIO_TEX | D3DSI_TEXLD_BIAS; + case BWRITERSIO_TEXLDP: return D3DSIO_TEX | D3DSI_TEXLD_PROJECT; + case BWRITERSIO_TEXLDB: return D3DSIO_TEX | D3DSI_TEXLD_BIAS; default: FIXME("Unhandled BWRITERSIO token %u\n", bwriter_opcode); @@ -484,8 +484,8 @@ const char *debug_print_opcode(DWORD opcode) { case BWRITERSIO_TEXLDL: return "texldl"; case BWRITERSIO_BREAKP: return "breakp"; - case BWRITERSIO_TEX | ( BWRITERSI_TEXLD_PROJECT << BWRITER_OPCODESPECIFICCONTROL_SHIFT ): return "texldp"; - case BWRITERSIO_TEX | ( BWRITERSI_TEXLD_BIAS << BWRITER_OPCODESPECIFICCONTROL_SHIFT ): return "texldb"; + case BWRITERSIO_TEXLDP: return "texldp"; + case BWRITERSIO_TEXLDB: return "texldb"; default: return "unknown"; } diff --git a/dlls/d3dx9_36/bytecodewriter.c b/dlls/d3dx9_36/bytecodewriter.c index 464ec52..a579ae8 100644 --- a/dlls/d3dx9_36/bytecodewriter.c +++ b/dlls/d3dx9_36/bytecodewriter.c @@ -693,8 +693,8 @@ static const struct instr_handler_table ps_3_handlers[] = { {BWRITERSIO_TEXLDL, instr_handler}, {BWRITERSIO_TEX, instr_handler}, - {BWRITERSIO_TEX | ( BWRITERSI_TEXLD_PROJECT << BWRITER_OPCODESPECIFICCONTROL_SHIFT ), instr_handler}, - {BWRITERSIO_TEX | ( BWRITERSI_TEXLD_BIAS << BWRITER_OPCODESPECIFICCONTROL_SHIFT ), instr_handler}, + {BWRITERSIO_TEXLDP, instr_handler}, + {BWRITERSIO_TEXLDB, instr_handler}, {BWRITERSIO_TEXKILL, instr_handler}, {BWRITERSIO_DSX, instr_handler}, {BWRITERSIO_DSY, instr_handler}, diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 923a0df..248503d 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -462,6 +462,8 @@ typedef enum _BWRITERSHADER_INSTRUCTION_OPCODE_TYPE { BWRITERSIO_SETP, BWRITERSIO_TEXLDL, BWRITERSIO_BREAKP, + BWRITERSIO_TEXLDP, + BWRITERSIO_TEXLDB, BWRITERSIO_COMMENT, BWRITERSIO_END, @@ -589,9 +591,6 @@ typedef enum _BWRITERDECLUSAGE { BWRITERDECLUSAGE_SAMPLE } BWRITERDECLUSAGE; -#define BWRITER_OPCODESPECIFICCONTROL_SHIFT 16 -#define BWRITER_OPCODESPECIFICCONTROL_MASK (0xff << BWRITER_OPCODESPECIFICCONTROL_SHIFT) - struct bwriter_shader *SlAssembleShader(const char *text, char **messages); DWORD SlWriteBytecode(const struct bwriter_shader *shader, int dxversion, DWORD **result); void SlDeleteShader(struct bwriter_shader *shader);

1 0

Matteo Bruni : d3dx9: Add missing texkill instruction parsing.
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: 1d3f462fefb687b8719d1ffcab71073dbf772ae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d3f462fefb687b8719d1ffca… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Thu May 20 01:21:40 2010 +0200 d3dx9: Add missing texkill instruction parsing. --- dlls/d3dx9_36/asmshader.y | 9 ++++++--- dlls/d3dx9_36/tests/asm.c | 5 +++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/asmshader.y b/dlls/d3dx9_36/asmshader.y index 06a6825..0949ee3 100644 --- a/dlls/d3dx9_36/asmshader.y +++ b/dlls/d3dx9_36/asmshader.y @@ -705,6 +705,11 @@ instruction: INSTR_ADD omods dreg ',' sregs TRACE("DP2ADD\n"); asm_ctx.funcs->instr(&asm_ctx, BWRITERSIO_DP2ADD, $2.mod, $2.shift, 0, &$3, &$5, 3); } + | INSTR_TEXKILL dreg + { + TRACE("TEXKILL\n"); + asm_ctx.funcs->instr(&asm_ctx, BWRITERSIO_TEXKILL, 0, 0, 0, &$2, 0, 0); + } | INSTR_TEXLD omods dreg ',' sregs { TRACE("TEXLD\n"); @@ -769,9 +774,7 @@ dreg_name: REG_TEMP } | REG_INPUT { - asmparser_message(&asm_ctx, "Line %u: Register v%u is not a valid destination register\n", - asm_ctx.line_no, $1); - set_parse_status(&asm_ctx, PARSE_WARN); + $$.regnum = $1; $$.type = BWRITERSPR_INPUT; } | REG_CONSTFLOAT { diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 54894df..79c6c07 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -1141,6 +1141,11 @@ static void ps_3_0_test(void) { {0xffff0300, 0x0500005d, 0x802f0000, 0x80e40001, 0x80e40002, 0x80e40003, 0x80e40004, 0x0000ffff} }, + { /* shader 10 */ + "ps_3_0\n" + "texkill v0\n", + {0xffff0300, 0x01000041, 0x900f0000, 0x0000ffff} + }, }; exec_tests("ps_3_0", tests, sizeof(tests) / sizeof(tests[0]));

1 0

Austin English : include: Rename structs to fix compile with recent gcc.
by Alexandre Julliard 21 May '10

21 May '10

Module: wine Branch: master Commit: f403816081bcd4a5b77bc9e43dee6147f5fcd38c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f403816081bcd4a5b77bc9e43… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 20 17:49:51 2010 -0500 include: Rename structs to fix compile with recent gcc. --- include/winnt.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index d8fbbfd..eb3ab2c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1047,7 +1047,7 @@ typedef struct _KNONVOLATILE_CONTEXT_POINTERS PM128A Xmm13; PM128A Xmm14; PM128A Xmm15; - } DUMMYSTRUCTNAME; + } DUMMYSTRUCTNAME1; } DUMMYUNIONNAME1; union @@ -1071,7 +1071,7 @@ typedef struct _KNONVOLATILE_CONTEXT_POINTERS PULONG64 R13; PULONG64 R14; PULONG64 R15; - } DUMMYSTRUCTNAME; + } DUMMYSTRUCTNAME2; } DUMMYUNIONNAME2; } KNONVOLATILE_CONTEXT_POINTERS, *PKNONVOLATILE_CONTEXT_POINTERS;

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
96
Older →

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