July 2020 - Wine-Commits - list.winehq.org

Matteo Bruni : wined3d: Update comment about sample_c_lz translation in GLSL.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 86459002f15b6b1fc2785a6511f6833adf334d46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86459002f15b6b1fc2785a65… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 16 18:50:06 2020 +0200 wined3d: Update comment about sample_c_lz translation in GLSL. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 66e90b1768..a14682c95a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6053,10 +6053,9 @@ static void shader_glsl_sample(const struct wined3d_shader_instruction *ins) shader_glsl_release_sample_function(ins->ctx, &sample_function); } -/* GLSL doesn't provide a function to sample from level zero with depth - * comparison for array textures and cube textures. We use textureGrad*() - * to implement sample_c_lz. - */ +/* Unless EXT_texture_shadow_lod is available, GLSL doesn't provide a function + * to sample from level zero with depth comparison for array textures and cube + * textures. We use textureGrad*() to implement sample_c_lz in that case. */ static void shader_glsl_gen_sample_c_lz_emulation(const struct wined3d_shader_instruction *ins, unsigned int sampler_bind_idx, const struct glsl_sample_function *sample_function, unsigned int coord_size, const char *coord_param, const char *ref_param)

1 0

Matteo Bruni : wined3d: Disable depth textures with backbuffer ORM.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 29dc8534f15d4265caf1beb1a270627a301cc5ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=29dc8534f15d4265caf1beb1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 16 18:50:04 2020 +0200 wined3d: Disable depth textures with backbuffer ORM. We currently don't have any way to copy the depth buffer from the DRAWABLE to the TEXTURE location, aside from FBOs. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index eaa391fafb..8d790c5294 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3034,15 +3034,17 @@ static void query_internal_format(struct wined3d_adapter *adapter, if ((format->f.flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_SRGB_WRITE) && !srgb_write_supported) format_clear_flag(&format->f, WINED3DFMT_FLAG_SRGB_WRITE); + } - if (!gl_info->supported[ARB_DEPTH_TEXTURE] && (format->f.depth_size || format->f.stencil_size)) - { - format->f.flags[WINED3D_GL_RES_TYPE_TEX_1D] &= ~WINED3DFMT_FLAG_TEXTURE; - format->f.flags[WINED3D_GL_RES_TYPE_TEX_2D] &= ~WINED3DFMT_FLAG_TEXTURE; - format->f.flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - format->f.flags[WINED3D_GL_RES_TYPE_TEX_CUBE] &= ~WINED3DFMT_FLAG_TEXTURE; - format->f.flags[WINED3D_GL_RES_TYPE_TEX_RECT] &= ~WINED3DFMT_FLAG_TEXTURE; - } + if ((!gl_info->supported[ARB_DEPTH_TEXTURE] || wined3d_settings.offscreen_rendering_mode != ORM_FBO) + && (format->f.depth_size || format->f.stencil_size)) + { + TRACE("Disabling texturing support for depth / stencil format %s.\n", debug_d3dformat(format->f.id)); + format->f.flags[WINED3D_GL_RES_TYPE_TEX_1D] &= ~WINED3DFMT_FLAG_TEXTURE; + format->f.flags[WINED3D_GL_RES_TYPE_TEX_2D] &= ~WINED3DFMT_FLAG_TEXTURE; + format->f.flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + format->f.flags[WINED3D_GL_RES_TYPE_TEX_CUBE] &= ~WINED3DFMT_FLAG_TEXTURE; + format->f.flags[WINED3D_GL_RES_TYPE_TEX_RECT] &= ~WINED3DFMT_FLAG_TEXTURE; } query_view_class(format);

1 0

Jacek Caban : server: Remove support for SET_CONSOLE_INPUT_INFO_ACTIVE_SB.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: d2b0c10000ad53dbc0aa717b31f18f9078f35c7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2b0c10000ad53dbc0aa717b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 17 13:56:09 2020 +0200 server: Remove support for SET_CONSOLE_INPUT_INFO_ACTIVE_SB. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 5 ++--- server/console.c | 26 +------------------------- server/protocol.def | 2 -- server/request.h | 1 - server/trace.c | 1 - 5 files changed, 3 insertions(+), 32 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 1176d9cbea..f50e6a213c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1833,7 +1833,7 @@ struct alloc_console_reply { struct reply_header __header; obj_handle_t handle_in; - obj_handle_t event; + char __pad_12[4]; }; @@ -1916,7 +1916,6 @@ struct set_console_input_info_reply { struct reply_header __header; }; -#define SET_CONSOLE_INPUT_INFO_ACTIVE_SB 0x01 #define SET_CONSOLE_INPUT_INFO_TITLE 0x02 #define SET_CONSOLE_INPUT_INFO_HISTORY_MODE 0x04 #define SET_CONSOLE_INPUT_INFO_HISTORY_SIZE 0x08 @@ -6452,7 +6451,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 628 +#define SERVER_PROTOCOL_VERSION 629 /* ### protocol_version end ### */ diff --git a/server/console.c b/server/console.c index 149a31dd57..3c562cb507 100644 --- a/server/console.c +++ b/server/console.c @@ -830,37 +830,13 @@ static int set_console_input_info( const struct set_console_input_info_request * struct condrv_renderer_event evt; if (!(console = console_input_get( req->handle, FILE_WRITE_PROPERTIES ))) goto error; - if (console_input_is_bare(console) && - (req->mask & (SET_CONSOLE_INPUT_INFO_ACTIVE_SB| - SET_CONSOLE_INPUT_INFO_WIN))) + if (console_input_is_bare(console) && (req->mask & SET_CONSOLE_INPUT_INFO_WIN)) { set_error( STATUS_UNSUCCESSFUL ); goto error; } memset(&evt.u, 0, sizeof(evt.u)); - if (req->mask & SET_CONSOLE_INPUT_INFO_ACTIVE_SB) - { - struct screen_buffer *screen_buffer; - - screen_buffer = (struct screen_buffer *)get_handle_obj( current->process, req->active_sb, - FILE_WRITE_PROPERTIES, &screen_buffer_ops ); - if (!screen_buffer || screen_buffer->input != console) - { - set_error( STATUS_INVALID_HANDLE ); - if (screen_buffer) release_object( screen_buffer ); - goto error; - } - - if (screen_buffer != console->active) - { - if (console->active) release_object( console->active ); - console->active = screen_buffer; - generate_sb_initial_events( console ); - } - else - release_object( screen_buffer ); - } if (req->mask & SET_CONSOLE_INPUT_INFO_TITLE) { WCHAR *new_title = NULL; diff --git a/server/protocol.def b/server/protocol.def index 4a59c32728..a121c371c1 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1464,7 +1464,6 @@ enum server_fd_type int input_fd; /* if pid=-1 (bare console to current process), fd for input */ @REPLY obj_handle_t handle_in; /* handle to console input */ - obj_handle_t event; /* handle to renderer events change notification */ @END @@ -1515,7 +1514,6 @@ enum server_fd_type user_handle_t win; /* console window if backend supports it */ VARARG(title,unicode_str); /* console title */ @END -#define SET_CONSOLE_INPUT_INFO_ACTIVE_SB 0x01 #define SET_CONSOLE_INPUT_INFO_TITLE 0x02 #define SET_CONSOLE_INPUT_INFO_HISTORY_MODE 0x04 #define SET_CONSOLE_INPUT_INFO_HISTORY_SIZE 0x08 diff --git a/server/request.h b/server/request.h index 31ca632669..1ddf21496b 100644 --- a/server/request.h +++ b/server/request.h @@ -1116,7 +1116,6 @@ C_ASSERT( FIELD_OFFSET(struct alloc_console_request, pid) == 20 ); C_ASSERT( FIELD_OFFSET(struct alloc_console_request, input_fd) == 24 ); C_ASSERT( sizeof(struct alloc_console_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct alloc_console_reply, handle_in) == 8 ); -C_ASSERT( FIELD_OFFSET(struct alloc_console_reply, event) == 12 ); C_ASSERT( sizeof(struct alloc_console_reply) == 16 ); C_ASSERT( sizeof(struct free_console_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct open_console_request, from) == 12 ); diff --git a/server/trace.c b/server/trace.c index c3cfd7de12..21468abd73 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2033,7 +2033,6 @@ static void dump_alloc_console_request( const struct alloc_console_request *req static void dump_alloc_console_reply( const struct alloc_console_reply *req ) { fprintf( stderr, " handle_in=%04x", req->handle_in ); - fprintf( stderr, ", event=%04x", req->event ); } static void dump_free_console_request( const struct free_console_request *req )

1 0

Alexandre Julliard : ntdll: Move some system stub functions to the Unix library.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 398cfe48079ce02f0f13f62273b31f5ee0fd1a4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=398cfe48079ce02f0f13f622… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 17 11:49:51 2020 +0200 ntdll: Move some system stub functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 22 -------------------- dlls/ntdll/nt.c | 32 ---------------------------- dlls/ntdll/ntdll.spec | 20 +++++++++--------- dlls/ntdll/unix/system.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 64 insertions(+), 64 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=398cfe48079ce02f0f13…

1 0

Zebediah Figura : ntdll/tests: Remove some workarounds for no longer supported versions of Windows.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: d7e12831b04ed6645558bdeec41e09311200d7f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7e12831b04ed6645558bdee… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 16 20:00:34 2020 -0500 ntdll/tests: Remove some workarounds for no longer supported versions of Windows. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 387 +++++++++++++++++++------------------------------- 1 file changed, 149 insertions(+), 238 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d7e12831b04ed6645558…

1 0

Zebediah Figura : ntdll/tests: Convert DIR_TEST_CREATE_OPEN into a function.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 5e240cdf50dc10003a8663ec9be51f9d8bb42634 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e240cdf50dc10003a8663ec… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 16 20:00:35 2020 -0500 ntdll/tests: Convert DIR_TEST_CREATE_OPEN into a function. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 53 +++++++++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 5d7e400785..313fb1160a 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -199,18 +199,25 @@ static void test_namespace_pipe(void) #define DIRECTORY_QUERY (0x0001) #define SYMBOLIC_LINK_QUERY 0x0001 -#define DIR_TEST_CREATE_OPEN(n,e) \ - do { \ - HANDLE h; \ - pRtlCreateUnicodeStringFromAsciiz(&str, n); \ - status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr ); \ - ok( status == e, "NtCreateDirectoryObject(%s) got %08x\n", n, status ); \ - if (!status) pNtClose( h ); \ - status = pNtOpenDirectoryObject( &h, DIRECTORY_QUERY, &attr ); \ - ok( status == e, "NtOpenDirectoryObject(%s) got %08x\n", n, status ); \ - if (!status) pNtClose( h ); \ - pRtlFreeUnicodeString(&str); \ - } while(0) +#define check_create_open_dir(parent, name, status) check_create_open_dir_(__LINE__, parent, name, status) +static void check_create_open_dir_( int line, HANDLE parent, const char *name, NTSTATUS expect ) +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; + NTSTATUS status; + HANDLE h; + + pRtlCreateUnicodeStringFromAsciiz( &str, name ); + InitializeObjectAttributes( &attr, &str, 0, parent, NULL ); + status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr ); + ok_(__FILE__, line)( status == expect, "NtCreateDirectoryObject(%s) got %08x\n", debugstr_a(name), status ); + if (!status) pNtClose( h ); + + status = pNtOpenDirectoryObject( &h, DIRECTORY_QUERY, &attr ); + ok_(__FILE__, line)( status == expect, "NtOpenDirectoryObject(%s) got %08x\n", debugstr_a(name), status ); + if (!status) pNtClose( h ); + pRtlFreeUnicodeString( &str ); +} static BOOL is_correct_dir( HANDLE dir, const char *name ) { @@ -906,11 +913,11 @@ static void test_directory(void) pRtlFreeUnicodeString(&str); pNtClose(dir); - DIR_TEST_CREATE_OPEN( "BaseNamedObjects", STATUS_OBJECT_PATH_SYNTAX_BAD ); - DIR_TEST_CREATE_OPEN( "\\BaseNamedObjects\\", STATUS_OBJECT_NAME_INVALID ); - DIR_TEST_CREATE_OPEN( "\\\\BaseNamedObjects", STATUS_OBJECT_NAME_INVALID ); - DIR_TEST_CREATE_OPEN( "\\BaseNamedObjects\\\\om.c-test", STATUS_OBJECT_NAME_INVALID ); - DIR_TEST_CREATE_OPEN( "\\BaseNamedObjects\\om.c-test\\", STATUS_OBJECT_PATH_NOT_FOUND ); + check_create_open_dir( NULL, "BaseNamedObjects", STATUS_OBJECT_PATH_SYNTAX_BAD ); + check_create_open_dir( NULL, "\\BaseNamedObjects\\", STATUS_OBJECT_NAME_INVALID ); + check_create_open_dir( NULL, "\\\\BaseNamedObjects", STATUS_OBJECT_NAME_INVALID ); + check_create_open_dir( NULL, "\\BaseNamedObjects\\\\om.c-test", STATUS_OBJECT_NAME_INVALID ); + check_create_open_dir( NULL, "\\BaseNamedObjects\\om.c-test\\", STATUS_OBJECT_PATH_NOT_FOUND ); pRtlCreateUnicodeStringFromAsciiz(&str, "\\BaseNamedObjects\\om.c-test"); status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr ); @@ -1009,13 +1016,13 @@ static void test_directory(void) status = pNtOpenDirectoryObject( &h, DIRECTORY_QUERY, &attr ); ok( status == STATUS_OBJECT_NAME_INVALID, "NtOpenDirectoryObject got %08x\n", status ); - InitializeObjectAttributes(&attr, &str, 0, dir, NULL); - DIR_TEST_CREATE_OPEN( "", STATUS_SUCCESS ); - DIR_TEST_CREATE_OPEN( "\\", STATUS_OBJECT_PATH_SYNTAX_BAD ); - DIR_TEST_CREATE_OPEN( "\\om.c-test", STATUS_OBJECT_PATH_SYNTAX_BAD ); - DIR_TEST_CREATE_OPEN( "\\om.c-test\\", STATUS_OBJECT_PATH_SYNTAX_BAD ); - DIR_TEST_CREATE_OPEN( "om.c-test\\", STATUS_OBJECT_PATH_NOT_FOUND ); + check_create_open_dir( dir, "", STATUS_SUCCESS ); + check_create_open_dir( dir, "\\", STATUS_OBJECT_PATH_SYNTAX_BAD ); + check_create_open_dir( dir, "\\om.c-test", STATUS_OBJECT_PATH_SYNTAX_BAD ); + check_create_open_dir( dir, "\\om.c-test\\", STATUS_OBJECT_PATH_SYNTAX_BAD ); + check_create_open_dir( dir, "om.c-test\\", STATUS_OBJECT_PATH_NOT_FOUND ); + InitializeObjectAttributes(&attr, &str, 0, dir, NULL); pRtlCreateUnicodeStringFromAsciiz(&str, "om.c-test"); status = pNtCreateDirectoryObject( &dir1, DIRECTORY_QUERY, &attr ); ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status );

1 0

Alexandre Julliard : ntdll: Move the registry system calls to the Unix library.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 7053b7c615b44e7112ab8fb4c056206d32b6f1c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7053b7c615b44e7112ab8fb4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 17 11:46:15 2020 +0200 ntdll: Move the registry system calls to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 1 + dlls/ntdll/ntdll.spec | 104 +++--- dlls/ntdll/reg.c | 795 --------------------------------------------- dlls/ntdll/unix/registry.c | 778 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 831 insertions(+), 847 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7053b7c615b44e7112ab…

1 0

Ziqing Hui : windowscodecs: Add support for decoding uncompressed DDS image.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 4e56d3e650a856d980369a51dd4afc024e9095a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e56d3e650a856d980369a51… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jul 15 22:01:37 2020 +0800 windowscodecs: Add support for decoding uncompressed DDS image. For uncompressed DDS image, "a block" means a pixel. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 75 ++++++++++++++++++++++-------------- dlls/windowscodecs/tests/ddsformat.c | 10 ----- 2 files changed, 47 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4e56d3e650a856d98036…

1 0

Ziqing Hui : windowscodecs: Return fail for unsupported format in DdsDecoder_Initialize().
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: f98a32ad471e95ab2c70563b24d5a0a1368439ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=f98a32ad471e95ab2c70563b… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jul 15 22:01:14 2020 +0800 windowscodecs: Return fail for unsupported format in DdsDecoder_Initialize(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 18 +++++++++++++++++- dlls/windowscodecs/tests/ddsformat.c | 3 --- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index f7b5201321..bbd30a90d2 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -626,10 +626,26 @@ static HRESULT WINAPI DdsDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p WICDecodeOptions cacheOptions) { DdsDecoder *This = impl_from_IWICBitmapDecoder(iface); + HRESULT hr; TRACE("(%p,%p,%x)\n", iface, pIStream, cacheOptions); - return IWICWineDecoder_Initialize(&This->IWICWineDecoder_iface, pIStream, cacheOptions); + EnterCriticalSection(&This->lock); + + hr = IWICWineDecoder_Initialize(&This->IWICWineDecoder_iface, pIStream, cacheOptions); + if (FAILED(hr)) goto end; + + if (!This->info.compressed || This->info.dimension == WICDdsTextureCube) { + IStream_Release(pIStream); + This->stream = NULL; + This->initialized = FALSE; + hr = WINCODEC_ERR_BADHEADER; + } + +end: + LeaveCriticalSection(&This->lock); + + return hr; } static HRESULT WINAPI DdsDecoder_GetContainerFormat(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index ecf7de0bc4..32a854fbb0 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -237,7 +237,6 @@ static HRESULT init_decoder(IWICBitmapDecoder *decoder, IWICStream *stream, HRES if (index == -1) { ok(hr == S_OK, "Decoder initialize failed, hr %#x\n", hr); } else { - todo_wine_if(wine_init) ok(hr == expected, "Test %u: Expected hr %#x, got %#x\n", index, expected, hr); } @@ -251,10 +250,8 @@ static HRESULT init_decoder(IWICBitmapDecoder *decoder, IWICStream *stream, HRES if (hr == S_OK) { hr = IWICWineDecoder_Initialize(wine_decoder, (IStream*)stream, WICDecodeMetadataCacheOnDemand); if (index == -1) { - todo_wine ok(hr == S_OK, "Initialize failed, hr %#x\n", hr); } else { - todo_wine ok(hr == S_OK, "Test %u: Initialize failed, hr %#x\n", index, hr); }

1 0

Zebediah Figura : ntdll/tests: Fix a copy-paste error.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: de1eaee4804ffbeb0917b139638adb19c2106936 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de1eaee4804ffbeb0917b139… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 16 20:00:37 2020 -0500 ntdll/tests: Fix a copy-paste error. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 03d97b2143..f68827c718 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1040,7 +1040,7 @@ static void test_directory(void) pNtClose(h); InitializeObjectAttributes(&attr, &str, 0, dir, NULL); RtlInitUnicodeString(&str, L"one more level"); - status = pNtCreateDirectoryObject( &dir, DIRECTORY_QUERY, &attr ); + status = pNtCreateDirectoryObject( &h, DIRECTORY_QUERY, &attr ); ok( status == STATUS_SUCCESS, "Failed to create directory %08x\n", status ); pNtClose(h); pNtClose(dir); @@ -1157,9 +1157,9 @@ static void test_symboliclink(void) RtlInitUnicodeString( &str, L"\\BaseNamedObjects\\om.c-test\\" ); status = pNtCreateSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr, &target ); - ok( status == STATUS_OBJECT_NAME_INVALID, "got %#x\n", status ); + ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "got %#x\n", status ); status = pNtOpenSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr ); - ok( status == STATUS_OBJECT_NAME_INVALID, "got %#x\n", status ); + ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "got %#x\n", status ); /* Compound test */ dir = get_base_dir();

1 0