October 2018 - Wine-Commits

Alexandre Julliard : kernel32: Use the Unicode string length to build the argv array.
by Alexandre Julliard Oct. 24, 2018

Oct. 24, 2018

Module: wine Branch: master Commit: 1a561b640b52359a2dba8aa345264f2f2a88fafe URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a561b640b52359a2dba8aa3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 24 12:20:38 2018 +0200 kernel32: Use the Unicode string length to build the argv array. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 59b6961..ea483b9 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1483,16 +1483,19 @@ void CDECL __wine_kernel_init(void) * Build an argv array from a command-line. * 'reserved' is the number of args to reserve before the first one. */ -static char **build_argv( const WCHAR *cmdlineW, int reserved ) +static char **build_argv( const UNICODE_STRING *cmdlineW, int reserved ) { int argc; char** argv; char *arg,*s,*d,*cmdline; int in_quotes,bcount,len; - len = WideCharToMultiByte( CP_UNIXCP, 0, cmdlineW, -1, NULL, 0, NULL, NULL ); - if (!(cmdline = HeapAlloc( GetProcessHeap(), 0, len ))) return NULL; - WideCharToMultiByte( CP_UNIXCP, 0, cmdlineW, -1, cmdline, len, NULL, NULL ); + len = WideCharToMultiByte( CP_UNIXCP, 0, cmdlineW->Buffer, cmdlineW->Length / sizeof(WCHAR), + NULL, 0, NULL, NULL ); + if (!(cmdline = HeapAlloc( GetProcessHeap(), 0, len + 1 ))) return NULL; + WideCharToMultiByte( CP_UNIXCP, 0, cmdlineW->Buffer, cmdlineW->Length / sizeof(WCHAR), + cmdline, len, NULL, NULL ); + cmdline[len++] = 0; argc=reserved+1; bcount=0; @@ -1689,7 +1692,7 @@ static int fork_and_exec( const RTL_USER_PROCESS_PARAMETERS *params, const char wine_server_handle_to_fd( params->hStdOutput, FILE_WRITE_DATA, &stdout_fd, NULL ); wine_server_handle_to_fd( params->hStdError, FILE_WRITE_DATA, &stderr_fd, NULL ); - argv = build_argv( params->CommandLine.Buffer, 0 ); + argv = build_argv( &params->CommandLine, 0 ); envp = build_envp( params->Environment ); if (!(pid = fork())) /* child */ @@ -2045,7 +2048,7 @@ static pid_t spawn_loader( const RTL_USER_PROCESS_PARAMETERS *params, int socket const char *loader = NULL; char **argv; - argv = build_argv( params->CommandLine.Buffer, 1 ); + argv = build_argv( &params->CommandLine, 1 ); if (!is_win64 ^ !is_64bit_arch( pe_info->cpu )) loader = get_alternate_loader( &wineloader ); @@ -2132,7 +2135,7 @@ static NTSTATUS exec_loader( const RTL_USER_PROCESS_PARAMETERS *params, int sock ULONGLONG res_start = pe_info->base; ULONGLONG res_end = pe_info->base + pe_info->map_size; - if (!(argv = build_argv( params->CommandLine.Buffer, 1 ))) return STATUS_NO_MEMORY; + if (!(argv = build_argv( &params->CommandLine, 1 ))) return STATUS_NO_MEMORY; if (!is_win64 ^ !is_64bit_arch( pe_info->cpu )) loader = get_alternate_loader( &wineloader );

1 0

Nikolay Sivov : dxgi: Add partial implementation for dxgi_adapter_GetDesc2 () and dxgi_adapter_GetDesc3().
by Alexandre Julliard Oct. 24, 2018

Oct. 24, 2018

Module: wine Branch: master Commit: 1e8d17d0a4ce5dfd892e70ba8cb131dc56989528 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e8d17d0a4ce5dfd892e70ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 24 08:22:03 2018 +0300 dxgi: Add partial implementation for dxgi_adapter_GetDesc2() and dxgi_adapter_GetDesc3(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/adapter.c | 57 ++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 43 insertions(+), 14 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index a913870..b96904e 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -147,18 +147,12 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac return S_OK; } -static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc1(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC1 *desc) +static HRESULT dxgi_adapter_get_desc(struct dxgi_adapter *adapter, DXGI_ADAPTER_DESC3 *desc) { - struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); struct wined3d_adapter_identifier adapter_id; char description[128]; HRESULT hr; - TRACE("iface %p, desc %p.\n", iface, desc); - - if (!desc) - return E_INVALIDARG; - adapter_id.driver_size = 0; adapter_id.description = description; adapter_id.description_size = sizeof(description); @@ -187,13 +181,16 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc1(IWineDXGIAdapter *iface, desc->SharedSystemMemory = 0; /* FIXME */ desc->AdapterLuid = adapter_id.adapter_luid; desc->Flags = 0; + desc->GraphicsPreemptionGranularity = 0; /* FIXME */ + desc->ComputePreemptionGranularity = 0; /* FIXME */ return hr; } static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC *desc) { - DXGI_ADAPTER_DESC1 desc1; + struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); + DXGI_ADAPTER_DESC3 desc3; HRESULT hr; TRACE("iface %p, desc %p.\n", iface, desc); @@ -201,8 +198,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IWineDXGIAdapter *iface, D if (!desc) return E_INVALIDARG; - if (SUCCEEDED(hr = dxgi_adapter_GetDesc1(iface, &desc1))) - memcpy(desc, &desc1, sizeof(*desc)); + if (SUCCEEDED(hr = dxgi_adapter_get_desc(adapter, &desc3))) + memcpy(desc, &desc3, sizeof(*desc)); return hr; } @@ -249,11 +246,38 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IWineDXGIAda return S_OK; } +static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc1(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC1 *desc) +{ + struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); + DXGI_ADAPTER_DESC3 desc3; + HRESULT hr; + + TRACE("iface %p, desc %p.\n", iface, desc); + + if (!desc) + return E_INVALIDARG; + + if (SUCCEEDED(hr = dxgi_adapter_get_desc(adapter, &desc3))) + memcpy(desc, &desc3, sizeof(*desc)); + + return hr; +} + static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc2(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC2 *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); + DXGI_ADAPTER_DESC3 desc3; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, desc %p.\n", iface, desc); + + if (!desc) + return E_INVALIDARG; + + if (SUCCEEDED(hr = dxgi_adapter_get_desc(adapter, &desc3))) + memcpy(desc, &desc3, sizeof(*desc)); + + return hr; } static HRESULT STDMETHODCALLTYPE dxgi_adapter_RegisterHardwareContentProtectionTeardownStatusEvent( @@ -304,9 +328,14 @@ static void STDMETHODCALLTYPE dxgi_adapter_UnregisterVideoMemoryBudgetChangeNoti static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc3(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC3 *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); - return E_NOTIMPL; + TRACE("iface %p, desc %p.\n", iface, desc); + + if (!desc) + return E_INVALIDARG; + + return dxgi_adapter_get_desc(adapter, desc); } static const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl =

1 0

Nikolay Sivov : ntdll/tests: Add a test for qsort() stability.
by Alexandre Julliard Oct. 24, 2018

Oct. 24, 2018

Module: wine Branch: master Commit: dd7230d1bce94c02449aead6eca352da57b89608 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd7230d1bce94c02449aead6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 24 16:34:31 2018 +0300 ntdll/tests: Add a test for qsort() stability. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/string.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 708d6e7..0ab28ff 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1189,6 +1189,16 @@ static int __cdecl strcomparefunc(const void *a, const void *b) return lstrcmpA(*p, *q); } +static int __cdecl istrcomparefunc(const void *a, const void *b) +{ + const char * const *p = a; + const char * const *q = b; + + ok (a != b, "must never get the same pointer\n"); + + return lstrcmpiA(*p, *q); +} + static void test_qsort(void) { int arr[5] = { 23, 42, 8, 4, 16 }; @@ -1202,6 +1212,15 @@ static void test_qsort(void) "Sorted", "." }; + const char *strarr2[7] = { + "Hello", + "Wine", + "World", + "!", + "wine", + "Sorted", + "WINE" + }; p_qsort ((void*)arr, 0, sizeof(int), intcomparefunc); ok(arr[0] == 23, "badly sorted, nmemb=0, arr[0] is %d\n", arr[0]); @@ -1246,6 +1265,17 @@ static void test_qsort(void) ok(!strcmp(strarr[4],"Sorted"), "badly sorted, strarr[4] is %s\n", strarr[4]); ok(!strcmp(strarr[5],"Wine"), "badly sorted, strarr[5] is %s\n", strarr[5]); ok(!strcmp(strarr[6],"World"), "badly sorted, strarr[6] is %s\n", strarr[6]); + + p_qsort ((void*)strarr2, 7, sizeof(char*), istrcomparefunc); + ok(!strcmp(strarr2[0], "!"), "badly sorted, strar2r[0] is %s\n", strarr2[0]); + ok(!strcmp(strarr2[1], "Hello"), "badly sorted, strarr2[1] is %s\n", strarr2[1]); + ok(!strcmp(strarr2[2], "Sorted"), "badly sorted, strarr2[2] is %s\n", strarr2[2]); +todo_wine { + ok(!strcmp(strarr2[3], "wine"), "badly sorted, strarr2[3] is %s\n", strarr2[3]); + ok(!strcmp(strarr2[4], "WINE"), "badly sorted, strarr2[4] is %s\n", strarr2[4]); + ok(!strcmp(strarr2[5], "Wine"), "badly sorted, strarr2[5] is %s\n", strarr2[5]); +} + ok(!strcmp(strarr2[6], "World"), "badly sorted, strarr2[6] is %s\n", strarr2[6]); } static void test_bsearch(void)

1 0

Alexandre Julliard : ntdll: Also return the SECTION_IMAGE_INFORMATION data from RtlCreateUserProcess( ).
by Alexandre Julliard Oct. 24, 2018

Oct. 24, 2018

Module: wine Branch: master Commit: c998667bf0983ef99cc48847d3d6fc6ca6ff4a2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c998667bf0983ef99cc48847… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 24 12:32:30 2018 +0200 ntdll: Also return the SECTION_IMAGE_INFORMATION data from RtlCreateUserProcess(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 2 ++ dlls/ntdll/process.c | 1 + dlls/ntdll/virtual.c | 59 ++++++++++++++++++++++++++++--------------------- 3 files changed, 37 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index f4de3cf..fdb443b 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -185,6 +185,8 @@ extern NTSTATUS virtual_uninterrupted_write_memory( void *addr, const void *buff extern void VIRTUAL_SetForceExec( BOOL enable ) DECLSPEC_HIDDEN; extern void virtual_release_address_space(void) DECLSPEC_HIDDEN; extern void virtual_set_large_address_space(void) DECLSPEC_HIDDEN; +extern void virtual_fill_image_information( const pe_image_info_t *pe_info, + SECTION_IMAGE_INFORMATION *info ) DECLSPEC_HIDDEN; extern struct _KUSER_SHARED_DATA *user_shared_data DECLSPEC_HIDDEN; /* completion */ diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 372e26e..623bf65 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -1314,6 +1314,7 @@ NTSTATUS WINAPI RtlCreateUserProcess( UNICODE_STRING *path, ULONG attributes, info->Thread = thread_handle; info->ClientId.UniqueProcess = ULongToHandle( process_id ); info->ClientId.UniqueThread = ULongToHandle( thread_id ); + virtual_fill_image_information( &pe_info, &info->ImageInformation ); process_handle = thread_handle = 0; status = STATUS_SUCCESS; } diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index af1509e..5dfbe74 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -3176,6 +3176,39 @@ NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr ) /****************************************************************************** + * virtual_fill_image_information + * + * Helper for NtQuerySection. + */ +void virtual_fill_image_information( const pe_image_info_t *pe_info, SECTION_IMAGE_INFORMATION *info ) +{ + info->TransferAddress = wine_server_get_ptr( pe_info->entry_point ); + info->ZeroBits = pe_info->zerobits; + info->MaximumStackSize = pe_info->stack_size; + info->CommittedStackSize = pe_info->stack_commit; + info->SubSystemType = pe_info->subsystem; + info->SubsystemVersionLow = pe_info->subsystem_low; + info->SubsystemVersionHigh = pe_info->subsystem_high; + info->GpValue = pe_info->gp; + info->ImageCharacteristics = pe_info->image_charact; + info->DllCharacteristics = pe_info->dll_charact; + info->Machine = pe_info->machine; + info->ImageContainsCode = pe_info->contains_code; + info->u.ImageFlags = pe_info->image_flags; + info->LoaderFlags = pe_info->loader_flags; + info->ImageFileSize = pe_info->file_size; + info->CheckSum = pe_info->checksum; +#ifndef _WIN64 /* don't return 64-bit values to 32-bit processes */ + if (pe_info->machine == IMAGE_FILE_MACHINE_AMD64 || pe_info->machine == IMAGE_FILE_MACHINE_ARM64) + { + info->TransferAddress = (void *)0x81231234; /* sic */ + info->MaximumStackSize = 0x100000; + info->CommittedStackSize = 0x10000; + } +#endif +} + +/****************************************************************************** * NtQuerySection (NTDLL.@) * ZwQuerySection (NTDLL.@) */ @@ -3217,32 +3250,8 @@ NTSTATUS WINAPI NtQuerySection( HANDLE handle, SECTION_INFORMATION_CLASS class, else if (reply->flags & SEC_IMAGE) { SECTION_IMAGE_INFORMATION *info = ptr; - info->TransferAddress = wine_server_get_ptr( image_info.entry_point ); - info->ZeroBits = image_info.zerobits; - info->MaximumStackSize = image_info.stack_size; - info->CommittedStackSize = image_info.stack_commit; - info->SubSystemType = image_info.subsystem; - info->SubsystemVersionLow = image_info.subsystem_low; - info->SubsystemVersionHigh = image_info.subsystem_high; - info->GpValue = image_info.gp; - info->ImageCharacteristics = image_info.image_charact; - info->DllCharacteristics = image_info.dll_charact; - info->Machine = image_info.machine; - info->ImageContainsCode = image_info.contains_code; - info->u.ImageFlags = image_info.image_flags; - info->LoaderFlags = image_info.loader_flags; - info->ImageFileSize = image_info.file_size; - info->CheckSum = image_info.checksum; + virtual_fill_image_information( &image_info, info ); if (ret_size) *ret_size = sizeof(*info); -#ifndef _WIN64 /* don't return 64-bit values to 32-bit processes */ - if (image_info.machine == IMAGE_FILE_MACHINE_AMD64 || - image_info.machine == IMAGE_FILE_MACHINE_ARM64) - { - info->TransferAddress = (void *)0x81231234; /* sic */ - info->MaximumStackSize = 0x100000; - info->CommittedStackSize = 0x10000; - } -#endif } else status = STATUS_SECTION_NOT_IMAGE; }

1 0

Nikolay Sivov : dxgi: Add IDXGIAdapter4 stub.
by Alexandre Julliard Oct. 24, 2018

Oct. 24, 2018

Module: wine Branch: master Commit: 7e7d03ed590af0c3379875bbfe7f717d87224da7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e7d03ed590af0c3379875bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 24 08:22:02 2018 +0300 dxgi: Add IDXGIAdapter4 stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 1 + dlls/dxgi/adapter.c | 10 ++++++++++ include/wine/winedxgi.idl | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 771e923..787fe87 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -30,6 +30,7 @@ #include "winuser.h" #include "objbase.h" +#include "dxgi1_6.h" #include "d3d11_4.h" #ifdef D3D11_INIT_GUID #include "initguid.h" diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 0079759..a913870 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -34,6 +34,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryInterface(IWineDXGIAdapter *i TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); if (IsEqualGUID(iid, &IID_IWineDXGIAdapter) + || IsEqualGUID(iid, &IID_IDXGIAdapter4) || IsEqualGUID(iid, &IID_IDXGIAdapter3) || IsEqualGUID(iid, &IID_IDXGIAdapter2) || IsEqualGUID(iid, &IID_IDXGIAdapter1) @@ -301,6 +302,13 @@ static void STDMETHODCALLTYPE dxgi_adapter_UnregisterVideoMemoryBudgetChangeNoti FIXME("iface %p, cookie %#x stub!\n", iface, cookie); } +static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc3(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC3 *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); + + return E_NOTIMPL; +} + static const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl = { dxgi_adapter_QueryInterface, @@ -325,6 +333,8 @@ static const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl = dxgi_adapter_SetVideoMemoryReservation, dxgi_adapter_RegisterVideoMemoryBudgetChangeNotificationEvent, dxgi_adapter_UnregisterVideoMemoryBudgetChangeNotification, + /* IDXGIAdapter4 methods */ + dxgi_adapter_GetDesc3, }; struct dxgi_adapter *unsafe_impl_from_IDXGIAdapter(IDXGIAdapter *iface) diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index 3a1d6fa..fccf45d 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -18,7 +18,7 @@ #pragma makedep header -import "dxgi1_5.idl"; +import "dxgi1_6.idl"; [ object, @@ -56,7 +56,7 @@ interface IWineDXGIDeviceParent : IUnknown local, uuid(17399d75-964e-4c03-99f8-9d4fd196dd62) ] -interface IWineDXGIAdapter : IDXGIAdapter3 +interface IWineDXGIAdapter : IDXGIAdapter4 { }

1 0

Jactry Zeng : kernel32: Don't check a discarded variable.
by Alexandre Julliard Oct. 24, 2018

Oct. 24, 2018

Module: wine Branch: master Commit: ebc0e5ffb595d92bca7a38a3710e494662298e96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebc0e5ffb595d92bca7a38a3… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Oct 24 13:30:17 2018 +0800 kernel32: Don't check a discarded variable. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 32e7517..799519e 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2146,7 +2146,7 @@ static NTSTATUS exec_loader( const RTL_USER_PROCESS_PARAMETERS *params, int sock wine_exec_wine_binary( loader, argv, getenv("WINELOADER") ); } #ifdef __APPLE__ - while (errno == ENOTSUP && exec_only && terminate_main_thread()); + while (errno == ENOTSUP && terminate_main_thread()); #else while (0); #endif

1 0

Alex Henrie : dwmapi: Fill in function names of documented ordinals.
by Alexandre Julliard Oct. 24, 2018

Oct. 24, 2018

Module: wine Branch: master Commit: 6955e368f477ac962d93494cbfc4ca3ef9b17b0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6955e368f477ac962d93494c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 23 21:43:38 2018 -0600 dwmapi: Fill in function names of documented ordinals. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/dwmapi.spec | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 3744719..27523b7 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -1,33 +1,33 @@ 100 stub DwmpDxGetWindowSharedSurface 101 stub DwmpDxUpdateWindowSharedSurface 102 stdcall DwmEnableComposition(long) -103 stub @ -104 stub @ -105 stub @ -106 stub @ -107 stub @ -108 stub @ -109 stub @ -110 stub @ -112 stub @ -113 stub @ -114 stub @ -115 stub @ -118 stub @ -119 stub @ -120 stub @ -121 stub @ -124 stub @ +103 stub -noname DwmpRestartComposition +104 stub -noname DwmpSetColorizationColor +105 stub -noname DwmpStartOrStopFlip3D +106 stub -noname DwmpIsCompositionCapable +107 stub -noname DwmpGetGlobalState +108 stub -noname DwmpEnableRedirection +109 stub -noname DwmpOpenGraphicsStream +110 stub -noname DwmpCloseGraphicsStream +112 stub -noname DwmpSetGraphicsStreamTransformHint +113 stub -noname DwmpActivateLivePreview +114 stub -noname DwmpQueryThumbnailType +115 stub -noname DwmpStartupViaUserInit +118 stub -noname DwmpGetAssessment +119 stub -noname DwmpGetAssessmentUsage +120 stub -noname DwmpSetAssessmentUsage +121 stub -noname DwmpIsSessionDWM +124 stub -noname DwmpRegisterThumbnail 125 stub DwmpDxBindSwapChain 126 stub DwmpDxUnbindSwapChain -127 stub @ +127 stub -noname DwmpGetColorizationParameters 128 stub DwmpDxgiIsThreadDesktopComposited -129 stub @ -130 stub @ -131 stub @ -132 stub @ +129 stub -noname DwmpDxgiDisableRedirection +130 stub -noname DwmpDxgiEnableRedirection +131 stub -noname DwmpSetColorizationParameters +132 stub -noname DwmpGetCompositionTimingInfoEx 133 stub DwmpDxUpdateWindowRedirectionBltSurface -134 stub @ +134 stub -noname DwmpDxSetContentHostingInformation 135 stub DwmpRenderFlick 136 stub DwmpAllocateSecurityDescriptor 137 stub DwmpFreeSecurityDescriptor

1 0

Alex Henrie : dwmapi: Add stub DwmpGetColorizationParameters.
by Alexandre Julliard Oct. 24, 2018

Oct. 24, 2018

Module: wine Branch: master Commit: 32f3918108e1fa911bc3e28f7350940aa56b7b0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=32f3918108e1fa911bc3e28f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 23 21:43:39 2018 -0600 dwmapi: Add stub DwmpGetColorizationParameters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43177 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/dwmapi.spec | 2 +- dlls/dwmapi/dwmapi_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 27523b7..23380a9 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -20,7 +20,7 @@ 124 stub -noname DwmpRegisterThumbnail 125 stub DwmpDxBindSwapChain 126 stub DwmpDxUnbindSwapChain -127 stub -noname DwmpGetColorizationParameters +127 stdcall -noname DwmpGetColorizationParameters(ptr) 128 stub DwmpDxgiIsThreadDesktopComposited 129 stub -noname DwmpDxgiDisableRedirection 130 stub -noname DwmpDxgiEnableRedirection diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 76e225f..c1ee067 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -286,3 +286,12 @@ HRESULT WINAPI DwmSetIconicThumbnail(HWND hwnd, HBITMAP hbmp, DWORD flags) FIXME("(%p %p %x) stub\n", hwnd, hbmp, flags); return S_OK; }; + +/********************************************************************** + * DwmpGetColorizationParameters (DWMAPI.@) + */ +HRESULT WINAPI DwmpGetColorizationParameters(void *params) +{ + FIXME("(%p) stub\n", params); + return E_NOTIMPL; +}

1 0

Matteo Bruni : wined3d: Invalidate shader resource bindings when blitting.
by Alexandre Julliard Oct. 24, 2018

Oct. 24, 2018

Module: wine Branch: master Commit: a27dbb2d5c27e6d932fc4b0839d3adb1c9d74a13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a27dbb2d5c27e6d932fc4b08… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 23 19:08:50 2018 +0200 wined3d: Invalidate shader resource bindings when blitting. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 37abf19..bdd291b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2846,6 +2846,8 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine } context_invalidate_state(context, STATE_SAMPLER(sampler)); } + context_invalidate_compute_state(context, STATE_COMPUTE_SHADER_RESOURCE_BINDING); + context_invalidate_state(context, STATE_GRAPHICS_SHADER_RESOURCE_BINDING); if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) {

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Oct. 24, 2018

Oct. 24, 2018

Module: wine Branch: master Commit: ec8425bab43e285a343c7329676a46438f368baa URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec8425bab43e285a343c7329… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Oct 24 08:55:58 2018 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/po/lt.po b/po/lt.po index 4c56e9b..b714392 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-10-06 08:19+0300\n" +"PO-Revision-Date: 2018-10-24 08:54+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -309,25 +309,23 @@ msgstr "Atsisakoma..." #: browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "liko %1!u! %2" #: browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "liko %1!u! %2 ir %3!u! %4" #: browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "S&ekundės" +msgstr "sek." #: browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "min." #: browseui.rc:33 msgid "hours" -msgstr "" +msgstr "val." #: comctl32.rc:68 winefile.rc:157 msgid "Properties for %s"

1 0