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

Alexandre Julliard : advapi32: Move performance stubs to kernelbase.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 0b709c5d853a7aae86931f13647382290af75cc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b709c5d853a7aae86931f13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 13:09:34 2019 +0200 advapi32: Move performance stubs to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/Makefile.in | 1 - dlls/advapi32/advapi32.spec | 14 ++++---- dlls/advapi32/perf.c | 72 ----------------------------------------- dlls/kernelbase/kernelbase.spec | 14 ++++---- dlls/kernelbase/main.c | 66 +++++++++++++++++++++++++++++++++++++ 5 files changed, 80 insertions(+), 87 deletions(-) diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in index db5015e..e530ada 100644 --- a/dlls/advapi32/Makefile.in +++ b/dlls/advapi32/Makefile.in @@ -14,7 +14,6 @@ C_SRCS = \ crypt_lmhash.c \ eventlog.c \ lsa.c \ - perf.c \ registry.c \ security.c \ service.c \ diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index a0283cf..231ab05 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -555,11 +555,11 @@ # @ stub OperationStart # @ stub PerfAddCounters # @ stub PerfCloseQueryHandle -@ stdcall PerfCreateInstance(long ptr wstr long) +@ stdcall -import PerfCreateInstance(long ptr wstr long) # @ stub PerfDecrementULongCounterValue # @ stub PerfDecrementULongLongCounterValue # @ stub PerfDeleteCounters -@ stdcall PerfDeleteInstance(long ptr) +@ stdcall -import PerfDeleteInstance(long ptr) # @ stub PerfEnumerateCounterSet # @ stub PerfEnumerateCounterSetInstances # @ stub PerfIncrementULongCounterValue @@ -575,13 +575,13 @@ # @ stub PerfRegQueryInfoKey # @ stub PerfRegQueryValue # @ stub PerfRegSetValue -@ stdcall PerfSetCounterRefValue(long ptr long ptr) -@ stdcall PerfSetCounterSetInfo(long ptr long) +@ stdcall -import PerfSetCounterRefValue(long ptr long ptr) +@ stdcall -import PerfSetCounterSetInfo(long ptr long) # @ stub PerfSetULongCounterValue # @ stub PerfSetULongLongCounterValue -@ stdcall PerfStartProvider(ptr ptr ptr) -@ stdcall PerfStartProviderEx(ptr ptr ptr) -@ stdcall PerfStopProvider(long) +@ stdcall -import PerfStartProvider(ptr ptr ptr) +@ stdcall -import PerfStartProviderEx(ptr ptr ptr) +@ stdcall -import PerfStopProvider(long) @ stdcall -import PrivilegeCheck(ptr ptr ptr) @ stdcall PrivilegedServiceAuditAlarmA(str str long ptr long) @ stdcall -import PrivilegedServiceAuditAlarmW(wstr wstr long ptr long) diff --git a/dlls/advapi32/perf.c b/dlls/advapi32/perf.c deleted file mode 100644 index 6712eae..0000000 --- a/dlls/advapi32/perf.c +++ /dev/null @@ -1,72 +0,0 @@ -/* - * advapi32 perf functions - * - * Copyright 2017 Austin English - * - * 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 <stdio.h> - -#include "windef.h" -#include "winbase.h" -#include "perflib.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(advapi); - -PPERF_COUNTERSET_INSTANCE WINAPI PerfCreateInstance(HANDLE handle, LPCGUID guid, const WCHAR *name, ULONG id) -{ - FIXME("%p %s %s %u: stub\n", handle, debugstr_guid(guid), debugstr_w(name), id); - return NULL; -} - -ULONG WINAPI PerfDeleteInstance(HANDLE provider, PPERF_COUNTERSET_INSTANCE block) -{ - FIXME("%p %p: stub\n", provider, block); - return ERROR_CALL_NOT_IMPLEMENTED; -} - -ULONG WINAPI PerfSetCounterSetInfo(HANDLE handle, PPERF_COUNTERSET_INFO template, ULONG size) -{ - FIXME("%p %p %u: stub\n", handle, template, size); - return ERROR_CALL_NOT_IMPLEMENTED; -} - -ULONG WINAPI PerfSetCounterRefValue(HANDLE provider, PPERF_COUNTERSET_INSTANCE instance, ULONG counterid, void *address) -{ - FIXME("%p %p %u %p: stub\n", provider, instance, counterid, address); - return ERROR_CALL_NOT_IMPLEMENTED; -} - -ULONG WINAPI PerfStartProvider(GUID *guid, PERFLIBREQUEST callback, HANDLE *provider) -{ - FIXME("%s %p %p: stub\n", debugstr_guid(guid), callback, provider); - return ERROR_CALL_NOT_IMPLEMENTED; -} - -ULONG WINAPI PerfStartProviderEx(GUID *guid, PPERF_PROVIDER_CONTEXT context, HANDLE *provider) -{ - FIXME("%s %p %p: stub\n", debugstr_guid(guid), context, provider); - return ERROR_CALL_NOT_IMPLEMENTED; -} - -ULONG WINAPI PerfStopProvider(HANDLE handle) -{ - FIXME("%p: stub\n", handle); - return ERROR_CALL_NOT_IMPLEMENTED; -} diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 6322e69..95dd28c 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1145,20 +1145,20 @@ @ stdcall PeekConsoleInputA(ptr ptr long ptr) kernel32.PeekConsoleInputA @ stdcall PeekConsoleInputW(ptr ptr long ptr) kernel32.PeekConsoleInputW @ stdcall PeekNamedPipe(long ptr long ptr ptr ptr) kernel32.PeekNamedPipe -@ stdcall PerfCreateInstance(long ptr wstr long) advapi32.PerfCreateInstance +@ stdcall PerfCreateInstance(long ptr wstr long) # @ stub PerfDecrementULongCounterValue # @ stub PerfDecrementULongLongCounterValue -@ stdcall PerfDeleteInstance(long ptr) advapi32.PerfDeleteInstance +@ stdcall PerfDeleteInstance(long ptr) # @ stub PerfIncrementULongCounterValue # @ stub PerfIncrementULongLongCounterValue # @ stub PerfQueryInstance -@ stdcall PerfSetCounterRefValue(long ptr long ptr) advapi32.PerfSetCounterRefValue -@ stdcall PerfSetCounterSetInfo(long ptr long) advapi32.PerfSetCounterSetInfo +@ stdcall PerfSetCounterRefValue(long ptr long ptr) +@ stdcall PerfSetCounterSetInfo(long ptr long) # @ stub PerfSetULongCounterValue # @ stub PerfSetULongLongCounterValue -@ stdcall PerfStartProvider(ptr ptr ptr) advapi32.PerfStartProvider -@ stdcall PerfStartProviderEx(ptr ptr ptr) advapi32.PerfStartProviderEx -@ stdcall PerfStopProvider(long) advapi32.PerfStopProvider +@ stdcall PerfStartProvider(ptr ptr ptr) +@ stdcall PerfStartProviderEx(ptr ptr ptr) +@ stdcall PerfStopProvider(long) # @ stub PoolPerAppKeyStateInternal @ stdcall PostQueuedCompletionStatus(long long ptr ptr) kernel32.PostQueuedCompletionStatus # @ stub PrefetchVirtualMemory diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c index 240b730..e00f9d1 100644 --- a/dlls/kernelbase/main.c +++ b/dlls/kernelbase/main.c @@ -24,6 +24,7 @@ #include "windows.h" #include "appmodel.h" #include "shlwapi.h" +#include "perflib.h" #include "wine/debug.h" #include "wine/heap.h" @@ -94,6 +95,71 @@ LONG WINAPI AppPolicyGetWindowingModel(HANDLE token, AppPolicyWindowingModel *po } /*********************************************************************** + * PerfCreateInstance (KERNELBASE.@) + */ +PPERF_COUNTERSET_INSTANCE WINAPI PerfCreateInstance(HANDLE handle, LPCGUID guid, + const WCHAR *name, ULONG id) +{ + FIXME("%p %s %s %u: stub\n", handle, debugstr_guid(guid), debugstr_w(name), id); + return NULL; +} + +/*********************************************************************** + * PerfDeleteInstance (KERNELBASE.@) + */ +ULONG WINAPI PerfDeleteInstance(HANDLE provider, PPERF_COUNTERSET_INSTANCE block) +{ + FIXME("%p %p: stub\n", provider, block); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * PerfSetCounterSetInfo (KERNELBASE.@) + */ +ULONG WINAPI PerfSetCounterSetInfo(HANDLE handle, PPERF_COUNTERSET_INFO template, ULONG size) +{ + FIXME("%p %p %u: stub\n", handle, template, size); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * PerfSetCounterRefValue (KERNELBASE.@) + */ +ULONG WINAPI PerfSetCounterRefValue(HANDLE provider, PPERF_COUNTERSET_INSTANCE instance, + ULONG counterid, void *address) +{ + FIXME("%p %p %u %p: stub\n", provider, instance, counterid, address); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * PerfStartProvider (KERNELBASE.@) + */ +ULONG WINAPI PerfStartProvider(GUID *guid, PERFLIBREQUEST callback, HANDLE *provider) +{ + FIXME("%s %p %p: stub\n", debugstr_guid(guid), callback, provider); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * PerfStartProviderEx (KERNELBASE.@) + */ +ULONG WINAPI PerfStartProviderEx(GUID *guid, PPERF_PROVIDER_CONTEXT context, HANDLE *provider) +{ + FIXME("%s %p %p: stub\n", debugstr_guid(guid), context, provider); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * PerfStopProvider (KERNELBASE.@) + */ +ULONG WINAPI PerfStopProvider(HANDLE handle) +{ + FIXME("%p: stub\n", handle); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** * QuirkIsEnabled (KERNELBASE.@) */ BOOL WINAPI QuirkIsEnabled(void *arg)

1 0

Alexandre Julliard : winebuild: Set the default entry point also for Windows builds.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 907896fba57f1c1ca6f0d9ca3379dc7ccabd8285 URL: https://source.winehq.org/git/wine.git/?a=commit;h=907896fba57f1c1ca6f0d9ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 25 17:36:44 2019 +0200 winebuild: Set the default entry point also for Windows builds. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47410 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 10 ---------- tools/winebuild/main.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 8c32b73..7d3c725 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -456,15 +456,6 @@ static void add_undef_import( const char *name, int is_ordinal ) add_import_func( import, xstrdup( p ), NULL, ordinal, 0 ); } -/* get the default entry point for a given spec file */ -static const char *get_default_entry_point( const DLLSPEC *spec ) -{ - if (spec->characteristics & IMAGE_FILE_DLL) return "__wine_spec_dll_entry"; - if (spec->subsystem == IMAGE_SUBSYSTEM_NATIVE) return "__wine_spec_drv_entry"; - if (spec->type == SPEC_WIN16) return "__wine_spec_exe16_entry"; - return "__wine_spec_exe_entry"; -} - /* check if the spec file exports any stubs */ static int has_stubs( const DLLSPEC *spec ) { @@ -480,7 +471,6 @@ static int has_stubs( const DLLSPEC *spec ) /* add the extra undefined symbols that will be contained in the generated spec file itself */ static void add_extra_undef_symbols( DLLSPEC *spec ) { - if (!spec->init_func) spec->init_func = xstrdup( get_default_entry_point(spec) ); add_extra_ld_symbol( spec->init_func ); if (has_stubs( spec )) add_extra_ld_symbol( "__wine_spec_unimplemented_stub" ); if (delayed_imports.count) add_extra_ld_symbol( "__wine_spec_delay_load" ); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 2539577..0a5becd 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -369,6 +369,15 @@ static void set_exec_mode( enum exec_mode_values mode ) exec_mode = mode; } +/* get the default entry point for a given spec file */ +static const char *get_default_entry_point( const DLLSPEC *spec ) +{ + if (spec->characteristics & IMAGE_FILE_DLL) return "__wine_spec_dll_entry"; + if (spec->subsystem == IMAGE_SUBSYSTEM_NATIVE) return "__wine_spec_drv_entry"; + if (spec->type == SPEC_WIN16) return "__wine_spec_exe16_entry"; + return "__wine_spec_exe_entry"; +} + /* parse options from the argv array and remove all the recognized ones */ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) { @@ -633,6 +642,7 @@ int main(int argc, char **argv) case MODE_EXE: load_resources( argv, spec ); if (spec_file_name && !parse_input_file( spec )) break; + if (!spec->init_func) spec->init_func = xstrdup( get_default_entry_point( spec )); if (fake_module) {

1 0

Nikolay Sivov : mfplat: Improve PROPVARIANT arguments traces.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 808fe2542c46708d408cf916a763761a95019e77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=808fe2542c46708d408cf916… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 25 14:05:50 2019 +0300 mfplat: Improve PROPVARIANT arguments traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mfplat_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h index 57e4211..6418afc 100644 --- a/dlls/mfplat/mfplat_private.h +++ b/dlls/mfplat/mfplat_private.h @@ -136,7 +136,7 @@ static inline const char *debugstr_propvar(const PROPVARIANT *v) case VT_R8: return wine_dbg_sprintf("%p {VT_R8: %lf}", v, v->u.dblVal); case VT_CLSID: - return wine_dbg_sprintf("%p {VT_CLSID: %s}", v, debugstr_guid(v->u.puuid)); + return wine_dbg_sprintf("%p {VT_CLSID: %s}", v, debugstr_mf_guid(v->u.puuid)); case VT_LPWSTR: return wine_dbg_sprintf("%p {VT_LPWSTR: %s}", v, wine_dbgstr_w(v->u.pwszVal)); case VT_VECTOR | VT_UI1:

1 0

Nikolay Sivov : mfplat: Add MF_LOW_LATENCY attribute GUID.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 4c3e5312426f6aa73093e82c0741c92fa83afa28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c3e5312426f6aa73093e82c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 25 14:05:51 2019 +0300 mfplat: Add MF_LOW_LATENCY attribute GUID. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 3 ++- include/mfapi.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 78ae417..45d1677 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -630,6 +630,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_TOPOLOGY_DYNAMIC_CHANGE_NOT_ALLOWED), X(MF_MT_ALPHA_MODE), X(MF_TOPOLOGY_PLAYBACK_MAX_DIMS), + X(MF_LOW_LATENCY), X(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS), X(MF_MT_PIXEL_ASPECT_RATIO), X(MF_TOPOLOGY_ENABLE_XVP_FOR_PLAYBACK), @@ -721,8 +722,8 @@ const char *debugstr_attr(const GUID *guid) X(MF_TOPONODE_DISABLE_PREROLL), X(MF_MT_VIDEO_3D_FORMAT), X(MF_EVENT_STREAM_METADATA_KEYDATA), - X(MF_SINK_WRITER_D3D_MANAGER), X(MF_SOURCE_READER_D3D_MANAGER), + X(MF_SINK_WRITER_D3D_MANAGER), X(MFSampleExtension_3DVideo), X(MF_EVENT_SOURCE_FAKE_START), X(MF_EVENT_SOURCE_PROJECTSTART), diff --git a/include/mfapi.h b/include/mfapi.h index 6797706..957fb0d 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -320,6 +320,8 @@ DEFINE_GUID(MF_EVENT_STREAM_METADATA_SYSTEMID, 0x1ea2ef64, 0xba16, 0x4a DEFINE_GUID(MF_EVENT_TOPOLOGY_STATUS, 0x30c5018d, 0x9a53, 0x454b, 0xad, 0x9e, 0x6d, 0x5f, 0x8f, 0xa7, 0xc4, 0x3b); DEFINE_GUID(MF_EVENT_OUTPUT_NODE, 0x830f1a8b, 0xc060, 0x46dd, 0xa8, 0x01, 0x1c, 0x95, 0xde, 0xc9, 0xb1, 0x07); +DEFINE_GUID(MF_LOW_LATENCY, 0x9c27891a, 0xed7a, 0x40e1, 0x88, 0xe8, 0xb2, 0x27, 0x27, 0xa0, 0x24, 0xee); + typedef unsigned __int64 MFWORKITEM_KEY; typedef enum

1 0

Nikolay Sivov : mfreadwrite: Add MFCreateSinkWriterFromURL() stub.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: b182ba882cfcce7b8769470f49f0fba216095c45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b182ba882cfcce7b8769470f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 25 14:05:52 2019 +0300 mfreadwrite: Add MFCreateSinkWriterFromURL() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 11 +++++++++++ dlls/mfreadwrite/mfreadwrite.spec | 2 +- include/mfreadwrite.idl | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index dd92337..3637d2f 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -1464,6 +1464,17 @@ HRESULT WINAPI MFCreateSinkWriterFromMediaSink(IMFMediaSink *sink, IMFAttributes return create_sink_writer_from_sink(sink, attributes, &IID_IMFSinkWriter, (void **)writer); } +/*********************************************************************** + * MFCreateSinkWriterFromURL (mfreadwrite.@) + */ +HRESULT WINAPI MFCreateSinkWriterFromURL(const WCHAR *url, IMFByteStream *bytestream, IMFAttributes *attributes, + IMFSinkWriter **writer) +{ + FIXME("%s, %p, %p, %p.\n", debugstr_w(url), bytestream, attributes, writer); + + return E_NOTIMPL; +} + static HRESULT create_source_reader_from_object(IUnknown *unk, IMFAttributes *attributes, REFIID riid, void **out) { IMFMediaSource *source = NULL; diff --git a/dlls/mfreadwrite/mfreadwrite.spec b/dlls/mfreadwrite/mfreadwrite.spec index 3a215a9..dd585d9 100644 --- a/dlls/mfreadwrite/mfreadwrite.spec +++ b/dlls/mfreadwrite/mfreadwrite.spec @@ -3,7 +3,7 @@ @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() @ stdcall MFCreateSinkWriterFromMediaSink(ptr ptr ptr) -@ stub MFCreateSinkWriterFromURL +@ stdcall MFCreateSinkWriterFromURL(wstr ptr ptr ptr) @ stdcall MFCreateSourceReaderFromByteStream(ptr ptr ptr) @ stdcall MFCreateSourceReaderFromMediaSource(ptr ptr ptr) @ stdcall MFCreateSourceReaderFromURL(wstr ptr ptr) diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl index ed09b74..cbfeef8 100644 --- a/include/mfreadwrite.idl +++ b/include/mfreadwrite.idl @@ -185,6 +185,8 @@ interface IMFReadWriteClassFactory : IUnknown cpp_quote( "HRESULT WINAPI MFCreateSinkWriterFromMediaSink(IMFMediaSink *sink, IMFAttributes *attributes," ) cpp_quote( " IMFSinkWriter **writer);" ) +cpp_quote( "HRESULT WINAPI MFCreateSinkWriterFromURL(const WCHAR *url, IMFByteStream *bytestream," ) +cpp_quote( " IMFAttributes *attributes, IMFSinkWriter **writer);" ) cpp_quote( "HRESULT WINAPI MFCreateSourceReaderFromByteStream(IMFByteStream *stream, IMFAttributes *attributes," ) cpp_quote( " IMFSourceReader **reader);" ) cpp_quote( "HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAttributes *attributes," )

1 0

Zebediah Figura : wined3d: Store the cursor texture in a local variable in swapchain_gl_present().
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: d601fd92347fd2032f1e7866ddba661566090674 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d601fd92347fd2032f1e7866… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 24 19:08:36 2019 -0500 wined3d: Store the cursor texture in a local variable in swapchain_gl_present(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47392 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 8d6306e..b75aead 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -428,9 +428,9 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, struct wined3d_texture *back_buffer = swapchain->back_buffers[0]; const struct wined3d_fb_state *fb = &swapchain->device->cs->fb; struct wined3d_rendertarget_view *dsv = fb->depth_stencil; + struct wined3d_texture *logo_texture, *cursor_texture; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; - struct wined3d_texture *logo_texture; struct wined3d_context *context; BOOL render_to_fbo; @@ -456,8 +456,8 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, WINED3D_BLT_SRC_CKEY, NULL, WINED3D_TEXF_POINT); } - if (swapchain->device->bCursorVisible && swapchain->device->cursor_texture - && !swapchain->device->hardwareCursor) + if ((cursor_texture = swapchain->device->cursor_texture) + && swapchain->device->bCursorVisible && !swapchain->device->hardwareCursor) { RECT dst_rect = { @@ -468,9 +468,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, }; RECT src_rect = { - 0, 0, - swapchain->device->cursor_texture->resource.width, - swapchain->device->cursor_texture->resource.height + 0, 0, cursor_texture->resource.width, cursor_texture->resource.height }; const RECT clip_rect = {0, 0, back_buffer->resource.width, back_buffer->resource.height}; @@ -479,9 +477,8 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, if (swapchain->desc.windowed) MapWindowPoints(NULL, swapchain->win_handle, (POINT *)&dst_rect, 2); if (wined3d_clip_blit(&clip_rect, &dst_rect, &src_rect)) - wined3d_texture_blt(back_buffer, 0, &dst_rect, - swapchain->device->cursor_texture, 0, &src_rect, - WINED3D_BLT_ALPHA_TEST, NULL, WINED3D_TEXF_POINT); + wined3d_texture_blt(back_buffer, 0, &dst_rect, cursor_texture, 0, + &src_rect, WINED3D_BLT_ALPHA_TEST, NULL, WINED3D_TEXF_POINT); } TRACE("Presenting DC %p.\n", context_gl->dc);

1 0

Justin Martin : d3d9: Implement d3d9_device_CreateRenderTargetEx().
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 6ad6c1ff4afe290482a5ac566e4d3f41f99b1e34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ad6c1ff4afe290482a5ac56… Author: Justin Martin <jaming(a)protonmail.com> Date: Tue Jun 25 16:48:24 2019 +0430 d3d9: Implement d3d9_device_CreateRenderTargetEx(). Signed-off-by: Justin Martin <jaming(a)protonmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 21 ++++++++++++++++++--- dlls/d3d9/tests/d3d9ex.c | 5 ++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 9fbdceb..e2da02b 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -4059,16 +4059,31 @@ static HRESULT WINAPI d3d9_device_CreateRenderTargetEx(IDirect3DDevice9Ex *iface UINT width, UINT height, D3DFORMAT format, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, BOOL lockable, IDirect3DSurface9 **surface, HANDLE *shared_handle, DWORD usage) { - FIXME("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u, " - "lockable %#x, surface %p, shared_handle %p, usage %#x stub!\n", + struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + unsigned int access = WINED3D_RESOURCE_ACCESS_GPU; + + TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u, " + "lockable %#x, surface %p, shared_handle %p, usage %#x.\n", iface, width, height, format, multisample_type, multisample_quality, lockable, surface, shared_handle, usage); *surface = NULL; + + if (usage & (D3DUSAGE_DEPTHSTENCIL | D3DUSAGE_RENDERTARGET)) + { + WARN("Invalid usage %#x.\n", usage); + return D3DERR_INVALIDCALL; + } + if (shared_handle) FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); - return E_NOTIMPL; + if (lockable) + access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + + return d3d9_device_create_surface(device, 0, wined3dformat_from_d3dformat(format), + multisample_type, multisample_quality, usage & WINED3DUSAGE_MASK, + WINED3D_BIND_RENDER_TARGET, access, width, height, NULL, surface); } static HRESULT WINAPI d3d9_device_CreateOffscreenPlainSurfaceEx(IDirect3DDevice9Ex *iface, diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 306241a..354a51d 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -3932,7 +3932,7 @@ static void test_format_unknown(void) iface = (void *)0xdeadbeef; hr = IDirect3DDevice9Ex_CreateRenderTargetEx(device, 64, 64, D3DFMT_UNKNOWN, D3DMULTISAMPLE_NONE, 0, FALSE, (IDirect3DSurface9 **)&iface, NULL, 0); - todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); ok(!iface, "Got unexpected iface %p.\n", iface); iface = (void *)0xdeadbeef; @@ -4372,8 +4372,7 @@ static void test_resource_access(void) case SURFACE_RT_EX: hr = IDirect3DDevice9Ex_CreateRenderTargetEx(device, 16, 16, format, D3DMULTISAMPLE_NONE, 0, tests[j].pool != D3DPOOL_DEFAULT, &surface, NULL, tests[j].usage); - todo_wine - ok(hr == (tests[j].format == FORMAT_COLOUR && !tests[j].usage ? D3D_OK : D3DERR_INVALIDCALL), + ok(hr == (tests[j].format == FORMAT_COLOUR && !tests[j].usage ? D3D_OK : D3DERR_INVALIDCALL), "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); if (FAILED(hr)) continue;

1 0

Jacek Caban : ntoskrnl.exe: Implement KeBugCheck and KeBugCheckEx.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: 39d4f9d8afed0b67928ec471be7ae4a0b07e8150 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39d4f9d8afed0b67928ec471… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 25 15:36:15 2019 +0200 ntoskrnl.exe: Implement KeBugCheck and KeBugCheckEx. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45656 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 17 +++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- include/ddk/ntddk.h | 1 + include/ddk/wdm.h | 1 + 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 79c45c7..209410c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3182,6 +3182,23 @@ BOOLEAN WINAPI KeAreApcsDisabled(void) } /*********************************************************************** + * KeBugCheck (NTOSKRNL.@) + */ +void WINAPI KeBugCheck(ULONG code) +{ + KeBugCheckEx(code, 0, 0, 0, 0); +} + +/*********************************************************************** + * KeBugCheckEx (NTOSKRNL.@) + */ +void WINAPI KeBugCheckEx(ULONG code, ULONG_PTR param1, ULONG_PTR param2, ULONG_PTR param3, ULONG_PTR param4) +{ + ERR( "%x %lx %lx %lx %lx\n", code, param1, param2, param3, param4 ); + ExitProcess( code ); +} + +/*********************************************************************** * ProbeForRead (NTOSKRNL.EXE.@) */ void WINAPI ProbeForRead(void *address, SIZE_T length, ULONG alignment) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index afe216b..d119f37 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -525,8 +525,8 @@ @ stub KeAddSystemServiceTable @ stdcall KeAreApcsDisabled() @ stub KeAttachProcess -@ stub KeBugCheck -@ stub KeBugCheckEx +@ stdcall KeBugCheck(long) +@ stdcall KeBugCheckEx(long long long long long) @ stdcall KeCancelTimer(ptr) @ stub KeCapturePersistentThreadState @ stdcall KeClearEvent(ptr) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 4afef81..8c7ead7 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -217,6 +217,7 @@ NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE,PULONG,PCONFIGURATION_ void WINAPI IoRegisterDriverReinitialization(PDRIVER_OBJECT,PDRIVER_REINITIALIZE,PVOID); NTSTATUS WINAPI IoRegisterShutdownNotification(PDEVICE_OBJECT); BOOLEAN WINAPI KeAreApcsDisabled(void); +void WINAPI DECLSPEC_NORETURN KeBugCheck(ULONG); NTSTATUS WINAPI KeExpandKernelStackAndCallout(PEXPAND_STACK_CALLOUT,void*,SIZE_T); void WINAPI KeSetTargetProcessorDpc(PRKDPC,CCHAR); BOOLEAN WINAPI MmIsAddressValid(void *); diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index f79b36a..e3333e9 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1613,6 +1613,7 @@ void WINAPI KeAcquireSpinLock(KSPIN_LOCK*,KIRQL*); KIRQL WINAPI KeAcquireSpinLockRaiseToDpc(KSPIN_LOCK*); #endif void WINAPI KeAcquireSpinLockAtDpcLevel(KSPIN_LOCK*); +void WINAPI DECLSPEC_NORETURN KeBugCheckEx(ULONG,ULONG_PTR,ULONG_PTR,ULONG_PTR,ULONG_PTR); BOOLEAN WINAPI KeCancelTimer(KTIMER*); void WINAPI KeClearEvent(PRKEVENT); NTSTATUS WINAPI KeDelayExecutionThread(KPROCESSOR_MODE,BOOLEAN,LARGE_INTEGER*);

1 0

Zebediah Figura : wine.inf: Add the GUID_DEVCLASS_SYSTEM class key.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: f79da3991a9e829bd6b4fd4b971fefd49bf81742 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f79da3991a9e829bd6b4fd4b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jun 22 10:12:30 2019 -0500 wine.inf: Add the GUID_DEVCLASS_SYSTEM class key. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 844f7c6..c3d3b77 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -461,6 +461,8 @@ HKLM,System\CurrentControlSet\Control\Class\{4d36e967-e325-11ce-bfc1-08002be1031 HKLM,System\CurrentControlSet\Control\Class\{4d36e967-e325-11ce-bfc1-08002be10318},"Class",,"DiskDrive" HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be10318},,,"Ports (COM & LPT)" HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be10318},"Class",,"Ports" +HKLM,System\CurrentControlSet\Control\Class\{4d36e97d-e325-11ce-bfc1-08002be10318},,,"System devices" +HKLM,System\CurrentControlSet\Control\Class\{4d36e97d-e325-11ce-bfc1-08002be10318},"Class",,"System" HKLM,System\CurrentControlSet\Control\Class\{6bdd1fc6-810f-11d0-bec7-08002be2092f},,,"Imaging devices" HKLM,System\CurrentControlSet\Control\Class\{6bdd1fc6-810f-11d0-bec7-08002be2092f},"Class",,"Image" HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57da},,,"Human Interface Devices"

1 0

Zebediah Figura : ntoskrnl.exe: Add a stub PnP manager driver.
by Alexandre Julliard 25 Jun '19

25 Jun '19

Module: wine Branch: master Commit: d4c91cc6f99b3f46df142bc92225150a18a2a11f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4c91cc6f99b3f46df142bc9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jun 22 10:12:31 2019 -0500 ntoskrnl.exe: Add a stub PnP manager driver. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 5 +++++ dlls/ntoskrnl.exe/ntoskrnl_private.h | 3 +++ dlls/ntoskrnl.exe/pnp.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 209410c..5839072 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -850,6 +850,8 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) PsInitialSystemProcess = IoGetCurrentProcess(); request_thread = GetCurrentThreadId(); + pnp_manager_start(); + handles[0] = stop_event; handles[1] = manager; @@ -917,6 +919,9 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) } done: + /* Native PnP drivers expect that all of their devices will be removed when + * their unload routine is called, so we must stop the PnP manager first. */ + pnp_manager_stop(); wine_rb_destroy( &wine_drivers, unload_driver, NULL ); return status; } diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 2823a1c..1c5952f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -76,6 +76,9 @@ extern POBJECT_TYPE SeTokenObjectType; void ObReferenceObject( void *obj ) DECLSPEC_HIDDEN; +void pnp_manager_start(void) DECLSPEC_HIDDEN; +void pnp_manager_stop(void) DECLSPEC_HIDDEN; + static const WCHAR servicesW[] = {'\\','R','e','g','i','s','t','r','y', '\\','M','a','c','h','i','n','e', '\\','S','y','s','t','e','m', diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index e1b348b..6f2283b 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -3,6 +3,7 @@ * * Copyright 2016 Sebastian Lackner * Copyright 2016 Aric Stewart for CodeWeavers + * Copyright 2019 Zebediah Figura * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -751,3 +752,38 @@ POWER_STATE WINAPI PoSetPowerState( DEVICE_OBJECT *device, POWER_STATE_TYPE type FIXME("device %p, type %u, state %u, stub!\n", device, type, state.DeviceState); return state; } + +static DRIVER_OBJECT *pnp_manager; + +static NTSTATUS WINAPI pnp_manager_device_pnp( DEVICE_OBJECT *device, IRP *irp ) +{ + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); + + TRACE("device %p, irp %p, minor function %#x.\n", device, irp, stack->MinorFunction); + + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return irp->IoStatus.u.Status; +} + +static NTSTATUS WINAPI pnp_manager_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *keypath ) +{ + pnp_manager = driver; + driver->MajorFunction[IRP_MJ_PNP] = pnp_manager_device_pnp; + return STATUS_SUCCESS; +} + +void pnp_manager_start(void) +{ + static const WCHAR driver_nameW[] = {'\\','D','r','i','v','e','r','\\','P','n','p','M','a','n','a','g','e','r',0}; + UNICODE_STRING driver_nameU; + NTSTATUS status; + + RtlInitUnicodeString( &driver_nameU, driver_nameW ); + if ((status = IoCreateDriver( &driver_nameU, pnp_manager_driver_entry ))) + ERR("Failed to create PnP manager driver, status %#x.\n", status); +} + +void pnp_manager_stop(void) +{ + IoDeleteDriver( pnp_manager ); +}

1 0