Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [SHELL32] Fix glitch in de-DE.rc
by Joachim Henze 14 Feb '18

14 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e4aa45f63a31df3f954b8… commit e4aa45f63a31df3f954b89d83f44f6bcfbf16c99 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Feb 14 20:12:10 2018 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Feb 14 20:12:10 2018 +0100 [SHELL32] Fix glitch in de-DE.rc checkbox captions are too long. issue was introduced by 3624c5d6fd2cf1c589c26f75ac2d6054f7a838a0 fixes CORE-14329 for de-DE --- dll/win32/shell32/lang/de-DE.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 099947a4ff..ef31156bc1 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -228,9 +228,9 @@ BEGIN EDITTEXT 14015, 58, 128, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 144, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Attribute:", 14020, 8, 152, 46, 10 - AUTOCHECKBOX "&Schreibgeschützt", 14021, 58, 151, 70, 10 - AUTOCHECKBOX "&Versteckt", 14022, 126, 151, 70, 10 - AUTOCHECKBOX "&Archiv", 14023, 181, 151, 70, 10 + AUTOCHECKBOX "&Schreibgeschützt", 14021, 58, 151, 65, 10 + AUTOCHECKBOX "&Versteckt", 14022, 126, 151, 50, 10 + AUTOCHECKBOX "&Archiv", 14023, 181, 151, 50, 10 PUSHBUTTON "Er&weitert...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END

1 0

01/01: [SHELL32] CDefViewBckgrndMenu: Fix handling string verbs. It shouldn't be necessary for QueryContextMenu to be called before InvokeCommand. Move retrieving the IContextMenu of the folder to the initialization of the class. CORE-12866
by Giannis Adamopoulos 13 Feb '18

13 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=111c40e012dc07e7f829b… commit 111c40e012dc07e7f829bc314615f4e37d86e6d0 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Wed Feb 14 00:03:35 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Wed Feb 14 00:03:35 2018 +0200 [SHELL32] CDefViewBckgrndMenu: Fix handling string verbs. It shouldn't be necessary for QueryContextMenu to be called before InvokeCommand. Move retrieving the IContextMenu of the folder to the initialization of the class. CORE-12866 --- dll/win32/shell32/CDefViewBckgrndMenu.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dll/win32/shell32/CDefViewBckgrndMenu.cpp b/dll/win32/shell32/CDefViewBckgrndMenu.cpp index 2fc6f1ac02..3815019894 100644 --- a/dll/win32/shell32/CDefViewBckgrndMenu.cpp +++ b/dll/win32/shell32/CDefViewBckgrndMenu.cpp @@ -113,6 +113,11 @@ HRESULT CDefViewBckgrndMenu::Initialize(IShellFolder* psf) { m_psf = psf; + + /* Get the context menu of the folder. Do it here because someone may call + InvokeCommand without calling QueryContextMenu. It is fine if this fails */ + m_psf->CreateViewObject(NULL, IID_PPV_ARG(IContextMenu, &m_folderCM)); + return S_OK; } @@ -154,9 +159,8 @@ CDefViewBckgrndMenu::QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFir but as stated above, its sole user is CDefView and should really be that way. */ m_idCmdFirst = idCmdFirst; - /* Query the shell folder to add any items it wants to add in the background context menu */ - hr = m_psf->CreateViewObject(NULL, IID_PPV_ARG(IContextMenu, &m_folderCM)); - if (SUCCEEDED(hr)) + /* Let the shell folder add any items it wants to add in the background context menu */ + if (m_folderCM) { hr = m_folderCM->QueryContextMenu(hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); if (SUCCEEDED(hr))

1 0

01/01: [SHLWAPI] Import wine commit 2c163225730e88 as addendum to the SHCreateWorkerWindowW/A fixes from commit 770bf93.
by Hermès Bélusca-Maïto 13 Feb '18

13 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eb3987e172fe1d3627a39… commit eb3987e172fe1d3627a391cd7fcb768a8a337f3c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Feb 13 22:05:13 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Feb 13 22:30:59 2018 +0100 [SHLWAPI] Import wine commit 2c163225730e88 as addendum to the SHCreateWorkerWindowW/A fixes from commit 770bf93. --- dll/win32/shlwapi/ordinal.c | 37 ++----------------------------------- 1 file changed, 2 insertions(+), 35 deletions(-) diff --git a/dll/win32/shlwapi/ordinal.c b/dll/win32/shlwapi/ordinal.c index d81adbbf0b..61e8804d50 100644 --- a/dll/win32/shlwapi/ordinal.c +++ b/dll/win32/shlwapi/ordinal.c @@ -2555,19 +2555,14 @@ HRESULT WINAPI IUnknown_GetSite(LPUNKNOWN lpUnknown, REFIID iid, PVOID *lppSite) * Success: The window handle of the newly created window. * Failure: 0. */ -#ifndef __REACTOS__ -HWND WINAPI SHCreateWorkerWindowA(LONG wndProc, HWND hWndParent, DWORD dwExStyle, - DWORD dwStyle, HMENU hMenu, LONG_PTR wnd_extra) -#else HWND WINAPI SHCreateWorkerWindowA(WNDPROC wndProc, HWND hWndParent, DWORD dwExStyle, DWORD dwStyle, HMENU hMenu, LONG_PTR wnd_extra) -#endif { static const char szClass[] = "WorkerA"; WNDCLASSA wc; HWND hWnd; - TRACE("(0x%08x, %p, 0x%08x, 0x%08x, %p, 0x%08lx)\n", + TRACE("(%p, %p, 0x%08x, 0x%08x, %p, 0x%08lx)\n", wndProc, hWndParent, dwExStyle, dwStyle, hMenu, wnd_extra); /* Create Window class */ @@ -2589,12 +2584,7 @@ HWND WINAPI SHCreateWorkerWindowA(WNDPROC wndProc, HWND hWndParent, DWORD dwExSt if (hWnd) { SetWindowLongPtrW(hWnd, 0, wnd_extra); -#ifndef __REACTOS__ - - if (wndProc) SetWindowLongPtrA(hWnd, GWLP_WNDPROC, wndProc); -#else if (wndProc) SetWindowLongPtrA(hWnd, GWLP_WNDPROC, (LONG_PTR)wndProc); -#endif } return hWnd; @@ -2853,45 +2843,28 @@ DWORD WINAPI WhichPlatform(void) * * Unicode version of SHCreateWorkerWindowA. */ -#ifndef __REACTOS__ -HWND WINAPI SHCreateWorkerWindowW(LONG wndProc, HWND hWndParent, DWORD dwExStyle, - DWORD dwStyle, HMENU hMenu, LONG msg_result) -#else HWND WINAPI SHCreateWorkerWindowW(WNDPROC wndProc, HWND hWndParent, DWORD dwExStyle, DWORD dwStyle, HMENU hMenu, LONG_PTR wnd_extra) -#endif { static const WCHAR szClass[] = { 'W', 'o', 'r', 'k', 'e', 'r', 'W', 0 }; WNDCLASSW wc; HWND hWnd; - TRACE("(0x%08x, %p, 0x%08x, 0x%08x, %p, 0x%08x)\n", -#ifndef __REACTOS__ - wndProc, hWndParent, dwExStyle, dwStyle, hMenu, msg_result); -#else + TRACE("(%p, %p, 0x%08x, 0x%08x, %p, 0x%08lx)\n", wndProc, hWndParent, dwExStyle, dwStyle, hMenu, wnd_extra); -#endif /* If our OS is natively ANSI, use the ANSI version */ if (GetVersion() & 0x80000000) /* not NT */ { TRACE("fallback to ANSI, ver 0x%08x\n", GetVersion()); -#ifndef __REACTOS__ - return SHCreateWorkerWindowA(wndProc, hWndParent, dwExStyle, dwStyle, hMenu, msg_result); -#else return SHCreateWorkerWindowA(wndProc, hWndParent, dwExStyle, dwStyle, hMenu, wnd_extra); -#endif } /* Create Window class */ wc.style = 0; wc.lpfnWndProc = DefWindowProcW; wc.cbClsExtra = 0; -#ifndef __REACTOS__ - wc.cbWndExtra = 4; -#else wc.cbWndExtra = sizeof(LONG_PTR); -#endif wc.hInstance = shlwapi_hInstance; wc.hIcon = NULL; wc.hCursor = LoadCursorW(NULL, (LPWSTR)IDC_ARROW); @@ -2905,14 +2878,8 @@ HWND WINAPI SHCreateWorkerWindowW(WNDPROC wndProc, HWND hWndParent, DWORD dwExSt hWndParent, hMenu, shlwapi_hInstance, 0); if (hWnd) { -#ifndef __REACTOS__ - SetWindowLongPtrW(hWnd, DWLP_MSGRESULT, msg_result); - - if (wndProc) SetWindowLongPtrW(hWnd, GWLP_WNDPROC, wndProc); -#else SetWindowLongPtrW(hWnd, 0, wnd_extra); if (wndProc) SetWindowLongPtrW(hWnd, GWLP_WNDPROC, (LONG_PTR)wndProc); -#endif } return hWnd;

1 0

01/01: [TRANSLATION][INF] Update Simplified Chinese translation. (#378)
by Luo Yufan 13 Feb '18

13 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=37b9ca3fe3d613b78f9e2… commit 37b9ca3fe3d613b78f9e2d87a66f5e1b7ce4c4e5 Author: Luo Yufan <njlyf2011(a)hotmail.com> AuthorDate: Wed Feb 14 05:16:25 2018 +0800 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Feb 13 22:16:25 2018 +0100 [TRANSLATION][INF] Update Simplified Chinese translation. (#378) --- media/inf/shortcuts.inf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/media/inf/shortcuts.inf b/media/inf/shortcuts.inf index 662a618d25..c9d4c181a3 100644 --- a/media/inf/shortcuts.inf +++ b/media/inf/shortcuts.inf @@ -1462,6 +1462,9 @@ ENTERTAINMENT=娱乐 COMMUNICATIONS=通讯 GAMES=游戏 +README_TITLE=请先读我 +README_DESC=ReactOS 自述文件 + CMD_TITLE=命令提示符 CMD_DESC=命令提示符 EXPLORER_TITLE=ReactOS 资源管理器

1 0

01/01: [COMCTL32] Import wine commit 71cf0a31d99feb to fix the name column width in rapps.
by Mark Jansen 13 Feb '18

13 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb7caa745240b523f6e82… commit fb7caa745240b523f6e826b60b2c735558f6bd68 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Feb 13 19:47:58 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Feb 13 19:48:18 2018 +0100 [COMCTL32] Import wine commit 71cf0a31d99feb to fix the name column width in rapps. --- dll/win32/comctl32/listview.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dll/win32/comctl32/listview.c b/dll/win32/comctl32/listview.c index 00c6ba2ad7..94b1fc28b1 100644 --- a/dll/win32/comctl32/listview.c +++ b/dll/win32/comctl32/listview.c @@ -8415,6 +8415,8 @@ static BOOL LISTVIEW_SetColumnWidth(LISTVIEW_INFO *infoPtr, INT nColumn, INT cx) if (infoPtr->himlSmall && (nColumn == 0 || (LISTVIEW_GetColumnInfo(infoPtr, nColumn)->fmt & LVCFMT_IMAGE))) max_cx += infoPtr->iconSize.cx; max_cx += TRAILING_LABEL_PADDING; + if (nColumn == 0 && (infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES)) + max_cx += GetSystemMetrics(SM_CXSMICON); } /* autosize based on listview items width */

1 0

01/01: [SHLWAPI] Improvements for SHCreateWorkerWindowW/A() prototypes + fix x64-bit compatibility. Sent upstream.
by Hermès Bélusca-Maïto 12 Feb '18

12 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=770bf93be372cfc78342e… commit 770bf93be372cfc78342e7bbf11fb2e251ae591d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Feb 13 00:10:09 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Feb 13 00:13:47 2018 +0100 [SHLWAPI] Improvements for SHCreateWorkerWindowW/A() prototypes + fix x64-bit compatibility. Sent upstream. [SHLWAPI] Refactor the SHCreateWorkerWindowW() prototype to match its ANSI SHCreateWorkerWindowA() counterpart. The last parameter is really to be understood as an extra window data, and not a "message result" (as it would be the case for dialog window procedure). That is why I also remove the mention of "DWLP_MSGRESULT" in the SetWindowLongPtrW() call. SHCreateWorkerWindowA() had it OK but SHCreateWorkerWindowW() did not. ------------------ [SHLWAPI] Make SHCreateWorkerWindowA() and SHCreateWorkerWindowW() x64-compatible. The first parameter of these functions is a pointer to a window procedure, having a definite prototype, so employ a correct typedef WNDPROC, which ensures both correct pointer size and parameter type enforcement. This also ensures that we use instead a correct pointer size, since otherwise LONG remains 32-bits for Windows compatibility on x64 platforms. The wndProc parameter is thus casted to LONG_PTR to comply with the SetWindowLongPtrA/W calls. In SHCreateWorkerWindowW(), the last "wnd_extra" parameter should also be LONG_PTR to be able to pass 64-bit data pointer on x64 platforms. Therefore fix also setting the wc.cbWndExtra size. One should note that the ANSI SHCreateWorkerWindowA() function had everything OK already. --- dll/win32/shlwapi/ordinal.c | 31 +++++++++++++++++++++++++++++++ dll/win32/shlwapi/shlwapi.spec | 4 ++-- sdk/include/reactos/shlwapi_undoc.h | 8 ++++---- 3 files changed, 37 insertions(+), 6 deletions(-) diff --git a/dll/win32/shlwapi/ordinal.c b/dll/win32/shlwapi/ordinal.c index b2543d4154..d81adbbf0b 100644 --- a/dll/win32/shlwapi/ordinal.c +++ b/dll/win32/shlwapi/ordinal.c @@ -2555,8 +2555,13 @@ HRESULT WINAPI IUnknown_GetSite(LPUNKNOWN lpUnknown, REFIID iid, PVOID *lppSite) * Success: The window handle of the newly created window. * Failure: 0. */ +#ifndef __REACTOS__ HWND WINAPI SHCreateWorkerWindowA(LONG wndProc, HWND hWndParent, DWORD dwExStyle, DWORD dwStyle, HMENU hMenu, LONG_PTR wnd_extra) +#else +HWND WINAPI SHCreateWorkerWindowA(WNDPROC wndProc, HWND hWndParent, DWORD dwExStyle, + DWORD dwStyle, HMENU hMenu, LONG_PTR wnd_extra) +#endif { static const char szClass[] = "WorkerA"; WNDCLASSA wc; @@ -2584,8 +2589,12 @@ HWND WINAPI SHCreateWorkerWindowA(LONG wndProc, HWND hWndParent, DWORD dwExStyle if (hWnd) { SetWindowLongPtrW(hWnd, 0, wnd_extra); +#ifndef __REACTOS__ if (wndProc) SetWindowLongPtrA(hWnd, GWLP_WNDPROC, wndProc); +#else + if (wndProc) SetWindowLongPtrA(hWnd, GWLP_WNDPROC, (LONG_PTR)wndProc); +#endif } return hWnd; @@ -2844,28 +2853,45 @@ DWORD WINAPI WhichPlatform(void) * * Unicode version of SHCreateWorkerWindowA. */ +#ifndef __REACTOS__ HWND WINAPI SHCreateWorkerWindowW(LONG wndProc, HWND hWndParent, DWORD dwExStyle, DWORD dwStyle, HMENU hMenu, LONG msg_result) +#else +HWND WINAPI SHCreateWorkerWindowW(WNDPROC wndProc, HWND hWndParent, DWORD dwExStyle, + DWORD dwStyle, HMENU hMenu, LONG_PTR wnd_extra) +#endif { static const WCHAR szClass[] = { 'W', 'o', 'r', 'k', 'e', 'r', 'W', 0 }; WNDCLASSW wc; HWND hWnd; TRACE("(0x%08x, %p, 0x%08x, 0x%08x, %p, 0x%08x)\n", +#ifndef __REACTOS__ wndProc, hWndParent, dwExStyle, dwStyle, hMenu, msg_result); +#else + wndProc, hWndParent, dwExStyle, dwStyle, hMenu, wnd_extra); +#endif /* If our OS is natively ANSI, use the ANSI version */ if (GetVersion() & 0x80000000) /* not NT */ { TRACE("fallback to ANSI, ver 0x%08x\n", GetVersion()); +#ifndef __REACTOS__ return SHCreateWorkerWindowA(wndProc, hWndParent, dwExStyle, dwStyle, hMenu, msg_result); +#else + return SHCreateWorkerWindowA(wndProc, hWndParent, dwExStyle, dwStyle, hMenu, wnd_extra); +#endif } /* Create Window class */ wc.style = 0; wc.lpfnWndProc = DefWindowProcW; wc.cbClsExtra = 0; +#ifndef __REACTOS__ wc.cbWndExtra = 4; +#else + wc.cbWndExtra = sizeof(LONG_PTR); +#endif wc.hInstance = shlwapi_hInstance; wc.hIcon = NULL; wc.hCursor = LoadCursorW(NULL, (LPWSTR)IDC_ARROW); @@ -2879,9 +2905,14 @@ HWND WINAPI SHCreateWorkerWindowW(LONG wndProc, HWND hWndParent, DWORD dwExStyle hWndParent, hMenu, shlwapi_hInstance, 0); if (hWnd) { +#ifndef __REACTOS__ SetWindowLongPtrW(hWnd, DWLP_MSGRESULT, msg_result); if (wndProc) SetWindowLongPtrW(hWnd, GWLP_WNDPROC, wndProc); +#else + SetWindowLongPtrW(hWnd, 0, wnd_extra); + if (wndProc) SetWindowLongPtrW(hWnd, GWLP_WNDPROC, (LONG_PTR)wndProc); +#endif } return hWnd; diff --git a/dll/win32/shlwapi/shlwapi.spec b/dll/win32/shlwapi/shlwapi.spec index e49c87e1c1..b70601775d 100644 --- a/dll/win32/shlwapi/shlwapi.spec +++ b/dll/win32/shlwapi/shlwapi.spec @@ -254,7 +254,7 @@ 254 stub -noname StopWatchExW 255 stub -noname EventTraceHandler 256 stdcall -noname IUnknown_GetSite(ptr ptr ptr) -257 stdcall -noname SHCreateWorkerWindowA(long ptr long long ptr long) +257 stdcall -noname SHCreateWorkerWindowA(ptr ptr long long ptr long) 258 stub -noname SHRegisterWaitForSingleObject 259 stub -noname SHUnregisterWait 260 stdcall -noname SHQueueUserWorkItem(long long long long long long long) @@ -275,7 +275,7 @@ 275 stub -noname RegisterGlobalHotkeyA 276 stdcall -noname WhichPlatform() 277 stub -noname SHDialogBox -278 stdcall -noname SHCreateWorkerWindowW(long long long long long long) +278 stdcall -noname SHCreateWorkerWindowW(ptr ptr long long ptr long) 279 stdcall -noname SHInvokeDefaultCommand(ptr ptr ptr) 280 stdcall -noname SHRegGetIntW(ptr wstr long) 281 stdcall -noname SHPackDispParamsV(ptr ptr long ptr) diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index 3fb4b21f91..27000e3bdd 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -92,11 +92,11 @@ HRESULT WINAPI SHGetPerScreenResName(OUT LPWSTR lpResName, HRESULT WINAPI SHPropertyBag_ReadStream(IPropertyBag*,LPCWSTR,IStream**); -HWND WINAPI SHCreateWorkerWindowA(LONG wndProc, HWND hWndParent, DWORD dwExStyle, - DWORD dwStyle, HMENU hMenu, LONG z); +HWND WINAPI SHCreateWorkerWindowA(WNDPROC wndProc, HWND hWndParent, DWORD dwExStyle, + DWORD dwStyle, HMENU hMenu, LONG_PTR wnd_extra); -HWND WINAPI SHCreateWorkerWindowW(LONG wndProc, HWND hWndParent, DWORD dwExStyle, - DWORD dwStyle, HMENU hMenu, LONG z); +HWND WINAPI SHCreateWorkerWindowW(WNDPROC wndProc, HWND hWndParent, DWORD dwExStyle, + DWORD dwStyle, HMENU hMenu, LONG_PTR wnd_extra); #ifdef UNICODE #define SHCreateWorkerWindow SHCreateWorkerWindowW #else

1 0

01/01: [CDFS_NEW] Fix a bug in Microsoft CDFS implementation where the top level IRP is set before locking is actually attempted for Cc worker thread (lazy write/read ahead). So in case locking fails, the top level IRP is set and never unset, and latter call will hit the assert where it expects the top level IRP to be NULL.
by Pierre Schweitzer 12 Feb '18

12 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5e89014dc943b2cbddb1… commit a5e89014dc943b2cbddb16fc4d92e13b7e5068e1 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Feb 12 20:45:12 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Feb 12 20:47:32 2018 +0100 [CDFS_NEW] Fix a bug in Microsoft CDFS implementation where the top level IRP is set before locking is actually attempted for Cc worker thread (lazy write/read ahead). So in case locking fails, the top level IRP is set and never unset, and latter call will hit the assert where it expects the top level IRP to be NULL. Should be reported upstream (tm). CORE-14315 --- drivers/filesystems/cdfs_new/resrcsup.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/filesystems/cdfs_new/resrcsup.c b/drivers/filesystems/cdfs_new/resrcsup.c index c9eaa7be26..3bb38bb529 100755 --- a/drivers/filesystems/cdfs_new/resrcsup.c +++ b/drivers/filesystems/cdfs_new/resrcsup.c @@ -164,10 +164,20 @@ Return Value: { PAGED_CODE(); +#ifdef __REACTOS__ + if (!ExAcquireResourceSharedLite( Fcb->Resource, Wait )) { + return FALSE; + } +#endif + NT_ASSERT(IoGetTopLevelIrp() == NULL); IoSetTopLevelIrp((PIRP)FSRTL_CACHE_TOP_LEVEL_IRP); +#ifndef __REACTOS__ return ExAcquireResourceSharedLite( Fcb->Resource, Wait ); +#else + return TRUE; +#endif }

1 0

01/01: [SERVICES] Set a complete service status for running boot start or system start drivers
by Eric Kohl 12 Feb '18

12 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c9cdd84bb43439dfdad0… commit 6c9cdd84bb43439dfdad0c7abc804fac7928bcde Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Feb 12 15:50:30 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Feb 12 15:50:30 2018 +0100 [SERVICES] Set a complete service status for running boot start or system start drivers --- base/system/services/database.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/base/system/services/database.c b/base/system/services/database.c index b450fe486d..d31d353a87 100644 --- a/base/system/services/database.c +++ b/base/system/services/database.c @@ -1040,6 +1040,11 @@ ScmCheckDriver(PSERVICE Service) /* Mark service as 'running' */ Service->Status.dwCurrentState = SERVICE_RUNNING; + Service->Status.dwControlsAccepted = SERVICE_ACCEPT_STOP; + Service->Status.dwWin32ExitCode = ERROR_SUCCESS; + Service->Status.dwServiceSpecificExitCode = 0; + Service->Status.dwCheckPoint = 0; + Service->Status.dwWaitHint = 0; /* Mark the service group as 'running' */ if (Service->lpGroup != NULL)

1 0

01/01: [SERVICES] Fix the initial service status
by Eric Kohl 12 Feb '18

12 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e917471e0457e949800f4… commit e917471e0457e949800f4246a6465b4fa735af48 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Feb 12 14:58:02 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Feb 12 14:58:02 2018 +0100 [SERVICES] Fix the initial service status - The initial dwWin32ExitCode for a disabled service is ERROR_SERVICE_DISABLED and ERROR_SRVICE_NEVER_STARTED for non-disabled services. - The initial dwWaitHint is 2000 (2 seconds) for (user-mode) services and 0 for drivers. - Move all driver-related code to driver.c. --- base/system/services/database.c | 29 ++++++++++++++++------------- base/system/services/driver.c | 27 +++++++++++++++++++++++++-- base/system/services/rpcserver.c | 6 +++--- base/system/services/services.h | 7 ++++--- 4 files changed, 48 insertions(+), 21 deletions(-) diff --git a/base/system/services/database.c b/base/system/services/database.c index 19c4e05724..b450fe486d 100644 --- a/base/system/services/database.c +++ b/base/system/services/database.c @@ -559,7 +559,9 @@ ScmGetServiceEntryByResumeCount(DWORD dwResumeCount) DWORD ScmCreateNewServiceRecord(LPCWSTR lpServiceName, - PSERVICE* lpServiceRecord) + PSERVICE *lpServiceRecord, + DWORD dwServiceType, + DWORD dwStartType) { PSERVICE lpService = NULL; @@ -579,6 +581,9 @@ ScmCreateNewServiceRecord(LPCWSTR lpServiceName, lpService->lpServiceName = lpService->szServiceName; lpService->lpDisplayName = lpService->lpServiceName; + /* Set the start type */ + lpService->dwStartType = dwStartType; + /* Set the resume count */ lpService->dwResumeCount = ResumeCount++; @@ -587,12 +592,15 @@ ScmCreateNewServiceRecord(LPCWSTR lpServiceName, &lpService->ServiceListEntry); /* Initialize the service status */ + lpService->Status.dwServiceType = dwServiceType; lpService->Status.dwCurrentState = SERVICE_STOPPED; lpService->Status.dwControlsAccepted = 0; - lpService->Status.dwWin32ExitCode = ERROR_SERVICE_NEVER_STARTED; + lpService->Status.dwWin32ExitCode = + (dwStartType == SERVICE_DISABLED) ? ERROR_SERVICE_DISABLED : ERROR_SERVICE_NEVER_STARTED; lpService->Status.dwServiceSpecificExitCode = 0; lpService->Status.dwCheckPoint = 0; - lpService->Status.dwWaitHint = 2000; /* 2 seconds */ + lpService->Status.dwWaitHint = + (dwServiceType & SERVICE_DRIVER) ? 0 : 2000; /* 2 seconds */ return ERROR_SUCCESS; } @@ -719,12 +727,12 @@ CreateServiceListEntry(LPCWSTR lpServiceName, DPRINT("Display name: %S\n", lpDisplayName); dwError = ScmCreateNewServiceRecord(lpServiceName, - &lpService); + &lpService, + dwServiceType, + dwStartType); if (dwError != ERROR_SUCCESS) goto done; - lpService->Status.dwServiceType = dwServiceType; - lpService->dwStartType = dwStartType; lpService->dwErrorControl = dwErrorControl; lpService->dwTag = dwTagId; @@ -1801,13 +1809,8 @@ ScmLoadService(PSERVICE Service, if (Service->Status.dwServiceType & SERVICE_DRIVER) { - /* Load driver */ - dwError = ScmLoadDriver(Service); - if (dwError == ERROR_SUCCESS) - { - Service->Status.dwCurrentState = SERVICE_RUNNING; - Service->Status.dwControlsAccepted = SERVICE_ACCEPT_STOP; - } + /* Start the driver */ + dwError = ScmStartDriver(Service); } else // if (Service->Status.dwServiceType & (SERVICE_WIN32 | SERVICE_INTERACTIVE_PROCESS)) { diff --git a/base/system/services/driver.c b/base/system/services/driver.c index de8bfc1aa3..819183e5c0 100644 --- a/base/system/services/driver.c +++ b/base/system/services/driver.c @@ -19,6 +19,7 @@ /* FUNCTIONS ****************************************************************/ +static DWORD ScmLoadDriver(PSERVICE lpService) { @@ -70,7 +71,7 @@ done: return RtlNtStatusToDosError(Status); } - +static DWORD ScmUnloadDriver(PSERVICE lpService) { @@ -123,6 +124,7 @@ done: } +static DWORD ScmGetDriverStatus(PSERVICE lpService, LPSERVICE_STATUS lpServiceStatus) @@ -285,6 +287,27 @@ ScmGetDriverStatus(PSERVICE lpService, } +DWORD +ScmStartDriver(PSERVICE pService) +{ + DWORD dwError; + + DPRINT("ScmStartDriver(%p)\n", pService); + + dwError = ScmLoadDriver(pService); + if (dwError == ERROR_SUCCESS) + { + pService->Status.dwCurrentState = SERVICE_RUNNING; + pService->Status.dwControlsAccepted = SERVICE_ACCEPT_STOP; + pService->Status.dwWin32ExitCode = ERROR_SUCCESS; + } + + DPRINT("ScmStartDriver returns %lu\n", dwError); + + return dwError; +} + + DWORD ScmControlDriver(PSERVICE lpService, DWORD dwControl, @@ -328,7 +351,7 @@ ScmControlDriver(PSERVICE lpService, dwError = ERROR_INVALID_SERVICE_CONTROL; } -done:; +done: DPRINT("ScmControlDriver() done (Erorr: %lu)\n", dwError); return dwError; diff --git a/base/system/services/rpcserver.c b/base/system/services/rpcserver.c index f1ce146a92..a4718aa15f 100644 --- a/base/system/services/rpcserver.c +++ b/base/system/services/rpcserver.c @@ -2279,13 +2279,13 @@ RCreateServiceW( /* Allocate a new service entry */ dwError = ScmCreateNewServiceRecord(lpServiceName, - &lpService); + &lpService, + dwServiceType, + dwStartType); if (dwError != ERROR_SUCCESS) goto done; /* Fill the new service entry */ - lpService->Status.dwServiceType = dwServiceType; - lpService->dwStartType = dwStartType; lpService->dwErrorControl = dwErrorControl; /* Fill the display name */ diff --git a/base/system/services/services.h b/base/system/services/services.h index 1d20f120d1..0f03849967 100644 --- a/base/system/services/services.h +++ b/base/system/services/services.h @@ -168,7 +168,9 @@ PSERVICE ScmGetServiceEntryByName(LPCWSTR lpServiceName); PSERVICE ScmGetServiceEntryByDisplayName(LPCWSTR lpDisplayName); PSERVICE ScmGetServiceEntryByResumeCount(DWORD dwResumeCount); DWORD ScmCreateNewServiceRecord(LPCWSTR lpServiceName, - PSERVICE *lpServiceRecord); + PSERVICE *lpServiceRecord, + DWORD dwServiceType, + DWORD dwStartType); VOID ScmDeleteServiceRecord(PSERVICE lpService); DWORD ScmMarkServiceForDelete(PSERVICE pService); @@ -185,8 +187,7 @@ VOID ScmDeleteNamedPipeCriticalSection(VOID); /* driver.c */ -DWORD ScmLoadDriver(PSERVICE lpService); -DWORD ScmUnloadDriver(PSERVICE lpService); +DWORD ScmStartDriver(PSERVICE lpService); DWORD ScmControlDriver(PSERVICE lpService, DWORD dwControl, LPSERVICE_STATUS lpServiceStatus);

1 0

01/01: [APPSHIM_APITEST] Fix 2 Clang-Cl warnings about ok2
by Serge Gautherie 12 Feb '18

12 Feb '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=12b0dfb71ec0578acff8c… commit 12b0dfb71ec0578acff8cebc3cfc61c4d154f85f Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sun Feb 11 23:15:06 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Feb 12 12:34:20 2018 +0100 [APPSHIM_APITEST] Fix 2 Clang-Cl warnings about ok2 "warning: expression result unused [-Wunused-value]" CORE-14306 --- modules/rostests/apitests/appshim/versionlie.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/appshim/versionlie.c b/modules/rostests/apitests/appshim/versionlie.c index aaac992c1e..5848f98aaf 100644 --- a/modules/rostests/apitests/appshim/versionlie.c +++ b/modules/rostests/apitests/appshim/versionlie.c @@ -62,7 +62,7 @@ static void verify_shima_imp(PHOOKAPI hook, const VersionLieInfo* info, PCSTR sh while (v1.dwOSVersionInfoSize) { - ok1 = GetVersionExA((LPOSVERSIONINFOA)&v1), ok2; + ok1 = GetVersionExA((LPOSVERSIONINFOA)&v1); hook->OriginalFunction = GetVersionExA; ok2 = ((GETVERSIONEXAPROC)hook->ReplacementFunction)(&v2); @@ -127,7 +127,7 @@ static void verify_shimw_imp(PHOOKAPI hook, const VersionLieInfo* info, PCSTR sh while (v1.dwOSVersionInfoSize) { - ok1 = GetVersionExW((LPOSVERSIONINFOW)&v1), ok2; + ok1 = GetVersionExW((LPOSVERSIONINFOW)&v1); hook->OriginalFunction = GetVersionExW; ok2 = ((GETVERSIONEXWPROC)hook->ReplacementFunction)(&v2);

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