[ros-diffs] [akhaldi] 53680: * Fix some more unused but set variables. * Allow warnings for some 3rd party code.
akhaldi at svn.reactos.org
akhaldi at svn.reactos.org
Sat Sep 10 23:54:02 UTC 2011
Author: akhaldi
Date: Sat Sep 10 23:54:02 2011
New Revision: 53680
URL: http://svn.reactos.org/svn/reactos?rev=53680&view=rev
Log:
* Fix some more unused but set variables.
* Allow warnings for some 3rd party code.
Modified:
trunk/reactos/base/system/smss/smapi.c
trunk/reactos/dll/cpl/desk/draw.c
trunk/reactos/dll/directx/dmusic/port.c
trunk/reactos/dll/directx/ksproxy/ksproxy.cpp
trunk/reactos/dll/win32/devmgr/advprop.c
trunk/reactos/dll/win32/dhcpcsvc/dhcp/pipe.c
trunk/reactos/dll/win32/glu32/CMakeLists.txt
trunk/reactos/dll/win32/msafd/misc/dllmain.c
trunk/reactos/dll/win32/msafd/misc/helpers.c
trunk/reactos/dll/win32/msafd/misc/sndrcv.c
trunk/reactos/dll/win32/netcfgx/netcfg_iface.c
trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c
trunk/reactos/dll/win32/spoolss/CMakeLists.txt
trunk/reactos/dll/win32/ws2_32_new/src/async.c
trunk/reactos/dll/win32/ws2_32_new/src/enumprot.c
trunk/reactos/dll/win32/ws2_32_new/src/nscatent.c
trunk/reactos/dll/win32/ws2_32_new/src/nsprovid.c
trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c
trunk/reactos/drivers/wdm/audio/sysaudio/control.c
trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c
trunk/reactos/lib/drivers/ip/network/icmp.c
trunk/reactos/lib/drivers/ip/network/router.c
trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c
trunk/reactos/lib/drivers/sound/mmixer/midi.c
trunk/reactos/lib/drivers/sound/mmixer/topology.c
trunk/reactos/lib/fslib/vfatlib/fat32.c
trunk/reactos/lib/fslib/vfatlib/vfatlib.c
Modified: trunk/reactos/base/system/smss/smapi.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smapi.c?rev=53680&r1=53679&r2=53680&view=diff
==============================================================================
--- trunk/reactos/base/system/smss/smapi.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/smss/smapi.c [iso-8859-1] Sat Sep 10 23:54:02 2011
@@ -189,8 +189,6 @@
PSM_CLIENT_DATA ClientData = NULL;
HANDLE hClientDataApiPort = (HANDLE) 0;
PHANDLE ClientDataApiPort = & hClientDataApiPort;
- HANDLE hClientDataApiPortThread = (HANDLE) 0;
- PHANDLE ClientDataApiPortThread = & hClientDataApiPortThread;
PVOID Context = NULL;
DPRINT("SM: %s called:\n SubSystemID=%d\n SbName=\"%S\"\n",
@@ -207,7 +205,6 @@
*/
DPRINT("SM: %s: simple request\n", __FUNCTION__);
ClientDataApiPort = & hClientDataApiPort;
- ClientDataApiPortThread = & hClientDataApiPortThread;
Accept = TRUE;
} else {
DPRINT("SM: %s: request to register an image set\n", __FUNCTION__);
@@ -232,7 +229,6 @@
* willing to manage a free image type.
*/
ClientDataApiPort = & ClientData->ApiPort;
- ClientDataApiPortThread = & ClientData->ApiPortThread;
/*
* Call back the candidate environment subsystem
* server (use the port name sent in in the
Modified: trunk/reactos/dll/cpl/desk/draw.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/draw.c?rev=53680&r1=53679&r2=53680&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/desk/draw.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/desk/draw.c [iso-8859-1] Sat Sep 10 23:54:02 2011
@@ -437,14 +437,9 @@
BOOL
MyDrawCaptionTemp(HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont, HICON hIcon, LPCWSTR str, UINT uFlags, THEME *theme)
{
- ULONG Height;
- UINT VCenter;
HBRUSH hbr;
HGDIOBJ hFontOld;
RECT rc;
-
- Height = theme->Size[SIZE_CAPTION_Y] - 1;
- VCenter = (rect->bottom - rect->top) / 2;
if (uFlags & DC_GRADIENT)
{
Modified: trunk/reactos/dll/directx/dmusic/port.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/port.c?rev=53680&r1=53679&r2=53680&view=diff
==============================================================================
--- trunk/reactos/dll/directx/dmusic/port.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/dmusic/port.c [iso-8859-1] Sat Sep 10 23:54:02 2011
@@ -362,7 +362,6 @@
HRESULT WINAPI DMUSIC_CreateDirectMusicPortImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter, LPDMUS_PORTPARAMS pPortParams, LPDMUS_PORTCAPS pPortCaps) {
IDirectMusicPortImpl *obj;
- HRESULT hr = E_FAIL;
TRACE("(%p,%p,%p)\n", lpcGUID, ppobj, pUnkOuter);
@@ -380,7 +379,7 @@
obj->caps = *pPortCaps;
obj->pDirectSound = NULL;
obj->pLatencyClock = NULL;
- hr = DMUSIC_CreateReferenceClockImpl(&IID_IReferenceClock, (LPVOID*)&obj->pLatencyClock, NULL);
+ DMUSIC_CreateReferenceClockImpl(&IID_IReferenceClock, (LPVOID*)&obj->pLatencyClock, NULL);
#if 0
if (pPortParams->dwValidParams & DMUS_PORTPARAMS_CHANNELGROUPS) {
Modified: trunk/reactos/dll/directx/ksproxy/ksproxy.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/ksproxy.cpp?rev=53680&r1=53679&r2=53680&view=diff
==============================================================================
--- trunk/reactos/dll/directx/ksproxy/ksproxy.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/ksproxy/ksproxy.cpp [iso-8859-1] Sat Sep 10 23:54:02 2011
@@ -111,7 +111,6 @@
PHANDLE DeviceHandle)
{
HDEVINFO hList;
- SP_DEVINFO_DATA DeviceInfoData;
SP_DEVICE_INTERFACE_DATA DeviceInterfaceData;
PSP_DEVICE_INTERFACE_DETAIL_DATA_W DeviceInterfaceDetailData;
WCHAR Path[MAX_PATH+sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W)];
@@ -126,7 +125,6 @@
}
/* setup parameters */
- DeviceInfoData.cbSize = sizeof(SP_DEVINFO_DATA);
DeviceInterfaceData.cbSize = sizeof(SP_DEVICE_INTERFACE_DATA);
if (SetupDiEnumDeviceInterfaces(hList, NULL, &Category, 0, &DeviceInterfaceData))
Modified: trunk/reactos/dll/win32/devmgr/advprop.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/advprop.c?rev=53680&r1=53679&r2=53680&view=diff
==============================================================================
--- trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] Sat Sep 10 23:54:02 2011
@@ -957,7 +957,6 @@
DisplayDevNodeEnumerator(IN PDEVADVPROP_INFO dap,
IN HWND hwndListView)
{
- HDEVINFO DeviceInfoSet;
PSP_DEVINFO_DATA DeviceInfoData;
DWORD dwType = 0;
@@ -966,12 +965,10 @@
if (dap->CurrentDeviceInfoSet != INVALID_HANDLE_VALUE)
{
- DeviceInfoSet = dap->CurrentDeviceInfoSet;
DeviceInfoData = &dap->CurrentDeviceInfoData;
}
else
{
- DeviceInfoSet = dap->DeviceInfoSet;
DeviceInfoData = &dap->DeviceInfoData;
}
Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/pipe.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/pipe.c?rev=53680&r1=53679&r2=53680&view=diff
==============================================================================
--- trunk/reactos/dll/win32/dhcpcsvc/dhcp/pipe.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/pipe.c [iso-8859-1] Sat Sep 10 23:54:02 2011
@@ -31,7 +31,7 @@
}
DWORD WINAPI PipeThreadProc( LPVOID Parameter ) {
- DWORD BytesRead, BytesWritten;
+ DWORD BytesRead;
COMM_DHCP_REQ Req;
COMM_DHCP_REPLY Reply;
BOOL Result, Connected;
@@ -51,34 +51,34 @@
if( Result ) {
switch( Req.Type ) {
case DhcpReqQueryHWInfo:
- BytesWritten = DSQueryHWInfo( PipeSend, &Req );
+ DSQueryHWInfo( PipeSend, &Req );
break;
case DhcpReqLeaseIpAddress:
- BytesWritten = DSLeaseIpAddress( PipeSend, &Req );
+ DSLeaseIpAddress( PipeSend, &Req );
break;
case DhcpReqReleaseIpAddress:
- BytesWritten = DSReleaseIpAddressLease( PipeSend, &Req );
+ DSReleaseIpAddressLease( PipeSend, &Req );
break;
case DhcpReqRenewIpAddress:
- BytesWritten = DSRenewIpAddressLease( PipeSend, &Req );
+ DSRenewIpAddressLease( PipeSend, &Req );
break;
case DhcpReqStaticRefreshParams:
- BytesWritten = DSStaticRefreshParams( PipeSend, &Req );
+ DSStaticRefreshParams( PipeSend, &Req );
break;
case DhcpReqGetAdapterInfo:
- BytesWritten = DSGetAdapterInfo( PipeSend, &Req );
+ DSGetAdapterInfo( PipeSend, &Req );
break;
default:
DPRINT1("Unrecognized request type %d\n", Req.Type);
ZeroMemory( &Reply, sizeof( COMM_DHCP_REPLY ) );
Reply.Reply = 0;
- BytesWritten = PipeSend( &Reply );
+ PipeSend( &Reply );
break;
}
}
Modified: trunk/reactos/dll/win32/glu32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/CMakeLists.txt?rev=53680&r1=53679&r2=53680&view=diff
==============================================================================
--- trunk/reactos/dll/win32/glu32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/glu32/CMakeLists.txt [iso-8859-1] Sat Sep 10 23:54:02 2011
@@ -107,7 +107,7 @@
${CMAKE_CURRENT_BINARY_DIR}/glu32.def)
add_library(glu32 SHARED ${SOURCE})
-
+allow_warnings(glu32)
set_module_type(glu32 win32dll ENTRYPOINT 0 )
if(NOT MSVC)
Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllmain.c?rev=53680&r1=53679&r2=53680&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sat Sep 10 23:54:02 2011
@@ -2598,7 +2598,6 @@
UNICODE_STRING AfdHelper;
OBJECT_ATTRIBUTES ObjectAttributes;
IO_STATUS_BLOCK IoSb;
- NTSTATUS Status;
FILE_COMPLETION_INFORMATION CompletionInfo;
OBJECT_HANDLE_ATTRIBUTE_INFORMATION HandleFlags;
@@ -2617,17 +2616,17 @@
NULL);
/* Open the Handle to AFD */
- Status = NtCreateFile(&SockAsyncHelperAfdHandle,
- GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE,
- &ObjectAttributes,
- &IoSb,
- NULL,
- 0,
- FILE_SHARE_READ | FILE_SHARE_WRITE,
- FILE_OPEN_IF,
- 0,
- NULL,
- 0);
+ NtCreateFile(&SockAsyncHelperAfdHandle,
+ GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE,
+ &ObjectAttributes,
+ &IoSb,
+ NULL,
+ 0,
+ FILE_SHARE_READ | FILE_SHARE_WRITE,
+ FILE_OPEN_IF,
+ 0,
+ NULL,
+ 0);
/*
* Now Set up the Completion Port Information
@@ -2635,20 +2634,20 @@
*/
CompletionInfo.Port = SockAsyncCompletionPort;
CompletionInfo.Key = SockAsyncSelectCompletionRoutine;
- Status = NtSetInformationFile(SockAsyncHelperAfdHandle,
- &IoSb,
- &CompletionInfo,
- sizeof(CompletionInfo),
- FileCompletionInformation);
+ NtSetInformationFile(SockAsyncHelperAfdHandle,
+ &IoSb,
+ &CompletionInfo,
+ sizeof(CompletionInfo),
+ FileCompletionInformation);
/* Protect the Handle */
HandleFlags.ProtectFromClose = TRUE;
HandleFlags.Inherit = FALSE;
- Status = NtSetInformationObject(SockAsyncCompletionPort,
- ObjectHandleFlagInformation,
- &HandleFlags,
- sizeof(HandleFlags));
+ NtSetInformationObject(SockAsyncCompletionPort,
+ ObjectHandleFlagInformation,
+ &HandleFlags,
+ sizeof(HandleFlags));
/* Set this variable to true so that Send/Recv/Accept will know wether to renable disabled events */
Modified: trunk/reactos/dll/win32/msafd/misc/helpers.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/helpers.c?rev=53680&r1=53679&r2=53680&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msafd/misc/helpers.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msafd/misc/helpers.c [iso-8859-1] Sat Sep 10 23:54:02 2011
@@ -296,10 +296,9 @@
PWINSOCK_MAPPING Mapping,
PHELPER_DATA *HelperDllData)
{
- PHELPER_DATA HelperData;
+ PHELPER_DATA HelperData;
PWSTR HelperDllName;
PWSTR FullHelperDllName;
- ULONG HelperDllNameSize;
PWSTR HelperKey;
HKEY KeyHandle;
ULONG DataSize;
@@ -412,9 +411,9 @@
}
/* Get the Full name, expanding Environment Strings */
- HelperDllNameSize = ExpandEnvironmentStringsW (HelperDllName,
- FullHelperDllName,
- 256);
+ ExpandEnvironmentStringsW (HelperDllName,
+ FullHelperDllName,
+ 256);
/* Load the DLL */
HelperData->hInstance = LoadLibraryW(FullHelperDllName);
Modified: trunk/reactos/dll/win32/msafd/misc/sndrcv.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/sndrcv.c?rev=53680&r1=53679&r2=53680&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] Sat Sep 10 23:54:02 2011
@@ -22,7 +22,6 @@
{
PSOCKET_INFORMATION Socket = NULL;
PASYNC_DATA AsyncData;
- NTSTATUS Status;
BOOLEAN BlockMode;
/* Get the Socket Structure associated to this Socket */
@@ -81,11 +80,11 @@
AsyncData->SequenceNumber = Socket->SharedData.SequenceNumber;
/* Begin Async Select by using I/O Completion */
- Status = NtSetIoCompletion(SockAsyncCompletionPort,
- (PVOID)&SockProcessQueuedAsyncSelect,
- AsyncData,
- 0,
- 0);
+ NtSetIoCompletion(SockAsyncCompletionPort,
+ (PVOID)&SockProcessQueuedAsyncSelect,
+ AsyncData,
+ 0,
+ 0);
/* Return */
return ERROR_SUCCESS;
Modified: trunk/reactos/dll/win32/netcfgx/netcfg_iface.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfg_iface.c?rev=53680&r1=53679&r2=53680&view=diff
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/netcfg_iface.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/netcfg_iface.c [iso-8859-1] Sat Sep 10 23:54:02 2011
@@ -170,7 +170,6 @@
DWORD dwIndex = 0;
DWORD dwSize;
DWORD dwType;
- DWORD dwCharacteristics;
WCHAR szName[100];
WCHAR szText[100];
HKEY hSubKey, hNDIKey;
@@ -179,7 +178,6 @@
*pHead = NULL;
do
{
- dwCharacteristics = 0;
szText[0] = L'\0';
dwSize = sizeof(szName)/sizeof(WCHAR);
Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c?rev=53680&r1=53679&r2=53680&view=diff
==============================================================================
--- trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] Sat Sep 10 23:54:02 2011
@@ -564,7 +564,6 @@
{
TcpipConfNotifyImpl * This;
LPPROPSHEETPAGE page;
- int res;
switch(uMsg)
{
@@ -576,11 +575,11 @@
case WM_COMMAND:
if (LOWORD(wParam) == IDC_OPTPROP)
{
- res = DialogBoxParamW(netcfgx_hInstance,
- MAKEINTRESOURCEW(IDD_TCPIP_FILTER_DLG),
- GetParent(hwndDlg),
- TcpipFilterSettingsDlg,
- (LPARAM)GetWindowLongPtr(hwndDlg, DWLP_USER));
+ DialogBoxParamW(netcfgx_hInstance,
+ MAKEINTRESOURCEW(IDD_TCPIP_FILTER_DLG),
+ GetParent(hwndDlg),
+ TcpipFilterSettingsDlg,
+ (LPARAM)GetWindowLongPtr(hwndDlg, DWLP_USER));
break;
}
}
@@ -2359,14 +2358,11 @@
COPY_TYPE Type,
LPWSTR szMetric)
{
- LPWSTR szItem;
IP_ADDR_STRING * pCurrent;
IP_ADDR *pNew, *pLast;
pCurrent = pSrc;
pLast = NULL;
-
- szItem = szMetric;
while(pCurrent)
{
Modified: trunk/reactos/dll/win32/spoolss/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/spoolss/CMakeLists.txt?rev=53680&r1=53679&r2=53680&view=diff
==============================================================================
--- trunk/reactos/dll/win32/spoolss/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/spoolss/CMakeLists.txt [iso-8859-1] Sat Sep 10 23:54:02 2011
@@ -11,12 +11,9 @@
${CMAKE_CURRENT_BINARY_DIR}/spoolss.def)
add_library(spoolss SHARED ${SOURCE})
-
+allow_warnings(spoolss)
set_module_type(spoolss win32dll)
-
target_link_libraries(spoolss wine)
-
add_importlibs(spoolss winspool msvcrt kernel32 ntdll)
add_importlib_target(spoolss.spec)
-
add_cd_file(TARGET spoolss DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/dll/win32/ws2_32_new/src/async.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/async.c?rev=53680&r1=53679&r2=53680&view=diff
==============================================================================
--- trunk/reactos/dll/win32/ws2_32_new/src/async.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32_new/src/async.c [iso-8859-1] Sat Sep 10 23:54:02 2011
@@ -702,12 +702,11 @@
{
PWSASYNCBLOCK AsyncBlock;
PLIST_ENTRY Entry;
- FARPROC OldHook;
HANDLE AsyncEvent = Context->AsyncEvent;
PLIST_ENTRY ListHead = &Context->AsyncQueue;
/* Set the blocking hook */
- OldHook = WSASetBlockingHook((FARPROC)WsAsyncThreadBlockingHook);
+ WSASetBlockingHook((FARPROC)WsAsyncThreadBlockingHook);
/* Loop */
while (TRUE)
Modified: trunk/reactos/dll/win32/ws2_32_new/src/enumprot.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/enumprot.c?rev=53680&r1=53679&r2=53680&view=diff
==============================================================================
--- trunk/reactos/dll/win32/ws2_32_new/src/enumprot.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32_new/src/enumprot.c [iso-8859-1] Sat Sep 10 23:54:02 2011
@@ -103,7 +103,6 @@
WSAAPI
OpenInitializedCatalog(VOID)
{
- INT ErrorCode;
PTCATALOG Catalog;
HKEY WsKey;
@@ -115,7 +114,7 @@
WsKey = WsOpenRegistryRoot();
/* Initialize the catalog */
- ErrorCode = WsTcInitializeFromRegistry(Catalog, WsKey, NULL);
+ WsTcInitializeFromRegistry(Catalog, WsKey, NULL);
/* Close the key */
RegCloseKey(WsKey);
Modified: trunk/reactos/dll/win32/ws2_32_new/src/nscatent.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/nscatent.c?rev=53680&r1=53679&r2=53680&view=diff
==============================================================================
--- trunk/reactos/dll/win32/ws2_32_new/src/nscatent.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32_new/src/nscatent.c [iso-8859-1] Sat Sep 10 23:54:02 2011
@@ -67,7 +67,6 @@
{
CHAR CatalogEntryName[13];
HKEY EntryKey;
- LONG Return;
ULONG RegType = REG_SZ;
ULONG RegSize = MAX_PATH;
@@ -75,90 +74,90 @@
sprintf(CatalogEntryName, "%0""12""i", (int)UniqueId);
/* Open the Entry */
- Return = RegOpenKeyEx(ParentKey,
- CatalogEntryName,
- 0,
- KEY_READ,
- &EntryKey);
+ RegOpenKeyEx(ParentKey,
+ CatalogEntryName,
+ 0,
+ KEY_READ,
+ &EntryKey);
/* Read the Library Path */
- Return = RegQueryValueExW(EntryKey,
- L"LibraryPath",
- 0,
- &RegType,
- (LPBYTE)&CatalogEntry->DllPath,
- &RegSize);
+ RegQueryValueExW(EntryKey,
+ L"LibraryPath",
+ 0,
+ &RegType,
+ (LPBYTE)&CatalogEntry->DllPath,
+ &RegSize);
/* Query Display String Size*/
- Return = RegQueryValueExW(EntryKey,
- L"DisplayString",
- 0,
- NULL,
- NULL,
- &RegSize);
+ RegQueryValueExW(EntryKey,
+ L"DisplayString",
+ 0,
+ NULL,
+ NULL,
+ &RegSize);
/* Allocate it */
CatalogEntry->ProviderName = (LPWSTR)HeapAlloc(WsSockHeap, 0, RegSize);
/* Read it */
- Return = RegQueryValueExW(EntryKey,
- L"DisplayString",
- 0,
- &RegType,
- (LPBYTE)CatalogEntry->ProviderName,
- &RegSize);
+ RegQueryValueExW(EntryKey,
+ L"DisplayString",
+ 0,
+ &RegType,
+ (LPBYTE)CatalogEntry->ProviderName,
+ &RegSize);
/* Read the Provider Id */
RegType = REG_BINARY;
RegSize = sizeof(GUID);
- Return = RegQueryValueEx(EntryKey,
- "ProviderId",
- 0,
- &RegType,
- (LPBYTE)&CatalogEntry->ProviderId,
- &RegSize);
+ RegQueryValueEx(EntryKey,
+ "ProviderId",
+ 0,
+ &RegType,
+ (LPBYTE)&CatalogEntry->ProviderId,
+ &RegSize);
/* Read the Address Family */
RegType = REG_DWORD;
RegSize = sizeof(DWORD);
- Return = RegQueryValueEx(EntryKey,
- "AddressFamily",
- 0,
- &RegType,
- (LPBYTE)&CatalogEntry->AddressFamily,
- &RegSize);
+ RegQueryValueEx(EntryKey,
+ "AddressFamily",
+ 0,
+ &RegType,
+ (LPBYTE)&CatalogEntry->AddressFamily,
+ &RegSize);
/* Read the Namespace Id */
- Return = RegQueryValueEx(EntryKey,
- "SupportedNamespace",
- 0,
- &RegType,
- (LPBYTE)&CatalogEntry->NamespaceId,
- &RegSize);
+ RegQueryValueEx(EntryKey,
+ "SupportedNamespace",
+ 0,
+ &RegType,
+ (LPBYTE)&CatalogEntry->NamespaceId,
+ &RegSize);
/* Read the Enabled Flag */
- Return = RegQueryValueEx(EntryKey,
- "Enabled",
- 0,
- &RegType,
- (LPBYTE)&CatalogEntry->Enabled,
- &RegSize);
+ RegQueryValueEx(EntryKey,
+ "Enabled",
+ 0,
+ &RegType,
+ (LPBYTE)&CatalogEntry->Enabled,
+ &RegSize);
/* Read the Version */
- Return = RegQueryValueEx(EntryKey,
- "Version",
- 0,
- &RegType,
- (LPBYTE)&CatalogEntry->Version,
- &RegSize);
+ RegQueryValueEx(EntryKey,
+ "Version",
+ 0,
+ &RegType,
+ (LPBYTE)&CatalogEntry->Version,
+ &RegSize);
/* Read the Support Service Class Info Flag */
- Return = RegQueryValueEx(EntryKey,
- "Version",
- 0,
- &RegType,
- (LPBYTE)&CatalogEntry->StoresServiceClassInfo,
- &RegSize);
+ RegQueryValueEx(EntryKey,
+ "Version",
+ 0,
+ &RegType,
+ (LPBYTE)&CatalogEntry->StoresServiceClassInfo,
+ &RegSize);
/* Done */
RegCloseKey(EntryKey);
Modified: trunk/reactos/dll/win32/ws2_32_new/src/nsprovid.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/nsprovid.c?rev=53680&r1=53679&r2=53680&view=diff
==============================================================================
--- trunk/reactos/dll/win32/ws2_32_new/src/nsprovid.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32_new/src/nsprovid.c [iso-8859-1] Sat Sep 10 23:54:02 2011
@@ -80,25 +80,24 @@
IN LPWSTR DllName,
IN LPGUID ProviderId)
{
- DWORD ExpandedPathLength, PathLength;
INT ErrorCode = ERROR_SUCCESS;
LPNSPSTARTUP NSPStartupProc;
CHAR AnsiPath[MAX_PATH], ExpandedDllPath[MAX_PATH];
/* Convert the path to ANSI */
- PathLength = WideCharToMultiByte(CP_ACP,
- 0,
- DllName,
- -1,
- AnsiPath,
- MAX_PATH,
- NULL,
- NULL);
+ WideCharToMultiByte(CP_ACP,
+ 0,
+ DllName,
+ -1,
+ AnsiPath,
+ MAX_PATH,
+ NULL,
+ NULL);
/* Expand the DLL Path */
- ExpandedPathLength = ExpandEnvironmentStringsA(AnsiPath,
- ExpandedDllPath,
- MAX_PATH);
+ ExpandEnvironmentStringsA(AnsiPath,
+ ExpandedDllPath,
+ MAX_PATH);
/* Load the DLL */
Provider->DllHandle = LoadLibraryA(ExpandedDllPath);
Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c?rev=53680&r1=53679&r2=53680&view=diff
==============================================================================
--- trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c [iso-8859-1] Sat Sep 10 23:54:02 2011
@@ -14,10 +14,6 @@
PDEVICE_OBJECT DeviceObject,
PIRP Irp)
{
- PIO_STACK_LOCATION IoStack;
-
- IoStack = IoGetCurrentIrpStackLocation(Irp);
-
UNIMPLEMENTED
Irp->IoStatus.Status = STATUS_UNSUCCESSFUL;
Modified: trunk/reactos/drivers/wdm/audio/sysaudio/control.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio/control.c?rev=53680&r1=53679&r2=53680&view=diff
==============================================================================
--- trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] Sat Sep 10 23:54:02 2011
@@ -296,13 +296,9 @@
PKSAUDIO_DEVICE_ENTRY Entry;
PSYSAUDIO_INSTANCE_INFO InstanceInfo;
ULONG BytesReturned;
- PKSOBJECT_CREATE_ITEM CreateItem;
UNICODE_STRING GuidString;
PKSP_PIN Pin;
LPWSTR DeviceName;
-
- /* access the create item */
- CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp);
IoStack = IoGetCurrentIrpStackLocation(Irp);
Modified: trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c?rev=53680&r1=53679&r2=53680&view=diff
==============================================================================
--- trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c [iso-8859-1] Sat Sep 10 23:54:02 2011
@@ -133,10 +133,7 @@
{
DEVICE_INTERFACE_CHANGE_NOTIFICATION * Event;
NTSTATUS Status = STATUS_SUCCESS;
- PSYSAUDIODEVEXT DeviceExtension;
PDEVICE_OBJECT DeviceObject = (PDEVICE_OBJECT)Context;
-
- DeviceExtension = (PSYSAUDIODEVEXT)DeviceObject->DeviceExtension;
Event = (DEVICE_INTERFACE_CHANGE_NOTIFICATION*)NotificationStructure;
Modified: trunk/reactos/lib/drivers/ip/network/icmp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/icmp.c?rev=53680&r1=53679&r2=53680&view=diff
==============================================================================
--- trunk/reactos/lib/drivers/ip/network/icmp.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/ip/network/icmp.c [iso-8859-1] Sat Sep 10 23:54:02 2011
@@ -160,7 +160,6 @@
IP_PACKET Packet;
PTA_IP_ADDRESS RemoteAddressTa = (PTA_IP_ADDRESS)ConnInfo->RemoteAddress;
IP_ADDRESS RemoteAddress, LocalAddress;
- USHORT RemotePort;
NTSTATUS Status;
PNEIGHBOR_CACHE_ENTRY NCE;
KIRQL OldIrql;
@@ -170,15 +169,14 @@
TI_DbgPrint(MID_TRACE,("RemoteAddressTa: %x\n", RemoteAddressTa));
switch( RemoteAddressTa->Address[0].AddressType ) {
- case TDI_ADDRESS_TYPE_IP:
- RemoteAddress.Type = IP_ADDRESS_V4;
- RemoteAddress.Address.IPv4Address =
- RemoteAddressTa->Address[0].Address[0].in_addr;
- RemotePort = RemoteAddressTa->Address[0].Address[0].sin_port;
- break;
-
- default:
- return STATUS_UNSUCCESSFUL;
+ case TDI_ADDRESS_TYPE_IP:
+ RemoteAddress.Type = IP_ADDRESS_V4;
+ RemoteAddress.Address.IPv4Address =
+ RemoteAddressTa->Address[0].Address[0].in_addr;
+ break;
+
+ default:
+ return STATUS_UNSUCCESSFUL;
}
TI_DbgPrint(MID_TRACE,("About to get route to destination\n"));
Modified: trunk/reactos/lib/drivers/ip/network/router.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/router.c?rev=53680&r1=53679&r2=53680&view=diff
==============================================================================
--- trunk/reactos/lib/drivers/ip/network/router.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/ip/network/router.c [iso-8859-1] Sat Sep 10 23:54:02 2011
@@ -252,7 +252,7 @@
PLIST_ENTRY CurrentEntry;
PLIST_ENTRY NextEntry;
PFIB_ENTRY Current;
- UCHAR State, BestState = 0;
+ UCHAR State;
UINT Length, BestLength = 0, MaskLength;
PNEIGHBOR_CACHE_ENTRY NCE, BestNCE = NULL;
@@ -281,7 +281,6 @@
/* This seems to be a better router */
BestNCE = NCE;
BestLength = Length;
- BestState = State;
TI_DbgPrint(DEBUG_ROUTER,("Route selected\n"));
}
Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c?rev=53680&r1=53679&r2=53680&view=diff
==============================================================================
--- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Sat Sep 10 23:54:02 2011
@@ -34,13 +34,12 @@
PCONNECTION_ENDPOINT Connection = (PCONNECTION_ENDPOINT)DeferredContext;
PLIST_ENTRY Entry;
PTDI_BUCKET Bucket;
- NTSTATUS Status;
-
+
LockObjectAtDpcLevel(Connection);
-
+
/* We timed out waiting for pending sends so force it to shutdown */
- Status = TCPTranslateError(LibTCPShutdown(Connection, 0, 1));
-
+ TCPTranslateError(LibTCPShutdown(Connection, 0, 1));
+
while (!IsListEmpty(&Connection->SendRequest))
{
Entry = RemoveHeadList(&Connection->SendRequest);
@@ -151,11 +150,8 @@
NTSTATUS TCPClose( PCONNECTION_ENDPOINT Connection )
{
KIRQL OldIrql;
- PVOID Socket;
LockObject(Connection, &OldIrql);
-
- Socket = Connection->SocketContext;
FlushAllQueues(Connection, STATUS_CANCELLED);
Modified: trunk/reactos/lib/drivers/sound/mmixer/midi.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/midi.c?rev=53680&r1=53679&r2=53680&view=diff
==============================================================================
--- trunk/reactos/lib/drivers/sound/mmixer/midi.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/sound/mmixer/midi.c [iso-8859-1] Sat Sep 10 23:54:02 2011
@@ -126,7 +126,6 @@
PKSDATARANGE DataRange;
KSPIN_COMMUNICATION Communication;
KSPIN_DATAFLOW DataFlow;
- MIXER_STATUS Status;
/* get first datarange */
DataRange = (PKSDATARANGE)(MultipleItem + 1);
@@ -146,11 +145,11 @@
{
if (DataFlow == KSPIN_DATAFLOW_IN && Communication == KSPIN_COMMUNICATION_SINK)
{
- Status = MMixerAddMidiPin(MixerContext, MixerList, MixerData->DeviceId, PinId, FALSE, szPname);
+ MMixerAddMidiPin(MixerContext, MixerList, MixerData->DeviceId, PinId, FALSE, szPname);
}
else if (DataFlow == KSPIN_DATAFLOW_OUT && Communication == KSPIN_COMMUNICATION_SOURCE)
{
- Status = MMixerAddMidiPin(MixerContext, MixerList, MixerData->DeviceId, PinId, TRUE, szPname);
+ MMixerAddMidiPin(MixerContext, MixerList, MixerData->DeviceId, PinId, TRUE, szPname);
}
}
}
Modified: trunk/reactos/lib/drivers/sound/mmixer/topology.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/topology.c?rev=53680&r1=53679&r2=53680&view=diff
==============================================================================
--- trunk/reactos/lib/drivers/sound/mmixer/topology.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/sound/mmixer/topology.c [iso-8859-1] Sat Sep 10 23:54:02 2011
@@ -525,15 +525,11 @@
IN OUT PTOPOLOGY Topology)
{
ULONG Index;
- LPGUID Guids;
PKSTOPOLOGY_CONNECTION Connection;
MIXER_STATUS Status;
/* sanity check */
ASSERT(Topology->TopologyNodesCount == NodeTypes->Count);
-
- /* get topology node types */
- Guids = (LPGUID)(NodeTypes + 1);
/* get node connections */
Connection = (PKSTOPOLOGY_CONNECTION)(NodeConnections + 1);
Modified: trunk/reactos/lib/fslib/vfatlib/fat32.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat32.c?rev=53680&r1=53679&r2=53680&view=diff
==============================================================================
--- trunk/reactos/lib/fslib/vfatlib/fat32.c [iso-8859-1] (original)
+++ trunk/reactos/lib/fslib/vfatlib/fat32.c [iso-8859-1] Sat Sep 10 23:54:02 2011
@@ -357,7 +357,6 @@
{
FAT32_BOOT_SECTOR BootSector;
OEM_STRING VolumeLabel;
- ULONG RootDirSectors;
ULONG TmpVal1;
ULONG TmpVal2;
NTSTATUS Status;
@@ -426,9 +425,6 @@
memcpy(&BootSector.SysType[0], "FAT32 ", 8);
- RootDirSectors = ((BootSector.RootEntries * 32) +
- (BootSector.BytesPerSector - 1)) / BootSector.BytesPerSector;
-
/* Calculate number of FAT sectors */
/* (BytesPerSector / 4) FAT entries (32bit) fit into one sector */
TmpVal1 = BootSector.SectorsHuge - BootSector.ReservedSectors;
Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.c?rev=53680&r1=53679&r2=53680&view=diff
==============================================================================
--- trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] (original)
+++ trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] Sat Sep 10 23:54:02 2011
@@ -329,7 +329,10 @@
IN BOOLEAN ScanDrive,
IN PFMIFSCALLBACK Callback)
{
- BOOLEAN verify, salvage_files;
+#if 0
+ BOOLEAN verify;
+ BOOLEAN salvage_files;
+#endif
//ULONG free_clusters;
//DOS_FS fs;
@@ -344,9 +347,10 @@
FsCheckTotalFiles = 0;
+#if 0
verify = TRUE;
salvage_files = TRUE;
-#if 0
+
/* Open filesystem */
fs_open(DriveRoot,FixErrors);
More information about the Ros-diffs
mailing list