wine-commits May 2013

wine-commits@winehq.org

2 participants
498 discussions

Hans Leidekker : winhttp: Get rid of the flags parameter to netconn_send.
by Alexandre Julliard 01 May '13

01 May '13

Module: wine Branch: master Commit: 52ef52e08502567c3c2f0f28f2d9b8d1f620b97f URL: http://source.winehq.org/git/wine.git/?a=commit;h=52ef52e08502567c3c2f0f28f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 1 12:12:45 2013 +0200 winhttp: Get rid of the flags parameter to netconn_send. --- dlls/winhttp/net.c | 6 ++---- dlls/winhttp/request.c | 8 ++++---- dlls/winhttp/winhttp_private.h | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 415511e..6d9b82a 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -531,7 +531,7 @@ static BOOL send_ssl_chunk(netconn_t *conn, const void *msg, size_t size) return TRUE; } -BOOL netconn_send( netconn_t *conn, const void *msg, size_t len, int flags, int *sent ) +BOOL netconn_send( netconn_t *conn, const void *msg, size_t len, int *sent ) { if (!netconn_connected( conn )) return FALSE; if (conn->secure) @@ -539,8 +539,6 @@ BOOL netconn_send( netconn_t *conn, const void *msg, size_t len, int flags, int const BYTE *ptr = msg; size_t chunk_size; - if (flags) FIXME("flags %08x not supported in SSL\n", flags); - *sent = 0; while(len) { @@ -555,7 +553,7 @@ BOOL netconn_send( netconn_t *conn, const void *msg, size_t len, int flags, int return TRUE; } - if ((*sent = send( conn->socket, msg, len, flags )) == -1) + if ((*sent = send( conn->socket, msg, len, 0 )) == -1) { set_last_error( sock_get_error( errno ) ); return FALSE; diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 861ddef..3238aa5 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -900,7 +900,7 @@ static BOOL secure_proxy_connect( request_t *request ) { int len = strlen( req_ascii ), bytes_sent; - ret = netconn_send( &request->netconn, req_ascii, len, 0, &bytes_sent ); + ret = netconn_send( &request->netconn, req_ascii, len, &bytes_sent ); heap_free( req_ascii ); if (ret) ret = read_reply( request ); @@ -1120,13 +1120,13 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST, NULL, 0 ); - ret = netconn_send( &request->netconn, req_ascii, len, 0, &bytes_sent ); + ret = netconn_send( &request->netconn, req_ascii, len, &bytes_sent ); heap_free( req_ascii ); if (!ret) goto end; if (optional_len) { - if (!netconn_send( &request->netconn, optional, optional_len, 0, &bytes_sent )) goto end; + if (!netconn_send( &request->netconn, optional, optional_len, &bytes_sent )) goto end; request->optional = optional; request->optional_len = optional_len; len += optional_len; @@ -2494,7 +2494,7 @@ static BOOL write_data( request_t *request, LPCVOID buffer, DWORD to_write, LPDW BOOL ret; int num_bytes; - ret = netconn_send( &request->netconn, buffer, to_write, 0, &num_bytes ); + ret = netconn_send( &request->netconn, buffer, to_write, &num_bytes ); if (async) { diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index f3e9496..bd50108 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -268,7 +268,7 @@ BOOL netconn_query_data_available( netconn_t *, DWORD * ) DECLSPEC_HIDDEN; BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ) DECLSPEC_HIDDEN; BOOL netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr *, socklen_t *, int ) DECLSPEC_HIDDEN; BOOL netconn_secure_connect( netconn_t *, WCHAR * ) DECLSPEC_HIDDEN; -BOOL netconn_send( netconn_t *, const void *, size_t, int, int * ) DECLSPEC_HIDDEN; +BOOL netconn_send( netconn_t *, const void *, size_t, int * ) DECLSPEC_HIDDEN; DWORD netconn_set_timeout( netconn_t *, BOOL, int ) DECLSPEC_HIDDEN; const void *netconn_get_certificate( netconn_t * ) DECLSPEC_HIDDEN; int netconn_get_cipher_strength( netconn_t * ) DECLSPEC_HIDDEN;

1 0

Rico Schüller : d3dx9: Remove unneeded variables.
by Alexandre Julliard 01 May '13

01 May '13

Module: wine Branch: master Commit: ae0d8b5e593db5498b2880b9374e4716f6ab9e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae0d8b5e593db5498b2880b93… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed May 1 11:27:26 2013 +0200 d3dx9: Remove unneeded variables. --- dlls/d3dx9_36/math.c | 116 ++++++++++++++++++++++++++------------------------ 1 files changed, 60 insertions(+), 56 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index b60cb89..43911e9 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -348,66 +348,70 @@ D3DXMATRIX* WINAPI D3DXMatrixInverse(D3DXMATRIX *pout, FLOAT *pdeterminant, cons return pout; } -D3DXMATRIX* WINAPI D3DXMatrixLookAtLH(D3DXMATRIX *pout, const D3DXVECTOR3 *peye, const D3DXVECTOR3 *pat, const D3DXVECTOR3 *pup) -{ - D3DXVECTOR3 right, rightn, up, upn, vec, vec2; - - TRACE("pout %p, peye %p, pat %p, pup %p\n", pout, peye, pat, pup); - - D3DXVec3Subtract(&vec2, pat, peye); - D3DXVec3Normalize(&vec, &vec2); - D3DXVec3Cross(&right, pup, &vec); - D3DXVec3Cross(&up, &vec, &right); - D3DXVec3Normalize(&rightn, &right); - D3DXVec3Normalize(&upn, &up); - pout->u.m[0][0] = rightn.x; - pout->u.m[1][0] = rightn.y; - pout->u.m[2][0] = rightn.z; - pout->u.m[3][0] = -D3DXVec3Dot(&rightn,peye); - pout->u.m[0][1] = upn.x; - pout->u.m[1][1] = upn.y; - pout->u.m[2][1] = upn.z; - pout->u.m[3][1] = -D3DXVec3Dot(&upn, peye); - pout->u.m[0][2] = vec.x; - pout->u.m[1][2] = vec.y; - pout->u.m[2][2] = vec.z; - pout->u.m[3][2] = -D3DXVec3Dot(&vec, peye); - pout->u.m[0][3] = 0.0f; - pout->u.m[1][3] = 0.0f; - pout->u.m[2][3] = 0.0f; - pout->u.m[3][3] = 1.0f; - return pout; +D3DXMATRIX * WINAPI D3DXMatrixLookAtLH(D3DXMATRIX *out, const D3DXVECTOR3 *eye, const D3DXVECTOR3 *at, + const D3DXVECTOR3 *up) +{ + D3DXVECTOR3 right, upn, vec; + + TRACE("out %p, eye %p, at %p, up %p\n", out, eye, at, up); + + D3DXVec3Subtract(&vec, at, eye); + D3DXVec3Normalize(&vec, &vec); + D3DXVec3Cross(&right, up, &vec); + D3DXVec3Cross(&upn, &vec, &right); + D3DXVec3Normalize(&right, &right); + D3DXVec3Normalize(&upn, &upn); + out->u.m[0][0] = right.x; + out->u.m[1][0] = right.y; + out->u.m[2][0] = right.z; + out->u.m[3][0] = -D3DXVec3Dot(&right, eye); + out->u.m[0][1] = upn.x; + out->u.m[1][1] = upn.y; + out->u.m[2][1] = upn.z; + out->u.m[3][1] = -D3DXVec3Dot(&upn, eye); + out->u.m[0][2] = vec.x; + out->u.m[1][2] = vec.y; + out->u.m[2][2] = vec.z; + out->u.m[3][2] = -D3DXVec3Dot(&vec, eye); + out->u.m[0][3] = 0.0f; + out->u.m[1][3] = 0.0f; + out->u.m[2][3] = 0.0f; + out->u.m[3][3] = 1.0f; + + return out; } -D3DXMATRIX* WINAPI D3DXMatrixLookAtRH(D3DXMATRIX *pout, const D3DXVECTOR3 *peye, const D3DXVECTOR3 *pat, const D3DXVECTOR3 *pup) -{ - D3DXVECTOR3 right, rightn, up, upn, vec, vec2; - - TRACE("pout %p, peye %p, pat %p, pup %p\n", pout, peye, pat, pup); - - D3DXVec3Subtract(&vec2, pat, peye); - D3DXVec3Normalize(&vec, &vec2); - D3DXVec3Cross(&right, pup, &vec); - D3DXVec3Cross(&up, &vec, &right); - D3DXVec3Normalize(&rightn, &right); - D3DXVec3Normalize(&upn, &up); - pout->u.m[0][0] = -rightn.x; - pout->u.m[1][0] = -rightn.y; - pout->u.m[2][0] = -rightn.z; - pout->u.m[3][0] = D3DXVec3Dot(&rightn,peye); - pout->u.m[0][1] = upn.x; - pout->u.m[1][1] = upn.y; - pout->u.m[2][1] = upn.z; - pout->u.m[3][1] = -D3DXVec3Dot(&upn, peye); - pout->u.m[0][2] = -vec.x; - pout->u.m[1][2] = -vec.y; - pout->u.m[2][2] = -vec.z; - pout->u.m[3][2] = D3DXVec3Dot(&vec, peye); - pout->u.m[0][3] = 0.0f; - pout->u.m[1][3] = 0.0f; - pout->u.m[2][3] = 0.0f; - pout->u.m[3][3] = 1.0f; - return pout; +D3DXMATRIX * WINAPI D3DXMatrixLookAtRH(D3DXMATRIX *out, const D3DXVECTOR3 *eye, const D3DXVECTOR3 *at, + const D3DXVECTOR3 *up) +{ + D3DXVECTOR3 right, upn, vec; + + TRACE("out %p, eye %p, at %p, up %p\n", out, eye, at, up); + + D3DXVec3Subtract(&vec, at, eye); + D3DXVec3Normalize(&vec, &vec); + D3DXVec3Cross(&right, up, &vec); + D3DXVec3Cross(&upn, &vec, &right); + D3DXVec3Normalize(&right, &right); + D3DXVec3Normalize(&upn, &upn); + out->u.m[0][0] = -right.x; + out->u.m[1][0] = -right.y; + out->u.m[2][0] = -right.z; + out->u.m[3][0] = D3DXVec3Dot(&right, eye); + out->u.m[0][1] = upn.x; + out->u.m[1][1] = upn.y; + out->u.m[2][1] = upn.z; + out->u.m[3][1] = -D3DXVec3Dot(&upn, eye); + out->u.m[0][2] = -vec.x; + out->u.m[1][2] = -vec.y; + out->u.m[2][2] = -vec.z; + out->u.m[3][2] = D3DXVec3Dot(&vec, eye); + out->u.m[0][3] = 0.0f; + out->u.m[1][3] = 0.0f; + out->u.m[2][3] = 0.0f; + out->u.m[3][3] = 1.0f; + + return out; } D3DXMATRIX* WINAPI D3DXMatrixMultiply(D3DXMATRIX *pout, const D3DXMATRIX *pm1, const D3DXMATRIX *pm2)

1 0

Alexandre Julliard : configure: Add rules for building libwine without soname on Android.
by Alexandre Julliard 01 May '13

01 May '13

Module: wine Branch: master Commit: daa5116010a02c0509210776034a249e07a546aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=daa5116010a02c05092107760… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 1 12:44:42 2013 +0200 configure: Add rules for building libwine without soname on Android. --- configure | 212 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 44 ++++++++++++ 2 files changed, 256 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=daa5116010a02c0509210…

1 0

Alexandre Julliard : makefiles: Generate the platform-specific libwine rules from configure.
by Alexandre Julliard 01 May '13

01 May '13

Module: wine Branch: master Commit: 54244470f36a864843aef6485db1197d4ac2bd8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=54244470f36a864843aef6485… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 1 12:29:00 2013 +0200 makefiles: Generate the platform-specific libwine rules from configure. --- Make.rules.in | 3 +- Make.vars.in | 1 - configure | 159 +++++++++++++++++++++++++++++-------------------- configure.ac | 129 ++++++++++++++++++++++++++++------------ libs/wine/Makefile.in | 72 +--------------------- 5 files changed, 189 insertions(+), 175 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=54244470f36a864843aef…

1 0

Sergey Guralnik : riched20: Fix richtext copy/paste to OOffice.
by Alexandre Julliard 01 May '13

01 May '13

Module: wine Branch: master Commit: 8849885f73921db8ba138fd56c3f448382404acc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8849885f73921db8ba138fd56… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Tue Apr 30 09:06:06 2013 +0300 riched20: Fix richtext copy/paste to OOffice. --- dlls/riched20/writer.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 440cb1b..6a4538c 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -297,6 +297,14 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, if (!ME_StreamOutPrint(pStream, "}\r\n")) return FALSE; + /* It seems like Open Office ignores \deff0 tag at RTF-header. + As result it can't correctly parse text before first \fN tag, + so we can put \f0 immediately after font table. This forces + parser to use the same font, that \deff0 specifies. + It makes OOffice happy */ + if (!ME_StreamOutPrint(pStream, "\\f0")) + return FALSE; + /* Output the color table */ if (!ME_StreamOutPrint(pStream, "{\\colortbl;")) return FALSE; /* first entry is auto-color */ for (i = 1; i < pStream->nColorTblLen; i++)

1 0

Daniel Jelinski : xolehlp: Fix calling convention.
by Alexandre Julliard 01 May '13

01 May '13

Module: wine Branch: master Commit: 8651c3b00f0e69f1da812f54cb54d4670e80f072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8651c3b00f0e69f1da812f54c… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Tue Apr 30 23:15:43 2013 +0200 xolehlp: Fix calling convention. --- dlls/xolehlp/xolehlp.c | 6 +++--- dlls/xolehlp/xolehlp.spec | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c index e1ec12c..475ef67 100644 --- a/dlls/xolehlp/xolehlp.c +++ b/dlls/xolehlp/xolehlp.c @@ -38,7 +38,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) return TRUE; } -HRESULT WINAPI DtcGetTransactionManager(char *host, char *tm_name, REFIID riid, +HRESULT CDECL DtcGetTransactionManager(char *host, char *tm_name, REFIID riid, DWORD dwReserved1, WORD wcbReserved2, void *pvReserved2, void **ppv) { FIXME("(%s, %s, %s, %d, %d, %p, %p): stub\n", debugstr_a(host), debugstr_a(tm_name), @@ -46,7 +46,7 @@ HRESULT WINAPI DtcGetTransactionManager(char *host, char *tm_name, REFIID riid, return E_NOTIMPL; } -HRESULT WINAPI DtcGetTransactionManagerExA(CHAR *host, CHAR *tm_name, REFIID riid, +HRESULT CDECL DtcGetTransactionManagerExA(CHAR *host, CHAR *tm_name, REFIID riid, DWORD options, void *config, void **ppv) { FIXME("(%s, %s, %s, %d, %p, %p): stub\n", debugstr_a(host), debugstr_a(tm_name), @@ -54,7 +54,7 @@ HRESULT WINAPI DtcGetTransactionManagerExA(CHAR *host, CHAR *tm_name, REFIID rii return E_NOTIMPL; } -HRESULT WINAPI DtcGetTransactionManagerExW(WCHAR *host, WCHAR *tm_name, REFIID riid, +HRESULT CDECL DtcGetTransactionManagerExW(WCHAR *host, WCHAR *tm_name, REFIID riid, DWORD options, void *config, void **ppv) { FIXME("(%s, %s, %s, %d, %p, %p): stub\n", debugstr_w(host), debugstr_w(tm_name), diff --git a/dlls/xolehlp/xolehlp.spec b/dlls/xolehlp/xolehlp.spec index 0b149de..80c7c60 100644 --- a/dlls/xolehlp/xolehlp.spec +++ b/dlls/xolehlp/xolehlp.spec @@ -1,6 +1,6 @@ @ stub GetDtcLocaleResourceHandle -@ stdcall DtcGetTransactionManager(str str ptr long long ptr ptr) +@ cdecl DtcGetTransactionManager(str str ptr long long ptr ptr) @ stub DtcGetTransactionManagerEx @ stub DtcGetTransactionManagerC -@ stdcall DtcGetTransactionManagerExA(str str ptr long ptr ptr) -@ stdcall DtcGetTransactionManagerExW(wstr wstr ptr long ptr ptr) +@ cdecl DtcGetTransactionManagerExA(str str ptr long ptr ptr) +@ cdecl DtcGetTransactionManagerExW(wstr wstr ptr long ptr ptr)

1 0

Austin English : msvcr110: Implement __crtGetShowWindowMode.
by Alexandre Julliard 01 May '13

01 May '13

Module: wine Branch: master Commit: c649d8746dc3865d086fd39bfa5774127cbd2248 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c649d8746dc3865d086fd39bf… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Apr 30 15:43:15 2013 -0700 msvcr110: Implement __crtGetShowWindowMode. --- dlls/msvcr110/msvcr110.c | 15 +++++++++++++++ dlls/msvcr110/msvcr110.spec | 2 +- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr110/msvcr110.c b/dlls/msvcr110/msvcr110.c index 9cf945a..04a0dc2 100644 --- a/dlls/msvcr110/msvcr110.c +++ b/dlls/msvcr110/msvcr110.c @@ -23,6 +23,9 @@ #include "stdlib.h" #include "windef.h" #include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); /********************************************************************* * DllMain (MSVCR110.@) @@ -47,3 +50,15 @@ LPTOP_LEVEL_EXCEPTION_FILTER CDECL MSVCR110__crtSetUnhandledExceptionFilter(LPTO { return SetUnhandledExceptionFilter(filter); } + +/********************************************************************* + * __crtGetShowWindowMode (MSVCR110.@) + */ +int CDECL MSVCR110__crtGetShowWindowMode(void) +{ + STARTUPINFOW si; + + GetStartupInfoW(&si); + TRACE("window=%d\n", si.wShowWindow); + return si.wShowWindow; +} diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 12fc808..c38763a 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -918,7 +918,7 @@ @ stub -arch=i386,win64 __crtFlsSetValue @ stub -arch=i386,win64 __crtGetDateFormatEx @ stub -arch=i386,win64 __crtGetLocaleInfoEx -@ stub __crtGetShowWindowMode +@ cdecl __crtGetShowWindowMode() MSVCR110__crtGetShowWindowMode @ stub -arch=i386,win64 __crtGetTimeFormatEx @ stub -arch=i386,win64 __crtGetUserDefaultLocaleName @ stub -arch=i386,win64 __crtInitializeCriticalSectionEx

1 0

Austin English : msvcr110: Add a missing function header.
by Alexandre Julliard 01 May '13

01 May '13

Module: wine Branch: master Commit: 991e8467c7e6618ad8598969ef01d26ad03f09d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=991e8467c7e6618ad8598969e… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Apr 30 15:42:30 2013 -0700 msvcr110: Add a missing function header. --- dlls/msvcr110/msvcr110.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msvcr110/msvcr110.c b/dlls/msvcr110/msvcr110.c index 1049e2a..9cf945a 100644 --- a/dlls/msvcr110/msvcr110.c +++ b/dlls/msvcr110/msvcr110.c @@ -40,6 +40,9 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) return TRUE; } +/********************************************************************* + * __crtSetUnhandledExceptionFilter (MSVCR110.@) + */ LPTOP_LEVEL_EXCEPTION_FILTER CDECL MSVCR110__crtSetUnhandledExceptionFilter(LPTOP_LEVEL_EXCEPTION_FILTER filter) { return SetUnhandledExceptionFilter(filter);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2013