wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

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

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

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

Hans Leidekker : wbemprox: Implement IWbemQualifierSet::Get.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 236b4dae4ace5fe5c994646dafa8d15ff5c940e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=236b4dae4ace5fe5c994646da… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 25 17:34:00 2013 +0100 wbemprox: Implement IWbemQualifierSet::Get. --- dlls/wbemprox/builtin.c | 53 +++++++++++++++++++-- dlls/wbemprox/class.c | 7 ++- dlls/wbemprox/qualifier.c | 99 +++++++++++++++++++++++++++++++++++++- dlls/wbemprox/tests/query.c | 43 ++++++++++++++++- dlls/wbemprox/wbemprox_private.h | 2 +- 5 files changed, 194 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=236b4dae4ace5fe5c9946…

1 0

Hans Leidekker : wbemprox: Check the result count instead of the result pointer in get_propval.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: d74cf43fbec6359c0d04493838791d763da92b6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d74cf43fbec6359c0d0449383… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 25 17:33:24 2013 +0100 wbemprox: Check the result count instead of the result pointer in get_propval. --- dlls/wbemprox/query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 1123159..2d416ef 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -650,7 +650,7 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR LONGLONG val; if (is_system_prop( name )) return get_system_propval( view, index, name, ret, type, flavor ); - if (!view->result || !is_selected_prop( view, name )) return WBEM_E_NOT_FOUND; + if (!view->count || !is_selected_prop( view, name )) return WBEM_E_NOT_FOUND; hr = get_column_index( view->table, name, &column ); if (hr != S_OK || is_method( view->table, column )) return WBEM_E_NOT_FOUND;

1 0

Piotr Caban : jscript: Fixed a leak in regexp_match function.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: c45c7bf94cb41f30149f2e81d72bbe3f4e6096c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c45c7bf94cb41f30149f2e81d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 25 16:48:07 2013 +0100 jscript: Fixed a leak in regexp_match function. --- dlls/jscript/regexp.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index a06550d..65ddc24 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3464,10 +3464,15 @@ static HRESULT regexp_match(script_ctx_t *ctx, jsdisp_t *dispex, jsstr_t *str, B break; if(ret_size == i) { - if(ret) - ret = heap_realloc(ret, (ret_size <<= 1) * sizeof(match_result_t)); - else + if(ret) { + match_result_t *old_ret = ret; + + ret = heap_realloc(old_ret, (ret_size <<= 1) * sizeof(match_result_t)); + if(!ret) + heap_free(old_ret); + }else { ret = heap_alloc((ret_size=4) * sizeof(match_result_t)); + } if(!ret) { hres = E_OUTOFMEMORY; break;

1 0

Jacek Caban : atl100: Added AtlGetPerUserRegistration stub implementation.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 0333b758b2a16ed7091da6c51f0e3ad41ee1aa99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0333b758b2a16ed7091da6c51… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 25 13:12:02 2013 +0100 atl100: Added AtlGetPerUserRegistration stub implementation. --- dlls/atl100/atl.c | 12 ++++++++++++ dlls/atl100/atl100.spec | 2 +- dlls/atl100/tests/atl.c | 6 ++++++ include/atlbase.h | 1 + 4 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index c4867aa..ce35b38 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -26,6 +26,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(atl100); +typedef unsigned char cpp_bool; + static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); @@ -709,6 +711,16 @@ HRESULT WINAPI AtlGetObjectSourceInterface(IUnknown *unk, GUID *libid, IID *iid, } /*********************************************************************** + * AtlGetPerUserRegistration [atl100.68] + */ +HRESULT WINAPI AtlGetPerUserRegistration(cpp_bool *pbEnabled) +{ + FIXME("stub: returning false\n"); + *pbEnabled = 0; + return S_OK; +} + +/*********************************************************************** * AtlGetVersion [atl100.@] */ DWORD WINAPI AtlGetVersion(void *pReserved) diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index 1732052..c959a29 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -49,4 +49,4 @@ 65 stdcall AtlWinModuleInit(ptr) 66 stub AtlWinModuleTerm 67 stub AtlSetPerUserRegistration -68 stub AtlGetPerUserRegistration +68 stdcall AtlGetPerUserRegistration(ptr) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 8aea90a..e7c3703 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -150,6 +150,7 @@ static void _test_key_not_exists(unsigned line, HKEY root, const char *key_name) static void test_regcat(void) { + unsigned char b; HRESULT hres; const struct _ATL_CATMAP_ENTRY catmap[] = { @@ -178,6 +179,11 @@ static void test_regcat(void) ok(hres == S_OK, "AtlRegisterClassCategoriesHelper failed: %08x\n", hres); test_key_not_exists(HKEY_CLASSES_ROOT, "CLSID\\{" CLSID_TEST_STR "}"); + + b = 10; + hres = AtlGetPerUserRegistration(&b); + ok(hres == S_OK, "AtlGetPerUserRegistration failed: %08x\n", hres); + ok(!b, "AtlGetPerUserRegistration returned %x\n", b); } static void test_typelib(void) diff --git a/include/atlbase.h b/include/atlbase.h index 8bacb97..7d18d81 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -258,5 +258,6 @@ HRESULT WINAPI AtlComModuleGetClassObject(_ATL_COM_MODULE*,REFCLSID,REFIID,void* HRESULT WINAPI AtlComModuleUnregisterServer(_ATL_COM_MODULE*,BOOL,const CLSID*); BOOL WINAPI AtlWaitWithMessageLoop(HANDLE); HRESULT WINAPI AtlGetObjectSourceInterface(IUnknown*,GUID*,IID*,unsigned short*,unsigned short*); +HRESULT WINAPI AtlGetPerUserRegistration(unsigned char /*bool*/ *); #endif /* __WINE_ATLBASE_H__ */

1 0

Piotr Caban : jscript: Fixed a leak in do_regexp_match_next function.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 1548d0ef7b9a029fc35cb58cba3abb2906ea7894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1548d0ef7b9a029fc35cb58cb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 25 16:47:57 2013 +0100 jscript: Fixed a leak in do_regexp_match_next function. --- dlls/jscript/regexp.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 4d29390..a06550d 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3708,8 +3708,10 @@ static HRESULT RegExp_exec(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig TRACE("\n"); hres = run_exec(ctx, jsthis, argc ? argv[0] : jsval_string(jsstr_empty()), &string, &match, &parens, &parens_cnt, &b); - if(FAILED(hres)) + if(FAILED(hres)) { + heap_free(parens); return hres; + } if(r) { if(b) { @@ -3931,8 +3933,10 @@ HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, jsstr_t *str, jsval const WCHAR *cp = str->str; hres = regexp_match_next(ctx, &regexp->dispex, 0, str, &cp, &parens, &parens_size, &parens_cnt, &match); - if(FAILED(hres)) + if(FAILED(hres)) { + heap_free(parens); return hres; + } if(r) { if(hres == S_OK) {

1 0

Aric Stewart : usp10: Do not apply SSA_LINK to right to left text.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 6c4f35f34586cb015e4e7d6763cd2cd894495569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c4f35f34586cb015e4e7d676… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jan 25 09:12:05 2013 -0600 usp10: Do not apply SSA_LINK to right to left text. --- dlls/usp10/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 23ba4f5..e2e72fc 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1935,7 +1935,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, if ((dwFlags & SSA_LINK) && !analysis->glyphs[i].fallbackFont && analysis->pItem[i].a.eScript == Script_Hangul) analysis->pItem[i].a.fNoGlyphIndex = TRUE; - if ((dwFlags & SSA_LINK) && !analysis->glyphs[i].fallbackFont && !scriptInformation[analysis->pItem[i].a.eScript].props.fComplex) + if ((dwFlags & SSA_LINK) && !analysis->glyphs[i].fallbackFont && !scriptInformation[analysis->pItem[i].a.eScript].props.fComplex && !analysis->pItem[i].a.fRTL) analysis->pItem[i].a.fNoGlyphIndex = TRUE; hr = ScriptShape(hdc, sc, &pStr[analysis->pItem[i].iCharPos],

1 0

Piotr Caban : msvcrt: Fixed _Gettnames test on Win8.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 97782484414ff5a32b26c8bcaccd22cc6b8bc2af URL: http://source.winehq.org/git/wine.git/?a=commit;h=97782484414ff5a32b26c8bca… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 25 15:07:37 2013 +0100 msvcrt: Fixed _Gettnames test on Win8. --- dlls/msvcrt/tests/locale.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 3bb7fdc..257e3c8 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -656,6 +656,7 @@ static void test__Gettnames(void) char data[1]; } *ret; int size; + char buf[64]; if(!setlocale(LC_ALL, "english")) return; @@ -712,7 +713,9 @@ static void test__Gettnames(void) ok(!strcmp(ret->str[39], "PM"), "ret->str[39] = %s\n", ret->str[39]); ok(!strcmp(ret->str[40], "M/d/yyyy") || broken(!strcmp(ret->str[40], "M/d/yy"))/*NT*/, "ret->str[40] = %s\n", ret->str[40]); - ok(!strcmp(ret->str[41], "dddd, MMMM dd, yyyy"), "ret->str[41] = %s\n", ret->str[41]); + ok(GetLocaleInfoA(MAKELCID(LANG_ENGLISH, SORT_DEFAULT), LOCALE_SLONGDATE|LOCALE_NOUSEROVERRIDE, + buf, sizeof(buf)) != 0, "GetLocaleInfo failed: %x\n", GetLastError()); + ok(!strcmp(ret->str[41], buf), "ret->str[41] = %s, expected %s\n", ret->str[41], buf); free(ret); if(!setlocale(LC_TIME, "german"))

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
74
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 January 2013