- wine-devel - winehq.org

[PATCH 5/5] usp10: Use heap_calloc() in ScriptShape().
by Henri Verbeet 06 Mar '18

06 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/usp10/usp10.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 411d19f..983eb83 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3333,10 +3333,10 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, if (!psva || !pcGlyphs) return E_INVALIDARG; if (cChars > cMaxGlyphs) return E_OUTOFMEMORY; - charProps = heap_alloc_zero(sizeof(SCRIPT_CHARPROP)*cChars); - if (!charProps) return E_OUTOFMEMORY; - glyphProps = heap_alloc_zero(sizeof(SCRIPT_GLYPHPROP)*cMaxGlyphs); - if (!glyphProps) + if (!(charProps = heap_calloc(cChars, sizeof(*charProps)))) + return E_OUTOFMEMORY; + + if (!(glyphProps = heap_calloc(cMaxGlyphs, sizeof(*glyphProps)))) { heap_free(charProps); return E_OUTOFMEMORY; -- 2.1.4

2 1

Re: GSOC
by Abhishek Kumar 06 Mar '18

06 Mar '18

Abhisheks-MacBook-Air:~ abhi$ *WINEARCH=win64 WINEPREFIX=~/.wine64 winecfg * 0059:err:process:__wine_kernel_init boot event wait timed out On Tue, Mar 6, 2018 at 2:37 AM, Abhishek Kumar <abhishek.sec09(a)gmail.com> wrote: > Again i get error after install ncurses. > > > *Abhisheks-MacBook-Air:~ abhi$ WINEARCH=win64 WINEPREFIX=~/.wine64 > notepad* > > *0055:err:process:__wine_kernel_init boot event wait timed out* > > *Wine cannot find the ncurses library (libncurses.5.4.dylib).* > > *002b:err:hid_report:process_hid_report Device reports coming in too fast, > last report not read yet!* > > > On Tue, Mar 6, 2018 at 2:16 AM, Abhishek Kumar <abhishek.sec09(a)gmail.com> > wrote: > >> No other app is running other than notepad. >> >> *Abhisheks-MacBook-Air:~ abhi$ WINEARCH=win32 WINEPREFIX=~/.wine64 >> explorer.exe* >> >> *-bash: explorer.exe: command not found* >> >> >> Please help >> >> On Tue, Mar 6, 2018 at 2:04 AM, Abhishek Kumar <abhishek.sec09(a)gmail.com> >> wrote: >> >>> Now i am getting this error. >>> >>> >>> *Abhisheks-MacBook-Air:~ abhi$ WINEARCH=win64 WINEPREFIX=~/.wine64 >>> notepad* >>> >>> *wine notepad* >>> >>> *004f:err:process:__wine_kernel_init boot event wait timed out* >>> >>> *Wine cannot find the ncurses library (libncurses.5.4.dylib).* >>> >>> >>> On Tue, Mar 6, 2018 at 1:16 AM, Austin English <austinenglish(a)gmail.com> >>> wrote: >>> >>>> On Mon, Mar 5, 2018 at 1:43 PM, Abhishek Kumar < >>>> abhishek.sec09(a)gmail.com> wrote: >>>> > No i have already applied this. >>>> > >>>> > sudo make install >>>> > >>>> > On Tue, Mar 6, 2018 at 1:08 AM, Austin English < >>>> austinenglish(a)gmail.com> >>>> > wrote: >>>> >> >>>> >> On Mon, Mar 5, 2018 at 1:35 PM, Abhishek Kumar < >>>> abhishek.sec09(a)gmail.com> >>>> >> wrote: >>>> >> > It has build from the source (version - 3.3) >>>> >> > >>>> >> > On Tue, Mar 6, 2018 at 12:57 AM, Abhishek Kumar >>>> >> > <abhishek.sec09(a)gmail.com> >>>> >> > wrote: >>>> >> >> >>>> >> >> i am unable to run wine after installing on my mac os sierra.It >>>> showing >>>> >> >> following error. >>>> >> >> >>>> >> >> >>>> >> >> Abhisheks-MacBook-Air:~ abhi$ wine notepad >>>> >> >> >>>> >> >> -bash: wine: command not found >>>> >> >> >>>> >> >> >>>> >> >> >>>> >> >> Please provide the solution soon as possible. >>>> >> >>>> >> You may have forgotten to run (sudo) make install >>>> >> >>>> >> -- >>>> >> -Austin >>>> >> GPG: 267B CC1F 053F 0749 (expires 2021/02/18) >>>> >>>> Then /usr/local/bin may not be in your path (or whatever you used for >>>> --prefix). >>>> >>>> P.S. Please keep wine-devel in CC and bottom post. >>>> >>>> -- >>>> -Austin >>>> GPG: 267B CC1F 053F 0749 (expires 2021/02/18) >>>> >>> >>> >> >

3 2

[PATCH] ntdll: implement RtlCreateRegistryKey
by Stefan Leichter 06 Mar '18

06 Mar '18

fixes https://bugs.winehq.org/show_bug.cgi?id=44641 Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/reg.c | 66 ++++++++++++++++++++++++++++++------- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 2 ++ 4 files changed, 59 insertions(+), 13 deletions(-)

2 1

[PATCH] wined3d: Recognize GTX 560M card with NVIDIA driver.
by Alistair Leslie-Hughes 06 Mar '18

06 Mar '18

From: Christian Costa <titan.costa(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b73966a..8bda9c4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1341,6 +1341,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX550, "NVIDIA GeForce GTX 550 Ti", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT555M, "NVIDIA GeForce GT 555M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560TI, "NVIDIA GeForce GTX 560 Ti", DRIVER_NVIDIA_GEFORCE8, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560M, "NVIDIA GeForce GTX 560M", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560, "NVIDIA GeForce GTX 560", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX570, "NVIDIA GeForce GTX 570", DRIVER_NVIDIA_GEFORCE8, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX580, "NVIDIA GeForce GTX 580", DRIVER_NVIDIA_GEFORCE8, 1536}, @@ -1945,6 +1946,7 @@ cards_nvidia_binary[] = {"GTX 580", CARD_NVIDIA_GEFORCE_GTX580}, /* Geforce 500 - highend */ {"GTX 570", CARD_NVIDIA_GEFORCE_GTX570}, /* Geforce 500 - midend high */ {"GTX 560 Ti", CARD_NVIDIA_GEFORCE_GTX560TI}, /* Geforce 500 - midend */ + {"GTX 560M", CARD_NVIDIA_GEFORCE_GTX560M}, /* Geforce 500 - midend mobile */ {"GTX 560", CARD_NVIDIA_GEFORCE_GTX560}, /* Geforce 500 - midend */ {"GT 555M", CARD_NVIDIA_GEFORCE_GT555M}, /* Geforce 500 - midend mobile */ {"GTX 550 Ti", CARD_NVIDIA_GEFORCE_GTX550}, /* Geforce 500 - midend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1c4c3ef..38d5e88 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2341,6 +2341,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX550 = 0x1244, CARD_NVIDIA_GEFORCE_GT555M = 0x04b8, CARD_NVIDIA_GEFORCE_GTX560TI = 0x1200, + CARD_NVIDIA_GEFORCE_GTX560M = 0x1251, CARD_NVIDIA_GEFORCE_GTX560 = 0x1201, CARD_NVIDIA_GEFORCE_GTX570 = 0x1081, CARD_NVIDIA_GEFORCE_GTX580 = 0x1080, -- 1.9.1

2 1

[PATCH] kernel32: Fix handling lines with only values in GetPrivateProfileSection
by Zhiyi Zhang 06 Mar '18

06 Mar '18

Fix 32104 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/kernel32/profile.c | 2 +- dlls/kernel32/tests/profile.c | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-)

1 0

[PATCH 4/5] wined3d: Pass a texture and sub-resource index to surface_load_drawable().
by Henri Verbeet 06 Mar '18

06 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 10 +++++----- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 24d1f59..1824a98 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2106,12 +2106,11 @@ BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_res } /* Context activation is done by the caller. */ -BOOL surface_load_drawable(struct wined3d_surface *surface, - struct wined3d_context *context) +BOOL texture2d_load_drawable(struct wined3d_texture *texture, + unsigned int sub_resource_idx, struct wined3d_context *context) { - unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); - struct wined3d_texture *texture = surface->container; struct wined3d_surface *restore_rt = NULL; + struct wined3d_surface *surface; struct wined3d_device *device; unsigned int level; RECT r; @@ -2127,11 +2126,12 @@ BOOL surface_load_drawable(struct wined3d_surface *surface, if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && wined3d_resource_is_offscreen(&texture->resource)) { - ERR("Trying to load offscreen surface into WINED3D_LOCATION_DRAWABLE.\n"); + ERR("Trying to load offscreen texture into WINED3D_LOCATION_DRAWABLE.\n"); return FALSE; } device = texture->resource.device; + surface = texture->sub_resources[sub_resource_idx].u.surface; restore_rt = context_get_rt_surface(context); if (restore_rt != surface) context = context_acquire(device, texture, sub_resource_idx); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0368550..9add4a3 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1806,7 +1806,7 @@ static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned in return texture2d_load_sysmem(texture, sub_resource_idx, context, location); case WINED3D_LOCATION_DRAWABLE: - return surface_load_drawable(surface, context); + return texture2d_load_drawable(texture, sub_resource_idx, context); case WINED3D_LOCATION_RB_RESOLVED: case WINED3D_LOCATION_RB_MULTISAMPLE: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d07c81d..44c0ab4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3233,6 +3233,8 @@ static inline unsigned int wined3d_texture_get_level_pow2_height(const struct wi return max(1, texture->pow2_height >> level); } +BOOL texture2d_load_drawable(struct wined3d_texture *texture, unsigned int sub_resource_idx, + struct wined3d_context *context) DECLSPEC_HIDDEN; BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD dst_location) DECLSPEC_HIDDEN; @@ -3339,8 +3341,6 @@ static inline struct wined3d_texture_sub_resource *surface_get_sub_resource(stru HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const struct wined3d_blt_fx *blt_fx, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; -BOOL surface_load_drawable(struct wined3d_surface *surface, - struct wined3d_context *context) DECLSPEC_HIDDEN; void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; BOOL surface_load_renderbuffer(struct wined3d_surface *surface, -- 2.1.4

1 0

[PATCH 3/5] wined3d: Pass a texture and sub-resource index to surface_load_sysmem().
by Henri Verbeet 06 Mar '18

06 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 16 +++++++--------- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 5 +++-- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 23d7ae7..24d1f59 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2060,12 +2060,10 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE } /* Context activation is done by the caller. */ -BOOL surface_load_sysmem(struct wined3d_surface *surface, +BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD dst_location) { - unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_texture *texture = surface->container; struct wined3d_texture_sub_resource *sub_resource; sub_resource = &texture->sub_resources[sub_resource_idx]; @@ -2075,7 +2073,7 @@ BOOL surface_load_sysmem(struct wined3d_surface *surface, if (is_multisample_location(texture, WINED3D_LOCATION_TEXTURE_RGB)) { wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_RB_RESOLVED); - read_from_framebuffer(surface, context, WINED3D_LOCATION_RB_RESOLVED, dst_location); + read_from_framebuffer(sub_resource->u.surface, context, WINED3D_LOCATION_RB_RESOLVED, dst_location); return TRUE; } else @@ -2083,12 +2081,12 @@ BOOL surface_load_sysmem(struct wined3d_surface *surface, if (sub_resource->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED)) wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); - /* Download the surface to system memory. */ + /* Download the sub-resource to system memory. */ if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) { wined3d_texture_bind_and_dirtify(texture, context, !(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB)); - surface_download_data(surface, gl_info, dst_location); + surface_download_data(sub_resource->u.surface, gl_info, dst_location); ++texture->download_count; return TRUE; @@ -2098,12 +2096,12 @@ BOOL surface_load_sysmem(struct wined3d_surface *surface, if (!(texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) && (sub_resource->locations & WINED3D_LOCATION_DRAWABLE)) { - read_from_framebuffer(surface, context, texture->resource.draw_binding, dst_location); + read_from_framebuffer(sub_resource->u.surface, context, texture->resource.draw_binding, dst_location); return TRUE; } - FIXME("Can't load surface %p with location flags %s into sysmem.\n", - surface, wined3d_debug_location(sub_resource->locations)); + FIXME("Can't load texture %p, %u with location flags %s into sysmem.\n", + texture, sub_resource_idx, wined3d_debug_location(sub_resource->locations)); return FALSE; } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 72aee66..0368550 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1803,7 +1803,7 @@ static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned in case WINED3D_LOCATION_USER_MEMORY: case WINED3D_LOCATION_SYSMEM: case WINED3D_LOCATION_BUFFER: - return surface_load_sysmem(surface, context, location); + return texture2d_load_sysmem(texture, sub_resource_idx, context, location); case WINED3D_LOCATION_DRAWABLE: return surface_load_drawable(surface, context); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 33bbd53..d07c81d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3233,6 +3233,9 @@ static inline unsigned int wined3d_texture_get_level_pow2_height(const struct wi return max(1, texture->pow2_height >> level); } +BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_resource_idx, + struct wined3d_context *context, DWORD dst_location) DECLSPEC_HIDDEN; + void wined3d_texture_apply_sampler_desc(struct wined3d_texture *texture, const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_texture_bind(struct wined3d_texture *texture, @@ -3342,8 +3345,6 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; BOOL surface_load_renderbuffer(struct wined3d_surface *surface, struct wined3d_context *context, DWORD dst_location) DECLSPEC_HIDDEN; -BOOL surface_load_sysmem(struct wined3d_surface *surface, - struct wined3d_context *context, DWORD dst_location) DECLSPEC_HIDDEN; BOOL surface_load_texture(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, -- 2.1.4

1 0

[PATCH 2/5] wined3d: Merge surface_load_location() into texture2d_load_location().
by Henri Verbeet 06 Mar '18

06 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 40 +++++----------------------------------- dlls/wined3d/texture.c | 31 ++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 10 ++++++++-- 3 files changed, 43 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5a2bf52..23d7ae7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2060,7 +2060,7 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE } /* Context activation is done by the caller. */ -static BOOL surface_load_sysmem(struct wined3d_surface *surface, +BOOL surface_load_sysmem(struct wined3d_surface *surface, struct wined3d_context *context, DWORD dst_location) { unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); @@ -2108,7 +2108,7 @@ static BOOL surface_load_sysmem(struct wined3d_surface *surface, } /* Context activation is done by the caller. */ -static BOOL surface_load_drawable(struct wined3d_surface *surface, +BOOL surface_load_drawable(struct wined3d_surface *surface, struct wined3d_context *context) { unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); @@ -2155,7 +2155,7 @@ static BOOL surface_load_drawable(struct wined3d_surface *surface, return TRUE; } -static BOOL surface_load_texture(struct wined3d_surface *surface, +BOOL surface_load_texture(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) { unsigned int width, height, level, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch; @@ -2326,8 +2326,8 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, } /* Context activation is done by the caller. */ -static BOOL surface_load_renderbuffer(struct wined3d_surface *surface, struct wined3d_context *context, - DWORD dst_location) +BOOL surface_load_renderbuffer(struct wined3d_surface *surface, + struct wined3d_context *context, DWORD dst_location) { struct wined3d_texture *texture = surface->container; unsigned int level = surface_get_sub_resource_idx(surface) % texture->level_count; @@ -2359,36 +2359,6 @@ static BOOL surface_load_renderbuffer(struct wined3d_surface *surface, struct wi return TRUE; } -/* Context activation is done by the caller. Context may be NULL in ddraw-only mode. */ -BOOL surface_load_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) -{ - TRACE("surface %p, location %s.\n", surface, wined3d_debug_location(location)); - - switch (location) - { - case WINED3D_LOCATION_USER_MEMORY: - case WINED3D_LOCATION_SYSMEM: - case WINED3D_LOCATION_BUFFER: - return surface_load_sysmem(surface, context, location); - - case WINED3D_LOCATION_DRAWABLE: - return surface_load_drawable(surface, context); - - case WINED3D_LOCATION_RB_RESOLVED: - case WINED3D_LOCATION_RB_MULTISAMPLE: - return surface_load_renderbuffer(surface, context, location); - - case WINED3D_LOCATION_TEXTURE_RGB: - case WINED3D_LOCATION_TEXTURE_SRGB: - return surface_load_texture(surface, context, - location == WINED3D_LOCATION_TEXTURE_SRGB); - - default: - ERR("Don't know how to handle location %#x.\n", location); - return FALSE; - } -} - /* Context activation is done by the caller. */ static void fbo_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_context *context) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 8c03331..72aee66 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1788,10 +1788,39 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int texture->resource.format, &src_rect, row_pitch, &dst_point, FALSE, data); } +/* Context activation is done by the caller. Context may be NULL in ddraw-only mode. */ static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) { - return surface_load_location(texture->sub_resources[sub_resource_idx].u.surface, context, location); + struct wined3d_surface *surface; + + TRACE("texture %p, sub_resource_idx %u, context %p, location %s.\n", + texture, sub_resource_idx, context, wined3d_debug_location(location)); + + surface = texture->sub_resources[sub_resource_idx].u.surface; + switch (location) + { + case WINED3D_LOCATION_USER_MEMORY: + case WINED3D_LOCATION_SYSMEM: + case WINED3D_LOCATION_BUFFER: + return surface_load_sysmem(surface, context, location); + + case WINED3D_LOCATION_DRAWABLE: + return surface_load_drawable(surface, context); + + case WINED3D_LOCATION_RB_RESOLVED: + case WINED3D_LOCATION_RB_MULTISAMPLE: + return surface_load_renderbuffer(surface, context, location); + + case WINED3D_LOCATION_TEXTURE_RGB: + case WINED3D_LOCATION_TEXTURE_SRGB: + return surface_load_texture(surface, context, + location == WINED3D_LOCATION_TEXTURE_SRGB); + + default: + ERR("Don't know how to handle location %#x.\n", location); + return FALSE; + } } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d92193d..33bbd53 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3336,10 +3336,16 @@ static inline struct wined3d_texture_sub_resource *surface_get_sub_resource(stru HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const struct wined3d_blt_fx *blt_fx, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; +BOOL surface_load_drawable(struct wined3d_surface *surface, + struct wined3d_context *context) DECLSPEC_HIDDEN; void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; -BOOL surface_load_location(struct wined3d_surface *surface, - struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; +BOOL surface_load_renderbuffer(struct wined3d_surface *surface, + struct wined3d_context *context, DWORD dst_location) DECLSPEC_HIDDEN; +BOOL surface_load_sysmem(struct wined3d_surface *surface, + struct wined3d_context *context, DWORD dst_location) DECLSPEC_HIDDEN; +BOOL surface_load_texture(struct wined3d_surface *surface, + struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, unsigned int src_pitch, const POINT *dst_point, BOOL srgb, -- 2.1.4

1 0

[PATCH 1/5] wined3d: Store the EXT_fbo "renderbuffers" list in the texture instead of the surface.
by Henri Verbeet 06 Mar '18

06 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 23 +++---- dlls/wined3d/surface.c | 84 ------------------------ dlls/wined3d/texture.c | 146 +++++++++++++++++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 10 +-- 4 files changed, 125 insertions(+), 138 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c9efad0..60bf52b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -445,19 +445,15 @@ static inline void context_set_fbo_key_for_render_target(const struct wined3d_co } texture = wined3d_texture_from_resource(resource); - if (resource->type == WINED3D_RTYPE_TEXTURE_2D) + if (texture->current_renderbuffer) { - struct wined3d_surface *surface = texture->sub_resources[sub_resource_idx].u.surface; - - if (surface->current_renderbuffer) - { - key->objects[idx].object = surface->current_renderbuffer->id; - key->objects[idx].target = 0; - key->objects[idx].level = key->objects[idx].layer = 0; - key->rb_namespace |= 1 << idx; - return; - } + key->objects[idx].object = texture->current_renderbuffer->id; + key->objects[idx].target = 0; + key->objects[idx].level = key->objects[idx].layer = 0; + key->rb_namespace |= 1 << idx; + return; } + key->objects[idx].target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); key->objects[idx].level = sub_resource_idx % texture->level_count; key->objects[idx].layer = sub_resource_idx / texture->level_count; @@ -604,10 +600,7 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, } else if (depth_stencil->resource->type == WINED3D_RTYPE_TEXTURE_2D) { - struct wined3d_surface *surface; - - surface = ds_texture->sub_resources[depth_stencil->sub_resource_idx].u.surface; - surface_set_compatible_renderbuffer(surface, &render_targets[0]); + wined3d_texture_set_compatible_renderbuffer(ds_texture, ds_level, &render_targets[0]); } } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8d6712b..5a2bf52 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -975,90 +975,6 @@ static HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, return WINED3D_OK; } -/* In D3D the depth stencil dimensions have to be greater than or equal to the - * render target dimensions. With FBOs, the dimensions have to be an exact match. */ -/* TODO: We should synchronize the renderbuffer's content with the texture's content. */ -/* Context activation is done by the caller. */ -void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const struct wined3d_rendertarget_info *rt) -{ - unsigned int sub_resource_idx, width, height, level; - struct wined3d_renderbuffer_entry *entry; - const struct wined3d_texture *texture; - const struct wined3d_gl_info *gl_info; - unsigned int src_width, src_height; - GLuint renderbuffer = 0; - - texture = surface->container; - gl_info = &texture->resource.device->adapter->gl_info; - sub_resource_idx = surface_get_sub_resource_idx(surface); - level = sub_resource_idx % texture->level_count; - - if (rt && rt->resource->format->id != WINED3DFMT_NULL) - { - struct wined3d_texture *rt_texture; - unsigned int rt_level; - - if (rt->resource->type == WINED3D_RTYPE_BUFFER) - { - FIXME("Unsupported resource type %s.\n", debug_d3dresourcetype(rt->resource->type)); - return; - } - rt_texture = wined3d_texture_from_resource(rt->resource); - rt_level = rt->sub_resource_idx % rt_texture->level_count; - - width = wined3d_texture_get_level_pow2_width(rt_texture, rt_level); - height = wined3d_texture_get_level_pow2_height(rt_texture, rt_level); - } - else - { - width = wined3d_texture_get_level_pow2_width(texture, level); - height = wined3d_texture_get_level_pow2_height(texture, level); - } - - src_width = wined3d_texture_get_level_pow2_width(texture, level); - src_height = wined3d_texture_get_level_pow2_height(texture, level); - - /* A depth stencil smaller than the render target is not valid */ - if (width > src_width || height > src_height) return; - - /* Remove any renderbuffer set if the sizes match */ - if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] - || (width == src_width && height == src_height)) - { - surface->current_renderbuffer = NULL; - return; - } - - /* Look if we've already got a renderbuffer of the correct dimensions */ - LIST_FOR_EACH_ENTRY(entry, &surface->renderbuffers, struct wined3d_renderbuffer_entry, entry) - { - if (entry->width == width && entry->height == height) - { - renderbuffer = entry->id; - surface->current_renderbuffer = entry; - break; - } - } - - if (!renderbuffer) - { - gl_info->fbo_ops.glGenRenderbuffers(1, &renderbuffer); - gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, renderbuffer); - gl_info->fbo_ops.glRenderbufferStorage(GL_RENDERBUFFER, - texture->resource.format->glInternal, width, height); - - entry = heap_alloc(sizeof(*entry)); - entry->width = width; - entry->height = height; - entry->id = renderbuffer; - list_add_head(&surface->renderbuffers, &entry->entry); - - surface->current_renderbuffer = entry; - } - - checkGLcall("set_compatible_renderbuffer"); -} - /* See also float_16_to_32() in wined3d_private.h */ static inline unsigned short float_32_to_16(const float *in) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0c0e434..8c03331 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -418,6 +418,8 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->flags |= WINED3D_TEXTURE_GENERATE_MIPMAPS; } + list_init(&texture->renderbuffers); + return WINED3D_OK; } @@ -654,8 +656,9 @@ static void wined3d_texture_cleanup(struct wined3d_texture *texture) { unsigned int sub_count = texture->level_count * texture->layer_count; struct wined3d_device *device = texture->resource.device; + struct wined3d_renderbuffer_entry *entry, *entry2; + const struct wined3d_gl_info *gl_info = NULL; struct wined3d_context *context = NULL; - const struct wined3d_gl_info *gl_info; GLuint buffer_object; unsigned int i; @@ -678,6 +681,21 @@ static void wined3d_texture_cleanup(struct wined3d_texture *texture) GL_EXTCALL(glDeleteBuffers(1, &buffer_object)); } + + if (!context && !list_empty(&texture->renderbuffers)) + { + context = context_acquire(device, NULL, 0); + gl_info = context->gl_info; + } + + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &texture->renderbuffers, struct wined3d_renderbuffer_entry, entry) + { + TRACE("Deleting renderbuffer %u.\n", entry->id); + context_gl_resource_released(device, entry->id, TRUE); + gl_info->fbo_ops.glDeleteRenderbuffers(1, &entry->id); + heap_free(entry); + } + if (context) context_release(context); @@ -1233,6 +1251,89 @@ HRESULT CDECL wined3d_texture_set_color_key(struct wined3d_texture *texture, return WINED3D_OK; } +/* In D3D the depth stencil dimensions have to be greater than or equal to the + * render target dimensions. With FBOs, the dimensions have to be an exact match. */ +/* TODO: We should synchronize the renderbuffer's content with the texture's content. */ +/* Context activation is done by the caller. */ +void wined3d_texture_set_compatible_renderbuffer(struct wined3d_texture *texture, + unsigned int level, const struct wined3d_rendertarget_info *rt) +{ + struct wined3d_renderbuffer_entry *entry; + const struct wined3d_gl_info *gl_info; + unsigned int src_width, src_height; + unsigned int width, height; + GLuint renderbuffer = 0; + + gl_info = &texture->resource.device->adapter->gl_info; + if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT]) + return; + + if (rt && rt->resource->format->id != WINED3DFMT_NULL) + { + struct wined3d_texture *rt_texture; + unsigned int rt_level; + + if (rt->resource->type == WINED3D_RTYPE_BUFFER) + { + FIXME("Unsupported resource type %s.\n", debug_d3dresourcetype(rt->resource->type)); + return; + } + rt_texture = wined3d_texture_from_resource(rt->resource); + rt_level = rt->sub_resource_idx % rt_texture->level_count; + + width = wined3d_texture_get_level_pow2_width(rt_texture, rt_level); + height = wined3d_texture_get_level_pow2_height(rt_texture, rt_level); + } + else + { + width = wined3d_texture_get_level_pow2_width(texture, level); + height = wined3d_texture_get_level_pow2_height(texture, level); + } + + src_width = wined3d_texture_get_level_pow2_width(texture, level); + src_height = wined3d_texture_get_level_pow2_height(texture, level); + + /* A depth stencil smaller than the render target is not valid */ + if (width > src_width || height > src_height) + return; + + /* Remove any renderbuffer set if the sizes match */ + if (width == src_width && height == src_height) + { + texture->current_renderbuffer = NULL; + return; + } + + /* Look if we've already got a renderbuffer of the correct dimensions */ + LIST_FOR_EACH_ENTRY(entry, &texture->renderbuffers, struct wined3d_renderbuffer_entry, entry) + { + if (entry->width == width && entry->height == height) + { + renderbuffer = entry->id; + texture->current_renderbuffer = entry; + break; + } + } + + if (!renderbuffer) + { + gl_info->fbo_ops.glGenRenderbuffers(1, &renderbuffer); + gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, renderbuffer); + gl_info->fbo_ops.glRenderbufferStorage(GL_RENDERBUFFER, + texture->resource.format->glInternal, width, height); + + entry = heap_alloc(sizeof(*entry)); + entry->width = width; + entry->height = height; + entry->id = renderbuffer; + list_add_head(&texture->renderbuffers, &entry->entry); + + texture->current_renderbuffer = entry; + } + + checkGLcall("set_compatible_renderbuffer"); +} + static void texture2d_create_dc(void *object) { struct wined3d_surface *surface = object; @@ -1738,10 +1839,7 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi static void texture2d_cleanup_sub_resources(struct wined3d_texture *texture) { unsigned int sub_count = texture->level_count * texture->layer_count; - struct wined3d_device *device = texture->resource.device; struct wined3d_texture_sub_resource *sub_resource; - struct wined3d_renderbuffer_entry *entry, *entry2; - const struct wined3d_gl_info *gl_info = NULL; struct wined3d_context *context = NULL; struct wined3d_surface *surface; unsigned int i; @@ -1754,20 +1852,6 @@ static void texture2d_cleanup_sub_resources(struct wined3d_texture *texture) TRACE("surface %p.\n", surface); - if (!context && !list_empty(&surface->renderbuffers)) - { - context = context_acquire(device, NULL, 0); - gl_info = context->gl_info; - } - - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &surface->renderbuffers, struct wined3d_renderbuffer_entry, entry) - { - TRACE("Deleting renderbuffer %u.\n", entry->id); - context_gl_resource_released(device, entry->id, TRUE); - gl_info->fbo_ops.glDeleteRenderbuffers(1, &entry->id); - heap_free(entry); - } - if (surface->dc) texture2d_destroy_dc(surface); } @@ -1813,6 +1897,7 @@ static void wined3d_texture_unload(struct wined3d_resource *resource) { struct wined3d_texture *texture = texture_from_resource(resource); UINT sub_count = texture->level_count * texture->layer_count; + struct wined3d_renderbuffer_entry *entry, *entry2; struct wined3d_device *device = resource->device; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; @@ -1847,23 +1932,17 @@ static void wined3d_texture_unload(struct wined3d_resource *resource) if (sub_resource->buffer_object) wined3d_texture_remove_buffer_object(texture, i, context->gl_info); + } - if (resource->type == WINED3D_RTYPE_TEXTURE_2D) - { - struct wined3d_surface *surface = sub_resource->u.surface; - struct wined3d_renderbuffer_entry *entry, *entry2; - - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &surface->renderbuffers, struct wined3d_renderbuffer_entry, entry) - { - context_gl_resource_released(device, entry->id, TRUE); - gl_info->fbo_ops.glDeleteRenderbuffers(1, &entry->id); - list_remove(&entry->entry); - heap_free(entry); - } - list_init(&surface->renderbuffers); - surface->current_renderbuffer = NULL; - } + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &texture->renderbuffers, struct wined3d_renderbuffer_entry, entry) + { + context_gl_resource_released(device, entry->id, TRUE); + gl_info->fbo_ops.glDeleteRenderbuffers(1, &entry->id); + list_remove(&entry->entry); + heap_free(entry); } + list_init(&texture->renderbuffers); + texture->current_renderbuffer = NULL; context_release(context); @@ -2247,7 +2326,6 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 surface->container = texture; surface->texture_level = i; surface->texture_layer = j; - list_init(&surface->renderbuffers); sub_resource = &texture->sub_resources[idx]; sub_resource->locations = WINED3D_LOCATION_DISCARDED; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a78055a..d92193d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3154,6 +3154,9 @@ struct wined3d_texture RECT dst_rect; } *overlay_info; + struct list renderbuffers; + const struct wined3d_renderbuffer_entry *current_renderbuffer; + struct wined3d_texture_sub_resource { void *parent; @@ -3251,6 +3254,8 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; +void wined3d_texture_set_compatible_renderbuffer(struct wined3d_texture *texture, + unsigned int level, const struct wined3d_rendertarget_info *rt) DECLSPEC_HIDDEN; void wined3d_texture_set_map_binding(struct wined3d_texture *texture, DWORD map_binding) DECLSPEC_HIDDEN; void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; @@ -3316,9 +3321,6 @@ struct wined3d_surface /* For GetDC */ HBITMAP bitmap; HDC dc; - - struct list renderbuffers; - const struct wined3d_renderbuffer_entry *current_renderbuffer; }; static inline unsigned int surface_get_sub_resource_idx(const struct wined3d_surface *surface) @@ -3338,8 +3340,6 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; BOOL surface_load_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; -void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, - const struct wined3d_rendertarget_info *rt) DECLSPEC_HIDDEN; void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, unsigned int src_pitch, const POINT *dst_point, BOOL srgb, -- 2.1.4

1 0

[PATCH 5/5] taskschd/tests: Add more tests for actions.
by Dmitry Timoshkov 06 Mar '18

06 Mar '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/taskschd/tests/scheduler.c | 55 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index c60fd1d9d7..80bc1c9034 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1304,6 +1304,8 @@ static void test_daily_trigger(ITrigger *trigger) static void create_action(ITaskDefinition *taskdef) { static WCHAR task1_exe[] = { 't','a','s','k','1','.','e','x','e',0 }; + static WCHAR workdir[] = { 'w','o','r','k','d','i','r',0 }; + static WCHAR args[] = { 'a','r','g','u','m','e','n','s',0 }; HRESULT hr; IActionCollection *actions; IAction *action; @@ -1311,6 +1313,9 @@ static void create_action(ITaskDefinition *taskdef) TASK_ACTION_TYPE type; BSTR path; + hr = ITaskDefinition_get_Actions(taskdef, NULL); + ok(hr == E_POINTER, "got %#x\n", hr); + hr = ITaskDefinition_get_Actions(taskdef, &actions); ok(hr == S_OK, "get_Actions error %#x\n", hr); @@ -1325,11 +1330,17 @@ static void create_action(ITaskDefinition *taskdef) ok(hr == S_OK, "get_Type error %#x\n", hr); ok(type == TASK_ACTION_EXEC, "got %u\n", type ); + hr = IExecAction_get_Path(exec_action, NULL); + ok(hr == E_POINTER, "got %#x\n", hr); + path = (BSTR)0xdeadbeef; hr = IExecAction_get_Path(exec_action, &path); ok(hr == S_OK, "get_Path error %#x\n", hr); ok(path == NULL, "path not set\n"); + hr = IExecAction_put_Path(exec_action, NULL); + ok(hr == S_OK, "put_Path error %#x\n", hr); + hr = IExecAction_put_Path(exec_action, task1_exe); ok(hr == S_OK, "put_Path error %#x\n", hr); @@ -1337,7 +1348,49 @@ static void create_action(ITaskDefinition *taskdef) hr = IExecAction_get_Path(exec_action, &path); ok(hr == S_OK, "get_Path error %#x\n", hr); ok(path != NULL, "path not set\n"); - ok(!lstrcmpW(path, task1_exe), "wrong path\n" ); + ok(!lstrcmpW(path, task1_exe), "got %s\n", wine_dbgstr_w(path)); + SysFreeString(path); + + hr = IExecAction_get_WorkingDirectory(exec_action, NULL); + ok(hr == E_POINTER, "got %#x\n", hr); + + path = (BSTR)0xdeadbeef; + hr = IExecAction_get_WorkingDirectory(exec_action, &path); + ok(hr == S_OK, "get_WorkingDirectory error %#x\n", hr); + ok(path == NULL, "workdir not set\n"); + + hr = IExecAction_put_WorkingDirectory(exec_action, NULL); + ok(hr == S_OK, "put_WorkingDirectory error %#x\n", hr); + + hr = IExecAction_put_WorkingDirectory(exec_action, workdir); + ok(hr == S_OK, "put_WorkingDirectory error %#x\n", hr); + + path = NULL; + hr = IExecAction_get_WorkingDirectory(exec_action, &path); + ok(hr == S_OK, "get_WorkingDirectory error %#x\n", hr); + ok(path != NULL, "workdir not set\n"); + ok(!lstrcmpW(path, workdir), "got %s\n", wine_dbgstr_w(path)); + SysFreeString(path); + + hr = IExecAction_get_Arguments(exec_action, NULL); + ok(hr == E_POINTER, "got %#x\n", hr); + + path = (BSTR)0xdeadbeef; + hr = IExecAction_get_Arguments(exec_action, &path); + ok(hr == S_OK, "get_Arguments error %#x\n", hr); + ok(path == NULL, "args not set\n"); + + hr = IExecAction_put_Arguments(exec_action, NULL); + ok(hr == S_OK, "put_Arguments error %#x\n", hr); + + hr = IExecAction_put_Arguments(exec_action, args); + ok(hr == S_OK, "put_WorkingDirectory error %#x\n", hr); + + path = NULL; + hr = IExecAction_get_Arguments(exec_action, &path); + ok(hr == S_OK, "get_Arguments error %#x\n", hr); + ok(path != NULL, "args not set\n"); + ok(!lstrcmpW(path, args), "got %s\n", wine_dbgstr_w(path)); SysFreeString(path); IExecAction_Release(exec_action); -- 2.16.2

1 0

[PATCH 4/5] taskschd: Implement IExecAction::get_Arguments.
by Dmitry Timoshkov 06 Mar '18

06 Mar '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/taskschd/task.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index a4cc3be898..1b6a7015ee 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1810,8 +1810,16 @@ static HRESULT WINAPI ExecAction_put_Path(IExecAction *iface, BSTR path) static HRESULT WINAPI ExecAction_get_Arguments(IExecAction *iface, BSTR *arguments) { - FIXME("%p,%p: stub\n", iface, arguments); - return E_NOTIMPL; + ExecAction *action = impl_from_IExecAction(iface); + + TRACE("%p,%p\n", iface, arguments); + + if (!arguments) return E_POINTER; + + if (!action->args) *arguments = NULL; + else if (!(*arguments = SysAllocString(action->args))) return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI ExecAction_put_Arguments(IExecAction *iface, BSTR arguments) -- 2.16.2

1 0

[PATCH 3/5] taskschd: Implement IExecAction::put_Arguments.
by Dmitry Timoshkov 06 Mar '18

06 Mar '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/taskschd/task.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 2b0283e9fe..a4cc3be898 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1678,6 +1678,7 @@ typedef struct LONG ref; WCHAR *path; WCHAR *directory; + WCHAR *args; } ExecAction; static inline ExecAction *impl_from_IExecAction(IExecAction *iface) @@ -1701,6 +1702,7 @@ static ULONG WINAPI ExecAction_Release(IExecAction *iface) TRACE("destroying %p\n", iface); heap_free(action->path); heap_free(action->directory); + heap_free(action->args); heap_free(action); } @@ -1814,7 +1816,15 @@ static HRESULT WINAPI ExecAction_get_Arguments(IExecAction *iface, BSTR *argumen static HRESULT WINAPI ExecAction_put_Arguments(IExecAction *iface, BSTR arguments) { - FIXME("%p,%s: stub\n", iface, debugstr_w(arguments)); + ExecAction *action = impl_from_IExecAction(iface); + WCHAR *str = NULL; + + TRACE("%p,%s\n", iface, debugstr_w(arguments)); + + if (arguments && !(str = heap_strdupW((arguments)))) return E_OUTOFMEMORY; + heap_free(action->args); + action->args = str; + return S_OK; } @@ -1877,6 +1887,7 @@ static HRESULT ExecAction_create(IExecAction **obj) action->ref = 1; action->path = NULL; action->directory = NULL; + action->args = NULL; *obj = &action->IExecAction_iface; -- 2.16.2

1 0

[PATCH 2/5] taskschd: Implement IExecAction::get_WorkingDirectory.
by Dmitry Timoshkov 06 Mar '18

06 Mar '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/taskschd/task.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index f7ea0131f7..2b0283e9fe 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1820,8 +1820,16 @@ static HRESULT WINAPI ExecAction_put_Arguments(IExecAction *iface, BSTR argument static HRESULT WINAPI ExecAction_get_WorkingDirectory(IExecAction *iface, BSTR *directory) { - FIXME("%p,%p: stub\n", iface, directory); - return E_NOTIMPL; + ExecAction *action = impl_from_IExecAction(iface); + + TRACE("%p,%p\n", iface, directory); + + if (!directory) return E_POINTER; + + if (!action->directory) *directory = NULL; + else if (!(*directory = SysAllocString(action->directory))) return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI ExecAction_put_WorkingDirectory(IExecAction *iface, BSTR directory) -- 2.16.2

1 0

[PATCH 1/5] taskschd: Implement IExecAction::put_WorkingDirectory.
by Dmitry Timoshkov 06 Mar '18

06 Mar '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/taskschd/task.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index a8b819c360..f7ea0131f7 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1677,6 +1677,7 @@ typedef struct IExecAction IExecAction_iface; LONG ref; WCHAR *path; + WCHAR *directory; } ExecAction; static inline ExecAction *impl_from_IExecAction(IExecAction *iface) @@ -1699,6 +1700,7 @@ static ULONG WINAPI ExecAction_Release(IExecAction *iface) { TRACE("destroying %p\n", iface); heap_free(action->path); + heap_free(action->directory); heap_free(action); } @@ -1824,8 +1826,16 @@ static HRESULT WINAPI ExecAction_get_WorkingDirectory(IExecAction *iface, BSTR * static HRESULT WINAPI ExecAction_put_WorkingDirectory(IExecAction *iface, BSTR directory) { - FIXME("%p,%s: stub\n", iface, debugstr_w(directory)); - return E_NOTIMPL; + ExecAction *action = impl_from_IExecAction(iface); + WCHAR *str = NULL; + + TRACE("%p,%s\n", iface, debugstr_w(directory)); + + if (directory && !(str = heap_strdupW((directory)))) return E_OUTOFMEMORY; + heap_free(action->directory); + action->directory = str; + + return S_OK; } static const IExecActionVtbl Action_vtbl = @@ -1858,6 +1868,7 @@ static HRESULT ExecAction_create(IExecAction **obj) action->IExecAction_iface.lpVtbl = &Action_vtbl; action->ref = 1; action->path = NULL; + action->directory = NULL; *obj = &action->IExecAction_iface; -- 2.16.2

1 0

[PATCH] ntdll: Implement NtCreateThreadEx.
by Alistair Leslie-Hughes 06 Mar '18

06 Mar '18

From: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/thread.c | 17 +++++++++++++++++ include/winternl.h | 7 +++++++ 3 files changed, 25 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 6e996a5..b63e335 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -152,6 +152,7 @@ @ stdcall NtCreateSemaphore(ptr long ptr long long) @ stdcall NtCreateSymbolicLinkObject(ptr long ptr ptr) @ stub NtCreateThread +@ stdcall NtCreateThreadEx(ptr long ptr long ptr ptr long long long long ptr) @ stdcall NtCreateTimer(ptr long ptr long) @ stub NtCreateToken # @ stub NtCreateWaitablePort diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 9ec94d6..35e23d2 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -525,6 +525,23 @@ static void start_thread( struct startup_info *info ) /*********************************************************************** + * NtCreateThreadEx (NTDLL.@) + */ +NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle_ptr, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, + HANDLE process, LPTHREAD_START_ROUTINE start, void *param, + ULONG flags, ULONG zero_bits, ULONG stack_commit, + ULONG stack_reserve, void *attribute_list ) +{ + FIXME( "%p, %x, %p, %p, %p, %p, %x, %x, %x, %x, %p semi-stub!\n", handle_ptr, access, attr, + process, start, param, flags, zero_bits, stack_commit, stack_reserve, attribute_list ); + + return RtlCreateUserThread( process, NULL, flags & THREAD_CREATE_FLAGS_CREATE_SUSPENDED, + NULL, stack_reserve, stack_commit, (PRTL_THREAD_START_ROUTINE)start, + param, handle_ptr, NULL ); +} + + +/*********************************************************************** * RtlCreateUserThread (NTDLL.@) */ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR *descr, diff --git a/include/winternl.h b/include/winternl.h index 6733977..98bf201 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2200,6 +2200,13 @@ typedef struct _SYSTEM_MODULE_INFORMATION SYSTEM_MODULE Modules[1]; /* FIXME: should be Modules[0] */ } SYSTEM_MODULE_INFORMATION, *PSYSTEM_MODULE_INFORMATION; +#define THREAD_CREATE_FLAGS_CREATE_SUSPENDED 0x00000001 +#define THREAD_CREATE_FLAGS_SKIP_THREAD_ATTACH 0x00000002 +#define THREAD_CREATE_FLAGS_HIDE_FROM_DEBUGGER 0x00000004 +#define THREAD_CREATE_FLAGS_HAS_SECURITY_DESCRIPTOR 0x00000010 +#define THREAD_CREATE_FLAGS_ACCESS_CHECK_IN_TARGET 0x00000020 +#define THREAD_CREATE_FLAGS_INITIAL_THREAD 0x00000080 + /*********************************************************************** * Function declarations */ -- 1.9.1

1 0

[PATCH] dmstyle/tests: Avoid a clang warning
by Michael Stefaniuc 06 Mar '18

06 Mar '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Alexandre missed this one ;) dlls/dmstyle/tests/dmstyle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index a9a89a7a77..ed12315a19 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -356,13 +356,13 @@ struct chunk { followed by the chunks of the list and terminated with 0. */ static IStream *gen_riff_stream(const FOURCC *ids) { + static const LARGE_INTEGER zero; int level = -1; DWORD *sizes[4]; /* Stack for the sizes of RIFF and LIST chunks */ char riff[1024]; char *p = riff; struct chunk *ck; IStream *stream; - LARGE_INTEGER zero = {0}; do { ck = (struct chunk *)p; -- 2.14.3

1 0

[PATCH] dmloader/tests: Add IDirectMusicObject::ParseDescriptor() tests
by Michael Stefaniuc 06 Mar '18

06 Mar '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmloader/tests/loader.c | 204 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 204 insertions(+) diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index ff084b6e4b..46e46d4baf 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -19,11 +19,14 @@ #define COBJMACROS #include "initguid.h" +#include <ole2.h> #include "dmusici.h" +#include <dmusicf.h> #include "wine/test.h" #define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static unsigned char mp3file[] = "\xFF\xFB\x92\x04"; /* MP3 header */ static unsigned char rifffile[8+4+8+16+8+256] = "RIFF\x24\x01\x00\x00WAVE" /* header: 4 ("WAVE") + (8 + 16) (format segment) + (8 + 256) (data segment) = 0x124 */ "fmt \x10\x00\x00\x00\x01\x00\x20\x00\xAC\x44\x00\x00\x10\xB1\x02\x00\x04\x00\x10\x00" /* format segment: PCM, 2 chan, 44100 Hz, 16 bits */ @@ -391,6 +394,205 @@ static void test_container(void) while (IDirectMusicContainer_Release(dmc)); } +struct chunk { + FOURCC id; + DWORD size; + FOURCC type; +}; + +#define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) + +/* Generate a RIFF file format stream from an array of FOURCC ids. + RIFF and LIST need to be followed by the form type respectively list type, + followed by the chunks of the list and terminated with 0. */ +static IStream *gen_riff_stream(const FOURCC *ids) +{ + static const LARGE_INTEGER zero; + int level = -1; + DWORD *sizes[4]; /* Stack for the sizes of RIFF and LIST chunks */ + char riff[1024]; + char *p = riff; + struct chunk *ck; + IStream *stream; + + do { + ck = (struct chunk *)p; + ck->id = *ids++; + switch (ck->id) { + case 0: + *sizes[level] = p - (char *)sizes[level] - sizeof(DWORD); + level--; + break; + case FOURCC_LIST: + case FOURCC_RIFF: + level++; + sizes[level] = &ck->size; + ck->type = *ids++; + p += sizeof(*ck); + break; + case DMUS_FOURCC_GUID_CHUNK: + ck->size = sizeof(GUID_NULL); + p += CHUNK_HDR_SIZE; + memcpy(p, &GUID_NULL, sizeof(GUID_NULL)); + p += ck->size; + break; + case DMUS_FOURCC_VERSION_CHUNK: + { + DMUS_VERSION ver = {5, 8}; + + ck->size = sizeof(ver); + p += CHUNK_HDR_SIZE; + memcpy(p, &ver, sizeof(ver)); + p += ck->size; + break; + } + default: + { + /* Just convert the FOURCC id to a WCHAR string */ + WCHAR *s; + + ck->size = 5 * sizeof(WCHAR); + p += CHUNK_HDR_SIZE; + s = (WCHAR *)p; + s[0] = (char)(ck->id); + s[1] = (char)(ck->id >> 8); + s[2] = (char)(ck->id >> 16); + s[3] = (char)(ck->id >> 24); + s[4] = 0; + p += ck->size; + } + } + } while (level >= 0); + + ck = (struct chunk *)riff; + CreateStreamOnHGlobal(NULL, TRUE, &stream); + IStream_Write(stream, riff, ck->size + CHUNK_HDR_SIZE, NULL); + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + + return stream; +} + +static void test_parsedescriptor(void) +{ + IDirectMusicObject *dmo; + IStream *stream; + DMUS_OBJECTDESC desc; + HRESULT hr; + DWORD valid; + const WCHAR s_unam[] = {'U','N','A','M','\0'}; + const FOURCC alldesc[] = + { + FOURCC_RIFF, DMUS_FOURCC_CONTAINER_FORM, DMUS_FOURCC_CATEGORY_CHUNK, FOURCC_LIST, + DMUS_FOURCC_UNFO_LIST, DMUS_FOURCC_UNAM_CHUNK, DMUS_FOURCC_UCOP_CHUNK, + DMUS_FOURCC_UCMT_CHUNK, DMUS_FOURCC_USBJ_CHUNK, 0, DMUS_FOURCC_VERSION_CHUNK, + DMUS_FOURCC_GUID_CHUNK, 0 + }; + const FOURCC dupes[] = + { + FOURCC_RIFF, DMUS_FOURCC_CONTAINER_FORM, DMUS_FOURCC_CATEGORY_CHUNK, + DMUS_FOURCC_CATEGORY_CHUNK, DMUS_FOURCC_VERSION_CHUNK, DMUS_FOURCC_VERSION_CHUNK, + DMUS_FOURCC_GUID_CHUNK, DMUS_FOURCC_GUID_CHUNK, FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, + DMUS_FOURCC_UNAM_CHUNK, 0, FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, mmioFOURCC('I','N','A','M'), + 0, 0 + }; + FOURCC empty[] = {FOURCC_RIFF, DMUS_FOURCC_CONTAINER_FORM, 0}; + FOURCC inam[] = + { + FOURCC_RIFF, DMUS_FOURCC_CONTAINER_FORM, FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, + mmioFOURCC('I','N','A','M'), 0, 0 + }; + + hr = CoCreateInstance(&CLSID_DirectMusicContainer, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void **)&dmo); + ok(hr == S_OK, "DirectMusicContainer create failed: %08x, expected S_OK\n", hr); + + /* Nothing loaded */ + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_GetDescriptor(dmo, &desc); + ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS /* XP */ || + broken(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS)), /* Vista and above */ + "Got valid data %#x, expected DMUS_OBJ_OBJECT\n", desc.dwValidData); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicContainer), + "Got class guid %s, expected CLSID_DirectMusicContainer\n", + wine_dbgstr_guid(&desc.guidClass)); + + /* Empty RIFF stream */ + stream = gen_riff_stream(empty); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == E_INVALIDARG, "ParseDescriptor failed: %08x, expected E_INVALIDARG\n", hr); + desc.dwSize = sizeof(desc); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + desc.dwValidData); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicContainer), + "Got class guid %s, expected CLSID_DirectMusicContainer\n", + wine_dbgstr_guid(&desc.guidClass)); + IStream_Release(stream); + + /* Wrong form */ + empty[1] = DMUS_FOURCC_SEGMENT_FORM; + stream = gen_riff_stream(empty); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + todo_wine ok(hr == DMUS_E_DESCEND_CHUNK_FAIL, + "ParseDescriptor failed: %08x, expected DMUS_E_DESCEND_CHUNK_FAIL\n", hr); + + /* All desc chunks */ + stream = gen_riff_stream(alldesc); + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION; + ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicContainer), + "Got class guid %s, expected CLSID_DirectMusicContainer\n", + wine_dbgstr_guid(&desc.guidClass)); + ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n", + wine_dbgstr_guid(&desc.guidClass)); + ok(!memcmp(desc.wszName, s_unam, sizeof(s_unam)), "Got name '%s', expected 'UNAM'\n", + wine_dbgstr_w(desc.wszName)); + IStream_Release(stream); + + /* UNFO list with INAM */ + inam[3] = DMUS_FOURCC_UNFO_LIST; + stream = gen_riff_stream(inam); + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + todo_wine ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + desc.dwValidData); + IStream_Release(stream); + + /* INFO list with INAM */ + inam[3] = DMUS_FOURCC_INFO_LIST; + stream = gen_riff_stream(inam); + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + desc.dwValidData); + IStream_Release(stream); + + /* Duplicated chunks */ + stream = gen_riff_stream(dupes); + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION; + ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); + todo_wine ok(!memcmp(desc.wszName, s_unam, sizeof(s_unam)), "Got name '%s', expected 'UNAM'\n", + wine_dbgstr_w(desc.wszName)); + IStream_Release(stream); + + IDirectMusicObject_Release(dmo); +} + START_TEST(loader) { CoInitialize(NULL); @@ -408,5 +610,7 @@ START_TEST(loader) test_COM(); test_COM_container(); test_container(); + test_parsedescriptor(); + CoUninitialize(); } -- 2.14.3

1 0

[PATCH] dmusic/tests: Check forms 'DMAP' and 'DMTG' in ParseDescriptor too
by Michael Stefaniuc 06 Mar '18

06 Mar '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/tests/dmime.c | 75 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 51 insertions(+), 24 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index b7b8095725..1438a8d142 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -723,71 +723,94 @@ static void test_parsedescriptor(void) }; FOURCC empty[] = {FOURCC_RIFF, ~0, 0}; FOURCC inam[] = {FOURCC_RIFF, ~0, FOURCC_LIST, ~0, mmioFOURCC('I','N','A','M'), 0, 0}; -#define X(form) form, #form +#define X(class) &CLSID_ ## class, #class +#define Y(form) form, #form const struct { + REFCLSID clsid; + const char *class; FOURCC form; const char *name; + BOOL needs_size; } forms[] = { - { X(DMUS_FOURCC_SEGMENT_FORM) }, - { X(mmioFOURCC('W','A','V','E')) }, + { X(DirectMusicSegment), Y(DMUS_FOURCC_SEGMENT_FORM), FALSE }, + { X(DirectMusicSegment), Y(mmioFOURCC('W','A','V','E')), FALSE }, + { X(DirectMusicAudioPathConfig), Y(DMUS_FOURCC_AUDIOPATH_FORM), TRUE }, + { X(DirectMusicGraph), Y(DMUS_FOURCC_TOOLGRAPH_FORM), TRUE }, }; #undef X +#undef Y - hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, - &IID_IDirectMusicObject, (void **)&dmo); - if (hr != S_OK) { - win_skip("Could not create DirectMusicSegment object: %08x\n", hr); - return; - } for (i = 0; i < ARRAY_SIZE(forms); i++) { - trace("Testing %s\n", forms[i].name); + trace("Testing %s / %s\n", forms[i].class, forms[i].name); + hr = CoCreateInstance(forms[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, + (void **)&dmo); + if (hr != S_OK) { + win_skip("Could not create %s object: %08x\n", forms[i].class, hr); + return; + } /* Nothing loaded */ memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_GetDescriptor(dmo, &desc); + if (forms[i].needs_size) { + todo_wine ok(hr == E_INVALIDARG, + "GetDescriptor failed: %08x, expected E_INVALIDARG\n", hr); + desc.dwSize = sizeof(desc); + hr = IDirectMusicObject_GetDescriptor(dmo, &desc); + } ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr); ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", desc.dwValidData); - ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicSegment), - "Got class guid %s, expected CLSID_DirectMusicSegment\n", - wine_dbgstr_guid(&desc.guidClass)); + ok(IsEqualGUID(&desc.guidClass, forms[i].clsid), "Got class guid %s, expected CLSID_%s\n", + wine_dbgstr_guid(&desc.guidClass), forms[i].class); /* Empty RIFF stream */ empty[1] = forms[i].form; stream = gen_riff_stream(empty); memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + if (forms[i].needs_size) { + todo_wine ok(hr == E_INVALIDARG, + "ParseDescriptor failed: %08x, expected E_INVALIDARG\n", hr); + desc.dwSize = sizeof(desc); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + } + todo_wine_if(forms[i].needs_size) + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", desc.dwValidData); - ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicSegment), - "Got class guid %s, expected CLSID_DirectMusicSegment\n", - wine_dbgstr_guid(&desc.guidClass)); + ok(IsEqualGUID(&desc.guidClass, forms[i].clsid), "Got class guid %s, expected CLSID_%s\n", + wine_dbgstr_guid(&desc.guidClass), forms[i].class); IStream_Release(stream); /* Wrong form */ empty[1] = DMUS_FOURCC_CONTAINER_FORM; stream = gen_riff_stream(empty); memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); - ok(hr == E_FAIL, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + if (forms[i].needs_size) + todo_wine ok(hr == DMUS_E_CHUNKNOTFOUND, + "ParseDescriptor failed: %08x, expected DMUS_E_CHUNKNOTFOUND\n", hr); + else + ok(hr == E_FAIL, "ParseDescriptor failed: %08x, expected E_FAIL\n", hr); todo_wine ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData); /* All desc chunks */ alldesc[1] = forms[i].form; stream = gen_riff_stream(alldesc); memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); valid = DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS | DMUS_OBJ_VERSION; - if (forms[i].form == DMUS_FOURCC_SEGMENT_FORM) + if (forms[i].form != mmioFOURCC('W','A','V','E')) valid |= DMUS_OBJ_NAME | DMUS_OBJ_CATEGORY; todo_wine_if(forms[i].form == mmioFOURCC('W','A','V','E')) ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); - ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicSegment), - "Got class guid %s, expected %s\n", wine_dbgstr_guid(&desc.guidClass), - wine_dbgstr_guid(&CLSID_DirectMusicSegment)); + ok(IsEqualGUID(&desc.guidClass, forms[i].clsid), "Got class guid %s, expected CLSID_%s\n", + wine_dbgstr_guid(&desc.guidClass), forms[i].class); ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n", wine_dbgstr_guid(&desc.guidClass)); if (forms[i].form == DMUS_FOURCC_SEGMENT_FORM) @@ -799,6 +822,7 @@ static void test_parsedescriptor(void) dupes[1] = forms[i].form; stream = gen_riff_stream(dupes); memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); todo_wine_if(forms[i].form == mmioFOURCC('W','A','V','E')) @@ -811,9 +835,10 @@ static void test_parsedescriptor(void) inam[3] = DMUS_FOURCC_UNFO_LIST; stream = gen_riff_stream(inam); memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); - todo_wine_if(forms[i].form == DMUS_FOURCC_SEGMENT_FORM) + todo_wine_if(forms[i].form != mmioFOURCC('W','A','V','E')) ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", desc.dwValidData); IStream_Release(stream); @@ -822,6 +847,7 @@ static void test_parsedescriptor(void) inam[3] = DMUS_FOURCC_INFO_LIST; stream = gen_riff_stream(inam); memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); valid = DMUS_OBJ_CLASS; @@ -834,8 +860,9 @@ static void test_parsedescriptor(void) todo_wine ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'I'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); + + IDirectMusicObject_Release(dmo); } - IDirectMusicObject_Release(dmo); } START_TEST(dmime) -- 2.14.3

1 0

Re: GSOC
by Austin English 05 Mar '18

05 Mar '18

On Mon, Mar 5, 2018 at 1:43 PM, Abhishek Kumar <abhishek.sec09(a)gmail.com> wrote: > No i have already applied this. > > sudo make install > > On Tue, Mar 6, 2018 at 1:08 AM, Austin English <austinenglish(a)gmail.com> > wrote: >> >> On Mon, Mar 5, 2018 at 1:35 PM, Abhishek Kumar <abhishek.sec09(a)gmail.com> >> wrote: >> > It has build from the source (version - 3.3) >> > >> > On Tue, Mar 6, 2018 at 12:57 AM, Abhishek Kumar >> > <abhishek.sec09(a)gmail.com> >> > wrote: >> >> >> >> i am unable to run wine after installing on my mac os sierra.It showing >> >> following error. >> >> >> >> >> >> Abhisheks-MacBook-Air:~ abhi$ wine notepad >> >> >> >> -bash: wine: command not found >> >> >> >> >> >> >> >> Please provide the solution soon as possible. >> >> You may have forgotten to run (sudo) make install >> >> -- >> -Austin >> GPG: 267B CC1F 053F 0749 (expires 2021/02/18) Then /usr/local/bin may not be in your path (or whatever you used for --prefix). P.S. Please keep wine-devel in CC and bottom post. -- -Austin GPG: 267B CC1F 053F 0749 (expires 2021/02/18)

2 1

GSOC
by Abhishek Kumar 05 Mar '18

05 Mar '18

i am unable to run wine after installing on my mac os sierra.It showing following error. *Abhisheks-MacBook-Air:~ abhi$ wine notepad* *-bash: wine: command not found* Please provide the solution soon as possible.

2 2

WriteFile() segfaults...
by Tom Watson 05 Mar '18

05 Mar '18

Over the weekend I seem to have triggered a number of segfaults while writing tests by sending 0 as the optional bytes written parameter; WriteFile(handle, buffer, sizeof(buffer), 0, NULL); Test patch/runs on testbot here: https://testbot.winehq.org/JobDetails.pl?Key=36430 I download the resulting .exe and ran it against current git source locally and it works fine. Is this a known issue? Something going on with testbot? Something I'm doing wrong? Or does it require some more investigation? Cheers.

2 2

[PATCH 1/1] Fix Bug 44570
by Tom Watson 05 Mar '18

05 Mar '18

https://bugs.winehq.org/show_bug.cgi?id=44570 Signed-off-by: Tom Watson <coder(a)tommywatson.com>

2 4

GSoC
by Abhishek Kumar 05 Mar '18

05 Mar '18

---------- Forwarded message --------- From: Abhishek Kumar <abhishek.sec09(a)gmail.com> Date: Mon, 5 Mar 2018 at 11:41 AM Subject: install wine To: Austin English <austinenglish(a)gmail.com> hi i am not able to run wine3.3 on my mac os sierra.I get this output *0056:err:process:__wine_kernel_init boot event wait timed out* *Wine cannot find the ncurses library (libncurses.5.4.dylib).* What is the solution?

3 2

[PATCH 5/5] usp10: Use heap_calloc() in ScriptPlace().
by Henri Verbeet 05 Mar '18

05 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/usp10/usp10.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 103b345..411d19f 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3501,8 +3501,8 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, if (!psva) return E_INVALIDARG; if (!pGoffset) return E_FAIL; - glyphProps = heap_alloc(sizeof(SCRIPT_GLYPHPROP)*cGlyphs); - if (!glyphProps) return E_OUTOFMEMORY; + if (!(glyphProps = heap_calloc(cGlyphs, sizeof(*glyphProps)))) + return E_OUTOFMEMORY; for (i = 0; i < cGlyphs; i++) glyphProps[i].sva = psva[i]; -- 2.1.4

2 1

[PATCH 4/5] wined3d: Pass a texture and sub-resource index to wined3d_surface_upload_data().
by Henri Verbeet 05 Mar '18

05 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 28 ++++++++++++++-------------- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 7 ++++--- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 38924a8..8d6712b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -777,24 +777,23 @@ static void surface_download_data(struct wined3d_surface *surface, const struct /* This call just uploads data, the caller is responsible for binding the * correct texture. */ /* Context activation is done by the caller. */ -void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, - const struct wined3d_format *format, const RECT *src_rect, UINT src_pitch, const POINT *dst_point, - BOOL srgb, const struct wined3d_const_bo_address *data) +void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, + const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, + unsigned int src_pitch, const POINT *dst_point, BOOL srgb, const struct wined3d_const_bo_address *data) { - unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); - struct wined3d_texture *texture = surface->container; UINT update_w = src_rect->right - src_rect->left; UINT update_h = src_rect->bottom - src_rect->top; unsigned int level, layer; GLenum target; - TRACE("surface %p, gl_info %p, format %s, src_rect %s, src_pitch %u, dst_point %s, srgb %#x, data {%#x:%p}.\n", - surface, gl_info, debug_d3dformat(format->id), wine_dbgstr_rect(src_rect), src_pitch, - wine_dbgstr_point(dst_point), srgb, data->buffer_object, data->addr); + TRACE("texure %p, sub_resource_idx %u, gl_info %p, format %s, src_rect %s, " + "src_pitch %u, dst_point %s, srgb %#x, data {%#x:%p}.\n", + texture, sub_resource_idx, gl_info, debug_d3dformat(format->id), wine_dbgstr_rect(src_rect), + src_pitch, wine_dbgstr_point(dst_point), srgb, data->buffer_object, data->addr); if (texture->sub_resources[sub_resource_idx].map_count) { - WARN("Uploading a surface that is currently mapped, setting WINED3D_TEXTURE_PIN_SYSMEM.\n"); + WARN("Uploading a texture that is currently mapped, setting WINED3D_TEXTURE_PIN_SYSMEM.\n"); texture->flags |= WINED3D_TEXTURE_PIN_SYSMEM; } @@ -875,7 +874,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w addr += src_pitch; } } - checkGLcall("Upload compressed surface data"); + checkGLcall("Upload compressed texture data"); } else { @@ -901,7 +900,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w update_w, update_h, format->glFormat, format->glType, addr); } gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); - checkGLcall("Upload surface data"); + checkGLcall("Upload texture data"); } if (data->buffer_object) @@ -915,6 +914,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w if (gl_info->quirks & WINED3D_QUIRK_FBO_TEX_UPDATE) { + struct wined3d_surface *surface = texture->sub_resources[sub_resource_idx].u.surface; struct wined3d_device *device = texture->resource.device; unsigned int i; @@ -964,7 +964,7 @@ static HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, src_texture->sub_resources[src_sub_resource_idx].locations); wined3d_texture_get_pitch(src_texture, src_level, &src_row_pitch, &src_slice_pitch); - wined3d_surface_upload_data(dst_surface, gl_info, src_texture->resource.format, src_rect, + wined3d_surface_upload_data(dst_texture, dst_sub_resource_idx, gl_info, src_texture->resource.format, src_rect, src_row_pitch, dst_point, FALSE, wined3d_const_bo_address(&data)); context_release(context); @@ -1410,7 +1410,7 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr wined3d_texture_prepare_texture(dst_texture, context, FALSE); wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); - wined3d_surface_upload_data(dst_texture->sub_resources[0].u.surface, gl_info, src_format, + wined3d_surface_upload_data(dst_texture, 0, gl_info, src_format, &src_rect, src_row_pitch, &dst_point, FALSE, wined3d_const_bo_address(&src_data)); wined3d_texture_validate_location(dst_texture, 0, WINED3D_LOCATION_TEXTURE_RGB); @@ -2401,7 +2401,7 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, data.addr = dst_mem; } - wined3d_surface_upload_data(surface, gl_info, &format, &src_rect, + wined3d_surface_upload_data(texture, sub_resource_idx, gl_info, &format, &src_rect, src_row_pitch, &dst_point, srgb, wined3d_const_bo_address(&data)); heap_free(dst_mem); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 72ab961..0c0e434 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1683,7 +1683,7 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int src_rect.bottom = wined3d_texture_get_level_height(texture, texture_level); } - wined3d_surface_upload_data(texture->sub_resources[sub_resource_idx].u.surface, context->gl_info, + wined3d_surface_upload_data(texture, sub_resource_idx, context->gl_info, texture->resource.format, &src_rect, row_pitch, &dst_point, FALSE, data); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4b33432..a78055a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3340,9 +3340,10 @@ BOOL surface_load_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const struct wined3d_rendertarget_info *rt) DECLSPEC_HIDDEN; -void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, - const struct wined3d_format *format, const RECT *src_rect, UINT src_pitch, const POINT *dst_point, - BOOL srgb, const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN; +void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, + const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, + unsigned int src_pitch, const POINT *dst_point, BOOL srgb, + const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN; void draw_textured_quad(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, const RECT *src_rect, const RECT *dst_rect, -- 2.1.4

1 0

[PATCH 3/5] wined3d: Pass a texture to surface_translate_drawable_coords().
by Henri Verbeet 05 Mar '18

05 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/surface.c | 33 +++------------------------------ dlls/wined3d/texture.c | 26 ++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 3 ++- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f86c167..87a233f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7847,7 +7847,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl if (dst_location == WINED3D_LOCATION_DRAWABLE) { d = *dst_rect; - surface_translate_drawable_coords(dst_surface, context->win_handle, &d); + wined3d_texture_translate_drawable_coords(dst_texture, context->win_handle, &d); dst_rect = &d; } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 421b01c..38924a8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -449,7 +449,7 @@ static void surface_blt_fbo(const struct wined3d_device *device, { TRACE("Source surface %p is onscreen.\n", src_surface); buffer = wined3d_texture_get_gl_buffer(src_texture); - surface_translate_drawable_coords(src_surface, context->win_handle, &src_rect); + wined3d_texture_translate_drawable_coords(src_texture, context->win_handle, &src_rect); } else { @@ -466,7 +466,7 @@ static void surface_blt_fbo(const struct wined3d_device *device, { TRACE("Destination surface %p is onscreen.\n", dst_surface); buffer = wined3d_texture_get_gl_buffer(dst_texture); - surface_translate_drawable_coords(dst_surface, context->win_handle, &dst_rect); + wined3d_texture_translate_drawable_coords(dst_texture, context->win_handle, &dst_rect); } else { @@ -2005,33 +2005,6 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); } -/* Front buffer coordinates are always full screen coordinates, but our GL - * drawable is limited to the window's client area. The sysmem and texture - * copies do have the full screen size. Note that GL has a bottom-left - * origin, while D3D has a top-left origin. */ -void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) -{ - struct wined3d_texture *texture = surface->container; - POINT offset = {0, 0}; - UINT drawable_height; - RECT windowsize; - - if (!texture->swapchain) - return; - - if (texture == texture->swapchain->front_buffer) - { - ScreenToClient(window, &offset); - OffsetRect(rect, offset.x, offset.y); - } - - GetClientRect(window, &windowsize); - drawable_height = windowsize.bottom - windowsize.top; - - rect->top = drawable_height - rect->top; - rect->bottom = drawable_height - rect->bottom; -} - static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RECT *dst_rect, struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) @@ -2925,7 +2898,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit if (dst_location == WINED3D_LOCATION_DRAWABLE) { r = *dst_rect; - surface_translate_drawable_coords(dst_surface, context->win_handle, &r); + wined3d_texture_translate_drawable_coords(dst_texture, context->win_handle, &r); dst_rect = &r; } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index c498c15..72ab961 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -48,6 +48,32 @@ static BOOL wined3d_texture_use_immutable_storage(const struct wined3d_texture * && !(texture->resource.format_flags & WINED3DFMT_FLAG_HEIGHT_SCALE); } +/* Front buffer coordinates are always full screen coordinates, but our GL + * drawable is limited to the window's client area. The sysmem and texture + * copies do have the full screen size. Note that GL has a bottom-left + * origin, while D3D has a top-left origin. */ +void wined3d_texture_translate_drawable_coords(const struct wined3d_texture *texture, HWND window, RECT *rect) +{ + unsigned int drawable_height; + POINT offset = {0, 0}; + RECT windowsize; + + if (!texture->swapchain) + return; + + if (texture == texture->swapchain->front_buffer) + { + ScreenToClient(window, &offset); + OffsetRect(rect, offset.x, offset.y); + } + + GetClientRect(window, &windowsize); + drawable_height = windowsize.bottom - windowsize.top; + + rect->top = drawable_height - rect->top; + rect->bottom = drawable_height - rect->bottom; +} + GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) { const struct wined3d_swapchain *swapchain = texture->swapchain; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1c4c3ef..4b33432 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3254,6 +3254,8 @@ void wined3d_texture_prepare_texture(struct wined3d_texture *texture, void wined3d_texture_set_map_binding(struct wined3d_texture *texture, DWORD map_binding) DECLSPEC_HIDDEN; void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; +void wined3d_texture_translate_drawable_coords(const struct wined3d_texture *texture, + HWND window, RECT *rect) DECLSPEC_HIDDEN; void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_box *box, const struct wined3d_const_bo_address *data, unsigned int row_pitch, unsigned int slice_pitch) DECLSPEC_HIDDEN; @@ -3338,7 +3340,6 @@ BOOL surface_load_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const struct wined3d_rendertarget_info *rt) DECLSPEC_HIDDEN; -void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) DECLSPEC_HIDDEN; void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, UINT src_pitch, const POINT *dst_point, BOOL srgb, const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN; -- 2.1.4

1 0

[PATCH 2/5] wined3d: Explicitly calculate the sub-resource level in wined3d_texture_update_overlay().
by Henri Verbeet 05 Mar '18

05 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 8e8a4dc..c498c15 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2764,9 +2764,10 @@ HRESULT CDECL wined3d_texture_update_overlay(struct wined3d_texture *texture, un const RECT *src_rect, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, const RECT *dst_rect, DWORD flags) { - struct wined3d_texture_sub_resource *sub_resource, *dst_sub_resource; - struct wined3d_surface *surface, *dst_surface; + struct wined3d_texture_sub_resource *dst_sub_resource; struct wined3d_overlay_info *overlay; + struct wined3d_surface *dst_surface; + unsigned int level, dst_level; TRACE("texture %p, sub_resource_idx %u, src_rect %s, dst_texture %p, " "dst_sub_resource_idx %u, dst_rect %s, flags %#x.\n", @@ -2774,7 +2775,7 @@ HRESULT CDECL wined3d_texture_update_overlay(struct wined3d_texture *texture, un dst_sub_resource_idx, wine_dbgstr_rect(dst_rect), flags); if (!(texture->resource.usage & WINED3DUSAGE_OVERLAY) || texture->resource.type != WINED3D_RTYPE_TEXTURE_2D - || !(sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx))) + || sub_resource_idx >= texture->level_count * texture->layer_count) { WARN("Invalid sub-resource specified.\n"); return WINEDDERR_NOTAOVERLAYSURFACE; @@ -2789,21 +2790,22 @@ HRESULT CDECL wined3d_texture_update_overlay(struct wined3d_texture *texture, un overlay = &texture->overlay_info[sub_resource_idx]; - surface = sub_resource->u.surface; + level = sub_resource_idx % texture->level_count; if (src_rect) overlay->src_rect = *src_rect; else SetRect(&overlay->src_rect, 0, 0, - wined3d_texture_get_level_width(texture, surface->texture_level), - wined3d_texture_get_level_height(texture, surface->texture_level)); + wined3d_texture_get_level_width(texture, level), + wined3d_texture_get_level_height(texture, level)); dst_surface = dst_sub_resource->u.surface; + dst_level = dst_sub_resource_idx % dst_texture->level_count; if (dst_rect) overlay->dst_rect = *dst_rect; else SetRect(&overlay->dst_rect, 0, 0, - wined3d_texture_get_level_width(dst_texture, dst_surface->texture_level), - wined3d_texture_get_level_height(dst_texture, dst_surface->texture_level)); + wined3d_texture_get_level_width(dst_texture, dst_level), + wined3d_texture_get_level_height(dst_texture, dst_level)); if (overlay->dst && (overlay->dst != dst_surface || flags & WINEDDOVER_HIDE)) { -- 2.1.4

1 0

[PATCH 1/5] wined3d: Explicitly calculate the sub-resource level in texture2d_create_dc().
by Henri Verbeet 05 Mar '18

05 Mar '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1ffc2a6..8e8a4dc 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1211,12 +1211,12 @@ static void texture2d_create_dc(void *object) { struct wined3d_surface *surface = object; struct wined3d_context *context = NULL; + unsigned int sub_resource_idx, level; const struct wined3d_format *format; unsigned int row_pitch, slice_pitch; struct wined3d_texture *texture; struct wined3d_bo_address data; D3DKMT_CREATEDCFROMMEMORY desc; - unsigned int sub_resource_idx; struct wined3d_device *device; NTSTATUS status; @@ -1224,6 +1224,7 @@ static void texture2d_create_dc(void *object) texture = surface->container; sub_resource_idx = surface_get_sub_resource_idx(surface); + level = sub_resource_idx % texture->level_count; device = texture->resource.device; format = texture->resource.format; @@ -1238,7 +1239,7 @@ static void texture2d_create_dc(void *object) wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding); wined3d_texture_invalidate_location(texture, sub_resource_idx, ~texture->resource.map_binding); - wined3d_texture_get_pitch(texture, surface->texture_level, &row_pitch, &slice_pitch); + wined3d_texture_get_pitch(texture, level, &row_pitch, &slice_pitch); wined3d_texture_get_memory(texture, sub_resource_idx, &data, texture->resource.map_binding); desc.pMemory = context_map_bo_address(context, &data, texture->sub_resources[sub_resource_idx].size, @@ -1248,8 +1249,8 @@ static void texture2d_create_dc(void *object) context_release(context); desc.Format = format->ddi_format; - desc.Width = wined3d_texture_get_level_width(texture, surface->texture_level); - desc.Height = wined3d_texture_get_level_height(texture, surface->texture_level); + desc.Width = wined3d_texture_get_level_width(texture, level); + desc.Height = wined3d_texture_get_level_height(texture, level); desc.Pitch = row_pitch; desc.hDeviceDc = CreateCompatibleDC(NULL); desc.pColorTable = NULL; -- 2.1.4

1 0

[PATCH v2 1/2] winevulkan: Implement vkEnumeratePhysicalDevices.
by Roderick Colenbrander 05 Mar '18

05 Mar '18

Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> --- dlls/winevulkan/make_vulkan | 1 + dlls/winevulkan/vulkan.c | 142 ++++++++++++++++++++++++++++++++++++++- dlls/winevulkan/vulkan_private.h | 14 ++++ dlls/winevulkan/vulkan_thunks.c | 6 -- dlls/winevulkan/vulkan_thunks.h | 1 + 5 files changed, 157 insertions(+), 7 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 5657b70c4c..3b045db8a9 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -90,6 +90,7 @@ FUNCTION_OVERRIDES = { # Instance functions "vkDestroyInstance" : {"dispatch" : True, "driver" : True, "thunk" : False }, + "vkEnumeratePhysicalDevices" : {"dispatch" : True, "driver" : False, "thunk" : False}, } diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 0f48d971e2..1e45253504 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -58,6 +58,85 @@ static BOOL wine_vk_init(void) return TRUE; } +/* Helper function which stores wrapped physical devices in the instance object. */ +static VkResult wine_vk_instance_load_physical_devices(struct VkInstance_T *instance) +{ + VkResult res; + struct VkPhysicalDevice_T **tmp_phys_devs = NULL; + uint32_t num_phys_devs = 0; + unsigned int i; + + res = instance->funcs.p_vkEnumeratePhysicalDevices(instance->instance, &num_phys_devs, NULL); + if (res != VK_SUCCESS) + { + ERR("Failed to enumerate physical devices, res=%d\n", res); + return res; + } + + /* Don't bother with any of the rest if the system just lacks devices. */ + if (num_phys_devs == 0) + { + instance->num_phys_devs = 0; + instance->phys_devs = NULL; + return VK_SUCCESS; + } + + tmp_phys_devs = heap_calloc(num_phys_devs, sizeof(*tmp_phys_devs)); + if (!tmp_phys_devs) + return VK_ERROR_OUT_OF_HOST_MEMORY; + + res = instance->funcs.p_vkEnumeratePhysicalDevices(instance->instance, &num_phys_devs, tmp_phys_devs); + if (res != VK_SUCCESS) + goto err; + + instance->phys_devs = heap_calloc(num_phys_devs, sizeof(*instance->phys_devs)); + if (!instance->phys_devs) + { + res = VK_ERROR_OUT_OF_HOST_MEMORY; + goto err; + } + + /* Wrap each native physical device handle into a dispatchable object for the ICD loader. */ + for (i = 0; i < num_phys_devs; i++) + { + struct VkPhysicalDevice_T *phys_dev = heap_alloc(sizeof(*phys_dev)); + if (!phys_dev) + { + ERR("Unable to allocate memory for physical device!\n"); + res = VK_ERROR_OUT_OF_HOST_MEMORY; + goto err; + } + + phys_dev->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; + phys_dev->instance = instance; + phys_dev->phys_dev = tmp_phys_devs[i]; + + instance->phys_devs[i] = phys_dev; + instance->num_phys_devs = i; + } + instance->num_phys_devs = num_phys_devs; + + heap_free(tmp_phys_devs); + return VK_SUCCESS; + +err: + heap_free(tmp_phys_devs); + + if (instance->phys_devs) + { + for (i = 0; i < instance->num_phys_devs; i++) + { + heap_free(instance->phys_devs[i]); + instance->phys_devs[i] = NULL; + } + heap_free(instance->phys_devs); + instance->num_phys_devs = 0; + instance->phys_devs = NULL; + } + + return res; +} + /* Helper function used for freeing an instance structure. This function supports full * and partial object cleanups and can thus be used for vkCreateInstance failures. */ @@ -66,6 +145,17 @@ static void wine_vk_instance_free(struct VkInstance_T *instance) if (!instance) return; + if (instance->phys_devs) + { + unsigned int i; + + for (i = 0; i < instance->num_phys_devs; i++) + { + heap_free(&instance->phys_devs[i]); + } + heap_free(instance->phys_devs); + } + if (instance->instance) vk_funcs->p_vkDestroyInstance(instance->instance, NULL /* allocator */); @@ -83,7 +173,7 @@ static VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_ if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); - object = heap_alloc(sizeof(*object)); + object = heap_alloc_zero(sizeof(*object)); if (!object) { ERR("Failed to allocate memory for instance\n"); @@ -108,6 +198,18 @@ static VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_ ALL_VK_INSTANCE_FUNCS() #undef USE_VK_FUNC + /* Cache physical devices for vkEnumeratePhysicalDevices within the instance as + * each vkPhysicalDevice is a dispatchable object, which means we need to wrap + * the native physical device and present those the application. + * Cleanup happens as part of wine_vkDestroyInstance. + */ + res = wine_vk_instance_load_physical_devices(object); + if (res != VK_SUCCESS) + { + ERR("Failed to cache physical devices, res=%d\n", res); + goto err; + } + *instance = object; TRACE("Done, instance=%p native_instance=%p\n", object, object->instance); return VK_SUCCESS; @@ -134,6 +236,44 @@ static VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *l return vk_funcs->p_vkEnumerateInstanceExtensionProperties(layer_name, count, properties); } +VkResult WINAPI wine_vkEnumeratePhysicalDevices(VkInstance instance, uint32_t *device_count, + VkPhysicalDevice *devices) +{ + VkResult res; + unsigned int i, num_copies; + + TRACE("%p %p %p\n", instance, device_count, devices); + + if (!devices) + { + *device_count = instance->num_phys_devs; + return VK_SUCCESS; + } + + if (*device_count < instance->num_phys_devs) + { + /* Incomplete is a type of success used to signal the application + * that not all devices got copied. + */ + num_copies = *device_count; + res = VK_INCOMPLETE; + } + else + { + num_copies = instance->num_phys_devs; + res = VK_SUCCESS; + } + + for (i = 0; i < num_copies; i++) + { + devices[i] = instance->phys_devs[i]; + } + *device_count = num_copies; + + TRACE("Returning %d devices\n", *device_count); + return res; +} + static PFN_vkVoidFunction WINAPI wine_vkGetInstanceProcAddr(VkInstance instance, const char *name) { void *func; diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 16aa0ce55c..8ef4b924a2 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -52,7 +52,21 @@ struct VkInstance_T { struct wine_vk_base base; struct vulkan_instance_funcs funcs; + + /* We cache devices as we need to wrap them as they are + * dispatchable objects. + */ + uint32_t num_phys_devs; + struct VkPhysicalDevice_T **phys_devs; + VkInstance instance; /* native instance */ }; +struct VkPhysicalDevice_T +{ + struct wine_vk_base base; + struct VkInstance_T *instance; /* parent */ + VkPhysicalDevice phys_dev; /* native physical device */ +}; + #endif /* __WINE_VULKAN_PRIVATE_H */ diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index c1c0b079a5..ae4f773ef0 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -28,12 +28,6 @@ static VkResult WINAPI wine_vkEnumerateDeviceLayerProperties(VkPhysicalDevice ph return VK_ERROR_OUT_OF_HOST_MEMORY; } -static VkResult WINAPI wine_vkEnumeratePhysicalDevices(VkInstance instance, uint32_t *pPhysicalDeviceCount, VkPhysicalDevice *pPhysicalDevices) -{ - FIXME("stub: %p, %p, %p\n", instance, pPhysicalDeviceCount, pPhysicalDevices); - return VK_ERROR_OUT_OF_HOST_MEMORY; -} - static void WINAPI wine_vkGetPhysicalDeviceFeatures(VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures *pFeatures) { FIXME("stub: %p, %p\n", physicalDevice, pFeatures); diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 087fa17d0e..26e114ab74 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -8,6 +8,7 @@ void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN; /* Functions for which we have custom implementations outside of the thunks. */ void WINAPI wine_vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks *pAllocator) DECLSPEC_HIDDEN; +VkResult WINAPI wine_vkEnumeratePhysicalDevices(VkInstance instance, uint32_t *pPhysicalDeviceCount, VkPhysicalDevice *pPhysicalDevices) DECLSPEC_HIDDEN; /* For use by vkInstance and children */ struct vulkan_instance_funcs -- 2.14.3

1 1

[PATCH 1/2] quartz/tests: Clean up test_legacy_filter_registration().
by Zebediah Figura 05 Mar '18

05 Mar '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/filtermapper.c | 175 ++++++++++++++------------------------- 1 file changed, 61 insertions(+), 114 deletions(-) diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index f044a31..99e77b5 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -48,24 +48,12 @@ static BOOL enum_find_filter(const WCHAR *wszFilterName, IEnumMoniker *pEnum) hr = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID*)&pPropBagCat); ok(SUCCEEDED(hr), "IMoniker_BindToStorage failed with %x\n", hr); - if (FAILED(hr) || !pPropBagCat) - { - VariantClear(&var); - IMoniker_Release(pMoniker); - continue; - } hr = IPropertyBag_Read(pPropBagCat, wszFriendlyName, &var, NULL); ok(SUCCEEDED(hr), "IPropertyBag_Read failed with %x\n", hr); - if (SUCCEEDED(hr)) - { - CHAR val1[512], val2[512]; - - WideCharToMultiByte(CP_ACP, 0, V_BSTR(&var), -1, val1, sizeof(val1), 0, 0); - WideCharToMultiByte(CP_ACP, 0, wszFilterName, -1, val2, sizeof(val2), 0, 0); - if (!lstrcmpA(val1, val2)) found = TRUE; - } + if (!lstrcmpW(V_BSTR(&var), wszFilterName)) + found = TRUE; IPropertyBag_Release(pPropBagCat); IMoniker_Release(pMoniker); @@ -214,125 +202,84 @@ static void test_fm2_enummatchingfilters(void) static void test_legacy_filter_registration(void) { - IFilterMapper2 *pMapper2 = NULL; - IFilterMapper *pMapper = NULL; + static const WCHAR testfilterW[] = {'T','e','s','t','f','i','l','t','e','r',0}; + static const WCHAR clsidW[] = {'C','L','S','I','D','\\',0}; + static const WCHAR pinW[] = {'P','i','n','1',0}; + IEnumRegFilters *enum_reg; + IEnumMoniker *enum_mon; + IFilterMapper2 *mapper2; + IFilterMapper *mapper; + REGFILTER *regfilter; + WCHAR clsidstring[40]; + WCHAR key_name[50]; + ULONG count; + CLSID clsid; + LRESULT ret; HRESULT hr; - static const WCHAR wszFilterName[] = {'T', 'e', 's', 't', 'f', 'i', 'l', 't', 'e', 'r', 0 }; - static const CHAR szFilterName[] = "Testfilter"; - static const WCHAR wszPinName[] = {'P', 'i', 'n', '1', 0 }; - CLSID clsidFilter; - CHAR szRegKey[MAX_PATH]; - static const CHAR szClsid[] = "CLSID"; - WCHAR wszGuidstring[MAX_PATH]; - CHAR szGuidstring[MAX_PATH]; - LONG lRet; - HKEY hKey = NULL; - IEnumMoniker *pEnum = NULL; BOOL found; - IEnumRegFilters *pRegEnum = NULL; + HKEY hkey; + + /* Register* functions need a filter class key to write pin and pin media + * type data to. Create a bogus class key for it. */ + CoCreateGuid(&clsid); + StringFromGUID2(&clsid, clsidstring, sizeof(clsidstring)); + lstrcpyW(key_name, clsidW); + lstrcatW(key_name, clsidstring); + ret = RegCreateKeyExW(HKEY_CLASSES_ROOT, key_name, 0, NULL, 0, KEY_WRITE, NULL, &hkey, NULL); + if (ret == ERROR_ACCESS_DENIED) + { + skip("Not authorized to register filters\n"); + return; + } /* Test if legacy filter registration scheme works (filter is added to HKCR\Filter). IFilterMapper_RegisterFilter * registers in this way. Filters so registered must then be accessible through both IFilterMapper_EnumMatchingFilters * and IFilterMapper2_EnumMatchingFilters. */ - hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, - &IID_IFilterMapper2, (LPVOID*)&pMapper2); + hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterMapper2, (void **)&mapper2); ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr); - if (FAILED(hr)) goto out; - hr = IFilterMapper2_QueryInterface(pMapper2, &IID_IFilterMapper, (void **)&pMapper); + hr = IFilterMapper2_QueryInterface(mapper2, &IID_IFilterMapper, (void **)&mapper); ok(hr == S_OK, "IFilterMapper2_QueryInterface failed with %x\n", hr); - if (FAILED(hr)) goto out; - /* Register a test filter. */ - hr = CoCreateGuid(&clsidFilter); - ok(hr == S_OK, "CoCreateGuid failed with %x\n", hr); + /* Set default value - this is interpreted as "friendly name" later. */ + RegSetValueExW(hkey, NULL, 0, REG_SZ, (BYTE *)testfilterW, sizeof(testfilterW)); + RegCloseKey(hkey); - lRet = StringFromGUID2(&clsidFilter, wszGuidstring, MAX_PATH); - ok(lRet > 0, "StringFromGUID2 failed\n"); - if (!lRet) goto out; - WideCharToMultiByte(CP_ACP, 0, wszGuidstring, -1, szGuidstring, MAX_PATH, 0, 0); + hr = IFilterMapper_RegisterFilter(mapper, clsid, testfilterW, MERIT_UNLIKELY); + ok(hr == S_OK, "RegisterFilter failed: %#x\n", hr); - lstrcpyA(szRegKey, szClsid); - lstrcatA(szRegKey, "\\"); - lstrcatA(szRegKey, szGuidstring); + hr = IFilterMapper_RegisterPin(mapper, clsid, pinW, TRUE, FALSE, FALSE, FALSE, GUID_NULL, NULL); + ok(hr == S_OK, "RegisterPin failed: %#x\n", hr); - /* Register---- functions need a filter class key to write pin and pin media type data to. Create a bogus - * class key for it. */ - lRet = RegCreateKeyExA(HKEY_CLASSES_ROOT, szRegKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL); - if (lRet == ERROR_ACCESS_DENIED) - skip("Not authorized to register filters\n"); - else - { - ok(lRet == ERROR_SUCCESS, "RegCreateKeyExA failed with %x\n", HRESULT_FROM_WIN32(lRet)); + hr = IFilterMapper_RegisterPinType(mapper, clsid, pinW, GUID_NULL, GUID_NULL); + ok(hr == S_OK, "RegisterPinType failed: %#x\n", hr); - /* Set default value - this is interpreted as "friendly name" later. */ - lRet = RegSetValueExA(hKey, NULL, 0, REG_SZ, (LPBYTE)szFilterName, lstrlenA(szFilterName) + 1); - ok(lRet == ERROR_SUCCESS, "RegSetValueExA failed with %x\n", HRESULT_FROM_WIN32(lRet)); + hr = IFilterMapper2_EnumMatchingFilters(mapper2, &enum_mon, 0, TRUE, MERIT_UNLIKELY, TRUE, + 0, NULL, NULL, &GUID_NULL, FALSE, FALSE, 0, NULL, NULL, &GUID_NULL); + ok(hr == S_OK, "IFilterMapper2_EnumMatchingFilters failed: %x\n", hr); + ok(enum_find_filter(testfilterW, enum_mon), "IFilterMapper2 didn't find filter\n"); + IEnumMoniker_Release(enum_mon); - if (hKey) RegCloseKey(hKey); - hKey = NULL; - - hr = IFilterMapper_RegisterFilter(pMapper, clsidFilter, wszFilterName, MERIT_UNLIKELY); - ok(hr == S_OK, "IFilterMapper_RegisterFilter failed with %x\n", hr); - - hr = IFilterMapper_RegisterPin(pMapper, clsidFilter, wszPinName, TRUE, FALSE, FALSE, FALSE, GUID_NULL, NULL); - ok(hr == S_OK, "IFilterMapper_RegisterPin failed with %x\n", hr); - - hr = IFilterMapper_RegisterPinType(pMapper, clsidFilter, wszPinName, GUID_NULL, GUID_NULL); - ok(hr == S_OK, "IFilterMapper_RegisterPinType failed with %x\n", hr); - - hr = IFilterMapper2_EnumMatchingFilters(pMapper2, &pEnum, 0, TRUE, MERIT_UNLIKELY, TRUE, - 0, NULL, NULL, &GUID_NULL, FALSE, FALSE, 0, NULL, NULL, &GUID_NULL); - ok(hr == S_OK, "IFilterMapper2_EnumMatchingFilters failed with %x\n", hr); - if (SUCCEEDED(hr) && pEnum) - { - found = enum_find_filter(wszFilterName, pEnum); - ok(found, "IFilterMapper2_EnumMatchingFilters failed to return the test filter\n"); - } - - if (pEnum) IEnumMoniker_Release(pEnum); - pEnum = NULL; - - found = FALSE; - hr = IFilterMapper_EnumMatchingFilters(pMapper, &pRegEnum, MERIT_UNLIKELY, TRUE, GUID_NULL, GUID_NULL, - FALSE, FALSE, GUID_NULL, GUID_NULL); - ok(hr == S_OK, "IFilterMapper_EnumMatchingFilters failed with %x\n", hr); - if (SUCCEEDED(hr) && pRegEnum) - { - ULONG cFetched; - REGFILTER *prgf; - - while(!found && IEnumRegFilters_Next(pRegEnum, 1, &prgf, &cFetched) == S_OK) - { - CHAR val[512]; - - WideCharToMultiByte(CP_ACP, 0, prgf->Name, -1, val, sizeof(val), 0, 0); - if (!lstrcmpA(val, szFilterName)) found = TRUE; - - CoTaskMemFree(prgf); - } - - IEnumRegFilters_Release(pRegEnum); - } - ok(found, "IFilterMapper_EnumMatchingFilters failed to return the test filter\n"); - - hr = IFilterMapper_UnregisterFilter(pMapper, clsidFilter); - ok(hr == S_OK, "FilterMapper_UnregisterFilter failed with %x\n", hr); - - lRet = RegOpenKeyExA(HKEY_CLASSES_ROOT, szClsid, 0, KEY_WRITE | DELETE, &hKey); - ok(lRet == ERROR_SUCCESS, "RegOpenKeyExA failed with %x\n", HRESULT_FROM_WIN32(lRet)); - - lRet = RegDeleteKeyA(hKey, szGuidstring); - ok(lRet == ERROR_SUCCESS, "RegDeleteKeyA failed with %x\n", HRESULT_FROM_WIN32(lRet)); + found = FALSE; + hr = IFilterMapper_EnumMatchingFilters(mapper, &enum_reg, MERIT_UNLIKELY, TRUE, GUID_NULL, GUID_NULL, + FALSE, FALSE, GUID_NULL, GUID_NULL); + ok(hr == S_OK, "IFilterMapper_EnumMatchingFilters failed with %x\n", hr); + while(!found && IEnumRegFilters_Next(enum_reg, 1, &regfilter, &count) == S_OK) + { + if (!lstrcmpW(regfilter->Name, testfilterW) && IsEqualGUID(&clsid, &regfilter->Clsid)) + found = TRUE; } + IEnumRegFilters_Release(enum_reg); + ok(found, "IFilterMapper didn't find filter\n"); - if (hKey) RegCloseKey(hKey); - hKey = NULL; + hr = IFilterMapper_UnregisterFilter(mapper, clsid); + ok(hr == S_OK, "FilterMapper_UnregisterFilter failed with %x\n", hr); - out: + ret = RegDeleteKeyW(HKEY_CLASSES_ROOT, key_name); + ok(!ret, "RegDeleteKeyA failed: %lu\n", ret); - if (pMapper) IFilterMapper_Release(pMapper); - if (pMapper2) IFilterMapper2_Release(pMapper2); + IFilterMapper_Release(mapper); + IFilterMapper2_Release(mapper2); } static ULONG getRefcount(IUnknown *iface) -- 2.7.4

1 1

[PATCH 14/14] kernel32: Add UmsThreadYield stub
by Alistair Leslie-Hughes 05 Mar '18

05 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 10 ++++++++++ include/winbase.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index b30db7b..60809f4 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1524,7 +1524,7 @@ # @ stub -arch=x86_64 uaw_wcsicmp # @ stub -arch=x86_64 uaw_wcslen # @ stub -arch=x86_64 uaw_wcsrchr -# @ stub -arch=x86_64 UmsThreadYield +@ stdcall -arch=x86_64 UmsThreadYield(ptr) # @ stub -arch=x86_64 __misaligned_access @ stdcall -i386 -private UTRegister(long str str str ptr ptr ptr) krnl386.exe16.UTRegister @ stdcall -i386 -private UTUnRegister(long) krnl386.exe16.UTUnRegister diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index e878261..e458354 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4354,6 +4354,16 @@ BOOL WINAPI SetUmsThreadInformation(PUMS_CONTEXT ctx, UMS_THREAD_INFO_CLASS clas return FALSE; } +/*********************************************************************** + * UmsThreadYield (KERNEL32.@) + */ +BOOL WINAPI UmsThreadYield(void *param) +{ + FIXME( "%p: stub\n", param ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + /********************************************************************** * BaseFlushAppcompatCache (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index d4b23dd..c99993a 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2654,6 +2654,7 @@ WINBASEAPI BOOL WINAPI UnlockFileEx(HANDLE,DWORD,DWORD,DWORD,LPOVERLAPPED #define UnlockResource(handle) ((handle), 0) #define UnlockSegment(handle) GlobalUnfix((HANDLE)(handle)) WINBASEAPI BOOL WINAPI UnmapViewOfFile(LPCVOID); +WINBASEAPI BOOL WINAPI UmsThreadYield(void *); WINBASEAPI HRESULT WINAPI UnregisterApplicationRestart(void); WINBASEAPI BOOL WINAPI UnregisterWait(HANDLE); WINBASEAPI BOOL WINAPI UnregisterWaitEx(HANDLE,HANDLE); -- 1.9.1

1 0

[PATCH 13/14] kernel32: Add SetUmsThreadInformation stub
by Alistair Leslie-Hughes 05 Mar '18

05 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 11 +++++++++++ include/winbase.h | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index e358075..b30db7b 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1464,7 +1464,7 @@ @ stdcall SetThreadpoolWait(ptr long ptr) @ stdcall SetTimeZoneInformation(ptr) @ stub SetTimerQueueTimer -# @ stub -arch=x86_64 SetUmsThreadInformation +@ stdcall -arch=x86_64 SetUmsThreadInformation(ptr long ptr long) @ stdcall SetUnhandledExceptionFilter(ptr) @ stdcall SetUserGeoID(long) @ stub SetVDMCurrentDirectories diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 499d303..e878261 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4343,6 +4343,17 @@ BOOL WINAPI QueryUmsThreadInformation(PUMS_CONTEXT ctx, UMS_THREAD_INFO_CLASS cl return FALSE; } +/*********************************************************************** + * SetUmsThreadInformation (KERNEL32.@) + */ +BOOL WINAPI SetUmsThreadInformation(PUMS_CONTEXT ctx, UMS_THREAD_INFO_CLASS class, + void *buf, ULONG length) +{ + FIXME( "%p,%08x,%p,%08x: stub\n", ctx, class, buf, length ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + /********************************************************************** * BaseFlushAppcompatCache (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index cff15b0..d4b23dd 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2620,6 +2620,7 @@ WINBASEAPI BOOL WINAPI SetVolumeMountPointW(LPCWSTR,LPCWSTR); #define SetVolumeMountPoint WINELIB_NAME_AW(SetVolumeMountPoint) WINBASEAPI BOOL WINAPI SetWaitableTimer(HANDLE,const LARGE_INTEGER*,LONG,PTIMERAPCROUTINE,LPVOID,BOOL); WINBASEAPI BOOL WINAPI SetWaitableTimerEx(HANDLE,const LARGE_INTEGER*,LONG,PTIMERAPCROUTINE,LPVOID,REASON_CONTEXT*,ULONG); +WINBASEAPI BOOL WINAPI SetUmsThreadInformation(PUMS_CONTEXT,UMS_THREAD_INFO_CLASS,void *,ULONG); WINBASEAPI BOOL WINAPI SetupComm(HANDLE,DWORD,DWORD); WINBASEAPI DWORD WINAPI SignalObjectAndWait(HANDLE,HANDLE,DWORD,BOOL); WINBASEAPI DWORD WINAPI SizeofResource(HMODULE,HRSRC); -- 1.9.1

1 0

[PATCH 12/14] kernel32: Add QueryUmsThreadInformation stub
by Alistair Leslie-Hughes 05 Mar '18

05 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 11 +++++++++++ include/winbase.h | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 23bd0b4..e358075 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1175,7 +1175,7 @@ @ stdcall QueryThreadCycleTime(long ptr) # @ stub QueryThreadProfiling # @ stub QueryThreadpoolStackInformation -# @ stub -arch=x86_64 QueryUmsThreadInformation +@ stdcall -arch=x86_64 QueryUmsThreadInformation(ptr long ptr long ptr) @ stdcall QueryUnbiasedInterruptTime(ptr) @ stub QueryWin31IniFilesMappedToRegistry @ stdcall QueueUserAPC(ptr long long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 3a8b9af..499d303 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4332,6 +4332,17 @@ BOOL WINAPI GetUmsCompletionListEvent(PUMS_COMPLETION_LIST list, HANDLE *event) return FALSE; } +/*********************************************************************** + * QueryUmsThreadInformation (KERNEL32.@) + */ +BOOL WINAPI QueryUmsThreadInformation(PUMS_CONTEXT ctx, UMS_THREAD_INFO_CLASS class, + void *buf, ULONG length, ULONG *ret_length) +{ + FIXME( "%p,%08x,%p,%08x,%p: stub\n", ctx, class, buf, length, ret_length ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + /********************************************************************** * BaseFlushAppcompatCache (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index a752d69..cff15b0 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2488,6 +2488,7 @@ WINBASEAPI BOOL WINAPI QueryMemoryResourceNotification(HANDLE,PBOOL); WINBASEAPI BOOL WINAPI QueryPerformanceCounter(LARGE_INTEGER*); WINBASEAPI BOOL WINAPI QueryPerformanceFrequency(LARGE_INTEGER*); WINBASEAPI BOOL WINAPI QueryThreadCycleTime(HANDLE,PULONG64); +WINBASEAPI BOOL WINAPI QueryUmsThreadInformation(PUMS_CONTEXT,UMS_THREAD_INFO_CLASS,PVOID,ULONG,PULONG); WINBASEAPI DWORD WINAPI QueueUserAPC(PAPCFUNC,HANDLE,ULONG_PTR); WINBASEAPI BOOL WINAPI QueueUserWorkItem(LPTHREAD_START_ROUTINE,PVOID,ULONG); WINBASEAPI void WINAPI RaiseException(DWORD,DWORD,DWORD,const ULONG_PTR *); -- 1.9.1

1 0

[PATCH 11/14] kernel32: Add GetUmsCompletionListEvent stub
by Alistair Leslie-Hughes 05 Mar '18

05 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 10 ++++++++++ include/winbase.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 31b305a..23bd0b4 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -866,7 +866,7 @@ @ stdcall GetTimeZoneInformationForYear(long ptr ptr) @ stdcall GetThreadUILanguage() # @ stub GetUILanguageInfo -# @ stub -arch=x86_64 GetUmsCompletionListEvent +@ stdcall -arch=x86_64 GetUmsCompletionListEvent(ptr ptr) # @ stub -arch=x86_64 GetUmsSystemThreadInformation @ stdcall GetUserDefaultLCID() @ stdcall GetUserDefaultLangID() diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index be3d55c..3a8b9af 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4322,6 +4322,16 @@ PUMS_CONTEXT WINAPI GetNextUmsListItem(PUMS_CONTEXT ctx) return NULL; } +/*********************************************************************** + * GetUmsCompletionListEvent (KERNEL32.@) + */ +BOOL WINAPI GetUmsCompletionListEvent(PUMS_COMPLETION_LIST list, HANDLE *event) +{ + FIXME( "%p,%p: stub\n", list, event ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + /********************************************************************** * BaseFlushAppcompatCache (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index 225f7ad..a752d69 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2248,6 +2248,7 @@ WINBASEAPI BOOL WINAPI GetThreadPriorityBoost(HANDLE,PBOOL); WINBASEAPI BOOL WINAPI GetThreadSelectorEntry(HANDLE,DWORD,LPLDT_ENTRY); WINBASEAPI BOOL WINAPI GetThreadTimes(HANDLE,LPFILETIME,LPFILETIME,LPFILETIME,LPFILETIME); WINADVAPI BOOL WINAPI GetTokenInformation(HANDLE,TOKEN_INFORMATION_CLASS,LPVOID,DWORD,LPDWORD); +WINBASEAPI BOOL WINAPI GetUmsCompletionListEvent(PUMS_COMPLETION_LIST, PHANDLE); WINADVAPI BOOL WINAPI GetUserNameA(LPSTR,LPDWORD); WINADVAPI BOOL WINAPI GetUserNameW(LPWSTR,LPDWORD); #define GetUserName WINELIB_NAME_AW(GetUserName) -- 1.9.1

1 0

[PATCH 10/14] kernel32: Add GetNextUmsListItem stub
by Alistair Leslie-Hughes 05 Mar '18

05 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 10 ++++++++++ include/winbase.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 3a295fb..31b305a 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -735,7 +735,7 @@ # @ stub GetNamedPipeServerProcessId # @ stub GetNamedPipeServerSessionId @ stdcall GetNativeSystemInfo(ptr) -# @ stub -arch=x86_64 GetNextUmsListItem +@ stdcall -arch=x86_64 GetNextUmsListItem(ptr) @ stub GetNextVDMCommand @ stub GetNlsSectionName # @ stub GetNLSVersion diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 126aa25..be3d55c 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4312,6 +4312,16 @@ PUMS_CONTEXT WINAPI GetCurrentUmsThread(void) return FALSE; } +/*********************************************************************** + * GetNextUmsListItem (KERNEL32.@) + */ +PUMS_CONTEXT WINAPI GetNextUmsListItem(PUMS_CONTEXT ctx) +{ + FIXME( "%p: stub\n", ctx ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return NULL; +} + /********************************************************************** * BaseFlushAppcompatCache (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index 4753015..225f7ad 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2147,6 +2147,7 @@ WINBASEAPI BOOL WINAPI GetNamedPipeHandleStateW(HANDLE,LPDWORD,LPDWORD,LP WINBASEAPI BOOL WINAPI GetNamedPipeInfo(HANDLE,LPDWORD,LPDWORD,LPDWORD,LPDWORD); WINBASEAPI BOOL WINAPI GetNamedPipeClientProcessId(HANDLE,PULONG); WINBASEAPI VOID WINAPI GetNativeSystemInfo(LPSYSTEM_INFO); +WINBASEAPI PUMS_CONTEXT WINAPI GetNextUmsListItem(PUMS_CONTEXT); WINBASEAPI BOOL WINAPI GetNumaProcessorNode(UCHAR,PUCHAR); WINADVAPI BOOL WINAPI GetNumberOfEventLogRecords(HANDLE,PDWORD); WINADVAPI BOOL WINAPI GetOldestEventLogRecord(HANDLE,PDWORD); -- 1.9.1

1 0

[PATCH 09/14] kernel32: Add GetCurrentUmsThread stub
by Alistair Leslie-Hughes 05 Mar '18

05 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 10 ++++++++++ include/winbase.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index b2b2422..3a295fb 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -637,7 +637,7 @@ @ stdcall GetCurrentProcessorNumberEx(ptr) ntdll.RtlGetCurrentProcessorNumberEx @ stdcall -norelay GetCurrentThread() @ stdcall -norelay GetCurrentThreadId() -# @ stub -arch=x86_64 GetCurrentUmsThread +@ stdcall -arch=x86_64 GetCurrentUmsThread() @ stdcall GetDateFormatA(long long ptr str ptr long) @ stdcall GetDateFormatEx(wstr long ptr wstr ptr long wstr) @ stdcall GetDateFormatW(long long ptr wstr ptr long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 92146e1..126aa25 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4302,6 +4302,16 @@ BOOL WINAPI ExecuteUmsThread(PUMS_CONTEXT ctx) return FALSE; } +/*********************************************************************** + * GetCurrentUmsThread (KERNEL32.@) + */ +PUMS_CONTEXT WINAPI GetCurrentUmsThread(void) +{ + FIXME( "stub\n" ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + /********************************************************************** * BaseFlushAppcompatCache (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index 8bd65c7..4753015 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2073,6 +2073,7 @@ WINBASEAPI DWORD WINAPI GetCurrentProcessorNumber(void); WINBASEAPI VOID WINAPI GetCurrentProcessorNumberEx(PPROCESSOR_NUMBER); WINBASEAPI HANDLE WINAPI GetCurrentThread(void); #define GetCurrentTime() GetTickCount() +WINBASEAPI PUMS_CONTEXT WINAPI GetCurrentUmsThread(void); WINBASEAPI BOOL WINAPI GetDefaultCommConfigA(LPCSTR,LPCOMMCONFIG,LPDWORD); WINBASEAPI BOOL WINAPI GetDefaultCommConfigW(LPCWSTR,LPCOMMCONFIG,LPDWORD); #define GetDefaultCommConfig WINELIB_NAME_AW(GetDefaultCommConfig) -- 1.9.1

1 0

[PATCH 08/14] kernel32: Add ExecuteUmsThread stub
by Alistair Leslie-Hughes 05 Mar '18

05 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 10 ++++++++++ include/winbase.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 09af923..b2b2422 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -437,7 +437,7 @@ @ stdcall -arch=x86_64 EnterUmsSchedulingMode(ptr) @ stdcall EraseTape(ptr long long) @ stdcall EscapeCommFunction(long long) -# @ stub -arch=x86_64 ExecuteUmsThread +@ stdcall -arch=x86_64 ExecuteUmsThread(ptr) @ stdcall ExitProcess(long) @ stdcall ExitThread(long) @ stub ExitVDM diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 5de7c97..92146e1 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4292,6 +4292,16 @@ BOOL WINAPI EnterUmsSchedulingMode(UMS_SCHEDULER_STARTUP_INFO *info) return FALSE; } +/*********************************************************************** + * ExecuteUmsThread (KERNEL32.@) + */ +BOOL WINAPI ExecuteUmsThread(PUMS_CONTEXT ctx) +{ + FIXME( "%p: stub\n", ctx ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + /********************************************************************** * BaseFlushAppcompatCache (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index 3cf28af..8bd65c7 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1957,6 +1957,7 @@ WINADVAPI BOOL WINAPI EqualPrefixSid(PSID,PSID); WINBASEAPI DWORD WINAPI EraseTape(HANDLE,DWORD,BOOL); WINBASEAPI VOID DECLSPEC_NORETURN WINAPI ExitProcess(DWORD); WINBASEAPI VOID DECLSPEC_NORETURN WINAPI ExitThread(DWORD); +WINBASEAPI BOOL WINAPI ExecuteUmsThread(PUMS_CONTEXT); WINBASEAPI DWORD WINAPI ExpandEnvironmentStringsA(LPCSTR,LPSTR,DWORD); WINBASEAPI DWORD WINAPI ExpandEnvironmentStringsW(LPCWSTR,LPWSTR,DWORD); #define ExpandEnvironmentStrings WINELIB_NAME_AW(ExpandEnvironmentStrings) -- 1.9.1

1 0

[PATCH 07/14] kernel32: Add EnterUmsSchedulingMode stub
by Alistair Leslie-Hughes 05 Mar '18

05 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 10 ++++++++++ include/winbase.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 86edcfd..09af923 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -434,7 +434,7 @@ @ stdcall EnumUILanguagesW(ptr long long) # @ stub EnumerateLocalComputerNamesA # @ stub EnumerateLocalComputerNamesW -# @ stub -arch=x86_64 EnterUmsSchedulingMode +@ stdcall -arch=x86_64 EnterUmsSchedulingMode(ptr) @ stdcall EraseTape(ptr long long) @ stdcall EscapeCommFunction(long long) # @ stub -arch=x86_64 ExecuteUmsThread diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 276061d..5de7c97 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4282,6 +4282,16 @@ BOOL WINAPI DequeueUmsCompletionListItems(void *list, DWORD timeout, PUMS_CONTEX return FALSE; } +/*********************************************************************** + * EnterUmsSchedulingMode (KERNEL32.@) + */ +BOOL WINAPI EnterUmsSchedulingMode(UMS_SCHEDULER_STARTUP_INFO *info) +{ + FIXME( "%p: stub\n", info ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + /********************************************************************** * BaseFlushAppcompatCache (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index 7d0eaa6..3cf28af 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1939,6 +1939,7 @@ WINBASEAPI BOOL WINAPI EndUpdateResourceA(HANDLE,BOOL); WINBASEAPI BOOL WINAPI EndUpdateResourceW(HANDLE,BOOL); #define EndUpdateResource WINELIB_NAME_AW(EndUpdateResource) WINBASEAPI void WINAPI EnterCriticalSection(CRITICAL_SECTION *lpCrit); +WINBASEAPI BOOL WINAPI EnterUmsSchedulingMode(PUMS_SCHEDULER_STARTUP_INFO); WINBASEAPI BOOL WINAPI EnumResourceLanguagesA(HMODULE,LPCSTR,LPCSTR,ENUMRESLANGPROCA,LONG_PTR); WINBASEAPI BOOL WINAPI EnumResourceLanguagesW(HMODULE,LPCWSTR,LPCWSTR,ENUMRESLANGPROCW,LONG_PTR); #define EnumResourceLanguages WINELIB_NAME_AW(EnumResourceLanguages) -- 1.9.1

1 0

[PATCH 06/14] kernel32: Add DequeueUmsCompletionListItems stub
by Alistair Leslie-Hughes 05 Mar '18

05 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 10 ++++++++++ include/winbase.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c780e3a..86edcfd 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -377,7 +377,7 @@ @ stdcall -arch=x86_64 DeleteUmsThreadContext(ptr) @ stdcall DeleteVolumeMountPointA(str) @ stdcall DeleteVolumeMountPointW(wstr) -# @ stub -arch=x86_64 DequeueUmsCompletionListItems +@ stdcall -arch=x86_64 DequeueUmsCompletionListItems(ptr long ptr) @ stdcall DeviceIoControl(long long ptr long ptr long ptr ptr) @ stdcall DisableThreadLibraryCalls(long) @ stdcall DisconnectNamedPipe(long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index e37ba2e..276061d 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4272,6 +4272,16 @@ BOOL WINAPI DeleteUmsThreadContext(PUMS_CONTEXT ctx) return FALSE; } +/*********************************************************************** + * DequeueUmsCompletionListItems (KERNEL32.@) + */ +BOOL WINAPI DequeueUmsCompletionListItems(void *list, DWORD timeout, PUMS_CONTEXT *ctx) +{ + FIXME( "%p,%08x,%p: stub\n", list, timeout, ctx ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + /********************************************************************** * BaseFlushAppcompatCache (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index f39d659..7d0eaa6 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1916,6 +1916,7 @@ WINBASEAPI BOOL WINAPI DeleteUmsThreadContext(PUMS_CONTEXT); WINBASEAPI BOOL WINAPI DeleteVolumeMountPointA(LPCSTR); WINBASEAPI BOOL WINAPI DeleteVolumeMountPointW(LPCWSTR); #define DeleteVolumeMountPoint WINELIB_NAME_AW(DeleteVolumeMountPoint) +WINBASEAPI BOOL WINAPI DequeueUmsCompletionListItems(void *, DWORD, PUMS_CONTEXT *); WINADVAPI BOOL WINAPI DeregisterEventSource(HANDLE); WINADVAPI BOOL WINAPI DestroyPrivateObjectSecurity(PSECURITY_DESCRIPTOR*); WINBASEAPI BOOL WINAPI DeviceIoControl(HANDLE,DWORD,LPVOID,DWORD,LPVOID,DWORD,LPDWORD,LPOVERLAPPED); -- 1.9.1

1 0

[PATCH 05/14] kernel32: Add DeleteUmsThreadContext stub
by Alistair Leslie-Hughes 05 Mar '18

05 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 10 ++++++++++ include/winbase.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 7a2a6ab..c780e3a 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -374,7 +374,7 @@ @ stdcall DeleteTimerQueueEx (long long) @ stdcall DeleteTimerQueueTimer(long long long) @ stdcall -arch=x86_64 DeleteUmsCompletionList(ptr) -# @ stub -arch=x86_64 DeleteUmsThreadContext +@ stdcall -arch=x86_64 DeleteUmsThreadContext(ptr) @ stdcall DeleteVolumeMountPointA(str) @ stdcall DeleteVolumeMountPointW(wstr) # @ stub -arch=x86_64 DequeueUmsCompletionListItems diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index f5069f4..e37ba2e 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4262,6 +4262,16 @@ BOOL WINAPI DeleteUmsCompletionList(PUMS_COMPLETION_LIST list) return FALSE; } +/*********************************************************************** + * DeleteUmsThreadContext (KERNEL32.@) + */ +BOOL WINAPI DeleteUmsThreadContext(PUMS_CONTEXT ctx) +{ + FIXME( "%p: stub\n", ctx ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + /********************************************************************** * BaseFlushAppcompatCache (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index 69d97c9..f39d659 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1912,6 +1912,7 @@ WINBASEAPI BOOL WINAPI DeleteTimerQueue(HANDLE); WINBASEAPI BOOL WINAPI DeleteTimerQueueEx(HANDLE,HANDLE); WINBASEAPI BOOL WINAPI DeleteTimerQueueTimer(HANDLE,HANDLE,HANDLE); WINBASEAPI BOOL WINAPI DeleteUmsCompletionList(PUMS_COMPLETION_LIST); +WINBASEAPI BOOL WINAPI DeleteUmsThreadContext(PUMS_CONTEXT); WINBASEAPI BOOL WINAPI DeleteVolumeMountPointA(LPCSTR); WINBASEAPI BOOL WINAPI DeleteVolumeMountPointW(LPCWSTR); #define DeleteVolumeMountPoint WINELIB_NAME_AW(DeleteVolumeMountPoint) -- 1.9.1

1 0

[PATCH 04/14] kernel32: Add DeleteUmsCompletionList stub
by Alistair Leslie-Hughes 05 Mar '18

05 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 10 ++++++++++ include/winbase.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 6c4804c..7a2a6ab 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -373,7 +373,7 @@ @ stdcall DeleteTimerQueue(long) @ stdcall DeleteTimerQueueEx (long long) @ stdcall DeleteTimerQueueTimer(long long long) -# @ stub -arch=x86_64 DeleteUmsCompletionList +@ stdcall -arch=x86_64 DeleteUmsCompletionList(ptr) # @ stub -arch=x86_64 DeleteUmsThreadContext @ stdcall DeleteVolumeMountPointA(str) @ stdcall DeleteVolumeMountPointW(wstr) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 4075cbf..f5069f4 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4252,6 +4252,16 @@ void WINAPI DeleteProcThreadAttributeList(struct _PROC_THREAD_ATTRIBUTE_LIST *li return; } +/*********************************************************************** + * DeleteUmsCompletionList (KERNEL32.@) + */ +BOOL WINAPI DeleteUmsCompletionList(PUMS_COMPLETION_LIST list) +{ + FIXME( "%p: stub\n", list ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + /********************************************************************** * BaseFlushAppcompatCache (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index d891b04..69d97c9 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1911,6 +1911,7 @@ WINBASEAPI void WINAPI DeleteProcThreadAttributeList(struct _PROC_THREAD_ WINBASEAPI BOOL WINAPI DeleteTimerQueue(HANDLE); WINBASEAPI BOOL WINAPI DeleteTimerQueueEx(HANDLE,HANDLE); WINBASEAPI BOOL WINAPI DeleteTimerQueueTimer(HANDLE,HANDLE,HANDLE); +WINBASEAPI BOOL WINAPI DeleteUmsCompletionList(PUMS_COMPLETION_LIST); WINBASEAPI BOOL WINAPI DeleteVolumeMountPointA(LPCSTR); WINBASEAPI BOOL WINAPI DeleteVolumeMountPointW(LPCWSTR); #define DeleteVolumeMountPoint WINELIB_NAME_AW(DeleteVolumeMountPoint) -- 1.9.1

1 0

[PATCH 03/14] kernel32: Add CreateUmsThreadContext stub
by Alistair Leslie-Hughes 05 Mar '18

05 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 10 ++++++++++ include/winbase.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 7f5f439..6c4804c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -341,7 +341,7 @@ @ stdcall CreateTimerQueueTimer(ptr long ptr ptr long long long) @ stdcall CreateToolhelp32Snapshot(long long) @ stdcall -arch=x86_64 CreateUmsCompletionList(ptr) -# @ stub -arch=x86_64 CreateUmsThreadContext +@ stdcall -arch=x86_64 CreateUmsThreadContext(ptr) @ stub CreateVirtualBuffer @ stdcall CreateWaitableTimerA(ptr long str) @ stdcall CreateWaitableTimerExA(ptr str long long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 8596be4..4075cbf 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4235,6 +4235,16 @@ BOOL WINAPI CreateUmsCompletionList(PUMS_COMPLETION_LIST *list) } /*********************************************************************** + * CreateUmsThreadContext (KERNEL32.@) + */ +BOOL WINAPI CreateUmsThreadContext(PUMS_CONTEXT *ctx) +{ + FIXME( "%p: stub\n", ctx ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/*********************************************************************** * DeleteProcThreadAttributeList (KERNEL32.@) */ void WINAPI DeleteProcThreadAttributeList(struct _PROC_THREAD_ATTRIBUTE_LIST *list) diff --git a/include/winbase.h b/include/winbase.h index f94f4c7..d891b04 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1877,6 +1877,7 @@ WINBASEAPI HANDLE WINAPI CreateThread(LPSECURITY_ATTRIBUTES,SIZE_T,LPTHREAD WINBASEAPI HANDLE WINAPI CreateTimerQueue(void); WINBASEAPI BOOL WINAPI CreateTimerQueueTimer(PHANDLE,HANDLE,WAITORTIMERCALLBACK,PVOID,DWORD,DWORD,ULONG); WINBASEAPI BOOL WINAPI CreateUmsCompletionList(PUMS_COMPLETION_LIST*); +WINBASEAPI BOOL WINAPI CreateUmsThreadContext(PUMS_CONTEXT*); WINBASEAPI HANDLE WINAPI CreateWaitableTimerA(LPSECURITY_ATTRIBUTES,BOOL,LPCSTR); WINBASEAPI HANDLE WINAPI CreateWaitableTimerW(LPSECURITY_ATTRIBUTES,BOOL,LPCWSTR); #define CreateWaitableTimer WINELIB_NAME_AW(CreateWaitableTimer) -- 1.9.1

1 0

[PATCH 02/14] kernel32: Add CreateUmsCompletionList stub
by Alistair Leslie-Hughes 05 Mar '18

05 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 10 ++++++++++ include/winbase.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ee11c42..7f5f439 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -340,7 +340,7 @@ @ stdcall CreateTimerQueue () @ stdcall CreateTimerQueueTimer(ptr long ptr ptr long long long) @ stdcall CreateToolhelp32Snapshot(long long) -# @ stub -arch=x86_64 CreateUmsCompletionList +@ stdcall -arch=x86_64 CreateUmsCompletionList(ptr) # @ stub -arch=x86_64 CreateUmsThreadContext @ stub CreateVirtualBuffer @ stdcall CreateWaitableTimerA(ptr long str) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index b883087..8596be4 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4225,6 +4225,16 @@ BOOL WINAPI UpdateProcThreadAttribute(struct _PROC_THREAD_ATTRIBUTE_LIST *list, } /*********************************************************************** + * CreateUmsCompletionList (KERNEL32.@) + */ +BOOL WINAPI CreateUmsCompletionList(PUMS_COMPLETION_LIST *list) +{ + FIXME( "%p: stub\n", list ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/*********************************************************************** * DeleteProcThreadAttributeList (KERNEL32.@) */ void WINAPI DeleteProcThreadAttributeList(struct _PROC_THREAD_ATTRIBUTE_LIST *list) diff --git a/include/winbase.h b/include/winbase.h index aefedfd..f94f4c7 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1876,6 +1876,7 @@ WINBASEAPI DWORD WINAPI CreateTapePartition(HANDLE,DWORD,DWORD,DWORD); WINBASEAPI HANDLE WINAPI CreateThread(LPSECURITY_ATTRIBUTES,SIZE_T,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPDWORD); WINBASEAPI HANDLE WINAPI CreateTimerQueue(void); WINBASEAPI BOOL WINAPI CreateTimerQueueTimer(PHANDLE,HANDLE,WAITORTIMERCALLBACK,PVOID,DWORD,DWORD,ULONG); +WINBASEAPI BOOL WINAPI CreateUmsCompletionList(PUMS_COMPLETION_LIST*); WINBASEAPI HANDLE WINAPI CreateWaitableTimerA(LPSECURITY_ATTRIBUTES,BOOL,LPCSTR); WINBASEAPI HANDLE WINAPI CreateWaitableTimerW(LPSECURITY_ATTRIBUTES,BOOL,LPCWSTR); #define CreateWaitableTimer WINELIB_NAME_AW(CreateWaitableTimer) -- 1.9.1

1 0

[PATCH 01/14] include: Add UMS typedef's
by Alistair Leslie-Hughes 05 Mar '18

05 Mar '18

Based off patch by Dmitry Timoshkov. Series Fixes: https://bugs.winehq.org/show_bug.cgi?id=44619 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/winbase.h | 14 ++++++++++++++ include/winnt.h | 21 +++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/include/winbase.h b/include/winbase.h index 9c7908a..aefedfd 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1694,6 +1694,20 @@ typedef enum _PROC_THREAD_ATTRIBUTE_NUM #define SYMBOLIC_LINK_FLAG_DIRECTORY (0x1) #define VALID_SYMBOLIC_LINK_FLAGS SYMBOLIC_LINK_FLAG_DIRECTORY +typedef void *PUMS_CONTEXT; +typedef void *PUMS_COMPLETION_LIST; +typedef PRTL_UMS_SCHEDULER_ENTRY_POINT PUMS_SCHEDULER_ENTRY_POINT; +typedef struct _UMS_SCHEDULER_STARTUP_INFO +{ + ULONG UmsVersion; + PUMS_COMPLETION_LIST CompletionList; + PUMS_SCHEDULER_ENTRY_POINT SchedulerProc; + PVOID SchedulerParam; +} UMS_SCHEDULER_STARTUP_INFO, *PUMS_SCHEDULER_STARTUP_INFO; + +typedef enum _RTL_UMS_SCHEDULER_REASON UMS_SCHEDULER_REASON; +typedef enum _RTL_UMS_THREAD_INFO_CLASS UMS_THREAD_INFO_CLASS, *PUMS_THREAD_INFO_CLASS; + WINBASEAPI BOOL WINAPI ActivateActCtx(HANDLE,ULONG_PTR *); WINADVAPI BOOL WINAPI AddAccessAllowedAce(PACL,DWORD,DWORD,PSID); WINADVAPI BOOL WINAPI AddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID); diff --git a/include/winnt.h b/include/winnt.h index 56b533c..e602c1f 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6123,6 +6123,27 @@ typedef VOID (CALLBACK *PTP_WIN32_IO_CALLBACK)(PTP_CALLBACK_INSTANCE,PVOID,PVOID NTSYSAPI BOOLEAN NTAPI RtlGetProductInfo(DWORD,DWORD,DWORD,DWORD,PDWORD); +typedef enum _RTL_UMS_THREAD_INFO_CLASS +{ + UmsThreadInvalidInfoClass, + UmsThreadUserContext, + UmsThreadPriority, + UmsThreadAffinity, + UmsThreadTeb, + UmsThreadIsSuspended, + UmsThreadIsTerminated, + UmsThreadMaxInfoClass +} RTL_UMS_THREAD_INFO_CLASS, *PRTL_UMS_THREAD_INFO_CLASS; + +typedef enum _RTL_UMS_SCHEDULER_REASON +{ + UmsSchedulerStartup, + UmsSchedulerThreadBlocked, + UmsSchedulerThreadYield, +} RTL_UMS_SCHEDULER_REASON, *PRTL_UMS_SCHEDULER_REASON; + +typedef void (CALLBACK *PRTL_UMS_SCHEDULER_ENTRY_POINT)(RTL_UMS_SCHEDULER_REASON,ULONG_PTR,PVOID); + #ifdef __cplusplus } #endif -- 1.9.1

1 0

[PATCH] include: Add missing NTSTATUS defines
by Alistair Leslie-Hughes 05 Mar '18

05 Mar '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/ntstatus.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/ntstatus.h b/include/ntstatus.h index 86dad85..735b6c2 100644 --- a/include/ntstatus.h +++ b/include/ntstatus.h @@ -990,6 +990,10 @@ #define STATUS_WOW_ASSERTION ((NTSTATUS) 0xC0009898) +#define STATUS_INVALID_SIGNATURE ((NTSTATUS) 0xC000A000) +#define STATUS_HMAC_NOT_SUPPORTED ((NTSTATUS) 0xC000A001) +#define STATUS_AUTH_TAG_MISMATCH ((NTSTATUS) 0xC000A002) + #define RPC_NT_INVALID_STRING_BINDING ((NTSTATUS) 0xC0020001) #define RPC_NT_WRONG_KIND_OF_BINDING ((NTSTATUS) 0xC0020002) #define RPC_NT_INVALID_BINDING ((NTSTATUS) 0xC0020003) -- 1.9.1

1 0

Google Summer of Code 2018
by André Hentschel 04 Mar '18

04 Mar '18

Hi, I'm currently doing the Org application for Wine, hopefully we'll have a great GSoC year! For now, I need two things from you: - Go through https://wiki.winehq.org/Summer_Of_Code and add/cleanup/remove ideas - Send me a mail if you would like to be a mentor (I will also invite usual mentor candidates to catch the lazy people :) )

5 5

[PATCH v3 1/3] ntdll: Implement ProcessImageFileNameWin32 in NtQueryInformationProcess.
by Zebediah Figura 04 Mar '18

04 Mar '18

From: Michael Müller <michael(a)fds-team.de> This patch allows Process Hacker to show the filename, icon and description of an executable. Since ProcessImageFileName incorrectly returns a Win32 path, we can simply reuse the existing implementation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: update comment v3: fix kernel32:process tests dlls/kernel32/tests/process.c | 16 ++++++++++------ dlls/ntdll/process.c | 4 ++-- include/winternl.h | 9 +++++++++ 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index cbca00e..b1a4539 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3501,16 +3501,16 @@ static void test_process_info(void) sizeof(buf) /* ProcessHandleTracing */, sizeof(ULONG) /* ProcessIoPriority */, sizeof(ULONG) /* ProcessExecuteFlags */, -#if 0 /* FIXME: Add remaining classes */ - ProcessResourceManagement, - sizeof(ULONG) /* ProcessCookie */, + 0 /* FIXME: sizeof(?) ProcessTlsInformation */, + 0 /* FIXME: sizeof(?) ProcessCookie */, sizeof(SECTION_IMAGE_INFORMATION) /* ProcessImageInformation */, - sizeof(PROCESS_CYCLE_TIME_INFORMATION) /* ProcessCycleTime */, + 0 /* FIXME: sizeof(PROCESS_CYCLE_TIME_INFORMATION) ProcessCycleTime */, sizeof(ULONG) /* ProcessPagePriority */, 40 /* ProcessInstrumentationCallback */, - sizeof(PROCESS_STACK_ALLOCATION_INFORMATION) /* ProcessThreadStackAllocation */, - sizeof(PROCESS_WS_WATCH_INFORMATION_EX[]) /* ProcessWorkingSetWatchEx */, + 0 /* FIXME: sizeof(PROCESS_STACK_ALLOCATION_INFORMATION) ProcessThreadStackAllocation */, + 0 /* FIXME: sizeof(PROCESS_WS_WATCH_INFORMATION_EX[]) ProcessWorkingSetWatchEx */, sizeof(buf) /* ProcessImageFileNameWin32 */, +#if 0 /* FIXME: Add remaining classes */ sizeof(HANDLE) /* ProcessImageFileMapping */, sizeof(PROCESS_AFFINITY_UPDATE_MODE) /* ProcessAffinityUpdateMode */, sizeof(PROCESS_MEMORY_ALLOCATION_MODE) /* ProcessMemoryAllocationMode */, @@ -3582,6 +3582,9 @@ static void test_process_info(void) case ProcessDefaultHardErrorMode: case ProcessHandleCount: case ProcessImageFileName: + case ProcessImageInformation: + case ProcessPagePriority: + case ProcessImageFileNameWin32: ok(status == STATUS_SUCCESS, "for info %u expected STATUS_SUCCESS, got %08x (ret_len %u)\n", i, status, ret_len); break; @@ -3599,6 +3602,7 @@ static void test_process_info(void) case ProcessExecuteFlags: case ProcessDebugPort: case ProcessDebugFlags: + case ProcessCookie: todo_wine ok(status == STATUS_ACCESS_DENIED, "for info %u expected STATUS_ACCESS_DENIED, got %08x (ret_len %u)\n", i, status, ret_len); break; diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 835d7e6..b299287 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -515,8 +515,8 @@ NTSTATUS WINAPI NtQueryInformationProcess( } break; case ProcessImageFileName: - /* FIXME: this will return a DOS path. Windows returns an NT path. Changing this would require also changing kernel32.QueryFullProcessImageName. - * The latter may be harder because of the lack of RtlNtPathNameToDosPathName. */ + /* FIXME: Should return a device path */ + case ProcessImageFileNameWin32: SERVER_START_REQ(get_dll_info) { UNICODE_STRING *image_file_name_str = ProcessInformation; diff --git a/include/winternl.h b/include/winternl.h index c3cca80..6733977 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -853,6 +853,15 @@ typedef enum _PROCESSINFOCLASS { ProcessDebugFlags = 31, ProcessHandleTracing = 32, ProcessExecuteFlags = 34, + ProcessTlsInformation = 35, + ProcessCookie = 36, + ProcessImageInformation = 37, + ProcessCycleTime = 38, + ProcessPagePriority = 39, + ProcessInstrumentationCallback = 40, + ProcessThreadStackAllocation = 41, + ProcessWorkingSetWatchEx = 42, + ProcessImageFileNameWin32 = 43, MaxProcessInfoClass } PROCESSINFOCLASS, PROCESS_INFORMATION_CLASS; -- 2.7.4

2 3

GSOC
by Abhishek Kumar 04 Mar '18

04 Mar '18

Hi i want to know the following. How does copy paste operation of explorer.exe work? what is the working phenomena of drag and drop?Please reply soon as possible.

2 1

[PATCH] sfc_os: Set an error code in SfcGetNextProtectedFile stub.
by Zebediah Figura 04 Mar '18

04 Mar '18

From: Michael Müller <michael(a)fds-team.de> Fixes https://bugs.winehq.org/show_bug.cgi?id=44654 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/sfc_os/sfc_os.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/sfc_os/sfc_os.c b/dlls/sfc_os/sfc_os.c index f4515f2..6193dda 100644 --- a/dlls/sfc_os/sfc_os.c +++ b/dlls/sfc_os/sfc_os.c @@ -55,6 +55,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) BOOL WINAPI SfcGetNextProtectedFile(HANDLE handle, PROTECTED_FILE_DATA *data) { FIXME("%p %p\n", handle, data); + + SetLastError(ERROR_NO_MORE_FILES); return FALSE; } -- 2.7.4

1 0

Gsoc 2018
by Abhishek Kumar 04 Mar '18

04 Mar '18

Hi i want to know the following. How does copy paste operation of explorer.exe work? what is the working phenomena of drag and drop?

1 0

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-devel