April 2019 - Wine-commits - list.winehq.org

Detlef Riekenberg : kernel32/tests: Fix FormatMessage test failures on recent win10 (ERROR_NO_WORK_DONE).
by Alexandre Julliard 05 Apr '19

05 Apr '19

Module: wine Branch: master Commit: c26a3a011649b92fb665e412fd70910ef6667765 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c26a3a011649b92fb665e412… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Mar 31 07:52:01 2019 +0200 kernel32/tests: Fix FormatMessage test failures on recent win10 (ERROR_NO_WORK_DONE). FormatMessageA/W sets last error to ERROR_NO_WORK_DONE when nothing was done, after Sep 2015, but before or with Win10 v1709. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/format_msg.c | 20 ++++++++++++-------- include/winerror.h | 1 + 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 57ee78a..9214e3e 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -155,7 +155,7 @@ static void test_message_from_string_wide(void) error = GetLastError(); ok(!lstrcmpW(empty, out), "failed out=%s\n", wine_dbgstr_w(out)); ok(r==0, "succeeded: r=%d\n", r); - ok(error==0xdeadbeef, "last error %u\n", error); + ok((error==0xdeadbeef) || (error == ERROR_NO_WORK_DONE), "last error %u\n", error); /* format placeholder with no specifier */ SetLastError(0xdeadbeef); @@ -443,7 +443,7 @@ static void test_message_from_string(void) r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING, "", 0, 0, out, ARRAY_SIZE(out), NULL); ok(!memcmp(out, init_buf, sizeof(init_buf)), "Expected the buffer to be untouched\n"); ok(r==0, "succeeded: r=%d\n", r); - ok(GetLastError()==0xdeadbeef, + ok((GetLastError()==0xdeadbeef) || (GetLastError() == ERROR_NO_WORK_DONE), "last error %u\n", GetLastError()); /* format placeholder with no specifier */ @@ -745,7 +745,8 @@ static void test_message_ignore_inserts(void) ARRAY_SIZE(out), NULL); ok(ret == 0, "Expected FormatMessageA to return 0, got %d\n", ret); ok(!memcmp(out, init_buf, sizeof(init_buf)), "Expected the output buffer to be untouched\n"); - ok(GetLastError() == 0xdeadbeef, "Expected GetLastError() to return 0xdeadbeef, got %u\n", GetLastError()); + ok((GetLastError() == 0xdeadbeef) || (GetLastError() == ERROR_NO_WORK_DONE), + "Expected GetLastError() to return 0xdeadbeef or ERROR_NO_WORK_DONE, got %u\n", GetLastError()); /* Insert sequences are ignored. */ ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, "test%1%2!*.*s!%99", 0, 0, out, @@ -855,7 +856,8 @@ static void test_message_ignore_inserts_wide(void) ARRAY_SIZE(out), NULL); ok(ret == 0, "Expected FormatMessageW to return 0, got %d\n", ret); ok(!lstrcmpW(empty, out), "Expected the output buffer to be the empty string, got %s\n", wine_dbgstr_w(out)); - ok(GetLastError() == 0xdeadbeef, "Expected GetLastError() to return 0xdeadbeef, got %u\n", GetLastError()); + ok((GetLastError() == 0xdeadbeef) || (GetLastError() == ERROR_NO_WORK_DONE), + "Expected GetLastError() to return 0xdeadbeef or ERROR_NO_WORK_DONE, got %u\n", GetLastError()); /* Insert sequences are ignored. */ ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_IGNORE_INSERTS, fmt_t12oos99, 0, 0, out, @@ -1294,8 +1296,8 @@ static void test_message_allocate_buffer(void) "", 0, 0, (char *)&buf, 0, NULL); ok(ret == 0, "Expected FormatMessageA to return 0, got %u\n", ret); ok(buf == NULL, "Expected output buffer pointer to be NULL\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected last error to be untouched, got %u\n", GetLastError()); + ok((GetLastError() == 0xdeadbeef) || (GetLastError() == ERROR_NO_WORK_DONE), + "Expected GetLastError() to return 0xdeadbeef or ERROR_NO_WORK_DONE, got %u\n", GetLastError()); buf = (char *)0xdeadbeef; ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, @@ -1391,8 +1393,8 @@ static void test_message_allocate_buffer_wide(void) empty, 0, 0, (WCHAR *)&buf, 0, NULL); ok(ret == 0, "Expected FormatMessageW to return 0, got %u\n", ret); ok(buf == NULL, "Expected output buffer pointer to be NULL\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected last error to be untouched, got %u\n", GetLastError()); + ok((GetLastError() == 0xdeadbeef) || (GetLastError() == ERROR_NO_WORK_DONE), + "Expected GetLastError() to return 0xdeadbeef or ERROR_NO_WORK_DONE, got %u\n", GetLastError()); buf = (WCHAR *)0xdeadbeef; ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, @@ -1522,6 +1524,7 @@ static void test_message_from_hmodule(void) error = GetLastError(); ok(ret == 0, "FormatMessageA returned %u instead of 0\n", ret); ok(error == ERROR_RESOURCE_LANG_NOT_FOUND || + error == ERROR_RESOURCE_TYPE_NOT_FOUND || error == ERROR_MR_MID_NOT_FOUND || error == ERROR_MUI_FILE_NOT_FOUND || error == ERROR_MUI_FILE_NOT_LOADED, @@ -1533,6 +1536,7 @@ static void test_message_from_hmodule(void) error = GetLastError(); ok(ret == 0, "FormatMessageA returned %u instead of 0\n", ret); ok(error == ERROR_RESOURCE_LANG_NOT_FOUND || + error == ERROR_RESOURCE_TYPE_NOT_FOUND || error == ERROR_MR_MID_NOT_FOUND || error == ERROR_MUI_FILE_NOT_FOUND || error == ERROR_MUI_FILE_NOT_LOADED, diff --git a/include/winerror.h b/include/winerror.h index d78c91e..79be438 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -291,6 +291,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_NO_DATA 232 #define ERROR_PIPE_NOT_CONNECTED 233 #define ERROR_MORE_DATA 234 +#define ERROR_NO_WORK_DONE 235 #define ERROR_VC_DISCONNECTED 240 #define ERROR_INVALID_EA_NAME 254 #define ERROR_EA_LIST_INCONSISTENT 255

1 0

Michael Stefaniuc : user32: Avoid using the comma operator.
by Alexandre Julliard 05 Apr '19

05 Apr '19

Module: wine Branch: master Commit: 516dc52401724906648411a577ac135a21909106 URL: https://source.winehq.org/git/wine.git/?a=commit;h=516dc52401724906648411a5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Apr 5 21:03:57 2019 +0200 user32: Avoid using the comma operator. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/text.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 9601c60..fd0751e 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -677,7 +677,7 @@ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count, { /* Throw away katakana access keys */ (*count)--, i++; /* skip the prefix */ - (*count)--, i++; /* skip the letter */ + (*count)--; i++; /* skip the letter */ } else {

1 0

Michael Stefaniuc : dxdiagn: Remove useless cast to self.
by Alexandre Julliard 05 Apr '19

05 Apr '19

Module: wine Branch: master Commit: 0004deba435d0dfa1306b5775989acd6633ea2b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0004deba435d0dfa1306b577… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Apr 5 21:03:59 2019 +0200 dxdiagn: Remove useless cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxdiagn/provider.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index ede7344..46193e9 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -1627,7 +1627,7 @@ static HRESULT fill_filter_data_information(IDxDiagContainerImpl_Container *subc if (FAILED(hr)) goto cleanup; - hr = IAMFilterData_ParseFilterData(pFilterData, pData, cb, (BYTE **)&ppRF); + hr = IAMFilterData_ParseFilterData(pFilterData, pData, cb, &ppRF); if (FAILED(hr)) goto cleanup; pRF = ((REGFILTER2**)ppRF)[0];

1 0

Gabriel Ivăncescu : comctl32/button: Delay calling get_button_text until it is needed to prevent a leak.
by Alexandre Julliard 05 Apr '19

05 Apr '19

Module: wine Branch: master Commit: 715065feb3915d37555e02f79d586f26adda1152 URL: https://source.winehq.org/git/wine.git/?a=commit;h=715065feb3915d37555e02f7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 25 15:31:53 2019 +0200 comctl32/button: Delay calling get_button_text until it is needed to prevent a leak. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index e974f86..f282abf 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2326,10 +2326,10 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in RECT bgRect, textRect; HFONT font = infoPtr->font; HFONT hPrevFont = font ? SelectObject(hDC, font) : NULL; - WCHAR *text = get_button_text(infoPtr); NMCUSTOMDRAW nmcd; LRESULT cdrf; HWND parent; + WCHAR *text; GetClientRect(infoPtr->hwnd, &bgRect); GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &bgRect, &textRect); @@ -2357,10 +2357,9 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; - if (text) + if (!(cdrf & CDRF_DOERASE) && (text = get_button_text(infoPtr))) { - if (!(cdrf & CDRF_DOERASE)) - DrawThemeText(theme, hDC, BP_PUSHBUTTON, state, text, lstrlenW(text), dtFlags, 0, &textRect); + DrawThemeText(theme, hDC, BP_PUSHBUTTON, state, text, lstrlenW(text), dtFlags, 0, &textRect); heap_free(text); } @@ -2398,11 +2397,11 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in DWORD dwStyle = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); UINT btn_type = get_button_type( dwStyle ); int part = (btn_type == BS_RADIOBUTTON) || (btn_type == BS_AUTORADIOBUTTON) ? BP_RADIOBUTTON : BP_CHECKBOX; - WCHAR *text = get_button_text(infoPtr); NMCUSTOMDRAW nmcd; LRESULT cdrf; LOGFONTW lf; HWND parent; + WCHAR *text; BOOL created_font = FALSE; HRESULT hr = GetThemeFont(theme, hDC, part, state, TMT_FONT, &lf); @@ -2456,6 +2455,7 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; + text = get_button_text(infoPtr); if (!(cdrf & CDRF_DOERASE) && text) DrawThemeText(theme, hDC, part, state, text, lstrlenW(text), dtFlags, 0, &textRect); @@ -2464,11 +2464,10 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in nmcd.dwDrawStage = CDDS_POSTPAINT; SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); } - if (cdrf & CDRF_SKIPPOSTPAINT) goto cleanup; if (text) { - if (focused) + if (!(cdrf & CDRF_SKIPPOSTPAINT) && focused) { RECT focusRect;

1 0

Gabriel Ivăncescu : comctl32/button: Use WM_GETTEXTLENGTH to see if the button has any text.
by Alexandre Julliard 05 Apr '19

05 Apr '19

Module: wine Branch: master Commit: 8ee1e3453e2e714241bcaac0cd75f4af3f828c8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ee1e3453e2e714241bcaac0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Apr 4 14:39:49 2019 +0300 comctl32/button: Use WM_GETTEXTLENGTH to see if the button has any text. There's no reason to allocate and then parse the entire string just to see if its length is zero. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index f282abf..5338ef8 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1276,20 +1276,16 @@ static BOOL GB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) static BOOL CB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) { LONG style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); - WCHAR *text = get_button_text(infoPtr); HDC hdc; HFONT hfont; SIZE labelSize; INT textOffset; - INT textLength = 0; double scaleX; double scaleY; LONG checkboxWidth, checkboxHeight; LONG maxWidth = 0; - if (text) textLength = lstrlenW(text); - heap_free(text); - if (textLength == 0) + if (SendMessageW(infoPtr->hwnd, WM_GETTEXTLENGTH, 0, 0) == 0) { BUTTON_GetClientRectSize(infoPtr, size); return TRUE; @@ -1325,26 +1321,18 @@ static BOOL CB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) static BOOL PB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) { - WCHAR *text = get_button_text(infoPtr); SIZE labelSize; - INT textLength = 0; - if (text) textLength = lstrlenW(text); - - if (textLength == 0) - { + if (SendMessageW(infoPtr->hwnd, WM_GETTEXTLENGTH, 0, 0) == 0) BUTTON_GetClientRectSize(infoPtr, size); - heap_free(text); - return TRUE; - } - heap_free(text); - - /* Ideal size include text size even if image only flags(BS_ICON, BS_BITMAP) are specified */ - BUTTON_GetLabelIdealSize(infoPtr, size->cx, &labelSize); - - size->cx = labelSize.cx; - size->cy = labelSize.cy; + else + { + /* Ideal size include text size even if image only flags(BS_ICON, BS_BITMAP) are specified */ + BUTTON_GetLabelIdealSize(infoPtr, size->cx, &labelSize); + size->cx = labelSize.cx; + size->cy = labelSize.cy; + } return TRUE; }

1 0

Piotr Caban : msi: Use case sensitive compare in handle_msi_break.
by Alexandre Julliard 05 Apr '19

05 Apr '19

Module: wine Branch: master Commit: 8c4b75f252dd5f127320144a43472d4558489af4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c4b75f252dd5f127320144a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 4 19:57:05 2019 +0200 msi: Use case sensitive compare in handle_msi_break. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index facb1d8..647961c 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -468,7 +468,7 @@ static void handle_msi_break(LPCSTR target) if (!GetEnvironmentVariableA("MsiBreak", val, MAX_PATH)) return; - if (strcasecmp(val, target)) + if (strcmp(val, target)) return; sprintf(msg, format, GetCurrentProcessId(), GetCurrentProcessId());

1 0

Piotr Caban : wineps.drv: Don't use strcasecmp.
by Alexandre Julliard 05 Apr '19

05 Apr '19

Module: wine Branch: master Commit: c191a1d44dc4464ed7c6c69b03253d239f17743e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c191a1d44dc4464ed7c6c69b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 4 16:00:50 2019 +0200 wineps.drv: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/builtin.c | 3 ++- dlls/wineps.drv/font.c | 5 +++-- dlls/wineps.drv/mkagl.c | 4 ++-- dlls/wineps.drv/ppd.c | 21 +++++++++++---------- dlls/wineps.drv/type1afm.c | 7 ++++--- 5 files changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index e2106d3..75485cd 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -28,6 +28,7 @@ #include "winerror.h" #include "wingdi.h" #include "winnls.h" +#include "winternl.h" #include "psdrv.h" #include "wine/debug.h" @@ -168,7 +169,7 @@ BOOL PSDRV_SelectBuiltinFont(PHYSDEV dev, HFONT hfont, /* Look for a matching font family */ for(family = physDev->pi->Fonts; family; family = family->next) { - if(!strcasecmp(FaceName, family->FamilyName)) + if(!_strnicmp(FaceName, family->FamilyName, -1)) break; } diff --git a/dlls/wineps.drv/font.c b/dlls/wineps.drv/font.c index c8ec976..5c5033c 100644 --- a/dlls/wineps.drv/font.c +++ b/dlls/wineps.drv/font.c @@ -27,6 +27,7 @@ #include "wingdi.h" #include "winnls.h" #include "winspool.h" +#include "winternl.h" #include "psdrv.h" #include "wine/debug.h" @@ -93,8 +94,8 @@ HFONT PSDRV_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) for (i = 0; i < physDev->pi->FontSubTableSize; ++i) { - if (!strcasecmp (FaceName, - physDev->pi->FontSubTable[i].pValueName)) + if (!_strnicmp (FaceName, + physDev->pi->FontSubTable[i].pValueName, -1)) { TRACE ("substituting facename '%s' for '%s'\n", (LPSTR) physDev->pi->FontSubTable[i].pData, FaceName); diff --git a/dlls/wineps.drv/mkagl.c b/dlls/wineps.drv/mkagl.c index f8919e3..788fb6e 100644 --- a/dlls/wineps.drv/mkagl.c +++ b/dlls/wineps.drv/mkagl.c @@ -190,8 +190,8 @@ static void read_afms(FILE *f_c, FILE *f_h) char *cp, linebuf[256], font_family[128]; int i, num_metrics; - cp = strrchr(de->d_name, '.'); /* Does it end in */ - if (cp == NULL || strcasecmp(cp, ".afm") != 0) /* .afm or .AFM? */ + cp = strrchr(de->d_name, '.'); /* Does it end in */ + if (cp == NULL || _strnicmp(cp, ".afm", -1) != 0) /* .afm or .AFM? */ continue; f = fopen(de->d_name, "r"); diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index f8de57b..08d07b8 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -30,6 +30,7 @@ #include <assert.h> #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "wine/debug.h" #include "psdrv.h" @@ -748,7 +749,7 @@ PPD *PSDRV_ParsePPD( const WCHAR *fname, HANDLE printer ) } else if(!strcmp("*ColorDevice", tuple.key)) { - if(!strcasecmp(tuple.value, "true")) + if(!_strnicmp(tuple.value, "true", -1)) ppd->ColorDevice = CD_True; else ppd->ColorDevice = CD_False; @@ -966,13 +967,13 @@ PPD *PSDRV_ParsePPD( const WCHAR *fname, HANDLE printer ) } else if(!strcmp("*TTRasterizer", tuple.key)) { - if(!strcasecmp("None", tuple.value)) + if(!_strnicmp("None", tuple.value, -1)) ppd->TTRasterizer = RO_None; - else if(!strcasecmp("Accept68K", tuple.value)) + else if(!_strnicmp("Accept68K", tuple.value, -1)) ppd->TTRasterizer = RO_Accept68K; - else if(!strcasecmp("Type42", tuple.value)) + else if(!_strnicmp("Type42", tuple.value, -1)) ppd->TTRasterizer = RO_Type42; - else if(!strcasecmp("TrueImage", tuple.value)) + else if(!_strnicmp("TrueImage", tuple.value, -1)) ppd->TTRasterizer = RO_TrueImage; else { FIXME("Unknown option %s for *TTRasterizer\n", @@ -988,14 +989,14 @@ PPD *PSDRV_ParsePPD( const WCHAR *fname, HANDLE printer ) duplex->Name = tuple.option; duplex->FullName = tuple.opttrans; duplex->InvocationString = tuple.value; - if(!strcasecmp("None", tuple.option) || !strcasecmp("False", tuple.option) - || !strcasecmp("Simplex", tuple.option)) + if(!_strnicmp("None", tuple.option, -1) || !_strnicmp("False", tuple.option, -1) + || !_strnicmp("Simplex", tuple.option, -1)) duplex->WinDuplex = DMDUP_SIMPLEX; - else if(!strcasecmp("DuplexNoTumble", tuple.option)) + else if(!_strnicmp("DuplexNoTumble", tuple.option, -1)) duplex->WinDuplex = DMDUP_VERTICAL; - else if(!strcasecmp("DuplexTumble", tuple.option)) + else if(!_strnicmp("DuplexTumble", tuple.option, -1)) duplex->WinDuplex = DMDUP_HORIZONTAL; - else if(!strcasecmp("Notcapable", tuple.option)) + else if(!_strnicmp("Notcapable", tuple.option, -1)) duplex->WinDuplex = 0; else { FIXME("Unknown option %s for *Duplex defaulting to simplex\n", tuple.option); diff --git a/dlls/wineps.drv/type1afm.c b/dlls/wineps.drv/type1afm.c index f9a8bcb..19bb2d3 100644 --- a/dlls/wineps.drv/type1afm.c +++ b/dlls/wineps.drv/type1afm.c @@ -48,6 +48,7 @@ #include "winerror.h" #include "winreg.h" #include "winnls.h" +#include "winternl.h" #include "psdrv.h" #include "wine/debug.h" @@ -464,7 +465,7 @@ static BOOL ReadFixedPitch(FILE *file, CHAR buffer[], INT bufsize, AFM *afm, return TRUE; } - if (strcasecmp(sz, "false") == 0) + if (_strnicmp(sz, "false", -1) == 0) { afm->IsFixedPitch = FALSE; *p_found = TRUE; @@ -472,7 +473,7 @@ static BOOL ReadFixedPitch(FILE *file, CHAR buffer[], INT bufsize, AFM *afm, return TRUE; } - if (strcasecmp(sz, "true") == 0) + if (_strnicmp(sz, "true", -1) == 0) { afm->IsFixedPitch = TRUE; *p_found = TRUE; @@ -1142,7 +1143,7 @@ static BOOL ReadAFMDir(LPCSTR dirname) CHAR *file_extension = strchr(dent->d_name, '.'); int fn_len; - if (file_extension == NULL || strcasecmp(file_extension, ".afm") != 0) + if (file_extension == NULL || _strnicmp(file_extension, ".afm", -1) != 0) continue; fn_len = snprintf(filename, 256, "%s/%s", dirname, dent->d_name);

1 0

Zebediah Figura : quartz/tests: Fix some VMR9 test failures.
by Alexandre Julliard 05 Apr '19

05 Apr '19

Module: wine Branch: master Commit: 409c60f95c483102d87af39ee40ea677e9381ea8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=409c60f95c483102d87af39e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 4 22:51:45 2019 -0500 quartz/tests: Fix some VMR9 test failures. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index f8e6f21..88b0562 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -36,7 +36,7 @@ static IBaseFilter *create_vmr9(DWORD mode) hr = IBaseFilter_QueryInterface(filter, &IID_IVMRFilterConfig9, (void **)&config); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_SetRenderingMode(config, mode); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_FAIL), "Got hr %#x.\n", hr); IVMRFilterConfig9_Release(config); } return filter; @@ -65,7 +65,7 @@ static void test_filter_config(void) ok(mode == VMRMode_Windowed, "Got mode %#x.\n", mode); hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowed); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_FAIL), "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -82,7 +82,7 @@ static void test_filter_config(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowless); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_FAIL), "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -134,7 +134,7 @@ static void test_filter_config(void) /* Despite MSDN, you can still change the rendering mode after setting the * stream count. */ hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowless); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_FAIL), "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -150,19 +150,30 @@ static void test_filter_config(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } -#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) -static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +#define check_interface_broken(a, b, c) check_interface_(__LINE__, a, b, c, TRUE) +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c, FALSE) +static HRESULT check_interface_(unsigned int line, void *iface, REFIID riid, BOOL supported, BOOL is_broken) { - IUnknown *iface = iface_ptr; - HRESULT hr, expected_hr; - IUnknown *unk; + HRESULT hr, expected_hr, broken_hr; + IUnknown *unknown = iface, *out; - expected_hr = supported ? S_OK : E_NOINTERFACE; + if (supported) + { + expected_hr = S_OK; + broken_hr = E_NOINTERFACE; + } + else + { + expected_hr = E_NOINTERFACE; + broken_hr = S_OK; + } - hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); - ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + hr = IUnknown_QueryInterface(unknown, riid, (void **)&out); + ok_(__FILE__, line)(hr == expected_hr || broken(is_broken && hr == broken_hr), + "Got hr %#x, expected %#x.\n", hr, expected_hr); if (SUCCEEDED(hr)) - IUnknown_Release(unk); + IUnknown_Release(out); + return hr; } static void test_interfaces(void) @@ -188,7 +199,9 @@ static void test_interfaces(void) todo_wine check_interface(filter, &IID_IVMRDeinterlaceControl9, TRUE); check_interface(filter, &IID_IVMRFilterConfig9, TRUE); todo_wine check_interface(filter, &IID_IVMRMixerBitmap9, TRUE); - check_interface(filter, &IID_IVMRMonitorConfig9, TRUE); + /* IVMRMonitorConfig9 may not be available if the d3d9 device has + * insufficient support. */ + check_interface_broken(filter, &IID_IVMRMonitorConfig9, TRUE); check_interface(filter, &IID_IBasicAudio, FALSE); check_interface(filter, &IID_IDirectDrawVideo, FALSE); @@ -210,7 +223,7 @@ static void test_interfaces(void) IBaseFilter_Release(filter); filter = create_vmr9(VMR9Mode_Windowless); - check_interface(filter, &IID_IVMRMonitorConfig9, TRUE); + check_interface_broken(filter, &IID_IVMRMonitorConfig9, TRUE); check_interface(filter, &IID_IVMRWindowlessControl9, TRUE); todo_wine check_interface(filter, &IID_IBasicVideo, FALSE);

1 0

Zebediah Figura : quartz/tests: Add tests for VMR9 pin interfaces.
by Alexandre Julliard 05 Apr '19

05 Apr '19

Module: wine Branch: master Commit: ea30abde1804c544ae967e791b6a342da65c840a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea30abde1804c544ae967e79… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 4 22:51:46 2019 -0500 quartz/tests: Add tests for VMR9 pin interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 88b0562..a0d2ea1 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -178,8 +178,10 @@ static HRESULT check_interface_(unsigned int line, void *iface, REFIID riid, BOO static void test_interfaces(void) { + WCHAR sink_id[] = {'V','M','R',' ','I','n','p','u','t','0',0}; IBaseFilter *filter = create_vmr9(0); ULONG ref; + IPin *pin; check_interface(filter, &IID_IAMCertifiedOutputProtection, TRUE); check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); @@ -220,6 +222,20 @@ static void test_interfaces(void) check_interface(filter, &IID_IVMRWindowlessControl, FALSE); check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + todo_wine check_interface(pin, &IID_IOverlay, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); + IBaseFilter_Release(filter); filter = create_vmr9(VMR9Mode_Windowless); @@ -236,6 +252,20 @@ static void test_interfaces(void) todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE); todo_wine check_interface(filter, &IID_IVMRWindowlessControl, FALSE); + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + todo_wine check_interface(pin, &IID_IOverlay, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); + IBaseFilter_Release(filter); filter = create_vmr9(VMR9Mode_Renderless); @@ -251,6 +281,20 @@ static void test_interfaces(void) check_interface(filter, &IID_IVMRWindowlessControl, FALSE); check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + todo_wine check_interface(pin, &IID_IOverlay, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 05 Apr '19

05 Apr '19

Module: wine Branch: master Commit: f2deab4174270f03cdada49ff42f2752f2328b98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2deab4174270f03cdada49f… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Apr 5 06:56:51 2019 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 50 +++++++++++++------------------------------------- 1 file changed, 13 insertions(+), 37 deletions(-) diff --git a/po/lt.po b/po/lt.po index a339fcf..8c6bb23 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-04-02 10:23+0300\n" +"PO-Revision-Date: 2019-04-05 06:56+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -7040,80 +7040,56 @@ msgid "No events available.\n" msgstr "Nėra pasiekiamų įvykių.\n" #: mferror.mc:445 -#, fuzzy -#| msgid "Invalid media source state transition\n" msgid "Invalid media source state transition.\n" -msgstr "Neteisingas medijos šaltinio būsenos perėjimas\n" +msgstr "Neteisingas medijos šaltinio būsenos perėjimas.\n" #: mferror.mc:452 -#, fuzzy -#| msgid "End of media stream has been reached\n" msgid "End of media stream has been reached.\n" -msgstr "Pasiekta medijos srauto pabaiga\n" +msgstr "Pasiekta medijos srauto pabaiga.\n" #: mferror.mc:459 msgid "Shutdown() was called.\n" msgstr "Shutdown() buvo iškviesta.\n" #: mferror.mc:466 -#, fuzzy -#| msgid "Media stream has no duration set\n" msgid "Media stream has no duration set.\n" -msgstr "Medijos srautui nenustatyta trukmė\n" +msgstr "Medijos srautui nenustatyta trukmė.\n" #: mferror.mc:473 -#, fuzzy -#| msgid "Media format was recognized but is invalid\n" msgid "Media format was recognized but is invalid.\n" -msgstr "Medijos formatas atpažintas, bet neteisingas\n" +msgstr "Medijos formatas atpažintas, bet neteisingas.\n" #: mferror.mc:480 -#, fuzzy -#| msgid "Property wasn't found\n" msgid "Property wasn't found.\n" -msgstr "Savybė nerasta\n" +msgstr "Savybė nerasta.\n" #: mferror.mc:487 -#, fuzzy -#| msgid "Property is read-only\n" msgid "Property is read-only.\n" -msgstr "Savybė tik skaitymui\n" +msgstr "Savybė tik skaitymui.\n" #: mferror.mc:494 -#, fuzzy -#| msgid "Property is not allowed\n" msgid "Property is not allowed.\n" -msgstr "Savybė neleidžiama\n" +msgstr "Savybė neleidžiama.\n" #: mferror.mc:501 -#, fuzzy -#| msgid "Media source is not started\n" msgid "Media source is not started.\n" -msgstr "Medijos šaltinis nepradėtas\n" +msgstr "Medijos šaltinis nepradėtas.\n" #: mferror.mc:508 -#, fuzzy -#| msgid "Unsupported media format\n" msgid "Unsupported media format.\n" -msgstr "Nepalaikomas medijos formatas\n" +msgstr "Nepalaikomas medijos formatas.\n" #: mferror.mc:515 -#, fuzzy -#| msgid "Media source is in wrong state\n" msgid "Media source is in wrong state.\n" -msgstr "Medijos šaltinis neteisingoje būsenoje\n" +msgstr "Medijos šaltinis neteisingoje būsenoje.\n" #: mferror.mc:522 -#, fuzzy -#| msgid "No media streams were selected\n" msgid "No media streams were selected.\n" -msgstr "Nepasirinktas nė vienas medijos srautas\n" +msgstr "Nepasirinktas nė vienas medijos srautas.\n" #: mferror.mc:529 -#, fuzzy -#| msgid "Unsupported media source characteristics\n" msgid "Unsupported media source characteristics.\n" -msgstr "Nepalaikomos medijos šaltinio charakteristikos\n" +msgstr "Nepalaikomos medijos šaltinio charakteristikos.\n" #: mferror.mc:536 msgid "Optional node is invalid.\n"

1 0