wine-commits December 2014

wine-commits@winehq.org

2 participants
319 discussions

Michael Stefaniuc : msi: Remove no-op toupperW() statement (PVS-Studio).
by Alexandre Julliard 10 Dec '14

10 Dec '14

Module: wine Branch: master Commit: 165c9e7cb991956287b981c0259c71c18f01c73d URL: http://source.winehq.org/git/wine.git/?a=commit;h=165c9e7cb991956287b981c02… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 10 10:59:59 2014 +0100 msi: Remove no-op toupperW() statement (PVS-Studio). --- dlls/msi/action.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 1e527da..34697f3 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2423,7 +2423,6 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) sprintfW( buf, fmtW, free.QuadPart / 512 ); msi_set_property( package->db, szPrimaryVolumeSpaceAvailable, buf, -1 ); } - toupperW( primary_folder[0] ); msi_set_property( package->db, szPrimaryVolumePath, primary_folder, 2 ); } msi_free( primary_folder );

1 0

André Hentschel : atl: Fix compiler warnings with flag -Wunused-macros.
by Alexandre Julliard 10 Dec '14

10 Dec '14

Module: wine Branch: master Commit: 76c24c80c379106c7417f12b5910700bd431cf78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76c24c80c379106c7417f12b5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 9 23:30:55 2014 +0100 atl: Fix compiler warnings with flag -Wunused-macros. --- dlls/atl/atl_ax.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index 5bafbf1..d7cf074 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -1137,7 +1137,6 @@ static LPDLGTEMPLATEW AX_ConvertDialogTemplate(LPCDLGTEMPLATEW src_tmpl) #define GET_DWORD(x) (*(const DWORD *)(x)) #define PUT_BLOCK(x,y) do {if (!advance_array(&output, &allocated, &filled, (x), (y))) return NULL;} while (0) #define PUT_WORD(x) do {WORD w = (x);PUT_BLOCK(&w, 1);} while(0) -#define PUT_DWORD(x) do {DWORD w = (x);PUT_BLOCK(&w, 2);} while(0) const WORD *tmp, *src = (const WORD *)src_tmpl; WORD *output; DWORD allocated, filled; /* in WORDs */

1 0

André Hentschel : gdiplus: Fix compiler warnings with flag -Wunused-macros.
by Alexandre Julliard 10 Dec '14

10 Dec '14

Module: wine Branch: master Commit: 1d0ff2ded3c214f5e25eb59d600bc1916e6b7f18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d0ff2ded3c214f5e25eb59d6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 9 23:30:28 2014 +0100 gdiplus: Fix compiler warnings with flag -Wunused-macros. --- dlls/gdiplus/image.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index eec76f6..e6921f5 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3876,11 +3876,6 @@ GpStatus WINGDIPAPI GdipSaveImageToFile(GpImage *image, GDIPCONST WCHAR* filenam * Encoding functions - * These functions encode an image in different image file formats. */ -#define BITMAP_FORMAT_BMP 0x4d42 /* "BM" */ -#define BITMAP_FORMAT_JPEG 0xd8ff -#define BITMAP_FORMAT_GIF 0x4947 -#define BITMAP_FORMAT_PNG 0x5089 -#define BITMAP_FORMAT_APM 0xcdd7 static GpStatus encode_image_WIC(GpImage *image, IStream* stream, GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params)

1 0

André Hentschel : dbghelp: Fix compiler warnings with flag -Wunused-macros.
by Alexandre Julliard 10 Dec '14

10 Dec '14

Module: wine Branch: master Commit: b2f967e0865f231991a8c83693bbc81ef5afba74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2f967e0865f231991a8c8369… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 9 23:29:52 2014 +0100 dbghelp: Fix compiler warnings with flag -Wunused-macros. --- dlls/dbghelp/cpu_i386.c | 1 - dlls/dbghelp/cpu_x86_64.c | 18 ++---------------- dlls/dbghelp/msc.c | 2 -- 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index 87f833f..8a3c074 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -29,7 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); -#define STEP_FLAG 0x00000100 /* single step flag */ #define V86_FLAG 0x00020000 #define IS_VM86_MODE(ctx) (ctx->EFlags & V86_FLAG) diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index e0ffb11..94f561c 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -76,21 +76,6 @@ typedef struct _UNWIND_INFO */ } UNWIND_INFO, *PUNWIND_INFO; -#define GetUnwindCodeEntry(info, index) \ - ((info)->UnwindCode[index]) - -#define GetLanguageSpecificDataPtr(info) \ - ((PVOID)&GetUnwindCodeEntry((info),((info)->CountOfCodes + 1) & ~1)) - -#define GetExceptionHandler(base, info) \ - ((PEXCEPTION_HANDLER)((base) + *(PULONG)GetLanguageSpecificDataPtr(info))) - -#define GetChainedFunctionEntry(base, info) \ - ((PRUNTIME_FUNCTION)((base) + *(PULONG)GetLanguageSpecificDataPtr(info))) - -#define GetExceptionDataPtr(info) \ - ((PVOID)((PULONG)GetLanguageSpecificData(info) + 1) - static BOOL x86_64_get_addr(HANDLE hThread, const CONTEXT* ctx, enum cpu_addr ca, ADDRESS64* addr) { @@ -107,6 +92,8 @@ static BOOL x86_64_get_addr(HANDLE hThread, const CONTEXT* ctx, } } +#ifdef __x86_64__ + enum st_mode {stm_start, stm_64bit, stm_done}; /* indexes in Reserved array */ @@ -118,7 +105,6 @@ enum st_mode {stm_start, stm_64bit, stm_done}; #define curr_count (frame->Reserved[__CurrentCount]) /* #define ??? (frame->Reserved[__]) (unused) */ -#ifdef __x86_64__ union handler_data { RUNTIME_FUNCTION chain; diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 636655f..3b12a3a 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -58,8 +58,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_msc); -#define MAX_PATHNAME_LEN 1024 - struct pdb_stream_name { const char* name;

1 0

André Hentschel : widl: Fix compiler warnings with flag -Wunused-macros.
by Alexandre Julliard 10 Dec '14

10 Dec '14

Module: wine Branch: master Commit: 900e7c5d6559eddfc14518f203fb36bc97881cda URL: http://source.winehq.org/git/wine.git/?a=commit;h=900e7c5d6559eddfc14518f20… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 9 23:29:18 2014 +0100 widl: Fix compiler warnings with flag -Wunused-macros. --- tools/widl/proxy.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 0c0d7ce..f4fe6f5 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -37,14 +37,6 @@ #include "typegen.h" #include "expr.h" -#define END_OF_LIST(list) \ - do { \ - if (list) { \ - while (NEXT_LINK(list)) \ - list = NEXT_LINK(list); \ - } \ - } while(0) - static FILE* proxy; static int indent = 0;

1 0

Michael Stefaniuc : comctl32: Remove a stray unused GetFocus() statement ( PVS-Studio).
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: 47fa711bbcff49e28d605eecabff70e229cb5c9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=47fa711bbcff49e28d605eeca… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 9 22:11:03 2014 +0100 comctl32: Remove a stray unused GetFocus() statement (PVS-Studio). --- dlls/comctl32/toolbar.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index a1b7966..a329c26 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5067,8 +5067,6 @@ TOOLBAR_SetHotItem2 (TOOLBAR_INFO *infoPtr, INT nHotItem, LPARAM lParam) TOOLBAR_SetHotItemEx(infoPtr, nHotItem, lParam); - GetFocus(); - return (nOldHotItem < 0) ? -1 : (LRESULT)nOldHotItem; }

1 0

Bruno Jesus : ws2_32: Implement getsockopt(SO_BSP_STATE).
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: 1c4cb6303647901affac8320bf49c388e34e515d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c4cb6303647901affac8320b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Dec 8 20:55:45 2014 -0200 ws2_32: Implement getsockopt(SO_BSP_STATE). --- dlls/ws2_32/socket.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/tests/sock.c | 21 ++++++++++++-- include/winsock.h | 1 + 3 files changed, 93 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1864dfd..b6aad67 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3095,6 +3095,79 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, } release_sock_fd( s, fd ); return ret; + case WS_SO_BSP_STATE: + { + int req_size, addr_size; + WSAPROTOCOL_INFOW infow; + CSADDR_INFO *csinfo; + + ret = ws_protocol_info(s, TRUE, &infow, &addr_size); + if (ret) + { + if (infow.iAddressFamily == WS_AF_INET) + addr_size = sizeof(struct sockaddr_in); + else if (infow.iAddressFamily == WS_AF_INET6) + addr_size = sizeof(struct sockaddr_in6); + else + { + FIXME("Family %d is unsupported for SO_BSP_STATE", infow.iAddressFamily); + SetLastError(WSAEAFNOSUPPORT); + return SOCKET_ERROR; + } + + req_size = sizeof(CSADDR_INFO) + addr_size * 2; + if (*optlen < req_size) + { + ret = 0; + SetLastError(WSAEFAULT); + } + else + { + union generic_unix_sockaddr uaddr; + socklen_t uaddrlen = sizeof(uaddr); + + if ( (fd = get_sock_fd( s, 0, NULL )) == -1) + return SOCKET_ERROR; + + csinfo = (CSADDR_INFO*) optval; + + /* Check if the sock is bound */ + if (!getsockname(fd, &uaddr.addr, &uaddrlen) && + is_sockaddr_bound(&uaddr.addr, uaddrlen)) + { + csinfo->LocalAddr.lpSockaddr = + (LPSOCKADDR) (optval + sizeof(CSADDR_INFO)); + ws_sockaddr_u2ws(&uaddr.addr, csinfo->LocalAddr.lpSockaddr, &addr_size); + csinfo->LocalAddr.iSockaddrLength = addr_size; + } + else + { + csinfo->LocalAddr.lpSockaddr = NULL; + csinfo->LocalAddr.iSockaddrLength = 0; + } + + /* Check if the sock is connected */ + if (!getpeername(fd, &uaddr.addr, &uaddrlen) && + is_sockaddr_bound(&uaddr.addr, uaddrlen)) + { + csinfo->RemoteAddr.lpSockaddr = + (LPSOCKADDR) (optval + sizeof(CSADDR_INFO) + addr_size); + ws_sockaddr_u2ws(&uaddr.addr, csinfo->RemoteAddr.lpSockaddr, &addr_size); + csinfo->RemoteAddr.iSockaddrLength = addr_size; + } + else + { + csinfo->RemoteAddr.lpSockaddr = NULL; + csinfo->RemoteAddr.iSockaddrLength = 0; + } + + csinfo->iSocketType = infow.iSocketType; + csinfo->iProtocol = infow.iProtocol; + release_sock_fd( s, fd ); + } + } + return ret ? 0 : SOCKET_ERROR; + } case WS_SO_DONTLINGER: { struct linger lingval; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f0946c9..49ebbf5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1486,9 +1486,9 @@ todo_wine } /* Test SO_BSP_STATE - Present only in >= Win 2008 */ - s = socket(AF_INET, SOCK_STREAM, 0); + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ok(s != INVALID_SOCKET, "Failed to create socket\n"); - s2 = socket(AF_INET, SOCK_STREAM, 0); + s2 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ok(s2 != INVALID_SOCKET, "Failed to create socket\n"); SetLastError(0xdeadbeef); @@ -1571,6 +1571,23 @@ todo_wine ok(!err, "Expected 0, got %d\n", err); ok(!memcmp(&saddr, csinfoB.cs.LocalAddr.lpSockaddr, size), "Expected matching addresses\n"); ok(!memcmp(&saddr, csinfoA.cs.RemoteAddr.lpSockaddr, size), "Expected matching addresses\n"); + + SetLastError(0xdeadbeef); + size = sizeof(CSADDR_INFO); + err = getsockopt(s, SOL_SOCKET, SO_BSP_STATE, (char *) &csinfoA, &size); + ok(err, "Expected non-zero\n"); + ok(size == sizeof(CSADDR_INFO), "Got %d\n", size); + ok(GetLastError() == WSAEFAULT, "Expected 10014, got %d\n", GetLastError()); + + /* At least for IPv4 the size is exactly 56 bytes */ + size = sizeof(*csinfoA.cs.LocalAddr.lpSockaddr) * 2 + sizeof(csinfoA.cs); + err = getsockopt(s, SOL_SOCKET, SO_BSP_STATE, (char *) &csinfoA, &size); + ok(!err, "Expected 0, got %d\n", err); + size--; + SetLastError(0xdeadbeef); + err = getsockopt(s, SOL_SOCKET, SO_BSP_STATE, (char *) &csinfoA, &size); + ok(err, "Expected non-zero\n"); + ok(GetLastError() == WSAEFAULT, "Expected 10014, got %d\n", GetLastError()); } else ok(GetLastError() == WSAENOPROTOOPT, "Expected 10042, got %d\n", GetLastError()); diff --git a/include/winsock.h b/include/winsock.h index 21e984c..50237e8 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -697,6 +697,7 @@ typedef struct WS(WSAData) #define WS_SO_RCVTIMEO 0x1006 #define WS_SO_ERROR 0x1007 #define WS_SO_TYPE 0x1008 +#define WS_SO_BSP_STATE 0x1009 #define WS_IOCPARM_MASK 0x7f #define WS_IOC_VOID 0x20000000

1 0

André Hentschel : ntdll: Remove unused macros.
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: 550f556dca616ae1a639e16f0170d483029f040d URL: http://source.winehq.org/git/wine.git/?a=commit;h=550f556dca616ae1a639e16f0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 9 00:59:28 2014 +0100 ntdll: Remove unused macros. --- dlls/ntdll/signal_i386.c | 1 - dlls/ntdll/time.c | 4 ---- 2 files changed, 5 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 13df4bb..1a69bc0 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -177,7 +177,6 @@ typedef struct ucontext #define FPU_sig(context) ((FLOATING_SAVE_AREA*)((context)->uc_mcontext.fpregs)) #define FPUX_sig(context) (FPU_sig(context) && !((context)->uc_mcontext.fpregs->status >> 16) ? (XMM_SAVE_AREA32 *)(FPU_sig(context) + 1) : NULL) -#define VM86_EAX 0 /* the %eax value while vm86_enter is executing */ #define VIF_FLAG 0x00080000 #define VIP_FLAG 0x00100000 diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 5ec5a1c..0f14a3e 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -74,12 +74,8 @@ static RTL_CRITICAL_SECTION TIME_tz_section = { &critsect_debug, -1, 0, 0, 0, 0 #define HOURSPERDAY 24 #define EPOCHWEEKDAY 1 /* Jan 1, 1601 was Monday */ #define DAYSPERWEEK 7 -#define EPOCHYEAR 1601 -#define DAYSPERNORMALYEAR 365 -#define DAYSPERLEAPYEAR 366 #define MONSPERYEAR 12 #define DAYSPERQUADRICENTENNIUM (365 * 400 + 97) -#define DAYSPERNORMALCENTURY (365 * 100 + 24) #define DAYSPERNORMALQUADRENNIUM (365 * 4 + 1) /* 1601 to 1970 is 369 years plus 89 leap days */

1 0

André Hentschel : qmgr/tests: Remove unused macro.
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: 8ae3c7ae275b0a85ce189ec0734f381e2c9658a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ae3c7ae275b0a85ce189ec07… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 9 00:59:16 2014 +0100 qmgr/tests: Remove unused macro. --- dlls/qmgr/tests/file.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/qmgr/tests/file.c b/dlls/qmgr/tests/file.c index c77ff11..5e6eb34 100644 --- a/dlls/qmgr/tests/file.c +++ b/dlls/qmgr/tests/file.c @@ -28,7 +28,6 @@ #include "bits.h" /* Globals used by many tests */ -#define NUM_FILES 1 static const WCHAR test_remoteName[] = {'r','e','m','o','t','e', 0}; static const WCHAR test_localName[] = {'l','o','c','a','l', 0}; static WCHAR test_localFile[MAX_PATH];

1 0

Nikolay Sivov : dwrite: Update to IDWriteFactory2.
by Alexandre Julliard 09 Dec '14

09 Dec '14

Module: wine Branch: master Commit: de741ffe52f3d49ff867e1ed87c81dd4259f67f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de741ffe52f3d49ff867e1ed8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 9 16:31:00 2014 +0300 dwrite: Update to IDWriteFactory2. --- dlls/dwrite/dwrite_private.h | 6 +- dlls/dwrite/font.c | 28 ++--- dlls/dwrite/gdiinterop.c | 10 +- dlls/dwrite/main.c | 238 +++++++++++++++++++++++++++++-------------- 4 files changed, 182 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de741ffe52f3d49ff867e…

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
32
Older →

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 December 2014