August 2007 - Wine-Commits - list.winehq.org

Huw Davies : wineps.drv: Only fail printer dc creation if the printer has no builtin fonts and there are no TrueType fonts to download .
by Alexandre Julliard Aug. 29, 2007

Aug. 29, 2007

Module: wine Branch: master Commit: dba09770921e6f4583a4b79226ed4f38d5520126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dba09770921e6f4583a4b7922… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 28 11:46:18 2007 +0100 wineps.drv: Only fail printer dc creation if the printer has no builtin fonts and there are no TrueType fonts to download. --- dlls/wineps.drv/init.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index a794bec..d499247 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -328,8 +328,14 @@ BOOL PSDRV_CreateDC( HDC hdc, PSDRV_PDEVICE **pdev, LPCWSTR driver, LPCWSTR devi if(!pi) return FALSE; if(!pi->Fonts) { - MESSAGE("To use WINEPS you need to install some AFM files.\n"); - return FALSE; + RASTERIZER_STATUS status; + if(!GetRasterizerCaps(&status, sizeof(status)) || + !(status.wFlags & TT_AVAILABLE) || + !(status.wFlags & TT_ENABLED)) { + MESSAGE("Disabling printer %s since it has no builtin fonts and there are no TrueType fonts available.\n", + debugstr_w(device)); + return FALSE; + } } physDev = HeapAlloc( PSDRV_Heap, HEAP_ZERO_MEMORY, sizeof(*physDev) );

1 0

Roderick Colenbrander : wined3d: Fix a hdc check in InitAdapters.
by Alexandre Julliard Aug. 29, 2007

Aug. 29, 2007

Module: wine Branch: master Commit: 8a7332f60f5fe12d306c2ccd1c55e31edb58efd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a7332f60f5fe12d306c2ccd1… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Wed Aug 29 01:07:26 2007 +0200 wined3d: Fix a hdc check in InitAdapters. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a553a6a..e60812a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2541,7 +2541,7 @@ BOOL InitAdapters(void) { } hdc = pwglGetCurrentDC(); - if(!ret) { + if(!hdc) { ERR("Failed to get gl HDC\n"); HeapFree(GetProcessHeap(), 0, Adapters); WineD3D_ReleaseFakeGLContext();

1 0

Alexandre Julliard : winex11: Tool windows should not have WM decorations.
by Alexandre Julliard Aug. 29, 2007

Aug. 29, 2007

Module: wine Branch: master Commit: 74cd76c9c7c448a4161b87509e7090848dab8cb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74cd76c9c7c448a4161b87509… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 29 12:02:57 2007 +0200 winex11: Tool windows should not have WM decorations. --- dlls/winex11.drv/window.c | 38 ++++++++++++++++++++++++-------------- 1 files changed, 24 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 24f89f8..2b56913 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -560,23 +560,26 @@ void X11DRV_set_wm_hints( Display *display, struct x11drv_win_data *data ) mwm_hints.flags = MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS; mwm_hints.functions = MWM_FUNC_MOVE; - if (style & WS_THICKFRAME) mwm_hints.functions |= MWM_FUNC_RESIZE; + if (style & WS_THICKFRAME) mwm_hints.functions |= MWM_FUNC_RESIZE; if (style & WS_MINIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MINIMIZE; if (style & WS_MAXIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MAXIMIZE; - if (style & WS_SYSMENU) mwm_hints.functions |= MWM_FUNC_CLOSE; + if (style & WS_SYSMENU) mwm_hints.functions |= MWM_FUNC_CLOSE; mwm_hints.decorations = 0; - if ((style & WS_CAPTION) == WS_CAPTION) + if (!(ex_style & WS_EX_TOOLWINDOW)) { - mwm_hints.decorations |= MWM_DECOR_TITLE; - if (style & WS_SYSMENU) mwm_hints.decorations |= MWM_DECOR_MENU; - if (style & WS_MINIMIZEBOX) mwm_hints.decorations |= MWM_DECOR_MINIMIZE; - if (style & WS_MAXIMIZEBOX) mwm_hints.decorations |= MWM_DECOR_MAXIMIZE; + if ((style & WS_CAPTION) == WS_CAPTION) + { + mwm_hints.decorations |= MWM_DECOR_TITLE; + if (style & WS_SYSMENU) mwm_hints.decorations |= MWM_DECOR_MENU; + if (style & WS_MINIMIZEBOX) mwm_hints.decorations |= MWM_DECOR_MINIMIZE; + if (style & WS_MAXIMIZEBOX) mwm_hints.decorations |= MWM_DECOR_MAXIMIZE; + } + if (ex_style & WS_EX_DLGMODALFRAME) mwm_hints.decorations |= MWM_DECOR_BORDER; + else if (style & WS_THICKFRAME) mwm_hints.decorations |= MWM_DECOR_BORDER | MWM_DECOR_RESIZEH; + else if ((style & (WS_DLGFRAME|WS_BORDER)) == WS_DLGFRAME) mwm_hints.decorations |= MWM_DECOR_BORDER; + else if (style & WS_BORDER) mwm_hints.decorations |= MWM_DECOR_BORDER; + else if (!(style & (WS_CHILD|WS_POPUP))) mwm_hints.decorations |= MWM_DECOR_BORDER; } - if (ex_style & WS_EX_DLGMODALFRAME) mwm_hints.decorations |= MWM_DECOR_BORDER; - else if (style & WS_THICKFRAME) mwm_hints.decorations |= MWM_DECOR_BORDER | MWM_DECOR_RESIZEH; - else if ((style & (WS_DLGFRAME|WS_BORDER)) == WS_DLGFRAME) mwm_hints.decorations |= MWM_DECOR_BORDER; - else if (style & WS_BORDER) mwm_hints.decorations |= MWM_DECOR_BORDER; - else if (!(style & (WS_CHILD|WS_POPUP))) mwm_hints.decorations |= MWM_DECOR_BORDER; XChangeProperty( display, data->whole_window, x11drv_atom(_MOTIF_WM_HINTS), x11drv_atom(_MOTIF_WM_HINTS), 32, PropModeReplace, @@ -650,14 +653,17 @@ void X11DRV_set_iconic_state( HWND hwnd ) void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect ) { RECT rc; + DWORD ex_style; if (!data->managed) return; if (IsRectEmpty( rect )) return; + ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); + if (ex_style & WS_EX_TOOLWINDOW) return; rc.top = rc.bottom = rc.left = rc.right = 0; AdjustWindowRectEx( &rc, GetWindowLongW( data->hwnd, GWL_STYLE ) & ~(WS_HSCROLL|WS_VSCROLL), - FALSE, GetWindowLongW( data->hwnd, GWL_EXSTYLE ) ); + FALSE, ex_style ); rect->left -= rc.left; rect->right -= rc.right; @@ -675,11 +681,15 @@ void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect ) */ void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect ) { + DWORD ex_style; + if (!data->managed) return; if (IsRectEmpty( rect )) return; + ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); + if (ex_style & WS_EX_TOOLWINDOW) return; AdjustWindowRectEx( rect, GetWindowLongW( data->hwnd, GWL_STYLE ) & ~(WS_HSCROLL|WS_VSCROLL), - FALSE, GetWindowLongW( data->hwnd, GWL_EXSTYLE )); + FALSE, ex_style ); if (rect->top >= rect->bottom) rect->bottom = rect->top + 1; if (rect->left >= rect->right) rect->right = rect->left + 1;

1 0

Juan Lang : winerror.h: Add more error definitions.
by Alexandre Julliard Aug. 29, 2007

Aug. 29, 2007

Module: wine Branch: master Commit: a47f47fe294a2ad6aede0bd79c1d468d150b2b53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a47f47fe294a2ad6aede0bd79… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 28 17:20:58 2007 -0700 winerror.h: Add more error definitions. --- include/winerror.h | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/include/winerror.h b/include/winerror.h index bc8521e..d19b4b0 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -2278,6 +2278,26 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned long x) #define TRUST_E_SUBJECT_FORM_UNKNOWN _HRESULT_TYPEDEF_(0x800B0003L) #define TRUST_E_SUBJECT_NOT_TRUSTED _HRESULT_TYPEDEF_(0x800B0004L) #define TRUST_E_NOSIGNATURE _HRESULT_TYPEDEF_(0x800B0100L) +#define CERT_E_EXPIRED _HRESULT_TYPEDEF_(0x800B0101) +#define CERT_E_VALIDITYPERIODNESTING _HRESULT_TYPEDEF_(0x800B0102) +#define CERT_E_ROLE _HRESULT_TYPEDEF_(0x800B0103) +#define CERT_E_PATHLENCONST _HRESULT_TYPEDEF_(0x800B0104) +#define CERT_E_CRITICAL _HRESULT_TYPEDEF_(0x800B0105) +#define CERT_E_PURPOSE _HRESULT_TYPEDEF_(0x800B0106) +#define CERT_E_ISSUERCHAINING _HRESULT_TYPEDEF_(0x800B0107) +#define CERT_E_MALFORMED _HRESULT_TYPEDEF_(0x800B0108) +#define CERT_E_UNTRUSTEDROOT _HRESULT_TYPEDEF_(0x800B0109) +#define CERT_E_CHAINING _HRESULT_TYPEDEF_(0x800B010A) +#define TRUST_E_FAIL _HRESULT_TYPEDEF_(0x800B010B) +#define CERT_E_REVOKED _HRESULT_TYPEDEF_(0x800B010C) +#define CERT_E_UNTRUSTEDTESTROOT _HRESULT_TYPEDEF_(0x800B010D) +#define CERT_E_REVOCATION_FAILURE _HRESULT_TYPEDEF_(0x800B010E) +#define CERT_E_CN_NO_MATCH _HRESULT_TYPEDEF_(0x800B010F) +#define CERT_E_WRONG_USAGE _HRESULT_TYPEDEF_(0x800B0110) +#define TRUST_E_EXPLICIT_DISTRUST _HRESULT_TYPEDEF_(0x800B0111) +#define CERT_E_UNTRUSTEDCA _HRESULT_TYPEDEF_(0x800B0112) +#define CERT_E_INVALID_POLICY _HRESULT_TYPEDEF_(0x800B0113) +#define CERT_E_INVALID_NAME _HRESULT_TYPEDEF_(0x800B0114) #define SPAPI_E_EXPECTED_SECTION_NAME _HRESULT_TYPEDEF_(0x800F0000L) #define SPAPI_E_BAD_SECTION_NAME_LINE _HRESULT_TYPEDEF_(0x800F0001L)

1 0

Alexandre Julliard : ntdll: Fixed file system name comparison on *BSD.
by Alexandre Julliard Aug. 29, 2007

Aug. 29, 2007

Module: wine Branch: master Commit: 8765a0da83acad6963693e915010f49c1b820b9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8765a0da83acad6963693e915… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 29 12:02:13 2007 +0200 ntdll: Fixed file system name comparison on *BSD. --- dlls/ntdll/file.c | 19 +++++++------------ server/fd.c | 6 ++---- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index e84490f..c7004d7 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1736,24 +1736,21 @@ NTSTATUS WINAPI NtQueryAttributesFile( const OBJECT_ATTRIBUTES *attr, FILE_BASIC #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__APPLE__) /* helper for FILE_GetDeviceInfo to hide some platform differences in fstatfs */ static inline void get_device_info_fstatfs( FILE_FS_DEVICE_INFORMATION *info, const char *fstypename, - size_t fstypesize, unsigned int flags ) + unsigned int flags ) { - if (!strncmp("cd9660", fstypename, fstypesize) || - !strncmp("udf", fstypename, fstypesize)) + if (!strcmp("cd9660", fstypename) || !strcmp("udf", fstypename)) { info->DeviceType = FILE_DEVICE_CD_ROM_FILE_SYSTEM; /* Don't assume read-only, let the mount options set it below */ info->Characteristics |= FILE_REMOVABLE_MEDIA; } - else if (!strncmp("nfs", fstypename, fstypesize) || - !strncmp("nwfs", fstypename, fstypesize) || - !strncmp("smbfs", fstypename, fstypesize) || - !strncmp("afpfs", fstypename, fstypesize)) + else if (!strcmp("nfs", fstypename) || !strcmp("nwfs", fstypename) || + !strcmp("smbfs", fstypename) || !strcmp("afpfs", fstypename)) { info->DeviceType = FILE_DEVICE_NETWORK_FILE_SYSTEM; info->Characteristics |= FILE_REMOTE_DEVICE; } - else if (!strncmp("procfs", fstypename, fstypesize)) + else if (!strcmp("procfs", fstypename)) info->DeviceType = FILE_DEVICE_VIRTUAL_DISK; else info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM; @@ -1849,16 +1846,14 @@ static NTSTATUS get_device_info( int fd, FILE_FS_DEVICE_INFORMATION *info ) if (fstatfs( fd, &stfs ) < 0) info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM; else - get_device_info_fstatfs( info, stfs.f_fstypename, - sizeof(stfs.f_fstypename), stfs.f_flags ); + get_device_info_fstatfs( info, stfs.f_fstypename, stfs.f_flags ); #elif defined(__NetBSD__) struct statvfs stfs; if (fstatvfs( fd, &stfs) < 0) info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM; else - get_device_info_fstatfs( info, stfs.f_fstypename, - sizeof(stfs.f_fstypename), stfs.f_flag ); + get_device_info_fstatfs( info, stfs.f_fstypename, stfs.f_flag ); #elif defined(sun) /* Use dkio to work out device types */ { diff --git a/server/fd.c b/server/fd.c index cf3a306..31e1c9f 100644 --- a/server/fd.c +++ b/server/fd.c @@ -802,14 +802,12 @@ static int is_device_removable( dev_t dev, int unix_fd ) struct statfs stfs; if (fstatfs( unix_fd, &stfs ) == -1) return 0; - return (!strncmp("cd9660", stfs.f_fstypename, sizeof(stfs.f_fstypename)) || - !strncmp("udf", stfs.f_fstypename, sizeof(stfs.f_fstypename))); + return (!strcmp("cd9660", stfs.f_fstypename) || !strcmp("udf", stfs.f_fstypename)); #elif defined(__NetBSD__) struct statvfs stfs; if (fstatvfs( unix_fd, &stfs ) == -1) return 0; - return (!strncmp("cd9660", stfs.f_fstypename, sizeof(stfs.f_fstypename)) || - !strncmp("udf", stfs.f_fstypename, sizeof(stfs.f_fstypename))); + return (!strcmp("cd9660", stfs.f_fstypename) || !strcmp("udf", stfs.f_fstypename)); #elif defined(sun) # include <sys/dkio.h> # include <sys/vtoc.h>

1 0

Aric Stewart : imm: Report GCS_DELTASTART to help behavior with advanced IME aware applications .
by Alexandre Julliard Aug. 29, 2007

Aug. 29, 2007

Module: wine Branch: master Commit: 0c9c00cf2b94108d22e96d8c053c70770c59d114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c9c00cf2b94108d22e96d8c0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Aug 29 17:55:07 2007 +0900 imm: Report GCS_DELTASTART to help behavior with advanced IME aware applications. --- dlls/imm32/imm.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 2bb1a47..38ba65e 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -287,6 +287,7 @@ static HIMCC updateCompStr(HIMCC old, LPWSTR compstr, DWORD len) &new_one->dwCompReadStrOffset, TRUE); /* new CompAttr, CompClause, CompStr, dwCursorPos */ + new_one->dwDeltaStart = 0; current_offset = updateField(lpcs->dwResultReadClauseLen, lpcs->dwResultReadClauseOffset, @@ -438,6 +439,7 @@ static HIMCC updateResultStr(HIMCC old, LPWSTR resultstr, DWORD len) &new_one->dwCompStrOffset, TRUE); new_one->dwCursorPos = lpcs->dwCursorPos; + new_one->dwDeltaStart = 0; current_offset = updateField(lpcs->dwResultReadClauseLen, lpcs->dwResultReadClauseOffset, @@ -861,6 +863,11 @@ LONG WINAPI ImmGetCompositionStringA( TRACE("GSC_CURSORPOS\n"); rc = compstr->dwCursorPos; } + else if (dwIndex == GCS_DELTASTART) + { + TRACE("GCS_DELTASTART\n"); + rc = compstr->dwDeltaStart; + } else { FIXME("Unhandled index 0x%x\n",dwIndex); @@ -955,6 +962,11 @@ LONG WINAPI ImmGetCompositionStringW( TRACE("GSC_CURSORPOS\n"); rc = compstr->dwCursorPos; } + else if (dwIndex == GCS_DELTASTART) + { + TRACE("GCS_DELTASTART\n"); + rc = compstr->dwDeltaStart; + } else { FIXME("Unhandled index 0x%x\n",dwIndex); @@ -1662,7 +1674,7 @@ BOOL WINAPI ImmSetCompositionStringW( root_context->IMC.hCompStr = newCompStr; wParam = ((const WCHAR*)lpComp)[0]; - flags |= GCS_COMPCLAUSE | GCS_COMPATTR; + flags |= GCS_COMPCLAUSE | GCS_COMPATTR | GCS_DELTASTART; } else {

1 0

Andrew Talbot : setupapi: Constify some variables.
by Alexandre Julliard Aug. 29, 2007

Aug. 29, 2007

Module: wine Branch: master Commit: 926a008ffbb70c05775fe4af9e3bdab68c09c141 URL: http://source.winehq.org/git/wine.git/?a=commit;h=926a008ffbb70c05775fe4af9… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Aug 29 07:19:48 2007 +0100 setupapi: Constify some variables. --- dlls/setupapi/virtcopy.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/virtcopy.c b/dlls/setupapi/virtcopy.c index cceca3c..782bb97 100644 --- a/dlls/setupapi/virtcopy.c +++ b/dlls/setupapi/virtcopy.c @@ -219,7 +219,8 @@ static LPVIRTNODE *pvnlist = NULL; static DWORD vn_num = 0; static DWORD vn_last = 0; -static RETERR16 VCP_VirtnodeCreate(LPVCPFILESPEC vfsSrc, LPVCPFILESPEC vfsDst, WORD fl, LPARAM lParam, LPEXPANDVTBL lpExpandVtbl) +static RETERR16 VCP_VirtnodeCreate(const VCPFILESPEC *vfsSrc, const VCPFILESPEC *vfsDst, + WORD fl, LPARAM lParam, LPEXPANDVTBL lpExpandVtbl) { HANDLE heap; LPVIRTNODE lpvn;

1 0

Mikolaj Zalewski : winex11.drv: Test for out-of-bound src coordinates in GdiAlphaBlend.
by Alexandre Julliard Aug. 29, 2007

Aug. 29, 2007

Module: wine Branch: master Commit: 9a72a865a24f4f0e43695fed48cddabd65832466 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a72a865a24f4f0e43695fed4… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Tue Aug 28 10:33:29 2007 -0700 winex11.drv: Test for out-of-bound src coordinates in GdiAlphaBlend. --- dlls/gdi32/tests/bitmap.c | 65 ++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/xrender.c | 8 +++++ 2 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 566545d..1ededdc 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -31,6 +31,8 @@ #include "wine/test.h" +#define expect_eq(expr, value, type, format) { type ret = (expr); ok((value) == ret, #expr " expected " format " got " format "\n", value, ret); } + static BOOL is_win9x; static INT BITMAP_GetWidthBytes( INT bmWidth, INT bpp ) @@ -1830,6 +1832,68 @@ static void test_get16dibits(void) ReleaseDC(NULL, screen_dc); } +void test_GdiAlphaBlend() +{ + /* test out-of-bound parameters for GdiAlphaBlend */ + HDC hdcNull = GetDC(NULL); + + HDC hdcDst = CreateCompatibleDC(hdcNull); + HBITMAP bmpDst = CreateCompatibleBitmap(hdcNull, 100, 100); + HBITMAP oldDst; + + BITMAPINFO bmi; + HDC hdcSrc = CreateCompatibleDC(hdcNull); + HBITMAP bmpSrc; + HBITMAP oldSrc; + LPVOID bits; + + BLENDFUNCTION blend; + + memset(&bmi, 0, sizeof(bmi)); /* as of Wine 0.9.44 we require the src to be a DIB section */ + bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); + bmi.bmiHeader.biHeight = 20; + bmi.bmiHeader.biWidth = 20; + bmi.bmiHeader.biBitCount = 32; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biCompression = BI_RGB; + bmpSrc = CreateDIBSection(hdcDst, &bmi, DIB_RGB_COLORS, &bits, NULL, 0); + ok(bmpSrc != NULL, "Couldn't create source bitmap\n"); + + oldDst = (HBITMAP)SelectObject(hdcDst, bmpDst); + oldSrc = (HBITMAP)SelectObject(hdcSrc, bmpSrc); + + blend.BlendOp = AC_SRC_OVER; + blend.BlendFlags = 0; + blend.SourceConstantAlpha = 128; + blend.AlphaFormat = 0; + + expect_eq(GdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, 0, 20, 20, blend), TRUE, BOOL, "%d"); + SetLastError(0xdeadbeef); + expect_eq(GdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, -1, 0, 10, 10, blend), FALSE, BOOL, "%d"); + expect_eq(GetLastError(), ERROR_INVALID_PARAMETER, int, "%d"); + expect_eq(GdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, -1, 10, 10, blend), FALSE, BOOL, "%d"); + expect_eq(GdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 15, 0, 10, 10, blend), FALSE, BOOL, "%d"); + expect_eq(GdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 10, 10, -2, 3, blend), FALSE, BOOL, "%d"); + expect_eq(GdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 10, 10, -2, 3, blend), FALSE, BOOL, "%d"); + + SetWindowOrgEx(hdcSrc, -10, -10, NULL); + expect_eq(GdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, -1, 0, 10, 10, blend), TRUE, BOOL, "%d"); + expect_eq(GdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, -1, 10, 10, blend), TRUE, BOOL, "%d"); + SetMapMode(hdcSrc, MM_ANISOTROPIC); + ScaleWindowExtEx(hdcSrc, 10, 1, 10, 1, NULL); + expect_eq(GdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, -1, 0, 30, 30, blend), TRUE, BOOL, "%d"); + expect_eq(GdiAlphaBlend(hdcDst, 0, 0, 20, 20, hdcSrc, 0, -1, 30, 30, blend), TRUE, BOOL, "%d"); + + SelectObject(hdcDst, oldDst); + SelectObject(hdcSrc, oldSrc); + DeleteObject(bmpSrc); + DeleteObject(bmpDst); + DeleteDC(hdcDst); + DeleteDC(hdcSrc); + + ReleaseDC(NULL, hdcNull); + +} START_TEST(bitmap) { @@ -1848,6 +1912,7 @@ START_TEST(bitmap) test_GetDIBits(); test_select_object(); test_CreateBitmap(); + test_GdiAlphaBlend(); test_bitmapinfoheadersize(); test_get16dibits(); } diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 8511f45..449c671 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1572,6 +1572,14 @@ BOOL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT widthDst, return FALSE; } + if (xSrc < 0 || ySrc < 0 || widthSrc < 0 || heightSrc < 0 || xSrc + widthSrc > dib.dsBmih.biWidth + || ySrc + heightSrc > abs(dib.dsBmih.biHeight)) + { + WARN("Invalid src coords: (%d,%d), size %dx%d\n", xSrc, ySrc, widthSrc, heightSrc); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if(dib.dsBm.bmBitsPixel != 32) { FIXME("not a 32 bpp dibsection\n"); return FALSE;

1 0

Juan Lang : wintrust: Use pfnAddStore2Chain internally.
by Alexandre Julliard Aug. 29, 2007

Aug. 29, 2007

Module: wine Branch: master Commit: a4d85d80a37967a57df85ee9b9d8be8a6fbb4e3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4d85d80a37967a57df85ee9b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 28 16:09:34 2007 -0700 wintrust: Use pfnAddStore2Chain internally. --- dlls/wintrust/softpub.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 4c8d356..4b6b33a 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -168,16 +168,8 @@ static BOOL SOFTPUB_CreateStoreFromMessage(CRYPT_PROVIDER_DATA *data) data->hProv, CERT_STORE_NO_CRYPT_RELEASE_FLAG, data->hMsg); if (store) { - data->pahStores = data->psPfns->pfnAlloc(sizeof(HCERTSTORE)); - if (data->pahStores) - { - data->chStores = 1; - data->pahStores[0] = CertDuplicateStore(store); - CertCloseStore(store, 0); - ret = TRUE; - } - else - SetLastError(ERROR_OUTOFMEMORY); + ret = data->psPfns->pfnAddStore2Chain(data, store); + CertCloseStore(store, 0); } TRACE("returning %d\n", ret); return ret;

1 0

Juan Lang : wintrust: Save signers of a message in SoftpubLoadSignature.
by Alexandre Julliard Aug. 29, 2007

Aug. 29, 2007

Module: wine Branch: master Commit: 5d7bffa5c7117dbdd3849b3141c69445cc8cf08c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d7bffa5c7117dbdd3849b314… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 28 16:10:41 2007 -0700 wintrust: Save signers of a message in SoftpubLoadSignature. --- dlls/wintrust/softpub.c | 103 +++++++++++++++++++++++++++++++++++----------- 1 files changed, 78 insertions(+), 25 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index caab601..b7c6d5d 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -292,6 +292,51 @@ error: return ret ? S_OK : S_FALSE; } +static CMSG_SIGNER_INFO *WINTRUST_GetSigner(CRYPT_PROVIDER_DATA *data, + DWORD signerIdx) +{ + BOOL ret; + CMSG_SIGNER_INFO *signerInfo = NULL; + DWORD size; + + ret = CryptMsgGetParam(data->hMsg, CMSG_SIGNER_INFO_PARAM, signerIdx, + NULL, &size); + if (ret) + { + signerInfo = data->psPfns->pfnAlloc(size); + if (signerInfo) + { + ret = CryptMsgGetParam(data->hMsg, CMSG_SIGNER_INFO_PARAM, + signerIdx, signerInfo, &size); + if (!ret) + { + data->psPfns->pfnFree(signerInfo); + signerInfo = NULL; + } + } + else + SetLastError(ERROR_OUTOFMEMORY); + } + return signerInfo; +} + +static BOOL WINTRUST_SaveSigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) +{ + BOOL ret; + CMSG_SIGNER_INFO *signerInfo = WINTRUST_GetSigner(data, signerIdx); + + if (signerInfo) + { + CRYPT_PROVIDER_SGNR sgnr = { sizeof(sgnr), { 0 } }; + + sgnr.psSigner = signerInfo; + ret = data->psPfns->pfnAddSgnr2Chain(data, FALSE, signerIdx, &sgnr); + } + else + ret = FALSE; + return ret; +} + static CERT_INFO *WINTRUST_GetSignerCertInfo(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) { @@ -320,6 +365,37 @@ static CERT_INFO *WINTRUST_GetSignerCertInfo(CRYPT_PROVIDER_DATA *data, return certInfo; } +static BOOL WINTRUST_VerifySigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) +{ + BOOL ret; + CERT_INFO *certInfo = WINTRUST_GetSignerCertInfo(data, signerIdx); + + if (certInfo) + { + CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA para = { sizeof(para), 0, signerIdx, + CMSG_VERIFY_SIGNER_CERT, NULL }; + + para.pvSigner = (LPVOID)CertGetSubjectCertificateFromStore( + data->pahStores[0], data->dwEncoding, certInfo); + if (para.pvSigner) + { + ret = CryptMsgControl(data->hMsg, 0, CMSG_CTRL_VERIFY_SIGNATURE_EX, + &para); + if (!ret) + SetLastError(TRUST_E_CERT_SIGNATURE); + } + else + { + SetLastError(TRUST_E_NO_SIGNER_CERT); + ret = FALSE; + } + data->psPfns->pfnFree(certInfo); + } + else + ret = FALSE; + return ret; +} + HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) { BOOL ret; @@ -339,31 +415,8 @@ HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) for (i = 0; ret && i < signerCount; i++) { - CERT_INFO *certInfo = WINTRUST_GetSignerCertInfo(data, i); - - if (certInfo) - { - CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA para = { sizeof(para), 0, i, - CMSG_VERIFY_SIGNER_CERT, NULL }; - - para.pvSigner = (LPVOID)CertGetSubjectCertificateFromStore( - data->pahStores[0], data->dwEncoding, certInfo); - if (para.pvSigner) - { - ret = CryptMsgControl(data->hMsg, 0, - CMSG_CTRL_VERIFY_SIGNATURE_EX, &para); - if (!ret) - SetLastError(TRUST_E_CERT_SIGNATURE); - } - else - { - SetLastError(TRUST_E_NO_SIGNER_CERT); - ret = FALSE; - } - data->psPfns->pfnFree(certInfo); - } - else - ret = FALSE; + if ((ret = WINTRUST_SaveSigner(data, i))) + ret = WINTRUST_VerifySigner(data, i); } } else

1 0