wine-devel

wine-devel@winehq.org

4 participants
84483 discussions

[PATCH] include: Add interface IGetDataSource
by Alistair Leslie-Hughes 12 Oct '20

12 Oct '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdaps/usrmarshal.c | 13 +++++++++++++ include/getdts.idl | 34 ++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + 3 files changed, 48 insertions(+) create mode 100644 include/getdts.idl diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 43e3aaeaa1a..2fe4e60b68b 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1576,3 +1576,16 @@ HRESULT __RPC_STUB IColumnsInfo_MapColumnIDs_Stub(IColumnsInfo* This, DBORDINAL FIXME("(%p)->(%lu %p %p %p): stub\n", This, column_ids, dbids, columns, error); return E_NOTIMPL; } + +HRESULT CALLBACK IGetDataSource_GetDataSource_Proxy(IGetDataSource* This, REFIID riid, IUnknown **datasource) +{ + FIXME("(%p)->(%s %p): stub\n", This, debugstr_guid(riid), datasource); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IGetDataSource_GetDataSource_Stub(IGetDataSource* This, REFIID riid, IUnknown **datasource, + IErrorInfo **error) +{ + FIXME("(%p)->(%s %p %p): stub\n", This, debugstr_guid(riid), datasource, error); + return E_NOTIMPL; +} diff --git a/include/getdts.idl b/include/getdts.idl new file mode 100644 index 00000000000..40991070cc1 --- /dev/null +++ b/include/getdts.idl @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2020 Alistair Leslie-Hughes + * + * 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 + */ +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a75-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IGetDataSource : IUnknown +{ + [local] + HRESULT GetDataSource([in] REFIID riid, [out, iid_is(riid)] IUnknown **datasource); + + [call_as(GetDataSource)] + HRESULT RemoteGetDataSource([in] REFIID riid, [out, iid_is(riid)] IUnknown **datasource, [out] IErrorInfo **error); +} diff --git a/include/oledb.idl b/include/oledb.idl index 537bb211cc5..1ffbefa9ffd 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -69,6 +69,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "binres.idl" #include "crtrow.idl" #include "errrec.idl" +#include "getdts.idl" cpp_quote("#include <accctrl.h>") -- 2.28.0

1 0

[PATCH] kernelbase: Add a name for codepage 708.
by Nikolay Sivov 12 Oct '20

12 Oct '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernelbase/locale.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 2cec5f7637a..9cfb9f129ee 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -106,6 +106,7 @@ static const struct { UINT cp; const WCHAR *name; } codepage_names[] = { 424, L"IBM EBCDIC Hebrew" }, { 437, L"OEM United States" }, { 500, L"IBM EBCDIC International" }, + { 708, L"Arabic ASMO" }, { 737, L"OEM Greek 437G" }, { 775, L"OEM Baltic" }, { 850, L"OEM Multilingual Latin 1" }, -- 2.28.0

1 0

[PATCH] qmgr: Use wide-char string literals.
by Michael Stefaniuc 11 Oct '20

11 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/qmgr/file.c | 6 ++---- dlls/qmgr/service.c | 3 +-- dlls/qmgr/tests/enum_files.c | 18 ++++++------------ dlls/qmgr/tests/enum_jobs.c | 12 ++++-------- dlls/qmgr/tests/file.c | 11 ++++------- dlls/qmgr/tests/job.c | 24 +++++++++--------------- dlls/qmgr/tests/qmgr.c | 17 ++++------------- 7 files changed, 30 insertions(+), 61 deletions(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index e0aeebf7cec..befd38b416b 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -452,14 +452,13 @@ static DWORD CALLBACK progress_callback_local(LARGE_INTEGER totalSize, LARGE_INT static BOOL transfer_file_local(BackgroundCopyFileImpl *file, const WCHAR *tmpname) { - static const WCHAR fileW[] = {'f','i','l','e',':','/','/',0}; BackgroundCopyJobImpl *job = file->owner; const WCHAR *ptr; BOOL ret; transitionJobState(job, BG_JOB_STATE_QUEUED, BG_JOB_STATE_TRANSFERRING); - if (lstrlenW(file->info.RemoteName) > 7 && !wcsnicmp(file->info.RemoteName, fileW, 7)) + if (lstrlenW(file->info.RemoteName) > 7 && !wcsnicmp(file->info.RemoteName, L"file://", 7)) ptr = file->info.RemoteName + 7; else ptr = file->info.RemoteName; @@ -476,7 +475,6 @@ static BOOL transfer_file_local(BackgroundCopyFileImpl *file, const WCHAR *tmpna BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) { - static const WCHAR prefix[] = {'B','I','T', 0}; WCHAR tmpDir[MAX_PATH], tmpName[MAX_PATH]; WCHAR host[MAX_PATH]; URL_COMPONENTSW uc; @@ -490,7 +488,7 @@ BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) return FALSE; } - if (!GetTempFileNameW(tmpDir, prefix, 0, tmpName)) + if (!GetTempFileNameW(tmpDir, L"BIT", 0, tmpName)) { ERR("Couldn't create temp file: %d\n", GetLastError()); /* Guessing on what state this should give us */ diff --git a/dlls/qmgr/service.c b/dlls/qmgr/service.c index e856408d8c4..521cb74eb8b 100644 --- a/dlls/qmgr/service.c +++ b/dlls/qmgr/service.c @@ -105,7 +105,6 @@ VOID WINAPI ServiceMain(DWORD dwArgc, LPWSTR *lpszArgv) { HANDLE fileTxThread; - static const WCHAR qmgr_nameW[] = {'B','I','T','S',0}; DWORD threadId; TRACE("\n"); @@ -115,7 +114,7 @@ ServiceMain(DWORD dwArgc, LPWSTR *lpszArgv) return; } - status_handle = RegisterServiceCtrlHandlerExW(qmgr_nameW, ServiceHandler, NULL); + status_handle = RegisterServiceCtrlHandlerExW(L"BITS", ServiceHandler, NULL); if (!status_handle) { ERR("failed to register handler: %u\n", GetLastError()); return; diff --git a/dlls/qmgr/tests/enum_files.c b/dlls/qmgr/tests/enum_files.c index 9564d7c1adb..9e1a665ac53 100644 --- a/dlls/qmgr/tests/enum_files.c +++ b/dlls/qmgr/tests/enum_files.c @@ -29,11 +29,6 @@ /* Globals used by many tests */ #define NUM_FILES 2 /* At least two. */ -static const WCHAR test_remoteNameA[] = {'r','e','m','o','t','e','A', 0}; -static const WCHAR test_localNameA[] = {'l','o','c','a','l','A', 0}; -static const WCHAR test_remoteNameB[] = {'r','e','m','o','t','e','B', 0}; -static const WCHAR test_localNameB[] = {'l','o','c','a','l','B', 0}; -static const WCHAR test_displayName[] = {'T', 'e', 's', 't', 0}; static const ULONG test_fileCount = NUM_FILES; static IBackgroundCopyJob *test_job; static IBackgroundCopyManager *test_manager; @@ -79,10 +74,10 @@ static HRESULT test_create_manager(void) IBackgroundCopyJob *job; GUID jobId; - hres = IBackgroundCopyManager_CreateJob(manager, test_displayName, BG_JOB_TYPE_DOWNLOAD, &jobId, &job); + hres = IBackgroundCopyManager_CreateJob(manager, L"Test", BG_JOB_TYPE_DOWNLOAD, &jobId, &job); if (hres == S_OK) { - hres = addFileHelper(job, test_localNameA, test_remoteNameA); + hres = addFileHelper(job, L"localA", L"remoteA"); if (hres != S_OK) win_skip("AddFile() with file:// protocol failed. Tests will be skipped.\n"); IBackgroundCopyJob_Release(job); @@ -105,17 +100,16 @@ static BOOL setup(void) if(hres != S_OK) return FALSE; - hres = IBackgroundCopyManager_CreateJob(test_manager, test_displayName, - BG_JOB_TYPE_DOWNLOAD, &test_jobId, - &test_job); + hres = IBackgroundCopyManager_CreateJob(test_manager, L"Test", BG_JOB_TYPE_DOWNLOAD, + &test_jobId, &test_job); if(hres != S_OK) { IBackgroundCopyManager_Release(test_manager); return FALSE; } - if (addFileHelper(test_job, test_localNameA, test_remoteNameA) != S_OK - || addFileHelper(test_job, test_localNameB, test_remoteNameB) != S_OK + if (addFileHelper(test_job, L"localA", L"remoteA") != S_OK + || addFileHelper(test_job, L"localB", L"remoteB") != S_OK || IBackgroundCopyJob_EnumFiles(test_job, &test_enumFiles) != S_OK) { IBackgroundCopyJob_Release(test_job); diff --git a/dlls/qmgr/tests/enum_jobs.c b/dlls/qmgr/tests/enum_jobs.c index 6a1a9688388..81df72e2e69 100644 --- a/dlls/qmgr/tests/enum_jobs.c +++ b/dlls/qmgr/tests/enum_jobs.c @@ -26,8 +26,6 @@ #include "bits.h" /* Globals used by many tests */ -static const WCHAR test_displayNameA[] = {'T','e','s','t','A', 0}; -static const WCHAR test_displayNameB[] = {'T','e','s','t','B', 0}; static IBackgroundCopyManager *test_manager; static IBackgroundCopyJob *test_jobA; static IBackgroundCopyJob *test_jobB; @@ -54,9 +52,8 @@ static BOOL setup(void) if(hres != S_OK) return FALSE; - hres = IBackgroundCopyManager_CreateJob(test_manager, test_displayNameA, - BG_JOB_TYPE_DOWNLOAD, &test_jobIdA, - &test_jobA); + hres = IBackgroundCopyManager_CreateJob(test_manager, L"TestA", BG_JOB_TYPE_DOWNLOAD, + &test_jobIdA, &test_jobA); if(hres != S_OK) return FALSE; @@ -64,9 +61,8 @@ static BOOL setup(void) if(hres != S_OK) return FALSE; - hres = IBackgroundCopyManager_CreateJob(test_manager, test_displayNameB, - BG_JOB_TYPE_DOWNLOAD, &test_jobIdB, - &test_jobB); + hres = IBackgroundCopyManager_CreateJob(test_manager, L"TestB", BG_JOB_TYPE_DOWNLOAD, + &test_jobIdB, &test_jobB); if(hres != S_OK) return FALSE; diff --git a/dlls/qmgr/tests/file.c b/dlls/qmgr/tests/file.c index 9fdf08c98a8..cb5ba5fbe37 100644 --- a/dlls/qmgr/tests/file.c +++ b/dlls/qmgr/tests/file.c @@ -28,11 +28,8 @@ #include "bits.h" /* Globals used by many tests */ -static const WCHAR test_remoteName[] = {'r','e','m','o','t','e', 0}; -static const WCHAR test_localName[] = {'l','o','c','a','l', 0}; static WCHAR test_localFile[MAX_PATH]; static WCHAR test_remoteUrl[MAX_PATH]; -static const WCHAR test_displayName[] = {'T','e','s','t', 0}; static IBackgroundCopyJob *test_job; static IBackgroundCopyManager *test_manager; static IEnumBackgroundCopyFiles *test_enumFiles; @@ -76,10 +73,10 @@ static HRESULT test_create_manager(void) IBackgroundCopyJob *job; GUID jobId; - hres = IBackgroundCopyManager_CreateJob(manager, test_displayName, BG_JOB_TYPE_DOWNLOAD, &jobId, &job); + hres = IBackgroundCopyManager_CreateJob(manager, L"Test", BG_JOB_TYPE_DOWNLOAD, &jobId, &job); if (hres == S_OK) { - hres = addFileHelper(job, test_localName, test_remoteName); + hres = addFileHelper(job, L"local", L"remote"); if (hres != S_OK) win_skip("AddFile() with file:// protocol failed. Tests will be skipped.\n"); IBackgroundCopyJob_Release(job); @@ -106,7 +103,7 @@ static BOOL setup(void) if(hres != S_OK) return FALSE; - hres = IBackgroundCopyManager_CreateJob(test_manager, test_displayName, + hres = IBackgroundCopyManager_CreateJob(test_manager, L"Test", BG_JOB_TYPE_DOWNLOAD, &test_jobId, &test_job); if(hres != S_OK) { @@ -114,7 +111,7 @@ static BOOL setup(void) return FALSE; } - if (addFileHelper(test_job, test_localName, test_remoteName) != S_OK + if (addFileHelper(test_job, L"local", L"remote") != S_OK || IBackgroundCopyJob_EnumFiles(test_job, &test_enumFiles) != S_OK) { IBackgroundCopyJob_Release(test_job); diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c index 8bc82dd172f..53b724eadbf 100644 --- a/dlls/qmgr/tests/job.c +++ b/dlls/qmgr/tests/job.c @@ -29,7 +29,6 @@ #include "bits2_5.h" /* Globals used by many tests */ -static const WCHAR test_displayName[] = {'T', 'e', 's', 't', 0}; static WCHAR test_remotePathA[MAX_PATH]; static WCHAR test_remotePathB[MAX_PATH]; static WCHAR test_localPathA[MAX_PATH]; @@ -62,7 +61,7 @@ static HRESULT test_create_manager(void) static void init_paths(void) { WCHAR tmpDir[MAX_PATH]; - WCHAR prefix[] = {'q', 'm', 'g', 'r', 0}; + WCHAR prefix[] = L"qmgr"; GetTempPathW(MAX_PATH, tmpDir); @@ -89,8 +88,7 @@ static BOOL setup(void) if(hres != S_OK) return FALSE; - hres = IBackgroundCopyManager_CreateJob(test_manager, test_displayName, - test_type, &test_jobId, &test_job); + hres = IBackgroundCopyManager_CreateJob(test_manager, L"Test", test_type, &test_jobId, &test_job); if(hres != S_OK) { IBackgroundCopyManager_Release(test_manager); @@ -119,7 +117,7 @@ static BOOL check_bits20(void) (void **)&manager); if (hres != S_OK) return FALSE; - hres = IBackgroundCopyManager_CreateJob(manager, test_displayName, test_type, &test_jobId, &job); + hres = IBackgroundCopyManager_CreateJob(manager, L"Test", test_type, &test_jobId, &job); if (hres != S_OK) { IBackgroundCopyManager_Release(manager); @@ -152,7 +150,7 @@ static BOOL check_bits25(void) (void **)&manager); if (hres != S_OK) return FALSE; - hres = IBackgroundCopyManager_CreateJob(manager, test_displayName, test_type, &test_jobId, &job); + hres = IBackgroundCopyManager_CreateJob(manager, L"Test", test_type, &test_jobId, &job); if (hres != S_OK) { IBackgroundCopyManager_Release(manager); @@ -203,7 +201,7 @@ static void test_GetName(void) hres = IBackgroundCopyJob_GetDisplayName(test_job, &displayName); ok(hres == S_OK, "GetName failed: %08x\n", hres); - ok(lstrcmpW(displayName, test_displayName) == 0, "Got incorrect type\n"); + ok(lstrcmpW(displayName, L"Test") == 0, "Got incorrect type\n"); CoTaskMemFree(displayName); } @@ -390,7 +388,6 @@ static void test_CompleteLocal(void) /* Test a complete transfer for local files */ static void test_CompleteLocalURL(void) { - static const WCHAR prot[] = {'f','i','l','e',':','/','/', 0}; static const int timeout_sec = 30; WCHAR *urlA, *urlB; HRESULT hres; @@ -414,9 +411,9 @@ static void test_CompleteLocalURL(void) return; } - lstrcpyW(urlA, prot); + lstrcpyW(urlA, L"file://"); lstrcatW(urlA, test_remotePathA); - lstrcpyW(urlB, prot); + lstrcpyW(urlB, L"file://"); lstrcatW(urlB, test_remotePathB); hres = IBackgroundCopyJob_AddFile(test_job, urlA, test_localPathA); @@ -506,10 +503,7 @@ static void test_Cancel(void) static void test_HttpOptions(void) { - static const WCHAR urlW[] = - {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g','/',0}; - static const WCHAR winetestW[] = - {'W','i','n','e',':',' ','t','e','s','t','\r','\n',0}; + static const WCHAR winetestW[] = L"Wine: test\r\n"; static const unsigned int timeout = 30; HRESULT hr; IBackgroundCopyJobHttpOptions *options; @@ -520,7 +514,7 @@ static void test_HttpOptions(void) ULONG flags, orig_flags; DeleteFileW(test_localPathA); - hr = IBackgroundCopyJob_AddFile(test_job, urlW, test_localPathA); + hr = IBackgroundCopyJob_AddFile(test_job, L"http://test.winehq.org/", test_localPathA); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IBackgroundCopyJob_QueryInterface(test_job, &IID_IBackgroundCopyJobHttpOptions, (void **)&options); diff --git a/dlls/qmgr/tests/qmgr.c b/dlls/qmgr/tests/qmgr.c index d000fd6f36d..bb238150aca 100644 --- a/dlls/qmgr/tests/qmgr.c +++ b/dlls/qmgr/tests/qmgr.c @@ -50,7 +50,6 @@ static HRESULT test_create_manager(void) static void test_CreateJob(void) { /* Job information */ - static const WCHAR copyNameW[] = {'T', 'e', 's', 't', 0}; IBackgroundCopyJob* job = NULL; GUID tmpId; HRESULT hres; @@ -64,9 +63,7 @@ static void test_CreateJob(void) ok(hres == S_OK, "got 0x%08x\n", hres); /* Create bits job */ - hres = IBackgroundCopyManager_CreateJob(manager, copyNameW, - BG_JOB_TYPE_DOWNLOAD, &tmpId, - &job); + hres = IBackgroundCopyManager_CreateJob(manager, L"Test", BG_JOB_TYPE_DOWNLOAD, &tmpId, &job); ok(hres == S_OK, "CreateJob failed: %08x\n", hres); res = IBackgroundCopyJob_Release(job); @@ -78,8 +75,6 @@ static void test_EnumJobs(void) { /* Job Enumerator */ IEnumBackgroundCopyJobs* enumJobs; - - static const WCHAR copyNameW[] = {'T', 'e', 's', 't', 0}; IBackgroundCopyManager *manager = NULL; IBackgroundCopyJob *job = NULL; HRESULT hres; @@ -91,9 +86,7 @@ static void test_EnumJobs(void) (void **) &manager); ok(hres == S_OK, "got 0x%08x\n", hres); - hres = IBackgroundCopyManager_CreateJob(manager, copyNameW, - BG_JOB_TYPE_DOWNLOAD, &tmpId, - &job); + hres = IBackgroundCopyManager_CreateJob(manager, L"Test", BG_JOB_TYPE_DOWNLOAD, &tmpId, &job); ok(hres == S_OK, "got 0x%08x\n", hres); hres = IBackgroundCopyManager_EnumJobs(manager, 0, &enumJobs); @@ -107,7 +100,6 @@ static void test_EnumJobs(void) static void run_child(WCHAR *secret) { - static const WCHAR format[] = {'%','s',' ','q','m','g','r',' ','%','s', 0}; WCHAR cmdline[MAX_PATH]; PROCESS_INFORMATION info; STARTUPINFOW startup; @@ -115,7 +107,7 @@ static void run_child(WCHAR *secret) memset(&startup, 0, sizeof startup); startup.cb = sizeof startup; - wsprintfW(cmdline, format, progname, secret); + wsprintfW(cmdline, L"%s qmgr %s", progname, secret); ok(CreateProcessW(NULL, cmdline, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); wait_child_process(info.hProcess); ok(CloseHandle(info.hProcess), "CloseHandle\n"); @@ -144,7 +136,6 @@ static void do_child(const char *secretA) static void test_globalness(void) { - static const WCHAR format[] = {'t','e','s','t','_','%','u', 0}; WCHAR secretName[MAX_PATH]; IEnumBackgroundCopyJobs* enumJobs; IBackgroundCopyManager *manager = NULL; @@ -154,7 +145,7 @@ static void test_globalness(void) (void **) &manager); ok(hres == S_OK, "got 0x%08x\n", hres); - wsprintfW(secretName, format, GetTickCount()); + wsprintfW(secretName, L"test_%u", GetTickCount()); run_child(secretName); hres = IBackgroundCopyManager_EnumJobs(manager, 0, &enumJobs); -- 2.26.2

2 2

[PATCH] winmgmt: Use wide-char string literals.
by Michael Stefaniuc 11 Oct '20

11 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winmgmt/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winmgmt/main.c b/programs/winmgmt/main.c index 8b262d00f3b..bc7150a08ca 100644 --- a/programs/winmgmt/main.c +++ b/programs/winmgmt/main.c @@ -24,7 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winmgmt); -static WCHAR winmgmtW[] = {'W','i','n','m','g','m','t',0}; +static WCHAR winmgmtW[] = L"Winmgmt"; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event; -- 2.26.2

1 0

[PATCH] termsv: Use wide-char string literals.
by Michael Stefaniuc 11 Oct '20

11 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/termsv/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/termsv/main.c b/programs/termsv/main.c index eb79d17f005..2ca6d0809df 100644 --- a/programs/termsv/main.c +++ b/programs/termsv/main.c @@ -24,7 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(termsv); -static WCHAR termserviceW[] = {'T','e','r','m','S','e','r','v','i','c','e',0}; +static WCHAR termserviceW[] = L"TermService"; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event; -- 2.26.2

1 0

[PATCH] spoolsv: Use wide-char string literals.
by Michael Stefaniuc 11 Oct '20

11 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/spoolsv/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/spoolsv/main.c b/programs/spoolsv/main.c index 8fe37f2354f..2893fa614a1 100644 --- a/programs/spoolsv/main.c +++ b/programs/spoolsv/main.c @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(spoolsv); -static WCHAR spoolerW[] = {'S','p','o','o','l','e','r',0}; +static WCHAR spoolerW[] = L"Spooler"; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event; -- 2.26.2

1 0

[PATCH] presentationfontcache: Use wide-char string literals.
by Michael Stefaniuc 11 Oct '20

11 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/presentationfontcache/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/presentationfontcache/main.c b/programs/presentationfontcache/main.c index 694ad792dbf..ab2d0e21061 100644 --- a/programs/presentationfontcache/main.c +++ b/programs/presentationfontcache/main.c @@ -24,7 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(fontcache); -static WCHAR fontcacheW[] = {'F','o','n','t','C','a','c','h','e','3','.','0','.','0','.','0',0}; +static WCHAR fontcacheW[] = L"FontCache3.0.0.0"; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event; -- 2.26.2

1 0

[PATCH] plugplay: Use wide-char string literals.
by Michael Stefaniuc 11 Oct '20

11 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Annoyingly the string in SERVICE_TABLE_ENTRYW is not const. Inlining the string would produce a warning. Same for the other patches. programs/plugplay/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/plugplay/main.c b/programs/plugplay/main.c index 8e007048422..2c4054de3e4 100644 --- a/programs/plugplay/main.c +++ b/programs/plugplay/main.c @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); -static WCHAR plugplayW[] = {'P','l','u','g','P','l','a','y',0}; +static WCHAR plugplayW[] = L"PlugPlay"; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event; -- 2.26.2

1 0

[PATCH] write: Use wide-char string literals.
by Michael Stefaniuc 11 Oct '20

11 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/write/write.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/write/write.c b/programs/write/write.c index 4039af4398f..1481e900f75 100644 --- a/programs/write/write.c +++ b/programs/write/write.c @@ -25,17 +25,15 @@ #include <windows.h> #include "resources.h" -static const WCHAR SZ_WORDPAD[] = {'\\','w','o','r','d','p','a','d','.','e','x','e',0}; - int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdParagraph, int res) { WCHAR path[MAX_PATH]; STARTUPINFOW stinf; PROCESS_INFORMATION info; - if (!GetSystemDirectoryW(path, MAX_PATH - 1 - lstrlenW(SZ_WORDPAD))) + if (!GetSystemDirectoryW(path, MAX_PATH - 1 - lstrlenW(L"\\wordpad.exe"))) goto failed; - lstrcatW(path, SZ_WORDPAD); + lstrcatW(path, L"\\wordpad.exe"); stinf.cb = sizeof(STARTUPINFOW); GetStartupInfoW(&stinf); -- 2.26.2

1 0

[PATCH 1/2] vbscript: add is_default flag to struct _function_decl_t.
by Robert Wilhelm 11 Oct '20

11 Oct '20

Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/compile.c | 6 ++---- dlls/vbscript/interp.c | 2 +- dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 4 +++- dlls/vbscript/vbdisp.c | 2 +- dlls/vbscript/vbscript.h | 1 - 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 2e991b0c0ae..e9f6361aee9 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1468,7 +1468,6 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f case FUNC_PROPGET: case FUNC_PROPLET: case FUNC_PROPSET: - case FUNC_DEFGET: ctx->prop_end_label = alloc_label(ctx); if(!ctx->prop_end_label) return E_OUTOFMEMORY; @@ -1630,7 +1629,6 @@ static HRESULT create_class_funcprop(compile_ctx_t *ctx, function_decl_t *func_d case FUNC_FUNCTION: case FUNC_SUB: case FUNC_PROPGET: - case FUNC_DEFGET: invoke_type = VBDISP_CALLGET; break; case FUNC_PROPLET: @@ -1696,7 +1694,7 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) for(func_decl = class_decl->funcs; func_decl; func_decl = func_decl->next) { for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { - if(func_prop_decl->type == FUNC_DEFGET) + if(func_prop_decl->is_default) break; } if(!func_prop_decl) @@ -1710,7 +1708,7 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) for(func_decl = class_decl->funcs, i=1; func_decl; func_decl = func_decl->next, i++) { for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { - if(func_prop_decl->type == FUNC_DEFGET) { + if(func_prop_decl->is_default) { i--; break; } diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index d58e89b7dba..a3bca804128 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -134,7 +134,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ DISPID id; HRESULT hres; - if((ctx->func->type == FUNC_FUNCTION || ctx->func->type == FUNC_PROPGET || ctx->func->type == FUNC_DEFGET) + if((ctx->func->type == FUNC_FUNCTION || ctx->func->type == FUNC_PROPGET ) && !wcsicmp(name, ctx->func->name)) { ref->type = REF_VAR; ref->u.v = &ctx->ret_val; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index ab81bb3ae41..f5d8a616b9f 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -184,6 +184,7 @@ typedef struct _function_decl_t { const WCHAR *name; function_type_t type; BOOL is_public; + BOOL is_default; arg_decl_t *args; statement_t *body; struct _function_decl_t *next; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index cf94bdce464..7e6cc17efd6 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -990,10 +990,11 @@ static function_decl_t *new_function_decl(parser_ctx_t *ctx, const WCHAR *name, unsigned storage_flags, arg_decl_t *arg_decl, statement_t *body) { function_decl_t *decl; + BOOL is_default = FALSE; if(storage_flags & STORAGE_IS_DEFAULT) { if(type == FUNC_PROPGET) { - type = FUNC_DEFGET; + is_default = TRUE; }else { FIXME("Invalid default property\n"); ctx->hres = E_FAIL; @@ -1008,6 +1009,7 @@ static function_decl_t *new_function_decl(parser_ctx_t *ctx, const WCHAR *name, decl->name = name; decl->type = type; decl->is_public = !(storage_flags & STORAGE_IS_PRIVATE); + decl->is_default = is_default; decl->args = arg_decl; decl->body = body; decl->next = NULL; diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 36eba21e279..1ff1110e56b 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -177,7 +177,7 @@ static HRESULT invoke_vbdisp(vbdisp_t *This, DISPID id, DWORD flags, BOOL extern switch(flags) { case DISPATCH_PROPERTYGET: func = This->desc->funcs[id].entries[VBDISP_CALLGET]; - if(!func || (func->type != FUNC_PROPGET && func->type != FUNC_DEFGET)) { + if(!func || func->type != FUNC_PROPGET) { WARN("no getter\n"); return DISP_E_MEMBERNOTFOUND; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 869fb05b6ed..afcce5eb9b8 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -314,7 +314,6 @@ typedef enum { FUNC_PROPGET, FUNC_PROPLET, FUNC_PROPSET, - FUNC_DEFGET } function_type_t; typedef struct { -- 2.26.2

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel