August 2016 - Wine-Commits - list.winehq.org

Austin English : winsta: Add a stub for WinStationEnumerateW.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: 0fa6f6f95a11d64fd1d34c6736f4447a508ab780 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fa6f6f95a11d64fd1d34c673… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Apr 26 23:36:47 2016 -0500 winsta: Add a stub for WinStationEnumerateW. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0a31f489a65230cb72ae9953c184571101b059d2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winsta/main.c | 7 +++++++ dlls/winsta/winsta.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/winsta/main.c b/dlls/winsta/main.c index a95782f..59efef2 100644 --- a/dlls/winsta/main.c +++ b/dlls/winsta/main.c @@ -91,3 +91,10 @@ BOOL WINAPI WinStationVirtualOpen( PVOID a, PVOID b, PVOID c ) SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } + +BOOLEAN WINAPI WinStationEnumerateW( HANDLE server, PSESSIONIDW *sessionids, ULONG *count ) +{ + FIXME( "%p %p %p\n", server, sessionids, count ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} diff --git a/dlls/winsta/winsta.spec b/dlls/winsta/winsta.spec index 30aa6b5..20db0ca 100644 --- a/dlls/winsta/winsta.spec +++ b/dlls/winsta/winsta.spec @@ -29,7 +29,7 @@ @ stub WinStationEnumerateA @ stub WinStationEnumerateLicenses @ stub WinStationEnumerateProcesses -@ stub WinStationEnumerateW +@ stdcall WinStationEnumerateW(ptr ptr ptr) @ stub WinStationEnumerate_IndexedA @ stub WinStationEnumerate_IndexedW @ stub WinStationFreeGAPMemory

1 0

Matteo Bruni : wined3d: Add a setting to check relative addressing indices when accessing uniforms.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: 3ca87c937e0cfc5f19ee0cd8aafcba2ad140d33e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ca87c937e0cfc5f19ee0cd8a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 2 00:50:00 2016 +0100 wined3d: Add a setting to check relative addressing indices when accessing uniforms. 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> (cherry picked from commit 8e696dee5ff05377c8ccc59b4d204eb42d4cdeca) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 7 ++++++- dlls/wined3d/wined3d_main.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 973b4a0..a980c5b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2233,7 +2233,12 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * /* Relative addressing */ if (reg->idx[0].rel_addr) { - if (reg->idx[0].offset) + if (wined3d_settings.check_float_constants) + sprintf(register_name, "(%s + %u >= 0 && %s + %u < %u ? %s_c[%s + %u] : vec4(0.0))", + rel_param0.param_str, reg->idx[0].offset, + rel_param0.param_str, reg->idx[0].offset, shader->limits->constant_float, + prefix, rel_param0.param_str, reg->idx[0].offset); + else if (reg->idx[0].offset) sprintf(register_name, "%s_c[%s + %u]", prefix, rel_param0.param_str, reg->idx[0].offset); else sprintf(register_name, "%s_c[%s]", prefix, rel_param0.param_str); diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 0543d97..45e41ad 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -82,6 +82,7 @@ struct wined3d_settings wined3d_settings = TRUE, /* Multisampling enabled by default. */ FALSE, /* No strict draw ordering. */ TRUE, /* Don't try to render onscreen by default. */ + FALSE, /* Don't range check relative addressing indices in float constants. */ ~0U, /* No VS shader model limit by default. */ ~0U, /* No GS shader model limit by default. */ ~0U, /* No PS shader model limit by default. */ @@ -302,6 +303,12 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) TRACE("Not always rendering backbuffers offscreen.\n"); wined3d_settings.always_offscreen = FALSE; } + if (!get_config_key(hkey, appkey, "CheckFloatConstants", buffer, size) + && !strcmp(buffer, "enabled")) + { + TRACE("Checking relative addressing indices in float constants.\n"); + wined3d_settings.check_float_constants = TRUE; + } if (!get_config_key_dword(hkey, appkey, "MaxShaderModelVS", &wined3d_settings.max_sm_vs)) TRACE("Limiting VS shader model to %u.\n", wined3d_settings.max_sm_vs); if (!get_config_key_dword(hkey, appkey, "MaxShaderModelGS", &wined3d_settings.max_sm_gs)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7183195..76a0559 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -278,6 +278,7 @@ struct wined3d_settings int allow_multisampling; BOOL strict_draw_ordering; BOOL always_offscreen; + BOOL check_float_constants; unsigned int max_sm_vs; unsigned int max_sm_gs; unsigned int max_sm_ps;

1 0

Piotr Caban : msvcr120: Add __ExceptionPtrToBool implementation.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: 25f2d99933bec4130f9e65793196d39b3f6c594d URL: http://source.winehq.org/git/wine.git/?a=commit;h=25f2d99933bec4130f9e65793… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 26 20:39:41 2016 +0200 msvcr120: Add __ExceptionPtrToBool implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4f8aafbe2891d16aeb1aa7916405b5efb862d7af) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/cpp.c | 9 +++++++++ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index aaf67ec..a0e9a31 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -704,8 +704,8 @@ @ cdecl -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX(a)Z(ptr) __ExceptionPtrRethrow @ stub -arch=win32 ?__ExceptionPtrSwap@@YAXPAX0(a)Z @ stub -arch=win64 ?__ExceptionPtrSwap@@YAXPEAX0(a)Z -@ stub -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z -@ stub -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z(ptr) __ExceptionPtrToBool +@ cdecl -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z(ptr) __ExceptionPtrToBool @ cdecl __uncaught_exception() MSVCRT___uncaught_exception @ stub ?_inconsistency@@YAXXZ @ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II(a)Z(wstr wstr wstr long long) MSVCRT__invalid_parameter diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 8159f0a..129ba27 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -686,8 +686,8 @@ @ cdecl -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX(a)Z(ptr) __ExceptionPtrRethrow @ stub -arch=win32 ?__ExceptionPtrSwap@@YAXPAX0(a)Z @ stub -arch=win64 ?__ExceptionPtrSwap@@YAXPEAX0(a)Z -@ stub -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z -@ stub -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z(ptr) __ExceptionPtrToBool +@ cdecl -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z(ptr) __ExceptionPtrToBool @ cdecl __uncaught_exception() MSVCRT___uncaught_exception @ stub ?_inconsistency@@YAXXZ @ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II(a)Z(wstr wstr wstr long long) MSVCRT__invalid_parameter diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 5087e9c..8aeaec8 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -682,8 +682,8 @@ @ cdecl -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX(a)Z(ptr) msvcr120.?__ExceptionPtrRethrow@@YAXPEBX(a)Z @ stub -arch=win32 ?__ExceptionPtrSwap@@YAXPAX0(a)Z @ stub -arch=win64 ?__ExceptionPtrSwap@@YAXPEAX0(a)Z -@ stub -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z -@ stub -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z(ptr) msvcr120.?__ExceptionPtrToBool@@YA_NPBX(a)Z +@ cdecl -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z(ptr) msvcr120.?__ExceptionPtrToBool@@YA_NPEBX(a)Z @ cdecl __uncaught_exception() msvcr120.__uncaught_exception @ stub ?_inconsistency@@YAXXZ @ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II(a)Z(wstr wstr wstr long long) msvcr120.?_invalid_parameter@@YAXPBG00II(a)Z diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 7cffa00..0e21415 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1487,6 +1487,15 @@ void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) } #endif +/********************************************************************* + * ?__ExceptionPtrToBool@@YA_NPBX(a)Z + * ?__ExceptionPtrToBool@@YA_NPEBX(a)Z + */ +MSVCRT_bool __cdecl __ExceptionPtrToBool(exception_ptr *ep) +{ + return !!ep->rec; +} + void* __cdecl __AdjustPointer(void *obj, const this_ptr_offsets *off) { return get_this_pointer(off, obj);

1 0

Sebastian Lackner : comctl32/syslink: Fix a blocks leak (Valgrind).
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: 6784577606cd284f4e366cc91640321fa881bee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6784577606cd284f4e366cc91… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri May 20 08:04:21 2016 +0300 comctl32/syslink: Fix a blocks leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f4640b04925e0044f6e32bb7d48c85117052a599) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/syslink.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 233169c..5e0f791 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -122,6 +122,8 @@ static VOID SYSLINK_FreeDocItem (PDOC_ITEM DocItem) Free(DocItem->u.Link.szUrl); } + Free(DocItem->Blocks); + /* we don't free Text because it's just a pointer to a character in the entire window text string */

1 0

Alexandre Julliard : user32: Completely free owned DCEs when the corresponding window/ class is destroyed.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: 251a085f2ab364e90888430cedb4b480c97f286d URL: http://source.winehq.org/git/wine.git/?a=commit;h=251a085f2ab364e90888430ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 21 09:54:40 2016 +0900 user32: Completely free owned DCEs when the corresponding window/class is destroyed. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d341b0c3815a1b8872c8354dd0811e05a1ce7152) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/tests/dc.c | 1 - dlls/user32/painting.c | 16 ++++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index cb42219..0fd6326 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -830,7 +830,6 @@ static void test_DeleteDC(void) ok(ret, "UnregisterClassA failed\n"); ret = GetObjectType(hdc_test); -todo_wine ok(!ret, "GetObjectType should fail for a deleted DC\n"); /* CS_OWNDC */ diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 1dea98d..1c4ca7c 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -339,16 +339,17 @@ static struct dce *get_window_dce( HWND hwnd ) */ void free_dce( struct dce *dce, HWND hwnd ) { + struct dce *dce_to_free = NULL; + USER_Lock(); if (dce) { if (!--dce->count) { - /* turn it into a cache entry */ - SetHookFlags( dce->hdc, DCHF_RESETDC ); release_dce( dce ); - dce->flags |= DCX_CACHE; + list_remove( &dce->entry ); + dce_to_free = dce; } else if (dce->hwnd == hwnd) { @@ -363,7 +364,7 @@ void free_dce( struct dce *dce, HWND hwnd ) LIST_FOR_EACH_ENTRY( dce, &dce_list, struct dce, entry ) { if (dce->hwnd != hwnd) continue; - if (!(dce->flags & DCX_CACHE)) continue; + if (!(dce->flags & DCX_CACHE)) break; if (dce->count) WARN( "GetDC() without ReleaseDC() for window %p\n", hwnd ); dce->count = 0; @@ -372,6 +373,13 @@ void free_dce( struct dce *dce, HWND hwnd ) } USER_Unlock(); + + if (dce_to_free) + { + SetDCHook( dce_to_free->hdc, NULL, 0 ); + DeleteDC( dce_to_free->hdc ); + HeapFree( GetProcessHeap(), 0, dce_to_free ); + } }

1 0

Austin English : ntdll: Add NtSetLdtEntries/ZwSetLdtEntries stub.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: b69e48457d6786216bed92a4f919cfcf8344b1fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b69e48457d6786216bed92a4f… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Apr 29 19:57:00 2016 -0500 ntdll: Add NtSetLdtEntries/ZwSetLdtEntries stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fee017c221d11818b608bc0d6abc807aa35ee8fe) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/nt.c | 12 ++++++++++++ dlls/ntdll/ntdll.spec | 4 ++-- include/ddk/wdm.h | 1 + include/winternl.h | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 0a96efe..c2fb734 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -2738,3 +2738,15 @@ NTSTATUS WINAPI NtSystemDebugControl(SYSDBG_COMMAND command, PVOID inbuffer, ULO return STATUS_NOT_IMPLEMENTED; } + +/****************************************************************************** + * NtSetLdtEntries (NTDLL.@) + * ZwSetLdtEntries (NTDLL.@) + */ +NTSTATUS WINAPI NtSetLdtEntries(ULONG selector1, ULONG entry1_low, ULONG entry1_high, + ULONG selector2, ULONG entry2_low, ULONG entry2_high) +{ + FIXME("(%u, %u, %u, %u, %u, %u): stub\n", selector1, entry1_low, entry1_high, selector2, entry2_low, entry2_high); + + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 2c1be0e..9990f36 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -340,7 +340,7 @@ @ stdcall NtSetInformationToken(long long ptr long) @ stdcall NtSetIntervalProfile(long long) @ stdcall NtSetIoCompletion(ptr long ptr long long) -@ stub NtSetLdtEntries +@ stdcall NtSetLdtEntries(long long long long long long) @ stub NtSetLowEventPair @ stub NtSetLowWaitHighEventPair @ stub NtSetLowWaitHighThread @@ -1261,7 +1261,7 @@ @ stdcall ZwSetInformationToken(long long ptr long) NtSetInformationToken @ stdcall ZwSetIntervalProfile(long long) NtSetIntervalProfile @ stdcall ZwSetIoCompletion(ptr long ptr long long) NtSetIoCompletion -@ stub ZwSetLdtEntries +@ stdcall ZwSetLdtEntries(long long long long long long) NtSetLdtEntries @ stub ZwSetLowEventPair @ stub ZwSetLowWaitHighEventPair @ stub ZwSetLowWaitHighThread diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index fc296a6..6ad4bb3 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1351,6 +1351,7 @@ NTSTATUS WINAPI ZwSetInformationObject(HANDLE, OBJECT_INFORMATION_CLASS, PVOID, NTSTATUS WINAPI ZwSetInformationProcess(HANDLE,PROCESS_INFORMATION_CLASS,PVOID,ULONG); NTSTATUS WINAPI ZwSetInformationThread(HANDLE,THREADINFOCLASS,LPCVOID,ULONG); NTSTATUS WINAPI ZwSetIoCompletion(HANDLE,ULONG,ULONG,NTSTATUS,ULONG); +NTSTATUS WINAPI ZwSetLdtEntries(ULONG,ULONG,ULONG,ULONG,ULONG,ULONG); NTSTATUS WINAPI ZwSetSecurityObject(HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR); NTSTATUS WINAPI ZwSetSystemInformation(SYSTEM_INFORMATION_CLASS,PVOID,ULONG); NTSTATUS WINAPI ZwSetSystemTime(const LARGE_INTEGER*,LARGE_INTEGER*); diff --git a/include/winternl.h b/include/winternl.h index e86faba..4da3250 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2293,7 +2293,7 @@ NTSYSAPI NTSTATUS WINAPI NtSetInformationThread(HANDLE,THREADINFOCLASS,LPCVOID, NTSYSAPI NTSTATUS WINAPI NtSetInformationToken(HANDLE,TOKEN_INFORMATION_CLASS,PVOID,ULONG); NTSYSAPI NTSTATUS WINAPI NtSetIntervalProfile(ULONG,KPROFILE_SOURCE); NTSYSAPI NTSTATUS WINAPI NtSetIoCompletion(HANDLE,ULONG_PTR,ULONG_PTR,NTSTATUS,SIZE_T); -NTSYSAPI NTSTATUS WINAPI NtSetLdtEntries(ULONG,LDT_ENTRY,ULONG,LDT_ENTRY); +NTSYSAPI NTSTATUS WINAPI NtSetLdtEntries(ULONG,ULONG,ULONG,ULONG,ULONG,ULONG); NTSYSAPI NTSTATUS WINAPI NtSetLowEventPair(HANDLE); NTSYSAPI NTSTATUS WINAPI NtSetLowWaitHighEventPair(HANDLE); NTSYSAPI NTSTATUS WINAPI NtSetLowWaitHighThread(VOID);

1 0

Ken Thomases : winspool.drv: Include <cups/ppd.h> to fix building against the macOS 10.12 SDK.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: 17a826192ec458b1f090021db7f03e31fbfe7464 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17a826192ec458b1f090021db… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jun 27 15:34:07 2016 -0500 winspool.drv: Include <cups/ppd.h> to fix building against the macOS 10.12 SDK. The cupsGetPPD() function was moved there from <cups/cups.h> because it's deprecated. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 10065d2acd0a9e1e852a8151c95569b99d1b3294) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 12 ++++++++++++ configure.ac | 3 ++- dlls/winspool.drv/info.c | 3 +++ include/config.h.in | 3 +++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 2e1b44d..4c5e14d 100755 --- a/configure +++ b/configure @@ -13053,6 +13053,18 @@ _ACEOF CUPS_CFLAGS="$ac_cups_cflags" fi + for ac_header in cups/ppd.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "cups/ppd.h" "ac_cv_header_cups_ppd_h" "$ac_includes_default" +if test "x$ac_cv_header_cups_ppd_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_CUPS_PPD_H 1 +_ACEOF + +fi + +done + fi done diff --git a/configure.ac b/configure.ac index a75ff16..0a54243 100644 --- a/configure.ac +++ b/configure.ac @@ -1536,7 +1536,8 @@ then AC_CHECK_HEADERS(cups/cups.h, [WINE_CHECK_SONAME(cups,cupsGetDefault, [CUPS_CFLAGS="$ac_cups_cflags"],, - [$ac_cups_libs])]) + [$ac_cups_libs]) + AC_CHECK_HEADERS(cups/ppd.h)]) CPPFLAGS="$ac_save_CPPFLAGS" fi WINE_NOTICE_WITH(cups,[test "x$ac_cv_lib_soname_cups" = "x"], diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 04def86..8ad9756 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -44,6 +44,9 @@ #ifdef HAVE_CUPS_CUPS_H # include <cups/cups.h> #endif +#ifdef HAVE_CUPS_PPD_H +# include <cups/ppd.h> +#endif #ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H #define GetCurrentProcess GetCurrentProcess_Mac diff --git a/include/config.h.in b/include/config.h.in index 90717c8..89ba762 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -80,6 +80,9 @@ /* Define to 1 if you have the <cups/cups.h> header file. */ #undef HAVE_CUPS_CUPS_H +/* Define to 1 if you have the <cups/ppd.h> header file. */ +#undef HAVE_CUPS_PPD_H + /* Define to 1 if you have the <curses.h> header file. */ #undef HAVE_CURSES_H

1 0

Austin English : kernel32: Add GetConsoleAliasExesLengthA/W stubs.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: 47d5193e1079ce4cba538a288c9cc7e35dbff1c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47d5193e1079ce4cba538a288… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Mar 31 21:38:36 2016 -0500 kernel32: Add GetConsoleAliasExesLengthA/W stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 43637ce9f7b8654934b8bea65cf5de68c182d4f9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/console.c | 14 ++++++++++++++ dlls/kernel32/kernel32.spec | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 179e14e..874d19c 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3203,6 +3203,20 @@ DWORD WINAPI GetConsoleAliasesLengthW(LPWSTR unknown) return 0; } +DWORD WINAPI GetConsoleAliasExesLengthA(void) +{ + FIXME(": stub!\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +DWORD WINAPI GetConsoleAliasExesLengthW(void) +{ + FIXME(": stub!\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + VOID WINAPI ExpungeConsoleCommandHistoryA(LPCSTR unknown) { FIXME(": (%s) stub!\n", debugstr_a(unknown)); diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index bcbc50ed..bc147c5 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -582,8 +582,8 @@ @ stdcall GetComputerNameW(ptr ptr) @ stub GetConsoleAliasA @ stub GetConsoleAliasExesA -@ stub GetConsoleAliasExesLengthA -@ stub GetConsoleAliasExesLengthW +@ stdcall GetConsoleAliasExesLengthA() +@ stdcall GetConsoleAliasExesLengthW() @ stub GetConsoleAliasExesW @ stdcall GetConsoleAliasW(wstr ptr long wstr) @ stub GetConsoleAliasesA

1 0

Austin English : dwmapi: Add DwmSetPresentParameters stub.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: 1d72cc8f4da527dfa6aeb40c56de72c5e3c07388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d72cc8f4da527dfa6aeb40c5… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jan 28 17:45:17 2016 -0600 dwmapi: Add DwmSetPresentParameters stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a717598b75b81f776e3fe51372651046cd24f955) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dwmapi/dwmapi.spec | 2 +- dlls/dwmapi/dwmapi_main.c | 9 +++++++++ include/dwmapi.h | 18 ++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 531f279..6adbcb9 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -39,7 +39,7 @@ @ stub DwmQueryThumbnailSourceSize @ stdcall DwmRegisterThumbnail(long long ptr) @ stub DwmSetDxFrameDuration -@ stub DwmSetPresentParameters +@ stdcall DwmSetPresentParameters(ptr ptr) @ stdcall DwmSetWindowAttribute(long long ptr long) @ stdcall DwmUnregisterThumbnail(long) @ stdcall DwmUpdateThumbnailProperties(ptr ptr) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index a776cfe..155d7d3 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -259,3 +259,12 @@ HRESULT WINAPI DwmUpdateThumbnailProperties(HTHUMBNAIL thumbnail, const DWM_THUM FIXME("(%p, %p) stub\n", thumbnail, props); return E_NOTIMPL; } + +/********************************************************************** + * DwmSetPresentParameters (DWMAPI.@) + */ +HRESULT WINAPI DwmSetPresentParameters(HWND hwnd, DWM_PRESENT_PARAMETERS *params) +{ + FIXME("(%p %p) stub\n", hwnd, params); + return S_OK; +}; diff --git a/include/dwmapi.h b/include/dwmapi.h index 035c831..f5191e1 100644 --- a/include/dwmapi.h +++ b/include/dwmapi.h @@ -37,6 +37,12 @@ typedef HTHUMBNAIL *PHTHUMBNAIL; typedef ULONGLONG DWM_FRAME_COUNT; typedef ULONGLONG QPC_TIME; +typedef enum _DWM_SOURCE_FRAME_SAMPLING { + DWM_SOURCE_FRAME_SAMPLING_POINT, + DWM_SOURCE_FRAME_SAMPLING_COVERAGE, + DWM_SOURCE_FRAME_SAMPLING_LAST +} DWM_SOURCE_FRAME_SAMPLING; + typedef struct _UNSIGNED_RATIO { UINT32 uiNumerator; UINT32 uiDenominator; @@ -117,6 +123,17 @@ typedef struct _DWM_THUMBNAIL_PROPERTIES BOOL fSourceClientAreaOnly; } DWM_THUMBNAIL_PROPERTIES, *PDWM_THUMBNAIL_PROPERTIES; +typedef struct _DWM_PRESENT_PARAMETERS { + UINT32 cbSize; + BOOL fQueue; + DWM_FRAME_COUNT cRefreshStart; + UINT cBuffer; + BOOL fUseSourceRate; + UNSIGNED_RATIO rateSource; + UINT cRefreshesPerFrame; + DWM_SOURCE_FRAME_SAMPLING eSampling; +} DWM_PRESENT_PARAMETERS; + #include <poppack.h> DWMAPI DwmDefWindowProc(HWND, UINT, WPARAM, LPARAM, LRESULT*); @@ -129,6 +146,7 @@ DWMAPI DwmGetCompositionTimingInfo(HWND,DWM_TIMING_INFO*); DWMAPI DwmInvalidateIconicBitmaps(HWND); DWMAPI DwmIsCompositionEnabled(BOOL*); DWMAPI DwmRegisterThumbnail(HWND, HWND, PHTHUMBNAIL); +DWMAPI DwmSetPresentParameters(HWND, DWM_PRESENT_PARAMETERS *); DWMAPI DwmSetWindowAttribute(HWND, DWORD, LPCVOID, DWORD); DWMAPI DwmUnregisterThumbnail(HTHUMBNAIL); DWMAPI DwmUpdateThumbnailProperties(HTHUMBNAIL, const DWM_THUMBNAIL_PROPERTIES *);

1 0

Austin English : hal: Add READ_PORT_UCHAR stub.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: f3c399fb70513b287b041608462119af5c82eb52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3c399fb70513b287b0416084… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Apr 25 23:47:05 2016 -0500 hal: Add READ_PORT_UCHAR stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d830f508834c2d55c0a58a2340f9585863425193) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hal/hal.c | 6 ++++++ dlls/hal/hal.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index bca688e..79bbfed 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -156,6 +156,12 @@ KIRQL WINAPI KeGetCurrentIrql(VOID) return 0; } +UCHAR WINAPI READ_PORT_UCHAR(UCHAR *port) +{ + FIXME("(%p) stub!\n", port); + return 0; +} + ULONG WINAPI READ_PORT_ULONG(ULONG *port) { FIXME("(%p) stub!\n", port); diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index 02f778c..071eba5 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -81,7 +81,7 @@ @ stub READ_PORT_BUFFER_UCHAR @ stub READ_PORT_BUFFER_ULONG @ stub READ_PORT_BUFFER_USHORT -@ stub READ_PORT_UCHAR +@ stdcall READ_PORT_UCHAR(ptr) @ stdcall READ_PORT_ULONG(ptr) @ stub READ_PORT_USHORT @ stub WRITE_PORT_BUFFER_UCHAR

1 0