July 2018 - Wine-devel - list.winehq.org

[PATCH] mpr: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 25 Jul '18

25 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mpr/wnet.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 78759ecb15..ad4f1ddb65 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -130,9 +130,8 @@ static void _tryLoadProvider(PCWSTR provider) HKEY hKey; TRACE("%s\n", debugstr_w(provider)); - snprintfW(serviceName, sizeof(serviceName) / sizeof(WCHAR), serviceFmt, - servicePrefix, provider); - serviceName[sizeof(serviceName) / sizeof(WCHAR) - 1] = '\0'; + snprintfW(serviceName, ARRAY_SIZE(serviceName), serviceFmt, servicePrefix, provider); + serviceName[ARRAY_SIZE(serviceName) - 1] = '\0'; if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, serviceName, 0, KEY_READ, &hKey) == ERROR_SUCCESS) { @@ -2127,7 +2126,7 @@ DWORD WINAPI WNetGetConnectionA( LPCSTR lpLocalName, if (wideLocalName) { WCHAR wideRemoteStatic[MAX_PATH]; - DWORD wideRemoteSize = sizeof(wideRemoteStatic) / sizeof(WCHAR); + DWORD wideRemoteSize = ARRAY_SIZE(wideRemoteStatic); MultiByteToWideChar(CP_ACP, 0, lpLocalName, -1, wideLocalName, len); -- 2.14.4

1 0

[PATCH 1/4] wined3d: Fix WINED3D_MCS_COLOR2.
by Stefan Dösinger 25 Jul '18

25 Jul '18

Don't use it unless we have a specular color in the vertex attributes, but allow it if there's no diffuse color. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/wined3d/utils.c | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 937c1bc0df6..ccf5b846efc 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5854,6 +5854,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_d3d_info *d3d_info = context->d3d_info; unsigned int coord_idx, i; + BOOL has_diffuse, has_specular; memset(settings, 0, sizeof(*settings)); @@ -5911,12 +5912,38 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, settings->point_size = state->gl_primitive_type == GL_POINTS; settings->per_vertex_point_size = !!(si->use_map & 1u << WINED3D_FFP_PSIZE); - if (state->render_states[WINED3D_RS_COLORVERTEX] && (si->use_map & (1u << WINED3D_FFP_DIFFUSE))) + has_diffuse = si->use_map & (1u << WINED3D_FFP_DIFFUSE); + has_specular = si->use_map & (1u << WINED3D_FFP_SPECULAR); + + if (state->render_states[WINED3D_RS_COLORVERTEX] && (has_diffuse || has_specular)) { - settings->diffuse_source = state->render_states[WINED3D_RS_DIFFUSEMATERIALSOURCE]; - settings->emissive_source = state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE]; - settings->ambient_source = state->render_states[WINED3D_RS_AMBIENTMATERIALSOURCE]; - settings->specular_source = state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE]; + if (state->render_states[WINED3D_RS_DIFFUSEMATERIALSOURCE] == WINED3D_MCS_COLOR1 && has_diffuse) + settings->diffuse_source = WINED3D_MCS_COLOR1; + else if (state->render_states[WINED3D_RS_DIFFUSEMATERIALSOURCE] == WINED3D_MCS_COLOR2 && has_specular) + settings->diffuse_source = WINED3D_MCS_COLOR2; + else + settings->diffuse_source = WINED3D_MCS_MATERIAL; + + if (state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE] == WINED3D_MCS_COLOR1 && has_diffuse) + settings->emissive_source = WINED3D_MCS_COLOR1; + else if (state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE] == WINED3D_MCS_COLOR2 && has_specular) + settings->emissive_source = WINED3D_MCS_COLOR2; + else + settings->emissive_source = WINED3D_MCS_MATERIAL; + + if (state->render_states[WINED3D_RS_AMBIENTMATERIALSOURCE] == WINED3D_MCS_COLOR1 && has_diffuse) + settings->ambient_source = WINED3D_MCS_COLOR1; + else if (state->render_states[WINED3D_RS_AMBIENTMATERIALSOURCE] == WINED3D_MCS_COLOR2 && has_specular) + settings->ambient_source = WINED3D_MCS_COLOR2; + else + settings->ambient_source = WINED3D_MCS_MATERIAL; + + if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3D_MCS_COLOR1 && has_diffuse) + settings->specular_source = WINED3D_MCS_COLOR1; + else if (state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE] == WINED3D_MCS_COLOR2 && has_specular) + settings->specular_source = WINED3D_MCS_COLOR2; + else + settings->specular_source = WINED3D_MCS_MATERIAL; } else { -- 2.16.4

1 3

This year's changes to the "Submitting Patches" page
by Alex Henrie 25 Jul '18

25 Jul '18

Hello everyone, I've made (and Alexandre has approved) changes to our commit message recommendations <https://wiki.winehq.org/Submitting_Patches> to reflect this year's WineConf discussions. The major differences from the previous information on the wiki are: - Explicitly request use of the imperative mood - Add more instructions on how to write paragraphs of explanation - Recommend inclusion of a Wine-Bug line with a URL to Bugzilla (similar to Gentoo's Gentoo-Bug) - Clarify that Signed-off-by means that you think a patch is good enough to go into Wine (and not that you are obligated fix any regressions it may cause) - Clarify that Signed-off-by also signifies compliance with legal requirements for developing Wine code (although we don't have a "Developer Certificate of Origin" yet) - Tell patch submitters to put extra information (not intended for the commit log) below three dashes Please let me know if you notice any more problems with the page, although it is on a wiki, so you are welcome to improve it yourself ;-) -Alex

6 8

[PATCH] programs: Allow to disable MIME-type associations.
by Dmitry Timoshkov 25 Jul '18

25 Jul '18

This patch should at least mitigate the state of the bug 19182. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- programs/winecfg/resource.h | 1 + programs/winecfg/theme.c | 30 ++++++++++++++-- programs/winecfg/winecfg.rc | 40 ++++++++++++---------- programs/winemenubuilder/winemenubuilder.c | 23 ++++++++++++- 4 files changed, 73 insertions(+), 21 deletions(-) diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index 0c0b038ff9..2760e92c00 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -176,6 +176,7 @@ #define IDC_SYSPARAM_COLOR_TEXT 1415 #define IDC_SYSPARAM_COLOR 1416 #define IDC_SYSPARAM_FONT 1417 +#define IDC_ENABLE_FILE_ASSOCIATIONS 1418 #define IDC_SYSPARAMS_BUTTON 8400 #define IDC_SYSPARAMS_BUTTON_TEXT 8401 diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index f98dcc3ae7..863bc6bb93 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -1168,6 +1168,26 @@ static void on_select_font(HWND hDlg) SendMessageW(GetParent(hDlg), PSM_CHANGED, 0, 0); } +static void init_mime_types(HWND hDlg) +{ + char *buf = get_reg_key(config_key, keypath("MIME-types"), "EnableFileAssociations", "Y"); + int state = IS_OPTION_TRUE(*buf) ? BST_CHECKED : BST_UNCHECKED; + + CheckDlgButton(hDlg, IDC_ENABLE_FILE_ASSOCIATIONS, state); + + HeapFree(GetProcessHeap(), 0, buf); +} + +static void update_mime_types(HWND hDlg) +{ + const char *state = "Y"; + + if (IsDlgButtonChecked(hDlg, IDC_ENABLE_FILE_ASSOCIATIONS) != BST_CHECKED) + state = "N"; + + set_reg_key(config_key, keypath("MIME-types"), "EnableFileAssociations", state); +} + INT_PTR CALLBACK ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -1177,8 +1197,9 @@ ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) init_shell_folder_listview_headers(hDlg); update_shell_folder_listview(hDlg); read_sysparams(hDlg); + init_mime_types(hDlg); break; - + case WM_DESTROY: free_theme_files(); break; @@ -1186,7 +1207,7 @@ ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_SHOWWINDOW: set_window_title(hDlg); break; - + case WM_COMMAND: switch(HIWORD(wParam)) { case CBN_SELCHANGE: { @@ -1296,6 +1317,10 @@ ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) } break; } + + case IDC_ENABLE_FILE_ASSOCIATIONS: + update_mime_types(hDlg); + break; } break; } @@ -1314,6 +1339,7 @@ ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) apply_sysparams(); read_shell_folder_link_targets(); update_shell_folder_listview(hDlg); + update_mime_types(hDlg); SetWindowLongPtrW(hDlg, DWLP_MSGRESULT, PSNRET_NOERROR); break; } diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index 5908b491d4..d37a55e9e6 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -284,25 +284,29 @@ IDD_DESKTOP_INTEGRATION DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Appearance",IDC_STATIC,8,4,244,106 - LTEXT "&Theme:",IDC_STATIC,15,16,130,8 - COMBOBOX IDC_THEME_THEMECOMBO,15,26,130,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Install theme...",IDC_THEME_INSTALL,152,26,93,14 - LTEXT "&Color:",IDC_THEME_COLORTEXT,15,48,105,8 - COMBOBOX IDC_THEME_COLORCOMBO,15,58,105,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "&Size:",IDC_THEME_SIZETEXT,126,48,120,8 - COMBOBOX IDC_THEME_SIZECOMBO,126,58,120,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "It&em:",IDC_STATIC,15,80,105,8 - COMBOBOX IDC_SYSPARAM_COMBO,15,90,105,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "C&olor:",IDC_SYSPARAM_COLOR_TEXT,126,80,25,8,WS_DISABLED - PUSHBUTTON "",IDC_SYSPARAM_COLOR,126,90,25,13,WS_DISABLED | BS_OWNERDRAW - LTEXT "Si&ze:",IDC_SYSPARAM_SIZE_TEXT,157,80,30,8,WS_DISABLED - EDITTEXT IDC_SYSPARAM_SIZE,157,90,30,13,ES_AUTOHSCROLL | WS_TABSTOP | WS_DISABLED - CONTROL "",IDC_SYSPARAM_SIZE_UD,UPDOWN_CLASSA,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | WS_DISABLED, 185,90,15,13 - PUSHBUTTON "&Font...",IDC_SYSPARAM_FONT,190,90,55,13,WS_DISABLED - GROUPBOX "Folders",IDC_STATIC,8,114,244,100 + GROUPBOX "Appearance",IDC_STATIC,8,4,244,90 + LTEXT "&Theme:",IDC_STATIC,15,15,130,8 + COMBOBOX IDC_THEME_THEMECOMBO,15,25,130,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Install theme...",IDC_THEME_INSTALL,152,25,93,13 + LTEXT "&Color:",IDC_THEME_COLORTEXT,15,40,105,8 + COMBOBOX IDC_THEME_COLORCOMBO,15,50,105,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "&Size:",IDC_THEME_SIZETEXT,126,40,120,8 + COMBOBOX IDC_THEME_SIZECOMBO,126,50,120,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "It&em:",IDC_STATIC,15,65,105,8 + COMBOBOX IDC_SYSPARAM_COMBO,15,75,105,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "C&olor:",IDC_SYSPARAM_COLOR_TEXT,126,65,25,8,WS_DISABLED + PUSHBUTTON "",IDC_SYSPARAM_COLOR,126,75,25,13,WS_DISABLED | BS_OWNERDRAW + LTEXT "Si&ze:",IDC_SYSPARAM_SIZE_TEXT,157,65,30,8,WS_DISABLED + EDITTEXT IDC_SYSPARAM_SIZE,157,75,30,13,ES_AUTOHSCROLL | WS_TABSTOP | WS_DISABLED + CONTROL "",IDC_SYSPARAM_SIZE_UD,UPDOWN_CLASSA,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | WS_DISABLED, 185,75,15,13 + + GROUPBOX "MIME types",IDC_STATIC,8,95,244,23 + CONTROL "Allow Wine to manage file &associations",IDC_ENABLE_FILE_ASSOCIATIONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,105,230,8 + + PUSHBUTTON "&Font...",IDC_SYSPARAM_FONT,190,75,55,13,WS_DISABLED + GROUPBOX "Folders",IDC_STATIC,8,120,244,94 CONTROL "",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | - LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 + LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,132,230,58 CONTROL "&Link to:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,65,13 EDITTEXT IDC_EDIT_SFPATH,80,195,110,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED PUSHBUTTON "B&rowse...",IDC_BROWSE_SFPATH,195,195,50,13,WS_DISABLED diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 0013b04cee..dd69ff96da 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -104,6 +104,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(menubuilder); #define in_startmenu(csidl) ((csidl)==CSIDL_STARTMENU || \ (csidl)==CSIDL_COMMON_STARTMENU) +#define IS_OPTION_TRUE(ch) \ + ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1') + /* link file formats */ #include "pshpack1.h" @@ -3619,6 +3622,23 @@ static BOOL init_xdg(void) return FALSE; } +static BOOL associations_enabled(void) +{ + BOOL ret = TRUE; + HKEY hkey; + BYTE buf[32]; + DWORD len; + + if (!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\MIME-types", &hkey)) + { + len = sizeof(buf); + if (!RegQueryValueExA(hkey, "EnableFileAssociations", NULL, NULL, buf, &len)) + ret = IS_OPTION_TRUE(buf[0]); + } + + return ret; +} + /*********************************************************************** * * wWinMain @@ -3654,7 +3674,8 @@ int PASCAL wWinMain (HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sh break; if( !strcmpW( token, dash_aW ) ) { - RefreshFileTypeAssociations(); + if (associations_enabled()) + RefreshFileTypeAssociations(); continue; } if( !strcmpW( token, dash_rW ) ) -- 2.17.1

1 0

Trivial bug in wine-staging xaudio2_7-WMA_support
by Olivier F. R. Dierick 25 Jul '18

25 Jul '18

Hello, I found a trivial bug in one of your staged patch set while trying to configure wine-staging on Debian 8 Jessie: Debian 8 Jessie doesn't ship a libavcodec-dev package that provides avcodec_send_packet(), so configure prints the "libavcodec not found or too old" notice. The option --without-ffmpeg disables the check but not the notice. In xaudio2_7-WMA_support / 0001-xaudio2-Use-ffmpeg-to-convert-WMA-formats.patch Line 69: WINE_NOTICE_WITH(libavcodec, ... should be: WINE_NOTICE_WITH(ffmpeg, ... With this change the notice is disabled when using --without-ffmpeg. I don't think it deserves a bug report. Regards, -- Olivier F. R. Dierick o.dierick(a)piezo-forte.be

2 1

[PATCH] wine.inf: Add "Sources" key.
by Gijs Vermeulen 24 Jul '18

24 Jul '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44981 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 9a76509983..777428900f 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3416,6 +3416,7 @@ HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"Schedule" HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,"System\CurrentControlSet\Services\Eventlog\Application",,16 HKLM,"System\CurrentControlSet\Services\Eventlog\System",,16 +HKLM,"System\CurrentControlSet\Services\Eventlog\System","Sources",0x10000,"" HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters",,16 HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16 HKLM,"System\CurrentControlSet\Services\Winsock\Parameters",,16 -- 2.13.7

1 0

[PATCH] windowscodecs: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 24 Jul '18

24 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/windowscodecs/bitmap.c | 2 +- dlls/windowscodecs/bmpencode.c | 2 +- dlls/windowscodecs/jpegformat.c | 2 +- dlls/windowscodecs/metadataquery.c | 10 +++++----- dlls/windowscodecs/pngformat.c | 4 ++-- dlls/windowscodecs/tiffformat.c | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/bitmap.c b/dlls/windowscodecs/bitmap.c index f8414962f2..116fd3134a 100644 --- a/dlls/windowscodecs/bitmap.c +++ b/dlls/windowscodecs/bitmap.c @@ -555,7 +555,7 @@ static HRESULT WINAPI IMILBitmapImpl_GetPixelFormat(IMILBitmapSource *iface, *format = 0; - for (i = 0; i < sizeof(pixel_fmt_map)/sizeof(pixel_fmt_map[0]); i++) + for (i = 0; i < ARRAY_SIZE(pixel_fmt_map); i++) { if (IsEqualGUID(pixel_fmt_map[i].WIC_format, &This->pixelformat)) { diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index 97f30d7197..aa65675a98 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -529,7 +529,7 @@ static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, if (ppIEncoderOptions) { - hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); + hr = CreatePropertyBag2(opts, ARRAY_SIZE(opts), ppIEncoderOptions); if (FAILED(hr)) return hr; } diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index f05663f070..d24af6dc9e 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -1463,7 +1463,7 @@ static HRESULT WINAPI JpegEncoder_CreateNewFrame(IWICBitmapEncoder *iface, if (ppIEncoderOptions) { - hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); + hr = CreatePropertyBag2(opts, ARRAY_SIZE(opts), ppIEncoderOptions); if (FAILED(hr)) { LeaveCriticalSection(&This->lock); diff --git a/dlls/windowscodecs/metadataquery.c b/dlls/windowscodecs/metadataquery.c index e33884881b..2d7c918921 100644 --- a/dlls/windowscodecs/metadataquery.c +++ b/dlls/windowscodecs/metadataquery.c @@ -164,7 +164,7 @@ static VARTYPE map_type(struct string_t *str) { UINT i; - for (i = 0; i < sizeof(str2vt)/sizeof(str2vt[0]); i++) + for (i = 0; i < ARRAY_SIZE(str2vt); i++) { if (str2vt[i].len == str->len) { @@ -743,7 +743,7 @@ HRESULT WINAPI WICMapGuidToShortName(REFGUID guid, UINT len, WCHAR *name, UINT * if (!guid) return E_INVALIDARG; - for (i = 0; i < sizeof(guid2name)/sizeof(guid2name[0]); i++) + for (i = 0; i < ARRAY_SIZE(guid2name); i++) { if (IsEqualGUID(guid, guid2name[i].guid)) { @@ -774,7 +774,7 @@ HRESULT WINAPI WICMapShortNameToGuid(PCWSTR name, GUID *guid) if (!name || !guid) return E_INVALIDARG; - for (i = 0; i < sizeof(guid2name)/sizeof(guid2name[0]); i++) + for (i = 0; i < ARRAY_SIZE(guid2name); i++) { if (!lstrcmpiW(name, guid2name[i].name)) { @@ -884,7 +884,7 @@ static const WCHAR *map_shortname_to_schema(const GUID *format, const WCHAR *nam !IsEqualGUID(format, &GUID_MetadataFormatXMPStruct)) return NULL; - for (i = 0; i < sizeof(name2schema)/sizeof(name2schema[0]); i++) + for (i = 0; i < ARRAY_SIZE(name2schema); i++) { if (!lstrcmpW(name2schema[i].name, name)) return name2schema[i].schema; @@ -909,7 +909,7 @@ HRESULT WINAPI WICMapSchemaToName(REFGUID format, LPWSTR schema, UINT len, WCHAR !IsEqualGUID(format, &GUID_MetadataFormatXMPStruct)) return WINCODEC_ERR_PROPERTYNOTFOUND; - for (i = 0; i < sizeof(name2schema)/sizeof(name2schema[0]); i++) + for (i = 0; i < ARRAY_SIZE(name2schema); i++) { if (!lstrcmpW(name2schema[i].schema, schema)) { diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index fd0d197bb3..6b13112130 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -1441,7 +1441,7 @@ static HRESULT WINAPI PngFrameEncode_Initialize(IWICBitmapFrameEncode *iface, if (pIEncoderOptions) { - hr = IPropertyBag2_Read(pIEncoderOptions, sizeof(opts)/sizeof(opts[0]), opts, NULL, opt_values, opt_hres); + hr = IPropertyBag2_Read(pIEncoderOptions, ARRAY_SIZE(opts), opts, NULL, opt_values, opt_hres); if (FAILED(hr)) return hr; @@ -2046,7 +2046,7 @@ static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, if (ppIEncoderOptions) { - hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); + hr = CreatePropertyBag2(opts, ARRAY_SIZE(opts), ppIEncoderOptions); if (FAILED(hr)) { LeaveCriticalSection(&This->lock); diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 2b2f84f859..966ab3eb4b 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1956,7 +1956,7 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, if (ppIEncoderOptions && SUCCEEDED(hr)) { - hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); + hr = CreatePropertyBag2(opts, ARRAY_SIZE(opts), ppIEncoderOptions); if (SUCCEEDED(hr)) { VARIANT v; -- 2.14.4

2 1

[PATCH v2] sfnt2fon: Prevent reading past allocated buffer
by janisozaur＠gmail.com 24 Jul '18

24 Jul '18

From: Michał Janiszewski <janisozaur(a)gmail.com> Some fonts (e.g. Courier) may cause sfnt2fon try reading past end of heap-allocated buffer. Rather than reading from uninitialised memory, return 0 in such case. Visual tests on .fon render of this font (using FontForge) shown no artifacts. This should fix Bug 45422 v2: - Improve C89 compatibility - Use cached index for both left and right bytes --- tools/sfnt2fon/sfnt2fon.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/sfnt2fon/sfnt2fon.c b/tools/sfnt2fon/sfnt2fon.c index 25f0763872..0f788da7e1 100644 --- a/tools/sfnt2fon/sfnt2fon.c +++ b/tools/sfnt2fon/sfnt2fon.c @@ -554,6 +554,7 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, for(x = 0; x < ((info->dfCharTable[i].width + 7) / 8); x++) { for(y = 0; y < ppem; y++) { + int idx, x_limit; if(y < ascent - face->glyph->bitmap_top || y >= face->glyph->bitmap.rows + ascent - face->glyph->bitmap_top) { info->data[data_pos++] = 0; @@ -565,16 +566,19 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, info->data[data_pos++] = 0; continue; } + idx = (y - (ascent - face->glyph->bitmap_top)) * face->glyph->bitmap.pitch + x - x_off; if(x == x_off) left_byte = 0; else - left_byte = face->glyph->bitmap.buffer[(y - (ascent - face->glyph->bitmap_top)) * face->glyph->bitmap.pitch + x - x_off - 1]; + left_byte = face->glyph->bitmap.buffer[idx - 1]; + /* FreeType allocates that many bytes for bitmap, but some fonts (e.g. Courier) might try reading past the buffer */ + x_limit = face->glyph->bitmap.rows * face->glyph->bitmap.pitch; /* On the last non-trivial output byte (x == x_end) have we got one or two input bytes */ - if(x == x_end && (face->glyph->bitmap_left % 8 != 0) && ((face->glyph->bitmap.width % 8 == 0) || (x != (((face->glyph->bitmap.width) & ~0x7) + face->glyph->bitmap_left) / 8))) + if((idx >= x_limit) || (x == x_end && (face->glyph->bitmap_left % 8 != 0) && ((face->glyph->bitmap.width % 8 == 0) || (x != (((face->glyph->bitmap.width) & ~0x7) + face->glyph->bitmap_left) / 8)))) right_byte = 0; else - right_byte = face->glyph->bitmap.buffer[(y - (ascent - face->glyph->bitmap_top)) * face->glyph->bitmap.pitch + x - x_off]; + right_byte = face->glyph->bitmap.buffer[idx]; byte = (left_byte << (8 - (face->glyph->bitmap_left & 7))) & 0xff; byte |= ((right_byte >> (face->glyph->bitmap_left & 7)) & 0xff); -- 2.18.0

1 0

[PATCH] mountmgr.sys: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 24 Jul '18

24 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mountmgr.sys/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 1437bfc853..f96b05e4da 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -658,7 +658,7 @@ static void create_drive_devices(void) if (!RegQueryValueExW( drives_key, driveW, NULL, &type, (BYTE *)buffer, &size ) && type == REG_SZ) { - for (j = 0; j < sizeof(drive_types)/sizeof(drive_types[0]); j++) + for (j = 0; j < ARRAY_SIZE(drive_types); j++) if (drive_types[j][0] && !strcmpiW( buffer, drive_types[j] )) { drive_type = j; @@ -1123,7 +1123,7 @@ static void create_port_devices( DRIVER_OBJECT *driver ) p[1] = 'o'; p[2] = 'm'; search_paths = serial_search_paths; - num_search_paths = sizeof(serial_search_paths)/sizeof(serial_search_paths[0]); + num_search_paths = ARRAY_SIZE(serial_search_paths); windows_ports_key_name = serialcomm_keyW; } else @@ -1132,7 +1132,7 @@ static void create_port_devices( DRIVER_OBJECT *driver ) p[1] = 'p'; p[2] = 't'; search_paths = parallel_search_paths; - num_search_paths = sizeof(parallel_search_paths)/sizeof(parallel_search_paths[0]); + num_search_paths = ARRAY_SIZE(parallel_search_paths); windows_ports_key_name = parallel_ports_keyW; } p += 3; -- 2.14.4

1 0

[PATCH] winetest: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 24 Jul '18

24 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winetest/gui.c | 2 +- programs/winetest/main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winetest/gui.c b/programs/winetest/gui.c index 2948d7e1ad..bda00f3707 100644 --- a/programs/winetest/gui.c +++ b/programs/winetest/gui.c @@ -547,7 +547,7 @@ report (enum report_type t, ...) } va_start (ap, t); - if (t < sizeof text_funcs / sizeof text_funcs[0]) ret = funcs[t](ap); + if (t < ARRAY_SIZE(text_funcs)) ret = funcs[t](ap); else report (R_WARNING, "unimplemented report type: %d", t); va_end (ap); return ret; diff --git a/programs/winetest/main.c b/programs/winetest/main.c index b3c3c1c850..56044095f3 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -461,7 +461,7 @@ static void print_language(void) if (pGetSystemPreferredUILanguages && !running_under_wine()) { WCHAR langW[32]; - ULONG num, size = sizeof(langW)/sizeof(langW[0]); + ULONG num, size = ARRAY_SIZE(langW); if (pGetSystemPreferredUILanguages(MUI_LANGUAGE_ID, &num, langW, &size)) { char lang[32], *p = lang; @@ -1263,7 +1263,7 @@ int main( int argc, char *argv[] ) exit (0); } else if ((argv[i][0] != '-' && argv[i][0] != '/') || argv[i][2]) { - if (nb_filters == sizeof(filters)/sizeof(filters[0])) + if (nb_filters == ARRAY_SIZE(filters)) { report (R_ERROR, "Too many test filters specified"); exit (2); -- 2.14.4

1 0