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

Zebediah Figura : ntoskrnl.exe: Stub PoStartNextPowerIrp().
by Alexandre Julliard June 26, 2019

June 26, 2019

Module: wine Branch: master Commit: 656035da855a9b1042b5f12f58ed0b832bfa83fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=656035da855a9b1042b5f12f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 25 21:35:17 2019 -0500 ntoskrnl.exe: Stub PoStartNextPowerIrp(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/pnp.c | 8 ++++++++ include/ddk/wdm.h | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index d119f37..99594c8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -853,7 +853,7 @@ @ stdcall PoSetPowerState(ptr long long) @ stub PoSetSystemState @ stub PoShutdownBugCheck -@ stub PoStartNextPowerIrp +@ stdcall PoStartNextPowerIrp(ptr) @ stub PoUnregisterSystemState @ stdcall ProbeForRead(ptr long long) @ stdcall ProbeForWrite(ptr long long) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index f531527..491f016 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -760,6 +760,14 @@ POWER_STATE WINAPI PoSetPowerState( DEVICE_OBJECT *device, POWER_STATE_TYPE type return state; } +/***************************************************** + * PoStartNextPowerIrp (NTOSKRNL.EXE.@) + */ +void WINAPI PoStartNextPowerIrp( IRP *irp ) +{ + FIXME("irp %p, stub!\n", irp); +} + static DRIVER_OBJECT *pnp_manager; struct root_pnp_device diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index e3333e9..0adfac0 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1671,6 +1671,8 @@ NTSTATUS WINAPI ObReferenceObjectByPointer(void*,ACCESS_MASK,POBJECT_TYPE,KPROC void WINAPI ObUnRegisterCallbacks(void*); POWER_STATE WINAPI PoSetPowerState(PDEVICE_OBJECT,POWER_STATE_TYPE,POWER_STATE); +void WINAPI PoStartNextPowerIrp(IRP*); + NTSTATUS WINAPI PsCreateSystemThread(PHANDLE,ULONG,POBJECT_ATTRIBUTES,HANDLE,PCLIENT_ID,PKSTART_ROUTINE,PVOID); #define PsGetCurrentProcess() IoGetCurrentProcess() #define PsGetCurrentThread() ((PETHREAD)KeGetCurrentThread())

1 0

Zebediah Figura : quartz/vmr9: Return S_OK when calling IVMRFilterConfig9: :SetNumberOfStreams(1).
by Alexandre Julliard June 26, 2019

June 26, 2019

Module: wine Branch: master Commit: 46bb907d3a4b1670001ae00c5c0281d215488d71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46bb907d3a4b1670001ae00c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 25 20:38:15 2019 -0500 quartz/vmr9: Return S_OK when calling IVMRFilterConfig9::SetNumberOfStreams(1). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47291 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 38c708b..e5efc16 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1354,11 +1354,11 @@ static HRESULT WINAPI VMR9FilterConfig_SetImageCompositor(IVMRFilterConfig9 *ifa return E_NOTIMPL; } -static HRESULT WINAPI VMR9FilterConfig_SetNumberOfStreams(IVMRFilterConfig9 *iface, DWORD max) +static HRESULT WINAPI VMR9FilterConfig_SetNumberOfStreams(IVMRFilterConfig9 *iface, DWORD count) { - struct quartz_vmr *This = impl_from_IVMRFilterConfig9(iface); - - FIXME("(%p/%p)->(%u) stub\n", iface, This, max); + FIXME("iface %p, count %u, stub!\n", iface, count); + if (count == 1) + return S_OK; return E_NOTIMPL; }

1 0

Alexandre Julliard : wiaservc: Build with msvcrt.
by Alexandre Julliard June 26, 2019

June 26, 2019

Module: wine Branch: master Commit: 339adaabbc3802f01b521f0e32022964df8b54d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=339adaabbc3802f01b521f0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 26 09:37:26 2019 +0200 wiaservc: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wiaservc/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wiaservc/Makefile.in b/dlls/wiaservc/Makefile.in index b40c8f0..2a8d890 100644 --- a/dlls/wiaservc/Makefile.in +++ b/dlls/wiaservc/Makefile.in @@ -1,6 +1,8 @@ MODULE = wiaservc.dll IMPORTS = uuid ole32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ factory.c \ service.c \

1 0

Alexandre Julliard : wevtapi: Build with msvcrt.
by Alexandre Julliard June 26, 2019

June 26, 2019

Module: wine Branch: master Commit: c2bd255b6405d28f514f1019715eb2ccdd8eed33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2bd255b6405d28f514f1019… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 26 09:37:19 2019 +0200 wevtapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wevtapi/Makefile.in | 2 ++ dlls/wevtapi/main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wevtapi/Makefile.in b/dlls/wevtapi/Makefile.in index b5c3f6c..9b742fe 100644 --- a/dlls/wevtapi/Makefile.in +++ b/dlls/wevtapi/Makefile.in @@ -1,4 +1,6 @@ MODULE = wevtapi.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index 9c8bb5d..f7aa7a2 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : wer: Build with msvcrt.
by Alexandre Julliard June 26, 2019

June 26, 2019

Module: wine Branch: master Commit: 6776953a62ffe7228872f271fb98c5fec454abe8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6776953a62ffe7228872f271… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 26 09:37:08 2019 +0200 wer: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wer/Makefile.in | 2 ++ dlls/wer/main.c | 7 ++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wer/Makefile.in b/dlls/wer/Makefile.in index 1439579..1de79a1 100644 --- a/dlls/wer/Makefile.in +++ b/dlls/wer/Makefile.in @@ -2,5 +2,7 @@ MODULE = wer.dll IMPORTLIB = wer IMPORTS = advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/wer/main.c b/dlls/wer/main.c index e4bda46..b40aa1b 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h" @@ -27,7 +25,6 @@ #include "werapi.h" #include "wine/heap.h" #include "wine/list.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wer); @@ -97,7 +94,7 @@ HRESULT WINAPI WerAddExcludedApplication(PCWSTR exeName, BOOL allUsers) if (!exeName || !exeName[0]) return E_INVALIDARG; - bs = strrchrW(exeName, '\\'); + bs = wcsrchr(exeName, '\\'); if (bs) { bs++; /* skip the backslash */ if (!bs[0]) { @@ -138,7 +135,7 @@ HRESULT WINAPI WerRemoveExcludedApplication(PCWSTR exeName, BOOL allUsers) if (!exeName || !exeName[0]) return E_INVALIDARG; - bs = strrchrW(exeName, '\\'); + bs = wcsrchr(exeName, '\\'); if (bs) { bs++; /* skip the backslash */ if (!bs[0]) {

1 0

Alexandre Julliard : wbemdisp: Build with msvcrt.
by Alexandre Julliard June 26, 2019

June 26, 2019

Module: wine Branch: master Commit: a6df3da3f5ad287eabcf67a966c170faa9f7d80c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6df3da3f5ad287eabcf67a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 26 09:36:09 2019 +0200 wbemdisp: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/Makefile.in | 2 ++ dlls/wbemdisp/locator.c | 20 +++++++++----------- dlls/wbemdisp/main.c | 6 ++---- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/wbemdisp/Makefile.in b/dlls/wbemdisp/Makefile.in index 3b4ee4f..38ef9cc 100644 --- a/dlls/wbemdisp/Makefile.in +++ b/dlls/wbemdisp/Makefile.in @@ -1,6 +1,8 @@ MODULE = wbemdisp.dll IMPORTS = oleaut32 ole32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ locator.c \ main.c diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index c307e34..5e22989 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -18,7 +18,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" @@ -31,7 +30,6 @@ #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" #include "wbemdisp_private.h" #include "wbemdisp_classes.h" @@ -683,7 +681,7 @@ static DISPID get_member_dispid( struct object *object, const WCHAR *name ) UINT i; for (i = 0; i < object->nb_members; i++) { - if (!strcmpiW( object->members[i].name, name )) + if (!wcsicmp( object->members[i].name, name )) { if (!object->members[i].dispid) { @@ -1704,12 +1702,12 @@ static HRESULT WINAPI services_DeleteAsync( static BSTR build_query_string( const WCHAR *class ) { static const WCHAR selectW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',0}; - UINT len = strlenW(class) + ARRAY_SIZE(selectW); + UINT len = lstrlenW(class) + ARRAY_SIZE(selectW); BSTR ret; if (!(ret = SysAllocStringLen( NULL, len ))) return NULL; - strcpyW( ret, selectW ); - strcatW( ret, class ); + lstrcpyW( ret, selectW ); + lstrcatW( ret, class ); return ret; } @@ -2134,22 +2132,22 @@ static BSTR build_resource_string( BSTR server, BSTR namespace ) ULONG len, len_server = 0, len_namespace = 0; BSTR ret; - if (server && *server) len_server = strlenW( server ); + if (server && *server) len_server = lstrlenW( server ); else len_server = 1; - if (namespace && *namespace) len_namespace = strlenW( namespace ); + if (namespace && *namespace) len_namespace = lstrlenW( namespace ); else len_namespace = ARRAY_SIZE(defaultW) - 1; if (!(ret = SysAllocStringLen( NULL, 2 + len_server + 1 + len_namespace ))) return NULL; ret[0] = ret[1] = '\\'; - if (server && *server) strcpyW( ret + 2, server ); + if (server && *server) lstrcpyW( ret + 2, server ); else ret[2] = '.'; len = len_server + 2; ret[len++] = '\\'; - if (namespace && *namespace) strcpyW( ret + len, namespace ); - else strcpyW( ret + len, defaultW ); + if (namespace && *namespace) lstrcpyW( ret + len, namespace ); + else lstrcpyW( ret + len, defaultW ); return ret; } diff --git a/dlls/wbemdisp/main.c b/dlls/wbemdisp/main.c index aff4d50..b921e49 100644 --- a/dlls/wbemdisp/main.c +++ b/dlls/wbemdisp/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #define COBJMACROS @@ -30,7 +29,6 @@ #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" #include "wbemdisp_private.h" #include "wbemdisp_classes.h" @@ -384,7 +382,7 @@ static HRESULT WINAPI WinMGMTS_ParseDisplayName(IParseDisplayName *iface, IBindC TRACE( "%p, %p, %s, %p, %p\n", iface, pbc, debugstr_w(pszDisplayName), pchEaten, ppmkOut ); - if (strncmpiW( pszDisplayName, prefixW, prefix_len )) return MK_E_SYNTAX; + if (wcsnicmp( pszDisplayName, prefixW, prefix_len )) return MK_E_SYNTAX; p = pszDisplayName + prefix_len; if (*p == '{') @@ -418,7 +416,7 @@ done: SysFreeString( server ); SysFreeString( namespace ); SysFreeString( relative ); - if (hr == S_OK) *pchEaten = strlenW( pszDisplayName ); + if (hr == S_OK) *pchEaten = lstrlenW( pszDisplayName ); return hr; }

1 0

Alexandre Julliard : w32sys: Build with msvcrt.
by Alexandre Julliard June 26, 2019

June 26, 2019

Module: wine Branch: master Commit: b7b22330490d6fe2c0050b2a56ee919b339e562f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7b22330490d6fe2c0050b2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 26 09:35:45 2019 +0200 w32sys: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/w32sys.dll16/Makefile.in | 2 +- dlls/w32sys.dll16/w32sys.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/w32sys.dll16/Makefile.in b/dlls/w32sys.dll16/Makefile.in index 73691b2..4453492 100644 --- a/dlls/w32sys.dll16/Makefile.in +++ b/dlls/w32sys.dll16/Makefile.in @@ -1,4 +1,4 @@ MODULE = w32sys.dll16 -EXTRADLLFLAGS = -m16 -Wb,--main-module,w32skrnl.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,w32skrnl.dll C_SRCS = w32sys.c diff --git a/dlls/w32sys.dll16/w32sys.c b/dlls/w32sys.dll16/w32sys.c index 77f4bc9..43e9344 100644 --- a/dlls/w32sys.dll16/w32sys.c +++ b/dlls/w32sys.dll16/w32sys.c @@ -19,13 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include <stdio.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif #include "windef.h" #include "winbase.h"

1 0

Alexandre Julliard : w32skrnl: Build with msvcrt.
by Alexandre Julliard June 26, 2019

June 26, 2019

Module: wine Branch: master Commit: b2c15989eab3184716060cdf8454aec080948441 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2c15989eab3184716060cdf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 26 09:35:09 2019 +0200 w32skrnl: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/w32skrnl/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/w32skrnl/Makefile.in b/dlls/w32skrnl/Makefile.in index 3cc5dd5..e6bee20 100644 --- a/dlls/w32skrnl/Makefile.in +++ b/dlls/w32skrnl/Makefile.in @@ -1,4 +1,6 @@ MODULE = w32skrnl.dll IMPORTS = kernel +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = w32skernel.c

1 0

Zebediah Figura : ntoskrnl.exe: Implement PoCallDriver().
by Alexandre Julliard June 26, 2019

June 26, 2019

Module: wine Branch: master Commit: 4ecbc3a0f5077cc4c214d50caa8296037c2f09c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ecbc3a0f5077cc4c214d50c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 25 21:35:18 2019 -0500 ntoskrnl.exe: Implement PoCallDriver(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/pnp.c | 9 +++++++++ include/ddk/wdm.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 99594c8..359e2d9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -841,7 +841,7 @@ @ stub PfxInitialize @ stub PfxInsertPrefix @ stub PfxRemovePrefix -@ stub PoCallDriver +@ stdcall PoCallDriver(ptr ptr) @ stub PoCancelDeviceNotify @ stub PoQueueShutdownWorkItem @ stub PoRegisterDeviceForIdleDetection diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 491f016..4ec8aaa 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -768,6 +768,15 @@ void WINAPI PoStartNextPowerIrp( IRP *irp ) FIXME("irp %p, stub!\n", irp); } +/***************************************************** + * PoCallDriver (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI PoCallDriver( DEVICE_OBJECT *device, IRP *irp ) +{ + TRACE("device %p, irp %p.\n", device, irp); + return IoCallDriver( device, irp ); +} + static DRIVER_OBJECT *pnp_manager; struct root_pnp_device diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 0adfac0..864c0c9 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1670,6 +1670,7 @@ NTSTATUS WINAPI ObReferenceObjectByName(UNICODE_STRING*,ULONG,ACCESS_STATE*,ACC NTSTATUS WINAPI ObReferenceObjectByPointer(void*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE); void WINAPI ObUnRegisterCallbacks(void*); +NTSTATUS WINAPI PoCallDriver(DEVICE_OBJECT*,IRP*); POWER_STATE WINAPI PoSetPowerState(PDEVICE_OBJECT,POWER_STATE_TYPE,POWER_STATE); void WINAPI PoStartNextPowerIrp(IRP*);

1 0

Zebediah Figura : quartz/parser: Store the source pins as an array of Parser_OutputPin pointers.
by Alexandre Julliard June 26, 2019

June 26, 2019

Module: wine Branch: master Commit: 8f4194f311ec38223349359fa73d8a4e5cfb1193 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f4194f311ec38223349359f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 25 20:38:14 2019 -0500 quartz/parser: Store the source pins as an array of Parser_OutputPin pointers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avisplit.c | 18 ++++------- dlls/quartz/mpegsplit.c | 12 +++---- dlls/quartz/parser.c | 82 +++++++++++++++++++++--------------------------- dlls/quartz/parser.h | 24 +++++++------- dlls/quartz/waveparser.c | 20 +++++------- 5 files changed, 66 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8f4194f311ec38223349…

1 0