December 2012 - Wine-commits

Piotr Caban : msvcrt: Added _vfwprintf_l implementation.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: 48335be04eeea96f7f6b970694f5482a0b89523d URL: http://source.winehq.org/git/wine.git/?a=commit;h=48335be04eeea96f7f6b97069… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 12 11:16:32 2012 +0100 msvcrt: Added _vfwprintf_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 17 +++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 44123a3..877f76e 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1426,7 +1426,7 @@ @ stub _vfprintf_p @ stub _vfprintf_p_l @ stub _vfprintf_s_l -@ stub _vfwprintf_l +@ cdecl _vfwprintf_l(ptr wstr ptr ptr) msvcrt._vfwprintf_l @ stub _vfwprintf_p @ stub _vfwprintf_p_l @ stub _vfwprintf_s_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 91fe34a..d62590d 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1087,7 +1087,7 @@ @ stub _vfprintf_p @ stub _vfprintf_p_l @ stub _vfprintf_s_l -@ stub _vfwprintf_l +@ cdecl _vfwprintf_l(ptr wstr ptr ptr) msvcrt._vfwprintf_l @ stub _vfwprintf_p @ stub _vfwprintf_p_l @ stub _vfwprintf_s_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ae3dfa2..61b0340 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1081,7 +1081,7 @@ @ stub _vfprintf_p @ stub _vfprintf_p_l @ stub _vfprintf_s_l -@ stub _vfwprintf_l +@ cdecl _vfwprintf_l(ptr wstr ptr ptr) msvcrt._vfwprintf_l @ stub _vfwprintf_p @ stub _vfwprintf_p_l @ stub _vfwprintf_s_l diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index bca17d2..4b9abc9 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3858,6 +3858,23 @@ int CDECL MSVCRT_vfwprintf_s(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ } /********************************************************************* + * _vfwprintf_l (MSVCRT.@) + */ +int CDECL MSVCRT__vfwprintf_l(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, + MSVCRT__locale_t locale, __ms_va_list valist) +{ + int ret; + + if (!MSVCRT_CHECK_PMT( file != NULL )) return -1; + + MSVCRT__lock_file(file); + ret = pf_printf_w(puts_clbk_file_w, file, format, locale, FALSE, FALSE, arg_clbk_valist, NULL, &valist); + MSVCRT__unlock_file(file); + + return ret; +} + +/********************************************************************* * vprintf (MSVCRT.@) */ int CDECL MSVCRT_vprintf(const char *format, __ms_va_list valist) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6d46f82..f95219f 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1018,7 +1018,7 @@ # stub _vfprintf_p(ptr str ptr) # stub _vfprintf_p_l(ptr str ptr ptr) # stub _vfprintf_s_l(ptr str ptr ptr) -# stub _vfwprintf_l(ptr wstr ptr ptr) +@ cdecl _vfwprintf_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_l # stub _vfwprintf_p(ptr wstr ptr) # stub _vfwprintf_p_l(ptr wstr ptr ptr) # stub _vfwprintf_s_l(ptr wstr ptr ptr)

1 0

Piotr Caban : msvcrt: Added _fwprintf_l implementation.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: 3b41fab0e9341bdfdc511b9cdc8235dd2d9c724c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b41fab0e9341bdfdc511b9cd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 12 11:16:43 2012 +0100 msvcrt: Added _fwprintf_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 13 +++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 877f76e..b4c702c 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -854,7 +854,7 @@ @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime32(long ptr) msvcrt._futime32 @ cdecl _futime64(long ptr) msvcrt._futime64 -@ stub _fwprintf_l +@ varargs _fwprintf_l(ptr wstr ptr) msvcrt._fwprintf_l @ stub _fwprintf_p @ stub _fwprintf_p_l @ stub _fwprintf_s_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d62590d..b08208a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -508,7 +508,7 @@ @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime32(long ptr) msvcrt._futime32 @ cdecl _futime64(long ptr) msvcrt._futime64 -@ stub _fwprintf_l +@ varargs _fwprintf_l(ptr wstr ptr) msvcrt._fwprintf_l @ stub _fwprintf_p @ stub _fwprintf_p_l @ stub _fwprintf_s_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 61b0340..4729b76 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -503,7 +503,7 @@ @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime32(long ptr) msvcrt._futime32 @ cdecl _futime64(long ptr) msvcrt._futime64 -@ stub _fwprintf_l +@ varargs _fwprintf_l(ptr wstr ptr) msvcrt._fwprintf_l @ stub _fwprintf_p @ stub _fwprintf_p_l @ stub _fwprintf_s_l diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 4b9abc9..e157ede 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3959,6 +3959,19 @@ int CDECL MSVCRT_fwprintf_s(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, ... } /********************************************************************* + * _fwprintf_l (MSVCRT.@) + */ +int CDECL MSVCRT__fwprintf_l(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, ...) +{ + __ms_va_list valist; + int res; + __ms_va_start(valist, locale); + res = MSVCRT__vfwprintf_l(file, format, locale, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* * printf (MSVCRT.@) */ int CDECL MSVCRT_printf(const char *format, ...) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f95219f..db9e22f 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -462,7 +462,7 @@ @ cdecl _futime(long ptr) @ cdecl _futime32(long ptr) @ cdecl _futime64(long ptr) -# stub _fwprintf_l(ptr wstr ptr) +@ varargs _fwprintf_l(ptr wstr ptr) MSVCRT__fwprintf_l # stub _fwprintf_p(ptr wstr) # stub _fwprintf_p_l(ptr wstr ptr) # stub _fwprintf_s_l(ptr wstr ptr)

1 0

Andrew Talbot : comdlg32: Indentation fix.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: 309654f058cba1d6980f0e0903c124f4d0fe103e URL: http://source.winehq.org/git/wine.git/?a=commit;h=309654f058cba1d6980f0e090… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Dec 10 22:43:40 2012 +0000 comdlg32: Indentation fix. --- dlls/comdlg32/filedlg31.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index b52b23e..7f918ff 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -201,11 +201,11 @@ static BOOL FD31_ScanDir(const OPENFILENAMEW *ofn, HWND hWnd, LPCWSTR newPath) while (filter) { scptr = strchrW(filter, ';'); if (scptr) *scptr = 0; - while (*filter == ' ') filter++; + while (*filter == ' ') filter++; TRACE("Using file spec %s\n", debugstr_w(filter)); SendMessageW(hdlg, LB_DIR, 0, (LPARAM)filter); if (scptr) *scptr = ';'; - filter = (scptr) ? (scptr + 1) : 0; + filter = (scptr) ? (scptr + 1) : 0; } }

1 0

Andrew Talbot : comctl32: Indentation fix.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: 441780b2f1375f3cded9ba6f90718871b839f22b URL: http://source.winehq.org/git/wine.git/?a=commit;h=441780b2f1375f3cded9ba6f9… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Dec 10 22:43:34 2012 +0000 comctl32: Indentation fix. --- dlls/comctl32/treeview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 3b2f747..57cb70c 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1562,7 +1562,7 @@ TREEVIEW_DeleteItem(TREEVIEW_INFO *infoPtr, HTREEITEM item) newFirstVisible = item->prevSibling; else if (item->parent != infoPtr->root) newFirstVisible = item->parent; - TREEVIEW_SetFirstVisible(infoPtr, NULL, TRUE); + TREEVIEW_SetFirstVisible(infoPtr, NULL, TRUE); } else newFirstVisible = infoPtr->firstVisible;

1 0

Hans Leidekker : wininet: Don' t perform revocation checks when verifying a certificate.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: 59247cf9db6b73023eb8e0215a2a4b08a2e4144c URL: http://source.winehq.org/git/wine.git/?a=commit;h=59247cf9db6b73023eb8e0215… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 11 09:45:55 2012 +0100 wininet: Don't perform revocation checks when verifying a certificate. --- dlls/wininet/netconnection.c | 34 +++------------------------------- 1 files changed, 3 insertions(+), 31 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index a792a92..e7a3274 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -222,25 +222,19 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR PCCERT_CHAIN_CONTEXT chain; char oid_server_auth[] = szOID_PKIX_KP_SERVER_AUTH; char *server_auth[] = { oid_server_auth }; - DWORD err = ERROR_SUCCESS, chainFlags = 0, errors; + DWORD err = ERROR_SUCCESS, errors; static const DWORD supportedErrors = CERT_TRUST_IS_NOT_TIME_VALID | CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_PARTIAL_CHAIN | - CERT_TRUST_IS_OFFLINE_REVOCATION | - CERT_TRUST_REVOCATION_STATUS_UNKNOWN | - CERT_TRUST_IS_REVOKED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE; TRACE("verifying %s\n", debugstr_w(conn->server->name)); chainPara.RequestedUsage.Usage.cUsageIdentifier = 1; chainPara.RequestedUsage.Usage.rgpszUsageIdentifier = server_auth; - if (!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) - chainFlags |= CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT; - - if (!(ret = CertGetCertificateChain(NULL, cert, NULL, store, &chainPara, chainFlags, NULL, &chain))) { + if (!(ret = CertGetCertificateChain(NULL, cert, NULL, store, &chainPara, 0, NULL, &chain))) { TRACE("failed\n"); return GetLastError(); } @@ -249,7 +243,7 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR do { /* This seems strange, but that's what tests show */ - if(errors & (CERT_TRUST_IS_PARTIAL_CHAIN|CERT_TRUST_IS_OFFLINE_REVOCATION)) { + if(errors & CERT_TRUST_IS_PARTIAL_CHAIN) { WARN("ERROR_INTERNET_SEC_CERT_REV_FAILED\n"); err = ERROR_INTERNET_SEC_CERT_REV_FAILED; if(conn->mask_errors) @@ -300,28 +294,6 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR errors &= ~CERT_TRUST_IS_PARTIAL_CHAIN; } - if(errors & (CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN)) { - WARN("CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN\n"); - if(!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) { - err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_NO_REV; - if(!conn->mask_errors) - break; - conn->security_flags |= _SECURITY_FLAG_CERT_REV_FAILED; - } - errors &= ~(CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN); - } - - if(errors & CERT_TRUST_IS_REVOKED) { - WARN("CERT_TRUST_IS_REVOKED\n"); - if(!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) { - err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_REVOKED; - if(!conn->mask_errors) - break; - WARN("TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN, unknown error flags\n"); - } - errors &= ~CERT_TRUST_IS_REVOKED; - } - if(errors & CERT_TRUST_IS_NOT_VALID_FOR_USAGE) { WARN("CERT_TRUST_IS_NOT_VALID_FOR_USAGE\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_WRONG_USAGE)) {

1 0

Francois Gouget : wined3d: Remove a stray semi-colon from the spec file.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: 130cabbca6dd520d589f2e97614bd8b13289fd94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=130cabbca6dd520d589f2e976… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Dec 11 10:52:12 2012 +0100 wined3d: Remove a stray semi-colon from the spec file. --- dlls/wined3d/wined3d.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 1d6e2b3..3b39c41 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -154,7 +154,7 @@ @ cdecl wined3d_device_set_vs_consts_b(ptr long ptr long) @ cdecl wined3d_device_set_vs_consts_f(ptr long ptr long) @ cdecl wined3d_device_set_vs_consts_i(ptr long ptr long) -@ cdecl wined3d_device_set_vs_sampler(ptr long ptr); +@ cdecl wined3d_device_set_vs_sampler(ptr long ptr) @ cdecl wined3d_device_setup_fullscreen_window(ptr ptr long long) @ cdecl wined3d_device_show_cursor(ptr long) @ cdecl wined3d_device_uninit_3d(ptr)

1 0

Amine Khaldi : include: Define FIELD_OFFSET to the standard offsetof.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: e3dd01a264328b60bf2aa33fdab4be252315e0a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3dd01a264328b60bf2aa33fd… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Mon Dec 10 23:14:02 2012 +0100 include: Define FIELD_OFFSET to the standard offsetof. --- include/winnt.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 207adaa..5f753bc 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -746,8 +746,7 @@ typedef struct _MEMORY_BASIC_INFORMATION #define UNICODE_STRING_MAX_CHARS 32767 -#define FIELD_OFFSET(type, field) \ - ((LONG)(INT_PTR)&(((type *)0)->field)) +#define FIELD_OFFSET(type, field) ((LONG)offsetof(type, field)) #define CONTAINING_RECORD(address, type, field) \ ((type *)((PCHAR)(address) - (PCHAR)(&((type *)0)->field)))

1 0

Amine Khaldi : include: Define CONTAINING_RECORD using the standard offsetof.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: 649c982e60d312e0a539f0c20d6ee4f2ea37ba40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=649c982e60d312e0a539f0c20… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Mon Dec 10 23:15:36 2012 +0100 include: Define CONTAINING_RECORD using the standard offsetof. --- include/winnt.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 5f753bc..467b427 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -749,7 +749,7 @@ typedef struct _MEMORY_BASIC_INFORMATION #define FIELD_OFFSET(type, field) ((LONG)offsetof(type, field)) #define CONTAINING_RECORD(address, type, field) \ - ((type *)((PCHAR)(address) - (PCHAR)(&((type *)0)->field))) + ((type *)((PCHAR)(address) - offsetof(type, field))) /* Types */

1 0

Amine Khaldi : include: Define WINE_RB_ENTRY_VALUE using the standard offsetof.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: d6617e1ec52a64b556b2ae6e6c732c748b05a23e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6617e1ec52a64b556b2ae6e6… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Mon Dec 10 23:17:41 2012 +0100 include: Define WINE_RB_ENTRY_VALUE using the standard offsetof. --- include/wine/rbtree.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wine/rbtree.h b/include/wine/rbtree.h index de29d10..2276e30 100644 --- a/include/wine/rbtree.h +++ b/include/wine/rbtree.h @@ -23,7 +23,7 @@ #define __WINE_WINE_RBTREE_H #define WINE_RB_ENTRY_VALUE(element, type, field) \ - ((type *)((char *)(element) - FIELD_OFFSET(type, field))) + ((type *)((char *)(element) - offsetof(type, field))) struct wine_rb_entry {

1 0

Amine Khaldi : include: Define LIST_ENTRY using the standard offsetof.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Module: wine Branch: master Commit: 9b4e92a6f153ed4139c8e8c54b6bb0213a66bfc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b4e92a6f153ed4139c8e8c54… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Mon Dec 10 23:16:46 2012 +0100 include: Define LIST_ENTRY using the standard offsetof. --- include/wine/list.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/wine/list.h b/include/wine/list.h index 9712603..b4d681f 100644 --- a/include/wine/list.h +++ b/include/wine/list.h @@ -21,6 +21,8 @@ #ifndef __WINE_SERVER_LIST_H #define __WINE_SERVER_LIST_H +#include <stddef.h> + struct list { struct list *next; @@ -227,6 +229,6 @@ static inline void list_move_head( struct list *dst, struct list *src ) /* get pointer to object containing list element */ #undef LIST_ENTRY #define LIST_ENTRY(elem, type, field) \ - ((type *)((char *)(elem) - (size_t)(&((type *)0)->field))) + ((type *)((char *)(elem) - offsetof(type, field))) #endif /* __WINE_SERVER_LIST_H */

1 0