December 2018 - Wine-commits

Denil Verghese : po: Update Malayalam translation.
by Alexandre Julliard 31 Dec '18

31 Dec '18

Module: wine Branch: master Commit: 1177a8c2ad52c00495bc8f3b20a5c5eda0fee30b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1177a8c2ad52c00495bc8f3b… Author: Denil Verghese <denilverghese(a)gmail.com> Date: Sat Dec 29 22:22:33 2018 +0530 po: Update Malayalam translation. Signed-off-by: Denil Verghese <denilverghese(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ml.po | 116 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 59 insertions(+), 57 deletions(-) diff --git a/po/ml.po b/po/ml.po index 005162c..545b63e 100644 --- a/po/ml.po +++ b/po/ml.po @@ -6,7 +6,7 @@ msgstr "" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" "PO-Revision-Date: N/A\n" -"Last-Translator: Automatically generated\n" +"Last-Translator: Denil C Verghese\n" "Language-Team: Malayalam\n" "Language: ml\n" "MIME-Version: 1.0\n" @@ -15,17 +15,19 @@ msgstr "" #: appwiz.rc:58 msgid "Install/Uninstall" -msgstr "" +msgstr "ഇൻസ്റ്റാൾ/അൺഇൻസ്റ്റാൾ" #: appwiz.rc:61 msgid "" "To install a new program from a floppy disk, CD-ROM drive, or your hard " "drive, click Install." msgstr "" +"ഫ്ലോപ്പി ഡിസ്ക്, സിഡി-റോം ഡ്രൈവ്, അല്ലെങ്കിൽ നിങ്ങളുടെ ഹാർഡ് ഡ്രൈവ് എന്നിവയിൽ നിന്നും ഒരു " +"പുതിയ പ്രോഗ്രാം ഇൻസ്റ്റാൾ ചെയ്യാൻ ഇൻസ്റ്റാൾ ചെയ്യുക ക്ലിക്കുചെയ്യുക." #: appwiz.rc:62 msgid "&Install..." -msgstr "" +msgstr "ഇൻസ്റ്റാൾ (&I)" #: appwiz.rc:65 msgid "" @@ -33,24 +35,26 @@ msgid "" "to modify its installed components, select it from the list and click Modify/" "Remove." msgstr "" +"ഇനിപ്പറയുന്ന സോഫ്റ്റ്വെയർ സ്വപ്രേരിതമായി നീക്കംചെയ്യാം. ഒരു പ്രോഗ്രാം നീക്കംചെയ്യാനോ അതിന്റെ " +"ഇൻസ്റ്റാൾ ചെയ്ത ഭാഗങ്ങൾ പരിഷ്ക്കരിക്കുന്നതിന് ലിസ്റ്റിൽ നിന്ന് അത് തിരഞ്ഞെടുത്ത് പരിഷ്ക്കരിക്കുക/" +"നീക്കം ചെയ്യുക ക്ലിക്കുചെയ്യുക." #: appwiz.rc:67 -#, fuzzy msgid "&Support Information" -msgstr "_അക്ഷരസഞ്ചയം..." +msgstr "പിന്തുണ വിവരം (&S)" #: appwiz.rc:68 regedit.rc:133 regedit.rc:232 msgid "&Modify..." -msgstr "" +msgstr "പരിഷ്ക്കരിക്കുക... (&M)" #: appwiz.rc:69 appwiz.rc:45 cryptui.rc:351 msacm32.rc:40 winecfg.rc:200 #: winecfg.rc:237 wordpad.rc:256 msgid "&Remove" -msgstr "" +msgstr "നീക്കംചെയ്യുക (&R)" #: appwiz.rc:75 msgid "Support Information" -msgstr "" +msgstr "പിന്തുണ വിവരം" #: appwiz.rc:78 avifil32.rc:54 comctl32.rc:71 comctl32.rc:55 comdlg32.rc:232 #: comdlg32.rc:262 comdlg32.rc:305 comdlg32.rc:359 comdlg32.rc:398 @@ -68,44 +72,43 @@ msgstr "" #: winemine.rc:73 winemine.rc:84 winemine.rc:98 wordpad.rc:215 wordpad.rc:226 #: wordpad.rc:244 wordpad.rc:257 msgid "OK" -msgstr "" +msgstr "ശരി" #: appwiz.rc:79 msgid "The following information can be used to get technical support for %s:" -msgstr "" +msgstr "%s നുള്ള സാങ്കേതിക പിന്തുണ ലഭിക്കാൻ താഴെ പറയുന്ന വിവരങ്ങൾ ഉപയോഗിക്കാം:" #: appwiz.rc:80 msgid "Publisher:" -msgstr "" +msgstr "പ്രസാധകൻ:" #: appwiz.rc:81 winefile.rc:166 msgid "Version:" -msgstr "" +msgstr "പതിപ്പ്:" #: appwiz.rc:82 msgid "Contact:" -msgstr "" +msgstr "ബന്ധപ്പെടുക:" #: appwiz.rc:83 -#, fuzzy msgid "Support Information:" -msgstr "_അക്ഷരസഞ്ചയം..." +msgstr "പിന്തുണ വിവരം:" #: appwiz.rc:84 msgid "Support Telephone:" -msgstr "" +msgstr "ടെലിഫോൺ പിന്തുണ:" #: appwiz.rc:85 msgid "Readme:" -msgstr "" +msgstr "എന്നെ വായിക്കൂ:" #: appwiz.rc:86 msgid "Product Updates:" -msgstr "" +msgstr "ഉൽപ്പന്ന അപ്ഡേറ്റുകൾ:" #: appwiz.rc:87 msgid "Comments:" -msgstr "" +msgstr "അഭിപ്രായങ്ങൾ:" #: appwiz.rc:100 msgid "Wine Gecko Installer" @@ -124,7 +127,7 @@ msgstr "" #: appwiz.rc:109 appwiz.rc:124 msgid "&Install" -msgstr "" +msgstr "ഇൻസ്റ്റാൾ (&I)" #: appwiz.rc:110 appwiz.rc:125 avifil32.rc:55 browseui.rc:45 comctl32.rc:72 #: comctl32.rc:87 comctl32.rc:56 comdlg32.rc:171 comdlg32.rc:193 @@ -164,17 +167,19 @@ msgstr "" #: appwiz.rc:31 msgid "Add/Remove Programs" -msgstr "" +msgstr "പ്രോഗ്രാമുകൾ ചേർക്കുക/നീക്കംചെയ്യുക" #: appwiz.rc:32 msgid "" "Allows you to install new software, or remove existing software from your " "computer." msgstr "" +"പുതിയ സോഫ്റ്റ്വെയർ ഇൻസ്റ്റാൾ ചെയ്യാൻ അല്ലെങ്കിൽ, നിങ്ങളുടെ കമ്പ്യൂട്ടറിൽ നിന്നും നിലവിലുള്ള " +"സോഫ്റ്റ്വെയർ നീക്കംചെയ്യാൻ നിങ്ങളെ അനുവദിക്കുന്നു." #: appwiz.rc:33 taskmgr.rc:262 winecfg.rc:33 msgid "Applications" -msgstr "" +msgstr "അപ്ലിക്കേഷനുകൾ" #: appwiz.rc:35 msgid "" @@ -184,44 +189,44 @@ msgstr "" #: appwiz.rc:36 msgid "Not specified" -msgstr "" +msgstr "വ്യക്തമാക്കിയിട്ടില്ല" #: appwiz.rc:38 shell32.rc:144 shell32.rc:241 regedit.rc:147 winefile.rc:107 msgid "Name" -msgstr "" +msgstr "പേര്" #: appwiz.rc:39 msgid "Publisher" -msgstr "" +msgstr "പ്രസാധകൻ" #: appwiz.rc:40 cryptui.rc:54 msgid "Version" -msgstr "" +msgstr "പതിപ്പ്" #: appwiz.rc:41 msgid "Installation programs" -msgstr "" +msgstr "ഇൻസ്റ്റലേഷൻ പ്രോഗ്രാമുകൾ" #: appwiz.rc:42 msgid "Programs (*.exe)" -msgstr "" +msgstr "പ്രോഗ്രാമുകൾ (*.exe)" #: appwiz.rc:43 avifil32.rc:33 cryptui.rc:83 shell32.rc:199 notepad.rc:76 #: oleview.rc:103 progman.rc:82 regedit.rc:225 winedbg.rc:43 winhlp32.rc:90 msgid "All files (*.*)" -msgstr "" +msgstr "എല്ലാ ഫയലുകളും (*.*)" #: appwiz.rc:46 msgid "&Modify/Remove" -msgstr "" +msgstr "പരിഷ്ക്കരിക്കുക/നീക്കംചെയ്യുക (&M)" #: appwiz.rc:51 msgid "Downloading..." -msgstr "" +msgstr "ഡൗൺലോഡുചെയ്യുന്നു..." #: appwiz.rc:52 msgid "Installing..." -msgstr "" +msgstr "ഇൻസ്റ്റാൾ ചെയ്യുന്നു..." #: appwiz.rc:53 msgid "" @@ -239,7 +244,7 @@ msgstr "" #: avifil32.rc:48 wordpad.rc:76 msgid "&Options..." -msgstr "" +msgstr "ഓപ്ഷനുകൾ... (&O)" #: avifil32.rc:49 msgid "&Interleave every" @@ -247,32 +252,31 @@ msgstr "" #: avifil32.rc:51 msvfw32.rc:51 msgid "frames" -msgstr "" +msgstr "ഫ്രെയിമുകൾ" #: avifil32.rc:52 -#, fuzzy msgid "Current format:" -msgstr "_അക്ഷരസഞ്ചയം..." +msgstr "നിലവിലെ ഫോർമാറ്റ്:" #: avifil32.rc:30 msgid "Waveform: %s" -msgstr "" +msgstr "തരംഗരൂപം: %s" #: avifil32.rc:31 msgid "Waveform" -msgstr "" +msgstr "തരംഗരൂപം" #: avifil32.rc:32 msgid "All multimedia files" -msgstr "" +msgstr "എല്ലാ മൾട്ടിമീഡിയ ഫയലുകളും" #: avifil32.rc:34 msgid "video" -msgstr "" +msgstr "വീഡിയോ" #: avifil32.rc:35 msgid "audio" -msgstr "" +msgstr "ഓഡിയോ" #: avifil32.rc:36 msgid "Wine AVI-default-filehandler" @@ -284,29 +288,27 @@ msgstr "" #: browseui.rc:28 msgid "Canceling..." -msgstr "" +msgstr "റദ്ദാക്കുന്നു..." #: browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "%1!u! %2 ശേഷിക്കുന്നു" #: browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "%1!u! %2 and %3!u! %4 ശേഷിക്കുന്നു" #: browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "_സെക്കന്‍ഡുകള്‍" +msgstr "സെക്കന്‍ഡുകള്‍" #: browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "മിനിറ്റുകൾ" #: browseui.rc:33 msgid "hours" -msgstr "" +msgstr "മണിക്കൂറുകൾ" #: comctl32.rc:68 winefile.rc:157 #, fuzzy @@ -315,11 +317,11 @@ msgstr "വി_വരം" #: comctl32.rc:73 comdlg32.rc:264 msgid "&Apply" -msgstr "" +msgstr "പ്രയോഗിക്കുക (&A)" #: comctl32.rc:74 comctl32.rc:88 comdlg32.rc:307 user32.rc:88 msgid "Help" -msgstr "" +msgstr "സഹായം" #: comctl32.rc:81 msgid "Wizard" @@ -327,7 +329,7 @@ msgstr "" #: comctl32.rc:84 msgid "< &Back" -msgstr "" +msgstr "< തിരികെ (&B)" #: comctl32.rc:85 msgid "&Next >" @@ -335,11 +337,11 @@ msgstr "" #: comctl32.rc:86 msgid "Finish" -msgstr "" +msgstr "പൂർത്തിയാക്കുക" #: comctl32.rc:97 msgid "Customize Toolbar" -msgstr "" +msgstr "ഉപകരണബാർ ഇഷ്ടാനുസൃതമാക്കുക" #: comctl32.rc:100 comctl32.rc:57 cryptui.rc:356 ieframe.rc:43 oleview.rc:83 #: oleview.rc:187 oleview.rc:200 oleview.rc:212 taskmgr.rc:139 @@ -407,16 +409,16 @@ msgstr "" #: comctl32.rc:62 msgid "Hide details" -msgstr "" +msgstr "വിശദാംശങ്ങൾ മറയ്ക്കുക" #: comctl32.rc:63 msgid "See details" -msgstr "" +msgstr "വിശദാംശങ്ങൾ കാണുക" #: comctl32.rc:31 cryptui.rc:235 regedit.rc:286 taskmgr.rc:434 winedbg.rc:61 #: winedbg.rc:76 wordpad.rc:180 msgid "Close" -msgstr "" +msgstr "അടയ്ക്കുക" #: comctl32.rc:36 msgid "Today:"

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 31 Dec '18

31 Dec '18

Module: wine Branch: master Commit: 37bc868d78bdaa979ef3ad94f58ce741611f756b URL: https://source.winehq.org/git/wine.git/?a=commit;h=37bc868d78bdaa979ef3ad94… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sun Dec 30 02:44:05 2018 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 416 ++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 198 insertions(+), 218 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=37bc868d78bdaa979ef3…

1 0

Paul Gofman : user32/tests: Add some tests for implicit stretch mode in CopyImage().
by Alexandre Julliard 31 Dec '18

31 Dec '18

Module: wine Branch: master Commit: 1bf418f0ff99ab7f8008d1d7e63939b55f6a2657 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bf418f0ff99ab7f8008d1d7… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Dec 28 23:15:16 2018 +0300 user32/tests: Add some tests for implicit stretch mode in CopyImage(). The values of the colored test result suggest that halftone filter is used for shrinking: each pixel of output 2x2 image has the color value averaged over 4 pixels from input 4x4 image. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/cursoricon.c | 125 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 323db82..c598b23 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -2751,6 +2751,130 @@ static void test_monochrome_icon(void) HeapFree(GetProcessHeap(), 0, icon_data); } +static COLORREF get_color_from_bits(const unsigned char *bits, const BITMAPINFO *bmi, + unsigned int row, unsigned int column) +{ + const BITMAPINFOHEADER *h = &bmi->bmiHeader; + const unsigned char *data; + unsigned int stride; + RGBQUAD color; + + ok(h->biBitCount == 1 || h->biBitCount >= 24, "Unsupported bit count %u.\n", h->biBitCount); + stride = ((h->biBitCount * h->biWidth + 7) / 8 + 3) & ~3; + data = bits + row * stride + column * h->biBitCount / 8; + if (h->biBitCount >= 24) + return RGB(data[2], data[1], data[0]); + + color = bmi->bmiColors[!!(data[0] & (1u << (7 - (column % 8))))]; + return RGB(color.rgbRed, color.rgbGreen, color.rgbBlue); +} + +static void test_CopyImage_StretchMode(void) +{ + static const unsigned char test_bits_24[] = + { + 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, + 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0x00, + 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, + 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, + }; + static const unsigned char expected_bits_24[] = + { + 0x3f, 0xff, 0x00, 0x3f, 0xff, 0x3f, 0x00, 0x00, + 0x3f, 0xff, 0x7f, 0x00, 0xff, 0x3f, 0x00, 0x00, + }; + static const unsigned char test_bits_1[] = + { + 0x30, 0x0, 0x0, 0x0, + 0x30, 0x0, 0x0, 0x0, + 0x40, 0x0, 0x0, 0x0, + 0xc0, 0x0, 0x0, 0x0, + }; + static const unsigned char expected_bits_1[] = + { + 0x40, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, + }; + + static const struct + { + LONG width, height, output_width, output_height; + WORD bit_count; + const unsigned char *test_bits, *expected_bits; + size_t test_bits_size, result_bits_size; + BOOL todo; + } + tests[] = + { + {4, 4, 2, 2, 24, test_bits_24, expected_bits_24, + sizeof(test_bits_24), sizeof(expected_bits_24), TRUE}, + {4, 4, 2, 2, 1, test_bits_1, expected_bits_1, + sizeof(test_bits_1), sizeof(expected_bits_1), FALSE}, + }; + + HBITMAP bitmap, bitmap_copy; + unsigned char *result_bits; + unsigned int row, column; + unsigned int test_index; + unsigned char *bits; + BITMAPINFO *bmi; + HDC hdc; + int ret; + + bmi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biCompression = BI_RGB; + bmi->bmiColors[1].rgbRed = 0xff; + bmi->bmiColors[1].rgbGreen = 0xff; + bmi->bmiColors[1].rgbBlue = 0xff; + + hdc = GetDC(NULL); + + for (test_index = 0; test_index < ARRAY_SIZE(tests); ++test_index) + { + bmi->bmiHeader.biWidth = tests[test_index].width; + bmi->bmiHeader.biHeight = tests[test_index].height; + bmi->bmiHeader.biBitCount = tests[test_index].bit_count; + + bitmap = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, (void **)&bits, NULL, 0); + ok(bitmap && bits, "CreateDIBSection() failed, result %u.\n", GetLastError()); + memcpy(bits, tests[test_index].test_bits, tests[test_index].test_bits_size); + + bitmap_copy = CopyImage(bitmap, IMAGE_BITMAP, tests[test_index].output_width, + tests[test_index].output_height, LR_CREATEDIBSECTION); + ok(!!bitmap_copy, "CopyImage() failed, result %u.\n", GetLastError()); + + result_bits = HeapAlloc(GetProcessHeap(), 0, tests[test_index].result_bits_size); + + bmi->bmiHeader.biWidth = tests[test_index].output_width; + bmi->bmiHeader.biHeight = tests[test_index].output_height; + ret = GetDIBits(hdc, bitmap_copy, 0, tests[test_index].output_height, + result_bits, bmi, DIB_RGB_COLORS); + ok(ret == tests[test_index].output_height, "Unexpected GetDIBits result %d, GetLastError() %u.\n", + ret, GetLastError()); + + for (row = 0; row < tests[test_index].output_height; ++row) + for (column = 0; column < tests[test_index].output_width; ++column) + { + COLORREF result, expected; + + result = get_color_from_bits(result_bits, bmi, row, column); + expected = get_color_from_bits(tests[test_index].expected_bits, bmi, row, column); + + todo_wine_if(tests[test_index].todo) + ok(result == expected, "Colors do not match, " + "got 0x%06x, expected 0x%06x, test_index %u, row %u, column %u.\n", + result, expected, test_index, row, column); + } + DeleteObject(bitmap); + DeleteObject(bitmap_copy); + HeapFree(GetProcessHeap(), 0, result_bits); + } + ReleaseDC(0, hdc); + HeapFree(GetProcessHeap(), 0, bmi); +} + START_TEST(cursoricon) { pGetCursorInfo = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetCursorInfo" ); @@ -2778,6 +2902,7 @@ START_TEST(cursoricon) test_CopyImage_Bitmap(16); test_CopyImage_Bitmap(24); test_CopyImage_Bitmap(32); + test_CopyImage_StretchMode(); test_initial_cursor(); test_CreateIcon(); test_LoadImage();

1 0

Alexandre Julliard : user32: Also ignore dynamic DPI awareness changes when DPI scaling is disabled.
by Alexandre Julliard 31 Dec '18

31 Dec '18

Module: wine Branch: master Commit: d3ca7db42e207e4f646865c39f47c987a8ac161a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3ca7db42e207e4f646865c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 31 16:45:06 2018 +0100 user32: Also ignore dynamic DPI awareness changes when DPI scaling is disabled. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 2 +- dlls/user32/tests/sysparams.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 224d2f9..70dce3f 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1463,7 +1463,7 @@ void SYSPARAMS_Init(void) if (!dpi_scaling) { default_awareness = DPI_AWARENESS_PER_MONITOR_AWARE; - if (dpi_awareness) dpi_awareness = 0x10 | default_awareness; + dpi_awareness = 0x10 | default_awareness; } if (volatile_base_key && dispos == REG_CREATED_NEW_KEY) /* first process, initialize entries */ diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index c50acbe..f74c9e7 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3567,6 +3567,7 @@ static void test_dpi_context(void) ok( !ret, "got %d\n", ret ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); ret = pSetProcessDpiAwarenessContext( DPI_AWARENESS_CONTEXT_SYSTEM_AWARE ); + todo_wine ok( ret, "got %d\n", ret ); ok( pIsProcessDPIAware(), "not aware\n" ); real_dpi = pGetDpiForSystem(); @@ -3587,9 +3588,11 @@ static void test_dpi_context(void) ok( GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError() ); ret = pGetProcessDpiAwarenessInternal( 0, &awareness ); ok( ret, "got %d\n", ret ); + todo_wine ok( awareness == DPI_AWARENESS_SYSTEM_AWARE, "wrong value %d\n", awareness ); ret = pGetProcessDpiAwarenessInternal( GetCurrentProcess(), &awareness ); ok( ret, "got %d\n", ret ); + todo_wine ok( awareness == DPI_AWARENESS_SYSTEM_AWARE, "wrong value %d\n", awareness ); ret = pGetProcessDpiAwarenessInternal( (HANDLE)0xdeadbeef, &awareness ); ok( ret, "got %d\n", ret ); @@ -3598,8 +3601,10 @@ static void test_dpi_context(void) ret = pIsProcessDPIAware(); ok(ret, "got %d\n", ret); context = pGetThreadDpiAwarenessContext(); + todo_wine ok( context == (DPI_AWARENESS_CONTEXT)(0x11 | flags), "wrong context %p\n", context ); awareness = pGetAwarenessFromDpiAwarenessContext( context ); + todo_wine ok( awareness == DPI_AWARENESS_SYSTEM_AWARE, "wrong awareness %u\n", awareness ); SetLastError( 0xdeadbeef ); context = pSetThreadDpiAwarenessContext( 0 ); @@ -3610,8 +3615,10 @@ static void test_dpi_context(void) ok( !context, "got %p\n", context ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); context = pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_UNAWARE ); + todo_wine ok( context == (DPI_AWARENESS_CONTEXT)(0x80000011 | flags), "wrong context %p\n", context ); awareness = pGetAwarenessFromDpiAwarenessContext( context ); + todo_wine ok( awareness == DPI_AWARENESS_SYSTEM_AWARE, "wrong awareness %u\n", awareness ); dpi = pGetDpiForSystem(); ok( dpi == USER_DEFAULT_SCREEN_DPI, "wrong dpi %u\n", dpi ); @@ -3648,16 +3655,21 @@ static void test_dpi_context(void) context = pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)(0x80000010 | flags) ); ok( context == (DPI_AWARENESS_CONTEXT)(0x11 | flags), "wrong context %p\n", context ); context = pGetThreadDpiAwarenessContext(); + todo_wine ok( context == (DPI_AWARENESS_CONTEXT)(0x11 | flags), "wrong context %p\n", context ); context = pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)(0x80000011 | flags) ); + todo_wine ok( context == (DPI_AWARENESS_CONTEXT)(0x80000011 | flags), "wrong context %p\n", context ); context = pGetThreadDpiAwarenessContext(); + todo_wine ok( context == (DPI_AWARENESS_CONTEXT)(0x11 | flags), "wrong context %p\n", context ); context = pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)0x12 ); + todo_wine ok( context == (DPI_AWARENESS_CONTEXT)(0x80000011 | flags), "wrong context %p\n", context ); context = pSetThreadDpiAwarenessContext( context ); ok( context == (DPI_AWARENESS_CONTEXT)(0x12), "wrong context %p\n", context ); context = pGetThreadDpiAwarenessContext(); + todo_wine ok( context == (DPI_AWARENESS_CONTEXT)(0x11 | flags), "wrong context %p\n", context ); for (i = 0; i < 0x100; i++) {

1 0

Alexandre Julliard : Wine release 4.0-rc4
by Alexandre Julliard 28 Dec '18

28 Dec '18

Module: website Branch: master Commit: b6dec1139115640582c9f596d6ad20739619029e URL: https://source.winehq.org/git/website.git/?a=commit;h=b6dec1139115640582c9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 28 20:00:31 2018 +0100 Wine release 4.0-rc4 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018122801.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2018122801.xml b/news/en/2018122801.xml new file mode 100644 index 0000000..6fb1975 --- /dev/null +++ b/news/en/2018122801.xml @@ -0,0 +1,12 @@ +<news> +<date>December 28, 2018</date> +<title>Wine 4.0-rc4 Released</title> +<body> + The Wine development release 4.0-rc4 is now available. + <a href="{$root}/announce/4.0-rc4">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.0/wine-4.0-rc4.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : user32: Clear %edi register when calling window procedure.
by Alexandre Julliard 28 Dec '18

28 Dec '18

Module: wine Branch: master Commit: 0d83218a2d25517bbeaef4d708843db680b54d49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d83218a2d25517bbeaef4d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 28 18:19:48 2018 +0100 user32: Clear %edi register when calling window procedure. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46352 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winproc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index b2d4fd2..f86fb4a 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -191,6 +191,8 @@ __ASM_GLOBAL_FUNC( WINPROC_wrapper, __ASM_CFI(".cfi_rel_offset %esi,-8\n\t") "pushl %ebx\n\t" __ASM_CFI(".cfi_rel_offset %ebx,-12\n\t") + /* TreePad X Enterprise assumes that edi is < 0x80000000 in WM_TIMER messages */ + "xorl %edi,%edi\n\t" "subl $12,%esp\n\t" "pushl 24(%ebp)\n\t" "pushl 20(%ebp)\n\t"

1 0

Dmitry Timoshkov : kernel32: CreateDirectory shouldn' t return ERROR_ACCESS_DENIED for the root of the drive.
by Alexandre Julliard 28 Dec '18

28 Dec '18

Module: wine Branch: master Commit: c26b6afad37742cb6a9abc52ff1aee304d9ae689 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c26b6afad37742cb6a9abc52… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 28 15:42:20 2018 +0800 kernel32: CreateDirectory shouldn't return ERROR_ACCESS_DENIED for the root of the drive. According to the testbot results CreateDirectory("C:\\", NULL) fails with ERROR_ACCESS_DENIED for not administrators. However with UAC enabled and not and administrator account I get ERROR_ALREADY_EXISTS in that case with Windows 7 64-bit running on real hardware. Moreover, Wine doesn't really perform any access checks in that case and blindly assumes that returning STATUS_ACCESS_DENIED is correct behaviour for the drive's root: dlls/ntdll/directory.c,lookup_unix_name(). This patch fixes an application that can't find its data files because after it receives ERROR_ACCESS_DENIED it stops further directory traversing. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/directory.c | 43 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/directory.c | 3 +-- 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/directory.c b/dlls/kernel32/tests/directory.c index 512dc6d..de78c61 100644 --- a/dlls/kernel32/tests/directory.c +++ b/dlls/kernel32/tests/directory.c @@ -541,10 +541,53 @@ static void test_SetCurrentDirectoryA(void) ok( GetLastError() == ERROR_PATH_NOT_FOUND, "wrong error %d\n", GetLastError() ); } +static void test_CreateDirectory_root(void) +{ + static const WCHAR drive_c_root[] = { 'C',':','\\',0 }; + static const WCHAR drive_c[] = { 'C',':',0 }; + char curdir[MAX_PATH]; + BOOL ret; + + GetCurrentDirectoryA(sizeof(curdir), curdir); + + ret = SetCurrentDirectoryA("C:\\"); + ok(ret, "SetCurrentDirectory error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateDirectoryA("C:\\", NULL); + ok(!ret, "CreateDirectory should fail\n"); + if (GetLastError() == ERROR_ACCESS_DENIED) + { + win_skip("not an administrator\n"); + SetCurrentDirectoryA(curdir); + return; + } + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateDirectoryA("C:", NULL); + ok(!ret, "CreateDirectory should fail\n"); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateDirectoryW(drive_c_root, NULL); + ok(!ret, "CreateDirectory should fail\n"); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = CreateDirectoryW(drive_c, NULL); + ok(!ret, "CreateDirectory should fail\n"); + ok(GetLastError() == ERROR_ALREADY_EXISTS, "got %u\n", GetLastError()); + + SetCurrentDirectoryA(curdir); +} + START_TEST(directory) { init(); + test_CreateDirectory_root(); + test_GetWindowsDirectoryA(); test_GetWindowsDirectoryW(); diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index c48b9e9..2719958 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2650,9 +2650,8 @@ static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer { if (!stat( unix_name, &st )) { - /* creation fails with STATUS_ACCESS_DENIED for the root of the drive */ if (disposition == FILE_CREATE) - return name_len ? STATUS_OBJECT_NAME_COLLISION : STATUS_ACCESS_DENIED; + return STATUS_OBJECT_NAME_COLLISION; return STATUS_SUCCESS; } }

1 0

Alexandre Julliard : Release 4.0-rc4.
by Alexandre Julliard 28 Dec '18

28 Dec '18

Module: wine Branch: master Commit: 1a727e3a1e42714359f6f498053e47533108d554 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a727e3a1e42714359f6f498… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 28 19:58:40 2018 +0100 Release 4.0-rc4. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 199 +++++++++++++++++++------------------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +++--- 4 files changed, 70 insertions(+), 150 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1a727e3a1e42714359f6…

1 0

Tag wine-4.0-rc4 : Alexandre Julliard : Release 4.0-rc4
by Alexandre Julliard 28 Dec '18

28 Dec '18

Module: wine Branch: refs/tags/wine-4.0-rc4 Tag: 59f088edeb52d36c8fc45a7ab42e3aca89b3998c URL: https://source.winehq.org/git/wine.git/?a=tag;h=59f088edeb52d36c8fc45a7ab42… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 28 19:58:41 2018 +0100 Release 4.0-rc4

1 0

Sebastian Lackner : urlmon/tests: Add test for opening cache file with DELETE access.
by Alexandre Julliard 27 Dec '18

27 Dec '18

Module: wine Branch: master Commit: 9c19b2e225ad5f10bd83e79dbc2eb630add35528 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c19b2e225ad5f10bd83e79d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Dec 26 13:43:02 2018 -0600 urlmon/tests: Add test for opening cache file with DELETE access. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/url.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 893632f..ada78c9 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -182,6 +182,7 @@ static HRESULT abort_hres; static BOOL have_IHttpNegotiate2, use_bscex, is_async_prot; static BOOL test_redirect, use_cache_file, callback_read, no_callback, test_abort; static WCHAR cache_file_name[MAX_PATH]; +static WCHAR http_cache_file[MAX_PATH]; static BOOL only_check_prot_args = FALSE; static BOOL invalid_cn_accepted = FALSE; static BOOL abort_start = FALSE; @@ -1927,6 +1928,14 @@ static HRESULT WINAPI statusclb_OnStopBinding(IBindStatusCallbackEx *iface, HRES ok( WaitForSingleObject(complete_event2, 90000) == WAIT_OBJECT_0, "wait timed out\n" ); } + if(test_protocol == HTTP_TEST && !emulate_protocol && http_cache_file[0]) { + HANDLE file = CreateFileW(http_cache_file, DELETE, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file == INVALID_HANDLE_VALUE, "expected INVALID_HANDLE_VALUE, got %p\n", file); + ok(GetLastError() == ERROR_SHARING_VIOLATION, "expected ERROR_SHARING_VIOLATION, got %u\n", GetLastError()); + http_cache_file[0] = 0; + } + return S_OK; } @@ -2083,6 +2092,8 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DW else if(emulate_protocol) ok(!lstrcmpW(pstgmed->u.lpszFileName, cache_fileW), "unexpected file name %s\n", wine_dbgstr_w(pstgmed->u.lpszFileName)); + else if(test_protocol == HTTP_TEST) + lstrcpyW(http_cache_file, pstgmed->u.lpszFileName); else ok(pstgmed->u.lpszFileName != NULL, "lpszFileName == NULL\n"); }

1 0