wine-commits September 2016

wine-commits@winehq.org

2 participants
430 discussions

Bruno Jesus : ws2_32: Use correct WS_ prefixed family.
by Alexandre Julliard 12 Sep '16

12 Sep '16

Module: wine Branch: master Commit: 6135a3fa93958e5c8dfdc05f046abf9625e1174c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6135a3fa93958e5c8dfdc05f0… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Sep 9 14:33:54 2016 -0300 ws2_32: Use correct WS_ prefixed family. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f0dc04f..2d54013 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4701,19 +4701,17 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID addr = inet_addr(ptr->IpAddressList.IpAddress.String); mask = inet_addr(ptr->IpAddressList.IpMask.String); bcast = addr | ~mask; - intArray->iiAddress.AddressIn.sin_family = AF_INET; + intArray->iiAddress.AddressIn.sin_family = WS_AF_INET; intArray->iiAddress.AddressIn.sin_port = 0; - intArray->iiAddress.AddressIn.sin_addr.WS_s_addr = - addr; - intArray->iiNetmask.AddressIn.sin_family = AF_INET; + intArray->iiAddress.AddressIn.sin_addr.WS_s_addr = addr; + + intArray->iiNetmask.AddressIn.sin_family = WS_AF_INET; intArray->iiNetmask.AddressIn.sin_port = 0; - intArray->iiNetmask.AddressIn.sin_addr.WS_s_addr = - mask; - intArray->iiBroadcastAddress.AddressIn.sin_family = - AF_INET; + intArray->iiNetmask.AddressIn.sin_addr.WS_s_addr = mask; + + intArray->iiBroadcastAddress.AddressIn.sin_family = WS_AF_INET; intArray->iiBroadcastAddress.AddressIn.sin_port = 0; - intArray->iiBroadcastAddress.AddressIn.sin_addr. - WS_s_addr = bcast; + intArray->iiBroadcastAddress.AddressIn.sin_addr.WS_s_addr = bcast; intArray++; numInt++; } @@ -4797,7 +4795,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID sa[i].lpSockaddr = (SOCKADDR *)&sockaddr[i]; sa[i].iSockaddrLength = sizeof(SOCKADDR); - sockaddr[i].sin_family = AF_INET; + sockaddr[i].sin_family = WS_AF_INET; sockaddr[i].sin_port = 0; sockaddr[i].sin_addr.WS_s_addr = inet_addr(p->IpAddressList.IpAddress.String); i++; @@ -4936,7 +4934,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID SetLastError(WSAEFAULT); return SOCKET_ERROR; } - if (daddr->sa_family != AF_INET) + if (daddr->sa_family != WS_AF_INET) { FIXME("unsupported address family %d\n", daddr->sa_family); status = WSAEAFNOSUPPORT; @@ -4969,7 +4967,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID status = WSAEFAULT; break; } - saddr_in->sin_family = AF_INET; + saddr_in->sin_family = WS_AF_INET; saddr_in->sin_addr.S_un.S_addr = ipAddrTable->table[found_index].dwAddr; saddr_in->sin_port = 0; total = sizeof(struct WS_sockaddr_in);

1 0

Michael Stefaniuc : mscoree: There can be only one QI implementation in a COM object.
by Alexandre Julliard 12 Sep '16

12 Sep '16

Module: wine Branch: master Commit: cac5a5996a6bba6e9c99de5f3acda59510a0cddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cac5a5996a6bba6e9c99de5f3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 8 21:25:27 2016 +0200 mscoree: There can be only one QI implementation in a COM object. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/config.c | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/dlls/mscoree/config.c b/dlls/mscoree/config.c index b8bf882..a52a521 100644 --- a/dlls/mscoree/config.c +++ b/dlls/mscoree/config.c @@ -73,18 +73,19 @@ static inline ConfigFileHandler *impl_from_ISAXErrorHandler(ISAXErrorHandler *if static HRESULT WINAPI ConfigFileHandler_QueryInterface(ISAXContentHandler *iface, REFIID riid, void **ppvObject) { - if (IsEqualGUID(riid, &IID_ISAXContentHandler) || - IsEqualGUID(riid, &IID_IUnknown)) - { - *ppvObject = iface; - } + ConfigFileHandler *This = impl_from_ISAXContentHandler(iface); + + if (IsEqualGUID(riid, &IID_ISAXContentHandler) || IsEqualGUID(riid, &IID_IUnknown)) + *ppvObject = &This->ISAXContentHandler_iface; + else if (IsEqualGUID(riid, &IID_ISAXErrorHandler)) + *ppvObject = &This->ISAXErrorHandler_iface; else { WARN("Unsupported interface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } - ISAXContentHandler_AddRef(iface); + IUnknown_AddRef((IUnknown*)*ppvObject); return S_OK; } @@ -377,20 +378,8 @@ static const struct ISAXContentHandlerVtbl ConfigFileHandlerVtbl = static HRESULT WINAPI ConfigFileHandler_Error_QueryInterface(ISAXErrorHandler *iface, REFIID riid, void **ppvObject) { - if (IsEqualGUID(riid, &IID_ISAXErrorHandler) || - IsEqualGUID(riid, &IID_IUnknown)) - { - *ppvObject = iface; - } - else - { - WARN("Unsupported interface %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; - } - - ISAXErrorHandler_AddRef(iface); - - return S_OK; + ConfigFileHandler *This = impl_from_ISAXErrorHandler(iface); + return ISAXContentHandler_QueryInterface(&This->ISAXContentHandler_iface, riid, ppvObject); } static ULONG WINAPI ConfigFileHandler_Error_AddRef(ISAXErrorHandler *iface)

1 0

Michael Stefaniuc : mscoree: Use the proper COM method wrappers.
by Alexandre Julliard 12 Sep '16

12 Sep '16

Module: wine Branch: master Commit: 478f3dd67bab9fc31fcd93069fe37f493bca2df4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=478f3dd67bab9fc31fcd93069… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 8 21:24:48 2016 +0200 mscoree: Use the proper COM method wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/config.c b/dlls/mscoree/config.c index 5da1102..b8bf882 100644 --- a/dlls/mscoree/config.c +++ b/dlls/mscoree/config.c @@ -396,13 +396,13 @@ static HRESULT WINAPI ConfigFileHandler_Error_QueryInterface(ISAXErrorHandler *i static ULONG WINAPI ConfigFileHandler_Error_AddRef(ISAXErrorHandler *iface) { ConfigFileHandler *This = impl_from_ISAXErrorHandler(iface); - return IUnknown_AddRef((IUnknown*)This); + return ISAXContentHandler_AddRef(&This->ISAXContentHandler_iface); } static ULONG WINAPI ConfigFileHandler_Error_Release(ISAXErrorHandler *iface) { ConfigFileHandler *This = impl_from_ISAXErrorHandler(iface); - return IUnknown_Release((IUnknown*)This); + return ISAXContentHandler_Release(&This->ISAXContentHandler_iface); } static HRESULT WINAPI ConfigFileHandler_error(ISAXErrorHandler *iface,

1 0

Łukasz Wojniłowicz : Polish translation for release 1.9.18
by Jeremy Newman 12 Sep '16

12 Sep '16

Module: website Branch: master Commit: cc00d0c128f48a8282b2e0136fd7d3dc8f15a635 URL: http://source.winehq.org/git/website.git/?a=commit;h=cc00d0c128f48a8282b2e0… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Sep 10 07:29:01 2016 +0200 Polish translation for release 1.9.18 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016090301.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/news/pl/2016090301.xml b/news/pl/2016090301.xml new file mode 100644 index 0000000..05705b8 --- /dev/null +++ b/news/pl/2016090301.xml @@ -0,0 +1,19 @@ +<news> +<date>Wrzesień 3, 2016</date> +<title>Wydano Wine 1.9.18</title> +<body> + Wydanie rozwojowe Wine 1.9.18 jest już dostępne. + <a href="{$root}/announce/1.9.18">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla wielu sterowników jądra w pojedynczym procesie.</li> + <li>Szersze wsparcie czytnika Usług Sieciowych.</li> + <li>Rozmaite usprawnienia w obsłudze joysticka.</li> + <li>Postęp w kierunku strumienia poleceń Direct3D.</li> + <li>Zwiększenie wydajności w GDI.</li> + <li>Ulepszona obsługa okien IME.</li> + <li>Poprawki zgodności w obsłudze schowka.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.18.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Sebastian Lackner : configure: Fix a typo in the udev help message.
by Alexandre Julliard 09 Sep '16

09 Sep '16

Module: wine Branch: master Commit: 4bfefc5c7132023ee40d70572b677ae0e441df38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bfefc5c7132023ee40d70572… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Sep 9 15:14:01 2016 +0200 configure: Fix a typo in the udev help message. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index bb18a6e..5e33a01 100755 --- a/configure +++ b/configure @@ -2281,7 +2281,7 @@ Optional Packages: --without-pulse do not use PulseAudio sound support --without-sane do not use SANE (scanner support) --without-tiff do not use TIFF - --without-udev do not use udev (play and play support) + --without-udev do not use udev (plug and play support) --without-v4l do not use v4l1 (v4l support) --without-xcomposite do not use the Xcomposite extension --without-xcursor do not use the Xcursor extension diff --git a/configure.ac b/configure.ac index cadaa5e..8007469 100644 --- a/configure.ac +++ b/configure.ac @@ -75,7 +75,7 @@ AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthrea AC_ARG_WITH(pulse, AS_HELP_STRING([--without-pulse],[do not use PulseAudio sound support])) AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)])) AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF])) -AC_ARG_WITH(udev, AS_HELP_STRING([--without-udev],[do not use udev (play and play support)])) +AC_ARG_WITH(udev, AS_HELP_STRING([--without-udev],[do not use udev (plug and play support)])) AC_ARG_WITH(v4l, AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)])) AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi])

1 0

Alexandre Julliard : user32/tests: Add more tests for GDI and private clipboard formats.
by Alexandre Julliard 09 Sep '16

09 Sep '16

Module: wine Branch: master Commit: ed97fa1cb2ed24af9a05a05ff2e601d1de8de794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed97fa1cb2ed24af9a05a05ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 9 22:49:27 2016 +0900 user32/tests: Add more tests for GDI and private clipboard formats. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 142 ++++++++++++++++++++++++++---------------- dlls/winex11.drv/clipboard.c | 5 +- 2 files changed, 91 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed97fa1cb2ed24af9a05a…

1 0

Alexandre Julliard : user32/tests: Make the clipboard sequence tests more strict.
by Alexandre Julliard 09 Sep '16

09 Sep '16

Module: wine Branch: master Commit: 3bab02d02a296a0653ffbe00b0961348116d761b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bab02d02a296a0653ffbe00b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 9 22:48:58 2016 +0900 user32/tests: Make the clipboard sequence tests more strict. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 4211ae4..dd724d9 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -1041,7 +1041,7 @@ static DWORD WINAPI clipboard_thread(void *param) if (pGetClipboardSequenceNumber) { seq = pGetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); old_seq = seq; } if (!cross_thread) @@ -1066,7 +1066,7 @@ static DWORD WINAPI clipboard_thread(void *param) if (pGetClipboardSequenceNumber) { seq = pGetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); old_seq = seq; } if (!cross_thread) @@ -1093,7 +1093,7 @@ static DWORD WINAPI clipboard_thread(void *param) if (pGetClipboardSequenceNumber) { seq = pGetClipboardSequenceNumber(); - todo_wine ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + todo_wine ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); old_seq = seq; } if (!cross_thread) @@ -1115,7 +1115,7 @@ static DWORD WINAPI clipboard_thread(void *param) if (pGetClipboardSequenceNumber) { seq = pGetClipboardSequenceNumber(); - todo_wine ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + todo_wine ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); old_seq = seq; } if (!cross_thread) @@ -1137,7 +1137,7 @@ static DWORD WINAPI clipboard_thread(void *param) if (pGetClipboardSequenceNumber) { seq = pGetClipboardSequenceNumber(); - todo_wine ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + todo_wine ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); old_seq = seq; } if (!cross_thread) @@ -1166,7 +1166,7 @@ static DWORD WINAPI clipboard_thread(void *param) if (pGetClipboardSequenceNumber) { seq = pGetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + todo_wine ok( (int)(seq - old_seq) == 2, "sequence diff %d\n", seq - old_seq ); old_seq = seq; } if (!cross_thread) @@ -1223,7 +1223,7 @@ static DWORD WINAPI clipboard_thread(void *param) if (pGetClipboardSequenceNumber) { seq = pGetClipboardSequenceNumber(); - todo_wine ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + todo_wine ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); old_seq = seq; } if (!cross_thread) @@ -1321,7 +1321,7 @@ static DWORD WINAPI clipboard_thread(void *param) if (pGetClipboardSequenceNumber) { seq = pGetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + ok( (int)(seq - old_seq) == 2, "sequence diff %d\n", seq - old_seq ); old_seq = seq; } if (!cross_thread) @@ -1370,7 +1370,7 @@ static DWORD WINAPI clipboard_thread(void *param) if (pGetClipboardSequenceNumber) { seq = pGetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); old_seq = seq; } if (!cross_thread) @@ -1396,7 +1396,7 @@ static DWORD WINAPI clipboard_thread(void *param) if (pGetClipboardSequenceNumber) { seq = pGetClipboardSequenceNumber(); - todo_wine ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + todo_wine ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); old_seq = seq; } if (!cross_thread) @@ -1443,7 +1443,8 @@ static DWORD WINAPI clipboard_thread(void *param) if (pGetClipboardSequenceNumber) { seq = pGetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + todo_wine_if (!cross_thread) + ok( (int)(seq - old_seq) == 2, "sequence diff %d\n", seq - old_seq ); old_seq = seq; } if (!cross_thread) @@ -1469,7 +1470,7 @@ static DWORD WINAPI clipboard_thread(void *param) if (pGetClipboardSequenceNumber) { seq = pGetClipboardSequenceNumber(); - todo_wine ok( (int)(seq - old_seq) > 0, "sequence unchanged\n" ); + todo_wine ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); old_seq = seq; } if (!cross_thread)

1 0

Alexandre Julliard : user32: Clear last error in EnumClipboardFormats.
by Alexandre Julliard 09 Sep '16

09 Sep '16

Module: wine Branch: master Commit: ef08bd76750908a86317cb9c1f184772002545e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef08bd76750908a86317cb9c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 9 22:48:32 2016 +0900 user32: Clear last error in EnumClipboardFormats. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 1 + dlls/user32/tests/clipboard.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index d11dd23..326ea03 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -738,6 +738,7 @@ UINT WINAPI EnumClipboardFormats(UINT wFormat) SetLastError(ERROR_CLIPBOARD_NOT_OPEN); return 0; } + SetLastError( 0 ); return USER_Driver->pEnumClipboardFormats(wFormat); } diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index da2163b..4211ae4 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -680,16 +680,30 @@ static void test_synthesized(void) r = OpenClipboard( NULL ); ok(r, "gle %d\n", GetLastError()); + SetLastError( 0xdeadbeef ); cf = EnumClipboardFormats(0); ok( cf == CF_UNICODETEXT, "cf %08x\n", cf ); + ok( GetLastError() == ERROR_SUCCESS, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); cf = EnumClipboardFormats(cf); ok( cf == CF_TEXT, "cf %08x\n", cf ); + ok( GetLastError() == ERROR_SUCCESS, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); cf = EnumClipboardFormats(cf); ok( cf == CF_OEMTEXT, "cf %08x\n", cf ); + ok( GetLastError() == ERROR_SUCCESS, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); cf = EnumClipboardFormats(cf); ok( cf == CF_LOCALE, "cf %08x\n", cf ); + ok( GetLastError() == ERROR_SUCCESS, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); cf = EnumClipboardFormats( cf ); ok( cf == 0, "cf %08x\n", cf ); + ok( GetLastError() == ERROR_SUCCESS, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + cf = EnumClipboardFormats( 0xdead ); + ok( cf == 0, "cf %08x\n", cf ); + ok( GetLastError() == ERROR_SUCCESS, "wrong error %u\n", GetLastError() ); r = EmptyClipboard(); ok(r, "gle %d\n", GetLastError());

1 0

Andrey Gusev : api-ms-win-core-registryuserspecific-l1-1-0: Add dll.
by Alexandre Julliard 09 Sep '16

09 Sep '16

Module: wine Branch: master Commit: 64fba3e3961bbaff0cbb7cd143f673b85bc27a49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64fba3e3961bbaff0cbb7cd14… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Sep 9 12:52:27 2016 +0300 api-ms-win-core-registryuserspecific-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 + ...pi-ms-win-core-registryuserspecific-l1-1-0.spec | 25 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 30 insertions(+) diff --git a/configure b/configure index 2cc532b..bb18a6e 100755 --- a/configure +++ b/configure @@ -931,6 +931,7 @@ enable_api_ms_win_core_processthreads_l1_1_2 enable_api_ms_win_core_profile_l1_1_0 enable_api_ms_win_core_psapi_l1_1_0 enable_api_ms_win_core_registry_l1_1_0 +enable_api_ms_win_core_registryuserspecific_l1_1_0 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 @@ -17584,6 +17585,7 @@ wine_fn_config_dll api-ms-win-core-processthreads-l1-1-2 enable_api_ms_win_core_ wine_fn_config_dll api-ms-win-core-profile-l1-1-0 enable_api_ms_win_core_profile_l1_1_0 wine_fn_config_dll api-ms-win-core-psapi-l1-1-0 enable_api_ms_win_core_psapi_l1_1_0 wine_fn_config_dll api-ms-win-core-registry-l1-1-0 enable_api_ms_win_core_registry_l1_1_0 +wine_fn_config_dll api-ms-win-core-registryuserspecific-l1-1-0 enable_api_ms_win_core_registryuserspecific_l1_1_0 wine_fn_config_dll api-ms-win-core-rtlsupport-l1-1-0 enable_api_ms_win_core_rtlsupport_l1_1_0 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 diff --git a/configure.ac b/configure.ac index 6809558..cadaa5e 100644 --- a/configure.ac +++ b/configure.ac @@ -2707,6 +2707,7 @@ WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-2) WINE_CONFIG_DLL(api-ms-win-core-profile-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-psapi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-registry-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-registryuserspecific-l1-1-0) 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) diff --git a/dlls/api-ms-win-core-registryuserspecific-l1-1-0/Makefile.in b/dlls/api-ms-win-core-registryuserspecific-l1-1-0/Makefile.in new file mode 100644 index 0000000..4d11856 --- /dev/null +++ b/dlls/api-ms-win-core-registryuserspecific-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-registryuserspecific-l1-1-0.dll diff --git a/dlls/api-ms-win-core-registryuserspecific-l1-1-0/api-ms-win-core-registryuserspecific-l1-1-0.spec b/dlls/api-ms-win-core-registryuserspecific-l1-1-0/api-ms-win-core-registryuserspecific-l1-1-0.spec new file mode 100644 index 0000000..1da9379 --- /dev/null +++ b/dlls/api-ms-win-core-registryuserspecific-l1-1-0/api-ms-win-core-registryuserspecific-l1-1-0.spec @@ -0,0 +1,25 @@ +@ stdcall SHRegCloseUSKey(ptr) shlwapi.SHRegCloseUSKey +@ stdcall SHRegCreateUSKeyA(str long long ptr long) shlwapi.SHRegCreateUSKeyA +@ stdcall SHRegCreateUSKeyW(wstr long long ptr long) shlwapi.SHRegCreateUSKeyW +@ stdcall SHRegDeleteEmptyUSKeyA(long str long) shlwapi.SHRegDeleteEmptyUSKeyA +@ stdcall SHRegDeleteEmptyUSKeyW(long wstr long) shlwapi.SHRegDeleteEmptyUSKeyW +@ stdcall SHRegDeleteUSValueA(long str long) shlwapi.SHRegDeleteUSValueA +@ stdcall SHRegDeleteUSValueW(long wstr long) shlwapi.SHRegDeleteUSValueW +@ stdcall SHRegEnumUSKeyA(long long str ptr long) shlwapi.SHRegEnumUSKeyA +@ stdcall SHRegEnumUSKeyW(long long wstr ptr long) shlwapi.SHRegEnumUSKeyW +@ stdcall SHRegEnumUSValueA(long long ptr ptr ptr ptr ptr long) shlwapi.SHRegEnumUSValueA +@ stdcall SHRegEnumUSValueW(long long ptr ptr ptr ptr ptr long) shlwapi.SHRegEnumUSValueW +@ stdcall SHRegGetBoolUSValueA(str str long long) shlwapi.SHRegGetBoolUSValueA +@ stdcall SHRegGetBoolUSValueW(wstr wstr long long) shlwapi.SHRegGetBoolUSValueW +@ stdcall SHRegGetUSValueA( str str ptr ptr ptr long ptr long ) shlwapi.SHRegGetUSValueA +@ stdcall SHRegGetUSValueW( wstr wstr ptr ptr ptr long ptr long ) shlwapi.SHRegGetUSValueW +@ stdcall SHRegOpenUSKeyA( str long long long long ) shlwapi.SHRegOpenUSKeyA +@ stdcall SHRegOpenUSKeyW( wstr long long long long ) shlwapi.SHRegOpenUSKeyW +@ stdcall SHRegQueryInfoUSKeyA( long ptr ptr ptr ptr long ) shlwapi.SHRegQueryInfoUSKeyA +@ stdcall SHRegQueryInfoUSKeyW( long ptr ptr ptr ptr long ) shlwapi.SHRegQueryInfoUSKeyW +@ stdcall SHRegQueryUSValueA( long str ptr ptr ptr long ptr long ) shlwapi.SHRegQueryUSValueA +@ stdcall SHRegQueryUSValueW( long wstr ptr ptr ptr long ptr long ) shlwapi.SHRegQueryUSValueW +@ stdcall SHRegSetUSValueA( str str long ptr long long) shlwapi.SHRegSetUSValueA +@ stdcall SHRegSetUSValueW( wstr wstr long ptr long long) shlwapi.SHRegSetUSValueW +@ stdcall SHRegWriteUSValueA(long str long ptr long long) shlwapi.SHRegWriteUSValueA +@ stdcall SHRegWriteUSValueW(long wstr long ptr long long) shlwapi.SHRegWriteUSValueW diff --git a/tools/make_specfiles b/tools/make_specfiles index 0b0bf28..68274f8 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -224,6 +224,7 @@ my @dll_groups = "shlwapi", "api-ms-win-downlevel-shlwapi-l1-1-0", "api-ms-win-downlevel-shlwapi-l2-1-0", + "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-url-l1-1-0",

1 0

Sebastian Lackner : jscript: Allocate string of correct size in Date toTimeString method.
by Alexandre Julliard 09 Sep '16

09 Sep '16

Module: wine Branch: master Commit: fd07a1572762a05de8f1269e2b1287af6a9c71e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd07a1572762a05de8f1269e2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 8 23:54:54 2016 +0200 jscript: Allocate string of correct size in Date toTimeString method. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/date.c | 15 +++++++-------- dlls/jscript/tests/api.js | 6 ++++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index b6997ab..fdc3051 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -850,6 +850,7 @@ static HRESULT Date_toTimeString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, ':','%','0','2','d',' ','U','T','C',0 }; DateInstance *date; jsstr_t *date_str; + WCHAR buf[32]; DOUBLE time; WCHAR sign; int offset; @@ -868,12 +869,6 @@ static HRESULT Date_toTimeString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, time = local_time(date->time, date); if(r) { - WCHAR *ptr; - - date_str = jsstr_alloc_buf(17, &ptr); - if(!date_str) - return E_OUTOFMEMORY; - offset = date->bias + daylight_saving_ta(time, date); @@ -884,13 +879,17 @@ static HRESULT Date_toTimeString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, else sign = '-'; if(offset) - sprintfW(ptr, formatW, (int)hour_from_time(time), + sprintfW(buf, formatW, (int)hour_from_time(time), (int)min_from_time(time), (int)sec_from_time(time), sign, offset/60, offset%60); else - sprintfW(ptr, formatUTCW, (int)hour_from_time(time), + sprintfW(buf, formatUTCW, (int)hour_from_time(time), (int)min_from_time(time), (int)sec_from_time(time)); + date_str = jsstr_alloc(buf); + if(!date_str) + return E_OUTOFMEMORY; + *r = jsval_string(date_str); } return S_OK; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 43f7a19..083da93 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2147,9 +2147,11 @@ ok(Date.parse("Tue, 22 Mar 2016 09:57:55 +0400") === Date.parse("Tue, 22 Mar 201 "Date.parse(\"Tue, 22 Mar 2016 09:57:55 +0400\") = " + Date.parse("Tue, 22 Mar 2016 09:57:55 +0400")); tmp = (new Date()).toLocaleDateString(); -ok(tmp.charCodeAt(tmp.length-1) != 0, "invalid null byte"); +ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); tmp = (new Date()).toLocaleTimeString(); -ok(tmp.charCodeAt(tmp.length-1) != 0, "invalid null byte"); +ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); +tmp = (new Date()).toTimeString(); +ok(tmp.indexOf(String.fromCharCode(0)) == -1, "invalid null byte"); ok(typeof(Math.PI) === "number", "typeof(Math.PI) = " + typeof(Math.PI)); ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI);

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
43
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 2016