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

Re: [PATCH] vcomp140: Add vcomp140 stub
by Sebastian Lackner 09 Aug '16

09 Aug '16

On 09.08.2016 05:31, Daniel Lehman wrote: > > 0001-vcomp140-Add-vcomp140-stub.txt > > > From 4a1bccc08c4fce6c37921cc7d94d4e738433c92b Mon Sep 17 00:00:00 2001 > From: Daniel Lehman <dlehman(a)esri.com> > Date: Mon, 8 Aug 2016 19:56:29 -0700 > Subject: [PATCH] vcomp140: Add vcomp140 stub > > Signed-off-by: Daniel Lehman <dlehman(a)esri.com> > --- > configure.ac | 1 + > dlls/vcomp140/Makefile.in | 1 + > dlls/vcomp140/vcomp140.spec | 113 ++++++++++++++++++++++++++++++++++++++++++++ > tools/make_specfiles | 1 + > 4 files changed, 116 insertions(+) > create mode 100644 dlls/vcomp140/Makefile.in > create mode 100644 dlls/vcomp140/vcomp140.spec Thanks for working on this. Is there any specific reason why you omitted the DllMain method? It might be better to return FALSE from DLL_WINE_PREATTACH to ensure the native dll is preferred if available (like done in all other vcomp* dlls). I would also be fine to switch vcomp to "prefer builtin" at some point, however I am not sure if it is sufficiently tested yet. There are still various unimplemented functions, so apps could stop working if they were using native vcomp140 before. Other opinions are also welcome of course. ;) Regards, Sebastian

2 3

Re: [PATCH] ntdll: Call __finally blocks in __C_specific_handler (try3)
by Piotr Caban 09 Aug '16

09 Aug '16

Hi, On 08/09/16 00:33, Daniel Lehman wrote: > Try2: don't use exception handler signature for termination handler You've sent old patch, with wrong termination handler signature. Thanks, Piotr

1 0

Re: [PATCH 3/5] server: Get and set the console ColorTable
by Alexandre Julliard 08 Aug '16

08 Aug '16

Hugh McMaster <hugh.mcmaster(a)outlook.com> writes: > @@ -1568,6 +1568,22 @@ struct console_renderer_event > short int font_height; > @END > > + > +/* Fill the console ColorTable */ > +(a)REQ(set_console_colortable) > + obj_handle_t handle; /* handle to the console */ > + VARARG(color,unsigned_int); /* ColorTable */ > +(a)END > + > + > +/* Fetch the console ColorTable */ > +(a)REQ(get_console_colortable) > + obj_handle_t handle; /* handle to the console */ > +(a)REPLY > + VARARG(color,unsigned_int); /* ColorTable */ > +(a)END It would probably be better to add this to the existing get/set_console_output_info requests. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH 7/7] wined3d: Do not enable blending for edge/line antialiasing.
by Marvin 08 Aug '16

08 Aug '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24847 Your paranoid android. === w1064 (32 bit ddraw7) === ddraw7.c:2295: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === w1064 (64 bit ddraw7) === ddraw7.c:2295: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768).

1 0

Re: [PATCH 7/7] wined3d: Do not enable blending for edge/line antialiasing.
by Marvin 08 Aug '16

08 Aug '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24846 Your paranoid android. === w1064 (32 bit ddraw7) === ddraw7.c:2295: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === w1064 (64 bit ddraw7) === ddraw7.c:2295: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768).

1 0

Re: [PATCH 5/7] ddraw/tests: Add test for edge antialiasing blending.
by Marvin 08 Aug '16

08 Aug '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24841 Your paranoid android. === w1064 (32 bit ddraw7) === ddraw7.c:2295: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768). === w1064 (64 bit ddraw7) === ddraw7.c:2295: Test failed: Expected (0,0)-(512,384), got (0,0)-(1024,768).

1 0

Re: server: Fix loading of IMAGE_OPTIONAL_HEADER
by Marvin 08 Aug '16

08 Aug '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24836 Your paranoid android. === w1064 (32 bit loader) === loader.c:2867: Test failed: Test 0: ResolveDelayLoadedAPI failed loader.c:2868: Test failed: Test 0: expected 74374550, got 00000000 loader.c:2867: Test failed: Test 1: ResolveDelayLoadedAPI failed loader.c:2868: Test failed: Test 1: expected 72BC2CF0, got 00000000 loader.c:2867: Test failed: Test 2: ResolveDelayLoadedAPI failed loader.c:2868: Test failed: Test 2: expected 74372DC0, got 00000000 loader.c:2875: Test failed: Test 3: ResolveDelayLoadedAPI succeeded with 00000000 loader.c:2876: Test failed: Test 3: Wrong callback count: 0 loader.c:2875: Test failed: Test 4: ResolveDelayLoadedAPI succeeded with 00000000 loader.c:2876: Test failed: Test 4: Wrong callback count: 0 === wvistau64 (64 bit loader) === loader.c:720: Test failed: 2: unexpected error 193 loader.c:720: Test failed: 3: unexpected error 193 loader.c:720: Test failed: 4: unexpected error 193 loader.c:720: Test failed: 6: unexpected error 193 loader.c:720: Test failed: 7: unexpected error 193 loader.c:173: Test failed: WriteFile error 1784 === w2008s64 (64 bit loader) === loader.c:720: Test failed: 2: unexpected error 193 loader.c:720: Test failed: 3: unexpected error 193 loader.c:720: Test failed: 4: unexpected error 193 loader.c:720: Test failed: 6: unexpected error 193 loader.c:720: Test failed: 7: unexpected error 193 loader.c:173: Test failed: WriteFile error 1784 === w7pro64 (64 bit loader) === loader.c:720: Test failed: 2: unexpected error 193 loader.c:720: Test failed: 3: unexpected error 193 loader.c:720: Test failed: 4: unexpected error 193 loader.c:720: Test failed: 6: unexpected error 193 loader.c:720: Test failed: 7: unexpected error 193 loader.c:173: Test failed: WriteFile error 1784 === w864 (64 bit loader) === loader.c:720: Test failed: 2: unexpected error 193 loader.c:720: Test failed: 3: unexpected error 193 loader.c:720: Test failed: 4: unexpected error 193 loader.c:720: Test failed: 6: unexpected error 193 loader.c:720: Test failed: 7: unexpected error 193 loader.c:173: Test failed: WriteFile error 1784 === w1064 (64 bit loader) === loader.c:720: Test failed: 2: unexpected error 193 loader.c:720: Test failed: 3: unexpected error 193 loader.c:720: Test failed: 4: unexpected error 193 loader.c:720: Test failed: 6: unexpected error 193 loader.c:720: Test failed: 7: unexpected error 193 loader.c:173: Test failed: WriteFile error 1784

2 1

Re: [PATCH 1/1] riched20: allow setting background text color
by Huw Davies 08 Aug '16

08 Aug '16

Hi Kenneth, Thanks for your contribution to Wine. Please see below for some comments. On Sat, Aug 06, 2016 at 02:17:34PM -0600, Kenneth Haley wrote: > diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c > index 42434b9..df7af79 100644 > --- a/dlls/riched20/paint.c > +++ b/dlls/riched20/paint.c > @@ -318,11 +318,20 @@ static void get_selection_rect( ME_Context *c, ME_Run *run, int from, int to, in > static void draw_text( ME_Context *c, ME_Run *run, int x, int y, BOOL selected, RECT *sel_rect ) > { > COLORREF text_color = get_text_color( c, run->style, selected ); > - COLORREF back_color = selected ? ITextHost_TxGetSysColor( c->editor->texthost, COLOR_HIGHLIGHT ) : 0; > + COLORREF back_color = 0; > COLORREF old_text, old_back = 0; > const WCHAR *text = get_text( run, 0 ); > ME_String *masked = NULL; > > + if (selected) > + back_color = ITextHost_TxGetSysColor( c->editor->texthost, COLOR_HIGHLIGHT ); > + else if(run->style->fmt.dwMask & CFM_BACKCOLOR) > + if (!(CFE_AUTOBACKCOLOR & run->style->fmt.dwEffects)) > + { > + back_color = run->style->fmt.crBackColor; > + selected = TRUE; > + } > + You don't need two 'if's in the 'else' clause, just combine them with an &&. I think we should introduce a new boolean 'paint_bkgnd' (or something) rather than hijacking 'selected' here. It would be set to TRUE if 'selected' or we have a background colour. The code that follows this would then use that rather than 'selected'. Also, please use 4-space indents in this function and be consistant about spaces after an 'if'. > @@ -385,6 +394,18 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, > } > } > } > + else if(run->style->fmt.dwMask & CFM_BACKCOLOR) Again, space after 'if'. > + { > + get_selection_rect( c, run, 0, run->len, cy, &sel_rect ); > + OffsetRect( &sel_rect, x, ymin ); > + sel_rgn = CreateRectRgnIndirect( &sel_rect ); > + clip = CreateRectRgn( 0, 0, 0, 0 ); > + if (GetClipRgn( hDC, clip ) != 1) > + { > + DeleteObject( clip ); > + clip = NULL; > + } > + } This block is essentially a copy of the selected block. It should be possible to rewrite the if condition in that block so you don't need to duplicate this code. Huw.

1 0

Re: [PATCH] winedevice: Remove static driver_obj variable
by Sebastian Lackner 07 Aug '16

07 Aug '16

On 05.08.2016 14:26, Aric Stewart wrote: > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > programs/winedevice/device.c | 36 ++++++++++++++++++++++++++++++------ > 1 file changed, 30 insertions(+), 6 deletions(-) > > > > 0001-winedevice-Remove-static-driver_obj-variable.txt > > > diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c > index e31318c..2744b9d5 100644 > --- a/programs/winedevice/device.c > +++ b/programs/winedevice/device.c > @@ -42,7 +42,16 @@ extern NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ); > > static SERVICE_STATUS_HANDLE service_handle; > static HANDLE stop_event; > -static DRIVER_OBJECT *driver_obj; > + > +static const WCHAR driverW[] = {'\\','D','r','i','v','e','r','\\',0}; > +extern NTSTATUS WINAPI ObReferenceObjectByName( UNICODE_STRING *ObjectName, > + ULONG Attributes, > + ACCESS_STATE *AccessState, > + ACCESS_MASK DesiredAccess, > + POBJECT_TYPE ObjectType, > + KPROCESSOR_MODE AccessMode, > + void *ParseContext, > + void **Object); It might be better to add this to a public header file. On Windows its in a different header file, but Wine already has a couple of ObReference* functions in include/ddk/wdm.h. You could add it there, too. > > /* find the LDR_MODULE corresponding to the driver module */ > static LDR_MODULE *find_ldr_module( HMODULE module ) > @@ -225,7 +234,6 @@ static NTSTATUS WINAPI init_driver( DRIVER_OBJECT *driver_object, UNICODE_STRING > if (!module) > return STATUS_DLL_INIT_FAILED; > > - driver_obj = driver_object; > driver_object->DriverSection = find_ldr_module( module ); > > nt = RtlImageNtHeader( module ); > @@ -253,9 +261,26 @@ static NTSTATUS WINAPI init_driver( DRIVER_OBJECT *driver_object, UNICODE_STRING > } > > /* call the driver unload function */ > -static void unload_driver( DRIVER_OBJECT *driver_obj ) > +static void unload_driver( const WCHAR *driver_name ) > { > - LDR_MODULE *ldr = driver_obj->DriverSection; > + DRIVER_OBJECT *driver_obj; > + LDR_MODULE *ldr; > + UNICODE_STRING drv_name; > + WCHAR *str; > + > + str = HeapAlloc( GetProcessHeap(), 0, sizeof(driverW) + strlenW(driver_name)*sizeof(WCHAR) ); > + lstrcpyW( str, driverW); > + lstrcatW( str, driver_name ); > + RtlInitUnicodeString( &drv_name, str ); > + > + if (ObReferenceObjectByName( &drv_name, OBJ_CASE_INSENSITIVE, NULL, > + 0, NULL, KernelMode, NULL, (void**)&driver_obj ) != STATUS_SUCCESS) To avoid putting together the string twice, you could already call this function immediately after loading. Also, in theory you would have to release the reference obtained by "ObReferenceObjectByName" using ObDereferenceObject. Since there is no refcounting yet its fine to skip it, but it might be important at some later point. > + { > + ERR("Failed to locate loaded driver (%s)\n", wine_dbgstr_w(driver_name)); > + return; You are leaking the drv_name variable here and at the end of the function. > + } > + > + ldr = driver_obj->DriverSection; > > if (driver_obj->DriverUnload) > { > @@ -276,7 +301,6 @@ static void unload_driver( DRIVER_OBJECT *driver_obj ) > > static NTSTATUS create_driver(const WCHAR *driver_name) > { > - static const WCHAR driverW[] = {'\\','D','r','i','v','e','r','\\',0}; > UNICODE_STRING drv_name; > NTSTATUS status; > WCHAR *str; > @@ -351,7 +375,7 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) > SetServiceStatus( service_handle, &status ); > > wine_ntoskrnl_main_loop( stop_event ); > - unload_driver( driver_obj ); > + unload_driver( driver_name ); > } > else WINE_ERR( "driver %s failed to load\n", wine_dbgstr_w(driver_name) ); > > > >

2 3

Re: [3/3] kernel32/tests: Remove superfluous filler definitions
by Marvin 07 Aug '16

07 Aug '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24824 Your paranoid android. === w7u (32 bit loader) === loader.c:2439: Test failed: WaitForSingleObject failed: 102 === w1064 (32 bit loader) === loader.c:2855: Test failed: Test 0: ResolveDelayLoadedAPI failed loader.c:2856: Test failed: Test 0: expected 74374550, got 00000000 loader.c:2855: Test failed: Test 1: ResolveDelayLoadedAPI failed loader.c:2856: Test failed: Test 1: expected 72BC2CF0, got 00000000 loader.c:2855: Test failed: Test 2: ResolveDelayLoadedAPI failed loader.c:2856: Test failed: Test 2: expected 74372DC0, got 00000000 loader.c:2863: Test failed: Test 3: ResolveDelayLoadedAPI succeeded with 00000000 loader.c:2864: Test failed: Test 3: Wrong callback count: 0 loader.c:2863: Test failed: Test 4: ResolveDelayLoadedAPI succeeded with 00000000 loader.c:2864: Test failed: Test 4: Wrong callback count: 0 === wvistau64 (64 bit loader) === loader.c:718: Test failed: 2: unexpected error 193 loader.c:718: Test failed: 3: unexpected error 193 loader.c:718: Test failed: 4: unexpected error 193 loader.c:718: Test failed: 6: unexpected error 193 loader.c:718: Test failed: 7: unexpected error 193 loader.c:173: Test failed: WriteFile error 1784 === w2008s64 (64 bit loader) === loader.c:718: Test failed: 2: unexpected error 193 loader.c:718: Test failed: 3: unexpected error 193 loader.c:718: Test failed: 4: unexpected error 193 loader.c:718: Test failed: 6: unexpected error 193 loader.c:718: Test failed: 7: unexpected error 193 loader.c:173: Test failed: WriteFile error 1784 === w7pro64 (64 bit loader) === loader.c:718: Test failed: 2: unexpected error 193 loader.c:718: Test failed: 3: unexpected error 193 loader.c:718: Test failed: 4: unexpected error 193 loader.c:718: Test failed: 6: unexpected error 193 loader.c:718: Test failed: 7: unexpected error 193 loader.c:173: Test failed: WriteFile error 1784 === w864 (64 bit loader) === loader.c:718: Test failed: 2: unexpected error 193 loader.c:718: Test failed: 3: unexpected error 193 loader.c:718: Test failed: 4: unexpected error 193 loader.c:718: Test failed: 6: unexpected error 193 loader.c:718: Test failed: 7: unexpected error 193 loader.c:173: Test failed: WriteFile error 1784 === w1064 (64 bit loader) === loader.c:718: Test failed: 2: unexpected error 193 loader.c:718: Test failed: 3: unexpected error 193 loader.c:718: Test failed: 4: unexpected error 193 loader.c:718: Test failed: 6: unexpected error 193 loader.c:718: Test failed: 7: unexpected error 193 loader.c:173: Test failed: WriteFile error 1784

1 0