November 2020 - Wine-Commits

Alex Henrie : urlmon: Reimplement canonicalize_ipv6address on top of ntdll functions.
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: dcdbe44d04906401049e406c7729b133e49c7946 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcdbe44d04906401049e406c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 18 20:02:17 2020 +0100 urlmon: Reimplement canonicalize_ipv6address on top of ntdll functions. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/uri.c | 25 +++ dlls/urlmon/uri.c | 438 +++--------------------------------------------- 2 files changed, 45 insertions(+), 418 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dcdbe44d04906401049e…

1 0

Robert Wilhelm : vbscript: Support properties with parameters.
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: a839ac952a8d5673b0aff6307cc7ecc0eabb3d99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a839ac952a8d5673b0aff630… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Tue Nov 17 21:11:32 2020 +0100 vbscript: Support properties with parameters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33996 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 2 +- dlls/vbscript/tests/lang.vbs | 21 +++++++++++++++++++++ dlls/vbscript/vbdisp.c | 35 +++++++++++++++++++++++++---------- 3 files changed, 47 insertions(+), 11 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index a9f4c540fcb..8f1c1307794 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -454,7 +454,7 @@ ClassBody PropertyDecl : Storage_opt tPROPERTY tGET Identifier ArgumentsDecl_opt StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPGET, $1, $5, $7); CHECK_ERROR; } - | Storage_opt tPROPERTY tLET Identifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY + | Storage_opt tPROPERTY tLET Identifier '(' ArgumentDeclList ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPLET, $1, $6, $9); CHECK_ERROR; } | Storage_opt tPROPERTY tSET Identifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPSET, $1, $6, $9); CHECK_ERROR; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 53f36b6e710..ed89906c9cf 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1770,6 +1770,27 @@ class TestPropSyntax end property end class +Class TestPropParam + Public oDict + Public Property Let Key(oldKey,newKey) + oDict = oldKey & newKey + End Property + Public Property Let three(uno,due,tre) + oDict = uno & due & tre + End Property + Public Property Let ten(a,b,c,d,e,f,g,h,i,j) + oDict = a & b & c & d & e & f & g & h & i & j + End Property +End Class + +Set x = new TestPropParam +x.key("old") = "new" +call ok(x.oDict = "oldnew","x.oDict = " & x.oDict & " expected oldnew") +x.three(1,2) = 3 +call ok(x.oDict = "123","x.oDict = " & x.oDict & " expected 123") +x.ten(1,2,3,4,5,6,7,8,9) = 0 +call ok(x.oDict = "1234567890","x.oDict = " & x.oDict & " expected 1234567890") + set x = new TestPropSyntax set x.prop = new TestPropSyntax set x.prop.prop = new TestPropSyntax diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 5f493d420bd..ee4875f4e01 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -197,28 +197,43 @@ static HRESULT invoke_vbdisp(vbdisp_t *This, DISPID id, DWORD flags, BOOL extern case DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF: { DISPPARAMS dp = {NULL, NULL, 1, 0}; BOOL needs_release; - VARIANT put_val; + VARIANT buf[6]; HRESULT hres; - - if(arg_cnt(params)) { - FIXME("arguments not implemented\n"); - return E_NOTIMPL; + INT i; + + dp.cArgs = arg_cnt(params) + 1; + if(dp.cArgs > ARRAY_SIZE(buf)) { + dp.rgvarg = heap_alloc(dp.cArgs*sizeof(VARIANT)); + if(!dp.rgvarg) + return E_OUTOFMEMORY; + }else { + dp.rgvarg = buf; } - hres = get_propput_arg(This->desc->ctx, params, flags, &put_val, &needs_release); - if(FAILED(hres)) + hres = get_propput_arg(This->desc->ctx, params, flags, dp.rgvarg, &needs_release); + if(FAILED(hres)) { + if(dp.rgvarg != buf) + heap_free(dp.rgvarg); return hres; + } - dp.rgvarg = &put_val; - func = This->desc->funcs[id].entries[V_VT(&put_val) == VT_DISPATCH ? VBDISP_SET : VBDISP_LET]; + func = This->desc->funcs[id].entries[V_VT(dp.rgvarg) == VT_DISPATCH ? VBDISP_SET : VBDISP_LET]; if(!func) { FIXME("no letter/setter\n"); + if(dp.rgvarg != buf) + heap_free(dp.rgvarg); return DISP_E_MEMBERNOTFOUND; } + for(i=1; i < dp.cArgs; i++) { + dp.rgvarg[i]=params->rgvarg[params->cNamedArgs+i-1]; + } + hres = exec_script(This->desc->ctx, extern_caller, func, This, &dp, NULL); if(needs_release) - VariantClear(&put_val); + VariantClear(dp.rgvarg); + if(dp.rgvarg != buf) + heap_free(dp.rgvarg); return hres; } default:

1 0

Alexandre Julliard : msvcrt: Use the msvcrt ctype functions internally.
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: b7fe06d0fa6dbad7d2c3ae380557adcaa10b89f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7fe06d0fa6dbad7d2c3ae38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 18 16:03:27 2020 +0100 msvcrt: Use the msvcrt ctype functions internally. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/ctype.c | 6 +++--- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/msvcrt.h | 3 +++ dlls/msvcrt/printf.h | 6 +++--- dlls/msvcrt/scanf.h | 7 ++----- dlls/msvcrt/undname.c | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 772357826eb..1334a514788 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -396,7 +396,7 @@ int CDECL MSVCRT_isblank(int c) */ int CDECL MSVCRT___isascii(int c) { - return isascii((unsigned)c); + return ((unsigned)c < 0x80); } /********************************************************************* @@ -421,7 +421,7 @@ int CDECL MSVCRT_iswascii(MSVCRT_wchar_t c) */ int CDECL MSVCRT___iscsym(int c) { - return (c < 127 && (isalnum(c) || c == '_')); + return (c < 127 && (MSVCRT_isalnum(c) || c == '_')); } /********************************************************************* @@ -429,7 +429,7 @@ int CDECL MSVCRT___iscsym(int c) */ int CDECL MSVCRT___iscsymf(int c) { - return (c < 127 && (isalpha(c) || c == '_')); + return (c < 127 && (MSVCRT_isalpha(c) || c == '_')); } /********************************************************************* diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 9d5f19cfbc0..090aa913589 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3013,7 +3013,7 @@ int CDECL MSVCRT_stat64(const char* path, struct MSVCRT__stat64 * buf) Also a letter as first char isn't enough to be classified as a drive letter */ - if (isalpha(*path)&& (*(path+1)==':')) + if (MSVCRT_isalpha(*path)&& (*(path+1)==':')) buf->st_dev = buf->st_rdev = MSVCRT__toupper_l(*path, NULL) - 'A'; /* drive num */ else buf->st_dev = buf->st_rdev = MSVCRT__getdrive() - 1; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 65956c9b2e5..ab5b4c13f85 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1072,6 +1072,9 @@ void* __cdecl MSVCRT_malloc(MSVCRT_size_t); void* __cdecl MSVCRT_calloc(MSVCRT_size_t,MSVCRT_size_t); void* __cdecl MSVCRT_realloc(void*,MSVCRT_size_t); +int __cdecl MSVCRT_isalpha(int c); +int __cdecl MSVCRT_isdigit(int c); +int __cdecl MSVCRT_isspace(int c); int __cdecl MSVCRT_iswalpha(MSVCRT_wint_t); int __cdecl MSVCRT_iswspace(MSVCRT_wint_t); int __cdecl MSVCRT_iswdigit(MSVCRT_wint_t); diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index cb83c05ff9f..f8b200c7e54 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -57,7 +57,7 @@ static inline const APICHAR* FUNC_NAME(pf_parse_int)(const APICHAR *fmt, int *va { *val = 0; - while(isdigit(*fmt)) { + while (*fmt >= '0' && *fmt <= '9') { *val *= 10; *val += *fmt++ - '0'; } @@ -1041,7 +1041,7 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API flags.LeftAlign = TRUE; flags.FieldLength = -flags.FieldLength; } - } else while(isdigit(*p)) { + } else while (*p >= '0' && *p <= '9') { flags.FieldLength *= 10; flags.FieldLength += *p++ - '0'; } @@ -1059,7 +1059,7 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API i = -1; flags.Precision = pf_args(args_ctx, i, VT_INT, valist).get_int; - } else while(isdigit(*p)) { + } else while (*p >= '0' && *p <= '9') { flags.Precision *= 10; flags.Precision += *p++ - '0'; } diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index e1a194e39fa..4750fae0f4a 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -28,7 +28,6 @@ #define _EOF_ MSVCRT_WEOF #define _EOF_RET (short)MSVCRT_WEOF #define _ISSPACE_(c) MSVCRT_iswspace(c) -#define _ISDIGIT_(c) MSVCRT_iswdigit(c) #define _WIDE2SUPPORTED_(c) c /* No conversion needed (wide to wide) */ #define _CHAR2SUPPORTED_(c) c /* FIXME: convert char to wide char */ #define _CHAR2DIGIT_(c, base) wchar2digit((c), (base)) @@ -37,8 +36,7 @@ #define _CHAR_ char #define _EOF_ MSVCRT_EOF #define _EOF_RET MSVCRT_EOF -#define _ISSPACE_(c) isspace(c) -#define _ISDIGIT_(c) isdigit(c) +#define _ISSPACE_(c) MSVCRT_isspace(c) #define _WIDE2SUPPORTED_(c) c /* FIXME: convert wide char to char */ #define _CHAR2SUPPORTED_(c) c /* No conversion needed (char to char) */ #define _CHAR2DIGIT_(c, base) char2digit((c), (base)) @@ -260,7 +258,7 @@ _FUNCTION_ { /* read prefix (if any) */ while (!prefix_finished) { /* look for width specification */ - while (_ISDIGIT_(*format)) { + while (*format >= '0' && *format <= '9') { width *= 10; width += *format++ - '0'; } @@ -721,7 +719,6 @@ _FUNCTION_ { #undef _EOF_ #undef _EOF_RET #undef _ISSPACE_ -#undef _ISDIGIT_ #undef _CHAR2SUPPORTED_ #undef _WIDE2SUPPORTED_ #undef _CHAR2DIGIT_ diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 69eef44654e..23317f49605 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -857,7 +857,7 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, if (!get_modified_type(ct, sym, pmt_ref, in_args ? dt : 'P', in_args)) goto done; break; case 'P': /* Pointer */ - if (isdigit(*sym->current)) + if (MSVCRT_isdigit(*sym->current)) { /* FIXME: * P6 = Function pointer

1 0

Alexandre Julliard : msvcrt: Use the msvcrt math functions internally.
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: 1be5e83859229d0e8a6c4fb3913865beea00a085 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1be5e83859229d0e8a6c4fb3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 18 16:01:52 2020 +0100 msvcrt: Use the msvcrt math functions internally. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 78 +++++++++++++++++++++++++--------------------------- dlls/msvcrt/msvcrt.h | 7 +++++ dlls/msvcrt/printf.h | 6 ++-- dlls/msvcrt/string.c | 2 +- 4 files changed, 48 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1be5e83859229d0e8a6c…

1 0

Ziqing Hui : d3dx10: Implement D3DX10GetImageInfoFromResource{A, W}().
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: 43aa33714ee081a8dcb6b489753a977d32b3fb3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=43aa33714ee081a8dcb6b489… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Nov 16 10:05:16 2020 +0800 d3dx10: Implement D3DX10GetImageInfoFromResource{A, W}(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 7 ++--- dlls/d3dx10_43/texture.c | 66 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 64 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index f9bd40a72cb..5d7ffcfde3f 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1460,8 +1460,6 @@ static void test_get_image_info(void) /* D3DX10GetImageInfoFromResource tests */ - todo_wine - { hr = D3DX10GetImageInfoFromResourceW(NULL, NULL, NULL, &image_info, NULL); ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); hr = D3DX10GetImageInfoFromResourceW(NULL, L"deadbeaf", NULL, &image_info, NULL); @@ -1470,20 +1468,19 @@ static void test_get_image_info(void) ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); hr = D3DX10GetImageInfoFromResourceA(NULL, "deadbeaf", NULL, &image_info, NULL); ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); - } for (i = 0; i < ARRAY_SIZE(test_image); ++i) { resource_module = create_resource_module(test_resource_name, test_image[i].data, test_image[i].size); hr = D3DX10GetImageInfoFromResourceW(resource_module, test_resource_name, NULL, &image_info, NULL); - todo_wine + todo_wine_if(test_image[i].expected.ImageFileFormat == D3DX10_IFF_WMP) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); if (hr == S_OK) check_image_info(&image_info, i, __LINE__); hr = D3DX10GetImageInfoFromResourceA(resource_module, get_str_a(test_resource_name), NULL, &image_info, NULL); - todo_wine + todo_wine_if(test_image[i].expected.ImageFileFormat == D3DX10_IFF_WMP) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); if (hr == S_OK) check_image_info(&image_info, i, __LINE__); diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 23d7b93e649..ea9b5120c47 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -148,6 +148,22 @@ done: return hr; } +static HRESULT load_resource(HMODULE module, HRSRC res_info, void **buffer, DWORD *size) +{ + HGLOBAL resource; + + if (!(*size = SizeofResource(module, res_info))) + return HRESULT_FROM_WIN32(GetLastError()); + + if (!(resource = LoadResource(module, res_info))) + return HRESULT_FROM_WIN32(GetLastError()); + + if (!(*buffer = LockResource(resource))) + return HRESULT_FROM_WIN32(GetLastError()); + + return S_OK; +} + HRESULT WINAPI D3DX10GetImageInfoFromFileA(const char *src_file, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info, HRESULT *result) { @@ -201,19 +217,61 @@ HRESULT WINAPI D3DX10GetImageInfoFromFileW(const WCHAR *src_file, ID3DX10ThreadP HRESULT WINAPI D3DX10GetImageInfoFromResourceA(HMODULE module, const char *resource, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info, HRESULT *result) { - FIXME("module %p, resource %s, pump %p, info %p, result %p\n", + HRSRC res_info; + void *buffer; + HRESULT hr; + DWORD size; + + TRACE("module %p, resource %s, pump %p, info %p, result %p.\n", module, debugstr_a(resource), pump, info, result); - return E_NOTIMPL; + if (!resource || !info) + return D3DX10_ERR_INVALID_DATA; + + res_info = FindResourceA(module, resource, (const char *)RT_RCDATA); + if (!res_info) + { + /* Try loading the resource as bitmap data */ + res_info = FindResourceA(module, resource, (const char *)RT_BITMAP); + if (!res_info) + return D3DX10_ERR_INVALID_DATA; + } + + hr = load_resource(module, res_info, &buffer, &size); + if (FAILED(hr)) + return D3DX10_ERR_INVALID_DATA; + + return D3DX10GetImageInfoFromMemory(buffer, size, pump, info, result); } HRESULT WINAPI D3DX10GetImageInfoFromResourceW(HMODULE module, const WCHAR *resource, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info, HRESULT *result) { - FIXME("module %p, resource %s, pump %p, info %p, result %p\n", + unsigned int size; + HRSRC res_info; + void *buffer; + HRESULT hr; + + TRACE("module %p, resource %s, pump %p, info %p, result %p.\n", module, debugstr_w(resource), pump, info, result); - return E_NOTIMPL; + if (!resource || !info) + return D3DX10_ERR_INVALID_DATA; + + res_info = FindResourceW(module, resource, (const WCHAR *)RT_RCDATA); + if (!res_info) + { + /* Try loading the resource as bitmap data */ + res_info = FindResourceW(module, resource, (const WCHAR *)RT_BITMAP); + if (!res_info) + return D3DX10_ERR_INVALID_DATA; + } + + hr = load_resource(module, res_info, &buffer, &size); + if (FAILED(hr)) + return D3DX10_ERR_INVALID_DATA; + + return D3DX10GetImageInfoFromMemory(buffer, size, pump, info, result); } HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump,

1 0

Ziqing Hui : d3dx10/tests: Add tests for D3DX10GetImageInfoFromResource{A, W}().
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: 6ffc3ecbd8ce9fe10d7f57183ecd2440d812cc6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ffc3ecbd8ce9fe10d7f5718… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Nov 18 13:22:08 2020 +0100 d3dx10/tests: Add tests for D3DX10GetImageInfoFromResource{A, W}(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 73 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 54cb4df3b7b..f9bd40a72cb 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -626,6 +626,43 @@ static ID3D10Device *create_device(void) return NULL; } +static HMODULE create_resource_module(const WCHAR *filename, const void *data, unsigned int size) +{ + WCHAR resource_module_path[MAX_PATH], current_module_path[MAX_PATH]; + HANDLE resource; + HMODULE module; + BOOL ret; + + if (!temp_dir[0]) + GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); + lstrcpyW(resource_module_path, temp_dir); + lstrcatW(resource_module_path, filename); + + GetModuleFileNameW(NULL, current_module_path, ARRAY_SIZE(current_module_path)); + ret = CopyFileW(current_module_path, resource_module_path, FALSE); + ok(ret, "CopyFileW failed, error %u.\n", GetLastError()); + SetFileAttributesW(resource_module_path, FILE_ATTRIBUTE_NORMAL); + + resource = BeginUpdateResourceW(resource_module_path, TRUE); + UpdateResourceW(resource, (LPCWSTR)RT_RCDATA, filename, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), (void *)data, size); + EndUpdateResourceW(resource, FALSE); + + module = LoadLibraryExW(resource_module_path, NULL, LOAD_LIBRARY_AS_DATAFILE); + + return module; +} + +static void delete_resource_module(const WCHAR *filename, HMODULE module) +{ + WCHAR path[MAX_PATH]; + + FreeLibrary(module); + + lstrcpyW(path, temp_dir); + lstrcatW(path, filename); + DeleteFileW(path); +} + static void check_image_info(D3DX10_IMAGE_INFO *image_info, unsigned int i, unsigned int line) { ok_(__FILE__, line)(image_info->Width == test_image[i].expected.Width, @@ -1364,8 +1401,10 @@ static void test_D3DX10CreateAsyncResourceLoader(void) static void test_get_image_info(void) { + static const WCHAR test_resource_name[] = L"resource.data"; static const WCHAR test_filename[] = L"image.data"; D3DX10_IMAGE_INFO image_info; + HMODULE resource_module; WCHAR path[MAX_PATH]; unsigned int i; DWORD dword; @@ -1418,6 +1457,40 @@ static void test_get_image_info(void) delete_file(test_filename); } + + /* D3DX10GetImageInfoFromResource tests */ + + todo_wine + { + hr = D3DX10GetImageInfoFromResourceW(NULL, NULL, NULL, &image_info, NULL); + ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); + hr = D3DX10GetImageInfoFromResourceW(NULL, L"deadbeaf", NULL, &image_info, NULL); + ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); + hr = D3DX10GetImageInfoFromResourceA(NULL, NULL, NULL, &image_info, NULL); + ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); + hr = D3DX10GetImageInfoFromResourceA(NULL, "deadbeaf", NULL, &image_info, NULL); + ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); + } + + for (i = 0; i < ARRAY_SIZE(test_image); ++i) + { + resource_module = create_resource_module(test_resource_name, test_image[i].data, test_image[i].size); + + hr = D3DX10GetImageInfoFromResourceW(resource_module, test_resource_name, NULL, &image_info, NULL); + todo_wine + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + if (hr == S_OK) + check_image_info(&image_info, i, __LINE__); + + hr = D3DX10GetImageInfoFromResourceA(resource_module, get_str_a(test_resource_name), NULL, &image_info, NULL); + todo_wine + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + if (hr == S_OK) + check_image_info(&image_info, i, __LINE__); + + delete_resource_module(test_resource_name, resource_module); + } + CoUninitialize(); }

1 0

Nikolay Sivov : mfplat: Use wide-char string literals.
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: 04106fa7872fc40ce28d634c8dd5dc5c832173f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04106fa7872fc40ce28d634c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 18 09:47:49 2020 +0300 mfplat: Use wide-char string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 47 ++++++++++++++++------------------------------- 1 file changed, 16 insertions(+), 31 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 44f29522487..6394784593e 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -624,21 +624,8 @@ HRESULT WINAPI MFCreateTransformActivate(IMFActivate **activate) return create_transform_activate(NULL, activate); } -static const WCHAR transform_keyW[] = {'M','e','d','i','a','F','o','u','n','d','a','t','i','o','n','\\', - 'T','r','a','n','s','f','o','r','m','s',0}; -static const WCHAR categories_keyW[] = {'M','e','d','i','a','F','o','u','n','d','a','t','i','o','n','\\', - 'T','r','a','n','s','f','o','r','m','s','\\', - 'C','a','t','e','g','o','r','i','e','s',0}; -static const WCHAR inputtypesW[] = {'I','n','p','u','t','T','y','p','e','s',0}; -static const WCHAR outputtypesW[] = {'O','u','t','p','u','t','T','y','p','e','s',0}; -static const WCHAR attributesW[] = {'A','t','t','r','i','b','u','t','e','s',0}; -static const WCHAR mftflagsW[] = {'M','F','T','F','l','a','g','s',0}; -static const WCHAR szGUIDFmt[] = -{ - '%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0', - '2','x','%','0','2','x','-','%','0','2','x','%','0','2','x','%','0','2', - 'x','%','0','2','x','%','0','2','x','%','0','2','x',0 -}; +static const WCHAR transform_keyW[] = L"MediaFoundation\\Transforms"; +static const WCHAR categories_keyW[] = L"MediaFoundation\\Transforms\\Categories"; static const BYTE guid_conv_table[256] = { @@ -653,10 +640,10 @@ static const BYTE guid_conv_table[256] = static WCHAR* GUIDToString(WCHAR *str, REFGUID guid) { - swprintf(str, 39, szGUIDFmt, guid->Data1, guid->Data2, - guid->Data3, guid->Data4[0], guid->Data4[1], - guid->Data4[2], guid->Data4[3], guid->Data4[4], - guid->Data4[5], guid->Data4[6], guid->Data4[7]); + swprintf(str, 39, L"%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", + guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], + guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], + guid->Data4[6], guid->Data4[7]); return str; } @@ -733,7 +720,6 @@ static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32 UINT32 cinput, const MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput, const MFT_REGISTER_TYPE_INFO *output_types, IMFAttributes *attributes) { - static const WCHAR reg_format[] = {'%','s','\\','%','s',0}; HRESULT hr = S_OK; HKEY hclsid = 0; WCHAR buffer[64]; @@ -742,7 +728,7 @@ static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32 UINT8 *blob; GUIDToString(buffer, clsid); - swprintf(str, ARRAY_SIZE(str), reg_format, transform_keyW, buffer); + swprintf(str, ARRAY_SIZE(str), L"%s\\%s", transform_keyW, buffer); if ((ret = RegCreateKeyW(HKEY_CLASSES_ROOT, str, &hclsid))) hr = HRESULT_FROM_WIN32(ret); @@ -757,14 +743,14 @@ static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32 if (SUCCEEDED(hr) && cinput && input_types) { size = cinput * sizeof(MFT_REGISTER_TYPE_INFO); - if ((ret = RegSetValueExW(hclsid, inputtypesW, 0, REG_BINARY, (BYTE *)input_types, size))) + if ((ret = RegSetValueExW(hclsid, L"InputTypes", 0, REG_BINARY, (BYTE *)input_types, size))) hr = HRESULT_FROM_WIN32(ret); } if (SUCCEEDED(hr) && coutput && output_types) { size = coutput * sizeof(MFT_REGISTER_TYPE_INFO); - if ((ret = RegSetValueExW(hclsid, outputtypesW, 0, REG_BINARY, (BYTE *)output_types, size))) + if ((ret = RegSetValueExW(hclsid, L"OutputTypes", 0, REG_BINARY, (BYTE *)output_types, size))) hr = HRESULT_FROM_WIN32(ret); } @@ -776,7 +762,7 @@ static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32 { if (SUCCEEDED(hr = MFGetAttributesAsBlob(attributes, blob, size))) { - if ((ret = RegSetValueExW(hclsid, attributesW, 0, REG_BINARY, blob, size))) + if ((ret = RegSetValueExW(hclsid, L"Attributes", 0, REG_BINARY, blob, size))) hr = HRESULT_FROM_WIN32(ret); } heap_free(blob); @@ -788,7 +774,7 @@ static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32 if (SUCCEEDED(hr) && flags) { - if ((ret = RegSetValueExW(hclsid, mftflagsW, 0, REG_DWORD, (BYTE *)&flags, sizeof(flags)))) + if ((ret = RegSetValueExW(hclsid, L"MFTFlags", 0, REG_DWORD, (BYTE *)&flags, sizeof(flags)))) hr = HRESULT_FROM_WIN32(ret); } @@ -798,7 +784,6 @@ static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32 static HRESULT register_category(CLSID *clsid, GUID *category) { - static const WCHAR reg_format[] = {'%','s','\\','%','s','\\','%','s',0}; HKEY htmp1; WCHAR guid1[64], guid2[64]; WCHAR str[350]; @@ -806,7 +791,7 @@ static HRESULT register_category(CLSID *clsid, GUID *category) GUIDToString(guid1, category); GUIDToString(guid2, clsid); - swprintf(str, ARRAY_SIZE(str), reg_format, categories_keyW, guid1, guid2); + swprintf(str, ARRAY_SIZE(str), L"%s\\%s\\%s", categories_keyW, guid1, guid2); if (RegCreateKeyW(HKEY_CLASSES_ROOT, str, &htmp1)) return E_FAIL; @@ -1157,13 +1142,13 @@ static HRESULT mft_collect_machine_reg(struct list *mfts, const GUID *category, if (!GUIDFromString(clsidW, &mft.clsid)) goto next; - mft_get_reg_flags(clsidW, mftflagsW, &mft.flags); + mft_get_reg_flags(clsidW, L"MFTFlags", &mft.flags); if (output_type) - mft_get_reg_type_info(clsidW, outputtypesW, &mft.output_types, &mft.output_types_count); + mft_get_reg_type_info(clsidW, L"OutputTypes", &mft.output_types, &mft.output_types_count); if (input_type) - mft_get_reg_type_info(clsidW, inputtypesW, &mft.input_types, &mft.input_types_count); + mft_get_reg_type_info(clsidW, L"InputTypes", &mft.input_types, &mft.input_types_count); if (!mft_is_type_info_match(&mft, category, flags, plugin_control, input_type, output_type)) { @@ -6139,7 +6124,7 @@ static HRESULT resolver_create_scheme_handler(const WCHAR *scheme, DWORD flags, static HRESULT resolver_get_scheme_handler(const WCHAR *url, DWORD flags, IMFSchemeHandler **handler) { - static const WCHAR fileschemeW[] = {'f','i','l','e',':',0}; + static const WCHAR fileschemeW[] = L"file:"; const WCHAR *ptr = url; unsigned int len; WCHAR *scheme;

1 0

Nikolay Sivov : xmllite/writer: Use wide-char string literals.
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: f8182ac19ce1f8ded2ae37b6e5da9491fb18369b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8182ac19ce1f8ded2ae37b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 18 09:44:42 2020 +0300 xmllite/writer: Use wide-char string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/writer.c | 130 +++++++++++++++++++------------------------------- 1 file changed, 48 insertions(+), 82 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f8182ac19ce1f8ded2ae…

1 0

Nikolay Sivov : xmllite/reader: Use wide-char string literals.
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: 6b5bf48c51214c23c6f73bf30cf651c69f313a9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b5bf48c51214c23c6f73bf3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 18 09:44:41 2020 +0300 xmllite/reader: Use wide-char string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 138 +++++++++++++++++++------------------------------- 1 file changed, 53 insertions(+), 85 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6b5bf48c51214c23c6f7…

1 0

Michael Stefaniuc : dxdiagn: Use wide-char string literals.
by Alexandre Julliard Nov. 18, 2020

Nov. 18, 2020

Module: wine Branch: master Commit: ea298a4c0967045a0a6db3c3feaaf7b5fe88adba URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea298a4c0967045a0a6db3c3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 18 00:06:41 2020 +0100 dxdiagn: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxdiagn/provider.c | 604 +++++++++++++++++------------------------------- 1 file changed, 208 insertions(+), 396 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ea298a4c0967045a0a6d…

1 0