October 2015 - Wine-Commits

Nikolay Sivov : dwrite/tests: Add missing return value test (PVS-Studio).
by Alexandre Julliard Oct. 28, 2015

Oct. 28, 2015

Module: wine Branch: master Commit: ad88407c9344df1b47993db0c8956df12bb6dda6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad88407c9344df1b47993db0c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 27 22:42:11 2015 +0300 dwrite/tests: Add missing return value test (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 8ec4f84..e03c819 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -4985,6 +4985,7 @@ static void test_GetPaletteEntries(void) IDWriteFont_Release(font); hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace2, (void**)&fontface2); + ok(hr == S_OK, "got 0x%08x\n", hr); IDWriteFontFace_Release(fontface); palettecount = IDWriteFontFace2_GetColorPaletteCount(fontface2);

1 0

Michael Stefaniuc : rsaenh/tests: Mark an old behavior as broken ( PVS-Studio).
by Alexandre Julliard Oct. 28, 2015

Oct. 28, 2015

Module: wine Branch: master Commit: 899207b6c9ac8193467de068a98b6aba5ecefdd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=899207b6c9ac8193467de068a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 28 11:22:37 2015 +0100 rsaenh/tests: Mark an old behavior as broken (PVS-Studio). All newer Windows support salt in their AES provider. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/tests/rsaenh.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 439d253..b7616fc 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1166,8 +1166,8 @@ static void test_aes(int keylen) /* Does AES provider support salt? */ result = CryptGetKeyParam(hKey, KP_SALT, NULL, &dwLen, 0); - ok((!result && GetLastError() == NTE_BAD_KEY) || result /* Win7 */, - "expected NTE_BAD_KEY, got %08x\n", GetLastError()); + todo_wine ok(result || broken(GetLastError() == NTE_BAD_KEY), /* Vista or older */ + "Expected OK, got last error %d\n", GetLastError()); if (result) ok(!dwLen, "unexpected salt length %d\n", dwLen);

1 0

Martin Storsjo : ucrtbase: Implement some printf functions.
by Alexandre Julliard Oct. 28, 2015

Oct. 28, 2015

Module: wine Branch: master Commit: 255a7fe06758de5e69dfc4ab20cddc6e6e4d331d URL: http://source.winehq.org/git/wine.git/?a=commit;h=255a7fe06758de5e69dfc4ab2… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Oct 27 23:42:15 2015 +0200 ucrtbase: Implement some printf functions. Not all functions are implemented (yet not all variants are implemented in the normal msvcrt either). The new functions are more generalized and are C99 compliant. They take an options parameter that e.g. for the snprintf family of functions indicate whether the truncation and return value should be handled as before or in the standards compliant way. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 12 +- dlls/msvcrt/file.c | 28 ++ dlls/msvcrt/wcs.c | 94 ++++++ dlls/ucrtbase/tests/Makefile.in | 1 + dlls/ucrtbase/tests/printf.c | 329 +++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 12 +- 6 files changed, 464 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=255a7fe06758de5e69dfc…

1 0

Jacek Caban : rpcrt4: Added support for binding argument in RpcMgmtIsServerListening.
by Alexandre Julliard Oct. 28, 2015

Oct. 28, 2015

Module: wine Branch: master Commit: 41f93d8f59fd9aaddbbca88740226e17737e55d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41f93d8f59fd9aaddbbca8874… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 27 19:28:28 2015 +0100 rpcrt4: Added support for binding argument in RpcMgmtIsServerListening. Based on patch by Andrew Eikum. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_binding.h | 2 ++ dlls/rpcrt4/rpc_server.c | 12 +++++++--- dlls/rpcrt4/rpc_transport.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index 7b8eaf3..1d73ebf 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -104,6 +104,7 @@ struct connection_ops { int (*write)(RpcConnection *conn, const void *buffer, unsigned int len); int (*close)(RpcConnection *conn); void (*cancel_call)(RpcConnection *conn); + RPC_STATUS (*is_server_listening)(const char *endpoint); int (*wait_for_incoming_data)(RpcConnection *conn); size_t (*get_top_of_tower)(unsigned char *tower_data, const char *networkaddr, const char *endpoint); RPC_STATUS (*parse_top_of_tower)(const unsigned char *tower_data, size_t tower_size, char **networkaddr, char **endpoint); @@ -162,6 +163,7 @@ RpcConnection *RPCRT4_GrabConnection( RpcConnection *conn ) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_ReleaseConnection(RpcConnection* Connection) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_OpenClientConnection(RpcConnection* Connection) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_CloseConnection(RpcConnection* Connection) DECLSPEC_HIDDEN; +RPC_STATUS RPCRT4_IsServerListening(const char *protseq, const char *endpoint) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_ResolveBinding(RpcBinding* Binding, LPCSTR Endpoint) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_SetBindingObject(RpcBinding* Binding, const UUID* ObjectUuid) DECLSPEC_HIDDEN; diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 1e22d03..9c3dea7 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -1676,9 +1676,15 @@ RPC_STATUS WINAPI RpcMgmtIsServerListening(RPC_BINDING_HANDLE Binding) TRACE("(%p)\n", Binding); - EnterCriticalSection(&listen_cs); - if (manual_listen_count > 0) status = RPC_S_OK; - LeaveCriticalSection(&listen_cs); + if (Binding) { + RpcBinding *rpc_binding = (RpcBinding*)Binding; + status = RPCRT4_IsServerListening(rpc_binding->Protseq, rpc_binding->Endpoint); + }else { + EnterCriticalSection(&listen_cs); + if (manual_listen_count > 0) status = RPC_S_OK; + LeaveCriticalSection(&listen_cs); + } + return status; } diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 932fa64..54cef07 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -398,6 +398,33 @@ static RPC_STATUS rpcrt4_ncacn_np_handoff(RpcConnection *old_conn, RpcConnection return status; } +static RPC_STATUS is_pipe_listening(const char *pipe_name) +{ + return WaitNamedPipeA(pipe_name, 1) ? RPC_S_OK : RPC_S_NOT_LISTENING; +} + +static RPC_STATUS rpcrt4_ncacn_np_is_server_listening(const char *endpoint) +{ + char *pipe_name; + RPC_STATUS status; + + pipe_name = ncacn_pipe_name(endpoint); + status = is_pipe_listening(pipe_name); + I_RpcFree(pipe_name); + return status; +} + +static RPC_STATUS rpcrt4_ncalrpc_np_is_server_listening(const char *endpoint) +{ + char *pipe_name; + RPC_STATUS status; + + pipe_name = ncalrpc_pipe_name(endpoint); + status = is_pipe_listening(pipe_name); + I_RpcFree(pipe_name); + return status; +} + static RPC_STATUS rpcrt4_ncalrpc_handoff(RpcConnection *old_conn, RpcConnection *new_conn) { RPC_STATUS status; @@ -1532,6 +1559,12 @@ static void rpcrt4_conn_tcp_cancel_call(RpcConnection *Connection) rpcrt4_sock_wait_cancel(tcpc); } +static RPC_STATUS rpcrt4_conn_tcp_is_server_listening(const char *endpoint) +{ + FIXME("\n"); + return RPC_S_ACCESS_DENIED; +} + static int rpcrt4_conn_tcp_wait_for_incoming_data(RpcConnection *Connection) { RpcConnection_tcp *tcpc = (RpcConnection_tcp *) Connection; @@ -3301,6 +3334,12 @@ static void rpcrt4_ncacn_http_cancel_call(RpcConnection *Connection) SetEvent(httpc->cancel_event); } +static RPC_STATUS rpcrt4_ncacn_http_is_server_listening(const char *endpoint) +{ + FIXME("\n"); + return RPC_S_ACCESS_DENIED; +} + static int rpcrt4_ncacn_http_wait_for_incoming_data(RpcConnection *Connection) { RpcConnection_http *httpc = (RpcConnection_http *) Connection; @@ -3342,6 +3381,7 @@ static const struct connection_ops conn_protseq_list[] = { rpcrt4_conn_np_write, rpcrt4_conn_np_close, rpcrt4_conn_np_cancel_call, + rpcrt4_ncacn_np_is_server_listening, rpcrt4_conn_np_wait_for_incoming_data, rpcrt4_ncacn_np_get_top_of_tower, rpcrt4_ncacn_np_parse_top_of_tower, @@ -3362,6 +3402,7 @@ static const struct connection_ops conn_protseq_list[] = { rpcrt4_conn_np_write, rpcrt4_conn_np_close, rpcrt4_conn_np_cancel_call, + rpcrt4_ncalrpc_np_is_server_listening, rpcrt4_conn_np_wait_for_incoming_data, rpcrt4_ncalrpc_get_top_of_tower, rpcrt4_ncalrpc_parse_top_of_tower, @@ -3382,6 +3423,7 @@ static const struct connection_ops conn_protseq_list[] = { rpcrt4_conn_tcp_write, rpcrt4_conn_tcp_close, rpcrt4_conn_tcp_cancel_call, + rpcrt4_conn_tcp_is_server_listening, rpcrt4_conn_tcp_wait_for_incoming_data, rpcrt4_ncacn_ip_tcp_get_top_of_tower, rpcrt4_ncacn_ip_tcp_parse_top_of_tower, @@ -3402,6 +3444,7 @@ static const struct connection_ops conn_protseq_list[] = { rpcrt4_ncacn_http_write, rpcrt4_ncacn_http_close, rpcrt4_ncacn_http_cancel_call, + rpcrt4_ncacn_http_is_server_listening, rpcrt4_ncacn_http_wait_for_incoming_data, rpcrt4_ncacn_http_get_top_of_tower, rpcrt4_ncacn_http_parse_top_of_tower, @@ -3575,6 +3618,20 @@ RPC_STATUS RPCRT4_ReleaseConnection(RpcConnection* Connection) return RPC_S_OK; } +RPC_STATUS RPCRT4_IsServerListening(const char *protseq, const char *endpoint) +{ + const struct connection_ops *ops; + + ops = rpcrt4_get_conn_protseq_ops(protseq); + if (!ops) + { + FIXME("not supported for protseq %s\n", protseq); + return RPC_S_INVALID_BINDING; + } + + return ops->is_server_listening(endpoint); +} + RPC_STATUS RpcTransport_GetTopOfTower(unsigned char *tower_data, size_t *tower_size, const char *protseq,

1 0

Andrew Eikum : xaudio2_7: Move APO implementations to a new file.
by Alexandre Julliard Oct. 28, 2015

Oct. 28, 2015

Module: wine Branch: master Commit: 9da38fdbee1e78db7c5342ad6d16b2d173693afe URL: http://source.winehq.org/git/wine.git/?a=commit;h=9da38fdbee1e78db7c5342ad6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 27 14:33:56 2015 -0500 xaudio2_7: Move APO implementations to a new file. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/Makefile.in | 1 + dlls/xaudio2_7/xapofx.c | 560 ++++++++++++++++++++++++++++++++++++++++ dlls/xaudio2_7/xaudio_dll.c | 510 +----------------------------------- dlls/xaudio2_7/xaudio_private.h | 2 + 4 files changed, 564 insertions(+), 509 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9da38fdbee1e78db7c534…

1 0

Anton Baskanov : quartz: Add stub IAMStreamSelect to MPEG-1 Stream Splitter.
by Alexandre Julliard Oct. 28, 2015

Oct. 28, 2015

Module: wine Branch: master Commit: b75eb2f91eb623d5560791e862596474e8ac5456 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b75eb2f91eb623d5560791e86… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Oct 22 22:54:47 2015 +0600 quartz: Add stub IAMStreamSelect to MPEG-1 Stream Splitter. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/mpegsplit.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++++- include/axcore.idl | 39 +++++++++++++++++++ 2 files changed, 137 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 60dd82c..1fd8002 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -55,6 +55,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct MPEGSplitterImpl { ParserImpl Parser; + IAMStreamSelect IAMStreamSelect_iface; LONGLONG EndOfFile; LONGLONG position; DWORD begin_offset; @@ -64,11 +65,21 @@ typedef struct MPEGSplitterImpl BOOL seek; } MPEGSplitterImpl; +static inline MPEGSplitterImpl *impl_from_IBaseFilter( IBaseFilter *iface ) +{ + return CONTAINING_RECORD(iface, MPEGSplitterImpl, Parser.filter.IBaseFilter_iface); +} + static inline MPEGSplitterImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) { return CONTAINING_RECORD(iface, MPEGSplitterImpl, Parser.sourceSeeking.IMediaSeeking_iface); } +static inline MPEGSplitterImpl *impl_from_IAMStreamSelect( IAMStreamSelect *iface ) +{ + return CONTAINING_RECORD(iface, MPEGSplitterImpl, IAMStreamSelect_iface); +} + static int MPEGSplitter_head_check(const BYTE *header) { /* If this is a possible start code, check for a system or video header */ @@ -752,9 +763,36 @@ static HRESULT MPEGSplitter_first_request(LPVOID iface) return hr; } +static HRESULT WINAPI MPEGSplitter_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppv) +{ + MPEGSplitterImpl *This = impl_from_IBaseFilter(iface); + TRACE("(%s, %p)\n", qzdebugstr_guid(riid), ppv); + + *ppv = NULL; + + if ( IsEqualIID(riid, &IID_IUnknown) + || IsEqualIID(riid, &IID_IPersist) + || IsEqualIID(riid, &IID_IMediaFilter) + || IsEqualIID(riid, &IID_IBaseFilter) ) + *ppv = iface; + else if ( IsEqualIID(riid, &IID_IAMStreamSelect) ) + *ppv = &This->IAMStreamSelect_iface; + + if (*ppv) + { + IBaseFilter_AddRef(iface); + return S_OK; + } + + if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow)) + FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); + + return E_NOINTERFACE; +} + static const IBaseFilterVtbl MPEGSplitter_Vtbl = { - Parser_QueryInterface, + MPEGSplitter_QueryInterface, Parser_AddRef, Parser_Release, Parser_GetClassID, @@ -771,6 +809,64 @@ static const IBaseFilterVtbl MPEGSplitter_Vtbl = Parser_QueryVendorInfo }; +static HRESULT WINAPI AMStreamSelect_QueryInterface(IAMStreamSelect *iface, REFIID riid, void **ppv) +{ + MPEGSplitterImpl *This = impl_from_IAMStreamSelect(iface); + + return IBaseFilter_QueryInterface(&This->Parser.filter.IBaseFilter_iface, riid, ppv); +} + +static ULONG WINAPI AMStreamSelect_AddRef(IAMStreamSelect *iface) +{ + MPEGSplitterImpl *This = impl_from_IAMStreamSelect(iface); + + return IBaseFilter_AddRef(&This->Parser.filter.IBaseFilter_iface); +} + +static ULONG WINAPI AMStreamSelect_Release(IAMStreamSelect *iface) +{ + MPEGSplitterImpl *This = impl_from_IAMStreamSelect(iface); + + return IBaseFilter_Release(&This->Parser.filter.IBaseFilter_iface); +} + +static HRESULT WINAPI AMStreamSelect_Count(IAMStreamSelect *iface, DWORD *streams) +{ + MPEGSplitterImpl *This = impl_from_IAMStreamSelect(iface); + + FIXME("(%p/%p)->(%p) stub!\n", This, iface, streams); + + return E_NOTIMPL; +} + +static HRESULT WINAPI AMStreamSelect_Info(IAMStreamSelect *iface, LONG index, AM_MEDIA_TYPE **media_type, DWORD *flags, LCID *lcid, DWORD *group, WCHAR **name, IUnknown **object, IUnknown **unknown) +{ + MPEGSplitterImpl *This = impl_from_IAMStreamSelect(iface); + + FIXME("(%p/%p)->(%d,%p,%p,%p,%p,%p,%p,%p) stub!\n", This, iface, index, media_type, flags, lcid, group, name, object, unknown); + + return E_NOTIMPL; +} + +static HRESULT WINAPI AMStreamSelect_Enable(IAMStreamSelect *iface, LONG index, DWORD flags) +{ + MPEGSplitterImpl *This = impl_from_IAMStreamSelect(iface); + + FIXME("(%p/%p)->(%d,%x) stub!\n", This, iface, index, flags); + + return E_NOTIMPL; +} + +static const IAMStreamSelectVtbl AMStreamSelectVtbl = +{ + AMStreamSelect_QueryInterface, + AMStreamSelect_AddRef, + AMStreamSelect_Release, + AMStreamSelect_Count, + AMStreamSelect_Info, + AMStreamSelect_Enable +}; + HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) { MPEGSplitterImpl *This; @@ -794,6 +890,7 @@ HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) CoTaskMemFree(This); return hr; } + This->IAMStreamSelect_iface.lpVtbl = &AMStreamSelectVtbl; This->seek = TRUE; /* Note: This memory is managed by the parser filter once created */ diff --git a/include/axcore.idl b/include/axcore.idl index b8c0e69..54523d5 100644 --- a/include/axcore.idl +++ b/include/axcore.idl @@ -655,3 +655,42 @@ enum tagAM_MEDIAEVENT_FLAGS { AM_MEDIAEVENT_NONOTIFY = 0x01 }; + +enum _AMSTREAMSELECTINFOFLAGS +{ + AMSTREAMSELECTINFO_ENABLED = 0x1, + AMSTREAMSELECTINFO_EXCLUSIVE = 0x2 +}; + +enum _AMSTREAMSELECTENABLEFLAGS +{ + AMSTREAMSELECTENABLE_ENABLE = 0x1, + AMSTREAMSELECTENABLE_ENABLEALL = 0x2 +}; + +[ +object, +uuid(c1960960-17f5-11d1-abe1-00a0c905f375), +pointer_default(unique) +] +interface IAMStreamSelect : IUnknown +{ + HRESULT Count( + [out] DWORD *streams); + + HRESULT Info( + [in] long index, + [out] AM_MEDIA_TYPE **media_type, + [out] DWORD *flags, + [out] LCID *lcid, + [out] DWORD *group, + [out] WCHAR **name, + [out] IUnknown **object, + [out] IUnknown **unknown); + + HRESULT Enable( + [in] long index, + [in] DWORD flags); +} + +typedef IAMStreamSelect *PAMSTREAMSELECT;

1 0

Alexandre Julliard : tools: Upgrade the config.guess/config.sub scripts.
by Alexandre Julliard Oct. 28, 2015

Oct. 28, 2015

Module: wine Branch: master Commit: bf6c3a1226b200d78ce06f2a483ffdd03ce39185 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf6c3a1226b200d78ce06f2a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 28 14:24:33 2015 +0900 tools: Upgrade the config.guess/config.sub scripts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/config.guess | 354 ++++++++++++++++++++--------------------------------- tools/config.sub | 80 +++++++----- 2 files changed, 182 insertions(+), 252 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf6c3a1226b200d78ce06…

1 0

Gerald Pfeifer : d3d9: Make D3DFVF_TEXTUREFORMAT4 and friends unsigned.
by Alexandre Julliard Oct. 28, 2015

Oct. 28, 2015

Module: wine Branch: master Commit: 75d62d24d1ac83838dda22476309670e3ef27e8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=75d62d24d1ac83838dda22476… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Oct 27 12:07:00 2015 +0100 d3d9: Make D3DFVF_TEXTUREFORMAT4 and friends unsigned. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d9types.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/d3d9types.h b/include/d3d9types.h index 111d242..cec42ec 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -60,10 +60,10 @@ #define D3DCS_PLANE5 __MSABI_LONG(0x800) #define D3DCS_ALL __MSABI_LONG(0xFFF) -#define D3DFVF_TEXTUREFORMAT1 3 -#define D3DFVF_TEXTUREFORMAT2 0 -#define D3DFVF_TEXTUREFORMAT3 1 -#define D3DFVF_TEXTUREFORMAT4 2 +#define D3DFVF_TEXTUREFORMAT1 3u +#define D3DFVF_TEXTUREFORMAT2 0u +#define D3DFVF_TEXTUREFORMAT3 1u +#define D3DFVF_TEXTUREFORMAT4 2u #define D3DFVF_TEXCOORDSIZE1(CoordIndex) (D3DFVF_TEXTUREFORMAT1 << (CoordIndex*2 + 16)) #define D3DFVF_TEXCOORDSIZE2(CoordIndex) (D3DFVF_TEXTUREFORMAT2) #define D3DFVF_TEXCOORDSIZE3(CoordIndex) (D3DFVF_TEXTUREFORMAT3 << (CoordIndex*2 + 16))

1 0

Michael Stefaniuc : kernel32/tests: Simplify an ok() condition (PVS-Studio ).
by Alexandre Julliard Oct. 28, 2015

Oct. 28, 2015

Module: wine Branch: master Commit: bcff50a9d476a03b93e21577d76288833900e39a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcff50a9d476a03b93e21577d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 28 11:21:13 2015 +0100 kernel32/tests: Simplify an ok() condition (PVS-Studio). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/comm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index cbd276b..97ec794 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -941,7 +941,8 @@ static void test_waittxempty(void) evtmask = 0; SetLastError(0xdeadbeef); res = WaitCommEvent(hcom, &evtmask, &ovl_wait); - ok((!res && GetLastError() == ERROR_IO_PENDING) || res /* busy system */, "%d: WaitCommEvent error %d\n", i, GetLastError()); + ok(res /* busy system */ || GetLastError() == ERROR_IO_PENDING, + "%d: WaitCommEvent error %d\n", i, GetLastError()); res = WaitForSingleObject(ovl_wait.hEvent, TIMEOUT); if (i == 0)

1 0

Alexandre Julliard : makefiles: Automatically add RPATH support for programs that use libwine.
by Alexandre Julliard Oct. 28, 2015

Oct. 28, 2015

Module: wine Branch: master Commit: a1515c68d4d4b4334f44b098debba2548a16ca38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1515c68d4d4b4334f44b098d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 28 10:56:21 2015 +0900 makefiles: Automatically add RPATH support for programs that use libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 48 +++++++++++++++++++----------------------------- configure.ac | 48 +++++++++++++++++++----------------------------- loader/Makefile.in | 2 -- server/Makefile.in | 14 ++------------ tools/makedep.c | 24 ++++++++++++++++++++++++ 5 files changed, 64 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1515c68d4d4b4334f44b…

1 0