Ros-diffs October 2017

ros-diffs@reactos.org

43 participants
275 discussions

[reactos] 01/01: [RTL] Revert b3b2a23 which introduced a regression. Spotted by Jérome

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ec9912f334aac0c5aeaaa… commit ec9912f334aac0c5aeaaa7c9f3b8fa72f3aae501 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Oct 29 15:03:12 2017 +0100 [RTL] Revert b3b2a23 which introduced a regression. Spotted by Jérome --- sdk/lib/rtl/memstream.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sdk/lib/rtl/memstream.c b/sdk/lib/rtl/memstream.c index 8fe4169fb1..0549424ca4 100644 --- a/sdk/lib/rtl/memstream.c +++ b/sdk/lib/rtl/memstream.c @@ -185,8 +185,7 @@ RtlReadMemoryStream( Stream->Current = (PUCHAR)Stream->Current + CopyLength; - if (BytesRead) - *BytesRead = CopyLength; + *BytesRead = CopyLength; return S_OK; }

7 years, 1 month

[reactos] 01/01: [KERNEL32] In GetLogicalDrives(), if NtQueryInformationProcess() call succeed, but return drive map is empty, make sure returned error is success. Patch by Alex Ionescu

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a80f5f53e747b91a65d94… commit a80f5f53e747b91a65d945105799bb3a85c68a89 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Oct 29 14:48:41 2017 +0100 [KERNEL32] In GetLogicalDrives(), if NtQueryInformationProcess() call succeed, but return drive map is empty, make sure returned error is success. Patch by Alex Ionescu --- dll/win32/kernel32/client/file/disk.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dll/win32/kernel32/client/file/disk.c b/dll/win32/kernel32/client/file/disk.c index 041f4b197b..6d13e64acb 100644 --- a/dll/win32/kernel32/client/file/disk.c +++ b/dll/win32/kernel32/client/file/disk.c @@ -127,6 +127,11 @@ GetLogicalDrives(VOID) return 0; } + if (ProcessDeviceMapInfo.Query.DriveMap == 0) + { + SetLastError(ERROR_SUCCESS); + } + return ProcessDeviceMapInfo.Query.DriveMap; }

7 years, 1 month

[reactos] 01/01: CID 1206831 Dereference after null check

by Samuel Serapion

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b3b2a23f05e5188dc1475… commit b3b2a23f05e5188dc1475961fcd7f036f0046d25 Author: Samuel Serapion <samcharly(a)hotmail.com> AuthorDate: Fri Oct 20 14:00:32 2017 -0400 CID 1206831 Dereference after null check BytesRead is an optional out parameter and must be checked before being written to. --- sdk/lib/rtl/memstream.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk/lib/rtl/memstream.c b/sdk/lib/rtl/memstream.c index 0549424ca4..8fe4169fb1 100644 --- a/sdk/lib/rtl/memstream.c +++ b/sdk/lib/rtl/memstream.c @@ -185,7 +185,8 @@ RtlReadMemoryStream( Stream->Current = (PUCHAR)Stream->Current + CopyLength; - *BytesRead = CopyLength; + if (BytesRead) + *BytesRead = CopyLength; return S_OK; }

7 years, 1 month

[reactos] 01/01: [MOUNTMGR][NTOSKRNL] ZwWriteFile() calls: Use explicit NULL instead of ambiguous 0. CORE-13910

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=abb6ad90f5a8685c63fea… commit abb6ad90f5a8685c63fea9ecb42daf882db25e8f Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Oct 28 17:02:24 2017 +0200 [MOUNTMGR][NTOSKRNL] ZwWriteFile() calls: Use explicit NULL instead of ambiguous 0. CORE-13910 --- drivers/filters/mountmgr/database.c | 2 +- ntoskrnl/config/cmwraprs.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/filters/mountmgr/database.c b/drivers/filters/mountmgr/database.c index d99f0ece80..6b760a135f 100644 --- a/drivers/filters/mountmgr/database.c +++ b/drivers/filters/mountmgr/database.c @@ -70,7 +70,7 @@ AddRemoteDatabaseEntry(IN HANDLE Database, /* Get size to append data */ Size.QuadPart = GetRemoteDatabaseSize(Database); - return ZwWriteFile(Database, 0, NULL, NULL, + return ZwWriteFile(Database, NULL, NULL, NULL, &IoStatusBlock, Entry, Entry->EntrySize, &Size, NULL); } diff --git a/ntoskrnl/config/cmwraprs.c b/ntoskrnl/config/cmwraprs.c index fa864a8fb5..031dc77c00 100644 --- a/ntoskrnl/config/cmwraprs.c +++ b/ntoskrnl/config/cmwraprs.c @@ -103,8 +103,8 @@ CmpFileWrite(IN PHHIVE RegistryHive, NTSTATUS Status; _FileOffset.QuadPart = *FileOffset; - Status = ZwWriteFile(HiveHandle, 0, 0, 0, &IoStatusBlock, - Buffer, (ULONG)BufferLength, &_FileOffset, 0); + Status = ZwWriteFile(HiveHandle, NULL, NULL, NULL, &IoStatusBlock, + Buffer, (ULONG)BufferLength, &_FileOffset, NULL); return NT_SUCCESS(Status) ? TRUE : FALSE; }

7 years, 1 month

[reactos] 01/01: [RAPPS] Prevent download dialog placeholder from displaying

by Alexander Shaposhnikov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ee019e12faac404a16266… commit ee019e12faac404a162661c12f33a14bb8f3297f Author: Alexander Shaposhnikov <sanchaez(a)reactos.org> AuthorDate: Sat Oct 28 23:44:17 2017 +0300 [RAPPS] Prevent download dialog placeholder from displaying CORE-13915 --- base/applications/rapps/loaddlg.cpp | 48 +++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index 346167cd77..166b38304c 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -393,6 +393,7 @@ INT_PTR CALLBACK CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM w case WM_INITDIALOG: { HICON hIconSm, hIconBg; + ATL::CStringW szTempCaption; hIconBg = (HICON) GetClassLongW(hMainWnd, GCLP_HICON); hIconSm = (HICON) GetClassLongW(hMainWnd, GCLP_HICONSM); @@ -423,11 +424,16 @@ INT_PTR CALLBACK CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM w } DownloadsListView.LoadList(AppsToInstallList); - ShowWindow(Dlg, SW_SHOW); - // Get a dlg string for later use GetWindowTextW(Dlg, szCaption, MAX_PATH); + // Hide a placeholder from displaying + szTempCaption = szCaption; + szTempCaption.Replace(L"%ls", L""); + SetWindowText(Dlg, szTempCaption.GetString()); + + ShowWindow(Dlg, SW_SHOW); + // Start download process DownloadParam *param = new DownloadParam(Dlg, AppsToInstallList, szCaption); DWORD ThreadId; @@ -580,6 +586,25 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) for (iAppId = 0; iAppId < InfoArray.GetSize(); ++iAppId) { + // Reset progress bar + Item = GetDlgItem(hDlg, IDC_DOWNLOAD_PROGRESS); + if (Item) + { + SendMessageW(Item, PBM_SETPOS, 0, 0); + } + + // Change caption to show the currently downloaded app + if (!bCab) + { + szNewCaption.Format(szCaption, InfoArray[iAppId].szName.GetString()); + } + else + { + szNewCaption.LoadStringW(IDS_DL_DIALOG_DB_DOWNLOAD_DISP); + } + + SetWindowTextW(hDlg, szNewCaption.GetString()); + // build the path for the download p = wcsrchr(InfoArray[iAppId].szUrl.GetString(), L'/'); q = wcsrchr(InfoArray[iAppId].szUrl.GetString(), L'?'); @@ -626,25 +651,6 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) goto run; } - // Reset progress bar - Item = GetDlgItem(hDlg, IDC_DOWNLOAD_PROGRESS); - if (Item) - { - SendMessageW(Item, PBM_SETPOS, 0, 0); - } - - // Change caption to show the currently downloaded app - if (!bCab) - { - szNewCaption.Format(szCaption, InfoArray[iAppId].szName.GetString()); - } - else - { - szNewCaption.LoadStringW(IDS_DL_DIALOG_DB_DOWNLOAD_DISP); - } - - SetWindowTextW(hDlg, szNewCaption.GetString()); - // Add the download URL SetDlgItemTextW(hDlg, IDC_DOWNLOAD_STATUS, InfoArray[iAppId].szUrl.GetString());

7 years, 1 month

[reactos] 01/01: [EXPLORER] CSysPagerWnd: Notify the CTrayWindow to reposition its children only when the number of the icons shown in the notification area changes.

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=82b12ef4cf046f5d346d8… commit 82b12ef4cf046f5d346d8f065dc47e98bc3c1654 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sat Oct 28 22:09:44 2017 +0300 [EXPLORER] CSysPagerWnd: Notify the CTrayWindow to reposition its children only when the number of the icons shown in the notification area changes. --- base/shell/explorer/trayntfy.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/base/shell/explorer/trayntfy.cpp b/base/shell/explorer/trayntfy.cpp index c14e29161a..b79d41b5a3 100644 --- a/base/shell/explorer/trayntfy.cpp +++ b/base/shell/explorer/trayntfy.cpp @@ -510,6 +510,8 @@ public: parentHWND = ::GetParent(parentHWND); ::GetClientRect(parentHWND, &windowRect); + int VisibleButtonCount = Toolbar.GetVisibleButtonCount(); + data = (PSYS_PAGER_COPY_DATA) cpData->lpData; iconData = &data->nicon_data; @@ -530,11 +532,10 @@ public: return FALSE; } - SendMessage(parentHWND, - WM_SIZE, - 0, - MAKELONG(windowRect.right - windowRect.left, - windowRect.bottom - windowRect.top)); + if (VisibleButtonCount != Toolbar.GetVisibleButtonCount()) + { + SendMessage(parentHWND, WM_SIZE, 0, 0); + } return ret; }

7 years, 1 month

[reactos] 01/01: [EXPLORER] Simplify how autohide is implemented Do not change m_TrayRects when m_AutoHideOffset is changed. m_AutoHideOffset will be taken into account only while WM_WINDOWPOSCHANGING is processed

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4238f223966abec8496f7… commit 4238f223966abec8496f7a077b0ab533344ee5e1 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sat Oct 28 19:23:49 2017 +0300 [EXPLORER] Simplify how autohide is implemented Do not change m_TrayRects when m_AutoHideOffset is changed. m_AutoHideOffset will be taken into account only while WM_WINDOWPOSCHANGING is processed --- base/shell/explorer/traywnd.cpp | 104 +++++++--------------------------------- 1 file changed, 18 insertions(+), 86 deletions(-) diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index f9d1f2ae39..f703955a30 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -1090,13 +1090,6 @@ GetPrimaryScreenRect: szTray.cy = rcPos.bottom - rcPos.top; GetTrayRectFromScreenRect(Pos, &rcScreen, &szTray, pRect); - if (AutoHide) - { - pRect->left += m_AutoHideOffset.cx; - pRect->right += m_AutoHideOffset.cx; - pRect->top += m_AutoHideOffset.cy; - pRect->bottom += m_AutoHideOffset.cy; - } hMon = hMonNew; } else @@ -1104,13 +1097,6 @@ GetPrimaryScreenRect: /* The user is dragging the tray window on the same monitor. We don't need to recalculate the rectangle */ *pRect = rcPos; - if (AutoHide) - { - pRect->left += m_AutoHideOffset.cx; - pRect->right += m_AutoHideOffset.cx; - pRect->top += m_AutoHideOffset.cy; - pRect->bottom += m_AutoHideOffset.cy; - } } *phMonitor = hMon; @@ -1146,13 +1132,6 @@ GetPrimaryScreenRect: rcTray.top = pwp->y; rcTray.right = rcTray.left + pwp->cx; rcTray.bottom = rcTray.top + pwp->cy; - if (AutoHide) - { - rcTray.left -= m_AutoHideOffset.cx; - rcTray.right -= m_AutoHideOffset.cx; - rcTray.top -= m_AutoHideOffset.cy; - rcTray.bottom -= m_AutoHideOffset.cy; - } if (!EqualRect(&rcTray, &m_TrayRects[m_DraggingPosition])) @@ -1204,13 +1183,6 @@ GetPrimaryScreenRect: MakeTrayRectWithSize(m_Position, &szWnd, &rcTray); } - if (AutoHide) - { - rcTray.left -= m_AutoHideOffset.cx; - rcTray.right -= m_AutoHideOffset.cx; - rcTray.top -= m_AutoHideOffset.cy; - rcTray.bottom -= m_AutoHideOffset.cy; - } m_TrayRects[m_Position] = rcTray; } else @@ -1219,20 +1191,21 @@ GetPrimaryScreenRect: new size or position is valid. this is to prevent changes to the window without user interaction. */ rcTray = m_TrayRects[m_Position]; + + if (AutoHide) + { + rcTray.left += m_AutoHideOffset.cx; + rcTray.right += m_AutoHideOffset.cx; + rcTray.top += m_AutoHideOffset.cy; + rcTray.bottom += m_AutoHideOffset.cy; + } + } ChangePos: m_TraySize.cx = rcTray.right - rcTray.left; m_TraySize.cy = rcTray.bottom - rcTray.top; - if (AutoHide) - { - rcTray.left += m_AutoHideOffset.cx; - rcTray.right += m_AutoHideOffset.cx; - rcTray.top += m_AutoHideOffset.cy; - rcTray.bottom += m_AutoHideOffset.cy; - } - pwp->flags &= ~(SWP_NOMOVE | SWP_NOSIZE); pwp->x = rcTray.left; pwp->y = rcTray.top; @@ -1332,18 +1305,7 @@ ChangePos: VOID CheckTrayWndPosition() { - RECT rcTray; - - rcTray = m_TrayRects[m_Position]; - - if (AutoHide) - { - rcTray.left += m_AutoHideOffset.cx; - rcTray.right += m_AutoHideOffset.cx; - rcTray.top += m_AutoHideOffset.cy; - rcTray.bottom += m_AutoHideOffset.cy; - } - + /* Force the rebar bands to resize */ IUnknown_Exec(m_TrayBandSite, IID_IDeskBand, DBID_BANDINFOCHANGED, @@ -1351,19 +1313,14 @@ ChangePos: NULL, NULL); - FitToRebar(&rcTray); - m_TrayRects[m_Position] = rcTray; + /* Calculate the size of the taskbar based on the rebar */ + FitToRebar(&m_TrayRects[m_Position]); /* Move the tray window */ - SetWindowPos(NULL, - rcTray.left, - rcTray.top, - rcTray.right - rcTray.left, - rcTray.bottom - rcTray.top, - SWP_NOZORDER | SWP_NOACTIVATE); - + /* The handler of WM_WINDOWPOSCHANGING will override whatever size + *and position we use here with m_TrayRects */ + SetWindowPos(NULL, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOACTIVATE); ResizeWorkArea(); - ApplyClipping(TRUE); } @@ -1788,12 +1745,9 @@ ChangePos: void ProcessAutoHide() { - RECT rc = m_TrayRects[m_Position]; INT w = m_TraySize.cx - GetSystemMetrics(SM_CXBORDER) * 2 - 1; INT h = m_TraySize.cy - GetSystemMetrics(SM_CYBORDER) * 2 - 1; - TRACE("AutoHide Timer received for %u, rc=(%d, %d, %d, %d), w=%d, h=%d.\n", m_AutoHideState, rc.left, rc.top, rc.right, rc.bottom, w, h); - switch (m_AutoHideState) { case AUTOHIDE_HIDING: @@ -1899,13 +1853,7 @@ ChangePos: break; } - rc.left += m_AutoHideOffset.cx; - rc.right += m_AutoHideOffset.cx; - rc.top += m_AutoHideOffset.cy; - rc.bottom += m_AutoHideOffset.cy; - - TRACE("AutoHide Changing position to (%d, %d, %d, %d) and state=%u.\n", rc.left, rc.top, rc.right, rc.bottom, m_AutoHideState); - SetWindowPos(NULL, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, SWP_NOACTIVATE | SWP_NOZORDER); + SetWindowPos(NULL, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOZORDER); } @@ -2367,14 +2315,6 @@ ChangePos: else { *pRect = m_TrayRects[m_Position]; - - if (AutoHide) - { - pRect->left += m_AutoHideOffset.cx; - pRect->right += m_AutoHideOffset.cx; - pRect->top += m_AutoHideOffset.cy; - pRect->bottom += m_AutoHideOffset.cy; - } } return TRUE; } @@ -2390,19 +2330,11 @@ ChangePos: else { *pRect = m_TrayRects[m_Position]; - - if (AutoHide) - { - pRect->left += m_AutoHideOffset.cx; - pRect->right += m_AutoHideOffset.cx; - pRect->top += m_AutoHideOffset.cy; - pRect->bottom += m_AutoHideOffset.cy; - } } return TRUE; } - LRESULT OnWindowPosChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + LRESULT OnWindowPosChanging(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { ChangingWinPos((LPWINDOWPOS) lParam); return TRUE; @@ -2925,7 +2857,7 @@ HandleTrayContextMenu: MESSAGE_HANDLER(WM_CTLCOLORBTN, OnCtlColorBtn) MESSAGE_HANDLER(WM_MOVING, OnMoving) MESSAGE_HANDLER(WM_SIZING, OnSizing) - MESSAGE_HANDLER(WM_WINDOWPOSCHANGING, OnWindowPosChange) + MESSAGE_HANDLER(WM_WINDOWPOSCHANGING, OnWindowPosChanging) MESSAGE_HANDLER(WM_ENTERSIZEMOVE, OnEnterSizeMove) MESSAGE_HANDLER(WM_EXITSIZEMOVE, OnExitSizeMove) MESSAGE_HANDLER(WM_NCLBUTTONDOWN, OnNcLButtonDown)

7 years, 1 month

[reactos] 01/01: [NTOS] Add missing brackets. Comment out some unused statements. CORE-11799 (#94)

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=840320cbd175af0381d20… commit 840320cbd175af0381d20fa3327de272b4878b64 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 28 15:19:17 2017 +0100 [NTOS] Add missing brackets. Comment out some unused statements. CORE-11799 (#94) --- ntoskrnl/mm/pagefile.c | 2 +- ntoskrnl/wmi/smbios.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/mm/pagefile.c b/ntoskrnl/mm/pagefile.c index 7bc4c8a602..a30d920d22 100644 --- a/ntoskrnl/mm/pagefile.c +++ b/ntoskrnl/mm/pagefile.c @@ -210,7 +210,7 @@ MmGetOffsetPageFile(PRETRIEVAL_POINTERS_BUFFER RetrievalPointers, LARGE_INTEGER { const LARGE_INTEGER dummy = { - 0 + {0} }; return dummy; } diff --git a/ntoskrnl/wmi/smbios.c b/ntoskrnl/wmi/smbios.c index bea8b9e27c..8f353fd5b3 100644 --- a/ntoskrnl/wmi/smbios.c +++ b/ntoskrnl/wmi/smbios.c @@ -256,11 +256,11 @@ WmipQueryRawSMBiosTables( AllData->WnodeHeader.KernelHandle = NULL; //AllData->WnodeHeader.TimeStamp; AllData->WnodeHeader.Guid = MSSmBios_RawSMBiosTables_GUID; - AllData->WnodeHeader.ClientContext; + //AllData->WnodeHeader.ClientContext; AllData->WnodeHeader.Flags = WNODE_FLAG_FIXED_INSTANCE_SIZE; AllData->DataBlockOffset = sizeof(WNODE_ALL_DATA); AllData->InstanceCount = 1; - AllData->OffsetInstanceNameOffsets; + //AllData->OffsetInstanceNameOffsets; AllData->FixedInstanceSize = TableSize; RtlCopyMemory(AllData + 1, TableData, TableSize);

7 years, 1 month

[reactos] 01/01: [BROWSEUI][DEVMGR][EXPLORER][NTGDI][NTOBJSHEX][NTVDM][SETUPAPI] Remove/comment out some unused variables. CORE-11799 (#94)

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5cb061514716fdd202ee1… commit 5cb061514716fdd202ee11facfaad336f68a97a1 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 28 15:04:18 2017 +0100 [BROWSEUI][DEVMGR][EXPLORER][NTGDI][NTOBJSHEX][NTVDM][SETUPAPI] Remove/comment out some unused variables. CORE-11799 (#94) --- base/shell/explorer/trayntfy.cpp | 2 -- dll/shellext/ntobjshex/ntobjfolder.h | 1 - dll/shellext/ntobjshex/regfolder.cpp | 2 +- dll/win32/browseui/brandband.cpp | 2 +- dll/win32/browseui/desktopipc.cpp | 7 +------ dll/win32/browseui/shellbrowser.cpp | 2 +- dll/win32/browseui/toolsband.cpp | 8 +++----- dll/win32/devmgr/devmgmt/MainWindow.h | 1 - dll/win32/setupapi/devclass.c | 2 -- subsystems/mvdm/ntvdm/bios/vidbios.c | 5 +++-- subsystems/mvdm/ntvdm/cpu/callback.c | 3 +++ win32ss/gdi/ntgdi/freetype.c | 1 - 12 files changed, 13 insertions(+), 23 deletions(-) diff --git a/base/shell/explorer/trayntfy.cpp b/base/shell/explorer/trayntfy.cpp index 366b45a0a8..c14e29161a 100644 --- a/base/shell/explorer/trayntfy.cpp +++ b/base/shell/explorer/trayntfy.cpp @@ -1309,7 +1309,6 @@ class CTrayNotifyWnd : SIZE szTrayClockMin; SIZE szTrayNotify; MARGINS ContentMargin; - HFONT hFontClock; union { DWORD dwFlags; @@ -1326,7 +1325,6 @@ public: m_pager(NULL), m_clock(NULL), TrayTheme(NULL), - hFontClock(NULL), dwFlags(0) { ZeroMemory(&szTrayClockMin, sizeof(szTrayClockMin)); diff --git a/dll/shellext/ntobjshex/ntobjfolder.h b/dll/shellext/ntobjshex/ntobjfolder.h index ef948f7621..5192e29856 100644 --- a/dll/shellext/ntobjshex/ntobjfolder.h +++ b/dll/shellext/ntobjshex/ntobjfolder.h @@ -14,7 +14,6 @@ class CNtObjectFolderExtractIcon : public IExtractIconW { PCWSTR m_NtPath; - PCIDLIST_ABSOLUTE m_pcidlFolder; PCITEMID_CHILD m_pcidlChild; public: diff --git a/dll/shellext/ntobjshex/regfolder.cpp b/dll/shellext/ntobjshex/regfolder.cpp index 6ac41d4ad5..a314ad70a6 100644 --- a/dll/shellext/ntobjshex/regfolder.cpp +++ b/dll/shellext/ntobjshex/regfolder.cpp @@ -12,7 +12,7 @@ const GUID CLSID_RegistryFolder = { 0x1c6d6e08, 0x2332, 0x4a7b, { 0xa9, 0x4d, 0x64, 0x32, 0xdb, 0x2b, 0x5a, 0xe6 } }; // {18A4B504-F6D8-4D8A-8661-6296514C2CF0} -static const GUID GUID_RegistryColumns = { 0x18a4b504, 0xf6d8, 0x4d8a, { 0x86, 0x61, 0x62, 0x96, 0x51, 0x4c, 0x2c, 0xf0 } }; +//static const GUID GUID_RegistryColumns = { 0x18a4b504, 0xf6d8, 0x4d8a, { 0x86, 0x61, 0x62, 0x96, 0x51, 0x4c, 0x2c, 0xf0 } }; enum RegistryColumns { diff --git a/dll/win32/browseui/brandband.cpp b/dll/win32/browseui/brandband.cpp index fc209b7344..230ab942bc 100644 --- a/dll/win32/browseui/brandband.cpp +++ b/dll/win32/browseui/brandband.cpp @@ -43,7 +43,7 @@ inline void FillSolidRect(HDC dc, const RECT *bounds, COLORREF clr) ::ExtTextOut(dc, 0, 0, ETO_OPAQUE, bounds, NULL, 0, NULL); } -static const int gSmallImageSize = 22; +//static const int gSmallImageSize = 22; static const int gMediumImageSize = 26; static const int gLargeImageSize = 38; diff --git a/dll/win32/browseui/desktopipc.cpp b/dll/win32/browseui/desktopipc.cpp index 4afb9929e7..c82f4cd30d 100644 --- a/dll/win32/browseui/desktopipc.cpp +++ b/dll/win32/browseui/desktopipc.cpp @@ -33,15 +33,10 @@ class CProxyDesktop : public CComObjectRootEx<CComMultiThreadModelNoCS>, public CWindowImpl < CProxyDesktop, CWindow, CFrameWinTraits > { - IEThreadParamBlock * m_Parameters; - - LPITEMIDLIST m_rootPidl; public: - CProxyDesktop(IEThreadParamBlock * parameters) : - m_Parameters(parameters) + CProxyDesktop(IEThreadParamBlock * parameters) { - } virtual ~CProxyDesktop() diff --git a/dll/win32/browseui/shellbrowser.cpp b/dll/win32/browseui/shellbrowser.cpp index 25df806e79..b95a4e331d 100644 --- a/dll/win32/browseui/shellbrowser.cpp +++ b/dll/win32/browseui/shellbrowser.cpp @@ -167,7 +167,7 @@ HRESULT WINAPI SHBindToFolder(LPCITEMIDLIST path, IShellFolder **newFolder) } static const TCHAR szCabinetWndClass[] = TEXT("CabinetWClass"); -static const TCHAR szExploreWndClass[] = TEXT("ExploreWClass"); +//static const TCHAR szExploreWndClass[] = TEXT("ExploreWClass"); class CDockManager; class CShellBrowser; diff --git a/dll/win32/browseui/toolsband.cpp b/dll/win32/browseui/toolsband.cpp index 03b3609b47..1e855cb660 100644 --- a/dll/win32/browseui/toolsband.cpp +++ b/dll/win32/browseui/toolsband.cpp @@ -38,8 +38,6 @@ class CToolsBand : { private: CComPtr<IDockingWindowSite> fDockSite; - GUID fExecCommandCategory; - CComPtr<IOleCommandTarget> fExecCommandTarget; HIMAGELIST m_himlNormal; HIMAGELIST m_himlHot; public: @@ -163,7 +161,7 @@ static const int cutImageIndex = 5; static const int copyImageIndex = 6; static const int pasteImageIndex = 7; static const int undoImageIndex = 8; -static const int redoImageIndex = 9; +//static const int redoImageIndex = 9; static const int deleteImageIndex = 10; // 11 // 12 @@ -186,13 +184,13 @@ static const int upImageIndex = 28; static const int mapDriveImageIndex = 29; static const int disconnectImageIndex = 30; // 31 -static const int viewsAltImageIndex = 32; // same image as viewsImageIndex +//static const int viewsAltImageIndex = 32; // same image as viewsImageIndex // 33 // 34 // 35 // 36 // 37 -static const int viewsAlt2ImageIndex = 38; // same image as viewsAltImageIndex & viewsImageIndex +//static const int viewsAlt2ImageIndex = 38; // same image as viewsAltImageIndex & viewsImageIndex // 39 // 40 // 41 diff --git a/dll/win32/devmgr/devmgmt/MainWindow.h b/dll/win32/devmgr/devmgmt/MainWindow.h index afd331344d..ec1633d6db 100644 --- a/dll/win32/devmgr/devmgmt/MainWindow.h +++ b/dll/win32/devmgr/devmgmt/MainWindow.h @@ -15,7 +15,6 @@ class CDeviceManager HWND m_hStatusBar; HWND m_hToolBar; HMENU m_hMenu; - HMENU m_hActionMenu; int m_CmdShow; BOOL m_RefreshPending; diff --git a/dll/win32/setupapi/devclass.c b/dll/win32/setupapi/devclass.c index 7b5c024ac6..4982e67290 100644 --- a/dll/win32/setupapi/devclass.c +++ b/dll/win32/setupapi/devclass.c @@ -27,13 +27,11 @@ /* Unicode constants */ static const WCHAR BackSlash[] = {'\\',0}; -static const WCHAR Class[] = {'C','l','a','s','s',0}; static const WCHAR ClassGUID[] = {'C','l','a','s','s','G','U','I','D',0}; static const WCHAR ClassInstall32[] = {'C','l','a','s','s','I','n','s','t','a','l','l','3','2',0}; static const WCHAR DotServices[] = {'.','S','e','r','v','i','c','e','s',0}; static const WCHAR InterfaceInstall32[] = {'I','n','t','e','r','f','a','c','e','I','n','s','t','a','l','l','3','2',0}; static const WCHAR SetupapiDll[] = {'s','e','t','u','p','a','p','i','.','d','l','l',0}; -static const WCHAR Version[] = {'V','e','r','s','i','o','n',0}; typedef BOOL (WINAPI* PROPERTY_PAGE_PROVIDER) ( diff --git a/subsystems/mvdm/ntvdm/bios/vidbios.c b/subsystems/mvdm/ntvdm/bios/vidbios.c index 052906dbe3..a2e19ac756 100644 --- a/subsystems/mvdm/ntvdm/bios/vidbios.c +++ b/subsystems/mvdm/ntvdm/bios/vidbios.c @@ -277,7 +277,10 @@ static VGA_REGISTERS VideoMode_320x200_256color = * etc...) A choice should be made at some point. */ +#if 0 + // This is the same as EgaPalette__HiRes +// Unused at the moment static CONST COLORREF TextPalette[VGA_MAX_COLORS / 4] = { RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0xAA), RGB(0x00, 0xAA, 0x00), RGB(0x00, 0xAA, 0xAA), @@ -346,8 +349,6 @@ static CONST COLORREF mtext_s3_palette[64] = RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF), RGB(0xFF, 0xFF, 0xFF) }; -#if 0 - // Unused at the moment static CONST COLORREF CgaPalette[16] = { diff --git a/subsystems/mvdm/ntvdm/cpu/callback.c b/subsystems/mvdm/ntvdm/cpu/callback.c index 00c8979989..c5f3002703 100644 --- a/subsystems/mvdm/ntvdm/cpu/callback.c +++ b/subsystems/mvdm/ntvdm/cpu/callback.c @@ -31,6 +31,8 @@ /* PRIVATE VARIABLES **********************************************************/ +#if 0 +/* FIXME: Are we going to use this somewhere? */ static BYTE Yield[] = { 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, @@ -38,6 +40,7 @@ static BYTE Yield[] = BOP(BOP_UNSIMULATE), // UnSimulate16 BOP }; C_ASSERT(sizeof(Yield) == 16 * sizeof(BYTE)); +#endif /* PUBLIC FUNCTIONS ***********************************************************/ diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index eb2fc7756d..5fb58cf3e4 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -48,7 +48,6 @@ extern const MATRIX gmxWorldToPageDefault; #define gmxWorldToDeviceDefault gmxWorldToPageDefault FT_Library library; -static const WORD gusEnglishUS = MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US); /* special font names */ static const UNICODE_STRING MarlettW = RTL_CONSTANT_STRING(L"Marlett");

7 years, 1 month

[reactos] 01/01: [SPOOLSV] Add some missing VOIDs. CORE-11799 (#94)

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0625e4d4f55340a879033… commit 0625e4d4f55340a879033f555eece55f95ae6727 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Oct 28 14:43:14 2017 +0100 [SPOOLSV] Add some missing VOIDs. CORE-11799 (#94) --- win32ss/printing/base/spoolsv/init.c | 2 +- win32ss/printing/base/spoolsv/notifications.c | 8 ++++---- win32ss/printing/base/spoolsv/printers.c | 4 ++-- win32ss/printing/base/spoolsv/rpcstubs.c | 18 +++++++++--------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/win32ss/printing/base/spoolsv/init.c b/win32ss/printing/base/spoolsv/init.c index ecd7349318..06c572040f 100644 --- a/win32ss/printing/base/spoolsv/init.c +++ b/win32ss/printing/base/spoolsv/init.c @@ -8,7 +8,7 @@ #include "precomp.h" DWORD -_RpcSpoolerInit() +_RpcSpoolerInit(VOID) { DWORD dwErrorCode; diff --git a/win32ss/printing/base/spoolsv/notifications.c b/win32ss/printing/base/spoolsv/notifications.c index a876e60271..266f6d2d41 100644 --- a/win32ss/printing/base/spoolsv/notifications.c +++ b/win32ss/printing/base/spoolsv/notifications.c @@ -8,21 +8,21 @@ #include "precomp.h" DWORD -_RpcClientFindFirstPrinterChangeNotification() +_RpcClientFindFirstPrinterChangeNotification(VOID) { UNIMPLEMENTED; return ERROR_INVALID_FUNCTION; } DWORD -_RpcFindClosePrinterChangeNotification() +_RpcFindClosePrinterChangeNotification(VOID) { UNIMPLEMENTED; return ERROR_INVALID_FUNCTION; } DWORD -_RpcFindNextPrinterChangeNotification() +_RpcFindNextPrinterChangeNotification(VOID) { UNIMPLEMENTED; return ERROR_INVALID_FUNCTION; @@ -57,7 +57,7 @@ _RpcReplyOpenPrinter(WINSPOOL_HANDLE pMachine, WINSPOOL_PRINTER_HANDLE* phPrinte } DWORD -_RpcRouterFindFirstPrinterChangeNotificationOld() +_RpcRouterFindFirstPrinterChangeNotificationOld(VOID) { UNIMPLEMENTED; return ERROR_INVALID_FUNCTION; diff --git a/win32ss/printing/base/spoolsv/printers.c b/win32ss/printing/base/spoolsv/printers.c index 49236e51dc..881eec87d4 100644 --- a/win32ss/printing/base/spoolsv/printers.c +++ b/win32ss/printing/base/spoolsv/printers.c @@ -332,14 +332,14 @@ _RpcResetPrinter(WINSPOOL_PRINTER_HANDLE hPrinter, WCHAR* pDatatype, WINSPOOL_DE } DWORD -_RpcResetPrinterEx() +_RpcResetPrinterEx(VOID) { UNIMPLEMENTED; return ERROR_INVALID_FUNCTION; } DWORD -_RpcSeekPrinter() +_RpcSeekPrinter(VOID) { UNIMPLEMENTED; return ERROR_INVALID_FUNCTION; diff --git a/win32ss/printing/base/spoolsv/rpcstubs.c b/win32ss/printing/base/spoolsv/rpcstubs.c index 56b3a1a3b4..41088b6c01 100644 --- a/win32ss/printing/base/spoolsv/rpcstubs.c +++ b/win32ss/printing/base/spoolsv/rpcstubs.c @@ -50,28 +50,28 @@ _RpcPrinterMessageBox(WINSPOOL_PRINTER_HANDLE hPrinter, DWORD Error, ULONG_PTR h } DWORD -_RpcSetAllocFailCount() +_RpcSetAllocFailCount(VOID) { UNIMPLEMENTED; return ERROR_INVALID_FUNCTION; } DWORD -_RpcClusterSplOpen() +_RpcClusterSplOpen(VOID) { UNIMPLEMENTED; return ERROR_INVALID_FUNCTION; } DWORD -_RpcClusterSplClose() +_RpcClusterSplClose(VOID) { UNIMPLEMENTED; return ERROR_INVALID_FUNCTION; } DWORD -_RpcClusterSplIsAlive() +_RpcClusterSplIsAlive(VOID) { UNIMPLEMENTED; return ERROR_INVALID_FUNCTION; @@ -99,28 +99,28 @@ _RpcEnumPerMachineConnections(WINSPOOL_HANDLE pServer, BYTE* pPrinterEnum, DWORD } DWORD -_RpcSplOpenPrinter() +_RpcSplOpenPrinter(VOID) { UNIMPLEMENTED; return ERROR_INVALID_FUNCTION; } DWORD -_RpcGetSpoolFileInfo() +_RpcGetSpoolFileInfo(VOID) { UNIMPLEMENTED; return ERROR_INVALID_FUNCTION; } DWORD -_RpcCommitSpoolData() +_RpcCommitSpoolData(VOID) { UNIMPLEMENTED; return ERROR_INVALID_FUNCTION; } DWORD -_RpcCloseSpoolFileHandle() +_RpcCloseSpoolFileHandle(VOID) { UNIMPLEMENTED; return ERROR_INVALID_FUNCTION; @@ -134,7 +134,7 @@ _RpcSendRecvBidiData(WINSPOOL_PRINTER_HANDLE hPrinter, const WCHAR* pAction, WIN } DWORD -_RpcAddDriverCatalog() +_RpcAddDriverCatalog(VOID) { UNIMPLEMENTED; return ERROR_INVALID_FUNCTION;

7 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2017