wine-commits April 2020

wine-commits@winehq.org

2 participants
1016 discussions

Alexandre Julliard : krnl386: Build with msvcrt.
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: 024f9ebd1a1aaf07b853f00efca9480d956312bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=024f9ebd1a1aaf07b853f00e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 2 10:54:08 2020 +0200 krnl386: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/Makefile.in | 4 ++-- dlls/krnl386.exe16/atom.c | 4 ---- dlls/krnl386.exe16/dosexe.h | 1 - dlls/krnl386.exe16/dosmem.c | 6 ------ dlls/krnl386.exe16/file.c | 5 +---- dlls/krnl386.exe16/global.c | 12 ------------ dlls/krnl386.exe16/instr.c | 3 --- dlls/krnl386.exe16/int21.c | 23 +++++++---------------- dlls/krnl386.exe16/int25.c | 6 +----- dlls/krnl386.exe16/int26.c | 6 +----- dlls/krnl386.exe16/int2f.c | 2 -- dlls/krnl386.exe16/int31.c | 3 --- dlls/krnl386.exe16/interrupts.c | 2 -- dlls/krnl386.exe16/ioports.c | 6 ------ dlls/krnl386.exe16/kernel.c | 2 ++ dlls/krnl386.exe16/kernel16_private.h | 1 - dlls/krnl386.exe16/local.c | 3 --- dlls/krnl386.exe16/ne_module.c | 10 ---------- dlls/krnl386.exe16/ne_segment.c | 21 +++------------------ dlls/krnl386.exe16/relay.c | 9 ++------- dlls/krnl386.exe16/resource.c | 32 ++++++++++++++------------------ dlls/krnl386.exe16/selector.c | 3 --- dlls/krnl386.exe16/snoop.c | 4 ---- dlls/krnl386.exe16/syslevel.c | 7 +------ dlls/krnl386.exe16/task.c | 6 ------ dlls/krnl386.exe16/thunk.c | 7 ------- dlls/krnl386.exe16/vxd.c | 25 +++++++------------------ dlls/krnl386.exe16/wowthunk.c | 6 ------ 28 files changed, 41 insertions(+), 178 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=024f9ebd1a1aaf07b853…

1 0

Alexandre Julliard : winebuild: Support building krnl386.exe in PE format.
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: 2746797ad5aee4df3b6f4736ad1aba571af7a361 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2746797ad5aee4df3b6f4736… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 2 10:49:56 2020 +0200 winebuild: Support building krnl386.exe in PE format. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/relay.c | 5 +++-- tools/winebuild/spec16.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index 3b1f4cd18e..29d0a74c83 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -379,9 +379,10 @@ static void BuildCallFrom16Core( int reg_func, int thunk ) static void BuildCallTo16Core( int reg_func ) { const char *name = reg_func ? "wine_call_to_16_regs" : "wine_call_to_16"; + const char *func_name = (target_platform == PLATFORM_WINDOWS ? strmake( "%s@12", name ) : name); /* Function header */ - function_header( name ); + function_header( func_name ); /* Function entry sequence */ output_cfi( ".cfi_startproc" ); @@ -523,7 +524,7 @@ static void BuildCallTo16Core( int reg_func ) output( "\tlret\n" ); /* Function footer */ - output_function_size( name ); + output_function_size( func_name ); } diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index 3a7e457282..a52c03aaa6 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -825,7 +825,7 @@ void output_spec16_file( DLLSPEC *spec16 ) output_stubs( spec16 ); output_exports( spec32 ); output_imports( spec16 ); - if (is_undefined( "__wine_call_from_16" )) output_asm_relays16(); + if (!strcmp( spec16->dll_name, "kernel" )) output_asm_relays16(); if (needs_get_pc_thunk) output_get_pc_thunk(); if (spec16->main_module) {

1 0

Alexandre Julliard : krnl386: Avoid using the selector functions from libwine.
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: 1acb481d29319f0ecd0f0ad96ed1ab1e0caf5543 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1acb481d29319f0ecd0f0ad9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 2 10:49:36 2020 +0200 krnl386: Avoid using the selector functions from libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/kernel.c | 4 ++-- dlls/krnl386.exe16/kernel16_private.h | 5 +++++ dlls/krnl386.exe16/ne_module.c | 2 +- dlls/krnl386.exe16/relay.c | 2 +- dlls/krnl386.exe16/selector.c | 4 ++-- dlls/krnl386.exe16/snoop.c | 4 ++-- dlls/krnl386.exe16/syslevel.c | 2 +- dlls/krnl386.exe16/thunk.c | 19 ++++++++----------- dlls/krnl386.exe16/wowthunk.c | 2 +- 9 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/krnl386.exe16/kernel.c b/dlls/krnl386.exe16/kernel.c index 5fcf19ff85..b1cfccacc7 100644 --- a/dlls/krnl386.exe16/kernel.c +++ b/dlls/krnl386.exe16/kernel.c @@ -113,8 +113,8 @@ BOOL WINAPI KERNEL_DllEntryPoint( DWORD reasion, HINSTANCE16 inst, WORD ds, NE_SetEntryPoint( inst, 178, GetWinFlags16() ); - NE_SetEntryPoint( inst, 454, wine_get_cs() ); - NE_SetEntryPoint( inst, 455, wine_get_ds() ); + NE_SetEntryPoint( inst, 454, get_cs() ); + NE_SetEntryPoint( inst, 455, get_ds() ); NE_SetEntryPoint( inst, 183, DOSMEM_0000H ); /* KERNEL.183: __0000H */ NE_SetEntryPoint( inst, 173, DOSMEM_BiosSysSeg ); /* KERNEL.173: __ROMBIOS */ diff --git a/dlls/krnl386.exe16/kernel16_private.h b/dlls/krnl386.exe16/kernel16_private.h index d313188b93..7f4d7629b1 100644 --- a/dlls/krnl386.exe16/kernel16_private.h +++ b/dlls/krnl386.exe16/kernel16_private.h @@ -261,6 +261,11 @@ extern void SELECTOR_FreeBlock( WORD sel ) DECLSPEC_HIDDEN; #define IS_SELECTOR_32BIT(sel) \ (ldt_is_system(sel) || (ldt_copy->flags[LOWORD(sel) >> 3] & LDT_FLAGS_32BIT)) +static inline WORD get_cs(void) { WORD res; __asm__( "movw %%cs,%0" : "=r" (res) ); return res; } +static inline WORD get_ds(void) { WORD res; __asm__( "movw %%ds,%0" : "=r" (res) ); return res; } +static inline WORD get_fs(void) { WORD res; __asm__( "movw %%fs,%0" : "=r" (res) ); return res; } +static inline WORD get_gs(void) { WORD res; __asm__( "movw %%gs,%0" : "=r" (res) ); return res; } + /* relay16.c */ extern int relay_call_from_16( void *entry_point, unsigned char *args16, CONTEXT *context ) DECLSPEC_HIDDEN; extern void RELAY16_InitDebugLists(void) DECLSPEC_HIDDEN; diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index 3d8a5fe15a..b8c658566d 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -95,7 +95,7 @@ static inline void patch_code_segment( NE_MODULE *pModule ) call[i].glue = __wine_call_from_16_regs; else call[i].glue = __wine_call_from_16; - call[i].flatcs = wine_get_cs(); + call[i].flatcs = get_cs(); } if (TRACE_ON(relay)) /* patch relay functions to all point to relay_call_from_16 */ diff --git a/dlls/krnl386.exe16/relay.c b/dlls/krnl386.exe16/relay.c index 837f389230..c7bdab6f95 100644 --- a/dlls/krnl386.exe16/relay.c +++ b/dlls/krnl386.exe16/relay.c @@ -725,6 +725,6 @@ void DOSVM_BuildCallFrame( CONTEXT *context, DOSRELAY relay, LPVOID data ) /* * Adjust code pointer. */ - context->SegCs = wine_get_cs(); + context->SegCs = get_cs(); context->Eip = (DWORD)__wine_call_from_16_regs; } diff --git a/dlls/krnl386.exe16/selector.c b/dlls/krnl386.exe16/selector.c index 73284cf073..fd29081900 100644 --- a/dlls/krnl386.exe16/selector.c +++ b/dlls/krnl386.exe16/selector.c @@ -72,8 +72,8 @@ static LDT_ENTRY ldt_make_entry( const void *base, unsigned int limit, unsigned */ void init_selectors(void) { - if (!is_gdt_sel( wine_get_gs() )) first_ldt_entry += 512; - if (!is_gdt_sel( wine_get_fs() )) first_ldt_entry += 512; + if (!is_gdt_sel( get_gs() )) first_ldt_entry += 512; + if (!is_gdt_sel( get_fs() )) first_ldt_entry += 512; RtlSetBits( &ldt_bitmap, 0, first_ldt_entry ); ldt_copy = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "__wine_ldt_copy" ); } diff --git a/dlls/krnl386.exe16/snoop.c b/dlls/krnl386.exe16/snoop.c index 941c656f28..4953e7e7ac 100644 --- a/dlls/krnl386.exe16/snoop.c +++ b/dlls/krnl386.exe16/snoop.c @@ -116,7 +116,7 @@ SNOOP16_RegisterDLL(HMODULE16 hModule,LPCSTR name) { snr[0].realfun = (DWORD)SNOOP16_Entry; snr[0].lcall = 0x9a; snr[0].callfromregs = (DWORD)__wine_call_from_16_regs; - snr[0].seg = wine_get_cs(); + snr[0].seg = get_cs(); snr[0].lret = 0xcb66; snr[1].pushbp = 0x5566; @@ -126,7 +126,7 @@ SNOOP16_RegisterDLL(HMODULE16 hModule,LPCSTR name) { snr[1].realfun = (DWORD)SNOOP16_Return; snr[1].lcall = 0x9a; snr[1].callfromregs = (DWORD)__wine_call_from_16_regs; - snr[1].seg = wine_get_cs(); + snr[1].seg = get_cs(); snr[1].lret = 0xcb66; } while (*dll) { diff --git a/dlls/krnl386.exe16/syslevel.c b/dlls/krnl386.exe16/syslevel.c index 88b7ea9459..f9f0f2de13 100644 --- a/dlls/krnl386.exe16/syslevel.c +++ b/dlls/krnl386.exe16/syslevel.c @@ -108,7 +108,7 @@ VOID WINAPI _EnterSysLevel(SYSLEVEL *lock) TRACE("(%p, level %d): thread %x count after %d\n", lock, lock->level, GetCurrentThreadId(), thread_data->sys_count[lock->level] ); - if (lock == &Win16Mutex) CallTo16_TebSelector = wine_get_fs(); + if (lock == &Win16Mutex) CallTo16_TebSelector = get_fs(); } /************************************************************************ diff --git a/dlls/krnl386.exe16/thunk.c b/dlls/krnl386.exe16/thunk.c index 06a6b4beb2..a9d81c5b3f 100644 --- a/dlls/krnl386.exe16/thunk.c +++ b/dlls/krnl386.exe16/thunk.c @@ -1168,7 +1168,7 @@ DEFINE_REGS_ENTRYPOINT( FreeMappedBuffer ) */ void WINAPI GetTEBSelectorFS16(void) { - CURRENT_STACK16->fs = wine_get_fs(); + CURRENT_STACK16->fs = get_fs(); } /********************************************************************** @@ -1421,8 +1421,6 @@ UINT WINAPI ThunkConnect16( void WINAPI C16ThkSL(CONTEXT *context) { LPBYTE stub = MapSL(context->Eax), x = stub; - WORD cs = wine_get_cs(); - WORD ds = wine_get_ds(); /* We produce the following code: * @@ -1437,7 +1435,7 @@ void WINAPI C16ThkSL(CONTEXT *context) * call __FLATCS:__wine_call_from_16_thunk */ - *x++ = 0xB8; *(WORD *)x = ds; x += sizeof(WORD); + *x++ = 0xB8; *(WORD *)x = get_ds(); x += sizeof(WORD); *x++ = 0x8E; *x++ = 0xC0; *x++ = 0x66; *x++ = 0x0F; *x++ = 0xB7; *x++ = 0xC9; *x++ = 0x67; *x++ = 0x66; *x++ = 0x26; *x++ = 0x8B; @@ -1449,7 +1447,7 @@ void WINAPI C16ThkSL(CONTEXT *context) *x++ = 0x66; *x++ = 0x52; *x++ = 0x66; *x++ = 0x9A; *(void **)x = __wine_call_from_16_thunk; x += sizeof(void *); - *(WORD *)x = cs; x += sizeof(WORD); + *(WORD *)x = get_cs(); x += sizeof(WORD); /* Jump to the stub code just created */ context->Eip = LOWORD(context->Eax); @@ -1474,7 +1472,6 @@ void WINAPI C16ThkSL01(CONTEXT *context) struct ThunkDataSL *td = SL16->fpData; DWORD procAddress = (DWORD)GetProcAddress16(GetModuleHandle16("KERNEL"), (LPCSTR)631); - WORD cs = wine_get_cs(); if (!td) { @@ -1507,7 +1504,7 @@ void WINAPI C16ThkSL01(CONTEXT *context) *x++ = 0x66; *x++ = 0x52; *x++ = 0x66; *x++ = 0x9A; *(void **)x = __wine_call_from_16_thunk; x += sizeof(void *); - *(WORD *)x = cs; x += sizeof(WORD); + *(WORD *)x = get_cs(); x += sizeof(WORD); /* Jump to the stub code just created */ context->Eip = LOWORD(context->Eax); @@ -1979,7 +1976,7 @@ void WINAPI CBClientThunkSL( CONTEXT *context ) SEGPTR stack = stack16_push( 12 ); LPWORD stackLin = MapSL(stack); /* stackLin[0] and stackLin[1] reserved for the 32-bit stack ptr */ - stackLin[2] = wine_get_ss(); + stackLin[2] = get_ds(); stackLin[3] = 0; stackLin[4] = OFFSETOF(stack) + 12; stackLin[5] = SELECTOROF(stack); @@ -2007,10 +2004,10 @@ void WINAPI CBClientThunkSLEx( CONTEXT *context ) stackLin = MapSL(stack); stackLin[0] = OFFSETOF(stack) + 4; stackLin[1] = SELECTOROF(stack); - stackLin[2] = wine_get_ds(); + stackLin[2] = get_ds(); stackLin[5] = OFFSETOF(stack) + 24; /* stackLin[6] and stackLin[7] reserved for the 32-bit stack ptr */ - stackLin[8] = wine_get_ss(); + stackLin[8] = get_ds(); stackLin[9] = 0; stackLin[10] = OFFSETOF(CALL32_CBClientEx_RetAddr); stackLin[11] = SELECTOROF(CALL32_CBClientEx_RetAddr); @@ -2065,7 +2062,7 @@ SEGPTR WINAPI Get16DLLAddress(HMODULE16 handle, LPSTR func_name) *thunk++ = 0xea; *(void **)thunk = QT_Thunk; thunk += sizeof(FARPROC16); - *(WORD *)thunk = wine_get_cs(); + *(WORD *)thunk = get_cs(); return MAKESEGPTR( code_sel32, (char *)thunk - (char *)ThunkletHeap ); } diff --git a/dlls/krnl386.exe16/wowthunk.c b/dlls/krnl386.exe16/wowthunk.c index cde3a2175b..616a0a1052 100644 --- a/dlls/krnl386.exe16/wowthunk.c +++ b/dlls/krnl386.exe16/wowthunk.c @@ -64,7 +64,7 @@ BOOL WOWTHUNK_Init(void) /* Patch the return addresses for CallTo16 routines */ - CallTo16_DataSelector = wine_get_ds(); + CallTo16_DataSelector = get_ds(); call16_ret_addr = MAKESEGPTR( codesel, (BYTE *)__wine_call_to_16_ret - __wine_call16_start ); CALL32_CBClient_RetAddr = MAKESEGPTR( codesel, (BYTE *)CALL32_CBClient_Ret - __wine_call16_start );

1 0

Alexandre Julliard : ntdll: Export the LDT copy from ntdll instead of libwine.
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: 9d588819febfa6483a90900bf570b0e2cc09a4d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d588819febfa6483a90900b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 1 22:57:51 2020 +0200 ntdll: Export the LDT copy from ntdll instead of libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/selector.c | 2 +- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/server.c | 5 ++++- dlls/ntdll/signal_i386.c | 21 ++++++++++++++------- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/krnl386.exe16/selector.c b/dlls/krnl386.exe16/selector.c index 5702b25999..73284cf073 100644 --- a/dlls/krnl386.exe16/selector.c +++ b/dlls/krnl386.exe16/selector.c @@ -75,7 +75,7 @@ void init_selectors(void) if (!is_gdt_sel( wine_get_gs() )) first_ldt_entry += 512; if (!is_gdt_sel( wine_get_fs() )) first_ldt_entry += 512; RtlSetBits( &ldt_bitmap, 0, first_ldt_entry ); - ldt_copy = (struct ldt_copy *)&wine_ldt_copy; + ldt_copy = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "__wine_ldt_copy" ); } /*********************************************************************** diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 13b0317744..873eef55d0 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1558,6 +1558,7 @@ @ cdecl wine_server_release_fd(long long) @ cdecl wine_server_send_fd(long) @ cdecl __wine_make_process_system() +@ extern -arch=i386 __wine_ldt_copy # Debugging @ cdecl -norelay __wine_dbg_get_channel_flags(ptr) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 4facdc08a7..df847d09a2 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -1448,6 +1448,9 @@ void server_init_process(void) */ void server_init_process_done(void) { +#ifdef __i386__ + extern struct ldt_copy __wine_ldt_copy; +#endif PEB *peb = NtCurrentTeb()->Peb; IMAGE_NT_HEADERS *nt = RtlImageNtHeader( peb->ImageBaseAddress ); void *entry = (char *)peb->ImageBaseAddress + nt->OptionalHeader.AddressOfEntryPoint; @@ -1471,7 +1474,7 @@ void server_init_process_done(void) { req->module = wine_server_client_ptr( peb->ImageBaseAddress ); #ifdef __i386__ - req->ldt_copy = wine_server_client_ptr( &wine_ldt_copy ); + req->ldt_copy = wine_server_client_ptr( &__wine_ldt_copy ); #endif req->entry = wine_server_client_ptr( entry ); req->gui = (nt->OptionalHeader.Subsystem != IMAGE_SUBSYSTEM_WINDOWS_CUI); diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index e812f634ff..0e033d53ba 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2306,6 +2306,13 @@ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) #define LDT_FLAGS_32BIT 0x40 /* Segment is 32-bit (code or stack) */ #define LDT_FLAGS_ALLOCATED 0x80 /* Segment is allocated */ +struct ldt_copy +{ + void *base[LDT_SIZE]; + unsigned int limit[LDT_SIZE]; + unsigned char flags[LDT_SIZE]; +} __wine_ldt_copy; + static WORD gdt_fs_sel; static RTL_CRITICAL_SECTION ldt_section; @@ -2417,11 +2424,11 @@ static void ldt_set_entry( WORD sel, LDT_ENTRY entry ) exit(1); #endif - wine_ldt_copy.base[index] = ldt_get_base( entry ); - wine_ldt_copy.limit[index] = ldt_get_limit( entry ); - wine_ldt_copy.flags[index] = (entry.HighWord.Bits.Type | - (entry.HighWord.Bits.Default_Big ? LDT_FLAGS_32BIT : 0) | - LDT_FLAGS_ALLOCATED); + __wine_ldt_copy.base[index] = ldt_get_base( entry ); + __wine_ldt_copy.limit[index] = ldt_get_limit( entry ); + __wine_ldt_copy.flags[index] = (entry.HighWord.Bits.Type | + (entry.HighWord.Bits.Default_Big ? LDT_FLAGS_32BIT : 0) | + LDT_FLAGS_ALLOCATED); } static void ldt_init(void) @@ -2464,7 +2471,7 @@ WORD ldt_alloc_fs( TEB *teb, int first_thread ) ldt_lock(); for (idx = first_ldt_entry; idx < LDT_SIZE; idx++) { - if (wine_ldt_copy.flags[idx]) continue; + if (__wine_ldt_copy.flags[idx]) continue; ldt_set_entry( (idx << 3) | 7, entry ); break; } @@ -2479,7 +2486,7 @@ static void ldt_free_fs( WORD sel ) if (sel == gdt_fs_sel) return; ldt_lock(); - wine_ldt_copy.flags[sel >> 3] = 0; + __wine_ldt_copy.flags[sel >> 3] = 0; ldt_unlock(); }

1 0

Alexandre Julliard : krnl386: Avoid using the LDT definitions from libwine.
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: b54483695208e45e4e27a4c1fbd0748461169730 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b54483695208e45e4e27a4c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 1 22:56:30 2020 +0200 krnl386: Avoid using the LDT definitions from libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/dosmem.c | 10 +-- dlls/krnl386.exe16/global.c | 6 +- dlls/krnl386.exe16/instr.c | 8 +- dlls/krnl386.exe16/int31.c | 22 ++--- dlls/krnl386.exe16/kernel.c | 2 +- dlls/krnl386.exe16/kernel16_private.h | 20 ++++- dlls/krnl386.exe16/local.c | 4 +- dlls/krnl386.exe16/ne_module.c | 2 +- dlls/krnl386.exe16/ne_segment.c | 4 +- dlls/krnl386.exe16/selector.c | 154 ++++++++++++++++------------------ dlls/krnl386.exe16/snoop.c | 6 +- dlls/krnl386.exe16/task.c | 6 +- dlls/krnl386.exe16/thunk.c | 7 +- dlls/krnl386.exe16/wowthunk.c | 2 +- 14 files changed, 127 insertions(+), 126 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b54483695208e45e4e27…

1 0

Alexandre Julliard : krnl386: Reimplement LDT support using NtSetLdtEntries().
by Alexandre Julliard 02 Apr '20

02 Apr '20

Module: wine Branch: master Commit: a02d2773be0c330d68194e94a8a8e64f5cef2da5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a02d2773be0c330d68194e94… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 1 22:55:24 2020 +0200 krnl386: Reimplement LDT support using NtSetLdtEntries(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/dosexe.h | 3 +- dlls/krnl386.exe16/instr.c | 12 +- dlls/krnl386.exe16/int31.c | 9 +- dlls/krnl386.exe16/interrupts.c | 2 +- dlls/krnl386.exe16/kernel.c | 1 + dlls/krnl386.exe16/kernel16_private.h | 7 +- dlls/krnl386.exe16/selector.c | 241 ++++++++++++++++++++++------------ dlls/krnl386.exe16/wowthunk.c | 16 +-- 8 files changed, 186 insertions(+), 105 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a02d2773be0c330d6819…

1 0

Derek Lesho : include: Add codecapi.h.
by Alexandre Julliard 01 Apr '20

01 Apr '20

Module: wine Branch: master Commit: 12c3177ed5cae39de8a9f9111a1cb450296cc8e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12c3177ed5cae39de8a9f911… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Mar 31 21:56:35 2020 +0300 include: Add codecapi.h. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/codecapi.h | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index dc79d2ca24..eea1543822 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -61,6 +61,7 @@ SOURCES = \ cmdbas.idl \ cmdtxt.idl \ cmnquery.idl \ + codecapi.h \ colinf.idl \ colordlg.h \ comcat.idl \ diff --git a/include/codecapi.h b/include/codecapi.h new file mode 100644 index 0000000000..1d9fd7e255 --- /dev/null +++ b/include/codecapi.h @@ -0,0 +1,56 @@ +/* + * Copyright 2020 Derek Lesho + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __CODECAPI_H +#define __CODECAPI_H + +enum eAVEncH264VProfile +{ + eAVEncH264VProfile_unknown = 0, + eAVEncH264VProfile_Simple = 66, + eAVEncH264VProfile_Base = 66, + eAVEncH264VProfile_Main = 77, + eAVEncH264VProfile_High = 100, + eAVEncH264VProfile_422 = 122, + eAVEncH264VProfile_High10 = 110, + eAVEncH264VProfile_444 = 244, + eAVEncH264VProfile_Extended = 88, +}; + +enum eAVEncH264VLevel +{ + eAVEncH264VLevel1 = 10, + eAVEncH264VLevel1_b = 11, + eAVEncH264VLevel1_1 = 11, + eAVEncH264VLevel1_2 = 12, + eAVEncH264VLevel1_3 = 13, + eAVEncH264VLevel2 = 20, + eAVEncH264VLevel2_1 = 21, + eAVEncH264VLevel2_2 = 22, + eAVEncH264VLevel3 = 30, + eAVEncH264VLevel3_1 = 31, + eAVEncH264VLevel3_2 = 32, + eAVEncH264VLevel4 = 40, + eAVEncH264VLevel4_1 = 41, + eAVEncH264VLevel4_2 = 42, + eAVEncH264VLevel5 = 50, + eAVEncH264VLevel5_1 = 51, + eAVEncH264VLevel5_2 = 52 +}; + +#endif /* __CODECAPI_H */

1 0

Derek Lesho : mfreadwrite: Fix flushing on MF_SOURCE_READER_ALL_STREAMS.
by Alexandre Julliard 01 Apr '20

01 Apr '20

Module: wine Branch: master Commit: 8e1761adc0a813b0806bc60b4a47a66563dd2aac URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e1761adc0a813b0806bc60b… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Wed Apr 1 13:25:54 2020 -0500 mfreadwrite: Fix flushing on MF_SOURCE_READER_ALL_STREAMS. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index e14538c313..19885ef61e 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -1001,11 +1001,26 @@ static void source_reader_release_responses(struct source_reader *reader, struct static void source_reader_flush_stream(struct source_reader *reader, DWORD stream_index) { struct media_stream *stream = stream_index == MF_SOURCE_READER_ALL_STREAMS ? NULL : &reader->streams[stream_index]; + unsigned int i; source_reader_release_responses(reader, stream); - if (stream->decoder) - IMFTransform_ProcessMessage(stream->decoder, MFT_MESSAGE_COMMAND_FLUSH, 0); - stream->requests = 0; + if (stream) + { + if (stream->decoder) + IMFTransform_ProcessMessage(stream->decoder, MFT_MESSAGE_COMMAND_FLUSH, 0); + + stream->requests = 0; + } + else + { + for (i = 0; i < reader->stream_count; i++) + { + if (reader->streams[i].decoder) + IMFTransform_ProcessMessage(reader->streams[i].decoder, MFT_MESSAGE_COMMAND_FLUSH, 0); + + reader->streams[i].requests = 0; + } + } } static HRESULT source_reader_flush(struct source_reader *reader, unsigned int index)

1 0

Nikolay Sivov : comctl32/button: Use duplicated image for drawing.
by Alexandre Julliard 01 Apr '20

01 Apr '20

Module: wine Branch: master Commit: 5fcd20396fb29a1f2ce87645cbb0d045ce5cf2d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fcd20396fb29a1f2ce87645… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 1 15:17:50 2020 +0300 comctl32/button: Use duplicated image for drawing. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47794 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 0078bd0fc6..b615df4a16 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -90,11 +90,12 @@ typedef struct _BUTTON_INFO HIMAGELIST glyph; /* this is a font character code when split_style doesn't have BCSS_IMAGE */ SIZE glyph_size; RECT text_margin; + HANDLE image; /* Original handle set with BM_SETIMAGE and returned with BM_GETIMAGE. */ union { HICON icon; HBITMAP bitmap; - HANDLE image; + HANDLE image; /* Duplicated handle used for drawing. */ } u; } BUTTON_INFO; @@ -488,6 +489,10 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L case WM_NCDESTROY: SetWindowLongPtrW( hWnd, 0, 0 ); + if (infoPtr->image_type == IMAGE_BITMAP) + DeleteObject(infoPtr->u.bitmap); + else if (infoPtr->image_type == IMAGE_ICON) + DestroyIcon(infoPtr->u.icon); heap_free(infoPtr->note); heap_free(infoPtr); break; @@ -859,13 +864,14 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L case BM_SETIMAGE: infoPtr->image_type = (DWORD)wParam; - oldHbitmap = infoPtr->u.image; - infoPtr->u.image = (HANDLE)lParam; - InvalidateRect( hWnd, NULL, FALSE ); - return (LRESULT)oldHbitmap; + oldHbitmap = infoPtr->image; + infoPtr->u.image = CopyImage((HANDLE)lParam, infoPtr->image_type, 0, 0, 0); + infoPtr->image = (HANDLE)lParam; + InvalidateRect( hWnd, NULL, FALSE ); + return (LRESULT)oldHbitmap; case BM_GETIMAGE: - return (LRESULT)infoPtr->u.image; + return (LRESULT)infoPtr->image; case BCM_SETIMAGELIST: {

1 0

Rémi Bernon : winedbg: Remove uses of dbg_curr_thread from gdbproxy.
by Alexandre Julliard 01 Apr '20

01 Apr '20

Module: wine Branch: master Commit: 38480c591694beaf2da1234137f7a118cf3f0f78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38480c591694beaf2da12341… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 1 17:03:28 2020 +0200 winedbg: Remove uses of dbg_curr_thread from gdbproxy. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 0e60bbb645..7c57caf9d1 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -268,14 +268,14 @@ static struct dbg_thread* dbg_thread_from_tid(struct gdb_context* gdbctx, int ti if (!process) return NULL; - if (tid == 0) return dbg_curr_thread; + if (tid == 0) tid = gdbctx->de.dwThreadId; LIST_FOR_EACH_ENTRY(thread, &process->threads, struct dbg_thread, entry) { if (tid > 0 && thread->tid != tid) continue; return thread; } - return dbg_curr_thread; + return NULL; } static void dbg_thread_set_single_step(struct dbg_thread *thread, BOOL enable) @@ -357,7 +357,7 @@ static BOOL handle_exception(struct gdb_context* gdbctx, EXCEPTION_DEBUG_INFO* e SIZE_T read; if (threadname->dwThreadID == -1) - thread = dbg_curr_thread; + thread = dbg_get_thread(gdbctx->process, gdbctx->de.dwThreadId); else thread = dbg_get_thread(gdbctx->process, threadname->dwThreadID); if (thread) @@ -394,7 +394,6 @@ static void handle_debug_event(struct gdb_context* gdbctx) WCHAR buffer[256]; } u; - dbg_curr_thread = dbg_get_thread(gdbctx->process, de->dwThreadId); gdbctx->exec_tid = de->dwThreadId; gdbctx->other_tid = de->dwThreadId; gdbctx->de_reply = DBG_REPLY_LATER; @@ -426,14 +425,12 @@ static void handle_debug_event(struct gdb_context* gdbctx) fprintf(stderr, "%04x:%04x: create thread I @%p\n", de->dwProcessId, de->dwThreadId, de->u.CreateProcessInfo.lpStartAddress); - assert(dbg_curr_thread == NULL); /* shouldn't be there */ dbg_add_thread(gdbctx->process, de->dwThreadId, de->u.CreateProcessInfo.hThread, de->u.CreateProcessInfo.lpThreadLocalBase); break; case LOAD_DLL_DEBUG_EVENT: - assert(dbg_curr_thread); memory_get_string_indirect(gdbctx->process, de->u.LoadDll.lpImageName, de->u.LoadDll.fUnicode, @@ -456,7 +453,6 @@ static void handle_debug_event(struct gdb_context* gdbctx) break; case EXCEPTION_DEBUG_EVENT: - assert(dbg_curr_thread); TRACE("%08x:%08x: exception code=0x%08x\n", de->dwProcessId, de->dwThreadId, de->u.Exception.ExceptionRecord.ExceptionCode); @@ -476,9 +472,8 @@ static void handle_debug_event(struct gdb_context* gdbctx) case EXIT_THREAD_DEBUG_EVENT: fprintf(stderr, "%08x:%08x: exit thread (%u)\n", de->dwProcessId, de->dwThreadId, de->u.ExitThread.dwExitCode); - - assert(dbg_curr_thread); - dbg_del_thread(dbg_curr_thread); + if ((thread = dbg_get_thread(gdbctx->process, de->dwThreadId))) + dbg_del_thread(thread); break; case EXIT_PROCESS_DEBUG_EVENT: @@ -493,7 +488,6 @@ static void handle_debug_event(struct gdb_context* gdbctx) break; case OUTPUT_DEBUG_STRING_EVENT: - assert(dbg_curr_thread); memory_get_string(gdbctx->process, de->u.DebugString.lpDebugStringData, TRUE, de->u.DebugString.fUnicode, u.bufferA, sizeof(u.bufferA)); @@ -525,7 +519,7 @@ static void handle_step_or_continue(struct gdb_context* gdbctx, int tid, BOOL st struct dbg_process *process = gdbctx->process; struct dbg_thread *thread; - if (tid == 0) tid = dbg_curr_thread->tid; + if (tid == 0) tid = gdbctx->de.dwThreadId; LIST_FOR_EACH_ENTRY(thread, &process->threads, struct dbg_thread, entry) { if (tid != -1 && thread->tid != tid) continue; @@ -596,7 +590,6 @@ static void wait_for_debuggee(struct gdb_context* gdbctx) assert(!gdbctx->process || gdbctx->process->pid == 0 || gdbctx->de.dwProcessId == gdbctx->process->pid); - assert(!dbg_curr_thread || gdbctx->de.dwThreadId == dbg_curr_thread->tid); if (gdbctx->in_trap) break; ContinueDebugEvent(gdbctx->de.dwProcessId, gdbctx->de.dwThreadId, DBG_CONTINUE); } @@ -828,6 +821,7 @@ static inline void packet_reply_register_hex_to(struct gdb_context* gdbctx, dbg_ static enum packet_return packet_reply_status(struct gdb_context* gdbctx) { struct dbg_process *process = gdbctx->process; + struct dbg_thread *thread; struct backend_cpu *backend; dbg_ctx_t ctx; size_t i; @@ -838,7 +832,8 @@ static enum packet_return packet_reply_status(struct gdb_context* gdbctx) if (!(backend = process->be_cpu)) return packet_error; - if (!backend->get_context(dbg_curr_thread->handle, &ctx)) + if (!(thread = dbg_get_thread(process, gdbctx->de.dwThreadId)) || + !backend->get_context(thread->handle, &ctx)) return packet_error; packet_reply_open(gdbctx); @@ -846,7 +841,7 @@ static enum packet_return packet_reply_status(struct gdb_context* gdbctx) sig = gdbctx->last_sig; packet_reply_val(gdbctx, sig, 1); packet_reply_add(gdbctx, "thread:"); - packet_reply_val(gdbctx, dbg_curr_thread->tid, 4); + packet_reply_val(gdbctx, gdbctx->de.dwThreadId, 4); packet_reply_add(gdbctx, ";"); for (i = 0; i < backend->gdb_num_regs; i++)

1 0

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 April 2020