October 2011 - Wine-commits

Huw Davies : gdi32/tests: Remove unused legacy values.
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: ffe5e20b78457ac8c0cc7efca2b5a77de8c4fa7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffe5e20b78457ac8c0cc7efca… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 18 09:43:03 2011 +0100 gdi32/tests: Remove unused legacy values. --- dlls/gdi32/tests/bitmap.c | 26 +++++++++++--------------- 1 files changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index ed304aa..a412cc9 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -3054,7 +3054,7 @@ static void check_StretchDIBits_pixel(HDC hdcDst, UINT32 *dstBuffer, UINT32 *src static void check_StretchDIBits_stretch(HDC hdcDst, UINT32 *dstBuffer, UINT32 *srcBuffer, int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest, int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, - UINT32 expected[4], UINT32 legacy_expected[4], int line) + UINT32 expected[4], int line) { BITMAPINFO bitmapInfo; @@ -3087,7 +3087,7 @@ static void test_StretchDIBits(void) UINT32 *dstBuffer, srcBuffer[4]; HBRUSH hBrush, hOldBrush; BITMAPINFO biDst; - UINT32 expected[4], legacy_expected[4]; + UINT32 expected[4]; memset(&biDst, 0, sizeof(BITMAPINFO)); biDst.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); @@ -3134,46 +3134,42 @@ static void test_StretchDIBits(void) expected[0] = 0xCAFED00D, expected[1] = 0xFEEDFACE; expected[2] = 0xFEDCBA98, expected[3] = 0x76543210; check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 0, 0, 2, 2, 0, 0, 2, 2, expected, expected, __LINE__); + 0, 0, 2, 2, 0, 0, 2, 2, expected, __LINE__); expected[0] = 0xCAFED00D, expected[1] = 0x00000000; expected[2] = 0x00000000, expected[3] = 0x00000000; - legacy_expected[0] = 0xFEDCBA98, legacy_expected[1] = 0x00000000; - legacy_expected[2] = 0x00000000, legacy_expected[3] = 0x00000000; check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 0, 0, 1, 1, 0, 0, 1, 1, expected, legacy_expected, __LINE__); + 0, 0, 1, 1, 0, 0, 1, 1, expected, __LINE__); expected[0] = 0xFEDCBA98, expected[1] = 0xFEDCBA98; expected[2] = 0xFEDCBA98, expected[3] = 0xFEDCBA98; check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 0, 0, 2, 2, 0, 0, 1, 1, expected, expected, __LINE__); + 0, 0, 2, 2, 0, 0, 1, 1, expected, __LINE__); expected[0] = 0x42441000, expected[1] = 0x00000000; expected[2] = 0x00000000, expected[3] = 0x00000000; - legacy_expected[0] = 0x00543210, legacy_expected[1] = 0x00000000; - legacy_expected[2] = 0x00000000, legacy_expected[3] = 0x00000000; check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 0, 0, 1, 1, 0, 0, 2, 2, expected, legacy_expected, __LINE__); + 0, 0, 1, 1, 0, 0, 2, 2, expected, __LINE__); expected[0] = 0x00000000, expected[1] = 0x00000000; expected[2] = 0x00000000, expected[3] = 0x00000000; check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 0, 0, 2, 2, 1, 1, -2, -2, expected, expected, __LINE__); + 0, 0, 2, 2, 1, 1, -2, -2, expected, __LINE__); expected[0] = 0x00000000, expected[1] = 0x00000000; expected[2] = 0x00000000, expected[3] = 0x00000000; check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 0, 0, 2, 2, 1, 1, -2, -2, expected, expected, __LINE__); + 0, 0, 2, 2, 1, 1, -2, -2, expected, __LINE__); expected[0] = 0x00000000, expected[1] = 0x00000000; expected[2] = 0x00000000, expected[3] = 0x00000000; check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 1, 1, -2, -2, 1, 1, -2, -2, expected, expected, __LINE__); + 1, 1, -2, -2, 1, 1, -2, -2, expected, __LINE__); expected[0] = 0x00000000, expected[1] = 0x00000000; expected[2] = 0x00000000, expected[3] = 0xCAFED00D; check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 1, 1, 2, 2, 0, 0, 2, 2, expected, expected, __LINE__); + 1, 1, 2, 2, 0, 0, 2, 2, expected, __LINE__); SelectObject(hdcDst, oldDst); DeleteObject(bmpDst); @@ -3187,7 +3183,7 @@ static void test_StretchDIBits(void) expected[0] = 0xFEDCBA98, expected[1] = 0x76543210; expected[2] = 0xCAFED00D, expected[3] = 0xFEEDFACE; check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 0, 0, 2, 2, 0, 0, 2, 2, expected, expected, __LINE__); + 0, 0, 2, 2, 0, 0, 2, 2, expected, __LINE__); /* Tidy up */ SelectObject(hdcDst, oldDst);

1 0

Piotr Caban : msvcp90: Added basic_string::rfind implementation.
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: ed6c1ff8d5bb6ec1d54cb510e017abfdb0d5ed24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed6c1ff8d5bb6ec1d54cb510e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 18 11:12:37 2011 +0200 msvcp90: Added basic_string::rfind implementation. --- dlls/msvcp90/msvcp90.spec | 32 ++++++------ dlls/msvcp90/string.c | 112 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed6c1ff8d5bb6ec1d54cb…

1 0

Piotr Caban : msvcp90: Added basic_string::find_last_not_of implementation.
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: a6897e888ef67db9bdc9a9ac63739fc8d32506cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6897e888ef67db9bdc9a9ac6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 18 11:12:53 2011 +0200 msvcp90: Added basic_string::find_last_not_of implementation. --- dlls/msvcp90/msvcp90.spec | 32 +++++++------- dlls/msvcp90/string.c | 105 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 120 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a6897e888ef67db9bdc9a…

1 0

Piotr Caban : msvcp90: Added basic_string::replace iterator based functions .
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: bc2567f9744c88e01aef26ffdab9f9142290f71a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc2567f9744c88e01aef26ffd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 18 11:13:10 2011 +0200 msvcp90: Added basic_string::replace iterator based functions. --- dlls/msvcp90/msvcp90.spec | 48 ++++++------ dlls/msvcp90/string.c | 194 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 190 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bc2567f9744c88e01aef2…

1 0

Piotr Caban : msvcp90: Added basic_string::erase iterator based functions.
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: 0b802bb7477e5ebc6ad672197c2152f949d0051f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b802bb7477e5ebc6ad672197… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 18 11:13:26 2011 +0200 msvcp90: Added basic_string::erase iterator based functions. --- dlls/msvcp90/msvcp90.spec | 16 +++++----- dlls/msvcp90/string.c | 64 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b802bb7477e5ebc6ad67…

1 0

Piotr Caban : msvcp90: Added basic_string::get_allocator implementation.
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: b0211b5b18b55e256394cea01c4253d907f3328a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0211b5b18b55e256394cea01… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 18 11:13:42 2011 +0200 msvcp90: Added basic_string::get_allocator implementation. --- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 4a41fed..33d5619 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -4099,12 +4099,12 @@ @ stub -arch=win64 ?get@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@0AEAVios_base(a)2@AEAHAEA_K(a)Z @ stub -arch=win32 ?get@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QBE?AV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@0AAVios_base(a)2@AAHAA_N(a)Z @ stub -arch=win64 ?get@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@0AEAVios_base(a)2@AEAHAEA_N(a)Z -@ stub -arch=win32 ?get_allocator@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBE?AV?$allocator(a)D@2(a)XZ -@ stub -arch=win64 ?get_allocator@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA?AV?$allocator(a)D@2(a)XZ +@ thiscall -arch=win32 ?get_allocator@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBE?AV?$allocator(a)D@2(a)XZ(ptr) basic_string_char_get_allocator +@ cdecl -arch=win64 ?get_allocator@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA?AV?$allocator(a)D@2(a)XZ(ptr) basic_string_char_get_allocator @ stub -arch=win32 ?get_allocator@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBE?AV?$allocator(a)G@2(a)XZ @ stub -arch=win64 ?get_allocator@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBA?AV?$allocator(a)G@2(a)XZ -@ stub -arch=win32 ?get_allocator@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBE?AV?$allocator(a)_W@2(a)XZ -@ stub -arch=win64 ?get_allocator@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA?AV?$allocator(a)_W@2(a)XZ +@ thiscall -arch=win32 ?get_allocator@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBE?AV?$allocator(a)_W@2(a)XZ(ptr) basic_string_wchar_get_allocator +@ cdecl -arch=win64 ?get_allocator@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA?AV?$allocator(a)_W@2(a)XZ(ptr) basic_string_wchar_get_allocator @ stub -arch=win32 ?get_date@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHPAUtm@@@Z @ stub -arch=win64 ?get_date@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AEAVios_base(a)2@AEAHPEAUtm@@@Z @ stub -arch=win32 ?get_date@?$time_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@QBE?AV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@0AAVios_base(a)2@AAHPAUtm@@@Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index e2595a7..c2aa0da 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -47,6 +47,10 @@ typedef struct { MSVCP_size_t val; } size_t_noverify; +/* allocator class */ +typedef struct { +} allocator; + /* char_traits<char> */ /* ?assign@?$char_traits(a)D@std@@SAXAADABD(a)Z */ /* ?assign@?$char_traits(a)D@std@@SAXAEADAEBD(a)Z */ @@ -643,6 +647,16 @@ MSVCP_size_t __cdecl MSVCP_basic_string_char_Pdif(String_iterator_char i1, Strin return !i1.pos ? 0 : i1.pos-i2.pos; } +/* ?get_allocator@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBE?AV?$allocator(a)D@2(a)XZ */ +/* ?get_allocator@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA?AV?$allocator(a)D@2(a)XZ */ +DEFINE_THISCALL_WRAPPER_RETPTR(basic_string_char_get_allocator, 4) +allocator __thiscall basic_string_char_get_allocator(const basic_string_char *this) +{ + allocator ret; + TRACE("%p\n", this); + return ret; +} + /* ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)II@Z */ /* ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_K0@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_erase, 12) @@ -2297,6 +2311,16 @@ MSVCP_size_t __cdecl MSVCP_basic_string_wchar_Pdif(String_iterator_wchar i1, Str return !i1.pos ? 0 : i1.pos-i2.pos; } +/* ?get_allocator@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBE?AV?$allocator(a)_W@2(a)XZ */ +/* ?get_allocator@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA?AV?$allocator(a)_W@2(a)XZ */ +DEFINE_THISCALL_WRAPPER(basic_string_wchar_get_allocator, 4) +allocator __thiscall basic_string_wchar_get_allocator(const basic_string_wchar *this) +{ + allocator ret; + TRACE("%p\n", this); + return ret; +} + /* ?erase@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)II@Z */ /* ?erase@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)_K0@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_erase, 12)

1 0

Piotr Caban : msvcp90: Fix buffer size in basic_string_char_grow.
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: 59514c463a6498a7a0b871a1ef193e40c1b6843f URL: http://source.winehq.org/git/wine.git/?a=commit;h=59514c463a6498a7a0b871a1e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 18 11:13:52 2011 +0200 msvcp90: Fix buffer size in basic_string_char_grow. --- dlls/msvcp90/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index c2aa0da..c480af1 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -607,7 +607,7 @@ MSVCP_bool __thiscall basic_string_char_grow( if(new_res/3 < this->res/2) new_res = this->res + this->res/2; - ptr = MSVCP_allocator_char_allocate(this->allocator, new_res); + ptr = MSVCP_allocator_char_allocate(this->allocator, new_res+1); if(!ptr) ptr = MSVCP_allocator_char_allocate(this->allocator, new_size+1); else @@ -2271,7 +2271,7 @@ MSVCP_bool __thiscall basic_string_wchar_grow( if(new_res/3 < this->res/2) new_res = this->res + this->res/2; - ptr = MSVCP_allocator_wchar_allocate(this->allocator, new_res); + ptr = MSVCP_allocator_wchar_allocate(this->allocator, new_res+1); if(!ptr) ptr = MSVCP_allocator_wchar_allocate(this->allocator, new_size+1); else

1 0

Piotr Caban : msvcp90: Use debugstr_a to avoid overflow in traces.
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: f73522698881696905e5b03c11535c11508ab220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f73522698881696905e5b03c1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 18 11:14:06 2011 +0200 msvcp90: Use debugstr_a to avoid overflow in traces. --- dlls/msvcp90/string.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index c480af1..2dd9f52 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -943,7 +943,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_ctor_cstr_len, 12) basic_string_char* __thiscall MSVCP_basic_string_char_ctor_cstr_len( basic_string_char *this, const char *str, MSVCP_size_t len) { - TRACE("%p %s %ld\n", this, str, len); + TRACE("%p %s %ld\n", this, debugstr_a(str), len); basic_string_char_tidy(this, FALSE, 0); MSVCP_basic_string_char_assign_cstr_len(this, str, len); @@ -1152,7 +1152,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_append_cstr_len, 12) basic_string_char* __thiscall MSVCP_basic_string_char_append_cstr_len( basic_string_char *this, const char *append, MSVCP_size_t count) { - TRACE("%p %s %lu\n", this, append, count); + TRACE("%p %s %lu\n", this, debugstr_a(append), count); if(basic_string_char_inside(this, append)) return MSVCP_basic_string_char_append_substr(this, this, @@ -1235,7 +1235,7 @@ basic_string_char* __thiscall MSVCP_basic_string_char_append_ch( basic_string_char* __cdecl MSVCP_basic_string_char_concatenate_bstr_cstr(basic_string_char *ret, const basic_string_char *left, const char *right) { - TRACE("%p %s\n", left, right); + TRACE("%p %s\n", left, debugstr_a(right)); MSVCP_basic_string_char_copy_ctor(ret, left); MSVCP_basic_string_char_append_cstr(ret, right); @@ -1247,7 +1247,7 @@ basic_string_char* __cdecl MSVCP_basic_string_char_concatenate_bstr_cstr(basic_s basic_string_char* __cdecl MSVCP_basic_string_char_concatenate_cstr_bstr(basic_string_char *ret, const char *left, const basic_string_char *right) { - TRACE("%s %p\n", left, right); + TRACE("%s %p\n", debugstr_a(left), right); MSVCP_basic_string_char_ctor_cstr(ret, left); MSVCP_basic_string_char_append(ret, right); @@ -1299,7 +1299,7 @@ int __thiscall MSVCP_basic_string_char_compare_substr_cstr_len( { int ans; - TRACE("%p %lu %lu %s %lu\n", this, pos, num, str, count); + TRACE("%p %lu %lu %s %lu\n", this, pos, num, debugstr_a(str), count); if(this->size < pos) MSVCP__String_base_Xran(); @@ -1531,7 +1531,7 @@ MSVCP_size_t __thiscall MSVCP_basic_string_char_find_cstr_substr( { const char *p, *end; - TRACE("%p %s %lu %lu\n", this, find, pos, len); + TRACE("%p %s %lu %lu\n", this, debugstr_a(find), pos, len); if(len==0 && pos<=this->size) return pos; @@ -1586,7 +1586,7 @@ MSVCP_size_t __thiscall MSVCP_basic_string_char_rfind_cstr_substr( { const char *p, *end; - TRACE("%p %s %lu %lu\n", this, find, pos, len); + TRACE("%p %s %lu %lu\n", this, debugstr_a(find), pos, len); if(len==0) return pos<this->size ? pos : this->size;

1 0

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

18 Oct '11

Module: wine Branch: master Commit: 32b24db04116335bc7ff858a34f1070454eea386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32b24db04116335bc7ff858a3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 18 11:14:21 2011 +0200 msvcp: Sync spec files. --- dlls/msvcp60/msvcp60.spec | 36 +++++++++++----------- dlls/msvcp70/msvcp70.spec | 72 ++++++++++++++++++++++---------------------- dlls/msvcp71/msvcp71.spec | 72 ++++++++++++++++++++++---------------------- dlls/msvcp80/msvcp80.spec | 72 ++++++++++++++++++++++---------------------- 4 files changed, 126 insertions(+), 126 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32b24db04116335bc7ff8…

1 0

Alexandre Julliard : wineps: Get rid of the StretchDIBits entry point.
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: 2dfa00230d43384cb3543719bfddb156ab0a1760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dfa00230d43384cb3543719b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 17 20:12:59 2011 +0200 wineps: Get rid of the StretchDIBits entry point. --- dlls/wineps.drv/bitmap.c | 158 +--------------------------------------------- dlls/wineps.drv/init.c | 2 +- dlls/wineps.drv/psdrv.h | 4 - 3 files changed, 3 insertions(+), 161 deletions(-) diff --git a/dlls/wineps.drv/bitmap.c b/dlls/wineps.drv/bitmap.c index fd153ba..ef6e482 100644 --- a/dlls/wineps.drv/bitmap.c +++ b/dlls/wineps.drv/bitmap.c @@ -38,7 +38,7 @@ static inline int get_dib_width_bytes( int width, int depth ) /*************************************************************************** * PSDRV_WriteImageHeader * - * Helper for PSDRV_StretchDIBits + * Helper for PSDRV_PutImage * * BUGS * Uses level 2 PostScript @@ -79,7 +79,7 @@ static BOOL PSDRV_WriteImageHeader(PHYSDEV dev, const BITMAPINFO *info, INT xDst /*************************************************************************** * PSDRV_WriteImageMaskHeader * - * Helper for PSDRV_StretchDIBits + * Helper for PSDRV_PutImage * * We use the imagemask operator for 1bpp bitmaps since the output * takes much less time for the printer to render. @@ -276,157 +276,3 @@ update_format: info->bmiHeader.biCompression = BI_RGB; return ERROR_BAD_FORMAT; } - -/*************************************************************************** - * - * PSDRV_StretchDIBits - * - * BUGS - * Doesn't work correctly if xSrc isn't byte aligned - this affects 1 and 4 - * bit depths. - * Compression not implemented. - */ -INT PSDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, - INT heightDst, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, const void *bits, - BITMAPINFO *info, UINT wUsage, DWORD dwRop ) -{ - INT stride; - INT line; - POINT pt[2]; - const BYTE *src_ptr; - BYTE *dst_ptr, *bitmap; - DWORD bitmap_size; - - TRACE("%p (%d,%d %dx%d) -> (%d,%d %dx%d)\n", dev->hdc, - xSrc, ySrc, widthSrc, heightSrc, xDst, yDst, widthDst, heightDst); - - stride = get_dib_width_bytes( info->bmiHeader.biWidth, info->bmiHeader.biBitCount ); - - TRACE("full size=%dx%d bpp=%d compression=%d rop=%08x\n", info->bmiHeader.biWidth, - info->bmiHeader.biHeight, info->bmiHeader.biBitCount, info->bmiHeader.biCompression, dwRop); - - - if(info->bmiHeader.biCompression != BI_RGB) { - FIXME("Compression not supported\n"); - return FALSE; - } - - pt[0].x = xDst; - pt[0].y = yDst; - pt[1].x = xDst + widthDst; - pt[1].y = yDst + heightDst; - LPtoDP( dev->hdc, pt, 2 ); - xDst = pt[0].x; - yDst = pt[0].y; - widthDst = pt[1].x - pt[0].x; - heightDst = pt[1].y - pt[0].y; - - switch (info->bmiHeader.biBitCount) { - - case 1: - src_ptr = bits; - src_ptr += (ySrc * stride); - if(xSrc & 7) - FIXME("This won't work...\n"); - bitmap_size = heightSrc * ((widthSrc + 7) / 8); - dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); - for(line = 0; line < heightSrc; line++, src_ptr += stride, dst_ptr += ((widthSrc + 7) / 8)) - memcpy(dst_ptr, src_ptr + xSrc / 8, (widthSrc + 7) / 8); - break; - - case 4: - src_ptr = bits; - src_ptr += (ySrc * stride); - if(xSrc & 1) - FIXME("This won't work...\n"); - bitmap_size = heightSrc * ((widthSrc + 1) / 2); - dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); - for(line = 0; line < heightSrc; line++, src_ptr += stride, dst_ptr += ((widthSrc + 1) / 2)) - memcpy(dst_ptr, src_ptr + xSrc/2, (widthSrc+1)/2); - break; - - case 8: - src_ptr = bits; - src_ptr += (ySrc * stride); - bitmap_size = heightSrc * widthSrc; - dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); - for(line = 0; line < heightSrc; line++, src_ptr += stride, dst_ptr += widthSrc) - memcpy(dst_ptr, src_ptr + xSrc, widthSrc); - break; - - case 16: - src_ptr = bits; - src_ptr += (ySrc * stride); - bitmap_size = heightSrc * widthSrc * 3; - dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); - - for(line = 0; line < heightSrc; line++, src_ptr += stride) { - const WORD *words = (const WORD *)src_ptr + xSrc; - int i; - for(i = 0; i < widthSrc; i++) { - BYTE r, g, b; - - /* We want 0x0 -- 0x1f to map to 0x0 -- 0xff */ - r = words[i] >> 10 & 0x1f; - r = r << 3 | r >> 2; - g = words[i] >> 5 & 0x1f; - g = g << 3 | g >> 2; - b = words[i] & 0x1f; - b = b << 3 | b >> 2; - dst_ptr[0] = r; - dst_ptr[1] = g; - dst_ptr[2] = b; - dst_ptr += 3; - } - } - break; - - case 24: - src_ptr = bits; - src_ptr += (ySrc * stride); - bitmap_size = heightSrc * widthSrc * 3; - dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); - for(line = 0; line < heightSrc; line++, src_ptr += stride) { - const BYTE *byte = src_ptr + xSrc * 3; - int i; - for(i = 0; i < widthSrc; i++) { - dst_ptr[0] = byte[i * 3 + 2]; - dst_ptr[1] = byte[i * 3 + 1]; - dst_ptr[2] = byte[i * 3]; - dst_ptr += 3; - } - } - break; - - case 32: - src_ptr = bits; - src_ptr += (ySrc * stride); - bitmap_size = heightSrc * widthSrc * 3; - dst_ptr = bitmap = HeapAlloc(GetProcessHeap(), 0, bitmap_size); - for(line = 0; line < heightSrc; line++, src_ptr += stride) { - const BYTE *byte = src_ptr + xSrc * 4; - int i; - for(i = 0; i < widthSrc; i++) { - dst_ptr[0] = byte[i * 4 + 2]; - dst_ptr[1] = byte[i * 4 + 1]; - dst_ptr[2] = byte[i * 4]; - dst_ptr += 3; - } - } - break; - - default: - FIXME("Unsupported depth\n"); - return FALSE; - - } - - PSDRV_SetClip(dev); - PSDRV_WriteGSave(dev); - PSDRV_WriteImageBits( dev, info, xDst, yDst, widthDst, heightDst, - widthSrc, heightSrc, bitmap, bitmap_size ); - HeapFree(GetProcessHeap(), 0, bitmap); - PSDRV_WriteGRestore(dev); - PSDRV_ResetClip(dev); - return abs(heightSrc); -} diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 3a6f89f..4532097 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -931,7 +931,7 @@ static const struct gdi_dc_funcs psdrv_funcs = PSDRV_StartDoc, /* pStartDoc */ PSDRV_StartPage, /* pStartPage */ NULL, /* pStretchBlt */ - PSDRV_StretchDIBits, /* pStretchDIBits */ + NULL, /* pStretchDIBits */ NULL, /* pStrokeAndFillPath */ NULL, /* pStrokePath */ NULL, /* pSwapBuffers */ diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 8047942..3f48991 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -459,10 +459,6 @@ extern COLORREF PSDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDD extern COLORREF PSDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF PSDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern INT PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) DECLSPEC_HIDDEN; -extern INT PSDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, - INT heightDst, INT xSrc, INT ySrc, - INT widthSrc, INT heightSrc, const void *bits, - BITMAPINFO *info, UINT wUsage, DWORD dwRop ) DECLSPEC_HIDDEN; extern void PSDRV_MergeDevmodes(PSDRV_DEVMODEA *dm1, PSDRV_DEVMODEA *dm2, PRINTERINFO *pi) DECLSPEC_HIDDEN;

1 0