wine-commits August 2013

wine-commits@winehq.org

2 participants
461 discussions

Nikolay Sivov : oledb32: Added IConnectionPoint stub for IRowPositionChange notification.
by Alexandre Julliard 02 Aug '13

02 Aug '13

Module: wine Branch: master Commit: b4bab7679228ef8b3ce4c57cb89117855e9098c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4bab7679228ef8b3ce4c57cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 2 09:50:29 2013 +0400 oledb32: Added IConnectionPoint stub for IRowPositionChange notification. --- dlls/oledb32/oledb_private.h | 10 ++++ dlls/oledb32/rowpos.c | 102 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 109 insertions(+), 3 deletions(-) diff --git a/dlls/oledb32/oledb_private.h b/dlls/oledb32/oledb_private.h index 3ff8d1d..1570529 100644 --- a/dlls/oledb32/oledb_private.h +++ b/dlls/oledb32/oledb_private.h @@ -21,3 +21,13 @@ HRESULT create_oledb_convert(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; HRESULT create_data_init(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; HRESULT create_error_info(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; HRESULT create_oledb_rowpos(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; + +static inline void *heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} diff --git a/dlls/oledb32/rowpos.c b/dlls/oledb32/rowpos.c index 88cdb6e..96a36a5 100644 --- a/dlls/oledb32/rowpos.c +++ b/dlls/oledb32/rowpos.c @@ -30,14 +30,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(oledb); +typedef struct rowpos rowpos; typedef struct { + IConnectionPoint IConnectionPoint_iface; + rowpos *container; +} rowpos_cp; + +struct rowpos +{ IRowPosition IRowPosition_iface; IConnectionPointContainer IConnectionPointContainer_iface; LONG ref; IRowset *rowset; -} rowpos; + rowpos_cp cp; +}; static inline rowpos *impl_from_IRowPosition(IRowPosition *iface) { @@ -49,6 +57,11 @@ static inline rowpos *impl_from_IConnectionPointContainer(IConnectionPointContai return CONTAINING_RECORD(iface, rowpos, IConnectionPointContainer_iface); } +static inline rowpos_cp *impl_from_IConnectionPoint(IConnectionPoint *iface) +{ + return CONTAINING_RECORD(iface, rowpos_cp, IConnectionPoint_iface); +} + static HRESULT WINAPI rowpos_QueryInterface(IRowPosition* iface, REFIID riid, void **obj) { rowpos *This = impl_from_IRowPosition(iface); @@ -94,7 +107,7 @@ static ULONG WINAPI rowpos_Release(IRowPosition* iface) if (ref == 0) { if (This->rowset) IRowset_Release(This->rowset); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); } return ref; @@ -194,6 +207,88 @@ static const struct IConnectionPointContainerVtbl rowpos_cpc_vtbl = cpc_FindConnectionPoint }; +static HRESULT WINAPI rowpos_cp_QueryInterface(IConnectionPoint *iface, REFIID riid, void **obj) +{ + rowpos_cp *This = impl_from_IConnectionPoint(iface); + return IConnectionPointContainer_QueryInterface(&This->container->IConnectionPointContainer_iface, riid, obj); +} + +static ULONG WINAPI rowpos_cp_AddRef(IConnectionPoint *iface) +{ + rowpos_cp *This = impl_from_IConnectionPoint(iface); + return IConnectionPointContainer_AddRef(&This->container->IConnectionPointContainer_iface); +} + +static ULONG WINAPI rowpos_cp_Release(IConnectionPoint *iface) +{ + rowpos_cp *This = impl_from_IConnectionPoint(iface); + return IConnectionPointContainer_Release(&This->container->IConnectionPointContainer_iface); +} + +static HRESULT WINAPI rowpos_cp_GetConnectionInterface(IConnectionPoint *iface, IID *iid) +{ + rowpos_cp *This = impl_from_IConnectionPoint(iface); + + TRACE("(%p)->(%p)\n", This, iid); + + if (!iid) return E_POINTER; + + *iid = IID_IRowPositionChange; + return S_OK; +} + +static HRESULT WINAPI rowpos_cp_GetConnectionPointContainer(IConnectionPoint *iface, IConnectionPointContainer **container) +{ + rowpos_cp *This = impl_from_IConnectionPoint(iface); + + TRACE("(%p)->(%p)\n", This, container); + + if (!container) return E_POINTER; + + *container = &This->container->IConnectionPointContainer_iface; + IConnectionPointContainer_AddRef(*container); + return S_OK; +} + +static HRESULT WINAPI rowpos_cp_Advise(IConnectionPoint *iface, IUnknown *sink, DWORD *cookie) +{ + rowpos_cp *This = impl_from_IConnectionPoint(iface); + FIXME("(%p)->(%p %p): stub\n", This, sink, cookie); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowpos_cp_Unadvise(IConnectionPoint *iface, DWORD cookie) +{ + rowpos_cp *This = impl_from_IConnectionPoint(iface); + FIXME("(%p)->(%d): stub\n", This, cookie); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowpos_cp_EnumConnections(IConnectionPoint *iface, IEnumConnections **enum_c) +{ + rowpos_cp *This = impl_from_IConnectionPoint(iface); + FIXME("(%p)->(%p): stub\n", This, enum_c); + return E_NOTIMPL; +} + +static const struct IConnectionPointVtbl rowpos_cp_vtbl = +{ + rowpos_cp_QueryInterface, + rowpos_cp_AddRef, + rowpos_cp_Release, + rowpos_cp_GetConnectionInterface, + rowpos_cp_GetConnectionPointContainer, + rowpos_cp_Advise, + rowpos_cp_Unadvise, + rowpos_cp_EnumConnections +}; + +static void rowposchange_cp_init(rowpos_cp *cp, rowpos *container) +{ + cp->IConnectionPoint_iface.lpVtbl = &rowpos_cp_vtbl; + cp->container = container; +} + HRESULT create_oledb_rowpos(IUnknown *outer, void **obj) { rowpos *This; @@ -204,13 +299,14 @@ HRESULT create_oledb_rowpos(IUnknown *outer, void **obj) if(outer) return CLASS_E_NOAGGREGATION; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = heap_alloc(sizeof(*This)); if(!This) return E_OUTOFMEMORY; This->IRowPosition_iface.lpVtbl = &rowpos_vtbl; This->IConnectionPointContainer_iface.lpVtbl = &rowpos_cpc_vtbl; This->ref = 1; This->rowset = NULL; + rowposchange_cp_init(&This->cp, This); *obj = &This->IRowPosition_iface;

1 0

Nikolay Sivov : oledb32: Added IConnectionPointContainer stub.
by Alexandre Julliard 02 Aug '13

02 Aug '13

Module: wine Branch: master Commit: 2111d70c252ebeba145552f64aa03a2abafb8dc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2111d70c252ebeba145552f64… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 2 09:44:43 2013 +0400 oledb32: Added IConnectionPointContainer stub. --- dlls/oledb32/rowpos.c | 52 +++++++++++++++++++++++++++++++++++++++++ dlls/oledb32/tests/database.c | 40 +++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/rowpos.c b/dlls/oledb32/rowpos.c index d789c19..88cdb6e 100644 --- a/dlls/oledb32/rowpos.c +++ b/dlls/oledb32/rowpos.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(oledb); typedef struct { IRowPosition IRowPosition_iface; + IConnectionPointContainer IConnectionPointContainer_iface; LONG ref; IRowset *rowset; @@ -43,6 +44,11 @@ static inline rowpos *impl_from_IRowPosition(IRowPosition *iface) return CONTAINING_RECORD(iface, rowpos, IRowPosition_iface); } +static inline rowpos *impl_from_IConnectionPointContainer(IConnectionPointContainer *iface) +{ + return CONTAINING_RECORD(iface, rowpos, IConnectionPointContainer_iface); +} + static HRESULT WINAPI rowpos_QueryInterface(IRowPosition* iface, REFIID riid, void **obj) { rowpos *This = impl_from_IRowPosition(iface); @@ -56,6 +62,10 @@ static HRESULT WINAPI rowpos_QueryInterface(IRowPosition* iface, REFIID riid, vo { *obj = iface; } + else if (IsEqualIID(riid, &IID_IConnectionPointContainer)) + { + *obj = &This->IConnectionPointContainer_iface; + } else { FIXME("interface %s not implemented\n", debugstr_guid(riid)); @@ -143,6 +153,47 @@ static const struct IRowPositionVtbl rowpos_vtbl = rowpos_SetRowPosition }; +static HRESULT WINAPI cpc_QueryInterface(IConnectionPointContainer *iface, REFIID riid, void **obj) +{ + rowpos *This = impl_from_IConnectionPointContainer(iface); + return IRowPosition_QueryInterface(&This->IRowPosition_iface, riid, obj); +} + +static ULONG WINAPI cpc_AddRef(IConnectionPointContainer *iface) +{ + rowpos *This = impl_from_IConnectionPointContainer(iface); + return IRowPosition_AddRef(&This->IRowPosition_iface); +} + +static ULONG WINAPI cpc_Release(IConnectionPointContainer *iface) +{ + rowpos *This = impl_from_IConnectionPointContainer(iface); + return IRowPosition_Release(&This->IRowPosition_iface); +} + +static HRESULT WINAPI cpc_EnumConnectionPoints(IConnectionPointContainer *iface, IEnumConnectionPoints **enum_points) +{ + rowpos *This = impl_from_IConnectionPointContainer(iface); + FIXME("(%p)->(%p): stub\n", This, enum_points); + return E_NOTIMPL; +} + +static HRESULT WINAPI cpc_FindConnectionPoint(IConnectionPointContainer *iface, REFIID riid, IConnectionPoint **point) +{ + rowpos *This = impl_from_IConnectionPointContainer(iface); + FIXME("(%p)->(%s %p): stub\n", This, debugstr_guid(riid), point); + return E_NOTIMPL; +} + +static const struct IConnectionPointContainerVtbl rowpos_cpc_vtbl = +{ + cpc_QueryInterface, + cpc_AddRef, + cpc_Release, + cpc_EnumConnectionPoints, + cpc_FindConnectionPoint +}; + HRESULT create_oledb_rowpos(IUnknown *outer, void **obj) { rowpos *This; @@ -157,6 +208,7 @@ HRESULT create_oledb_rowpos(IUnknown *outer, void **obj) if(!This) return E_OUTOFMEMORY; This->IRowPosition_iface.lpVtbl = &rowpos_vtbl; + This->IConnectionPointContainer_iface.lpVtbl = &rowpos_cpc_vtbl; This->ref = 1; This->rowset = NULL; diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index d54d546..7b129b8 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdarg.h> +#include <stdio.h> #define COBJMACROS #define NONAMELESSUNION @@ -37,6 +38,21 @@ DEFINE_GUID(CSLID_MSDAER, 0xc8b522cf,0x5cf3,0x11ce,0xad,0xe5,0x00,0xaa,0x00,0x44 static WCHAR initstring_default[] = {'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';',0}; +static const char *debugstr_guid(REFIID riid) +{ + static char buf[50]; + + if(!riid) + return "(null)"; + + sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], + riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], + riid->Data4[5], riid->Data4[6], riid->Data4[7]); + + return buf; +} + static void test_GetDataSource(WCHAR *initstring) { IDataInitialize *datainit = NULL; @@ -188,12 +204,36 @@ static void test_initializationstring(void) static void test_rowposition(void) { + IEnumConnectionPoints *enum_points; + IConnectionPointContainer *cpc; + IConnectionPoint *cp; IRowPosition *rowpos; HRESULT hr; + IID iid; hr = CoCreateInstance(&CLSID_OLEDB_ROWPOSITIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IRowPosition, (void**)&rowpos); ok(hr == S_OK, "got %08x\n", hr); + hr = IRowPosition_QueryInterface(rowpos, &IID_IConnectionPointContainer, (void**)&cpc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IConnectionPointContainer_EnumConnectionPoints(cpc, &enum_points); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); +if (hr == S_OK) { + hr = IEnumConnectionPoints_Next(enum_points, 1, &cp, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IConnectionPoint_GetConnectionInterface(cp, &iid); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualIID(&iid, &IID_IRowPositionChange), "got %s\n", debugstr_guid(&iid)); + IConnectionPoint_Release(cp); + + hr = IEnumConnectionPoints_Next(enum_points, 1, &cp, NULL); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + + IEnumConnectionPoints_Release(enum_points); +} + IConnectionPointContainer_Release(cpc); IRowPosition_Release(rowpos); }

1 0

Dmitry Timoshkov : cabarc: Fix compilation under Windows.
by Alexandre Julliard 02 Aug '13

02 Aug '13

Module: wine Branch: master Commit: 452a64e3a76ab92c9591115080fc93e6daf79d7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=452a64e3a76ab92c959111508… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 2 12:22:24 2013 +0900 cabarc: Fix compilation under Windows. --- programs/cabarc/cabarc.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c index 02213f6..032aab2 100644 --- a/programs/cabarc/cabarc.c +++ b/programs/cabarc/cabarc.c @@ -39,7 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cabarc); #define _O_RDONLY 0 #define _O_WRONLY 1 #define _O_RDWR 2 -#define _O_ACCMODE (_O_RDONLY|_O_WRONLY|_O_RDWR) #define _O_APPEND 0x0008 #define _O_RANDOM 0x0010 #define _O_SEQUENTIAL 0x0020 @@ -53,6 +52,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(cabarc); #define _O_BINARY 0x8000 #endif +#ifndef _O_ACCMODE +#define _O_ACCMODE (_O_RDONLY|_O_WRONLY|_O_RDWR) +#endif + #ifndef _SH_COMPAT #define _SH_COMPAT 0x00 #define _SH_DENYRW 0x10

1 0

Bruno Jesus : ws2_32/tests: Add and update WSASocketA() tests.
by Alexandre Julliard 02 Aug '13

02 Aug '13

Module: wine Branch: master Commit: ce0e3158b2e8ac9c2e946f700727ef79537ff972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce0e3158b2e8ac9c2e946f700… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Aug 1 21:51:31 2013 -0300 ws2_32/tests: Add and update WSASocketA() tests. --- dlls/ws2_32/tests/sock.c | 58 +++++++++++++++++++++++++++++++++++++++------ include/winsock2.h | 6 ++++ 2 files changed, 56 insertions(+), 8 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7e70449..5ce4959 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1701,6 +1701,22 @@ todo_wine ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); closesocket(sock); + /* SOCK_STREAM does not support IPPROTO_UDP */ + SetLastError(0xdeadbeef); + ok(WSASocketA(AF_INET, SOCK_STREAM, IPPROTO_UDP, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); + + /* SOCK_DGRAM does not support IPPROTO_TCP */ + SetLastError(0xdeadbeef); + ok(WSASocketA(AF_INET, SOCK_DGRAM, IPPROTO_TCP, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); + /* Set pi_size explicitly to a value below 2*sizeof(WSAPROTOCOL_INFOA) * to avoid a crash on win98. */ @@ -1739,6 +1755,18 @@ todo_wine pi[0].iProtocol = IPPROTO_UDP; pi[0].iSocketType = SOCK_DGRAM; pi[0].iAddressFamily = AF_INET; + sock = WSASocketA(0, 0, 0, &pi[0], 0, 0); +todo_wine { + ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", + WSAGetLastError()); + size = sizeof(socktype); + socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err,"getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == SOCK_DGRAM, "Wrong socket type, expected %d received %d\n", + SOCK_DGRAM, socktype); + closesocket(sock); +} sock = WSASocketA(AF_INET, SOCK_STREAM, IPPROTO_TCP, &pi[0], 0, 0); ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", WSAGetLastError()); @@ -1771,7 +1799,9 @@ todo_wine ok(items != SOCKET_ERROR, "WSAEnumProtocolsA failed, last error is %d\n", WSAGetLastError()); - /* when no protocol is specified the first socket type from WSAEnumProtocols is returned */ + /* when no protocol and socket type are specified the first entry + * from WSAEnumProtocols that has the flag PFL_MATCHES_PROTOCOL_ZERO + * is returned */ sock = WSASocketA(AF_INET, 0, 0, NULL, 0, 0); todo_wine ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", @@ -1782,12 +1812,21 @@ todo_wine { socktype = 0xdead; err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); - ok(socktype == pi[0].iSocketType, "Wrong socket type, expected %d received %d\n", - pi[0].iSocketType, socktype); + for(i = 0; i < items; i++) + { + if(pi[i].dwProviderFlags & PFL_MATCHES_PROTOCOL_ZERO) + { + ok(socktype == pi[i].iSocketType, "Wrong socket type, expected %d received %d\n", + pi[i].iSocketType, socktype); + break; + } + } + ok(i != items, "Creating a socket without protocol and socket type didn't work\n"); } closesocket(sock); - /* when the protocol is specified the first socket type that matches the protocol is returned */ + /* when no socket type is specified the first entry from WSAEnumProtocols + * that matches the protocol is returned */ for (i = 0; i < sizeof(autoprotocols) / sizeof(autoprotocols[0]); i++) { sock = WSASocketA(0, 0, autoprotocols[i], NULL, 0, 0); @@ -1801,18 +1840,21 @@ todo_wine todo_wine ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); - for (j = 0; j < items; j++) + for (err = 1, j = 0; j < items; j++) { if (pi[j].iProtocol == autoprotocols[i]) { + if (socktype == pi[j].iSocketType) + err = 0; + else todo_wine - ok(socktype == pi[j].iSocketType, "Wrong socket type, expected %d received %d\n", - pi[j].iSocketType, socktype); + ok(0, "Wrong socket type, expected %d received %d\n", + pi[j].iSocketType, socktype); break; } } todo_wine - ok(socktype != 0xdead, "Protocol %d not found in WSAEnumProtocols\n", autoprotocols[i]); + ok(!err, "Protocol %d not found in WSAEnumProtocols\n", autoprotocols[i]); closesocket(sock); } diff --git a/include/winsock2.h b/include/winsock2.h index 3e060e5..7516d25 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -213,6 +213,12 @@ typedef struct _WSAPROTOCOLCHAIN DWORD ChainEntries[MAX_PROTOCOL_CHAIN]; /* a list of dwCatalogEntryIds */ } WSAPROTOCOLCHAIN, * LPWSAPROTOCOLCHAIN; +/* constants used in dwProviderFlags from struct WSAPROTOCOL_INFO */ +#define PFL_MULTIPLE_PROTO_ENTRIES 0x00000001 +#define PFL_RECOMMENDED_PROTO_ENTRY 0x00000002 +#define PFL_HIDDEN 0x00000004 +#define PFL_MATCHES_PROTOCOL_ZERO 0x00000008 + #define XP1_CONNECTIONLESS 0x00000001 #define XP1_GUARANTEED_DELIVERY 0x00000002 #define XP1_GUARANTEED_ORDER 0x00000004

1 0

Stefan Dösinger : ddraw: Fix double to float conversion warnings.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: c0faf86fff1ebd052f9564a728bbcbd9af58fbd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0faf86fff1ebd052f9564a72… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 1 19:49:15 2013 +0200 ddraw: Fix double to float conversion warnings. --- dlls/ddraw/device.c | 2 +- dlls/ddraw/executebuffer.c | 18 ++++++++---------- dlls/ddraw/viewport.c | 8 ++++---- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 09880dd..449b5b8 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4391,7 +4391,7 @@ static DWORD in_plane(UINT plane, D3DVECTOR normal, D3DVALUE origin_plane, D3DVE { float distance, norm; - norm = sqrt( normal.u1.x * normal.u1.x + normal.u2.y * normal.u2.y + normal.u3.z * normal.u3.z ); + norm = sqrtf(normal.u1.x * normal.u1.x + normal.u2.y * normal.u2.y + normal.u3.z * normal.u3.z); distance = ( origin_plane + normal.u1.x * center.u1.x + normal.u2.y * center.u2.y + normal.u3.z * center.u3.z ) / norm; if ( fabs( distance ) < radius ) return D3DSTATUS_CLIPUNIONLEFT << plane; diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 2925cfa..04ea257 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -381,11 +381,10 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, dst->u7.tu = src->u7.tu; dst->u8.tv = src->u8.tv; - /* Now, the matrix multiplication */ - dst->u1.sx = (src->u1.x * mat._11) + (src->u2.y * mat._21) + (src->u3.z * mat._31) + (1.0 * mat._41); - dst->u2.sy = (src->u1.x * mat._12) + (src->u2.y * mat._22) + (src->u3.z * mat._32) + (1.0 * mat._42); - dst->u3.sz = (src->u1.x * mat._13) + (src->u2.y * mat._23) + (src->u3.z * mat._33) + (1.0 * mat._43); - dst->u4.rhw = (src->u1.x * mat._14) + (src->u2.y * mat._24) + (src->u3.z * mat._34) + (1.0 * mat._44); + dst->u1.sx = (src->u1.x * mat._11) + (src->u2.y * mat._21) + (src->u3.z * mat._31) + mat._41; + dst->u2.sy = (src->u1.x * mat._12) + (src->u2.y * mat._22) + (src->u3.z * mat._32) + mat._42; + dst->u3.sz = (src->u1.x * mat._13) + (src->u2.y * mat._23) + (src->u3.z * mat._33) + mat._43; + dst->u4.rhw = (src->u1.x * mat._14) + (src->u2.y * mat._24) + (src->u3.z * mat._34) + mat._44; dst->u1.sx = dst->u1.sx / dst->u4.rhw * Viewport->dvScaleX + Viewport->dwX + Viewport->dwWidth / 2; @@ -424,11 +423,10 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, dst->u7.tu = src->u6.tu; dst->u8.tv = src->u7.tv; - /* Now, the matrix multiplication */ - dst->u1.sx = (src->u1.x * mat._11) + (src->u2.y * mat._21) + (src->u3.z * mat._31) + (1.0 * mat._41); - dst->u2.sy = (src->u1.x * mat._12) + (src->u2.y * mat._22) + (src->u3.z * mat._32) + (1.0 * mat._42); - dst->u3.sz = (src->u1.x * mat._13) + (src->u2.y * mat._23) + (src->u3.z * mat._33) + (1.0 * mat._43); - dst->u4.rhw = (src->u1.x * mat._14) + (src->u2.y * mat._24) + (src->u3.z * mat._34) + (1.0 * mat._44); + dst->u1.sx = (src->u1.x * mat._11) + (src->u2.y * mat._21) + (src->u3.z * mat._31) + mat._41; + dst->u2.sy = (src->u1.x * mat._12) + (src->u2.y * mat._22) + (src->u3.z * mat._32) + mat._42; + dst->u3.sz = (src->u1.x * mat._13) + (src->u2.y * mat._23) + (src->u3.z * mat._33) + mat._43; + dst->u4.rhw = (src->u1.x * mat._14) + (src->u2.y * mat._24) + (src->u3.z * mat._34) + mat._44; dst->u1.sx = dst->u1.sx / dst->u4.rhw * Viewport->dvScaleX + Viewport->dwX + Viewport->dwWidth / 2; diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index f9eddda..95df63f 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -428,10 +428,10 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, outH = lpData->lpHOut; for(i = 0; i < dwVertexCount; i++) { - x = (in[0] * mat._11) + (in[1] * mat._21) + (in[2] * mat._31) + (1.0 * mat._41); - y = (in[0] * mat._12) + (in[1] * mat._22) + (in[2] * mat._32) + (1.0 * mat._42); - z = (in[0] * mat._13) + (in[1] * mat._23) + (in[2] * mat._33) + (1.0 * mat._43); - w = (in[0] * mat._14) + (in[1] * mat._24) + (in[2] * mat._34) + (1.0 * mat._44); + x = (in[0] * mat._11) + (in[1] * mat._21) + (in[2] * mat._31) + mat._41; + y = (in[0] * mat._12) + (in[1] * mat._22) + (in[2] * mat._32) + mat._42; + z = (in[0] * mat._13) + (in[1] * mat._23) + (in[2] * mat._33) + mat._43; + w = (in[0] * mat._14) + (in[1] * mat._24) + (in[2] * mat._34) + mat._44; if(dwFlags & D3DTRANSFORM_CLIPPED) {

1 0

Stefan Dösinger : wined3d: Avoid calculating 1 / ( fog_end - fog_start) in the shader.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: ba61730daa6a614ef07128a69a0bbca819e716b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba61730daa6a614ef07128a69… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 1 12:25:55 2013 +0200 wined3d: Avoid calculating 1 / (fog_end - fog_start) in the shader. --- dlls/wined3d/glsl_shader.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e1fe0ee..cbf2c60 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4502,8 +4502,7 @@ static void shader_glsl_generate_fog_code(struct wined3d_shader_buffer *buffer, return; case WINED3D_FFP_PS_FOG_LINEAR: - /* Fog = (gl_Fog.end - gl_FogFragCoord) / (gl_Fog.end - gl_Fog.start) */ - shader_addline(buffer, "float Fog = (gl_Fog.end - gl_FogFragCoord) / (gl_Fog.end - gl_Fog.start);\n"); + shader_addline(buffer, "float Fog = (gl_Fog.end - gl_FogFragCoord) * gl_Fog.scale;\n"); break; case WINED3D_FFP_PS_FOG_EXP:

1 0

Dmitry Timoshkov : windowscodecs: Workaround libtiff bug when it defines toff_t as 32-bit for 32-bit builds.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: 3894493a76cb766c4322f09a1d12b9723d3d3759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3894493a76cb766c4322f09a1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 1 22:04:28 2013 +0900 windowscodecs: Workaround libtiff bug when it defines toff_t as 32-bit for 32-bit builds. --- dlls/windowscodecs/tiffformat.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 62f1ad7..e252ced 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -44,6 +44,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); #ifdef SONAME_LIBTIFF +/* Workaround for broken libtiff 4.x headers on some 64-bit hosts which + * define TIFF_UINT64_T/toff_t as 32-bit for 32-bit builds, while they + * are supposed to be always 64-bit. + * TIFF_UINT64_T doesn't exist in libtiff 3.x, it was introduced in 4.x. + */ +#ifdef TIFF_UINT64_T +# undef toff_t +# define toff_t UINT64 +#endif + static CRITICAL_SECTION init_tiff_cs; static CRITICAL_SECTION_DEBUG init_tiff_cs_debug = { @@ -209,8 +219,8 @@ static TIFF* tiff_open_stream(IStream *stream, const char *mode) IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); return pTIFFClientOpen("<IStream object>", mode, stream, tiff_stream_read, - tiff_stream_write, tiff_stream_seek, tiff_stream_close, - tiff_stream_size, tiff_stream_map, tiff_stream_unmap); + tiff_stream_write, (void *)tiff_stream_seek, tiff_stream_close, + (void *)tiff_stream_size, (void *)tiff_stream_map, (void *)tiff_stream_unmap); } typedef struct {

1 0

Aric Stewart : wineps.drv: Allow for vertical text printing.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: 745e7c93c9042f62460f181daaa1f05645560b41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=745e7c93c9042f62460f181da… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jul 30 07:54:25 2013 -0500 wineps.drv: Allow for vertical text printing. With extensive review and help from Huw Davies. --- dlls/wineps.drv/builtin.c | 2 +- dlls/wineps.drv/download.c | 23 +++-- dlls/wineps.drv/font.c | 14 ++- dlls/wineps.drv/ps.c | 2 +- dlls/wineps.drv/psdrv.h | 10 ++- dlls/wineps.drv/text.c | 206 +++++++++++++++++++++++++++++++++++++------- 6 files changed, 208 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=745e7c93c9042f62460f1…

1 0

Bruno Jesus : ws2_32: Simplify WINSOCK_EnterSingleProtocolA using the W version.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: 75fc88452c069803e32ddd76129202aa18db37d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75fc88452c069803e32ddd761… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Aug 1 00:30:30 2013 -0300 ws2_32: Simplify WINSOCK_EnterSingleProtocolA using the W version. --- dlls/ws2_32/protocol.c | 106 +++++------------------------------------------- 1 files changed, 10 insertions(+), 96 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index fa72de8..98e7c38 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -53,12 +53,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsock); /* names of the protocols */ -static const CHAR NameIpx[] = "IPX"; -static const CHAR NameSpx[] = "SPX"; -static const CHAR NameSpxII[] = "SPX II"; -static const CHAR NameTcp[] = "TCP/IP"; -static const CHAR NameUdp[] = "UDP/IP"; - static const WCHAR NameIpxW[] = {'I', 'P', 'X', '\0'}; static const WCHAR NameSpxW[] = {'S', 'P', 'X', '\0'}; static const WCHAR NameSpxIIW[] = {'S', 'P', 'X', ' ', 'I', 'I', '\0'}; @@ -194,100 +188,20 @@ static INT WINSOCK_EnterSingleProtocolW( INT protocol, WSAPROTOCOL_INFOW* info ) */ static INT WINSOCK_EnterSingleProtocolA( INT protocol, WSAPROTOCOL_INFOA* info ) { + WSAPROTOCOL_INFOW infow; + INT ret; memset( info, 0, sizeof(WSAPROTOCOL_INFOA) ); - info->iProtocol = protocol; - switch (protocol) + ret = WINSOCK_EnterSingleProtocolW( protocol, &infow ); + if (ret != SOCKET_ERROR) { - case WS_IPPROTO_TCP: - info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_EXPEDITED_DATA | - XP1_GRACEFUL_CLOSE | XP1_GUARANTEED_ORDER | - XP1_GUARANTEED_DELIVERY; - info->ProviderId = ProviderIdIP; - info->dwCatalogEntryId = 0x3e9; - info->ProtocolChain.ChainLen = 1; - info->iVersion = 2; - info->iAddressFamily = WS_AF_INET; - info->iMaxSockAddr = 0x10; - info->iMinSockAddr = 0x10; - info->iSocketType = WS_SOCK_STREAM; - strcpy( info->szProtocol, NameTcp ); - break; - - case WS_IPPROTO_UDP: - info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_SUPPORT_BROADCAST | - XP1_SUPPORT_MULTIPOINT | XP1_MESSAGE_ORIENTED | - XP1_CONNECTIONLESS; - info->ProviderId = ProviderIdIP; - info->dwCatalogEntryId = 0x3ea; - info->ProtocolChain.ChainLen = 1; - info->iVersion = 2; - info->iAddressFamily = WS_AF_INET; - info->iMaxSockAddr = 0x10; - info->iMinSockAddr = 0x10; - info->iSocketType = WS_SOCK_DGRAM; - info->dwMessageSize = 0xffbb; - strcpy( info->szProtocol, NameUdp ); - break; - - case NSPROTO_IPX: - info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_SUPPORT_BROADCAST | - XP1_SUPPORT_MULTIPOINT | XP1_MESSAGE_ORIENTED | - XP1_CONNECTIONLESS; - info->ProviderId = ProviderIdIPX; - info->dwCatalogEntryId = 0x406; - info->ProtocolChain.ChainLen = 1; - info->iVersion = 2; - info->iAddressFamily = WS_AF_IPX; - info->iMaxSockAddr = 0x10; - info->iMinSockAddr = 0x0e; - info->iSocketType = WS_SOCK_DGRAM; - info->iProtocolMaxOffset = 0xff; - info->dwMessageSize = 0x240; - strcpy( info->szProtocol, NameIpx ); - break; - - case NSPROTO_SPX: - info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_PSEUDO_STREAM | - XP1_MESSAGE_ORIENTED | XP1_GUARANTEED_ORDER | - XP1_GUARANTEED_DELIVERY; - info->ProviderId = ProviderIdSPX; - info->dwCatalogEntryId = 0x407; - info->ProtocolChain.ChainLen = 1; - info->iVersion = 2; - info->iAddressFamily = WS_AF_IPX; - info->iMaxSockAddr = 0x10; - info->iMinSockAddr = 0x0e; - info->iSocketType = 5; - info->dwMessageSize = 0xffffffff; - strcpy( info->szProtocol, NameSpx ); - break; - - case NSPROTO_SPXII: - info->dwServiceFlags1 = XP1_IFS_HANDLES | XP1_GRACEFUL_CLOSE | - XP1_PSEUDO_STREAM | XP1_MESSAGE_ORIENTED | - XP1_GUARANTEED_ORDER | XP1_GUARANTEED_DELIVERY; - info->ProviderId = ProviderIdSPX; - info->dwCatalogEntryId = 0x409; - info->ProtocolChain.ChainLen = 1; - info->iVersion = 2; - info->iAddressFamily = WS_AF_IPX; - info->iMaxSockAddr = 0x10; - info->iMinSockAddr = 0x0e; - info->iSocketType = 5; - info->dwMessageSize = 0xffffffff; - strcpy( info->szProtocol, NameSpxII ); - break; - - default: - if ((protocol == ISOPROTO_TP4) || (protocol == NSPROTO_SPX)) - FIXME("Protocol <%s> not implemented\n", - (protocol == ISOPROTO_TP4) ? "ISOPROTO_TP4" : "NSPROTO_SPX"); - else - FIXME("unknown Protocol <0x%08x>\n", protocol); - return SOCKET_ERROR; + /* convert the structure from W to A */ + memcpy( info, &infow, FIELD_OFFSET( WSAPROTOCOL_INFOA, szProtocol ) ); + WideCharToMultiByte( CP_ACP, 0, infow.szProtocol, -1, + info->szProtocol, WSAPROTOCOL_LEN+1, NULL, NULL ); } - return 1; + + return ret; } /*****************************************************************************

1 0

Piotr Caban : msvcrt: Added _swprintf_s_l implementation.
by Alexandre Julliard 01 Aug '13

01 Aug '13

Module: wine Branch: master Commit: a51ffcd442678ce019a52bd5b95d99d0b7eab4ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=a51ffcd442678ce019a52bd5b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 1 13:55:39 2013 +0200 msvcrt: Added _swprintf_s_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 16 ++++++++++++++++ 6 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 9d4cc80..7e602ef 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1371,7 +1371,7 @@ @ stub _swprintf_c_l @ stub _swprintf_p @ varargs _swprintf_p_l(ptr long wstr ptr) msvcrt._swprintf_p_l -@ stub _swprintf_s_l +@ varargs _swprintf_s_l(ptr long wstr ptr) msvcrt._swprintf_s_l @ varargs _swscanf_l(wstr wstr ptr) msvcrt._swscanf_l @ varargs _swscanf_s_l(wstr wstr ptr) msvcrt._swscanf_s_l @ extern _sys_errlist msvcrt._sys_errlist diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 6e97edb..6c2da4c 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1733,7 +1733,7 @@ @ stub _swprintf_c_l @ stub _swprintf_p @ varargs _swprintf_p_l(ptr long wstr ptr) msvcrt._swprintf_p_l -@ stub _swprintf_s_l +@ varargs _swprintf_s_l(ptr long wstr ptr) msvcrt._swprintf_s_l @ varargs _swscanf_l(wstr wstr ptr) msvcrt._swscanf_l @ varargs _swscanf_s_l(wstr wstr ptr) msvcrt._swscanf_s_l @ extern _sys_errlist msvcrt._sys_errlist diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 8d91d66..ec886eb 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1049,7 +1049,7 @@ @ stub _swprintf_c @ stub _swprintf_p @ varargs _swprintf_p_l(ptr long wstr ptr) msvcrt._swprintf_p_l -@ stub _swprintf_s_l +@ varargs _swprintf_s_l(ptr long wstr ptr) msvcrt._swprintf_s_l @ varargs _swscanf_l(wstr wstr ptr) msvcrt._swscanf_l @ varargs _swscanf_s_l(wstr wstr ptr) msvcrt._swscanf_s_l @ extern _sys_errlist msvcrt._sys_errlist diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9469587..d5eebb4 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1025,7 +1025,7 @@ @ stub _swprintf_c_l @ stub _swprintf_p @ varargs _swprintf_p_l(ptr long wstr ptr) msvcrt._swprintf_p_l -@ stub _swprintf_s_l +@ varargs _swprintf_s_l(ptr long wstr ptr) msvcrt._swprintf_s_l @ varargs _swscanf_l(wstr wstr ptr) msvcrt._swscanf_l @ varargs _swscanf_s_l(wstr wstr ptr) msvcrt._swscanf_s_l @ extern _sys_errlist msvcrt._sys_errlist diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 975afe0..7511129 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -993,7 +993,7 @@ # stub _swprintf_c(ptr long str) # stub _swprintf_c_l(ptr long str ptr) @ varargs _swprintf_p_l(ptr long wstr ptr) MSVCRT_swprintf_p_l -# stub _swprintf_s_l(ptr long str ptr) +@ varargs _swprintf_s_l(ptr long wstr ptr) MSVCRT__swprintf_s_l @ varargs _swscanf_l(wstr wstr ptr) MSVCRT__swscanf_l @ varargs _swscanf_s_l(wstr wstr ptr) MSVCRT__swscanf_s_l @ extern _sys_errlist MSVCRT__sys_errlist diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 3df7c02..ca4fba6 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -947,6 +947,22 @@ int CDECL MSVCRT_swprintf_s(MSVCRT_wchar_t *str, MSVCRT_size_t numberOfElements, } /********************************************************************* + * _swprintf_s_l (MSVCRT.@) + */ +int CDECL MSVCRT__swprintf_s_l(MSVCRT_wchar_t *str, MSVCRT_size_t numberOfElements, + const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, ... ) +{ + __ms_va_list ap; + int r; + + __ms_va_start(ap, locale); + r = MSVCRT_vsnwprintf_s_l(str, numberOfElements, INT_MAX, format, locale, ap); + __ms_va_end(ap); + + return r; +} + +/********************************************************************* * _vswprintf (MSVCRT.@) */ int CDECL MSVCRT_vswprintf( MSVCRT_wchar_t* str, const MSVCRT_wchar_t* format, __ms_va_list args )

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 August 2013