[ros-diffs] [ashaposhnikov] 74920: [RAPPS] * Added constants in resource.h for stringtables * Removed "Installed apps" from the TreeView * Added intallation status to the RichEdit using existing check
Author: ashaposhnikov
Date: Sun Jun 4 21:36:14 2017
New Revision: 74920
URL: http://svn.reactos.org/svn/reactos?rev=74920=rev
Log:
[RAPPS]
* Added constants in resource.h for stringtables
* Removed "Installed apps" from the TreeView
* Added intallation status to the RichEdit using existing check
* Changed IsInstalledApplication signature to accept access righta
This is needed for the 64 bit systems.
Modified:
branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp
branches/GSoC_2017/rapps/reactos/base/applications/rapps/crichedit.h
branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp
branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp
branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h
branches/GSoC_2017/rapps/reactos/base/applications/rapps/resource.h
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp?rev=74920=74919=74920=diff
==
--- branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp
[iso-8859-1] (original)
+++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp
[iso-8859-1] Sun Jun 4 21:36:14 2017
@@ -17,6 +17,12 @@
InsertRichEditText(b, d); \
} \
+#define ADD_TEXT_NEWL(a, b) \
+ LoadStringW(hInst, a, szText, _countof(szText)); \
+ InsertRichEditText(L"\n", 0); \
+ InsertRichEditText(szText, b); \
+ InsertRichEditText(L"\n", 0);
+
#define GET_STRING1(a, b) \
if (!ParserGetString(a, b, _countof(b), FindFileData.cFileName)) \
continue;
@@ -25,6 +31,16 @@
if (!ParserGetString(a, b, _countof(b), FindFileData.cFileName)) \
b[0] = '\0';
+//App is "installed" if the RegName is in the registry
+#define APP_INSTALL_CHECK_K(Info, key) \
+ (*Info->szRegName && (IsInstalledApplicationEx(Info->szRegName, FALSE, key) \
+|| IsInstalledApplicationEx(Info->szRegName, TRUE,
key)))
+
+//Check both registry keys in 64bit system
+//TODO: check system type beforehand to avoid double checks?
+#define APP_INSTALL_CHECK(Info) \
+ (APP_INSTALL_CHECK_K(Info, KEY_WOW64_32KEY) || APP_INSTALL_CHECK_K(Info,
KEY_WOW64_64KEY))
+
LIST_ENTRY CachedEntriesHead = { , };
PLIST_ENTRY pCachedEntry =
@@ -37,8 +53,13 @@
if (!Info) return FALSE;
NewRichEditText(Info->szName, CFE_BOLD);
-
-InsertRichEditText(L"\n", 0);
+if (APP_INSTALL_CHECK(Info))
+{
+ ADD_TEXT_NEWL(IDS_STATUS_INSTALLED, CFE_ITALIC);
+} else
+{
+ ADD_TEXT_NEWL(IDS_STATUS_NOTINSTALLED, CFE_ITALIC);
+}
ADD_TEXT(IDS_AINFO_VERSION, Info->szVersion, CFE_BOLD, 0);
ADD_TEXT(IDS_AINFO_LICENSE, Info->szLicense, CFE_BOLD, 0);
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/crichedit.h
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/applications/rapps/crichedit.h?rev=74920=74919=74920=diff
==
--- branches/GSoC_2017/rapps/reactos/base/applications/rapps/crichedit.h
[iso-8859-1] (original)
+++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/crichedit.h
[iso-8859-1] Sun Jun 4 21:36:14 2017
@@ -90,7 +90,6 @@
return m_hWnd;
}
-public:
virtual VOID OnLink(ENLINK *Link)
{
}
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp?rev=74920=74919=74920=diff
==
--- branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp
[iso-8859-1] (original)
+++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp
[iso-8859-1] Sun Jun 4 21:36:14 2017
@@ -372,33 +372,28 @@
VOID InitCategoriesList(VOID)
{
-HTREEITEM hRootItem1, hRootItem2;
-
-hRootItem1 = AddCategory(TVI_ROOT, IDS_INSTALLED, IDI_CATEGORY);
-AddCategory(hRootItem1, IDS_APPLICATIONS, IDI_APPS);
-AddCategory(hRootItem1, IDS_UPDATES, IDI_APPUPD);
-
-hRootItem2 = AddCategory(TVI_ROOT, IDS_AVAILABLEFORINST, IDI_CATEGORY);
-AddCategory(hRootItem2, IDS_CAT_AUDIO, IDI_CAT_AUDIO);
-AddCategory(hRootItem2, IDS_CAT_VIDEO, IDI_CAT_VIDEO);
-AddCategory(hRootItem2, IDS_CAT_GRAPHICS, IDI_CAT_GRAPHICS);
-AddCategory(hRootItem2, IDS_CAT_GAMES, IDI_CAT_GAMES);
-AddCategory(hRootItem2, IDS_CAT_INTERNET, IDI_CAT_INTERNET);
-AddCategory(hRootItem2, IDS_CAT_OFFICE, IDI_CAT_OFFICE);
-AddCategory(hRootItem2, IDS_CAT_DEVEL, IDI_CAT_DEVEL);
-AddCategory(hRootItem2, IDS_CAT_EDU, IDI_CAT_EDU);
-AddCategory(hRootItem2, IDS_CAT_ENGINEER,
[ros-diffs] [pschweitzer] 74919: [UDFS] Complete the implementation of UDFGetNetworkInformation() so that it sets all the fields. This fixes displaying file size in explorer. CORE-4375 CORE-13366
Author: pschweitzer
Date: Sun Jun 4 19:17:10 2017
New Revision: 74919
URL: http://svn.reactos.org/svn/reactos?rev=74919=rev
Log:
[UDFS]
Complete the implementation of UDFGetNetworkInformation() so that it sets all
the fields.
This fixes displaying file size in explorer.
CORE-4375
CORE-13366
Modified:
trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp
Modified: trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp?rev=74919=74918=74919=diff
==
--- trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp [iso-8859-1] Sun Jun 4
19:17:10 2017
@@ -697,6 +697,7 @@
PtrBuffer->CreationTime = Fcb->NTRequiredFCB->CreationTime;
PtrBuffer->LastAccessTime = Fcb->NTRequiredFCB->LastAccessTime;
PtrBuffer->LastWriteTime = Fcb->NTRequiredFCB->LastWriteTime;
+PtrBuffer->ChangeTime = Fcb->NTRequiredFCB->ChangeTime;
FileInfo = Fcb->FileInfo;
@@ -711,6 +712,13 @@
#ifdef UDF_DBG
if(!FileInfo->Dloc->DirIndex) AdPrint(("*! Directory has
no DirIndex !*\n"));
#endif
+} else {
+if(Fcb->NTRequiredFCB->CommonFCBHeader.AllocationSize.LowPart ==
0x) {
+Fcb->NTRequiredFCB->CommonFCBHeader.AllocationSize.QuadPart =
+UDFSysGetAllocSize(Fcb->Vcb, UDFGetFileSize(FileInfo));
+}
+PtrBuffer->AllocationSize =
Fcb->NTRequiredFCB->CommonFCBHeader.AllocationSize;
+PtrBuffer->EndOfFile =
Fcb->NTRequiredFCB->CommonFCBHeader.FileSize;
}
// Similarly, fill in attributes indicating a hidden file, system
// file, compressed file, temporary file, etc. if the FSD supports
[ros-diffs] [hbelusca] 74918: [i8042prt]: Yet another hack for Dell trackpad, but this time, we inaugurate the Inspiron series with a Dell Inspiron 6000 hack!! x^( Something's fishy in our driver... T
Author: hbelusca
Date: Sun Jun 4 18:24:05 2017
New Revision: 74918
URL: http://svn.reactos.org/svn/reactos?rev=74918=rev
Log:
[i8042prt]: Yet another hack for Dell trackpad, but this time, we inaugurate
the Inspiron series with a Dell Inspiron 6000 hack!! x^( Something's fishy in
our driver...
Tested and confirmed working by Jared Smudde.
CORE-6901
Modified:
trunk/reactos/drivers/input/i8042prt/hwhacks.c
Modified: trunk/reactos/drivers/input/i8042prt/hwhacks.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/hwhacks.c?rev=74918=74917=74918=diff
==
--- trunk/reactos/drivers/input/i8042prt/hwhacks.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/input/i8042prt/hwhacks.c [iso-8859-1] Sun Jun 4
18:24:05 2017
@@ -59,6 +59,7 @@
//{ {{BOARD_VENDOR, "ASUSTeK Computer Inc."}, {BOARD_NAME, "G1S"},
{BOARD_VERSION, "1.0"}}, FL_NOLOOP },
{ {{SYS_VENDOR, "Microsoft Corporation"}, {SYS_PRODUCT, "Virtual
Machine"}}, FL_INITHACK },
+{ {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Inspiron 6000
"}}, FL_INITHACK },
{ {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D430
"}}, FL_INITHACK },
{ {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D530
"}}, FL_INITHACK },
{ {{SYS_VENDOR, "Dell Inc."}, {SYS_PRODUCT, "Latitude D531
"}}, FL_INITHACK },
[ros-diffs] [hbelusca] 74916: [SETUPAPI]: Fix a 9-year old bug in the SETUP_CreateClassKey() logic, introduced in r31860, that set a wrong Class name value if the corresponding registry key already ex
Author: hbelusca
Date: Sun Jun 4 18:16:24 2017
New Revision: 74916
URL: http://svn.reactos.org/svn/reactos?rev=74916=rev
Log:
[SETUPAPI]: Fix a 9-year old bug in the SETUP_CreateClassKey() logic,
introduced in r31860, that set a wrong Class name value if the corresponding
registry key already existed. The bug was unveiled by my commit r74761.
[SETUPAPI_APITEST]: When selecting another test_class_guid and test_class_name
couple via SetupDiClassNameFromGuidA(), check whether this function actually
succeeds. Also, improve some error output.
Modified:
trunk/reactos/dll/win32/setupapi/devinst.c
trunk/rostests/apitests/setupapi/devclass.c
Modified: trunk/reactos/dll/win32/setupapi/devinst.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst.c?rev=74916=74915=74916=diff
==
--- trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] Sun Jun 4
18:16:24 2017
@@ -3599,58 +3599,72 @@
HKEY SETUP_CreateClassKey(HINF hInf)
{
-static const WCHAR slash[] = { '\\',0 };
WCHAR FullBuffer[MAX_PATH];
WCHAR Buffer[MAX_PATH];
DWORD RequiredSize;
HKEY hClassKey;
-
+DWORD Disposition;
+
+/* Obtain the Class GUID for this class */
if (!SetupGetLineTextW(NULL,
hInf,
Version,
REGSTR_VAL_CLASSGUID,
Buffer,
- MAX_PATH,
+ sizeof(Buffer) / sizeof(WCHAR),
))
{
return INVALID_HANDLE_VALUE;
}
+/* Build the corresponding registry key name */
lstrcpyW(FullBuffer, REGSTR_PATH_CLASS_NT);
-lstrcatW(FullBuffer, slash);
+lstrcatW(FullBuffer, BackSlash);
lstrcatW(FullBuffer, Buffer);
+/* Obtain the Class name for this class */
+if (!SetupGetLineTextW(NULL,
+ hInf,
+ Version,
+ REGSTR_VAL_CLASS,
+ Buffer,
+ sizeof(Buffer) / sizeof(WCHAR),
+ ))
+{
+return INVALID_HANDLE_VALUE;
+}
+
+/* Try to open or create the registry key */
+TRACE("Opening class key %s\n", debugstr_w(FullBuffer));
+#if 0 // I keep this for reference...
if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,
FullBuffer,
0,
KEY_SET_VALUE,
))
{
-if (!SetupGetLineTextW(NULL,
- hInf,
- Version,
- REGSTR_VAL_CLASS,
- Buffer,
- MAX_PATH,
- ))
-{
-return INVALID_HANDLE_VALUE;
-}
-
-if (RegCreateKeyExW(HKEY_LOCAL_MACHINE,
-FullBuffer,
-0,
-NULL,
-REG_OPTION_NON_VOLATILE,
-KEY_SET_VALUE,
-NULL,
-,
-NULL))
-{
-return INVALID_HANDLE_VALUE;
-}
-}
-
+/* Use RegCreateKeyExW */
+}
+#endif
+if (RegCreateKeyExW(HKEY_LOCAL_MACHINE,
+FullBuffer,
+0,
+NULL,
+REG_OPTION_NON_VOLATILE,
+KEY_SET_VALUE,
+NULL,
+,
+))
+{
+ERR("RegCreateKeyExW(%s) failed\n", debugstr_w(FullBuffer));
+return INVALID_HANDLE_VALUE;
+}
+if (Disposition == REG_CREATED_NEW_KEY)
+TRACE("The class key %s was successfully created\n",
debugstr_w(FullBuffer));
+else
+TRACE("The class key %s was successfully opened\n",
debugstr_w(FullBuffer));
+
+TRACE( "setting value %s to %s\n", debugstr_w(REGSTR_VAL_CLASS),
debugstr_w(Buffer) );
if (RegSetValueExW(hClassKey,
REGSTR_VAL_CLASS,
0,
Modified: trunk/rostests/apitests/setupapi/devclass.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/setupapi/devclass.c?rev=74916=74915=74916=diff
==
--- trunk/rostests/apitests/setupapi/devclass.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/setupapi/devclass.c [iso-8859-1] Sun Jun 4
18:16:24 2017
@@ -89,9 +89,10 @@
if ( size > 0 )
{
- /* That's better to use the first class found, as we know for sure that
it exists */
- memcpy(_class_guid, _list[0], sizeof( GUID ) );
- SetupDiClassNameFromGuidA( _class_guid,
[ros-diffs] [ssawant] 74915: [QCKLNCH] -Added .rgs script and other files to facilitate component registration.
Author: ssawant
Date: Sun Jun 4 17:33:06 2017
New Revision: 74915
URL: http://svn.reactos.org/svn/reactos?rev=74915=rev
Log:
[QCKLNCH]
-Added .rgs script and other files to facilitate component registration.
Added:
branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.rc (with
props)
branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/rgs/
branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/rgs/qcklnch.rgs
(with props)
Modified:
branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CMakeLists.txt
branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp
branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h
branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.cpp
Modified:
branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CMakeLists.txt?rev=74915=74914=74915=diff
==
--- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CMakeLists.txt
[iso-8859-1] (original)
+++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CMakeLists.txt
[iso-8859-1] Sun Jun 4 17:33:06 2017
@@ -16,6 +16,7 @@
add_library(qcklnch SHARED
qcklnch.cpp
+qcklnch.rc
CQuickLaunchBand.cpp
${CMAKE_CURRENT_BINARY_DIR}/qcklnch.def)
Modified:
branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp?rev=74915=74914=74915=diff
==
---
branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp
[iso-8859-1] (original)
+++
branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp
[iso-8859-1] Sun Jun 4 17:33:06 2017
@@ -13,6 +13,20 @@
// {260CB95D-4544-44F6-A079-575BAA60B72F}
static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, {
0xa0, 0x79, 0x57, 0x5b, 0xaa, 0x60, 0xb7, 0x2f } };
+//RegComCat function
+HRESULT RegisterComCat()
+{
+ICatRegister *pcr;
+HRESULT hr = CoCreateInstance(CLSID_StdComponentCategoriesMgr, NULL,
CLSCTX_INPROC_SERVER, IID_ICatRegister, (void**));
+if (SUCCEEDED(hr))
+{
+CATID catid = CATID_DeskBand;
+hr = pcr->RegisterClassImplCategories(CLSID_QuickLaunchBand, 1,
);
+pcr->Release();
+}
+return hr;
+}
+
//CQuickLaunchBand
CQuickLaunchBand::CQuickLaunchBand() :
@@ -59,9 +73,9 @@
IN REFIID riid,
OUT VOID **ppvSite)
{
-/*TRACE("CQuickLaunchBand::GetSite(0x%p,0x%p)\n", riid, ppvSite);
-
-if (m_Site != NULL)
+TRACE("CQuickLaunchBand::GetSite(0x%p,0x%p)\n", riid, ppvSite);
+
+ /* if (m_Site != NULL)
{
return m_Site->QueryInterface(riid, ppvSite);
}
@@ -117,8 +131,7 @@
IN DWORD dwViewMode,
IN OUT DESKBANDINFO *pdbi)
{
-//TRACE("CQuickLaunchBand::GetBandInfo(0x%x,0x%x,0x%p) hWnd=0x%p\n",
dwBandID, dwViewMode, pdbi, m_hWnd);
-
+TRACE("CQuickLaunchBand::GetBandInfo(0x%x,0x%x,0x%p) hWnd=0x%p\n",
dwBandID, dwViewMode, pdbi, m_hWnd);
return E_FAIL;
}
@@ -127,14 +140,14 @@
HRESULT STDMETHODCALLTYPE CQuickLaunchBand::SetClient(
IN IUnknown *punkClient)
{
-/*TRACE("IDeskBar::SetClient(0x%p)\n", punkClient);*/
+TRACE("IDeskBar::SetClient(0x%p)\n", punkClient);
return E_NOTIMPL;
}
HRESULT STDMETHODCALLTYPE CQuickLaunchBand::GetClient(
OUT IUnknown **ppunkClient)
{
-/*TRACE("IDeskBar::GetClient(0x%p)\n", ppunkClient);*/
+TRACE("IDeskBar::GetClient(0x%p)\n", ppunkClient);
return E_NOTIMPL;
}
@@ -155,7 +168,7 @@
{
TRACE("CQuickLaunchBand::GetClassID(0x%p)\n", pClassID);
/* We're going to return the (internal!) CLSID of the task band
interface */
-//*pClassID = CLSID_ITaskBand;
+*pClassID = CLSID_QuickLaunchBand;
return S_OK;
}
@@ -168,7 +181,7 @@
HRESULT STDMETHODCALLTYPE CQuickLaunchBand::Load(
IN IStream *pStm)
{
-//TRACE("CQuickLaunchBand::Load called\n");
+TRACE("CQuickLaunchBand::Load called\n");
/* Nothing to do */
return S_OK;
}
@@ -200,7 +213,7 @@
IN LPARAM lParam,
OUT LRESULT *plrResult)
{
-//TRACE("CQuickLaunchBand: IWinEventHandler::ProcessMessage(0x%p,
0x%x, 0x%p, 0x%p, 0x%p)\n", hWnd, uMsg, wParam, lParam, plrResult);
+TRACE("CQuickLaunchBand: IWinEventHandler::ProcessMessage(0x%p, 0x%x,
0x%p, 0x%p, 0x%p)\n", hWnd, uMsg, wParam, lParam, plrResult);
return E_NOTIMPL;
}
@@ -252,18 +265,3 @@
return E_NOTIMPL;
[ros-diffs] [pschweitzer] 74914: [UDFS] Fix broken implementation of UDFGetFullNameInformation(). Always return full name length so that caller can allocate a big-enough buffer for later call. CORE-43
Author: pschweitzer
Date: Sun Jun 4 16:59:25 2017
New Revision: 74914
URL: http://svn.reactos.org/svn/reactos?rev=74914=rev
Log:
[UDFS]
Fix broken implementation of UDFGetFullNameInformation().
Always return full name length so that caller can allocate a big-enough buffer
for later call.
CORE-4375
Modified:
trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp
Modified: trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp?rev=74914=74913=74914=diff
==
--- trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/udfs/fileinfo.cpp [iso-8859-1] Sun Jun 4
16:59:25 2017
@@ -831,20 +831,22 @@
IN OUT PLONG PtrReturnedLength
)
{
+ULONG BytesToCopy;
NTSTATUS RC = STATUS_SUCCESS;
AdPrint(("UDFGetFullNameInformation\n"));
PtrBuffer->FileNameLength = FileObject->FileName.Length;
+BytesToCopy = FileObject->FileName.Length;
if (PtrBuffer->FileNameLength + sizeof( ULONG ) >
(ULONG)(*PtrReturnedLength)) {
-PtrBuffer->FileNameLength = *PtrReturnedLength - sizeof( ULONG );
+BytesToCopy = *PtrReturnedLength - sizeof( ULONG );
RC = STATUS_BUFFER_OVERFLOW;
}
-RtlCopyMemory( PtrBuffer->FileName, FileObject->FileName.Buffer,
PtrBuffer->FileNameLength );
+RtlCopyMemory( PtrBuffer->FileName, FileObject->FileName.Buffer,
BytesToCopy );
// Reduce the available bytes by the amount stored into this buffer.
*PtrReturnedLength -= sizeof( ULONG ) + PtrBuffer->FileNameLength;
[ros-diffs] [ekohl] 74913: [NETAPI32] - Implement NetFileClose, NetFileEnum and NetFileGetInfo. These functions call their counterparts in the server service. - Get rid of share.c as it is no longer n
Author: ekohl
Date: Sun Jun 4 15:46:29 2017
New Revision: 74913
URL: http://svn.reactos.org/svn/reactos?rev=74913=rev
Log:
[NETAPI32]
- Implement NetFileClose, NetFileEnum and NetFileGetInfo. These functions call
their counterparts in the server service.
- Get rid of share.c as it is no longer needed.
Removed:
trunk/reactos/dll/win32/netapi32/share.c
Modified:
trunk/reactos/dll/win32/netapi32/CMakeLists.txt
trunk/reactos/dll/win32/netapi32/netapi32.spec
trunk/reactos/dll/win32/netapi32/srvsvc.c
Modified: trunk/reactos/dll/win32/netapi32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/CMakeLists.txt?rev=74913=74912=74913=diff
==
--- trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] Sun Jun 4
15:46:29 2017
@@ -26,7 +26,6 @@
netapi32.c
netbios.c
schedule.c
-share.c
srvsvc.c
user.c
wksta.c
Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi32.spec?rev=74913=74912=74913=diff
==
--- trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] Sun Jun 4
15:46:29 2017
@@ -144,9 +144,9 @@
@ stub NetErrorLogClear
@ stub NetErrorLogRead
@ stub NetErrorLogWrite
-@ stub NetFileClose
+@ stdcall NetFileClose(wstr long)
@ stdcall NetFileEnum(wstr wstr wstr long ptr long ptr ptr ptr)
-@ stub NetFileGetInfo
+@ stdcall NetFileGetInfo(wstr long long ptr)
@ stdcall NetGetAnyDCName(wstr wstr ptr)
@ stdcall NetGetDCName(wstr wstr ptr)
@ stub NetGetDisplayInformationIndex
Removed: trunk/reactos/dll/win32/netapi32/share.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/share.c?rev=74912
==
--- trunk/reactos/dll/win32/netapi32/share.c[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netapi32/share.c(removed)
@@ -1,33 +0,0 @@
-/* Copyright 2006 Paul Vriens
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include "netapi32.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(share);
-
-/
- *NetFileEnum (NETAPI32.@)
- */
-NET_API_STATUS WINAPI NetFileEnum(
-LPWSTR ServerName, LPWSTR BasePath, LPWSTR UserName,
-DWORD Level, LPBYTE* BufPtr, DWORD PrefMaxLen,
-LPDWORD EntriesRead, LPDWORD TotalEntries, PDWORD_PTR ResumeHandle)
-{
-FIXME("(%s, %s, %s, %u): stub\n", debugstr_w(ServerName),
debugstr_w(BasePath),
-debugstr_w(UserName), Level);
-return ERROR_NOT_SUPPORTED;
-}
Modified: trunk/reactos/dll/win32/netapi32/srvsvc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/srvsvc.c?rev=74913=74912=74913=diff
==
--- trunk/reactos/dll/win32/netapi32/srvsvc.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netapi32/srvsvc.c [iso-8859-1] Sun Jun 4
15:46:29 2017
@@ -72,14 +72,148 @@
NET_API_STATUS
WINAPI
+NetFileClose(
+_In_ LMSTR servername,
+_In_ DWORD fileid)
+{
+NET_API_STATUS status;
+
+TRACE("NetFileClose(%s %lu)\n",
+ debugstr_w(servername), fileid);
+
+RpcTryExcept
+{
+status = NetrFileClose(servername,
+ fileid);
+}
+RpcExcept(EXCEPTION_EXECUTE_HANDLER)
+{
+status = I_RpcMapWin32Status(RpcExceptionCode());
+}
+RpcEndExcept;
+
+return status;
+}
+
+
+NET_API_STATUS
+WINAPI
+NetFileEnum(
+_In_ LMSTR servername,
+_In_ LMSTR basepath,
+_In_ LMSTR username,
+_In_ DWORD level,
+_Out_ LPBYTE *bufptr,
+_In_ DWORD prefmaxlen,
+_Out_ LPDWORD entriesread,
+_Out_ LPDWORD totalentries,
+_Inout_ PDWORD_PTR resume_handle)
+{
+FILE_ENUM_STRUCT EnumStruct;
+FILE_INFO_2_CONTAINER Level2Container = {0, NULL};
+FILE_INFO_3_CONTAINER Level3Container = {0, NULL};
+NET_API_STATUS
[ros-diffs] [akhaldi] 74912: [README.WINE] Mark some modules as synced with Wine Staging 2.9. CORE-13362
Author: akhaldi Date: Sun Jun 4 15:19:05 2017 New Revision: 74912 URL: http://svn.reactos.org/svn/reactos?rev=74912=rev Log: [README.WINE] Mark some modules as synced with Wine Staging 2.9. CORE-13362 Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=74912=74911=74912=diff == --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Jun 4 15:19:05 2017 @@ -15,235 +15,235 @@ The following build tools are shared with Wine. -reactos/sdk/tools/unicode # Synced to WineStaging-1.9.16 +reactos/sdk/tools/unicode # Synced to WineStaging-2.9 reactos/sdk/tools/widl # Synced to WineStaging-2.9 -reactos/sdk/tools/wpp # Synced to WineStaging-1.9.11 +reactos/sdk/tools/wpp # Synced to WineStaging-2.9 The following libraries are shared with Wine. -reactos/dll/directx/wine/amstream # Synced to WineStaging-1.9.23 +reactos/dll/directx/wine/amstream # Synced to WineStaging-2.9 reactos/dll/directx/wine/d3d8 # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/d3d9 # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.9.4 -reactos/dll/directx/wine/d3drm # Synced to WineStaging-1.9.23 +reactos/dll/directx/wine/d3drm # Synced to WineStaging-2.9 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-1.9.4 -reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.9.23 +reactos/dll/directx/wine/d3dxof # Synced to WineStaging-2.9 reactos/dll/directx/wine/ddraw # Synced to WineStaging-1.9.4 reactos/dll/directx/wine/devenum# Synced to WineStaging-2.9 reactos/dll/directx/wine/dinput # Synced to WineStaging-2.9 -reactos/dll/directx/wine/dinput8# Synced to WineStaging-1.9.23 +reactos/dll/directx/wine/dinput8# Synced to WineStaging-2.9 reactos/dll/directx/wine/dmusic # Synced to WineStaging-2.9 -reactos/dll/directx/wine/dplay # Synced to WineStaging-1.9.23 +reactos/dll/directx/wine/dplay # Synced to WineStaging-2.9 reactos/dll/directx/wine/dplayx # Synced to WineStaging-2.9 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 -reactos/dll/directx/wine/dxdiagn# Synced to WineStaging-1.9.23 -reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.9.23 -reactos/dll/directx/wine/qedit # Synced to WineStaging-1.9.23 +reactos/dll/directx/wine/dxdiagn# Synced to WineStaging-2.9 +reactos/dll/directx/wine/msdmo # Synced to WineStaging-2.9 +reactos/dll/directx/wine/qedit # Synced to WineStaging-2.9 reactos/dll/directx/wine/quartz # Synced to WineStaging-2.9 reactos/dll/directx/wine/wined3d# Synced to WineStaging-1.9.4 -reactos/dll/win32/activeds# Synced to WineStaging-1.9.11 -reactos/dll/win32/actxprxy# Synced to WineStaging-1.9.11 +reactos/dll/win32/activeds# Synced to WineStaging-2.9 +reactos/dll/win32/actxprxy# Synced to WineStaging-2.9 reactos/dll/win32/advpack # Synced to WineStaging-2.9 -reactos/dll/win32/atl # Synced to WineStaging-2.2 -reactos/dll/win32/atl80 # Synced to WineStaging-1.9.11 -reactos/dll/win32/atl100 # Synced to WineStaging-1.9.11 +reactos/dll/win32/atl # Synced to WineStaging-2.9 +reactos/dll/win32/atl80 # Synced to WineStaging-2.9 +reactos/dll/win32/atl100 # Synced to WineStaging-2.9 reactos/dll/win32/avifil32# Synced to WineStaging-2.9 reactos/dll/win32/bcrypt # Synced to WineStaging-1.9.23 reactos/dll/win32/browseui# Out of sync -reactos/dll/win32/cabinet # Synced to WineStaging-2.2 -reactos/dll/win32/clusapi # Synced to WineStaging-1.9.11 -reactos/dll/win32/comcat # Synced to WineStaging-1.9.11 +reactos/dll/win32/cabinet # Synced to WineStaging-2.9 +reactos/dll/win32/clusapi # Synced to WineStaging-2.9 +reactos/dll/win32/comcat # Synced to WineStaging-2.9 reactos/dll/win32/comctl32# Synced to WineStaging-2.9 reactos/dll/win32/comdlg32# Synced to WineStaging-2.9 -reactos/dll/win32/compstui# Synced to WineStaging-2.2 +reactos/dll/win32/compstui# Synced to WineStaging-2.9 reactos/dll/win32/credui # Synced to WineStaging-2.9 reactos/dll/win32/crypt32 # Synced to WineStaging-2.9 -reactos/dll/win32/cryptdlg# Synced to WineStaging-1.9.11 -reactos/dll/win32/cryptdll# Synced to WineStaging-1.9.11 +reactos/dll/win32/cryptdlg#
[ros-diffs] [akhaldi] 74909: [USER32_WINETEST] Sync with Wine Staging 2.9 except win.c. CORE-13362
Author: akhaldi Date: Sun Jun 4 14:34:15 2017 New Revision: 74909 URL: http://svn.reactos.org/svn/reactos?rev=74909=rev Log: [USER32_WINETEST] Sync with Wine Staging 2.9 except win.c. CORE-13362 Modified: trunk/rostests/winetests/user32/class.c trunk/rostests/winetests/user32/clipboard.c trunk/rostests/winetests/user32/combo.c trunk/rostests/winetests/user32/cursoricon.c trunk/rostests/winetests/user32/dce.c trunk/rostests/winetests/user32/dialog.c trunk/rostests/winetests/user32/input.c trunk/rostests/winetests/user32/menu.c trunk/rostests/winetests/user32/monitor.c trunk/rostests/winetests/user32/msg.c trunk/rostests/winetests/user32/resource.rc trunk/rostests/winetests/user32/sysparams.c trunk/rostests/winetests/user32/text.c trunk/rostests/winetests/user32/uitools.c trunk/rostests/winetests/user32/wsprintf.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/user32/class.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/class.c?rev=74909=74908=74909=diff Modified: trunk/rostests/winetests/user32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/clipboard.c?rev=74909=74908=74909=diff Modified: trunk/rostests/winetests/user32/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/combo.c?rev=74909=74908=74909=diff Modified: trunk/rostests/winetests/user32/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/cursoricon.c?rev=74909=74908=74909=diff Modified: trunk/rostests/winetests/user32/dce.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/dce.c?rev=74909=74908=74909=diff Modified: trunk/rostests/winetests/user32/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/dialog.c?rev=74909=74908=74909=diff Modified: trunk/rostests/winetests/user32/input.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/input.c?rev=74909=74908=74909=diff Modified: trunk/rostests/winetests/user32/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/menu.c?rev=74909=74908=74909=diff Modified: trunk/rostests/winetests/user32/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/monitor.c?rev=74909=74908=74909=diff Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?rev=74909=74908=74909=diff Modified: trunk/rostests/winetests/user32/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/resource.rc?rev=74909=74908=74909=diff Modified: trunk/rostests/winetests/user32/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/sysparams.c?rev=74909=74908=74909=diff Modified: trunk/rostests/winetests/user32/text.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/text.c?rev=74909=74908=74909=diff Modified: trunk/rostests/winetests/user32/uitools.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/uitools.c?rev=74909=74908=74909=diff Modified: trunk/rostests/winetests/user32/wsprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/wsprintf.c?rev=74909=74908=74909=diff
[ros-diffs] [akhaldi] 74908: [KERNEL32_WINETEST] Sync with Wine Staging 2.9. CORE-13362
Author: akhaldi Date: Sun Jun 4 14:29:15 2017 New Revision: 74908 URL: http://svn.reactos.org/svn/reactos?rev=74908=rev Log: [KERNEL32_WINETEST] Sync with Wine Staging 2.9. CORE-13362 Modified: trunk/rostests/winetests/kernel32/actctx.c trunk/rostests/winetests/kernel32/codepage.c trunk/rostests/winetests/kernel32/console.c trunk/rostests/winetests/kernel32/debugger.c trunk/rostests/winetests/kernel32/directory.c trunk/rostests/winetests/kernel32/file.c trunk/rostests/winetests/kernel32/format_msg.c trunk/rostests/winetests/kernel32/heap.c trunk/rostests/winetests/kernel32/loader.c trunk/rostests/winetests/kernel32/locale.c trunk/rostests/winetests/kernel32/pipe.c trunk/rostests/winetests/kernel32/process.c trunk/rostests/winetests/kernel32/thread.c trunk/rostests/winetests/kernel32/version.c trunk/rostests/winetests/kernel32/virtual.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/kernel32/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/actctx.c?rev=74908=74907=74908=diff Modified: trunk/rostests/winetests/kernel32/codepage.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/codepage.c?rev=74908=74907=74908=diff Modified: trunk/rostests/winetests/kernel32/console.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/console.c?rev=74908=74907=74908=diff Modified: trunk/rostests/winetests/kernel32/debugger.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/debugger.c?rev=74908=74907=74908=diff Modified: trunk/rostests/winetests/kernel32/directory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/directory.c?rev=74908=74907=74908=diff Modified: trunk/rostests/winetests/kernel32/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/file.c?rev=74908=74907=74908=diff Modified: trunk/rostests/winetests/kernel32/format_msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/format_msg.c?rev=74908=74907=74908=diff Modified: trunk/rostests/winetests/kernel32/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/heap.c?rev=74908=74907=74908=diff Modified: trunk/rostests/winetests/kernel32/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/loader.c?rev=74908=74907=74908=diff Modified: trunk/rostests/winetests/kernel32/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/locale.c?rev=74908=74907=74908=diff Modified: trunk/rostests/winetests/kernel32/pipe.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/pipe.c?rev=74908=74907=74908=diff Modified: trunk/rostests/winetests/kernel32/process.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/process.c?rev=74908=74907=74908=diff Modified: trunk/rostests/winetests/kernel32/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/thread.c?rev=74908=74907=74908=diff Modified: trunk/rostests/winetests/kernel32/version.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/version.c?rev=74908=74907=74908=diff Modified: trunk/rostests/winetests/kernel32/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/virtual.c?rev=74908=74907=74908=diff
[ros-diffs] [akhaldi] 74907: [PSDK] Add some missing PROC_THREAD_ATTRIBUTE_* definitions.
Author: akhaldi
Date: Sun Jun 4 14:27:51 2017
New Revision: 74907
URL: http://svn.reactos.org/svn/reactos?rev=74907=rev
Log:
[PSDK] Add some missing PROC_THREAD_ATTRIBUTE_* definitions.
Modified:
trunk/reactos/sdk/include/psdk/winbase.h
Modified: trunk/reactos/sdk/include/psdk/winbase.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/winbase.h?rev=74907=74906=74907=diff
==
--- trunk/reactos/sdk/include/psdk/winbase.h[iso-8859-1] (original)
+++ trunk/reactos/sdk/include/psdk/winbase.h[iso-8859-1] Sun Jun 4
14:27:51 2017
@@ -1342,6 +1342,33 @@
typedef RTL_CONDITION_VARIABLE CONDITION_VARIABLE, *PCONDITION_VARIABLE;
#endif
+typedef struct _PROC_THREAD_ATTRIBUTE_LIST *PPROC_THREAD_ATTRIBUTE_LIST,
*LPPROC_THREAD_ATTRIBUTE_LIST;
+
+#define PROC_THREAD_ATTRIBUTE_NUMBER 0x
+#define PROC_THREAD_ATTRIBUTE_THREAD 0x0001
+#define PROC_THREAD_ATTRIBUTE_INPUT 0x0002
+#define PROC_THREAD_ATTRIBUTE_ADDITIVE 0x0004
+
+typedef enum _PROC_THREAD_ATTRIBUTE_NUM {
+ ProcThreadAttributeParentProcess = 0,
+ ProcThreadAttributeHandleList = 2,
+ ProcThreadAttributeGroupAffinity = 3,
+ ProcThreadAttributeIdealProcessor = 5,
+ ProcThreadAttributeUmsThread = 6,
+ ProcThreadAttributeMitigationPolicy = 7,
+ ProcThreadAttributeSecurityCapabilities = 9,
+ ProcThreadAttributeProtectionLevel = 11,
+ ProcThreadAttributeJobList = 13,
+ ProcThreadAttributeChildProcessPolicy = 14,
+ ProcThreadAttributeAllApplicationPackagesPolicy = 15,
+ ProcThreadAttributeWin32kFilter = 16,
+ ProcThreadAttributeSafeOpenPromptOriginClaim = 17,
+} PROC_THREAD_ATTRIBUTE_NUM;
+
+#define PROC_THREAD_ATTRIBUTE_IDEAL_PROCESSOR
(ProcThreadAttributeIdealProcessor | PROC_THREAD_ATTRIBUTE_THREAD |
PROC_THREAD_ATTRIBUTE_INPUT)
+#define PROC_THREAD_ATTRIBUTE_HANDLE_LIST (ProcThreadAttributeHandleList |
PROC_THREAD_ATTRIBUTE_INPUT)
+#define PROC_THREAD_ATTRIBUTE_PARENT_PROCESS (ProcThreadAttributeParentProcess
| PROC_THREAD_ATTRIBUTE_INPUT)
+
typedef DWORD
(WINAPI *PFE_EXPORT_FUNC)(
_In_reads_bytes_(ulLength) PBYTE pbData,
[ros-diffs] [mjansen] 74906: [WIN32SS] Prevent accessing an unininitialized pointer when loading an invalid font. CORE-13364
Author: mjansen Date: Sun Jun 4 14:03:25 2017 New Revision: 74906 URL: http://svn.reactos.org/svn/reactos?rev=74906=rev Log: [WIN32SS] Prevent accessing an unininitialized pointer when loading an invalid font. CORE-13364 Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype.c?rev=74906=74905=74906=diff == --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Sun Jun 4 14:03:25 2017 @@ -814,7 +814,7 @@ IntUnLockFreeType; -if (FT_IS_SFNT(Face)) +if (!Error && FT_IS_SFNT(Face)) pLoadFont->IsTrueType = TRUE; if (Error || SharedFace == NULL)
[ros-diffs] [akhaldi] 74905: [RPCRT4_WINETEST] Sync with Wine Staging 2.9. CORE-13362
Author: akhaldi
Date: Sun Jun 4 14:02:01 2017
New Revision: 74905
URL: http://svn.reactos.org/svn/reactos?rev=74905=rev
Log:
[RPCRT4_WINETEST] Sync with Wine Staging 2.9. CORE-13362
Modified:
trunk/rostests/winetests/rpcrt4/rpc.c
trunk/rostests/winetests/rpcrt4/server.c
Modified: trunk/rostests/winetests/rpcrt4/rpc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/rpc.c?rev=74905=74904=74905=diff
==
--- trunk/rostests/winetests/rpcrt4/rpc.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/rpcrt4/rpc.c [iso-8859-1] Sun Jun 4
14:02:01 2017
@@ -250,10 +250,8 @@
ok(status == RPC_S_OK, "RpcServerListen failed (%u)\n", status);
status = RpcServerListen(1, 20, TRUE);
-todo_wine {
ok(status == RPC_S_ALREADY_LISTENING,
"wrong RpcServerListen error (%u)\n", status);
-}
status = RpcStringBindingComposeA(NULL, ncacn_ip_tcp, address,
endpoint, NULL, );
@@ -301,9 +299,7 @@
ok(status == RPC_S_OK, "RpcServerUnregisterIf failed (%u)\n", status);
status = RpcMgmtWaitServerListen();
-todo_wine {
ok(status == RPC_S_OK, "RpcMgmtWaitServerListen failed (%u)\n", status);
-}
status = RpcStringFreeA();
ok(status == RPC_S_OK, "RpcStringFree failed (%u)\n", status);
@@ -1150,7 +1146,7 @@
hr = INetFwPolicy_get_CurrentProfile( policy, );
if (hr != S_OK) goto done;
-INetFwProfile_get_AuthorizedApplications( profile, );
+hr = INetFwProfile_get_AuthorizedApplications( profile, );
ok( hr == S_OK, "got %08x\n", hr );
if (hr != S_OK) goto done;
Modified: trunk/rostests/winetests/rpcrt4/server.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/server.c?rev=74905=74904=74905=diff
==
--- trunk/rostests/winetests/rpcrt4/server.c[iso-8859-1] (original)
+++ trunk/rostests/winetests/rpcrt4/server.c[iso-8859-1] Sun Jun 4
14:02:01 2017
@@ -1752,10 +1752,42 @@
if (ret == WAIT_OBJECT_0)
{
status = RpcMgmtWaitServerListen();
-todo_wine {
- ok(status == RPC_S_OK, "RpcMgmtWaitServerListening failed with status
%d\n", status);
-}
- }
+ok(status == RPC_S_OK, "RpcMgmtWaitServerListening failed with status
%d\n", status);
+ }
+
+ CloseHandle(stop_event);
+ stop_event = NULL;
+}
+
+static void test_server_listening(void)
+{
+static unsigned char np[] = "ncacn_np";
+static unsigned char pipe[] = PIPE "listen_test";
+RPC_STATUS status;
+
+status = RpcServerUseProtseqEpA(np, 0, pipe, NULL);
+ok(status == RPC_S_OK, "RpcServerUseProtseqEp(ncacn_np) failed with status
%d\n", status);
+
+status = RpcServerRegisterIf(s_IServer_v0_0_s_ifspec, NULL, NULL);
+ok(status == RPC_S_OK, "RpcServerRegisterIf failed with status %d\n",
status);
+
+test_is_server_listening(NULL, RPC_S_NOT_LISTENING);
+status = RpcServerListen(1, 20, TRUE);
+ok(status == RPC_S_OK, "RpcServerListen failed with status %d\n", status);
+test_is_server_listening(NULL, RPC_S_OK);
+
+status = RpcServerListen(1, 20, TRUE);
+ok(status == RPC_S_ALREADY_LISTENING, "RpcServerListen failed with status
%d\n", status);
+
+status = RpcMgmtStopServerListening(NULL);
+ok(status == RPC_S_OK, "RpcMgmtStopServerListening\n");
+test_is_server_listening(NULL, RPC_S_NOT_LISTENING);
+
+status = RpcMgmtWaitServerListen();
+ok(status == RPC_S_OK, "RpcMgmtWaitServerListening failed with status
%d\n", status);
+
+status = RpcMgmtWaitServerListen();
+ok(status == RPC_S_NOT_LISTENING, "RpcMgmtWaitServerListening failed with
status %d\n", status);
}
static BOOL is_process_elevated(void)
@@ -1843,7 +1875,7 @@
hr = INetFwPolicy_get_CurrentProfile( policy, );
if (hr != S_OK) goto done;
-INetFwProfile_get_AuthorizedApplications( profile, );
+hr = INetFwProfile_get_AuthorizedApplications( profile, );
ok( hr == S_OK, "got %08x\n", hr );
if (hr != S_OK) goto done;
@@ -1912,6 +1944,10 @@
trace("Exception %d\n", RpcExceptionCode());
}
RpcEndExcept
+ }
+ else if (argc == 4)
+ {
+test_server_listening();
}
else
{
@@ -1926,6 +1962,7 @@
}
}
server();
+run_client("test listen");
if (firewall_enabled) set_firewall(APP_REMOVE);
}
[ros-diffs] [akhaldi] 74904: [RPCRT4] Sync with Wine Staging 2.9. CORE-13362 6b53b79 rpcrt4: Use HEAP_ZERO_MEMORY to alloc RpcServerProtseq objects. 28f865b rpcrt4: Add close_read implementation for T
Author: akhaldi
Date: Sun Jun 4 14:01:54 2017
New Revision: 74904
URL: http://svn.reactos.org/svn/reactos?rev=74904=rev
Log:
[RPCRT4] Sync with Wine Staging 2.9. CORE-13362
6b53b79 rpcrt4: Use HEAP_ZERO_MEMORY to alloc RpcServerProtseq objects.
28f865b rpcrt4: Add close_read implementation for TCP connections.
29f0b28 rpcrt4: Add close_read implementation for named pipe connections.
42ba4d7 rpcrt4: Introduce op for closing connection read end and use it when
shutting down server.
ef267f1 rpcrt4: Store all active connections in RpcServerProtseq.
dae3065 rpcrt4: Remove connection from list in RPCRT4_ReleaseConnection.
812897c rpcrt4: Use HEAP_ZERO_MEMORY to alloc RpcConnection objects.
13d529a rpcrt4: Renamed connections list to listeners.
c953763 rpcrt4: Remove no longer needed helpers.
b548338 rpcrt4: Implement cancel_call for named pipes.
372c9e0 rpcrt4: Cache event handle in RpcConnection_np object.
6e7a297 rpcrt4: Use non-blocking listening on named pipes.
4f4ac8c rpcrt4: Use named pipe in overlapped mode.
bd6f807 rpcrt4: Simplify rpcrt4_conn_np_read implementation.
f62b9d6 rpcrt4: Simplify rpcrt4_conn_np_write implementation.
2035294 rpcrt4: Use standard Wine list to store connections in RpcServerProtseq.
e621593 rpcrt4: Always use winsock for networking.
d0ed6d1 rpcrt4: Get rid of manual_listen_count and use binary state instead.
Modified:
trunk/reactos/dll/win32/rpcrt4/rpc_binding.h
trunk/reactos/dll/win32/rpcrt4/rpc_server.c
trunk/reactos/dll/win32/rpcrt4/rpc_server.h
trunk/reactos/dll/win32/rpcrt4/rpc_transport.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_binding.h?rev=74904=74903=74904=diff
==
--- trunk/reactos/dll/win32/rpcrt4/rpc_binding.h[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/rpcrt4/rpc_binding.h[iso-8859-1] Sun Jun 4
14:01:54 2017
@@ -86,7 +86,8 @@
/* The active interface bound to server. */
RPC_SYNTAX_IDENTIFIER ActiveInterface;
USHORT NextCallId;
- struct _RpcConnection* Next;
+ struct list protseq_entry;
+ struct _RpcServerProtseq *protseq;
struct _RpcBinding *server_binding;
} RpcConnection;
@@ -99,6 +100,7 @@
int (*read)(RpcConnection *conn, void *buffer, unsigned int len);
int (*write)(RpcConnection *conn, const void *buffer, unsigned int len);
int (*close)(RpcConnection *conn);
+ void (*close_read)(RpcConnection *conn);
void (*cancel_call)(RpcConnection *conn);
RPC_STATUS (*is_server_listening)(const char *endpoint);
int (*wait_for_incoming_data)(RpcConnection *conn);
@@ -192,6 +194,11 @@
return Connection->ops->close(Connection);
}
+static inline void rpcrt4_conn_close_read(RpcConnection *connection)
+{
+ connection->ops->close_read(connection);
+}
+
static inline void rpcrt4_conn_cancel_call(RpcConnection *Connection)
{
Connection->ops->cancel_call(Connection);
Modified: trunk/reactos/dll/win32/rpcrt4/rpc_server.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_server.c?rev=74904=74903=74904=diff
==
--- trunk/reactos/dll/win32/rpcrt4/rpc_server.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/rpcrt4/rpc_server.c [iso-8859-1] Sun Jun 4
14:01:54 2017
@@ -79,11 +79,9 @@
/* whether the server is currently listening */
static BOOL std_listen;
-/* number of manual listeners (calls to RpcServerListen) */
-static LONG manual_listen_count;
/* total listeners including auto listeners */
static LONG listen_count;
-/* event set once all listening is finished */
+/* event set once all manual listening is finished */
static HANDLE listen_done_event;
static UUID uuid_nil;
@@ -649,9 +647,12 @@
{
/* cleanup */
cps->ops->free_wait_array(cps, objs);
+
EnterCriticalSection(>cs);
- for (conn = cps->conn; conn; conn = conn->Next)
+ LIST_FOR_EACH_ENTRY(conn, >listeners, RpcConnection, protseq_entry)
RPCRT4_CloseConnection(conn);
+ LIST_FOR_EACH_ENTRY(conn, >connections, RpcConnection,
protseq_entry)
+rpcrt4_conn_close_read(conn);
LeaveCriticalSection(>cs);
if (res == 0 && !std_listen)
@@ -713,13 +714,16 @@
TRACE("\n");
EnterCriticalSection(_cs);
- if (auto_listen || (manual_listen_count++ == 0))
+ if (auto_listen || !listen_done_event)
{
status = RPC_S_OK;
+if(!auto_listen)
+ listen_done_event = CreateEventW(NULL, TRUE, FALSE, NULL);
if (++listen_count == 1)
std_listen = TRUE;
}
LeaveCriticalSection(_cs);
+ if (status) return status;
if (std_listen)
{
@@ -742,51 +746,53 @@
static RPC_STATUS RPCRT4_stop_listen(BOOL auto_listen)
{
+ BOOL stop_listen = FALSE;
RPC_STATUS status = RPC_S_OK;
EnterCriticalSection(_cs);
-
- if (!std_listen)
+ if
[ros-diffs] [akhaldi] 74903: [COMCTL32_WINETEST] Sync with Wine Staging 2.9. CORE-13362
Author: akhaldi
Date: Sun Jun 4 12:53:30 2017
New Revision: 74903
URL: http://svn.reactos.org/svn/reactos?rev=74903=rev
Log:
[COMCTL32_WINETEST] Sync with Wine Staging 2.9. CORE-13362
Added:
trunk/rostests/winetests/comctl32/taskdialog.c (with props)
Modified:
trunk/rostests/winetests/comctl32/CMakeLists.txt
trunk/rostests/winetests/comctl32/animate.c
trunk/rostests/winetests/comctl32/button.c
trunk/rostests/winetests/comctl32/comboex.c
trunk/rostests/winetests/comctl32/datetime.c
trunk/rostests/winetests/comctl32/header.c
trunk/rostests/winetests/comctl32/imagelist.c
trunk/rostests/winetests/comctl32/listview.c
trunk/rostests/winetests/comctl32/misc.c
trunk/rostests/winetests/comctl32/monthcal.c
trunk/rostests/winetests/comctl32/msg.h
trunk/rostests/winetests/comctl32/pager.c
trunk/rostests/winetests/comctl32/propsheet.c
trunk/rostests/winetests/comctl32/syslink.c
trunk/rostests/winetests/comctl32/tab.c
trunk/rostests/winetests/comctl32/testlist.c
trunk/rostests/winetests/comctl32/toolbar.c
trunk/rostests/winetests/comctl32/trackbar.c
trunk/rostests/winetests/comctl32/treeview.c
trunk/rostests/winetests/comctl32/updown.c
Modified: trunk/rostests/winetests/comctl32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/CMakeLists.txt?rev=74903=74902=74903=diff
==
--- trunk/rostests/winetests/comctl32/CMakeLists.txt[iso-8859-1] (original)
+++ trunk/rostests/winetests/comctl32/CMakeLists.txt[iso-8859-1] Sun Jun 4
12:53:30 2017
@@ -24,6 +24,7 @@
subclass.c
syslink.c
tab.c
+taskdialog.c
toolbar.c
tooltips.c
trackbar.c
Modified: trunk/rostests/winetests/comctl32/animate.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/animate.c?rev=74903=74902=74903=diff
==
--- trunk/rostests/winetests/comctl32/animate.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/comctl32/animate.c [iso-8859-1] Sun Jun 4
12:53:30 2017
@@ -160,8 +160,9 @@
SetLastError(0xdeadbeef);
res = SendMessageA(hAnimateWnd, ACM_PLAY, (WPARAM) -1, MAKELONG(0, -1));
+err = GetLastError();
ok(res == 0, "Play should have failed\n");
-ok(err == ERROR_RESOURCE_NAME_NOT_FOUND, "Expected 1814, got %u\n", err);
+ok(err == 0xdeadbeef, "Expected 0xdeadbeef, got %u\n", err);
destroy_animate();
create_animate(0, 0);
Modified: trunk/rostests/winetests/comctl32/button.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/button.c?rev=74903=74902=74903=diff
==
--- trunk/rostests/winetests/comctl32/button.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/comctl32/button.c [iso-8859-1] Sun Jun 4
12:53:30 2017
@@ -124,8 +124,8 @@
static LRESULT CALLBACK button_subclass_proc(HWND hwnd, UINT message, WPARAM
wParam, LPARAM lParam, UINT_PTR id, DWORD_PTR ref_data)
{
static LONG defwndproc_counter = 0;
+struct message msg = { 0 };
LRESULT ret;
-struct message msg;
if (ignore_message( message )) return pDefSubclassProc(hwnd, message,
wParam, lParam);
@@ -160,8 +160,8 @@
{
static LONG defwndproc_counter = 0;
static LONG beginpaint_counter = 0;
+struct message msg = { 0 };
LRESULT ret;
-struct message msg;
if (ignore_message( message )) return 0;
@@ -171,17 +171,6 @@
message == WM_DRAWITEM || message == WM_COMMAND ||
message == WM_IME_SETCONTEXT)
{
-switch (message)
-{
-/* ignore */
-case WM_NCHITTEST:
-return HTCLIENT;
-case WM_SETCURSOR:
-case WM_MOUSEMOVE:
-case WM_NCMOUSEMOVE:
-return 0;
-}
-
msg.message = message;
msg.flags = sent|parent|wparam|lparam;
if (defwndproc_counter) msg.flags |= defwinproc;
Modified: trunk/rostests/winetests/comctl32/comboex.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/comboex.c?rev=74903=74902=74903=diff
==
--- trunk/rostests/winetests/comctl32/comboex.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/comctl32/comboex.c [iso-8859-1] Sun Jun 4
12:53:30 2017
@@ -90,8 +90,8 @@
{
WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA);
static LONG defwndproc_counter = 0;
+struct message msg = { 0 };
LRESULT ret;
-struct message msg;
msg.message = message;
msg.flags = sent|wparam|lparam;
Modified: trunk/rostests/winetests/comctl32/datetime.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/datetime.c?rev=74903=74902=74903=diff
[ros-diffs] [akhaldi] 74902: [COMCTL32] Sync with Wine Staging 2.9. CORE-13362 9abd3d1 comctl32: fix buttons becoming unthemed when pressed/released 8967e87 comctl32/taskdialog: Display content text l
Author: akhaldi Date: Sun Jun 4 12:53:17 2017 New Revision: 74902 URL: http://svn.reactos.org/svn/reactos?rev=74902=rev Log: [COMCTL32] Sync with Wine Staging 2.9. CORE-13362 9abd3d1 comctl32: fix buttons becoming unthemed when pressed/released 8967e87 comctl32/taskdialog: Display content text label. 65d64e1 comctl32/listview: Simplify a couple of conditions that are using LVFI_PARTIAL. 407a3c0 comctl32/listview: Search through all items in LVFI_NEARESTXY mode. 5fe4493 comctl32/listview: When adding a scrollbar, update the other one. 8ef79b0 comctl32/listview: Convert item text once when looking for insertion point. 791924a comctl32/listview: Remove internal autoarrange flag, it breaks positioning. b1d46e0 comctl32/taskdialog: Remove superfluous title pointer check (Coverity). 48c4edd comctl32/pager: Prevent excessive PGN_CALCSIZE notifications during PGM_SETCHILD. d6a6055 comctl32: Improve right-click handling in treeview controls. 6926564 comctl32: Don't touch the new child twice in PGM_SETCHILD. 995b690 comctl32/taskdialog: Initial implementation of a minimal task dialog. e2245bc comctl32/taskdialog: Move TaskDialogIndirect and its tests into own source files. 429705e comctl32/propsheet: Implement PSPCB_ADDREF/PSPCB_RELEASE notifications. a3aa217 comctl32/propsheet: Enforce minimal PROPSHEETPAGE structure size when creating a page. b7cc440 comctl32: Update the tooltip rectangle when a tool button is hidden. 690022c comctl32: Return TRUE from LVM_REDRAWITEMS with bad indices. Added: trunk/reactos/dll/win32/comctl32/taskdialog.c (with props) Modified: trunk/reactos/dll/win32/comctl32/CMakeLists.txt trunk/reactos/dll/win32/comctl32/comctl32.h trunk/reactos/dll/win32/comctl32/commctrl.c trunk/reactos/dll/win32/comctl32/lang/comctl_Bg.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Cs.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Da.rc trunk/reactos/dll/win32/comctl32/lang/comctl_De.rc trunk/reactos/dll/win32/comctl32/lang/comctl_El.rc trunk/reactos/dll/win32/comctl32/lang/comctl_En.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Eo.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Es.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Fr.rc trunk/reactos/dll/win32/comctl32/lang/comctl_He.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Hu.rc trunk/reactos/dll/win32/comctl32/lang/comctl_It.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Ja.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Ko.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Lt.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Nl.rc trunk/reactos/dll/win32/comctl32/lang/comctl_No.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Pl.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Pt.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Ro.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Ru.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Si.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Sk.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Sq.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Sr.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Sv.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Th.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Tr.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Tw.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Uk.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Zh.rc trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/pager.c trunk/reactos/dll/win32/comctl32/propsheet.c trunk/reactos/dll/win32/comctl32/resource.h trunk/reactos/dll/win32/comctl32/syslink.c trunk/reactos/dll/win32/comctl32/theme_button.c trunk/reactos/dll/win32/comctl32/theme_edit.c trunk/reactos/dll/win32/comctl32/theme_listbox.c trunk/reactos/dll/win32/comctl32/theming.c trunk/reactos/dll/win32/comctl32/treeview.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/CMakeLists.txt?rev=74902=74901=74902=diff == --- trunk/reactos/dll/win32/comctl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/CMakeLists.txt [iso-8859-1] Sun Jun 4 12:53:17 2017 @@ -37,6 +37,7 @@ string.c syslink.c tab.c +taskdialog.c theme_button.c theme_combo.c theme_dialog.c Modified: trunk/reactos/dll/win32/comctl32/comctl32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl32.h?rev=74902=74901=74902=diff == --- trunk/reactos/dll/win32/comctl32/comctl32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.h [iso-8859-1] Sun Jun 4 12:53:17 2017 @@ -45,8 +45,9 @@ #include #include +#include
[ros-diffs] [pschweitzer] 74901: [UDFS] Enable the UDFS driver on ReactOS. It will be started "on demand" by the FS_REC driver when an UDF formatted volume is inserted. It's not bug free (yet? ; -)).
Author: pschweitzer Date: Sun Jun 4 11:47:34 2017 New Revision: 74901 URL: http://svn.reactos.org/svn/reactos?rev=74901=rev Log: [UDFS] Enable the UDFS driver on ReactOS. It will be started "on demand" by the FS_REC driver when an UDF formatted volume is inserted. It's not bug free (yet? ;-)). It seems to show issues when trying to start an executable, it locks and never release DVD (ie, you've to force ejection) and you might face deadlocks. But, for the basics, you can open an UDF volume, browse it, and display files. CORE-4375 Added: trunk/reactos/drivers/filesystems/udfs/udfs_reg.inf (with props) Modified: trunk/reactos/drivers/filesystems/udfs/CMakeLists.txt Modified: trunk/reactos/drivers/filesystems/udfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/CMakeLists.txt?rev=74901=74900=74901=diff == --- trunk/reactos/drivers/filesystems/udfs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/CMakeLists.txt [iso-8859-1] Sun Jun 4 11:47:34 2017 @@ -55,3 +55,4 @@ add_importlibs(udfs ntoskrnl hal) add_pch(udfs udffs.h SOURCE) add_cd_file(TARGET udfs DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_registry_inf(udfs_reg.inf) Added: trunk/reactos/drivers/filesystems/udfs/udfs_reg.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/udfs_reg.inf?rev=74901 == --- trunk/reactos/drivers/filesystems/udfs/udfs_reg.inf (added) +++ trunk/reactos/drivers/filesystems/udfs/udfs_reg.inf [iso-8859-1] Sun Jun 4 11:47:34 2017 @@ -0,0 +1,7 @@ +; UDF filesystem driver +[AddReg] +HKLM,"SYSTEM\CurrentControlSet\Services\Udfs","ErrorControl",0x00010001,0x +HKLM,"SYSTEM\CurrentControlSet\Services\Udfs","Group",0x,"File System" +HKLM,"SYSTEM\CurrentControlSet\Services\Udfs","ImagePath",0x0002,"system32\drivers\udfs.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Udfs","Start",0x00010001,0x0003 +HKLM,"SYSTEM\CurrentControlSet\Services\Udfs","Type",0x00010001,0x0002 Propchange: trunk/reactos/drivers/filesystems/udfs/udfs_reg.inf -- svn:eol-style = native
[ros-diffs] [pschweitzer] 74900: [UDFS] Add UFDS to bootcd, so that it can be installed on disk CORE-4375
Author: pschweitzer Date: Sun Jun 4 10:32:51 2017 New Revision: 74900 URL: http://svn.reactos.org/svn/reactos?rev=74900=rev Log: [UDFS] Add UFDS to bootcd, so that it can be installed on disk CORE-4375 Modified: trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif?rev=74900=74899=74900=diff == --- trunk/reactos/boot/bootdata/txtsetup.sif[iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif[iso-8859-1] Sun Jun 4 10:32:51 2017 @@ -70,6 +70,7 @@ btrfs.sys=,,x,,4 reiserfs.sys=,,x,,4 ffs.sys=,,x,,4 +udfs.sys=,,x,,4 [SystemPartitionFiles]
[ros-diffs] [ssawant] 74899: [QCKLNCH] -Added CQuickLaunchBand -Exposed required Interfaces -Stubbed the methods
Author: ssawant
Date: Sun Jun 4 09:56:54 2017
New Revision: 74899
URL: http://svn.reactos.org/svn/reactos?rev=74899=rev
Log:
[QCKLNCH]
-Added CQuickLaunchBand
-Exposed required Interfaces
-Stubbed the methods
Added:
branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp
(with props)
branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.h
(with props)
Modified:
branches/GSoC_2017/shellext/reactos/dll/shellext/CMakeLists.txt
branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CMakeLists.txt
branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/precomp.h
branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/qcklnch.cpp
Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/shellext/CMakeLists.txt?rev=74899=74898=74899=diff
==
--- branches/GSoC_2017/shellext/reactos/dll/shellext/CMakeLists.txt
[iso-8859-1] (original)
+++ branches/GSoC_2017/shellext/reactos/dll/shellext/CMakeLists.txt
[iso-8859-1] Sun Jun 4 09:56:54 2017
@@ -6,5 +6,6 @@
add_subdirectory(fontext)
add_subdirectory(netshell)
add_subdirectory(ntobjshex)
+add_subdirectory(qcklnch)
add_subdirectory(shellbtrfs)
add_subdirectory(stobject)
Modified:
branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CMakeLists.txt?rev=74899=74898=74899=diff
==
--- branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CMakeLists.txt
[iso-8859-1] (original)
+++ branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CMakeLists.txt
[iso-8859-1] Sun Jun 4 09:56:54 2017
@@ -15,7 +15,8 @@
spec2def(qcklnch.dll qcklnch.spec)
add_library(qcklnch SHARED
-qcklnch.cpp
+qcklnch.cpp
+CQuickLaunchBand.cpp
${CMAKE_CURRENT_BINARY_DIR}/qcklnch.def)
set_module_type(qcklnch win32dll UNICODE)
Added:
branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp?rev=74899
==
---
branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp
(added)
+++
branches/GSoC_2017/shellext/reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp
[iso-8859-1] Sun Jun 4 09:56:54 2017
@@ -0,0 +1,269 @@
+/*
+ * PROJECT: ReactOS shell extensions
+ * LICENSE: GPL - See COPYING in the top level directory
+ * FILE:dll/shellext/qcklnch/CQuickLaunchBand.cpp
+ * PURPOSE: Quick Launch Toolbar (Taskbar Shell Extension)
+ * PROGRAMMERS: Shriraj Sawant a.k.a SR13
+ */
+
+#include "precomp.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(qcklnch);
+
+// {260CB95D-4544-44F6-A079-575BAA60B72F}
+static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, {
0xa0, 0x79, 0x57, 0x5b, 0xaa, 0x60, 0xb7, 0x2f } };
+
+//CQuickLaunchBand
+
+CQuickLaunchBand::CQuickLaunchBand() :
+m_hWnd(NULL),
+m_BandID(0)
+{
+
+}
+
+CQuickLaunchBand::~CQuickLaunchBand() { }
+
+/*/
+//IObjectWithSite
+HRESULT STDMETHODCALLTYPE CQuickLaunchBand::SetSite(IUnknown *pUnkSite)
+{
+/*HRESULT hRet;
+HWND hwndSite;
+
+TRACE("CQuickLaunchBand::SetSite(0x%p)\n", pUnkSite);
+
+hRet = IUnknown_GetWindow(pUnkSite, );
+if (FAILED(hRet))
+{
+TRACE("Querying site window failed: 0x%x\n", hRet);
+return hRet;
+}
+
+TRACE("CreateTaskSwitchWnd(Parent: 0x%p)\n", hwndSite);
+
+HWND hwndTaskSwitch = CreateTaskSwitchWnd(hwndSite, m_Tray);
+if (!hwndTaskSwitch)
+{
+ERR("CreateTaskSwitchWnd failed");
+return E_FAIL;
+}
+
+m_Site = pUnkSite;
+m_hWnd = hwndTaskSwitch;*/
+
+return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE CQuickLaunchBand::GetSite(
+IN REFIID riid,
+OUT VOID **ppvSite)
+{
+/*TRACE("CQuickLaunchBand::GetSite(0x%p,0x%p)\n", riid, ppvSite);
+
+if (m_Site != NULL)
+{
+return m_Site->QueryInterface(riid, ppvSite);
+}
+
+*ppvSite = NULL;*/
+return E_FAIL;
+}
+
+/*/
+//IDeskBand
+HRESULT STDMETHODCALLTYPE CQuickLaunchBand::GetWindow(OUT HWND *phwnd)
+{
+/*if (!m_hWnd)
+return E_FAIL;
+if (!phwnd)
+return E_INVALIDARG;
+*phwnd = m_hWnd;*/
+return S_OK;
+}
+
+
[ros-diffs] [pschweitzer] 74898: [UDFS] Addendum to r74897: use the appropriate keyword (by Thomas) CORE-4375
Author: pschweitzer
Date: Sun Jun 4 08:09:29 2017
New Revision: 74898
URL: http://svn.reactos.org/svn/reactos?rev=74898=rev
Log:
[UDFS]
Addendum to r74897: use the appropriate keyword (by Thomas)
CORE-4375
Modified:
trunk/reactos/drivers/filesystems/udfs/close.cpp
trunk/reactos/drivers/filesystems/udfs/create.cpp
Modified: trunk/reactos/drivers/filesystems/udfs/close.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/close.cpp?rev=74898=74897=74898=diff
==
--- trunk/reactos/drivers/filesystems/udfs/close.cpp[iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/udfs/close.cpp[iso-8859-1] Sun Jun 4
08:09:29 2017
@@ -1109,7 +1109,7 @@
{
PtrUDFIrpContextLiteIrpContextLite;
BOOLEAN StartWorker = FALSE;
-volatile BOOLEANAcquiredVcb = FALSE;
+_SEH2_VOLATILE BOOLEAN AcquiredVcb = FALSE;
NTSTATUSRC;
AdPrint((" UDFQueueDelayedClose\n"));
Modified: trunk/reactos/drivers/filesystems/udfs/create.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/create.cpp?rev=74898=74897=74898=diff
==
--- trunk/reactos/drivers/filesystems/udfs/create.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/udfs/create.cpp [iso-8859-1] Sun Jun 4
08:09:29 2017
@@ -205,7 +205,7 @@
PACCESS_STATE AccessState;
PVCBVcb = NULL;
-volatile BOOLEANAcquiredVcb = FALSE;
+_SEH2_VOLATILE BOOLEAN AcquiredVcb = FALSE;
BOOLEAN OpenExisting = FALSE;
PERESOURCE Res1 = NULL;
PERESOURCE Res2 = NULL;
[ros-diffs] [pschweitzer] 74897: [UDFS] lolfix some deadlocks in UDFS: - deadlock when enumerating files - deadlock on shutdown after volume change I could track it to the fact that for whatever reaso
Author: pschweitzer
Date: Sun Jun 4 08:02:01 2017
New Revision: 74897
URL: http://svn.reactos.org/svn/reactos?rev=74897=rev
Log:
[UDFS]
lolfix some deadlocks in UDFS:
- deadlock when enumerating files
- deadlock on shutdown after volume change
I could track it to the fact that for whatever reason, GCC wrongly optimize the
BOOLEAN used to store whether the VCB resource was acquired. The optimization
being
to assume it's always FALSE. Thus, the resource is never released and the driver
ends in a deadlock.
To avoid this: marked the BOOLEAN variables as volatile.
I guess there are same kind deadlocks I couldn't see in my limited tests...
CORE-4375
Modified:
trunk/reactos/drivers/filesystems/udfs/close.cpp
trunk/reactos/drivers/filesystems/udfs/create.cpp
Modified: trunk/reactos/drivers/filesystems/udfs/close.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/close.cpp?rev=74897=74896=74897=diff
==
--- trunk/reactos/drivers/filesystems/udfs/close.cpp[iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/udfs/close.cpp[iso-8859-1] Sun Jun 4
08:02:01 2017
@@ -1109,7 +1109,7 @@
{
PtrUDFIrpContextLiteIrpContextLite;
BOOLEAN StartWorker = FALSE;
-BOOLEAN AcquiredVcb = FALSE;
+volatile BOOLEANAcquiredVcb = FALSE;
NTSTATUSRC;
AdPrint((" UDFQueueDelayedClose\n"));
Modified: trunk/reactos/drivers/filesystems/udfs/create.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/create.cpp?rev=74897=74896=74897=diff
==
--- trunk/reactos/drivers/filesystems/udfs/create.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/udfs/create.cpp [iso-8859-1] Sun Jun 4
08:02:01 2017
@@ -205,7 +205,7 @@
PACCESS_STATE AccessState;
PVCBVcb = NULL;
-BOOLEAN AcquiredVcb = FALSE;
+volatile BOOLEANAcquiredVcb = FALSE;
BOOLEAN OpenExisting = FALSE;
PERESOURCE Res1 = NULL;
PERESOURCE Res2 = NULL;
