December 2018 - Wine-Commits

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

Dec. 31, 2018

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

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

Dec. 31, 2018

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

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Dec. 31, 2018

Dec. 31, 2018

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

Denil Verghese : po: Update Malayalam translation.
by Alexandre Julliard Dec. 31, 2018

Dec. 31, 2018

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

Alexandre Julliard : Wine release 4.0-rc4
by Alexandre Julliard Dec. 28, 2018

Dec. 28, 2018

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

Tag wine-4.0-rc4 : Alexandre Julliard : Release 4.0-rc4
by Alexandre Julliard Dec. 28, 2018

Dec. 28, 2018

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

Alexandre Julliard : Release 4.0-rc4.
by Alexandre Julliard Dec. 28, 2018

Dec. 28, 2018

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

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

Dec. 28, 2018

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 : user32: Clear %edi register when calling window procedure.
by Alexandre Julliard Dec. 28, 2018

Dec. 28, 2018

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

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

Dec. 27, 2018

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

Józef Kucia : d3d9: Fix Reset() with system memory buffers.
by Alexandre Julliard Dec. 27, 2018

Dec. 27, 2018

Module: wine Branch: master Commit: 70a95cea66384b475bd3584768b5fffc5f940a17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70a95cea66384b475bd35847… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 25 13:24:34 2018 +0100 d3d9: Fix Reset() with system memory buffers. Fixes a regression introduced by commit b18a53a5b44b651cde8e05200c75eacf54f49926. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46362 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 15 +++++++++++++++ dlls/d3d9/tests/device.c | 16 ++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 17f6565..c1418e9 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -875,6 +875,8 @@ static UINT WINAPI d3d9_device_GetNumberOfSwapChains(IDirect3DDevice9Ex *iface) static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource) { + struct d3d9_vertexbuffer *vertex_buffer; + struct d3d9_indexbuffer *index_buffer; struct wined3d_resource_desc desc; IDirect3DBaseTexture9 *texture; struct d3d9_surface *surface; @@ -886,6 +888,19 @@ static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource) if (desc.resource_type != WINED3D_RTYPE_TEXTURE_2D) { + if (desc.bind_flags & WINED3D_BIND_VERTEX_BUFFER) + { + vertex_buffer = wined3d_resource_get_parent(resource); + if (vertex_buffer && vertex_buffer->draw_buffer) + return D3D_OK; + } + if (desc.bind_flags & WINED3D_BIND_INDEX_BUFFER) + { + index_buffer = wined3d_resource_get_parent(resource); + if (index_buffer && index_buffer->draw_buffer) + return D3D_OK; + } + WARN("Resource %p in pool D3DPOOL_DEFAULT blocks the Reset call.\n", resource); return D3DERR_INVALIDCALL; } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 6edf2b3..bc8d708 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1827,6 +1827,8 @@ static void test_reset(void) IDirect3DDevice9 *device2 = NULL; IDirect3DSwapChain9 *swapchain; struct device_desc device_desc; + IDirect3DVertexBuffer9 *vb; + IDirect3DIndexBuffer9 *ib; DEVMODEW devmode; IDirect3D9 *d3d; D3DCAPS9 caps; @@ -2198,6 +2200,20 @@ static void test_reset(void) ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successful reset returned %#x\n", hr); IDirect3DSurface9_Release(surface); + hr = IDirect3DDevice9_CreateVertexBuffer(device1, 16, 0, + D3DFVF_XYZ, D3DPOOL_SYSTEMMEM, &vb, NULL); + ok(hr == D3D_OK, "Failed to create vertex buffer, hr %#x.\n", hr); + hr = IDirect3DDevice9_Reset(device1, &d3dpp); + ok(hr == D3D_OK, "Failed to reset device, hr %#x.\n", hr); + IDirect3DVertexBuffer9_Release(vb); + + hr = IDirect3DDevice9_CreateIndexBuffer(device1, 16, 0, + D3DFMT_INDEX16, D3DPOOL_SYSTEMMEM, &ib, NULL); + ok(hr == D3D_OK, "Failed to create index buffer, hr %#x.\n", hr); + hr = IDirect3DDevice9_Reset(device1, &d3dpp); + ok(hr == D3D_OK, "Failed to reset device, hr %#x.\n", hr); + IDirect3DIndexBuffer9_Release(ib); + /* The depth stencil should get reset to the auto depth stencil when present. */ hr = IDirect3DDevice9_SetDepthStencilSurface(device1, NULL); ok(hr == D3D_OK, "SetDepthStencilSurface failed with 0x%08x\n", hr);

1 0

Józef Kucia : wined3d: Handle unmappable buffers in wined3d_device_process_vertices() gracefully.
by Alexandre Julliard Dec. 27, 2018

Dec. 27, 2018

Module: wine Branch: master Commit: 2058505cebc7bb069e1e2d0d738353336e943b7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2058505cebc7bb069e1e2d0d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 25 13:24:36 2018 +0100 wined3d: Handle unmappable buffers in wined3d_device_process_vertices() gracefully. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c90cbdb..d03a982 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3340,7 +3340,7 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, struct wined3d_resource *resource; struct wined3d_box box = {0}; struct wined3d_shader *vs; - unsigned int i; + unsigned int i, j; HRESULT hr; WORD map; @@ -3375,7 +3375,20 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, box.left = src_start_idx * e->stride; box.right = box.left + vertex_count * e->stride; if (FAILED(wined3d_resource_map(resource, 0, &map_desc, &box, WINED3D_MAP_READ))) + { ERR("Failed to map resource.\n"); + for (j = 0, map = stream_info.use_map; map && j < i; map >>= 1, ++j) + { + if (!(map & 1)) + continue; + + e = &stream_info.elements[j]; + resource = &state->streams[e->stream_idx].buffer->resource; + if (FAILED(wined3d_resource_unmap(resource, 0))) + ERR("Failed to unmap resource.\n"); + } + return WINED3DERR_INVALIDCALL; + } e->data.buffer_object = 0; e->data.addr += (ULONG_PTR)map_desc.data; }

1 0

Isira Seneviratne : po: Update Sinhala translation.
by Alexandre Julliard Dec. 27, 2018

Dec. 27, 2018

Module: wine Branch: master Commit: 693dbf900e20b4b20ac600ae57c7bfe4ad9a4ff5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=693dbf900e20b4b20ac600ae… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Thu Dec 27 11:04:54 2018 +0530 po: Update Sinhala translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/si.po | 106 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/po/si.po b/po/si.po index 99ce144..60feedc 100644 --- a/po/si.po +++ b/po/si.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-12-22 04:58+0530\n" +"PO-Revision-Date: 2018-12-27 10:39+0530\n" "Last-Translator: Isira Seneviratne <isirasen96(a)gmail.com>\n" "Language-Team: Sinhala\n" "Language: si\n" @@ -41,7 +41,7 @@ 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 @@ -92,7 +92,7 @@ msgstr "තොරතුරු සඳහා සහාය:" #: appwiz.rc:84 msgid "Support Telephone:" -msgstr "" +msgstr "සහාය දුරකතනය:" #: appwiz.rc:85 msgid "Readme:" @@ -353,7 +353,7 @@ msgstr "" #: progman.rc:184 progman.rc:202 progman.rc:219 regedit.rc:77 taskmgr.rc:87 #: winefile.rc:82 winemine.rc:53 winhlp32.rc:57 wordpad.rc:102 msgid "&Help" -msgstr "" +msgstr "උදව් (&H)" #: comctl32.rc:103 msgid "Move &Up" @@ -424,7 +424,7 @@ msgstr "අදට යන්න" #: comdlg32.rc:157 comdlg32.rc:170 comdlg32.rc:459 comdlg32.rc:484 #: comdlg32.rc:511 shell32.rc:167 oleview.rc:101 msgid "Open" -msgstr "" +msgstr "අරින්න" #: comdlg32.rc:160 comdlg32.rc:182 msgid "File &Name:" @@ -470,7 +470,7 @@ msgstr "" #: comdlg32.rc:207 comdlg32.rc:384 regedit.rc:268 msgid "&All" -msgstr "" +msgstr "ඔක්කොම (&A)" #: comdlg32.rc:208 msgid "S&election" @@ -478,7 +478,7 @@ msgstr "" #: comdlg32.rc:209 msgid "&Pages" -msgstr "" +msgstr "පිටු (&P)" #: comdlg32.rc:212 comdlg32.rc:234 msgid "&Setup" @@ -538,11 +538,11 @@ msgstr "" #: comdlg32.rc:240 comdlg32.rc:415 comdlg32.rc:435 wineps.rc:28 msgid "Paper" -msgstr "" +msgstr "කඩදාසි" #: comdlg32.rc:241 msgid "Si&ze" -msgstr "" +msgstr "ප්රමාණය (&Z)" #: comdlg32.rc:242 msgid "&Source" @@ -562,7 +562,7 @@ msgstr "" #: comdlg32.rc:259 comdlg32.rc:436 winecfg.rc:294 msgid "&Size:" -msgstr "" +msgstr "ප්රමාණය (&S):" #: comdlg32.rc:266 msgid "Effects" @@ -697,7 +697,7 @@ msgstr "" #: comdlg32.rc:366 comdlg32.rc:404 msacm32.rc:34 winefile.rc:138 msgid "&Name:" -msgstr "" +msgstr "නම (&N):" #: comdlg32.rc:368 comdlg32.rc:406 msgid "Status:" @@ -705,11 +705,11 @@ msgstr "" #: comdlg32.rc:370 comdlg32.rc:408 msgid "Type:" -msgstr "" +msgstr "වර්ගය:" #: comdlg32.rc:372 comdlg32.rc:410 msgid "Where:" -msgstr "" +msgstr "කොහෙද:" #: comdlg32.rc:374 comdlg32.rc:412 msgid "Comment:" @@ -729,7 +729,7 @@ msgstr "" #: comdlg32.rc:385 msgid "Pa&ges" -msgstr "" +msgstr "පිටු (&G)" #: comdlg32.rc:386 msgid "&Selection" @@ -1902,7 +1902,7 @@ msgstr "" #: crypt32.rc:208 msgid "Full Name" -msgstr "" +msgstr "මුළු නම" #: crypt32.rc:209 msgid "RDN Name" @@ -9635,11 +9635,11 @@ msgstr "" #: urlmon.rc:35 msgid "Do you want to install this software?" -msgstr "" +msgstr "මේ මෘදුකාංගය ඔබට ස්ථාපනය කරන්න ඕනෙද?" #: urlmon.rc:39 msgid "Don't install" -msgstr "" +msgstr "ස්ථාපනය කරන්න එපා" #: urlmon.rc:43 msgid "" @@ -9653,11 +9653,11 @@ msgstr "" #: urlmon.rc:52 msgid "Install (%d)" -msgstr "" +msgstr "ස්ථාපනය කරන්න (%d)" #: urlmon.rc:53 msgid "Install" -msgstr "" +msgstr "ස්ථාපනය කරන්න" #: user32.rc:30 user32.rc:43 taskmgr.rc:138 msgctxt "window" @@ -9690,7 +9690,7 @@ msgstr "" #: user32.rc:49 msgid "&Close\tCtrl+F4" -msgstr "" +msgstr "වහන්න (&C)\tCtrl+F4" #: user32.rc:51 msgid "Nex&t\tCtrl+F6" @@ -10669,7 +10669,7 @@ msgstr "" #: clock.rc:40 msgid "&Date" -msgstr "" +msgstr "දිනය (&D)" #: clock.rc:42 taskmgr.rc:43 taskmgr.rc:141 msgid "&Always on Top" @@ -10681,7 +10681,7 @@ msgstr "" #: clock.rc:51 msgid "Clock" -msgstr "" +msgstr "ඔරලෝසුව" #: cmd.rc:40 msgid "" @@ -11122,7 +11122,7 @@ msgstr "" #: cmd.rc:371 msgid "More..." -msgstr "" +msgstr "තව..." #: cmd.rc:372 msgid "Line in Batch processing possibly truncated. Using:\n" @@ -12640,7 +12640,7 @@ msgstr "" #: regedit.rc:294 regedit.rc:305 msgid "Name:" -msgstr "" +msgstr "නම:" #: regedit.rc:302 msgid "Remove Favorite" @@ -14065,7 +14065,7 @@ msgstr "" #: wineboot.rc:46 msgid "The Wine configuration in %s is being updated, please wait..." -msgstr "" +msgstr "Wine වින්යාසය %s ඇතුලේ යාවත්කාලීන වේ, බලා සිටින්න..." #: winecfg.rc:141 msgid "" @@ -14467,7 +14467,7 @@ msgstr "" #: winecfg.rc:72 msgid "Floppy disk" -msgstr "" +msgstr "Floppy තැටිය" #: winecfg.rc:73 msgid "CD-ROM" @@ -14638,7 +14638,7 @@ msgstr "" #: wineconsole.rc:64 msgid "&Small" -msgstr "" +msgstr "පොඩි (&S)" #: wineconsole.rc:65 msgid "&Medium" @@ -14646,7 +14646,7 @@ msgstr "" #: wineconsole.rc:66 msgid "&Large" -msgstr "" +msgstr "ලොකු (&L)" #: wineconsole.rc:68 msgid "Command history" @@ -14690,7 +14690,7 @@ msgstr "" #: wineconsole.rc:90 msgid "&Color" -msgstr "" +msgstr "පාට (&C)" #: wineconsole.rc:101 msgid "Configuration" @@ -14702,11 +14702,11 @@ msgstr "" #: wineconsole.rc:105 msgid "&Width:" -msgstr "" +msgstr "පළල (&W):" #: wineconsole.rc:108 msgid "&Height:" -msgstr "" +msgstr "උස (&H):" #: wineconsole.rc:112 msgid "Window size" @@ -14714,11 +14714,11 @@ msgstr "" #: wineconsole.rc:113 msgid "W&idth:" -msgstr "" +msgstr "පළල (&I):" #: wineconsole.rc:116 msgid "H&eight:" -msgstr "" +msgstr "උස (&E):" #: wineconsole.rc:120 msgid "End of program" @@ -14861,7 +14861,7 @@ msgstr "" #: winedbg.rc:62 msgid "Show &Details" -msgstr "" +msgstr "විස්තර පෙන්නන්න (&D)" #: winedbg.rc:67 msgid "Program Error Details" @@ -14923,7 +14923,7 @@ msgstr "" #: winefile.rc:51 msgid "&Name" -msgstr "" +msgstr "නම (&N)" #: winefile.rc:52 msgid "&All File Details" @@ -15064,15 +15064,15 @@ msgstr "" #: winefile.rc:109 msgid "Creation date" -msgstr "" +msgstr "හදපු දිනය" #: winefile.rc:110 msgid "Access date" -msgstr "" +msgstr "පිවිසුම් දිනය" #: winefile.rc:111 msgid "Modification date" -msgstr "" +msgstr "වෙනස් කරපු දිනය" #: winefile.rc:112 msgid "Index/Inode" @@ -15088,7 +15088,7 @@ msgstr "" #: winemine.rc:40 msgid "&New\tF2" -msgstr "" +msgstr "අලුත් (&N)\tF2" #: winemine.rc:42 msgid "Question &Marks" @@ -15208,15 +15208,15 @@ msgstr "" #: winhlp32.rc:52 winhlp32.rc:72 msgid "Small" -msgstr "" +msgstr "පොඩි" #: winhlp32.rc:53 winhlp32.rc:73 msgid "Normal" -msgstr "" +msgstr "සාමාන" #: winhlp32.rc:54 winhlp32.rc:74 msgid "Large" -msgstr "" +msgstr "ලොකු" #: winhlp32.rc:58 msgid "&Help on help\tF1" @@ -15292,7 +15292,7 @@ msgstr "" #: wordpad.rc:31 msgid "&New...\tCtrl+N" -msgstr "" +msgstr "අලුත්... (&N)\tCtrl+N" #: wordpad.rc:45 msgid "R&edo\tCtrl+Y" @@ -15372,7 +15372,7 @@ msgstr "" #: wordpad.rc:88 msgid "Numbers" -msgstr "" +msgstr "නොම්බර" #: wordpad.rc:89 msgid "Letters - lower case" @@ -15440,11 +15440,11 @@ msgstr "" #: wordpad.rc:236 wordpad.rc:159 msgid "Left" -msgstr "" +msgstr "වම් පැත්ත" #: wordpad.rc:238 wordpad.rc:160 msgid "Right" -msgstr "" +msgstr "දකුණු පැත්ත" #: wordpad.rc:240 msgid "First line" @@ -15503,7 +15503,7 @@ msgstr "" #: wordpad.rc:286 msgctxt "accelerator Align Right" msgid "R" -msgstr "" +msgstr "R" #: wordpad.rc:293 msgctxt "accelerator Redo" @@ -15571,19 +15571,19 @@ msgstr "" #: wordpad.rc:174 msgid "Next page" -msgstr "" +msgstr "ඊළඟ පිටුව" #: wordpad.rc:175 msgid "Previous page" -msgstr "" +msgstr "කලින් පිටුව" #: wordpad.rc:176 msgid "Two pages" -msgstr "" +msgstr "පිටු දෙකක්" #: wordpad.rc:177 msgid "One page" -msgstr "" +msgstr "එක පිටුවක්" #: wordpad.rc:178 msgid "Zoom in" @@ -15595,11 +15595,11 @@ msgstr "" #: wordpad.rc:181 msgid "Page" -msgstr "" +msgstr "පිටුව" #: wordpad.rc:182 msgid "Pages" -msgstr "" +msgstr "පිටු" #: wordpad.rc:183 msgctxt "unit: centimeter"

1 0

Sebastian Lackner : appwiz.cpl: Copy addons to cache instead of moving.
by Alexandre Julliard Dec. 27, 2018

Dec. 27, 2018

Module: wine Branch: master Commit: 29e5f1d97804595639d1e9198c8c4288070da60b URL: https://source.winehq.org/git/wine.git/?a=commit;h=29e5f1d97804595639d1e919… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Dec 26 13:43:03 2018 -0600 appwiz.cpl: Copy addons to cache instead of moving. This leaves behind entries in wininet's own cache. That these are created in the first place is probably less than desirable, but that seems best addressed after code freeze. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46364 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index c34101f..79f667b 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -513,7 +513,7 @@ static HRESULT WINAPI InstallCallback_OnStopBinding(IBindStatusCallback *iface, cache_file_name = get_cache_file_name(TRUE); if(cache_file_name) { - MoveFileW(msi_file, cache_file_name); + CopyFileW(msi_file, cache_file_name, FALSE); heap_free(cache_file_name); } }else {

1 0

Józef Kucia : d3d8: Fix Reset() with system memory buffers.
by Alexandre Julliard Dec. 27, 2018

Dec. 27, 2018

Module: wine Branch: master Commit: bdccebcab40fdc3bb04c4d6cae8fd2dde1749691 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdccebcab40fdc3bb04c4d6c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 25 13:24:35 2018 +0100 d3d8: Fix Reset() with system memory buffers. Fixes a regression introduced by commit 75b7ff60562880b6e7b646a8fa84486670162d00. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 15 +++++++++++++++ dlls/d3d8/tests/device.c | 18 +++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 11ee0b2..b4d445d 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -826,6 +826,8 @@ static HRESULT WINAPI d3d8_device_CreateAdditionalSwapChain(IDirect3DDevice8 *if static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource) { + struct d3d8_vertexbuffer *vertex_buffer; + struct d3d8_indexbuffer *index_buffer; struct wined3d_resource_desc desc; IDirect3DBaseTexture8 *texture; struct d3d8_surface *surface; @@ -837,6 +839,19 @@ static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource) if (desc.resource_type != WINED3D_RTYPE_TEXTURE_2D) { + if (desc.bind_flags & WINED3D_BIND_VERTEX_BUFFER) + { + vertex_buffer = wined3d_resource_get_parent(resource); + if (vertex_buffer && vertex_buffer->draw_buffer) + return D3D_OK; + } + if (desc.bind_flags & WINED3D_BIND_INDEX_BUFFER) + { + index_buffer = wined3d_resource_get_parent(resource); + if (index_buffer && index_buffer->draw_buffer) + return D3D_OK; + } + WARN("Resource %p in pool D3DPOOL_DEFAULT blocks the Reset call.\n", resource); return D3DERR_DEVICELOST; } diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 49d2a98..adfeca8 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1312,6 +1312,8 @@ static void test_reset(void) D3DPRESENT_PARAMETERS d3dpp; IDirect3DSurface8 *surface; IDirect3DTexture8 *texture; + IDirect3DVertexBuffer8 *vb; + IDirect3DIndexBuffer8 *ib; UINT adapter_mode_count; D3DLOCKED_RECT lockrect; UINT mode_count = 0; @@ -1704,6 +1706,20 @@ static void test_reset(void) ok(SUCCEEDED(hr), "TestCooperativeLevel failed, hr %#x.\n", hr); IDirect3DTexture8_Release(texture); + hr = IDirect3DDevice8_CreateVertexBuffer(device1, 16, 0, + D3DFVF_XYZ, D3DPOOL_SYSTEMMEM, &vb); + ok(hr == D3D_OK, "Failed to create vertex buffer, hr %#x.\n", hr); + hr = IDirect3DDevice8_Reset(device1, &d3dpp); + ok(hr == D3D_OK, "Failed to reset device, hr %#x.\n", hr); + IDirect3DVertexBuffer8_Release(vb); + + hr = IDirect3DDevice8_CreateIndexBuffer(device1, 16, 0, + D3DFMT_INDEX16, D3DPOOL_SYSTEMMEM, &ib); + ok(hr == D3D_OK, "Failed to create index buffer, hr %#x.\n", hr); + hr = IDirect3DDevice8_Reset(device1, &d3dpp); + ok(hr == D3D_OK, "Failed to reset device, hr %#x.\n", hr); + IDirect3DIndexBuffer8_Release(ib); + /* The depth stencil should get reset to the auto depth stencil when present. */ hr = IDirect3DDevice8_SetRenderTarget(device1, NULL, NULL); ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); @@ -2878,7 +2894,7 @@ static void test_wndproc(void) && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight); - /* I have to minimize and restore the focus window, otherwise native d3d9 fails + /* I have to minimize and restore the focus window, otherwise native d3d8 fails * device::reset with D3DERR_DEVICELOST. This does not happen when the window * restore is triggered by the user. */ expect_messages = reactivate_messages;

1 0

Alexandre Julliard : winetest: Also check for file size overflow occurring between tests.
by Alexandre Julliard Dec. 27, 2018

Dec. 27, 2018

Module: tools Branch: master Commit: 5579470f18ba8ce4014d441916777660577f4159 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5579470f18ba8ce4014d441… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 27 13:06:20 2018 +0100 winetest: Also check for file size overflow occurring between tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 2 ++ 1 file changed, 2 insertions(+) diff --git a/winetest/dissect b/winetest/dissect index 24d5621..a468812 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -751,6 +751,8 @@ close_test_unit(1); close SUM or mydie "error writing to '$tmpdir/summary.txt': $!"; close IN; +mydie "report reached file size limit (runaway test?)" if -s $report >= $maxfilesize; + # # Generate the 'DLL version' section of the info box

1 0

Alexander Coffin : cmd/tests: Add some tests for "choice".
by Alexandre Julliard Dec. 26, 2018

Dec. 26, 2018

Module: wine Branch: master Commit: fc358a82750fbec482ddddee7191f2723b503435 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc358a82750fbec482ddddee… Author: Alexander Coffin <alexcoffin1999(a)gmail.com> Date: Tue Dec 18 19:25:01 2018 -0600 cmd/tests: Add some tests for "choice". Signed-off-by: Alexander Coffin <alexcoffin1999(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd | 42 ++++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 14 +++++++++++ 2 files changed, 56 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 79233d8..f4dfc9f 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -527,6 +527,48 @@ rmdir "fol;der" rmdir folder PATH=%PATH_BACKUP% +echo ------------ Testing 'choice' ------------ + +rem Windows XP and Windows 2000 do not come with choice +rem echo is used for @or_broken@ formatting +choice /C:ABC /M "Example message" /D A /T:0 +if %ERRORLEVEL% EQU 9009 ( + echo choice unavailable +) +echo %ERRORLEVEL% +choice /C ABC "/M:Example message" /D:B /T 0 +if %ERRORLEVEL% EQU 9009 ( + echo choice unavailable +) +echo %ERRORLEVEL% +choice /C def /D:f /T:0 +if %ERRORLEVEL% EQU 9009 ( + echo choice unavailable +) +echo %ERRORLEVEL% +REM If a pipe fails due to a nonexistent command +REM it will stop the whole program's execution +if %ERRORLEVEL% NEQ 9009 ( + echo Y | choice /C ABCXYZ /D A /T 2 +) +if %ERRORLEVEL% EQU 9009 ( + echo choice unavailable +) +echo %ERRORLEVEL% +choice /C ABC /N /D A /T 0 +if %ERRORLEVEL% EQU 9009 ( + echo choice unavailable +) +echo %ERRORLEVEL% +choice /C abcABC /CS /D:A /T:0 +if %ERRORLEVEL% EQU 9009 ( + echo choice unavailable +) +echo %ERRORLEVEL% +rem intentional error +choice /C abcABC /D:A /T:0 >NUL 2>NUL +echo %ERRORLEVEL% + echo ------------ Testing variable expansion ------------ call :setError 0 echo ~p0 should be path containing batch file diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 01ddc4d..d78d91a 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -479,6 +479,20 @@ foo I'm here!@space@ I'm here!@space@ I'm here!@space@ +------------ Testing 'choice' ------------ +(a)todo_wine@Example message [A,B,C]?A(a)or_broken@choice unavailable +(a)todo_wine@1(a)or_broken@9009 +(a)todo_wine@Example message [A,B,C]?B(a)or_broken@choice unavailable +(a)todo_wine@2(a)or_broken@9009 +(a)todo_wine@[D,E,F]?F(a)or_broken@choice unavailable +(a)todo_wine@3(a)or_broken@9009 +(a)todo_wine@[A,B,C,X,Y,Z]?Y(a)or_broken@choice unavailable +(a)todo_wine@5(a)or_broken@9009 +(a)todo_wine@A(a)or_broken@choice unavailable +(a)todo_wine@1(a)or_broken@9009 +(a)todo_wine@[a,b,c,A,B,C]?A(a)or_broken@choice unavailable +(a)todo_wine@4(a)or_broken@9009 +(a)todo_wine@255(a)or_broken@9009 ------------ Testing variable expansion ------------ ~p0 should be path containing batch file @path@

1 0

Mingcong Bai : po: Update Simplified Chinese translation.
by Alexandre Julliard Dec. 26, 2018

Dec. 26, 2018

Module: wine Branch: master Commit: ab445900dd1e7679c1d97fd59a0ad925819aaed2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab445900dd1e7679c1d97fd5… Author: Mingcong Bai <jeffbai(a)aosc.io> Date: Tue Dec 25 10:41:55 2018 +0800 po: Update Simplified Chinese translation. Signed-off-by: Mingcong Bai <jeffbai(a)aosc.io> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 420 +++++++++++++++++++++++++++++------------------------------- 1 file changed, 200 insertions(+), 220 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ab445900dd1e7679c1d9…

1 0

Isira Seneviratne : po: Add Sinhala translation.
by Alexandre Julliard Dec. 26, 2018

Dec. 26, 2018

Module: wine Branch: master Commit: 39b51d2b3d68535565af18c25aed51540f770b1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=39b51d2b3d68535565af18c2… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Sat Dec 22 05:17:16 2018 +0530 po: Add Sinhala translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/Makefile.in | 1 + po/si.po | 15769 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 15770 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=39b51d2b3d68535565af…

1 0

Sven Baars : quartz: Fix some memory leaks (Valgrind).
by Alexandre Julliard Dec. 26, 2018

Dec. 26, 2018

Module: wine Branch: master Commit: 889fe31483e05e162345e0d329e071761290a054 URL: https://source.winehq.org/git/wine.git/?a=commit;h=889fe31483e05e162345e0d3… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Dec 22 15:47:22 2018 +0100 quartz: Fix some memory leaks (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 6 +++--- dlls/quartz/filtergraph.c | 4 ++++ dlls/quartz/memallocator.c | 5 ++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index e5904dc..df444ae 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -493,7 +493,7 @@ static ULONG WINAPI AsyncReader_Release(IBaseFilter * iface) } CoTaskMemFree(This->pszFileName); if (This->pmt) - FreeMediaType(This->pmt); + DeleteMediaType(This->pmt); BaseFilter_Destroy(&This->filter); CoTaskMemFree(This); return 0; @@ -610,7 +610,7 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi { CoTaskMemFree(This->pszFileName); if (This->pmt) - FreeMediaType(This->pmt); + DeleteMediaType(This->pmt); This->pszFileName = CoTaskMemAlloc((strlenW(pszFileName) + 1) * sizeof(WCHAR)); strcpyW(This->pszFileName, pszFileName); @@ -650,7 +650,7 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi CoTaskMemFree(This->pszFileName); if (This->pmt) - FreeMediaType(This->pmt); + DeleteMediaType(This->pmt); This->pszFileName = NULL; This->pmt = NULL; diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 7abffa5..02707b4 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -687,6 +687,7 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, IBaseFilte IBaseFilter_SetSyncSource(pFilter, NULL); IBaseFilter_Release(pFilter); list_remove(&entry->entry); + CoTaskMemFree(entry->name); heap_free(entry); This->version++; /* Invalidate interfaces in the cache */ @@ -1801,6 +1802,9 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, LPCWSTR TRACE("MajorType %s\n", debugstr_guid(&mt.majortype)); TRACE("SubType %s\n", debugstr_guid(&mt.subtype)); + CoTaskMemFree(filename); + FreeMediaType(&mt); + if (ppFilter) *ppFilter = preader; IFileSourceFilter_Release(pfile); diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index f5ee3c2..477c63a 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -444,6 +444,9 @@ static HRESULT StdMediaSample2_Construct(BYTE * pbBuffer, LONG cbBuffer, IMemAll static void StdMediaSample2_Delete(StdMediaSample2 * This) { + if (This->props.pMediaType) + DeleteMediaType(This->props.pMediaType); + /* NOTE: does not remove itself from the list it belongs to */ CoTaskMemFree(This); } @@ -676,7 +679,7 @@ static HRESULT WINAPI StdMediaSample2_SetMediaType(IMediaSample2 * iface, AM_MED if (This->props.pMediaType) { - FreeMediaType(This->props.pMediaType); + DeleteMediaType(This->props.pMediaType); This->props.pMediaType = NULL; } if (!pMediaType)

1 0

Alexandre Julliard : wrc: Support more languages.
by Alexandre Julliard Dec. 24, 2018

Dec. 24, 2018

Module: wine Branch: master Commit: 395bef5200693bcd3cd0d4b17f3364a1493621d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=395bef5200693bcd3cd0d4b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 24 18:46:47 2018 +0100 wrc: Support more languages. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/po.c | 294 ++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 185 insertions(+), 109 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=395bef5200693bcd3cd0…

1 0

Alexandre Julliard : include: Add more language codes.
by Alexandre Julliard Dec. 24, 2018

Dec. 24, 2018

Module: wine Branch: master Commit: 75bf9d4ed2123b95711cf4a8f51c0f566dbe96f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75bf9d4ed2123b95711cf4a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 24 18:46:36 2018 +0100 include: Add more language codes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.rh | 44 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/include/winnt.rh b/include/winnt.rh index 5f07168..50aafb1 100644 --- a/include/winnt.rh +++ b/include/winnt.rh @@ -44,7 +44,8 @@ #define LANG_ARABIC 0x01 #define LANG_ARMENIAN 0x2b #define LANG_ASSAMESE 0x4d -#define LANG_AZERI 0x2c +#define LANG_AZERBAIJANI 0x2c +#define LANG_AZERI LANG_AZERBAIJANI #define LANG_BANGLA 0x45 #define LANG_BASHKIR 0x6d #define LANG_BASQUE 0x2d @@ -55,6 +56,8 @@ #define LANG_BRETON 0x7e #define LANG_BULGARIAN 0x02 #define LANG_CATALAN 0x03 +#define LANG_CENTRAL_KURDISH 0x92 +#define LANG_CHEROKEE 0x5c #define LANG_CHINESE 0x04 #define LANG_CHINESE_SIMPLIFIED 0x0004 #define LANG_CHINESE_TRADITIONAL 0x7c04 @@ -73,6 +76,7 @@ #define LANG_FINNISH 0x0b #define LANG_FRENCH 0x0c #define LANG_FRISIAN 0x62 +#define LANG_FULAH 0x67 #define LANG_GALICIAN 0x56 #define LANG_GEORGIAN 0x37 #define LANG_GERMAN 0x07 @@ -80,6 +84,7 @@ #define LANG_GREENLANDIC 0x6f #define LANG_GUJARATI 0x47 #define LANG_HAUSA 0x68 +#define LANG_HAWAIIAN 0x75 #define LANG_HEBREW 0x0d #define LANG_HINDI 0x39 #define LANG_HUNGARIAN 0x0e @@ -117,16 +122,19 @@ #define LANG_NEPALI 0x61 #define LANG_NORWEGIAN 0x14 #define LANG_OCCITAN 0x82 -#define LANG_ORIYA 0x48 +#define LANG_ODIA 0x48 +#define LANG_ORIYA LANG_ODIA #define LANG_PASHTO 0x63 #define LANG_PERSIAN 0x29 #define LANG_POLISH 0x15 #define LANG_PORTUGUESE 0x16 +#define LANG_PULAR LANG_FULAH #define LANG_PUNJABI 0x46 #define LANG_QUECHUA 0x6b #define LANG_ROMANIAN 0x18 #define LANG_ROMANSH 0x17 #define LANG_RUSSIAN 0x19 +#define LANG_SAKHA 0x85 #define LANG_SAMI 0x3b #define LANG_SANSKRIT 0x4f #define LANG_SCOTTISH_GAELIC 0x91 @@ -148,7 +156,8 @@ #define LANG_TELUGU 0x4a #define LANG_THAI 0x1e #define LANG_TIBETAN 0x51 -#define LANG_TIGRIGNA 0x73 +#define LANG_TIGRINYA 0x73 +#define LANG_TIGRIGNA LANG_TIGRINYA #define LANG_TSWANA 0x32 #define LANG_TURKISH 0x1f #define LANG_TURKMEN 0x42 @@ -157,11 +166,12 @@ #define LANG_UPPER_SORBIAN 0x2e #define LANG_URDU 0x20 #define LANG_UZBEK 0x43 +#define LANG_VALENCIAN LANG_CATALAN #define LANG_VIETNAMESE 0x2a #define LANG_WELSH 0x52 #define LANG_WOLOF 0x88 #define LANG_XHOSA 0x34 -#define LANG_YAKUT 0x85 +#define LANG_YAKUT LANG_SAKHA #define LANG_YI 0x78 #define LANG_YORUBA 0x6a #define LANG_ZULU 0x35 @@ -210,8 +220,10 @@ #define SUBLANG_ARABIC_QATAR 0x10 #define SUBLANG_ARMENIAN_ARMENIA 0x01 #define SUBLANG_ASSAMESE_INDIA 0x01 -#define SUBLANG_AZERI_LATIN 0x01 -#define SUBLANG_AZERI_CYRILLIC 0x02 +#define SUBLANG_AZERBAIJANI_AZERBAIJAN_LATIN 0x01 +#define SUBLANG_AZERBAIJANI_AZERBAIJAN_CYRILLIC 0x02 +#define SUBLANG_AZERI_LATIN SUBLANG_AZERBAIJANI_AZERBAIJAN_LATIN +#define SUBLANG_AZERI_CYRILLIC SUBLANG_AZERBAIJANI_AZERBAIJAN_CYRILLIC #define SUBLANG_BANGLA_BANGLADESH 0x02 #define SUBLANG_BANGLA_INDIA 0x01 #define SUBLANG_BASHKIR_RUSSIA 0x01 @@ -224,6 +236,8 @@ #define SUBLANG_BRETON_FRANCE 0x01 #define SUBLANG_BULGARIAN_BULGARIA 0x01 #define SUBLANG_CATALAN_CATALAN 0x01 +#define SUBLANG_CENTRAL_KURDISH_IRAQ 0x01 +#define SUBLANG_CHEROKEE_CHEROKEE 0x01 #define SUBLANG_CHINESE_TRADITIONAL 0x01 #define SUBLANG_CHINESE_SIMPLIFIED 0x02 #define SUBLANG_CHINESE_HONGKONG 0x03 @@ -265,6 +279,7 @@ #define SUBLANG_FRENCH_LUXEMBOURG 0x05 #define SUBLANG_FRENCH_MONACO 0x06 #define SUBLANG_FRISIAN_NETHERLANDS 0x01 +#define SUBLANG_FULAH_SENEGAL 0x02 #define SUBLANG_GALICIAN_GALICIAN 0x01 #define SUBLANG_GEORGIAN_GEORGIA 0x01 #define SUBLANG_GERMAN 0x01 @@ -276,6 +291,7 @@ #define SUBLANG_GREENLANDIC_GREENLAND 0x01 #define SUBLANG_GUJARATI_INDIA 0x01 #define SUBLANG_HAUSA_NIGERIA_LATIN 0x01 +#define SUBLANG_HAWAIIAN_US 0x01 #define SUBLANG_HEBREW_ISRAEL 0x01 #define SUBLANG_HINDI_INDIA 0x01 #define SUBLANG_HUNGARIAN_HUNGARY 0x01 @@ -319,19 +335,23 @@ #define SUBLANG_NORWEGIAN_BOKMAL 0x01 #define SUBLANG_NORWEGIAN_NYNORSK 0x02 #define SUBLANG_OCCITAN_FRANCE 0x01 -#define SUBLANG_ORIYA_INDIA 0x01 +#define SUBLANG_ODIA_INDIA 0x01 +#define SUBLANG_ORIYA_INDIA SUBLANG_ODIA_INDIA #define SUBLANG_PASHTO_AFGHANISTAN 0x01 #define SUBLANG_PERSIAN_IRAN 0x01 #define SUBLANG_POLISH_POLAND 0x01 #define SUBLANG_PORTUGUESE 0x02 #define SUBLANG_PORTUGUESE_BRAZILIAN 0x01 +#define SUBLANG_PULAR_SENEGAL SUBLANG_FULAH_SENEGAL #define SUBLANG_PUNJABI_INDIA 0x01 +#define SUBLANG_PUNJABI_PAKISTAN 0x02 #define SUBLANG_QUECHUA_BOLIVIA 0x01 #define SUBLANG_QUECHUA_ECUADOR 0x02 #define SUBLANG_QUECHUA_PERU 0x03 #define SUBLANG_ROMANIAN_ROMANIA 0x01 #define SUBLANG_ROMANSH_SWITZERLAND 0x01 #define SUBLANG_RUSSIAN_RUSSIA 0x01 +#define SUBLANG_SAKHA_RUSSIA 0x01 #define SUBLANG_SAMI_NORTHERN_NORWAY 0x01 #define SUBLANG_SAMI_NORTHERN_SWEDEN 0x02 #define SUBLANG_SAMI_NORTHERN_FINLAND 0x03 @@ -386,14 +406,19 @@ #define SUBLANG_SYRIAC_SYRIA 0x01 #define SUBLANG_TAJIK_TAJIKISTAN 0x01 #define SUBLANG_TAMAZIGHT_ALGERIA_LATIN 0x02 +#define SUBLANG_TAMAZIGHT_MOROCCO_TIFINAGH 0x04 #define SUBLANG_TAMIL_INDIA 0x01 +#define SUBLANG_TAMIL_SRI_LANKA 0x02 #define SUBLANG_TATAR_RUSSIA 0x01 #define SUBLANG_TELUGU_INDIA 0x01 #define SUBLANG_THAI_THAILAND 0x01 #define SUBLANG_TIBETAN_PRC 0x01 #define SUBLANG_TIBETAN_BHUTAN 0x02 -#define SUBLANG_TIGRIGNA_ERITREA 0x02 +#define SUBLANG_TIGRINYA_ERITREA 0x02 +#define SUBLANG_TIGRINYA_ETHIOPIA 0x01 +#define SUBLANG_TIGRIGNA_ERITREA SUBLANG_TIGRINYA_ERITREA #define SUBLANG_TSWANA_SOUTH_AFRICA 0x01 +#define SUBLANG_TSWANA_BOTSWANA 0x02 #define SUBLANG_TURKISH_TURKEY 0x01 #define SUBLANG_TURKMEN_TURKMENISTAN 0x01 #define SUBLANG_UIGHUR_PRC 0x01 @@ -403,11 +428,12 @@ #define SUBLANG_URDU_INDIA 0x02 #define SUBLANG_UZBEK_LATIN 0x01 #define SUBLANG_UZBEK_CYRILLIC 0x02 +#define SUBLANG_VALENCIAN_VALENCIA 0x02 #define SUBLANG_VIETNAMESE_VIETNAM 0x01 #define SUBLANG_WELSH_UNITED_KINGDOM 0x01 #define SUBLANG_WOLOF_SENEGAL 0x01 #define SUBLANG_XHOSA_SOUTH_AFRICA 0x01 -#define SUBLANG_YAKUT_RUSSIA 0x01 +#define SUBLANG_YAKUT_RUSSIA SUBLANG_SAKHA_RUSSIA #define SUBLANG_YI_PRC 0x01 #define SUBLANG_YORUBA_NIGERIA 0x01 #define SUBLANG_ZULU_SOUTH_AFRICA 0x01

1 0

Sven Baars : wsdapi/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard Dec. 24, 2018

Dec. 24, 2018

Module: wine Branch: master Commit: f3c8eb386f536fbae21d2d658c065d8c89f71b31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3c8eb386f536fbae21d2d65… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Dec 23 16:47:02 2018 +0100 wsdapi/tests: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/xml.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wsdapi/tests/xml.c b/dlls/wsdapi/tests/xml.c index 633124f..ab86d23 100644 --- a/dlls/wsdapi/tests/xml.c +++ b/dlls/wsdapi/tests/xml.c @@ -604,6 +604,7 @@ static void XMLContext_AddNameToNamespace_tests(void) /* Apparently wsdapi always leaves the namespace names array as empty */ ok(ns2->Names == NULL, "Names array is not empty\n"); ok(ns2->NamesCount == 0, "NamesCount is not 0 (value = %d)\n", ns2->NamesCount); + WSDFreeLinkedMemory(ns2); } IWSDXMLContext_Release(context);

1 0

André Hentschel : shlwapi: Remove dead code (coverity ).
by Alexandre Julliard Dec. 24, 2018

Dec. 24, 2018

Module: wine Branch: master Commit: 8868cff25731353304da5772656fff6ebfba1bc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8868cff25731353304da5772… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Dec 22 15:30:30 2018 +0100 shlwapi: Remove dead code (coverity). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/shlwapi_main.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/shlwapi/shlwapi_main.c b/dlls/shlwapi/shlwapi_main.c index 795bf55..fc1b6d6 100644 --- a/dlls/shlwapi/shlwapi_main.c +++ b/dlls/shlwapi/shlwapi_main.c @@ -61,9 +61,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) DisableThreadLibraryCalls(hinstDLL); shlwapi_hInstance = hinstDLL; break; - case DLL_PROCESS_DETACH: - if (fImpLoad) break; - break; } return TRUE; }

1 0

Zebediah Figura : ntoskrnl.exe: Avoid loading a driver multiple times in ZwLoadDriver().
by Alexandre Julliard Dec. 24, 2018

Dec. 24, 2018

Module: wine Branch: master Commit: e3ad1cff73851f0b16df310934f835988a8287fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3ad1cff73851f0b16df3109… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Dec 21 17:28:46 2018 -0600 ntoskrnl.exe: Avoid loading a driver multiple times in ZwLoadDriver(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45805 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 7 +++++++ dlls/ntoskrnl.exe/tests/driver.c | 3 +++ 2 files changed, 10 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index aea7d44..88ec372 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3519,6 +3519,13 @@ NTSTATUS WINAPI ZwLoadDriver( const UNICODE_STRING *service_name ) return STATUS_NO_MEMORY; } + if (wine_rb_get( &wine_drivers, &drv_name )) + { + TRACE( "driver %s already loaded\n", debugstr_us(&drv_name) ); + RtlFreeUnicodeString( &drv_name ); + return STATUS_IMAGE_ALREADY_LOADED; + } + set_service_status( service_handle, SERVICE_START_PENDING, 0 ); status = IoCreateDriver( &drv_name, init_driver ); diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 17e54cd..6ab5c3e 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -206,6 +206,9 @@ static void test_load_driver(void) ret = ZwLoadDriver(&name); ok(!ret, "got %#x\n", ret); + ret = ZwLoadDriver(&name); + ok(ret == STATUS_IMAGE_ALREADY_LOADED, "got %#x\n", ret); + ret = ZwUnloadDriver(&name); ok(!ret, "got %#x\n", ret); }

1 0

Nikolay Sivov : gdi32: Fix fontconfig objects leak (Valgrind).
by Alexandre Julliard Dec. 24, 2018

Dec. 24, 2018

Module: wine Branch: master Commit: dfcd8f85f1e1c2eb5439450c0ac9611fc5634b67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfcd8f85f1e1c2eb5439450c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 22 11:35:33 2018 +0300 gdi32: Fix fontconfig objects leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9f6bdfe..c38108e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5279,8 +5279,8 @@ found: TRACE("got %s\n", wine_dbgstr_w(nameW)); end: - if (!pat) pFcPatternDestroy(pat); - if (!best) pFcPatternDestroy(best); + pFcPatternDestroy(pat); + pFcPatternDestroy(best); return family; } #endif

1 0

André Hentschel : ntdll: Use correct PC for instruction decoding on ARM64.
by Alexandre Julliard Dec. 24, 2018

Dec. 24, 2018

Module: wine Branch: master Commit: 1b5b311cce908e33a5b1b11d5eb659e99c92c2f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b5b311cce908e33a5b1b11d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Dec 21 20:07:48 2018 +0100 ntdll: Use correct PC for instruction decoding on ARM64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46194 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index c976884..e195889 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -611,9 +611,9 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f return STATUS_SUCCESS; } -static inline DWORD is_write_fault( ucontext_t *context ) +static inline DWORD is_write_fault( DWORD *pc ) { - DWORD inst = *(DWORD *)PC_sig(context); + DWORD inst = *pc; if ((inst & 0xbfff0000) == 0x0c000000 /* C3.3.1 */ || (inst & 0xbfe00000) == 0x0c800000 /* C3.3.2 */ || (inst & 0xbfdf0000) == 0x0d000000 /* C3.3.3 */ || @@ -637,6 +637,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) { EXCEPTION_RECORD *rec; ucontext_t *context = ucontext; + DWORD *orig_pc = PC_sig(context); /* check for page fault inside the thread stack */ if (signal == SIGSEGV && @@ -664,7 +665,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) case SIGSEGV: /* Segmentation fault */ rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; rec->NumberParameters = 2; - rec->ExceptionInformation[0] = is_write_fault(context); + rec->ExceptionInformation[0] = is_write_fault(orig_pc); rec->ExceptionInformation[1] = (ULONG_PTR)info->si_addr; break; case SIGBUS: /* Alignment check exception */

1 0

Zebediah Figura : ntoskrnl.exe: Handle already-loaded drivers in handle_bus_relations().
by Alexandre Julliard Dec. 24, 2018

Dec. 24, 2018

Module: wine Branch: master Commit: d498780294c635f67aee823bc030151a6b75bee4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d498780294c635f67aee823b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Dec 21 17:28:47 2018 -0600 ntoskrnl.exe: Handle already-loaded drivers in handle_bus_relations(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 88ec372..48b309f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3756,7 +3756,10 @@ static void handle_bus_relations( DEVICE_OBJECT *device ) strcpyW( buffer, servicesW ); strcatW( buffer, driver ); RtlInitUnicodeString( &string, buffer ); - if (ZwLoadDriver( &string ) != STATUS_SUCCESS) + status = ZwLoadDriver( &string ); + if (status == STATUS_IMAGE_ALREADY_LOADED) + return; + else if (status != STATUS_SUCCESS) { ERR_(plugplay)( "Failed to load driver %s\n", debugstr_w(driver) ); return;

1 0

Alexandre Julliard : wmc: Support more languages.
by Alexandre Julliard Dec. 24, 2018

Dec. 24, 2018

Module: wine Branch: master Commit: d209055e916c6fd8e1e4b79cd364303db285c13f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d209055e916c6fd8e1e4b79c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 24 19:31:08 2018 +0100 wmc: Support more languages. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/po.c | 294 ++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 185 insertions(+), 109 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d209055e916c6fd8e1e4…

1 0

Alexandre Julliard : Wine release 4.0-rc3
by Alexandre Julliard Dec. 21, 2018

Dec. 21, 2018

Module: website Branch: master Commit: 0f830b8f4439567faa83082e37a9135b9429b33e URL: https://source.winehq.org/git/website.git/?a=commit;h=0f830b8f4439567faa830… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 21 18:44:25 2018 +0100 Wine release 4.0-rc3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018122101.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2018122101.xml b/news/en/2018122101.xml new file mode 100644 index 0000000..7d71fc1 --- /dev/null +++ b/news/en/2018122101.xml @@ -0,0 +1,12 @@ +<news> +<date>December 21, 2018</date> +<title>Wine 4.0-rc3 Released</title> +<body> + The Wine development release 4.0-rc3 is now available. + <a href="{$root}/announce/4.0-rc3">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-rc3.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

Tag wine-4.0-rc3 : Alexandre Julliard : Release 4.0-rc3
by Alexandre Julliard Dec. 21, 2018

Dec. 21, 2018

Module: wine Branch: refs/tags/wine-4.0-rc3 Tag: 251d70e7d17db5b1aba16d48a52710e51faf22b8 URL: https://source.winehq.org/git/wine.git/?a=tag;h=251d70e7d17db5b1aba16d48a52… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 21 18:42:31 2018 +0100 Release 4.0-rc3

1 0

Alexandre Julliard : makefiles: Add support for sharing resource files with parent dll.
by Alexandre Julliard Dec. 21, 2018

Dec. 21, 2018

Module: wine Branch: master Commit: 00c57ad89a225b840225f83e34d98c9688516944 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00c57ad89a225b840225f83e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 21 10:49:17 2018 +0100 makefiles: Add support for sharing resource files with parent dll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/Makefile.in | 1 + tools/make_makefiles | 1 + tools/makedep.c | 5 ++++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dinput8/Makefile.in b/dlls/dinput8/Makefile.in index 53cd0c3..0ede9f0 100644 --- a/dlls/dinput8/Makefile.in +++ b/dlls/dinput8/Makefile.in @@ -21,4 +21,5 @@ C_SRCS = \ IDL_SRCS = dinput8.idl RC_SRCS = \ + dinput.rc \ version.rc diff --git a/tools/make_makefiles b/tools/make_makefiles index d1fe7f5..455ff9e 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -404,6 +404,7 @@ sub assign_sources_to_makefiles(@) my $parent = get_parent_makefile( $file ); next unless $parent; preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "C_SRCS" ); + preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "RC_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "IDL_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "LEX_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "BISON_SRCS" ); diff --git a/tools/makedep.c b/tools/makedep.c index 6b631b6..532ef52 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -89,6 +89,7 @@ struct incl_file #define FLAG_GENERATED 0x000001 /* generated file */ #define FLAG_INSTALL 0x000002 /* file to install */ +#define FLAG_PARENTDIR 0x000004 /* file comes from parent dir */ #define FLAG_IDL_PROXY 0x000100 /* generates a proxy (_p.c) file */ #define FLAG_IDL_CLIENT 0x000200 /* generates a client (_c.c) file */ #define FLAG_IDL_SERVER 0x000400 /* generates a server (_s.c) file */ @@ -1351,6 +1352,7 @@ static struct file *open_local_file( const struct makefile *make, const char *pa path = strmake( "%s/%s", make->parent_dir, path ); src_path = root_dir_path( base_dir_path( make, path )); ret = load_file( src_path ); + if (ret) ret->flags |= FLAG_PARENTDIR; } if (ret) *filename = src_dir_path( make, path ); @@ -2447,6 +2449,7 @@ static void output_po_files( const struct makefile *make ) LIST_FOR_EACH_ENTRY( source, &submake->sources, struct incl_file, entry ) { + if (source->file->flags & FLAG_PARENTDIR) continue; if (strendswith( source->name, ".rc" ) && (source->file->flags & FLAG_RC_PO)) { char *pot_file = replace_extension( source->name, ".rc", ".pot" ); @@ -2567,7 +2570,7 @@ static void output_source_rc( struct makefile *make, struct incl_file *source, c output_filename( source->filename ); output( "\n" ); } - if (source->file->flags & FLAG_RC_PO) + if (source->file->flags & FLAG_RC_PO && !(source->file->flags & FLAG_PARENTDIR)) { strarray_add( &make->clean_files, strmake( "%s.pot", obj )); output( "%s.pot: %s\n", obj_dir_path( make, obj ), source->filename );

1 0

Sven Baars : propsys/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard Dec. 21, 2018

Dec. 21, 2018

Module: wine Branch: master Commit: 61a1dae39885d20de1da321ff742697e7634f0fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=61a1dae39885d20de1da321f… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Dec 20 21:18:29 2018 +0100 propsys/tests: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/tests/propstore.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/propsys/tests/propstore.c b/dlls/propsys/tests/propstore.c index 01500dd..3fe8613 100644 --- a/dlls/propsys/tests/propstore.c +++ b/dlls/propsys/tests/propstore.c @@ -214,6 +214,7 @@ static void test_persistserialized(void) if (FAILED(hr)) { + IPropertyStore_Release(propstore); skip("IPersistSerializedPropStorage not supported\n"); return; }

1 0

Alexandre Julliard : Release 4.0-rc3.
by Alexandre Julliard Dec. 21, 2018

Dec. 21, 2018

Module: wine Branch: master Commit: 2d16e6e59c910ba0a5e7c1c104b290731a8f1ffa URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d16e6e59c910ba0a5e7c1c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 21 18:42:31 2018 +0100 Release 4.0-rc3. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 221 +++++++++++++++++++++++++++++++++++--------------------------- VERSION | 2 +- configure | 18 ++--- 3 files changed, 136 insertions(+), 105 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2d16e6e59c910ba0a5e7…

1 0

Andrey Gusev : windowscodecs: Remove redundant comparison.
by Alexandre Julliard Dec. 21, 2018

Dec. 21, 2018

Module: wine Branch: master Commit: af8d3d366ca7cd98b00e5e1462663cb8f206f9dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=af8d3d366ca7cd98b00e5e14… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Dec 12 16:04:36 2018 +0200 windowscodecs: Remove redundant comparison. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/imgfactory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 40f3ed5..e7c61cf 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -507,7 +507,7 @@ static HRESULT create_bitmap_from_source_rect(IWICBitmapSource *piBitmapSource, IWICPixelFormatInfo2 *formatinfo; WICPixelFormatNumericRepresentation format_type; - assert(!rect || (rect && option == WICBitmapCacheOnLoad)); + assert(!rect || option == WICBitmapCacheOnLoad); if (!piBitmapSource || !ppIBitmap) return E_INVALIDARG;

1 0

Alistair Leslie-Hughes : include: Wrap exported function in extern C.
by Alexandre Julliard Dec. 21, 2018

Dec. 21, 2018

Module: wine Branch: master Commit: 0805783df313ed9fef2e4588811fd5f90a3507f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0805783df313ed9fef2e4588… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Dec 21 00:24:21 2018 +0000 include: Wrap exported function in extern C. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfapi.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/mfapi.h b/include/mfapi.h index 4697f50..b0d8e43 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -23,6 +23,10 @@ #include <mmreg.h> #include <avrt.h> +#if defined(__cplusplus) +extern "C" { +#endif + #if !defined(MF_VERSION) /* Default to Windows XP */ #define MF_SDK_VERSION 0x0001 @@ -95,4 +99,8 @@ HRESULT WINAPI MFTUnregister(CLSID clsid); HRESULT WINAPI MFTUnregisterLocal(IClassFactory *factory); HRESULT WINAPI MFGetPluginControl(IMFPluginControl**); +#if defined(__cplusplus) +} +#endif + #endif /* __WINE_MFAPI_H */

1 0

Piotr Caban : msvcrt: Use _timezone in _ftime64.
by Alexandre Julliard Dec. 21, 2018

Dec. 21, 2018

Module: wine Branch: master Commit: b8bafa2c58f69043debe9c7a962eb5f04dee0ca5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8bafa2c58f69043debe9c7a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 21 12:44:26 2018 +0100 msvcrt: Use _timezone in _ftime64. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 861b2ed..1fee0a9 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -769,17 +769,16 @@ void CDECL MSVCRT__ftime64(struct MSVCRT___timeb64 *buf) FILETIME ft; ULONGLONG time; - DWORD tzid = GetTimeZoneInformation(&tzinfo); + _tzset_init(); + GetSystemTimeAsFileTime(&ft); time = ((ULONGLONG)ft.dwHighDateTime << 32) | ft.dwLowDateTime; buf->time = time / TICKSPERSEC - SECS_1601_TO_1970; buf->millitm = (time % TICKSPERSEC) / TICKSPERMSEC; - buf->timezone = tzinfo.Bias + - ( tzid == TIME_ZONE_ID_STANDARD ? tzinfo.StandardBias : - ( tzid == TIME_ZONE_ID_DAYLIGHT ? tzinfo.DaylightBias : 0 )); - buf->dstflag = (tzid == TIME_ZONE_ID_DAYLIGHT?1:0); + buf->timezone = MSVCRT___timezone / 60; + buf->dstflag = GetTimeZoneInformation(&tzinfo) == TIME_ZONE_ID_DAYLIGHT; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Use GetDaylightFlag() to set dstflag value in _ftime64.
by Alexandre Julliard Dec. 21, 2018

Dec. 21, 2018

Module: wine Branch: master Commit: 2efc73b96811330be34ef81ff9e35054bcbb5679 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2efc73b96811330be34ef81f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 21 12:44:39 2018 +0100 msvcrt: Use GetDaylightFlag() to set dstflag value in _ftime64. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 1fee0a9..14f4ba0 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -36,6 +36,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); +BOOL WINAPI GetDaylightFlag(void); + static const int MonthLengths[2][12] = { { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }, @@ -765,7 +767,6 @@ double CDECL MSVCRT_difftime(MSVCRT___time32_t time1, MSVCRT___time32_t time2) */ void CDECL MSVCRT__ftime64(struct MSVCRT___timeb64 *buf) { - TIME_ZONE_INFORMATION tzinfo; FILETIME ft; ULONGLONG time; @@ -778,7 +779,7 @@ void CDECL MSVCRT__ftime64(struct MSVCRT___timeb64 *buf) buf->time = time / TICKSPERSEC - SECS_1601_TO_1970; buf->millitm = (time % TICKSPERSEC) / TICKSPERMSEC; buf->timezone = MSVCRT___timezone / 60; - buf->dstflag = GetTimeZoneInformation(&tzinfo) == TIME_ZONE_ID_DAYLIGHT; + buf->dstflag = GetDaylightFlag(); } /*********************************************************************

1 0

Paul Gofman : d3d8: Fix crash in d3d8_indexbuffer_Release().
by Alexandre Julliard Dec. 20, 2018

Dec. 20, 2018

Module: wine Branch: master Commit: f6896e062d30d6d5d6d94a34e3a622c83aa9d3f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6896e062d30d6d5d6d94a34… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Dec 18 19:57:25 2018 +0300 d3d8: Fix crash in d3d8_indexbuffer_Release(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 887ecf4..3b98000 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -395,12 +395,13 @@ static ULONG WINAPI d3d8_indexbuffer_Release(IDirect3DIndexBuffer8 *iface) if (!refcount) { + struct wined3d_buffer *draw_buffer = buffer->draw_buffer; IDirect3DDevice8 *device = buffer->parent_device; wined3d_mutex_lock(); wined3d_buffer_decref(buffer->wined3d_buffer); - if (buffer->draw_buffer) - wined3d_buffer_decref(buffer->draw_buffer); + if (draw_buffer) + wined3d_buffer_decref(draw_buffer); wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */

1 0

Paul Gofman : d3d9: Fix crash in d3d9_indexbuffer_Release().
by Alexandre Julliard Dec. 20, 2018

Dec. 20, 2018

Module: wine Branch: master Commit: a878b0fae82962da017c56fdde564d15b8b4d4c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a878b0fae82962da017c56fd… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Dec 18 19:57:23 2018 +0300 d3d9: Fix crash in d3d9_indexbuffer_Release(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 7e178f2..840d7e9 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -402,12 +402,13 @@ static ULONG WINAPI d3d9_indexbuffer_Release(IDirect3DIndexBuffer9 *iface) if (!refcount) { + struct wined3d_buffer *draw_buffer = buffer->draw_buffer; IDirect3DDevice9Ex *device = buffer->parent_device; wined3d_mutex_lock(); wined3d_buffer_decref(buffer->wined3d_buffer); - if (buffer->draw_buffer) - wined3d_buffer_decref(buffer->draw_buffer); + if (draw_buffer) + wined3d_buffer_decref(draw_buffer); wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */

1 0

Paul Gofman : d3d9: Fix crash in d3d9_vertexbuffer_Release().
by Alexandre Julliard Dec. 20, 2018

Dec. 20, 2018

Module: wine Branch: master Commit: e6c6be1cf75db1cf58f39d170ab6a7f3d7bc5663 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6c6be1cf75db1cf58f39d17… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Dec 18 19:57:22 2018 +0300 d3d9: Fix crash in d3d9_vertexbuffer_Release(). If there is no draw buffer then buffer pointer gets freed in wined3d_buffer_decref() via d3d9_vertexbuffer_wined3d_parent_ops and consequent check for buffer->draw_buffer results in freed memory access. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 1533a84..7e178f2 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -76,12 +76,13 @@ static ULONG WINAPI d3d9_vertexbuffer_Release(IDirect3DVertexBuffer9 *iface) if (!refcount) { + struct wined3d_buffer *draw_buffer = buffer->draw_buffer; IDirect3DDevice9Ex *device = buffer->parent_device; wined3d_mutex_lock(); wined3d_buffer_decref(buffer->wined3d_buffer); - if (buffer->draw_buffer) - wined3d_buffer_decref(buffer->draw_buffer); + if (draw_buffer) + wined3d_buffer_decref(draw_buffer); wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */

1 0

Paul Gofman : d3d8: Fix crash in d3d8_vertexbuffer_Release().
by Alexandre Julliard Dec. 20, 2018

Dec. 20, 2018

Module: wine Branch: master Commit: 90bd6dc3eedda2c65308258ca49056d006fae222 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90bd6dc3eedda2c65308258c… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Dec 18 19:57:24 2018 +0300 d3d8: Fix crash in d3d8_vertexbuffer_Release(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 58aaff2..887ecf4 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -74,12 +74,13 @@ static ULONG WINAPI d3d8_vertexbuffer_Release(IDirect3DVertexBuffer8 *iface) if (!refcount) { + struct wined3d_buffer *draw_buffer = buffer->draw_buffer; IDirect3DDevice8 *device = buffer->parent_device; wined3d_mutex_lock(); wined3d_buffer_decref(buffer->wined3d_buffer); - if (buffer->draw_buffer) - wined3d_buffer_decref(buffer->draw_buffer); + if (draw_buffer) + wined3d_buffer_decref(draw_buffer); wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */

1 0

Alexandre Julliard : oleaut32: Fix rendering of monochrome icons.
by Alexandre Julliard Dec. 20, 2018

Dec. 20, 2018

Module: wine Branch: master Commit: cc743f8e6cee1ddfbda5a008c906d32277146733 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc743f8e6cee1ddfbda5a008… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 20 18:33:17 2018 +0100 oleaut32: Fix rendering of monochrome icons. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46308 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/olepicture.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 03fd6cf..cee9a7f 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -614,7 +614,6 @@ static void render_masked_bitmap(OLEPictureImpl *This, HDC hdc, LONG x, LONG y, LONG cx, LONG cy, OLE_XPOS_HIMETRIC xSrc, OLE_YPOS_HIMETRIC ySrc, OLE_XSIZE_HIMETRIC cxSrc, OLE_YSIZE_HIMETRIC cySrc, HBITMAP hbmMask, HBITMAP hbmXor) { - HBITMAP hbmpOld; HDC hdcBmp; /* Set a mapping mode that maps bitmap pixels into HIMETRIC units. @@ -630,32 +629,26 @@ static void render_masked_bitmap(OLEPictureImpl *This, HDC hdc, if (hbmMask) { - HDC hdcMask = CreateCompatibleDC(0); - HBITMAP hOldbm = SelectObject(hdcMask, hbmMask); - - hbmpOld = SelectObject(hdcBmp, hbmXor); - - SetMapMode(hdcMask, MM_ANISOTROPIC); - SetWindowOrgEx(hdcMask, 0, 0, NULL); - SetWindowExtEx(hdcMask, This->himetricWidth, This->himetricHeight, NULL); - SetViewportOrgEx(hdcMask, 0, This->origHeight, NULL); - SetViewportExtEx(hdcMask, This->origWidth, -This->origHeight, NULL); - SetBkColor(hdc, RGB(255, 255, 255)); SetTextColor(hdc, RGB(0, 0, 0)); - StretchBlt(hdc, x, y, cx, cy, hdcMask, xSrc, ySrc, cxSrc, cySrc, SRCAND); - StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCPAINT); - SelectObject(hdcMask, hOldbm); - DeleteDC(hdcMask); + SelectObject(hdcBmp, hbmMask); + StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCAND); + + if (hbmXor) + { + SelectObject(hdcBmp, hbmXor); + StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCPAINT); + } + else StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc - This->himetricHeight, + cxSrc, cySrc, SRCPAINT); } else { - hbmpOld = SelectObject(hdcBmp, hbmXor); + SelectObject(hdcBmp, hbmXor); StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCCOPY); } - SelectObject(hdcBmp, hbmpOld); DeleteDC(hdcBmp); }

1 0

Serge Gautherie : d3dcompiler: Fix dxbc_init() function prototype.
by Alexandre Julliard Dec. 20, 2018

Dec. 20, 2018

Module: wine Branch: master Commit: ffe9346120ca74f193d8a31d0b6a48eb55604d2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffe9346120ca74f193d8a31d… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Wed Dec 19 23:06:46 2018 +0100 d3dcompiler: Fix dxbc_init() function prototype. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 +- dlls/d3dcompiler_43/utils.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 1eea0d2..68ff962 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -1214,7 +1214,7 @@ HRESULT dxbc_write_blob(struct dxbc *dxbc, ID3DBlob **blob) DECLSPEC_HIDDEN; void dxbc_destroy(struct dxbc *dxbc) DECLSPEC_HIDDEN; HRESULT dxbc_parse(const char *data, SIZE_T data_size, struct dxbc *dxbc) DECLSPEC_HIDDEN; HRESULT dxbc_add_section(struct dxbc *dxbc, DWORD tag, const char *data, DWORD data_size) DECLSPEC_HIDDEN; -HRESULT dxbc_init(struct dxbc *dxbc, DWORD count) DECLSPEC_HIDDEN; +HRESULT dxbc_init(struct dxbc *dxbc, unsigned int size) DECLSPEC_HIDDEN; static inline void read_dword(const char **ptr, DWORD *d) { diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index b872e34..95a1dbd 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -557,7 +557,7 @@ HRESULT dxbc_add_section(struct dxbc *dxbc, DWORD tag, const char *data, DWORD d return S_OK; } -HRESULT dxbc_init(struct dxbc *dxbc, UINT size) +HRESULT dxbc_init(struct dxbc *dxbc, unsigned int size) { TRACE("dxbc %p, size %u.\n", dxbc, size);

1 0

Nikolay Sivov : urlmon/tests: Release correct uri object (Coverity).
by Alexandre Julliard Dec. 20, 2018

Dec. 20, 2018

Module: wine Branch: master Commit: f8bf719482d08488d43a00dbada9f63527394818 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8bf719482d08488d43a00db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 3 10:53:48 2018 +0300 urlmon/tests: Release correct uri object (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/uri.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index b62f247..9069a9c 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -10529,7 +10529,7 @@ static void test_IUriBuilderFactory(void) { ok(hr == S_OK, "Error: GetIUri return 0x%08x, expected 0x%08x.\n", hr, S_OK); ok(tmp == uri, "Error: Expected tmp to be %p, but was %p.\n", uri, tmp); - if(uri) IUri_Release(uri); + if(tmp) IUri_Release(tmp); } if(builder) IUriBuilder_Release(builder); }

1 0

Nikolay Sivov : urlmon/tests: Fix some leaks (Valgrind).
by Alexandre Julliard Dec. 20, 2018

Dec. 20, 2018

Module: wine Branch: master Commit: f19fdad2ba18c6e2c2c30c10b1bfb61442377a7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f19fdad2ba18c6e2c2c30c10… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 17 08:16:09 2018 +0300 urlmon/tests: Fix some leaks (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban<jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/uri.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 3c5e27c..b62f247 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -8366,6 +8366,7 @@ static void test_IUri_GetPropertyLength(void) { /* Value may be unicode encoded */ expectedValueW = a2w(prop.value); expectedLen = lstrlenW(expectedValueW); + heap_free(expectedValueW); /* This won't be necessary once GetPropertyLength is implemented. */ receivedLen = -1; @@ -11538,6 +11539,7 @@ static void test_IPersistStream(void) ok(hr == S_OK, "%d) Error creating uninitialized Uri: 0x%08x.\n", i, hr); hr = IUri_QueryInterface(uri, &IID_IMarshal, (void**)&marshal); ok(hr == S_OK, "%d) QueryInterface failed 0x%08x, expected S_OK.\n", i, hr); + IUri_Release(uri); hr = IMarshal_UnmarshalInterface(marshal, stream, &IID_IUri, (void**)&uri); ok(hr == S_OK, "%d) UnmarshalInterface failed 0x%08x, expected S_OK.\n", i, hr); hr = IUri_GetRawUri(uri, &raw_uri);

1 0

Huw Davies : gdi32: Try to update the default families with fonts that exist.
by Alexandre Julliard Dec. 20, 2018

Dec. 20, 2018

Module: wine Branch: master Commit: f59755755e90220ccb27db56e169401f509bb227 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f59755755e90220ccb27db56… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 20 10:32:14 2018 +0000 gdi32: Try to update the default families with fonts that exist. Based on a patch by Akihiro Sagawa. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46285 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46244 Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ebecf79..9f6bdfe 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -482,10 +482,6 @@ static inline struct freetype_physdev *get_freetype_dev( PHYSDEV dev ) static const struct gdi_dc_funcs freetype_funcs; -static const WCHAR defSerif[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n','\0'}; -static const WCHAR defSans[] = {'A','r','i','a','l','\0'}; -static const WCHAR defFixed[] = {'C','o','u','r','i','e','r',' ','N','e','w','\0'}; - static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\0'}; static const WCHAR win9x_font_reg_key[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s','\\', @@ -557,6 +553,10 @@ static const WCHAR *default_sans_list[] = NULL }; +static const WCHAR *default_serif = times_new_roman; +static const WCHAR *default_fixed = courier_new; +static const WCHAR *default_sans = arial; + typedef struct { WCHAR *name; INT charset; @@ -4341,22 +4341,24 @@ static BOOL move_to_front(const WCHAR *name) return FALSE; } -static BOOL set_default(const WCHAR **name_list) +static const WCHAR *set_default(const WCHAR **name_list) { - while (*name_list) + const WCHAR **entry = name_list; + + while (*entry) { - if (move_to_front(*name_list)) return TRUE; - name_list++; + if (move_to_front(*entry)) return *entry; + entry++; } - return FALSE; + return *name_list; } static void reorder_font_list(void) { - set_default( default_serif_list ); - set_default( default_fixed_list ); - set_default( default_sans_list ); + default_serif = set_default( default_serif_list ); + default_fixed = set_default( default_fixed_list ); + default_sans = set_default( default_sans_list ); } /************************************************************* @@ -5649,13 +5651,13 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) if((lf.lfPitchAndFamily & FIXED_PITCH) || (lf.lfPitchAndFamily & 0xF0) == FF_MODERN) - strcpyW(lf.lfFaceName, defFixed); + strcpyW(lf.lfFaceName, default_fixed); else if((lf.lfPitchAndFamily & 0xF0) == FF_ROMAN) - strcpyW(lf.lfFaceName, defSerif); + strcpyW(lf.lfFaceName, default_serif); else if((lf.lfPitchAndFamily & 0xF0) == FF_SWISS) - strcpyW(lf.lfFaceName, defSans); + strcpyW(lf.lfFaceName, default_sans); else - strcpyW(lf.lfFaceName, defSans); + strcpyW(lf.lfFaceName, default_sans); LIST_FOR_EACH_ENTRY( family, &font_list, Family, entry ) { if(!strncmpiW(family->FamilyName, lf.lfFaceName, LF_FACESIZE - 1)) { font_link = find_font_link(family->FamilyName);

1 0

Daniel Lehman : gdi32: Fix memory leak (Valgrind).
by Alexandre Julliard Dec. 20, 2018

Dec. 20, 2018

Module: wine Branch: master Commit: 3b8fde3f0840af271cd0c1db4501e4e8261c05a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b8fde3f0840af271cd0c1db… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Dec 19 21:35:05 2018 -0800 gdi32: Fix memory leak (Valgrind). Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/bitblt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 0acb23f..a84be82 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -1035,6 +1035,7 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, &dc->brush_org, rop ); free_clipped_rects( &clipped_rects ); } + free_dib_info( &src_dib ); if (tmp_rgn) DeleteObject( tmp_rgn ); return ret;

1 0

Zebediah Figura : dinput8: Include common resources from dinput.
by Alexandre Julliard Dec. 20, 2018

Dec. 20, 2018

Module: wine Branch: master Commit: feb23d367f7b3d457053b8f48237e6abe9ef9231 URL: https://source.winehq.org/git/wine.git/?a=commit;h=feb23d367f7b3d457053b8f4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Dec 19 15:41:12 2018 -0600 dinput8: Include common resources from dinput. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dinput8/Makefile.in b/dlls/dinput8/Makefile.in index 6b62969..53cd0c3 100644 --- a/dlls/dinput8/Makefile.in +++ b/dlls/dinput8/Makefile.in @@ -20,4 +20,5 @@ C_SRCS = \ IDL_SRCS = dinput8.idl -RC_SRCS = version.rc +RC_SRCS = \ + version.rc

1 0

Zhiyi Zhang : vulkan-1/tests: Add tests for vkGetPhysicalDeviceProperties2.
by Alexandre Julliard Dec. 20, 2018

Dec. 20, 2018

Module: wine Branch: master Commit: ee61493d9c3b253a9aebd5bae33ef8f32c7e77fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee61493d9c3b253a9aebd5ba… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Dec 19 23:15:12 2018 +0100 vulkan-1/tests: Add tests for vkGetPhysicalDeviceProperties2. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/tests/vulkan.c | 64 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 4143af7..9a93e2a 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -158,6 +158,69 @@ static void enumerate_physical_device(VkPhysicalDevice vk_physical_device) VK_VERSION_PATCH(properties.apiVersion)); } +static void test_enumerate_physical_device2(void) +{ + static const char *procs[] = {"vkGetPhysicalDeviceProperties2", "vkGetPhysicalDeviceProperties2KHR"}; + static const char *extensions[] = {VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME}; + PFN_vkGetPhysicalDeviceProperties2 pfn_vkGetPhysicalDeviceProperties2; + VkPhysicalDeviceProperties2 properties2; + VkPhysicalDevice *vk_physical_devices; + VkPhysicalDeviceIDProperties id; + VkInstance vk_instance; + unsigned int i, j; + const LUID *luid; + uint32_t count; + VkResult vr; + + if ((vr = create_instance_skip(ARRAY_SIZE(extensions), extensions, &vk_instance)) < 0) + return; + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + vr = vkEnumeratePhysicalDevices(vk_instance, &count, NULL); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + if (!count) + { + skip("No physical devices.\n"); + vkDestroyInstance(vk_instance, NULL); + return; + } + + vk_physical_devices = heap_calloc(count, sizeof(*vk_physical_devices)); + ok(!!vk_physical_devices, "Failed to allocate memory.\n"); + vr = vkEnumeratePhysicalDevices(vk_instance, &count, vk_physical_devices); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + for (i = 0; i < ARRAY_SIZE(procs); ++i) + { + pfn_vkGetPhysicalDeviceProperties2 + = (PFN_vkGetPhysicalDeviceProperties2)vkGetInstanceProcAddr(vk_instance, procs[i]); + if (!pfn_vkGetPhysicalDeviceProperties2) + { + skip("%s is not available.\n", procs[i]); + continue; + } + + for (j = 0; j < count; ++j) + { + properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; + properties2.pNext = &id; + + memset(&id, 0, sizeof(id)); + id.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES; + + pfn_vkGetPhysicalDeviceProperties2(vk_physical_devices[j], &properties2); + luid = (const LUID *)id.deviceLUID; + trace("Device '%s', device UUID: %s, driver UUID: %s, device LUID: %08x:%08x.\n", + properties2.properties.deviceName, wine_dbgstr_guid((const GUID *)id.deviceUUID), + wine_dbgstr_guid((const GUID *)id.driverUUID), luid->HighPart, luid->LowPart); + todo_wine ok(id.deviceLUIDValid == VK_TRUE, "Expected valid device LUID.\n"); + } + } + + heap_free(vk_physical_devices); + vkDestroyInstance(vk_instance, NULL); +} + static void enumerate_device_queues(VkPhysicalDevice vk_physical_device) { VkPhysicalDeviceProperties device_properties; @@ -359,6 +422,7 @@ START_TEST(vulkan) { test_instance_version(); for_each_device(enumerate_physical_device); + test_enumerate_physical_device2(); for_each_device(enumerate_device_queues); test_physical_device_groups(); for_each_device(test_destroy_command_pool);

1 0