[hbelusca] 74066: [WS2_32] - Let require explicit semicolons when using the Ws***(Un)Lock macros (and thus remove the semicolon from their definition).
4 Mar
2017
4 Mar
'17
11:55 p.m.
Author: hbelusca
Date: Sat Mar 4 23:55:30 2017
New Revision: 74066
URL: http://svn.reactos.org/svn/reactos?rev=74066&view=rev
Log:
[WS2_32]
- Let require explicit semicolons when using the Ws***(Un)Lock macros (and thus remove the
semicolon from their definition).
Modified:
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/dprocess.c
trunk/reactos/dll/win32/ws2_32/src/nscatalo.c
trunk/reactos/dll/win32/ws2_32/src/nsquery.c
trunk/reactos/dll/win32/ws2_32/src/rasdial.c
trunk/reactos/dll/win32/ws2_32/src/rnr.c
trunk/reactos/dll/win32/ws2_32/src/startup.c
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] Sat Mar 4 23:55:30 2017
@@ -21,8 +21,8 @@
HANDLE WsAsyncCancelledTaskHandle;
HINSTANCE WsAsyncDllHandle;
-#define WsAsyncLock() EnterCriticalSection(&WsAsyncCritSect);
-#define WsAsyncUnlock() LeaveCriticalSection(&WsAsyncCritSect);
+#define WsAsyncLock() EnterCriticalSection(&WsAsyncCritSect)
+#define WsAsyncUnlock() LeaveCriticalSection(&WsAsyncCritSect)
/* FUNCTIONS *****************************************************************/
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] Sat Mar 4 23:55:30 2017
@@ -15,8 +15,8 @@
/* DATA **********************************************************************/
-#define WsTcLock() EnterCriticalSection(&Catalog->Lock);
-#define WsTcUnlock() LeaveCriticalSection(&Catalog->Lock);
+#define WsTcLock() EnterCriticalSection(&Catalog->Lock)
+#define WsTcUnlock() LeaveCriticalSection(&Catalog->Lock)
/* FUNCTIONS *****************************************************************/
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] Sat Mar 4 23:55:30 2017
@@ -14,8 +14,8 @@
PWSPROCESS CurrentWsProcess;
-#define WsProcLock() EnterCriticalSection(&Process->ThreadLock);
-#define WsProcUnlock() LeaveCriticalSection(&Process->ThreadLock);
+#define WsProcLock() EnterCriticalSection(&Process->ThreadLock)
+#define WsProcUnlock() LeaveCriticalSection(&Process->ThreadLock)
/* FUNCTIONS *****************************************************************/
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] Sat Mar 4 23:55:30 2017
@@ -15,8 +15,8 @@
/* DATA **********************************************************************/
-#define WsNcLock() EnterCriticalSection(&Catalog->Lock);
-#define WsNcUnlock() LeaveCriticalSection(&Catalog->Lock);
+#define WsNcLock() EnterCriticalSection(&Catalog->Lock)
+#define WsNcUnlock() LeaveCriticalSection(&Catalog->Lock)
/* FUNCTIONS *****************************************************************/
@@ -370,7 +370,7 @@
GoOn = Callback(Context, CatalogEntry);
}
- /* Release lock */
+ /* Release the lock */
WsNcUnlock();
}
@@ -413,7 +413,7 @@
}
}
- /* Release the lock */
+ /* Release the lock and return */
WsNcUnlock();
return ErrorCode;
}
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] Sat Mar 4 23:55:30 2017
@@ -12,8 +12,8 @@
/* DATA **********************************************************************/
-#define WsNqLock() EnterCriticalSection(&NsQuery->Lock);
-#define WsNqUnlock() LeaveCriticalSection(&NsQuery->Lock);
+#define WsNqLock() EnterCriticalSection(&NsQuery->Lock)
+#define WsNqUnlock() LeaveCriticalSection(&NsQuery->Lock)
/* FUNCTIONS *****************************************************************/
Modified: trunk/reactos/dll/win32/ws2_32/src/rasdial.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/rasdi…
==============================================================================
--- trunk/reactos/dll/win32/ws2_32/src/rasdial.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32/src/rasdial.c [iso-8859-1] Sat Mar 4 23:55:30 2017
@@ -37,8 +37,8 @@
PWS_ATTEMPT_AUTODIAL_NAME lpfnWSAttemptAutodialName;
PWS_NOTE_SUCCESSFUL_HOSTENT_LOOKUP lpfnWSNoteSuccessfulHostentLookup;
-#define WsRasLock() EnterCriticalSection(&WsRasHelperLock);
-#define WsRasUnlock() LeaveCriticalSection(&WsRasHelperLock);
+#define WsRasLock() EnterCriticalSection(&WsRasHelperLock)
+#define WsRasUnlock() LeaveCriticalSection(&WsRasHelperLock)
/* FUNCTIONS *****************************************************************/
Modified: trunk/reactos/dll/win32/ws2_32/src/rnr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/rnr.c…
==============================================================================
--- trunk/reactos/dll/win32/ws2_32/src/rnr.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32/src/rnr.c [iso-8859-1] Sat Mar 4 23:55:30 2017
@@ -34,6 +34,7 @@
PTCATALOG_ENTRY CatalogEntry;
LPWSTR UnicodeString;
DWORD Length = *lpdwAddressStringLength;
+
DPRINT("WSAAddressToStringA: %p\n", lpsaAddress);
/* Enter prolog */
@@ -136,6 +137,7 @@
DWORD CatalogEntryId;
PTCATALOG Catalog;
PTCATALOG_ENTRY CatalogEntry;
+
DPRINT("WSAAddressToStringW: %p\n", lpsaAddress);
/* Enter prolog */
@@ -203,6 +205,7 @@
PWSTHREAD Thread;
INT ErrorCode;
PNSQUERY Query = hLookup;
+
DPRINT("WSALookupServiceEnd: %lx\n", hLookup);
/* Enter prolog */
@@ -246,6 +249,7 @@
INT ErrorCode;
LPWSAQUERYSETW UnicodeQuerySet = NULL;
DWORD UnicodeQuerySetSize = 0;
+
DPRINT("WSALookupServiceBeginA: %p\n", lpqsRestrictions);
/* Verify pointer */
@@ -317,6 +321,7 @@
PWSTHREAD Thread;
INT ErrorCode;
PNSQUERY Query;
+
DPRINT("WSALookupServiceBeginW: %p\n", lpqsRestrictions);
/* Enter prolog */
@@ -387,6 +392,7 @@
PWSTHREAD Thread;
INT ErrorCode;
PNSQUERY Query = hLookup;
+
DPRINT("WSALookupServiceNextW: %lx\n", hLookup);
/* Enter prolog */
@@ -440,6 +446,7 @@
LPWSAQUERYSETW UnicodeQuerySet;
DWORD UnicodeQuerySetSize;
INT ErrorCode;
+
DPRINT("WSALookupServiceNextA: %lx\n", hLookup);
/* Verify pointers */
@@ -734,6 +741,7 @@
PWSPROCESS WsProcess;
PNSCATALOG Catalog;
NSPROVIDER_ENUM_CONTEXT Context;
+
DPRINT("WSAEnumNameSpaceProvidersInternal: %lx\n", lpnspBuffer);
if (!lpdwBufferLength)
@@ -829,6 +837,7 @@
PTCATALOG_ENTRY CatalogEntry;
LPWSTR UnicodeString;
DWORD Length = (DWORD)strlen(AddressString) + 1;
+
DPRINT("WSAStringToAddressA: %s\n", AddressString);
/* Enter prolog */
@@ -920,6 +929,7 @@
DWORD CatalogEntryId;
PTCATALOG Catalog;
PTCATALOG_ENTRY CatalogEntry;
+
DPRINT("WSAStringToAddressW: %S\n", AddressString);
/* Enter prolog */
Modified: trunk/reactos/dll/win32/ws2_32/src/startup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/start…
==============================================================================
--- trunk/reactos/dll/win32/ws2_32/src/startup.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32/src/startup.c [iso-8859-1] Sat Mar 4 23:55:30 2017
@@ -18,8 +18,8 @@
PWS_SOCK_POST_ROUTINE WsSockPostRoutine = NULL;
CRITICAL_SECTION WsStartupLock;
-#define WsStartupLock() EnterCriticalSection(&WsStartupLock);
-#define WsStartupUnlock() LeaveCriticalSection(&WsStartupLock);
+#define WsStartupLock() EnterCriticalSection(&WsStartupLock)
+#define WsStartupUnlock() LeaveCriticalSection(&WsStartupLock)
/* FUNCTIONS *****************************************************************/
2812
days inactive
2812
days old
0 comments
1 participants
participants (1)
-
hbelusca＠svn.reactos.org