wine-commits June 2010

wine-commits@winehq.org

3 participants
663 discussions

Nikolay Sivov : msvcrt: Add _snwprintf_s implementation.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: 1a234159fe1e5fc24a0035f43265f70672abd41f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a234159fe1e5fc24a0035f43… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 10 23:28:01 2010 +0400 msvcrt: Add _snwprintf_s implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 14 ++++++++++++++ 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index e6524d6..b0b8172 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1052,7 +1052,7 @@ @ stub _snscanf_s_l @ varargs _snwprintf(ptr long wstr) msvcrt._snwprintf @ stub _snwprintf_l -@ stub _snwprintf_s +@ varargs _snwprintf_s(ptr long long wstr) msvcrt._snwprintf_s @ stub _snwprintf_s_l @ stub _snwscanf @ stub _snwscanf_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index db65318..a8ba61e 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -899,7 +899,7 @@ @ stub _snscanf_s_l @ varargs _snwprintf(ptr long wstr) msvcrt._snwprintf @ stub _snwprintf_l -@ stub _snwprintf_s +@ varargs _snwprintf_s(ptr long long wstr) msvcrt._snwprintf_s @ stub _snwprintf_s_l @ stub _snwscanf @ stub _snwscanf_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 1da6e82..df65a5c 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -885,7 +885,7 @@ @ stub _snscanf_s_l @ varargs _snwprintf(ptr long wstr) msvcrt._snwprintf @ stub _snwprintf_l -@ stub _snwprintf_s +@ varargs _snwprintf_s(ptr long long wstr) msvcrt._snwprintf_s @ stub _snwprintf_s_l @ stub _snwscanf @ stub _snwscanf_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ff19519..88a2ab9 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -838,7 +838,7 @@ # stub _snscanf_s_l @ varargs _snwprintf(ptr long wstr) MSVCRT__snwprintf # stub _snwprintf_l -# stub _snwprintf_s +@ varargs _snwprintf_s(ptr long long wstr) MSVCRT__snwprintf_s # stub _snwprintf_s_l # stub _snwscanf # stub _snwscanf_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 9571928..4485db3 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1205,6 +1205,20 @@ int CDECL MSVCRT__snwprintf( MSVCRT_wchar_t *str, unsigned int len, const MSVCRT } /********************************************************************* + * _snwprintf_s (MSVCRT.@) + */ +int CDECL MSVCRT__snwprintf_s( MSVCRT_wchar_t *str, unsigned int len, unsigned int count, + const MSVCRT_wchar_t *format, ...) +{ + int retval; + __ms_va_list valist; + __ms_va_start(valist, format); + retval = MSVCRT_vsnwprintf_s_l(str, len, count, format, NULL, valist); + __ms_va_end(valist); + return retval; +} + +/********************************************************************* * sprintf (MSVCRT.@) */ int CDECL MSVCRT_sprintf( char *str, const char *format, ... )

1 0

Nikolay Sivov : msvcrt: Add _snprintf_s implementation.
by Alexandre Julliard 11 Jun '10

11 Jun '10

Module: wine Branch: master Commit: 59bddde594a9bca91de4f09914c092c37efe6200 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59bddde594a9bca91de4f0991… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 10 23:12:20 2010 +0400 msvcrt: Add _snprintf_s implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 14 ++++++++++++++ 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 2117c05..e6524d6 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1044,7 +1044,7 @@ @ stub _snprintf_c @ stub _snprintf_c_l @ stub _snprintf_l -@ stub _snprintf_s +@ varargs _snprintf_s(ptr long long str) msvcrt._snprintf_s @ stub _snprintf_s_l @ stub _snscanf @ stub _snscanf_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 0249277..db65318 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -891,7 +891,7 @@ @ stub _snprintf_c @ stub _snprintf_c_l @ stub _snprintf_l -@ stub _snprintf_s +@ varargs _snprintf_s(ptr long long str) msvcrt._snprintf_s @ stub _snprintf_s_l @ stub _snscanf @ stub _snscanf_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 6592e7c..1da6e82 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -877,7 +877,7 @@ @ stub _snprintf_c @ stub _snprintf_c_l @ stub _snprintf_l -@ stub _snprintf_s +@ varargs _snprintf_s(ptr long long str) msvcrt._snprintf_s @ stub _snprintf_s_l @ stub _snscanf @ stub _snscanf_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 604a5ce..ff19519 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -830,7 +830,7 @@ # stub _snprintf_c # stub _snprintf_c_l # stub _snprintf_l -# stub _snprintf_s +@ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s # stub _snprintf_s_l # stub _snscanf # stub _snscanf_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 78e42b2..9571928 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1103,6 +1103,20 @@ int CDECL MSVCRT__snprintf(char *str, unsigned int len, const char *format, ...) } /********************************************************************* + * _snprintf_s (MSVCRT.@) + */ +int CDECL MSVCRT__snprintf_s(char *str, unsigned int len, unsigned int count, + const char *format, ...) +{ + int retval; + __ms_va_list valist; + __ms_va_start(valist, format); + retval = MSVCRT_vsnprintf_s_l(str, len, count, format, NULL, valist); + __ms_va_end(valist); + return retval; +} + +/********************************************************************* * vsnwprintf_internal (INTERNAL) */ static inline int vsnwprintf_internal(MSVCRT_wchar_t *str, MSVCRT_size_t len,

1 0

Alexandre Julliard : include: Set the oleautomation attribute on XML interfaces so that they get registered properly .
by Alexandre Julliard 10 Jun '10

10 Jun '10

Module: wine Branch: master Commit: 7c520469362879e95da891fd52c06a74442c4c25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c520469362879e95da891fd5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 10 18:07:42 2010 +0200 include: Set the oleautomation attribute on XML interfaces so that they get registered properly. --- include/msxml2.idl | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c520469362879e95da89…

1 0

Alexandre Julliard : wine.inf: Avoid creating empty registry values.
by Alexandre Julliard 10 Jun '10

10 Jun '10

Module: wine Branch: master Commit: 314171535cf6fa86511ca950831a4c0648fec08f URL: http://source.winehq.org/git/wine.git/?a=commit;h=314171535cf6fa86511ca9508… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 10 17:10:19 2010 +0200 wine.inf: Avoid creating empty registry values. --- tools/wine.inf.in | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 8a1a871..b8f4a82 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -483,10 +483,10 @@ HKCU,%Desktop%,"LowPowerActive",,"0" HKCU,%Desktop%,"MenuShowDelay",2,"400" [DotNet] -HKLM,Software\Microsoft\.NETFramework\policy\v1.0 -HKLM,Software\Microsoft\.NETFramework\policy\v1.1 -HKLM,Software\Microsoft\.NETFramework\policy\v2.0 -HKLM,Software\Microsoft\.NETFramework\policy\v3.0 +HKLM,Software\Microsoft\.NETFramework\policy\v1.0,,16 +HKLM,Software\Microsoft\.NETFramework\policy\v1.1,,16 +HKLM,Software\Microsoft\.NETFramework\policy\v2.0,,16 +HKLM,Software\Microsoft\.NETFramework\policy\v3.0,,16 HKLM,Software\Microsoft\NET Framework Setup\NDP\v1.1.4322,Install,0x10003,1 HKLM,Software\Microsoft\NET Framework Setup\NDP\v1.1.4322,SP,0x10003,1 HKLM,Software\Microsoft\NET Framework Setup\NDP\v2.0.50727,Install,0x10003,1

1 0

Matteo Bruni : d3dx9: Disallow sampler declarations where not supported.
by Alexandre Julliard 10 Jun '10

10 Jun '10

Module: wine Branch: master Commit: 5a5844d45864201d3be01055035f5fe4f7ae1310 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a5844d45864201d3be010550… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Jun 8 16:13:59 2010 +0200 d3dx9: Disallow sampler declarations where not supported. --- dlls/d3dx9_36/asmparser.c | 11 +++++++++-- dlls/d3dx9_36/tests/asm.c | 3 +++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/asmparser.c b/dlls/d3dx9_36/asmparser.c index 528e6b3..4e7f018 100644 --- a/dlls/d3dx9_36/asmparser.c +++ b/dlls/d3dx9_36/asmparser.c @@ -178,6 +178,13 @@ static void asmparser_dcl_sampler(struct asm_parser *This, DWORD samptype, } } +static void asmparser_dcl_sampler_unsupported(struct asm_parser *This, DWORD samptype, + DWORD mod, DWORD regnum, + unsigned int line_no) { + asmparser_message(This, "Line %u: Sampler declaration unsupported in this shader version\n", This->line_no); + set_parse_status(This, PARSE_ERR); +} + static void asmparser_sincos(struct asm_parser *This, DWORD mod, DWORD shift, const struct shader_reg *dst, const struct src_regs *srcs) { @@ -779,7 +786,7 @@ static const struct asmparser_backend parser_vs_1 = { asmparser_dcl_output, asmparser_dcl_input, - asmparser_dcl_sampler, + asmparser_dcl_sampler_unsupported, asmparser_end, @@ -799,7 +806,7 @@ static const struct asmparser_backend parser_vs_2 = { asmparser_dcl_output, asmparser_dcl_input, - asmparser_dcl_sampler, + asmparser_dcl_sampler_unsupported, asmparser_end, diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 6255d02..276a6e2 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -1374,6 +1374,9 @@ static void failure_test(void) { /* shader 46: no tx registers in ps_3_0 */ "ps_3_0\n" "dcl t2\n", + /* shader 47: no samplers in vs_2_0 */ + "vs_2_0\n" + "dcl_2d s2\n", }; HRESULT hr; unsigned int i;

1 0

Matteo Bruni : d3dx9: Check register type in dcl input instruction.
by Alexandre Julliard 10 Jun '10

10 Jun '10

Module: wine Branch: master Commit: a74978dfefb1eea2ab0dda2df086f372b896fb6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a74978dfefb1eea2ab0dda2df… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Jun 8 03:21:43 2010 +0200 d3dx9: Check register type in dcl input instruction. --- dlls/d3dx9_36/asmparser.c | 8 ++++++++ dlls/d3dx9_36/tests/asm.c | 9 +++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/asmparser.c b/dlls/d3dx9_36/asmparser.c index b20479a..528e6b3 100644 --- a/dlls/d3dx9_36/asmparser.c +++ b/dlls/d3dx9_36/asmparser.c @@ -118,6 +118,8 @@ static void asmparser_dcl_output(struct asm_parser *This, DWORD usage, DWORD num static void asmparser_dcl_input(struct asm_parser *This, DWORD usage, DWORD num, DWORD mod, const struct shader_reg *reg) { + struct instruction instr; + if(!This->shader) return; if(mod != 0 && (This->shader->version != BWRITERPS_VERSION(3, 0) || @@ -127,6 +129,12 @@ static void asmparser_dcl_input(struct asm_parser *This, DWORD usage, DWORD num, set_parse_status(This, PARSE_ERR); return; } + + /* Check register type and modifiers */ + instr.dstmod = mod; + instr.shift = 0; + This->funcs->dstreg(This, &instr, reg); + if(!record_declaration(This->shader, usage, num, mod, FALSE, reg->regnum, reg->writemask, FALSE)) { ERR("Out of memory\n"); set_parse_status(This, PARSE_ERR); diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 5f2e49a..6255d02 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -1365,6 +1365,15 @@ static void failure_test(void) { /* shader 43: can't explicitely declare input registers in ps_2_0 */ "ps_2_0\n" "dcl_texcoord0 t0\n", + /* shader 44: can't implicitely declare registers in vs */ + "vs_2_0\n" + "dcl o0\n", + /* shader 45: can't implicitely declare samplers in vs */ + "vs_3_0\n" + "dcl s2\n", + /* shader 46: no tx registers in ps_3_0 */ + "ps_3_0\n" + "dcl t2\n", }; HRESULT hr; unsigned int i;

1 0

Matteo Bruni : d3dx9: Allow sampler declaration without sampler type.
by Alexandre Julliard 10 Jun '10

10 Jun '10

Module: wine Branch: master Commit: 5bb403ceb2be5f727c24a87bee35e72fdd6b41aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bb403ceb2be5f727c24a87be… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Jun 8 03:20:20 2010 +0200 d3dx9: Allow sampler declaration without sampler type. --- dlls/d3dx9_36/asmshader.y | 15 +++++++++++++++ dlls/d3dx9_36/tests/asm.c | 5 +++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/asmshader.y b/dlls/d3dx9_36/asmshader.y index 0c335b4..689a8fd 100644 --- a/dlls/d3dx9_36/asmshader.y +++ b/dlls/d3dx9_36/asmshader.y @@ -618,6 +618,21 @@ instruction: INSTR_ADD omods dreg ',' sregs } asm_ctx.funcs->dcl_sampler(&asm_ctx, $2, $3.mod, $4, asm_ctx.line_no); } + | INSTR_DCL omods REG_SAMPLER + { + TRACE("Sampler declared\n"); + if($2.shift != 0) { + asmparser_message(&asm_ctx, "Line %u: Shift modifier not allowed here\n", + asm_ctx.line_no); + set_parse_status(&asm_ctx, PARSE_ERR); + } + if(asm_ctx.shader->type != ST_PIXEL) { + asmparser_message(&asm_ctx, "Line %u: Declaration needs a sampler type\n", + asm_ctx.line_no); + set_parse_status(&asm_ctx, PARSE_ERR); + } + asm_ctx.funcs->dcl_sampler(&asm_ctx, BWRITERSTT_UNKNOWN, $2.mod, $3, asm_ctx.line_no); + } | INSTR_DCL sampdcl omods dcl_inputreg { TRACE("Error rule: sampler decl of input reg\n"); diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index dda0e2b..5f2e49a 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -1216,6 +1216,11 @@ static void ps_3_0_test(void) { "dcl v0\n", {0xffff0300, 0x0200001f, 0x80000000, 0x900f0000, 0x0000ffff} }, + { /* shader 16 */ + "ps_3_0\n" + "dcl s2\n", + {0xffff0300, 0x0200001f, 0x80000000, 0xa00f0802, 0x0000ffff} + }, }; exec_tests("ps_3_0", tests, sizeof(tests) / sizeof(tests[0]));

1 0

Marcus Meissner : wininet: Fixed buffer lengths in InternetCrackUrlW tests.
by Alexandre Julliard 10 Jun '10

10 Jun '10

Module: wine Branch: master Commit: 3d5a3a32ce7536041fce9b07e265404c2e112b35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d5a3a32ce7536041fce9b07e… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Jun 10 13:52:33 2010 +0200 wininet: Fixed buffer lengths in InternetCrackUrlW tests. --- dlls/wininet/tests/url.c | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 1f012f0..6dc1369 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -200,7 +200,7 @@ static void test_crack_url(const crack_url_test_t *test) urlw.dwUrlPathLength = 1; urlw.dwExtraInfoLength = 1; - MultiByteToWideChar(CP_ACP, 0, test->url, -1, buf, sizeof(buf)); + MultiByteToWideChar(CP_ACP, 0, test->url, -1, buf, sizeof(buf)/sizeof(buf[0])); b = InternetCrackUrlW(buf, lstrlenW(buf), 0, &urlw); if(!b && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { win_skip("InternetCrackUrlW is not implemented\n"); @@ -416,19 +416,19 @@ static void InternetCrackUrlW_test(void) user[0]=0; pwd[0]=0; memset(&comp, 0, sizeof comp); - comp.dwStructSize = sizeof comp; + comp.dwStructSize = sizeof(comp); comp.lpszScheme = scheme; - comp.dwSchemeLength = sizeof scheme; + comp.dwSchemeLength = sizeof(scheme)/sizeof(scheme[0]); comp.lpszHostName = host; - comp.dwHostNameLength = sizeof host; + comp.dwHostNameLength = sizeof(host)/sizeof(host[0]); comp.lpszUserName = user; - comp.dwUserNameLength = sizeof user; + comp.dwUserNameLength = sizeof(user)/sizeof(user[0]); comp.lpszPassword = pwd; - comp.dwPasswordLength = sizeof pwd; + comp.dwPasswordLength = sizeof(pwd)/sizeof(pwd[0]); comp.lpszUrlPath = urlpart; - comp.dwUrlPathLength = sizeof urlpart; + comp.dwUrlPathLength = sizeof(urlpart)/sizeof(urlpart[0]); comp.lpszExtraInfo = extra; - comp.dwExtraInfoLength = sizeof extra; + comp.dwExtraInfoLength = sizeof(extra)/sizeof(extra[0]); SetLastError(0xdeadbeef); r = InternetCrackUrlW(NULL, 0, 0, &comp ); @@ -471,9 +471,9 @@ static void InternetCrackUrlW_test(void) memset(&comp, 0, sizeof comp); comp.dwStructSize = sizeof comp; comp.lpszHostName = host; - comp.dwHostNameLength = sizeof host; + comp.dwHostNameLength = sizeof(host)/sizeof(host[0]); comp.lpszUrlPath = urlpart; - comp.dwUrlPathLength = sizeof urlpart; + comp.dwUrlPathLength = sizeof(urlpart)/sizeof(urlpart[0]); r = InternetCrackUrlW(url, 0, 0, &comp ); ok( r, "failed to crack url\n"); @@ -493,11 +493,11 @@ static void InternetCrackUrlW_test(void) memset(&comp, 0, sizeof comp); comp.dwStructSize = sizeof comp; comp.lpszHostName = host; - comp.dwHostNameLength = sizeof host; + comp.dwHostNameLength = sizeof(host)/sizeof(host[0]); comp.lpszUrlPath = urlpart; - comp.dwUrlPathLength = sizeof urlpart; + comp.dwUrlPathLength = sizeof(urlpart)/sizeof(urlpart[0]); comp.lpszExtraInfo = NULL; - comp.dwExtraInfoLength = sizeof extra; + comp.dwExtraInfoLength = sizeof(extra)/sizeof(extra[0]); r = InternetCrackUrlW(url, 0, 0, &comp ); ok( r, "failed to crack url\n"); @@ -547,17 +547,17 @@ static void InternetCrackUrlW_test(void) memset(&comp, 0, sizeof comp); comp.dwStructSize = sizeof comp; comp.lpszScheme = scheme; - comp.dwSchemeLength = sizeof scheme; + comp.dwSchemeLength = sizeof(scheme)/sizeof(scheme[0]); comp.lpszHostName = host; - comp.dwHostNameLength = sizeof host; + comp.dwHostNameLength = sizeof(host)/sizeof(host[0]); comp.lpszUserName = user; - comp.dwUserNameLength = sizeof user; + comp.dwUserNameLength = sizeof(user)/sizeof(user[0]); comp.lpszPassword = pwd; - comp.dwPasswordLength = sizeof pwd; + comp.dwPasswordLength = sizeof(pwd)/sizeof(pwd[0]); comp.lpszUrlPath = urlpart; - comp.dwUrlPathLength = sizeof urlpart; + comp.dwUrlPathLength = sizeof(urlpart)/sizeof(urlpart[0]); comp.lpszExtraInfo = extra; - comp.dwExtraInfoLength = sizeof extra; + comp.dwExtraInfoLength = sizeof(extra)/sizeof(extra[0]); r = InternetCrackUrlW(url3, 0, 0, &comp ); ok( r, "InternetCrackUrlW failed unexpectedly\n"); ok( host[0] == 'x', "host should be x.org\n");

1 0

Nikolay Sivov : comctl32/tests: Some expand notifications tests.
by Alexandre Julliard 10 Jun '10

10 Jun '10

Module: wine Branch: master Commit: 138b2435f9880072dccb1f11272fd889e5462804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=138b2435f9880072dccb1f112… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 10 01:32:06 2010 +0400 comctl32/tests: Some expand notifications tests. --- dlls/comctl32/tests/treeview.c | 229 +++++++++++++++++++++++++++++++--------- dlls/comctl32/treeview.c | 10 +- 2 files changed, 185 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=138b2435f9880072dccb1…

1 0

Jacek Caban : winbase.h: Added missing COPY_FILE_* flags.
by Alexandre Julliard 10 Jun '10

10 Jun '10

Module: wine Branch: master Commit: 75912afabdec583be7f89141ea1326509a0ebdd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75912afabdec583be7f89141e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 10 13:01:19 2010 +0200 winbase.h: Added missing COPY_FILE_* flags. --- include/winbase.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 6bb4866..c3dc64c 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -187,6 +187,9 @@ typedef struct _OFSTRUCT #define COPY_FILE_FAIL_IF_EXISTS 0x00000001 #define COPY_FILE_RESTARTABLE 0x00000002 #define COPY_FILE_OPEN_SOURCE_FOR_WRITE 0x00000004 +#define COPY_FILE_ALLOW_DECRYPTED_DESTINATION 0x00000008 +#define COPY_FILE_COPY_SYMLINK 0x00000800 +#define COPY_FILE_NO_BUFFERING 0x00001000 /* return values for CopyProgressRoutine */ #define PROGRESS_CONTINUE 0

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
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 June 2010