December 2018 - Wine-Commits

Alex Henrie : ieframe: Turn several variables into static constants.
by Alexandre Julliard Dec. 20, 2018

Dec. 20, 2018

Module: wine Branch: master Commit: d4029a1acf1dbb015bcef7089a38f1bc6ae64189 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4029a1acf1dbb015bcef708… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 4 01:14:01 2018 -0700 ieframe: Turn several variables into static constants. 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/ieframe/intshcut.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index 4331bb9..8bf8ae8 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -456,11 +456,11 @@ static HRESULT get_profile_string(LPCWSTR lpAppName, LPCWSTR lpKeyName, static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileName, DWORD dwMode) { + static const WCHAR str_header[] = {'I','n','t','e','r','n','e','t','S','h','o','r','t','c','u','t',0}; + static const WCHAR str_URL[] = {'U','R','L',0}; + static const WCHAR str_iconfile[] = {'i','c','o','n','f','i','l','e',0}; + static const WCHAR str_iconindex[] = {'i','c','o','n','i','n','d','e','x',0}; InternetShortcut *This = impl_from_IPersistFile(pFile); - static WCHAR str_header[] = {'I','n','t','e','r','n','e','t','S','h','o','r','t','c','u','t',0}; - static WCHAR str_URL[] = {'U','R','L',0}; - static WCHAR str_iconfile[] = {'i','c','o','n','f','i','l','e',0}; - static WCHAR str_iconindex[] = {'i','c','o','n','i','n','d','e','x',0}; WCHAR *filename = NULL; WCHAR *url; HRESULT hr; @@ -573,12 +573,12 @@ static HRESULT WINAPI PersistFile_Save(IPersistFile *pFile, LPCOLESTR pszFileNam file = CreateFileW(pszFileName, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (file != INVALID_HANDLE_VALUE) { + static const char str_header[] = "[InternetShortcut]"; + static const char str_URL[] = "URL="; + static const char str_ICONFILE[] = "ICONFILE="; + static const char str_eol[] = "\r\n"; DWORD bytesWritten; char *iconfile; - char str_header[] = "[InternetShortcut]"; - char str_URL[] = "URL="; - char str_ICONFILE[] = "ICONFILE="; - char str_eol[] = "\r\n"; IPropertyStorage *pPropStgRead; PROPSPEC ps[2]; PROPVARIANT pvread[2]; @@ -587,11 +587,11 @@ static HRESULT WINAPI PersistFile_Save(IPersistFile *pFile, LPCOLESTR pszFileNam ps[1].ulKind = PRSPEC_PROPID; ps[1].u.propid = PID_IS_ICONINDEX; - WriteFile(file, str_header, lstrlenA(str_header), &bytesWritten, NULL); - WriteFile(file, str_eol, lstrlenA(str_eol), &bytesWritten, NULL); - WriteFile(file, str_URL, lstrlenA(str_URL), &bytesWritten, NULL); + WriteFile(file, str_header, ARRAY_SIZE(str_header) - 1, &bytesWritten, NULL); + WriteFile(file, str_eol, ARRAY_SIZE(str_eol) - 1, &bytesWritten, NULL); + WriteFile(file, str_URL, ARRAY_SIZE(str_URL) - 1, &bytesWritten, NULL); WriteFile(file, url, lstrlenA(url), &bytesWritten, NULL); - WriteFile(file, str_eol, lstrlenA(str_eol), &bytesWritten, NULL); + WriteFile(file, str_eol, ARRAY_SIZE(str_eol) - 1, &bytesWritten, NULL); hr = IPropertySetStorage_Open(This->property_set_storage, &FMTID_Intshcut, STGM_READ|STGM_SHARE_EXCLUSIVE, &pPropStgRead); if (SUCCEEDED(hr))

1 0

Zebediah Figura : dinput: Use the global module instance handle to load resources.
by Alexandre Julliard Dec. 20, 2018

Dec. 20, 2018

Module: wine Branch: master Commit: d507549038f7e0555e077ab9374eb16b8f7b06db URL: https://source.winehq.org/git/wine.git/?a=commit;h=d507549038f7e0555e077ab9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Dec 19 15:41:13 2018 -0600 dinput: Use the global module instance handle to load resources. This fixes a regression introduced by 56345c8757887431ada9f2347b43fc372d72872a. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46323 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/config.c | 8 ++++---- dlls/dinput/dinput_main.c | 2 +- dlls/dinput/dinput_private.h | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index bb36db0..885f1f4 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -86,7 +86,6 @@ static BOOL CALLBACK collect_devices(LPCDIDEVICEINSTANCEW lpddi, IDirectInputDev */ static void init_listview_columns(HWND dialog) { - HINSTANCE hinstance = (HINSTANCE) GetWindowLongPtrW(dialog, GWLP_HINSTANCE); LVCOLUMNW listColumn; RECT viewRect; int width; @@ -95,7 +94,7 @@ static void init_listview_columns(HWND dialog) GetClientRect(GetDlgItem(dialog, IDC_DEVICEOBJECTSLIST), &viewRect); width = (viewRect.right - viewRect.left)/2; - LoadStringW(hinstance, IDS_OBJECTCOLUMN, column, ARRAY_SIZE(column)); + LoadStringW(DINPUT_instance, IDS_OBJECTCOLUMN, column, ARRAY_SIZE(column)); listColumn.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; listColumn.pszText = column; listColumn.cchTextMax = lstrlenW(listColumn.pszText); @@ -103,7 +102,7 @@ static void init_listview_columns(HWND dialog) SendDlgItemMessageW (dialog, IDC_DEVICEOBJECTSLIST, LVM_INSERTCOLUMNW, 0, (LPARAM) &listColumn); - LoadStringW(hinstance, IDS_ACTIONCOLUMN, column, ARRAY_SIZE(column)); + LoadStringW(DINPUT_instance, IDS_ACTIONCOLUMN, column, ARRAY_SIZE(column)); listColumn.cx = width; listColumn.pszText = column; listColumn.cchTextMax = lstrlenW(listColumn.pszText); @@ -453,7 +452,8 @@ HRESULT _configure_devices(IDirectInput8W *iface, InitCommonControls(); - DialogBoxParamW(GetModuleHandleA("dinput.dll"), (LPCWSTR) MAKEINTRESOURCE(IDD_CONFIGUREDEVICES), lpdiCDParams->hwnd, ConfigureDevicesDlgProc, (LPARAM) &data); + DialogBoxParamW(DINPUT_instance, (const WCHAR *)MAKEINTRESOURCE(IDD_CONFIGUREDEVICES), + lpdiCDParams->hwnd, ConfigureDevicesDlgProc, (LPARAM)&data); return DI_OK; } diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 6ed764e..7074704 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -93,7 +93,7 @@ static const struct dinput_device *dinput_devices[] = &joystick_osx_device }; -static HINSTANCE DINPUT_instance = NULL; +HINSTANCE DINPUT_instance; static BOOL check_hook_thread(void); static CRITICAL_SECTION dinput_hook_crit; diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index 6c93e16..abdfbeb 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -27,6 +27,8 @@ #include "dinputd.h" #include "wine/list.h" +extern HINSTANCE DINPUT_instance; + /* Implementation specification */ typedef struct IDirectInputImpl IDirectInputImpl; struct IDirectInputImpl

1 0

Zebediah Figura : dinput: Move the version resource to a separate file.
by Alexandre Julliard Dec. 20, 2018

Dec. 20, 2018

Module: wine Branch: master Commit: a8ce68333cc905c3f1c93eef6f4a2e24dd59c101 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8ce68333cc905c3f1c93eef… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Dec 19 15:41:11 2018 -0600 dinput: Move the version resource to a separate file. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/Makefile.in | 4 +++- dlls/dinput/dinput.rc | 9 --------- dlls/dinput/version.rc | 26 ++++++++++++++++++++++++++ po/ar.po | 22 +++++++++++----------- po/bg.po | 22 +++++++++++----------- po/ca.po | 22 +++++++++++----------- po/cs.po | 22 +++++++++++----------- po/da.po | 22 +++++++++++----------- po/de.po | 22 +++++++++++----------- po/el.po | 22 +++++++++++----------- po/en.po | 22 +++++++++++----------- po/en_US.po | 22 +++++++++++----------- po/eo.po | 22 +++++++++++----------- po/es.po | 22 +++++++++++----------- po/fa.po | 22 +++++++++++----------- po/fi.po | 22 +++++++++++----------- po/fr.po | 22 +++++++++++----------- po/he.po | 22 +++++++++++----------- po/hi.po | 22 +++++++++++----------- po/hr.po | 22 +++++++++++----------- po/hu.po | 22 +++++++++++----------- po/it.po | 22 +++++++++++----------- po/ja.po | 22 +++++++++++----------- po/ko.po | 22 +++++++++++----------- po/lt.po | 22 +++++++++++----------- po/ml.po | 22 +++++++++++----------- po/nb_NO.po | 22 +++++++++++----------- po/nl.po | 22 +++++++++++----------- po/or.po | 22 +++++++++++----------- po/pa.po | 22 +++++++++++----------- po/pl.po | 22 +++++++++++----------- po/pt_BR.po | 22 +++++++++++----------- po/pt_PT.po | 22 +++++++++++----------- po/rm.po | 22 +++++++++++----------- po/ro.po | 22 +++++++++++----------- po/ru.po | 22 +++++++++++----------- po/sk.po | 22 +++++++++++----------- po/sl.po | 22 +++++++++++----------- po/sr_RS(a)cyrillic.po | 22 +++++++++++----------- po/sr_RS(a)latin.po | 22 +++++++++++----------- po/sv.po | 22 +++++++++++----------- po/te.po | 22 +++++++++++----------- po/th.po | 22 +++++++++++----------- po/tr.po | 22 +++++++++++----------- po/uk.po | 22 +++++++++++----------- po/wa.po | 22 +++++++++++----------- po/wine.pot | 22 +++++++++++----------- po/zh_CN.po | 22 +++++++++++----------- po/zh_TW.po | 22 +++++++++++----------- 49 files changed, 535 insertions(+), 516 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a8ce68333cc905c3f1c9…

1 0

Serge Gautherie : jscript: Fix a MSVC-x64 warning about to_uint32().
by Alexandre Julliard Dec. 20, 2018

Dec. 20, 2018

Module: wine Branch: master Commit: 961d5c8ed05eeccbe216ff24faa0e3d6a0c2b332 URL: https://source.winehq.org/git/wine.git/?a=commit;h=961d5c8ed05eeccbe216ff24… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Tue Dec 18 02:11:41 2018 +0100 jscript: Fix a MSVC-x64 warning about to_uint32(). Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index b612e65..b653e52 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -675,7 +675,7 @@ HRESULT to_int32(script_ctx_t *ctx, jsval_t v, INT *ret) } /* ECMA-262 3rd Edition 9.6 */ -HRESULT to_uint32(script_ctx_t *ctx, jsval_t val, DWORD *ret) +HRESULT to_uint32(script_ctx_t *ctx, jsval_t val, UINT32 *ret) { INT32 n; HRESULT hres;

1 0

Dmitry Timoshkov : comdlg32: When FOS_PICKFOLDERS is specified item selection box should contain full path name.
by Alexandre Julliard Dec. 20, 2018

Dec. 20, 2018

Module: wine Branch: master Commit: 5a622342d9e658e0db880d79c1412c79e53a74c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a622342d9e658e0db880d79… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 20 17:17:22 2018 +0300 comdlg32: When FOS_PICKFOLDERS is specified item selection box should contain full path name. Otherwise when selecting a folder using IFileOpenDialog interface the caller instead of C:\Temp receives C:\Temp\Temp. This matches both an old GetOpenFileName behaviour and what IFileOpenDialog returns under Windows. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 2 +- dlls/comdlg32/itemdlg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index deae866..541410c 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -639,7 +639,7 @@ void COMDLG32_GetCanonicalPath(PCIDLIST_ABSOLUTE pidlAbsCurrent, } PathAddBackslashW(lpstrPathAndFile); - TRACE("current directory=%s\n", debugstr_w(lpstrPathAndFile)); + TRACE("current directory=%s, file=%s\n", debugstr_w(lpstrPathAndFile), debugstr_w(lpstrFile)); /* if the user specified a fully qualified path use it */ if(PathIsRelativeW(lpstrFile)) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index ff97ae2..5f36d2b 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -424,7 +424,7 @@ static void fill_filename_from_selection(FileDialogImpl *This) (!(This->options & FOS_PICKFOLDERS) && (attr & SFGAO_FOLDER)))) continue; - hr = IShellItem_GetDisplayName(psi, SIGDN_PARENTRELATIVEPARSING, &names[valid_count]); + hr = IShellItem_GetDisplayName(psi, (This->options & FOS_PICKFOLDERS) ? SIGDN_FILESYSPATH : SIGDN_PARENTRELATIVEPARSING, &names[valid_count]); if(SUCCEEDED(hr)) { len_total += lstrlenW(names[valid_count]) + 3;

1 0

Józef Kucia : vkd3d-shader: Implement DXBC checksum for root signatures.
by Alexandre Julliard Dec. 20, 2018

Dec. 20, 2018

Module: vkd3d Branch: master Commit: 49e55dd6391aa5c08dcffd95f380e94a98b99140 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=49e55dd6391aa5c08dcffd9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 17 21:25:54 2018 +0100 vkd3d-shader: Implement DXBC checksum for root signatures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/checksum.c | 73 +++++++++++++++++++++----------- libs/vkd3d-shader/dxbc.c | 6 ++- libs/vkd3d-shader/vkd3d_shader_private.h | 6 +-- tests/d3d12.c | 9 +--- 4 files changed, 56 insertions(+), 38 deletions(-) diff --git a/libs/vkd3d-shader/checksum.c b/libs/vkd3d-shader/checksum.c index d2929da..b9a7140 100644 --- a/libs/vkd3d-shader/checksum.c +++ b/libs/vkd3d-shader/checksum.c @@ -35,11 +35,15 @@ #include "vkd3d_shader_private.h" +#define DXBC_CHECKSUM_BLOCK_SIZE 64 + +STATIC_ASSERT(sizeof(unsigned int) == 4); + struct md5_ctx { unsigned int i[2]; unsigned int buf[4]; - unsigned char in[64]; + unsigned char in[DXBC_CHECKSUM_BLOCK_SIZE]; unsigned char digest[16]; }; @@ -163,7 +167,7 @@ static void byte_reverse(unsigned char *buf, unsigned longs) * Start MD5 accumulation. Set bit count to 0 and buffer to mysterious * initialization constants. */ -void md5_init(struct md5_ctx *ctx) +static void md5_init(struct md5_ctx *ctx) { ctx->buf[0] = 0x67452301; ctx->buf[1] = 0xefcdab89; @@ -177,7 +181,7 @@ void md5_init(struct md5_ctx *ctx) * Update context to reflect the concatenation of another buffer full * of bytes. */ -void md5_update(struct md5_ctx *ctx, const unsigned char *buf, unsigned int len) +static void md5_update(struct md5_ctx *ctx, const unsigned char *buf, unsigned int len) { unsigned int t; @@ -194,7 +198,7 @@ void md5_update(struct md5_ctx *ctx, const unsigned char *buf, unsigned int len) if (t) { unsigned char *p = (unsigned char *)ctx->in + t; - t = 64 - t; + t = DXBC_CHECKSUM_BLOCK_SIZE - t; if (len < t) { @@ -212,27 +216,25 @@ void md5_update(struct md5_ctx *ctx, const unsigned char *buf, unsigned int len) } /* Process data in 64-byte chunks */ - while (len >= 64) + while (len >= DXBC_CHECKSUM_BLOCK_SIZE) { - memcpy(ctx->in, buf, 64); + memcpy(ctx->in, buf, DXBC_CHECKSUM_BLOCK_SIZE); byte_reverse(ctx->in, 16); md5_transform(ctx->buf, (unsigned int *)ctx->in); - buf += 64; - len -= 64; + buf += DXBC_CHECKSUM_BLOCK_SIZE; + len -= DXBC_CHECKSUM_BLOCK_SIZE; } /* Handle any remaining bytes of data. */ memcpy(ctx->in, buf, len); } -/* - * Final wrapup - pad to 64-byte boundary with the bit pattern - * 1 0* (64-bit count of bits processed, MSB-first) - */ -void md5_final(struct md5_ctx *ctx) +static void dxbc_checksum_final(struct md5_ctx *ctx) { + unsigned int padding; + unsigned int length; unsigned int count; unsigned char *p; @@ -243,34 +245,57 @@ void md5_final(struct md5_ctx *ctx) always at least one byte free */ p = ctx->in + count; *p++ = 0x80; + ++count; /* Bytes of padding needed to make 64 bytes */ - count = 64 - 1 - count; + padding = DXBC_CHECKSUM_BLOCK_SIZE - count; /* Pad out to 56 mod 64 */ - if (count < 8) + if (padding < 8) { /* Two lots of padding: Pad the first block to 64 bytes */ - memset(p, 0, count); + memset(p, 0, padding); byte_reverse(ctx->in, 16); md5_transform(ctx->buf, (unsigned int *)ctx->in); - /* Now fill the next block with 56 bytes */ - memset(ctx->in, 0, 56); + /* Now fill the next block */ + memset(ctx->in, 0, DXBC_CHECKSUM_BLOCK_SIZE); } else { - /* Pad block to 56 bytes */ - memset(p, 0, count - 8); - } + /* Make place for bitcount at the beginning of the block */ + memmove(&ctx->in[4], ctx->in, count); - byte_reverse(ctx->in, 14); + /* Pad block to 60 bytes */ + memset(p + 4, 0, padding - 4); + } /* Append length in bits and transform */ - ((unsigned int *)ctx->in)[14] = ctx->i[0]; - ((unsigned int *)ctx->in)[15] = ctx->i[1]; + length = ctx->i[0]; + memcpy(&ctx->in[0], &length, sizeof(length)); + byte_reverse(&ctx->in[4], 14); + length = ctx->i[0] >> 2 | 0x1; + memcpy(&ctx->in[DXBC_CHECKSUM_BLOCK_SIZE - 4], &length, sizeof(length)); md5_transform(ctx->buf, (unsigned int *)ctx->in); byte_reverse((unsigned char *)ctx->buf, 4); memcpy(ctx->digest, ctx->buf, 16); } + +#define DXBC_CHECKSUM_SKIP_BYTE_COUNT 20 + +void vkd3d_compute_dxbc_checksum(const void *dxbc, size_t size, uint32_t checksum[4]) +{ + const uint8_t *ptr = dxbc; + struct md5_ctx ctx; + + assert(size > DXBC_CHECKSUM_SKIP_BYTE_COUNT); + ptr += DXBC_CHECKSUM_SKIP_BYTE_COUNT; + size -= DXBC_CHECKSUM_SKIP_BYTE_COUNT; + + md5_init(&ctx); + md5_update(&ctx, ptr, size); + dxbc_checksum_final(&ctx); + + memcpy(checksum, ctx.digest, sizeof(ctx.digest)); +} diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index b199749..4b36ea6 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2389,7 +2389,7 @@ static int shader_write_root_signature_header(struct root_signature_writer_conte if (!write_dword(context, TAG_DXBC)) return VKD3D_ERROR_OUT_OF_MEMORY; - WARN("DXBC checksum is not implemented.\n"); + /* The checksum is computed when all data is generated. */ if (!write_dwords(context, 4, 0x00000000)) return VKD3D_ERROR_OUT_OF_MEMORY; @@ -2596,6 +2596,7 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_root_signature_desc { struct root_signature_writer_context context; size_t total_size, chunk_size; + uint32_t checksum[4]; int ret; TRACE("root_signature %p, version %#x, dxbc %p.\n", root_signature, version, dxbc); @@ -2628,5 +2629,8 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_root_signature_desc dxbc->code = context.data; dxbc->size = total_size; + vkd3d_compute_dxbc_checksum(dxbc->code, dxbc->size, checksum); + memcpy((uint32_t *)dxbc->code + 1, checksum, sizeof(checksum)); + return VKD3D_OK; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index e0fad68..bf2f455 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -815,11 +815,7 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, struct vkd3d_shader_code *spirv) DECLSPEC_HIDDEN; void vkd3d_dxbc_compiler_destroy(struct vkd3d_dxbc_compiler *compiler) DECLSPEC_HIDDEN; -struct md5_ctx; - -void md5_init(struct md5_ctx *ctx) DECLSPEC_HIDDEN; -void md5_update(struct md5_ctx *ctx, const unsigned char *buf, unsigned int len) DECLSPEC_HIDDEN; -void md5_final(struct md5_ctx *ctx) DECLSPEC_HIDDEN; +void vkd3d_compute_dxbc_checksum(const void *dxbc, size_t size, uint32_t checksum[4]) DECLSPEC_HIDDEN; static inline enum vkd3d_component_type vkd3d_component_type_from_data_type( enum vkd3d_data_type data_type) diff --git a/tests/d3d12.c b/tests/d3d12.c index 7d67de2..314f08a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9107,14 +9107,7 @@ static void test_root_signature_serialization_(unsigned int line, const DWORD *c ok_(line)(blob_size == code_size, "Got size %u, expected %u.\n", (unsigned int)blob_size, (unsigned int)code_size); - ok_(line)(blob_buffer[0] == code[0], "Got magic %#x, expected %#x.\n", - (unsigned int)blob_buffer[0], (unsigned int)code[0]); - for (i = 1; i < 5; ++i) - { - todo ok_(line)(blob_buffer[i] == code[i], "Got checksum %#x, expected %#x at %u.\n", - (unsigned int)blob_buffer[i], (unsigned int)code[i], i - 1); - } - for (; i < code_size / sizeof(DWORD); ++i) + for (i = 0; i < code_size / sizeof(DWORD); ++i) { ok_(line)(blob_buffer[i] == code[i], "Got dword %#x, expected %#x at %u.\n", (unsigned int)blob_buffer[i], (unsigned int)code[i], i);

1 0

Józef Kucia : vkd3d-shader: Import MD5 implementation from Wine.
by Alexandre Julliard Dec. 20, 2018

Dec. 20, 2018

Module: vkd3d Branch: master Commit: 3795add8787075d130cf575cc6db8e4d1afcc6ce URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3795add8787075d130cf575… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 17 21:21:15 2018 +0100 vkd3d-shader: Import MD5 implementation from Wine. With style changes. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 + libs/vkd3d-shader/checksum.c | 276 +++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 6 + 3 files changed, 283 insertions(+) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=3795add8787075d130c…

1 0

Michael Stefaniuc : dmstyle/tests: Relax a test for a pristine DMStyle object.
by Alexandre Julliard Dec. 19, 2018

Dec. 19, 2018

Module: wine Branch: master Commit: 6b42be395daabec358870b0bb065935226a166c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b42be395daabec358870b0b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Dec 19 21:55:42 2018 +0100 dmstyle/tests: Relax a test for a pristine DMStyle object. Based on a patch by Alex Henrie. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/tests/dmstyle.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 245424c..4c09d44 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -456,9 +456,8 @@ static void test_parsedescriptor(void) /* Nothing loaded */ 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(desc.dwValidData & DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicStyle), "Got class guid %s, expected CLSID_DirectMusicStyle\n", wine_dbgstr_guid(&desc.guidClass));

1 0

Sven Baars : windowscodecs: Fix a memory leak (Valgrind).
by Alexandre Julliard Dec. 19, 2018

Dec. 19, 2018

Module: wine Branch: master Commit: 7a32035fc5701bf7a292848d27d7b6039d36243f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a32035fc5701bf7a292848d… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue Dec 18 20:44:17 2018 +0100 windowscodecs: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/imgfactory.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index fb235fb..40f3ed5 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -185,6 +185,7 @@ static HRESULT find_decoder(IStream *pIStream, const GUID *pguidVendor, IWICBitmapDecoder_Release(*decoder); IWICBitmapDecoderInfo_Release(decoderinfo); IUnknown_Release(unkdecoderinfo); + IEnumUnknown_Release(enumdecoders); *decoder = NULL; return res; }

1 0

Sven Baars : windowscodecs/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard Dec. 19, 2018

Dec. 19, 2018

Module: wine Branch: master Commit: a77c7626dd0ebea1f7fa0bbbf2edbcd7a209bb10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a77c7626dd0ebea1f7fa0bbb… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue Dec 18 20:44:16 2018 +0100 windowscodecs/tests: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/pngformat.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index d08a5fb..8c33d3b 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -306,6 +306,8 @@ static HRESULT create_decoder(const void *image_data, UINT image_size, IWICBitma refcount = IStream_Release(stream); ok(refcount > 0, "expected stream refcount > 0\n"); } + else + IStream_Release(stream); return hr; }

1 0