wine-devel January 2020

wine-devel@winehq.org

75 participants
595 discussions

[PATCH 1/3] kernel32/tests: Use WAIT_EVENT_TIMEOUT in wait_for_breakpoint.
by Jacek Caban 03 Jan '20

03 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/debugger.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

2 1

[PATCH] po: Update Norwegian translation.
by Kim Malmo 03 Jan '20

03 Jan '20

Signed-off-by: Kim Malmo <berencamlost(a)msn.com> --- po/nb_NO.po | 110 +++++++++++++--------------------------------------- 1 file changed, 28 insertions(+), 82 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 083c3e11cd..2e95616fe1 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.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: 2018-11-01 22:38+0100\n" +"PO-Revision-Date: 2020-… [View More]01-03 16:23+0100\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -662,11 +662,9 @@ msgid "&Define Custom Colors >>" msgstr "&Definer egendefinerte farger >>" #: comdlg32.rc:312 -#, fuzzy -#| msgid "&No" msgctxt "Solid" msgid "&o" -msgstr "&Nei" +msgstr "&o" #: comdlg32.rc:318 regedit.rc:275 regedit.rc:285 msgid "Find" @@ -6832,34 +6830,24 @@ msgid "Sink has not been finalized.\n" msgstr "Fant ikke objekt-UUID'en.\n" #: mferror.mc:32 -#, fuzzy -#| msgid "Installation platform not supported.\n" msgid "Media Foundation platform is not initialized.\n" -msgstr "Installasjonsplattformen støttes ikke.\n" +msgstr "Media Foundation plattformen er ikke lastet.\n" #: mferror.mc:39 -#, fuzzy -#| msgid "Byte count too small.\n" msgid "Buffer is too small.\n" -msgstr "Antall byte er for lavt.\n" +msgstr "For lite hurtigminne.\n" #: mferror.mc:46 -#, fuzzy -#| msgid "Invalid query syntax.\n" msgid "Invalid request.\n" -msgstr "Ugyldig syntaks for spørring.\n" +msgstr "Ugyldig forespørsel.\n" #: mferror.mc:53 -#, fuzzy -#| msgid "Invalid segment number.\n" msgid "Invalid stream number.\n" -msgstr "Ugyldig segmentnummer.\n" +msgstr "Ugyldig strømnummer.\n" #: mferror.mc:60 -#, fuzzy -#| msgid "Invalid data type.\n" msgid "Invalid media type.\n" -msgstr "Ugyldig datatype.\n" +msgstr "Ugyldig mediatype.\n" #: mferror.mc:67 #, fuzzy @@ -6868,44 +6856,32 @@ msgid "No more input is accepted.\n" msgstr "Ingen flere oppføringer.\n" #: mferror.mc:74 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Object is not initialized.\n" -msgstr "Fant ikke objekt-UUID'en.\n" +msgstr "Objekt er ikke lastet.\n" #: mferror.mc:81 -#, fuzzy -#| msgid "Operation not supported.\n" msgid "Representation is not supported.\n" -msgstr "Operasjonen støttes ikke.\n" +msgstr "Representasjonen støttes ikke.\n" #: mferror.mc:88 msgid "No more types in the list of suggested media types.\n" msgstr "" #: mferror.mc:95 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported service.\n" -msgstr "Typen støttes ikke.\n" +msgstr "Tjenesten støttes ikke.\n" #: mferror.mc:102 -#, fuzzy -#| msgid "Unexpected network error.\n" msgid "Unexpected error.\n" -msgstr "Uventet nettverksfeil.\n" +msgstr "Uventet feil.\n" #: mferror.mc:116 -#, fuzzy -#| msgid "Invalid time.\n" msgid "Invalid type.\n" -msgstr "Ugyldig tid.\n" +msgstr "Ugyldig type.\n" #: mferror.mc:123 -#, fuzzy -#| msgid "Invalid pixel format.\n" msgid "Invalid file format.\n" -msgstr "Ugyldig format for bildepunkt.\n" +msgstr "Ugyldig filformat.\n" #: mferror.mc:137 #, fuzzy @@ -6914,10 +6890,8 @@ msgid "Invalid timestamp.\n" msgstr "Ugyldig tid.\n" #: mferror.mc:144 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported scheme.\n" -msgstr "Typen støttes ikke.\n" +msgstr "Skjemaet støttes ikke.\n" #: mferror.mc:151 #, fuzzy @@ -6926,10 +6900,8 @@ msgid "Unsupported bytestream type.\n" msgstr "Typen støttes ikke.\n" #: mferror.mc:158 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported time format.\n" -msgstr "Typen støttes ikke.\n" +msgstr "Tidsformatet støttes ikke.\n" #: mferror.mc:165 msgid "Timestamp is not set for the sample.\n" @@ -6940,16 +6912,12 @@ msgid "No duration set for the sample.\n" msgstr "" #: mferror.mc:179 -#, fuzzy -#| msgid "Invalid data.\n" msgid "Invalid stream data.\n" -msgstr "Ugyldig data.\n" +msgstr "Ugyldig strømdata.\n" #: mferror.mc:186 -#, fuzzy -#| msgid "Help not available." msgid "Realtime support is not available.\n" -msgstr "Ingen hjelp er ikke tilgjengelig." +msgstr "Sanntidsstøtte er ikke tilgjengelig.\n" #: mferror.mc:193 #, fuzzy @@ -6980,22 +6948,16 @@ msgid "Rate change was preempted.\n" msgstr "" #: mferror.mc:228 -#, fuzzy -#| msgid "Object UUID not found.\n" msgid "Object or value wasn't found.\n" -msgstr "Fant ikke objekt-UUID'en.\n" +msgstr "Fant ikke objekt eller verdi.\n" #: mferror.mc:235 -#, fuzzy -#| msgid "Help not available." msgid "Value is not available.\n" -msgstr "Ingen hjelp er ikke tilgjengelig." +msgstr "Verdi er ikke tilgjengelig.\n" #: mferror.mc:242 -#, fuzzy -#| msgid "Help not available." msgid "Clock is not available.\n" -msgstr "Ingen hjelp er ikke tilgjengelig." +msgstr "Klokken er ikke tilgjengelig.\n" #: mferror.mc:263 #, fuzzy @@ -7022,10 +6984,8 @@ msgid "Unsupported state transition.\n" msgstr "Godkjenningsnivået støttes ikke.\n" #: mferror.mc:291 -#, fuzzy -#| msgid "An internal error has occurred.\n" msgid "Unrecoverable error occurred.\n" -msgstr "En intern feil har oppstått.\n" +msgstr "En ugjenopprettelig feil har oppstått.\n" #: mferror.mc:298 msgid "Sample has too many buffers.\n" @@ -7038,10 +6998,8 @@ msgid "Sample is not writable.\n" msgstr "Mappen for midlertidige filer kan ikke skrives til.\n" #: mferror.mc:312 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "Key is invalid.\n" -msgstr "Stien er ugyldig.\n" +msgstr "Nøkkelen er ugyldig.\n" #: mferror.mc:319 #, fuzzy @@ -7056,16 +7014,12 @@ msgid "Unsupported caption.\n" msgstr "Typen støttes ikke.\n" #: mferror.mc:333 -#, fuzzy -#| msgid "Invalid workstation.\n" msgid "Invalid position.\n" -msgstr "Ugyldig arbeidsstasjon.\n" +msgstr "Ugyldig posisjon.\n" #: mferror.mc:340 -#, fuzzy -#| msgid "File not found.\n" msgid "Attribute is not found.\n" -msgstr "Fant ikke filen.\n" +msgstr "Fant ikke egenskapen.\n" #: mferror.mc:347 #, fuzzy @@ -7102,10 +7056,8 @@ msgid "Vector property is required.\n" msgstr "" #: mferror.mc:389 -#, fuzzy -#| msgid "Operation canceled by user.\n" msgid "Operation was cancelled.\n" -msgstr "Operasjonen ble avbrutt av brukeren.\n" +msgstr "Operasjonen ble avbrutt.\n" #: mferror.mc:396 #, fuzzy @@ -7190,16 +7142,12 @@ msgid "Property is not allowed.\n" msgstr "Hook-typen er ikke tillat.\n" #: mferror.mc:501 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is not started.\n" -msgstr "Ressursen er i bruk.\n" +msgstr "Mediakilden er ikke startet.\n" #: mferror.mc:508 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Unsupported media format.\n" -msgstr "Typen støttes ikke.\n" +msgstr "Mediaformatet støttes ikke.\n" #: mferror.mc:515 #, fuzzy @@ -8450,10 +8398,8 @@ msgid "Off" msgstr "Av" #: version.rc:42 -#, fuzzy -#| msgid "video" msgid "Provider" -msgstr "video" +msgstr "Tilbyder" #: version.rc:45 #, fuzzy -- 2.17.1 [View Less]

1 0

[PATCH] vbscript/tests: Add missing checks for Close() calls (Coverity).
by Nikolay Sivov 03 Jan '20

03 Jan '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vbscript/tests/run.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 5357ab1f12..d45416a94a 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -1956,7 +1956,6 @@ static HRESULT parse_script(DWORD flags, BSTR script_str, const WCHAR *delim) IActiveScriptParse *parser; IActiveScript *engine; … [View More]

2 1

[PATCH] webservices: Fix WsWriteText test crash on Windows 10.
by Piotr Caban 03 Jan '20

03 Jan '20

The tests crashes on my system when utf8.value.dictionary != NULL. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/webservices/tests/reader.c | 1 + 1 file changed, 1 insertion(+)

2 1

[PATCH] wined3d: Return FALSE rather than E_FAIL in wined3d_context_gl_create_wgl_ctx.
by Gabriel Ivăncescu 03 Jan '20

03 Jan '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This function returns BOOL. dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9576901..458343c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2049,7 +2049,7 @@ static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context if (!(context_gl->dc = … [View More]

2 1

[PATCH] strmbase: Fix fixed size buffer copy in JoinFilterGraph() (Coverity).
by Nikolay Sivov 03 Jan '20

03 Jan '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/strmbase/filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 002bf11665..5242efe762 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -290,7 +290,7 @@ static HRESULT WINAPI filter_JoinFilterGraph(IBaseFilter *iface, IFilterGraph *p EnterCriticalSection(&This->csFilter); { if (pName) - … [View More]

1 0

[PATCH] kernelbase: Fix a typo in weights comparison helper (Coverity).
by Nikolay Sivov 03 Jan '20

03 Jan '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- This changes matches winelib copy. dlls/kernelbase/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index c250c97968..da69e5a1f3 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -2191,7 +2191,7 @@ static int compare_weights(int flags, const WCHAR *str1, int len1, inc_str_pos( &str1, &len1, &dpos1, … [View More]

1 0

[PATCH] testbot/Janitor: Notify the administrator whenever an error occurs.
by Francois Gouget 03 Jan '20

03 Jan '20

Errors are also recorded in the general TestBot log but administrators would normally only read the log when something breaks the TestBot so that they would miss messages about unexpected TestAgentd.exe files for instance. Directly notifying the administrators about such issues makes it more likely that the Janitor script will remain up to date. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Janitor.pl | 10 ++++++++++ 1 file changed, 10 insertions(+) … [View More]

1 0

[PATCH] msi/tests: Avoid test failure when running as an unprivileged user.
by Hans Leidekker 03 Jan '20

03 Jan '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/tests/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 3c547bf04a..3b7b11d81e 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -4054,7 +4054,6 @@ static void test_appsearch(void) r = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Winetest_msi", 0, NULL, 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, … [View More]

1 0

[PATCH v2 1/2] gdi32/tests: Separate and expand tests for GetClipBox().
by Zebediah Figura 02 Jan '20

02 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/gdi32/tests/dc.c | 102 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 99 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 9739b8f61d..02ddd56cfd 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -429,9 +429,6 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale } else ok( ret || broken(!… [View More]ret) /* NT4 */, "GetDeviceGammaRamp failed on %s (type %d), error %u\n", descr, GetObjectType( hdc ), GetLastError() ); - type = GetClipBox( hdc, &rect ); - todo_wine_if (GetObjectType( hdc ) == OBJ_ENHMETADC) - ok( type == SIMPLEREGION, "GetClipBox returned %d on memdc for %s\n", type, descr ); type = GetBoundsRect( hdc, &rect, 0 ); ok( type == DCB_RESET || broken(type == DCB_SET) /* XP */, @@ -1569,6 +1566,104 @@ static void test_pscript_printer_dc(void) DeleteDC(hdc); } +static void test_clip_box(void) +{ + HBITMAP bitmap = CreateBitmap(10, 10, 1, 1, NULL); + HDC dc, desktop_dc, printer_dc; + RECT rect, expect, screen_rect; + int type, screen_type; + DEVMODEA scale_mode; + + EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &scale_mode); + scale_mode.dmFields |= DM_SCALE; + scale_mode.u1.s1.dmScale = 200; + + SetRect(&screen_rect, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN), + GetSystemMetrics(SM_XVIRTUALSCREEN) + GetSystemMetrics(SM_CXVIRTUALSCREEN), + GetSystemMetrics(SM_YVIRTUALSCREEN) + GetSystemMetrics(SM_CYVIRTUALSCREEN)); + screen_type = GetSystemMetrics(SM_CMONITORS) > 1 ? COMPLEXREGION : SIMPLEREGION; + + dc = CreateDCA("DISPLAY", NULL, NULL, NULL); + type = GetClipBox(dc, &rect); + todo_wine_if(screen_type == COMPLEXREGION) + ok(type == screen_type, "wrong region type %d\n", type); + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + DeleteDC(dc); + + dc = CreateDCA("DISPLAY", NULL, NULL, &scale_mode); + type = GetClipBox(dc, &rect); + todo_wine_if(screen_type == COMPLEXREGION) + ok(type == screen_type, "wrong region type %d\n", type); + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + ResetDCA(dc, &scale_mode); + type = GetClipBox(dc, &rect); + todo_wine_if(screen_type == COMPLEXREGION) + ok(type == screen_type, "wrong region type %d\n", type); + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + DeleteDC(dc); + + dc = CreateCompatibleDC(NULL); + type = GetClipBox(dc, &rect); + ok(type == SIMPLEREGION, "wrong region type %d\n", type); + SetRect(&expect, 0, 0, 1, 1); + ok(EqualRect(&rect, &expect), "got %s\n", wine_dbgstr_rect(&rect)); + SelectObject(dc, bitmap); + type = GetClipBox(dc, &rect); + ok(type == SIMPLEREGION, "wrong region type %d\n", type); + SetRect(&expect, 0, 0, 10, 10); + ok(EqualRect(&rect, &expect), "got %s\n", wine_dbgstr_rect(&rect)); + DeleteDC(dc); + + desktop_dc = GetDC(0); + type = GetClipBox(desktop_dc, &rect); + todo_wine_if(screen_type == COMPLEXREGION) + ok(type == screen_type, "wrong region type %d\n", type); + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + + dc = CreateEnhMetaFileA(desktop_dc, NULL, NULL, NULL); + ok(!!dc, "CreateEnhMetaFile() failed\n"); + type = GetClipBox(dc, &rect); + todo_wine ok(type == SIMPLEREGION, "wrong region type %d\n", type); + if (type != ERROR) + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + DeleteEnhMetaFile(CloseEnhMetaFile(dc)); + + ReleaseDC(0, desktop_dc); + + dc = CreateMetaFileA(NULL); + ok(!!dc, "CreateEnhMetaFile() failed\n"); + type = GetClipBox(dc, &rect); + ok(type == ERROR, "wrong region type %d\n", type); + DeleteMetaFile(CloseMetaFile(dc)); + + if ((printer_dc = create_printer_dc(100, FALSE))) + { + type = GetClipBox(printer_dc, &rect); + ok(type == SIMPLEREGION, "wrong region type %d\n", type); + + dc = CreateCompatibleDC(printer_dc); + type = GetClipBox(dc, &rect); + ok(type == SIMPLEREGION, "wrong region type %d\n", type); + SetRect(&expect, 0, 0, 1, 1); + ok(EqualRect(&rect, &expect), "got %s\n", wine_dbgstr_rect(&rect)); + DeleteDC(dc); + + dc = CreateEnhMetaFileA(printer_dc, NULL, NULL, NULL); + type = GetClipBox(dc, &rect); + ok(type == SIMPLEREGION, "wrong region type %d\n", type); + DeleteEnhMetaFile(CloseEnhMetaFile(dc)); + + DeleteDC(printer_dc); + } + + DeleteObject(bitmap); +} + START_TEST(dc) { pSetLayout = (void *)GetProcAddress( GetModuleHandleA("gdi32.dll"), "SetLayout"); @@ -1585,4 +1680,5 @@ START_TEST(dc) test_gamma(); test_printer_dc(); test_pscript_printer_dc(); + test_clip_box(); } -- 2.24.1 [View Less]

2 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel January 2020