November 2013 - Wine-Commits

Nikolay Sivov : qmgr: Implement IBackgroundCopyJob::SetDescription().
by Alexandre Julliard Nov. 25, 2013

Nov. 25, 2013

Module: wine Branch: master Commit: eeb05e6ef98d7bb5cade2eda82640846ebb18c11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeb05e6ef98d7bb5cade2eda8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 25 10:42:31 2013 +0400 qmgr: Implement IBackgroundCopyJob::SetDescription(). --- dlls/qmgr/job.c | 50 ++++++++++++++++++++++++++++++++++++++++++-------- dlls/qmgr/qmgr.h | 1 + 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 4abf220..a395ec6 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -25,9 +25,15 @@ #include "qmgr.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(qmgr); +static inline BOOL is_job_done(const BackgroundCopyJobImpl *job) +{ + return job->state == BG_JOB_STATE_CANCELLED || job->state == BG_JOB_STATE_ACKNOWLEDGED; +} + static inline BackgroundCopyJobImpl *impl_from_IBackgroundCopyJob2(IBackgroundCopyJob2 *iface) { return CONTAINING_RECORD(iface, BackgroundCopyJobImpl, IBackgroundCopyJob2_iface); @@ -73,6 +79,7 @@ static ULONG WINAPI BITS_IBackgroundCopyJob_Release(IBackgroundCopyJob2 *iface) This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); HeapFree(GetProcessHeap(), 0, This->displayName); + HeapFree(GetProcessHeap(), 0, This->description); HeapFree(GetProcessHeap(), 0, This); } @@ -147,8 +154,7 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_Resume( HRESULT rv = S_OK; EnterCriticalSection(&globalMgr.cs); - if (This->state == BG_JOB_STATE_CANCELLED - || This->state == BG_JOB_STATE_ACKNOWLEDGED) + if (is_job_done(This)) { rv = BG_E_INVALID_STATE; } @@ -182,8 +188,7 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_Complete( EnterCriticalSection(&This->cs); - if (This->state == BG_JOB_STATE_CANCELLED - || This->state == BG_JOB_STATE_ACKNOWLEDGED) + if (is_job_done(This)) { rv = BG_E_INVALID_STATE; } @@ -313,7 +318,7 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_GetDisplayName( if (!pVal) return E_INVALIDARG; - n = (lstrlenW(This->displayName) + 1) * sizeof **pVal; + n = (strlenW(This->displayName) + 1) * sizeof **pVal; *pVal = CoTaskMemAlloc(n); if (*pVal == NULL) return E_OUTOFMEMORY; @@ -325,8 +330,36 @@ static HRESULT WINAPI BITS_IBackgroundCopyJob_SetDescription( IBackgroundCopyJob2 *iface, LPCWSTR Val) { - FIXME("Not implemented\n"); - return E_NOTIMPL; + BackgroundCopyJobImpl *This = impl_from_IBackgroundCopyJob2(iface); + static const int max_description_len = 1024; + HRESULT hr = S_OK; + int len; + + TRACE("(%p)->(%s)\n", This, debugstr_w(Val)); + + if (!Val) return E_INVALIDARG; + + len = strlenW(Val); + if (len > max_description_len) return BG_E_STRING_TOO_LONG; + + EnterCriticalSection(&This->cs); + + if (is_job_done(This)) + { + hr = BG_E_INVALID_STATE; + } + else + { + HeapFree(GetProcessHeap(), 0, This->description); + if ((This->description = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR)))) + strcpyW(This->description, Val); + else + hr = E_OUTOFMEMORY; + } + + LeaveCriticalSection(&This->cs); + + return hr; } static HRESULT WINAPI BITS_IBackgroundCopyJob_GetDescription( @@ -588,7 +621,7 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID This->ref = 1; This->type = type; - n = (lstrlenW(displayName) + 1) * sizeof *displayName; + n = (strlenW(displayName) + 1) * sizeof *displayName; This->displayName = HeapAlloc(GetProcessHeap(), 0, n); if (!This->displayName) { @@ -617,6 +650,7 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID This->jobProgress.FilesTransferred = 0; This->state = BG_JOB_STATE_SUSPENDED; + This->description = NULL; *job = This; return S_OK; diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index 215c200..1f64d41 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -36,6 +36,7 @@ typedef struct IBackgroundCopyJob2 IBackgroundCopyJob2_iface; LONG ref; LPWSTR displayName; + LPWSTR description; BG_JOB_TYPE type; GUID jobId; struct list files;

1 0

Frédéric Delanoy : stress.dll16: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 25, 2013

Nov. 25, 2013

Module: wine Branch: master Commit: d5b0232b04c70e4aa8d1e6c7fd35c65240733e84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5b0232b04c70e4aa8d1e6c7f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Nov 24 00:05:12 2013 +0100 stress.dll16: Use BOOL type where appropriate. --- dlls/stress.dll16/stress.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/stress.dll16/stress.c b/dlls/stress.dll16/stress.c index c97a1b2..be292d9 100644 --- a/dlls/stress.dll16/stress.c +++ b/dlls/stress.dll16/stress.c @@ -54,8 +54,7 @@ INT16 WINAPI AllocFileHandles(INT16 Left) BOOL16 WINAPI AllocGDIMem(UINT16 uLeft) { TRACE("(%d) - stub\n", uLeft); - - return 1; + return TRUE; } /*********************************************************************** @@ -64,8 +63,7 @@ BOOL16 WINAPI AllocGDIMem(UINT16 uLeft) BOOL16 WINAPI AllocMem(DWORD dwLeft) { FIXME("(%d) - stub\n", dwLeft); - - return 1; + return TRUE; } /*********************************************************************** @@ -74,8 +72,7 @@ BOOL16 WINAPI AllocMem(DWORD dwLeft) BOOL16 WINAPI AllocUserMem(UINT16 uContig) { TRACE("AllocUserMem %d\n", uContig); - - return 1; + return TRUE; } /***********************************************************************

1 0

Frédéric Delanoy : rsaenh/tests: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 25, 2013

Nov. 25, 2013

Module: wine Branch: master Commit: 7377aa16832d1934d826c658f47ca61f9e66cbf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7377aa16832d1934d826c658f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Nov 24 00:05:11 2013 +0100 rsaenh/tests: Use BOOL type where appropriate. --- dlls/rsaenh/tests/rsaenh.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 20969c7..8552bc3 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -118,7 +118,7 @@ static void trace_hex(BYTE *pbData, DWORD dwLen) { } */ -static int init_base_environment(DWORD dwKeyFlags) +static BOOL init_base_environment(DWORD dwKeyFlags) { HCRYPTKEY hKey; BOOL result; @@ -141,7 +141,7 @@ static int init_base_environment(DWORD dwKeyFlags) if (GetLastError()!=NTE_BAD_KEYSET) { win_skip("RSA full provider not available\n"); - return 0; + return FALSE; } result = CryptAcquireContextA(&hProv, szContainer, szProvider, PROV_RSA_FULL, CRYPT_NEWKEYSET); @@ -149,7 +149,7 @@ static int init_base_environment(DWORD dwKeyFlags) if (!result) { win_skip("Couldn't create crypto provider\n"); - return 0; + return FALSE; } result = CryptGenKey(hProv, AT_KEYEXCHANGE, dwKeyFlags, &hKey); ok(result, "%08x\n", GetLastError()); @@ -158,7 +158,7 @@ static int init_base_environment(DWORD dwKeyFlags) ok(result, "%08x\n", GetLastError()); if (result) CryptDestroyKey(hKey); } - return 1; + return TRUE; } static void clean_up_base_environment(void) @@ -178,7 +178,7 @@ static void clean_up_base_environment(void) CryptAcquireContextA(&hProv, szContainer, szProvider, PROV_RSA_FULL, CRYPT_DELETEKEYSET); } -static int init_aes_environment(void) +static BOOL init_aes_environment(void) { HCRYPTKEY hKey; BOOL result; @@ -196,18 +196,18 @@ static int init_aes_environment(void) if (!result && GetLastError() == NTE_PROV_TYPE_NOT_DEF) { win_skip("RSA_AES provider not supported\n"); - return 0; + return FALSE; } ok(!result && GetLastError()==NTE_BAD_FLAGS, "%d, %08x\n", result, GetLastError()); if (!CryptAcquireContextA(&hProv, szContainer, NULL, PROV_RSA_AES, 0)) { ok(GetLastError()==NTE_BAD_KEYSET, "%08x\n", GetLastError()); - if (GetLastError()!=NTE_BAD_KEYSET) return 0; + if (GetLastError()!=NTE_BAD_KEYSET) return FALSE; result = CryptAcquireContextA(&hProv, szContainer, NULL, PROV_RSA_AES, CRYPT_NEWKEYSET); ok(result, "%08x\n", GetLastError()); - if (!result) return 0; + if (!result) return FALSE; result = CryptGenKey(hProv, AT_KEYEXCHANGE, 0, &hKey); ok(result, "%08x\n", GetLastError()); if (result) CryptDestroyKey(hKey); @@ -215,7 +215,7 @@ static int init_aes_environment(void) ok(result, "%08x\n", GetLastError()); if (result) CryptDestroyKey(hKey); } - return 1; + return TRUE; } static void clean_up_aes_environment(void)

1 0

Frédéric Delanoy : system.drv16: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 25, 2013

Nov. 25, 2013

Module: wine Branch: master Commit: 5e321b2c7f7b291b21d8e8b2e9c4f73a4339c025 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e321b2c7f7b291b21d8e8b2e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Nov 24 00:05:10 2013 +0100 system.drv16: Use BOOL type where appropriate. --- dlls/system.drv16/system.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/system.drv16/system.c b/dlls/system.drv16/system.c index 2d4cb6b..83c0c87 100644 --- a/dlls/system.drv16/system.c +++ b/dlls/system.drv16/system.c @@ -46,7 +46,7 @@ static SYSTEM_TIMER SYS_Timers[NB_SYS_TIMERS]; static int SYS_NbTimers = 0; static HANDLE SYS_timer; static HANDLE SYS_thread; -static int SYS_timers_disabled; +static BOOL SYS_timers_disabled; /*********************************************************************** @@ -200,7 +200,7 @@ WORD WINAPI SYSTEM_KillSystemTimer( WORD timer ) */ void WINAPI EnableSystemTimers16(void) { - SYS_timers_disabled = 0; + SYS_timers_disabled = FALSE; } @@ -209,7 +209,7 @@ void WINAPI EnableSystemTimers16(void) */ void WINAPI DisableSystemTimers16(void) { - SYS_timers_disabled = 1; + SYS_timers_disabled = TRUE; }

1 0

Frédéric Delanoy : rsaenh: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 25, 2013

Nov. 25, 2013

Module: wine Branch: master Commit: 08acae5debd3d99c55956d16254b38139197c36c URL: http://source.winehq.org/git/wine.git/?a=commit;h=08acae5debd3d99c55956d162… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Nov 24 00:05:09 2013 +0100 rsaenh: Use BOOL type where appropriate. --- dlls/rsaenh/handle.c | 74 +++++++++++++++++++++++++------------------------- dlls/rsaenh/handle.h | 8 +++--- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/dlls/rsaenh/handle.c b/dlls/rsaenh/handle.c index ade1909..4d85d73 100644 --- a/dlls/rsaenh/handle.c +++ b/dlls/rsaenh/handle.c @@ -87,13 +87,13 @@ void destroy_handle_table(struct handle_table *lpTable) * dwType [I] A magic value that identifies the referenced object's type. * * RETURNS - * non zero, if handle is valid. - * zero, if handle is not valid. + * TRUE, if handle is valid. + * FALSE, if handle is not valid. */ -int is_valid_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) +BOOL is_valid_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) { unsigned int index = HANDLE2INDEX(handle); - int ret = 0; + BOOL ret = FALSE; TRACE("(lpTable=%p, handle=%ld)\n", lpTable, handle); @@ -110,8 +110,8 @@ int is_valid_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType /* Check if this handle references an object of the correct type. */ if (lpTable->paEntries[index].pObject->dwType != dwType) goto exit; - - ret = 1; + + ret = TRUE; exit: LeaveCriticalSection(&lpTable->mutex); return ret; @@ -126,13 +126,13 @@ exit: * lpTable [I] Pointer to the table, which is to be grown * * RETURNS - * non zero, if successful - * zero, if not successful (out of memory on process heap) + * TRUE, if successful + * FALSE, if not successful (out of memory on process heap) * * NOTES * This is a support function for alloc_handle. Do not call! */ -static int grow_handle_table(struct handle_table *lpTable) +static BOOL grow_handle_table(struct handle_table *lpTable) { struct handle_table_entry *newEntries; unsigned int i, newIEntries; @@ -140,8 +140,8 @@ static int grow_handle_table(struct handle_table *lpTable) newIEntries = lpTable->iEntries + TABLE_SIZE_INCREMENT; newEntries = HeapAlloc(GetProcessHeap(), 0, sizeof(struct handle_table_entry)*newIEntries); - if (!newEntries) - return 0; + if (!newEntries) + return FALSE; if (lpTable->paEntries) { @@ -158,7 +158,7 @@ static int grow_handle_table(struct handle_table *lpTable) lpTable->paEntries = newEntries; lpTable->iEntries = newIEntries; - return 1; + return TRUE; } /****************************************************************************** @@ -174,12 +174,12 @@ static int grow_handle_table(struct handle_table *lpTable) * be stored. If not successful, this will be * INVALID_HANDLE_VALUE * RETURNS - * non zero, if successful - * zero, if not successful (no free handle) + * TRUE, if successful + * FALSE, if not successful (no free handle) */ -static int alloc_handle(struct handle_table *lpTable, OBJECTHDR *lpObject, HCRYPTKEY *lpHandle) +static BOOL alloc_handle(struct handle_table *lpTable, OBJECTHDR *lpObject, HCRYPTKEY *lpHandle) { - int ret = 0; + BOOL ret = FALSE; TRACE("(lpTable=%p, lpObject=%p, lpHandle=%p)\n", lpTable, lpObject, lpHandle); @@ -197,7 +197,7 @@ static int alloc_handle(struct handle_table *lpTable, OBJECTHDR *lpObject, HCRYP lpTable->iFirstFree = lpTable->paEntries[lpTable->iFirstFree].iNextFree; InterlockedIncrement(&lpObject->refcount); - ret = 1; + ret = TRUE; exit: LeaveCriticalSection(&lpTable->mutex); return ret; @@ -221,14 +221,14 @@ exit: * to be released. * * RETURNS - * non zero, if successful - * zero, if not successful (invalid handle) + * TRUE, if successful + * FALSE, if not successful (invalid handle) */ -int release_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) +BOOL release_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) { unsigned int index = HANDLE2INDEX(handle); OBJECTHDR *pObject; - int ret = 0; + BOOL ret = FALSE; TRACE("(lpTable=%p, handle=%ld)\n", lpTable, handle); @@ -248,8 +248,8 @@ int release_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) lpTable->paEntries[index].pObject = NULL; lpTable->paEntries[index].iNextFree = lpTable->iFirstFree; lpTable->iFirstFree = index; - - ret = 1; + + ret = TRUE; exit: LeaveCriticalSection(&lpTable->mutex); return ret; @@ -263,16 +263,16 @@ exit: * PARAMS * lpTable [I] Pointer to the handle table, in which the handle is looked up. * handle [I] The handle, which is to be looked up - * lplpObject [O] Pointer to the variable, into which the pointer to the - * object looked up is copied. + * lplpObject [O] Pointer to the variable, into which the pointer to the + * object looked up is copied. * RETURNS - * non zero, if successful - * zero, if not successful (invalid handle) + * TRUE, if successful + * FALSE, if not successful (invalid handle) */ -int lookup_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject) +BOOL lookup_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject) { - int ret = 0; - + BOOL ret = FALSE; + TRACE("(lpTable=%p, handle=%ld, lplpObject=%p)\n", lpTable, handle, lplpObject); EnterCriticalSection(&lpTable->mutex); @@ -283,7 +283,7 @@ int lookup_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, } *lplpObject = lpTable->paEntries[HANDLE2INDEX(handle)].pObject; - ret = 1; + ret = TRUE; exit: LeaveCriticalSection(&lpTable->mutex); return ret; @@ -301,14 +301,14 @@ exit: * copy [O] Pointer to a handle variable, where the copied handle is put. * * RETURNS - * non zero, if successful - * zero, if not successful (invalid handle or out of memory) + * TRUE, if successful + * FALSE, if not successful (invalid handle or out of memory) */ -int copy_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy) +BOOL copy_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy) { OBJECTHDR *pObject; - int ret; - + BOOL ret; + TRACE("(lpTable=%p, handle=%ld, copy=%p)\n", lpTable, handle, copy); EnterCriticalSection(&lpTable->mutex); @@ -316,7 +316,7 @@ int copy_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, HC { *copy = (HCRYPTKEY)INVALID_HANDLE_VALUE; LeaveCriticalSection(&lpTable->mutex); - return 0; + return FALSE; } ret = alloc_handle(lpTable, pObject, copy); diff --git a/dlls/rsaenh/handle.h b/dlls/rsaenh/handle.h index 662553e..05cbb77 100644 --- a/dlls/rsaenh/handle.h +++ b/dlls/rsaenh/handle.h @@ -58,10 +58,10 @@ struct handle_table void init_handle_table (struct handle_table *lpTable) DECLSPEC_HIDDEN; void destroy_handle_table(struct handle_table *lpTable) DECLSPEC_HIDDEN; -int release_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) DECLSPEC_HIDDEN; -int copy_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy) DECLSPEC_HIDDEN; -int lookup_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject) DECLSPEC_HIDDEN; -int is_valid_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) DECLSPEC_HIDDEN; +BOOL release_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) DECLSPEC_HIDDEN; +BOOL copy_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy) DECLSPEC_HIDDEN; +BOOL lookup_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject) DECLSPEC_HIDDEN; +BOOL is_valid_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) DECLSPEC_HIDDEN; HCRYPTKEY new_object (struct handle_table *lpTable, size_t cbSize, DWORD dwType, DESTRUCTOR destructor, OBJECTHDR **ppObject) DECLSPEC_HIDDEN;

1 0

Frédéric Delanoy : kernel32: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 25, 2013

Nov. 25, 2013

Module: wine Branch: master Commit: 6e472d8bc3563b6b0bc9ba5118a1d10a7e2bc01a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e472d8bc3563b6b0bc9ba511… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Nov 24 00:05:08 2013 +0100 kernel32: Use BOOL type where appropriate. --- dlls/kernel32/profile.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 87c3cd7..a9a11b1 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -267,8 +267,8 @@ static void PROFILE_Free( PROFILESECTION *section ) } } -/* returns 1 if a character white space else 0 */ -static inline int PROFILE_isspaceW(WCHAR c) +/* returns TRUE if a whitespace character, else FALSE */ +static inline BOOL PROFILE_isspaceW(WCHAR c) { /* ^Z (DOS EOF) is a space too (found on CD-ROMs) */ return isspaceW(c) || c == 0x1a;

1 0

Marcus Meissner : netapi32: Added missing breaks (Coverity).
by Alexandre Julliard Nov. 25, 2013

Nov. 25, 2013

Module: wine Branch: master Commit: 0ef0f7bb0a1b88a81122f7b126076eb700740b05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ef0f7bb0a1b88a81122f7b12… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Nov 23 15:27:22 2013 +0100 netapi32: Added missing breaks (Coverity). --- dlls/netapi32/netapi32.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 832fdbe..3ec0b0c 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -541,6 +541,7 @@ static NET_API_STATUS ace_to_samba( const ACE_HEADER *src, struct ace *dst ) dst->access_mask = access_mask_to_samba( ace->Mask ); memset( &dst->object, 0, sizeof(dst->object) ); sid_to_samba( (const SID *)&ace->SidStart, &dst->trustee ); + break; } case ACCESS_DENIED_ACE_TYPE: { @@ -548,6 +549,7 @@ static NET_API_STATUS ace_to_samba( const ACE_HEADER *src, struct ace *dst ) dst->access_mask = access_mask_to_samba( ace->Mask ); memset( &dst->object, 0, sizeof(dst->object) ); sid_to_samba( (const SID *)&ace->SidStart, &dst->trustee ); + break; } case SYSTEM_AUDIT_ACE_TYPE: { @@ -555,6 +557,7 @@ static NET_API_STATUS ace_to_samba( const ACE_HEADER *src, struct ace *dst ) dst->access_mask = access_mask_to_samba( ace->Mask ); memset( &dst->object, 0, sizeof(dst->object) ); sid_to_samba( (const SID *)&ace->SidStart, &dst->trustee ); + break; } case SYSTEM_ALARM_ACE_TYPE: { @@ -562,6 +565,7 @@ static NET_API_STATUS ace_to_samba( const ACE_HEADER *src, struct ace *dst ) dst->access_mask = access_mask_to_samba( ace->Mask ); memset( &dst->object, 0, sizeof(dst->object) ); sid_to_samba( (const SID *)&ace->SidStart, &dst->trustee ); + break; } default: ERR( "unhandled type %u\n", src->AceType );

1 0

Vincent Povirk : gdiplus: Add metafile test for FillRectangles.
by Alexandre Julliard Nov. 25, 2013

Nov. 25, 2013

Module: wine Branch: master Commit: 68b60c0ddddc8e4abcbb18b6e90aa167fde85630 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68b60c0ddddc8e4abcbb18b6e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 20 16:07:26 2013 -0600 gdiplus: Add metafile test for FillRectangles. --- dlls/gdiplus/tests/metafile.c | 109 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 109 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 9dcc803..d4d7adb 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -601,6 +601,114 @@ static void test_emfonly(void) ok(ret != 0, "Failed to delete enhmetafile %p\n", hemf); } +static const emfplus_record fillrect_records[] = { + {0, EMR_HEADER}, + {0, EmfPlusRecordTypeHeader}, + {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeEndOfFile}, + {0, EMR_EOF}, + {0} +}; + +static void test_fillrect(void) +{ + GpStatus stat; + GpMetafile *metafile; + GpGraphics *graphics; + HDC hdc; + HENHMETAFILE hemf; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + static const GpPointF dst_points[3] = {{0.0,0.0},{100.0,0.0},{0.0,100.0}}; + static const GpPointF dst_points_half[3] = {{0.0,0.0},{50.0,0.0},{0.0,50.0}}; + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + GpBitmap *bitmap; + ARGB color; + GpBrush *brush; + + hdc = CreateCompatibleDC(0); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + + DeleteDC(hdc); + + if (stat != Ok) + return; + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(InvalidParameter, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipCreateSolidFill((ARGB)0xff0000ff, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangleI(graphics, brush, 25, 25, 75, 75); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + check_metafile(metafile, fillrect_records, "fillrect metafile", dst_points, &frame, UnitPixel); + + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + + play_metafile(metafile, graphics, fillrect_records, "fillrect playback", dst_points, &frame, UnitPixel); + + stat = GdipBitmapGetPixel(bitmap, 15, 15, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipBitmapGetPixel(bitmap, 50, 50, &color); + expect(Ok, stat); + expect(0xff0000ff, color); + + stat = GdipBitmapSetPixel(bitmap, 50, 50, 0); + expect(Ok, stat); + + play_metafile(metafile, graphics, fillrect_records, "fillrect playback", dst_points_half, &frame, UnitPixel); + + stat = GdipBitmapGetPixel(bitmap, 15, 15, &color); + expect(Ok, stat); + expect(0xff0000ff, color); + + stat = GdipBitmapGetPixel(bitmap, 50, 50, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipBitmapSetPixel(bitmap, 15, 15, 0); + expect(Ok, stat); + + stat = GdipDrawImagePointsRect(graphics, (GpImage*)metafile, dst_points, 3, + 0.0, 0.0, 100.0, 100.0, UnitPixel, NULL, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap, 15, 15, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipBitmapGetPixel(bitmap, 50, 50, &color); + expect(Ok, stat); + expect(0xff0000ff, color); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)bitmap); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -616,6 +724,7 @@ START_TEST(metafile) test_empty(); test_getdc(); test_emfonly(); + test_fillrect(); GdiplusShutdown(gdiplusToken); }

1 0

Vincent Povirk : gdiplus: Set world transform when drawing metafiles.
by Alexandre Julliard Nov. 25, 2013

Nov. 25, 2013

Module: wine Branch: master Commit: 681cd545ea3f7633744f068111e2ed1a553d23b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=681cd545ea3f7633744f06811… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Nov 22 16:19:13 2013 -0600 gdiplus: Set world transform when drawing metafiles. --- dlls/gdiplus/gdiplus_private.h | 4 ++ dlls/gdiplus/metafile.c | 62 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 60 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index d95ea88..5e8f78a 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -298,8 +298,12 @@ struct GpMetafile{ GpGraphics *playback_graphics; HDC playback_dc; GpPointF playback_points[3]; + GpRectF src_rect; HANDLETABLE *handle_table; int handle_count; + GpMatrix *world_transform; + GpUnit page_unit; + REAL page_scale; }; struct GpBitmap{ diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 14995dd..a79bfc3 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -484,6 +484,28 @@ static void METAFILE_PlaybackReleaseDC(GpMetafile *metafile) } } +static GpStatus METAFILE_PlaybackUpdateWorldTransform(GpMetafile *metafile) +{ + GpMatrix *real_transform; + GpStatus stat; + + stat = GdipCreateMatrix3(&metafile->src_rect, metafile->playback_points, &real_transform); + + if (stat == Ok) + { + /* FIXME: Prepend page transform. */ + + stat = GdipMultiplyMatrix(real_transform, metafile->world_transform, MatrixOrderPrepend); + + if (stat == Ok) + stat = GdipSetWorldTransform(metafile->playback_graphics, real_transform); + + GdipDeleteMatrix(real_transform); + } + + return stat; +} + GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, EmfPlusRecordType recordType, UINT flags, UINT dataSize, GDIPCONST BYTE *data) { @@ -672,6 +694,7 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics *graphics, struct enum_metafile_data data; GpStatus stat; GpMetafile *real_metafile = (GpMetafile*)metafile; /* whoever made this const was joking */ + GraphicsContainer state; TRACE("(%p,%p,%p,%i,%p,%i,%p,%p,%p)\n", graphics, metafile, destPoints, count, srcRect, srcUnit, callback, callbackData, @@ -696,19 +719,46 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics *graphics, real_metafile->playback_graphics = graphics; real_metafile->playback_dc = NULL; + real_metafile->src_rect = *srcRect; memcpy(real_metafile->playback_points, destPoints, sizeof(PointF) * 3); stat = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, real_metafile->playback_points, 3); - if (stat == Ok && (metafile->metafile_type == MetafileTypeEmf || - metafile->metafile_type == MetafileTypeWmfPlaceable || - metafile->metafile_type == MetafileTypeWmf)) - stat = METAFILE_PlaybackGetDC((GpMetafile*)metafile); + if (stat == Ok) + stat = GdipBeginContainer2(graphics, &state); if (stat == Ok) - EnumEnhMetaFile(0, metafile->hemf, enum_metafile_proc, &data, NULL); + { + stat = GdipSetPageScale(graphics, 1.0); + + if (stat == Ok) + stat = GdipSetPageUnit(graphics, UnitPixel); - METAFILE_PlaybackReleaseDC((GpMetafile*)metafile); + if (stat == Ok) + stat = GdipCreateMatrix(&real_metafile->world_transform); + + if (stat == Ok) + { + real_metafile->page_unit = UnitPixel; /* FIXME: Use frame unit here? */ + real_metafile->page_scale = 1.0; + stat = METAFILE_PlaybackUpdateWorldTransform(real_metafile); + } + + if (stat == Ok && (metafile->metafile_type == MetafileTypeEmf || + metafile->metafile_type == MetafileTypeWmfPlaceable || + metafile->metafile_type == MetafileTypeWmf)) + stat = METAFILE_PlaybackGetDC(real_metafile); + + if (stat == Ok) + EnumEnhMetaFile(0, metafile->hemf, enum_metafile_proc, &data, NULL); + + METAFILE_PlaybackReleaseDC(real_metafile); + + GdipDeleteMatrix(real_metafile->world_transform); + real_metafile->world_transform = NULL; + + GdipEndContainer(graphics, state); + } real_metafile->playback_graphics = NULL;

1 0

Vincent Povirk : gdiplus: Implement FillRects record playback.
by Alexandre Julliard Nov. 25, 2013

Nov. 25, 2013

Module: wine Branch: master Commit: fc560b212119acce3a8da506d762607af3f614bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc560b212119acce3a8da506d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Nov 22 14:55:31 2013 -0600 gdiplus: Implement FillRects record playback. --- dlls/gdiplus/metafile.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 4949bd9..14995dd 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -487,6 +487,8 @@ static void METAFILE_PlaybackReleaseDC(GpMetafile *metafile) GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, EmfPlusRecordType recordType, UINT flags, UINT dataSize, GDIPCONST BYTE *data) { + GpStatus stat; + TRACE("(%p,%x,%x,%d,%p)\n", metafile, recordType, flags, dataSize, data); if (!metafile || (dataSize && !data) || !metafile->playback_graphics) @@ -518,6 +520,8 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, } else { + EmfPlusRecordHeader *header = (EmfPlusRecordHeader*)(data)-1; + METAFILE_PlaybackReleaseDC((GpMetafile*)metafile); switch(recordType) @@ -528,6 +532,72 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, case EmfPlusRecordTypeGetDC: METAFILE_PlaybackGetDC((GpMetafile*)metafile); break; + case EmfPlusRecordTypeFillRects: + { + EmfPlusFillRects *record = (EmfPlusFillRects*)header; + GpBrush *brush, *temp_brush=NULL; + GpRectF *rects, *temp_rects=NULL; + + if (dataSize + sizeof(EmfPlusRecordHeader) < sizeof(EmfPlusFillRects)) + return InvalidParameter; + + if (flags & 0x4000) + { + if (dataSize + sizeof(EmfPlusRecordHeader) < sizeof(EmfPlusFillRects) + sizeof(EmfPlusRect) * record->Count) + return InvalidParameter; + } + else + { + if (dataSize + sizeof(EmfPlusRecordHeader) < sizeof(EmfPlusFillRects) + sizeof(GpRectF) * record->Count) + return InvalidParameter; + } + + if (flags & 0x8000) + { + stat = GdipCreateSolidFill((ARGB)record->BrushID, (GpSolidFill**)&temp_brush); + brush = temp_brush; + } + else + { + FIXME("brush deserialization not implemented\n"); + return NotImplemented; + } + + if (stat == Ok) + { + if (flags & 0x4000) + { + EmfPlusRect *int_rects = (EmfPlusRect*)(record+1); + int i; + + rects = temp_rects = GdipAlloc(sizeof(GpRectF) * record->Count); + if (rects) + { + for (i=0; i<record->Count; i++) + { + rects[i].X = int_rects[i].X; + rects[i].Y = int_rects[i].Y; + rects[i].Width = int_rects[i].Width; + rects[i].Height = int_rects[i].Height; + } + } + else + stat = OutOfMemory; + } + else + rects = (GpRectF*)(record+1); + } + + if (stat == Ok) + { + stat = GdipFillRectangles(metafile->playback_graphics, brush, rects, record->Count); + } + + GdipDeleteBrush(temp_brush); + GdipFree(temp_rects); + + return stat; + } default: FIXME("Not implemented for record type %x\n", recordType); return NotImplemented;

1 0