January 2022 - Wine-commits

Zebediah Figura : include: Define InterlockedExchangeAdd64() and InterlockedExchangeAddSizeT().
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: c5bdd938d2ab2e81ff3854c4e1c19709e9057e56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5bdd938d2ab2e81ff3854c4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 26 11:44:19 2022 -0600 include: Define InterlockedExchangeAdd64() and InterlockedExchangeAddSizeT(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index 9296a3dc555..e20b504a4f9 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6276,6 +6276,7 @@ typedef enum _PROCESS_MITIGATION_POLICY #define InterlockedDecrement16 _InterlockedDecrement16 #define InterlockedExchange _InterlockedExchange #define InterlockedExchangeAdd _InterlockedExchangeAdd +#define InterlockedExchangeAdd64 _InterlockedExchangeAdd64 #define InterlockedExchangePointer _InterlockedExchangePointer #define InterlockedIncrement _InterlockedIncrement #define InterlockedIncrement16 _InterlockedIncrement16 @@ -6291,6 +6292,7 @@ typedef enum _PROCESS_MITIGATION_POLICY #pragma intrinsic(_InterlockedCompareExchange64) #pragma intrinsic(_InterlockedExchange) #pragma intrinsic(_InterlockedExchangeAdd) +#pragma intrinsic(_InterlockedExchangeAdd64) #pragma intrinsic(_InterlockedIncrement) #pragma intrinsic(_InterlockedIncrement16) #pragma intrinsic(_InterlockedDecrement) @@ -6307,6 +6309,7 @@ long _InterlockedDecrement(long volatile*); short _InterlockedDecrement16(short volatile*); long _InterlockedExchange(long volatile*,long); long _InterlockedExchangeAdd(long volatile*,long); +long long _InterlockedExchangeAdd64(long long volatile*,long long); long _InterlockedIncrement(long volatile*); short _InterlockedIncrement16(short volatile*); long _InterlockedOr(long volatile *,long); @@ -6432,6 +6435,11 @@ static FORCEINLINE LONG WINAPI InterlockedExchangeAdd( LONG volatile *dest, LONG return __sync_fetch_and_add( dest, incr ); } +static FORCEINLINE LONGLONG WINAPI InterlockedExchangeAdd64( LONGLONG volatile *dest, LONGLONG incr ) +{ + return __sync_fetch_and_add( dest, incr ); +} + static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) { return __sync_add_and_fetch( dest, 1 ); @@ -6515,7 +6523,14 @@ static FORCEINLINE unsigned char InterlockedCompareExchange128( volatile __int64 } #endif -#endif + +#define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd64((LONGLONG *)(a), (b)) + +#else /* _WIN64 */ + +#define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd((LONG *)(a), (b)) + +#endif /* _WIN64 */ static FORCEINLINE void YieldProcessor(void) {

1 0

Matteo Bruni : d3dcompiler/tests: Use the relevant d3dcompiler version in blob tests.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: edd9d23ee15e680b4071f73c0ca6406e35e8fc20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=edd9d23ee15e680b4071f73c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 26 22:37:13 2022 +0100 d3dcompiler/tests: Use the relevant d3dcompiler version in blob tests. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/blob.c | 205 ++++++++++++++++++--------------------- 1 file changed, 97 insertions(+), 108 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=edd9d23ee15e680b4071…

1 0

Nikolay Sivov : d3dcompiler: Implement D3DWriteBlobToFile().
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: d12d6b29786575d261bcd41236c0937daf291627 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d12d6b29786575d261bcd412… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 26 22:37:14 2022 +0100 d3dcompiler: Implement D3DWriteBlobToFile(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/blob.c | 25 ++++++++++++++++++++++--- dlls/d3dcompiler_43/tests/blob.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index 5cc49fe5699..ee23893576d 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -514,9 +514,28 @@ HRESULT WINAPI D3DReadFileToBlob(const WCHAR *filename, ID3DBlob **contents) return S_OK; } -HRESULT WINAPI D3DWriteBlobToFile(ID3DBlob* blob, const WCHAR *filename, BOOL overwrite) +HRESULT WINAPI D3DWriteBlobToFile(ID3DBlob *blob, const WCHAR *filename, BOOL overwrite) { - FIXME("blob %p, filename %s, overwrite %d\n", blob, debugstr_w(filename), overwrite); + DWORD written_size; + SIZE_T data_size; + HANDLE file; + BOOL ret; + + TRACE("blob %p, filename %s, overwrite %#x.\n", blob, debugstr_w(filename), overwrite); + + file = CreateFileW(filename, GENERIC_WRITE, FILE_SHARE_READ, NULL, overwrite ? CREATE_ALWAYS : CREATE_NEW, + FILE_ATTRIBUTE_NORMAL, NULL); + if (file == INVALID_HANDLE_VALUE) + return HRESULT_FROM_WIN32(GetLastError()); - return E_NOTIMPL; + data_size = ID3D10Blob_GetBufferSize(blob); + ret = WriteFile(file, ID3D10Blob_GetBufferPointer(blob), data_size, &written_size, NULL); + CloseHandle(file); + if (!ret || data_size != written_size) + { + WARN("Failed to write blob contents.\n"); + return E_FAIL; + } + + return S_OK; } diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c index 9369fcd97f5..400d5940bf7 100644 --- a/dlls/d3dcompiler_43/tests/blob.c +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -859,6 +859,37 @@ static void test_D3DReadFileToBlob(void) DeleteFileW(filename); ID3D10Blob_Release(blob); } + +static void test_D3DWriteBlobToFile(void) +{ + WCHAR temp_dir[MAX_PATH], filename[MAX_PATH]; + ID3DBlob *blob; + HRESULT hr; + + GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); + GetTempFileNameW(temp_dir, NULL, 0, filename); + + hr = D3DCreateBlob(16, &blob); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = D3DWriteBlobToFile(blob, filename, FALSE); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "Unexpected hr %#x.\n", hr); + + hr = D3DWriteBlobToFile(blob, filename, TRUE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + DeleteFileW(filename); + + hr = D3DWriteBlobToFile(blob, filename, FALSE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = D3DWriteBlobToFile(blob, filename, FALSE); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "Unexpected hr %#x.\n", hr); + + DeleteFileW(filename); + + ID3D10Blob_Release(blob); +} #endif #endif @@ -870,6 +901,7 @@ START_TEST(blob) test_get_blob_part2(); #if D3D_COMPILER_VERSION >= 46 test_D3DReadFileToBlob(); + test_D3DWriteBlobToFile(); #endif #endif }

1 0

Nikolay Sivov : d3d10/tests: Add a test with fx_4_1 binary.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: 61d5e8fd1c221311e3923006381477385bb2a386 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61d5e8fd1c221311e3923006… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 26 12:04:49 2022 +0300 d3d10/tests: Add a test with fx_4_1 binary. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/tests/effect.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index dbc4dcf3941..b5df2fd8538 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -8209,6 +8209,43 @@ static void test_effect_value_expression(void) ok(!refcount, "Device has %u references left.\n", refcount); } +#if 0 +technique10 tech0 +{ + pass pass0 {} +}; +#endif +static DWORD fx_test_fx_4_1[] = +{ + 0x43425844, 0x228fcf4d, 0x9396b2f5, 0xd817b31f, 0xab6dd460, 0x00000001, 0x000000a0, 0x00000001, + 0x00000024, 0x30315846, 0x00000074, 0xfeff1011, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0x00000010, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x68636574, + 0x61700030, 0x00307373, 0x00000004, 0x00000001, 0x00000000, 0x0000000a, 0x00000000, 0x00000000, +}; + +static void test_effect_fx_4_1(void) +{ + ID3D10Effect *effect; + ID3D10Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = create_effect(fx_test_fx_4_1, 0, device, NULL, &effect); + ok(SUCCEEDED(hr), "Failed to create an effect, hr %#x.\n", hr); + + effect->lpVtbl->Release(effect); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(effect) { test_effect_constant_buffer_type(); @@ -8235,4 +8272,5 @@ START_TEST(effect) test_effect_dynamic_numeric_field(); test_effect_index_expression(); test_effect_value_expression(); + test_effect_fx_4_1(); }

1 0

Eric Pouech : winedbg: Use correct integral type.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: aa9eb8e067049587f6eccaead1be2c614c871f78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa9eb8e067049587f6eccaea… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Jan 27 10:17:20 2022 +0100 winedbg: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 44079c2fe76..d82c4ccb687 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -341,7 +341,7 @@ static BOOL be_x86_64_is_break_insn(const void* insn) return dbg_read_memory(insn, &c, sizeof(c)) && c == 0xCC; } -static BOOL fetch_value(const char* addr, unsigned sz, int* value) +static BOOL fetch_value(const char* addr, unsigned sz, LONG* value) { char value8; short value16;

1 0

Eric Pouech : winetest: Use correct integral type.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: 53085f10f105366145f94daf69f1335ec3be1beb URL: https://source.winehq.org/git/wine.git/?a=commit;h=53085f10f105366145f94daf… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Jan 27 10:17:26 2022 +0100 winetest: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 0c431a903d7..3ed514f73e2 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -318,7 +318,8 @@ static BOOL is_native_dll( HMODULE module ) */ static BOOL is_stub_dll(const char *filename) { - DWORD size, ver; + UINT size; + DWORD ver; BOOL isstub = FALSE; char *p, *data;

1 0

Eric Pouech : adsldp: Use correct integral type.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: e785da84bd8becffd8bf44d089615a400940b061 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e785da84bd8becffd8bf44d0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Jan 27 10:17:41 2022 +0100 adsldp: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 3d5ea29882c..8039065eff3 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -245,7 +245,7 @@ static HRESULT WINAPI sysinfo_get_UserName(IADsADSystemInfo *iface, BSTR *retval static HRESULT WINAPI sysinfo_get_ComputerName(IADsADSystemInfo *iface, BSTR *retval) { - UINT size; + ULONG size; WCHAR *name; TRACE("%p,%p\n", iface, retval);

1 0

Eric Pouech : comctl32: Use correct integral type.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: 5e56ada9c4552ff6865f668fae472df3321bba8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e56ada9c4552ff6865f668f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Jan 27 10:17:47 2022 +0100 comctl32: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 7 ++++++- dlls/comctl32/taskdialog.c | 6 ++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index a2a1c9e0561..88b48a4a5c0 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1229,7 +1229,12 @@ static SIZE BUTTON_GetImageSize(const BUTTON_INFO *infoPtr) /* ImageList has priority over image */ if (infoPtr->imagelist.himl) - ImageList_GetIconSize(infoPtr->imagelist.himl, &size.cx, &size.cy); + { + int scx, scy; + ImageList_GetIconSize(infoPtr->imagelist.himl, &scx, &scy); + size.cx = scx; + size.cy = scy; + } else if (infoPtr->u.image) { if (infoPtr->image_type == IMAGE_ICON) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 92a2b533efb..4523695d614 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -430,7 +430,8 @@ static void taskdialog_get_expando_size(struct taskdialog_info *dialog_info, HWN HFONT hfont, old_hfont; HDC hdc; RECT rect = {0}; - LONG icon_width, icon_height, text_offset; + LONG icon_width, icon_height; + INT text_offset; LONG max_width, max_text_height; hdc = GetDC(hwnd); @@ -1092,7 +1093,8 @@ static void taskdialog_draw_expando_control(struct taskdialog_info *dialog_info, HDC hdc; RECT rect = {0}; WCHAR *text; - LONG icon_width, icon_height, text_offset; + LONG icon_width, icon_height; + INT text_offset; UINT style = DFCS_FLAT; BOOL draw_focus;

1 0

Eric Pouech : comdlg32: Use correct integral type.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: d55aad928bb658126c745c60ae8bd9773f5834c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d55aad928bb658126c745c60… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Jan 27 10:17:53 2022 +0100 comdlg32: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/itemdlg.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index d6957d51a66..603d48876c0 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -393,7 +393,8 @@ static void fill_filename_from_selection(FileDialogImpl *This) IShellItem *psi; LPWSTR *names; HRESULT hr; - UINT item_count, valid_count; + DWORD item_count; + UINT valid_count; UINT len_total, i; if(!This->psia_selection) @@ -412,7 +413,7 @@ static void fill_filename_from_selection(FileDialogImpl *This) hr = IShellItemArray_GetItemAt(This->psia_selection, i, &psi); if(SUCCEEDED(hr)) { - UINT attr; + DWORD attr; hr = IShellItem_GetAttributes(psi, SFGAO_FOLDER, &attr); if(SUCCEEDED(hr) && @@ -2675,7 +2676,7 @@ static HRESULT WINAPI IFileDialog2_fnGetResult(IFileDialog2 *iface, IShellItem * if(This->psia_results) { - UINT item_count; + DWORD item_count; hr = IShellItemArray_GetCount(This->psia_results, &item_count); if(SUCCEEDED(hr)) {

1 0

Eric Pouech : crypt32: Use correct integral type.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: f88507a4fd72ffc51b94ca3e0661d74065adfde2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f88507a4fd72ffc51b94ca3e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Jan 27 10:18:01 2022 +0100 crypt32: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/protectdata.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/protectdata.c b/dlls/crypt32/protectdata.c index 3d9447dfdee..b23f1f02117 100644 --- a/dlls/crypt32/protectdata.c +++ b/dlls/crypt32/protectdata.c @@ -403,7 +403,7 @@ BOOL unserialize(const DATA_BLOB *pSerial, struct protect_data_t *pInfo) } /* cipher_alg */ - if (!unserialize_dword(ptr,&index,size,&pInfo->cipher_alg)) + if (!unserialize_dword(ptr,&index,size,(DWORD*)&pInfo->cipher_alg)) { ERR("reading cipher_alg failed!\n"); return FALSE; @@ -432,7 +432,7 @@ BOOL unserialize(const DATA_BLOB *pSerial, struct protect_data_t *pInfo) } /* hash_alg */ - if (!unserialize_dword(ptr,&index,size,&pInfo->hash_alg)) + if (!unserialize_dword(ptr,&index,size,(DWORD*)&pInfo->hash_alg)) { ERR("reading hash_alg failed!\n"); return FALSE;

1 0