October 2016 - Wine-commits

Nikolay Sivov : dwrite: Update to IDWriteFontFace4.
by Alexandre Julliard 31 Oct '16

31 Oct '16

Module: wine Branch: master Commit: 9bf1114d7189f576a8a5d84f2f05b2df645036b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf1114d7189f576a8a5d84f2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 29 21:25:54 2016 +0300 dwrite: Update to IDWriteFontFace4. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 28 ++-- dlls/dwrite/font.c | 358 +++++++++++++++++++++++-------------------- dlls/dwrite/freetype.c | 44 +++--- dlls/dwrite/main.c | 14 +- dlls/dwrite/opentype.c | 6 +- 5 files changed, 242 insertions(+), 208 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9bf1114d7189f576a8a5d…

1 0

Bruno Jesus : xinput1_3: Prefer builtin DLL.
by Alexandre Julliard 31 Oct '16

31 Oct '16

Module: wine Branch: master Commit: 4b09e848b8867683007f4c90ac589b43dfdc5707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b09e848b8867683007f4c90a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Oct 29 23:13:25 2016 -0200 xinput1_3: Prefer builtin DLL. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/xinput1_3_main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput1_3_main.c index 04732eb..5f88ca1 100644 --- a/dlls/xinput1_3/xinput1_3_main.c +++ b/dlls/xinput1_3/xinput1_3_main.c @@ -43,8 +43,6 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) { switch(reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(inst); break;

1 0

Nikolay Sivov : xmllite: Store and return MultiLanguage reader property.
by Alexandre Julliard 31 Oct '16

31 Oct '16

Module: wine Branch: master Commit: ac83cb99ee1736a5f77b6b7abbca506a37708507 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac83cb99ee1736a5f77b6b7ab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 30 11:05:28 2016 +0300 xmllite: Store and return MultiLanguage reader property. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index b6fce80..deab301 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -244,6 +244,7 @@ typedef struct XmlNodeType nodetype; DtdProcessing dtdmode; IXmlResolver *resolver; + IUnknown *mlang; UINT line, pos; /* reader position in XML stream */ struct list attrs; /* attributes list for current node */ struct attribute *attr; /* current attribute */ @@ -2474,6 +2475,7 @@ static ULONG WINAPI xmlreader_Release(IXmlReader *iface) IMalloc *imalloc = This->imalloc; if (This->input) IUnknown_Release(&This->input->IXmlReaderInput_iface); if (This->resolver) IXmlResolver_Release(This->resolver); + if (This->mlang) IUnknown_Release(This->mlang); reader_clear_attrs(This); reader_clear_elements(This); reader_free_strvalues(This); @@ -2558,6 +2560,11 @@ static HRESULT WINAPI xmlreader_GetProperty(IXmlReader* iface, UINT property, LO switch (property) { + case XmlReaderProperty_MultiLanguage: + *value = (LONG_PTR)This->mlang; + if (This->mlang) + IUnknown_AddRef(This->mlang); + break; case XmlReaderProperty_XmlResolver: *value = (LONG_PTR)This->resolver; if (This->resolver) @@ -2586,8 +2593,13 @@ static HRESULT WINAPI xmlreader_SetProperty(IXmlReader* iface, UINT property, LO switch (property) { case XmlReaderProperty_MultiLanguage: - if (value) - FIXME("Ignoring MultiLanguage %lx\n", value); + if (This->mlang) + IUnknown_Release(This->mlang); + This->mlang = (IUnknown*)value; + if (This->mlang) + IUnknown_AddRef(This->mlang); + if (This->mlang) + FIXME("Ignoring MultiLanguage %p\n", This->mlang); break; case XmlReaderProperty_XmlResolver: if (This->resolver) @@ -2996,6 +3008,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) reader->resumestate = XmlReadResumeState_Initial; reader->dtdmode = DtdProcessing_Prohibit; reader->resolver = NULL; + reader->mlang = NULL; reader->line = reader->pos = 0; reader->imalloc = imalloc; if (imalloc) IMalloc_AddRef(imalloc);

1 0

Andrey Gusev : api-ms-win-rtcore-ntuser-private-l1-1-0: Add dll.
by Alexandre Julliard 31 Oct '16

31 Oct '16

Module: wine Branch: master Commit: ff4ac5f5bcd56654b857bed246aaa7cecd09f88e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff4ac5f5bcd56654b857bed24… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Oct 29 13:53:30 2016 +0300 api-ms-win-rtcore-ntuser-private-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-rtcore-ntuser-private-l1-1-0/Makefile.in | 1 + .../api-ms-win-rtcore-ntuser-private-l1-1-0.spec | 9 +++++++++ tools/make_specfiles | 1 + 5 files changed, 14 insertions(+) diff --git a/configure b/configure index a6934ea..8c0e9f5 100755 --- a/configure +++ b/configure @@ -1010,6 +1010,7 @@ enable_api_ms_win_eventing_controller_l1_1_0 enable_api_ms_win_eventing_provider_l1_1_0 enable_api_ms_win_eventlog_legacy_l1_1_0 enable_api_ms_win_ntuser_dc_access_l1_1_0 +enable_api_ms_win_rtcore_ntuser_private_l1_1_0 enable_api_ms_win_security_audit_l1_1_1 enable_api_ms_win_security_base_l1_1_0 enable_api_ms_win_security_base_l1_2_0 @@ -17705,6 +17706,7 @@ wine_fn_config_dll api-ms-win-eventing-controller-l1-1-0 enable_api_ms_win_event wine_fn_config_dll api-ms-win-eventing-provider-l1-1-0 enable_api_ms_win_eventing_provider_l1_1_0 wine_fn_config_dll api-ms-win-eventlog-legacy-l1-1-0 enable_api_ms_win_eventlog_legacy_l1_1_0 wine_fn_config_dll api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_dc_access_l1_1_0 +wine_fn_config_dll api-ms-win-rtcore-ntuser-private-l1-1-0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 wine_fn_config_dll api-ms-win-security-audit-l1-1-1 enable_api_ms_win_security_audit_l1_1_1 wine_fn_config_dll api-ms-win-security-base-l1-1-0 enable_api_ms_win_security_base_l1_1_0 wine_fn_config_dll api-ms-win-security-base-l1-2-0 enable_api_ms_win_security_base_l1_2_0 diff --git a/configure.ac b/configure.ac index 84316f9..94b494b 100644 --- a/configure.ac +++ b/configure.ac @@ -2787,6 +2787,7 @@ WINE_CONFIG_DLL(api-ms-win-eventing-controller-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventing-provider-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventlog-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-rtcore-ntuser-private-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-audit-l1-1-1) WINE_CONFIG_DLL(api-ms-win-security-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-base-l1-2-0) diff --git a/dlls/api-ms-win-rtcore-ntuser-private-l1-1-0/Makefile.in b/dlls/api-ms-win-rtcore-ntuser-private-l1-1-0/Makefile.in new file mode 100644 index 0000000..a831ede --- /dev/null +++ b/dlls/api-ms-win-rtcore-ntuser-private-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-rtcore-ntuser-private-l1-1-0.dll diff --git a/dlls/api-ms-win-rtcore-ntuser-private-l1-1-0/api-ms-win-rtcore-ntuser-private-l1-1-0.spec b/dlls/api-ms-win-rtcore-ntuser-private-l1-1-0/api-ms-win-rtcore-ntuser-private-l1-1-0.spec new file mode 100644 index 0000000..1520a5b --- /dev/null +++ b/dlls/api-ms-win-rtcore-ntuser-private-l1-1-0/api-ms-win-rtcore-ntuser-private-l1-1-0.spec @@ -0,0 +1,9 @@ +@ stub CreateDCompositionHwndTarget +@ stub CreateWindowInBand +@ stub DestroyDCompositionHwndTarget +@ stdcall GetTaskmanWindow() user32.GetTaskmanWindow +@ stub GetWindowBand +@ stub IsWindowInDestroy +@ stub RegisterSessionPort +@ stdcall SetTaskmanWindow(long) user32.SetTaskmanWindow +@ stub UnregisterSessionPort diff --git a/tools/make_specfiles b/tools/make_specfiles index 8e11529..8ca5437 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -266,6 +266,7 @@ my @dll_groups = "api-ms-win-core-string-l2-1-0", "api-ms-win-downlevel-user32-l1-1-0", "api-ms-win-ntuser-dc-access-l1-1-0", + "api-ms-win-rtcore-ntuser-private-l1-1-0", "ext-ms-win-ntuser-message-l1-1-1", "ext-ms-win-ntuser-uicontext-ext-l1-1-0", "ext-ms-win-rtcore-ntuser-dpi-l1-1-0",

1 0

Andrey Gusev : ext-ms-win-ntuser-private-l1-1-1: Add dll.
by Alexandre Julliard 31 Oct '16

31 Oct '16

Module: wine Branch: master Commit: 1fbeca51a5873b5e78352ac7a444e2faa6e4df54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fbeca51a5873b5e78352ac7a… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Oct 29 14:16:38 2016 +0300 ext-ms-win-ntuser-private-l1-1-1: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-ntuser-private-l1-1-1/Makefile.in | 1 + .../ext-ms-win-ntuser-private-l1-1-1.spec | 24 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 29 insertions(+) diff --git a/configure b/configure index 8c0e9f5..8503d79 100755 --- a/configure +++ b/configure @@ -1167,6 +1167,7 @@ enable_ext_ms_win_gdi_dc_create_l1_1_1 enable_ext_ms_win_gdi_devcaps_l1_1_0 enable_ext_ms_win_kernel32_package_current_l1_1_0 enable_ext_ms_win_ntuser_message_l1_1_1 +enable_ext_ms_win_ntuser_private_l1_1_1 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 enable_faultrep @@ -17928,6 +17929,7 @@ wine_fn_config_dll ext-ms-win-gdi-dc-create-l1-1-1 enable_ext_ms_win_gdi_dc_crea wine_fn_config_dll ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi_devcaps_l1_1_0 wine_fn_config_dll ext-ms-win-kernel32-package-current-l1-1-0 enable_ext_ms_win_kernel32_package_current_l1_1_0 wine_fn_config_dll ext-ms-win-ntuser-message-l1-1-1 enable_ext_ms_win_ntuser_message_l1_1_1 +wine_fn_config_dll ext-ms-win-ntuser-private-l1-1-1 enable_ext_ms_win_ntuser_private_l1_1_1 wine_fn_config_dll ext-ms-win-ntuser-uicontext-ext-l1-1-0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 wine_fn_config_dll ext-ms-win-rtcore-ntuser-dpi-l1-1-0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 wine_fn_config_dll faultrep enable_faultrep implib diff --git a/configure.ac b/configure.ac index 94b494b..5f2fc55 100644 --- a/configure.ac +++ b/configure.ac @@ -3009,6 +3009,7 @@ WINE_CONFIG_DLL(ext-ms-win-gdi-dc-create-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-message-l1-1-1) +WINE_CONFIG_DLL(ext-ms-win-ntuser-private-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-ntuser-uicontext-ext-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0) WINE_CONFIG_DLL(faultrep,,[implib]) diff --git a/dlls/ext-ms-win-ntuser-private-l1-1-1/Makefile.in b/dlls/ext-ms-win-ntuser-private-l1-1-1/Makefile.in new file mode 100644 index 0000000..e4c4e77 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-private-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-private-l1-1-1.dll diff --git a/dlls/ext-ms-win-ntuser-private-l1-1-1/ext-ms-win-ntuser-private-l1-1-1.spec b/dlls/ext-ms-win-ntuser-private-l1-1-1/ext-ms-win-ntuser-private-l1-1-1.spec new file mode 100644 index 0000000..958837b --- /dev/null +++ b/dlls/ext-ms-win-ntuser-private-l1-1-1/ext-ms-win-ntuser-private-l1-1-1.spec @@ -0,0 +1,24 @@ +@ stub CancelShutdown +@ stub CreateWindowInBand +@ stub DwmGetRemoteSessionOcclusionEvent +@ stub DwmGetRemoteSessionOcclusionState +@ stub DwmLockScreenUpdates +@ stub GetClipboardAccessToken +@ stub GetWindowBand +@ stub GetWindowCompositionAttribute +@ stub IsQueueAttached +@ stub IsThreadDesktopComposited +@ stub IsThreadMessageQueueAttached +@ stdcall LoadLocalFonts() user32.LoadLocalFonts +@ stub LoadRemoteFonts +@ stub LockWindowStation +@ stub RecordShutdownReason +@ stdcall RegisterLogonProcess(long long) user32.RegisterLogonProcess +@ stub SetThreadInputBlocked +@ stub SetWindowCompositionAttribute +@ stdcall SetWindowStationUser(long long) user32.SetWindowStationUser +@ stub SwitchDesktopWithFade +@ stub UnlockWindowStation +@ stub UpdatePerUserSystemParameters +@ stub UpdateWindowInputSinkHints +@ stub WaitForRedirectionStartComplete diff --git a/tools/make_specfiles b/tools/make_specfiles index 8ca5437..7d42a22 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -268,6 +268,7 @@ my @dll_groups = "api-ms-win-ntuser-dc-access-l1-1-0", "api-ms-win-rtcore-ntuser-private-l1-1-0", "ext-ms-win-ntuser-message-l1-1-1", + "ext-ms-win-ntuser-private-l1-1-1", "ext-ms-win-ntuser-uicontext-ext-l1-1-0", "ext-ms-win-rtcore-ntuser-dpi-l1-1-0", ],

1 0

Andrey Gusev : ext-ms-win-ntuser-rectangle-ext-l1-1-0: Add dll.
by Alexandre Julliard 31 Oct '16

31 Oct '16

Module: wine Branch: master Commit: 025ea7a93cdbe4b3f04679af3a64be10e877617c URL: http://source.winehq.org/git/wine.git/?a=commit;h=025ea7a93cdbe4b3f04679af3… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Oct 29 14:46:16 2016 +0300 ext-ms-win-ntuser-rectangle-ext-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0/Makefile.in | 1 + .../ext-ms-win-ntuser-rectangle-ext-l1-1-0.spec | 11 +++++++++++ tools/make_specfiles | 1 + 5 files changed, 16 insertions(+) diff --git a/configure b/configure index 8503d79..f688ba2 100755 --- a/configure +++ b/configure @@ -1168,6 +1168,7 @@ enable_ext_ms_win_gdi_devcaps_l1_1_0 enable_ext_ms_win_kernel32_package_current_l1_1_0 enable_ext_ms_win_ntuser_message_l1_1_1 enable_ext_ms_win_ntuser_private_l1_1_1 +enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 enable_faultrep @@ -17930,6 +17931,7 @@ wine_fn_config_dll ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi_devcaps_l wine_fn_config_dll ext-ms-win-kernel32-package-current-l1-1-0 enable_ext_ms_win_kernel32_package_current_l1_1_0 wine_fn_config_dll ext-ms-win-ntuser-message-l1-1-1 enable_ext_ms_win_ntuser_message_l1_1_1 wine_fn_config_dll ext-ms-win-ntuser-private-l1-1-1 enable_ext_ms_win_ntuser_private_l1_1_1 +wine_fn_config_dll ext-ms-win-ntuser-rectangle-ext-l1-1-0 enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 wine_fn_config_dll ext-ms-win-ntuser-uicontext-ext-l1-1-0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 wine_fn_config_dll ext-ms-win-rtcore-ntuser-dpi-l1-1-0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 wine_fn_config_dll faultrep enable_faultrep implib diff --git a/configure.ac b/configure.ac index 5f2fc55..b340889 100644 --- a/configure.ac +++ b/configure.ac @@ -3010,6 +3010,7 @@ WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-message-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-ntuser-private-l1-1-1) +WINE_CONFIG_DLL(ext-ms-win-ntuser-rectangle-ext-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-uicontext-ext-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0) WINE_CONFIG_DLL(faultrep,,[implib]) diff --git a/dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0/Makefile.in b/dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0/Makefile.in new file mode 100644 index 0000000..8f2b420 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-rectangle-ext-l1-1-0.dll diff --git a/dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0/ext-ms-win-ntuser-rectangle-ext-l1-1-0.spec b/dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0/ext-ms-win-ntuser-rectangle-ext-l1-1-0.spec new file mode 100644 index 0000000..35b318a --- /dev/null +++ b/dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0/ext-ms-win-ntuser-rectangle-ext-l1-1-0.spec @@ -0,0 +1,11 @@ +@ stdcall CopyRect(ptr ptr) user32.CopyRect +@ stdcall EqualRect(ptr ptr) user32.EqualRect +@ stdcall InflateRect(ptr long long) user32.InflateRect +@ stdcall IntersectRect(ptr ptr ptr) user32.IntersectRect +@ stdcall IsRectEmpty(ptr) user32.IsRectEmpty +@ stdcall OffsetRect(ptr long long) user32.OffsetRect +@ stdcall PtInRect(ptr int64) user32.PtInRect +@ stdcall SetRect(ptr long long long long) user32.SetRect +@ stdcall SetRectEmpty(ptr) user32.SetRectEmpty +@ stdcall SubtractRect(ptr ptr ptr) user32.SubtractRect +@ stdcall UnionRect(ptr ptr ptr) user32.UnionRect diff --git a/tools/make_specfiles b/tools/make_specfiles index 7d42a22..52c097b 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -269,6 +269,7 @@ my @dll_groups = "api-ms-win-rtcore-ntuser-private-l1-1-0", "ext-ms-win-ntuser-message-l1-1-1", "ext-ms-win-ntuser-private-l1-1-1", + "ext-ms-win-ntuser-rectangle-ext-l1-1-0", "ext-ms-win-ntuser-uicontext-ext-l1-1-0", "ext-ms-win-rtcore-ntuser-dpi-l1-1-0", ],

1 0

Andrey Gusev : ext-ms-win-ntuser-window-l1-1-1: Add dll.
by Alexandre Julliard 31 Oct '16

31 Oct '16

Module: wine Branch: master Commit: fd1333f2f31733efa94dc784cb17be6693d9d4d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd1333f2f31733efa94dc784c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Oct 29 16:21:45 2016 +0300 ext-ms-win-ntuser-window-l1-1-1: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/ext-ms-win-ntuser-window-l1-1-1/Makefile.in | 1 + .../ext-ms-win-ntuser-window-l1-1-1.spec | 55 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 60 insertions(+) diff --git a/configure b/configure index f688ba2..b04ac21 100755 --- a/configure +++ b/configure @@ -1170,6 +1170,7 @@ enable_ext_ms_win_ntuser_message_l1_1_1 enable_ext_ms_win_ntuser_private_l1_1_1 enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 +enable_ext_ms_win_ntuser_window_l1_1_1 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 enable_faultrep enable_fltlib @@ -17933,6 +17934,7 @@ wine_fn_config_dll ext-ms-win-ntuser-message-l1-1-1 enable_ext_ms_win_ntuser_mes wine_fn_config_dll ext-ms-win-ntuser-private-l1-1-1 enable_ext_ms_win_ntuser_private_l1_1_1 wine_fn_config_dll ext-ms-win-ntuser-rectangle-ext-l1-1-0 enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 wine_fn_config_dll ext-ms-win-ntuser-uicontext-ext-l1-1-0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 +wine_fn_config_dll ext-ms-win-ntuser-window-l1-1-1 enable_ext_ms_win_ntuser_window_l1_1_1 wine_fn_config_dll ext-ms-win-rtcore-ntuser-dpi-l1-1-0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 wine_fn_config_dll faultrep enable_faultrep implib wine_fn_config_test dlls/faultrep/tests faultrep_test diff --git a/configure.ac b/configure.ac index b340889..8afeeba 100644 --- a/configure.ac +++ b/configure.ac @@ -3012,6 +3012,7 @@ WINE_CONFIG_DLL(ext-ms-win-ntuser-message-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-ntuser-private-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-ntuser-rectangle-ext-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-uicontext-ext-l1-1-0) +WINE_CONFIG_DLL(ext-ms-win-ntuser-window-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0) WINE_CONFIG_DLL(faultrep,,[implib]) WINE_CONFIG_TEST(dlls/faultrep/tests) diff --git a/dlls/ext-ms-win-ntuser-window-l1-1-1/Makefile.in b/dlls/ext-ms-win-ntuser-window-l1-1-1/Makefile.in new file mode 100644 index 0000000..2951532 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-window-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-window-l1-1-1.dll diff --git a/dlls/ext-ms-win-ntuser-window-l1-1-1/ext-ms-win-ntuser-window-l1-1-1.spec b/dlls/ext-ms-win-ntuser-window-l1-1-1/ext-ms-win-ntuser-window-l1-1-1.spec new file mode 100644 index 0000000..69488d1 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-window-l1-1-1/ext-ms-win-ntuser-window-l1-1-1.spec @@ -0,0 +1,55 @@ +@ stdcall AdjustWindowRectEx(ptr long long long) user32.AdjustWindowRectEx +@ stdcall AllowSetForegroundWindow(long) user32.AllowSetForegroundWindow +@ stdcall AnimateWindow(long long long) user32.AnimateWindow +@ stdcall BringWindowToTop(long) user32.BringWindowToTop +@ stdcall CallNextHookEx(long long long long) user32.CallNextHookEx +@ stdcall CreateWindowExA(long str str long long long long long long long long ptr) user32.CreateWindowExA +@ stdcall CreateWindowExW(long wstr wstr long long long long long long long long ptr) user32.CreateWindowExW +@ stdcall DefWindowProcA(long long long long) user32.DefWindowProcA +@ stdcall DefWindowProcW(long long long long) user32.DefWindowProcW +@ stdcall DestroyWindow(long) user32.DestroyWindow +@ stdcall EnumChildWindows(long ptr long) user32.EnumChildWindows +@ stdcall EnumThreadWindows(long ptr long) user32.EnumThreadWindows +@ stdcall EnumWindows(ptr long) user32.EnumWindows +@ stdcall FindWindowA(str str) user32.FindWindowA +@ stdcall FindWindowExW(long long wstr wstr) user32.FindWindowExW +@ stdcall FindWindowW(wstr wstr) user32.FindWindowW +@ stdcall GetAncestor(long long) user32.GetAncestor +@ stdcall GetClientRect(long long) user32.GetClientRect +@ stdcall GetDesktopWindow() user32.GetDesktopWindow +@ stdcall GetForegroundWindow() user32.GetForegroundWindow +@ stdcall GetGUIThreadInfo(long ptr) user32.GetGUIThreadInfo +@ stdcall GetLayeredWindowAttributes(long ptr ptr ptr) user32.GetLayeredWindowAttributes +@ stdcall GetParent(long) user32.GetParent +@ stdcall GetPropW(long wstr) user32.GetPropW +@ stdcall GetShellWindow() user32.GetShellWindow +@ stdcall GetWindow(long long) user32.GetWindow +@ stub GetWindowDisplayAffinity +@ stdcall GetWindowInfo(long ptr) user32.GetWindowInfo +@ stdcall GetWindowPlacement(long ptr) user32.GetWindowPlacement +@ stdcall GetWindowRect(long ptr) user32.GetWindowRect +@ stdcall GetWindowTextLengthW(long) user32.GetWindowTextLengthW +@ stdcall GetWindowTextW(long ptr long) user32.GetWindowTextW +@ stdcall GetWindowThreadProcessId(long ptr) user32.GetWindowThreadProcessId +@ stdcall IsChild(long long) user32.IsChild +@ stdcall IsIconic(long) user32.IsIconic +@ stdcall IsWindow(long) user32.IsWindow +@ stdcall IsWindowUnicode(long) user32.IsWindowUnicode +@ stdcall IsWindowVisible(long) user32.IsWindowVisible +@ stub LogicalToPhysicalPoint +@ stdcall MoveWindow(long long long long long long) user32.MoveWindow +@ stdcall RemovePropW(long wstr) user32.RemovePropW +@ stdcall SetForegroundWindow(long) user32.SetForegroundWindow +@ stdcall SetLayeredWindowAttributes(ptr long long long) user32.SetLayeredWindowAttributes +@ stdcall SetParent(long long) user32.SetParent +@ stdcall SetPropW(long wstr long) user32.SetPropW +@ stub SetWindowDisplayAffinity +@ stdcall SetWindowPos(long long long long long long long) user32.SetWindowPos +@ stdcall SetWindowTextW(long wstr) user32.SetWindowTextW +@ stdcall SetWindowsHookExW(long long long long) user32.SetWindowsHookExW +@ stdcall ShowWindow(long long) user32.ShowWindow +@ stub SoundSentry +@ stdcall UnhookWindowsHookEx(long) user32.UnhookWindowsHookEx +@ stdcall UpdateLayeredWindow(long long ptr ptr long ptr long ptr long) user32.UpdateLayeredWindow +@ stub WindowFromPhysicalPoint +@ stdcall WindowFromPoint(int64) user32.WindowFromPoint diff --git a/tools/make_specfiles b/tools/make_specfiles index 52c097b..d2a5004 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -271,6 +271,7 @@ my @dll_groups = "ext-ms-win-ntuser-private-l1-1-1", "ext-ms-win-ntuser-rectangle-ext-l1-1-0", "ext-ms-win-ntuser-uicontext-ext-l1-1-0", + "ext-ms-win-ntuser-window-l1-1-1", "ext-ms-win-rtcore-ntuser-dpi-l1-1-0", ], [

1 0

Andrey Gusev : ext-ms-win-rtcore-ntuser-sysparams-l1-1-0: Add dll.
by Alexandre Julliard 31 Oct '16

31 Oct '16

Module: wine Branch: master Commit: d787f0d9c6970da049208436d8106f61376d2023 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d787f0d9c6970da049208436d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Oct 29 16:49:43 2016 +0300 ext-ms-win-rtcore-ntuser-sysparams-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + .../Makefile.in | 1 + .../ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec | 20 ++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 25 insertions(+) diff --git a/configure b/configure index b04ac21..8814d56 100755 --- a/configure +++ b/configure @@ -1172,6 +1172,7 @@ enable_ext_ms_win_ntuser_rectangle_ext_l1_1_0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 enable_ext_ms_win_ntuser_window_l1_1_1 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 +enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 enable_faultrep enable_fltlib enable_fltmgr_sys @@ -17936,6 +17937,7 @@ wine_fn_config_dll ext-ms-win-ntuser-rectangle-ext-l1-1-0 enable_ext_ms_win_ntus wine_fn_config_dll ext-ms-win-ntuser-uicontext-ext-l1-1-0 enable_ext_ms_win_ntuser_uicontext_ext_l1_1_0 wine_fn_config_dll ext-ms-win-ntuser-window-l1-1-1 enable_ext_ms_win_ntuser_window_l1_1_1 wine_fn_config_dll ext-ms-win-rtcore-ntuser-dpi-l1-1-0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 +wine_fn_config_dll ext-ms-win-rtcore-ntuser-sysparams-l1-1-0 enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 wine_fn_config_dll faultrep enable_faultrep implib wine_fn_config_test dlls/faultrep/tests faultrep_test wine_fn_config_dll fltlib enable_fltlib diff --git a/configure.ac b/configure.ac index 8afeeba..8b7c80a 100644 --- a/configure.ac +++ b/configure.ac @@ -3014,6 +3014,7 @@ WINE_CONFIG_DLL(ext-ms-win-ntuser-rectangle-ext-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-uicontext-ext-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-ntuser-window-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0) +WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-sysparams-l1-1-0) WINE_CONFIG_DLL(faultrep,,[implib]) WINE_CONFIG_TEST(dlls/faultrep/tests) WINE_CONFIG_DLL(fltlib) diff --git a/dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/Makefile.in b/dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/Makefile.in new file mode 100644 index 0000000..18a0b1f --- /dev/null +++ b/dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.dll diff --git a/dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec b/dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec new file mode 100644 index 0000000..ffb8f5b --- /dev/null +++ b/dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec @@ -0,0 +1,20 @@ +@ stdcall ChangeDisplaySettingsExW(wstr ptr long long ptr) user32.ChangeDisplaySettingsExW +@ stdcall DisplayConfigGetDeviceInfo(ptr) user32.DisplayConfigGetDeviceInfo +@ stub DisplayConfigSetDeviceInfo +@ stdcall EnumDisplayDevicesW(ptr long ptr long) user32.EnumDisplayDevicesW +@ stdcall EnumDisplayMonitors(long ptr ptr long) user32.EnumDisplayMonitors +@ stdcall EnumDisplaySettingsExW(wstr long ptr long) user32.EnumDisplaySettingsExW +@ stdcall EnumDisplaySettingsW(wstr long ptr ) user32.EnumDisplaySettingsW +@ stdcall GetDisplayConfigBufferSizes(long ptr ptr) user32.GetDisplayConfigBufferSizes +@ stdcall GetMonitorInfoW(long ptr) user32.GetMonitorInfoW +@ stdcall GetSysColor(long) user32.GetSysColor +@ stdcall GetSystemMetrics(long) user32.GetSystemMetrics +@ stdcall IsProcessDPIAware() user32.IsProcessDPIAware +@ stdcall MonitorFromPoint(int64 long) user32.MonitorFromPoint +@ stdcall MonitorFromRect(ptr long) user32.MonitorFromRect +@ stdcall MonitorFromWindow(long long) user32.MonitorFromWindow +@ stdcall QueryDisplayConfig(long ptr ptr ptr ptr ptr) user32.QueryDisplayConfig +@ stdcall SetProcessDPIAware() user32.SetProcessDPIAware +@ stdcall SetSysColors(long ptr ptr) user32.SetSysColors +@ stdcall SystemParametersInfoA(long long ptr long) user32.SystemParametersInfoA +@ stdcall SystemParametersInfoW(long long ptr long) user32.SystemParametersInfoW diff --git a/tools/make_specfiles b/tools/make_specfiles index d2a5004..cc956e6 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -273,6 +273,7 @@ my @dll_groups = "ext-ms-win-ntuser-uicontext-ext-l1-1-0", "ext-ms-win-ntuser-window-l1-1-1", "ext-ms-win-rtcore-ntuser-dpi-l1-1-0", + "ext-ms-win-rtcore-ntuser-sysparams-l1-1-0", ], [ "version",

1 0

Roman Pišl : ws2_32: Fix the default behavior of IPV6_V6ONLY.
by Alexandre Julliard 31 Oct '16

31 Oct '16

Module: wine Branch: master Commit: 96eb36e4bbdb21da18aa2dd843b60f91fca5c0c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96eb36e4bbdb21da18aa2dd84… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Sat Oct 29 22:26:43 2016 -0200 ws2_32: Fix the default behavior of IPV6_V6ONLY. Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 29 +++++++-------- dlls/ws2_32/tests/sock.c | 91 ++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 88 insertions(+), 32 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3d9a99b..8510034 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3240,20 +3240,6 @@ int WINAPI WS_bind(SOCKET s, const struct WS_sockaddr* name, int namelen) } else { -#ifdef IPV6_V6ONLY - const struct sockaddr_in6 *in6 = (const struct sockaddr_in6*) &uaddr; - if (name->sa_family == WS_AF_INET6 && - !memcmp(&in6->sin6_addr, &in6addr_any, sizeof(struct in6_addr))) - { - int enable = 1; - if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &enable, sizeof(enable)) == -1) - { - release_sock_fd( s, fd ); - SetLastError(WSAEAFNOSUPPORT); - return SOCKET_ERROR; - } - } -#endif if (name->sa_family == WS_AF_INET) { struct sockaddr_in *in4 = (struct sockaddr_in*) &uaddr; @@ -7241,6 +7227,21 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, TRACE("\tcreated %04lx\n", ret ); if (ipxptype > 0) set_ipx_packettype(ret, ipxptype); + +#ifdef IPV6_V6ONLY + if (unixaf == AF_INET6) + { + int fd = get_sock_fd(ret, 0, NULL); + if (fd != -1) + { + /* IPV6_V6ONLY is set by default on Windows */ + int enable = 1; + if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &enable, sizeof(enable))) + WARN("\tsetting IPV6_V6ONLY failed - errno = %i\n", errno); + release_sock_fd(ret, fd); + } + } +#endif return ret; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index a144bd3..80425c9 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1732,7 +1732,7 @@ static void test_so_reuseaddr(void) DWORD err; saddr.sin_family = AF_INET; - saddr.sin_port = htons(9375); + saddr.sin_port = htons(SERVERPORT+1); saddr.sin_addr.s_addr = inet_addr("127.0.0.1"); s1=socket(AF_INET, SOCK_STREAM, 0); @@ -6105,11 +6105,10 @@ end: static void test_ipv6only(void) { - SOCKET v4 = INVALID_SOCKET, - v6 = INVALID_SOCKET; + SOCKET v4 = INVALID_SOCKET, v6; struct sockaddr_in sin4; struct sockaddr_in6 sin6; - int ret; + int ret, enabled, len = sizeof(enabled); memset(&sin4, 0, sizeof(sin4)); sin4.sin_family = AF_INET; @@ -6120,27 +6119,83 @@ static void test_ipv6only(void) sin6.sin6_port = htons(SERVERPORT); v6 = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP); - if (v6 == INVALID_SOCKET) { - skip("Could not create IPv6 socket (LastError: %d; %d expected if IPv6 not available).\n", - WSAGetLastError(), WSAEAFNOSUPPORT); + if (v6 == INVALID_SOCKET) + { + skip("Could not create IPv6 socket (LastError: %d)\n", WSAGetLastError()); goto end; } + + enabled = 2; + ret = getsockopt(v6, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); + ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(enabled == 1, "expected 1, got %d\n", enabled); + ret = bind(v6, (struct sockaddr*)&sin6, sizeof(sin6)); - if (ret) { - skip("Could not bind IPv6 address (LastError: %d).\n", - WSAGetLastError()); + if (ret) + { + skip("Could not bind IPv6 address (LastError: %d)\n", WSAGetLastError()); goto end; } v4 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - if (v4 == INVALID_SOCKET) { - skip("Could not create IPv4 socket (LastError: %d).\n", - WSAGetLastError()); - goto end; - } + ok(v4 != INVALID_SOCKET, "Could not create IPv6 socket (LastError: %d)\n", WSAGetLastError()); + + /* bind on IPv4 socket should succeed - IPV6_V6ONLY is enabled by default */ + ret = bind(v4, (struct sockaddr*)&sin4, sizeof(sin4)); + ok(!ret, "Could not bind IPv4 address (LastError: %d)\n", WSAGetLastError()); + + closesocket(v4); + closesocket(v6); + + /* Test again, this time disabling IPV6_V6ONLY. */ + sin4.sin_port = htons(SERVERPORT+2); + sin6.sin6_port = htons(SERVERPORT+2); + + v6 = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP); + ok(v6 != INVALID_SOCKET, "Could not create IPv6 socket (LastError: %d; %d expected if IPv6 not available).\n", + WSAGetLastError(), WSAEAFNOSUPPORT); + + enabled = 0; + ret = setsockopt(v6, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, len); + ok(!ret, "Could not disable IPV6_V6ONLY (LastError: %d).\n", WSAGetLastError()); + + enabled = 2; + ret = getsockopt(v6, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); + ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!enabled, "expected 0, got %d\n", enabled); + + /* + Observaition: + On Windows, bind on both IPv4 and IPv6 with IPV6_V6ONLY disabled succeeds by default. + Application must set SO_EXCLUSIVEADDRUSE on first socket to disallow another successful bind. + In general, a standard application should not use SO_REUSEADDR. + Setting both SO_EXCLUSIVEADDRUSE and SO_REUSEADDR on the same socket is not possible in + either order, the later setsockopt call always fails. + */ + enabled = 1; + ret = setsockopt(v6, SOL_SOCKET, SO_EXCLUSIVEADDRUSE, (char*)&enabled, len); + ok(!ret, "Could not set SO_EXCLUSIVEADDRUSE on IPv6 socket (LastError: %d)\n", WSAGetLastError()); + + ret = bind(v6, (struct sockaddr*)&sin6, sizeof(sin6)); + ok(!ret, "Could not bind IPv6 address (LastError: %d)\n", WSAGetLastError()); + + enabled = 2; + len = sizeof(enabled); + getsockopt(v6, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&enabled, &len); + ok(!ret, "getsockopt(IPV6_ONLY) failed (LastError: %d)\n", WSAGetLastError()); + ok(!enabled, "IPV6_V6ONLY is enabled after bind\n"); + + v4 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(v4 != INVALID_SOCKET, "Could not create IPv4 socket (LastError: %d)\n", WSAGetLastError()); + + enabled = 1; + ret = setsockopt(v4, SOL_SOCKET, SO_REUSEADDR, (char*)&enabled, len); + ok(!ret, "Could not set SO_REUSEADDR on IPv4 socket (LastError: %d)\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); ret = bind(v4, (struct sockaddr*)&sin4, sizeof(sin4)); - ok(!ret, "Could not bind IPv4 address (LastError: %d; %d expected if IPv6 binds to IPv4 as well).\n", - WSAGetLastError(), WSAEADDRINUSE); + ok(ret, "bind succeeded unexpectedly for the IPv4 socket\n"); + ok(WSAGetLastError() == WSAEACCES, "Expected 10013, got %d\n", WSAGetLastError()); end: if (v4 != INVALID_SOCKET) @@ -8024,7 +8079,7 @@ static void test_TransmitFile(void) /* Setup a properly connected socket for transfers */ memset(&bindAddress, 0, sizeof(bindAddress)); bindAddress.sin_family = AF_INET; - bindAddress.sin_port = htons(9375); + bindAddress.sin_port = htons(SERVERPORT+1); bindAddress.sin_addr.s_addr = inet_addr("127.0.0.1"); iret = bind(server, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); if (iret != 0)

1 0

Nikolay Sivov : ucrtbase: Added _sopen_dispatch/_wsopen_dispatch.
by Alexandre Julliard 31 Oct '16

31 Oct '16

Module: wine Branch: master Commit: cc77571898cde37829816707793d2c3c649d6bd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc77571898cde378298167077… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 29 20:22:27 2016 +0300 ucrtbase: Added _sopen_dispatch/_wsopen_dispatch. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.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 | 4 +- dlls/msvcrt/file.c | 40 ++++++++--- dlls/ucrtbase/tests/misc.c | 81 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 4 +- 4 files changed, 114 insertions(+), 15 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 4b8be01..6acd08e 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 @@ -87,7 +87,7 @@ @ cdecl _setmaxstdio(long) ucrtbase._setmaxstdio @ cdecl _setmode(long long) ucrtbase._setmode @ varargs _sopen(str long long) ucrtbase._sopen -@ stub _sopen_dispatch +@ cdecl _sopen_dispatch(str long long long ptr long) ucrtbase._sopen_dispatch @ cdecl _sopen_s(ptr str long long long) ucrtbase._sopen_s @ cdecl _tell(long) ucrtbase._tell @ cdecl -ret64 _telli64(long) ucrtbase._telli64 @@ -107,7 +107,7 @@ @ cdecl _wpopen(wstr wstr) ucrtbase._wpopen @ cdecl _write(long ptr long) ucrtbase._write @ varargs _wsopen(wstr long long) ucrtbase._wsopen -@ stub _wsopen_dispatch +@ cdecl _wsopen_dispatch(wstr long long long ptr long) ucrtbase._wsopen_dispatch @ cdecl _wsopen_s(ptr wstr long long long) ucrtbase._wsopen_s @ cdecl _wtempnam(wstr wstr) ucrtbase._wtempnam @ cdecl _wtmpnam(ptr) ucrtbase._wtmpnam diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 432d5c7..8965156 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2144,9 +2144,10 @@ static int check_bom(HANDLE h, int oflags, BOOL seek) } /********************************************************************* - * _wsopen_s (MSVCRT.@) + * _wsopen_dispatch (UCRTBASE.@) */ -int CDECL MSVCRT__wsopen_s( int *fd, const MSVCRT_wchar_t* path, int oflags, int shflags, int pmode ) +int CDECL MSVCRT__wsopen_dispatch( const MSVCRT_wchar_t* path, int oflags, int shflags, int pmode, + int *fd, int secure ) { DWORD access = 0, creation = 0, attrib; SECURITY_ATTRIBUTES sa; @@ -2154,8 +2155,8 @@ int CDECL MSVCRT__wsopen_s( int *fd, const MSVCRT_wchar_t* path, int oflags, int int wxflag; HANDLE hand; - TRACE("fd*: %p :file (%s) oflags: 0x%04x shflags: 0x%04x pmode: 0x%04x\n", - fd, debugstr_w(path), oflags, shflags, pmode); + TRACE("path: (%s) oflags: 0x%04x shflags: 0x%04x pmode: 0x%04x fd*: %p secure: %d\n", + debugstr_w(path), oflags, shflags, pmode, fd, secure); if (!MSVCRT_CHECK_PMT( fd != NULL )) return MSVCRT_EINVAL; @@ -2306,6 +2307,15 @@ int CDECL MSVCRT__wsopen_s( int *fd, const MSVCRT_wchar_t* path, int oflags, int return 0; } + +/********************************************************************* + * _wsopen_s (MSVCRT.@) + */ +int CDECL MSVCRT__wsopen_s( int *fd, const MSVCRT_wchar_t* path, int oflags, int shflags, int pmode ) +{ + return MSVCRT__wsopen_dispatch( path, oflags, shflags, pmode, fd, 1 ); +} + /********************************************************************* * _wsopen (MSVCRT.@) */ @@ -2325,14 +2335,15 @@ int CDECL MSVCRT__wsopen( const MSVCRT_wchar_t *path, int oflags, int shflags, . else pmode = 0; - MSVCRT__wsopen_s(&fd, path, oflags, shflags, pmode); - return fd; + return MSVCRT__wsopen_dispatch(path, oflags, shflags, pmode, &fd, 0) ? -1 : fd; } + /********************************************************************* - * _sopen_s (MSVCRT.@) + * _sopen_dispatch (UCRTBASE.@) */ -int CDECL MSVCRT__sopen_s( int *fd, const char *path, int oflags, int shflags, int pmode ) +int CDECL MSVCRT__sopen_dispatch( const char *path, int oflags, int shflags, + int pmode, int *fd, int secure) { MSVCRT_wchar_t *pathW; int ret; @@ -2343,12 +2354,20 @@ int CDECL MSVCRT__sopen_s( int *fd, const char *path, int oflags, int shflags, i if(!MSVCRT_CHECK_PMT(path && (pathW = msvcrt_wstrdupa(path)))) return MSVCRT_EINVAL; - ret = MSVCRT__wsopen_s(fd, pathW, oflags, shflags, pmode); + ret = MSVCRT__wsopen_dispatch(pathW, oflags, shflags, pmode, fd, secure); MSVCRT_free(pathW); return ret; } /********************************************************************* + * _sopen_s (MSVCRT.@) + */ +int CDECL MSVCRT__sopen_s( int *fd, const char *path, int oflags, int shflags, int pmode ) +{ + return MSVCRT__sopen_dispatch(path, oflags, shflags, pmode, fd, 1); +} + +/********************************************************************* * _sopen (MSVCRT.@) */ int CDECL MSVCRT__sopen( const char *path, int oflags, int shflags, ... ) @@ -2367,8 +2386,7 @@ int CDECL MSVCRT__sopen( const char *path, int oflags, int shflags, ... ) else pmode = 0; - MSVCRT__sopen_s(&fd, path, oflags, shflags, pmode); - return fd; + return MSVCRT__sopen_dispatch(path, oflags, shflags, pmode, &fd, 0) ? -1 : fd; } /********************************************************************* diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index ad22699..cc82022 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -22,6 +22,10 @@ #include <wchar.h> #include <stdio.h> #include <float.h> +#include <io.h> +#include <sys/stat.h> +#include <share.h> +#include <fcntl.h> #include <windef.h> #include <winbase.h> @@ -74,6 +78,8 @@ static _invalid_parameter_handler (CDECL *p__set_thread_local_invalid_parameter_ static _invalid_parameter_handler (CDECL *p__get_thread_local_invalid_parameter_handler)(void); static int (CDECL *p__ltoa_s)(LONG, char*, size_t, int); static char* (CDECL *p__get_narrow_winmain_command_line)(void); +static int (CDECL *p_sopen_dispatch)(const char *, int, int, int, int *, int); +static int (CDECL *p_sopen_s)(int *, const char *, int, int, int); static void test__initialize_onexit_table(void) { @@ -365,10 +371,83 @@ static BOOL init(void) p__get_thread_local_invalid_parameter_handler = (void*)GetProcAddress(module, "_get_thread_local_invalid_parameter_handler"); p__ltoa_s = (void*)GetProcAddress(module, "_ltoa_s"); p__get_narrow_winmain_command_line = (void*)GetProcAddress(GetModuleHandleA("ucrtbase.dll"), "_get_narrow_winmain_command_line"); + p_sopen_dispatch = (void*)GetProcAddress(module, "_sopen_dispatch"); + p_sopen_s = (void*)GetProcAddress(module, "_sopen_s"); return TRUE; } +static void test__sopen_dispatch(void) +{ + int ret, fd; + char *tempf; + + tempf = _tempnam(".", "wne"); + + fd = 0; + ret = p_sopen_dispatch(tempf, _O_CREAT, _SH_DENYWR, 0xff, &fd, 0); + ok(!ret, "got %d\n", ret); + ok(fd > 0, "got fd %d\n", fd); + _close(fd); + unlink(tempf); + + p__set_invalid_parameter_handler(global_invalid_parameter_handler); + + SET_EXPECT(global_invalid_parameter_handler); + fd = 0; + ret = p_sopen_dispatch(tempf, _O_CREAT, _SH_DENYWR, 0xff, &fd, 1); +todo_wine { + ok(ret == EINVAL, "got %d\n", ret); + ok(fd == -1, "got fd %d\n", fd); + CHECK_CALLED(global_invalid_parameter_handler); +} + if (fd > 0) + { + _close(fd); + unlink(tempf); + } + + p__set_invalid_parameter_handler(NULL); + + free(tempf); +} + +static void test__sopen_s(void) +{ + int ret, fd; + char *tempf; + + tempf = _tempnam(".", "wne"); + + fd = 0; + ret = p_sopen_s(&fd, tempf, _O_CREAT, _SH_DENYWR, 0); + ok(!ret, "got %d\n", ret); + ok(fd > 0, "got fd %d\n", fd); + _close(fd); + unlink(tempf); + + /* _open() does not validate pmode */ + fd = _open(tempf, _O_CREAT, 0xff); + ok(fd > 0, "got fd %d\n", fd); + _close(fd); + unlink(tempf); + + p__set_invalid_parameter_handler(global_invalid_parameter_handler); + + /* _sopen_s() invokes invalid parameter handler on invalid pmode */ + SET_EXPECT(global_invalid_parameter_handler); + fd = 0; + ret = p_sopen_s(&fd, tempf, _O_CREAT, _SH_DENYWR, 0xff); +todo_wine { + ok(ret == EINVAL, "got %d\n", ret); + ok(fd == -1, "got fd %d\n", fd); + CHECK_CALLED(global_invalid_parameter_handler); +} + p__set_invalid_parameter_handler(NULL); + + free(tempf); +} + START_TEST(misc) { int arg_c; @@ -389,4 +468,6 @@ START_TEST(misc) test__execute_onexit_table(); test___fpe_flt_rounds(); test__get_narrow_winmain_command_line(arg_v[0]); + test__sopen_dispatch(); + test__sopen_s(); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index f0598ce..47608f9 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1902,7 +1902,7 @@ @ stub _setsystime(ptr long) @ cdecl _sleep(long) MSVCRT__sleep @ varargs _sopen(str long long) MSVCRT__sopen -@ stub _sopen_dispatch +@ cdecl _sopen_dispatch(str long long long ptr long) MSVCRT__sopen_dispatch @ cdecl _sopen_s(ptr str long long long) MSVCRT__sopen_s @ varargs _spawnl(long str str) @ varargs _spawnle(long str str) @@ -2109,7 +2109,7 @@ @ cdecl _wsearchenv_s(wstr wstr ptr long) MSVCRT__wsearchenv_s @ cdecl _wsetlocale(long wstr) MSVCRT__wsetlocale @ varargs _wsopen(wstr long long) MSVCRT__wsopen -@ stub _wsopen_dispatch +@ cdecl _wsopen_dispatch(wstr long long long ptr long) MSVCRT__wsopen_dispatch @ cdecl _wsopen_s(ptr wstr long long long) MSVCRT__wsopen_s @ varargs _wspawnl(long wstr wstr) @ varargs _wspawnle(long wstr wstr)

1 0