June 2020 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Move the get/set file information functions to the Unix library.
by Alexandre Julliard June 15, 2020

June 15, 2020

Module: wine Branch: master Commit: c3e2013b615dd449113fe8fce0700319aa082020 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3e2013b615dd449113fe8fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 13 15:32:41 2020 +0200 ntdll: Move the get/set file information functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 951 +------------------------------------ dlls/ntdll/loader.c | 4 - dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/unix/file.c | 1006 +++++++++++++++++++++++++++++++++++++++- dlls/ntdll/unix/loader.c | 4 +- dlls/ntdll/unix/unix_private.h | 3 - dlls/ntdll/unixlib.h | 10 +- 7 files changed, 1012 insertions(+), 967 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c3e2013b615dd449113f…

1 0

Alexandre Julliard : ntdll: Initialize file redirects only after the server is connected.
by Alexandre Julliard June 15, 2020

June 15, 2020

Module: wine Branch: master Commit: 98eab245d3c3377af0c3da6880bb8ede80cb0925 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98eab245d3c3377af0c3da68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 13 12:59:17 2020 +0200 ntdll: Initialize file redirects only after the server is connected. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49380 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 4 ++-- dlls/ntdll/unix/loader.c | 2 -- dlls/ntdll/unix/thread.c | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 469fe55fe4..d39ca8cd63 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -2689,7 +2689,7 @@ static void init_redirects(void) char *dir; struct stat st; - if (!(dir = RtlAllocateHeap( GetProcessHeap(), 0, strlen(config_dir) + sizeof(windows_dir) ))) return; + if (!(dir = malloc( strlen(config_dir) + sizeof(windows_dir) ))) return; strcpy( dir, config_dir ); strcat( dir, windows_dir ); if (!stat( dir, &st )) @@ -2699,7 +2699,7 @@ static void init_redirects(void) nb_redirects = ARRAY_SIZE( redirects ); } else ERR( "%s: %s\n", dir, strerror(errno) ); - RtlFreeHeap( GetProcessHeap(), 0, dir ); + free( dir ); } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 3bb805103d..73be77e7af 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1227,7 +1227,6 @@ void __wine_main( int argc, char *argv[], char *envp[] ) fixup_ntdll_imports( &__wine_spec_nt_header, module ); init_environment( argc, argv, envp ); - init_files(); #ifdef __APPLE__ apple_main_thread(); @@ -1262,7 +1261,6 @@ NTSTATUS __cdecl __wine_init_unix_lib( HMODULE module, const void *ptr_in, void map_so_dll( nt, module ); fixup_ntdll_imports( &__wine_spec_nt_header, module ); init_environment( __wine_main_argc, __wine_main_argv, envp ); - init_files(); *(struct unix_funcs **)ptr_out = &unix_funcs; wine_mmap_enum_reserved_areas( add_area, NULL, 0 ); return STATUS_SUCCESS; diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 97b191e1a5..0470f5eaa8 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -110,6 +110,7 @@ TEB * CDECL init_threading( int *nb_threads_ptr, struct ldt_copy **ldt_copy, SIZ server_init_process(); info_size = server_init_thread( teb->Peb, suspend ); virtual_map_user_shared_data(); + init_files(); NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); if (size) *size = info_size;

1 0

Zebediah Figura : include: Correct the name of WAVEBANKMINIWAVEFORMAT.
by Alexandre Julliard June 15, 2020

June 15, 2020

Module: wine Branch: master Commit: 362ed8c2d5ff11c49ce42c0979048c068356758f URL: https://source.winehq.org/git/wine.git/?a=commit;h=362ed8c2d5ff11c49ce42c09… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 12 17:59:41 2020 -0500 include: Correct the name of WAVEBANKMINIWAVEFORMAT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/xact3wb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/xact3wb.h b/include/xact3wb.h index c68d7a30fa..81b1518930 100644 --- a/include/xact3wb.h +++ b/include/xact3wb.h @@ -138,7 +138,7 @@ typedef struct WAVEBANKDATA DWORD dwEntryMetaDataElementSize; DWORD dwEntryNameElementSize; DWORD dwAlignment; - WAVEBANKMINIFORMAT CompactFormat; + WAVEBANKMINIWAVEFORMAT CompactFormat; FILETIME BuildTime; } WAVEBANKDATA, *LPWAVEBANKDATA; typedef const WAVEBANKDATA *LPCWAVEBANKDATA;

1 0

Alexandre Julliard : ntdll: Move the IO completion functions to the Unix library.
by Alexandre Julliard June 15, 2020

June 15, 2020

Module: wine Branch: master Commit: 06fa3d32a73d59c7fec59a8682e3750150f84554 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06fa3d32a73d59c7fec59a86… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 13 11:56:30 2020 +0200 ntdll: Move the IO completion functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 223 +++-------------------------------------------- dlls/ntdll/unix/loader.c | 6 ++ dlls/ntdll/unix/sync.c | 189 +++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unixlib.h | 15 +++- 4 files changed, 223 insertions(+), 210 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=06fa3d32a73d59c7fec5…

1 0

Paul Gofman : ntoskrnl.exe/tests: Add initial test for netio.sys.
by Alexandre Julliard June 12, 2020

June 12, 2020

Module: wine Branch: master Commit: e63c3ed8279d782ef23702893ce1a3a98bf58885 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e63c3ed8279d782ef2370289… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jun 11 17:47:45 2020 +0300 ntoskrnl.exe/tests: Add initial test for netio.sys. Test driver should import netio.sys which is available since Vista, so a new test driver is needed to preserve XP compatibility for the existing tests. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/Makefile.in | 4 + dlls/ntoskrnl.exe/tests/driver4.c | 246 +++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/tests/driver4.spec | 1 + dlls/ntoskrnl.exe/tests/ntoskrnl.c | 59 +++++++-- 4 files changed, 302 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e63c3ed8279d782ef237…

1 0

Jacek Caban : msscript: Reimplement state property using embedded script engine state.
by Alexandre Julliard June 12, 2020

June 12, 2020

Module: wine Branch: master Commit: 197e226e97747c5f34a387d4a76f281a46d5c255 URL: https://source.winehq.org/git/wine.git/?a=commit;h=197e226e97747c5f34a387d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 12 17:11:25 2020 +0200 msscript: Reimplement state property using embedded script engine state. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 2d0239a4d8..35554ff123 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -100,7 +100,6 @@ struct ScriptControl { LONG timeout; VARIANT_BOOL allow_ui; VARIANT_BOOL use_safe_subset; - ScriptControlStates state; /* connection points */ ConnectionPoint *cp_list; @@ -242,7 +241,7 @@ static HRESULT start_script(struct ScriptControl *control) { HRESULT hr = S_OK; - if (!control->host || control->state != Initialized) + if (!control->host) return E_FAIL; if (control->host->script_state != SCRIPTSTATE_STARTED) @@ -1196,6 +1195,9 @@ static HRESULT WINAPI ScriptControl_put_Language(IScriptControl *iface, BSTR lan static HRESULT WINAPI ScriptControl_get_State(IScriptControl *iface, ScriptControlStates *p) { ScriptControl *This = impl_from_IScriptControl(iface); + SCRIPTSTATE state; + HRESULT hres; + TRACE("(%p)->(%p)\n", This, p); if(!p) @@ -1204,7 +1206,22 @@ static HRESULT WINAPI ScriptControl_get_State(IScriptControl *iface, ScriptContr if(!This->host) return E_FAIL; - *p = This->state; + hres = IActiveScript_GetScriptState(This->host->script, &state); + if (FAILED(hres)) return hres; + + switch (state) + { + case SCRIPTSTATE_INITIALIZED: + case SCRIPTSTATE_STARTED: + *p = Initialized; + break; + case SCRIPTSTATE_CONNECTED: + *p = Connected; + break; + default: + WARN("unexpected state %d\n", state); + return E_FAIL; + } return S_OK; } @@ -1219,8 +1236,7 @@ static HRESULT WINAPI ScriptControl_put_State(IScriptControl *iface, ScriptContr if(state != Initialized && state != Connected) return CTL_E_INVALIDPROPERTYVALUE; - This->state = state; - return S_OK; + return IActiveScript_SetScriptState(This->host->script, state == Connected ? SCRIPTSTATE_CONNECTED : SCRIPTSTATE_STARTED); } static HRESULT WINAPI ScriptControl_put_SitehWnd(IScriptControl *iface, LONG hwnd) @@ -2433,7 +2449,6 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow script_control->timeout = 10000; script_control->allow_ui = VARIANT_TRUE; script_control->use_safe_subset = VARIANT_FALSE; - script_control->state = Initialized; ConnectionPoint_Init(&script_control->cp_scsource, script_control, &DIID_DScriptControlSource); ConnectionPoint_Init(&script_control->cp_propnotif, script_control, &IID_IPropertyNotifySink);

1 0

Jacek Caban : msscript: Parse script host object instead of control to parse_script_text.
by Alexandre Julliard June 12, 2020

June 12, 2020

Module: wine Branch: master Commit: b531e51cd706ff356976a58a97e23e63d6487827 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b531e51cd706ff356976a58a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 12 17:11:51 2020 +0200 msscript: Parse script host object instead of control to parse_script_text. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 35554ff123..e397044fd7 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -237,15 +237,12 @@ static HRESULT set_script_state(ScriptHost *host, SCRIPTSTATE state) return hr; } -static HRESULT start_script(struct ScriptControl *control) +static HRESULT start_script(ScriptHost *host) { HRESULT hr = S_OK; - if (!control->host) - return E_FAIL; - - if (control->host->script_state != SCRIPTSTATE_STARTED) - hr = set_script_state(control->host, SCRIPTSTATE_STARTED); + if (host->script_state != SCRIPTSTATE_STARTED) + hr = set_script_state(host, SCRIPTSTATE_STARTED); return hr; } @@ -1421,15 +1418,15 @@ static HRESULT WINAPI ScriptControl_Reset(IScriptControl *iface) return set_script_state(This->host, SCRIPTSTATE_INITIALIZED); } -static HRESULT parse_script_text(ScriptControl *control, BSTR script_text, DWORD flag, VARIANT *res) +static HRESULT parse_script_text(ScriptHost *host, BSTR script_text, DWORD flag, VARIANT *res) { EXCEPINFO excepinfo; HRESULT hr; - hr = start_script(control); + hr = start_script(host); if (FAILED(hr)) return hr; - hr = IActiveScriptParse_ParseScriptText(control->host->parse, script_text, NULL, + hr = IActiveScriptParse_ParseScriptText(host->parse, script_text, NULL, NULL, NULL, 0, 1, flag, res, &excepinfo); /* FIXME: more error handling */ return hr; @@ -1441,7 +1438,10 @@ static HRESULT WINAPI ScriptControl_AddCode(IScriptControl *iface, BSTR code) TRACE("(%p)->(%s).\n", This, debugstr_w(code)); - return parse_script_text(This, code, SCRIPTTEXT_ISVISIBLE, NULL); + if (!This->host) + return E_FAIL; + + return parse_script_text(This->host, code, SCRIPTTEXT_ISVISIBLE, NULL); } static HRESULT WINAPI ScriptControl_Eval(IScriptControl *iface, BSTR expression, VARIANT *res) @@ -1453,8 +1453,10 @@ static HRESULT WINAPI ScriptControl_Eval(IScriptControl *iface, BSTR expression, if (!res) return E_POINTER; V_VT(res) = VT_EMPTY; + if (!This->host) + return E_FAIL; - return parse_script_text(This, expression, SCRIPTTEXT_ISEXPRESSION, res); + return parse_script_text(This->host, expression, SCRIPTTEXT_ISEXPRESSION, res); } static HRESULT WINAPI ScriptControl_ExecuteStatement(IScriptControl *iface, BSTR statement) @@ -1463,7 +1465,10 @@ static HRESULT WINAPI ScriptControl_ExecuteStatement(IScriptControl *iface, BSTR TRACE("(%p)->(%s)\n", This, debugstr_w(statement)); - return parse_script_text(This, statement, 0, NULL); + if (!This->host) + return E_FAIL; + + return parse_script_text(This->host, statement, 0, NULL); } static HRESULT WINAPI ScriptControl_Run(IScriptControl *iface, BSTR procedure_name, SAFEARRAY **parameters, VARIANT *res) @@ -1486,7 +1491,9 @@ static HRESULT WINAPI ScriptControl_Run(IScriptControl *iface, BSTR procedure_na if (sa->cDims == 0) return DISP_E_BADINDEX; if (!(sa->fFeatures & FADF_VARIANT)) return DISP_E_BADVARTYPE; - hr = start_script(This); + + if (!This->host) return E_FAIL; + hr = start_script(This->host); if (FAILED(hr)) return hr; hr = get_script_dispatch(This, &disp);

1 0

Vijay Kiran Kamuju : include: Add missing packing, structs and defines for xact3wb.h.
by Alexandre Julliard June 12, 2020

June 12, 2020

Module: wine Branch: master Commit: 948a6a47b8dbd0ddd86cad04de03f0e4ba81b65d URL: https://source.winehq.org/git/wine.git/?a=commit;h=948a6a47b8dbd0ddd86cad04… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Mar 20 13:37:35 2020 +0100 include: Add missing packing, structs and defines for xact3wb.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/xact3wb.h | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 89 insertions(+), 4 deletions(-) diff --git a/include/xact3wb.h b/include/xact3wb.h index b4c5a53d40..c68d7a30fa 100644 --- a/include/xact3wb.h +++ b/include/xact3wb.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2020 Alistair Leslie-Hughes + * Copyright (c) 2020 Vijay Kiran Kamuju * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,6 +19,52 @@ #ifndef __XACT3WB_H__ #define __XACT3WB_H__ +#include <pshpack1.h> + +typedef DWORD WAVEBANKOFFSET; + +#define WAVEBANK_HEADER_SIGNATURE 0x444e4257 /* DNBW */ +#define WAVEBANK_HEADER_VERSION 44 +#define WAVEBANK_BANKNAME_LENGTH 64 +#define WAVEBANK_ENTRYNAME_LENGTH 64 + +#define WAVEBANK_MAX_DATA_SEGMENT_SIZE 0xffffffff +#define WAVEBANK_COMPACT_DATA_SEGMENT_SIZE 0x001fffff + +#define WAVEBANK_TYPE_BUFFER 0x00000000 +#define WAVEBANK_TYPE_STREAMING 0x00000001 +#define WAVEBANK_TYPE_MASK 0x00000001 + +#define WAVEBANK_FLAGS_ENTRYNAMES 0x00010000 +#define WAVEBANK_FLAGS_COMPACT 0x00020000 +#define WAVEBANK_FLAGS_SYNC_DISABLED 0x00040000 +#define WAVEBANK_FLAGS_SEEKTABLES 0x00080000 +#define WAVEBANK_FLAGS_MASK 0x000F0000 + +#define WAVEBANK_DVD_SECTOR_SIZE 2048 +#define WAVEBANK_DVD_BLOCK_SIZE (WAVEBANK_DVD_SECTOR_SIZE * 16) +#define WAVEBANK_ALIGNMENT_MIN 4 +#define WAVEBANK_ALIGNMENT_DVD WAVEBANK_DVD_SECTOR_SIZE + +typedef enum WAVEBANKSEGIDX +{ + WAVEBANK_SEGIDX_BANKDATA = 0, + WAVEBANK_SEGIDX_ENTRYMETADATA, + WAVEBANK_SEGIDX_SEEKTABLES, + WAVEBANK_SEGIDX_ENTRYNAMES, + WAVEBANK_SEGIDX_ENTRYWAVEDATA, + WAVEBANK_SEGIDX_COUNT +} WAVEBANKSEGIDX, *LPWAVEBANKSEGIDX; +typedef const WAVEBANKSEGIDX *LPCWAVEBANKSEGIDX; + +#define WAVEBANKMINIFORMAT_TAG_PCM 0x0 +#define WAVEBANKMINIFORMAT_TAG_XMA 0x1 +#define WAVEBANKMINIFORMAT_TAG_ADPCM 0x2 +#define WAVEBANKMINIFORMAT_TAG_WMA 0x3 + +#define WAVEBANKMINIFORMAT_BITDEPTH_8 0x0 +#define WAVEBANKMINIFORMAT_BITDEPTH_16 0x1 + typedef union WAVEBANKMINIWAVEFORMAT { struct @@ -29,19 +76,34 @@ typedef union WAVEBANKMINIWAVEFORMAT DWORD wBitsPerSample : 1; } DUMMYSTRUCTNAME; DWORD dwValue; -} WAVEBANKMINIWAVEFORMAT; +} WAVEBANKMINIWAVEFORMAT, *LPWAVEBANKMINIWAVEFORMAT; +typedef const WAVEBANKMINIWAVEFORMAT *LPCWAVEBANKMINIWAVEFORMAT; typedef struct WAVEBANKREGION { DWORD dwOffset; DWORD dwLength; -} WAVEBANKREGION; +} WAVEBANKREGION, *LPWAVEBANKREGION; +typedef const WAVEBANKREGION *LPCWAVEBANKREGION; typedef struct WAVEBANKSAMPLEREGION { DWORD dwStartSample; DWORD dwTotalSamples; -} WAVEBANKSAMPLEREGION; +} WAVEBANKSAMPLEREGION, *LPWAVEBANKSAMPLEREGION; +typedef const WAVEBANKSAMPLEREGION *LPCWAVEBANKSAMPLEREGION; + +typedef struct WAVEBANKHEADER +{ + DWORD dwSignature; + DWORD dwVersion; + DWORD dwHeaderVersion; + WAVEBANKREGION Segments[WAVEBANK_SEGIDX_COUNT]; +} WAVEBANKHEADER, *LPWAVEBANKHEADER; +typedef const WAVEBANKHEADER *LPCWAVEBANKHEADER; + +#define WAVEBANKENTRY_XMASTREAMS_MAX 3 +#define WAVEBANKENTRY_XMACHANNELS_MAX 6 typedef struct WAVEBANKENTRY { @@ -58,6 +120,29 @@ typedef struct WAVEBANKENTRY WAVEBANKMINIWAVEFORMAT Format; WAVEBANKREGION PlayRegion; WAVEBANKSAMPLEREGION LoopRegion; -} WAVEBANKENTRY; +} WAVEBANKENTRY, *LPWAVEBANKENTRY; +typedef const WAVEBANKENTRY *LPCWAVEBANKENTRY; + +typedef struct WAVEBANKENTRYCOMPACT +{ + DWORD dwOffset : 21; + DWORD dwLengthDeviation : 11; +} WAVEBANKENTRYCOMPACT, *LPWAVEBANKENTRYCOMPACT; +typedef const WAVEBANKENTRYCOMPACT *LPCWAVEBANKENTRYCOMPACT; + +typedef struct WAVEBANKDATA +{ + DWORD dwFlags; + DWORD dwEntryCount; + CHAR szBankName[WAVEBANK_BANKNAME_LENGTH]; + DWORD dwEntryMetaDataElementSize; + DWORD dwEntryNameElementSize; + DWORD dwAlignment; + WAVEBANKMINIFORMAT CompactFormat; + FILETIME BuildTime; +} WAVEBANKDATA, *LPWAVEBANKDATA; +typedef const WAVEBANKDATA *LPCWAVEBANKDATA; + +#include <poppack.h> #endif /* __XACT3WB_H__ */

1 0

Louis Lenders : pwrshplugin: New stub dll.
by Alexandre Julliard June 12, 2020

June 12, 2020

Module: wine Branch: master Commit: 77e9ca7b4c4cfc544225fda2a9e714be766a6923 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77e9ca7b4c4cfc544225fda2… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Jun 9 14:49:58 2020 +0200 pwrshplugin: New stub dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49351 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/pwrshplugin/Makefile.in | 5 +++++ dlls/pwrshplugin/pwrshplugin.spec | 12 ++++++++++++ dlls/pwrshplugin/version.rc | 26 ++++++++++++++++++++++++++ 5 files changed, 46 insertions(+) diff --git a/configure b/configure index 2832456d30..3e28ac28cb 100755 --- a/configure +++ b/configure @@ -1532,6 +1532,7 @@ enable_prntvpt enable_propsys enable_psapi enable_pstorec +enable_pwrshplugin enable_qasf enable_qcap enable_qdvd @@ -21037,6 +21038,7 @@ wine_fn_config_makefile dlls/psapi enable_psapi wine_fn_config_makefile dlls/psapi/tests enable_tests wine_fn_config_makefile dlls/pstorec enable_pstorec wine_fn_config_makefile dlls/pstorec/tests enable_tests +wine_fn_config_makefile dlls/pwrshplugin enable_pwrshplugin wine_fn_config_makefile dlls/qasf enable_qasf wine_fn_config_makefile dlls/qasf/tests enable_tests wine_fn_config_makefile dlls/qcap enable_qcap diff --git a/configure.ac b/configure.ac index b5f2ef0327..8a76b74e83 100644 --- a/configure.ac +++ b/configure.ac @@ -3624,6 +3624,7 @@ WINE_CONFIG_MAKEFILE(dlls/psapi) WINE_CONFIG_MAKEFILE(dlls/psapi/tests) WINE_CONFIG_MAKEFILE(dlls/pstorec) WINE_CONFIG_MAKEFILE(dlls/pstorec/tests) +WINE_CONFIG_MAKEFILE(dlls/pwrshplugin) WINE_CONFIG_MAKEFILE(dlls/qasf) WINE_CONFIG_MAKEFILE(dlls/qasf/tests) WINE_CONFIG_MAKEFILE(dlls/qcap) diff --git a/dlls/pwrshplugin/Makefile.in b/dlls/pwrshplugin/Makefile.in new file mode 100644 index 0000000000..03138ab166 --- /dev/null +++ b/dlls/pwrshplugin/Makefile.in @@ -0,0 +1,5 @@ +MODULE = pwrshplugin.dll + +EXTRADLLFLAGS = -mno-cygwin + +RC_SRCS = version.rc diff --git a/dlls/pwrshplugin/pwrshplugin.spec b/dlls/pwrshplugin/pwrshplugin.spec new file mode 100644 index 0000000000..8887bfc59c --- /dev/null +++ b/dlls/pwrshplugin/pwrshplugin.spec @@ -0,0 +1,12 @@ +@ stub GetCLRVersionForPSVersion +@ stub PerformWSManPluginReportCompletion +@ stub WSManPluginCommand +@ stub WSManPluginConnect +@ stub WSManPluginReceive +@ stub WSManPluginReleaseCommandContext +@ stub WSManPluginReleaseShellContext +@ stub WSManPluginSend +@ stub WSManPluginShell +@ stub WSManPluginShutdown +@ stub WSManPluginSignal +@ stub WSManPluginStartup diff --git a/dlls/pwrshplugin/version.rc b/dlls/pwrshplugin/version.rc new file mode 100644 index 0000000000..f3ea96f3cc --- /dev/null +++ b/dlls/pwrshplugin/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2020 Louis Lenders + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine powershell plugin" +#define WINE_FILENAME_STR "pwrshplugin.dll" +#define WINE_FILEVERSION 6,3,9600,16384 +#define WINE_FILEVERSION_STR "6.3.9600.16384" +#define WINE_PRODUCTVERSION 6,3,9600,16384 +#define WINE_PRODUCTVERSION_STR "6.3.9600.16384" + +#include "wine/wine_common_ver.rc"

1 0

Alistair Leslie-Hughes : directmanipulation: New stub dll.
by Alexandre Julliard June 12, 2020

June 12, 2020

Module: wine Branch: master Commit: ed9e60fb775bbaf4d3bbb7a7480d6285954b3d1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed9e60fb775bbaf4d3bbb7a7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 17 09:26:16 2019 +1000 directmanipulation: New stub dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44865 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/directmanipulation/Makefile.in | 6 +++ dlls/directmanipulation/directmanipulation.c | 55 +++++++++++++++++++++++++ dlls/directmanipulation/directmanipulation.spec | 6 +++ 5 files changed, 70 insertions(+) diff --git a/configure b/configure index b5287cdce1..2832456d30 100755 --- a/configure +++ b/configure @@ -1246,6 +1246,7 @@ enable_dhtmled_ocx enable_difxapi enable_dinput enable_dinput8 +enable_directmanipulation enable_dispex enable_dmband enable_dmcompos @@ -20622,6 +20623,7 @@ wine_fn_config_makefile dlls/dinput enable_dinput wine_fn_config_makefile dlls/dinput/tests enable_tests wine_fn_config_makefile dlls/dinput8 enable_dinput8 wine_fn_config_makefile dlls/dinput8/tests enable_tests +wine_fn_config_makefile dlls/directmanipulation enable_directmanipulation wine_fn_config_makefile dlls/dispdib.dll16 enable_win16 wine_fn_config_makefile dlls/dispex enable_dispex wine_fn_config_makefile dlls/dispex/tests enable_tests diff --git a/configure.ac b/configure.ac index 72276fc066..b5f2ef0327 100644 --- a/configure.ac +++ b/configure.ac @@ -3210,6 +3210,7 @@ WINE_CONFIG_MAKEFILE(dlls/dinput) WINE_CONFIG_MAKEFILE(dlls/dinput/tests) WINE_CONFIG_MAKEFILE(dlls/dinput8) WINE_CONFIG_MAKEFILE(dlls/dinput8/tests) +WINE_CONFIG_MAKEFILE(dlls/directmanipulation) WINE_CONFIG_MAKEFILE(dlls/dispdib.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/dispex) WINE_CONFIG_MAKEFILE(dlls/dispex/tests) diff --git a/dlls/directmanipulation/Makefile.in b/dlls/directmanipulation/Makefile.in new file mode 100644 index 0000000000..d09d652b61 --- /dev/null +++ b/dlls/directmanipulation/Makefile.in @@ -0,0 +1,6 @@ +MODULE = directmanipulation.dll + +EXTRADLLFLAGS = -mno-cygwin + +C_SRCS = \ + directmanipulation.c diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c new file mode 100644 index 0000000000..21458ba1fe --- /dev/null +++ b/dlls/directmanipulation/directmanipulation.c @@ -0,0 +1,55 @@ +/* + * Copyright 2019 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 + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(manipulation); + +static HINSTANCE dm_instance; + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + dm_instance = instance; + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + FIXME("(%s,%s,%p): no interface found.\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/directmanipulation/directmanipulation.spec b/dlls/directmanipulation/directmanipulation.spec new file mode 100644 index 0000000000..6c8a107d5c --- /dev/null +++ b/dlls/directmanipulation/directmanipulation.spec @@ -0,0 +1,6 @@ +@ stub InitializeDManipHook +@ stdcall -private DllCanUnloadNow() +@ stub DllGetActivationFactory +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stub DllRegisterServer() +@ stub DllUnregisterServer()

1 0