December 2017 - Wine-devel - list.winehq.org

Issues with the registry font keys / entries
by Mihai Todor 20 Dec '17

20 Dec '17

Hi Everyone, I have spent some time trying to improve the font packages in Winetricks and I've run into a few issues with Wine that I hope someone can clarify. I agreed with Austin here https://github.com/Winetricks/winetricks/issues/896 that it would be best to get a wider audience on Wine Devel. First of all, there is some logic somewhere in Wine which automagically populates `HKCU\Software\Wine\Fonts\Cache` when font files are copied into `.wine/drive_c/windows/Fonts/`. The magic seems to be based on inotify, but I don't understand well enough how it works. However, there seems to be a race issue between apps like regedit and notepad and the above mechanism. For example, if I have the corefonts installers cached under `.cache/winetricks/` and I run `winetricks corefonts` and I start notepad immediately after, I notice that the new fonts are not available. Worse, most times (not sure yet how to reproduce it all the time) if I run regedit just after, the new fonts never get added to `HKCU\Software\Wine\Fonts\Cache`, which seems to be the place from where Wine lists fonts through EnumFontFamiliesEx (try running this code https://github.com/kamwoods/FontAnalysis/blob/d894c082221912e72653ae76804a7… just after installing corefonts). This happens on wine-3.0-rc2 and older. Is this the expected behaviour? I'm also wondering why Wine doesn't also write the required entries under `HKLM\Software\Microsoft\Windows[\ NT]?\CurrentVersion\Fonts` when it populates `HKCU\Software\Wine\Fonts\Cache`. Is this a bug? Is there a different way of registering fonts that Winetricks should use? I'd be more than happy to remove this manual registry insertion code from Winetricks... And, I also noticed that a fresh wine install on Ubuntu 16 will auto-populate both `HKLM\Software\Microsoft\Windows[\ NT]?\CurrentVersion\Fonts` keys with the following fonts: Courier -> coure.fon MS Sans Serif -> sserife.fon MS Serif -> serife.fon Small Fonts -> smalle.fon If I look in `HKCU\Software\Wine\Fonts\Cache`, I see that they are located in `/opt/wine-devel/bin/../share/wine/fonts/`, so shouldn't the above entries also point to the same location? And maybe not all apps will like the `..` in the font path... And, since we're here, I noticed that Winetricks registers font replacements under `HKCU\Software\Wine\Fonts\Replacements`, but doesn't add any entries to `HKLM\Software\Microsoft\Windows NT\CurrentVersion\FontSubstitutes`. Does Wine completely ignore this key? Thank you, Mihai

2 2

[PATCH] mmdevapi/tests: Fix memory leaks (Coverity)
by Alex Henrie 20 Dec '17

20 Dec '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/mmdevapi/tests/capture.c | 4 ++-- dlls/mmdevapi/tests/render.c | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 99da296e0a..3cdfda1a37 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -556,8 +556,7 @@ static void test_audioclient(void) if (hr != S_OK) { skip("Cannot initialize %08x, remainder of tests is useless\n", hr); - CoTaskMemFree(pwfx); - return; + goto cleanup; } hr = IAudioClient_GetStreamLatency(ac, NULL); @@ -592,6 +591,7 @@ static void test_audioclient(void) test_capture(ac, handle, pwfx); +cleanup: IAudioClient_Release(ac); CloseHandle(handle); CoTaskMemFree(pwfx); diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index e394d59cfe..9d3e8617b9 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -323,11 +323,7 @@ static void test_audioclient(void) hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); ok(hr == S_OK, "Valid Initialize returns %08x\n", hr); if (hr != S_OK) - { - IAudioClient_Release(ac); - CoTaskMemFree(pwfx); - return; - } + goto cleanup; hr = IAudioClient_GetStreamLatency(ac, NULL); ok(hr == E_POINTER, "GetStreamLatency(NULL) call returns %08x\n", hr); @@ -372,8 +368,8 @@ static void test_audioclient(void) hr = IAudioClient_Start(ac); ok(hr == AUDCLNT_E_NOT_STOPPED, "Start twice returns %08x\n", hr); +cleanup: IAudioClient_Release(ac); - CloseHandle(handle); CoTaskMemFree(pwfx); } -- 2.15.1

3 2

[PATCH] include: Add newer definitions for user controls
by Nikolay Sivov 20 Dec '17

20 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/commctrl.h | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 70 insertions(+), 1 deletion(-) diff --git a/include/commctrl.h b/include/commctrl.h index 587caae88b..e3c166b305 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1032,7 +1032,51 @@ static const WCHAR WC_BUTTONW[] = { 'B','u','t','t','o','n',0 }; #define BCN_FIRST (0U-1250U) #define BCN_LAST (0U-1350U) -#define BCN_HOTITEMCHANGE (BCN_FIRST + 0x0001) +#define BCN_HOTITEMCHANGE (BCN_FIRST + 1) +#define BCN_DROPDOWN (BCN_FIRST + 2) + +#define BCM_FIRST 0x1600 +#define BCM_GETIDEALSIZE (BCM_FIRST + 1) +#define BCM_SETIMAGELIST (BCM_FIRST + 2) +#define BCM_GETIMAGELIST (BCM_FIRST + 3) +#define BCM_SETTEXTMARGIN (BCM_FIRST + 4) +#define BCM_GETTEXTMARGIN (BCM_FIRST + 5) +#define BCM_SETDROPDOWNSTATE (BCM_FIRST + 6) +#define BCM_SETSPLITINFO (BCM_FIRST + 7) +#define BCM_GETSPLITINFO (BCM_FIRST + 8) +#define BCM_SETNOTE (BCM_FIRST + 9) +#define BCM_GETNOTE (BCM_FIRST + 10) +#define BCM_GETNOTELENGTH (BCM_FIRST + 11) +#define BCM_SETSHIELD (BCM_FIRST + 12) + +#define BUTTON_IMAGELIST_ALIGN_LEFT 0 +#define BUTTON_IMAGELIST_ALIGN_RIGHT 1 +#define BUTTON_IMAGELIST_ALIGN_TOP 2 +#define BUTTON_IMAGELIST_ALIGN_BOTTOM 3 +#define BUTTON_IMAGELIST_ALIGN_CENTER 4 + +#define BCCL_NOGLYPH (HIMAGELIST)(-1) + +typedef struct +{ + HIMAGELIST himl; + RECT margin; + UINT uAlign; +} BUTTON_IMAGELIST, *PBUTTON_IMAGELIST; + +typedef struct tagBUTTON_SPLITINFO +{ + UINT mask; + HIMAGELIST himlGlyph; + UINT uSplitStyle; + SIZE size; +} BUTTON_SPLITINFO, *PBUTTON_SPLITINFO; + +typedef struct tagNMBCDROPDOWN +{ + NMHDR hdr; + RECT rcButton; +} NMBCDROPDOWN; typedef struct tagNMBCHOTITEM { @@ -1041,6 +1085,7 @@ typedef struct tagNMBCHOTITEM } NMBCHOTITEM, *LPNMBCHOTITEM; #define BST_HOT 0x0200 +#define BST_DROPDOWNPUSHED 0x0400 /* Button control styles for _WIN32_WINNT >= 0x600 */ #define BS_SPLITBUTTON 0x0000000C @@ -5147,6 +5192,12 @@ static const WCHAR WC_COMBOBOXW[] = { 'C','o','m','b','o','B','o','x',0 }; #endif #define WC_COMBOBOX WINELIB_NAME_AW(WC_COMBOBOX) +#define CBM_FIRST 0x1700 +#define CB_SETMINVISIBLE (CBM_FIRST + 1) +#define CB_GETMINVISIBLE (CBM_FIRST + 2) +#define CB_SETCUEBANNER (CBM_FIRST + 3) +#define CB_GETCUEBANNER (CBM_FIRST + 4) + /************************************************************************** * Edit control */ @@ -5161,6 +5212,24 @@ static const WCHAR WC_EDITW[] = { 'E','d','i','t',0 }; #endif #define WC_EDIT WINELIB_NAME_AW(WC_EDIT) +typedef struct _tagEDITBALLOONTIP +{ + DWORD cbStruct; + LPCWSTR pszTitle; + LPCWSTR pszText; + INT ttiIcon; +} EDITBALLOONTIP, *PEDITBALLOONTIP; + +#define ECM_FIRSP 0x1500 +#define EM_SETCUEBANNER (ECM_FIRST + 1) +#define EM_GETCUEBANNER (ECM_FIRST + 2) +#define EM_SHOWBALLOONTIP (ECM_FIRST + 3) +#define EM_HIDEBALLOONTIP (ECM_FIRST + 4) +#define EM_SETHILITE (ECM_FIRST + 5) +#define EM_GETHILITE (ECM_FIRST + 6) +#define EM_NOSETFOCUS (ECM_FIRST + 7) +#define EM_TAKEFOCUS (ECM_FIRST + 8) + /************************************************************************** * Listbox control */ -- 2.15.1

1 0

[PATCH] winegstreamer: Hold a reference to the filter in push_data().
by Zebediah Figura 19 Dec '17

19 Dec '17

Fixes bug #43004. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This fixes a regression probably introduced by 38586dcf48bf38c136ea315fd9d83a1be56483b1. dlls/winegstreamer/gstdemux.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 95a1630..a19c64f 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -510,6 +510,8 @@ static DWORD CALLBACK push_data(LPVOID iface) DWORD_PTR user; HRESULT hr; + IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); + if (!This->stop) IAsyncReader_Length(This->pInputPin.pReader, &maxlen, &curlen); else @@ -589,6 +591,9 @@ static DWORD CALLBACK push_data(LPVOID iface) } while (buf); TRACE("Stopping.. %08x\n", hr); + + IBaseFilter_Release(&This->filter.IBaseFilter_iface); + return 0; } -- 2.7.4

1 0

[PATCH 1/4] user32/tests: Don't leave hwndMain in a topmost state.
by Zebediah Figura 19 Dec '17

19 Dec '17

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/win.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index db27b6b..ea9fac2 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4011,6 +4011,8 @@ done: if (child) DestroyWindow(child); DestroyWindow(popup); + + SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); } static void test_validatergn(HWND hwnd) -- 2.7.4

2 5

[PATCH] po: Update Norwegian translation.
by Kim Malmo 19 Dec '17

19 Dec '17

Signed-off-by: Kim Malmo <berencamlost(a)msn.com> --- po/nb_NO.po | 68 +++++++++++++------------------------------------------------ 1 file changed, 14 insertions(+), 54 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 605b7e8c62..d00e67aebc 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -6998,7 +6998,7 @@ msgstr "Publiserer produktinformasjon" #: msi.rc:118 msgid "Registering Class servers" -msgstr "" +msgstr "Registrerer Klassetjenere" #: msi.rc:119 msgid "Registering COM+ Applications and Components" @@ -7102,7 +7102,7 @@ msgstr "Avpubliserer produktinformasjon" #: msi.rc:145 msgid "Unregister Class servers" -msgstr "" +msgstr "Avregistrerer Klassetjenere" #: msi.rc:146 msgid "Unregistering COM+ Applications and Components" @@ -7162,7 +7162,7 @@ msgstr "Tjeneste: [1]" #: msi.rc:166 msi.rc:169 msi.rc:173 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "Fil: [1], Mappe: [9], Størrelse: [6]" +msgstr "Fil: [1], Katalog: [9], Størrelse: [6]" #: msi.rc:167 msgid "Found application: [1]" @@ -7170,7 +7170,7 @@ msgstr "Funnet program: [1]" #: msi.rc:168 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "Fil: [1], Mappe: [9], Størrelse: [6]" +msgstr "Fil: [1], Katalog: [9], Størrelse: [6]" #: msi.rc:170 msgid "Service: [2]" @@ -7186,11 +7186,11 @@ msgstr "Program: [1]" #: msi.rc:174 msi.rc:175 msgid "Application Context:[1], Assembly Name:[2]" -msgstr "Programkontekst:[1], Assemblynavn:[2]" +msgstr "Programkontekst:[1], Assembly-navn:[2]" #: msi.rc:176 msgid "File: [1], Directory: [2], Size: [3]" -msgstr "Fil: [1], Mappe: [2], Størrelse: [6]" +msgstr "Fil: [1], Katalog: [2], Størrelse: [6]" #: msi.rc:177 msi.rc:198 msgid "Component ID: [1], Qualifier: [2]" @@ -7202,7 +7202,7 @@ msgstr "Egenskap: [1]" #: msi.rc:179 msi.rc:200 msgid "Class Id: [1]" -msgstr "Klasse ID: [1]" +msgstr "Klasse Id: [1]" #: msi.rc:180 msgid "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" @@ -7222,15 +7222,15 @@ msgstr "MIME innholdstype: [1], Utvidelse: [2]" #: msi.rc:184 msi.rc:205 msgid "ProgId: [1]" -msgstr "" +msgstr "ProgId: [1]" #: msi.rc:185 msi.rc:206 msgid "LibID: [1]" -msgstr "" +msgstr "LibID: [1]" #: msi.rc:186 msi.rc:189 msgid "File: [1], Directory: [9]" -msgstr "Fil: [1], Mappe: [2]" +msgstr "Fil: [1], Katalog: [2]" #: msi.rc:187 msi.rc:207 msgid "Name: [1], Value: [2], Action [3]" @@ -7254,7 +7254,7 @@ msgstr "Fil: [1], Mappe: [2]" #: msi.rc:201 msgid "AppId: [1]{{, AppType: [2]}}" -msgstr "" +msgstr "AppId: [1]{{, AppType: [2]}}" #: msi.rc:209 msgid "Key: [1], Name: [2], Value: [3]" @@ -7282,7 +7282,7 @@ msgid "" "This may indicate a problem with this package. The error code is [1]. {{The " "arguments are: [2], [3], [4]}}" msgstr "" -"Installeren har truffet på ett eventet problem under installeringen av denne " +"Installeren har truffet på ett uventet problem under installeringen av denne " "pakken. Dette kan skyldes ett problem med denne pakken. Errorkoden er [1]. " "{{Argumentene er: [2], [3], [4]}}" @@ -10601,47 +10601,6 @@ msgstr "" "eller skallet CMD ble startet fra.\n" #: cmd.rc:364 -#, fuzzy -#| msgid "" -#| "CMD built-in commands are:\n" -#| "ASSOC\t\tShow or modify file extension associations\n" -#| "ATTRIB\t\tShow or change DOS file attributes\n" -#| "CALL\t\tInvoke a batch file from inside another\n" -#| "CD (CHDIR)\tChange current default directory\n" -#| "CHOICE\t\tWait for an keypress from a selectable list\n" -#| "CLS\t\tClear the console screen\n" -#| "COPY\t\tCopy file\n" -#| "CTTY\t\tChange input/output device\n" -#| "DATE\t\tShow or change the system date\n" -#| "DEL (ERASE)\tDelete a file or set of files\n" -#| "DIR\t\tList the contents of a directory\n" -#| "ECHO\t\tCopy text directly to the console output\n" -#| "ENDLOCAL\tEnd localization of environment changes in a batch file\n" -#| "FTYPE\t\tShow or modify open commands associated with file types\n" -#| "HELP\t\tShow brief help details on a topic\n" -#| "MD (MKDIR)\tCreate a subdirectory\n" -#| "MORE\t\tDisplay output in pages\n" -#| "MOVE\t\tMove a file, set of files or directory tree\n" -#| "PATH\t\tSet or show the search path\n" -#| "PAUSE\t\tSuspend execution of a batch file\n" -#| "POPD\t\tRestore the directory to the last one saved with PUSHD\n" -#| "PROMPT\t\tChange the command prompt\n" -#| "PUSHD\t\tChange to a new directory, saving the current one\n" -#| "REN (RENAME)\tRename a file\n" -#| "RD (RMDIR)\tDelete a subdirectory\n" -#| "SET\t\tSet or show environment variables\n" -#| "SETLOCAL\tStart localization of environment changes in a batch file\n" -#| "START\t\tStart a program, or open a document in the associated program\n" -#| "TIME\t\tSet or show the current system time\n" -#| "TITLE\t\tSet the window title for the CMD session\n" -#| "TYPE\t\tType the contents of a text file\n" -#| "VER\t\tShow the current version of CMD\n" -#| "VOL\t\tShow the volume label of a disk device\n" -#| "XCOPY\t\tCopy source files or directory trees to a destination\n" -#| "EXIT\t\tClose down CMD\n" -#| "\n" -#| "Enter HELP <command> for further information on any of the above " -#| "commands.\n" msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -10701,6 +10660,7 @@ msgstr "" "FTYPE\t\tViser eller endrer kommandoer for åpning av ulike filtyper\n" "HELP\t\tViser en kort hjelpebeskrivelse om et emne\n" "MD (MKDIR)\tLager en underkatalog\n" +"MKLINK\tOpprett en symbolsk lenke\n" "MORE\t\tViser utdata i sider\n" "MOVE\t\tFlytter én eller flere filer, eller et katalogtre\n" "PATH\t\tEndrer eller viser søkestien\n" @@ -12531,7 +12491,7 @@ msgstr "" "Brukseksempler:\n" " regedit \"import.reg\"\n" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" #: regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" -- 2.14.1

1 0

[PATCH] comctl32/tooltips: Remove window subclass right before window is destroyed
by Nikolay Sivov 19 Dec '17

19 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Fixes a crash reported as https://bugs.winehq.org/show_bug.cgi?id=14937. dlls/comctl32/tooltips.c | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index bbf1693f4d..405b1e9f5c 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1888,16 +1888,12 @@ TOOLTIPS_Destroy (TOOLTIPS_INFO *infoPtr) } } - /* remove subclassing */ - if (toolPtr->uInternalFlags & TTF_SUBCLASS) { - if (toolPtr->uInternalFlags & TTF_IDISHWND) { - RemoveWindowSubclass((HWND)toolPtr->uId, TOOLTIPS_SubclassProc, 1); - } - else { - RemoveWindowSubclass(toolPtr->hwnd, TOOLTIPS_SubclassProc, 1); - } + /* Reset subclassing data. */ + if (toolPtr->uInternalFlags & TTF_SUBCLASS) + SetWindowSubclass(toolPtr->uInternalFlags & TTF_IDISHWND ? (HWND)toolPtr->uId : toolPtr->hwnd, + TOOLTIPS_SubclassProc, 1, 0); } - } + Free (infoPtr->tools); } @@ -2117,12 +2113,13 @@ TOOLTIPS_WinIniChange (TOOLTIPS_INFO *infoPtr) static LRESULT CALLBACK -TOOLTIPS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uID, DWORD_PTR dwRef) +TOOLTIPS_SubclassProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, UINT_PTR uID, DWORD_PTR dwRef) { TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr ((HWND)dwRef); MSG msg; - switch(uMsg) { + switch (message) + { case WM_MOUSEMOVE: case WM_LBUTTONDOWN: case WM_LBUTTONUP: @@ -2130,17 +2127,23 @@ TOOLTIPS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_ case WM_MBUTTONUP: case WM_RBUTTONDOWN: case WM_RBUTTONUP: - msg.hwnd = hwnd; - msg.message = uMsg; - msg.wParam = wParam; - msg.lParam = lParam; - TOOLTIPS_RelayEvent(infoPtr, &msg); - break; - + if (infoPtr) + { + msg.hwnd = hwnd; + msg.message = message; + msg.wParam = wParam; + msg.lParam = lParam; + TOOLTIPS_RelayEvent(infoPtr, &msg); + } + break; + case WM_NCDESTROY: + RemoveWindowSubclass(hwnd, TOOLTIPS_SubclassProc, 1); + break; default: break; } - return DefSubclassProc(hwnd, uMsg, wParam, lParam); + + return DefSubclassProc(hwnd, message, wParam, lParam); } -- 2.15.1

1 0

[PATCH v2] gdi32: Set otmMacLineGap from the line gap in the hhea table.
by Huw Davies 19 Dec '17

19 Dec '17

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 2 +- dlls/gdi32/tests/font.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 660900a56e..4db1c7eb56 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7930,7 +7930,7 @@ static BOOL get_outline_text_metrics(GdiFont *font) font->potm->otmrcFontBox.bottom = SCALE_Y(ft_face->bbox.yMin); font->potm->otmMacAscent = TM.tmAscent; font->potm->otmMacDescent = -TM.tmDescent; - font->potm->otmMacLineGap = font->potm->otmLineGap; + font->potm->otmMacLineGap = SCALE_Y(pHori->Line_Gap); font->potm->otmusMinimumPPEM = 0; /* TT Header */ font->potm->otmptSubscriptSize.x = SCALE_X(pOS2->ySubscriptXSize); font->potm->otmptSubscriptSize.y = SCALE_Y(pOS2->ySubscriptYSize); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index bd04a8b6b1..117a14f153 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1790,17 +1790,17 @@ static void test_GetKerningPairs(void) kd[i].otmMacDescent, otm.otmMacDescent); ok(near_match(kd[i].otmMacAscent, otm.otmMacAscent), "expected %d, got %d\n", kd[i].otmMacAscent, otm.otmMacAscent); -todo_wine { +todo_wine ok(kd[i].otmsCapEmHeight == otm.otmsCapEmHeight, "expected %u, got %u\n", kd[i].otmsCapEmHeight, otm.otmsCapEmHeight); +todo_wine ok(kd[i].otmsXHeight == otm.otmsXHeight, "expected %u, got %u\n", kd[i].otmsXHeight, otm.otmsXHeight); - /* FIXME: this one sometimes succeeds due to expected 0, enable it when removing todo */ - if (0) ok(kd[i].otmMacLineGap == otm.otmMacLineGap, "expected %u, got %u\n", + ok(kd[i].otmMacLineGap == otm.otmMacLineGap, "expected %u, got %u\n", kd[i].otmMacLineGap, otm.otmMacLineGap); +todo_wine ok(kd[i].otmusMinimumPPEM == otm.otmusMinimumPPEM, "expected %u, got %u\n", kd[i].otmusMinimumPPEM, otm.otmusMinimumPPEM); -} total_kern_pairs = GetKerningPairsW(hdc, 0, NULL); trace("total_kern_pairs %u\n", total_kern_pairs); -- 2.12.0

2 1

Upcoming TestBot patches
by Francois Gouget 19 Dec '17

19 Dec '17

For those that are interested I'm trying to regularly push my set of 'might be ready to send' patches on GitHub: https://github.com/fgouget/wine-tools/tree/future So feel free to have a look and / or test it. -- Francois Gouget <fgouget(a)codeweavers.com>

2 4

[PATCH] bcrypt: Require macOS version 10.7 or newer for encryption support.
by Hans Leidekker 19 Dec '17

19 Dec '17

Reported by Ryan Schmidt. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 35c0e4a076..55cf2f6f28 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -22,6 +22,7 @@ #include <stdarg.h> #ifdef HAVE_COMMONCRYPTO_COMMONCRYPTOR_H +#include <AvailabilityMacros.h> #include <CommonCrypto/CommonCryptor.h> #elif defined(SONAME_LIBGNUTLS) #include <gnutls/gnutls.h> @@ -766,7 +767,7 @@ NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG se return BCryptDestroyHash( handle ); } -#if defined(HAVE_GNUTLS_CIPHER_INIT) || defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) +#if defined(HAVE_GNUTLS_CIPHER_INIT) || defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 static ULONG get_block_size( enum alg_id alg ) { ULONG ret = 0, size = sizeof(ret); @@ -895,7 +896,7 @@ static NTSTATUS key_destroy( struct key *key ) HeapFree( GetProcessHeap(), 0, key ); return STATUS_SUCCESS; } -#elif defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) +#elif defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 struct key { struct object hdr; -- 2.11.0

1 0