March 2020 - Wine-devel - list.winehq.org

[PATCH] kernel32: Reimplement ReplaceFile() on top of MoveFileEx().
by Zebediah Figura 13 Mar '20

13 Mar '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Some manual testing (which I didn't think was interesting enough to add) shows that native does indeed move the target out of the way if it already exists. The temporary file name doesn't match the pattern used here, but this seemed easier. dlls/kernel32/file.c | 140 +++++++++++-------------------------------- 1 file changed, 35 insertions(+), 105 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index b2979f96222..2a2ace5dd81 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -423,11 +423,7 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa LPVOID lpExclude, LPVOID lpReserved) { UNICODE_STRING nt_replaced_name, nt_replacement_name; - ANSI_STRING unix_replaced_name, unix_replacement_name, unix_backup_name; - HANDLE hReplaced = NULL, hReplacement = NULL, hBackup = NULL; - DWORD error = ERROR_SUCCESS; - UINT replaced_flags; - BOOL ret = FALSE; + HANDLE hReplacement = NULL; NTSTATUS status; IO_STATUS_BLOCK io; OBJECT_ATTRIBUTES attr; @@ -447,10 +443,6 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa return FALSE; } - unix_replaced_name.Buffer = NULL; - unix_replacement_name.Buffer = NULL; - unix_backup_name.Buffer = NULL; - attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.Attributes = OBJ_CASE_INSENSITIVE; @@ -461,39 +453,21 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa /* Open the "replaced" file for reading */ if (!(RtlDosPathNameToNtPathName_U(lpReplacedFileName, &nt_replaced_name, NULL, NULL))) { - error = ERROR_PATH_NOT_FOUND; - goto fail; + SetLastError( ERROR_PATH_NOT_FOUND ); + return FALSE; } - replaced_flags = lpBackupFileName ? FILE_OPEN : FILE_OPEN_IF; attr.ObjectName = &nt_replaced_name; - status = NtOpenFile(&hReplaced, GENERIC_READ|DELETE|SYNCHRONIZE, - &attr, &io, - FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, - FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE); - if (status == STATUS_SUCCESS) - status = wine_nt_to_unix_file_name(&nt_replaced_name, &unix_replaced_name, replaced_flags, FALSE); - RtlFreeUnicodeString(&nt_replaced_name); - if (status != STATUS_SUCCESS) - { - if (status == STATUS_OBJECT_NAME_NOT_FOUND) - error = ERROR_FILE_NOT_FOUND; - else - error = ERROR_UNABLE_TO_REMOVE_REPLACED; - goto fail; - } /* Replacement should fail if replaced is READ_ONLY */ - status = NtQueryInformationFile(hReplaced, &io, &info, sizeof(info), FileBasicInformation); + status = NtQueryAttributesFile(&attr, &info); + RtlFreeUnicodeString(&nt_replaced_name); if (status != STATUS_SUCCESS) - { - error = RtlNtStatusToDosError(status); - goto fail; - } + return set_ntstatus( status ); if (info.FileAttributes & FILE_ATTRIBUTE_READONLY) { - error = ERROR_ACCESS_DENIED; - goto fail; + SetLastError( ERROR_ACCESS_DENIED ); + return FALSE; } /* @@ -502,65 +476,41 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa */ if (!(RtlDosPathNameToNtPathName_U(lpReplacementFileName, &nt_replacement_name, NULL, NULL))) { - error = ERROR_PATH_NOT_FOUND; - goto fail; + SetLastError( ERROR_PATH_NOT_FOUND ); + return FALSE; } attr.ObjectName = &nt_replacement_name; status = NtOpenFile(&hReplacement, GENERIC_READ|GENERIC_WRITE|DELETE|WRITE_DAC|SYNCHRONIZE, &attr, &io, 0, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE); - if (status == STATUS_SUCCESS) - status = wine_nt_to_unix_file_name(&nt_replacement_name, &unix_replacement_name, FILE_OPEN, FALSE); RtlFreeUnicodeString(&nt_replacement_name); if (status != STATUS_SUCCESS) - { - error = RtlNtStatusToDosError(status); - goto fail; - } + return set_ntstatus( status ); + NtClose( hReplacement ); /* If the user wants a backup then that needs to be performed first */ if (lpBackupFileName) { - UNICODE_STRING nt_backup_name; - FILE_BASIC_INFORMATION replaced_info; - - /* Obtain the file attributes from the "replaced" file */ - status = NtQueryInformationFile(hReplaced, &io, &replaced_info, - sizeof(replaced_info), - FileBasicInformation); - if (status != STATUS_SUCCESS) - { - error = RtlNtStatusToDosError(status); - goto fail; - } - - if (!(RtlDosPathNameToNtPathName_U(lpBackupFileName, &nt_backup_name, NULL, NULL))) - { - error = ERROR_PATH_NOT_FOUND; - goto fail; - } - attr.ObjectName = &nt_backup_name; - /* Open the backup with permissions to write over it */ - status = NtCreateFile(&hBackup, GENERIC_WRITE | SYNCHRONIZE, - &attr, &io, NULL, replaced_info.FileAttributes, - FILE_SHARE_WRITE, FILE_OPEN_IF, - FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE, - NULL, 0); - if (status == STATUS_SUCCESS) - status = wine_nt_to_unix_file_name(&nt_backup_name, &unix_backup_name, FILE_OPEN_IF, FALSE); - RtlFreeUnicodeString(&nt_backup_name); - if (status != STATUS_SUCCESS) - { - error = RtlNtStatusToDosError(status); - goto fail; - } + if (!MoveFileExW( lpReplacedFileName, lpBackupFileName, MOVEFILE_REPLACE_EXISTING )) + return FALSE; + } + else + { + /* ReplaceFile() can replace an open target. To do this, we need to move + * it out of the way first. */ + static const WCHAR prefixW[] = {'r','f',0}; + WCHAR temp_path[MAX_PATH], temp_file[MAX_PATH]; + + if (!GetTempPathW( ARRAY_SIZE(temp_path), temp_path ) + || !GetTempFileNameW( temp_path, prefixW, 0, temp_file ) + || !MoveFileExW( lpReplacedFileName, temp_file, MOVEFILE_REPLACE_EXISTING )) + return FALSE; - /* If an existing backup exists then copy over it */ - if (rename(unix_replaced_name.Buffer, unix_backup_name.Buffer) == -1) + if (!DeleteFileW( temp_file )) { - error = ERROR_UNABLE_TO_REMOVE_REPLACED; /* is this correct? */ - goto fail; + SetLastError( ERROR_UNABLE_TO_REMOVE_REPLACED ); + return FALSE; } } @@ -568,37 +518,17 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa * Now that the backup has been performed (if requested), copy the replacement * into place */ - if (rename(unix_replacement_name.Buffer, unix_replaced_name.Buffer) == -1) + if (!MoveFileExW( lpReplacementFileName, lpReplacedFileName, 0 )) { - if (errno == EACCES) - { - /* Inappropriate permissions on "replaced", rename will fail */ - error = ERROR_UNABLE_TO_REMOVE_REPLACED; - goto fail; - } /* on failure we need to indicate whether a backup was made */ if (!lpBackupFileName) - error = ERROR_UNABLE_TO_MOVE_REPLACEMENT; + SetLastError( ERROR_UNABLE_TO_MOVE_REPLACEMENT ); else - error = ERROR_UNABLE_TO_MOVE_REPLACEMENT_2; - goto fail; + SetLastError( ERROR_UNABLE_TO_MOVE_REPLACEMENT_2 ); + return FALSE; } - /* Success! */ - ret = TRUE; - - /* Perform resource cleanup */ -fail: - if (hBackup) CloseHandle(hBackup); - if (hReplaced) CloseHandle(hReplaced); - if (hReplacement) CloseHandle(hReplacement); - RtlFreeAnsiString(&unix_backup_name); - RtlFreeAnsiString(&unix_replacement_name); - RtlFreeAnsiString(&unix_replaced_name); - - /* If there was an error, set the error code */ - if(!ret) - SetLastError(error); - return ret; + + return TRUE; } -- 2.25.1

2 1

[PATCH] wineqtdecoder: Dont define CLSID_QTSplitter twice.
by Alistair Leslie-Hughes 13 Mar '20

13 Mar '20

../../../wine/dlls/wineqtdecoder/qtsplitter.c:130:14: error: redeclaration of 'CLSID_QTSplitter' with a different type: 'CLSID' (aka 'struct _GUID') vs 'const GUID' (aka 'const struct _GUID') extern CLSID CLSID_QTSplitter; ^ ./wineqtdecoder_classes.h:50:13: note: previous declaration is here Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wineqtdecoder/qtsplitter.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 6973620809..f52971f3f7 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -127,7 +127,6 @@ #include "wineqtdecoder_classes.h" WINE_DEFAULT_DEBUG_CHANNEL(qtsplitter); -extern CLSID CLSID_QTSplitter; typedef struct QTOutPin { struct strmbase_source pin; -- 2.17.1

1 0

[PATCH] dwrite: Simplify LB22 rule according to Unicode 13.0 algorithm.
by Nikolay Sivov 12 Mar '20

12 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index a418081d49..de8ac2ea3c 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -680,21 +680,7 @@ static HRESULT analyze_linebreaks(const WCHAR *text, UINT32 count, DWRITE_LINE_B break; /* LB22 */ case b_IN: - if (i > 0) - { - switch (break_class[i-1]) - { - case b_AL: - case b_HL: - case b_EX: - case b_ID: - case b_EB: - case b_EM: - case b_IN: - case b_NU: - set_break_condition(i, BreakConditionBefore, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, &state); - } - } + set_break_condition(i, BreakConditionBefore, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, &state); break; } -- 2.25.1

1 0

[PATCH v9 1/4] jscript: Get rid of the variable_obj parameter to exec_source.
by Gabriel Ivăncescu 12 Mar '20

12 Mar '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/engine.c | 39 +++++++++++++++++++++++++++++---------- dlls/jscript/engine.h | 2 +- dlls/jscript/function.c | 6 ++---- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 6 +++--- 5 files changed, 36 insertions(+), 19 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 5a627ea..a78a42b 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2984,8 +2984,9 @@ static HRESULT setup_scope(script_ctx_t *ctx, call_frame_t *frame, scope_chain_t } HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, function_code_t *function, scope_chain_t *scope, - IDispatch *this_obj, jsdisp_t *function_instance, jsdisp_t *variable_obj, unsigned argc, jsval_t *argv, jsval_t *r) + IDispatch *this_obj, jsdisp_t *function_instance, unsigned argc, jsval_t *argv, jsval_t *r) { + jsdisp_t *variable_obj; call_frame_t *frame; unsigned i; HRESULT hres; @@ -2997,6 +2998,18 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi } } + if(flags & (EXEC_GLOBAL | EXEC_EVAL)) { + if(ctx->call_ctx) + variable_obj = ctx->call_ctx->variable_obj; + else + variable_obj = ctx->global; + jsdisp_addref(variable_obj); + } + else { + hres = create_dispex(ctx, NULL, NULL, &variable_obj); + if(FAILED(hres)) return hres; + } + if(!ctx->ei->enter_notified) { ctx->ei->enter_notified = TRUE; IActiveScriptSite_OnEnterScript(ctx->site); @@ -3010,12 +3023,12 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi hres = create_source_function(ctx, bytecode, function->funcs+i, scope, &func_obj); if(FAILED(hres)) - return hres; + goto fail; hres = bind_event_target(ctx, function->funcs+i, func_obj); jsdisp_release(func_obj); if(FAILED(hres)) - return hres; + goto fail; } if(flags & (EXEC_GLOBAL | EXEC_EVAL)) { @@ -3028,7 +3041,7 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi hres = create_source_function(ctx, bytecode, function->funcs+function->variables[i].func_id, scope, &func_obj); if(FAILED(hres)) - return hres; + goto fail; hres = jsdisp_propput_name(variable_obj, function->variables[i].name, jsval_obj(func_obj)); jsdisp_release(func_obj); @@ -3037,7 +3050,7 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi hres = jsdisp_get_id(variable_obj, function->variables[i].name, fdexNameEnsure, &id); if(FAILED(hres)) - return hres; + goto fail; } } } @@ -3057,12 +3070,14 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi if(ctx->call_ctx && (flags & EXEC_EVAL)) { hres = detach_variable_object(ctx, ctx->call_ctx, FALSE); if(FAILED(hres)) - return hres; + goto fail; } frame = heap_alloc_zero(sizeof(*frame)); - if(!frame) - return E_OUTOFMEMORY; + if(!frame) { + hres = E_OUTOFMEMORY; + goto fail; + } frame->function = function; frame->ret = jsval_undefined(); @@ -3074,7 +3089,7 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi if(FAILED(hres)) { release_bytecode(frame->bytecode); heap_free(frame); - return hres; + goto fail; } }else if(scope) { frame->base_scope = frame->scope = scope_addref(scope); @@ -3091,7 +3106,7 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi frame->function_instance = jsdisp_addref(function_instance); frame->flags = flags; - frame->variable_obj = jsdisp_addref(variable_obj); + frame->variable_obj = variable_obj; frame->prev_frame = ctx->call_ctx; ctx->call_ctx = frame; @@ -3107,4 +3122,8 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi } return enter_bytecode(ctx, r); + +fail: + jsdisp_release(variable_obj); + return hres; } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index fe6b2a0..2a8e405 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -281,7 +281,7 @@ typedef struct _call_frame_t { #define EXEC_EVAL 0x0008 HRESULT exec_source(script_ctx_t*,DWORD,bytecode_t*,function_code_t*,scope_chain_t*,IDispatch*, - jsdisp_t*,jsdisp_t*,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; + jsdisp_t*,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT create_source_function(script_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT setup_arguments_object(script_ctx_t*,call_frame_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 007aec0..e1a8c29 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -722,7 +722,7 @@ static HRESULT InterpretedFunction_call(script_ctx_t *ctx, FunctionInstance *fun unsigned argc, jsval_t *argv, jsval_t *r) { InterpretedFunction *function = (InterpretedFunction*)func; - jsdisp_t *var_disp, *new_obj = NULL; + jsdisp_t *new_obj = NULL; DWORD exec_flags = 0; HRESULT hres; @@ -745,14 +745,12 @@ static HRESULT InterpretedFunction_call(script_ctx_t *ctx, FunctionInstance *fun if(flags & DISPATCH_CONSTRUCT) exec_flags |= EXEC_CONSTRUCTOR; - hres = create_dispex(ctx, NULL, NULL, &var_disp); if(SUCCEEDED(hres)) hres = exec_source(ctx, exec_flags, function->code, function->func_code, function->scope_chain, this_obj, - &function->function.dispex, var_disp, argc, argv, r); + &function->function.dispex, argc, argv, r); if(new_obj) jsdisp_release(new_obj); - jsdisp_release(var_disp); return hres; } diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 2a1dcb2..64b910f 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -215,7 +215,7 @@ HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned a if(flags & DISPATCH_JSCRIPT_CALLEREXECSSOURCE) exec_flags |= EXEC_RETURN_TO_INTERP; hres = exec_source(ctx, exec_flags, code, &code->global_code, frame ? frame->scope : NULL, - frame ? frame->this_obj : NULL, NULL, frame ? frame->variable_obj : ctx->global, 0, NULL, r); + frame ? frame->this_obj : NULL, NULL, 0, NULL, r); release_bytecode(code); return hres; } diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index aabad7e..f54c34a 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -408,7 +408,7 @@ static void exec_queued_code(JScript *This) LIST_FOR_EACH_ENTRY(iter, &This->queued_code, bytecode_t, entry) { enter_script(This->ctx, &ei); - hres = exec_source(This->ctx, EXEC_GLOBAL, iter, &iter->global_code, NULL, NULL, NULL, This->ctx->global, 0, NULL, NULL); + hres = exec_source(This->ctx, EXEC_GLOBAL, iter, &iter->global_code, NULL, NULL, NULL, 0, NULL, NULL); leave_script(This->ctx, hres); if(FAILED(hres)) break; @@ -1053,7 +1053,7 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, if(dwFlags & SCRIPTTEXT_ISEXPRESSION) { jsval_t r; - hres = exec_source(This->ctx, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, NULL, This->ctx->global, 0, NULL, &r); + hres = exec_source(This->ctx, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, NULL, 0, NULL, &r); if(SUCCEEDED(hres)) { if(pvarResult) hres = jsval_to_variant(r, pvarResult); @@ -1072,7 +1072,7 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, if(!pvarResult && !is_started(This->ctx)) { list_add_tail(&This->queued_code, &code->entry); }else { - hres = exec_source(This->ctx, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, NULL, This->ctx->global, 0, NULL, NULL); + hres = exec_source(This->ctx, EXEC_GLOBAL, code, &code->global_code, NULL, NULL, NULL, 0, NULL, NULL); if(code->is_persistent) list_add_tail(&This->persistent_code, &code->entry); else -- 2.21.0

2 5

[PATCH 1/3] mfplat: Add MFGetStrideForBitmapInfoHeader().
by Nikolay Sivov 12 Mar '20

12 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/mediatype.c | 120 +++++++++++++++++++++++++++++-------- dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 73 +++++++++++++++++++++- include/mfapi.h | 1 + 4 files changed, 166 insertions(+), 30 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 8378e24196..c3e3133b8f 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -19,6 +19,7 @@ #define COBJMACROS #include "mfplat_private.h" +#include "d3d9types.h" #include "initguid.h" #include "ks.h" @@ -1763,6 +1764,8 @@ struct uncompressed_video_format { const GUID *subtype; unsigned int bytes_per_pixel; + unsigned int alignment; + BOOL bottom_up; }; static int __cdecl uncompressed_video_format_compare(const void *a, const void *b) @@ -1772,33 +1775,57 @@ static int __cdecl uncompressed_video_format_compare(const void *a, const void * return memcmp(guid, format->subtype, sizeof(*guid)); } -static HRESULT mf_get_image_size(REFGUID subtype, unsigned int width, unsigned int height, unsigned int *size) +static const struct uncompressed_video_format video_formats[] = +{ + { &MFVideoFormat_RGB24, 3, 3, 1 }, + { &MFVideoFormat_ARGB32, 4, 3, 1 }, + { &MFVideoFormat_RGB32, 4, 3, 1 }, + { &MFVideoFormat_RGB565, 2, 3, 1 }, + { &MFVideoFormat_RGB555, 2, 3, 1 }, + { &MFVideoFormat_A2R10G10B10, 4, 3, 1 }, + { &MFVideoFormat_RGB8, 1, 3, 1 }, + { &MFVideoFormat_L8, 1, 3, 1 }, + { &MFVideoFormat_NV12, 1, 0, 0 }, + { &MFVideoFormat_D16, 2, 3, 0 }, + { &MFVideoFormat_L16, 2, 3, 0 }, + { &MFVideoFormat_A16B16G16R16F, 8, 3, 1 }, +}; + +static struct uncompressed_video_format *mf_get_video_format(const GUID *subtype) +{ + return bsearch(subtype, video_formats, ARRAY_SIZE(video_formats), sizeof(*video_formats), + uncompressed_video_format_compare); +} + +static unsigned int mf_get_stride_for_format(const struct uncompressed_video_format *format, unsigned int width) +{ + return (width * format->bytes_per_pixel + format->alignment) & ~format->alignment; +} + +/*********************************************************************** + * MFGetStrideForBitmapInfoHeader (mfplat.@) + */ +HRESULT WINAPI MFGetStrideForBitmapInfoHeader(DWORD fourcc, DWORD width, LONG *stride) { - static const struct uncompressed_video_format video_formats[] = - { - { &MFVideoFormat_RGB24, 3 }, - { &MFVideoFormat_ARGB32, 4 }, - { &MFVideoFormat_RGB32, 4 }, - { &MFVideoFormat_RGB565, 2 }, - { &MFVideoFormat_RGB555, 2 }, - { &MFVideoFormat_A2R10G10B10, 4 }, - { &MFVideoFormat_RGB8, 1 }, - { &MFVideoFormat_A16B16G16R16F, 8 }, - }; struct uncompressed_video_format *format; + GUID subtype; - format = bsearch(subtype, video_formats, ARRAY_SIZE(video_formats), sizeof(*video_formats), - uncompressed_video_format_compare); - if (format) - { - *size = ((width * format->bytes_per_pixel + 3) & ~3) * height; - } - else + TRACE("%#x, %u, %p.\n", fourcc, width, stride); + + memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); + subtype.Data1 = fourcc; + + if (!(format = mf_get_video_format(&subtype))) { - *size = 0; + *stride = 0; + return MF_E_INVALIDMEDIATYPE; } - return format ? S_OK : E_INVALIDARG; + *stride = mf_get_stride_for_format(format, width); + if (format->bottom_up) + *stride *= -1; + + return S_OK; } /*********************************************************************** @@ -1806,24 +1833,65 @@ static HRESULT mf_get_image_size(REFGUID subtype, unsigned int width, unsigned i */ HRESULT WINAPI MFCalculateImageSize(REFGUID subtype, UINT32 width, UINT32 height, UINT32 *size) { + struct uncompressed_video_format *format; + unsigned int stride; + TRACE("%s, %u, %u, %p.\n", debugstr_mf_guid(subtype), width, height, size); - return mf_get_image_size(subtype, width, height, size); + if (!(format = mf_get_video_format(subtype))) + { + *size = 0; + return E_INVALIDARG; + } + + switch (subtype->Data1) + { + case MAKEFOURCC('N','V','1','2'): + /* 2 x 2 block, interleaving UV for half the height */ + *size = ((width + 1) & ~1) * height * 3 / 2; + break; + case D3DFMT_L8: + case D3DFMT_L16: + case D3DFMT_D16: + *size = width * format->bytes_per_pixel * height; + break; + default: + stride = mf_get_stride_for_format(format, width); + *size = stride * height; + } + + return S_OK; } /*********************************************************************** * MFGetPlaneSize (mfplat.@) */ -HRESULT WINAPI MFGetPlaneSize(DWORD format, DWORD width, DWORD height, DWORD *size) +HRESULT WINAPI MFGetPlaneSize(DWORD fourcc, DWORD width, DWORD height, DWORD *size) { + struct uncompressed_video_format *format; + unsigned int stride; GUID subtype; - TRACE("%#x, %u, %u, %p.\n", format, width, height, size); + TRACE("%#x, %u, %u, %p.\n", fourcc, width, height, size); memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); - subtype.Data1 = format; + subtype.Data1 = fourcc; + + if (!(format = mf_get_video_format(&subtype))) + return MF_E_INVALIDMEDIATYPE; + + stride = mf_get_stride_for_format(format, width); - return mf_get_image_size(&subtype, width, height, size); + switch (fourcc) + { + case MAKEFOURCC('N','V','1','2'): + *size = stride * height * 3 / 2; + break; + default: + *size = stride * height; + } + + return S_OK; } /*********************************************************************** diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 1e11a1fc2a..338e8f8eff 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -101,7 +101,7 @@ @ stdcall MFGetPluginControl(ptr) @ stub MFGetPrivateWorkqueues @ stub MFGetSockaddrFromNumericName -@ stub MFGetStrideForBitmapInfoHeader +@ stdcall MFGetStrideForBitmapInfoHeader(long long ptr) @ stdcall MFGetSystemTime() @ stdcall MFGetTimerPeriodicity(ptr) @ stub MFGetUncompressedVideoFormat diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 97108e1478..0fd55c6fa1 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -92,6 +92,7 @@ static HRESULT (WINAPI *pMFAllocateWorkQueueEx)(MFASYNC_WORKQUEUE_TYPE queue_typ static HRESULT (WINAPI *pMFTEnumEx)(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, const MFT_REGISTER_TYPE_INFO *output_type, IMFActivate ***activate, UINT32 *count); static HRESULT (WINAPI *pMFGetPlaneSize)(DWORD format, DWORD width, DWORD height, DWORD *size); +static HRESULT (WINAPI *pMFGetStrideForBitmapInfoHeader)(DWORD format, DWORD width, LONG *stride); static const WCHAR fileschemeW[] = L"file://"; @@ -664,6 +665,7 @@ static void init_functions(void) X(MFCreateMFByteStreamOnStream); X(MFCreateTransformActivate); X(MFGetPlaneSize); + X(MFGetStrideForBitmapInfoHeader); X(MFHeapAlloc); X(MFHeapFree); X(MFPutWaitingWorkItem); @@ -3376,6 +3378,7 @@ static void test_MFCalculateImageSize(void) UINT32 width; UINT32 height; UINT32 size; + UINT32 plane_size; /* Matches image size when 0. */ } image_size_tests[] = { @@ -3395,6 +3398,13 @@ static void test_MFCalculateImageSize(void) { &MFVideoFormat_A2R10G10B10, 1, 1, 4 }, { &MFVideoFormat_A16B16G16R16F, 3, 5, 120 }, { &MFVideoFormat_A16B16G16R16F, 1, 1, 8 }, + + /* YUV */ + { &MFVideoFormat_NV12, 1, 3, 9, 4 }, + { &MFVideoFormat_NV12, 1, 2, 6, 3 }, + { &MFVideoFormat_NV12, 2, 2, 6, 6 }, + { &MFVideoFormat_NV12, 3, 2, 12, 9 }, + { &MFVideoFormat_NV12, 4, 2, 12, 12 }, }; unsigned int i; UINT32 size; @@ -3418,15 +3428,17 @@ static void test_MFCalculateImageSize(void) image_size_tests[i].height, &size); ok(hr == S_OK || (is_broken && hr == E_INVALIDARG), "%u: failed to calculate image size, hr %#x.\n", i, hr); ok(size == image_size_tests[i].size, "%u: unexpected image size %u, expected %u.\n", i, size, - image_size_tests[i].size); + image_size_tests[i].size); if (pMFGetPlaneSize) { + unsigned int plane_size = image_size_tests[i].plane_size ? image_size_tests[i].plane_size : + image_size_tests[i].size; + hr = pMFGetPlaneSize(image_size_tests[i].subtype->Data1, image_size_tests[i].width, image_size_tests[i].height, &size); ok(hr == S_OK, "%u: failed to get plane size, hr %#x.\n", i, hr); - ok(size == image_size_tests[i].size, "%u: unexpected plane size %u, expected %u.\n", i, size, - image_size_tests[i].size); + ok(size == plane_size, "%u: unexpected plane size %u, expected %u.\n", i, size, plane_size); } } } @@ -4473,6 +4485,60 @@ static void test_queue_com_state(const char *name) ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); } +static void test_MFGetStrideForBitmapInfoHeader(void) +{ + static const struct stride_test + { + const GUID *subtype; + unsigned int width; + LONG stride; + } + stride_tests[] = + { + { &MFVideoFormat_RGB8, 3, -4 }, + { &MFVideoFormat_RGB8, 1, -4 }, + { &MFVideoFormat_RGB555, 3, -8 }, + { &MFVideoFormat_RGB555, 1, -4 }, + { &MFVideoFormat_RGB565, 3, -8 }, + { &MFVideoFormat_RGB565, 1, -4 }, + { &MFVideoFormat_RGB24, 3, -12 }, + { &MFVideoFormat_RGB24, 1, -4 }, + { &MFVideoFormat_RGB32, 3, -12 }, + { &MFVideoFormat_RGB32, 1, -4 }, + { &MFVideoFormat_ARGB32, 3, -12 }, + { &MFVideoFormat_ARGB32, 1, -4 }, + { &MFVideoFormat_A2R10G10B10, 3, -12 }, + { &MFVideoFormat_A2R10G10B10, 1, -4 }, + { &MFVideoFormat_A16B16G16R16F, 3, -24 }, + { &MFVideoFormat_A16B16G16R16F, 1, -8 }, + + /* YUV */ + { &MFVideoFormat_NV12, 1, 1 }, + { &MFVideoFormat_NV12, 2, 2 }, + { &MFVideoFormat_NV12, 3, 3 }, + }; + unsigned int i; + LONG stride; + HRESULT hr; + + if (!pMFGetStrideForBitmapInfoHeader) + { + win_skip("MFGetStrideForBitmapInfoHeader() is not available.\n"); + return; + } + + hr = pMFGetStrideForBitmapInfoHeader(MAKEFOURCC('H','2','6','4'), 1, &stride); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(stride_tests); ++i) + { + hr = pMFGetStrideForBitmapInfoHeader(stride_tests[i].subtype->Data1, stride_tests[i].width, &stride); + ok(hr == S_OK, "%u: failed to get stride, hr %#x.\n", i, hr); + ok(stride == stride_tests[i].stride, "%u: format %s, unexpected stride %d, expected %d.\n", i, + wine_dbgstr_an((char *)&stride_tests[i].subtype->Data1, 4), stride, stride_tests[i].stride); + } +} + START_TEST(mfplat) { char **argv; @@ -4524,6 +4590,7 @@ START_TEST(mfplat) test_MFCreateTransformActivate(); test_MFTRegisterLocal(); test_queue_com(); + test_MFGetStrideForBitmapInfoHeader(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 38577cfe62..1f01dbe0c8 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -421,6 +421,7 @@ void * WINAPI MFHeapAlloc(SIZE_T size, ULONG flags, char *file, int line, EAllo void WINAPI MFHeapFree(void *ptr); HRESULT WINAPI MFGetAttributesAsBlob(IMFAttributes *attributes, UINT8 *buffer, UINT size); HRESULT WINAPI MFGetAttributesAsBlobSize(IMFAttributes *attributes, UINT32 *size); +HRESULT WINAPI MFGetStrideForBitmapInfoHeader(DWORD format, DWORD width, LONG *stride); HRESULT WINAPI MFGetPlaneSize(DWORD format, DWORD width, DWORD height, DWORD *size); HRESULT WINAPI MFGetTimerPeriodicity(DWORD *periodicity); HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *input_type, -- 2.25.1

2 4

[PATCH 5/5] ucrtbase/tests: Directly use ucrtbase functions in scanf.c.
by Jacek Caban 12 Mar '20

12 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ucrtbase/tests/scanf.c | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-)

2 1

[PATCH 4/5] ucrtbase/tests: Directly use ucrtbase functions in printf.c.
by Jacek Caban 12 Mar '20

12 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ucrtbase/tests/printf.c | 120 ++++++++++++----------------------- 1 file changed, 42 insertions(+), 78 deletions(-)

2 1

[PATCH 3/5] ucrtbase/tests: Directly use __stdio_common_* functions.
by Jacek Caban 12 Mar '20

12 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ucrtbase/tests/printf.c | 37 +++++++----------------------------- 1 file changed, 7 insertions(+), 30 deletions(-)

2 1

[PATCH 2/5] ucrtbase/tests: Use public _CRT_INTERNAL_PRINTF_* defines.
by Jacek Caban 12 Mar '20

12 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ucrtbase/tests/printf.c | 38 +++++++++++++++--------------------- 1 file changed, 16 insertions(+), 22 deletions(-)

2 1

[PATCH 1/5] ucrtbase/tests: Link to ucrtbase.
by Jacek Caban 12 Mar '20

12 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Changes are needed because tests were previously using errno from msvcrt, which doesn't make much sense. testbot will fail to build this, because make clean in test directory is needed. dlls/ucrtbase/tests/Makefile.in | 1 + dlls/ucrtbase/tests/string.c | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-)

2 1