wine-commits April 2009

wine-commits@winehq.org

2 participants
664 discussions

Henri Verbeet : wined3d: Store the destination relative addressing token as a struct wined3d_shader_src_param .
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 915b91757f35a246f956e65f75a09f1a86cfeab2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=915b91757f35a246f956e65f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 17 09:46:56 2009 +0200 wined3d: Store the destination relative addressing token as a struct wined3d_shader_src_param. --- dlls/wined3d/arb_program_shader.c | 29 +++++++++++++++-------------- dlls/wined3d/baseshader.c | 24 +++++++++++++++++------- dlls/wined3d/glsl_shader.c | 3 ++- dlls/wined3d/vertexshader.c | 3 +-- dlls/wined3d/wined3d_private.h | 3 +-- 5 files changed, 36 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=915b91757f35a246f956e…

1 0

Henri Verbeet : wined3d: Store the source relative addressing token as a struct wined3d_shader_src_param .
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 0663eb932326b1b9767296c3f80ac58959de6b97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0663eb932326b1b9767296c3f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 17 09:46:56 2009 +0200 wined3d: Store the source relative addressing token as a struct wined3d_shader_src_param. --- dlls/wined3d/baseshader.c | 20 ++++- dlls/wined3d/glsl_shader.c | 168 ++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 100 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0663eb932326b1b976729…

1 0

Henri Verbeet : wined3d: Create a relative addressing token for 1. x shaders in the frontend.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: d6ee7d59a8f22af7e51523ee9d8a5a288c0839a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6ee7d59a8f22af7e51523ee9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 17 09:46:56 2009 +0200 wined3d: Create a relative addressing token for 1.x shaders in the frontend. Rather than handling this in the backends. Note that the ARB backend always assumes 1.x shaders. --- dlls/wined3d/baseshader.c | 31 +++++++++++++++++++++++-------- dlls/wined3d/glsl_shader.c | 27 ++++++--------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index e0cedbc..7640a79 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -7,6 +7,7 @@ * Copyright 2005 Oliver Stieber * Copyright 2006 Ivan Gyurdiev * Copyright 2007-2008 Stefan Dösinger for CodeWeavers + * Copyright 2009 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -131,17 +132,31 @@ const SHADER_OPCODE *shader_get_opcode(const SHADER_OPCODE *opcode_table, DWORD * Return the number of tokens read */ static int shader_get_param(const DWORD *pToken, DWORD shader_version, DWORD *param, DWORD *addr_token) { + UINT count = 1; + + *param = *pToken; + /* PS >= 3.0 have relative addressing (with token) * VS >= 2.0 have relative addressing (with token) * VS >= 1.0 < 2.0 have relative addressing (without token) * The version check below should work in general */ + if (*pToken & WINED3DSHADER_ADDRMODE_RELATIVE) + { + if (WINED3DSHADER_VERSION_MAJOR(shader_version) < 2) + { + *addr_token = (1 << 31) + | ((WINED3DSPR_ADDR << WINED3DSP_REGTYPE_SHIFT2) & WINED3DSP_REGTYPE_MASK2) + | ((WINED3DSPR_ADDR << WINED3DSP_REGTYPE_SHIFT) & WINED3DSP_REGTYPE_MASK) + | WINED3DSP_NOSWIZZLE; + } + else + { + *addr_token = *(pToken + 1); + ++count; + } + } - char rel_token = WINED3DSHADER_VERSION_MAJOR(shader_version) >= 2 && - ((*pToken & WINED3DSHADER_ADDRESSMODE_MASK) == WINED3DSHADER_ADDRMODE_RELATIVE); - - *param = *pToken; - *addr_token = rel_token? *(pToken + 1): 0; - return rel_token? 2:1; + return count; } /* Return the number of parameters to skip for an opcode */ @@ -167,7 +182,7 @@ static int shader_skip_unrecognized(const DWORD *pToken, DWORD shader_version) /* TODO: Think of a good name for 0x80000000 and replace it with a constant */ while (*pToken & 0x80000000) { - DWORD param, addr_token; + DWORD param, addr_token = 0; tokens_read += shader_get_param(pToken, shader_version, &param, &addr_token); pToken += tokens_read; @@ -1014,7 +1029,7 @@ void shader_trace_init(const DWORD *pFunction, const SHADER_OPCODE *opcode_table } else { - DWORD param, addr_token; + DWORD param, addr_token = 0; int tokens_read; /* Print out predication source token first - it follows diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3c8eac1..01a7c38 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1105,27 +1105,12 @@ static void shader_glsl_get_register_name(WINED3DSHADER_PARAM_REGISTER_TYPE regi /* Relative addressing */ if (rel_addr) { - /* Relative addressing on shaders 2.0+ have a relative address token, - * prior to that, it was hard-coded as "A0.x" because there's only 1 register */ - if (WINED3DSHADER_VERSION_MAJOR(shader_version) >= 2) - { - glsl_src_param_t rel_param; - shader_glsl_add_src_param(ins, addr_token, 0, WINED3DSP_WRITEMASK_0, &rel_param); - if (register_idx) - { - sprintf(register_name, "%cC[%s + %u]", prefix, rel_param.param_str, register_idx); - } else { - sprintf(register_name, "%cC[%s]", prefix, rel_param.param_str); - } - } else { - if (register_idx) - { - sprintf(register_name, "%cC[A0.x + %u]", prefix, register_idx); - } else { - sprintf(register_name, "%cC[A0.x]", prefix); - } - } - + glsl_src_param_t rel_param; + shader_glsl_add_src_param(ins, addr_token, 0, WINED3DSP_WRITEMASK_0, &rel_param); + if (register_idx) + sprintf(register_name, "%cC[%s + %u]", prefix, rel_param.param_str, register_idx); + else + sprintf(register_name, "%cC[%s]", prefix, rel_param.param_str); } else { if (shader_constant_is_local(This, register_idx)) {

1 0

Paul Vriens : gdi32/tests: Skip several tests on Win9x.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 59cc56b15a544ecc010a7ee799d0fe01f49e1754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59cc56b15a544ecc010a7ee79… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Apr 17 15:43:24 2009 +0200 gdi32/tests: Skip several tests on Win9x. --- dlls/gdi32/tests/pen.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index f53dac4..460288d 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -91,6 +91,14 @@ static void test_logpen(void) size = GetObject(hpen, sizeof(lp), &lp); ok(size == sizeof(lp), "GetObject returned %d, error %d\n", size, GetLastError()); + if (pen[i].style == PS_USERSTYLE || pen[i].style == PS_ALTERNATE) + { + if (lp.lopnStyle == pen[i].style) + { + win_skip("Skipping PS_USERSTYLE and PS_ALTERNATE tests on Win9x\n"); + continue; + } + } ok(lp.lopnStyle == pen[i].ret_style, "expected %u, got %u\n", pen[i].ret_style, lp.lopnStyle); ok(lp.lopnWidth.x == pen[i].ret_width, "expected %u, got %d\n", pen[i].ret_width, lp.lopnWidth.x); ok(lp.lopnWidth.y == 0 || @@ -521,6 +529,11 @@ static void test_ps_userstyle(void) pen = ExtCreatePen(PS_GEOMETRIC | PS_USERSTYLE, 50, &lb, 3, NULL); ok(pen == 0, "ExtCreatePen should fail\n"); + if (pen == 0 && GetLastError() == 0xdeadbeef) + { + win_skip("Looks like 9x, skipping PS_USERSTYLE tests\n"); + return; + } expect(ERROR_INVALID_PARAMETER, GetLastError()); DeleteObject(pen); SetLastError(0xdeadbeef);

1 0

Michael Stefaniuc : msi/tests: Replace long with LONG.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: cf6ec333a5fd3f2169b8b2e1b6ab889830cd4a1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf6ec333a5fd3f2169b8b2e1b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Apr 17 10:34:58 2009 +0200 msi/tests: Replace long with LONG. --- dlls/msi/tests/automation.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index f9ab254..7229748 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1046,7 +1046,7 @@ static HRESULT Session_EvaluateCondition(IDispatch *pSession, LPCWSTR szConditio return hr; } -static HRESULT Session_Message(IDispatch *pSession, long kind, IDispatch *record, int *ret) +static HRESULT Session_Message(IDispatch *pSession, LONG kind, IDispatch *record, int *ret) { VARIANT varresult; VARIANTARG vararg[2]; @@ -1067,7 +1067,7 @@ static HRESULT Session_Message(IDispatch *pSession, long kind, IDispatch *record return hr; } -static HRESULT Session_SetInstallLevel(IDispatch *pSession, long iInstallLevel) +static HRESULT Session_SetInstallLevel(IDispatch *pSession, LONG iInstallLevel) { VARIANT varresult; VARIANTARG vararg[1];

1 0

Michael Stefaniuc : msi: Remove superfluous cast of a MSIHANDLE in a TRACE( ).
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: f3a1660181bb75de2b38c839e9d68f4ec5665c13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3a1660181bb75de2b38c839e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Apr 17 10:34:47 2009 +0200 msi: Remove superfluous cast of a MSIHANDLE in a TRACE(). --- dlls/msi/automation.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 6668b17..b443257 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -162,7 +162,7 @@ static HRESULT create_automation_object(MSIHANDLE msiHandle, IUnknown *pUnkOuter AutomationObject *object; HRESULT hr; - TRACE("(%ld,%p,%p,%s,%p,%p,%ld)\n", (unsigned long)msiHandle, pUnkOuter, ppObj, debugstr_guid(clsid), funcInvoke, funcFree, sizetPrivateData); + TRACE("(%d,%p,%p,%s,%p,%p,%ld)\n", msiHandle, pUnkOuter, ppObj, debugstr_guid(clsid), funcInvoke, funcFree, sizetPrivateData); if( pUnkOuter ) return CLASS_E_NOAGGREGATION;

1 0

Michael Stefaniuc : ws2_32: Use better types for some variables.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 0847e7d826567aa3a8502fa6c4913d1343d37cf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0847e7d826567aa3a8502fa6c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Apr 17 10:35:21 2009 +0200 ws2_32: Use better types for some variables. --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index cabe191..0031ad2 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2382,7 +2382,7 @@ INT WINAPI WSAIoctl(SOCKET s, int WINAPI WS_ioctlsocket(SOCKET s, LONG cmd, WS_u_long *argp) { int fd; - long newcmd = cmd; + LONG newcmd = cmd; TRACE("socket %04lx, cmd %08x, ptr %p\n", s, cmd, argp); /* broken apps like defcon pass the argp value directly instead of a pointer to it */ diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ffc7ba9..c46a3f1 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1996,8 +1996,8 @@ static void test_ioctlsocket(void) { SOCKET sock; int ret; - long cmds[] = {FIONBIO, FIONREAD, SIOCATMARK}; - int i; + static const LONG cmds[] = {FIONBIO, FIONREAD, SIOCATMARK}; + UINT i; sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ok(sock != INVALID_SOCKET, "Creating the socket failed: %d\n", WSAGetLastError()); @@ -2007,7 +2007,7 @@ static void test_ioctlsocket(void) return; } - for(i = 0; i < sizeof(cmds)/sizeof(long); i++) + for(i = 0; i < sizeof(cmds)/sizeof(cmds[0]); i++) { /* broken apps like defcon pass the argp value directly instead of a pointer to it */ ret = ioctlsocket(sock, cmds[i], (u_long *)1);

1 0

Michael Stefaniuc : riched20/tests: Use better types than long.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: b747284797bdf1d48659eaaceac8bfef53ed678a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b747284797bdf1d48659eaace… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Apr 17 10:34:37 2009 +0200 riched20/tests: Use better types than long. --- dlls/riched20/tests/editor.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 78a9541..1b9e244 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -445,7 +445,7 @@ static int get_scroll_pos_y(HWND hwnd) return p.y; } -static void move_cursor(HWND hwnd, long charindex) +static void move_cursor(HWND hwnd, LONG charindex) { CHARRANGE cr; cr.cpMax = charindex; @@ -4211,9 +4211,9 @@ static void test_EM_GETMODIFY(void) } struct exsetsel_s { - long min; - long max; - long expected_retval; + LONG min; + LONG max; + LRESULT expected_retval; int expected_getsel_start; int expected_getsel_end; int _getsel_todo_wine;

1 0

Frans Kool : crypt32: Corrected Dutch translations.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 88f981658bb6a1ae276cdb04b7dc63bfbeabad90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88f981658bb6a1ae276cdb04b… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Thu Apr 16 09:26:25 2009 +0200 crypt32: Corrected Dutch translations. --- dlls/crypt32/crypt32_Nl.rc | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/crypt32_Nl.rc b/dlls/crypt32/crypt32_Nl.rc index fe3fa45..70ea2ba 100644 --- a/dlls/crypt32/crypt32_Nl.rc +++ b/dlls/crypt32/crypt32_Nl.rc @@ -43,7 +43,7 @@ STRINGTABLE DISCARDABLE IDS_CONTENT_TYPE "Inhoud Type" IDS_MESSAGE_DIGEST "Boodschap Samenvatting" IDS_SIGNING_TIME "Tijd van Ondertekening" - IDS_COUNTER_SIGN "Counter Sign" + IDS_COUNTER_SIGN "Tegen handtekening" IDS_CHALLENGE_PASSWORD "Geheime Vraag Wachtwoord" IDS_UNSTRUCTURED_ADDRESS "Ongestructureerd Adres" IDS_SMIME_CAPABILITIES "SMIME Mogelijkheden" @@ -63,9 +63,9 @@ STRINGTABLE DISCARDABLE IDS_NETSCAPE_CA_POLICY_URL "Netscape CA Beleids URL" IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL Server Naam" IDS_NETSCAPE_COMMENT "Netscape Commentaar" - IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo" - IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria" - IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria" + IDS_SPC_SP_AGENCY_INFO "SPC SP Agency Informatie" + IDS_SPC_FINANCIAL_CRITERIA "SPC Financiele Criteria" + IDS_SPC_MINIMAL_CRITERIA "SPC Minimale Criteria" IDS_COUNTRY "Land/Regio" IDS_ORGANIZATION "Organisatie" IDS_ORGANIZATIONAL_UNIT "Organisatie Onderdeel" @@ -173,6 +173,7 @@ STRINGTABLE DISCARDABLE IDS_LOCALIZEDNAME_ADDRESSBOOK "Overige Personen" IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "Vertrouwde uitgevers" } + STRINGTABLE DISCARDABLE { IDS_KEY_ID "SleutelID=" @@ -181,7 +182,7 @@ STRINGTABLE DISCARDABLE IDS_ALT_NAME_OTHER_NAME "Andere naam=" IDS_ALT_NAME_RFC822_NAME "Email Adres=" IDS_ALT_NAME_DNS_NAME "DNS naam=" - IDS_ALT_NAME_DIRECTORY_NAME "Directory adres" + IDS_ALT_NAME_DIRECTORY_NAME "Directory naam=" IDS_ALT_NAME_URL "URL=" IDS_ALT_NAME_IP_ADDRESS "IP adres=" IDS_ALT_NAME_MASK "Masker=" @@ -205,8 +206,8 @@ STRINGTABLE DISCARDABLE IDS_CRL_DIST_POINT_RDN_NAME "RDN naam" IDS_CRL_DIST_POINT_REASON "CRL reden=" IDS_CRL_DIST_POINT_ISSUER "CRL verstrekker" - IDS_REASON_KEY_COMPROMISE "Key Compromie" - IDS_REASON_CA_COMPROMISE "CA Compromie" + IDS_REASON_KEY_COMPROMISE "Sleutel besmet" + IDS_REASON_CA_COMPROMISE "CA besmet" IDS_REASON_AFFILIATION_CHANGED "Samenwerking gewijzigd" IDS_REASON_SUPERSEDED "Verouderd" IDS_REASON_CESSATION_OF_OPERATION "Werkzaamheden gestaakt"

1 0

Huw Davies : wineps.drv: Fix compile error.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: e911fde41cbcbfe0bf2bc8fea5631abe174cc2c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e911fde41cbcbfe0bf2bc8fea… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 16 22:05:30 2009 +0100 wineps.drv: Fix compile error. --- dlls/wineps.drv/mkagl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/mkagl.c b/dlls/wineps.drv/mkagl.c index d6aab8a..0cdb605 100644 --- a/dlls/wineps.drv/mkagl.c +++ b/dlls/wineps.drv/mkagl.c @@ -518,7 +518,7 @@ int main(int argc, char *argv[]) /* Clean up */ fclose(f_c); - fclose(f_h; + fclose(f_h); return 0; }

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
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