January 2013 - Wine-commits

Detlef Riekenberg : wininet: Remove most GetLastError tests for IsDomainLegalCookieDomainW.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 2a66b25e6d97afeffe9a7fb3fbcd106a252f829e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a66b25e6d97afeffe9a7fb3f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jan 25 14:26:20 2013 +0100 wininet: Remove most GetLastError tests for IsDomainLegalCookieDomainW. --- dlls/wininet/tests/internet.c | 50 +---------------------------------------- 1 files changed, 1 insertions(+), 49 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index e9e2239..3dc2233 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -878,7 +878,6 @@ static void InternetTimeToSystemTimeW_test(void) static void test_IsDomainLegalCookieDomainW(void) { BOOL ret; - DWORD error; static const WCHAR empty[] = {0}; static const WCHAR dot[] = {'.',0}; static const WCHAR uk[] = {'u','k',0}; @@ -895,8 +894,7 @@ static void test_IsDomainLegalCookieDomainW(void) SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(NULL, NULL); - error = GetLastError(); - if (!ret && error == ERROR_CALL_NOT_IMPLEMENTED) + if (!ret && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) { win_skip("IsDomainLegalCookieDomainW is not implemented\n"); return; @@ -904,82 +902,46 @@ static void test_IsDomainLegalCookieDomainW(void) ok(!ret || broken(ret), /* IE6 */ "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(com, NULL); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(NULL, gmail_com); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(empty, gmail_com); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_NAME || - broken(error == ERROR_INVALID_PARAMETER), /* IE6 */ - "got %u expected ERROR_INVALID_NAME\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(com, empty); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_NAME || - broken(error == ERROR_INVALID_PARAMETER), /* IE6 */ - "got %u expected ERROR_INVALID_NAME\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(gmail_com, dot); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_NAME || - broken(error == 0xdeadbeef), /* IE6 */ - "got %u expected ERROR_INVALID_NAME\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(dot, gmail_com); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_NAME || - broken(error == 0xdeadbeef), /* IE6 */ - "got %u expected ERROR_INVALID_NAME\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(com, com); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == 0xdeadbeef, "got %u expected 0xdeadbeef\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(com, dot_com); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_NAME || - broken(error == 0xdeadbeef), /* IE6 */ - "got %u expected ERROR_INVALID_NAME\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(dot_com, com); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_NAME || - broken(error == 0xdeadbeef), /* IE6 */ - "got %u expected ERROR_INVALID_NAME\n", error); SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(com, gmail_com); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_SXS_KEY_NOT_FOUND || - error == ERROR_SUCCESS || /* IE8 on W2K3 */ - error == 0xdeadbeef, /* up to IE7 */ - "unexpected error: %u\n", error); ret = pIsDomainLegalCookieDomainW(gmail_com, gmail_com); ok(ret, "IsDomainLegalCookieDomainW failed\n"); @@ -992,13 +954,7 @@ static void test_IsDomainLegalCookieDomainW(void) SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(gmail_co_uk, co_uk); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_SXS_KEY_NOT_FOUND || /* IE8 on XP */ - error == ERROR_FILE_NOT_FOUND || /* IE8 on Vista */ - error == ERROR_SUCCESS || /* IE8 on W2K3 */ - error == 0xdeadbeef, /* up to IE7 */ - "unexpected error: %u\n", error); ret = pIsDomainLegalCookieDomainW(uk, co_uk); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); @@ -1017,11 +973,7 @@ static void test_IsDomainLegalCookieDomainW(void) SetLastError(0xdeadbeef); ret = pIsDomainLegalCookieDomainW(dot_gmail_com, mail_gmail_com); - error = GetLastError(); ok(!ret, "IsDomainLegalCookieDomainW succeeded\n"); - ok(error == ERROR_INVALID_NAME || - broken(error == 0xdeadbeef), /* IE6 */ - "got %u expected ERROR_INVALID_NAME\n", error); ret = pIsDomainLegalCookieDomainW(gmail_com, mail_gmail_com); ok(ret, "IsDomainLegalCookieDomainW failed\n");

1 0

Detlef Riekenberg : wininet: Don't depend on user settings.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 097dee606eb02acee7421c3ab35f2fa57e036fb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=097dee606eb02acee7421c3ab… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jan 25 17:23:49 2013 +0100 wininet: Don't depend on user settings. --- dlls/wininet/tests/internet.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 3dc2233..bf5723c 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -319,14 +319,14 @@ static void test_max_conns(void) res = InternetQueryOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_SERVER, &val, &len); ok(res,"Got wrong return value %x\n", res); ok(len == sizeof(val), "got %d\n", len); - ok(val == 2, "got %d\n", val); + trace("INTERNET_OPTION_MAX_CONNS_PER_SERVER: %d\n", val); len = sizeof(val); val = 0xdeadbeef; res = InternetQueryOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER, &val, &len); ok(res,"Got wrong return value %x\n", res); ok(len == sizeof(val), "got %d\n", len); - ok(val == 4, "got %d\n", val); + trace("INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER: %d\n", val); val = 3; res = InternetSetOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_SERVER, &val, sizeof(val));

1 0

Andrew Eikum : wineoss.drv: Set reasonable defaults if driver reports invalid values.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 6da3ce276bd76a5242c8340c50042c95ea74a787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6da3ce276bd76a5242c8340c5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 28 08:52:55 2013 -0600 wineoss.drv: Set reasonable defaults if driver reports invalid values. --- dlls/wineoss.drv/mmdevdrv.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index ea6d452..2c81404 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1307,8 +1307,19 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, return E_FAIL; } - fmt->Format.nChannels = This->ai.max_channels; - fmt->Format.nSamplesPerSec = This->ai.max_rate; + /* some OSS drivers are buggy, so set reasonable defaults if + * the reported values seem wacky */ + fmt->Format.nChannels = max(This->ai.max_channels, This->ai.min_channels); + if(fmt->Format.nChannels == 0 || fmt->Format.nChannels > 8) + fmt->Format.nChannels = 2; + + if(This->ai.max_rate == 0) + fmt->Format.nSamplesPerSec = 44100; + else + fmt->Format.nSamplesPerSec = min(This->ai.max_rate, 44100); + if(fmt->Format.nSamplesPerSec < This->ai.min_rate) + fmt->Format.nSamplesPerSec = This->ai.min_rate; + fmt->dwChannelMask = get_channel_mask(fmt->Format.nChannels); fmt->Format.nBlockAlign = (fmt->Format.wBitsPerSample *

1 0

Hans Leidekker : wbemprox: Return an empty object if the path is NULL or empty.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 07197a19f2843b41b32be2c1d07ba4cc54260a08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07197a19f2843b41b32be2c1d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 28 15:56:40 2013 +0100 wbemprox: Return an empty object if the path is NULL or empty. --- dlls/wbemprox/class.c | 4 ++-- dlls/wbemprox/services.c | 8 +++----- dlls/wbemprox/tests/query.c | 15 ++++++++++++++- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index f47987d..5205515 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -1015,8 +1015,8 @@ HRESULT create_class_object( const WCHAR *name, IEnumWbemClassObject *iter, UINT co->IWbemClassObject_iface.lpVtbl = &class_object_vtbl; co->refs = 1; - co->name = heap_strdupW( name ); - if (!co->name) + if (!name) co->name = NULL; + else if (!(co->name = heap_strdupW( name ))) { heap_free( co ); return E_OUTOFMEMORY; diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 4bcd824..bf202be 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -352,11 +352,9 @@ static HRESULT WINAPI wbem_services_GetObject( if (lFlags) FIXME("unsupported flags 0x%08x\n", lFlags); - if (!strObjectPath) - { - FIXME("no support for creating new classes\n"); - return WBEM_E_FAILED; - } + if (!strObjectPath || !strObjectPath[0]) + return create_class_object( NULL, NULL, 0, NULL, ppObject ); + return get_object( strObjectPath, ppObject ); } diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 014bac4..dd3424f 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -146,7 +146,8 @@ static void test_Win32_Service( IWbemServices *services ) static const WCHAR stoppedW[] = {'S','t','o','p','p','e','d',0}; static const WCHAR serviceW[] = {'W','i','n','3','2','_','S','e','r','v','i','c','e','.', 'N','a','m','e','=','"','S','p','o','o','l','e','r','"',0}; - BSTR class = SysAllocString( serviceW ), method; + static const WCHAR emptyW[] = {0}; + BSTR class = SysAllocString( serviceW ), empty = SysAllocString( emptyW ), method; IWbemClassObject *service, *out; VARIANT state, retval; CIMTYPE type; @@ -219,6 +220,18 @@ static void test_Win32_Service( IWbemServices *services ) } VariantClear( &state ); IWbemClassObject_Release( service ); + + service = NULL; + hr = IWbemServices_GetObject( services, NULL, 0, NULL, &service, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (service) IWbemClassObject_Release( service ); + + service = NULL; + hr = IWbemServices_GetObject( services, empty, 0, NULL, &service, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (service) IWbemClassObject_Release( service ); + + SysFreeString( empty ); SysFreeString( class ); }

1 0

Piotr Caban : msvcp71: Fixed basic_filebuf class layout.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: cbfe913a1a847614f5a0ca3850e875307fcf05f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbfe913a1a847614f5a0ca385… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jan 26 14:38:03 2013 +0100 msvcp71: Fixed basic_filebuf class layout. --- dlls/msvcp71/ios.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index e6a6e84..cbfc78b 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -64,7 +64,9 @@ typedef enum { typedef struct { basic_streambuf_char base; codecvt_char *cvt; + int state0; char putback; + basic_string_char *conv; MSVCP_bool wrotesome; int state; MSVCP_bool close; @@ -74,7 +76,9 @@ typedef struct { typedef struct { basic_streambuf_wchar base; codecvt_wchar *cvt; + int state0; wchar_t putback; + basic_string_char *conv; MSVCP_bool wrotesome; int state; MSVCP_bool close;

1 0

Piotr Caban : jscript: Update buffer size in do_regexp_match_next.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: c3bdaf59a8cf0ec1a901a345739b1edd8f9f0791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3bdaf59a8cf0ec1a901a3457… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jan 26 15:51:24 2013 +0100 jscript: Update buffer size in do_regexp_match_next. --- dlls/jscript/regexp.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 65ddc24..c1311d1 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3366,6 +3366,7 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D if(!new_parens) return E_OUTOFMEMORY; + *parens_size = regexp->jsregexp->parenCount; *parens = new_parens; } }

1 0

Michael Stefaniuc : d3dcompiler_43: Use assignment instead of memcpy to copy structs.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: b5d4c20bfe2ae62b3204bd42c3262854a0ba5a98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5d4c20bfe2ae62b3204bd42c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 27 22:55:33 2013 +0100 d3dcompiler_43: Use assignment instead of memcpy to copy structs. --- dlls/d3dcompiler_43/asmparser.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/d3dcompiler_43/asmparser.c b/dlls/d3dcompiler_43/asmparser.c index b929c08..c57343f 100644 --- a/dlls/d3dcompiler_43/asmparser.c +++ b/dlls/d3dcompiler_43/asmparser.c @@ -782,7 +782,7 @@ static void asmparser_srcreg_vs_1(struct asm_parser *This, check_legacy_srcmod(This, src->srcmod); check_abs_srcmod(This, src->srcmod); reg = map_oldvs_register(src); - memcpy(&instr->src[num], &reg, sizeof(reg)); + instr->src[num] = reg; } static const struct allowed_reg_type vs_2_reg_allowed[] = { @@ -816,7 +816,7 @@ static void asmparser_srcreg_vs_2(struct asm_parser *This, check_legacy_srcmod(This, src->srcmod); check_abs_srcmod(This, src->srcmod); reg = map_oldvs_register(src); - memcpy(&instr->src[num], &reg, sizeof(reg)); + instr->src[num] = reg; } static const struct allowed_reg_type vs_3_reg_allowed[] = { @@ -845,7 +845,7 @@ static void asmparser_srcreg_vs_3(struct asm_parser *This, } check_loop_swizzle(This, src); check_legacy_srcmod(This, src->srcmod); - memcpy(&instr->src[num], src, sizeof(*src)); + instr->src[num] = *src; } static const struct allowed_reg_type ps_1_0123_reg_allowed[] = { @@ -869,7 +869,7 @@ static void asmparser_srcreg_ps_1_0123(struct asm_parser *This, } check_abs_srcmod(This, src->srcmod); reg = map_oldps_register(src, FALSE); - memcpy(&instr->src[num], &reg, sizeof(reg)); + instr->src[num] = reg; } static const struct allowed_reg_type ps_1_4_reg_allowed[] = { @@ -893,7 +893,7 @@ static void asmparser_srcreg_ps_1_4(struct asm_parser *This, } check_abs_srcmod(This, src->srcmod); reg = map_oldps_register(src, TRUE); - memcpy(&instr->src[num], &reg, sizeof(reg)); + instr->src[num] = reg; } static const struct allowed_reg_type ps_2_0_reg_allowed[] = { @@ -923,7 +923,7 @@ static void asmparser_srcreg_ps_2(struct asm_parser *This, check_legacy_srcmod(This, src->srcmod); check_abs_srcmod(This, src->srcmod); reg = map_oldps_register(src, TRUE); - memcpy(&instr->src[num], &reg, sizeof(reg)); + instr->src[num] = reg; } static const struct allowed_reg_type ps_2_x_reg_allowed[] = { @@ -955,7 +955,7 @@ static void asmparser_srcreg_ps_2_x(struct asm_parser *This, check_legacy_srcmod(This, src->srcmod); check_abs_srcmod(This, src->srcmod); reg = map_oldps_register(src, TRUE); - memcpy(&instr->src[num], &reg, sizeof(reg)); + instr->src[num] = reg; } static const struct allowed_reg_type ps_3_reg_allowed[] = { @@ -985,7 +985,7 @@ static void asmparser_srcreg_ps_3(struct asm_parser *This, } check_loop_swizzle(This, src); check_legacy_srcmod(This, src->srcmod); - memcpy(&instr->src[num], src, sizeof(*src)); + instr->src[num] = *src; } static void asmparser_dstreg_vs_1(struct asm_parser *This, @@ -1002,7 +1002,7 @@ static void asmparser_dstreg_vs_1(struct asm_parser *This, check_ps_dstmod(This, instr->dstmod); check_shift_dstmod(This, instr->shift); reg = map_oldvs_register(dst); - memcpy(&instr->dst, &reg, sizeof(reg)); + instr->dst = reg; instr->has_dst = TRUE; } @@ -1020,7 +1020,7 @@ static void asmparser_dstreg_vs_2(struct asm_parser *This, check_ps_dstmod(This, instr->dstmod); check_shift_dstmod(This, instr->shift); reg = map_oldvs_register(dst); - memcpy(&instr->dst, &reg, sizeof(reg)); + instr->dst = reg; instr->has_dst = TRUE; } @@ -1035,7 +1035,7 @@ static void asmparser_dstreg_vs_3(struct asm_parser *This, } check_ps_dstmod(This, instr->dstmod); check_shift_dstmod(This, instr->shift); - memcpy(&instr->dst, dst, sizeof(*dst)); + instr->dst = *dst; instr->has_dst = TRUE; } @@ -1051,7 +1051,7 @@ static void asmparser_dstreg_ps_1_0123(struct asm_parser *This, set_parse_status(&This->status, PARSE_ERR); } reg = map_oldps_register(dst, FALSE); - memcpy(&instr->dst, &reg, sizeof(reg)); + instr->dst = reg; instr->has_dst = TRUE; } @@ -1067,7 +1067,7 @@ static void asmparser_dstreg_ps_1_4(struct asm_parser *This, set_parse_status(&This->status, PARSE_ERR); } reg = map_oldps_register(dst, TRUE); - memcpy(&instr->dst, &reg, sizeof(reg)); + instr->dst = reg; instr->has_dst = TRUE; } @@ -1084,7 +1084,7 @@ static void asmparser_dstreg_ps_2(struct asm_parser *This, } check_shift_dstmod(This, instr->shift); reg = map_oldps_register(dst, TRUE); - memcpy(&instr->dst, &reg, sizeof(reg)); + instr->dst = reg; instr->has_dst = TRUE; } @@ -1101,7 +1101,7 @@ static void asmparser_dstreg_ps_2_x(struct asm_parser *This, } check_shift_dstmod(This, instr->shift); reg = map_oldps_register(dst, TRUE); - memcpy(&instr->dst, &reg, sizeof(reg)); + instr->dst = reg; instr->has_dst = TRUE; } @@ -1115,7 +1115,7 @@ static void asmparser_dstreg_ps_3(struct asm_parser *This, set_parse_status(&This->status, PARSE_ERR); } check_shift_dstmod(This, instr->shift); - memcpy(&instr->dst, dst, sizeof(*dst)); + instr->dst = *dst; instr->has_dst = TRUE; } @@ -1125,7 +1125,7 @@ static void asmparser_predicate_supported(struct asm_parser *This, if(!This->shader) return; if(This->shader->num_instrs == 0) ERR("Predicate without an instruction\n"); This->shader->instr[This->shader->num_instrs - 1]->has_predicate = TRUE; - memcpy(&This->shader->instr[This->shader->num_instrs - 1]->predicate, predicate, sizeof(*predicate)); + This->shader->instr[This->shader->num_instrs - 1]->predicate = *predicate; } static void asmparser_predicate_unsupported(struct asm_parser *This,

1 0

Michael Stefaniuc : wined3d: Use assignment instead of memcpy to copy structs.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: b28aff0dd72686774dfe159daf92b29cbb86ec21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b28aff0dd72686774dfe159da… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 27 22:57:20 2013 +0100 wined3d: Use assignment instead of memcpy to copy structs. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/stateblock.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 31ee94a..2fd5108 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6448,7 +6448,7 @@ static void fragment_prog_arbfp(struct wined3d_context *context, const struct wi return; } - memcpy(&new_desc->parent.settings, &settings, sizeof(settings)); + new_desc->parent.settings = settings; new_desc->shader = gen_arbfp_ffp_shader(&settings, gl_info); add_ffp_frag_shader(&priv->fragment_shaders, &new_desc->parent); TRACE("Allocated fixed function replacement shader descriptor %p\n", new_desc); diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 75d1dfe..5657732 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -861,7 +861,7 @@ static void set_tex_op_atifs(struct wined3d_context *context, const struct wined new_desc->num_textures_used = i + 1; } - memcpy(&new_desc->parent.settings, &settings, sizeof(settings)); + new_desc->parent.settings = settings; new_desc->shader = gen_ati_shader(settings.op, gl_info); add_ffp_frag_shader(&priv->fragment_shaders, &new_desc->parent); TRACE("Allocated fixed function replacement shader descriptor %p\n", new_desc); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 10104e1..6f55dc3 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1168,11 +1168,11 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) memset(stateblock->changed.vertexShaderConstantsF, 0, device->d3d_vshader_constantF * sizeof(BOOL)); /* Set some of the defaults for lights, transforms etc */ - memcpy(&state->transforms[WINED3D_TS_PROJECTION], &identity, sizeof(identity)); - memcpy(&state->transforms[WINED3D_TS_VIEW], &identity, sizeof(identity)); + state->transforms[WINED3D_TS_PROJECTION] = identity; + state->transforms[WINED3D_TS_VIEW] = identity; for (i = 0; i < 256; ++i) { - memcpy(&state->transforms[WINED3D_TS_WORLD_MATRIX(i)], &identity, sizeof(identity)); + state->transforms[WINED3D_TS_WORLD_MATRIX(i)] = identity; } state->fb = &device->fb; @@ -1313,7 +1313,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) for (i = 0; i < MAX_TEXTURES; ++i) { TRACE("Setting up default texture states for texture Stage %u.\n", i); - memcpy(&state->transforms[WINED3D_TS_TEXTURE0 + i], &identity, sizeof(identity)); + state->transforms[WINED3D_TS_TEXTURE0 + i] = identity; state->texture_states[i][WINED3D_TSS_COLOR_OP] = i ? WINED3D_TOP_DISABLE : WINED3D_TOP_MODULATE; state->texture_states[i][WINED3D_TSS_COLOR_ARG1] = WINED3DTA_TEXTURE; state->texture_states[i][WINED3D_TSS_COLOR_ARG2] = WINED3DTA_CURRENT;

1 0

Ken Thomases : winemac: Implement WINDOW_FRAME_CHANGED event to tell Wine when window is moved or resized .
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: 6e59740e18ed41579016013ee614234e2d9bf9b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e59740e18ed41579016013ee… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Jan 27 16:19:29 2013 -0600 winemac: Implement WINDOW_FRAME_CHANGED event to tell Wine when window is moved or resized. --- dlls/winemac.drv/cocoa_window.m | 53 ++++++++++++++++++ dlls/winemac.drv/event.c | 7 ++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 7 ++ dlls/winemac.drv/window.c | 110 ++++++++++++++++++++++++++++++++++++- dlls/winemac.drv/winemac.drv.spec | 1 + 6 files changed, 177 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6e59740e18ed415790160…

1 0

Ken Thomases : winemac: Add infrastructure to convert from Cocoa event time to Wine tick count.
by Alexandre Julliard 28 Jan '13

28 Jan '13

Module: wine Branch: master Commit: a22be47fcf172793a67b851fd8c4b00c97b71072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a22be47fcf172793a67b851fd… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Jan 27 16:19:33 2013 -0600 winemac: Add infrastructure to convert from Cocoa event time to Wine tick count. --- dlls/winemac.drv/cocoa_app.h | 5 +++++ dlls/winemac.drv/cocoa_app.m | 10 ++++++++++ dlls/winemac.drv/cocoa_main.m | 36 +++++++++++++++++++++++++++--------- dlls/winemac.drv/macdrv_cocoa.h | 2 +- dlls/winemac.drv/macdrv_main.c | 2 +- 5 files changed, 44 insertions(+), 11 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 490c2ee..0955dea 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -33,6 +33,8 @@ { NSMutableArray* eventQueues; NSLock* eventQueuesLock; + + NSTimeInterval eventTimeAdjustment; } - (void) transformProcessToForeground; @@ -40,6 +42,9 @@ - (BOOL) registerEventQueue:(WineEventQueue*)queue; - (void) unregisterEventQueue:(WineEventQueue*)queue; + - (void) computeEventTimeAdjustmentFromTicks:(unsigned long long)tickcount uptime:(uint64_t)uptime_ns; + - (double) ticksForEventTime:(NSTimeInterval)eventTime; + @end void OnMainThread(dispatch_block_t block); diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index bcdfee0..638e642 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -108,6 +108,16 @@ int macdrv_err_on; [eventQueuesLock unlock]; } + - (void) computeEventTimeAdjustmentFromTicks:(unsigned long long)tickcount uptime:(uint64_t)uptime_ns + { + eventTimeAdjustment = (tickcount / 1000.0) - (uptime_ns / (double)NSEC_PER_SEC); + } + + - (double) ticksForEventTime:(NSTimeInterval)eventTime + { + return (eventTime + eventTimeAdjustment) * 1000; + } + @end /*********************************************************************** diff --git a/dlls/winemac.drv/cocoa_main.m b/dlls/winemac.drv/cocoa_main.m index d920036..f0e501d 100644 --- a/dlls/winemac.drv/cocoa_main.m +++ b/dlls/winemac.drv/cocoa_main.m @@ -19,6 +19,8 @@ */ #import <AppKit/AppKit.h> +#include <mach/mach.h> +#include <mach/mach_time.h> #include "macdrv_cocoa.h" #import "cocoa_app.h" @@ -33,6 +35,13 @@ enum { }; +struct cocoa_app_startup_info { + NSConditionLock* lock; + unsigned long long tickcount; + uint64_t uptime_ns; +}; + + /*********************************************************************** * run_cocoa_app * @@ -50,12 +59,14 @@ enum { */ static void run_cocoa_app(void* info) { - NSConditionLock* lock = info; + struct cocoa_app_startup_info* startup_info = info; + NSConditionLock* lock = startup_info->lock; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; [WineApplication sharedApplication]; [NSApp setDelegate:(WineApplication*)NSApp]; + [NSApp computeEventTimeAdjustmentFromTicks:startup_info->tickcount uptime:startup_info->uptime_ns]; /* Retain the lock while we're using it, so macdrv_start_cocoa_app() doesn't deallocate it in the middle of us unlocking it. */ @@ -78,11 +89,13 @@ static void run_cocoa_app(void* info) * * Returns 0 on success, non-zero on failure. */ -int macdrv_start_cocoa_app(void) +int macdrv_start_cocoa_app(unsigned long long tickcount) { int ret = -1; CFRunLoopSourceRef source; - NSConditionLock* lock; + struct cocoa_app_startup_info startup_info; + uint64_t uptime_mach = mach_absolute_time(); + mach_timebase_info_data_t mach_timebase; NSDate* timeLimit; CFRunLoopSourceContext source_context = { 0 }; @@ -94,29 +107,34 @@ int macdrv_start_cocoa_app(void) toTarget:[NSThread class] withObject:nil]; - lock = [[NSConditionLock alloc] initWithCondition:COCOA_APP_NOT_RUNNING]; + startup_info.lock = [[NSConditionLock alloc] initWithCondition:COCOA_APP_NOT_RUNNING]; + startup_info.tickcount = tickcount; + + mach_timebase_info(&mach_timebase); + startup_info.uptime_ns = uptime_mach * mach_timebase.numer / mach_timebase.denom; + timeLimit = [NSDate dateWithTimeIntervalSinceNow:5]; - source_context.info = lock; + source_context.info = &startup_info; source_context.perform = run_cocoa_app; source = CFRunLoopSourceCreate(NULL, 0, &source_context); - if (source && lock && timeLimit) + if (source && startup_info.lock && timeLimit) { CFRunLoopAddSource(CFRunLoopGetMain(), source, kCFRunLoopCommonModes); CFRunLoopSourceSignal(source); CFRunLoopWakeUp(CFRunLoopGetMain()); - if ([lock lockWhenCondition:COCOA_APP_RUNNING beforeDate:timeLimit]) + if ([startup_info.lock lockWhenCondition:COCOA_APP_RUNNING beforeDate:timeLimit]) { - [lock unlock]; + [startup_info.lock unlock]; ret = 0; } } if (source) CFRelease(source); - [lock release]; + [startup_info.lock release]; [pool release]; return ret; } diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 550c63e..70be367 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -112,7 +112,7 @@ struct macdrv_display { /* main */ extern int macdrv_err_on; -extern int macdrv_start_cocoa_app(void) DECLSPEC_HIDDEN; +extern int macdrv_start_cocoa_app(unsigned long long tickcount) DECLSPEC_HIDDEN; /* display */ diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 2a9e0ac..a21390d 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -40,7 +40,7 @@ static BOOL process_attach(void) if ((thread_data_tls_index = TlsAlloc()) == TLS_OUT_OF_INDEXES) return FALSE; macdrv_err_on = ERR_ON(macdrv); - if (macdrv_start_cocoa_app()) + if (macdrv_start_cocoa_app(GetTickCount64())) { ERR("Failed to start Cocoa app main loop\n"); return FALSE;

1 0