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

Eric Pouech : winedbg: Merge pointer deref and array index functions into a single one.
by Alexandre Julliard April 13, 2010

April 13, 2010

Module: wine Branch: master Commit: 2becd3349de5d7b4f1f1a428e5bc08294ba0f8a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2becd3349de5d7b4f1f1a428e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Apr 12 21:18:25 2010 +0200 winedbg: Merge pointer deref and array index functions into a single one. --- programs/winedbg/debugger.h | 1 - programs/winedbg/expr.c | 4 +- programs/winedbg/memory.c | 2 +- programs/winedbg/types.c | 86 ++++++++++++++++++------------------------ programs/winedbg/winedbg.c | 2 - 5 files changed, 40 insertions(+), 55 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index b38d6bd..bb3c131 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -434,7 +434,6 @@ extern int print_types(void); extern long int types_extract_as_integer(const struct dbg_lvalue*); extern LONGLONG types_extract_as_longlong(const struct dbg_lvalue*, unsigned* psize); extern void types_extract_as_address(const struct dbg_lvalue*, ADDRESS64*); -extern BOOL types_deref(const struct dbg_lvalue* value, struct dbg_lvalue* result); extern BOOL types_udt_find_element(struct dbg_lvalue* value, const char* name, long int* tmpbuf); extern BOOL types_array_index(const struct dbg_lvalue* value, int index, struct dbg_lvalue* result); extern BOOL types_get_info(const struct dbg_type*, IMAGEHLP_SYMBOL_TYPE_INFO, void*); diff --git a/programs/winedbg/expr.c b/programs/winedbg/expr.c index 6b8c46f..66cd701 100644 --- a/programs/winedbg/expr.c +++ b/programs/winedbg/expr.c @@ -375,7 +375,7 @@ struct dbg_lvalue expr_eval(struct expr* exp) break; case EXPR_TYPE_PSTRUCT: exp1 = expr_eval(exp->un.structure.exp1); - if (exp1.type.id == dbg_itype_none || !types_deref(&exp1, &rtn) || + if (exp1.type.id == dbg_itype_none || !types_array_index(&exp1, 0, &rtn) || rtn.type.id == dbg_itype_none) RaiseException(DEBUG_STATUS_BAD_TYPE, 0, 0, NULL); if (!types_udt_find_element(&rtn, exp->un.structure.element_name, @@ -626,7 +626,7 @@ struct dbg_lvalue expr_eval(struct expr* exp) exp->un.unop.result = ~types_extract_as_integer(&exp1); break; case EXP_OP_DEREF: - if (!types_deref(&exp1, &rtn)) + if (!types_array_index(&exp1, 0, &rtn)) RaiseException(DEBUG_STATUS_BAD_TYPE, 0, 0, NULL); break; case EXP_OP_FORCE_DEREF: diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 76a103a..6560062 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -416,7 +416,7 @@ static void print_typed_basic(const struct dbg_lvalue* lvalue) } break; case SymTagPointerType: - if (!types_deref(lvalue, &sub_lvalue)) + if (!types_array_index(lvalue, 0, &sub_lvalue)) { dbg_printf("Internal symbol error: unable to access memory location %p", memory_to_linear_addr(&lvalue->addr)); diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 414bb9f..6d50c81 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -155,45 +155,6 @@ void types_extract_as_address(const struct dbg_lvalue* lvalue, ADDRESS64* addr) } /****************************************************************** - * types_deref - * - */ -BOOL types_deref(const struct dbg_lvalue* lvalue, struct dbg_lvalue* result) -{ - struct dbg_type type = lvalue->type; - DWORD tag; - - memset(result, 0, sizeof(*result)); - result->type.id = dbg_itype_none; - result->type.module = 0; - - /* - * Make sure that this really makes sense. - */ - if (!types_get_real_type(&type, &tag) || tag != SymTagPointerType || - !memory_read_value(lvalue, sizeof(result->addr.Offset), &result->addr.Offset) || - !types_get_info(&type, TI_GET_TYPE, &result->type.id)) - return FALSE; - result->type.module = type.module; - result->cookie = DLV_TARGET; - /* FIXME: this is currently buggy. - * there is no way to tell were the deref:ed value is... - * for example: - * x is a pointer to struct s, x being on the stack - * => lvalue is in debuggee, result is in debugger - * x is a pointer to struct s, x being optimized into a reg - * => lvalue is debugger, result is debuggee - * x is a pointer to internal variable x - * => lvalue is debugger, result is debuggee - * so we force debuggee address space, because dereferencing pointers to - * internal variables is very unlikely. A correct fix would be - * rather large. - */ - result->addr.Mode = AddrModeFlat; - return TRUE; -} - -/****************************************************************** * types_get_udt_element_lvalue * * Implement a structure derefencement @@ -301,24 +262,32 @@ BOOL types_udt_find_element(struct dbg_lvalue* lvalue, const char* name, long in * * Grab an element from an array */ -BOOL types_array_index(const struct dbg_lvalue* lvalue, int index, - struct dbg_lvalue* result) +BOOL types_array_index(const struct dbg_lvalue* lvalue, int index, struct dbg_lvalue* result) { struct dbg_type type = lvalue->type; DWORD tag, count; - DWORD64 length; + + memset(result, 0, sizeof(*result)); + result->type.id = dbg_itype_none; + result->type.module = 0; if (!types_get_real_type(&type, &tag)) return FALSE; - /* Contents of array share same data (addr mode, module...) */ - *result = *lvalue; switch (tag) { case SymTagArrayType: - types_get_info(&type, TI_GET_COUNT, &count); + if (!types_get_info(&type, TI_GET_COUNT, &count)) return FALSE; if (index < 0 || index >= count) return FALSE; + result->addr = lvalue->addr; break; case SymTagPointerType: - memory_read_value(lvalue, sizeof(result->addr.Offset), &result->addr.Offset); + if (!memory_read_value(lvalue, be_cpu->pointer_size, &result->addr.Offset)) return FALSE; + result->addr.Mode = AddrModeFlat; + switch (be_cpu->pointer_size) + { + case 4: result->addr.Offset = (DWORD)result->addr.Offset; break; + case 8: break; + default: assert(0); + } break; default: assert(FALSE); @@ -326,9 +295,28 @@ BOOL types_array_index(const struct dbg_lvalue* lvalue, int index, /* * Get the base type, so we know how much to index by. */ - types_get_info(&type, TI_GET_TYPE, &result->type.id); - types_get_info(&result->type, TI_GET_LENGTH, &length); - result->addr.Offset += index * (DWORD)length; + if (!types_get_info(&type, TI_GET_TYPE, &result->type.id)) return FALSE; + result->type.module = type.module; + if (index) + { + DWORD64 length; + if (!types_get_info(&result->type, TI_GET_LENGTH, &length)) return FALSE; + result->addr.Offset += index * (DWORD)length; + } + /* FIXME: the following statement is not always true (and can lead to buggy behavior). + * There is no way to tell were the deref:ed value is... + * For example: + * x is a pointer to struct s, x being on the stack + * => lvalue is in debuggee, result is in debugger + * x is a pointer to struct s, x being optimized into a reg + * => lvalue is debugger, result is debuggee + * x is a pointer to internal variable x + * => lvalue is debugger, result is debuggee + * So we always force debuggee address space, because dereferencing pointers to + * internal variables is very unlikely. A correct fix would be + * rather large. + */ + result->cookie = DLV_TARGET; return TRUE; } diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 6ce6db4..7a37805 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -55,8 +55,6 @@ * + all computations should be made on long long * o expr computations are in int:s * o bitfield size is on a 4-bytes - * + array_index and deref should be the same function (or should share the same - * core) * - execution: * + set a better fix for gdb (proxy mode) than the step-mode hack * + implement function call in debuggee

1 0

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

April 13, 2010

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 : msi: Make the string reference count a short.
by Alexandre Julliard April 13, 2010

April 13, 2010

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

Hans Leidekker : include: Add some error codes.
by Alexandre Julliard April 13, 2010

April 13, 2010

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

Eric Pouech : winedbg: Describe pointer size in CPU backend structure.
by Alexandre Julliard April 13, 2010

April 13, 2010

Module: wine Branch: master Commit: 0d7a6f13a8c235a8bf10adb13c1a16e1347b919f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d7a6f13a8c235a8bf10adb13… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Apr 12 21:18:18 2010 +0200 winedbg: Describe pointer size in CPU backend structure. --- programs/winedbg/be_alpha.c | 1 + programs/winedbg/be_cpu.h | 3 ++- programs/winedbg/be_i386.c | 1 + programs/winedbg/be_ppc.c | 1 + programs/winedbg/be_x86_64.c | 1 + programs/winedbg/debugger.h | 2 +- 6 files changed, 7 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_alpha.c b/programs/winedbg/be_alpha.c index 3c470e7..76cddb5 100644 --- a/programs/winedbg/be_alpha.c +++ b/programs/winedbg/be_alpha.c @@ -146,6 +146,7 @@ static int be_alpha_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, struct backend_cpu be_alpha = { IMAGE_FILE_MACHINE_ALPHA, + 8, be_cpu_linearize, be_cpu_build_addr, be_alpha_get_addr, diff --git a/programs/winedbg/be_cpu.h b/programs/winedbg/be_cpu.h index a08f8f0..005494d 100644 --- a/programs/winedbg/be_cpu.h +++ b/programs/winedbg/be_cpu.h @@ -23,7 +23,8 @@ enum be_xpoint_type {be_xpoint_break, be_xpoint_watch_exec, be_xpoint_watch_read be_xpoint_watch_write}; struct backend_cpu { - DWORD machine; + const DWORD machine; + const DWORD pointer_size; /* ------------------------------------------------------------------------------ * address manipulation * ------------------------------------------------------------------------------ */ diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 74676dd..d6111bd 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -738,6 +738,7 @@ static int be_i386_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, struct backend_cpu be_i386 = { IMAGE_FILE_MACHINE_I386, + 4, be_i386_linearize, be_i386_build_addr, be_i386_get_addr, diff --git a/programs/winedbg/be_ppc.c b/programs/winedbg/be_ppc.c index 22becf2..2377648 100644 --- a/programs/winedbg/be_ppc.c +++ b/programs/winedbg/be_ppc.c @@ -170,6 +170,7 @@ static int be_ppc_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, struct backend_cpu be_ppc = { IMAGE_FILE_MACHINE_POWERPC, + 4, be_cpu_linearize, be_cpu_build_addr, be_ppc_get_addr, diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 514310b..6099a78 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -547,6 +547,7 @@ static int be_x86_64_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, struct backend_cpu be_x86_64 = { IMAGE_FILE_MACHINE_AMD64, + 8, be_cpu_linearize, be_cpu_build_addr, be_x86_64_get_addr, diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index d8e1ef4..b38d6bd 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -38,7 +38,7 @@ #include "objbase.h" #include "oaidl.h" -#define ADDRSIZE ((unsigned)sizeof(void*)) +#define ADDRSIZE (be_cpu->pointer_size) #define ADDRWIDTH (ADDRSIZE * 2) /* the debugger uses these exceptions for it's internal use */

1 0

Damjan Jovanovic : ntoskrnl.exe: Stub out KeResetEvent and KeSetEvent.
by Alexandre Julliard April 13, 2010

April 13, 2010

Module: wine Branch: master Commit: fcd33d6877917500426c918e89eca18c7800a3f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcd33d6877917500426c918e8… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Apr 12 20:35:19 2010 +0200 ntoskrnl.exe: Stub out KeResetEvent and KeSetEvent. --- dlls/ntoskrnl.exe/ntoskrnl.c | 20 ++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a6c79d3..e71f692 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1176,6 +1176,26 @@ ULONG WINAPI KeQueryTimeIncrement(void) /*********************************************************************** + * KeResetEvent (NTOSKRNL.EXE.@) + */ +LONG WINAPI KeResetEvent( PRKEVENT Event ) +{ + FIXME("(%p): stub\n", Event); + return 0; +} + + +/*********************************************************************** + * KeSetEvent (NTOSKRNL.EXE.@) + */ +LONG WINAPI KeSetEvent( PRKEVENT Event, KPRIORITY Increment, BOOLEAN Wait ) +{ + FIXME("(%p, %d, %d): stub\n", Event, Increment, Wait); + return 0; +} + + +/*********************************************************************** * KeSetPriorityThread (NTOSKRNL.EXE.@) */ KPRIORITY WINAPI KeSetPriorityThread( PKTHREAD Thread, KPRIORITY Priority ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 24b228e..1722393 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -597,7 +597,7 @@ @ stub KeRemoveQueue @ stub KeRemoveQueueDpc @ stub KeRemoveSystemServiceTable -@ stub KeResetEvent +@ stdcall KeResetEvent(ptr) @ stub KeRestoreFloatingPointState @ stub KeRevertToUserAffinityThread @ stub KeRundownQueue @@ -607,7 +607,7 @@ @ stub KeSetAffinityThread @ stub KeSetBasePriorityThread @ stub KeSetDmaIoCoherency -@ stub KeSetEvent +@ stdcall KeSetEvent(ptr long long) @ stub KeSetEventBoostPriority @ stub KeSetIdealProcessorThread @ stub KeSetImportanceDpc

1 0

Vincent Povirk : ole32: Create storage files with 4096-byte blocks when asked.
by Alexandre Julliard April 13, 2010

April 13, 2010

Module: wine Branch: master Commit: 0b149df98789a327afb38b982d7298fc6e4b677c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b149df98789a327afb38b982… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 12 14:01:01 2010 -0500 ole32: Create storage files with 4096-byte blocks when asked. --- dlls/ole32/storage32.c | 99 ++++++++++++++++++++++++++++++----------------- dlls/ole32/storage32.h | 2 + 2 files changed, 65 insertions(+), 36 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 9d36820..434d8b2 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2583,6 +2583,7 @@ static HRESULT StorageImpl_Construct( DWORD openFlags, BOOL fileBased, BOOL create, + ULONG sector_size, StorageImpl** result) { StorageImpl* This; @@ -2634,7 +2635,7 @@ static HRESULT StorageImpl_Construct( /* * Initialize the big block cache. */ - This->bigBlockSize = DEF_BIG_BLOCK_SIZE; + This->bigBlockSize = sector_size; This->smallBlockSize = DEF_SMALL_BLOCK_SIZE; This->bigBlockFile = BIGBLOCKFILE_Construct(hFile, pLkbyt, @@ -2667,7 +2668,10 @@ static HRESULT StorageImpl_Construct( This->rootStartBlock = 1; This->smallBlockLimit = LIMIT_TO_USE_SMALL_BLOCK; This->smallBlockDepotStart = BLOCK_END_OF_CHAIN; - This->bigBlockSizeBits = DEF_BIG_BLOCK_SIZE_BITS; + if (sector_size == 4096) + This->bigBlockSizeBits = MAX_BIG_BLOCK_SIZE_BITS; + else + This->bigBlockSizeBits = MIN_BIG_BLOCK_SIZE_BITS; This->smallBlockSizeBits = DEF_SMALL_BLOCK_SIZE_BITS; This->extBigBlockDepotStart = BLOCK_END_OF_CHAIN; This->extBigBlockDepotCount = 0; @@ -4355,13 +4359,14 @@ static HRESULT Storage_Construct( DWORD openFlags, BOOL fileBased, BOOL create, + ULONG sector_size, StorageBaseImpl** result) { StorageImpl *newStorage; StorageBaseImpl *newTransactedStorage; HRESULT hr; - hr = StorageImpl_Construct(hFile, pwcsName, pLkbyt, openFlags, fileBased, create, &newStorage); + hr = StorageImpl_Construct(hFile, pwcsName, pLkbyt, openFlags, fileBased, create, sector_size, &newStorage); if (FAILED(hr)) goto end; if (openFlags & STGM_TRANSACTED) @@ -6311,30 +6316,13 @@ static ULARGE_INTEGER SmallBlockChainStream_GetSize(SmallBlockChainStream* This) return chainEntry.size; } -/****************************************************************************** - * StgCreateDocfile [OLE32.@] - * Creates a new compound file storage object - * - * PARAMS - * pwcsName [ I] Unicode string with filename (can be relative or NULL) - * grfMode [ I] Access mode for opening the new storage object (see STGM_ constants) - * reserved [ ?] unused?, usually 0 - * ppstgOpen [IO] A pointer to IStorage pointer to the new onject - * - * RETURNS - * S_OK if the file was successfully created - * some STG_E_ value if error - * NOTES - * if pwcsName is NULL, create file with new unique name - * the function can returns - * STG_S_CONVERTED if the specified file was successfully converted to storage format - * (unrealized now) - */ -HRESULT WINAPI StgCreateDocfile( +static HRESULT create_storagefile( LPCOLESTR pwcsName, DWORD grfMode, - DWORD reserved, - IStorage **ppstgOpen) + DWORD grfAttrs, + STGOPTIONS* pStgOptions, + REFIID riid, + void** ppstgOpen) { StorageBaseImpl* newStorage = 0; HANDLE hFile = INVALID_HANDLE_VALUE; @@ -6345,13 +6333,10 @@ HRESULT WINAPI StgCreateDocfile( DWORD fileAttributes; WCHAR tempFileName[MAX_PATH]; - TRACE("(%s, %x, %d, %p)\n", - debugstr_w(pwcsName), grfMode, - reserved, ppstgOpen); - if (ppstgOpen == 0) return STG_E_INVALIDPOINTER; - if (reserved != 0) + + if (pStgOptions->ulSectorSize != MIN_BIG_BLOCK_SIZE && pStgOptions->ulSectorSize != MAX_BIG_BLOCK_SIZE) return STG_E_INVALIDPARAMETER; /* if no share mode given then DENY_NONE is the default */ @@ -6453,6 +6438,7 @@ HRESULT WINAPI StgCreateDocfile( grfMode, TRUE, TRUE, + pStgOptions->ulSectorSize, &newStorage); if (FAILED(hr)) @@ -6460,10 +6446,9 @@ HRESULT WINAPI StgCreateDocfile( goto end; } - /* - * Get an "out" pointer for the caller. - */ - *ppstgOpen = (IStorage*)newStorage; + hr = IStorage_QueryInterface((IStorage*)newStorage, riid, ppstgOpen); + + IStorage_Release((IStorage*)newStorage); end: TRACE("<-- %p r = %08x\n", *ppstgOpen, hr); @@ -6472,6 +6457,45 @@ end: } /****************************************************************************** + * StgCreateDocfile [OLE32.@] + * Creates a new compound file storage object + * + * PARAMS + * pwcsName [ I] Unicode string with filename (can be relative or NULL) + * grfMode [ I] Access mode for opening the new storage object (see STGM_ constants) + * reserved [ ?] unused?, usually 0 + * ppstgOpen [IO] A pointer to IStorage pointer to the new onject + * + * RETURNS + * S_OK if the file was successfully created + * some STG_E_ value if error + * NOTES + * if pwcsName is NULL, create file with new unique name + * the function can returns + * STG_S_CONVERTED if the specified file was successfully converted to storage format + * (unrealized now) + */ +HRESULT WINAPI StgCreateDocfile( + LPCOLESTR pwcsName, + DWORD grfMode, + DWORD reserved, + IStorage **ppstgOpen) +{ + STGOPTIONS stgoptions = {1, 0, 512}; + + TRACE("(%s, %x, %d, %p)\n", + debugstr_w(pwcsName), grfMode, + reserved, ppstgOpen); + + if (ppstgOpen == 0) + return STG_E_INVALIDPOINTER; + if (reserved != 0) + return STG_E_INVALIDPARAMETER; + + return create_storagefile(pwcsName, grfMode, 0, &stgoptions, &IID_IStorage, (void**)ppstgOpen); +} + +/****************************************************************************** * StgCreateStorageEx [OLE32.@] */ HRESULT WINAPI StgCreateStorageEx(const WCHAR* pwcsName, DWORD grfMode, DWORD stgfmt, DWORD grfAttrs, STGOPTIONS* pStgOptions, void* reserved, REFIID riid, void** ppObjectOpen) @@ -6499,10 +6523,10 @@ HRESULT WINAPI StgCreateStorageEx(const WCHAR* pwcsName, DWORD grfMode, DWORD st if (stgfmt == STGFMT_STORAGE || stgfmt == STGFMT_DOCFILE) { - FIXME("Stub: calling StgCreateDocfile, but ignoring pStgOptions and grfAttrs\n"); - return StgCreateDocfile(pwcsName, grfMode, 0, (IStorage **)ppObjectOpen); + return create_storagefile(pwcsName, grfMode, grfAttrs, pStgOptions, riid, ppObjectOpen); } + ERR("Invalid stgfmt argument\n"); return STG_E_INVALIDPARAMETER; } @@ -6725,6 +6749,7 @@ HRESULT WINAPI StgOpenStorage( grfMode, TRUE, FALSE, + 512, &newStorage); if (FAILED(hr)) @@ -6772,6 +6797,7 @@ HRESULT WINAPI StgCreateDocfileOnILockBytes( grfMode, FALSE, TRUE, + 512, &newStorage); if (FAILED(hr)) @@ -6819,6 +6845,7 @@ HRESULT WINAPI StgOpenStorageOnILockBytes( grfMode, FALSE, FALSE, + 512, &newStorage); if (FAILED(hr)) diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 98ec6d1..36a7d67 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -66,6 +66,8 @@ static const ULONG OFFSET_PS_MTIMEHIGH = 0x00000070; static const ULONG OFFSET_PS_STARTBLOCK = 0x00000074; static const ULONG OFFSET_PS_SIZE = 0x00000078; static const WORD DEF_BIG_BLOCK_SIZE_BITS = 0x0009; +static const WORD MIN_BIG_BLOCK_SIZE_BITS = 0x0009; +static const WORD MAX_BIG_BLOCK_SIZE_BITS = 0x000c; static const WORD DEF_SMALL_BLOCK_SIZE_BITS = 0x0006; static const WORD DEF_BIG_BLOCK_SIZE = 0x0200; static const WORD DEF_SMALL_BLOCK_SIZE = 0x0040;

1 0

Vincent Povirk : windowscodecs: Add locking to the JPEG decoder.
by Alexandre Julliard April 13, 2010

April 13, 2010

Module: wine Branch: master Commit: 7c8b7559a26d2e84a6ada44423b70295b20cfab8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c8b7559a26d2e84a6ada4442… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 9 15:03:49 2010 -0500 windowscodecs: Add locking to the JPEG decoder. --- dlls/windowscodecs/jpegformat.c | 28 ++++++++++++++++++++++++++-- dlls/windowscodecs/regsvr.c | 2 +- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 017e604..b5676ea 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -103,6 +103,7 @@ typedef struct { struct jpeg_source_mgr source_mgr; BYTE source_buffer[1024]; BYTE *image_data; + CRITICAL_SECTION lock; } JpegDecoder; static inline JpegDecoder *decoder_from_decompress(j_decompress_ptr decompress) @@ -156,6 +157,8 @@ static ULONG WINAPI JpegDecoder_Release(IWICBitmapDecoder *iface) if (ref == 0) { + This->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->lock); if (This->cinfo_initialized) pjpeg_destroy_decompress(&This->cinfo); if (This->stream) IStream_Release(This->stream); HeapFree(GetProcessHeap(), 0, This->image_data); @@ -225,7 +228,13 @@ static HRESULT WINAPI JpegDecoder_Initialize(IWICBitmapDecoder *iface, IStream * int ret; TRACE("(%p,%p,%u)\n", iface, pIStream, cacheOptions); - if (This->cinfo_initialized) return WINCODEC_ERR_WRONGSTATE; + EnterCriticalSection(&This->lock); + + if (This->cinfo_initialized) + { + LeaveCriticalSection(&This->lock); + return WINCODEC_ERR_WRONGSTATE; + } This->cinfo.err = pjpeg_std_error(&This->jerr); @@ -249,6 +258,7 @@ static HRESULT WINAPI JpegDecoder_Initialize(IWICBitmapDecoder *iface, IStream * if (ret != JPEG_HEADER_OK) { WARN("Jpeg image in stream has bad format, read header returned %d.\n",ret); + LeaveCriticalSection(&This->lock); return E_FAIL; } @@ -260,11 +270,14 @@ static HRESULT WINAPI JpegDecoder_Initialize(IWICBitmapDecoder *iface, IStream * if (!pjpeg_start_decompress(&This->cinfo)) { ERR("jpeg_start_decompress failed\n"); + LeaveCriticalSection(&This->lock); return E_FAIL; } This->initialized = TRUE; + LeaveCriticalSection(&This->lock); + return S_OK; } @@ -448,10 +461,16 @@ static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, max_row_needed = prc->Y + prc->Height; if (max_row_needed > This->cinfo.output_height) return E_INVALIDARG; + EnterCriticalSection(&This->lock); + if (!This->image_data) { This->image_data = HeapAlloc(GetProcessHeap(), 0, data_size); - if (!This->image_data) return E_OUTOFMEMORY; + if (!This->image_data) + { + LeaveCriticalSection(&This->lock); + return E_OUTOFMEMORY; + } } while (max_row_needed > This->cinfo.output_scanline) @@ -471,6 +490,7 @@ static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, if (ret == 0) { ERR("read_scanlines failed\n"); + LeaveCriticalSection(&This->lock); return E_FAIL; } @@ -492,6 +512,8 @@ static HRESULT WINAPI JpegDecoder_Frame_CopyPixels(IWICBitmapFrameDecode *iface, } } + LeaveCriticalSection(&This->lock); + return copy_pixels(bpp, This->image_data, This->cinfo.output_width, This->cinfo.output_height, stride, prc, cbStride, cbBufferSize, pbBuffer); @@ -559,6 +581,8 @@ HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->cinfo_initialized = FALSE; This->stream = NULL; This->image_data = NULL; + InitializeCriticalSection(&This->lock); + This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JpegDecoder.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 83d25ef..a71ef0a 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -769,7 +769,7 @@ static struct regsvr_coclass const coclass_list[] = { "WIC JPEG Decoder", NULL, "windowscodecs.dll", - "Apartment" + "Both" }, { &CLSID_WICTiffDecoder, "WIC TIFF Decoder",

1 0

Vincent Povirk : windowscodecs: Add locking to the format converter.
by Alexandre Julliard April 13, 2010

April 13, 2010

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

Vincent Povirk : windowscodecs: Add locking to the PNG decoder.
by Alexandre Julliard April 13, 2010

April 13, 2010

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