Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/02: [VFATLIB] Only check volume if full scan or if allowed to fix it
by Pierre Schweitzer 05 Jun '18

05 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=54f383d9965463bf036f9… commit 54f383d9965463bf036f92affcda6c44b0dc4ffa Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Jun 5 19:30:11 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Jun 5 19:34:47 2018 +0200 [VFATLIB] Only check volume if full scan or if allowed to fix it This allows doing a quick probe about whether a volume needs to be fixed by checking its dirty bit. CORE-14692 --- sdk/lib/fslib/vfatlib/vfatlib.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sdk/lib/fslib/vfatlib/vfatlib.c b/sdk/lib/fslib/vfatlib/vfatlib.c index 8db6e8a11a..82c1282fbf 100644 --- a/sdk/lib/fslib/vfatlib/vfatlib.c +++ b/sdk/lib/fslib/vfatlib/vfatlib.c @@ -428,6 +428,14 @@ VfatChkdsk(IN PUNICODE_STRING DriveRoot, /* No need to check FS */ return (fs_close(FALSE) == 0 ? STATUS_SUCCESS : STATUS_DISK_CORRUPT_ERROR); } + else if (CheckOnlyIfDirty && fs_isdirty()) + { + if (!(FsCheckFlags & FSCHECK_READ_WRITE) && !(FsCheckFlags & FSCHECK_INTERACTIVE)) + { + fs_close(FALSE); + return STATUS_DISK_CORRUPT_ERROR; + } + } read_boot(&fs);

1 0

01/01: [CONFIGURE][CMAKE] Remove Visual Studio 9 (2008) support
by Serge Gautherie 05 Jun '18

05 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=695547cd8c56ef623e6ba… commit 695547cd8c56ef623e6bac391a2bf949adcf5b6e Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri May 25 02:49:08 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Jun 5 18:59:36 2018 +0200 [CONFIGURE][CMAKE] Remove Visual Studio 9 (2008) support ReactOS does not compile anymore with it. VS9 is already officially unsupported. CORE-11836 --- configure.cmd | 11 ++--------- sdk/cmake/msvc.cmake | 11 ++--------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/configure.cmd b/configure.cmd index 5253daa360..5f3d939ef0 100755 --- a/configure.cmd +++ b/configure.cmd @@ -62,7 +62,6 @@ if defined ROS_ARCH ( cl 2>&1 | find "x86" > NUL && set ARCH=i386 cl 2>&1 | find "x64" > NUL && set ARCH=amd64 cl 2>&1 | find "ARM" > NUL && set ARCH=arm - cl 2>&1 | find "15.00." > NUL && set VS_VERSION=9 cl 2>&1 | find "16.00." > NUL && set VS_VERSION=10 cl 2>&1 | find "17.00." > NUL && set VS_VERSION=11 cl 2>&1 | find "18.00." > NUL && set VS_VERSION=12 @@ -72,7 +71,7 @@ if defined ROS_ARCH ( cl 2>&1 | find "19.12." > NUL && set VS_VERSION=15 cl 2>&1 | find "19.13." > NUL && set VS_VERSION=15 if not defined VS_VERSION ( - echo Error: Visual Studio version too old or version detection failed. + echo Error: Visual Studio version too old ^(before 10 ^(2010^)^) or version detection failed. goto quit ) set BUILD_ENVIRONMENT=VS @@ -138,13 +137,7 @@ REM Parse command line parameters set VS_VERSION=%3 echo Visual Studio Environment set to !BUILD_ENVIRONMENT!!VS_VERSION!-!ARCH! ) - if "!VS_VERSION!" == "9" ( - if "!ARCH!" == "amd64" ( - set CMAKE_GENERATOR="Visual Studio 9 2008 Win64" - ) else ( - set CMAKE_GENERATOR="Visual Studio 9 2008" - ) - ) else if "!VS_VERSION!" == "10" ( + if "!VS_VERSION!" == "10" ( if "!ARCH!" == "amd64" ( set CMAKE_GENERATOR="Visual Studio 10 Win64" ) else ( diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 01d933f73f..fe15fb3bc9 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -149,15 +149,8 @@ if(MSVC_IDE AND (CMAKE_VERSION MATCHES "ReactOS")) # For VS builds we'll only have en-US in resource files add_definitions(/DLANGUAGE_EN_US) else() - # Only VS 10+ resource compiler supports /nologo - # CMAKE_CXX_SIMULATE_VERSION is a similar check for our clang-cl builds - if((MSVC_VERSION GREATER 1599) OR (CMAKE_CXX_SIMULATE_VERSION VERSION_GREATER 15.99)) - set(rc_nologo_flag "/nologo") - else() - set(rc_nologo_flag) - endif() if(CMAKE_VERSION VERSION_LESS 3.4.0) - set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_nologo_flag} <FLAGS> <DEFINES> ${I18N_DEFS} /fo<OBJECT> <SOURCE>") + set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> /nologo <FLAGS> <DEFINES> ${I18N_DEFS} /fo<OBJECT> <SOURCE>") if(ARCH STREQUAL "arm") set(CMAKE_ASM_COMPILE_OBJECT "cl ${cl_includes_flag} /nologo /X /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" @@ -168,7 +161,7 @@ else() "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp") endif() else() - set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_nologo_flag} <INCLUDES> <FLAGS> <DEFINES> ${I18N_DEFS} /fo<OBJECT> <SOURCE>") + set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> /nologo <INCLUDES> <FLAGS> <DEFINES> ${I18N_DEFS} /fo<OBJECT> <SOURCE>") if(ARCH STREQUAL "arm") set(CMAKE_ASM_COMPILE_OBJECT "cl ${cl_includes_flag} /nologo /X /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm <INCLUDES> <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp"

1 0

01/01: [CMAKE] Add "--always" parameter to "git describe" call
by Serge Gautherie 05 Jun '18

05 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9822462946a84f228629f… commit 9822462946a84f228629ffabdb0066716ae0e64a Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Tue May 29 16:02:26 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Jun 5 18:59:11 2018 +0200 [CMAKE] Add "--always" parameter to "git describe" call "fatal: No names found, cannot describe anything." message, when called without enough history, i.e. appveyor.yml "clone_depth: 5". --- sdk/include/reactos/version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/reactos/version.cmake b/sdk/include/reactos/version.cmake index 75dacc321c..e0eae0a064 100644 --- a/sdk/include/reactos/version.cmake +++ b/sdk/include/reactos/version.cmake @@ -39,7 +39,7 @@ if(EXISTS "${REACTOS_SOURCE_DIR}/.git") endif() execute_process( - COMMAND "${GIT_EXECUTABLE}" describe --abbrev=7 --long + COMMAND "${GIT_EXECUTABLE}" describe --abbrev=7 --long --always WORKING_DIRECTORY ${REACTOS_SOURCE_DIR} OUTPUT_VARIABLE GIT_DESCRIBE_REVISION RESULT_VARIABLE GIT_CALL_RESULT

1 0

01/01: [MSHTA] Implement MSHTA.exe (#577) CORE-12813
by Jared Smudde 05 Jun '18

05 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76a73b429519543e959f4… commit 76a73b429519543e959f411f661915b9114fd241 Author: Jared Smudde <computerwhiz02(a)hotmail.com> AuthorDate: Tue Jun 5 10:17:00 2018 -0500 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jun 5 17:17:00 2018 +0200 [MSHTA] Implement MSHTA.exe (#577) CORE-12813 Implement mshta.exe. It links directly to the function RunHTMLApplication in mshtml and passes the file name and other optional arguments along. While the function is unimplemented in mshtml, it's a start. [MSHTML] Add ADD_IMPORTLIB to CMakeLists so mshta can link to mshtml. [BOOTDATA] Add the association information for mshta.exe to the registry. --- base/applications/CMakeLists.txt | 1 + base/applications/mshta/CMakeLists.txt | 6 ++++++ base/applications/mshta/main.c | 18 ++++++++++++++++++ base/applications/mshta/mshta.ico | Bin 0 -> 5430 bytes base/applications/mshta/mshta.rc | 7 +++++++ boot/bootdata/hivecls.inf | 6 ++++++ dll/win32/mshtml/CMakeLists.txt | 2 +- 7 files changed, 39 insertions(+), 1 deletion(-) diff --git a/base/applications/CMakeLists.txt b/base/applications/CMakeLists.txt index 2af017dff5..4c7677abdc 100644 --- a/base/applications/CMakeLists.txt +++ b/base/applications/CMakeLists.txt @@ -23,6 +23,7 @@ add_subdirectory(mplay32) add_subdirectory(msconfig) add_subdirectory(msconfig_new) add_subdirectory(mscutils) +add_subdirectory(mshta) add_subdirectory(mspaint) add_subdirectory(mstsc) add_subdirectory(network) diff --git a/base/applications/mshta/CMakeLists.txt b/base/applications/mshta/CMakeLists.txt new file mode 100644 index 0000000000..e34b8228f2 --- /dev/null +++ b/base/applications/mshta/CMakeLists.txt @@ -0,0 +1,6 @@ + +add_executable(mshta main.c mshta.rc) +target_link_libraries(mshta) +set_module_type(mshta win32gui) +add_importlibs(mshta msvcrt mshtml kernel32 ntdll) +add_cd_file(TARGET mshta DESTINATION reactos/system32 FOR all) diff --git a/base/applications/mshta/main.c b/base/applications/mshta/main.c new file mode 100644 index 0000000000..b7a47d047d --- /dev/null +++ b/base/applications/mshta/main.c @@ -0,0 +1,18 @@ +/* + * PROJECT: ReactOS HTML Application Host + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Forwards HTA application information to mshtml + * COPYRIGHT: Copyright 2017-2018 Jared Smudde(computerwhiz02(a)hotmail.com) + */ + +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <mshtml.h> + +extern DWORD WINAPI RunHTMLApplication(HINSTANCE hinst, HINSTANCE hPrevInst, LPSTR szCmdLine, int nCmdShow); + +int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR cmdline, int cmdshow) +{ + return RunHTMLApplication(hInst, hPrevInst, cmdline, cmdshow); +} diff --git a/base/applications/mshta/mshta.ico b/base/applications/mshta/mshta.ico new file mode 100644 index 0000000000..c0ab82c23c Binary files /dev/null and b/base/applications/mshta/mshta.ico differ diff --git a/base/applications/mshta/mshta.rc b/base/applications/mshta/mshta.rc new file mode 100644 index 0000000000..6865b5de3e --- /dev/null +++ b/base/applications/mshta/mshta.rc @@ -0,0 +1,7 @@ +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS HTML Application Host" +#define REACTOS_STR_INTERNAL_NAME "mshta" +#define REACTOS_STR_ORIGINAL_FILENAME "mshta.exe" + +#include <reactos/version.rc> + +1 ICON "mshta.ico" diff --git a/boot/bootdata/hivecls.inf b/boot/bootdata/hivecls.inf index 1568b545f5..61d6f4f318 100644 --- a/boot/bootdata/hivecls.inf +++ b/boot/bootdata/hivecls.inf @@ -216,6 +216,12 @@ HKCR,"chm.file","",0x00000000,%CHMFILE% HKCR,"chm.file\DefaultIcon","",0x00020000,"%SystemRoot%\hh.exe,0" HKCR,"chm.file\shell\open\command","",0x00020000,"%SystemRoot%\hh.exe %1" +; HTA Files +HKCR,".hta","",0x00000000,"htafile" +HKCR,"htafile","",0x00000000,"HTML Application" +HKCR,"htafile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\mshta.exe,-1" +HKCR,"htafile\shell\open\command","",0x00020000,"%SystemRoot%\system32\mshta.exe ""%1"" %*" + ; set MIME type for .html and .htm because Tiny webserver needs it HKCR,".htm","",0x00000000,"htmlfile" HKCR,".htm","Content Type",0x00000000,"text/html" diff --git a/dll/win32/mshtml/CMakeLists.txt b/dll/win32/mshtml/CMakeLists.txt index 5db472483d..1b93bfa575 100644 --- a/dll/win32/mshtml/CMakeLists.txt +++ b/dll/win32/mshtml/CMakeLists.txt @@ -8,7 +8,7 @@ add_definitions( include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) add_idl_headers(mshtml_nsiface_header nsiface.idl) -spec2def(mshtml.dll mshtml.spec) +spec2def(mshtml.dll mshtml.spec ADD_IMPORTLIB) list(APPEND SOURCE conpoint.c

1 0

01/01: [NTOS:CC] Access SectionObjectPointers without lock in CcRosInitializeFileCache. CORE-14691
by Thomas Faber 05 Jun '18

05 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1d398057a3394298d2b25… commit 1d398057a3394298d2b251862f383d6eb27142f1 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Mon Jun 4 14:36:07 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Tue Jun 5 16:24:13 2018 +0200 [NTOS:CC] Access SectionObjectPointers without lock in CcRosInitializeFileCache. CORE-14691 kmtest:NtCreateSection calls CcInitializeCacheMap with a NULL value for SectionObjectPointers. This will cause an exception when trying to access it, which in Windows can be handled gracefully. However accessing it while holding ViewLock means the lock will not be released, leading to an APC_INDEX_MISMATCH bugcheck. This solves the problem by allocating SharedCacheMap outside the lock, then freeing it again under lock if another thread has updated SharedCacheMap in the mean time. This is also What Windows Does(TM). --- ntoskrnl/cc/view.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 1909c8bb1e..6a087e6531 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -1394,7 +1394,6 @@ CcRosInitializeFileCache ( DPRINT("CcRosInitializeFileCache(FileObject 0x%p)\n", FileObject); Allocated = FALSE; - KeAcquireGuardedMutex(&ViewLock); SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; if (SharedCacheMap == NULL) { @@ -1402,14 +1401,9 @@ CcRosInitializeFileCache ( SharedCacheMap = ExAllocateFromNPagedLookasideList(&SharedCacheMapLookasideList); if (SharedCacheMap == NULL) { - KeReleaseGuardedMutex(&ViewLock); return STATUS_INSUFFICIENT_RESOURCES; } RtlZeroMemory(SharedCacheMap, sizeof(*SharedCacheMap)); - ObReferenceObjectByPointer(FileObject, - FILE_ALL_ACCESS, - NULL, - KernelMode); SharedCacheMap->NodeTypeCode = NODE_TYPE_SHARED_MAP; SharedCacheMap->NodeByteSize = sizeof(*SharedCacheMap); SharedCacheMap->FileObject = FileObject; @@ -1423,11 +1417,28 @@ CcRosInitializeFileCache ( InitializeListHead(&SharedCacheMap->PrivateList); KeInitializeSpinLock(&SharedCacheMap->CacheMapLock); InitializeListHead(&SharedCacheMap->CacheMapVacbListHead); - FileObject->SectionObjectPointer->SharedCacheMap = SharedCacheMap; + } - OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); - InsertTailList(&CcCleanSharedCacheMapList, &SharedCacheMap->SharedCacheMapLinks); - KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); + KeAcquireGuardedMutex(&ViewLock); + if (Allocated) + { + if (FileObject->SectionObjectPointer->SharedCacheMap == NULL) + { + ObReferenceObjectByPointer(FileObject, + FILE_ALL_ACCESS, + NULL, + KernelMode); + FileObject->SectionObjectPointer->SharedCacheMap = SharedCacheMap; + + OldIrql = KeAcquireQueuedSpinLock(LockQueueMasterLock); + InsertTailList(&CcCleanSharedCacheMapList, &SharedCacheMap->SharedCacheMapLinks); + KeReleaseQueuedSpinLock(LockQueueMasterLock, OldIrql); + } + else + { + ExFreeToNPagedLookasideList(&SharedCacheMapLookasideList, SharedCacheMap); + SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; + } } if (FileObject->PrivateCacheMap == NULL) {

1 0

01/01: [FONTS] Delete 16px bitmap from Tahoma Bold
by Katayama Hirofumi MZ 05 Jun '18

05 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2355838fbb91c3b857025… commit 2355838fbb91c3b857025af3af55c77151347c26 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jun 5 08:20:25 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jun 5 15:57:45 2018 +0200 [FONTS] Delete 16px bitmap from Tahoma Bold --- media/fonts/tahomabd.ttf | Bin 200136 -> 184696 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/tahomabd.ttf b/media/fonts/tahomabd.ttf index d3c47d0fb0..651e09ce7a 100644 Binary files a/media/fonts/tahomabd.ttf and b/media/fonts/tahomabd.ttf differ

1 0

01/01: [OLE32_WINETEST] Fix MSVC build.
by Thomas Faber 05 Jun '18

05 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a1206c5f823666bfd4e4… commit 1a1206c5f823666bfd4e484ea9d62f0ac2419d9b Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Jun 5 11:36:30 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Tue Jun 5 14:40:32 2018 +0200 [OLE32_WINETEST] Fix MSVC build. --- modules/rostests/winetests/ole32/marshal.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/rostests/winetests/ole32/marshal.c b/modules/rostests/winetests/ole32/marshal.c index 1fcf9a392a..943321b609 100644 --- a/modules/rostests/winetests/ole32/marshal.c +++ b/modules/rostests/winetests/ole32/marshal.c @@ -560,12 +560,12 @@ static IPSFactoryBuffer PSFactoryBuffer = { &PSFactoryBufferVtbl }; struct host_object_data { IStream *stream; - IID iid; + const IID *iid; IUnknown *object; MSHLFLAGS marshal_flags; IMessageFilter *filter; IUnknown *register_object; - CLSID register_clsid; + const CLSID *register_clsid; HANDLE marshal_event; }; @@ -583,7 +583,7 @@ static DWORD CALLBACK host_object_proc(LPVOID p) pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); if(data->register_object) { - hr = CoRegisterClassObject(&data->register_clsid, data->register_object, + hr = CoRegisterClassObject(data->register_clsid, data->register_object, CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &registration_key); ok(hr == S_OK, "CoRegisterClassObject failed: %08x\n", hr); } @@ -596,7 +596,7 @@ static DWORD CALLBACK host_object_proc(LPVOID p) ok_ole_success(hr, CoRegisterMessageFilter); } - hr = CoMarshalInterface(data->stream, &data->iid, data->object, MSHCTX_INPROC, NULL, data->marshal_flags); + hr = CoMarshalInterface(data->stream, data->iid, data->object, MSHCTX_INPROC, NULL, data->marshal_flags); ok_ole_success(hr, CoMarshalInterface); /* force the message queue to be created before signaling parent thread */ @@ -641,7 +641,7 @@ static DWORD start_host_object2(struct host_object_data *object_data, HANDLE *th static DWORD start_host_object(IStream *stream, REFIID riid, IUnknown *object, MSHLFLAGS marshal_flags, HANDLE *thread) { - struct host_object_data object_data = { stream, *riid, object, marshal_flags }; + struct host_object_data object_data = { stream, riid, object, marshal_flags }; return start_host_object2(&object_data, thread); } @@ -1256,9 +1256,9 @@ static void test_marshal_channel_buffer(void) HANDLE thread; HRESULT hr; - struct host_object_data object_data = { NULL, IID_IOleClientSite, (IUnknown*)&Test_OleClientSite, + struct host_object_data object_data = { NULL, &IID_IOleClientSite, (IUnknown*)&Test_OleClientSite, MSHLFLAGS_NORMAL, NULL, (IUnknown*)&PSFactoryBuffer, - CLSID_WineTestPSFactoryBuffer }; + &CLSID_WineTestPSFactoryBuffer }; cLocks = 0; external_connections = 0; @@ -2323,7 +2323,7 @@ static void test_message_filter(void) IMessageFilter *prev_filter = NULL; HANDLE thread; - struct host_object_data object_data = { NULL, IID_IClassFactory, (IUnknown*)&Test_ClassFactory, + struct host_object_data object_data = { NULL, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHLFLAGS_NORMAL, &MessageFilter }; cLocks = 0; @@ -4215,7 +4215,7 @@ static void test_channel_hook(void) HANDLE thread; HRESULT hr; - struct host_object_data object_data = { NULL, IID_IClassFactory, (IUnknown*)&Test_ClassFactory, + struct host_object_data object_data = { NULL, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHLFLAGS_NORMAL, &MessageFilter }; hr = CoRegisterChannelHook(&EXTENTID_WineTest, &TestChannelHook);

1 0

01/01: [JSCRIPT] Fix MSVC build.
by Thomas Faber 04 Jun '18

04 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c6f49f5394683f3420550… commit c6f49f5394683f3420550271129d725bbe544552 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Mon Jun 4 20:25:13 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Mon Jun 4 20:26:14 2018 +0200 [JSCRIPT] Fix MSVC build. --- dll/win32/jscript/dispex.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/win32/jscript/dispex.c b/dll/win32/jscript/dispex.c index 9b47368cf8..65ca47a515 100644 --- a/dll/win32/jscript/dispex.c +++ b/dll/win32/jscript/dispex.c @@ -1793,6 +1793,7 @@ HRESULT jsdisp_define_property(jsdisp_t *obj, const WCHAR *name, property_desc_t HRESULT jsdisp_define_data_property(jsdisp_t *obj, const WCHAR *name, unsigned flags, jsval_t value) { - property_desc_t prop_desc = { flags, flags, TRUE, value }; + property_desc_t prop_desc = { flags, flags, TRUE }; + prop_desc.value = value; return jsdisp_define_property(obj, name, &prop_desc); }

1 0

01/01: [XMLLITE_WINETEST] Sync with Wine Staging 3.9. CORE-14656
by Amine Khaldi 04 Jun '18

04 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1074ede011d7014fc01ec… commit 1074ede011d7014fc01ec29c0e48d150e82951f7 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Jun 4 03:59:33 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Jun 4 03:59:33 2018 +0100 [XMLLITE_WINETEST] Sync with Wine Staging 3.9. CORE-14656 --- modules/rostests/winetests/xmllite/reader.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/rostests/winetests/xmllite/reader.c b/modules/rostests/winetests/xmllite/reader.c index e8e504a0f5..41adad1598 100644 --- a/modules/rostests/winetests/xmllite/reader.c +++ b/modules/rostests/winetests/xmllite/reader.c @@ -32,10 +32,6 @@ #include "wine/test.h" #include "wine/heap.h" -#ifndef __REACTOS__ -#define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0])) -#endif - DEFINE_GUID(IID_IXmlReaderInput, 0x0b3ccc9b, 0x9214, 0x428b, 0xa2, 0xae, 0xef, 0x3a, 0xa8, 0x71, 0xaf, 0xda); static WCHAR *a2w(const char *str)

1 0

01/01: [WTSAPI32] Sync with Wine Staging 3.9. CORE-14656
by Amine Khaldi 04 Jun '18

04 Jun '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f554481baf886de6d4572… commit f554481baf886de6d457230ed8a4233b8f00099d Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Jun 4 03:59:11 2018 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Mon Jun 4 03:59:11 2018 +0100 [WTSAPI32] Sync with Wine Staging 3.9. CORE-14656 --- dll/win32/wtsapi32/CMakeLists.txt | 2 +- dll/win32/wtsapi32/wtsapi32.c | 16 +++++++++++++++- media/doc/README.WINE | 2 +- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dll/win32/wtsapi32/CMakeLists.txt b/dll/win32/wtsapi32/CMakeLists.txt index b7c19e5cc3..6c58733791 100644 --- a/dll/win32/wtsapi32/CMakeLists.txt +++ b/dll/win32/wtsapi32/CMakeLists.txt @@ -11,5 +11,5 @@ list(APPEND SOURCE add_library(wtsapi32 SHARED ${SOURCE}) set_module_type(wtsapi32 win32dll) target_link_libraries(wtsapi32 wine) -add_importlibs(wtsapi32 msvcrt kernel32 ntdll) +add_importlibs(wtsapi32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET wtsapi32 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/wtsapi32/wtsapi32.c b/dll/win32/wtsapi32/wtsapi32.c index fad7aa8d7d..f684dd9058 100644 --- a/dll/win32/wtsapi32/wtsapi32.c +++ b/dll/win32/wtsapi32/wtsapi32.c @@ -25,6 +25,7 @@ #include "wine/winternl.h" #include "wtsapi32.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(wtsapi); @@ -241,7 +242,7 @@ BOOL WINAPI WTSEnumerateSessionsW(HANDLE hServer, DWORD Reserved, DWORD Version, */ void WINAPI WTSFreeMemory(PVOID pMemory) { - HeapFree(GetProcessHeap(), 0, pMemory); + heap_free(pMemory); } /************************************************************ @@ -305,6 +306,19 @@ BOOL WINAPI WTSQuerySessionInformationW( FIXME("Stub %p 0x%08x %d %p %p\n", hServer, SessionId, WTSInfoClass, Buffer, BytesReturned); + if (WTSInfoClass == WTSUserName) + { + WCHAR *username; + DWORD count = 0; + + GetUserNameW(NULL, &count); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return FALSE; + if (!(username = heap_alloc(count * sizeof(WCHAR)))) return FALSE; + GetUserNameW(username, &count); + *Buffer = username; + *BytesReturned = count * sizeof(WCHAR); + return TRUE; + } return FALSE; } diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 9d019760d2..c71caf4196 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -212,7 +212,7 @@ reactos/dll/win32/wmi # Synced to WineStaging-2.9 reactos/dll/win32/wmiutils # Synced to WineStaging-3.3 reactos/dll/win32/wmvcore # Synced to WineStaging-3.9 reactos/dll/win32/wshom.ocx # Synced to WineStaging-3.3 -reactos/dll/win32/wtsapi32 # Synced to WineStaging-3.3 +reactos/dll/win32/wtsapi32 # Synced to WineStaging-3.9 reactos/dll/win32/wuapi # Synced to WineStaging-3.3 reactos/dll/win32/xinput1_1 # Synced to WineStaging-2.9 reactos/dll/win32/xinput1_2 # Synced to WineStaging-2.9

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