April 2010 - Wine-commits - list.winehq.org

Dmitry Timoshkov : user32: Button painting code always sets up the clipping , there is no need to duplicate it.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: fedc194e68e18367a6d7d0f0d8dd6b314474d111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fedc194e68e18367a6d7d0f0d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Apr 13 15:48:53 2010 +0900 user32: Button painting code always sets up the clipping, there is no need to duplicate it. --- dlls/user32/button.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 916d0c2..eacacbb 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -834,8 +834,6 @@ static void PB_Paint( HWND hwnd, HDC hDC, UINT action ) if (pushedState) OffsetRect(&r, 1, 1); - IntersectClipRect(hDC, rc.left, rc.top, rc.right, rc.bottom); - oldTxtColor = SetTextColor( hDC, GetSysColor(COLOR_BTNTEXT) ); BUTTON_DrawLabel(hwnd, hDC, dtFlags, &r); @@ -847,7 +845,6 @@ draw_focus: ((action == ODA_DRAWENTIRE) && (state & BUTTON_HASFOCUS))) { InflateRect( &focus_rect, -1, -1 ); - IntersectRect(&focus_rect, &focus_rect, &rc); DrawFocusRect( hDC, &focus_rect ); }

1 0

Hans Leidekker : include: Add some error codes.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: 7edeb282b6a59331ab60c0dbb70c6714e5872d8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7edeb282b6a59331ab60c0dbb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 13 11:14:52 2010 +0200 include: Add some error codes. --- include/winerror.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/winerror.h b/include/winerror.h index ff31d4d..8713ecc 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -711,7 +711,17 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_INVALID_COMMAND_LINE 1639 #define ERROR_INSTALL_REMOTE_DISALLOWED 1640 #define ERROR_SUCCESS_REBOOT_INITIATED 1641 +#define ERROR_PATCH_TARGET_NOT_FOUND 1642 +#define ERROR_PATCH_PACKAGE_REJECTED 1643 +#define ERROR_INSTALL_TRANSFORM_REJECTED 1644 +#define ERROR_INSTALL_REMOTE_PROHIBITED 1645 +#define ERROR_PATCH_REMOVAL_UNSUPPORTED 1646 #define ERROR_UNKNOWN_PATCH 1647 +#define ERROR_PATCH_NO_SEQUENCE 1648 +#define ERROR_PATCH_REMOVAL_DISALLOWED 1649 +#define ERROR_INVALID_PATCH_XML 1650 +#define ERROR_PATCH_MANAGED_ADVERTISED_PRODUCT 1651 +#define ERROR_INSTALL_SERVICE_SAFEBOOT 1652 #define RPC_S_INVALID_STRING_BINDING 1700 #define RPC_S_WRONG_KIND_OF_BINDING 1701 #define RPC_S_INVALID_BINDING 1702

1 0

Hans Leidekker : msi: Make the string reference count a short.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: ff2f894888c0cb465fe08db8e6f22d4848ca5aef URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff2f894888c0cb465fe08db8e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 13 11:15:08 2010 +0200 msi: Make the string reference count a short. This is safe because the reference count is stored in 2 bytes on disk. --- dlls/msi/msipriv.h | 2 +- dlls/msi/string.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 5e699ae..2b7d6ba 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -660,7 +660,7 @@ enum StringPersistence StringNonPersistent = 1 }; -extern BOOL msi_addstringW( string_table *st, UINT string_no, const WCHAR *data, int len, UINT refcount, enum StringPersistence persistence ); +extern BOOL msi_addstringW( string_table *st, UINT string_no, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ); extern UINT msi_string2idW( const string_table *st, LPCWSTR buffer, UINT *id ); extern VOID msi_destroy_stringtable( string_table *st ); diff --git a/dlls/msi/string.c b/dlls/msi/string.c index 3bdc436..84f4e71 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -44,8 +44,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); typedef struct _msistring { - UINT persistent_refcount; - UINT nonpersistent_refcount; + USHORT persistent_refcount; + USHORT nonpersistent_refcount; LPWSTR str; } msistring; @@ -188,7 +188,7 @@ static void insert_string_sorted( string_table *st, UINT string_id ) st->sortcount++; } -static void set_st_entry( string_table *st, UINT n, LPWSTR str, UINT refcount, enum StringPersistence persistence ) +static void set_st_entry( string_table *st, UINT n, LPWSTR str, USHORT refcount, enum StringPersistence persistence ) { if (persistence == StringPersistent) { @@ -237,7 +237,7 @@ static UINT msi_string2idA( const string_table *st, LPCSTR buffer, UINT *id ) return r; } -static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, UINT refcount, enum StringPersistence persistence ) +static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, USHORT refcount, enum StringPersistence persistence ) { LPWSTR str; int sz; @@ -288,7 +288,7 @@ static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, U return n; } -int msi_addstringW( string_table *st, UINT n, const WCHAR *data, int len, UINT refcount, enum StringPersistence persistence ) +int msi_addstringW( string_table *st, UINT n, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ) { LPWSTR str;

1 0

Hans Leidekker : msi: Make the string reference count a short.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: 88214a72cedb182c2324ba096fa55353c6be3374 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88214a72cedb182c2324ba096… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 13 11:15:08 2010 +0200 msi: Make the string reference count a short. This is safe because the reference count is stored in 2 bytes on disk. --- dlls/msi/msipriv.h | 2 +- dlls/msi/string.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 2b7d6ba..5e699ae 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -660,7 +660,7 @@ enum StringPersistence StringNonPersistent = 1 }; -extern BOOL msi_addstringW( string_table *st, UINT string_no, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ); +extern BOOL msi_addstringW( string_table *st, UINT string_no, const WCHAR *data, int len, UINT refcount, enum StringPersistence persistence ); extern UINT msi_string2idW( const string_table *st, LPCWSTR buffer, UINT *id ); extern VOID msi_destroy_stringtable( string_table *st ); diff --git a/dlls/msi/string.c b/dlls/msi/string.c index 84f4e71..3bdc436 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -44,8 +44,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msidb); typedef struct _msistring { - USHORT persistent_refcount; - USHORT nonpersistent_refcount; + UINT persistent_refcount; + UINT nonpersistent_refcount; LPWSTR str; } msistring; @@ -188,7 +188,7 @@ static void insert_string_sorted( string_table *st, UINT string_id ) st->sortcount++; } -static void set_st_entry( string_table *st, UINT n, LPWSTR str, USHORT refcount, enum StringPersistence persistence ) +static void set_st_entry( string_table *st, UINT n, LPWSTR str, UINT refcount, enum StringPersistence persistence ) { if (persistence == StringPersistent) { @@ -237,7 +237,7 @@ static UINT msi_string2idA( const string_table *st, LPCSTR buffer, UINT *id ) return r; } -static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, USHORT refcount, enum StringPersistence persistence ) +static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, UINT refcount, enum StringPersistence persistence ) { LPWSTR str; int sz; @@ -288,7 +288,7 @@ static int msi_addstring( string_table *st, UINT n, const CHAR *data, int len, U return n; } -int msi_addstringW( string_table *st, UINT n, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ) +int msi_addstringW( string_table *st, UINT n, const WCHAR *data, int len, UINT refcount, enum StringPersistence persistence ) { LPWSTR str;

1 0

Piotr Caban : msvcrt: Added memmove_s and memcpy_s implementation.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: 8fc18b6b4801efc0098f20a6ed4cacf6172e986f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fc18b6b4801efc0098f20a6e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 12 15:35:31 2010 +0200 msvcrt: Added memmove_s and memcpy_s implementation. --- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/heap.c | 29 +++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 4 +- dlls/msvcrt/tests/misc.c | 55 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 90 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d7d0395..7d170a9 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1335,9 +1335,9 @@ @ cdecl memchr(ptr long long) msvcrt.memchr @ cdecl memcmp(ptr ptr long) msvcrt.memcmp @ cdecl memcpy(ptr ptr long) msvcrt.memcpy -@ stub memcpy_s +@ cdecl memcpy_s(ptr long ptr long) msvcrt.memcpy_s @ cdecl memmove(ptr ptr long) msvcrt.memmove -@ stub memmove_s +@ cdecl memmove_s(ptr long ptr long) msvcrt.memmove_s @ cdecl memset(ptr long long) msvcrt.memset @ cdecl modf(double ptr) msvcrt.modf @ cdecl perror(str) msvcrt.perror diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9bfa23d..3eae9a0 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1319,9 +1319,9 @@ @ cdecl memchr(ptr long long) msvcrt.memchr @ cdecl memcmp(ptr ptr long) msvcrt.memcmp @ cdecl memcpy(ptr ptr long) msvcrt.memcpy -@ stub memcpy_s +@ cdecl memcpy_s(ptr long ptr long) msvcrt.memcpy_s @ cdecl memmove(ptr ptr long) msvcrt.memmove -@ stub memmove_s +@ cdecl memmove_s(ptr long ptr long) msvcrt.memmove_s @ cdecl memset(ptr long long) msvcrt.memset @ cdecl modf(double ptr) msvcrt.modf @ cdecl perror(str) msvcrt.perror diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index e40a0c9..7adaf90 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -511,3 +511,32 @@ void * CDECL _aligned_realloc(void *memblock, MSVCRT_size_t size, MSVCRT_size_t TRACE("(%p, %lu, %lu)\n", memblock, size, alignment); return _aligned_offset_realloc(memblock, size, alignment, 0); } + +/********************************************************************* + * memmove_s (MSVCRT.@) + */ +int CDECL memmove_s(void *dest, MSVCRT_size_t numberOfElements, const void *src, MSVCRT_size_t count) +{ + TRACE("(%p %lu %p %lu)\n", dest, numberOfElements, src, count); + + if(!count) + return 0; + + if(!dest || !src) { + if(dest) + memset(dest, 0, numberOfElements); + + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + if(count > numberOfElements) { + memset(dest, 0, numberOfElements); + + *MSVCRT__errno() = MSVCRT_ERANGE; + return MSVCRT_ERANGE; + } + + memmove(dest, src, count); + return 0; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index eac8f46..08b330f 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1267,9 +1267,9 @@ @ cdecl memchr(ptr long long) ntdll.memchr @ cdecl memcmp(ptr ptr long) ntdll.memcmp @ cdecl memcpy(ptr ptr long) ntdll.memcpy -# stub memcpy_s +@ cdecl memcpy_s(ptr long ptr long) memmove_s @ cdecl memmove(ptr ptr long) ntdll.memmove -# stub memmove_s +@ cdecl memmove_s(ptr long ptr long) @ cdecl memset(ptr long long) ntdll.memset @ cdecl mktime(ptr) MSVCRT_mktime @ cdecl modf(double ptr) MSVCRT_modf diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c index 1f069fa..d8b1b88 100644 --- a/dlls/msvcrt/tests/misc.c +++ b/dlls/msvcrt/tests/misc.c @@ -20,14 +20,17 @@ #include "wine/test.h" #include <errno.h> +#include "msvcrt.h" static int (__cdecl *prand_s)(unsigned int *); +static int (__cdecl *memcpy_s)(void *, MSVCRT_size_t, void*, MSVCRT_size_t); static void init(void) { HMODULE hmod = GetModuleHandleA("msvcrt.dll"); prand_s = (void *)GetProcAddress(hmod, "rand_s"); + memcpy_s = (void*)GetProcAddress(hmod, "memcpy_s"); } static void test_rand_s(void) @@ -50,9 +53,61 @@ static void test_rand_s(void) ok(ret == 0, "Expected rand_s to return 0, got %d\n", ret); } +static void test_memcpy_s(void) +{ + static char data[] = "data\0to\0be\0copied"; + static char dest[32]; + int ret; + + if(!memcpy_s) + { + win_skip("memcpy_s in not available\n"); + return; + } + + errno = 0xdeadbeef; + ret = memcpy_s(NULL, 0, NULL, 0); + ok(ret == 0, "ret = %x\n", ret); + ok(errno == 0xdeadbeef, "errno = %x\n", errno); + + errno = 0xdeadbeef; + dest[0] = 'x'; + ret = memcpy_s(dest, 10, NULL, 0); + ok(ret == 0, "ret = %x\n", ret); + ok(errno == 0xdeadbeef, "errno = %x\n", errno); + ok(dest[0] == 'x', "dest[0] != \'x\'\n"); + + errno = 0xdeadbeef; + ret = memcpy_s(NULL, 10, data, 10); + ok(ret == EINVAL, "ret = %x\n", ret); + ok(errno == EINVAL, "errno = %x\n", errno); + + errno = 0xdeadbeef; + dest[7] = 'x'; + ret = memcpy_s(dest, 10, data, 5); + ok(ret == 0, "ret = %x\n", ret); + ok(errno == 0xdeadbeef, "errno = %x\n", errno); + ok(memcmp(dest, data, 10), "All data copied\n"); + ok(!memcmp(dest, data, 5), "First five bytes are different\n"); + + errno = 0xdeadbeef; + ret = memcpy_s(data, 10, data, 10); + ok(ret == 0, "ret = %x\n", ret); + ok(errno == 0xdeadbeef, "errno = %x\n", errno); + ok(!memcmp(dest, data, 5), "data was destroyed during overwritting\n"); + + errno = 0xdeadbeef; + dest[0] = 'x'; + ret = memcpy_s(dest, 5, data, 10); + ok(ret == ERANGE, "ret = %x\n", ret); + ok(errno == ERANGE, "errno = %x\n", errno); + ok(dest[0] == '\0', "dest[0] != \'\\0\'\n"); +} + START_TEST(misc) { init(); test_rand_s(); + test_memcpy_s(); }

1 0

Piotr Caban : msvcr90: Forward _calloc_crt to calloc.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: e339872252c5d8de552181d4c869720d9636b755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e339872252c5d8de552181d4c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 12 15:35:56 2010 +0200 msvcr90: Forward _calloc_crt to calloc. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 7d170a9..1ba50b8 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -307,7 +307,7 @@ @ cdecl _c_exit() msvcrt._c_exit @ cdecl _cabs(long) msvcrt._cabs @ cdecl _callnewh(long) msvcrt._callnewh -@ stub _calloc_crt +@ cdecl _calloc_crt(long long) msvcrt.calloc @ cdecl _cexit() msvcrt._cexit @ cdecl _cgets(str) msvcrt._cgets @ stub _cgets_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 3eae9a0..5e145dd 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -299,7 +299,7 @@ @ cdecl _c_exit() msvcrt._c_exit @ cdecl _cabs(long) msvcrt._cabs @ cdecl _callnewh(long) msvcrt._callnewh -@ stub _calloc_crt +@ cdecl _calloc_crt(long long) msvcrt.calloc @ cdecl _cexit() msvcrt._cexit @ cdecl _cgets(str) msvcrt._cgets @ stub _cgets_s

1 0

Alexandre Julliard : msvcrt: Make a few more exception handling functions i386-specific.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: bcf1ef3c90ba9b50207194cdd343e42d15aac973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcf1ef3c90ba9b50207194cdd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 12 17:52:32 2010 +0200 msvcrt: Make a few more exception handling functions i386-specific. --- dlls/crtdll/crtdll.spec | 4 ++-- dlls/msvcr70/msvcr70.spec | 6 +++--- dlls/msvcr71/msvcr71.spec | 6 +++--- dlls/msvcr80/msvcr80.spec | 6 +++--- dlls/msvcr90/msvcr90.spec | 6 +++--- dlls/msvcrt/except.c | 26 +++++++++----------------- dlls/msvcrt/msvcrt.spec | 6 +++--- dlls/msvcrt20/msvcrt20.spec | 6 +++--- dlls/msvcrt40/msvcrt40.spec | 6 +++--- dlls/msvcrtd/msvcrtd.spec | 6 +++--- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 6 +++--- 11 files changed, 38 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bcf1ef3c90ba9b5020719…

1 0

Anders Jonsson : wineboot: Update Swedish translation.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: 122e02e368235eee84517947b2e6e84b13505f2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=122e02e368235eee84517947b… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Mon Apr 12 17:53:20 2010 +0200 wineboot: Update Swedish translation. --- programs/wineboot/wineboot_Sv.rc | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/programs/wineboot/wineboot_Sv.rc b/programs/wineboot/wineboot_Sv.rc index 046432b..bb28047 100644 --- a/programs/wineboot/wineboot_Sv.rc +++ b/programs/wineboot/wineboot_Sv.rc @@ -35,3 +35,13 @@ BEGIN LTEXT "Om du avslutar processen kan du f�rlora allt osparat data.", IDC_STATIC,7,28,172,15 END + +IDD_WAITDLG DIALOG 0, 0, 200, 50 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_DISABLED +CAPTION "Wine" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_WAITICON, 3, 3, 10, 10 + LTEXT "Wine-inst�llningarna i %s uppdateras, var god v�nta...", + IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX +END

1 0

Vincent Povirk : windowscodecs: Add locking to the PNG decoder.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: 7871033a407b9e01f3091461f8d07d97e804f761 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7871033a407b9e01f3091461f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 9 14:01:06 2010 -0500 windowscodecs: Add locking to the PNG decoder. --- dlls/windowscodecs/pngformat.c | 84 ++++++++++++++++++++++++++++++++-------- dlls/windowscodecs/regsvr.c | 2 +- 2 files changed, 68 insertions(+), 18 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 5af680e..8f2b74c 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -162,6 +162,7 @@ typedef struct { UINT stride; const WICPixelFormatGUID *format; BYTE *image_bits; + CRITICAL_SECTION lock; /* must be held when png structures are accessed or initialized is set */ } PngDecoder; static inline PngDecoder *impl_from_frame(IWICBitmapFrameDecode *iface) @@ -214,6 +215,8 @@ static ULONG WINAPI PngDecoder_Release(IWICBitmapDecoder *iface) { if (This->png_ptr) ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, &This->end_info); + This->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->lock); HeapFree(GetProcessHeap(), 0, This->image_bits); HeapFree(GetProcessHeap(), 0, This); } @@ -246,7 +249,7 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p { PngDecoder *This = (PngDecoder*)iface; LARGE_INTEGER seek; - HRESULT hr; + HRESULT hr=S_OK; png_bytep *row_pointers=NULL; UINT image_size; UINT i; @@ -259,16 +262,23 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p TRACE("(%p,%p,%x)\n", iface, pIStream, cacheOptions); + EnterCriticalSection(&This->lock); + /* initialize libpng */ This->png_ptr = ppng_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); - if (!This->png_ptr) return E_FAIL; + if (!This->png_ptr) + { + hr = E_FAIL; + goto end; + } This->info_ptr = ppng_create_info_struct(This->png_ptr); if (!This->info_ptr) { ppng_destroy_read_struct(&This->png_ptr, NULL, NULL); This->png_ptr = NULL; - return E_FAIL; + hr = E_FAIL; + goto end; } This->end_info = ppng_create_info_struct(This->png_ptr); @@ -276,7 +286,8 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p { ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, NULL); This->png_ptr = NULL; - return E_FAIL; + hr = E_FAIL; + goto end; } /* set up setjmp/longjmp error handling */ @@ -285,14 +296,15 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, &This->end_info); HeapFree(GetProcessHeap(), 0, row_pointers); This->png_ptr = NULL; - return E_FAIL; + hr = E_FAIL; + goto end; } ppng_set_error_fn(This->png_ptr, &jmpbuf, user_error_fn, user_warning_fn); /* seek to the start of the stream */ seek.QuadPart = 0; hr = IStream_Seek(pIStream, seek, STREAM_SEEK_SET, NULL); - if (FAILED(hr)) return hr; + if (FAILED(hr)) goto end; /* set up custom i/o handling */ ppng_set_read_fn(This->png_ptr, pIStream, user_read_data); @@ -340,7 +352,8 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p case 16: This->format = &GUID_WICPixelFormat16bppGray; break; default: ERR("invalid grayscale bit depth: %i\n", bit_depth); - return E_FAIL; + hr = E_FAIL; + goto end; } break; case PNG_COLOR_TYPE_GRAY_ALPHA: @@ -357,7 +370,8 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p case 16: This->format = &GUID_WICPixelFormat64bppRGBA; break; default: ERR("invalid RGBA bit depth: %i\n", bit_depth); - return E_FAIL; + hr = E_FAIL; + goto end; } break; case PNG_COLOR_TYPE_PALETTE: @@ -370,7 +384,8 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p case 8: This->format = &GUID_WICPixelFormat8bppIndexed; break; default: ERR("invalid indexed color bit depth: %i\n", bit_depth); - return E_FAIL; + hr = E_FAIL; + goto end; } break; case PNG_COLOR_TYPE_RGB: @@ -384,12 +399,14 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p case 16: This->format = &GUID_WICPixelFormat48bppRGB; break; default: ERR("invalid RGB color bit depth: %i\n", bit_depth); - return E_FAIL; + hr = E_FAIL; + goto end; } break; default: ERR("invalid color type %i\n", color_type); - return E_FAIL; + hr = E_FAIL; + goto end; } /* read the image data */ @@ -399,10 +416,18 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p image_size = This->stride * This->height; This->image_bits = HeapAlloc(GetProcessHeap(), 0, image_size); - if (!This->image_bits) return E_OUTOFMEMORY; + if (!This->image_bits) + { + hr = E_OUTOFMEMORY; + goto end; + } row_pointers = HeapAlloc(GetProcessHeap(), 0, sizeof(png_bytep)*This->height); - if (!row_pointers) return E_OUTOFMEMORY; + if (!row_pointers) + { + hr = E_OUTOFMEMORY; + goto end; + } for (i=0; i<This->height; i++) row_pointers[i] = This->image_bits + i * This->stride; @@ -416,7 +441,11 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p This->initialized = TRUE; - return S_OK; +end: + + LeaveCriticalSection(&This->lock); + + return hr; } static HRESULT WINAPI PngDecoder_GetContainerFormat(IWICBitmapDecoder *iface, @@ -570,6 +599,8 @@ static HRESULT WINAPI PngDecoder_Frame_GetResolution(IWICBitmapFrameDecode *ifac png_uint_32 ret, xres, yres; int unit_type; + EnterCriticalSection(&This->lock); + ret = ppng_get_pHYs(This->png_ptr, This->info_ptr, &xres, &yres, &unit_type); if (ret && unit_type == PNG_RESOLUTION_METER) @@ -583,6 +614,8 @@ static HRESULT WINAPI PngDecoder_Frame_GetResolution(IWICBitmapFrameDecode *ifac *pDpiX = *pDpiY = 96.0; } + LeaveCriticalSection(&This->lock); + TRACE("(%p)->(%0.2f,%0.2f)\n", iface, *pDpiX, *pDpiY); return S_OK; @@ -600,16 +633,24 @@ static HRESULT WINAPI PngDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, int num_trans; png_color_16p trans_values; int i; + HRESULT hr=S_OK; TRACE("(%p,%p)\n", iface, pIPalette); + EnterCriticalSection(&This->lock); + ret = ppng_get_PLTE(This->png_ptr, This->info_ptr, &png_palette, &num_palette); - if (!ret) return WINCODEC_ERR_PALETTEUNAVAILABLE; + if (!ret) + { + hr = WINCODEC_ERR_PALETTEUNAVAILABLE; + goto end; + } if (num_palette > 256) { ERR("palette has %i colors?!\n", num_palette); - return E_FAIL; + hr = E_FAIL; + goto end; } for (i=0; i<num_palette; i++) @@ -629,7 +670,14 @@ static HRESULT WINAPI PngDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, } } - return IWICPalette_InitializeCustom(pIPalette, palette, num_palette); +end: + + LeaveCriticalSection(&This->lock); + + if (SUCCEEDED(hr)) + hr = IWICPalette_InitializeCustom(pIPalette, palette, num_palette); + + return hr; } static HRESULT WINAPI PngDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, @@ -706,6 +754,8 @@ HRESULT PngDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->end_info = NULL; This->initialized = FALSE; This->image_bits = NULL; + InitializeCriticalSection(&This->lock); + This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PngDecoder.lock"); ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); IUnknown_Release((IUnknown*)This); diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index d9f6905..69ea4cc 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -739,7 +739,7 @@ static struct regsvr_coclass const coclass_list[] = { "WIC PNG Decoder", NULL, "windowscodecs.dll", - "Apartment" + "Both" }, { &CLSID_WICPngEncoder, "WIC PNG Encoder",

1 0

Vincent Povirk : windowscodecs: Add locking to the format converter.
by Alexandre Julliard 13 Apr '10

13 Apr '10

Module: wine Branch: master Commit: c1beb63609254e67fbdbd669174f6c6695a60ed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1beb63609254e67fbdbd6691… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 9 14:18:15 2010 -0500 windowscodecs: Add locking to the format converter. --- dlls/windowscodecs/converter.c | 39 +++++++++++++++++++++++++++++++-------- dlls/windowscodecs/regsvr.c | 2 +- 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 15c7b0f..b1c0952 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -71,6 +71,7 @@ typedef struct FormatConverter { WICBitmapDitherType dither; double alpha_threshold; WICBitmapPaletteType palette_type; + CRITICAL_SECTION lock; /* must be held when initialized */ } FormatConverter; static void make_grayscale_palette(WICColor *colors, UINT num_colors) @@ -765,6 +766,8 @@ static ULONG WINAPI FormatConverter_Release(IWICFormatConverter *iface) if (ref == 0) { + This->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->lock); if (This->source) IWICBitmapSource_Release(This->source); HeapFree(GetProcessHeap(), 0, This); } @@ -841,38 +844,56 @@ static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, const struct pixelformatinfo *srcinfo, *dstinfo; static INT fixme=0; GUID srcFormat; - HRESULT res; + HRESULT res=S_OK; TRACE("(%p,%p,%s,%u,%p,%0.1f,%u)\n", iface, pISource, debugstr_guid(dstFormat), dither, pIPalette, alphaThresholdPercent, paletteTranslate); if (pIPalette && !fixme++) FIXME("ignoring palette\n"); - if (This->source) return WINCODEC_ERR_WRONGSTATE; + EnterCriticalSection(&This->lock); + + if (This->source) + { + res = WINCODEC_ERR_WRONGSTATE; + goto end; + } res = IWICBitmapSource_GetPixelFormat(pISource, &srcFormat); - if (FAILED(res)) return res; + if (FAILED(res)) goto end; srcinfo = get_formatinfo(&srcFormat); - if (!srcinfo) return WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; + if (!srcinfo) + { + res = WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; + goto end; + } dstinfo = get_formatinfo(dstFormat); - if (!dstinfo) return WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; + if (!dstinfo) + { + res = WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; + goto end; + } if (dstinfo->copy_function) { IWICBitmapSource_AddRef(pISource); - This->source = pISource; This->src_format = srcinfo; This->dst_format = dstinfo; This->dither = dither; This->alpha_threshold = alphaThresholdPercent; This->palette_type = paletteTranslate; + This->source = pISource; } else - return WINCODEC_ERR_UNSUPPORTEDOPERATION; + res = WINCODEC_ERR_UNSUPPORTEDOPERATION; - return S_OK; +end: + + LeaveCriticalSection(&This->lock); + + return res; } static HRESULT WINAPI FormatConverter_CanConvert(IWICFormatConverter *iface, @@ -930,6 +951,8 @@ HRESULT FormatConverter_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** p This->lpVtbl = &FormatConverter_Vtbl; This->ref = 1; This->source = NULL; + InitializeCriticalSection(&This->lock); + This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": FormatConverter.lock"); ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); IUnknown_Release((IUnknown*)This); diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 69ea4cc..334ce85 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -781,7 +781,7 @@ static struct regsvr_coclass const coclass_list[] = { "WIC Default Format Converter", NULL, "windowscodecs.dll", - "Apartment" + "Both" }, { NULL } /* list terminator */ };

1 0