June 2021 - Wine-commits - list.winehq.org

Akihiro Sagawa : winmm/tests: Expect TIME_BYTES format for TIME_MS request.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: c84fb8ad7761a7a38a047835ffd96810979a6286 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c84fb8ad7761a7a38a047835… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jan 20 22:23:40 2021 +0900 winmm/tests: Expect TIME_BYTES format for TIME_MS request. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit aa56ee08f6c436cb5d0cbebf6b2213d06570ac8a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winmm/tests/wave.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 819489e5566..079a497dd0b 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -519,14 +519,11 @@ static void check_position(int device, HWAVEOUT wout, DWORD bytes, rc=waveOutGetPosition(wout, &mmtime, sizeof(mmtime)); ok(rc==MMSYSERR_NOERROR, "waveOutGetPosition(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); - if (mmtime.wType != TIME_MS && winetest_debug > 1) - trace("waveOutGetPosition(%s): TIME_MS not supported, returned %s\n", - dev_name(device), wave_time_format(mmtime.wType)); + todo_wine ok(mmtime.wType == TIME_BYTES, "(waveOutGetPosition(%s): returned %s\n", + dev_name(device), wave_time_format(mmtime.wType)); returned = time_to_bytes(&mmtime, pwfx); - ok(returned == bytes, "waveOutGetPosition(%s): returned %d ms, " - "(%d bytes), should be %d (%d bytes)\n", dev_name(device), - bytes_to_ms(returned, pwfx), returned, - bytes_to_ms(bytes, pwfx), bytes); + ok(returned == bytes, "waveOutGetPosition(%s): TIME_MS test failed\n", + dev_name(device)); mmtime.wType = TIME_SMPTE; rc=waveOutGetPosition(wout, &mmtime, sizeof(mmtime));

1 0

Akihiro Sagawa : winmm: Get rid of TIME_MS format support in waveOutGetPosition().
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: e6819b0f4339ba98e14f60f71bf4a48e0a5934b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6819b0f4339ba98e14f60f7… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jan 20 22:23:42 2021 +0900 winmm: Get rid of TIME_MS format support in waveOutGetPosition(). SofTalk (Japanese text-to-speech software) depends on this. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50515 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 37f3a078314423da4e291ccc8b09c6aab8aeb99f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winmm/tests/wave.c | 2 +- dlls/winmm/waveform.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 079a497dd0b..cb18f3e0fa4 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -519,7 +519,7 @@ static void check_position(int device, HWAVEOUT wout, DWORD bytes, rc=waveOutGetPosition(wout, &mmtime, sizeof(mmtime)); ok(rc==MMSYSERR_NOERROR, "waveOutGetPosition(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); - todo_wine ok(mmtime.wType == TIME_BYTES, "(waveOutGetPosition(%s): returned %s\n", + ok(mmtime.wType == TIME_BYTES, "(waveOutGetPosition(%s): returned %s\n", dev_name(device), wave_time_format(mmtime.wType)); returned = time_to_bytes(&mmtime, pwfx); ok(returned == bytes, "waveOutGetPosition(%s): TIME_MS test failed\n", diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 9d58b78c779..876b9d3d91d 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2038,9 +2038,6 @@ static MMRESULT WINMM_FramesToMMTime(MMTIME *time, UINT32 played_frames, case TIME_SAMPLES: time->u.sample = played_frames; return MMSYSERR_NOERROR; - case TIME_MS: - time->u.ms = (UINT64)played_frames * 1000 / sample_rate; - return MMSYSERR_NOERROR; case TIME_SMPTE: time->u.smpte.fps = 30; played_frames += sample_rate / time->u.smpte.fps - 1; /* round up */

1 0

Zebediah Figura : ntdll: Treat '>' the same as '?' in match_filename().
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 82b079cae4ff9bee4b0449b3059bd571dbf8cb59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82b079cae4ff9bee4b0449b3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 2 18:17:15 2021 -0600 ntdll: Treat '>' the same as '?' in match_filename(). They differ in strange ways, as the tests show, but the basic behaviour of '>' is similar to '?'. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22635 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 690a0699189b26d4821d614dfa9704f49cf610a7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/unix/file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index a4c6bf4a137..d6533fedfdd 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1342,6 +1342,7 @@ static BOOLEAN match_filename( const WCHAR *name, int length, const UNICODE_STRI next_to_retry = name; break; case '?': + case '>': mask++; name++; break;

1 0

Nikolay Sivov : explorerframe: Do not block clicks on the item button.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 1b44efb59e796e23b12b0af24cb2a2494187f979 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b44efb59e796e23b12b0af2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 10 17:00:19 2021 +0300 explorerframe: Do not block clicks on the item button. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28786 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7ac196aa0cc97e7730b81a4f67e65f6ca1f6cd8b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/explorerframe/nstc.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 0abaded85a6..b1ecace5fae 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -678,7 +678,7 @@ static LRESULT on_nm_click(NSTC2Impl *This, NMHDR *nmhdr) { TVHITTESTINFO tvhit; IShellItem *psi; - HRESULT hr; + TRACE("%p (%p)\n", This, nmhdr); GetCursorPos(&tvhit.pt); @@ -690,17 +690,7 @@ static LRESULT on_nm_click(NSTC2Impl *This, NMHDR *nmhdr) /* TVHT_ maps onto the corresponding NSTCEHT_ */ psi = shellitem_from_treeitem(This, tvhit.hItem); - hr = events_OnItemClick(This, psi, tvhit.flags, NSTCECT_LBUTTON); - - /* The expando should not be expanded unless - * double-clicked. */ - if(tvhit.flags == TVHT_ONITEMBUTTON) - return TRUE; - - if(SUCCEEDED(hr)) - return FALSE; - else - return TRUE; + return FAILED(events_OnItemClick(This, psi, tvhit.flags, NSTCECT_LBUTTON)); } static LRESULT on_wm_mbuttonup(NSTC2Impl *This, WPARAM wParam, LPARAM lParam)

1 0

Jan Sikorski : wined3d: Align vertex attribute offsets to their size, if smaller than 4.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 6f3608d81aaa93f3b845a7954d7eab00f6da3e39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f3608d81aaa93f3b845a795… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Mon Feb 8 18:50:37 2021 +0100 wined3d: Align vertex attribute offsets to their size, if smaller than 4. This should not change behaviour for d3d9 and earlier, where all formats have sizes that are multiples of 4. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43422 Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 81dfece45ce7c1f0436e28675c53be734e94fb55) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/vertexdeclaration.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index c5df45541e4..e96216db380 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -200,6 +200,7 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara for (i = 0; i < element_count; ++i) { struct wined3d_vertex_declaration_element *e = &declaration->elements[i]; + unsigned int alignment; e->format = wined3d_get_format(adapter, elements[i].format, 0); e->ffp_valid = declaration_element_valid_ffp(&elements[i]); @@ -212,6 +213,9 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara e->usage = elements[i].usage; e->usage_idx = elements[i].usage_idx; + if ((alignment = e->format->byte_count) > 4) + alignment = 4; + if (e->usage == WINED3D_DECL_USAGE_POSITIONT) declaration->position_transformed = TRUE; @@ -239,15 +243,16 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara prev = &declaration->elements[i - j]; if (prev->input_slot == e->input_slot) { - e->offset = (prev->offset + prev->format->byte_count + 3) & ~3; + e->offset = (prev->offset + prev->format->byte_count + alignment - 1) & ~(alignment - 1); break; } } } - if (e->offset & 0x3) + if (e->offset & (alignment - 1)) { - WARN("Declaration element %u is not 4 byte aligned(%u), returning E_FAIL.\n", i, e->offset); + WARN("Declaration element %u with format %s and offset %u is not %u byte aligned.\n", + i, debug_d3dformat(elements[i].format), e->offset, alignment); heap_free(declaration->elements); return E_FAIL; }

1 0

Jacek Caban : kernelbase: Support FileEndOfFileInfo in SetFileInformationByHandle.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: e34899aea363396c085ff663f01f5b4918d2c1c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e34899aea363396c085ff663… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 3 19:53:47 2021 +0100 kernelbase: Support FileEndOfFileInfo in SetFileInformationByHandle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1d36532d2277046872fa39ff3a81d9dc84e27d5a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernelbase/file.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 7b122e263b0..abfdade04ed 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -3528,7 +3528,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetFileInformationByHandle( HANDLE file, FILE_INFO case FileNameInfo: case FileRenameInfo: case FileAllocationInfo: - case FileEndOfFileInfo: case FileStreamInfo: case FileIdBothDirectoryInfo: case FileIdBothDirectoryRestartInfo: @@ -3543,6 +3542,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetFileInformationByHandle( HANDLE file, FILE_INFO SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; + case FileEndOfFileInfo: + status = NtSetInformationFile( file, &io, info, size, FileEndOfFileInformation ); + break; case FileBasicInfo: status = NtSetInformationFile( file, &io, info, size, FileBasicInformation ); break;

1 0

Nikolay Sivov : oleaut32/tests: Remove workarounds in VarFormat* tests.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 70a22fcb6ecb0dc7c6f6a9449dccffeb027f01ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=70a22fcb6ecb0dc7c6f6a944… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 5 10:30:45 2021 +0300 oleaut32/tests: Remove workarounds in VarFormat* tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f1abfc6933b689de249deb90737abbed819e1cf6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oleaut32/tests/varformat.c | 70 +++++++++++------------------------------ 1 file changed, 19 insertions(+), 51 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 9e4cc063f94..1bd1917d209 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -37,22 +37,9 @@ #include "wtypes.h" #include "oleauto.h" -static HMODULE hOleaut32; - -static HRESULT (WINAPI *pVarFormatNumber)(LPVARIANT,int,int,int,int,ULONG,BSTR*); -static HRESULT (WINAPI *pVarFormat)(LPVARIANT,LPOLESTR,int,int,ULONG,BSTR*); -static HRESULT (WINAPI *pVarWeekdayName)(int,int,int,ULONG,BSTR*); - -/* Has I8/UI8 data type? */ -static BOOL has_i8; - -/* Get a conversion function ptr, return if function not available */ -#define CHECKPTR(func) p##func = (void*)GetProcAddress(hOleaut32, #func); \ - if (!p##func) { win_skip("function " # func " not available, not testing it\n"); return; } - #define FMT_NUMBER(vt,val) \ VariantInit(&v); V_VT(&v) = vt; val(&v) = 1; \ - hres = pVarFormatNumber(&v,2,0,0,0,0,&str); \ + hres = VarFormatNumber(&v,2,0,0,0,0,&str); \ ok(hres == S_OK, "VarFormatNumber (vt %d): returned %8x\n", vt, hres); \ if (hres == S_OK) { \ ok(str && wcscmp(str,szResult1) == 0, \ @@ -71,8 +58,6 @@ static void test_VarFormatNumber(void) VARIANT v; BSTR str = NULL; - CHECKPTR(VarFormatNumber); - GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, buff, ARRAY_SIZE(buff)); if (buff[0] != '.' || buff[1]) { @@ -86,11 +71,8 @@ static void test_VarFormatNumber(void) FMT_NUMBER(VT_UI2, V_UI2); FMT_NUMBER(VT_I4, V_I4); FMT_NUMBER(VT_UI4, V_UI4); - if (has_i8) - { - FMT_NUMBER(VT_I8, V_I8); - FMT_NUMBER(VT_UI8, V_UI8); - } + FMT_NUMBER(VT_I8, V_I8); + FMT_NUMBER(VT_UI8, V_UI8); FMT_NUMBER(VT_R4, V_R4); FMT_NUMBER(VT_R8, V_R8); FMT_NUMBER(VT_BOOL, V_BOOL); @@ -98,7 +80,7 @@ static void test_VarFormatNumber(void) V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szSrc1); - hres = pVarFormatNumber(&v,2,0,0,0,0,&str); + hres = VarFormatNumber(&v,2,0,0,0,0,&str); ok(hres == S_OK, "VarFormatNumber (bstr): returned %8x\n", hres); if (hres == S_OK) ok(str && wcscmp(str, szResult1) == 0, "VarFormatNumber (bstr): string different\n"); @@ -106,7 +88,7 @@ static void test_VarFormatNumber(void) SysFreeString(str); V_BSTR(&v) = SysAllocString(szSrc2); - hres = pVarFormatNumber(&v,2,0,-1,0,0,&str); + hres = VarFormatNumber(&v,2,0,-1,0,0,&str); ok(hres == S_OK, "VarFormatNumber (bstr): returned %8x\n", hres); if (hres == S_OK) ok(str && wcscmp(str, szResult2) == 0, "VarFormatNumber (-bstr): string different\n"); @@ -121,7 +103,7 @@ static const char *szVarFmtFail = "VT %d|0x%04x Format %s: expected 0x%08x, '%s' out = NULL; \ V_VT(&in) = (vt); v(&in) = val; \ if (fmt) MultiByteToWideChar(CP_ACP, 0, fmt, -1, buffW, ARRAY_SIZE(buffW)); \ - hres = pVarFormat(&in,fmt ? buffW : NULL,fd,fw,flags,&out); \ + hres = VarFormat(&in,fmt ? buffW : NULL,fd,fw,flags,&out); \ if (SUCCEEDED(hres)) WideCharToMultiByte(CP_ACP, 0, out, -1, buff, sizeof(buff),0,0); \ else buff[0] = '\0'; \ ok(hres == ret && (FAILED(ret) || !strcmp(buff, str)), \ @@ -242,8 +224,6 @@ static void test_VarFormat(void) BSTR bstrin, out = NULL; HRESULT hres; - CHECKPTR(VarFormat); - if (PRIMARYLANGID(LANGIDFROMLCID(GetUserDefaultLCID())) != LANG_ENGLISH) { skip("Skipping VarFormat tests for non English language\n"); @@ -268,18 +248,12 @@ static void test_VarFormat(void) VNUMFMT(VT_I1,V_I1); VNUMFMT(VT_I2,V_I2); VNUMFMT(VT_I4,V_I4); - if (has_i8) - { - VNUMFMT(VT_I8,V_I8); - } + VNUMFMT(VT_I8,V_I8); VNUMFMT(VT_INT,V_INT); VNUMFMT(VT_UI1,V_UI1); VNUMFMT(VT_UI2,V_UI2); VNUMFMT(VT_UI4,V_UI4); - if (has_i8) - { - VNUMFMT(VT_UI8,V_UI8); - } + VNUMFMT(VT_UI8,V_UI8); VNUMFMT(VT_UINT,V_UINT); VNUMFMT(VT_R4,V_R4); VNUMFMT(VT_R8,V_R8); @@ -414,21 +388,21 @@ static void test_VarFormat(void) /* 'out' is not cleared */ out = (BSTR)0x1; - hres = pVarFormat(&in,NULL,fd,fw,flags,&out); /* Would crash if out is cleared */ + hres = VarFormat(&in,NULL,fd,fw,flags,&out); /* Would crash if out is cleared */ ok(hres == S_OK, "got %08x\n", hres); SysFreeString(out); out = NULL; /* VT_NULL */ V_VT(&in) = VT_NULL; - hres = pVarFormat(&in,NULL,fd,fw,0,&out); + hres = VarFormat(&in,NULL,fd,fw,0,&out); ok(hres == S_OK, "VarFormat failed with 0x%08x\n", hres); ok(out == NULL, "expected NULL formatted string\n"); /* Invalid args */ - hres = pVarFormat(&in,NULL,fd,fw,flags,NULL); + hres = VarFormat(&in,NULL,fd,fw,flags,NULL); ok(hres == E_INVALIDARG, "Null out: expected E_INVALIDARG, got 0x%08x\n", hres); - hres = pVarFormat(NULL,NULL,fd,fw,flags,&out); + hres = VarFormat(NULL,NULL,fd,fw,flags,&out); ok(hres == E_INVALIDARG, "Null in: expected E_INVALIDARG, got 0x%08x\n", hres); fd = -1; VARFMT(VT_BOOL,V_BOOL,VARIANT_TRUE,"",E_INVALIDARG,""); @@ -444,7 +418,7 @@ static const char *szVarWdnFail = "VarWeekdayName (%d, %d, %d, %d, %x): returned %8x, expected %8x\n"; #define VARWDN(iWeekday, fAbbrev, iFirstDay, dwFlags, ret, buff, out, freeOut) \ do { \ - hres = pVarWeekdayName(iWeekday, fAbbrev, iFirstDay, dwFlags, &out); \ + hres = VarWeekdayName(iWeekday, fAbbrev, iFirstDay, dwFlags, &out); \ if (SUCCEEDED(hres)) { \ WideCharToMultiByte(CP_ACP, 0, out, -1, buff, sizeof(buff), 0, 0); \ if (freeOut) SysFreeString(out); \ @@ -476,8 +450,6 @@ static void test_VarWeekdayName(void) int size; DWORD localeValue; - CHECKPTR(VarWeekdayName); - SetLastError(0xdeadbeef); GetLocaleInfoW(LOCALE_USER_DEFAULT, 0, NULL, 0); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) @@ -511,7 +483,7 @@ static void test_VarWeekdayName(void) VARWDN_F(4, 0, -1, 0, E_INVALIDARG); VARWDN_F(4, 0, 8, 0, E_INVALIDARG); - hres = pVarWeekdayName(1, 0, 0, 0, NULL); + hres = VarWeekdayName(1, 0, 0, 0, NULL); ok(E_INVALIDARG == hres, "Null pointer: expected E_INVALIDARG, got 0x%08x\n", hres); @@ -668,13 +640,9 @@ static void test_GetAltMonthNames(void) START_TEST(varformat) { - hOleaut32 = GetModuleHandleA("oleaut32.dll"); - - has_i8 = GetProcAddress(hOleaut32, "VarI8FromI1") != NULL; - - test_VarFormatNumber(); - test_VarFormat(); - test_VarWeekdayName(); - test_VarFormatFromTokens(); - test_GetAltMonthNames(); + test_VarFormatNumber(); + test_VarFormat(); + test_VarWeekdayName(); + test_VarFormatFromTokens(); + test_GetAltMonthNames(); }

1 0

Nikolay Sivov : oleaut32: Handle preformatted strings in VarFormatCurrency().
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 00fb915af45a5054864da58ca88c34a27951620d URL: https://source.winehq.org/git/wine.git/?a=commit;h=00fb915af45a5054864da58c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 5 10:30:47 2021 +0300 oleaut32: Handle preformatted strings in VarFormatCurrency(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46709 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e26d6da8a944a45c0b7a38f1ef3ccc55355b8ad5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oleaut32/tests/varformat.c | 35 +++++++++++++++++++++++++++++++++++ dlls/oleaut32/varformat.c | 15 +++++++++++++-- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 1bd1917d209..7f97cebded2 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -638,6 +638,40 @@ static void test_GetAltMonthNames(void) ok(str != NULL, "Got %p\n", str); } +static void test_VarFormatCurrency(void) +{ + HRESULT hr; + VARIANT in; + BSTR str, str2; + + V_CY(&in).int64 = 0; + V_VT(&in) = VT_CY; + hr = VarFormatCurrency(&in, 3, -2, -2, -2, 0, &str); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + V_VT(&in) = VT_BSTR; + V_BSTR(&in) = str; + hr = VarFormatCurrency(&in, 1, -2, -2, -2, 0, &str2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(lstrcmpW(str, str2), "Expected different string.\n"); + SysFreeString(str2); + + V_VT(&in) = VT_BSTR | VT_BYREF; + V_BSTRREF(&in) = &str; + hr = VarFormatCurrency(&in, 1, -2, -2, -2, 0, &str2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(lstrcmpW(str, str2), "Expected different string.\n"); + + SysFreeString(str); + SysFreeString(str2); + + V_VT(&in) = VT_BSTR; + V_BSTR(&in) = SysAllocString(L"test"); + hr = VarFormatCurrency(&in, 1, -2, -2, -2, 0, &str2); + ok(hr == DISP_E_TYPEMISMATCH, "Unexpected hr %#x.\n", hr); + VariantClear(&in); +} + START_TEST(varformat) { test_VarFormatNumber(); @@ -645,4 +679,5 @@ START_TEST(varformat) test_VarWeekdayName(); test_VarFormatFromTokens(); test_GetAltMonthNames(); + test_VarFormatCurrency(); } diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index e88bf0bc365..8ed8f790d14 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -2401,6 +2401,7 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading, { HRESULT hRet; VARIANT vStr; + CY cy; TRACE("(%s,%d,%d,%d,%d,0x%08x,%p)\n", debugstr_variant(pVarIn), nDigits, nLeading, nParens, nGrouping, dwFlags, pbstrOut); @@ -2410,8 +2411,18 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading, *pbstrOut = NULL; - V_VT(&vStr) = VT_EMPTY; - hRet = VariantCopyInd(&vStr, pVarIn); + if (V_VT(pVarIn) == VT_BSTR || V_VT(pVarIn) == (VT_BSTR | VT_BYREF)) + { + hRet = VarCyFromStr(V_ISBYREF(pVarIn) ? *V_BSTRREF(pVarIn) : V_BSTR(pVarIn), LOCALE_USER_DEFAULT, 0, &cy); + if (FAILED(hRet)) return hRet; + V_VT(&vStr) = VT_CY; + V_CY(&vStr) = cy; + } + else + { + V_VT(&vStr) = VT_EMPTY; + hRet = VariantCopyInd(&vStr, pVarIn); + } if (SUCCEEDED(hRet)) hRet = VariantChangeTypeEx(&vStr, &vStr, LOCALE_USER_DEFAULT, 0, VT_BSTR);

1 0

Christian Costa : d3dx9: Return D3DFMT_A8R8G8B8 in D3DXGetImageInfoFromFileInMemory for 32 bpp BMP with alpha.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: e4976c0c98cda62f1ee06bb9c72c6c5c965f91b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4976c0c98cda62f1ee06bb9… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sat Jan 30 13:50:48 2021 -0600 d3dx9: Return D3DFMT_A8R8G8B8 in D3DXGetImageInfoFromFileInMemory for 32 bpp BMP with alpha. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48563 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8f6c832b3178279321140d4a79f2b66bdd069c0f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/surface.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/surface.c | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 045d7267c96..362113386ea 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -887,6 +887,41 @@ static BOOL convert_dib_to_bmp(const void **data, unsigned int *size) return TRUE; } +/* windowscodecs always returns xRGB, but we should return ARGB if and only if + * at least one pixel has a non-zero alpha component. */ +static BOOL image_is_argb(IWICBitmapFrameDecode *frame, const D3DXIMAGE_INFO *info) +{ + unsigned int size, i; + BYTE *buffer; + HRESULT hr; + + if (info->Format != D3DFMT_X8R8G8B8 || info->ImageFileFormat != D3DXIFF_BMP) + return FALSE; + + size = info->Width * info->Height * 4; + if (!(buffer = malloc(size))) + return FALSE; + + if (FAILED(hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, info->Width * 4, size, buffer))) + { + ERR("Failed to copy pixels, hr %#x.\n", hr); + free(buffer); + return FALSE; + } + + for (i = 0; i < info->Width * info->Height; ++i) + { + if (buffer[i * 4 + 3]) + { + free(buffer); + return TRUE; + } + } + + free(buffer); + return FALSE; +} + /************************************************************ * D3DXGetImageInfoFromFileInMemory * @@ -1006,6 +1041,9 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(const void *data, UINT datasize, } } + if (SUCCEEDED(hr) && image_is_argb(frame, info)) + info->Format = D3DFMT_A8R8G8B8; + if (frame) IWICBitmapFrameDecode_Release(frame); diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 4590a758d78..1d32b68c3a6 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -698,7 +698,7 @@ static void test_D3DXGetImageInfo(void) ok(info.Format == D3DFMT_X8R8G8B8, "Got unexpected format %u.\n", info.Format); hr = D3DXGetImageInfoFromFileInMemory(bmp_32bpp_argb, sizeof(bmp_32bpp_argb), &info); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(info.Format == D3DFMT_A8R8G8B8, "Got unexpected format %u.\n", info.Format); + ok(info.Format == D3DFMT_A8R8G8B8, "Got unexpected format %u.\n", info.Format); /* Grayscale PNG */ hr = D3DXGetImageInfoFromFileInMemory(png_grayscale, sizeof(png_grayscale), &info);

1 0

Alexandre Julliard : msvcp: Fix some spec file discrepancies.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 600f8462ac5113b73e4d3a9de4c721e0fe2dc5e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=600f8462ac5113b73e4d3a9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 22 11:46:46 2021 +0100 msvcp: Fix some spec file discrepancies. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2012d7ab6a67f909d3970a8880b5487820f3972d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 20 +++++---- dlls/msvcp110/msvcp110.spec | 4 +- dlls/msvcp120/msvcp120.spec | 4 +- dlls/msvcp120_app/msvcp120_app.spec | 4 +- dlls/msvcp140/msvcp140.spec | 84 ++++++++++++++++++------------------- 5 files changed, 60 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=600f8462ac5113b73e4d…

1 0