wine-commits April 2009

wine-commits@winehq.org

2 participants
664 discussions

Alexandre Julliard : include: Fix the SYSTEM_CACHE_INFORMATION structure for Win64.
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: wine Branch: master Commit: 1f8876b1decd892f7456828b8325ceb307326350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f8876b1decd892f7456828b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 24 12:31:03 2009 +0200 include: Fix the SYSTEM_CACHE_INFORMATION structure for Win64. --- include/winternl.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index 48fa8d0..5ebbca5 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1302,9 +1302,11 @@ typedef struct _SYSTEM_CACHE_INFORMATION { ULONG CurrentSize; ULONG PeakSize; ULONG PageFaultCount; +#ifndef _WIN64 ULONG MinimumWorkingSet; ULONG MaximumWorkingSet; ULONG unused[4]; +#endif } SYSTEM_CACHE_INFORMATION, *PSYSTEM_CACHE_INFORMATION; /* System Information Class 0x17 */

1 0

Alexandre Julliard : user32/tests: Fix a couple of dimension checks on W2k3 and Vista.
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: wine Branch: master Commit: 095c38e7c43862d2eeda5fb2d371f09b68260383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=095c38e7c43862d2eeda5fb2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 24 12:18:02 2009 +0200 user32/tests: Fix a couple of dimension checks on W2k3 and Vista. --- dlls/user32/tests/sysparams.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 0e68de4..3c94441 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -1801,9 +1801,9 @@ static void test_SPI_SETWORKAREA( void ) /* 47 */ eq( area.left, curr_val.left, "left", "%d" ); eq( area.top, curr_val.top, "top", "%d" ); /* size may be rounded up */ - ok( area.right >= curr_val.right && area.right < curr_val.right + 8, + ok( area.right >= curr_val.right && area.right < curr_val.right + 16, "right: got %d instead of %d\n", area.right, curr_val.right ); - ok( area.bottom >= curr_val.bottom && area.bottom < curr_val.bottom + 8, + ok( area.bottom >= curr_val.bottom && area.bottom < curr_val.bottom + 16, "bottom: got %d instead of %d\n", area.bottom, curr_val.bottom ); curr_val = area; rc=SystemParametersInfoA( SPI_SETWORKAREA, 0, &old_area, @@ -1816,9 +1816,9 @@ static void test_SPI_SETWORKAREA( void ) /* 47 */ eq( area.left, old_area.left, "left", "%d" ); eq( area.top, old_area.top, "top", "%d" ); /* size may be rounded up */ - ok( area.right >= old_area.right && area.right < old_area.right + 8, + ok( area.right >= old_area.right && area.right < old_area.right + 16, "right: got %d instead of %d\n", area.right, old_area.right ); - ok( area.bottom >= old_area.bottom && area.bottom < old_area.bottom + 8, + ok( area.bottom >= old_area.bottom && area.bottom < old_area.bottom + 16, "bottom: got %d instead of %d\n", area.bottom, old_area.bottom ); } @@ -2667,8 +2667,10 @@ static void test_GetSystemMetrics( void) screen.cx = GetSystemMetrics( SM_CXSCREEN ); screen.cy = GetSystemMetrics( SM_CYSCREEN ); } - ok_gsm( SM_CXMAXTRACK, screen.cx + 4 + 2 * GetSystemMetrics(SM_CXFRAME)); - ok_gsm( SM_CYMAXTRACK, screen.cy + 4 + 2 * GetSystemMetrics(SM_CYFRAME)); + ok_gsm_2( SM_CXMAXTRACK, screen.cx + 4 + 2 * GetSystemMetrics(SM_CXFRAME), + screen.cx - 4 + 2 * GetSystemMetrics(SM_CXFRAME)); /* Vista */ + ok_gsm_2( SM_CYMAXTRACK, screen.cy + 4 + 2 * GetSystemMetrics(SM_CYFRAME), + screen.cy - 4 + 2 * GetSystemMetrics(SM_CYFRAME)); /* Vista */ /* the next two cannot really be tested as they depend on (application) * toolbars */ /* SM_CXMAXIMIZED */

1 0

Alexandre Julliard : advapi32/tests: Fix a couple of test failures on Vista .
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: wine Branch: master Commit: 66df782b119c07fd2179174a363a9154ea0e3215 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66df782b119c07fd2179174a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 24 12:17:31 2009 +0200 advapi32/tests: Fix a couple of test failures on Vista. --- dlls/advapi32/tests/service.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 060a5e2..b924c69 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -307,7 +307,8 @@ static void test_create_delete_svc(void) svc_handle1 = CreateServiceA(scm_handle, servicename, NULL, GENERIC_ALL, SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS, SERVICE_DISABLED, 0, pathname, NULL, NULL, NULL, account, password); ok(!svc_handle1, "Expected failure\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_INVALID_SERVICE_ACCOUNT, + "Expected ERROR_INVALID_PARAMETER or ERROR_INVALID_SERVICE_ACCOUNT, got %d\n", GetLastError()); /* Illegal (start-type is not a mask and should only be one of the possibilities) * Remark : 'OR'-ing them could result in a valid possibility (but doesn't make sense as @@ -1762,10 +1763,7 @@ static void test_sequence(void) SetLastError(0xdeadbeef); ret = QueryServiceConfigA(svc_handle, config, given, &needed); ok(ret, "Expected success, got error %u\n", GetLastError()); - todo_wine - { - ok(given == needed, "Expected the given (%d) and needed (%d) buffersizes to be equal\n", given, needed); - } + ok(config->lpBinaryPathName && config->lpLoadOrderGroup && config->lpDependencies && config->lpServiceStartName && config->lpDisplayName, "Expected all string struct members to be non-NULL\n"); ok(config->dwServiceType == (SERVICE_INTERACTIVE_PROCESS | SERVICE_WIN32_OWN_PROCESS),

1 0

Paul Vriens : gdiplus/tests: Fix test failures on Win98 by using A-functions.
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: wine Branch: master Commit: 163b046ec57167ddc0cde0f0626da18d487eb39d URL: http://source.winehq.org/git/wine.git/?a=commit;h=163b046ec57167ddc0cde0f06… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Apr 23 21:29:22 2009 +0200 gdiplus/tests: Fix test failures on Win98 by using A-functions. --- dlls/gdiplus/tests/font.c | 87 ++++++++++++++++++++++----------------------- 1 files changed, 43 insertions(+), 44 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 125535d..7d6582f 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -97,7 +97,7 @@ static void test_createfont(void) static void test_logfont(void) { - LOGFONTW lfw, lfw2; + LOGFONTA lfa, lfa2; GpFont *font; GpStatus stat; GpGraphics *graphics; @@ -105,70 +105,69 @@ static void test_logfont(void) INT style; GdipCreateFromHDC(hdc, &graphics); - memset(&lfw, 0, sizeof(LOGFONTW)); - memset(&lfw2, 0xff, sizeof(LOGFONTW)); + memset(&lfa, 0, sizeof(LOGFONTA)); + memset(&lfa2, 0xff, sizeof(LOGFONTA)); /* empty FaceName */ - lfw.lfFaceName[0] = 0; - stat = GdipCreateFontFromLogfontW(hdc, &lfw, &font); - + lfa.lfFaceName[0] = 0; + stat = GdipCreateFontFromLogfontA(hdc, &lfa, &font); expect(NotTrueTypeFont, stat); - memcpy(&lfw.lfFaceName, arial, 6 * sizeof(WCHAR)); + lstrcpyA(lfa.lfFaceName, "Arial"); - stat = GdipCreateFontFromLogfontW(hdc, &lfw, &font); + stat = GdipCreateFontFromLogfontA(hdc, &lfa, &font); if (stat == FileNotFound) { skip("Arial not installed.\n"); return; } expect(Ok, stat); - stat = GdipGetLogFontW(font, graphics, &lfw2); + stat = GdipGetLogFontA(font, graphics, &lfa2); expect(Ok, stat); - ok(lfw2.lfHeight < 0, "Expected negative height\n"); - expect(0, lfw2.lfWidth); - expect(0, lfw2.lfEscapement); - expect(0, lfw2.lfOrientation); - ok((lfw2.lfWeight >= 100) && (lfw2.lfWeight <= 900), "Expected weight to be set\n"); - expect(0, lfw2.lfItalic); - expect(0, lfw2.lfUnderline); - expect(0, lfw2.lfStrikeOut); - expect(GetTextCharset(hdc), lfw2.lfCharSet); - expect(0, lfw2.lfOutPrecision); - expect(0, lfw2.lfClipPrecision); - expect(0, lfw2.lfQuality); - expect(0, lfw2.lfPitchAndFamily); + ok(lfa2.lfHeight < 0, "Expected negative height\n"); + expect(0, lfa2.lfWidth); + expect(0, lfa2.lfEscapement); + expect(0, lfa2.lfOrientation); + ok((lfa2.lfWeight >= 100) && (lfa2.lfWeight <= 900), "Expected weight to be set\n"); + expect(0, lfa2.lfItalic); + expect(0, lfa2.lfUnderline); + expect(0, lfa2.lfStrikeOut); + expect(GetTextCharset(hdc), lfa2.lfCharSet); + expect(0, lfa2.lfOutPrecision); + expect(0, lfa2.lfClipPrecision); + expect(0, lfa2.lfQuality); + expect(0, lfa2.lfPitchAndFamily); GdipDeleteFont(font); - memset(&lfw, 0, sizeof(LOGFONTW)); - lfw.lfHeight = 25; - lfw.lfWidth = 25; - lfw.lfEscapement = lfw.lfOrientation = 50; - lfw.lfItalic = lfw.lfUnderline = lfw.lfStrikeOut = TRUE; + memset(&lfa, 0, sizeof(LOGFONTA)); + lfa.lfHeight = 25; + lfa.lfWidth = 25; + lfa.lfEscapement = lfa.lfOrientation = 50; + lfa.lfItalic = lfa.lfUnderline = lfa.lfStrikeOut = TRUE; - memset(&lfw2, 0xff, sizeof(LOGFONTW)); - memcpy(&lfw.lfFaceName, arial, 6 * sizeof(WCHAR)); + memset(&lfa2, 0xff, sizeof(LOGFONTA)); + lstrcpyA(lfa.lfFaceName, "Arial"); - stat = GdipCreateFontFromLogfontW(hdc, &lfw, &font); + stat = GdipCreateFontFromLogfontA(hdc, &lfa, &font); expect(Ok, stat); - stat = GdipGetLogFontW(font, graphics, &lfw2); + stat = GdipGetLogFontA(font, graphics, &lfa2); expect(Ok, stat); - ok(lfw2.lfHeight < 0, "Expected negative height\n"); - expect(0, lfw2.lfWidth); - expect(0, lfw2.lfEscapement); - expect(0, lfw2.lfOrientation); - ok((lfw2.lfWeight >= 100) && (lfw2.lfWeight <= 900), "Expected weight to be set\n"); - expect(TRUE, lfw2.lfItalic); - expect(TRUE, lfw2.lfUnderline); - expect(TRUE, lfw2.lfStrikeOut); - expect(GetTextCharset(hdc), lfw2.lfCharSet); - expect(0, lfw2.lfOutPrecision); - expect(0, lfw2.lfClipPrecision); - expect(0, lfw2.lfQuality); - expect(0, lfw2.lfPitchAndFamily); + ok(lfa2.lfHeight < 0, "Expected negative height\n"); + expect(0, lfa2.lfWidth); + expect(0, lfa2.lfEscapement); + expect(0, lfa2.lfOrientation); + ok((lfa2.lfWeight >= 100) && (lfa2.lfWeight <= 900), "Expected weight to be set\n"); + expect(TRUE, lfa2.lfItalic); + expect(TRUE, lfa2.lfUnderline); + expect(TRUE, lfa2.lfStrikeOut); + expect(GetTextCharset(hdc), lfa2.lfCharSet); + expect(0, lfa2.lfOutPrecision); + expect(0, lfa2.lfClipPrecision); + expect(0, lfa2.lfQuality); + expect(0, lfa2.lfPitchAndFamily); stat = GdipGetFontStyle(font, &style); expect(Ok, stat);

1 0

Paul Vriens : gdiplus: Convert lfFaceName from W to A, not the other way around.
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: wine Branch: master Commit: 40f812c110b11406bd119c031990abf8ff4ab8c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40f812c110b11406bd119c031… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Apr 23 21:24:54 2009 +0200 gdiplus: Convert lfFaceName from W to A, not the other way around. --- dlls/gdiplus/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index f764d00..6454765 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -388,7 +388,7 @@ GpStatus WINGDIPAPI GdipGetLogFontA(GpFont *font, GpGraphics *graphics, memcpy(lfa, &lfw, FIELD_OFFSET(LOGFONTA,lfFaceName) ); - if(!MultiByteToWideChar(CP_ACP, 0, lfa->lfFaceName, -1, lfw.lfFaceName, LF_FACESIZE)) + if(!WideCharToMultiByte(CP_ACP, 0, lfw.lfFaceName, -1, lfa->lfFaceName, LF_FACESIZE, NULL, NULL)) return GenericError; return Ok;

1 0

Paul Vriens : gdiplus: Return the correct result in GdipCreateFontFromLogfontA.
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: wine Branch: master Commit: 7bf6a3030b6eb92d795e3bdf305630b7cb5031a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bf6a3030b6eb92d795e3bdf3… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Apr 23 21:20:11 2009 +0200 gdiplus: Return the correct result in GdipCreateFontFromLogfontA. --- dlls/gdiplus/font.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 07aaf74..f764d00 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -224,9 +224,7 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontA(HDC hdc, if(!MultiByteToWideChar(CP_ACP, 0, lfa->lfFaceName, -1, lfw.lfFaceName, LF_FACESIZE)) return GenericError; - GdipCreateFontFromLogfontW(hdc, &lfw, font); - - return Ok; + return GdipCreateFontFromLogfontW(hdc, &lfw, font); } /*******************************************************************************

1 0

Paul Vriens : include: Add missing GdipGetLogFontA definition.
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: wine Branch: master Commit: 73e23b823ac5ce889e304e54667b5cedbceeed15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73e23b823ac5ce889e304e546… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Apr 23 21:14:45 2009 +0200 include: Add missing GdipGetLogFontA definition. --- include/gdiplusflat.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 56540cd..158eb5e 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -82,6 +82,7 @@ GpStatus WINGDIPAPI GdipCreateFontFromDC(HDC,GpFont**); GpStatus WINGDIPAPI GdipCreateFontFromLogfontA(HDC,GDIPCONST LOGFONTA*,GpFont**); GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC,GDIPCONST LOGFONTW*,GpFont**); GpStatus WINGDIPAPI GdipDeleteFont(GpFont*); +GpStatus WINGDIPAPI GdipGetLogFontA(GpFont*,GpGraphics*,LOGFONTA*); GpStatus WINGDIPAPI GdipGetLogFontW(GpFont*,GpGraphics*,LOGFONTW*); GpStatus WINGDIPAPI GdipGetFamily(GpFont*, GpFontFamily**); GpStatus WINGDIPAPI GdipGetFontUnit(GpFont*, Unit*);

1 0

Henri Verbeet : wined3d: Use shader_sm1_read_opcode() in shader_get_registers_used().
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: wine Branch: master Commit: 19b84ffda114b35b0c75f7694d1f946adc9f8d0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=19b84ffda114b35b0c75f7694… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 24 09:17:58 2009 +0200 wined3d: Use shader_sm1_read_opcode() in shader_get_registers_used(). --- dlls/wined3d/baseshader.c | 115 +++++++++++++++++++++++++-------------------- 1 files changed, 64 insertions(+), 51 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index db510bf..6bc7aac 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -384,8 +384,8 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, struct shader_reg_m pshader = shader_is_pshader_version(shader_version); while (WINED3DVS_END() != *pToken) { - CONST SHADER_OPCODE* curOpcode; - DWORD opcode_token; + struct wined3d_shader_instruction ins; + UINT param_size; /* Skip comments */ if (shader_is_comment(*pToken)) @@ -397,17 +397,19 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, struct shader_reg_m } /* Fetch opcode */ - opcode_token = *pToken++; - curOpcode = shader_get_opcode(shader_ins, shader_version, opcode_token); + shader_sm1_read_opcode(&pToken, &ins, &param_size, shader_ins, shader_version); /* Unhandled opcode, and its parameters */ - if (NULL == curOpcode) { - while (*pToken & 0x80000000) - ++pToken; + if (ins.handler_idx == WINED3DSIH_TABLE_SIZE) + { + TRACE("Skipping unrecognized instruction.\n"); + pToken += param_size; + continue; + } /* Handle declarations */ - } else if (WINED3DSIO_DCL == curOpcode->opcode) { - + if (ins.handler_idx == WINED3DSIH_DCL) + { DWORD usage = *pToken++; DWORD param = *pToken++; DWORD regtype = shader_get_regtype(param); @@ -441,9 +443,9 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, struct shader_reg_m /* Save sampler usage token */ } else if (WINED3DSPR_SAMPLER == regtype) reg_maps->samplers[regnum] = usage; - - } else if (WINED3DSIO_DEF == curOpcode->opcode) { - + } + else if (ins.handler_idx == WINED3DSIH_DEF) + { local_constant* lconst = HeapAlloc(GetProcessHeap(), 0, sizeof(local_constant)); if (!lconst) return E_OUTOFMEMORY; lconst->idx = *pToken & WINED3DSP_REGNUM_MASK; @@ -464,65 +466,70 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, struct shader_reg_m } list_add_head(&This->baseShader.constantsF, &lconst->entry); - pToken += curOpcode->num_params; - - } else if (WINED3DSIO_DEFI == curOpcode->opcode) { - + pToken += param_size; + } + else if (ins.handler_idx == WINED3DSIH_DEFI) + { local_constant* lconst = HeapAlloc(GetProcessHeap(), 0, sizeof(local_constant)); if (!lconst) return E_OUTOFMEMORY; lconst->idx = *pToken & WINED3DSP_REGNUM_MASK; memcpy(lconst->value, pToken + 1, 4 * sizeof(DWORD)); list_add_head(&This->baseShader.constantsI, &lconst->entry); - pToken += curOpcode->num_params; - - } else if (WINED3DSIO_DEFB == curOpcode->opcode) { - + pToken += param_size; + } + else if (ins.handler_idx == WINED3DSIH_DEFB) + { local_constant* lconst = HeapAlloc(GetProcessHeap(), 0, sizeof(local_constant)); if (!lconst) return E_OUTOFMEMORY; lconst->idx = *pToken & WINED3DSP_REGNUM_MASK; memcpy(lconst->value, pToken + 1, 1 * sizeof(DWORD)); list_add_head(&This->baseShader.constantsB, &lconst->entry); - pToken += curOpcode->num_params; - + pToken += param_size; + } /* If there's a loop in the shader */ - } else if (WINED3DSIO_LOOP == curOpcode->opcode || - WINED3DSIO_REP == curOpcode->opcode) { + else if (ins.handler_idx == WINED3DSIH_LOOP + || ins.handler_idx == WINED3DSIH_REP) + { cur_loop_depth++; if(cur_loop_depth > max_loop_depth) max_loop_depth = cur_loop_depth; - pToken += curOpcode->num_params; + pToken += param_size; /* Rep and Loop always use an integer constant for the control parameters */ This->baseShader.uses_int_consts = TRUE; - } else if (WINED3DSIO_ENDLOOP == curOpcode->opcode || - WINED3DSIO_ENDREP == curOpcode->opcode) { + } + else if (ins.handler_idx == WINED3DSIH_ENDLOOP + || ins.handler_idx == WINED3DSIH_ENDREP) + { cur_loop_depth--; - + } /* For subroutine prototypes */ - } else if (WINED3DSIO_LABEL == curOpcode->opcode) { + else if (ins.handler_idx == WINED3DSIH_LABEL) + { DWORD snum = *pToken & WINED3DSP_REGNUM_MASK; reg_maps->labels[snum] = 1; - pToken += curOpcode->num_params; - + pToken += param_size; + } /* Set texture, address, temporary registers */ - } else { + else + { int i, limit; /* Declare 1.X samplers implicitly, based on the destination reg. number */ if (WINED3DSHADER_VERSION_MAJOR(shader_version) == 1 && pshader /* Filter different instructions with the same enum values in VS */ - && (WINED3DSIO_TEX == curOpcode->opcode - || WINED3DSIO_TEXBEM == curOpcode->opcode - || WINED3DSIO_TEXBEML == curOpcode->opcode - || WINED3DSIO_TEXDP3TEX == curOpcode->opcode - || WINED3DSIO_TEXM3x2TEX == curOpcode->opcode - || WINED3DSIO_TEXM3x3SPEC == curOpcode->opcode - || WINED3DSIO_TEXM3x3TEX == curOpcode->opcode - || WINED3DSIO_TEXM3x3VSPEC == curOpcode->opcode - || WINED3DSIO_TEXREG2AR == curOpcode->opcode - || WINED3DSIO_TEXREG2GB == curOpcode->opcode - || WINED3DSIO_TEXREG2RGB == curOpcode->opcode)) + && (ins.handler_idx == WINED3DSIH_TEX + || ins.handler_idx == WINED3DSIH_TEXBEM + || ins.handler_idx == WINED3DSIH_TEXBEML + || ins.handler_idx == WINED3DSIH_TEXDP3TEX + || ins.handler_idx == WINED3DSIH_TEXM3x2TEX + || ins.handler_idx == WINED3DSIH_TEXM3x3SPEC + || ins.handler_idx == WINED3DSIH_TEXM3x3TEX + || ins.handler_idx == WINED3DSIH_TEXM3x3VSPEC + || ins.handler_idx == WINED3DSIH_TEXREG2AR + || ins.handler_idx == WINED3DSIH_TEXREG2GB + || ins.handler_idx == WINED3DSIH_TEXREG2RGB)) { /* Fake sampler usage, only set reserved bit and ttype */ DWORD sampler_code = *pToken & WINED3DSP_REGNUM_MASK; @@ -531,20 +538,27 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, struct shader_reg_m reg_maps->samplers[sampler_code] = (0x1 << 31) | WINED3DSTT_2D; /* texbem is only valid with < 1.4 pixel shaders */ - if(WINED3DSIO_TEXBEM == curOpcode->opcode || - WINED3DSIO_TEXBEML == curOpcode->opcode) { + if (ins.handler_idx == WINED3DSIH_TEXBEM + || ins.handler_idx == WINED3DSIH_TEXBEML) + { reg_maps->bumpmat[sampler_code] = TRUE; - if(WINED3DSIO_TEXBEML == curOpcode->opcode) { + if (ins.handler_idx == WINED3DSIH_TEXBEML) + { reg_maps->luminanceparams[sampler_code] = TRUE; } } } - if(WINED3DSIO_NRM == curOpcode->opcode) { + if (ins.handler_idx == WINED3DSIH_NRM) + { reg_maps->usesnrm = 1; - } else if(WINED3DSIO_BEM == curOpcode->opcode && pshader) { + } + else if (pshader && ins.handler_idx == WINED3DSIH_BEM) + { DWORD regnum = *pToken & WINED3DSP_REGNUM_MASK; reg_maps->bumpmat[regnum] = TRUE; - } else if(WINED3DSIO_DSY == curOpcode->opcode) { + } + else if (ins.handler_idx == WINED3DSIH_DSY) + { reg_maps->usesdsy = 1; } @@ -555,8 +569,7 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, struct shader_reg_m * okay, since we'll catch any address registers when * they are initialized (required by spec) */ - limit = (opcode_token & WINED3DSHADER_INSTRUCTION_PREDICATED)? - curOpcode->num_params + 1: curOpcode->num_params; + limit = ins.dst_count + ins.src_count + (ins.predicate ? 1 : 0); for (i = 0; i < limit; ++i) {

1 0

Henri Verbeet : wined3d: Add a function to read an opcode from SM1-3 bytecode.
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: wine Branch: master Commit: 521fcf11db8a82fcfe7df380d9dde81c4285d1da URL: http://source.winehq.org/git/wine.git/?a=commit;h=521fcf11db8a82fcfe7df380d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 24 09:17:58 2009 +0200 wined3d: Add a function to read an opcode from SM1-3 bytecode. --- dlls/wined3d/baseshader.c | 246 ++++++++++++++++++++++++--------------------- 1 files changed, 131 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=521fcf11db8a82fcfe7df…

1 0

Henri Verbeet : wined3d: The first shader token should be the version token .
by Alexandre Julliard 24 Apr '09

24 Apr '09

Module: wine Branch: master Commit: e63bd2ce21ba7b2f5fc254209e19124a07eb97fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e63bd2ce21ba7b2f5fc254209… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 24 09:17:58 2009 +0200 wined3d: The first shader token should be the version token. --- dlls/wined3d/baseshader.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 1cb5a12..a7c2a50 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -911,17 +911,16 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, ins.src = src_param; This->baseShader.parse_state.current_row = 0; + if (!shader_is_version_token(*pToken++)) + { + ERR("First token is not a version token, invalid shader.\n"); + return; + } + while (WINED3DPS_END() != *pToken) { DWORD opcode_token; - /* Skip version token */ - if (shader_is_version_token(*pToken)) - { - ++pToken; - continue; - } - /* Skip comment tokens */ if (shader_is_comment(*pToken)) {

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
67
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 April 2009