Ros-diffs November 2019

ros-diffs@reactos.org

24 participants
322 discussions

[reactos] 01/01: [SECUR32_WINETEST] Sync with Wine Staging 4.18. CORE-16441

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b5283b702731c6f484c0… commit 2b5283b702731c6f484c0175225fa36f4260039d Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Nov 30 14:48:48 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Nov 30 14:48:48 2019 +0100 [SECUR32_WINETEST] Sync with Wine Staging 4.18. CORE-16441 --- modules/rostests/winetests/secur32/negotiate.c | 4 +++- modules/rostests/winetests/secur32/ntlm.c | 4 +++- modules/rostests/winetests/secur32/schannel.c | 24 +++++++++++++++--------- modules/rostests/winetests/secur32/secur32.c | 4 +++- 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/modules/rostests/winetests/secur32/negotiate.c b/modules/rostests/winetests/secur32/negotiate.c index 095aee6cb57..5e5beed7f77 100644 --- a/modules/rostests/winetests/secur32/negotiate.c +++ b/modules/rostests/winetests/secur32/negotiate.c @@ -297,7 +297,9 @@ static void test_authentication(void) ok( pi->fCapabilities == NTLM_BASE_CAPS || pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_READONLY_WITH_CHECKSUM) || pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS) || - pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS| + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS|SECPKG_FLAG_APPCONTAINER_CHECKS) || + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS|SECPKG_FLAG_APPLY_LOOPBACK) || + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS|SECPKG_FLAG_APPLY_LOOPBACK| SECPKG_FLAG_APPCONTAINER_CHECKS), "got %08x\n", pi->fCapabilities ); ok( pi->wVersion == 1, "got %u\n", pi->wVersion ); diff --git a/modules/rostests/winetests/secur32/ntlm.c b/modules/rostests/winetests/secur32/ntlm.c index 6b1249d2017..930a49e451b 100644 --- a/modules/rostests/winetests/secur32/ntlm.c +++ b/modules/rostests/winetests/secur32/ntlm.c @@ -929,7 +929,9 @@ static void testAuth(ULONG data_rep, BOOL fake) ok(pi->fCapabilities == NTLM_BASE_CAPS || pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_READONLY_WITH_CHECKSUM) || pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS) || - pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS| + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS|SECPKG_FLAG_APPCONTAINER_CHECKS) || + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS|SECPKG_FLAG_APPLY_LOOPBACK) || + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS|SECPKG_FLAG_APPLY_LOOPBACK| SECPKG_FLAG_APPCONTAINER_CHECKS), "got %08x\n", pi->fCapabilities); ok(pi->wVersion == 1, "got %u\n", pi->wVersion); diff --git a/modules/rostests/winetests/secur32/schannel.c b/modules/rostests/winetests/secur32/schannel.c index ebdfcb61a13..217dbe8dfaa 100644 --- a/modules/rostests/winetests/secur32/schannel.c +++ b/modules/rostests/winetests/secur32/schannel.c @@ -435,11 +435,13 @@ static void testAcquireSecurityContext(void) ok(ret, "CertSetCertificateContextProperty failed: %08x\n", GetLastError()); st = AcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, &schanCred, NULL, NULL, &cred, NULL); - ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_INTERNAL_ERROR /* WinNT */, + ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_INTERNAL_ERROR /* WinNT */ || + st == SEC_E_INSUFFICIENT_MEMORY /* win10 */, "Expected SEC_E_UNKNOWN_CREDENTIALS or SEC_E_INTERNAL_ERROR, got %08x\n", st); st = AcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, NULL, &schanCred, NULL, NULL, &cred, NULL); - ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_INTERNAL_ERROR /* WinNT */, + ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_INTERNAL_ERROR /* WinNT */ || + st == SEC_E_INSUFFICIENT_MEMORY /* win10 */, "Expected SEC_E_UNKNOWN_CREDENTIALS or SEC_E_INTERNAL_ERROR, got %08x\n", st); ret = CryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, @@ -489,12 +491,13 @@ static void testAcquireSecurityContext(void) schanCred.dwVersion = SCH_CRED_V3; st = AcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, &schanCred, NULL, NULL, &cred, NULL); - ok(st == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", st); + ok(st == SEC_E_OK || st == SEC_E_INSUFFICIENT_MEMORY /* win10 */, + "AcquireCredentialsHandleA failed: %08x\n", st); FreeCredentialsHandle(&cred); st = AcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, NULL, &schanCred, NULL, NULL, &cred, NULL); - ok(st == SEC_E_OK || - st == SEC_E_UNKNOWN_CREDENTIALS, /* win2k3 */ + ok(st == SEC_E_OK || st == SEC_E_UNKNOWN_CREDENTIALS /* win2k3 */ || + st == SEC_E_INSUFFICIENT_MEMORY /* win10 */, "AcquireCredentialsHandleA failed: %08x\n", st); FreeCredentialsHandle(&cred); schanCred.dwVersion = SCHANNEL_CRED_VERSION; @@ -533,7 +536,7 @@ static void testAcquireSecurityContext(void) st == SEC_E_INVALID_TOKEN /* WinNT */, "st = %08x\n", st); st = AcquireCredentialsHandleA(NULL, unisp_name_a, SECPKG_CRED_INBOUND, NULL, &schanCred, NULL, NULL, &cred, NULL); - ok(st == SEC_E_UNKNOWN_CREDENTIALS, + ok(st == SEC_E_UNKNOWN_CREDENTIALS || st == SEC_E_NO_CREDENTIALS, "Expected SEC_E_UNKNOWN_CREDENTIALS, got %08x\n", st); /* FIXME: what about two valid certs? */ @@ -843,7 +846,7 @@ todo_wine buffers[1].pBuffers[0].cbBuffer = ret; status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", - ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM|ISC_REQ_USE_SUPPLIED_CREDS, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); buffers[1].pBuffers[0].cbBuffer = buf_size; while (status == SEC_I_CONTINUE_NEEDED) @@ -860,17 +863,20 @@ todo_wine buf->BufferType = SECBUFFER_TOKEN; status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", - ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, + ISC_REQ_USE_SUPPLIED_CREDS, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); buffers[1].pBuffers[0].cbBuffer = buf_size; } ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n"); - ok(status == SEC_E_OK, "InitializeSecurityContext failed: %08x\n", status); + ok(status == SEC_E_OK || broken(status == SEC_E_ILLEGAL_MESSAGE) /* winxp */, + "InitializeSecurityContext failed: %08x\n", status); if(status != SEC_E_OK) { skip("Handshake failed\n"); return; } + ok(attrs == (ISC_RET_REPLAY_DETECT|ISC_RET_SEQUENCE_DETECT|ISC_RET_CONFIDENTIALITY|ISC_RET_STREAM|ISC_RET_USED_SUPPLIED_CREDS), + "got %08x\n", attrs); status = QueryCredentialsAttributesA(&cred_handle, SECPKG_CRED_ATTR_NAMES, &names); ok(status == SEC_E_NO_CREDENTIALS || status == SEC_E_UNSUPPORTED_FUNCTION /* before Vista */, "expected SEC_E_NO_CREDENTIALS, got %08x\n", status); diff --git a/modules/rostests/winetests/secur32/secur32.c b/modules/rostests/winetests/secur32/secur32.c index 2d2c2a69255..8fd421ca732 100644 --- a/modules/rostests/winetests/secur32/secur32.c +++ b/modules/rostests/winetests/secur32/secur32.c @@ -440,7 +440,9 @@ static void test_kerberos(void) | SECPKG_FLAG_READONLY_WITH_CHECKSUM; static const ULONG optional_mask = SECPKG_FLAG_RESTRICTED_TOKENS - | SECPKG_FLAG_APPCONTAINER_CHECKS; + | SECPKG_FLAG_APPCONTAINER_CHECKS + | 0x02000000; /* not defined in the SDK */ + status = QuerySecurityPackageInfoA(provider, &info); ok(status == SEC_E_OK, "Kerberos package not installed, skipping test\n");

4 years, 10 months

[reactos] 01/01: [PSDK] Add SECPKG_FLAG_APPLY_LOOPBACK. CORE-16441

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=54be41be6b79ea9a1bf1b… commit 54be41be6b79ea9a1bf1b267a5e4580d1b7b9535 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Nov 30 14:48:23 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Nov 30 14:48:23 2019 +0100 [PSDK] Add SECPKG_FLAG_APPLY_LOOPBACK. CORE-16441 --- sdk/include/psdk/sspi.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/include/psdk/sspi.h b/sdk/include/psdk/sspi.h index 940f55a1c6e..c436fd85724 100644 --- a/sdk/include/psdk/sspi.h +++ b/sdk/include/psdk/sspi.h @@ -134,6 +134,7 @@ typedef struct _SecPkgInfoW #define SECPKG_FLAG_NEGOTIABLE2 0x00200000 #define SECPKG_FLAG_APPCONTAINER_PASSTHROUGH 0x00400000 #define SECPKG_FLAG_APPCONTAINER_CHECKS 0x00800000 +#define SECPKG_FLAG_APPLY_LOOPBACK 0x02000000 typedef struct _SecBuffer { ULONG cbBuffer;

4 years, 10 months

[reactos] 01/01: [SCRRUN_WINETEST] Sync with Wine Staging 4.18. CORE-16441

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=465ab8e0c3020566d9d80… commit 465ab8e0c3020566d9d8059d085238a6e4b1a454 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Nov 30 14:47:55 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Nov 30 14:47:55 2019 +0100 [SCRRUN_WINETEST] Sync with Wine Staging 4.18. CORE-16441 --- modules/rostests/winetests/scrrun/filesystem.c | 202 ++++++++++++++++++++++--- 1 file changed, 181 insertions(+), 21 deletions(-) diff --git a/modules/rostests/winetests/scrrun/filesystem.c b/modules/rostests/winetests/scrrun/filesystem.c index 29ee73f2433..3b4af3c4986 100644 --- a/modules/rostests/winetests/scrrun/filesystem.c +++ b/modules/rostests/winetests/scrrun/filesystem.c @@ -973,6 +973,61 @@ static void test_GetFolder(void) IFolder_Release(folder); } +static void _test_clone(IEnumVARIANT *enumvar, BOOL position_inherited, LONG count, int line) +{ + HRESULT hr; + IEnumVARIANT *clone; + ULONG fetched; + VARIANT var, var2; + + hr = IEnumVARIANT_Reset(enumvar); + ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); + + VariantInit(&var); + fetched = -1; + hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); + ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); + ok(fetched == 1, "%d: got %d\n", line, fetched); + + /* clone enumerator */ + hr = IEnumVARIANT_Clone(enumvar, &clone); + ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); + ok(clone != enumvar, "%d: got %p, %p\n", line, enumvar, clone); + + /* check if clone inherits position */ + VariantInit(&var2); + fetched = -1; + hr = IEnumVARIANT_Next(clone, 1, &var2, &fetched); + if (position_inherited && count == 1) + { + ok(hr == S_FALSE, "%d: got 0x%08x\n", line, hr); + ok(fetched == 0, "%d: got %d\n", line, fetched); + } + else + { + ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); + ok(fetched == 1, "%d: got %d\n", line, fetched); + if (!position_inherited) + todo_wine ok(V_DISPATCH(&var) == V_DISPATCH(&var2), "%d: values don't match\n", line); + else + { + fetched = -1; + hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); + ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); + ok(fetched == 1, "%d: got %d\n", line, fetched); + todo_wine ok(V_DISPATCH(&var) == V_DISPATCH(&var2), "%d: values don't match\n", line); + } + } + + VariantClear(&var2); + VariantClear(&var); + IEnumVARIANT_Release(clone); + + hr = IEnumVARIANT_Reset(enumvar); + ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); +} +#define test_clone(a, b, c) _test_clone(a, b, c, __LINE__) + /* Please keep the tests for IFolderCollection and IFileCollection in sync */ static void test_FolderCollection(void) { @@ -982,7 +1037,7 @@ static void test_FolderCollection(void) static const WCHAR cW[] = {'\\','c',0}; IFolderCollection *folders; WCHAR buffW[MAX_PATH], pathW[MAX_PATH]; - IEnumVARIANT *enumvar, *clone; + IEnumVARIANT *enumvar; LONG count, ref, ref2, i; IUnknown *unk, *unk2; IFolder *folder; @@ -1068,14 +1123,7 @@ static void test_FolderCollection(void) ref2 = GET_REFCOUNT(folders); ok(ref2 == ref, "got %d, %d\n", ref2, ref); - /* clone enumerator */ - hr = IEnumVARIANT_Clone(enumvar, &clone); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(clone != enumvar, "got %p, %p\n", enumvar, clone); - IEnumVARIANT_Release(clone); - - hr = IEnumVARIANT_Reset(enumvar); - ok(hr == S_OK, "got 0x%08x\n", hr); + test_clone(enumvar, FALSE, count); for (i = 0; i < 3; i++) { @@ -1165,7 +1213,7 @@ static void test_FileCollection(void) IFolder *folder; IFileCollection *files; IFile *file; - IEnumVARIANT *enumvar, *clone; + IEnumVARIANT *enumvar; LONG count, ref, ref2, i; IUnknown *unk, *unk2; ULONG fetched; @@ -1245,14 +1293,7 @@ static void test_FileCollection(void) ref2 = GET_REFCOUNT(files); ok(ref2 == ref, "got %d, %d\n", ref2, ref); - /* clone enumerator */ - hr = IEnumVARIANT_Clone(enumvar, &clone); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(clone != enumvar, "got %p, %p\n", enumvar, clone); - IEnumVARIANT_Release(clone); - - hr = IEnumVARIANT_Reset(enumvar); - ok(hr == S_OK, "got 0x%08x\n", hr); + test_clone(enumvar, FALSE, count); for (i = 0; i < 3; i++) { @@ -1366,9 +1407,7 @@ static void test_DriveCollection(void) hr = IEnumVARIANT_Skip(enumvar, 1); ok(hr == S_FALSE, "got 0x%08x\n", hr); - /* reset and iterate again */ - hr = IEnumVARIANT_Reset(enumvar); - ok(hr == S_OK, "got 0x%08x\n", hr); + test_clone(enumvar, TRUE, count); while (IEnumVARIANT_Next(enumvar, 1, &var, &fetched) == S_OK) { IDrive *drive = (IDrive*)V_DISPATCH(&var); @@ -1857,6 +1896,127 @@ todo_wine SysFreeString(str); ITextStream_Release(stream); + /* default read will use Unicode */ + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateUseDefault, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + lstrcpyW(buffW, nameW); + lstrcatW(buffW, crlfW); + lstrcatW(buffW, secondlineW); + lstrcatW(buffW, crlfW); + str = NULL; + hr = ITextStream_Read(stream, 500, &str); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); + ok(!lstrcmpW(buffW, str), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + ITextStream_Release(stream); + + /* default append will use Unicode */ + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForAppending, VARIANT_FALSE, TristateUseDefault, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = SysAllocString(L"123"); + hr = ITextStream_Write(stream, str); + ok(hr == S_OK, "got %08x\n", hr); + SysFreeString(str); + + ITextStream_Release(stream); + + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateTrue, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + lstrcatW(buffW, L"123"); + str = NULL; + hr = ITextStream_Read(stream, 500, &str); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); + ok(!lstrcmpW(buffW, str), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + ITextStream_Release(stream); + + /* default write will use ASCII */ + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForWriting, VARIANT_FALSE, TristateUseDefault, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = SysAllocString(L"123"); + hr = ITextStream_Write(stream, str); + ok(hr == S_OK, "got %08x\n", hr); + SysFreeString(str); + + ITextStream_Release(stream); + + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = (void*)0xdeadbeef; + hr = ITextStream_Read(stream, 500, &str); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); + ok(!wcscmp(str, L"123"), "got %s\n", wine_dbgstr_w(str)); + + ITextStream_Release(stream); + /* ASCII file, read with default stream */ + hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_TRUE, VARIANT_FALSE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + str = SysAllocString(L"test"); + hr = ITextStream_Write(stream, str); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + ITextStream_Release(stream); + + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateUseDefault, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = (void*)0xdeadbeef; + hr = ITextStream_Read(stream, 500, &str); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); + ok(!wcscmp(str, L"test"), "got %s\n", wine_dbgstr_w(str)); + + ITextStream_Release(stream); + + /* default append will use Unicode */ + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForAppending, VARIANT_FALSE, TristateUseDefault, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = SysAllocString(L"123"); + hr = ITextStream_Write(stream, str); + ok(hr == S_OK, "got %08x\n", hr); + SysFreeString(str); + + ITextStream_Release(stream); + + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = NULL; + hr = ITextStream_Read(stream, 500, &str); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); + ok(!lstrcmpW(L"test123", str), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + ITextStream_Release(stream); + + /* default write will use ASCII as well */ + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForWriting, VARIANT_FALSE, TristateUseDefault, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = SysAllocString(L"test string"); + hr = ITextStream_Write(stream, str); + ok(hr == S_OK, "got %08x\n", hr); + SysFreeString(str); + + ITextStream_Release(stream); + + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = (void*)0xdeadbeef; + hr = ITextStream_Read(stream, 500, &str); + ok(hr == S_FALSE || broken(hr == S_OK) /* win2003 */, "got 0x%08x\n", hr); + ok(!wcscmp(str, L"test string"), "got %s\n", wine_dbgstr_w(str)); + + ITextStream_Release(stream); + /* ASCII file, read with Unicode stream */ /* 1. one byte content, not enough for Unicode read */ hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_TRUE, VARIANT_FALSE, &stream);

4 years, 10 months

[reactos] 01/01: [SCRRUN] Sync with Wine Staging 4.18. CORE-16441

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=39343ec6e17d2f1f9166d… commit 39343ec6e17d2f1f9166da7352e46b702511ac37 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Nov 30 14:47:27 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Nov 30 14:47:27 2019 +0100 [SCRRUN] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/scrrun/dictionary.c | 13 ++-- dll/win32/scrrun/filesystem.c | 142 +++++++++++++++++++++++------------------- dll/win32/scrrun/scrrun.c | 1 - media/doc/README.WINE | 2 +- 4 files changed, 87 insertions(+), 71 deletions(-) diff --git a/dll/win32/scrrun/dictionary.c b/dll/win32/scrrun/dictionary.c index 681274e3218..7cddc743d87 100644 --- a/dll/win32/scrrun/dictionary.c +++ b/dll/win32/scrrun/dictionary.c @@ -18,10 +18,12 @@ */ #define COBJMACROS -#include "config.h" -#include "wine/port.h" - +#ifdef __REACTOS__ +#include <wine/config.h> +#include <wine/port.h> +#endif #include <stdarg.h> +#include <math.h> #include "windef.h" #include "winbase.h" @@ -32,7 +34,6 @@ #include "scrrun_private.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/heap.h" #include "wine/list.h" @@ -125,7 +126,7 @@ static inline int strcmp_key(const dictionary *dict, const VARIANT *key1, const str1 = get_key_strptr(key1); str2 = get_key_strptr(key2); - return dict->method == BinaryCompare ? strcmpW(str1, str2) : strcmpiW(str1, str2); + return dict->method == BinaryCompare ? wcscmp(str1, str2) : wcsicmp(str1, str2); } static BOOL is_matching_key(const dictionary *dict, const struct keyitem_pair *pair, const VARIANT *key, DWORD hash) @@ -754,7 +755,7 @@ static DWORD get_str_hash(const WCHAR *str, CompareMethod method) while (*str) { WCHAR ch; - ch = (method == TextCompare || method == DatabaseCompare) ? tolowerW(*str) : *str; + ch = (method == TextCompare || method == DatabaseCompare) ? towlower(*str) : *str; hash += (hash << 4) + ch; str++; diff --git a/dll/win32/scrrun/filesystem.c b/dll/win32/scrrun/filesystem.c index 7a162a27764..c15ff5636ef 100644 --- a/dll/win32/scrrun/filesystem.c +++ b/dll/win32/scrrun/filesystem.c @@ -18,9 +18,11 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include <limits.h> +#ifdef __REACTOS__ +#include <wchar.h> +#endif #include "windef.h" #include "winbase.h" @@ -32,7 +34,6 @@ #include "scrrun_private.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/heap.h" #ifdef __REACTOS__ @@ -201,6 +202,7 @@ static HRESULT create_folder(const WCHAR*, IFolder**); static HRESULT create_file(BSTR, IFile**); static HRESULT create_foldercoll_enum(struct foldercollection*, IUnknown**); static HRESULT create_filecoll_enum(struct filecollection*, IUnknown**); +static HRESULT create_drivecoll_enum(struct drivecollection*, IUnknown**); static inline BOOL is_dir_data(const WIN32_FIND_DATAW *data) { @@ -208,8 +210,8 @@ static inline BOOL is_dir_data(const WIN32_FIND_DATAW *data) static const WCHAR dotW[] = {'.',0}; return (data->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && - strcmpW(data->cFileName, dotdotW) && - strcmpW(data->cFileName, dotW); + wcscmp(data->cFileName, dotdotW) && + wcscmp(data->cFileName, dotW); } static inline BOOL is_file_data(const WIN32_FIND_DATAW *data) @@ -222,10 +224,10 @@ static BSTR get_full_path(BSTR path, const WIN32_FIND_DATAW *data) int len = SysStringLen(path); WCHAR buffW[MAX_PATH]; - strcpyW(buffW, path); + lstrcpyW(buffW, path); if (path[len-1] != '\\') - strcatW(buffW, bsW); - strcatW(buffW, data->cFileName); + lstrcatW(buffW, bsW); + lstrcatW(buffW, data->cFileName); return SysAllocString(buffW); } @@ -694,7 +696,7 @@ static const ITextStreamVtbl textstreamvtbl = { textstream_Close }; -static HRESULT create_textstream(const WCHAR *filename, DWORD disposition, IOMode mode, BOOL unicode, ITextStream **ret) +static HRESULT create_textstream(const WCHAR *filename, DWORD disposition, IOMode mode, Tristate format, ITextStream **ret) { struct textstream *stream; DWORD access = 0; @@ -709,7 +711,7 @@ static HRESULT create_textstream(const WCHAR *filename, DWORD disposition, IOMod access = GENERIC_WRITE; break; case ForAppending: - access = FILE_APPEND_DATA; + access = GENERIC_READ | GENERIC_WRITE; break; default: return E_INVALIDARG; @@ -721,7 +723,6 @@ static HRESULT create_textstream(const WCHAR *filename, DWORD disposition, IOMod stream->ITextStream_iface.lpVtbl = &textstreamvtbl; stream->ref = 1; stream->mode = mode; - stream->unicode = unicode; stream->first_read = TRUE; stream->file = CreateFileW(filename, access, 0, NULL, disposition, FILE_ATTRIBUTE_NORMAL, NULL); @@ -737,14 +738,39 @@ static HRESULT create_textstream(const WCHAR *filename, DWORD disposition, IOMod else stream->size.QuadPart = 0; - /* Write Unicode BOM */ - if (unicode && mode == ForWriting && (disposition == CREATE_ALWAYS || disposition == CREATE_NEW)) { - DWORD written = 0; - BOOL ret = WriteFile(stream->file, &utf16bom, sizeof(utf16bom), &written, NULL); - if (!ret || written != sizeof(utf16bom)) { - ITextStream_Release(&stream->ITextStream_iface); - return create_error(GetLastError()); + if (mode == ForWriting) + { + stream->unicode = format == TristateTrue; + /* Write Unicode BOM */ + if (stream->unicode && (disposition == CREATE_ALWAYS || disposition == CREATE_NEW)) { + DWORD written = 0; + BOOL ret = WriteFile(stream->file, &utf16bom, sizeof(utf16bom), &written, NULL); + if (!ret || written != sizeof(utf16bom)) { + ITextStream_Release(&stream->ITextStream_iface); + return create_error(GetLastError()); + } + } + } + else + { + if (format == TristateUseDefault) + { + BYTE buf[64]; + DWORD read; + BOOL ret; + + ret = ReadFile(stream->file, buf, sizeof(buf), &read, NULL); + if (!ret) { + ITextStream_Release(&stream->ITextStream_iface); + return create_error(GetLastError()); + } + + stream->unicode = IsTextUnicode(buf, read, NULL); + if (mode == ForReading) SetFilePointer(stream->file, 0, 0, FILE_BEGIN); } + else stream->unicode = format != TristateFalse; + + if (mode == ForAppending) SetFilePointer(stream->file, 0, 0, FILE_END); } init_classinfo(&CLSID_TextStream, (IUnknown *)&stream->ITextStream_iface, &stream->classinfo); @@ -1168,11 +1194,11 @@ static HANDLE start_enumeration(const WCHAR *path, WIN32_FIND_DATAW *data, BOOL int len; HANDLE handle; - strcpyW(pathW, path); - len = strlenW(pathW); + lstrcpyW(pathW, path); + len = lstrlenW(pathW); if (len && pathW[len-1] != '\\') - strcatW(pathW, bsW); - strcatW(pathW, allW); + lstrcatW(pathW, bsW); + lstrcatW(pathW, allW); handle = FindFirstFileW(pathW, data); if (handle == INVALID_HANDLE_VALUE) return 0; @@ -1559,8 +1585,8 @@ static HRESULT WINAPI drivecoll_enumvariant_Reset(IEnumVARIANT *iface) static HRESULT WINAPI drivecoll_enumvariant_Clone(IEnumVARIANT *iface, IEnumVARIANT **pclone) { struct enumvariant *This = impl_from_IEnumVARIANT(iface); - FIXME("(%p)->(%p): stub\n", This, pclone); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pclone); + return create_drivecoll_enum(This->data.u.drivecoll.coll, (IUnknown**)pclone); } static const IEnumVARIANTVtbl drivecollenumvariantvtbl = { @@ -1741,8 +1767,8 @@ static HRESULT WINAPI foldercoll_get_Count(IFolderCollection *iface, LONG *count *count = 0; - strcpyW(pathW, This->path); - strcatW(pathW, allW); + lstrcpyW(pathW, This->path); + lstrcatW(pathW, allW); handle = FindFirstFileW(pathW, &data); if (handle == INVALID_HANDLE_VALUE) return HRESULT_FROM_WIN32(GetLastError()); @@ -1936,8 +1962,8 @@ static HRESULT WINAPI filecoll_get_Count(IFileCollection *iface, LONG *count) *count = 0; - strcpyW(pathW, This->path); - strcatW(pathW, allW); + lstrcpyW(pathW, This->path); + lstrcatW(pathW, allW); handle = FindFirstFileW(pathW, &data); if (handle == INVALID_HANDLE_VALUE) return HRESULT_FROM_WIN32(GetLastError()); @@ -2290,7 +2316,7 @@ static HRESULT WINAPI folder_get_Name(IFolder *iface, BSTR *name) *name = NULL; - ptr = strrchrW(This->path, '\\'); + ptr = wcsrchr(This->path, '\\'); if (ptr) { *name = SysAllocString(ptr+1); @@ -2640,7 +2666,7 @@ static HRESULT WINAPI file_get_Name(IFile *iface, BSTR *name) *name = NULL; - ptr = strrchrW(This->path, '\\'); + ptr = wcsrchr(This->path, '\\'); if (ptr) { *name = SysAllocString(ptr+1); @@ -2816,12 +2842,7 @@ static HRESULT WINAPI file_OpenAsTextStream(IFile *iface, IOMode mode, Tristate TRACE("(%p)->(%d %d %p)\n", This, mode, format, stream); - if (format == TristateUseDefault) { - FIXME("default format not handled, defaulting to unicode\n"); - format = TristateTrue; - } - - return create_textstream(This->path, OPEN_EXISTING, mode, format == TristateTrue, stream); + return create_textstream(This->path, OPEN_EXISTING, mode, format, stream); } static const IFileVtbl file_vtbl = { @@ -3034,9 +3055,9 @@ static HRESULT WINAPI filesys_BuildPath(IFileSystem3 *iface, BSTR Path, ret = SysAllocStringLen(NULL, path_len + name_len); if (ret) { - strcpyW(ret, Path); + lstrcpyW(ret, Path); ret[path_len] = 0; - strcatW(ret, Name); + lstrcatW(ret, Name); } } else if (Path[path_len-1] != '\\' && Name[0] != '\\') @@ -3044,10 +3065,10 @@ static HRESULT WINAPI filesys_BuildPath(IFileSystem3 *iface, BSTR Path, ret = SysAllocStringLen(NULL, path_len + name_len + 1); if (ret) { - strcpyW(ret, Path); + lstrcpyW(ret, Path); if (Path[path_len-1] != ':') - strcatW(ret, bsW); - strcatW(ret, Name); + lstrcatW(ret, bsW); + lstrcatW(ret, Name); } } else @@ -3055,8 +3076,8 @@ static HRESULT WINAPI filesys_BuildPath(IFileSystem3 *iface, BSTR Path, ret = SysAllocStringLen(NULL, path_len + name_len); if (ret) { - strcpyW(ret, Path); - strcatW(ret, Name); + lstrcpyW(ret, Path); + lstrcatW(ret, Name); } } } @@ -3080,7 +3101,7 @@ static HRESULT WINAPI filesys_GetDriveName(IFileSystem3 *iface, BSTR path, BSTR *drive = NULL; - if (path && strlenW(path) > 1 && path[1] == ':') + if (path && lstrlenW(path) > 1 && path[1] == ':') *drive = SysAllocStringLen(path, 2); return S_OK; @@ -3150,7 +3171,7 @@ static HRESULT WINAPI filesys_GetFileName(IFileSystem3 *iface, BSTR Path, return S_OK; } - for(end=strlenW(Path)-1; end>=0; end--) + for(end=lstrlenW(Path)-1; end>=0; end--) if(Path[end]!='/' && Path[end]!='\\') break; @@ -3185,7 +3206,7 @@ static HRESULT WINAPI filesys_GetBaseName(IFileSystem3 *iface, BSTR Path, return S_OK; } - for(end=strlenW(Path)-1; end>=0; end--) + for(end=lstrlenW(Path)-1; end>=0; end--) if(Path[end]!='/' && Path[end]!='\\') break; @@ -3255,7 +3276,7 @@ static HRESULT WINAPI filesys_GetAbsolutePathName(IFileSystem3 *iface, BSTR Path if(!len) return E_FAIL; - buf[0] = toupperW(buf[0]); + buf[0] = towupper(buf[0]); if(len>3 && buf[len-1] == '\\') buf[--len] = 0; @@ -3269,7 +3290,7 @@ static HRESULT WINAPI filesys_GetAbsolutePathName(IFileSystem3 *iface, BSTR Path if(fh == INVALID_HANDLE_VALUE) break; - exp_len = strlenW(fdata.cFileName); + exp_len = lstrlenW(fdata.cFileName); if(exp_len == i-beg) memcpy(buf+beg, fdata.cFileName, exp_len*sizeof(WCHAR)); FindClose(fh); @@ -3300,7 +3321,7 @@ static HRESULT WINAPI filesys_GetTempName(IFileSystem3 *iface, BSTR *pbstrResult if(!RtlGenRandom(&random, sizeof(random))) return E_FAIL; - sprintfW(*pbstrResult, fmt, random & 0xfffff); + swprintf(*pbstrResult, fmt, random & 0xfffff); return S_OK; } @@ -3317,7 +3338,7 @@ static HRESULT WINAPI filesys_DriveExists(IFileSystem3 *iface, BSTR DriveSpec, len = SysStringLen(DriveSpec); if (len >= 1) { - driveletter = toupperW(DriveSpec[0]); + driveletter = towupper(DriveSpec[0]); if (driveletter >= 'A' && driveletter <= 'Z' && (len < 2 || DriveSpec[1] == ':') && (len < 3 || DriveSpec[2] == '\\')) { @@ -3375,7 +3396,7 @@ static HRESULT WINAPI filesys_GetDrive(IFileSystem3 *iface, BSTR DriveSpec, if (!len) return E_INVALIDARG; else if (len <= 3) { - driveletter = toupperW(DriveSpec[0]); + driveletter = towupper(DriveSpec[0]); if (driveletter < 'A' || driveletter > 'Z' || (len >= 2 && DriveSpec[1] != ':') || (len == 3 && DriveSpec[2] != '\\')) @@ -3492,7 +3513,7 @@ static inline HRESULT delete_file(const WCHAR *file, DWORD file_len, VARIANT_BOO if(ffd.dwFileAttributes & (FILE_ATTRIBUTE_DIRECTORY|FILE_ATTRIBUTE_DEVICE)) continue; - name_len = strlenW(ffd.cFileName); + name_len = lstrlenW(ffd.cFileName); if(len+name_len+1 >= MAX_PATH) { FindClose(f); return E_FAIL; @@ -3554,7 +3575,7 @@ static HRESULT delete_folder(const WCHAR *folder, DWORD folder_len, VARIANT_BOOL (ffd.cFileName[1]=='.' && ffd.cFileName[2]==0))) continue; - name_len = strlenW(ffd.cFileName); + name_len = lstrlenW(ffd.cFileName); if(len+name_len+3 >= MAX_PATH) { FindClose(f); return E_FAIL; @@ -3670,7 +3691,7 @@ static inline HRESULT copy_file(const WCHAR *source, DWORD source_len, if(ffd.dwFileAttributes & (FILE_ATTRIBUTE_DIRECTORY|FILE_ATTRIBUTE_DEVICE)) continue; - name_len = strlenW(ffd.cFileName); + name_len = lstrlenW(ffd.cFileName); if(src_len+name_len+1>=MAX_PATH || dst_len+name_len+1>=MAX_PATH) { FindClose(f); return E_FAIL; @@ -3772,7 +3793,7 @@ static HRESULT copy_folder(const WCHAR *source, DWORD source_len, const WCHAR *d (ffd.cFileName[1]=='.' && ffd.cFileName[2]==0))) continue; - name_len = strlenW(ffd.cFileName); + name_len = lstrlenW(ffd.cFileName); if(dst_len+name_len>=MAX_PATH || src_len+name_len+2>=MAX_PATH) { FindClose(f); return E_FAIL; @@ -3856,7 +3877,7 @@ static HRESULT WINAPI filesys_CreateTextFile(IFileSystem3 *iface, BSTR filename, TRACE("%p %s %d %d %p\n", iface, debugstr_w(filename), overwrite, unicode, stream); disposition = overwrite == VARIANT_TRUE ? CREATE_ALWAYS : CREATE_NEW; - return create_textstream(filename, disposition, ForWriting, !!unicode, stream); + return create_textstream(filename, disposition, ForWriting, unicode ? TristateTrue : TristateFalse, stream); } static HRESULT WINAPI filesys_OpenTextFile(IFileSystem3 *iface, BSTR filename, @@ -3866,14 +3887,9 @@ static HRESULT WINAPI filesys_OpenTextFile(IFileSystem3 *iface, BSTR filename, DWORD disposition; TRACE("(%p)->(%s %d %d %d %p)\n", iface, debugstr_w(filename), mode, create, format, stream); - disposition = create == VARIANT_TRUE ? OPEN_ALWAYS : OPEN_EXISTING; - if (format == TristateUseDefault) { - FIXME("default format not handled, defaulting to unicode\n"); - format = TristateTrue; - } - - return create_textstream(filename, disposition, mode, format == TristateTrue, stream); + disposition = create == VARIANT_TRUE ? OPEN_ALWAYS : OPEN_EXISTING; + return create_textstream(filename, disposition, mode, format, stream); } static HRESULT WINAPI filesys_GetStandardStream(IFileSystem3 *iface, @@ -3898,7 +3914,7 @@ static void get_versionstring(VS_FIXEDFILEINFO *info, WCHAR *ver) c = (WORD)((version >> 16) & 0xffff); d = (WORD)( version & 0xffff); - sprintfW(ver, fmtW, a, b, c, d); + swprintf(ver, fmtW, a, b, c, d); } static HRESULT WINAPI filesys_GetFileVersion(IFileSystem3 *iface, BSTR name, BSTR *version) diff --git a/dll/win32/scrrun/scrrun.c b/dll/win32/scrrun/scrrun.c index 8c60c8072f1..c14fb130f60 100644 --- a/dll/win32/scrrun/scrrun.c +++ b/dll/win32/scrrun/scrrun.c @@ -17,7 +17,6 @@ */ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 8b697874b0d..29f24b6e112 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -166,7 +166,7 @@ dll/win32/rsabase # Synced to WineStaging-3.3 dll/win32/rsaenh # Synced to WineStaging-2.9 dll/win32/sccbase # Synced to WineStaging-4.18 dll/win32/schannel # Synced to WineStaging-3.3 -dll/win32/scrrun # Synced to WineStaging-3.3 +dll/win32/scrrun # Synced to WineStaging-4.18 dll/win32/secur32 # Forked dll/win32/security # Forked (different .spec) dll/win32/sensapi # Synced to WineStaging-3.3

4 years, 10 months

[reactos] 01/01: [SCCBASE] Sync with Wine Staging 4.18. CORE-16441

by Amine Khaldi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=858af2db9db3f54fecfc9… commit 858af2db9db3f54fecfc99980dd53aaa0d98da29 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Nov 30 14:46:59 2019 +0100 Commit: Amine Khaldi <amine.khaldi(a)reactos.org> CommitDate: Sat Nov 30 14:46:59 2019 +0100 [SCCBASE] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/sccbase/main.c | 2 -- media/doc/README.WINE | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dll/win32/sccbase/main.c b/dll/win32/sccbase/main.c index 1fb221f3402..b263d4dc5dd 100644 --- a/dll/win32/sccbase/main.c +++ b/dll/win32/sccbase/main.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h" diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 2be1fedf4a3..8b697874b0d 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -164,7 +164,7 @@ dll/win32/riched32 # Synced to WineStaging-3.3 dll/win32/rpcrt4 # Synced to WineStaging-4.18 dll/win32/rsabase # Synced to WineStaging-3.3 dll/win32/rsaenh # Synced to WineStaging-2.9 -dll/win32/sccbase # Synced to WineStaging-3.3 +dll/win32/sccbase # Synced to WineStaging-4.18 dll/win32/schannel # Synced to WineStaging-3.3 dll/win32/scrrun # Synced to WineStaging-3.3 dll/win32/secur32 # Forked

4 years, 10 months

[reactos] 01/01: [STORAGE] Storage driver cleanup part 5 (last part)

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c1f22c88ca9b6175fb4a0… commit c1f22c88ca9b6175fb4a0c1af6625f80d046c5b1 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Nov 30 13:33:32 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Nov 30 13:33:32 2019 +0100 [STORAGE] Storage driver cleanup part 5 (last part) Move the fdc and flpydrv drivers into the floppy directory. --- drivers/storage/CMakeLists.txt | 1 - drivers/storage/fdc/CMakeLists.txt | 2 -- drivers/storage/floppy/CMakeLists.txt | 2 ++ drivers/storage/{fdc => floppy}/fdc/CMakeLists.txt | 0 drivers/storage/{fdc => floppy}/fdc/fdc.c | 0 drivers/storage/{fdc => floppy}/fdc/fdc.h | 0 drivers/storage/{fdc => floppy}/fdc/fdc.rc | 0 drivers/storage/{fdc => floppy}/fdc/fdo.c | 0 drivers/storage/{fdc => floppy}/fdc/misc.c | 0 drivers/storage/{fdc => floppy}/fdc/pdo.c | 0 drivers/storage/{fdc => floppy}/flpydisk/.keep | 0 11 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/storage/CMakeLists.txt b/drivers/storage/CMakeLists.txt index 40c861b0a1d..aafce81c642 100644 --- a/drivers/storage/CMakeLists.txt +++ b/drivers/storage/CMakeLists.txt @@ -1,5 +1,4 @@ add_subdirectory(class) -#add_subdirectory(fdc) add_subdirectory(floppy) add_subdirectory(ide) add_subdirectory(port) diff --git a/drivers/storage/fdc/CMakeLists.txt b/drivers/storage/fdc/CMakeLists.txt deleted file mode 100644 index fc6b28e7a12..00000000000 --- a/drivers/storage/fdc/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ - -add_subdirectory(fdc) diff --git a/drivers/storage/floppy/CMakeLists.txt b/drivers/storage/floppy/CMakeLists.txt index 732ce5e16b6..d598c15db96 100644 --- a/drivers/storage/floppy/CMakeLists.txt +++ b/drivers/storage/floppy/CMakeLists.txt @@ -1 +1,3 @@ +#add_subdirectory(fdc) add_subdirectory(floppy) +#add_subdirectory(flpydisk) diff --git a/drivers/storage/fdc/fdc/CMakeLists.txt b/drivers/storage/floppy/fdc/CMakeLists.txt similarity index 100% rename from drivers/storage/fdc/fdc/CMakeLists.txt rename to drivers/storage/floppy/fdc/CMakeLists.txt diff --git a/drivers/storage/fdc/fdc/fdc.c b/drivers/storage/floppy/fdc/fdc.c similarity index 100% rename from drivers/storage/fdc/fdc/fdc.c rename to drivers/storage/floppy/fdc/fdc.c diff --git a/drivers/storage/fdc/fdc/fdc.h b/drivers/storage/floppy/fdc/fdc.h similarity index 100% rename from drivers/storage/fdc/fdc/fdc.h rename to drivers/storage/floppy/fdc/fdc.h diff --git a/drivers/storage/fdc/fdc/fdc.rc b/drivers/storage/floppy/fdc/fdc.rc similarity index 100% rename from drivers/storage/fdc/fdc/fdc.rc rename to drivers/storage/floppy/fdc/fdc.rc diff --git a/drivers/storage/fdc/fdc/fdo.c b/drivers/storage/floppy/fdc/fdo.c similarity index 100% rename from drivers/storage/fdc/fdc/fdo.c rename to drivers/storage/floppy/fdc/fdo.c diff --git a/drivers/storage/fdc/fdc/misc.c b/drivers/storage/floppy/fdc/misc.c similarity index 100% rename from drivers/storage/fdc/fdc/misc.c rename to drivers/storage/floppy/fdc/misc.c diff --git a/drivers/storage/fdc/fdc/pdo.c b/drivers/storage/floppy/fdc/pdo.c similarity index 100% rename from drivers/storage/fdc/fdc/pdo.c rename to drivers/storage/floppy/fdc/pdo.c diff --git a/drivers/storage/fdc/flpydisk/.keep b/drivers/storage/floppy/flpydisk/.keep similarity index 100% rename from drivers/storage/fdc/flpydisk/.keep rename to drivers/storage/floppy/flpydisk/.keep

4 years, 10 months

[reactos] 01/01: [STORAGE] Storage driver cleanup part 4

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2a2040a9fe9c017040322… commit 2a2040a9fe9c01704032277b52aac60e0f5a1e9c Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Nov 30 13:13:59 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Nov 30 13:13:59 2019 +0100 [STORAGE] Storage driver cleanup part 4 Move the floppy driver into the floppy/floppy directory. --- drivers/storage/floppy/CMakeLists.txt | 17 +---------------- drivers/storage/floppy/{ => floppy}/CMakeLists.txt | 0 drivers/storage/floppy/{ => floppy}/SOURCES | 0 drivers/storage/floppy/{ => floppy}/csqrtns.c | 0 drivers/storage/floppy/{ => floppy}/csqrtns.h | 0 drivers/storage/floppy/{ => floppy}/floppy.c | 0 drivers/storage/floppy/{ => floppy}/floppy.h | 0 drivers/storage/floppy/{ => floppy}/floppy.rc | 0 drivers/storage/floppy/{ => floppy}/floppy_reg.inf | 0 drivers/storage/floppy/{ => floppy}/hardware.c | 0 drivers/storage/floppy/{ => floppy}/hardware.h | 0 drivers/storage/floppy/{ => floppy}/ioctl.c | 0 drivers/storage/floppy/{ => floppy}/ioctl.h | 0 drivers/storage/floppy/{ => floppy}/precomp.h | 0 drivers/storage/floppy/{ => floppy}/readwrite.c | 0 drivers/storage/floppy/{ => floppy}/readwrite.h | 0 16 files changed, 1 insertion(+), 16 deletions(-) diff --git a/drivers/storage/floppy/CMakeLists.txt b/drivers/storage/floppy/CMakeLists.txt index c1dd6a29dc7..732ce5e16b6 100644 --- a/drivers/storage/floppy/CMakeLists.txt +++ b/drivers/storage/floppy/CMakeLists.txt @@ -1,16 +1 @@ - -list(APPEND SOURCE - csqrtns.c - floppy.c - hardware.c - ioctl.c - readwrite.c - precomp.h) - -add_library(floppy MODULE ${SOURCE} floppy.rc) -target_link_libraries(floppy csq) -add_pch(floppy precomp.h SOURCE) -set_module_type(floppy kernelmodedriver) -add_importlibs(floppy hal ntoskrnl) -add_cd_file(TARGET floppy DESTINATION reactos/system32/drivers NO_CAB FOR all) -add_registry_inf(floppy_reg.inf) +add_subdirectory(floppy) diff --git a/drivers/storage/floppy/CMakeLists.txt b/drivers/storage/floppy/floppy/CMakeLists.txt similarity index 100% copy from drivers/storage/floppy/CMakeLists.txt copy to drivers/storage/floppy/floppy/CMakeLists.txt diff --git a/drivers/storage/floppy/SOURCES b/drivers/storage/floppy/floppy/SOURCES similarity index 100% rename from drivers/storage/floppy/SOURCES rename to drivers/storage/floppy/floppy/SOURCES diff --git a/drivers/storage/floppy/csqrtns.c b/drivers/storage/floppy/floppy/csqrtns.c similarity index 100% rename from drivers/storage/floppy/csqrtns.c rename to drivers/storage/floppy/floppy/csqrtns.c diff --git a/drivers/storage/floppy/csqrtns.h b/drivers/storage/floppy/floppy/csqrtns.h similarity index 100% rename from drivers/storage/floppy/csqrtns.h rename to drivers/storage/floppy/floppy/csqrtns.h diff --git a/drivers/storage/floppy/floppy.c b/drivers/storage/floppy/floppy/floppy.c similarity index 100% rename from drivers/storage/floppy/floppy.c rename to drivers/storage/floppy/floppy/floppy.c diff --git a/drivers/storage/floppy/floppy.h b/drivers/storage/floppy/floppy/floppy.h similarity index 100% rename from drivers/storage/floppy/floppy.h rename to drivers/storage/floppy/floppy/floppy.h diff --git a/drivers/storage/floppy/floppy.rc b/drivers/storage/floppy/floppy/floppy.rc similarity index 100% rename from drivers/storage/floppy/floppy.rc rename to drivers/storage/floppy/floppy/floppy.rc diff --git a/drivers/storage/floppy/floppy_reg.inf b/drivers/storage/floppy/floppy/floppy_reg.inf similarity index 100% rename from drivers/storage/floppy/floppy_reg.inf rename to drivers/storage/floppy/floppy/floppy_reg.inf diff --git a/drivers/storage/floppy/hardware.c b/drivers/storage/floppy/floppy/hardware.c similarity index 100% rename from drivers/storage/floppy/hardware.c rename to drivers/storage/floppy/floppy/hardware.c diff --git a/drivers/storage/floppy/hardware.h b/drivers/storage/floppy/floppy/hardware.h similarity index 100% rename from drivers/storage/floppy/hardware.h rename to drivers/storage/floppy/floppy/hardware.h diff --git a/drivers/storage/floppy/ioctl.c b/drivers/storage/floppy/floppy/ioctl.c similarity index 100% rename from drivers/storage/floppy/ioctl.c rename to drivers/storage/floppy/floppy/ioctl.c diff --git a/drivers/storage/floppy/ioctl.h b/drivers/storage/floppy/floppy/ioctl.h similarity index 100% rename from drivers/storage/floppy/ioctl.h rename to drivers/storage/floppy/floppy/ioctl.h diff --git a/drivers/storage/floppy/precomp.h b/drivers/storage/floppy/floppy/precomp.h similarity index 100% rename from drivers/storage/floppy/precomp.h rename to drivers/storage/floppy/floppy/precomp.h diff --git a/drivers/storage/floppy/readwrite.c b/drivers/storage/floppy/floppy/readwrite.c similarity index 100% rename from drivers/storage/floppy/readwrite.c rename to drivers/storage/floppy/floppy/readwrite.c diff --git a/drivers/storage/floppy/readwrite.h b/drivers/storage/floppy/floppy/readwrite.h similarity index 100% rename from drivers/storage/floppy/readwrite.h rename to drivers/storage/floppy/floppy/readwrite.h

4 years, 10 months

[reactos] 01/01: [STORAGE] Storage driver cleanup part 3

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9393c6a48ba985205988d… commit 9393c6a48ba985205988d2dc90f1e76f29cdc9cf Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Nov 30 12:58:59 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Nov 30 12:58:59 2019 +0100 [STORAGE] Storage driver cleanup part 3 Move the storahci driver into the port directory. --- drivers/storage/CMakeLists.txt | 1 - drivers/storage/port/CMakeLists.txt | 1 + drivers/storage/{ => port}/storahci/CMakeLists.txt | 0 drivers/storage/{ => port}/storahci/Notes.txt | 0 drivers/storage/{ => port}/storahci/makefile | 0 drivers/storage/{ => port}/storahci/sources | 0 drivers/storage/{ => port}/storahci/storahci.c | 0 drivers/storage/{ => port}/storahci/storahci.h | 0 drivers/storage/{ => port}/storahci/storahci.inf | 0 drivers/storage/{ => port}/storahci/storahci.rc | 0 10 files changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/storage/CMakeLists.txt b/drivers/storage/CMakeLists.txt index 2353cede57e..40c861b0a1d 100644 --- a/drivers/storage/CMakeLists.txt +++ b/drivers/storage/CMakeLists.txt @@ -3,4 +3,3 @@ add_subdirectory(class) add_subdirectory(floppy) add_subdirectory(ide) add_subdirectory(port) -add_subdirectory(storahci) diff --git a/drivers/storage/port/CMakeLists.txt b/drivers/storage/port/CMakeLists.txt index 297111c860c..cf7cc74cf22 100644 --- a/drivers/storage/port/CMakeLists.txt +++ b/drivers/storage/port/CMakeLists.txt @@ -1,3 +1,4 @@ add_subdirectory(buslogic) add_subdirectory(scsiport) +add_subdirectory(storahci) add_subdirectory(storport) diff --git a/drivers/storage/storahci/CMakeLists.txt b/drivers/storage/port/storahci/CMakeLists.txt similarity index 100% rename from drivers/storage/storahci/CMakeLists.txt rename to drivers/storage/port/storahci/CMakeLists.txt diff --git a/drivers/storage/storahci/Notes.txt b/drivers/storage/port/storahci/Notes.txt similarity index 100% rename from drivers/storage/storahci/Notes.txt rename to drivers/storage/port/storahci/Notes.txt diff --git a/drivers/storage/storahci/makefile b/drivers/storage/port/storahci/makefile similarity index 100% rename from drivers/storage/storahci/makefile rename to drivers/storage/port/storahci/makefile diff --git a/drivers/storage/storahci/sources b/drivers/storage/port/storahci/sources similarity index 100% rename from drivers/storage/storahci/sources rename to drivers/storage/port/storahci/sources diff --git a/drivers/storage/storahci/storahci.c b/drivers/storage/port/storahci/storahci.c similarity index 100% rename from drivers/storage/storahci/storahci.c rename to drivers/storage/port/storahci/storahci.c diff --git a/drivers/storage/storahci/storahci.h b/drivers/storage/port/storahci/storahci.h similarity index 100% rename from drivers/storage/storahci/storahci.h rename to drivers/storage/port/storahci/storahci.h diff --git a/drivers/storage/storahci/storahci.inf b/drivers/storage/port/storahci/storahci.inf similarity index 100% rename from drivers/storage/storahci/storahci.inf rename to drivers/storage/port/storahci/storahci.inf diff --git a/drivers/storage/storahci/storahci.rc b/drivers/storage/port/storahci/storahci.rc similarity index 100% rename from drivers/storage/storahci/storahci.rc rename to drivers/storage/port/storahci/storahci.rc

4 years, 10 months

[reactos] 01/01: [STORAGE] Storage driver cleanup part 2

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d7369089675406e221c6b… commit d7369089675406e221c6ba1f75a9ec7e2356778f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Nov 30 12:19:03 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Nov 30 12:19:03 2019 +0100 [STORAGE] Storage driver cleanup part 2 Move the scsiport driver into the port directory. --- drivers/storage/CMakeLists.txt | 2 -- drivers/storage/port/CMakeLists.txt | 1 + drivers/storage/{ => port}/scsiport/CMakeLists.txt | 0 drivers/storage/{ => port}/scsiport/precomp.h | 0 drivers/storage/{ => port}/scsiport/scsiport.c | 0 drivers/storage/{ => port}/scsiport/scsiport.rc | 0 drivers/storage/{ => port}/scsiport/scsiport.spec | 0 drivers/storage/{ => port}/scsiport/scsiport_int.h | 0 drivers/storage/{ => port}/scsiport/stubs.c | 0 9 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/storage/CMakeLists.txt b/drivers/storage/CMakeLists.txt index 2d5c1418747..2353cede57e 100644 --- a/drivers/storage/CMakeLists.txt +++ b/drivers/storage/CMakeLists.txt @@ -1,8 +1,6 @@ - add_subdirectory(class) #add_subdirectory(fdc) add_subdirectory(floppy) add_subdirectory(ide) add_subdirectory(port) -add_subdirectory(scsiport) add_subdirectory(storahci) diff --git a/drivers/storage/port/CMakeLists.txt b/drivers/storage/port/CMakeLists.txt index 9a5d2f26aa9..297111c860c 100644 --- a/drivers/storage/port/CMakeLists.txt +++ b/drivers/storage/port/CMakeLists.txt @@ -1,2 +1,3 @@ add_subdirectory(buslogic) +add_subdirectory(scsiport) add_subdirectory(storport) diff --git a/drivers/storage/scsiport/CMakeLists.txt b/drivers/storage/port/scsiport/CMakeLists.txt similarity index 100% rename from drivers/storage/scsiport/CMakeLists.txt rename to drivers/storage/port/scsiport/CMakeLists.txt diff --git a/drivers/storage/scsiport/precomp.h b/drivers/storage/port/scsiport/precomp.h similarity index 100% rename from drivers/storage/scsiport/precomp.h rename to drivers/storage/port/scsiport/precomp.h diff --git a/drivers/storage/scsiport/scsiport.c b/drivers/storage/port/scsiport/scsiport.c similarity index 100% rename from drivers/storage/scsiport/scsiport.c rename to drivers/storage/port/scsiport/scsiport.c diff --git a/drivers/storage/scsiport/scsiport.rc b/drivers/storage/port/scsiport/scsiport.rc similarity index 100% rename from drivers/storage/scsiport/scsiport.rc rename to drivers/storage/port/scsiport/scsiport.rc diff --git a/drivers/storage/scsiport/scsiport.spec b/drivers/storage/port/scsiport/scsiport.spec similarity index 100% rename from drivers/storage/scsiport/scsiport.spec rename to drivers/storage/port/scsiport/scsiport.spec diff --git a/drivers/storage/scsiport/scsiport_int.h b/drivers/storage/port/scsiport/scsiport_int.h similarity index 100% rename from drivers/storage/scsiport/scsiport_int.h rename to drivers/storage/port/scsiport/scsiport_int.h diff --git a/drivers/storage/scsiport/stubs.c b/drivers/storage/port/scsiport/stubs.c similarity index 100% rename from drivers/storage/scsiport/stubs.c rename to drivers/storage/port/scsiport/stubs.c

4 years, 10 months

[reactos] 01/01: [STORAGE] Storage driver cleanup part 1

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b687478d1f26ab3fe47e… commit 6b687478d1f26ab3fe47e8ce375221455423ae79 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Nov 30 11:41:39 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Nov 30 11:54:33 2019 +0100 [STORAGE] Storage driver cleanup part 1 Move the classpnp driver into the class directory because it is a class driver, just like the class2 driver. --- drivers/storage/CMakeLists.txt | 3 +-- drivers/storage/class/CMakeLists.txt | 1 + drivers/storage/{ => class}/classpnp/CMakeLists.txt | 2 +- drivers/storage/{ => class}/classpnp/autorun.c | 0 drivers/storage/{ => class}/classpnp/class.c | 0 drivers/storage/{ => class}/classpnp/class.rc | 0 drivers/storage/{ => class}/classpnp/classp.h | 0 drivers/storage/{ => class}/classpnp/classpnp.spec | 0 drivers/storage/{ => class}/classpnp/classwmi.c | 0 drivers/storage/{ => class}/classpnp/clntirp.c | 0 drivers/storage/{ => class}/classpnp/create.c | 0 drivers/storage/{ => class}/classpnp/data.c | 0 drivers/storage/{ => class}/classpnp/debug.c | 0 drivers/storage/{ => class}/classpnp/debug.h | 0 drivers/storage/{ => class}/classpnp/dictlib.c | 0 drivers/storage/{ => class}/classpnp/guid.c | 0 drivers/storage/{ => class}/classpnp/lock.c | 0 drivers/storage/{ => class}/classpnp/obsolete.c | 0 drivers/storage/{ => class}/classpnp/power.c | 0 drivers/storage/{ => class}/classpnp/retry.c | 0 drivers/storage/{ => class}/classpnp/utils.c | 0 drivers/storage/{ => class}/classpnp/xferpkt.c | 0 22 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/storage/CMakeLists.txt b/drivers/storage/CMakeLists.txt index 610df522d26..2d5c1418747 100644 --- a/drivers/storage/CMakeLists.txt +++ b/drivers/storage/CMakeLists.txt @@ -1,7 +1,6 @@ add_subdirectory(class) -add_subdirectory(classpnp) -add_subdirectory(fdc) +#add_subdirectory(fdc) add_subdirectory(floppy) add_subdirectory(ide) add_subdirectory(port) diff --git a/drivers/storage/class/CMakeLists.txt b/drivers/storage/class/CMakeLists.txt index 0ead5deb252..cb0538ace05 100644 --- a/drivers/storage/class/CMakeLists.txt +++ b/drivers/storage/class/CMakeLists.txt @@ -1,6 +1,7 @@ add_subdirectory(cdrom) add_subdirectory(cdrom_new) add_subdirectory(class2) +add_subdirectory(classpnp) add_subdirectory(disk) add_subdirectory(disk_new) add_subdirectory(ramdisk) diff --git a/drivers/storage/classpnp/CMakeLists.txt b/drivers/storage/class/classpnp/CMakeLists.txt similarity index 96% rename from drivers/storage/classpnp/CMakeLists.txt rename to drivers/storage/class/classpnp/CMakeLists.txt index c5f576fbd2c..d3399c72668 100644 --- a/drivers/storage/classpnp/CMakeLists.txt +++ b/drivers/storage/class/classpnp/CMakeLists.txt @@ -1,5 +1,5 @@ -include_directories(../inc) +include_directories(../../inc) spec2def(classpnp.sys classpnp.spec ADD_IMPORTLIB) add_definitions( diff --git a/drivers/storage/classpnp/autorun.c b/drivers/storage/class/classpnp/autorun.c similarity index 100% rename from drivers/storage/classpnp/autorun.c rename to drivers/storage/class/classpnp/autorun.c diff --git a/drivers/storage/classpnp/class.c b/drivers/storage/class/classpnp/class.c similarity index 100% rename from drivers/storage/classpnp/class.c rename to drivers/storage/class/classpnp/class.c diff --git a/drivers/storage/classpnp/class.rc b/drivers/storage/class/classpnp/class.rc similarity index 100% rename from drivers/storage/classpnp/class.rc rename to drivers/storage/class/classpnp/class.rc diff --git a/drivers/storage/classpnp/classp.h b/drivers/storage/class/classpnp/classp.h similarity index 100% rename from drivers/storage/classpnp/classp.h rename to drivers/storage/class/classpnp/classp.h diff --git a/drivers/storage/classpnp/classpnp.spec b/drivers/storage/class/classpnp/classpnp.spec similarity index 100% rename from drivers/storage/classpnp/classpnp.spec rename to drivers/storage/class/classpnp/classpnp.spec diff --git a/drivers/storage/classpnp/classwmi.c b/drivers/storage/class/classpnp/classwmi.c similarity index 100% rename from drivers/storage/classpnp/classwmi.c rename to drivers/storage/class/classpnp/classwmi.c diff --git a/drivers/storage/classpnp/clntirp.c b/drivers/storage/class/classpnp/clntirp.c similarity index 100% rename from drivers/storage/classpnp/clntirp.c rename to drivers/storage/class/classpnp/clntirp.c diff --git a/drivers/storage/classpnp/create.c b/drivers/storage/class/classpnp/create.c similarity index 100% rename from drivers/storage/classpnp/create.c rename to drivers/storage/class/classpnp/create.c diff --git a/drivers/storage/classpnp/data.c b/drivers/storage/class/classpnp/data.c similarity index 100% rename from drivers/storage/classpnp/data.c rename to drivers/storage/class/classpnp/data.c diff --git a/drivers/storage/classpnp/debug.c b/drivers/storage/class/classpnp/debug.c similarity index 100% rename from drivers/storage/classpnp/debug.c rename to drivers/storage/class/classpnp/debug.c diff --git a/drivers/storage/classpnp/debug.h b/drivers/storage/class/classpnp/debug.h similarity index 100% rename from drivers/storage/classpnp/debug.h rename to drivers/storage/class/classpnp/debug.h diff --git a/drivers/storage/classpnp/dictlib.c b/drivers/storage/class/classpnp/dictlib.c similarity index 100% rename from drivers/storage/classpnp/dictlib.c rename to drivers/storage/class/classpnp/dictlib.c diff --git a/drivers/storage/classpnp/guid.c b/drivers/storage/class/classpnp/guid.c similarity index 100% rename from drivers/storage/classpnp/guid.c rename to drivers/storage/class/classpnp/guid.c diff --git a/drivers/storage/classpnp/lock.c b/drivers/storage/class/classpnp/lock.c similarity index 100% rename from drivers/storage/classpnp/lock.c rename to drivers/storage/class/classpnp/lock.c diff --git a/drivers/storage/classpnp/obsolete.c b/drivers/storage/class/classpnp/obsolete.c similarity index 100% rename from drivers/storage/classpnp/obsolete.c rename to drivers/storage/class/classpnp/obsolete.c diff --git a/drivers/storage/classpnp/power.c b/drivers/storage/class/classpnp/power.c similarity index 100% rename from drivers/storage/classpnp/power.c rename to drivers/storage/class/classpnp/power.c diff --git a/drivers/storage/classpnp/retry.c b/drivers/storage/class/classpnp/retry.c similarity index 100% rename from drivers/storage/classpnp/retry.c rename to drivers/storage/class/classpnp/retry.c diff --git a/drivers/storage/classpnp/utils.c b/drivers/storage/class/classpnp/utils.c similarity index 100% rename from drivers/storage/classpnp/utils.c rename to drivers/storage/class/classpnp/utils.c diff --git a/drivers/storage/classpnp/xferpkt.c b/drivers/storage/class/classpnp/xferpkt.c similarity index 100% rename from drivers/storage/classpnp/xferpkt.c rename to drivers/storage/class/classpnp/xferpkt.c

4 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2019