October 2011 - Wine-commits

Piotr Caban : msvcp90: Remove code that is never executed.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: 105ffa40fddc70fe73e06bd046399830be91271e URL: http://source.winehq.org/git/wine.git/?a=commit;h=105ffa40fddc70fe73e06bd04… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 14 15:01:35 2011 +0200 msvcp90: Remove code that is never executed. --- dlls/msvcp90/string.c | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 1f2bf7d..ab319c0 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -637,10 +637,8 @@ basic_string_char* __thiscall MSVCP_basic_string_char_erase( { TRACE("%p %lu %lu\n", this, pos, len); - if(pos > this->size) { + if(pos > this->size) MSVCP__String_base_Xran(); - return NULL; - } if(len > this->size-pos) len = this->size-pos; @@ -664,10 +662,8 @@ basic_string_char* __thiscall MSVCP_basic_string_char_assign_substr( { TRACE("%p %p %lu %lu\n", this, assign, pos, len); - if(assign->size < pos) { + if(assign->size < pos) MSVCP__String_base_Xran(); - return NULL; - } if(len > assign->size-pos) len = assign->size-pos; @@ -2087,10 +2083,8 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_erase( { TRACE("%p %lu %lu\n", this, pos, len); - if(pos > this->size) { + if(pos > this->size) MSVCP__String_base_Xran(); - return NULL; - } if(len > this->size-pos) len = this->size-pos; @@ -2114,10 +2108,8 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_assign_substr( { TRACE("%p %p %lu %lu\n", this, assign, pos, len); - if(assign->size < pos) { + if(assign->size < pos) MSVCP__String_base_Xran(); - return NULL; - } if(len > assign->size-pos) len = assign->size-pos;

1 0

Piotr Caban : msvcp90: Added _String_val class implementation.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: 8cca58251bb175ad380ac1318f1083c0c33ca59b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cca58251bb175ad380ac1318… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 14 15:01:50 2011 +0200 msvcp90: Added _String_val class implementation. --- dlls/msvcp90/msvcp90.spec | 48 ++++++++++++++++++++++---------------------- dlls/msvcp90/string.c | 40 +++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 24 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 11271cf..99bd7e0 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -518,18 +518,18 @@ @ stub -arch=win64 ??0?$_Mpunct(a)_W@std@@QEAA(a)AEBV_Locinfo@1(a)_K_N2@Z @ stub -arch=win32 ??0?$_Mpunct(a)_W@std@@QAE(a)I_N@Z @ stub -arch=win64 ??0?$_Mpunct(a)_W@std@@QEAA(a)_K_N@Z -@ stub -arch=win32 ??0?$_String_val(a)DV?$allocator(a)D@std@@@std@@IAE(a)V?$allocator(a)D@1@@Z -@ stub -arch=win64 ??0?$_String_val(a)DV?$allocator(a)D@std@@@std@@IEAA(a)V?$allocator(a)D@1@@Z -@ stub -arch=win32 ??0?$_String_val(a)DV?$allocator(a)D@std@@@std@@QAE(a)ABV01@@Z -@ stub -arch=win64 ??0?$_String_val(a)DV?$allocator(a)D@std@@@std@@QEAA(a)AEBV01@@Z -@ stub -arch=win32 ??0?$_String_val(a)GV?$allocator(a)G@std@@@std@@IAE(a)V?$allocator(a)G@1@@Z -@ stub -arch=win64 ??0?$_String_val(a)GV?$allocator(a)G@std@@@std@@IEAA(a)V?$allocator(a)G@1@@Z -@ stub -arch=win32 ??0?$_String_val(a)GV?$allocator(a)G@std@@@std@@QAE(a)ABV01@@Z -@ stub -arch=win64 ??0?$_String_val(a)GV?$allocator(a)G@std@@@std@@QEAA(a)AEBV01@@Z -@ stub -arch=win32 ??0?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@IAE(a)V?$allocator(a)_W@1@@Z -@ stub -arch=win64 ??0?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@IEAA(a)V?$allocator(a)_W@1@@Z -@ stub -arch=win32 ??0?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QAE(a)ABV01@@Z -@ stub -arch=win64 ??0?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QEAA(a)AEBV01@@Z +@ thiscall -arch=win32 ??0?$_String_val(a)DV?$allocator(a)D@std@@@std@@IAE(a)V?$allocator(a)D@1@@Z(ptr ptr) _String_val_null_ctor +@ cdecl -arch=win64 ??0?$_String_val(a)DV?$allocator(a)D@std@@@std@@IEAA(a)V?$allocator(a)D@1@@Z(ptr ptr) _String_val_null_ctor +@ thiscall -arch=win32 ??0?$_String_val(a)DV?$allocator(a)D@std@@@std@@QAE(a)ABV01@@Z(ptr ptr) _String_val_null_ctor +@ cdecl -arch=win64 ??0?$_String_val(a)DV?$allocator(a)D@std@@@std@@QEAA(a)AEBV01@@Z(ptr ptr) _String_val_null_ctor +@ thiscall -arch=win32 ??0?$_String_val(a)GV?$allocator(a)G@std@@@std@@IAE(a)V?$allocator(a)G@1@@Z(ptr ptr) _String_val_null_ctor +@ cdecl -arch=win64 ??0?$_String_val(a)GV?$allocator(a)G@std@@@std@@IEAA(a)V?$allocator(a)G@1@@Z(ptr ptr) _String_val_null_ctor +@ thiscall -arch=win32 ??0?$_String_val(a)GV?$allocator(a)G@std@@@std@@QAE(a)ABV01@@Z(ptr ptr) _String_val_null_ctor +@ cdecl -arch=win64 ??0?$_String_val(a)GV?$allocator(a)G@std@@@std@@QEAA(a)AEBV01@@Z(ptr ptr) _String_val_null_ctor +@ thiscall -arch=win32 ??0?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@IAE(a)V?$allocator(a)_W@1@@Z(ptr ptr) _String_val_null_ctor +@ cdecl -arch=win64 ??0?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@IEAA(a)V?$allocator(a)_W@1@@Z(ptr ptr) _String_val_null_ctor +@ thiscall -arch=win32 ??0?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QAE(a)ABV01@@Z(ptr ptr) _String_val_null_ctor +@ cdecl -arch=win64 ??0?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QEAA(a)AEBV01@@Z(ptr ptr) _String_val_null_ctor @ thiscall -arch=win32 ??0?$allocator(a)D@std@@QAE(a)ABV01@@Z(ptr ptr) MSVCP_allocator_char_copy_ctor @ cdecl -arch=win64 ??0?$allocator(a)D@std@@QEAA(a)AEBV01@@Z(ptr ptr) MSVCP_allocator_char_copy_ctor @ thiscall -arch=win32 ??0?$allocator(a)D@std@@QAE(a)XZ(ptr) MSVCP_allocator_char_ctor @@ -1366,12 +1366,12 @@ @ stub -arch=win64 ??4?$_Iosb(a)H@std@@QEAAAEAV01(a)AEBV01@@Z @ stub -arch=win32 ??4?$_Locbase(a)H@std@@QAEAAV01(a)ABV01@@Z @ stub -arch=win64 ??4?$_Locbase(a)H@std@@QEAAAEAV01(a)AEBV01@@Z -@ stub -arch=win32 ??4?$_String_val(a)DV?$allocator(a)D@std@@@std@@QAEAAV01(a)ABV01@@Z -@ stub -arch=win64 ??4?$_String_val(a)DV?$allocator(a)D@std@@@std@@QEAAAEAV01(a)AEBV01@@Z -@ stub -arch=win32 ??4?$_String_val(a)GV?$allocator(a)G@std@@@std@@QAEAAV01(a)ABV01@@Z -@ stub -arch=win64 ??4?$_String_val(a)GV?$allocator(a)G@std@@@std@@QEAAAEAV01(a)AEBV01@@Z -@ stub -arch=win32 ??4?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QAEAAV01(a)ABV01@@Z -@ stub -arch=win64 ??4?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QEAAAEAV01(a)AEBV01@@Z +@ thiscall -arch=win32 ??4?$_String_val(a)DV?$allocator(a)D@std@@@std@@QAEAAV01(a)ABV01@@Z(ptr ptr) _String_val_null_ctor +@ cdecl -arch=win64 ??4?$_String_val(a)DV?$allocator(a)D@std@@@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) _String_val_null_ctor +@ thiscall -arch=win32 ??4?$_String_val(a)GV?$allocator(a)G@std@@@std@@QAEAAV01(a)ABV01@@Z(ptr ptr) _String_val_null_ctor +@ cdecl -arch=win64 ??4?$_String_val(a)GV?$allocator(a)G@std@@@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) _String_val_null_ctor +@ thiscall -arch=win32 ??4?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QAEAAV01(a)ABV01@@Z(ptr ptr) _String_val_null_ctor +@ cdecl -arch=win64 ??4?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) _String_val_null_ctor @ thiscall -arch=win32 ??4?$allocator(a)D@std@@QAEAAV01(a)ABV01@@Z(ptr ptr) MSVCP_allocator_char_assign @ cdecl -arch=win64 ??4?$allocator(a)D@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_allocator_char_assign @ thiscall -arch=win32 ??4?$allocator(a)G@std@@QAEAAV01(a)ABV01@@Z(ptr ptr) MSVCP_allocator_short_assign @@ -1955,12 +1955,12 @@ @ stub -arch=win64 ??_D?$basic_stringstream(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAXXZ @ stub -arch=win32 ??_D?$basic_stringstream(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEXXZ @ stub -arch=win64 ??_D?$basic_stringstream(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAXXZ -@ stub -arch=win32 ??_F?$_String_val(a)DV?$allocator(a)D@std@@@std@@QAEXXZ -@ stub -arch=win64 ??_F?$_String_val(a)DV?$allocator(a)D@std@@@std@@QEAAXXZ -@ stub -arch=win32 ??_F?$_String_val(a)GV?$allocator(a)G@std@@@std@@QAEXXZ -@ stub -arch=win64 ??_F?$_String_val(a)GV?$allocator(a)G@std@@@std@@QEAAXXZ -@ stub -arch=win32 ??_F?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QAEXXZ -@ stub -arch=win64 ??_F?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QEAAXXZ +@ thiscall -arch=win32 ??_F?$_String_val(a)DV?$allocator(a)D@std@@@std@@QAEXXZ(ptr) _String_val_ctor +@ cdecl -arch=win64 ??_F?$_String_val(a)DV?$allocator(a)D@std@@@std@@QEAAXXZ(ptr) _String_val_ctor +@ thiscall -arch=win32 ??_F?$_String_val(a)GV?$allocator(a)G@std@@@std@@QAEXXZ(ptr) _String_val_ctor +@ cdecl -arch=win64 ??_F?$_String_val(a)GV?$allocator(a)G@std@@@std@@QEAAXXZ(ptr) _String_val_ctor +@ thiscall -arch=win32 ??_F?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QAEXXZ(ptr) _String_val_ctor +@ cdecl -arch=win64 ??_F?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QEAAXXZ(ptr) _String_val_ctor @ stub -arch=win32 ??_F?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ @ stub -arch=win64 ??_F?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAXXZ @ stub -arch=win32 ??_F?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QAEXXZ diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index ab319c0..1971d71 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -3418,3 +3418,43 @@ MSVCP_size_t __cdecl MSVCP_basic_string_wchar_Pdif(String_iterator_wchar i1, Str return !i1.pos ? 0 : i1.pos-i2.pos; } + +/* _String_val class */ +/* ??_F?$_String_val(a)DV?$allocator(a)D@std@@@std@@QAEXXZ */ +/* ??_F?$_String_val(a)DV?$allocator(a)D@std@@@std@@QEAAXXZ */ +/* ??_F?$_String_val(a)GV?$allocator(a)G@std@@@std@@QAEXXZ */ +/* ??_F?$_String_val(a)GV?$allocator(a)G@std@@@std@@QEAAXXZ */ +/* ??_F?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QAEXXZ */ +/* ??_F?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_String_val_ctor, 4) +void* __thiscall _String_val_ctor(void *this) +{ + TRACE("%p\n", this); + return this; +} + +/* ??0?$_String_val(a)DV?$allocator(a)D@std@@@std@@IAE(a)V?$allocator(a)D@1@@Z */ +/* ??0?$_String_val(a)DV?$allocator(a)D@std@@@std@@IEAA(a)V?$allocator(a)D@1@@Z */ +/* ??0?$_String_val(a)GV?$allocator(a)G@std@@@std@@IAE(a)V?$allocator(a)G@1@@Z */ +/* ??0?$_String_val(a)GV?$allocator(a)G@std@@@std@@IEAA(a)V?$allocator(a)G@1@@Z */ +/* ??0?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@IAE(a)V?$allocator(a)_W@1@@Z */ +/* ??0?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@IEAA(a)V?$allocator(a)_W@1@@Z */ +/* ??0?$_String_val(a)DV?$allocator(a)D@std@@@std@@QAE(a)ABV01@@Z */ +/* ??0?$_String_val(a)DV?$allocator(a)D@std@@@std@@QEAA(a)AEBV01@@Z */ +/* ??0?$_String_val(a)GV?$allocator(a)G@std@@@std@@QAE(a)ABV01@@Z */ +/* ??0?$_String_val(a)GV?$allocator(a)G@std@@@std@@QEAA(a)AEBV01@@Z */ +/* ??0?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QAE(a)ABV01@@Z */ +/* ??0?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QEAA(a)AEBV01@@Z */ +/* ??4?$_String_val(a)DV?$allocator(a)D@std@@@std@@QAEAAV01(a)ABV01@@Z */ +/* ??4?$_String_val(a)DV?$allocator(a)D@std@@@std@@QEAAAEAV01(a)AEBV01@@Z */ +/* ??4?$_String_val(a)GV?$allocator(a)G@std@@@std@@QAEAAV01(a)ABV01@@Z */ +/* ??4?$_String_val(a)GV?$allocator(a)G@std@@@std@@QEAAAEAV01(a)AEBV01@@Z */ +/* ??4?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QAEAAV01(a)ABV01@@Z */ +/* ??4?$_String_val(a)_WV?$allocator(a)_W@std@@@std@@QEAAAEAV01(a)AEBV01@@Z */ +/* ??4?$_String_val(a)DV?$allocator(a)D@std@@@std@@QAEAAV01(a)ABV01@@Z */ +DEFINE_THISCALL_WRAPPER(_String_val_null_ctor, 8) +void* __thiscall _String_val_null_ctor(void *this, const void *misc) +{ + TRACE("%p %p\n", this, misc); + return this; +}

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: b9b24bdf51bd2bd697262674c00fa490808629f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9b24bdf51bd2bd697262674c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 14 15:02:00 2011 +0200 msvcp: Sync spec files. --- dlls/msvcp60/msvcp60.spec | 64 +++++++------- dlls/msvcp70/msvcp70.spec | 104 +++++++++++----------- dlls/msvcp71/msvcp71.spec | 198 +++++++++++++++++++++--------------------- dlls/msvcp80/msvcp80.spec | 216 ++++++++++++++++++++++---------------------- dlls/msvcp90/msvcp90.spec | 8 +- 5 files changed, 295 insertions(+), 295 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9b24bdf51bd2bd697262…

1 0

Aric Stewart : usp10: Correct buffer reading overrun.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: 85d33f41398568f967e7139b5d524fe72ba94621 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85d33f41398568f967e7139b5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Oct 14 08:24:58 2011 -0500 usp10: Correct buffer reading overrun. Found by Dan Kegel using valgrind. --- dlls/usp10/indic.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/indic.c b/dlls/usp10/indic.c index 43bf0e5..a25ceec 100644 --- a/dlls/usp10/indic.c +++ b/dlls/usp10/indic.c @@ -333,6 +333,8 @@ void Indic_ReorderCharacters( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, L while((next < cChar) && lex(input[next]) == lex_Generic) next++; index = next; + if (next >= cChar) + break; next = Indic_process_next_syllable(input, cChar, 0, &center, index, lex); if (next != -1) {

1 0

Aric Stewart : usp10: Add fallback font for Armenian and Georgian.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: 29b52fa57579a80711c0b52c9aad372dfc5a4512 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29b52fa57579a80711c0b52c9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Oct 14 08:25:17 2011 -0500 usp10: Add fallback font for Armenian and Georgian. --- dlls/usp10/usp10.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index df6f75a..107f8cc 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -212,11 +212,11 @@ static const scriptData scriptInformation[] = { {{Script_Armenian, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_ARMENIAN, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, MS_MAKE_TAG('a','r','m','n'), - {0}}, + {'S','y','l','f','a','e','n',0}}, {{Script_Georgian, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_GEORGIAN, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, MS_MAKE_TAG('g','e','o','r'), - {0}}, + {'S','y','l','f','a','e','n',0}}, {{Script_Sinhala, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_SINHALESE, 0, 1, 0, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('s','i','n','h'),

1 0

Frédéric Delanoy : inetmib1: Avoid idempotent operation in findSupportedQuery function (Clang).
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: 699fb02d101d708b52cd8904f82ab455c9b00a4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=699fb02d101d708b52cd8904f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 14 13:02:35 2011 +0200 inetmib1: Avoid idempotent operation in findSupportedQuery function (Clang). --- dlls/inetmib1/main.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 76741f3..af9f17c 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -1342,29 +1342,26 @@ static void cleanup(void) static struct mibImplementation *findSupportedQuery(UINT *ids, UINT idLength, UINT *matchingIndex) { - int indexHigh = DEFINE_SIZEOF(supportedIDs) - 1, indexLow = 0, i; - struct mibImplementation *impl = NULL; + int indexHigh = DEFINE_SIZEOF(supportedIDs) - 1, indexLow = 0; AsnObjectIdentifier oid1 = { idLength, ids}; if (!idLength) return NULL; - for (i = (indexLow + indexHigh) / 2; !impl && indexLow <= indexHigh; - i = (indexLow + indexHigh) / 2) - { - INT cmp; - cmp = SnmpUtilOidNCmp(&oid1, &supportedIDs[i].name, idLength); - if (!cmp) + while (indexLow <= indexHigh) + { + INT cmp, i = (indexLow + indexHigh) / 2; + if (!(cmp = SnmpUtilOidNCmp(&oid1, &supportedIDs[i].name, idLength))) { - impl = &supportedIDs[i]; *matchingIndex = i; + return &supportedIDs[i]; } - else if (cmp > 0) + if (cmp > 0) indexLow = i + 1; else indexHigh = i - 1; } - return impl; + return NULL; } /*****************************************************************************

1 0

Frédéric Delanoy : cmd/tests: Add tests for directories RENAMEs.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: 1f5c0a6170a14306ba350019b55a63e9d1619e9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f5c0a6170a14306ba350019b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 14 15:37:57 2011 +0200 cmd/tests: Add tests for directories RENAMEs. --- programs/cmd/tests/test_builtins.cmd | 15 +++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 3 +++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 1967e42..b68e697 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -899,6 +899,21 @@ rem no-op ren foo foo mkdir baz ren foo baz\abc +echo ... rename directories ... +mkdir rep1 +ren rep1 rep2 +if not exist rep1 ( + if exist rep2 ( + echo dir renamed + ) +) +attrib +r rep2 +ren rep2 rep1 +if not exist rep2 ( + if exist rep1 ( + echo read-only dir renamed + ) +) echo ... rename in other directory ... if not exist baz\abc ( echo rename impossible in other directory diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index e45016c..5371246 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -601,6 +601,9 @@ bar renamed to foo ... name collision ... foo bar +... rename directories ... +dir renamed +read-only dir renamed ... rename in other directory ... @todo_wine(a)rename impossible in other directory @todo_wine(a)original file still present

1 0

Frédéric Delanoy : cmd/tests: Show that read-only files are RENAMEable.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: d5523fcd8090cf39506eb38d33eea074195aafbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5523fcd8090cf39506eb38d3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 14 15:37:58 2011 +0200 cmd/tests: Show that read-only files are RENAMEable. --- programs/cmd/tests/test_builtins.cmd | 11 +++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 2 ++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index b68e697..02e264d 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -899,6 +899,17 @@ rem no-op ren foo foo mkdir baz ren foo baz\abc +echo ... rename read-only files ... +echo > file1 +attrib +r file1 +ren file1 file2 +if not exist file1 ( + if exist file2 ( + echo read-only file renamed + ) +) else ( + echo read-only file not renamed! +) echo ... rename directories ... mkdir rep1 ren rep1 rep2 diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 5371246..eaefdc1 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -601,6 +601,8 @@ bar renamed to foo ... name collision ... foo bar +... rename read-only files ... +(a)todo_wine@read-only file renamed ... rename directories ... dir renamed read-only dir renamed

1 0

Frédéric Delanoy : cmd: Make RENAME work for read-only files.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: 6fd9d774268fe2b9e4f3fecbbbcf29f8a87218c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd9d774268fe2b9e4f3fecbb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 14 15:37:59 2011 +0200 cmd: Make RENAME work for read-only files. --- programs/cmd/builtins.c | 15 +++------------ programs/cmd/tests/test_builtins.cmd.exp | 2 +- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index ed2b6f0..5a890c7 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1768,8 +1768,8 @@ void WCMD_remove_dir (WCHAR *command) { * Rename a file. */ -void WCMD_rename (void) { - +void WCMD_rename (void) +{ int status; HANDLE hff; WIN32_FIND_DATAW fd; @@ -1779,7 +1779,6 @@ void WCMD_rename (void) { WCHAR dir[MAX_PATH]; WCHAR fname[MAX_PATH]; WCHAR ext[MAX_PATH]; - DWORD attribs; errorlevel = 0; @@ -1853,15 +1852,7 @@ void WCMD_rename (void) { WINE_TRACE("Source '%s'\n", wine_dbgstr_w(src)); WINE_TRACE("Dest '%s'\n", wine_dbgstr_w(dest)); - /* Check if file is read only, otherwise move it */ - attribs = GetFileAttributesW(src); - if ((attribs != INVALID_FILE_ATTRIBUTES) && - (attribs & FILE_ATTRIBUTE_READONLY)) { - SetLastError(ERROR_ACCESS_DENIED); - status = 0; - } else { - status = MoveFileW(src, dest); - } + status = MoveFileW(src, dest); if (!status) { WCMD_print_error (); diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index eaefdc1..20e5d12 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -602,7 +602,7 @@ bar renamed to foo foo bar ... rename read-only files ... -(a)todo_wine@read-only file renamed +read-only file renamed ... rename directories ... dir renamed read-only dir renamed

1 0

Alexandre Julliard : gdi32: Overlapping rectangles are not allowed in GdiAlphaBlend.
by Alexandre Julliard 14 Oct '11

14 Oct '11

Module: wine Branch: master Commit: b7a15ae7faa0541bbaf55074413e4c176ed4f852 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7a15ae7faa0541bbaf550744… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 14 18:22:50 2011 +0200 gdi32: Overlapping rectangles are not allowed in GdiAlphaBlend. --- dlls/gdi32/bitblt.c | 8 ++++++++ dlls/gdi32/tests/bitmap.c | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index e03a5c1..eee6fa2 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -774,6 +774,14 @@ BOOL WINAPI GdiAlphaBlend(HDC hdcDst, int xDst, int yDst, int widthDst, int heig SetLastError( ERROR_INVALID_PARAMETER ); ret = FALSE; } + else if (dcSrc == dcDst && src.x + src.width > dst.x && src.x < dst.x + dst.width && + src.y + src.height > dst.y && src.y < dst.y + dst.height) + { + WARN( "Overlapping coords: (%d,%d), %dx%d and (%d,%d), %dx%d\n", + src.x, src.y, src.width, src.height, dst.x, dst.y, dst.width, dst.height ); + SetLastError( ERROR_INVALID_PARAMETER ); + ret = FALSE; + } else if (!ret) ret = dst_dev->funcs->pAlphaBlend( dst_dev, &dst, src_dev, &src, blendFunction ); release_dc_ptr( dcDst ); diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index e069fa8..32fabb8 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -3279,6 +3279,25 @@ static void test_GdiAlphaBlend(void) ok( !ret, "GdiAlphaBlend succeeded\n" ); ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() ); + /* overlapping source and dest not allowed */ + + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcDst, 19, 19, 20, 20, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 20, 20, 20, 20, hdcDst, 1, 1, 20, 20, blend); + ok( !ret, "GdiAlphaBlend succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcDst, 20, 10, 20, 20, blend); + ok( ret, "GdiAlphaBlend succeeded\n" ); + SetLastError(0xdeadbeef); + ret = pGdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcDst, 10, 20, 20, 20, blend); + ok( ret, "GdiAlphaBlend succeeded\n" ); + /* AC_SRC_ALPHA requires 32-bpp BI_RGB format */ blend.AlphaFormat = AC_SRC_ALPHA;

1 0