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

Paul Vriens : wintrust/tests: Add a basic CryptCATOpen test.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 1862826a87c48a22c353b4ce9717dcb9c28ec96a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1862826a87c48a22c353b4ce9… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue May 19 11:54:10 2009 +0200 wintrust/tests: Add a basic CryptCATOpen test. --- dlls/wintrust/tests/crypt.c | 35 ++++++++++++++++++++++++++++++++--- 1 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index acadead..3e77814 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -373,6 +373,37 @@ static void test_calchash(void) DeleteFileA(temp); } +static void test_CryptCATOpen(void) +{ + HANDLE hcat; + char empty[MAX_PATH]; + WCHAR emptyW[MAX_PATH]; + HANDLE file; + BOOL ret; + + SetLastError(0xdeadbeef); + hcat = pCryptCATOpen(NULL, 0, 0, 0, 0); + ok(hcat == INVALID_HANDLE_VALUE, "CryptCATOpen succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); + + if (!GetTempFileNameA(CURR_DIR, "cat", 0, empty)) return; + + file = CreateFileA(empty, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFileA failed %u\n", GetLastError()); + CloseHandle(file); + MultiByteToWideChar(CP_ACP, 0, empty, -1, emptyW, MAX_PATH); + + hcat = pCryptCATOpen(emptyW, 0, 0, 0, 0); + todo_wine + ok(hcat != INVALID_HANDLE_VALUE, "Expected a correct handle\n"); + + ret = pCryptCATClose(hcat); + todo_wine + ok(ret, "CryptCATClose failed\n"); + DeleteFileA(empty); +} + static DWORD error_area; static DWORD local_error; @@ -615,9 +646,6 @@ static void test_catalog_properties(CHAR *catfile, int attributes, int members) catalog[0] = 0; } - hcat = pCryptCATOpen(NULL, 0, 0, 0, 0); - ok(hcat == INVALID_HANDLE_VALUE, "CryptCATOpen succeeded\n"); - hcat = pCryptCATOpen(catalogW, 0, 0, 0, 0); if (hcat == INVALID_HANDLE_VALUE && members == 0) { @@ -1106,6 +1134,7 @@ START_TEST(crypt) test_context(); test_calchash(); + test_CryptCATOpen(); /* Parameter checking only */ test_CryptCATCDF_params(); /* Test the parsing of a cdf file */

1 0

Aric Stewart : advapi32: Handle well qualified names in LookupAccountNameW for account names.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: fe30b79d72fbb51b1789be0792df6615ec4166a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe30b79d72fbb51b1789be079… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon May 18 14:47:36 2009 -0500 advapi32: Handle well qualified names in LookupAccountNameW for account names. --- dlls/advapi32/security.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 65e68ff..efe34f4 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2753,13 +2753,23 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI userName = HeapAlloc(GetProcessHeap(), 0, nameLen*sizeof(WCHAR)); - if (GetUserNameW(userName, &nameLen) && !strcmpW(lpAccountName, userName)) + if (lpDomainNamePtr) + { + /* check to make sure this account is on this computer */ + if (GetComputerNameW(userName, &nameLen) && strcmpW(lpDomainNamePtr, userName)) + { + SetLastError(ERROR_NONE_MAPPED); + ret = FALSE; + } + } + + if (GetUserNameW(userName, &nameLen) && !strcmpW(lpAccountNamePtr, userName)) ret = lookup_user_account_name(Sid, cbSid, ReferencedDomainName, cchReferencedDomainName, peUse); else { nameLen = UNLEN + 1; - if (GetComputerNameW(userName, &nameLen) && !strcmpW(lpAccountName, userName)) + if (GetComputerNameW(userName, &nameLen) && !strcmpW(lpAccountNamePtr, userName)) ret = lookup_computer_account_name(Sid, cbSid, ReferencedDomainName, cchReferencedDomainName, peUse); else

1 0

Aric Stewart : msctf: Add stub implementation of ITfRange.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: d0ef9886c3ef34266257d6df4c52449a1ea26973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0ef9886c3ef34266257d6df4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon May 18 14:48:18 2009 -0500 msctf: Add stub implementation of ITfRange. --- dlls/msctf/Makefile.in | 1 + dlls/msctf/msctf_internal.h | 1 + dlls/msctf/range.c | 330 +++++++++++++++++++++++++++++++++++++++++++ include/msctf.idl | 141 ++++++++++++++++++ include/textstor.idl | 4 + 5 files changed, 477 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d0ef9886c3ef34266257d…

1 0

Aric Stewart : msctf: Implement ITfRange::GetContext.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: bdd4e0b48b01228f525fc412a8d356752709ecc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdd4e0b48b01228f525fc412a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon May 18 14:48:26 2009 -0500 msctf: Implement ITfRange::GetContext. --- dlls/msctf/range.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/range.c b/dlls/msctf/range.c index d7445ca..63181af 100644 --- a/dlls/msctf/range.c +++ b/dlls/msctf/range.c @@ -271,8 +271,11 @@ static HRESULT WINAPI Range_Clone(ITfRange *iface, ITfRange **ppClone) static HRESULT WINAPI Range_GetContext(ITfRange *iface, ITfContext **ppContext) { Range *This = (Range *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + TRACE("(%p)\n",This); + if (!ppContext) + return E_INVALIDARG; + *ppContext = This->pITfContext; + return S_OK; } static const ITfRangeVtbl Range_RangeVtbl =

1 0

Francois Gouget : msi/tests: Use win_skip() to skip over unimplemented functionality.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: d9ffbe4e82d1f9108487a3f40c194a0819ed4c3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ffbe4e82d1f9108487a3f40… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 19 11:21:38 2009 +0200 msi/tests: Use win_skip() to skip over unimplemented functionality. --- dlls/msi/tests/install.c | 4 ++-- dlls/msi/tests/msi.c | 10 +++++----- dlls/msi/tests/source.c | 14 +++++++------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 3500007..933a145 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3322,7 +3322,7 @@ static void test_publish(void) if (!pMsiQueryComponentStateA) { - skip("MsiQueryComponentStateA is not available\n"); + win_skip("MsiQueryComponentStateA is not available\n"); return; } @@ -3810,7 +3810,7 @@ static void test_publishsourcelist(void) if (!pMsiSourceListEnumSourcesA || !pMsiSourceListGetInfoA) { - skip("MsiSourceListEnumSourcesA and/or MsiSourceListGetInfoA are not available\n"); + win_skip("MsiSourceListEnumSourcesA and/or MsiSourceListGetInfoA are not available\n"); return; } diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index c3ef72b..fdbb253 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -190,7 +190,7 @@ static void test_usefeature(void) if (!pMsiUseFeatureExA) { - skip("MsiUseFeatureExA not implemented\n"); + win_skip("MsiUseFeatureExA not implemented\n"); return; } @@ -408,7 +408,7 @@ static void test_MsiGetFileHash(void) if (!pMsiGetFileHashA) { - skip("MsiGetFileHash not implemented\n"); + win_skip("MsiGetFileHash not implemented\n"); return; } @@ -1221,7 +1221,7 @@ static void test_MsiQueryComponentState(void) if (!pMsiQueryComponentStateA) { - skip("MsiQueryComponentStateA not implemented\n"); + win_skip("MsiQueryComponentStateA not implemented\n"); return; } @@ -3864,7 +3864,7 @@ static void test_MsiGetProductInfoEx(void) if (!pMsiGetProductInfoExA) { - skip("MsiGetProductInfoExA is not available\n"); + win_skip("MsiGetProductInfoExA is not available\n"); return; } @@ -10958,7 +10958,7 @@ START_TEST(msi) test_MsiGetFileHash(); if (!pConvertSidToStringSidA) - skip("ConvertSidToStringSidA not implemented\n"); + win_skip("ConvertSidToStringSidA not implemented\n"); else { /* These tests rely on get_user_sid that needs ConvertSidToStringSidA */ diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 2e9e3ff..4e94eda 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -193,7 +193,7 @@ static void test_MsiSourceListGetInfo(void) if (!pMsiSourceListGetInfoA) { - skip("Skipping MsiSourceListGetInfoA tests\n"); + win_skip("Skipping MsiSourceListGetInfoA tests\n"); return; } @@ -645,7 +645,7 @@ static void test_MsiSourceListAddSourceEx(void) if (!pMsiSourceListAddSourceExA) { - skip("Skipping MsiSourceListAddSourceExA tests\n"); + win_skip("Skipping MsiSourceListAddSourceExA tests\n"); return; } @@ -1018,7 +1018,7 @@ static void test_MsiSourceListEnumSources(void) if (!pMsiSourceListEnumSourcesA) { - skip("MsiSourceListEnumSourcesA is not available\n"); + win_skip("MsiSourceListEnumSourcesA is not available\n"); return; } @@ -1620,7 +1620,7 @@ static void test_MsiSourceListSetInfo(void) if (!pMsiSourceListSetInfoA) { - skip("MsiSourceListSetInfoA is not available\n"); + win_skip("MsiSourceListSetInfoA is not available\n"); return; } @@ -2030,7 +2030,7 @@ static void test_MsiSourceListAddMediaDisk(void) if (!pMsiSourceListAddMediaDiskA) { - skip("MsiSourceListAddMediaDiskA is not available\n"); + win_skip("MsiSourceListAddMediaDiskA is not available\n"); return; } @@ -2332,7 +2332,7 @@ static void test_MsiSourceListEnumMediaDisks(void) if (!pMsiSourceListEnumMediaDisksA) { - skip("MsiSourceListEnumMediaDisksA is not available\n"); + win_skip("MsiSourceListEnumMediaDisksA is not available\n"); return; } @@ -3131,7 +3131,7 @@ static void test_MsiSourceListAddSource(void) if (!pMsiSourceListAddSourceA) { - skip("Skipping MsiSourceListAddSourceA tests\n"); + win_skip("Skipping MsiSourceListAddSourceA tests\n"); return; }

1 0

Francois Gouget : shell32: Add the SHCreateDirectoryEx() macro.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: acc4021e741f24f8c0dcf39ab367a375edc96b5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=acc4021e741f24f8c0dcf39ab… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 19 11:21:26 2009 +0200 shell32: Add the SHCreateDirectoryEx() macro. --- include/shlobj.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/shlobj.h b/include/shlobj.h index df3a959..a608a7e 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1263,6 +1263,7 @@ HRESULT WINAPI SHGetRealIDL(IShellFolder *psf, LPCITEMIDLIST pidlSimple, LPITEMI DWORD WINAPI SHCreateDirectory(HWND, LPCVOID); int WINAPI SHCreateDirectoryExA(HWND, LPCSTR, LPSECURITY_ATTRIBUTES); int WINAPI SHCreateDirectoryExW(HWND, LPCWSTR, LPSECURITY_ATTRIBUTES); +#define SHCreateDirectoryEx WINELIB_NAME_AW(SHCreateDirectoryEx) /**************************************************************************** * SHGetSpecialFolderLocation API

1 0

Stefan Dösinger : wined3d: Only declare TMP_OUT in vertex shaders.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 4bf980962af0e1d34e7bb674f6f88929706ea129 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bf980962af0e1d34e7bb674f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 4 14:30:45 2009 +0200 wined3d: Only declare TMP_OUT in vertex shaders. --- dlls/wined3d/arb_program_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 93f84d5..94e3ce8 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -332,9 +332,9 @@ static void shader_generate_arb_declarations(IWineD3DBaseShader *iface, const sh } else { max_constantsF = GL_LIMITS(vshader_constantsF) - 1; } + /* Temporary Output register */ + shader_addline(buffer, "TEMP TMP_OUT;\n"); } - /* Temporary Output register */ - shader_addline(buffer, "TEMP TMP_OUT;\n"); for(i = 0; i < This->baseShader.limits.temporary; i++) { if (reg_maps->temporary[i])

1 0

Stefan Dösinger : wined3d: Get rid of TMP2 and some easy TMP register uses.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: 17b001788fbc2275444093156636a3353336100f URL: http://source.winehq.org/git/wine.git/?a=commit;h=17b001788fbc2275444093156… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 12 20:23:10 2009 +0200 wined3d: Get rid of TMP2 and some easy TMP register uses. We have 5 temporary registers declared for private use. We can get rid of two of them. --- dlls/wined3d/arb_program_shader.c | 118 ++++++++++++++++++++----------------- 1 files changed, 64 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=17b001788fbc227544409…

1 0

Stefan Dösinger : wined3d: Get rid of TMP access in texm3x2*.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: ced325f8164ed03c90b598018e0c8a7ee2da7d56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ced325f8164ed03c90b598018… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 4 15:11:04 2009 +0200 wined3d: Get rid of TMP access in texm3x2*. texm3x2pad knows which register the following texm3x2depth or tex instruction will use, and it knows that this register is uninitialized. So use it for temporary storage instead of TMP. --- dlls/wined3d/arb_program_shader.c | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d7c4d8a..e2b6005 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1260,7 +1260,10 @@ static void pshader_hw_texm3x2pad(const struct wined3d_shader_instruction *ins) char src0_name[50]; shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); - shader_addline(buffer, "DP3 TMP.x, fragment.texcoord[%u], %s;\n", reg, src0_name); + /* The next instruction will be a texm3x2tex or texm3x2depth that writes to the uninitialized + * T<reg+1> register. Use this register to store the calculated vector + */ + shader_addline(buffer, "DP3 T%u.x, fragment.texcoord[%u], %s;\n", reg + 1, reg, src0_name); } static void pshader_hw_texm3x2tex(const struct wined3d_shader_instruction *ins) @@ -1272,12 +1275,16 @@ static void pshader_hw_texm3x2tex(const struct wined3d_shader_instruction *ins) SHADER_BUFFER *buffer = ins->ctx->buffer; char dst_str[50]; char src0_name[50]; + char dst_reg[50]; + + /* We know that we're writing to the uninitialized T<reg> register, so use it for temporary storage */ + sprintf(dst_reg, "T%u", reg); shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); - shader_addline(buffer, "DP3 TMP.y, fragment.texcoord[%u], %s;\n", reg, src0_name); + shader_addline(buffer, "DP3 %s.y, fragment.texcoord[%u], %s;\n", dst_reg, reg, src0_name); flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; - shader_hw_sample(ins, reg, dst_str, "TMP", flags & WINED3DTTFF_PROJECTED, FALSE); + shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3DTTFF_PROJECTED, FALSE); } static void pshader_hw_texm3x3pad(const struct wined3d_shader_instruction *ins) @@ -1478,16 +1485,16 @@ static void pshader_hw_texm3x2depth(const struct wined3d_shader_instruction *ins char src0[50]; shader_arb_get_src_param(ins, &ins->src[0], 0, src0); - shader_addline(buffer, "DP3 TMP.y, fragment.texcoord[%u], %s;\n", dst_reg, src0); + shader_addline(buffer, "DP3 T%u.y, fragment.texcoord[%u], %s;\n", dst_reg, dst_reg, src0); /* How to deal with the special case dst_name.g == 0? if r != 0, then * the r * (1 / 0) will give infinity, which is clamped to 1.0, the correct * result. But if r = 0.0, then 0 * inf = 0, which is incorrect. */ - shader_addline(buffer, "RCP TMP.y, TMP.y;\n"); - shader_addline(buffer, "MUL TMP.x, TMP.x, TMP.y;\n"); - shader_addline(buffer, "MIN TMP.x, TMP.x, one.x;\n"); - shader_addline(buffer, "MAX result.depth, TMP.x, 0.0;\n"); + shader_addline(buffer, "RCP T%u.y, T%u.y;\n", dst_reg, dst_reg); + shader_addline(buffer, "MUL T%u.x, T%u.x, T%u.y;\n", dst_reg, dst_reg, dst_reg); + shader_addline(buffer, "MIN T%u.x, T%u.x, one.x;\n", dst_reg, dst_reg); + shader_addline(buffer, "MAX result.depth, T%u.x, 0.0;\n", dst_reg); } /** Handles transforming all WINED3DSIO_M?x? opcodes for

1 0

Stefan Dösinger : wined3d: Get rid of TMP accesses in texm3x3* instructions.
by Alexandre Julliard 19 May '09

19 May '09

Module: wine Branch: master Commit: ad217029b0348cacfa45ab0d6b656ed431f3d144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad217029b0348cacfa45ab0d6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 19:07:34 2009 +0200 wined3d: Get rid of TMP accesses in texm3x3* instructions. --- dlls/wined3d/arb_program_shader.c | 55 +++++++++++++++++++++++------------- 1 files changed, 35 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e2b6005..229c323 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1294,9 +1294,16 @@ static void pshader_hw_texm3x3pad(const struct wined3d_shader_instruction *ins) SHADER_BUFFER *buffer = ins->ctx->buffer; SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; char src0_name[50]; + unsigned int dst; + + /* There are always 2 texm3x3pad instructions followed by one texm3x3[tex,vspec, ...] instruction, with + * incrementing ins->dst[0].register_idx numbers. So the pad instruction already knows the final destination + * register, and this register is uninitialized(otherwise the assembler complains that it is 'redeclared') + */ + dst = reg + 2 - current_state->current_row; shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); - shader_addline(buffer, "DP3 TMP.%c, fragment.texcoord[%u], %s;\n", 'x' + current_state->current_row, reg, src0_name); + shader_addline(buffer, "DP3 T%u.%c, fragment.texcoord[%u], %s;\n", dst, 'x' + current_state->current_row, reg, src0_name); current_state->texcoord_w[current_state->current_row++] = reg; } @@ -1309,15 +1316,17 @@ static void pshader_hw_texm3x3tex(const struct wined3d_shader_instruction *ins) SHADER_BUFFER *buffer = ins->ctx->buffer; SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; char dst_str[50]; + char dst_reg[8]; char src0_name[50]; + sprintf(dst_reg, "T%u", reg); shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); - shader_addline(buffer, "DP3 TMP.z, fragment.texcoord[%u], %s;\n", reg, src0_name); + shader_addline(buffer, "DP3 %s.z, fragment.texcoord[%u], %s;\n", dst_reg, reg, src0_name); /* Sample the texture using the calculated coordinates */ shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; - shader_hw_sample(ins, reg, dst_str, "TMP", flags & WINED3DTTFF_PROJECTED, FALSE); + shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3DTTFF_PROJECTED, FALSE); current_state->current_row = 0; } @@ -1331,10 +1340,14 @@ static void pshader_hw_texm3x3vspec(const struct wined3d_shader_instruction *ins SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; char dst_str[50]; char src0_name[50]; + char dst_reg[8]; + /* Get the dst reg without writemask strings. We know this register is uninitialized, so we can use all + * components for temporary data storage + */ + sprintf(dst_reg, "T%u", reg); shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); - /* Note: TMP.xy is input here, generated in earlier texm3x3pad instructions */ - shader_addline(buffer, "DP3 TMP.z, fragment.texcoord[%u], %s;\n", reg, src0_name); + shader_addline(buffer, "DP3 %s.z, fragment.texcoord[%u], %s;\n", dst_reg, reg, src0_name); /* Construct the eye-ray vector from w coordinates */ shader_addline(buffer, "MOV TB.x, fragment.texcoord[%u].w;\n", current_state->texcoord_w[0]); @@ -1343,18 +1356,18 @@ static void pshader_hw_texm3x3vspec(const struct wined3d_shader_instruction *ins /* Calculate reflection vector */ - shader_addline(buffer, "DP3 TMP.w, TMP, TB;\n"); + shader_addline(buffer, "DP3 %s.w, %s, TB;\n", dst_reg, dst_reg); /* The .w is ignored when sampling, so I can use TB.w to calculate dot(N, N) */ - shader_addline(buffer, "DP3 TB.w, TMP, TMP;\n"); + shader_addline(buffer, "DP3 TB.w, %s, %s;\n", dst_reg, dst_reg); shader_addline(buffer, "RCP TB.w, TB.w;\n"); - shader_addline(buffer, "MUL TMP.w, TMP.w, TB.w;\n"); - shader_addline(buffer, "MUL TMP, TMP.w, TMP;\n"); - shader_addline(buffer, "MAD TMP, coefmul.x, TMP, -TB;\n"); + shader_addline(buffer, "MUL %s.w, %s.w, TB.w;\n", dst_reg, dst_reg); + shader_addline(buffer, "MUL %s, %s.w, %s;\n", dst_reg, dst_reg, dst_reg); + shader_addline(buffer, "MAD %s, coefmul.x, %s, -TB;\n", dst_reg, dst_reg); /* Sample the texture using the calculated coordinates */ shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; - shader_hw_sample(ins, reg, dst_str, "TMP", flags & WINED3DTTFF_PROJECTED, FALSE); + shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3DTTFF_PROJECTED, FALSE); current_state->current_row = 0; } @@ -1369,11 +1382,13 @@ static void pshader_hw_texm3x3spec(const struct wined3d_shader_instruction *ins) char dst_str[50]; char src0_name[50]; char src1_name[50]; + char dst_reg[8]; shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); shader_arb_get_src_param(ins, &ins->src[0], 1, src1_name); /* Note: TMP.xy is input here, generated by two texm3x3pad instructions */ - shader_addline(buffer, "DP3 TMP.z, fragment.texcoord[%u], %s;\n", reg, src0_name); + sprintf(dst_reg, "T%u", reg); + shader_addline(buffer, "DP3 %s.z, fragment.texcoord[%u], %s;\n", dst_reg, reg, src0_name); /* Calculate reflection vector. * @@ -1383,17 +1398,17 @@ static void pshader_hw_texm3x3spec(const struct wined3d_shader_instruction *ins) * * Which normalizes the normal vector */ - shader_addline(buffer, "DP3 TMP.w, TMP, %s;\n", src1_name); - shader_addline(buffer, "DP3 TC.w, TMP, TMP;\n"); + shader_addline(buffer, "DP3 %s.w, %s, %s;\n", dst_reg, dst_reg, src1_name); + shader_addline(buffer, "DP3 TC.w, %s, %s;\n", dst_reg, dst_reg); shader_addline(buffer, "RCP TC.w, TC.w;\n"); - shader_addline(buffer, "MUL TMP.w, TMP.w, TC.w;\n"); - shader_addline(buffer, "MUL TMP, TMP.w, TMP;\n"); - shader_addline(buffer, "MAD TMP, coefmul.x, TMP, -%s;\n", src1_name); + shader_addline(buffer, "MUL %s.w, %s.w, TC.w;\n", dst_reg, dst_reg); + shader_addline(buffer, "MUL %s, %s.w, %s;\n", dst_reg, dst_reg, dst_reg); + shader_addline(buffer, "MAD %s, coefmul.x, %s, -%s;\n", dst_reg, dst_reg, src1_name); /* Sample the texture using the calculated coordinates */ shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); flags = reg < MAX_TEXTURES ? deviceImpl->stateBlock->textureState[reg][WINED3DTSS_TEXTURETRANSFORMFLAGS] : 0; - shader_hw_sample(ins, reg, dst_str, "TMP", flags & WINED3DTTFF_PROJECTED, FALSE); + shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3DTTFF_PROJECTED, FALSE); current_state->current_row = 0; } @@ -1469,8 +1484,8 @@ static void pshader_hw_texm3x3(const struct wined3d_shader_instruction *ins) shader_arb_get_dst_param(ins, dst, dst_str); shader_arb_get_src_param(ins, &ins->src[0], 0, src0); - shader_addline(buffer, "DP3 TMP.z, fragment.texcoord[%u], %s;\n", dst->reg.idx, src0); - shader_addline(buffer, "MOV %s, TMP;\n", dst_str); + shader_addline(buffer, "DP3 T%u.z, fragment.texcoord[%u], %s;\n", dst->reg.idx, dst->reg.idx, src0); + shader_addline(buffer, "MOV %s, T%u;\n", dst_str, dst->reg.idx); } /** Process the WINED3DSIO_TEXM3X2DEPTH instruction in ARB:

1 0