wine-commits September 2017

wine-commits@winehq.org

2 participants
446 discussions

Fabian Maurer : api-ms-win-core-shlwapi-obsolete-l1-2-0: Add dll.
by Alexandre Julliard 07 Sep '17

07 Sep '17

Module: wine Branch: master Commit: 7750b4d823e1296948962822243853676e9526c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7750b4d823e12969489628222… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Sep 7 20:03:08 2017 +0200 api-ms-win-core-shlwapi-obsolete-l1-2-0: Add dll. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-core-shlwapi-obsolete-l1-2-0.spec | 58 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 63 insertions(+) diff --git a/configure b/configure index 48abef9..ddeff2e 100755 --- a/configure +++ b/configure @@ -964,6 +964,7 @@ enable_api_ms_win_core_rtlsupport_l1_1_0 enable_api_ms_win_core_rtlsupport_l1_2_0 enable_api_ms_win_core_shlwapi_legacy_l1_1_0 enable_api_ms_win_core_shlwapi_obsolete_l1_1_0 +enable_api_ms_win_core_shlwapi_obsolete_l1_2_0 enable_api_ms_win_core_sidebyside_l1_1_0 enable_api_ms_win_core_string_l1_1_0 enable_api_ms_win_core_string_l2_1_0 @@ -18041,6 +18042,7 @@ wine_fn_config_dll api-ms-win-core-rtlsupport-l1-1-0 enable_api_ms_win_core_rtls wine_fn_config_dll api-ms-win-core-rtlsupport-l1-2-0 enable_api_ms_win_core_rtlsupport_l1_2_0 wine_fn_config_dll api-ms-win-core-shlwapi-legacy-l1-1-0 enable_api_ms_win_core_shlwapi_legacy_l1_1_0 wine_fn_config_dll api-ms-win-core-shlwapi-obsolete-l1-1-0 enable_api_ms_win_core_shlwapi_obsolete_l1_1_0 +wine_fn_config_dll api-ms-win-core-shlwapi-obsolete-l1-2-0 enable_api_ms_win_core_shlwapi_obsolete_l1_2_0 wine_fn_config_dll api-ms-win-core-sidebyside-l1-1-0 enable_api_ms_win_core_sidebyside_l1_1_0 wine_fn_config_dll api-ms-win-core-string-l1-1-0 enable_api_ms_win_core_string_l1_1_0 wine_fn_config_dll api-ms-win-core-string-l2-1-0 enable_api_ms_win_core_string_l2_1_0 diff --git a/configure.ac b/configure.ac index 3cd4fee..ae514b0 100644 --- a/configure.ac +++ b/configure.ac @@ -2819,6 +2819,7 @@ WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-shlwapi-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-shlwapi-obsolete-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-shlwapi-obsolete-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-sidebyside-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l2-1-0) diff --git a/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/Makefile.in b/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/Makefile.in new file mode 100644 index 0000000..d973b4e --- /dev/null +++ b/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-shlwapi-obsolete-l1-2-0.dll diff --git a/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec b/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec new file mode 100644 index 0000000..be3b9f1 --- /dev/null +++ b/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec @@ -0,0 +1,58 @@ +@ stdcall QISearch(long long long long) shlwapi.QISearch +@ stdcall StrCatBuffA(str str long) shlwapi.StrCatBuffA +@ stdcall StrCatBuffW(wstr wstr long) shlwapi.StrCatBuffW +@ stdcall StrCatChainW(ptr long long wstr) shlwapi.StrCatChainW +@ stdcall StrChrA(str long) shlwapi.StrChrA +@ stdcall StrChrIA(str long) shlwapi.StrChrIA +@ stdcall StrChrIW(wstr long) shlwapi.StrChrIW +@ stub StrChrNIW +@ stdcall StrChrNW(wstr long long) shlwapi.StrChrNW +@ stdcall StrChrW(wstr long) shlwapi.StrChrW +@ stdcall StrCmpCA(str str) shlwapi.StrCmpCA +@ stdcall StrCmpCW(wstr wstr) shlwapi.StrCmpCW +@ stdcall StrCmpICA(str str) shlwapi.StrCmpICA +@ stdcall StrCmpICW(wstr wstr) shlwapi.StrCmpICW +@ stdcall StrCmpIW(wstr wstr) shlwapi.StrCmpIW +@ stdcall StrCmpLogicalW(wstr wstr) shlwapi.StrCmpLogicalW +@ stdcall StrCmpNA(str str long) shlwapi.StrCmpNA +@ stdcall StrCmpNCA(str ptr long) shlwapi.StrCmpNCA +@ stdcall StrCmpNCW(wstr wstr long) shlwapi.StrCmpNCW +@ stdcall StrCmpNIA(str str long) shlwapi.StrCmpNIA +@ stdcall StrCmpNICA(long long long) shlwapi.StrCmpNICA +@ stdcall StrCmpNICW(wstr wstr long) shlwapi.StrCmpNICW +@ stdcall StrCmpNIW(wstr wstr long) shlwapi.StrCmpNIW +@ stdcall StrCmpNW(wstr wstr long) shlwapi.StrCmpNW +@ stdcall StrCmpW(wstr wstr) shlwapi.StrCmpW +@ stdcall StrCpyNW(ptr wstr long) shlwapi.StrCpyNW +@ stdcall StrCSpnA(str str) shlwapi.StrCSpnA +@ stdcall StrCSpnIA(str str) shlwapi.StrCSpnIA +@ stdcall StrCSpnIW(wstr wstr) shlwapi.StrCSpnIW +@ stdcall StrCSpnW(wstr wstr) shlwapi.StrCSpnW +@ stdcall StrDupA(str) shlwapi.StrDupA +@ stdcall StrDupW(wstr) shlwapi.StrDupW +@ stdcall StrIsIntlEqualA(long str str long) shlwapi.StrIsIntlEqualA +@ stdcall StrIsIntlEqualW(long wstr wstr long) shlwapi.StrIsIntlEqualW +@ stdcall StrPBrkA(str str) shlwapi.StrPBrkA +@ stdcall StrPBrkW(wstr wstr) shlwapi.StrPBrkW +@ stdcall StrRChrA(str str long) shlwapi.StrRChrA +@ stdcall StrRChrIA(str str long) shlwapi.StrRChrIA +@ stdcall StrRChrIW(wstr wstr long) shlwapi.StrRChrIW +@ stdcall StrRChrW(wstr wstr long) shlwapi.StrRChrW +@ stdcall StrRStrIA(str str str) shlwapi.StrRStrIA +@ stdcall StrRStrIW(wstr wstr wstr) shlwapi.StrRStrIW +@ stdcall StrSpnA(str str) shlwapi.StrSpnA +@ stdcall StrSpnW(wstr wstr) shlwapi.StrSpnW +@ stdcall StrStrA(str str) shlwapi.StrStrA +@ stdcall StrStrIA(str str) shlwapi.StrStrIA +@ stdcall StrStrIW(wstr wstr) shlwapi.StrStrIW +@ stdcall StrStrNIW(wstr wstr long) shlwapi.StrStrNIW +@ stdcall StrStrNW(wstr wstr long) shlwapi.StrStrNW +@ stdcall StrStrW(wstr wstr) shlwapi.StrStrW +@ stdcall StrToInt64ExA(str long ptr) shlwapi.StrToInt64ExA +@ stdcall StrToInt64ExW(wstr long ptr) shlwapi.StrToInt64ExW +@ stdcall StrToIntA(str) shlwapi.StrToIntA +@ stdcall StrToIntExA(str long ptr) shlwapi.StrToIntExA +@ stdcall StrToIntExW(wstr long ptr) shlwapi.StrToIntExW +@ stdcall StrToIntW(wstr) shlwapi.StrToIntW +@ stdcall StrTrimA(str str) shlwapi.StrTrimA +@ stdcall StrTrimW(wstr wstr) shlwapi.StrTrimW diff --git a/tools/make_specfiles b/tools/make_specfiles index eddb7d3..15966c3 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -312,6 +312,7 @@ my @dll_groups = "api-ms-win-core-registryuserspecific-l1-1-0", "api-ms-win-core-shlwapi-legacy-l1-1-0", "api-ms-win-core-shlwapi-obsolete-l1-1-0", + "api-ms-win-core-shlwapi-obsolete-l1-2-0", "api-ms-win-core-url-l1-1-0", ], [

1 0

Fabian Maurer : api-ms-win-core-localization-obsolete-l1-3-0: Add dll.
by Alexandre Julliard 07 Sep '17

07 Sep '17

Module: wine Branch: master Commit: f5de3faf7c2f8e50fda58689db581974a8a6e188 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5de3faf7c2f8e50fda58689d… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Sep 7 20:03:07 2017 +0200 api-ms-win-core-localization-obsolete-l1-3-0: Add dll. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-localization-obsolete-l1-3-0/Makefile.in | 1 + .../api-ms-win-core-localization-obsolete-l1-3-0.spec | 9 +++++++++ tools/make_specfiles | 1 + 5 files changed, 14 insertions(+) diff --git a/configure b/configure index 1011c3d..48abef9 100755 --- a/configure +++ b/configure @@ -933,6 +933,7 @@ enable_api_ms_win_core_localization_l1_2_1 enable_api_ms_win_core_localization_l2_1_0 enable_api_ms_win_core_localization_obsolete_l1_1_0 enable_api_ms_win_core_localization_obsolete_l1_2_0 +enable_api_ms_win_core_localization_obsolete_l1_3_0 enable_api_ms_win_core_localization_private_l1_1_0 enable_api_ms_win_core_localregistry_l1_1_0 enable_api_ms_win_core_memory_l1_1_0 @@ -18009,6 +18010,7 @@ wine_fn_config_dll api-ms-win-core-localization-l1-2-1 enable_api_ms_win_core_lo wine_fn_config_dll api-ms-win-core-localization-l2-1-0 enable_api_ms_win_core_localization_l2_1_0 wine_fn_config_dll api-ms-win-core-localization-obsolete-l1-1-0 enable_api_ms_win_core_localization_obsolete_l1_1_0 wine_fn_config_dll api-ms-win-core-localization-obsolete-l1-2-0 enable_api_ms_win_core_localization_obsolete_l1_2_0 +wine_fn_config_dll api-ms-win-core-localization-obsolete-l1-3-0 enable_api_ms_win_core_localization_obsolete_l1_3_0 wine_fn_config_dll api-ms-win-core-localization-private-l1-1-0 enable_api_ms_win_core_localization_private_l1_1_0 wine_fn_config_dll api-ms-win-core-localregistry-l1-1-0 enable_api_ms_win_core_localregistry_l1_1_0 wine_fn_config_dll api-ms-win-core-memory-l1-1-0 enable_api_ms_win_core_memory_l1_1_0 diff --git a/configure.ac b/configure.ac index fac6ba0..3cd4fee 100644 --- a/configure.ac +++ b/configure.ac @@ -2788,6 +2788,7 @@ WINE_CONFIG_DLL(api-ms-win-core-localization-l1-2-1) WINE_CONFIG_DLL(api-ms-win-core-localization-l2-1-0) WINE_CONFIG_DLL(api-ms-win-core-localization-obsolete-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-localization-obsolete-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-core-localization-obsolete-l1-3-0) WINE_CONFIG_DLL(api-ms-win-core-localization-private-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-memory-l1-1-0) diff --git a/dlls/api-ms-win-core-localization-obsolete-l1-3-0/Makefile.in b/dlls/api-ms-win-core-localization-obsolete-l1-3-0/Makefile.in new file mode 100644 index 0000000..4624581 --- /dev/null +++ b/dlls/api-ms-win-core-localization-obsolete-l1-3-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-localization-obsolete-l1-3-0.dll diff --git a/dlls/api-ms-win-core-localization-obsolete-l1-3-0/api-ms-win-core-localization-obsolete-l1-3-0.spec b/dlls/api-ms-win-core-localization-obsolete-l1-3-0/api-ms-win-core-localization-obsolete-l1-3-0.spec new file mode 100644 index 0000000..70473b4 --- /dev/null +++ b/dlls/api-ms-win-core-localization-obsolete-l1-3-0/api-ms-win-core-localization-obsolete-l1-3-0.spec @@ -0,0 +1,9 @@ +@ stdcall CompareStringA(long long str long str long) kernel32.CompareStringA +@ stdcall EnumLanguageGroupLocalesW(ptr long long ptr) kernel32.EnumLanguageGroupLocalesW +@ stdcall EnumSystemLanguageGroupsW(ptr long ptr) kernel32.EnumSystemLanguageGroupsW +@ stdcall EnumUILanguagesW(ptr long long) kernel32.EnumUILanguagesW +@ stdcall GetNumberFormatW(long long wstr ptr ptr long) kernel32.GetNumberFormatW +@ stdcall GetStringTypeA(long long str long ptr) kernel32.GetStringTypeA +@ stdcall GetSystemDefaultLocaleName(ptr long) kernel32.GetSystemDefaultLocaleName +@ stdcall GetSystemDefaultUILanguage() kernel32.GetSystemDefaultUILanguage +@ stdcall GetUserDefaultUILanguage() kernel32.GetUserDefaultUILanguage diff --git a/tools/make_specfiles b/tools/make_specfiles index 0ff4a57..eddb7d3 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -226,6 +226,7 @@ my @dll_groups = "api-ms-win-core-localization-l2-1-0", "api-ms-win-core-localization-obsolete-l1-1-0", "api-ms-win-core-localization-obsolete-l1-2-0", + "api-ms-win-core-localization-obsolete-l1-3-0", "api-ms-win-core-localization-private-l1-1-0", "api-ms-win-core-memory-l1-1-0", "api-ms-win-core-memory-l1-1-1",

1 0

Fabian Maurer : api-ms-win-core-heap-l2-1-0: Add dll.
by Alexandre Julliard 07 Sep '17

07 Sep '17

Module: wine Branch: master Commit: 9ec3939386c7cd462594c2a4327382c623f6157e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ec3939386c7cd462594c2a43… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Sep 7 20:03:06 2017 +0200 api-ms-win-core-heap-l2-1-0: Add dll. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-heap-l2-1-0/Makefile.in | 1 + dlls/api-ms-win-core-heap-l2-1-0/api-ms-win-core-heap-l2-1-0.spec | 7 +++++++ tools/make_specfiles | 1 + 5 files changed, 12 insertions(+) diff --git a/configure b/configure index 3abee30..1011c3d 100755 --- a/configure +++ b/configure @@ -912,6 +912,7 @@ enable_api_ms_win_core_file_l2_1_1 enable_api_ms_win_core_handle_l1_1_0 enable_api_ms_win_core_heap_l1_1_0 enable_api_ms_win_core_heap_l1_2_0 +enable_api_ms_win_core_heap_l2_1_0 enable_api_ms_win_core_heap_obsolete_l1_1_0 enable_api_ms_win_core_interlocked_l1_1_0 enable_api_ms_win_core_interlocked_l1_2_0 @@ -17987,6 +17988,7 @@ wine_fn_config_dll api-ms-win-core-file-l2-1-1 enable_api_ms_win_core_file_l2_1_ wine_fn_config_dll api-ms-win-core-handle-l1-1-0 enable_api_ms_win_core_handle_l1_1_0 wine_fn_config_dll api-ms-win-core-heap-l1-1-0 enable_api_ms_win_core_heap_l1_1_0 wine_fn_config_dll api-ms-win-core-heap-l1-2-0 enable_api_ms_win_core_heap_l1_2_0 +wine_fn_config_dll api-ms-win-core-heap-l2-1-0 enable_api_ms_win_core_heap_l2_1_0 wine_fn_config_dll api-ms-win-core-heap-obsolete-l1-1-0 enable_api_ms_win_core_heap_obsolete_l1_1_0 wine_fn_config_dll api-ms-win-core-interlocked-l1-1-0 enable_api_ms_win_core_interlocked_l1_1_0 wine_fn_config_dll api-ms-win-core-interlocked-l1-2-0 enable_api_ms_win_core_interlocked_l1_2_0 diff --git a/configure.ac b/configure.ac index bf73b65..fac6ba0 100644 --- a/configure.ac +++ b/configure.ac @@ -2767,6 +2767,7 @@ WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-1) WINE_CONFIG_DLL(api-ms-win-core-handle-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-heap-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-heap-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-core-heap-l2-1-0) WINE_CONFIG_DLL(api-ms-win-core-heap-obsolete-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-interlocked-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-interlocked-l1-2-0) diff --git a/dlls/api-ms-win-core-heap-l2-1-0/Makefile.in b/dlls/api-ms-win-core-heap-l2-1-0/Makefile.in new file mode 100644 index 0000000..3caed9e --- /dev/null +++ b/dlls/api-ms-win-core-heap-l2-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-heap-l2-1-0.dll diff --git a/dlls/api-ms-win-core-heap-l2-1-0/api-ms-win-core-heap-l2-1-0.spec b/dlls/api-ms-win-core-heap-l2-1-0/api-ms-win-core-heap-l2-1-0.spec new file mode 100644 index 0000000..81308d2 --- /dev/null +++ b/dlls/api-ms-win-core-heap-l2-1-0/api-ms-win-core-heap-l2-1-0.spec @@ -0,0 +1,7 @@ +@ stdcall GlobalAlloc(long long) kernel32.GlobalAlloc +@ stdcall GlobalFree(long) kernel32.GlobalFree +@ stdcall LocalAlloc(long long) kernel32.LocalAlloc +@ stdcall LocalFree(long) kernel32.LocalFree +@ stdcall LocalLock(long) kernel32.LocalLock +@ stdcall LocalReAlloc(long long long) kernel32.LocalReAlloc +@ stdcall LocalUnlock(long) kernel32.LocalUnlock diff --git a/tools/make_specfiles b/tools/make_specfiles index b506f73..0ff4a57 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -211,6 +211,7 @@ my @dll_groups = "api-ms-win-core-handle-l1-1-0", "api-ms-win-core-heap-l1-1-0", "api-ms-win-core-heap-l1-2-0", + "api-ms-win-core-heap-l2-1-0", "api-ms-win-core-heap-obsolete-l1-1-0", "api-ms-win-core-io-l1-1-0", "api-ms-win-core-io-l1-1-1",

1 0

Alexandre Julliard : ntdll: Store memory views in a binary tree instead of a list.
by Alexandre Julliard 07 Sep '17

07 Sep '17

Module: wine Branch: master Commit: 2967e3efb6cb83decfa75e5d2e1d9e7da44130c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2967e3efb6cb83decfa75e5d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 7 19:31:42 2017 +0200 ntdll: Store memory views in a binary tree instead of a list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 150 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 90 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2967e3efb6cb83decfa75…

1 0

Alexandre Julliard : rbtree.h: Add a wine_rb_prev iteration helper function.
by Alexandre Julliard 07 Sep '17

07 Sep '17

Module: wine Branch: master Commit: c1d46149e0bdaf59aa2251fc6b9c692b8c2f52e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1d46149e0bdaf59aa2251fc6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 7 19:31:26 2017 +0200 rbtree.h: Add a wine_rb_prev iteration helper function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/rbtree.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/wine/rbtree.h b/include/wine/rbtree.h index 65d9a90..bb4edf5 100644 --- a/include/wine/rbtree.h +++ b/include/wine/rbtree.h @@ -101,6 +101,13 @@ static inline struct wine_rb_entry *wine_rb_head(struct wine_rb_entry *iter) return iter; } +static inline struct wine_rb_entry *wine_rb_tail(struct wine_rb_entry *iter) +{ + if (!iter) return NULL; + while (iter->right) iter = iter->right; + return iter; +} + static inline struct wine_rb_entry *wine_rb_next(struct wine_rb_entry *iter) { if (iter->right) return wine_rb_head(iter->right); @@ -108,6 +115,13 @@ static inline struct wine_rb_entry *wine_rb_next(struct wine_rb_entry *iter) return iter->parent; } +static inline struct wine_rb_entry *wine_rb_prev(struct wine_rb_entry *iter) +{ + if (iter->left) return wine_rb_tail(iter->left); + while (iter->parent && iter->parent->left == iter) iter = iter->parent; + return iter->parent; +} + static inline struct wine_rb_entry *wine_rb_postorder_head(struct wine_rb_entry *iter) { if (!iter) return NULL;

1 0

Alexandre Julliard : ntdll: Use the find_view_range helper function to check for overlapping views.
by Alexandre Julliard 07 Sep '17

07 Sep '17

Module: wine Branch: master Commit: 917d98a457f2beaf59b39b99a0e13f7a90146cfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=917d98a457f2beaf59b39b99a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 7 18:52:48 2017 +0200 ntdll: Use the find_view_range helper function to check for overlapping views. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 48 +++++++++++++----------------------------------- 1 file changed, 13 insertions(+), 35 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index a730417..21cc9f5 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -638,6 +638,18 @@ static NTSTATUS create_view( struct file_view **view_ret, void *base, size_t siz assert( !((UINT_PTR)base & page_mask) ); assert( !(size & page_mask) ); + /* Check for overlapping views. This can happen if the previous view + * was a system view that got unmapped behind our back. In that case + * we recover by simply deleting it. */ + + while ((view = find_view_range( base, size ))) + { + TRACE( "overlapping view %p-%p for %p-%p\n", + view->base, (char *)view->base + view->size, base, (char *)base + size ); + assert( view->protect & VPROT_SYSTEM ); + delete_view( view ); + } + if (!alloc_pages_vprot( base, size )) return STATUS_NO_MEMORY; /* Create the view structure */ @@ -664,35 +676,6 @@ static NTSTATUS create_view( struct file_view **view_ret, void *base, size_t siz } list_add_before( ptr, &view->entry ); - /* Check for overlapping views. This can happen if the previous view - * was a system view that got unmapped behind our back. In that case - * we recover by simply deleting it. */ - - if ((ptr = list_prev( &views_list, &view->entry )) != NULL) - { - struct file_view *prev = LIST_ENTRY( ptr, struct file_view, entry ); - if ((char *)prev->base + prev->size > (char *)base) - { - TRACE( "overlapping prev view %p-%p for %p-%p\n", - prev->base, (char *)prev->base + prev->size, - base, (char *)base + view->size ); - assert( prev->protect & VPROT_SYSTEM ); - delete_view( prev ); - } - } - if ((ptr = list_next( &views_list, &view->entry )) != NULL) - { - struct file_view *next = LIST_ENTRY( ptr, struct file_view, entry ); - if ((char *)base + view->size > (char *)next->base) - { - TRACE( "overlapping next view %p-%p for %p-%p\n", - next->base, (char *)next->base + next->size, - base, (char *)base + view->size ); - assert( next->protect & VPROT_SYSTEM ); - delete_view( next ); - } - } - *view_ret = view; VIRTUAL_DEBUG_DUMP_VIEW( view ); @@ -1187,15 +1170,10 @@ static NTSTATUS allocate_dos_memory( struct file_view **view, unsigned int vprot void * const low_64k = (void *)0x10000; const size_t dosmem_size = 0x110000; int unix_prot = VIRTUAL_GetUnixProt( vprot ); - struct list *ptr; /* check for existing view */ - if ((ptr = list_head( &views_list ))) - { - struct file_view *first_view = LIST_ENTRY( ptr, struct file_view, entry ); - if (first_view->base < (void *)dosmem_size) return STATUS_CONFLICTING_ADDRESSES; - } + if (find_view_range( 0, dosmem_size )) return STATUS_CONFLICTING_ADDRESSES; /* check without the first 64K */

1 0

Fabian Maurer : user32: Add stub for CalcMenuBar.
by Alexandre Julliard 07 Sep '17

07 Sep '17

Module: wine Branch: master Commit: 5e59e9b34c232caf9c49f22d9fab9edfded37894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e59e9b34c232caf9c49f22d9… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Sep 7 17:40:08 2017 +0200 user32: Add stub for CalcMenuBar. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 10 ++++++++++ dlls/user32/user32.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 5866383..a5f2317 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -5289,6 +5289,16 @@ INT WINAPI MenuItemFromPoint(HWND hWnd, HMENU hMenu, POINT ptScreen) /********************************************************************** + * CalcMenuBar (USER32.@) + */ +DWORD WINAPI CalcMenuBar(HWND hwnd, DWORD left, DWORD right, DWORD top, RECT *rect) +{ + FIXME("(%p, %d, %d, %d, %p): stub\n", hwnd, left, right, top, rect); + return 0; +} + + +/********************************************************************** * translate_accelerator */ static BOOL translate_accelerator( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam, diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 9407c34..e45cafa 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -22,7 +22,7 @@ @ stdcall BroadcastSystemMessageW(long ptr long long long) # @ stub BuildReasonArray @ stdcall CalcChildScroll(long long) -# @ stub CalcMenuBar +@ stdcall CalcMenuBar(long long long long ptr) CalcMenuBar @ stdcall CallMsgFilter(ptr long) CallMsgFilterA @ stdcall CallMsgFilterA(ptr long) @ stdcall CallMsgFilterW(ptr long)

1 0

Alex Henrie : include: Add multimon.h.
by Alexandre Julliard 07 Sep '17

07 Sep '17

Module: wine Branch: master Commit: 6501192b2db9b6c544133ba98cad3e186a71a6bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6501192b2db9b6c544133ba98… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Sep 7 09:11:15 2017 -0600 include: Add multimon.h. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/multimon.h | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index fcdd8b3..8a774e9 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -522,6 +522,7 @@ HEADER_SRCS = \ msxml6did.h \ msxmldid.h \ mtxdm.h \ + multimon.h \ nb30.h \ ncrypt.h \ ndrtypes.h \ diff --git a/include/multimon.h b/include/multimon.h new file mode 100644 index 0000000..22f00ab --- /dev/null +++ b/include/multimon.h @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2017 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* This file intentionally left blank */

1 0

Alex Henrie : ucrtbase: Add __stdio_common_vfwprintf_s.
by Alexandre Julliard 07 Sep '17

07 Sep '17

Module: wine Branch: master Commit: efaeb5cf8aa336627c0398bac2a1b88fb79606f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efaeb5cf8aa336627c0398bac… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Sep 4 12:06:58 2017 -0600 ucrtbase: Add __stdio_common_vfwprintf_s. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcrt/file.c | 27 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 6196fb4..6c46519 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -7,7 +7,7 @@ @ cdecl __stdio_common_vfscanf(int64 ptr str ptr ptr) ucrtbase.__stdio_common_vfscanf @ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) ucrtbase.__stdio_common_vfwprintf @ stub __stdio_common_vfwprintf_p -@ stub __stdio_common_vfwprintf_s +@ cdecl __stdio_common_vfwprintf_s(int64 ptr wstr ptr ptr) ucrtbase.__stdio_common_vfwprintf_s @ cdecl __stdio_common_vfwscanf(int64 ptr wstr ptr ptr) ucrtbase.__stdio_common_vfwscanf @ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) ucrtbase.__stdio_common_vsnprintf_s @ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) ucrtbase.__stdio_common_vsnwprintf_s diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 1c63202..eb474c5 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -5185,6 +5185,33 @@ int CDECL MSVCRT__stdio_common_vfwprintf(unsigned __int64 options, MSVCRT_FILE * return ret; } +/********************************************************************* + * __stdio_common_vfwprintf_s (UCRTBASE.@) + */ +int CDECL MSVCRT__stdio_common_vfwprintf_s(unsigned __int64 options, MSVCRT_FILE *file, const MSVCRT_wchar_t *format, + MSVCRT__locale_t locale, __ms_va_list valist) +{ + BOOL tmp_buf; + int ret; + + if (!MSVCRT_CHECK_PMT(file != NULL)) return -1; + if (!MSVCRT_CHECK_PMT(format != NULL)) return -1; + + MSVCRT__lock_file(file); + tmp_buf = add_std_buffer(file); + + if (options & ~UCRTBASE_PRINTF_MASK) + FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); + + ret = pf_printf_w(puts_clbk_file_w, file, format, locale, + (options & UCRTBASE_PRINTF_MASK) | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, + arg_clbk_valist, NULL, &valist); + + if (tmp_buf) remove_std_buffer(file); + MSVCRT__unlock_file(file); + + return ret; +} /********************************************************************* * _vfwprintf_l (MSVCRT.@) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 6ba0ae0..90ee5b6 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -152,7 +152,7 @@ @ cdecl __stdio_common_vfscanf(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfscanf @ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwprintf @ stub __stdio_common_vfwprintf_p -@ stub __stdio_common_vfwprintf_s +@ cdecl __stdio_common_vfwprintf_s(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwprintf_s @ cdecl __stdio_common_vfwscanf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwscanf @ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) MSVCRT__stdio_common_vsnprintf_s @ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) MSVCRT__stdio_common_vsnwprintf_s

1 0

Alex Henrie : ucrtbase: Add __stdio_common_vfprintf_s.
by Alexandre Julliard 07 Sep '17

07 Sep '17

Module: wine Branch: master Commit: a116f4a7abfe09182eb488a033dbbf0c20e2f9f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a116f4a7abfe09182eb488a03… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Sep 4 12:06:57 2017 -0600 ucrtbase: Add __stdio_common_vfprintf_s. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcrt/file.c | 27 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 6acd08e..6196fb4 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -3,7 +3,7 @@ @ cdecl __p__fmode() ucrtbase.__p__fmode @ cdecl __stdio_common_vfprintf(int64 ptr str ptr ptr) ucrtbase.__stdio_common_vfprintf @ stub __stdio_common_vfprintf_p -@ stub __stdio_common_vfprintf_s +@ cdecl __stdio_common_vfprintf_s(int64 ptr str ptr ptr) ucrtbase.__stdio_common_vfprintf_s @ cdecl __stdio_common_vfscanf(int64 ptr str ptr ptr) ucrtbase.__stdio_common_vfscanf @ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) ucrtbase.__stdio_common_vfwprintf @ stub __stdio_common_vfwprintf_p diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 6dcb194..1c63202 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -5132,6 +5132,33 @@ int CDECL MSVCRT__stdio_common_vfprintf(unsigned __int64 options, MSVCRT_FILE *f } /********************************************************************* + * __stdio_common_vfprintf_s (UCRTBASE.@) + */ +int CDECL MSVCRT__stdio_common_vfprintf_s(unsigned __int64 options, MSVCRT_FILE *file, const char *format, + MSVCRT__locale_t locale, __ms_va_list valist) +{ + BOOL tmp_buf; + int ret; + + if (!MSVCRT_CHECK_PMT(file != NULL)) return -1; + + MSVCRT__lock_file(file); + tmp_buf = add_std_buffer(file); + + if (options & ~UCRTBASE_PRINTF_MASK) + FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); + + ret = pf_printf_a(puts_clbk_file_a, file, format, locale, + (options & UCRTBASE_PRINTF_MASK) | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, + arg_clbk_valist, NULL, &valist); + + if (tmp_buf) remove_std_buffer(file); + MSVCRT__unlock_file(file); + + return ret; +} + +/********************************************************************* * __stdio_common_vfwprintf (UCRTBASE.@) */ int CDECL MSVCRT__stdio_common_vfwprintf(unsigned __int64 options, MSVCRT_FILE *file, const MSVCRT_wchar_t *format, diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index ce1e24e..6ba0ae0 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -148,7 +148,7 @@ @ cdecl __std_type_info_name(ptr ptr) MSVCRT_type_info_name_list @ cdecl __stdio_common_vfprintf(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf @ stub __stdio_common_vfprintf_p -@ stub __stdio_common_vfprintf_s +@ cdecl __stdio_common_vfprintf_s(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf_s @ cdecl __stdio_common_vfscanf(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfscanf @ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwprintf @ stub __stdio_common_vfwprintf_p

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
45
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2017