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

Aric Stewart : ntoskrnl.exe: Implement ObReferenceObjectByName but only for loaded drivers.
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: 6a686d63ad92c80cdca08e1a67856a431031b600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a686d63ad92c80cdca08e1a6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Aug 4 11:53:57 2016 -0500 ntoskrnl.exe: Implement ObReferenceObjectByName but only for loaded drivers. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 25187d3..d812692 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2107,8 +2107,36 @@ NTSTATUS WINAPI ObReferenceObjectByName( UNICODE_STRING *ObjectName, void *ParseContext, void **Object) { - FIXME("stub\n"); - return STATUS_NOT_IMPLEMENTED; + struct wine_driver *driver; + struct wine_rb_entry *entry; + + TRACE("mostly-stub:%s %i %p %i %p %i %p %p\n", debugstr_us(ObjectName), + Attributes, AccessState, DesiredAccess, ObjectType, AccessMode, + ParseContext, Object); + + if (AccessState) FIXME("Unhandled AccessState\n"); + if (DesiredAccess) FIXME("Unhandled DesiredAccess\n"); + if (ParseContext) FIXME("Unhandled ParseContext\n"); + if (ObjectType) FIXME("Unhandled ObjectType\n"); + + if (AccessMode != KernelMode) + { + FIXME("UserMode access not implemented\n"); + return STATUS_NOT_IMPLEMENTED; + } + + EnterCriticalSection(&drivers_cs); + entry = wine_rb_get(&wine_drivers, ObjectName); + LeaveCriticalSection(&drivers_cs); + if (!entry) + { + FIXME("Object (%s) not found, may not be tracked.\n", debugstr_us(ObjectName)); + return STATUS_NOT_IMPLEMENTED; + } + + driver = WINE_RB_ENTRY_VALUE(entry, struct wine_driver, entry); + *Object = &driver->driver_obj; + return STATUS_SUCCESS; }

1 0

Aric Stewart : winedevice: Use IoCreateDriver and IoDeleteDriver.
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: 3b37db88e93ee8aeb42bd4256fb1a4d2bbeb8bbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b37db88e93ee8aeb42bd4256… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Aug 4 18:59:50 2016 +0200 winedevice: Use IoCreateDriver and IoDeleteDriver. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedevice/device.c | 176 ++++++++++++++++++++++--------------------- 1 file changed, 90 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b37db88e93ee8aeb42bd…

1 0

Sebastian Lackner : winedevice: Get rid of static driver_module variable.
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: e3321faf14beef308919a34f4ec5fe3979accf7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3321faf14beef308919a34f4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Aug 4 19:00:00 2016 +0200 winedevice: Get rid of static driver_module variable. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedevice/device.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 2da9446..e31318c 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -43,7 +43,6 @@ 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 HMODULE driver_module; /* find the LDR_MODULE corresponding to the driver module */ static LDR_MODULE *find_ldr_module( HMODULE module ) @@ -216,22 +215,22 @@ static NTSTATUS WINAPI init_driver( DRIVER_OBJECT *driver_object, UNICODE_STRING NTSTATUS status; const IMAGE_NT_HEADERS *nt; const WCHAR *driver_name; + HMODULE module; /* Retrieve driver name from the keyname */ driver_name = strrchrW( keyname->Buffer, '\\' ); driver_name++; - driver_module = load_driver( driver_name, keyname ); - if (!driver_module) + module = load_driver( driver_name, keyname ); + if (!module) return STATUS_DLL_INIT_FAILED; driver_obj = driver_object; + driver_object->DriverSection = find_ldr_module( module ); - nt = RtlImageNtHeader( driver_module ); + nt = RtlImageNtHeader( module ); if (!nt->OptionalHeader.AddressOfEntryPoint) return STATUS_SUCCESS; - - driver_object->DriverSection = find_ldr_module( driver_module ); - driver_object->DriverInit = (PDRIVER_INITIALIZE)((char *)driver_module + nt->OptionalHeader.AddressOfEntryPoint); + driver_object->DriverInit = (PDRIVER_INITIALIZE)((char *)module + nt->OptionalHeader.AddressOfEntryPoint); if (WINE_TRACE_ON(relay)) WINE_DPRINTF( "%04x:Call driver init %p (obj=%p,str=%s)\n", GetCurrentThreadId(), @@ -254,8 +253,10 @@ static NTSTATUS WINAPI init_driver( DRIVER_OBJECT *driver_object, UNICODE_STRING } /* call the driver unload function */ -static void unload_driver( HMODULE module, DRIVER_OBJECT *driver_obj ) +static void unload_driver( DRIVER_OBJECT *driver_obj ) { + LDR_MODULE *ldr = driver_obj->DriverSection; + if (driver_obj->DriverUnload) { if (WINE_TRACE_ON(relay)) @@ -268,7 +269,8 @@ static void unload_driver( HMODULE module, DRIVER_OBJECT *driver_obj ) WINE_DPRINTF( "%04x:Ret driver unload %p (obj=%p)\n", GetCurrentThreadId(), driver_obj->DriverUnload, driver_obj ); } - FreeLibrary( module ); + + FreeLibrary( ldr->BaseAddress ); IoDeleteDriver( driver_obj ); } @@ -349,7 +351,7 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) SetServiceStatus( service_handle, &status ); wine_ntoskrnl_main_loop( stop_event ); - unload_driver( driver_module, driver_obj ); + unload_driver( driver_obj ); } else WINE_ERR( "driver %s failed to load\n", wine_dbgstr_w(driver_name) );

1 0

Nikolay Sivov : dwrite: Add missing return value check (Coverity).
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: ff6f31de7625b0fb3d8e73f85fdf3e81a8f3093b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff6f31de7625b0fb3d8e73f85… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 4 10:56:38 2016 +0300 dwrite: Add missing return value check (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index d1a04db..d354eaf 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1596,12 +1596,13 @@ static HRESULT WINAPI dwritefont3_GetFontFaceReference(IDWriteFont3 *iface, IDWr static BOOL WINAPI dwritefont3_HasCharacter(IDWriteFont3 *iface, UINT32 ch) { struct dwrite_font *This = impl_from_IDWriteFont3(iface); + HRESULT hr; BOOL ret; TRACE("(%p)->(0x%x)\n", This, ch); - IDWriteFont_HasCharacter((IDWriteFont*)iface, ch, &ret); - return ret; + hr = IDWriteFont_HasCharacter((IDWriteFont*)iface, ch, &ret); + return hr == S_OK && ret; } static DWRITE_LOCALITY WINAPI dwritefont3_GetLocality(IDWriteFont3 *iface)

1 0

Nikolay Sivov : cabinet: Fix its vs it's typos.
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: a6c47d73239fa96cd42f1d222933172730191279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6c47d73239fa96cd42f1d222… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 4 10:57:42 2016 +0300 cabinet: Fix its vs it's typos. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cabinet/fdi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index ae6aec8..fdff0bf 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2582,7 +2582,7 @@ BOOL __cdecl FDICopy( * where all the cabinet files needed for decryption are simultaneously * available. But presumably, the API is supposed to support cabinets which * are split across multiple CDROMS; we may need to change our implementation - * to strictly serialize it's file usage so that it opens only one cabinet + * to strictly serialize its file usage so that it opens only one cabinet * at a time. Some experimentation with Windows is needed to figure out the * precise semantics required. The relevant code is here and in fdi_decomp(). */ @@ -2613,8 +2613,8 @@ BOOL __cdecl FDICopy( * if we imagine parallelized access to the FDICopy API. * * The current implementation punts -- it just returns the previous cabinet and - * it's info from the header of this cabinet. This provides the right answer in - * 95% of the cases; its worth checking if Microsoft cuts the same corner before + * its info from the header of this cabinet. This provides the right answer in + * 95% of the cases; it's worth checking if Microsoft cuts the same corner before * we "fix" it. */ ZeroMemory(&fdin, sizeof(FDINOTIFICATION));

1 0

Nikolay Sivov : quartz: Fix its vs it's typo.
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: efe94aea182abe3cfdb0756bbc48fe0994c757b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efe94aea182abe3cfdb0756bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 4 10:57:45 2016 +0300 quartz: Fix its vs it's typo. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avidec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 7e29318..c9ca760 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -172,7 +172,7 @@ static HRESULT WINAPI AVIDec_Receive(TransformFilter *tf, IMediaSample *pSample) if (res != ICERR_OK) ERR("Error occurred during the decompression (%x)\n", res); - /* Drop sample if its intended to be dropped */ + /* Drop sample if it's intended to be dropped */ if (flags & ICDECOMPRESS_HURRYUP) { hr = S_OK; goto error;

1 0

Nikolay Sivov : shlwapi: Fix its vs it's typo.
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: 817302b5686a4abf92e65c5443c022110e748f96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=817302b5686a4abf92e65c544… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 4 10:57:46 2016 +0300 shlwapi: Fix its vs it's typo. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/url.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index ee93818..fe97fae 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -923,7 +923,7 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, } if (ret == S_OK) { - /* Reuse mrelative as temp storage as its already allocated and not needed anymore */ + /* Reuse mrelative as temp storage as it's already allocated and not needed anymore */ if(*pcchCombined == 0) *pcchCombined = 1; ret = UrlCanonicalizeW(preliminary, mrelative, pcchCombined, (dwFlags & ~URL_FILE_USE_PATHURL));

1 0

Nikolay Sivov : wined3d: Fix its vs it's typos.
by Alexandre Julliard 04 Aug '16

04 Aug '16

Module: wine Branch: master Commit: 42cc080f8c2cf472b18a172aae3349f016419b41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42cc080f8c2cf472b18a172aa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 4 10:57:44 2016 +0300 wined3d: Fix its vs it's typos. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 945abe5..c206745 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1374,7 +1374,7 @@ static const char *shader_arb_get_modifier(const struct wined3d_shader_instructi mod = ins->dst[0].modifiers; - /* Silently ignore PARTIALPRECISION if its not supported */ + /* Silently ignore PARTIALPRECISION if it's not supported */ if(priv->target_version == ARB) mod &= ~WINED3DSPDM_PARTIALPRECISION; if(mod & WINED3DSPDM_MSAMPCENTROID) @@ -7237,7 +7237,7 @@ static BOOL gen_yv12_read(struct wined3d_string_buffer *buffer, const struct arb * | 0.5 | 0.5 | * * So it appears as if there are 4 chroma images, but in fact the odd rows - * in the chroma images are in the same row as the even ones. So its is + * in the chroma images are in the same row as the even ones. So it is * kinda tricky to read * * When reading from rectangle textures, keep in mind that the input y coordinates

1 0

Frédéric Delanoy : French translation for release 1.9.15
by Jeremy Newman 04 Aug '16

04 Aug '16

Module: website Branch: master Commit: fd2f3aa4e099afa6e57efb41c44b08bde1e3303a URL: http://source.winehq.org/git/website.git/?a=commit;h=fd2f3aa4e099afa6e57efb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 4 09:03:13 2016 +0200 French translation for release 1.9.15 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016072201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/fr/2016072201.xml b/news/fr/2016072201.xml new file mode 100644 index 0000000..c0ba25f --- /dev/null +++ b/news/fr/2016072201.xml @@ -0,0 +1,16 @@ +<news> +<date>22 juillet 2016</date> +<title>Sortie de Wine 1.9.15</title> +<body> +La version de développement 1.9.15 de Wine est disponible. +<a href="{$root}/announce/1.9.15">Nouveautés</a> de cette version : +<ul> + <li>Plus d'instructions de shaders dans Direct3D.</li> + <li>Améliorations de performances dans GDI.</li> + <li>Meilleure prise en charge multi-joysticks sous MacOS.</li> + <li>Améliorations dans Active Scripting.</li> + <li>Prise en charge additionnelle des flux dans le moteur d'exécution C++.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.15.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Jacek Caban : jscript: Setup arguments object by interpreter and store all arguments inside the object on call exit.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 5a7327d21d424f9a3c07f38d6b568c9b4a342686 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a7327d21d424f9a3c07f38d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 16:28:19 2016 +0200 jscript: Setup arguments object by interpreter and store all arguments inside the object on call exit. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 20 +++----- dlls/jscript/engine.h | 4 +- dlls/jscript/function.c | 129 ++++++++++++++++++++++++++++-------------------- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 4 +- 5 files changed, 88 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a7327d21d424f9a3c07f…

1 0