wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

Piotr Caban : msvcrt: Add mbsrtowcs_s implementation.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: 08da46f08bd2793b2b54f6ec0197350d89b8b873 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08da46f08bd2793b2b54f6ec0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 16 13:29:41 2016 +0200 msvcrt: Add mbsrtowcs_s implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 540d969150e7ff87d731d6f4b9baa9a6f90f2737) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-convert-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 29 ++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 38 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec index f926ba8..4fe9037 100644 --- a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec +++ b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec @@ -88,7 +88,7 @@ @ stub mbrtoc32 @ cdecl mbrtowc(ptr str long ptr) ucrtbase.mbrtowc @ cdecl mbsrtowcs(ptr ptr long ptr) ucrtbase.mbsrtowcs -@ stub mbsrtowcs_s +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) ucrtbase.mbsrtowcs_s @ cdecl mbstowcs(ptr str long) ucrtbase.mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) ucrtbase.mbstowcs_s @ cdecl mbtowc(ptr str long) ucrtbase.mbtowc diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index d4cfa44..dfda3dd 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1744,7 +1744,7 @@ @ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen @ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc @ cdecl mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs -@ stub mbsrtowcs_s +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) MSVCRT_mbsrtowcs_s @ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s @ cdecl mbtowc(ptr str long) MSVCRT_mbtowc diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index cd56cf8..aaf67ec 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2103,7 +2103,7 @@ @ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen @ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc @ cdecl mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs -@ stub mbsrtowcs_s +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) MSVCRT_mbsrtowcs_s @ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s @ cdecl mbtowc(ptr str long) MSVCRT_mbtowc diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 4c0e95a..8159f0a 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2280,7 +2280,7 @@ @ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen @ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc @ cdecl mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs -@ stub mbsrtowcs_s +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) MSVCRT_mbsrtowcs_s @ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s @ cdecl mbtowc(ptr str long) MSVCRT_mbtowc diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index d7979d6..5087e9c 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1943,7 +1943,7 @@ @ cdecl mbrlen(ptr long ptr) msvcr120.mbrlen @ cdecl mbrtowc(ptr str long ptr) msvcr120.mbrtowc @ cdecl mbsrtowcs(ptr ptr long ptr) msvcr120.mbsrtowcs -@ stub mbsrtowcs_s +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) msvcr120.mbsrtowcs_s @ cdecl mbstowcs(ptr str long) msvcr120.mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) msvcr120.mbstowcs_s @ cdecl mbtowc(ptr str long) msvcr120.mbtowc diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 4def939..2611bcc 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1425,7 +1425,7 @@ @ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen @ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc @ cdecl mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs -@ stub mbsrtowcs_s +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) MSVCRT_mbsrtowcs_s @ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s @ cdecl mbtowc(ptr str long) MSVCRT_mbtowc diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 752db52..45e1d6b 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1397,7 +1397,7 @@ @ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen @ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc @ cdecl mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs -@ stub mbsrtowcs_s +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) MSVCRT_mbsrtowcs_s @ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s @ cdecl mbtowc(ptr str long) MSVCRT_mbtowc diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index e7adaad..c206af1 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2357,6 +2357,35 @@ MSVCRT_size_t CDECL MSVCRT_mbsrtowcs(MSVCRT_wchar_t *wcstr, } /********************************************************************* + * mbsrtowcs_s(MSVCRT.@) + */ +int CDECL MSVCRT_mbsrtowcs_s(MSVCRT_size_t *ret, MSVCRT_wchar_t *wcstr, MSVCRT_size_t len, + const char **mbstr, MSVCRT_size_t count, MSVCRT_mbstate_t *state) +{ + MSVCRT_size_t tmp; + + if(!ret) ret = &tmp; + if(!MSVCRT_CHECK_PMT(!!wcstr == !!len)) { + *ret = -1; + return MSVCRT_EINVAL; + } + + *ret = MSVCRT_mbsrtowcs(wcstr, mbstr, count>len ? len : count, state); + if(*ret == -1) { + if(wcstr) *wcstr = 0; + return *MSVCRT__errno(); + } + (*ret)++; + if(*ret > len) { + /* no place for terminating '\0' */ + if(wcstr) *wcstr = 0; + return 0; + } + if(wcstr) wcstr[(*ret)-1] = 0; + return 0; +} + +/********************************************************************* * _mbctohira (MSVCRT.@) * * Converts a sjis katakana character to hiragana. diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ca1c97f..fb64163 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1365,7 +1365,7 @@ @ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc # stub mbsdup_dbg(wstr long ptr long) @ cdecl mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs -# stub mbsrtowcs_s(ptr ptr long ptr long ptr) +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) MSVCRT_mbsrtowcs_s @ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s @ cdecl mbtowc(ptr str long) MSVCRT_mbtowc diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index bbae921..c4c6510 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2415,7 +2415,7 @@ @ stub mbrtoc32 @ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc @ cdecl mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs -@ stub mbsrtowcs_s +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) MSVCRT_mbsrtowcs_s @ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s @ cdecl mbtowc(ptr str long) MSVCRT_mbtowc

1 0

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

22 Aug '16

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 22 Aug '16

22 Aug '16

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

Olivier F. R. Dierick : shell32: Set last error explicitly in SHFileOperation().
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: e3853a5e0f79b9cc191801b0ff2690f2cdd4a4ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3853a5e0f79b9cc191801b0f… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Sat Apr 23 16:03:39 2016 +0200 shell32: Set last error explicitly in SHFileOperation(). Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9f202b78046adbb30cb9b936e72ce3ca0c4fa1fa) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shlfileop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 234a141..6f20181 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -894,7 +894,6 @@ int WINAPI SHFileOperationA(LPSHFILEOPSTRUCTA lpFileOp) if (ForFree) continue; retCode = ERROR_OUTOFMEMORY; nFileOp.fAnyOperationsAborted = TRUE; - SetLastError(retCode); return retCode; } } @@ -1564,6 +1563,7 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp) if (ret == ERROR_CANCELLED) lpFileOp->fAnyOperationsAborted = TRUE; + SetLastError(ERROR_SUCCESS); return ret; }

1 0

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

22 Aug '16

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

Alistair Leslie-Hughes : wininet: Free socket when connection is freed.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: bbacc9a40593cd33b36ad42b4400a39e1e5d5397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbacc9a40593cd33b36ad42b4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 11 18:41:25 2016 +1000 wininet: Free socket when connection is freed. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5ee82583f7716c140a02c4eb043e80d64cd33c04) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wininet/netconnection.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 7305860..63b84aa 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -396,6 +396,7 @@ void free_netconn(netconn_t *netconn) DeleteSecurityContext(&netconn->ssl_ctx); } + close_netconn(netconn); heap_free(netconn); }

1 0

Austin English : kernel32: Add GetConsoleAliasExesLengthA/W stubs.
by Alexandre Julliard 22 Aug '16

22 Aug '16

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 22 Aug '16

22 Aug '16

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 : winsta: Add a stub for WinStationEnumerateW.
by Alexandre Julliard 22 Aug '16

22 Aug '16

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

Austin English : hal: Add READ_PORT_ULONG stub.
by Alexandre Julliard 22 Aug '16

22 Aug '16

Module: wine Branch: stable Commit: ea13beda0c527b8329cc493f070be290237a7968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea13beda0c527b8329cc493f0… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 22 19:35:00 2015 -0600 hal: Add READ_PORT_ULONG stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3e16c3343ad6cf3e0ab076343dd651f5bbc73750) 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 96bc895..bca688e 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -155,3 +155,9 @@ KIRQL WINAPI KeGetCurrentIrql(VOID) FIXME( " stub!\n"); return 0; } + +ULONG WINAPI READ_PORT_ULONG(ULONG *port) +{ + FIXME("(%p) stub!\n", port); + return 0; +} diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index 3046c65..02f778c 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -82,7 +82,7 @@ @ stub READ_PORT_BUFFER_ULONG @ stub READ_PORT_BUFFER_USHORT @ stub READ_PORT_UCHAR -@ stub READ_PORT_ULONG +@ stdcall READ_PORT_ULONG(ptr) @ stub READ_PORT_USHORT @ stub WRITE_PORT_BUFFER_UCHAR @ stub WRITE_PORT_BUFFER_ULONG

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2016