September 2020 - Wine-Commits

Michael Stefaniuc : shlwapi: Remove superfluous cast to self.
by Alexandre Julliard Sept. 28, 2020

Sept. 28, 2020

Module: wine Branch: master Commit: 93da988df2a7fc7a772c3a2347fa6a46bfdca2c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93da988df2a7fc7a772c3a23… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Sep 28 21:28:07 2020 +0200 shlwapi: Remove superfluous cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index be178bba60..f4c6ca85d6 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -229,7 +229,7 @@ HRESULT WINAPI StrRetToBufA (LPSTRRET src, const ITEMIDLIST *pidl, LPSTR dest, U break; case STRRET_OFFSET: - lstrcpynA((LPSTR)dest, ((LPCSTR)&pidl->mkid)+src->u.uOffset, len); + lstrcpynA(dest, ((LPCSTR)&pidl->mkid)+src->u.uOffset, len); break; default:

1 0

Alexandre Julliard : configure: Don't disable ntdll or kernel32 for Windows builds.
by Alexandre Julliard Sept. 28, 2020

Sept. 28, 2020

Module: wine Branch: master Commit: 725bb795f8f8793b6649f01eb28e3238b9099025 URL: https://source.winehq.org/git/wine.git/?a=commit;h=725bb795f8f8793b6649f01e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 16:34:23 2020 +0200 configure: Don't disable ntdll or kernel32 for Windows builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 -- configure.ac | 2 -- 2 files changed, 4 deletions(-) diff --git a/configure b/configure index a70d60da82..296e476779 100755 --- a/configure +++ b/configure @@ -8282,8 +8282,6 @@ if test "x$ac_cv_cflags__Wl___disable_stdcall_fixup" = xyes; then : fi ;; esac enable_iphlpapi=${enable_iphlpapi:-no} - enable_kernel32=${enable_kernel32:-no} - enable_ntdll=${enable_ntdll:-no} enable_ws2_32=${enable_ws2_32:-no} enable_loader=${enable_loader:-no} enable_server=${enable_server:-no} diff --git a/configure.ac b/configure.ac index 722e5653bd..1072f16f09 100644 --- a/configure.ac +++ b/configure.ac @@ -723,8 +723,6 @@ case $host_os in esac dnl Disable modules that can't be used on Windows enable_iphlpapi=${enable_iphlpapi:-no} - enable_kernel32=${enable_kernel32:-no} - enable_ntdll=${enable_ntdll:-no} enable_ws2_32=${enable_ws2_32:-no} enable_loader=${enable_loader:-no} enable_server=${enable_server:-no}

1 0

Alexandre Julliard : kernel32: Build with msvcrt.
by Alexandre Julliard Sept. 28, 2020

Sept. 28, 2020

Module: wine Branch: master Commit: 0c631ebb2354334eaf309bc0765d3283654cf902 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c631ebb2354334eaf309bc0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 16:34:11 2020 +0200 kernel32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 4 +- dlls/kernel32/atom.c | 9 +-- dlls/kernel32/comm.c | 39 ++++++------ dlls/kernel32/computername.c | 4 -- dlls/kernel32/console.c | 5 +- dlls/kernel32/debugger.c | 3 +- dlls/kernel32/editline.c | 4 -- dlls/kernel32/file.c | 9 +-- dlls/kernel32/heap.c | 3 - dlls/kernel32/kernel_main.c | 4 -- dlls/kernel32/lcformat.c | 31 +++++----- dlls/kernel32/locale.c | 4 -- dlls/kernel32/lzexpand.c | 9 +-- dlls/kernel32/module.c | 14 ++--- dlls/kernel32/path.c | 9 +-- dlls/kernel32/process.c | 21 +------ dlls/kernel32/profile.c | 140 +++++++++++++++++++++---------------------- dlls/kernel32/resource.c | 6 +- dlls/kernel32/sync.c | 7 --- dlls/kernel32/tests/loader.c | 22 ++----- dlls/kernel32/thread.c | 2 - dlls/kernel32/toolhelp.c | 5 -- dlls/kernel32/version.c | 4 -- dlls/kernel32/virtual.c | 11 +--- dlls/kernel32/volume.c | 3 - 25 files changed, 128 insertions(+), 244 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c631ebb2354334eaf30…

1 0

Michael Stefaniuc : gdiplus: Remove superfluous cast to self.
by Alexandre Julliard Sept. 28, 2020

Sept. 28, 2020

Module: wine Branch: master Commit: 812eb3c41d5eae82835c5ea507bb1041edf5ba7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=812eb3c41d5eae82835c5ea5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Sep 28 21:28:05 2020 +0200 gdiplus: Remove superfluous cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index e52932da11..e9855c7226 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -3482,7 +3482,7 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, if (flags & 0x8000) { - stat = GdipCreateSolidFill(draw->brush.Color, (GpSolidFill**)&solidfill); + stat = GdipCreateSolidFill(draw->brush.Color, &solidfill); if (stat != Ok) return InvalidParameter;

1 0

Michael Stefaniuc : shell32: Remove superfluous cast to self.
by Alexandre Julliard Sept. 28, 2020

Sept. 28, 2020

Module: wine Branch: master Commit: 1f313b7f1f0345259dbfa5667b34d89042ea7928 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f313b7f1f0345259dbfa566… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Sep 28 21:28:06 2020 +0200 shell32: Remove superfluous cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index de581dec42..b0eefa5999 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -934,7 +934,7 @@ static HRESULT ShellLinkObject_Constructor(FolderItemImpl *item, IShellLinkDual2 return hr; } - *link = (IShellLinkDual2 *)&This->IShellLinkDual2_iface; + *link = &This->IShellLinkDual2_iface; return S_OK; }

1 0

Robert Wilhelm : vbscript: Allow public and private declarations in global scope.
by Alexandre Julliard Sept. 28, 2020

Sept. 28, 2020

Module: wine Branch: master Commit: 53cd1a27ad6b5a59c00525c1324e3c2405f58c69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53cd1a27ad6b5a59c00525c1… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Mon Sep 28 20:09:14 2020 +0200 vbscript: Allow public and private declarations in global scope. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46588 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 7 +++++++ dlls/vbscript/tests/lang.vbs | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 924d0b973b..cf94bdce46 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -131,6 +131,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %token <dbl> tDouble %type <statement> Statement SimpleStatement StatementNl StatementsNl StatementsNl_opt BodyStatements IfStatement Else_opt +%type <statement> GlobalDimDeclaration %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression ExpressionNl_opt %type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression MultiplicativeExpression ExpExpression %type <expression> NotExpression UnaryExpression AndExpression OrExpression XorExpression EqvExpression SignExpression @@ -161,9 +162,15 @@ OptionExplicit_opt SourceElements : /* empty */ + | SourceElements GlobalDimDeclaration StSep + { source_add_statement(ctx, $2); } | SourceElements StatementNl { source_add_statement(ctx, $2); } | SourceElements ClassDeclaration { source_add_class(ctx, $2); } +GlobalDimDeclaration + : tPRIVATE DimDeclList { $$ = new_dim_statement(ctx, @$, $2); CHECK_ERROR; } + | tPUBLIC DimDeclList { $$ = new_dim_statement(ctx, @$, $2); CHECK_ERROR; } + ExpressionNl_opt : /* empty */ { $$ = NULL; } | Expression tNL { $$ = $1; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 9f254f502b..dc16c50fae 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -69,6 +69,10 @@ Call ok(x = "xx", "x = " & x & " expected ""xx""") Dim public1 : public1 = 42 Call ok(public1 = 42, "public1=" & public1 & " expected & " & 42) +Private priv1 : priv1 = 43 +Call ok(priv1 = 43, "priv1=" & priv1 & " expected & " & 43) +Public pub1 : pub1 = 44 +Call ok(pub1 = 44, "pub1=" & pub1 & " expected & " & 44) Call ok(true <> false, "true <> false is false") Call ok(not (true <> true), "true <> true is true")

1 0

Dmitry Timoshkov : wevtsvc: Add EventLog service stub.
by Alexandre Julliard Sept. 28, 2020

Sept. 28, 2020

Module: wine Branch: master Commit: 7e7e81f0c614dc03ad8f9ae35c0d1470783cd9f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e7e81f0c614dc03ad8f9ae3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 23 21:15:21 2020 +0300 wevtsvc: Add EventLog service stub. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/advapi32/tests/service.c | 46 +++++++++++++++++++++++ dlls/wevtsvc/Makefile.in | 7 ++++ dlls/wevtsvc/wevtsvc.c | 87 +++++++++++++++++++++++++++++++++++++++++++ dlls/wevtsvc/wevtsvc.spec | 1 + loader/wine.inf.in | 17 +++++++++ 7 files changed, 161 insertions(+) diff --git a/configure b/configure index cde0867a80..e26ee4a0ce 100755 --- a/configure +++ b/configure @@ -1645,6 +1645,7 @@ enable_wdscore enable_webservices enable_wer enable_wevtapi +enable_wevtsvc enable_wiaservc enable_wimgapi enable_windowscodecs @@ -21007,6 +21008,7 @@ wine_fn_config_makefile dlls/webservices/tests enable_tests wine_fn_config_makefile dlls/wer enable_wer wine_fn_config_makefile dlls/wer/tests enable_tests wine_fn_config_makefile dlls/wevtapi enable_wevtapi +wine_fn_config_makefile dlls/wevtsvc enable_wevtsvc wine_fn_config_makefile dlls/wiaservc enable_wiaservc wine_fn_config_makefile dlls/wiaservc/tests enable_tests wine_fn_config_makefile dlls/wimgapi enable_wimgapi diff --git a/configure.ac b/configure.ac index 3d784b1de6..cb3e2f6317 100644 --- a/configure.ac +++ b/configure.ac @@ -3790,6 +3790,7 @@ WINE_CONFIG_MAKEFILE(dlls/webservices/tests) WINE_CONFIG_MAKEFILE(dlls/wer) WINE_CONFIG_MAKEFILE(dlls/wer/tests) WINE_CONFIG_MAKEFILE(dlls/wevtapi) +WINE_CONFIG_MAKEFILE(dlls/wevtsvc) WINE_CONFIG_MAKEFILE(dlls/wiaservc) WINE_CONFIG_MAKEFILE(dlls/wiaservc/tests) WINE_CONFIG_MAKEFILE(dlls/wimgapi) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 7048e5a09a..817d0cb9ab 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2678,6 +2678,51 @@ static void test_refcount(void) CloseServiceHandle(scm_handle); } +static void test_EventLog(void) +{ + SC_HANDLE scm_handle, svc_handle; + DWORD size; + BOOL ret; + QUERY_SERVICE_CONFIGA *config; + + scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_READ); + ok(scm_handle != NULL, "OpenSCManager error %u\n", GetLastError()); + + svc_handle = OpenServiceA(scm_handle, "EventLog", GENERIC_READ); + ok(svc_handle != NULL, "OpenService error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = QueryServiceConfigA(svc_handle, NULL, 0, &size); + ok(!ret, "QueryServiceConfig should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + + config = HeapAlloc(GetProcessHeap(), 0, size); + ret = QueryServiceConfigA(svc_handle, config, size, &size); + ok(ret, "QueryServiceConfig error %u\n", GetLastError()); + + ok(config->dwServiceType == SERVICE_WIN32_SHARE_PROCESS, "got %#x\n", config->dwServiceType); + ok(config->dwStartType == SERVICE_AUTO_START, "got %u\n", config->dwStartType); + ok(config->dwErrorControl == SERVICE_ERROR_NORMAL, "got %u\n", config->dwErrorControl); + ok(!strcmpi(config->lpBinaryPathName, "C:\\windows\\system32\\services.exe") /* XP */ || + !strcmpi(config->lpBinaryPathName, "C:\\windows\\system32\\svchost.exe -k LocalServiceNetworkRestricted") /* Vista+ */ || + !strcmpi(config->lpBinaryPathName, "C:\\windows\\system32\\svchost.exe -k LocalServiceNetworkRestricted -p") /* Win10 */, + "got %s\n", config->lpBinaryPathName); +todo_wine + ok(!strcmpi(config->lpLoadOrderGroup, "Event Log"), "got %s\n", config->lpLoadOrderGroup); + ok(config->dwTagId == 0, "Expected 0, got %d\n", config->dwTagId); + ok(!config->lpDependencies[0], "lpDependencies is not empty\n"); + ok(!strcmp(config->lpServiceStartName, "LocalSystem") /* XP */ || + !strcmp(config->lpServiceStartName, "NT AUTHORITY\\LocalService"), + "got %s\n", config->lpServiceStartName); + ok(!strcmp(config->lpDisplayName, "Event Log") /* XP */ || + !strcmp(config->lpDisplayName, "Windows Event Log") /* Vista+ */, "got %s\n", config->lpDisplayName); + + HeapFree(GetProcessHeap(), 0, config); + + CloseServiceHandle(svc_handle); + CloseServiceHandle(scm_handle); +} + static DWORD WINAPI ctrl_handler(DWORD ctl, DWORD type, void *data, void *user) { HANDLE evt = user; @@ -2775,4 +2820,5 @@ START_TEST(service) * and what the rules are */ test_refcount(); + test_EventLog(); } diff --git a/dlls/wevtsvc/Makefile.in b/dlls/wevtsvc/Makefile.in new file mode 100644 index 0000000000..3dcbb804a3 --- /dev/null +++ b/dlls/wevtsvc/Makefile.in @@ -0,0 +1,7 @@ +MODULE = wevtsvc.dll +IMPORTS = rpcrt4 advapi32 + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + wevtsvc.c diff --git a/dlls/wevtsvc/wevtsvc.c b/dlls/wevtsvc/wevtsvc.c new file mode 100644 index 0000000000..14c30791ff --- /dev/null +++ b/dlls/wevtsvc/wevtsvc.c @@ -0,0 +1,87 @@ +/* + * Event Log Service + * + * Copyright 2020 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winsvc.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(eventlog); + +static SERVICE_STATUS_HANDLE svc_handle; +static HANDLE done_event; + +static void eventlog_update_status(DWORD state) +{ + SERVICE_STATUS status; + + status.dwServiceType = SERVICE_WIN32; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 0; + status.dwControlsAccepted = 0; + status.dwCurrentState = state; + + SetServiceStatus(svc_handle, &status); +} + +static void WINAPI eventlog_handler(DWORD control) +{ + TRACE("%#x\n", control); + + switch (control) + { + case SERVICE_CONTROL_STOP: + case SERVICE_CONTROL_SHUTDOWN: + eventlog_update_status(SERVICE_STOP_PENDING); + SetEvent(done_event); + break; + + default: + eventlog_update_status(SERVICE_RUNNING); + break; + } +} + +void WINAPI ServiceMain(DWORD argc, LPWSTR *argv) +{ + TRACE("starting Event Log Service\n"); + + svc_handle = RegisterServiceCtrlHandlerW(L"EventLog", eventlog_handler); + if (!svc_handle) + { + ERR("RegisterServiceCtrlHandler error %u\n", GetLastError()); + return; + } + + eventlog_update_status(SERVICE_RUNNING); + + done_event = CreateEventW(NULL, TRUE, FALSE, NULL); + WaitForSingleObject(done_event, INFINITE); + CloseHandle(done_event); + + eventlog_update_status(SERVICE_STOPPED); + + TRACE("exiting Event Log Service\n"); +} diff --git a/dlls/wevtsvc/wevtsvc.spec b/dlls/wevtsvc/wevtsvc.spec new file mode 100644 index 0000000000..daa88578f7 --- /dev/null +++ b/dlls/wevtsvc/wevtsvc.spec @@ -0,0 +1 @@ +@ stdcall -private ServiceMain(long ptr) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index cd0e7bd16f..9fcbf47c9f 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -149,6 +149,7 @@ WineFakeDlls=FakeDllsWin32 [DefaultInstall.Services] AddService=BITS,0,BITSService +AddService=EventLog,0,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService AddService=MountMgr,0x800,MountMgrService @@ -167,6 +168,7 @@ AddService=NDIS,0x800,NDISService [DefaultInstall.NT.Services] AddService=BITS,0,BITSService +AddService=EventLog,0,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService AddService=MountMgr,0x800,MountMgrService @@ -185,6 +187,7 @@ AddService=NDIS,0x800,NDISService [DefaultInstall.ntamd64.Services] AddService=BITS,0,BITSService +AddService=EventLog,0,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService AddService=MountMgr,0x800,MountMgrService @@ -203,6 +206,7 @@ AddService=NDIS,0x800,NDISService [DefaultInstall.ntarm64.Services] AddService=BITS,0,BITSService +AddService=EventLog,0,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService AddService=MountMgr,0x800,MountMgrService @@ -3609,6 +3613,15 @@ ServiceType=16 StartType=3 ErrorControl=1 +[EventLogService] +AddReg=EventLogServiceKeys +Description="Event Log" +DisplayName="Event Log" +ServiceBinary="%11%\svchost.exe -k LocalServiceNetworkRestricted" +ServiceType=32 +StartType=2 +ErrorControl=1 + [HTTPService] Description="HTTP server" DisplayName="HTTP" @@ -3696,6 +3709,10 @@ ErrorControl=1 HKR,Parameters,"ServiceDll",,"%11%\qmgr.dll" HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010000,"BITS" +[EventLogServiceKeys] +HKR,Parameters,"ServiceDll",,"%11%\wevtsvc.dll" +HKLM,%CurrentVersionNT%\SvcHost,"LocalServiceNetworkRestricted",0x00010000,"EventLog" + [StiServiceKeys] HKR,Parameters,"ServiceDll",,"%11%\wiaservc.dll" HKLM,%CurrentVersionNT%\SvcHost,"imgsvc",0x00010000,"StiSvc"

1 0

Alexandre Julliard : configure: Require 64-bit compare-and-swap support from gcc.
by Alexandre Julliard Sept. 28, 2020

Sept. 28, 2020

Module: wine Branch: master Commit: e055a3ee0503a62d1d0c1391b01471c13fad6bd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e055a3ee0503a62d1d0c1391… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 28 14:35:32 2020 +0200 configure: Require 64-bit compare-and-swap support from gcc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49191 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 61 +++++++++++++++++++++++++++++++++++++ configure.ac | 26 ++++++++++++++++ dlls/ntdll/large_int.c | 23 -------------- dlls/ntdll/ntdll_misc.h | 4 --- dlls/ntdll/unix/unix_private.h | 4 --- include/winbase.h | 69 ++++++++---------------------------------- 6 files changed, 99 insertions(+), 88 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e055a3ee0503a62d1d0c…

1 0

Michael Stefaniuc : dswave: Simplify the stub WAVE IPersistStream_Load().
by Alexandre Julliard Sept. 28, 2020

Sept. 28, 2020

Module: wine Branch: master Commit: ef12437b690bb2f73fcb5abddb7a2932565d75c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef12437b690bb2f73fcb5abd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Sep 25 21:14:32 2020 +0200 dswave: Simplify the stub WAVE IPersistStream_Load(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dswave/dswave.c | 166 +++++-------------------------------------- dlls/dswave/dswave_private.h | 9 --- 2 files changed, 19 insertions(+), 156 deletions(-) diff --git a/dlls/dswave/dswave.c b/dlls/dswave/dswave.c index a561660cfa..349c7e2fda 100644 --- a/dlls/dswave/dswave.c +++ b/dlls/dswave/dswave.c @@ -21,8 +21,7 @@ #include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dswave); -WINE_DECLARE_DEBUG_CHANNEL(dmfile); - + /* an interface that is, according to my tests, obtained by loader after loading object; is it acting as some sort of bridge between object and loader? */ static const GUID IID_IDirectMusicWavePRIVATE = {0x69e934e4,0x97f1,0x4f1d,{0x88,0xe8,0xf2,0xac,0x88,0x67,0x13,0x27}}; @@ -144,151 +143,24 @@ static inline IDirectMusicWaveImpl *impl_from_IPersistStream(IPersistStream *ifa return CONTAINING_RECORD(iface, IDirectMusicWaveImpl, dmobj.IPersistStream_iface); } -static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm) +static HRESULT WINAPI wave_IPersistStream_Load(IPersistStream *iface, IStream *stream) { - IDirectMusicWaveImpl *This = impl_from_IPersistStream(iface); - DMUS_PRIVATE_CHUNK Chunk; - DWORD StreamSize, StreamCount, ListSize[1], ListCount[1]; - LARGE_INTEGER liMove; /* used when skipping chunks */ - - FIXME("(%p, %p): loading not implemented yet (only descriptor is loaded)\n", This, pStm); - - /* FIXME: should this be determined from stream? */ - This->dmobj.desc.dwValidData |= DMUS_OBJ_CLASS; - This->dmobj.desc.guidClass = CLSID_DirectMusicSegment; - - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - case FOURCC_RIFF: { - IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": RIFF chunk of type %s", debugstr_fourcc(Chunk.fccID)); - StreamSize = Chunk.dwSize - sizeof(FOURCC); - StreamCount = 0; - if (Chunk.fccID == mmioFOURCC('W','A','V','E')) { - TRACE_(dmfile)(": wave form\n"); - do { - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - case DMUS_FOURCC_GUID_CHUNK: { - TRACE_(dmfile)(": GUID chunk\n"); - This->dmobj.desc.dwValidData |= DMUS_OBJ_OBJECT; - IStream_Read (pStm, &This->dmobj.desc.guidObject, Chunk.dwSize, NULL); - break; - } - case DMUS_FOURCC_VERSION_CHUNK: { - TRACE_(dmfile)(": version chunk\n"); - This->dmobj.desc.dwValidData |= DMUS_OBJ_VERSION; - IStream_Read (pStm, &This->dmobj.desc.vVersion, Chunk.dwSize, NULL); - break; - } - case DMUS_FOURCC_CATEGORY_CHUNK: { - TRACE_(dmfile)(": category chunk\n"); - This->dmobj.desc.dwValidData |= DMUS_OBJ_CATEGORY; - IStream_Read (pStm, This->dmobj.desc.wszCategory, Chunk.dwSize, NULL); - break; - } - case FOURCC_LIST: { - IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": LIST chunk of type %s", debugstr_fourcc(Chunk.fccID)); - ListSize[0] = Chunk.dwSize - sizeof(FOURCC); - ListCount[0] = 0; - switch (Chunk.fccID) { - /* evil M$ UNFO list, which can (!?) contain INFO elements */ - case DMUS_FOURCC_UNFO_LIST: { - TRACE_(dmfile)(": UNFO list\n"); - do { - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - /* don't ask me why, but M$ puts INFO elements in UNFO list sometimes - (though strings seem to be valid unicode) */ - case mmioFOURCC('I','N','A','M'): - case DMUS_FOURCC_UNAM_CHUNK: { - TRACE_(dmfile)(": name chunk\n"); - This->dmobj.desc.dwValidData |= DMUS_OBJ_NAME; - IStream_Read (pStm, This->dmobj.desc.wszName, Chunk.dwSize, NULL); - break; - } - case mmioFOURCC('I','A','R','T'): - case DMUS_FOURCC_UART_CHUNK: { - TRACE_(dmfile)(": artist chunk (ignored)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - case mmioFOURCC('I','C','O','P'): - case DMUS_FOURCC_UCOP_CHUNK: { - TRACE_(dmfile)(": copyright chunk (ignored)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - case mmioFOURCC('I','S','B','J'): - case DMUS_FOURCC_USBJ_CHUNK: { - TRACE_(dmfile)(": subject chunk (ignored)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - case mmioFOURCC('I','C','M','T'): - case DMUS_FOURCC_UCMT_CHUNK: { - TRACE_(dmfile)(": comment chunk (ignored)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); - } while (ListCount[0] < ListSize[0]); - break; - } - default: { - TRACE_(dmfile)(": unknown (skipping)\n"); - liMove.QuadPart = Chunk.dwSize - sizeof(FOURCC); - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - break; - } - default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize); - } while (StreamCount < StreamSize); - } else { - TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); - liMove.QuadPart = StreamSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */ - return E_FAIL; - } - - TRACE_(dmfile)(": reading finished\n"); - break; - } - default: { - TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */ - return DMUS_E_INVALIDFILE; - } - } - - return S_OK; + IDirectMusicWaveImpl *This = impl_from_IPersistStream(iface); + struct chunk_entry riff = {0}; + + /* Without the private interface the implementation should go to dmime/segment.c */ + FIXME("(%p, %p): loading not implemented (only descriptor is loaded)\n", This, stream); + + if (!stream) + return E_POINTER; + + if (stream_get_chunk(stream, &riff) != S_OK || riff.id != FOURCC_RIFF || + riff.type != mmioFOURCC('W','A','V','E')) + return DMUS_E_UNSUPPORTED_STREAM; + stream_reset_chunk_start(stream, &riff); + + return IDirectMusicObject_ParseDescriptor(&This->dmobj.IDirectMusicObject_iface, stream, + &This->dmobj.desc); } static const IPersistStreamVtbl persiststream_vtbl = { @@ -297,7 +169,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_Release, dmobj_IPersistStream_GetClassID, unimpl_IPersistStream_IsDirty, - IPersistStreamImpl_Load, + wave_IPersistStream_Load, unimpl_IPersistStream_Save, unimpl_IPersistStream_GetSizeMax }; diff --git a/dlls/dswave/dswave_private.h b/dlls/dswave/dswave_private.h index 10560d0254..5b5eb7a937 100644 --- a/dlls/dswave/dswave_private.h +++ b/dlls/dswave/dswave_private.h @@ -51,13 +51,4 @@ extern LONG DSWAVE_refCount DECLSPEC_HIDDEN; static inline void DSWAVE_LockModule(void) { InterlockedIncrement( &DSWAVE_refCount ); } static inline void DSWAVE_UnlockModule(void) { InterlockedDecrement( &DSWAVE_refCount ); } -/***************************************************************************** - * Misc. - */ -/* for simpler reading */ -typedef struct _DMUS_PRIVATE_CHUNK { - FOURCC fccID; /* FOURCC ID of the chunk */ - DWORD dwSize; /* size of the chunk */ -} DMUS_PRIVATE_CHUNK, *LPDMUS_PRIVATE_CHUNK; - #endif /* __WINE_DSWAVE_PRIVATE_H */

1 0

Huw Davies : include: Fix TXTVIEW_INACTIVE to be -1.
by Alexandre Julliard Sept. 28, 2020

Sept. 28, 2020

Module: wine Branch: master Commit: fabef7ae2b53bb244ba9ad784d6e22c36f691a1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=fabef7ae2b53bb244ba9ad78… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Sep 28 11:16:59 2020 +0100 include: Fix TXTVIEW_INACTIVE to be -1. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/textserv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/textserv.h b/include/textserv.h index d3583f3a96..1272a6bba0 100644 --- a/include/textserv.h +++ b/include/textserv.h @@ -174,7 +174,7 @@ enum TXTNATURALSIZE { enum TXTVIEW { TXTVIEW_ACTIVE = 0, - TXTVIEW_INACTIVE = 1 + TXTVIEW_INACTIVE = -1 }; #define TXTBIT_RICHTEXT 0x000001

1 0