February 2018 - Wine-Commits

Alexandre Julliard : krnl386: Remove support for DOS devices and event handling.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: 5ec544959632d63ad50175885503cc78f6ed6c58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ec544959632d63ad5017588… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 2 10:50:48 2018 +0100 krnl386: Remove support for DOS devices and event handling. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/Makefile.in | 5 - dlls/krnl386.exe16/dosdev.c | 489 -------------------------------------- dlls/krnl386.exe16/dosexe.h | 126 ---------- dlls/krnl386.exe16/dosvm.c | 221 ----------------- dlls/krnl386.exe16/instr.c | 6 - dlls/krnl386.exe16/int09.c | 244 ------------------- dlls/krnl386.exe16/int16.c | 215 ----------------- dlls/krnl386.exe16/int21.c | 184 ++------------ dlls/krnl386.exe16/int2f.c | 57 ----- dlls/krnl386.exe16/int31.c | 119 +--------- dlls/krnl386.exe16/int33.c | 367 ---------------------------- dlls/krnl386.exe16/interrupts.c | 112 +-------- dlls/krnl386.exe16/ioports.c | 3 - dlls/krnl386.exe16/soundblaster.c | 6 +- dlls/krnl386.exe16/timer.c | 74 ------ dlls/krnl386.exe16/wowthunk.c | 113 --------- 16 files changed, 30 insertions(+), 2311 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5ec544959632d63ad501…

1 0

Alexandre Julliard : krnl386: Remove support for VGA emulation.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: 33b2d8521c916e1d5c9201adc8e52507bedb7d26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33b2d8521c916e1d5c9201ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 2 12:43:25 2018 +0100 krnl386: Remove support for VGA emulation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/Makefile.in | 4 +- dlls/krnl386.exe16/dosexe.h | 4 - dlls/krnl386.exe16/int10.c | 1462 ---------------------------- dlls/krnl386.exe16/int21.c | 2 - dlls/krnl386.exe16/interrupts.c | 17 +- dlls/krnl386.exe16/ioports.c | 86 -- dlls/krnl386.exe16/vga.c | 1999 --------------------------------------- dlls/krnl386.exe16/vga.h | 97 -- 8 files changed, 3 insertions(+), 3668 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=33b2d8521c916e1d5c92…

1 0

Hans Leidekker : kerberos: Fix parameter check in kerberos_SpUnsealMessage.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: e1bef53ebb7f82364aaf1eeb3345fad3dc195703 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1bef53ebb7f82364aaf1eeb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 2 12:20:24 2018 +0100 kerberos: Fix parameter check in kerberos_SpUnsealMessage. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 0345469..d2280e5 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -1339,7 +1339,7 @@ static NTSTATUS NTAPI kerberos_SpUnsealMessage( LSA_SEC_HANDLE context, SecBuffe TRACE( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); if (message_seq_no) FIXME( "ignoring message_seq_no %u\n", message_seq_no ); - if (context) return SEC_E_INVALID_HANDLE; + if (!context) return SEC_E_INVALID_HANDLE; ctxt_handle = ctxthandle_sspi_to_gss( context ); if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN;

1 0

Nikolay Sivov : comctl32/edit: Fix replacement text trace.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: e0883d8f3f5518e7fe2bd3216e978ab0488d6360 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0883d8f3f5518e7fe2bd321… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 2 08:41:15 2018 +0300 comctl32/edit: Fix replacement text trace. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 5b6773e..a01b75b 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -2434,7 +2434,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, const WCHAR *lpsz_r UINT bufl; TRACE("%s, can_undo %d, send_update %d\n", - debugstr_w(lpsz_replace), can_undo, send_update); + debugstr_wn(lpsz_replace, strl), can_undo, send_update); s = es->selection_start; e = es->selection_end;

1 0

Alexandre Julliard : winedbg: Remove support for vm86 exceptions.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: 39b1384e78e24d39e750ae74bee9e255a45633c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39b1384e78e24d39e750ae74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 2 12:53:09 2018 +0100 winedbg: Remove support for vm86 exceptions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/info.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index c1de158..83341c0 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -930,15 +930,6 @@ void info_win32_exception(void) case EXCEPTION_WINE_ASSERTION: dbg_printf("assertion failed"); break; - case EXCEPTION_VM86_INTx: - dbg_printf("interrupt %02lx in vm86 mode", rec->ExceptionInformation[0]); - break; - case EXCEPTION_VM86_STI: - dbg_printf("sti in vm86 mode"); - break; - case EXCEPTION_VM86_PICRETURN: - dbg_printf("PIC return in vm86 mode"); - break; case EXCEPTION_FLT_DENORMAL_OPERAND: dbg_printf("denormal float operand"); break;

1 0

Michael Stefaniuc : oleacc: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: f9e47ff5e03ae568dea436f4c3305e6bc301d271 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9e47ff5e03ae568dea436f4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 2 01:03:57 2018 +0100 oleacc: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/client.c | 1 + dlls/oleacc/oleacc_private.h | 10 ---------- dlls/oleacc/window.c | 1 + 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index ddaa89d..5b1f0ee 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -22,6 +22,7 @@ #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(oleacc); diff --git a/dlls/oleacc/oleacc_private.h b/dlls/oleacc/oleacc_private.h index 06e3ba6..32561ef 100644 --- a/dlls/oleacc/oleacc_private.h +++ b/dlls/oleacc/oleacc_private.h @@ -23,13 +23,3 @@ HRESULT create_window_object(HWND, const IID*, void**) DECLSPEC_HIDDEN; HRESULT get_accpropservices_factory(REFIID, void**) DECLSPEC_HIDDEN; int convert_child_id(VARIANT *v) DECLSPEC_HIDDEN; - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} diff --git a/dlls/oleacc/window.c b/dlls/oleacc/window.c index 64d7167..32c19fd 100644 --- a/dlls/oleacc/window.c +++ b/dlls/oleacc/window.c @@ -22,6 +22,7 @@ #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(oleacc);

1 0

Nikolay Sivov : comctl32/edit: Merge theming logic.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: a9d4b9870d4ff9d446ceba7f3fc1aedbefbe37e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9d4b9870d4ff9d446ceba7f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 2 08:41:14 2018 +0300 comctl32/edit: Merge theming logic. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/Makefile.in | 1 - dlls/comctl32/edit.c | 170 ++++++++++++++++++++++++++++++++------------- dlls/comctl32/theme_edit.c | 134 ----------------------------------- dlls/comctl32/theming.c | 3 - 4 files changed, 121 insertions(+), 187 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a9d4b9870d4ff9d446ce…

1 0

Michael Stefaniuc : odbccp32: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: 0c7863d9e985df1cacebce6de26dd53fed5f8f7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c7863d9e985df1cacebce6d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 2 01:03:55 2018 +0100 odbccp32: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index fce3fcd..f9a2269 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -31,6 +31,7 @@ #include "winnls.h" #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/heap.h" #include "odbcinst.h" @@ -84,16 +85,6 @@ static void clear_errors(void) num_errors = 0; } -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline WCHAR *heap_strdupAtoW(const char *str) { LPWSTR ret = NULL;

1 0

Michael Stefaniuc : ole32: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: f38ddaec6fa9b5258a8dde5869893dfc6b7f4edf URL: https://source.winehq.org/git/wine.git/?a=commit;h=f38ddaec6fa9b5258a8dde58… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 2 01:03:56 2018 +0100 ole32: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj_private.h | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 0f10a7c..9e65c3e 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -30,6 +30,7 @@ #include <stdarg.h> #include "wine/list.h" +#include "wine/heap.h" #include "windef.h" #include "winbase.h" @@ -259,7 +260,7 @@ void leave_apartment(struct oletls *info) DECLSPEC_HIDDEN; static inline struct oletls *COM_CurrentInfo(void) { if (!NtCurrentTeb()->ReservedForOle) - NtCurrentTeb()->ReservedForOle = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct oletls)); + NtCurrentTeb()->ReservedForOle = heap_alloc_zero(sizeof(struct oletls)); return NtCurrentTeb()->ReservedForOle; } @@ -323,16 +324,6 @@ extern BOOL actctx_get_miscstatus(const CLSID*, DWORD, DWORD*) DECLSPEC_HIDDEN; extern const char *debugstr_formatetc(const FORMATETC *formatetc) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline HRESULT copy_formatetc(FORMATETC *dst, const FORMATETC *src) { *dst = *src;

1 0

Michael Stefaniuc : msvcrt: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 2, 2018

Feb. 2, 2018

Module: wine Branch: master Commit: caf0d0f5fd09280711fd2367d849d88f2585839d URL: https://source.winehq.org/git/wine.git/?a=commit;h=caf0d0f5fd09280711fd2367… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 2 01:03:52 2018 +0100 msvcrt: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/lock.c | 1 + dlls/msvcrt/msvcrt.h | 15 --------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index b8b8672..583e429 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" #include "winternl.h" +#include "wine/heap.h" #include "msvcrt.h" #include "cppexcept.h" #include "mtdll.h" diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index a380613..65ced6d 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1429,20 +1429,5 @@ typedef struct { _FPIEEE_VALUE Result; } _FPIEEE_RECORD, *_PFPIEEE_RECORD; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - #define INHERIT_THREAD_PRIORITY 0xF000 #endif /* __WINE_MSVCRT_H */

1 0