November 2011 - Wine-commits

Francois Gouget : msvcrt: Give a name to the critical sections.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: f2043352d1bedc31a286facce09d7e644c67b672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2043352d1bedc31a286facce… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 14 15:10:55 2011 +0100 msvcrt: Give a name to the critical sections. --- dlls/msvcrt/file.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 90e0d80..b6af98f 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -379,7 +379,10 @@ static int msvcrt_init_fp(MSVCRT_FILE* file, int fd, unsigned stream_flags) file->_flag = stream_flags; if(file<MSVCRT__iob || file>=MSVCRT__iob+_IOB_ENTRIES) + { InitializeCriticalSection(&((file_crit*)file)->crit); + ((file_crit*)file)->crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": file_crit.crit"); + } TRACE(":got FILE* (%p)\n",file); return 0; @@ -2608,7 +2611,10 @@ int CDECL MSVCRT_fclose(MSVCRT_FILE* file) file->_flag = 0; MSVCRT__unlock_file(file); if(file<MSVCRT__iob || file>=MSVCRT__iob+_IOB_ENTRIES) + { + ((file_crit*)file)->crit.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&((file_crit*)file)->crit); + } if(file == msvcrt_get_file(MSVCRT_stream_idx-1)) { while(MSVCRT_stream_idx>3 && !file->_flag) {

1 0

Francois Gouget : mcicda: Give a name to the critical sections.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 4db0d0da197b7241c71a99a13bc767c7fe7a86eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4db0d0da197b7241c71a99a13… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 14 15:11:10 2011 +0100 mcicda: Give a name to the critical sections. --- dlls/mcicda/mcicda.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c index 3ec8307..1ea9a58 100644 --- a/dlls/mcicda/mcicda.c +++ b/dlls/mcicda/mcicda.c @@ -179,6 +179,7 @@ static DWORD MCICDA_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) modp->wCustomCommandTable = MCI_NO_COMMAND_TABLE; modp->wType = MCI_DEVTYPE_CD_AUDIO; InitializeCriticalSection(&wmcda->cs); + wmcda->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": WINE_MCICDAUDIO.cs"); return modp->wDeviceID; } @@ -190,6 +191,7 @@ static DWORD MCICDA_drvClose(DWORD dwDevID) WINE_MCICDAUDIO* wmcda = (WINE_MCICDAUDIO*)mciGetDriverData(dwDevID); if (wmcda) { + wmcda->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&wmcda->cs); HeapFree(GetProcessHeap(), 0, wmcda); mciSetDriverData(dwDevID, 0);

1 0

Francois Gouget : inetcomm: Give a name to the critical sections and delete them when done.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: f7b22f654706b4277b3a461de18ff875f1bcee9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7b22f654706b4277b3a461de… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 14 15:11:30 2011 +0100 inetcomm: Give a name to the critical sections and delete them when done. --- dlls/inetcomm/mimeintl.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c index 1b15251..07d3ae5 100644 --- a/dlls/inetcomm/mimeintl.c +++ b/dlls/inetcomm/mimeintl.c @@ -104,6 +104,8 @@ static ULONG WINAPI MimeInternat_Release( IMimeInternational *iface ) list_remove(&charset->entry); HeapFree(GetProcessHeap(), 0, charset); } + This->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->cs); HeapFree(GetProcessHeap(), 0, This); } @@ -527,6 +529,7 @@ HRESULT MimeInternational_Construct(IMimeInternational **internat) global_internat->IMimeInternational_iface.lpVtbl = &mime_internat_vtbl; global_internat->refs = 0; InitializeCriticalSection(&global_internat->cs); + global_internat->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": global_internat.cs"); list_init(&global_internat->charsets); global_internat->next_charset_handle = 0;

1 0

Marcus Meissner : oleaut32: Use correct variable (Coverity).
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 49cade4b01cb6089e7e53355f968a0d70633e4a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49cade4b01cb6089e7e53355f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Nov 14 17:23:14 2011 +0100 oleaut32: Use correct variable (Coverity). --- dlls/oleaut32/tests/vartype.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 1ceb436..dd32f8a 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5152,7 +5152,7 @@ static void test_VarBstrCmp(void) SysFreeString(bstr); bstr = SysAllocStringByteLen(sbchr0, sizeof(sbchr0)); - bstr2 = SysAllocStringByteLen(sbchr0, sizeof(sbchr00)); + bstr2 = SysAllocStringByteLen(sbchr00, sizeof(sbchr00)); VARBSTRCMP(bstr,bstrempty,0,VARCMP_GT); VARBSTRCMP(bstrempty,bstr,0,VARCMP_LT); VARBSTRCMP(bstr2,bstrempty,0,VARCMP_GT); @@ -5171,7 +5171,7 @@ static void test_VarBstrCmp(void) SysFreeString(bstr); bstr = SysAllocStringByteLen(sbchr0, sizeof(sbchr0)); - bstr2 = SysAllocStringByteLen(sbchr0, sizeof(sbchr00)); + bstr2 = SysAllocStringByteLen(sbchr00, sizeof(sbchr00)); VARBSTRCMP(bstr,bstrempty,0,VARCMP_GT); VARBSTRCMP(bstrempty,bstr,0,VARCMP_LT); VARBSTRCMP(bstr2,bstrempty,0,VARCMP_GT);

1 0

Juan Lang : iphlpapi: Combine #ifdef HAVE_IFADDRS_H blocks.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: cd0ee464cdd4b719e3245d33d5a7bd87dd948e1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd0ee464cdd4b719e3245d33d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Nov 13 08:25:52 2011 -0800 iphlpapi: Combine #ifdef HAVE_IFADDRS_H blocks. --- dlls/iphlpapi/ifenum.c | 130 +++++++++++++++++++++++------------------------ 1 files changed, 64 insertions(+), 66 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index d84caed..7e0caf2 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -764,6 +764,69 @@ DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags) return ret; } +ULONG v6addressesFromIndex(DWORD index, SOCKET_ADDRESS **addrs, ULONG *num_addrs) +{ + struct ifaddrs *ifa; + ULONG ret; + + if (!getifaddrs(&ifa)) + { + struct ifaddrs *p; + ULONG n; + char name[IFNAMSIZ]; + + getInterfaceNameByIndex(index, name); + for (p = ifa, n = 0; p; p = p->ifa_next) + if (p->ifa_addr && p->ifa_addr->sa_family == AF_INET6 && + !strcmp(name, p->ifa_name)) + n++; + if (n) + { + *addrs = HeapAlloc(GetProcessHeap(), 0, n * (sizeof(SOCKET_ADDRESS) + + sizeof(struct WS_sockaddr_in6))); + if (*addrs) + { + struct WS_sockaddr_in6 *next_addr = (struct WS_sockaddr_in6 *)( + (BYTE *)*addrs + n * sizeof(SOCKET_ADDRESS)); + + for (p = ifa, n = 0; p; p = p->ifa_next) + { + if (p->ifa_addr && p->ifa_addr->sa_family == AF_INET6 && + !strcmp(name, p->ifa_name)) + { + struct sockaddr_in6 *addr = (struct sockaddr_in6 *)p->ifa_addr; + + next_addr->sin6_family = WS_AF_INET6; + next_addr->sin6_port = addr->sin6_port; + next_addr->sin6_flowinfo = addr->sin6_flowinfo; + memcpy(&next_addr->sin6_addr, &addr->sin6_addr, + sizeof(next_addr->sin6_addr)); + next_addr->sin6_scope_id = addr->sin6_scope_id; + (*addrs)[n].lpSockaddr = (LPSOCKADDR)next_addr; + (*addrs)[n].iSockaddrLength = sizeof(struct WS_sockaddr_in6); + next_addr++; + n++; + } + } + *num_addrs = n; + ret = ERROR_SUCCESS; + } + else + ret = ERROR_OUTOFMEMORY; + } + else + { + *addrs = NULL; + *num_addrs = 0; + ret = ERROR_SUCCESS; + } + freeifaddrs(ifa); + } + else + ret = ERROR_NO_DATA; + return ret; +} + #else /* Enumerates the IP addresses in the system using SIOCGIFCONF, returning @@ -886,78 +949,13 @@ DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags) return ret; } -#endif - -#ifdef HAVE_IFADDRS_H -ULONG v6addressesFromIndex(DWORD index, SOCKET_ADDRESS **addrs, ULONG *num_addrs) -{ - struct ifaddrs *ifa; - ULONG ret; - - if (!getifaddrs(&ifa)) - { - struct ifaddrs *p; - ULONG n; - char name[IFNAMSIZ]; - - getInterfaceNameByIndex(index, name); - for (p = ifa, n = 0; p; p = p->ifa_next) - if (p->ifa_addr && p->ifa_addr->sa_family == AF_INET6 && - !strcmp(name, p->ifa_name)) - n++; - if (n) - { - *addrs = HeapAlloc(GetProcessHeap(), 0, n * (sizeof(SOCKET_ADDRESS) + - sizeof(struct WS_sockaddr_in6))); - if (*addrs) - { - struct WS_sockaddr_in6 *next_addr = (struct WS_sockaddr_in6 *)( - (BYTE *)*addrs + n * sizeof(SOCKET_ADDRESS)); - - for (p = ifa, n = 0; p; p = p->ifa_next) - { - if (p->ifa_addr && p->ifa_addr->sa_family == AF_INET6 && - !strcmp(name, p->ifa_name)) - { - struct sockaddr_in6 *addr = (struct sockaddr_in6 *)p->ifa_addr; - - next_addr->sin6_family = WS_AF_INET6; - next_addr->sin6_port = addr->sin6_port; - next_addr->sin6_flowinfo = addr->sin6_flowinfo; - memcpy(&next_addr->sin6_addr, &addr->sin6_addr, - sizeof(next_addr->sin6_addr)); - next_addr->sin6_scope_id = addr->sin6_scope_id; - (*addrs)[n].lpSockaddr = (LPSOCKADDR)next_addr; - (*addrs)[n].iSockaddrLength = sizeof(struct WS_sockaddr_in6); - next_addr++; - n++; - } - } - *num_addrs = n; - ret = ERROR_SUCCESS; - } - else - ret = ERROR_OUTOFMEMORY; - } - else - { - *addrs = NULL; - *num_addrs = 0; - ret = ERROR_SUCCESS; - } - freeifaddrs(ifa); - } - else - ret = ERROR_NO_DATA; - return ret; -} -#else ULONG v6addressesFromIndex(DWORD index, SOCKET_ADDRESS **addrs, ULONG *num_addrs) { *addrs = NULL; *num_addrs = 0; return ERROR_SUCCESS; } + #endif char *toIPAddressString(unsigned int addr, char string[16])

1 0

Juan Lang : iphlpapi: Remove an unmaintained comment, and update copyright.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 0de0796134209bd6318ea8031bf297cad8ce880b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0de0796134209bd6318ea8031… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Nov 13 08:30:38 2011 -0800 iphlpapi: Remove an unmaintained comment, and update copyright. --- dlls/iphlpapi/ifenum.c | 14 +------------- 1 files changed, 1 insertions(+), 13 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index 7e0caf2..e749cce 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2003,2006 Juan Lang +/* Copyright (C) 2003,2006,2011 Juan Lang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -13,18 +13,6 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * Implementation notes - * FIXME: - * - I don't support IPv6 addresses here, since SIOCGIFCONF can't return them - * - * There are three implemented methods for determining the MAC address of an - * interface: - * - a specific IOCTL (Linux) - * - looking in the ARP cache (at least Solaris) - * - using the sysctl interface (FreeBSD and Mac OS X) - * Solaris and some others have SIOCGENADDR, but I haven't gotten that to work - * on the Solaris boxes at SourceForge's compile farm, whereas SIOCGARP does. */ #include "config.h"

1 0

Juan Lang : iphlpapi: Remove unneeded includes.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: c6bb89a6d6cdfa4dcf59e4f63bd4c2452f709660 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6bb89a6d6cdfa4dcf59e4f63… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 9 17:42:20 2011 -0800 iphlpapi: Remove unneeded includes. --- dlls/iphlpapi/iphlpapi_main.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index d5e8f33..a2bdea3 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -23,12 +23,6 @@ #include <stdarg.h> #include <stdlib.h> #include <sys/types.h> -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif -#ifdef HAVE_NET_IF_H -#include <net/if.h> -#endif #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif

1 0

Francois Gouget : include: Update dlgs.h.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: b295da2d865c40046598a8208c28d0f36c742905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b295da2d865c40046598a8208… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Nov 14 11:30:51 2011 +0100 include: Update dlgs.h. --- include/dlgs.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/dlgs.h b/include/dlgs.h index 7315b11..abcb488 100644 --- a/include/dlgs.h +++ b/include/dlgs.h @@ -210,5 +210,15 @@ #define COLORMGMTDLGORD 1551 #define NEWFILEOPENV2ORD 1552 #define NEWFILEOPENV3ORD 1553 +#define NEWFORMATDLGWITHLINK 1591 +#define IDC_MANAGE_LINK 1592 + +typedef struct tagCRGB +{ + BYTE bRed; + BYTE bGreen; + BYTE bBlue; + BYTE bExtra; +} CRGB; #endif /* #ifdef __WINE_DLGS_H */

1 0

Francois Gouget : dsound: Unset Spare[0] before deleting non-static critical sections.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 0caef81de2e67dbf1eb7cbaea549371c51e48806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0caef81de2e67dbf1eb7cbaea… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 14 11:32:27 2011 +0100 dsound: Unset Spare[0] before deleting non-static critical sections. --- dlls/dsound/capture.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 9e289f3..4897e17 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -1027,6 +1027,7 @@ static HRESULT DirectSoundCaptureDevice_Initialize( hr = IMMDevice_Activate(mmdevice, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&client); if(FAILED(hr)){ + device->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&device->lock); HeapFree(GetProcessHeap(), 0, device); LeaveCriticalSection(&DSOUND_capturers_lock);

1 0

Francois Gouget : strmbase: Unset Spare[0] before deleting non-static critical sections.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 76b64d9a4a41ff01984945c44049fba7c58ee53a URL: http://source.winehq.org/git/wine.git/?a=commit;h=76b64d9a4a41ff01984945c44… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 14 11:32:32 2011 +0100 strmbase: Unset Spare[0] before deleting non-static critical sections. --- dlls/strmbase/outputqueue.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/strmbase/outputqueue.c b/dlls/strmbase/outputqueue.c index 88a49f8..e931923 100644 --- a/dlls/strmbase/outputqueue.c +++ b/dlls/strmbase/outputqueue.c @@ -127,6 +127,7 @@ HRESULT WINAPI OutputQueue_Destroy(OutputQueue *pOutputQueue) SetEvent(pOutputQueue->hProcessQueue); LeaveCriticalSection(&pOutputQueue->csQueue); + pOutputQueue->csQueue.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&pOutputQueue->csQueue); CloseHandle(pOutputQueue->hProcessQueue);

1 0