From aac5a0da5375e94bccc30c1dd22142ad158807a4 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 4 May 2014 00:21:29 +0200 Subject: [PATCH] Add additional patch to silence repeated CompareStringEx FIXME messages. --- ...lence-repeated-CompareStringEx-FIXME.patch | 50 +++++++++++++++++++ .../325645ba-d39d-4de4-9c94-3fe694eedaab.def | 3 ++ patches/patch-list.patch | 3 +- 3 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 patches/98-Miscellaneous/0003-kernel32-Silence-repeated-CompareStringEx-FIXME.patch create mode 100644 patches/98-Miscellaneous/325645ba-d39d-4de4-9c94-3fe694eedaab.def diff --git a/patches/98-Miscellaneous/0003-kernel32-Silence-repeated-CompareStringEx-FIXME.patch b/patches/98-Miscellaneous/0003-kernel32-Silence-repeated-CompareStringEx-FIXME.patch new file mode 100644 index 00000000..85a0d7b6 --- /dev/null +++ b/patches/98-Miscellaneous/0003-kernel32-Silence-repeated-CompareStringEx-FIXME.patch @@ -0,0 +1,50 @@ +From 33fa174b6404cfea673d510457d21d784a23efbd Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner +Date: Sun, 4 May 2014 00:18:11 +0200 +Subject: kernel32: Silence repeated CompareStringEx FIXME. + +--- + dlls/kernel32/locale.c | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c +index eca0e39..55ef3d6 100644 +--- a/dlls/kernel32/locale.c ++++ b/dlls/kernel32/locale.c +@@ -2985,9 +2985,10 @@ INT WINAPI CompareStringW(LCID lcid, DWORD flags, + INT WINAPI CompareStringEx(LPCWSTR locale, DWORD flags, LPCWSTR str1, INT len1, + LPCWSTR str2, INT len2, LPNLSVERSIONINFO version, LPVOID reserved, LPARAM lParam) + { +- DWORD supported_flags = NORM_IGNORECASE|NORM_IGNORENONSPACE|NORM_IGNORESYMBOLS|SORT_STRINGSORT +- |NORM_IGNOREKANATYPE|NORM_IGNOREWIDTH|LOCALE_USE_CP_ACP; +- DWORD semistub_flags = NORM_LINGUISTIC_CASING|LINGUISTIC_IGNORECASE|0x10000000; ++ static const DWORD supported_flags = NORM_IGNORECASE|NORM_IGNORENONSPACE|NORM_IGNORESYMBOLS|SORT_STRINGSORT ++ |NORM_IGNOREKANATYPE|NORM_IGNOREWIDTH|LOCALE_USE_CP_ACP ++ |NORM_LINGUISTIC_CASING|LINGUISTIC_IGNORECASE|0x10000000; ++ static DWORD semistub_flags = NORM_LINGUISTIC_CASING|LINGUISTIC_IGNORECASE|0x10000000; + /* 0x10000000 is related to diacritics in Arabic, Japanese, and Hebrew */ + INT ret; + +@@ -3001,14 +3002,17 @@ INT WINAPI CompareStringEx(LPCWSTR locale, DWORD flags, LPCWSTR str1, INT len1, + return 0; + } + +- if (flags & ~(supported_flags|semistub_flags)) ++ if (flags & ~supported_flags) + { + SetLastError(ERROR_INVALID_FLAGS); + return 0; + } + + if (flags & semistub_flags) +- FIXME("semi-stub behavor for flag(s) 0x%x\n", flags & semistub_flags); ++ { ++ FIXME("semi-stub behavior for flag(s) 0x%x\n", flags & semistub_flags); ++ semistub_flags &= ~flags; ++ } + + if (len1 < 0) len1 = strlenW(str1); + if (len2 < 0) len2 = strlenW(str2); +-- +1.7.9.5 + diff --git a/patches/98-Miscellaneous/325645ba-d39d-4de4-9c94-3fe694eedaab.def b/patches/98-Miscellaneous/325645ba-d39d-4de4-9c94-3fe694eedaab.def new file mode 100644 index 00000000..ccca1abd --- /dev/null +++ b/patches/98-Miscellaneous/325645ba-d39d-4de4-9c94-3fe694eedaab.def @@ -0,0 +1,3 @@ +Revision: 1 +Author: Sebastian Lackner +Title: kernel32: Silence repeated CompareStringEx FIXME. diff --git a/patches/patch-list.patch b/patches/patch-list.patch index c0f604f7..2cc7ca89 100644 --- a/patches/patch-list.patch +++ b/patches/patch-list.patch @@ -37,7 +37,7 @@ diff --git a/libs/wine/config.c b/libs/wine/config.c index a273502..5fa0cd5 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c -@@ -478,6 +478,36 @@ const char *wine_get_version(void) +@@ -478,6 +478,37 @@ const char *wine_get_version(void) return PACKAGE_VERSION; } @@ -59,6 +59,7 @@ index a273502..5fa0cd5 100644 + { "0b21d7ac-0387-4493-aa38-fbafe3e749f5:2", "Michael Müller", "Decrease minimum SetTimer interval to 5 ms." }, + { "19835498-8d90-4673-867e-2376af4d7c76:1", "Sebastian Lackner", "Allow to set wined3d strictDrawOrdering via environment variable." }, + { "59bd38b7-bbdc-4cfd-9ccd-1c72c4ed84c0:1", "Sebastian Lackner", "Implement X11DRV_FLUSH_GDI_DISPLAY ExtEscape command." }, ++ { "325645ba-d39d-4de4-9c94-3fe694eedaab:1", "Sebastian Lackner", "kernel32: Silence repeated CompareStringEx FIXME." }, + { "acff3012-0f75-4710-9941-08b5ce4c61f3:1", "Erich E. Hoover", "wined3d: Silence repeated resource_check_usage FIXME." }, + { "eec5dea8-879d-417b-9f97-364deaae6576:1", "Sebastian Lackner", "Add tests for IVMRMonitorConfig." }, + { "e46b26df-3c1b-419c-9579-f0d1e1c50bea:1", "Sebastian Lackner", "Workaround for broken implementation of shlwapi url functions." },