June 2007 - Wine-Commits - list.winehq.org

Francois Gouget : winapi: Add support for GDIPCONST.
by Alexandre Julliard June 21, 2007

June 21, 2007

Module: wine Branch: master Commit: 8304759634bd7774979a63ffb169bba99e10b27a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8304759634bd7774979a63ffb… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 21 11:15:26 2007 +0200 winapi: Add support for GDIPCONST. --- tools/winapi/winapi_parser.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winapi/winapi_parser.pm b/tools/winapi/winapi_parser.pm index bf3021d..01774cd 100644 --- a/tools/winapi/winapi_parser.pm +++ b/tools/winapi/winapi_parser.pm @@ -434,14 +434,14 @@ sub parse_c_file($$) { $argument =~ s/^\s*(.*?)\s*$/$1/; # print " " . ($n + 1) . ": '$argument'\n"; $argument =~ s/^(?:IN OUT|IN|OUT)?\s+//; - $argument =~ s/^(?:const|CONST|volatile)?\s+//; + $argument =~ s/^(?:const|CONST|GDIPCONST|volatile)?\s+//; if($argument =~ /^\.\.\.$/) { $argument_type = "..."; $argument_name = "..."; } elsif($argument =~ /^ ((?:interface\s+|struct\s+|union\s+|enum\s+|register\s+|(?:signed\s+|unsigned\s+)? (?:short\s+(?=int)|long\s+(?=int))?)?(?:\w+|ElfW$\w+$|WS$\w+$))\s* - ((?:__RPC_FAR|const|CONST|volatile)?\s*(?:\*\s*(?:__RPC_FAR|const|CONST|volatile)?\s*?)*)\s* + ((?:__RPC_FAR|const|CONST|GDIPCONST|volatile)?\s*(?:\*\s*(?:__RPC_FAR|const|CONST|volatile)?\s*?)*)\s* (\w*)\s*(\[\])?(?:\s+OPTIONAL)?$/x) { $argument_type = $1;

1 0

Francois Gouget : advapi32: Add more RegGetValue() conformance tests, and fix Wine accordingly.
by Alexandre Julliard June 21, 2007

June 21, 2007

Module: wine Branch: master Commit: 1da7a32b116c169f07bfef060894df2b1f71a4b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1da7a32b116c169f07bfef060… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 21 02:12:30 2007 +0200 advapi32: Add more RegGetValue() conformance tests, and fix Wine accordingly. --- dlls/advapi32/registry.c | 22 ++++++++++++++-------- dlls/advapi32/tests/registry.c | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index cb905ed..e62206b 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1451,6 +1451,8 @@ LONG WINAPI RegGetValueW( HKEY hKey, LPCWSTR pszSubKey, LPCWSTR pszValue, hKey, debugstr_w(pszSubKey), debugstr_w(pszValue), dwFlags, pdwType, pvData, pcbData, cbData); + if (pvData && !pcbData) + return ERROR_INVALID_PARAMETER; if ((dwFlags & RRF_RT_REG_EXPAND_SZ) && !(dwFlags & RRF_NOEXPAND)) return ERROR_INVALID_PARAMETER; @@ -1466,7 +1468,7 @@ LONG WINAPI RegGetValueW( HKEY hKey, LPCWSTR pszSubKey, LPCWSTR pszValue, * if the passed buffer was too small as the expanded string might be * smaller than the unexpanded one and could fit into cbData bytes. */ if ((ret == ERROR_SUCCESS || ret == ERROR_MORE_DATA) && - (dwType == REG_EXPAND_SZ && !(dwFlags & RRF_NOEXPAND))) + dwType == REG_EXPAND_SZ && !(dwFlags & RRF_NOEXPAND)) { do { HeapFree(GetProcessHeap(), 0, pvBuf); @@ -1478,7 +1480,7 @@ LONG WINAPI RegGetValueW( HKEY hKey, LPCWSTR pszSubKey, LPCWSTR pszValue, break; } - if (ret == ERROR_MORE_DATA) + if (ret == ERROR_MORE_DATA || !pvData) ret = RegQueryValueExW(hKey, pszValue, NULL, &dwType, pvBuf, &cbData); else @@ -1496,6 +1498,7 @@ LONG WINAPI RegGetValueW( HKEY hKey, LPCWSTR pszSubKey, LPCWSTR pszValue, if (ret == ERROR_SUCCESS) { + /* Recheck dwType in case it changed since the first call */ if (dwType == REG_EXPAND_SZ) { cbData = ExpandEnvironmentStringsW(pvBuf, pvData, @@ -1504,7 +1507,7 @@ LONG WINAPI RegGetValueW( HKEY hKey, LPCWSTR pszSubKey, LPCWSTR pszValue, if(pcbData && cbData > *pcbData) ret = ERROR_MORE_DATA; } - else if (pcbData) + else if (pvData) CopyMemory(pvData, pvBuf, *pcbData); } @@ -1516,7 +1519,7 @@ LONG WINAPI RegGetValueW( HKEY hKey, LPCWSTR pszSubKey, LPCWSTR pszValue, ADVAPI_ApplyRestrictions(dwFlags, dwType, cbData, &ret); - if (pcbData && ret != ERROR_SUCCESS && (dwFlags & RRF_ZEROONFAILURE)) + if (pvData && ret != ERROR_SUCCESS && (dwFlags & RRF_ZEROONFAILURE)) ZeroMemory(pvData, *pcbData); if (pdwType) *pdwType = dwType; @@ -1543,6 +1546,8 @@ LONG WINAPI RegGetValueA( HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue, hKey, pszSubKey, pszValue, dwFlags, pdwType, pvData, pcbData, cbData); + if (pvData && !pcbData) + return ERROR_INVALID_PARAMETER; if ((dwFlags & RRF_RT_REG_EXPAND_SZ) && !(dwFlags & RRF_NOEXPAND)) return ERROR_INVALID_PARAMETER; @@ -1558,7 +1563,7 @@ LONG WINAPI RegGetValueA( HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue, * if the passed buffer was too small as the expanded string might be * smaller than the unexpanded one and could fit into cbData bytes. */ if ((ret == ERROR_SUCCESS || ret == ERROR_MORE_DATA) && - (dwType == REG_EXPAND_SZ && !(dwFlags & RRF_NOEXPAND))) + dwType == REG_EXPAND_SZ && !(dwFlags & RRF_NOEXPAND)) { do { HeapFree(GetProcessHeap(), 0, pvBuf); @@ -1570,7 +1575,7 @@ LONG WINAPI RegGetValueA( HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue, break; } - if (ret == ERROR_MORE_DATA) + if (ret == ERROR_MORE_DATA || !pvData) ret = RegQueryValueExA(hKey, pszValue, NULL, &dwType, pvBuf, &cbData); else @@ -1588,6 +1593,7 @@ LONG WINAPI RegGetValueA( HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue, if (ret == ERROR_SUCCESS) { + /* Recheck dwType in case it changed since the first call */ if (dwType == REG_EXPAND_SZ) { cbData = ExpandEnvironmentStringsA(pvBuf, pvData, @@ -1596,7 +1602,7 @@ LONG WINAPI RegGetValueA( HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue, if(pcbData && cbData > *pcbData) ret = ERROR_MORE_DATA; } - else if (pcbData) + else if (pvData) CopyMemory(pvData, pvBuf, *pcbData); } @@ -1608,7 +1614,7 @@ LONG WINAPI RegGetValueA( HKEY hKey, LPCSTR pszSubKey, LPCSTR pszValue, ADVAPI_ApplyRestrictions(dwFlags, dwType, cbData, &ret); - if (pcbData && ret != ERROR_SUCCESS && (dwFlags & RRF_ZEROONFAILURE)) + if (pvData && ret != ERROR_SUCCESS && (dwFlags & RRF_ZEROONFAILURE)) ZeroMemory(pvData, *pcbData); if (pdwType) *pdwType = dwType; diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 0cc58f1..cdd4835 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -598,6 +598,10 @@ static void test_get_value(void) return; } + /* Invalid parameter */ + ret = pRegGetValueA(hkey_main, NULL, "DWORD", RRF_RT_REG_DWORD, &type, &dw, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "ret=%d\n", ret); + /* Query REG_DWORD using RRF_RT_REG_DWORD (ok) */ size = type = dw = 0xdeadbeef; ret = pRegGetValueA(hkey_main, NULL, "DWORD", RRF_RT_REG_DWORD, &type, &dw, &size); @@ -629,6 +633,13 @@ static void test_get_value(void) /* ... except the buffer, which is zeroed out */ ok(dw == 0, "dw=%d\n", dw); + /* Test RRF_ZEROONFAILURE with a NULL buffer... */ + type = size = 0xbadbeef; + ret = pRegGetValueA(hkey_main, NULL, "DWORD", RRF_RT_REG_SZ|RRF_ZEROONFAILURE, &type, NULL, &size); + ok(ret == ERROR_UNSUPPORTED_TYPE, "ret=%d\n", ret); + ok(size == 4, "size=%d\n", size); + ok(type == REG_DWORD, "type=%d\n", type); + /* Query REG_DWORD using RRF_RT_DWORD (ok) */ size = type = dw = 0xdeadbeef; ret = pRegGetValueA(hkey_main, NULL, "DWORD", RRF_RT_DWORD, &type, &dw, &size); @@ -678,6 +689,15 @@ static void test_get_value(void) ok(type == REG_SZ, "type=%d\n", type); ok(!strcmp(sTestpath1, buf), "sTestpath=\"%s\" buf=\"%s\"\n", sTestpath1, buf); + /* Query REG_SZ using RRF_RT_REG_SZ and no buffer (ok) */ + type = 0xdeadbeef; size = 0; + ret = pRegGetValueA(hkey_main, NULL, "TP1_SZ", RRF_RT_REG_SZ, &type, NULL, &size); + ok(ret == ERROR_SUCCESS, "ret=%d\n", ret); + /* v5.2.3790.1830 (2003 SP1) returns sTestpath1 length + 2 here. */ + ok(size == strlen(sTestpath1)+1 || size == strlen(sTestpath1)+2, + "strlen(sTestpath1)=%d size=%d\n", lstrlenA(sTestpath1), size); + ok(type == REG_SZ, "type=%d\n", type); + /* Query REG_SZ using RRF_RT_REG_SZ|RRF_NOEXPAND (ok) */ buf[0] = 0; type = 0xdeadbeef; size = sizeof(buf); ret = pRegGetValueA(hkey_main, NULL, "TP1_SZ", RRF_RT_REG_SZ|RRF_NOEXPAND, &type, buf, &size); @@ -686,6 +706,14 @@ static void test_get_value(void) ok(type == REG_SZ, "type=%d\n", type); ok(!strcmp(sTestpath1, buf), "sTestpath=\"%s\" buf=\"%s\"\n", sTestpath1, buf); + /* Query REG_EXPAND_SZ using RRF_RT_REG_SZ and no buffer (ok, expands) */ + size = 0xbadbeef; + ret = pRegGetValueA(hkey_main, NULL, "TP1_EXP_SZ", RRF_RT_REG_SZ, NULL, NULL, &size); + ok(ret == ERROR_SUCCESS, "ret=%d\n", ret); + /* At least v5.2.3790.1830 (2003 SP1) returns the unexpanded sTestpath1 length + 1 here. */ + ok((size == strlen(expanded)+1) || (size == strlen(sTestpath1)+1), + "strlen(expanded)=%d, strlen(sTestpath1)=%d, size=%d\n", lstrlenA(expanded), lstrlenA(sTestpath1), size); + /* Query REG_EXPAND_SZ using RRF_RT_REG_SZ (ok, expands) */ buf[0] = 0; type = 0xdeadbeef; size = sizeof(buf); ret = pRegGetValueA(hkey_main, NULL, "TP1_EXP_SZ", RRF_RT_REG_SZ, &type, buf, &size); @@ -703,7 +731,15 @@ static void test_get_value(void) ok(size == strlen(sTestpath1)+1, "strlen(sTestpath1)=%d size=%d\n", lstrlenA(sTestpath1), size); ok(type == REG_EXPAND_SZ, "type=%d\n", type); ok(!strcmp(sTestpath1, buf), "sTestpath=\"%s\" buf=\"%s\"\n", sTestpath1, buf); - + + /* Query REG_EXPAND_SZ using RRF_RT_REG_EXPAND_SZ|RRF_NOEXPAND and no buffer (ok, doesn't expand) */ + size = 0xbadbeef; + ret = pRegGetValueA(hkey_main, NULL, "TP1_EXP_SZ", RRF_RT_REG_EXPAND_SZ|RRF_NOEXPAND, NULL, NULL, &size); + ok(ret == ERROR_SUCCESS, "ret=%d\n", ret); + /* v5.2.3790.1830 (2003 SP1) returns sTestpath1 length + 2 here. */ + ok(size == strlen(sTestpath1)+1 || size == strlen(sTestpath1)+2, + "strlen(sTestpath1)=%d size=%d\n", lstrlenA(sTestpath1), size); + /* Query REG_EXPAND_SZ using RRF_RT_REG_SZ|RRF_NOEXPAND (type mismatch) */ ret = pRegGetValueA(hkey_main, NULL, "TP1_EXP_SZ", RRF_RT_REG_SZ|RRF_NOEXPAND, NULL, NULL, NULL); ok(ret == ERROR_UNSUPPORTED_TYPE, "ret=%d\n", ret);

1 0

Dan Hipschman : widl: Fix warnings about unused function parameters.
by Alexandre Julliard June 21, 2007

June 21, 2007

Module: wine Branch: master Commit: bf5e46a60aa1cfcbb6efd61ebf4d34eb9fb0084d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf5e46a60aa1cfcbb6efd61eb… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Jun 20 16:51:23 2007 -0700 widl: Fix warnings about unused function parameters. --- tools/widl/typegen.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 7b3bd13..8c76e6e 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -992,7 +992,7 @@ static void write_descriptors(FILE *file, type_t *type, unsigned int *tfsoff) } static int write_no_repeat_pointer_descriptions( - FILE *file, const attr_list_t *attrs, type_t *type, + FILE *file, type_t *type, size_t *offset_in_memory, size_t *offset_in_buffer, unsigned int *typestring_offset) { @@ -1028,7 +1028,7 @@ static int write_no_repeat_pointer_descriptions( const var_t *v; LIST_FOR_EACH_ENTRY( v, type->fields, const var_t, entry ) written += write_no_repeat_pointer_descriptions( - file, v->attrs, v->type, + file, v->type, offset_in_memory, offset_in_buffer, typestring_offset); } else @@ -1303,7 +1303,6 @@ static int write_varying_array_pointer_descriptions( } static void write_pointer_description(FILE *file, type_t *type, - size_t mem_offset, int level, unsigned int *typestring_offset) { size_t offset_in_buffer; @@ -1314,7 +1313,7 @@ static void write_pointer_description(FILE *file, type_t *type, offset_in_memory = 0; offset_in_buffer = 0; write_no_repeat_pointer_descriptions( - file, NULL, type, + file, type, &offset_in_memory, &offset_in_buffer, typestring_offset); /* pass 2: search for pointers in fixed arrays */ @@ -1518,7 +1517,7 @@ static size_t write_array_tfs(FILE *file, const attr_list_t *attrs, type_t *type print_file(file, 2, "0x%x, /* FC_PP */\n", RPC_FC_PP); print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD); *typestring_offset += 2; - write_pointer_description(file, type, 0, 0, typestring_offset); + write_pointer_description(file, type, typestring_offset); print_file(file, 2, "0x%x, /* FC_END */\n", RPC_FC_END); *typestring_offset += 1; } @@ -1631,7 +1630,7 @@ static size_t write_struct_tfs(FILE *file, type_t *type, print_file(file, 2, "0x%x, /* FC_PP */\n", RPC_FC_PP); print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD); *tfsoff += 2; - write_pointer_description(file, type, 0, 0, tfsoff); + write_pointer_description(file, type, tfsoff); print_file(file, 2, "0x%x, /* FC_END */\n", RPC_FC_END); *tfsoff += 1; }

1 0

Dan Hipschman : widl: Add tests for arrays of pointers.
by Alexandre Julliard June 21, 2007

June 21, 2007

Module: wine Branch: master Commit: 4e8c8d03e50a13c62711a3afb1bb424a56a9382a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e8c8d03e50a13c62711a3afb… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Jun 20 16:50:44 2007 -0700 widl: Add tests for arrays of pointers. --- dlls/rpcrt4/tests/server.c | 28 ++++++++++++++++++++++++++++ dlls/rpcrt4/tests/server.idl | 2 ++ tools/widl/typegen.c | 2 +- 3 files changed, 31 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 65226db..a0291e0 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -257,6 +257,21 @@ s_square_encu(encu_t *eu) } } +int +s_sum_parr(int *a[3]) +{ + return s_sum_pcarr(a, 3); +} + +int +s_sum_pcarr(int *a[], int n) +{ + int i, s = 0; + for (i = 0; i < n; ++i) + s += *a[i]; + return s; +} + void s_stop(void) { @@ -494,14 +509,27 @@ us_t_UserFree(ULONG *flags, us_t *pus) static void pointer_tests(void) { + static int a[] = {1, 2, 3, 4}; static char p1[] = "11"; test_list_t *list = make_list(make_list(make_list(null_list()))); static test_us_t tus = {{p1}}; + int *pa[4]; ok(test_list_length(list) == 3, "RPC test_list_length\n"); ok(square_puint(p1) == 121, "RPC square_puint\n"); ok(square_test_us(&tus) == 121, "RPC square_test_us\n"); + pa[0] = &a[0]; + pa[1] = &a[1]; + pa[2] = &a[2]; + ok(sum_parr(pa) == 6, "RPC sum_parr\n"); + + pa[0] = &a[0]; + pa[1] = &a[1]; + pa[2] = &a[2]; + pa[3] = &a[3]; + ok(sum_pcarr(pa, 4) == 10, "RPC sum_pcarr\n"); + free_list(list); } diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index e7873f5..d409c53 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -158,5 +158,7 @@ interface IServer } encu_t; double square_encu(encu_t *eu); + int sum_parr(int *a[3]); + int sum_pcarr([size_is(n)] int *a[], int n); void stop(void); } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 823f6e5..7b3bd13 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1518,7 +1518,7 @@ static size_t write_array_tfs(FILE *file, const attr_list_t *attrs, type_t *type print_file(file, 2, "0x%x, /* FC_PP */\n", RPC_FC_PP); print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD); *typestring_offset += 2; - write_pointer_description(file, type->ref, 0, 0, typestring_offset); + write_pointer_description(file, type, 0, 0, typestring_offset); print_file(file, 2, "0x%x, /* FC_END */\n", RPC_FC_END); *typestring_offset += 1; }

1 0

H. Verbeet : wined3d: Use texture2D to sample in pshader_glsl_texdp3tex().
by Alexandre Julliard June 21, 2007

June 21, 2007

Module: wine Branch: master Commit: 2e786e09bb3354ee6d3fb96fa7f100e8c2e1efc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e786e09bb3354ee6d3fb96fa… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Jun 21 00:00:59 2007 +0200 wined3d: Use texture2D to sample in pshader_glsl_texdp3tex(). --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index afffa23..244316a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1625,7 +1625,7 @@ void pshader_glsl_texdp3tex(SHADER_OPCODE_ARG* arg) { shader_glsl_append_dst(arg->buffer, arg); shader_glsl_get_write_mask(arg->dst, dst_mask); - shader_addline(arg->buffer, "texture1D(Psampler%u, dot(gl_TexCoord[%u].xyz, %s))%s);\n", + shader_addline(arg->buffer, "texture2D(Psampler%u, vec2(dot(gl_TexCoord[%u].xyz, %s), 0.5))%s);\n", sampler_idx, sampler_idx, src0_param.param_str, dst_mask); }

1 0

Alexander Nicolaysen Sørnes : wordpad: Set default font effects to 0.
by Alexandre Julliard June 21, 2007

June 21, 2007

Module: wine Branch: master Commit: 40bee2c46b755698af93a6882c4a5f11ac693cca URL: http://source.winehq.org/git/wine.git/?a=commit;h=40bee2c46b755698af93a6882… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jun 14 20:03:21 2007 +0200 wordpad: Set default font effects to 0. --- programs/wordpad/wordpad.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 1dd869b..12c2d43 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -319,7 +319,8 @@ static void DoDefaultFont(void) ZeroMemory(&fmt, sizeof(fmt)); fmt.cbSize = sizeof(fmt); - fmt.dwMask = CFM_FACE; + fmt.dwMask = CFM_FACE | CFM_BOLD | CFM_ITALIC | CFM_UNDERLINE; + fmt.dwEffects = 0; lstrcpyW(fmt.szFaceName, szFaceName);

1 0

H. Verbeet : wined3d: Make use of the texUnitMap in drawStridedSlow as well .
by Alexandre Julliard June 21, 2007

June 21, 2007

Module: wine Branch: master Commit: c60bdca5b055d275088e709637cbd2734c291d67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c60bdca5b055d275088e70963… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Jun 21 00:01:05 2007 +0200 wined3d: Make use of the texUnitMap in drawStridedSlow as well. --- dlls/wined3d/drawprim.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 115f3e3..b996ae2 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -284,7 +284,6 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData const void *idxData, short idxSize, ULONG minIndex, ULONG startIdx, ULONG startVertex) { unsigned int textureNo = 0; - unsigned int texture_idx = 0; const WORD *pIdxBufS = NULL; const DWORD *pIdxBufL = NULL; LONG vx_index; @@ -318,7 +317,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData /* Adding the stream offset once is cheaper than doing it every iteration. Do not modify the strided data, it is a pointer * to the strided Data in the device and might be needed intact on the next draw */ - for (textureNo = 0, texture_idx = 0; textureNo < GL_LIMITS(texture_stages); ++textureNo) { + for (textureNo = 0; textureNo < GL_LIMITS(texture_stages); ++textureNo) { if(sd->u.s.texCoords[textureNo].lpData) { texCoords[textureNo] = sd->u.s.texCoords[textureNo].lpData + streamOffset[sd->u.s.texCoords[textureNo].streamNo]; } else { @@ -383,7 +382,7 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData } /* Texture coords --------------------------- */ - for (textureNo = 0, texture_idx = 0; textureNo < GL_LIMITS(texture_stages); ++textureNo) { + for (textureNo = 0; textureNo < GL_LIMITS(texture_stages); ++textureNo) { if (!GL_SUPPORT(ARB_MULTITEXTURE) && textureNo > 0) { FIXME("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); @@ -399,23 +398,22 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData if (coordIdx > 7) { VTRACE(("tex: %d - Skip tex coords, as being system generated\n", textureNo)); - ++texture_idx; continue; } else if (coordIdx < 0) { FIXME("tex: %d - Coord index %d is less than zero, expect a crash.\n", textureNo, coordIdx); - ++texture_idx; continue; } ptrToCoords = (float *)(texCoords[coordIdx] + (SkipnStrides * sd->u.s.texCoords[coordIdx].dwStride)); if (texCoords[coordIdx] == NULL) { TRACE("tex: %d - Skipping tex coords, as no data supplied\n", textureNo); - ++texture_idx; continue; } else { - + int texture_idx = This->texUnitMap[textureNo]; int coordsToUse = sd->u.s.texCoords[coordIdx].dwType + 1; /* 0 == WINED3DDECLTYPE_FLOAT1 etc */ + if (texture_idx == -1) continue; + /* The coords to supply depend completely on the fvf / vertex shader */ switch (coordsToUse) { case 4: q = ptrToCoords[3]; /* drop through */ @@ -492,7 +490,6 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData } } } - if (/*!GL_SUPPORT(NV_REGISTER_COMBINERS) || This->stateBlock->textures[textureNo]*/TRUE) ++texture_idx; } /* End of textures */ /* Diffuse -------------------------------- */

1 0

Alexander Nicolaysen Sørnes : wordpad: Remove unnecessary toolbar resizing code.
by Alexandre Julliard June 21, 2007

June 21, 2007

Module: wine Branch: master Commit: bb1a13774ef1d104a0e0b2b8bab229fb87b20490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb1a13774ef1d104a0e0b2b8b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jun 14 22:09:33 2007 +0200 wordpad: Remove unnecessary toolbar resizing code. --- programs/wordpad/wordpad.c | 22 ---------------------- 1 files changed, 0 insertions(+), 22 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 12c2d43..1b859b7 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -822,8 +822,6 @@ static LRESULT OnSize( HWND hWnd, WPARAM wParam, LPARAM lParam ) HWND hwndEditor = GetDlgItem(hWnd, IDC_EDITOR); HWND hwndStatusBar = GetDlgItem(hWnd, IDC_STATUSBAR); HWND hwndReBar = GetDlgItem(hWnd, IDC_REBAR); - HWND hwndToolBar = GetDlgItem(hwndReBar, IDC_TOOLBAR); - HWND hwndFormatBar = GetDlgItem(hwndReBar, IDC_FORMATBAR); int rebarHeight = 0; REBARBANDINFOW rbbinfo; int rebarRows = 2; @@ -840,26 +838,6 @@ static LRESULT OnSize( HWND hWnd, WPARAM wParam, LPARAM lParam ) nStatusSize = 0; } } - if (hwndToolBar) - { - rc.left = rc.top = 0; - rc.right = LOWORD(lParam); - rc.bottom = HIWORD(lParam); - SendMessageW(hwndToolBar, TB_AUTOSIZE, 0, 0); - SendMessageW(hwndReBar, RB_SIZETORECT, 0, (LPARAM)&rc); - GetClientRect(hwndReBar, &rc); - MoveWindow(hwndReBar, 0, 0, LOWORD(lParam), rc.right, FALSE); - } - if (hwndFormatBar) - { - rc.left = rc.top = 0; - rc.right = LOWORD(lParam); - rc.bottom = HIWORD(lParam); - SendMessageW(hwndFormatBar, TB_AUTOSIZE, 0, 0); - SendMessageW(hwndReBar, RB_SIZETORECT, 0, (LPARAM)&rc); - GetClientRect(hwndReBar, &rc); - MoveWindow(hwndReBar, 0, 0, LOWORD(lParam), rc.right, FALSE); - } if (hwndReBar) { rbbinfo.cbSize = sizeof(rbbinfo);

1 0

Stefan Dösinger : wined3d: Emulate tracking of multiple material properties.
by Alexandre Julliard June 21, 2007

June 21, 2007

Module: wine Branch: master Commit: b081cbaf40519dc9556d3fab57e02a2296cf4e66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b081cbaf40519dc9556d3fab5… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Jun 20 14:36:32 2007 +0200 wined3d: Emulate tracking of multiple material properties. --- dlls/wined3d/drawprim.c | 57 ++++++++++++++++++++++++++++++++++++++- dlls/wined3d/state.c | 21 ++++++++++++++ dlls/wined3d/wined3d_private.h | 2 + 3 files changed, 78 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 1cde3a9..115f3e3 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -510,6 +510,19 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData D3DCOLOR_B_G(diffuseColor), D3DCOLOR_B_B(diffuseColor), D3DCOLOR_B_A(diffuseColor))); + + if(This->activeContext->num_untracked_materials) { + unsigned char i; + float color[4]; + color[0] = D3DCOLOR_B_R(diffuseColor) / 255.0; + color[1] = D3DCOLOR_B_G(diffuseColor) / 255.0; + color[2] = D3DCOLOR_B_B(diffuseColor) / 255.0; + color[3] = D3DCOLOR_B_A(diffuseColor) / 255.0; + + for(i = 0; i < This->activeContext->num_untracked_materials; i++) { + glMaterialfv(GL_FRONT_AND_BACK, This->activeContext->untracked_materials[i], color); + } + } } /* Specular ------------------------------- */ @@ -1030,15 +1043,55 @@ void drawPrimitive(IWineD3DDevice *iface, { GLenum glPrimType; + BOOL emulation = FALSE; + WineDirect3DVertexStridedData *strided = &This->strided_streams; + WineDirect3DVertexStridedData stridedlcl; /* Ok, Work out which primitive is requested and how many vertexes that will be */ UINT calculatedNumberOfindices = primitiveToGl(PrimitiveType, NumPrimitives, &glPrimType); if (numberOfVertices == 0 ) numberOfVertices = calculatedNumberOfindices; - if (This->useDrawStridedSlow) { + if(!This->strided_streams.u.s.position_transformed && !use_vs(This)) { + if(This->activeContext->num_untracked_materials && + This->stateBlock->renderState[WINED3DRS_LIGHTING]) { + IWineD3DVertexBufferImpl *vb; + + FIXME("Using software emulation because not all material properties could be tracked\n"); + emulation = TRUE; + + strided = &stridedlcl; + memcpy(&stridedlcl, &This->strided_streams, sizeof(stridedlcl)); + +#define FIXVBO(type) \ +if(stridedlcl.u.s.type.VBO) { \ + vb = (IWineD3DVertexBufferImpl *) This->stateBlock->streamSource[stridedlcl.u.s.type.streamNo]; \ + stridedlcl.u.s.type.VBO = 0; \ + stridedlcl.u.s.type.lpData = (BYTE *) ((unsigned long) stridedlcl.u.s.type.lpData + (unsigned long) vb->resource.allocatedMemory); \ +} + FIXVBO(position); + FIXVBO(blendWeights); + FIXVBO(blendMatrixIndices); + FIXVBO(normal); + FIXVBO(pSize); + FIXVBO(diffuse); + FIXVBO(specular); + for(i = 0; i < WINED3DDP_MAXTEXCOORD; i++) FIXVBO(texCoords[i]); + FIXVBO(position2); + FIXVBO(normal2); + FIXVBO(tangent); + FIXVBO(binormal); + FIXVBO(tessFactor); + FIXVBO(fog); + FIXVBO(depth); + FIXVBO(sample); +#undef FIXVBO + } + } + + if (This->useDrawStridedSlow || emulation) { /* Immediate mode drawing */ - drawStridedSlow(iface, &This->strided_streams, calculatedNumberOfindices, + drawStridedSlow(iface, strided, calculatedNumberOfindices, glPrimType, idxData, idxSize, minIndex, StartIdx, StartVertexIndex); } else if(This->instancedDraw) { /* Instancing emulation with mixing immediate mode and arrays */ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1c72785..3b7c5c9 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -980,6 +980,7 @@ static void state_colormat(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine isDiffuseSupplied = diffuse->lpData || diffuse->VBO; + context->num_untracked_materials = 0; if (isDiffuseSupplied && stateblock->renderState[WINED3DRS_COLORVERTEX]) { TRACE("diff %d, amb %d, emis %d, spec %d\n", stateblock->renderState[WINED3DRS_DIFFUSEMATERIALSOURCE], @@ -993,10 +994,30 @@ static void state_colormat(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine } else { Parm = GL_DIFFUSE; } + if(stateblock->renderState[WINED3DRS_EMISSIVEMATERIALSOURCE] == WINED3DMCS_COLOR1) { + context->untracked_materials[context->num_untracked_materials] = GL_EMISSION; + context->num_untracked_materials++; + } + if(stateblock->renderState[WINED3DRS_SPECULARMATERIALSOURCE] == WINED3DMCS_COLOR1) { + context->untracked_materials[context->num_untracked_materials] = GL_SPECULAR; + context->num_untracked_materials++; + } } else if (stateblock->renderState[WINED3DRS_AMBIENTMATERIALSOURCE] == WINED3DMCS_COLOR1) { Parm = GL_AMBIENT; + if(stateblock->renderState[WINED3DRS_EMISSIVEMATERIALSOURCE] == WINED3DMCS_COLOR1) { + context->untracked_materials[context->num_untracked_materials] = GL_EMISSION; + context->num_untracked_materials++; + } + if(stateblock->renderState[WINED3DRS_SPECULARMATERIALSOURCE] == WINED3DMCS_COLOR1) { + context->untracked_materials[context->num_untracked_materials] = GL_SPECULAR; + context->num_untracked_materials++; + } } else if (stateblock->renderState[WINED3DRS_EMISSIVEMATERIALSOURCE] == WINED3DMCS_COLOR1) { Parm = GL_EMISSION; + if(stateblock->renderState[WINED3DRS_SPECULARMATERIALSOURCE] == WINED3DMCS_COLOR1) { + context->untracked_materials[context->num_untracked_materials] = GL_SPECULAR; + context->num_untracked_materials++; + } } else if (stateblock->renderState[WINED3DRS_SPECULARMATERIALSOURCE] == WINED3DMCS_COLOR1) { Parm = GL_SPECULAR; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1c35ea4..3c0dfee 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -507,6 +507,8 @@ struct WineD3DContext { BOOL namedArraysLoaded, numberedArraysLoaded; BOOL lastWasPow2Texture[MAX_TEXTURES]; GLenum tracking_parm; /* Which source is tracking current colour */ + unsigned char num_untracked_materials; + GLenum untracked_materials[2]; BOOL last_was_blit, last_was_ckey; char texShaderBumpMap;

1 0

Stefan Dösinger : wined3d: Unload texture coords for all supported texture stages.
by Alexandre Julliard June 21, 2007

June 21, 2007

Module: wine Branch: master Commit: 35ee1e9693f086fa996dec020c74570e3523d942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35ee1e9693f086fa996dec020… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Jun 20 14:23:04 2007 +0200 wined3d: Unload texture coords for all supported texture stages. --- dlls/wined3d/state.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d6522f2..1c72785 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1812,7 +1812,7 @@ static void transform_texture(DWORD state, IWineD3DStateBlockImpl *stateblock, W static void unloadTexCoords(IWineD3DStateBlockImpl *stateblock) { int texture_idx; - for (texture_idx = 0; texture_idx < GL_LIMITS(textures); ++texture_idx) { + for (texture_idx = 0; texture_idx < GL_LIMITS(texture_stages); ++texture_idx) { GL_EXTCALL(glClientActiveTextureARB(GL_TEXTURE0_ARB + texture_idx)); glDisableClientState(GL_TEXTURE_COORD_ARRAY); }

1 0