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

Dmitry Timoshkov : ntdll: Do not leave not initialized cached timezone information if a timezone doesn 't have daylight saving rules.
by Alexandre Julliard 29 Aug '07

29 Aug '07

Module: wine Branch: master Commit: a76ef05c9057e7e5d712d2c3626b90df10a12769 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a76ef05c9057e7e5d712d2c36… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Aug 29 18:56:52 2007 +0900 ntdll: Do not leave not initialized cached timezone information if a timezone doesn't have daylight saving rules. --- dlls/kernel32/tests/time.c | 6 ++- dlls/ntdll/time.c | 88 +++++++++++++++++++++---------------------- 2 files changed, 48 insertions(+), 46 deletions(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index cf557ab..eaf4f7d 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -21,6 +21,7 @@ #include "wine/test.h" #include "winbase.h" +#include "winnls.h" static BOOL (WINAPI *pTzSpecificLocalTimeToSystemTime)(LPTIME_ZONE_INFORMATION, LPSYSTEMTIME, LPSYSTEMTIME); static BOOL (WINAPI *pSystemTimeToTzSpecificLocalTime)(LPTIME_ZONE_INFORMATION, LPSYSTEMTIME, LPSYSTEMTIME); @@ -221,6 +222,7 @@ static LONG get_tz_bias(const TIME_ZONE_INFORMATION *tzinfo, DWORD tz_id) static void test_GetTimeZoneInformation(void) { + char std_name[32], dlt_name[32]; TIME_ZONE_INFORMATION tzinfo, tzinfo1; BOOL res; DWORD tz_id; @@ -252,7 +254,9 @@ static void test_GetTimeZoneInformation(void) (tz_id == TIME_ZONE_ID_UNKNOWN ? "TIME_ZONE_ID_UNKNOWN" : "TIME_ZONE_ID_INVALID"))); - trace("bias %d\n", tzinfo.Bias); + WideCharToMultiByte(CP_ACP, 0, tzinfo.StandardName, -1, std_name, sizeof(std_name), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, tzinfo.DaylightName, -1, dlt_name, sizeof(dlt_name), NULL, NULL); + trace("bias %d, %s - %s\n", tzinfo.Bias, std_name, dlt_name); trace("standard (d/m/y): %u/%02u/%04u day of week %u %u:%02u:%02u.%03u bias %d\n", tzinfo.StandardDate.wDay, tzinfo.StandardDate.wMonth, tzinfo.StandardDate.wYear, tzinfo.StandardDate.wDayOfWeek, diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 36b1ef5..957d587 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -787,54 +787,52 @@ static int init_tz_info(RTL_TIME_ZONE_INFORMATION *tzi) TRACE("dlt: %s", ctime(&dlt)); if (dlt == std || !dlt || !std) - { - RtlLeaveCriticalSection( &TIME_tz_section ); TRACE("there is no daylight saving rules in this time zone\n"); - return 0; + else + { + tmp = dlt - tzi->Bias * 60; + tm = gmtime(&tmp); + TRACE("dlt gmtime: %s", asctime(tm)); + + tzi->DaylightBias = -60; + tzi->DaylightDate.wYear = tm->tm_year + 1900; + tzi->DaylightDate.wMonth = tm->tm_mon + 1; + tzi->DaylightDate.wDayOfWeek = tm->tm_wday; + tzi->DaylightDate.wDay = tm->tm_mday; + tzi->DaylightDate.wHour = tm->tm_hour; + tzi->DaylightDate.wMinute = tm->tm_min; + tzi->DaylightDate.wSecond = tm->tm_sec; + tzi->DaylightDate.wMilliseconds = 0; + + TRACE("daylight (d/m/y): %u/%02u/%04u day of week %u %u:%02u:%02u.%03u bias %d\n", + tzi->DaylightDate.wDay, tzi->DaylightDate.wMonth, + tzi->DaylightDate.wYear, tzi->DaylightDate.wDayOfWeek, + tzi->DaylightDate.wHour, tzi->DaylightDate.wMinute, + tzi->DaylightDate.wSecond, tzi->DaylightDate.wMilliseconds, + tzi->DaylightBias); + + tmp = std - tzi->Bias * 60 - tzi->DaylightBias * 60; + tm = gmtime(&tmp); + TRACE("std gmtime: %s", asctime(tm)); + + tzi->StandardBias = 0; + tzi->StandardDate.wYear = tm->tm_year + 1900; + tzi->StandardDate.wMonth = tm->tm_mon + 1; + tzi->StandardDate.wDayOfWeek = tm->tm_wday; + tzi->StandardDate.wDay = tm->tm_mday; + tzi->StandardDate.wHour = tm->tm_hour; + tzi->StandardDate.wMinute = tm->tm_min; + tzi->StandardDate.wSecond = tm->tm_sec; + tzi->StandardDate.wMilliseconds = 0; + + TRACE("standard (d/m/y): %u/%02u/%04u day of week %u %u:%02u:%02u.%03u bias %d\n", + tzi->StandardDate.wDay, tzi->StandardDate.wMonth, + tzi->StandardDate.wYear, tzi->StandardDate.wDayOfWeek, + tzi->StandardDate.wHour, tzi->StandardDate.wMinute, + tzi->StandardDate.wSecond, tzi->StandardDate.wMilliseconds, + tzi->StandardBias); } - tmp = dlt - tzi->Bias * 60; - tm = gmtime(&tmp); - TRACE("dlt gmtime: %s", asctime(tm)); - - tzi->DaylightBias = -60; - tzi->DaylightDate.wYear = tm->tm_year + 1900; - tzi->DaylightDate.wMonth = tm->tm_mon + 1; - tzi->DaylightDate.wDayOfWeek = tm->tm_wday; - tzi->DaylightDate.wDay = tm->tm_mday; - tzi->DaylightDate.wHour = tm->tm_hour; - tzi->DaylightDate.wMinute = tm->tm_min; - tzi->DaylightDate.wSecond = tm->tm_sec; - tzi->DaylightDate.wMilliseconds = 0; - - TRACE("daylight (d/m/y): %u/%02u/%04u day of week %u %u:%02u:%02u.%03u bias %d\n", - tzi->DaylightDate.wDay, tzi->DaylightDate.wMonth, - tzi->DaylightDate.wYear, tzi->DaylightDate.wDayOfWeek, - tzi->DaylightDate.wHour, tzi->DaylightDate.wMinute, - tzi->DaylightDate.wSecond, tzi->DaylightDate.wMilliseconds, - tzi->DaylightBias); - - tmp = std - tzi->Bias * 60 - tzi->DaylightBias * 60; - tm = gmtime(&tmp); - TRACE("std gmtime: %s", asctime(tm)); - - tzi->StandardBias = 0; - tzi->StandardDate.wYear = tm->tm_year + 1900; - tzi->StandardDate.wMonth = tm->tm_mon + 1; - tzi->StandardDate.wDayOfWeek = tm->tm_wday; - tzi->StandardDate.wDay = tm->tm_mday; - tzi->StandardDate.wHour = tm->tm_hour; - tzi->StandardDate.wMinute = tm->tm_min; - tzi->StandardDate.wSecond = tm->tm_sec; - tzi->StandardDate.wMilliseconds = 0; - - TRACE("standard (d/m/y): %u/%02u/%04u day of week %u %u:%02u:%02u.%03u bias %d\n", - tzi->StandardDate.wDay, tzi->StandardDate.wMonth, - tzi->StandardDate.wYear, tzi->StandardDate.wDayOfWeek, - tzi->StandardDate.wHour, tzi->StandardDate.wMinute, - tzi->StandardDate.wSecond, tzi->StandardDate.wMilliseconds, - tzi->StandardBias); - find_reg_tz_info(tzi); cached_tzi = *tzi;

1 0

Juan Lang : winerror.h: Add more error definitions.
by Alexandre Julliard 29 Aug '07

29 Aug '07

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

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

29 Aug '07

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

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

29 Aug '07

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

Alexandre Julliard : winex11: Tool windows should not have WM decorations.
by Alexandre Julliard 29 Aug '07

29 Aug '07

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

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

29 Aug '07

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

Andrew Talbot : setupapi: Constify some variables.
by Alexandre Julliard 29 Aug '07

29 Aug '07

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

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

29 Aug '07

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

Juan Lang : wintrust: Test and implement pfnAddStore2Chain.
by Alexandre Julliard 29 Aug '07

29 Aug '07

Module: wine Branch: master Commit: 150ddd6bd48540dbf5bd92f3bd9b94fc7f605564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=150ddd6bd48540dbf5bd92f3b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 28 15:59:18 2007 -0700 wintrust: Test and implement pfnAddStore2Chain. --- dlls/wintrust/register.c | 2 +- dlls/wintrust/tests/softpub.c | 60 ++++++++++++++++++++++++++++++++--------- dlls/wintrust/wintrust_main.c | 22 +++++++++++++++ dlls/wintrust/wintrust_priv.h | 1 + 4 files changed, 71 insertions(+), 14 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index 1f0054b..0a02ed2 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -836,7 +836,7 @@ BOOL WINAPI WintrustLoadFunctionPointers( GUID* pgActionID, /* Get the function pointers from the registry, where applicable */ pPfns->pfnAlloc = WINTRUST_Alloc; pPfns->pfnFree = WINTRUST_Free; - pPfns->pfnAddStore2Chain = NULL; + pPfns->pfnAddStore2Chain = WINTRUST_AddStore; pPfns->pfnAddSgnr2Chain = NULL; pPfns->pfnAddCert2Chain = NULL; pPfns->pfnAddPrivData2Chain = NULL; diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 5df430b..1eb967a 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -74,6 +74,52 @@ typedef struct _SAFE_PROVIDER_FUNCTIONS SAFE_PROVIDER_CLEANUP_CALL pfnCleanupPolicy; } SAFE_PROVIDER_FUNCTIONS; +static const BYTE v1CertWithPubKey[] = { +0x30,0x81,0x95,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30, +0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61, +0x6e,0x67,0x00,0x30,0x22,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31, +0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31, +0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x30,0x15,0x31,0x13,0x30,0x11, +0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e, +0x67,0x00,0x30,0x22,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01, +0x01,0x01,0x05,0x00,0x03,0x11,0x00,0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07, +0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0xa3,0x16,0x30,0x14,0x30,0x12,0x06, +0x03,0x55,0x1d,0x13,0x01,0x01,0xff,0x04,0x08,0x30,0x06,0x01,0x01,0xff,0x02, +0x01,0x01 }; + +static void test_utils(SAFE_PROVIDER_FUNCTIONS *funcs) +{ + CRYPT_PROVIDER_DATA data = { 0 }; + HCERTSTORE store; + BOOL ret; + + /* Crash + ret = funcs->pfnAddStore2Chain(NULL, NULL); + ret = funcs->pfnAddStore2Chain(&data, NULL); + */ + store = CertOpenStore(CERT_STORE_PROV_MEMORY, X509_ASN_ENCODING, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + if (store) + { + ret = funcs->pfnAddStore2Chain(&data, store); + ok(ret, "pfnAddStore2Chain failed: %08x\n", GetLastError()); + ok(data.chStores == 1, "Expected 1 store, got %d\n", data.chStores); + ok(data.pahStores != NULL, "Expected pahStores to be allocated\n"); + if (data.pahStores) + { + ok(data.pahStores[0] == store, "Unexpected store\n"); + CertCloseStore(data.pahStores[0], 0); + funcs->pfnFree(data.pahStores); + data.pahStores = NULL; + data.chStores = 0; + CertCloseStore(store, 0); + store = NULL; + } + } + else + skip("CertOpenStore failed: %08x\n", GetLastError()); +} + static void testInitialize(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) { HRESULT ret; @@ -115,19 +161,6 @@ static void testInitialize(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) } } -static const BYTE v1CertWithPubKey[] = { -0x30,0x81,0x95,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30, -0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61, -0x6e,0x67,0x00,0x30,0x22,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31, -0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31, -0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x30,0x15,0x31,0x13,0x30,0x11, -0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e, -0x67,0x00,0x30,0x22,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01, -0x01,0x01,0x05,0x00,0x03,0x11,0x00,0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07, -0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0xa3,0x16,0x30,0x14,0x30,0x12,0x06, -0x03,0x55,0x1d,0x13,0x01,0x01,0xff,0x04,0x08,0x30,0x06,0x01,0x01,0xff,0x02, -0x01,0x01 }; - static void testObjTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) { HRESULT ret; @@ -216,6 +249,7 @@ START_TEST(softpub) skip("WintrustLoadFunctionPointers failed\n"); else { + test_utils(&funcs); testInitialize(&funcs, &generic_verify_v2); testObjTrust(&funcs, &generic_verify_v2); } diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 4b0c8ff..6ecfb1d 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -230,3 +230,25 @@ void WINAPI WINTRUST_Free(void *p) { HeapFree(GetProcessHeap(), 0, p); } + +BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store) +{ + BOOL ret = FALSE; + + if (data->chStores) + data->pahStores = WINTRUST_ReAlloc(data->pahStores, + (data->chStores + 1) * sizeof(HCERTSTORE)); + else + { + data->pahStores = WINTRUST_Alloc(sizeof(HCERTSTORE)); + data->chStores = 0; + } + if (data->pahStores) + { + data->pahStores[data->chStores++] = CertDuplicateStore(store); + ret = TRUE; + } + else + SetLastError(ERROR_OUTOFMEMORY); + return ret; +} diff --git a/dlls/wintrust/wintrust_priv.h b/dlls/wintrust/wintrust_priv.h index dc6a873..40f2e5d 100644 --- a/dlls/wintrust/wintrust_priv.h +++ b/dlls/wintrust/wintrust_priv.h @@ -21,5 +21,6 @@ void * WINAPI WINTRUST_Alloc(DWORD cb); void * WINAPI WINTRUST_ReAlloc(void *ptr, DWORD cb); void WINAPI WINTRUST_Free(void *p); +BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store); #endif /* ndef __WINTRUST_PRIV_H__ */

1 0

Juan Lang : wintrust: Test and implement pfnAddSgnr2Chain.
by Alexandre Julliard 29 Aug '07

29 Aug '07

Module: wine Branch: master Commit: 8c34271aaa54165e8b9ecb1395b0836e3de9388a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c34271aaa54165e8b9ecb139… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 28 16:07:30 2007 -0700 wintrust: Test and implement pfnAddSgnr2Chain. --- dlls/wintrust/register.c | 2 +- dlls/wintrust/tests/softpub.c | 39 +++++++++++++++++++++++++++++++ dlls/wintrust/wintrust_main.c | 51 +++++++++++++++++++++++++++++++++++++++++ dlls/wintrust/wintrust_priv.h | 2 + 4 files changed, 93 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index 0a02ed2..9b97d9c 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -837,7 +837,7 @@ BOOL WINAPI WintrustLoadFunctionPointers( GUID* pgActionID, pPfns->pfnAlloc = WINTRUST_Alloc; pPfns->pfnFree = WINTRUST_Free; pPfns->pfnAddStore2Chain = WINTRUST_AddStore; - pPfns->pfnAddSgnr2Chain = NULL; + pPfns->pfnAddSgnr2Chain = WINTRUST_AddSgnr; pPfns->pfnAddCert2Chain = NULL; pPfns->pfnAddPrivData2Chain = NULL; pPfns->psUIpfns = NULL; diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 1eb967a..b1ca23a 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -91,6 +91,7 @@ static void test_utils(SAFE_PROVIDER_FUNCTIONS *funcs) { CRYPT_PROVIDER_DATA data = { 0 }; HCERTSTORE store; + CRYPT_PROVIDER_SGNR sgnr = { 0 }; BOOL ret; /* Crash @@ -118,6 +119,44 @@ static void test_utils(SAFE_PROVIDER_FUNCTIONS *funcs) } else skip("CertOpenStore failed: %08x\n", GetLastError()); + + /* Crash + ret = funcs->pfnAddSgnr2Chain(NULL, FALSE, 0, NULL); + ret = funcs->pfnAddSgnr2Chain(&data, FALSE, 0, NULL); + */ + ret = funcs->pfnAddSgnr2Chain(&data, FALSE, 0, &sgnr); + ok(ret, "pfnAddSgnr2Chain failed: %08x\n", GetLastError()); + ok(data.csSigners == 1, "Expected 1 signer, got %d\n", data.csSigners); + ok(data.pasSigners != NULL, "Expected pasSigners to be allocated\n"); + if (data.pasSigners) + { + ok(!memcmp(&data.pasSigners[0], &sgnr, sizeof(sgnr)), + "Unexpected data in signer\n"); + /* Adds into the location specified by the index */ + sgnr.cbStruct = sizeof(CRYPT_PROVIDER_SGNR); + sgnr.sftVerifyAsOf.dwLowDateTime = 0xdeadbeef; + ret = funcs->pfnAddSgnr2Chain(&data, FALSE, 1, &sgnr); + ok(ret, "pfnAddSgnr2Chain failed: %08x\n", GetLastError()); + ok(data.csSigners == 2, "Expected 2 signers, got %d\n", data.csSigners); + ok(!memcmp(&data.pasSigners[1], &sgnr, sizeof(sgnr)), + "Unexpected data in signer\n"); + /* This also adds, but the data aren't copied */ + sgnr.cbStruct = sizeof(DWORD); + ret = funcs->pfnAddSgnr2Chain(&data, FALSE, 0, &sgnr); + ok(ret, "pfnAddSgnr2Chain failed: %08x\n", GetLastError()); + ok(data.csSigners == 3, "Expected 3 signers, got %d\n", data.csSigners); + ok(data.pasSigners[0].cbStruct == 0, "Unexpected data size %d\n", + data.pasSigners[0].cbStruct); + ok(data.pasSigners[0].sftVerifyAsOf.dwLowDateTime == 0, + "Unexpected verify time %d\n", + data.pasSigners[0].sftVerifyAsOf.dwLowDateTime); + /* But too large a thing isn't added */ + sgnr.cbStruct = sizeof(sgnr) + sizeof(DWORD); + SetLastError(0xdeadbeef); + ret = funcs->pfnAddSgnr2Chain(&data, FALSE, 0, &sgnr); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } } static void testInitialize(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 6ecfb1d..0f6dcd6 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -252,3 +252,54 @@ BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store) SetLastError(ERROR_OUTOFMEMORY); return ret; } + +BOOL WINAPI WINTRUST_AddSgnr(CRYPT_PROVIDER_DATA *data, + BOOL fCounterSigner, DWORD idxSigner, CRYPT_PROVIDER_SGNR *sgnr) +{ + BOOL ret = FALSE; + + if (sgnr->cbStruct > sizeof(CRYPT_PROVIDER_SGNR)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (fCounterSigner) + { + FIXME("unimplemented for counter signers\n"); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (data->csSigners) + data->pasSigners = WINTRUST_ReAlloc(data->pasSigners, + (data->csSigners + 1) * sizeof(CRYPT_PROVIDER_SGNR)); + else + { + data->pasSigners = WINTRUST_Alloc(sizeof(CRYPT_PROVIDER_SGNR)); + data->csSigners = 0; + } + if (data->pasSigners) + { + if (idxSigner < data->csSigners) + memmove(&data->pasSigners[idxSigner], + &data->pasSigners[idxSigner + 1], + (data->csSigners - idxSigner) * sizeof(CRYPT_PROVIDER_SGNR)); + ret = TRUE; + if (sgnr->cbStruct == sizeof(CRYPT_PROVIDER_SGNR)) + { + /* The PSDK says psSigner should be allocated using pfnAlloc, but + * it doesn't say anything about ownership. Since callers are + * internal, assume ownership is passed, and just store the + * pointer. + */ + memcpy(&data->pasSigners[idxSigner], sgnr, + sizeof(CRYPT_PROVIDER_SGNR)); + } + else + memset(&data->pasSigners[idxSigner], 0, + sizeof(CRYPT_PROVIDER_SGNR)); + data->csSigners++; + } + else + SetLastError(ERROR_OUTOFMEMORY); + return ret; +} diff --git a/dlls/wintrust/wintrust_priv.h b/dlls/wintrust/wintrust_priv.h index 40f2e5d..75b0438 100644 --- a/dlls/wintrust/wintrust_priv.h +++ b/dlls/wintrust/wintrust_priv.h @@ -22,5 +22,7 @@ void * WINAPI WINTRUST_Alloc(DWORD cb); void * WINAPI WINTRUST_ReAlloc(void *ptr, DWORD cb); void WINAPI WINTRUST_Free(void *p); BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store); +BOOL WINAPI WINTRUST_AddSgnr(CRYPT_PROVIDER_DATA *data, + BOOL fCounterSigner, DWORD idxSigner, CRYPT_PROVIDER_SGNR *sgnr); #endif /* ndef __WINTRUST_PRIV_H__ */

1 0