Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 73843: [WS2_32] Remove duplicated if CID 1400935
by pschweitzer＠svn.reactos.org 19 Feb '17

19 Feb '17

Author: pschweitzer Date: Sun Feb 19 12:52:14 2017 New Revision: 73843 URL: http://svn.reactos.org/svn/reactos?rev=73843&view=rev Log: [WS2_32] Remove duplicated if CID 1400935 Modified: trunk/reactos/dll/win32/ws2_32/src/socklife.c Modified: trunk/reactos/dll/win32/ws2_32/src/socklife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/sockl… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/socklife.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/socklife.c [iso-8859-1] Sun Feb 19 12:52:14 2017 @@ -574,13 +574,6 @@ } /* Check if we got a valid socket */ - if (Status == WSAEINVAL) - { - Status = INVALID_SOCKET; - ErrorCode = WSAEINVAL; - } - - /* Check if we got a valid socket */ if (Status != INVALID_SOCKET) { /* Add an API reference and return */

1 0

[pschweitzer] 73842: [DNSAPI] Properly check for domain name being set CID 1401070
by pschweitzer＠svn.reactos.org 19 Feb '17

19 Feb '17

Author: pschweitzer Date: Sun Feb 19 12:42:08 2017 New Revision: 73842 URL: http://svn.reactos.org/svn/reactos?rev=73842&view=rev Log: [DNSAPI] Properly check for domain name being set CID 1401070 Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/query.c Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/qu… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] Sun Feb 19 12:42:08 2017 @@ -738,7 +738,7 @@ TempLen += StringLength; HostWithDomainName = (PCHAR)RtlAllocateHeap(RtlGetProcessHeap(), 0, TempLen); StringCchCopyA(HostWithDomainName, TempLen, network_info->HostName); - if (network_info->DomainName) + if (network_info->DomainName[0]) { StringCchCatA(HostWithDomainName, TempLen, "."); StringCchCatA(HostWithDomainName, TempLen, network_info->DomainName); @@ -783,7 +783,7 @@ if ((addr.s_addr != INADDR_ANY) && (addr.s_addr != INADDR_NONE)) adns_addserver(astate, addr); } - if (network_info->DomainName) + if (network_info->DomainName[0]) { adns_ccf_search(astate, "LOCALDOMAIN", -1, network_info->DomainName); }

1 0

[tfaber] 73841: [WSHTCPIP] - Fix incorrect sizeof in SHIoctl_GetInterfaceList. CID 1401188
by tfaber＠svn.reactos.org 19 Feb '17

19 Feb '17

Author: tfaber Date: Sun Feb 19 12:21:06 2017 New Revision: 73841 URL: http://svn.reactos.org/svn/reactos?rev=73841&view=rev Log: [WSHTCPIP] - Fix incorrect sizeof in SHIoctl_GetInterfaceList. CID 1401188 Modified: trunk/reactos/dll/win32/wshtcpip/iflist.c Modified: trunk/reactos/dll/win32/wshtcpip/iflist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshtcpip/iflist.… ============================================================================== --- trunk/reactos/dll/win32/wshtcpip/iflist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshtcpip/iflist.c [iso-8859-1] Sun Feb 19 12:21:06 2017 @@ -236,7 +236,7 @@ INT res = -1; /* Init Interface-ID-List */ - IntfIDList = HeapAlloc(hHeap,0,sizeof(IntfIDList)); + IntfIDList = HeapAlloc(hHeap, 0, sizeof(*IntfIDList)); list_init(&IntfIDList->entry); /* open tcp-driver */

1 0

[tfaber] 73840: [WS2_32] - Fix ridiculous over-casting
by tfaber＠svn.reactos.org 19 Feb '17

19 Feb '17

Author: tfaber Date: Sun Feb 19 12:05:48 2017 New Revision: 73840 URL: http://svn.reactos.org/svn/reactos?rev=73840&view=rev Log: [WS2_32] - Fix ridiculous over-casting Modified: trunk/reactos/dll/win32/ws2_32/inc/ws2_32p.h trunk/reactos/dll/win32/ws2_32/src/addrinfo.c trunk/reactos/dll/win32/ws2_32/src/async.c trunk/reactos/dll/win32/ws2_32/src/dcatalog.c trunk/reactos/dll/win32/ws2_32/src/dcatitem.c trunk/reactos/dll/win32/ws2_32/src/dprocess.c trunk/reactos/dll/win32/ws2_32/src/dprovide.c trunk/reactos/dll/win32/ws2_32/src/getxbyxx.c trunk/reactos/dll/win32/ws2_32/src/nscatalo.c trunk/reactos/dll/win32/ws2_32/src/nsprovid.c trunk/reactos/dll/win32/ws2_32/src/nsquery.c trunk/reactos/dll/win32/ws2_32/src/qshelpr.c Modified: trunk/reactos/dll/win32/ws2_32/inc/ws2_32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/inc/ws2_3… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/inc/ws2_32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/inc/ws2_32p.h [iso-8859-1] Sun Feb 19 12:05:48 2017 @@ -98,7 +98,7 @@ DWORD UniqueId; DWORD NextId; HKEY CatalogKey; - RTL_CRITICAL_SECTION Lock; + CRITICAL_SECTION Lock; BOOLEAN Initialized; } TCATALOG, *PTCATALOG; @@ -139,7 +139,7 @@ DWORD ItemCount; DWORD UniqueId; HKEY CatalogKey; - RTL_CRITICAL_SECTION Lock; + CRITICAL_SECTION Lock; } NSCATALOG, *PNSCATALOG; typedef struct _NSQUERY @@ -149,7 +149,7 @@ BOOLEAN ShuttingDown; LIST_ENTRY ProviderList; PNSQUERY_PROVIDER ActiveProvider; - RTL_CRITICAL_SECTION Lock; + CRITICAL_SECTION Lock; PNSQUERY_PROVIDER CurrentProvider; LPWSAQUERYSETW QuerySet; DWORD ControlFlags; @@ -169,7 +169,7 @@ HANDLE NamespaceCatalogEvent; DWORD Version; BOOLEAN LockReady; - RTL_CRITICAL_SECTION ThreadLock; + CRITICAL_SECTION ThreadLock; } WSPROCESS, *PWSPROCESS; typedef struct _WSTHREAD @@ -270,11 +270,11 @@ LPSTR WSAAPI -AnsiDupFromUnicode(IN LPWSTR UnicodeString); +AnsiDupFromUnicode(IN LPCWSTR UnicodeString); LPWSTR WSAAPI -UnicodeDupFromAnsi(IN LPSTR AnsiString); +UnicodeDupFromAnsi(IN LPCSTR AnsiString); VOID WSAAPI Modified: trunk/reactos/dll/win32/ws2_32/src/addrinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/addri… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/addrinfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/addrinfo.c [iso-8859-1] Sun Feb 19 12:05:48 2017 @@ -816,7 +816,7 @@ /* Convert the node name */ if (nodename) { - UnicodeNodeName = UnicodeDupFromAnsi((LPSTR)nodename); + UnicodeNodeName = UnicodeDupFromAnsi(nodename); if (!UnicodeNodeName) { /* Prepare to fail */ @@ -828,7 +828,7 @@ /* Convert the servname too, if we have one */ if (servname) { - UnicodeServName = UnicodeDupFromAnsi((LPSTR)servname); + UnicodeServName = UnicodeDupFromAnsi(servname); if (!UnicodeServName) { /* Prepare to fail */ Modified: trunk/reactos/dll/win32/ws2_32/src/async.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/async… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/async.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/async.c [iso-8859-1] Sun Feb 19 12:05:48 2017 @@ -700,8 +700,9 @@ DWORD WINAPI -WsAsyncThread(IN PWSASYNCCONTEXT Context) -{ +WsAsyncThread(IN PVOID ThreadContext) +{ + PWSASYNCCONTEXT Context = ThreadContext; PWSASYNCBLOCK AsyncBlock; PLIST_ENTRY Entry; HANDLE AsyncEvent = Context->AsyncEvent; @@ -859,7 +860,7 @@ /* Create the thread */ ThreadHandle = CreateThread(NULL, 0, - (LPTHREAD_START_ROUTINE)WsAsyncThread, + WsAsyncThread, Context, 0, &Tid); Modified: trunk/reactos/dll/win32/ws2_32/src/dcatalog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/dcata… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/dcatalog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/dcatalog.c [iso-8859-1] Sun Feb 19 12:05:48 2017 @@ -15,8 +15,8 @@ /* DATA **********************************************************************/ -#define WsTcLock() EnterCriticalSection((LPCRITICAL_SECTION)&Catalog->Lock); -#define WsTcUnlock() LeaveCriticalSection((LPCRITICAL_SECTION)&Catalog->Lock); +#define WsTcLock() EnterCriticalSection(&Catalog->Lock); +#define WsTcUnlock() LeaveCriticalSection(&Catalog->Lock); /* FUNCTIONS *****************************************************************/ @@ -49,7 +49,7 @@ CHAR* CatalogKeyName; /* Initialize the catalog lock and namespace list */ - InitializeCriticalSection((LPCRITICAL_SECTION)&Catalog->Lock); + InitializeCriticalSection(&Catalog->Lock); InitializeListHead(&Catalog->ProtocolList); /* Read the catalog name */ @@ -759,7 +759,7 @@ PTPROVIDER Provider; IN SOCKET NewHandle; INT Error; - DWORD OptionLength; + INT OptionLength; PLIST_ENTRY Entry; WSAPROTOCOL_INFOW ProtocolInfo; DWORD UniqueId; @@ -811,7 +811,7 @@ SOL_SOCKET, SO_PROTOCOL_INFOW, (PCHAR)&ProtocolInfo, - (LPINT)&OptionLength, + &OptionLength, &Error); /* Dereference the entry and check the result */ @@ -895,7 +895,7 @@ /* Release and delete the lock */ WsTcUnlock(); - DeleteCriticalSection((LPCRITICAL_SECTION)&Catalog->Lock); + DeleteCriticalSection(&Catalog->Lock); /* Delete the object */ HeapFree(WsSockHeap, 0, Catalog); Modified: trunk/reactos/dll/win32/ws2_32/src/dcatitem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/dcati… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/dcatitem.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/dcatitem.c [iso-8859-1] Sun Feb 19 12:05:48 2017 @@ -100,7 +100,7 @@ &RegSize); - memcpy(CatalogEntry->DllPath, (LPCSTR)Buf, sizeof(CatalogEntry->DllPath)); + memcpy(CatalogEntry->DllPath, Buf, sizeof(CatalogEntry->DllPath)); index = sizeof(CatalogEntry->DllPath); if(index < RegSize) { Modified: trunk/reactos/dll/win32/ws2_32/src/dprocess.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/dproc… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/dprocess.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/dprocess.c [iso-8859-1] Sun Feb 19 12:05:48 2017 @@ -14,8 +14,8 @@ PWSPROCESS CurrentWsProcess; -#define WsProcLock() EnterCriticalSection((LPCRITICAL_SECTION)&Process->ThreadLock); -#define WsProcUnlock() LeaveCriticalSection((LPCRITICAL_SECTION)&Process->ThreadLock); +#define WsProcLock() EnterCriticalSection(&Process->ThreadLock); +#define WsProcUnlock() LeaveCriticalSection(&Process->ThreadLock); /* FUNCTIONS *****************************************************************/ @@ -27,7 +27,7 @@ HKEY RootKey = NULL; /* Initialize the thread list lock */ - InitializeCriticalSection((LPCRITICAL_SECTION)&Process->ThreadLock); + InitializeCriticalSection(&Process->ThreadLock); Process->LockReady = TRUE; /* Open the Winsock Key */ @@ -295,7 +295,7 @@ } /* Delete the thread lock */ - DeleteCriticalSection((LPCRITICAL_SECTION)&Process->ThreadLock); + DeleteCriticalSection(&Process->ThreadLock); } VOID Modified: trunk/reactos/dll/win32/ws2_32/src/dprovide.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/dprov… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/dprovide.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/dprovide.c [iso-8859-1] Sun Feb 19 12:05:48 2017 @@ -46,8 +46,8 @@ DPRINT("WsTpInitialize: %p, %p, %p\n", Provider, DllName, ProtocolInfo); /* Clear the tables */ - RtlZeroMemory(&Provider->UpcallTable, sizeof(WSPUPCALLTABLE)); - RtlZeroMemory(&Provider->Service.lpWSPAccept, sizeof(WSPPROC_TABLE)); + RtlZeroMemory(&Provider->UpcallTable, sizeof(Provider->UpcallTable)); + RtlZeroMemory(&Provider->Service, sizeof(Provider->Service)); /* Set up the Upcall Table */ Provider->UpcallTable.lpWPUCloseEvent = WPUCloseEvent; @@ -88,7 +88,7 @@ &WspData, ProtocolInfo, Provider->UpcallTable, - (LPWSPPROC_TABLE)&Provider->Service.lpWSPAccept); + &Provider->Service); /* Return */ return ErrorCode; Modified: trunk/reactos/dll/win32/ws2_32/src/getxbyxx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/getxb… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/getxbyxx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/getxbyxx.c [iso-8859-1] Sun Feb 19 12:05:48 2017 @@ -413,7 +413,7 @@ if(Name) { /* Copy it */ - strncpy((LPSTR)name, Name, namelen-1); + strncpy(name, Name, namelen-1); } /* Check if we received a newly allocated buffer; free it. */ Modified: trunk/reactos/dll/win32/ws2_32/src/nscatalo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/nscat… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/nscatalo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/nscatalo.c [iso-8859-1] Sun Feb 19 12:05:48 2017 @@ -15,8 +15,8 @@ /* DATA **********************************************************************/ -#define WsNcLock() EnterCriticalSection((LPCRITICAL_SECTION)&Catalog->Lock); -#define WsNcUnlock() LeaveCriticalSection((LPCRITICAL_SECTION)&Catalog->Lock); +#define WsNcLock() EnterCriticalSection(&Catalog->Lock); +#define WsNcUnlock() LeaveCriticalSection(&Catalog->Lock); /* FUNCTIONS *****************************************************************/ @@ -48,7 +48,7 @@ CHAR* CatalogKeyName; /* Initialize the catalog lock and namespace list */ - InitializeCriticalSection((LPCRITICAL_SECTION)&Catalog->Lock); + InitializeCriticalSection(&Catalog->Lock); InitializeListHead(&Catalog->CatalogList); /* Read the catalog name */ @@ -638,7 +638,7 @@ /* Release and delete the lock */ WsNcUnlock(); - DeleteCriticalSection((LPCRITICAL_SECTION)&Catalog->Lock); + DeleteCriticalSection(&Catalog->Lock); /* Delete the object */ HeapFree(WsSockHeap, 0, Catalog); Modified: trunk/reactos/dll/win32/ws2_32/src/nsprovid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/nspro… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/nsprovid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/nsprovid.c [iso-8859-1] Sun Feb 19 12:05:48 2017 @@ -120,7 +120,7 @@ } /* Call it */ - (*NSPStartupProc)(ProviderId, (LPNSP_ROUTINE)&Provider->Service.cbSize); + (*NSPStartupProc)(ProviderId, &Provider->Service); /* Save the provider ID */ Provider->ProviderId = *ProviderId; Modified: trunk/reactos/dll/win32/ws2_32/src/nsquery.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/nsque… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/nsquery.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/nsquery.c [iso-8859-1] Sun Feb 19 12:05:48 2017 @@ -12,8 +12,8 @@ /* DATA **********************************************************************/ -#define WsNqLock() EnterCriticalSection((LPCRITICAL_SECTION)&NsQuery->Lock); -#define WsNqUnlock() LeaveCriticalSection((LPCRITICAL_SECTION)&NsQuery->Lock); +#define WsNqLock() EnterCriticalSection(&NsQuery->Lock); +#define WsNqUnlock() LeaveCriticalSection(&NsQuery->Lock); /* FUNCTIONS *****************************************************************/ @@ -40,7 +40,7 @@ WsNqInitialize(IN PNSQUERY Query) { /* Initialize the lock */ - InitializeCriticalSection((LPCRITICAL_SECTION)&Query->Lock); + InitializeCriticalSection(&Query->Lock); /* Set initial reference count and signature */ Query->RefCount = 1; @@ -92,7 +92,7 @@ /* Remove the signature and delete the lock */ NsQuery->Signature = ~0xBEADFACE; - DeleteCriticalSection((LPCRITICAL_SECTION)&NsQuery->Lock); + DeleteCriticalSection(&NsQuery->Lock); /* Free us */ HeapFree(WsSockHeap, 0, NsQuery); Modified: trunk/reactos/dll/win32/ws2_32/src/qshelpr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/qshel… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/qshelpr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/qshelpr.c [iso-8859-1] Sun Feb 19 12:05:48 2017 @@ -17,7 +17,7 @@ LPSTR WSAAPI -AnsiDupFromUnicode(IN LPWSTR UnicodeString) +AnsiDupFromUnicode(IN LPCWSTR UnicodeString) { INT Length = 0; BOOL GoOn = TRUE; @@ -65,7 +65,7 @@ LPWSTR WSAAPI -UnicodeDupFromAnsi(IN LPSTR AnsiString) +UnicodeDupFromAnsi(IN LPCSTR AnsiString) { INT Length = 0; BOOL GoOn = TRUE;

1 0

[tfaber] 73839: [WS2_32] - Fix wrong ServLength in getnameinfo, again, since it got lost in the ws2_32_new work. CID 716150 CORE-11214
by tfaber＠svn.reactos.org 19 Feb '17

19 Feb '17

Author: tfaber Date: Sun Feb 19 11:44:18 2017 New Revision: 73839 URL: http://svn.reactos.org/svn/reactos?rev=73839&view=rev Log: [WS2_32] - Fix wrong ServLength in getnameinfo, again, since it got lost in the ws2_32_new work. CID 716150 CORE-11214 Modified: trunk/reactos/dll/win32/ws2_32/src/addrinfo.c Modified: trunk/reactos/dll/win32/ws2_32/src/addrinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/addri… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/addrinfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/addrinfo.c [iso-8859-1] Sun Feb 19 11:44:18 2017 @@ -1028,7 +1028,7 @@ { /* Setup the data for it */ ServiceString = ServiceBuffer; - ServLength = sizeof(ServiceBuffer) - 1; + ServLength = sizeof(ServiceBuffer) / sizeof(WCHAR); } /* Now call the unicode function */

1 0

[gadamopoulos] 73838: [UXTHEME] -Set cbSize field of WINDOWINFO before calling GetWindowInfo. CORE-12776
by gadamopoulos＠svn.reactos.org 19 Feb '17

19 Feb '17

Author: gadamopoulos Date: Sun Feb 19 11:41:23 2017 New Revision: 73838 URL: http://svn.reactos.org/svn/reactos?rev=73838&view=rev Log: [UXTHEME] -Set cbSize field of WINDOWINFO before calling GetWindowInfo. CORE-12776 Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclien… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Sun Feb 19 11:41:23 2017 @@ -851,6 +851,7 @@ POINT ClientPoint; WINDOWINFO wi; + wi.cbSize = sizeof(wi); GetWindowInfo(hWnd, &wi); if (!PtInRect(&wi.rcWindow, Point)) @@ -1185,6 +1186,7 @@ if (!context.theme) return E_FAIL; context.Active = TRUE; + context.wi.cbSize = sizeof(context.wi); if (!GetWindowInfo(hwndDummy, &context.wi)) return E_FAIL; context.wi.dwStyle |= WS_VISIBLE;

1 0

[pschweitzer] 73837: [DNSAPI] Properly check for domain name being set CID 1401080
by pschweitzer＠svn.reactos.org 19 Feb '17

19 Feb '17

Author: pschweitzer Date: Sun Feb 19 11:34:00 2017 New Revision: 73837 URL: http://svn.reactos.org/svn/reactos?rev=73837&view=rev Log: [DNSAPI] Properly check for domain name being set CID 1401080 Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/query.c Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/qu… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] Sun Feb 19 11:34:00 2017 @@ -346,7 +346,7 @@ PIP_ADAPTER_ADDRESSES Addresses = NULL, pip; BOOL Found = FALSE; - if (network_info->DomainName) + if (network_info->DomainName[0]) { size_t StringLength; size_t TempSize = 2;

1 0

[pschweitzer] 73836: [FASTFAT] Avoid uninit variable usage. CID 1401257, 1401259
by pschweitzer＠svn.reactos.org 19 Feb '17

19 Feb '17

Author: pschweitzer Date: Sun Feb 19 11:22:21 2017 New Revision: 73836 URL: http://svn.reactos.org/svn/reactos?rev=73836&view=rev Log: [FASTFAT] Avoid uninit variable usage. CID 1401257, 1401259 Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] Sun Feb 19 11:22:21 2017 @@ -555,6 +555,10 @@ ASSERT(IrpContext->DeviceObject); + PagingIo = BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO); + CanWait = BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT); + NoCache = BooleanFlagOn(IrpContext->Irp->Flags, IRP_NOCACHE); + // This request is not allowed on the main device object if (IrpContext->DeviceObject == VfatGlobalData->DeviceObject) { @@ -567,6 +571,8 @@ ASSERT(IrpContext->FileObject); Fcb = IrpContext->FileObject->FsContext; ASSERT(Fcb); + + IsVolume = BooleanFlagOn(Fcb->Flags, FCB_IS_VOLUME); if (BooleanFlagOn(Fcb->Flags, FCB_IS_PAGE_FILE)) { @@ -584,10 +590,6 @@ ByteOffset = IrpContext->Stack->Parameters.Read.ByteOffset; Length = IrpContext->Stack->Parameters.Read.Length; BytesPerSector = IrpContext->DeviceExt->FatInfo.BytesPerSector; - PagingIo = BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO); - CanWait = BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT); - IsVolume = BooleanFlagOn(Fcb->Flags, FCB_IS_VOLUME); - NoCache = BooleanFlagOn(IrpContext->Irp->Flags, IRP_NOCACHE); /* fail if file is a directory and no paged read */ if (vfatFCBIsDirectory(Fcb) && !PagingIo) @@ -779,6 +781,10 @@ ASSERT(IrpContext->DeviceObject); + PagingIo = BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO); + CanWait = BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT); + NoCache = BooleanFlagOn(IrpContext->Irp->Flags, IRP_NOCACHE); + // This request is not allowed on the main device object if (IrpContext->DeviceObject == VfatGlobalData->DeviceObject) { @@ -791,6 +797,9 @@ ASSERT(IrpContext->FileObject); Fcb = IrpContext->FileObject->FsContext; ASSERT(Fcb); + + IsVolume = BooleanFlagOn(Fcb->Flags, FCB_IS_VOLUME); + IsFAT = BooleanFlagOn(Fcb->Flags, FCB_IS_FAT); if (BooleanFlagOn(Fcb->Flags, FCB_IS_PAGE_FILE)) { @@ -804,12 +813,6 @@ } DPRINT("<%wZ>\n", &Fcb->PathNameU); - - PagingIo = BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO); - CanWait = BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT); - IsVolume = BooleanFlagOn(Fcb->Flags, FCB_IS_VOLUME); - IsFAT = BooleanFlagOn(Fcb->Flags, FCB_IS_FAT); - NoCache = BooleanFlagOn(IrpContext->Irp->Flags, IRP_NOCACHE); /* fail if file is a directory and no paged read */ if (vfatFCBIsDirectory(Fcb) && !PagingIo)

1 0

[tfaber] 73835: [LOCALMON] - Avoid a potential double free in InitializePrintMonitor2. CID 1401299 - Avoid a use after free in LocalmonClosePort. CID 1401298
by tfaber＠svn.reactos.org 19 Feb '17

19 Feb '17

Author: tfaber Date: Sun Feb 19 10:31:37 2017 New Revision: 73835 URL: http://svn.reactos.org/svn/reactos?rev=73835&view=rev Log: [LOCALMON] - Avoid a potential double free in InitializePrintMonitor2. CID 1401299 - Avoid a use after free in LocalmonClosePort. CID 1401298 Modified: trunk/reactos/win32ss/printing/monitors/localmon/main.c trunk/reactos/win32ss/printing/monitors/localmon/ports.c Modified: trunk/reactos/win32ss/printing/monitors/localmon/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/monitors/… ============================================================================== --- trunk/reactos/win32ss/printing/monitors/localmon/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/monitors/localmon/main.c [iso-8859-1] Sun Feb 19 10:31:37 2017 @@ -223,6 +223,7 @@ if (!cchPortName || _IsNEPort(pPort->pwszPortName)) { DllFreeSplMem(pPort); + pPort = NULL; continue; } Modified: trunk/reactos/win32ss/printing/monitors/localmon/ports.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/monitors/… ============================================================================== --- trunk/reactos/win32ss/printing/monitors/localmon/ports.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/monitors/localmon/ports.c [iso-8859-1] Sun Feb 19 10:31:37 2017 @@ -541,8 +541,8 @@ { EnterCriticalSection(&pPort->pLocalmon->Section); RemoveEntryList(&pPort->Entry); + LeaveCriticalSection(&pPort->pLocalmon->Section); DllFreeSplMem(pPort); - LeaveCriticalSection(&pPort->pLocalmon->Section); } SetLastError(ERROR_SUCCESS);

1 0

[gadamopoulos] 73834: [UXTHEME] -The code to draw the classic style borders was copied from win32k, so imitate what it does and restore two bits that got removed in the copy. CORE-9667
by gadamopoulos＠svn.reactos.org 19 Feb '17

19 Feb '17

Author: gadamopoulos Date: Sun Feb 19 10:23:26 2017 New Revision: 73834 URL: http://svn.reactos.org/svn/reactos?rev=73834&view=rev Log: [UXTHEME] -The code to draw the classic style borders was copied from win32k, so imitate what it does and restore two bits that got removed in the copy. CORE-9667 Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclien… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Sun Feb 19 10:23:26 2017 @@ -58,6 +58,7 @@ return FALSE; if (Style & WS_THICKFRAME) return TRUE; + Style &= WS_CAPTION; if (Style == WS_DLGFRAME || Style == WS_CAPTION) return TRUE; return FALSE; @@ -442,9 +443,9 @@ prcCurrent->right - prcCurrent->left, Height, PATCOPY); PatBlt(context->hDC, prcCurrent->left, prcCurrent->top, Width, prcCurrent->bottom - prcCurrent->top, PATCOPY); - PatBlt(context->hDC, prcCurrent->left, prcCurrent->bottom, + PatBlt(context->hDC, prcCurrent->left, prcCurrent->bottom - 1, prcCurrent->right - prcCurrent->left, -Height, PATCOPY); - PatBlt(context->hDC, prcCurrent->right, prcCurrent->top, + PatBlt(context->hDC, prcCurrent->right - 1, prcCurrent->top, -Width, prcCurrent->bottom - prcCurrent->top, PATCOPY); InflateRect(prcCurrent, -Width, -Height); @@ -467,9 +468,9 @@ prcCurrent->right - prcCurrent->left, Height, PATCOPY); PatBlt(context->hDC, prcCurrent->left, prcCurrent->top, Width, prcCurrent->bottom - prcCurrent->top, PATCOPY); - PatBlt(context->hDC, prcCurrent->left, prcCurrent->bottom, + PatBlt(context->hDC, prcCurrent->left, prcCurrent->bottom - 1, prcCurrent->right - prcCurrent->left, -Height, PATCOPY); - PatBlt(context->hDC, prcCurrent->right, prcCurrent->top, + PatBlt(context->hDC, prcCurrent->right - 1, prcCurrent->top, -Width, prcCurrent->bottom - prcCurrent->top, PATCOPY); InflateRect(prcCurrent, -Width, -Height);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs