wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 076cb32d5304a5c8c3ac064481358e1b67241802 URL: http://source.winehq.org/git/wine.git/?a=commit;h=076cb32d5304a5c8c3ac06448… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Apr 21 00:54:16 2016 +0200 po: Update French translation. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fr.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index adbc019..0f42ced 100644 --- a/po/fr.po +++ b/po/fr.po @@ -11768,7 +11768,8 @@ msgstr "Voulez-vous réellement supprimer la clé de registre « %1 » ?" #: reg.rc:52 msgid "reg: The option [/d] must be followed by a valid string\n" -msgstr "reg : l'option [/d] doit être suivie d'un entier valide\n" +msgstr "" +"reg : l'option [/d] doit être suivie d'une chaîne de caractères valide\n" #: reg.rc:53 msgid ""

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 23e945ffa9e85be44159d3f3a7c8cc6228adb8af URL: http://source.winehq.org/git/wine.git/?a=commit;h=23e945ffa9e85be44159d3f3a… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Apr 20 20:41:38 2016 +0300 po: Update Ukrainian translation. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/uk.po | 93 +++++++++++++++++----------------------------------------------- 1 file changed, 25 insertions(+), 68 deletions(-) diff --git a/po/uk.po b/po/uk.po index 4201199..862c0dc 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-11-20 13:01+0200\n" +"PO-Revision-Date: 2016-04-20 20:39+0200\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -11656,111 +11656,82 @@ msgid "The operation completed successfully\n" msgstr "Операція успішно завершена\n" #: reg.rc:35 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid key name\n" -msgstr "Помилка: неправильне ім'я ключа\n" +msgstr "reg: невірне ім'я ключа\n" #: reg.rc:36 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "reg: Invalid command line parameters\n" -msgstr "Помилка: неправильні параметри командного рядка\n" +msgstr "reg: невірні параметри командного рядка\n" #: reg.rc:37 -#, fuzzy -#| msgid "Error: Unable to access remote machine\n" msgid "reg: Unable to access remote machine\n" -msgstr "Помилка: неможливо отримати доступ до віддаленої машини\n" +msgstr "reg: неможливо отримати доступ до віддаленої машини\n" #: reg.rc:38 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "" "reg: The system was unable to find the specified registry key or value\n" -msgstr "Помилка: не вдалось знайти вказаний ключ реєстру чи значення\n" +msgstr "reg: не вдалось знайти вказаний ключ реєстру чи значення\n" #: reg.rc:39 -#, fuzzy -#| msgid "Error: Unsupported type\n" msgid "reg: Unsupported registry data type [%1]\n" -msgstr "Помилка: Непідтримуваний тип\n" +msgstr "reg: непідтримуваний тип даних [%1]\n" #: reg.rc:40 -#, fuzzy -#| msgid "" -#| "uninstaller: The option '--remove' must be followed by an application " -#| "GUID\n" msgid "reg: The option [/d] must be followed by a valid integer\n" -msgstr "" -"uninstaller: Для параметра '--remove' повинен бути вказаний GUID застосунка\n" +msgstr "reg: після параметра [/d] повинно бути вказано ціле число\n" #: reg.rc:41 -#, fuzzy -#| msgid "" -#| "uninstaller: The option '--remove' must be followed by an application " -#| "GUID\n" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgstr "" -"uninstaller: Для параметра '--remove' повинен бути вказаний GUID застосунка\n" +"reg: після параметра [/d] повинно бути вказано число в шістнадцятковому " +"форматі\n" #: reg.rc:42 msgid "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" -msgstr "" +msgstr "reg: невідомий тип даних [/t 0x%1!x!, /d %2]\n" #: reg.rc:43 -#, fuzzy -#| msgid "The specified file already exists. Do you want to replace it?" msgid "The registry value '%1' already exists. Do you want to overwrite it?" -msgstr "Вказаний файл вже існує. Ви хочете його замінити?" +msgstr "Значення реєстру '%1' вже існує. Ви хочете його замінити?" #: reg.rc:47 msgid "The registry operation was cancelled\n" -msgstr "" +msgstr "Операцію з реєстром було скасовано\n" #: reg.rc:48 regedit.rc:204 msgid "(Default)" -msgstr "(Стандартно)" +msgstr "(За замовчуванням)" #: reg.rc:49 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "Ви впевнені, що хочете видалити ці значення?" +msgstr "Ви впевнені, що хочете видалити значення реєстру '%1'?" #: reg.rc:50 -#, fuzzy -#| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" -msgstr "Ви впевнені, що хочете видалити значення '%s'?" +msgstr "Ви впевнені, що хочете видалити всі значення реєстру в '%1'?" #: reg.rc:51 -#, fuzzy -#| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" -msgstr "Ви впевнені, що хочете вилучити '%1'?" +msgstr "Ви впевнені, що хочете видалити ключ реєстру '%1'?" #: reg.rc:52 -#, fuzzy -#| msgid "" -#| "uninstaller: The option '--remove' must be followed by an application " -#| "GUID\n" msgid "reg: The option [/d] must be followed by a valid string\n" -msgstr "" -"uninstaller: Для параметра '--remove' повинен бути вказаний GUID застосунка\n" +msgstr "reg: після параметра [/d] повинно бути вказано рядок\n" #: reg.rc:53 msgid "" "reg: Unable to delete all registry values in '%1'. An unexpected error " "occurred.\n" msgstr "" +"reg: неможливо видалити всі значення реєстру в '%1'. Сталася неочікувана " +"помилка.\n" #: reg.rc:54 msgid "" "reg: Unable to complete the specified operation. An unexpected error " "occurred.\n" msgstr "" +"reg: неможливо завершити зазначену операцію. Сталася неочікувана помилка.\n" #: regedit.rc:34 msgid "&Registry" @@ -13268,7 +13239,7 @@ msgstr "&Нове заміщення для бібліотеки:" #: winecfg.rc:196 msgid "A&dd" -msgstr "" +msgstr "&Додати" #: winecfg.rc:197 msgid "Existing &overrides:" @@ -13295,8 +13266,6 @@ msgid "&Native (Windows)" msgstr "&Стороння (Windows)" #: winecfg.rc:211 -#, fuzzy -#| msgid "Bui&ltin then Native" msgid "Buil&tin then Native" msgstr "В&будована, потім стороння" @@ -13321,14 +13290,10 @@ msgstr "" "редагуватися." #: winecfg.rc:236 -#, fuzzy -#| msgid "&Add..." msgid "A&dd..." msgstr "&Додати..." #: winecfg.rc:238 -#, fuzzy -#| msgid "Autodetect" msgid "Aut&odetect" msgstr "Автовизначення" @@ -13337,10 +13302,8 @@ msgid "&Path:" msgstr "&Шлях:" #: winecfg.rc:248 winecfg.rc:38 -#, fuzzy -#| msgid "Show &Advanced" msgid "Show Advan&ced" -msgstr "Показати &Додаткове" +msgstr "Показати &додат. налаштування" #: winecfg.rc:249 msgid "De&vice:" @@ -13359,10 +13322,8 @@ msgid "S&erial:" msgstr "&Сер.ном:" #: winecfg.rc:258 -#, fuzzy -#| msgid "Show &dot files" msgid "&Show dot files" -msgstr "Показати &файли, що починаються з крапки" +msgstr "Показувати &файли, що починаються з крапки" #: winecfg.rc:265 msgid "Driver diagnostics" @@ -13441,10 +13402,8 @@ msgid "Select the Unix target directory, please." msgstr "Будь ласка, виберіть цільову теку Unix." #: winecfg.rc:37 -#, fuzzy -#| msgid "Hide &Advanced" msgid "Hide Advan&ced" -msgstr "Сховати &Додаткове" +msgstr "Сховати &додат. налаштування" #: winecfg.rc:39 msgid "(No Theme)" @@ -13905,12 +13864,10 @@ msgid "Configuration error" msgstr "Помилка конфігурації" #: wineconsole.rc:42 -#, fuzzy -#| msgid "Screen buffer size must be greater or equal to the window's one" msgid "" "The size of the screen buffer must be greater than or equal to the size of " "the window." -msgstr "Розмір буфера екрану повинен бути не менший буфера вікна" +msgstr "Розмір буфера екрану повинен бути не менший розміру вікна." #: wineconsole.rc:37 msgid "Each character is %1!u! pixels wide and %2!u! pixels high"

1 0

Francois Gouget : mmdevapi/tests: Use RegQueryValueExW() for compatibility with Windows XP.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: d25af3c247fa47c7b62e924138c7e56ad9b5b5b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d25af3c247fa47c7b62e92413… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 20 11:52:11 2016 +0200 mmdevapi/tests: Use RegQueryValueExW() for compatibility with Windows XP. RegGetValueW() was added later and should be avoided in the conformance tests. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/propstore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index 06fe690..665136f 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -173,7 +173,7 @@ static void test_setvalue_on_wow64(IPropertyStore *store) /* Note: the registry key exists even without calling IPropStore::Commit */ size = sizeof(regval); - ret = RegGetValueW(props, NULL, bogusW, RRF_RT_DWORD, &type, &regval, &size); + ret = RegQueryValueExW(props, bogusW, NULL, &type, (LPBYTE)&regval, &size); ok(ret == ERROR_SUCCESS, "Couldn't get bogus propertykey value: %u\n", ret); ok(type == REG_DWORD, "Got wrong value type: %u\n", type); ok(regval == 0xAB, "Got wrong value: 0x%x\n", regval);

1 0

Francois Gouget : mmdevapi/tests: A spelling fix for a render ok() message.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: c79236b86ed841179d64a930806b49d3f2da8d34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c79236b86ed841179d64a9308… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 20 08:56:12 2016 +0200 mmdevapi/tests: A spelling fix for a render ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/render.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 9d2853c..9c42f3a 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -730,7 +730,7 @@ static void test_padding(void) ok(defp == 100000 || broken(defp == 101587) || defp == 200000, "Expected 10ms default period: %u\n", (ULONG)defp); ok(minp != 0, "Minimum period is 0\n"); - ok(minp <= defp, "Mininum period is greater than default period\n"); + ok(minp <= defp, "Minimum period is greater than default period\n"); hr = IAudioClient_GetService(ac, &IID_IAudioRenderClient, (void**)&arc); ok(hr == S_OK, "GetService failed: %08x\n", hr);

1 0

Nikolay Sivov : d3dx10: Implement D3DX10CreateDevice().
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 8622cdac40471c9be4c26d1d12d7bb066d92ebc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8622cdac40471c9be4c26d1d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 20 17:42:30 2016 +0200 d3dx10: Implement D3DX10CreateDevice(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/Makefile.in | 1 + dlls/d3dx10_43/d3dx10_43.spec | 2 +- dlls/d3dx10_43/d3dx10_43_main.c | 21 ++++++++++++++++++++- include/d3dx10core.idl | 2 ++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/Makefile.in b/dlls/d3dx10_43/Makefile.in index cb48f0d..6e67a6b 100644 --- a/dlls/d3dx10_43/Makefile.in +++ b/dlls/d3dx10_43/Makefile.in @@ -1,5 +1,6 @@ MODULE = d3dx10_43.dll IMPORTLIB = d3dx10 +IMPORTS = d3d10_1 C_SRCS = \ d3dx10_43_main.c diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 0673f6a..53059bf 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -18,7 +18,7 @@ @ stub D3DX10CreateAsyncShaderResourceViewProcessor(ptr ptr ptr) @ stub D3DX10CreateAsyncTextureInfoProcessor(ptr ptr) @ stub D3DX10CreateAsyncTextureProcessor(ptr ptr ptr) -@ stub D3DX10CreateDevice(ptr long long long ptr) +@ stdcall D3DX10CreateDevice(ptr long long long ptr) @ stub D3DX10CreateDeviceAndSwapChain(ptr long long long ptr ptr ptr) @ stdcall D3DX10CreateEffectFromFileA(str ptr ptr str long long ptr ptr ptr ptr ptr ptr) @ stdcall D3DX10CreateEffectFromFileW(wstr ptr ptr str long long ptr ptr ptr ptr ptr ptr) diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index fa4fa79..1b60fc5 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -33,7 +33,7 @@ #include "winuser.h" #include "objbase.h" -#include "d3d10.h" +#include "d3d10_1.h" #include "d3dx10core.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -123,3 +123,22 @@ HRESULT WINAPI D3DX10UnsetAllDeviceObjects(ID3D10Device *device) return E_NOTIMPL; } + +HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, + HMODULE swrast, unsigned int flags, ID3D10Device **device) +{ + HRESULT hr; + + TRACE("adapter %p, driver_type %d, swrast %p, flags %#x, device %p.\n", adapter, driver_type, + swrast, flags, device); + + if (SUCCEEDED(hr = D3D10CreateDevice1(adapter, driver_type, swrast, flags, D3D10_FEATURE_LEVEL_10_1, + D3D10_SDK_VERSION, (ID3D10Device1 **)device))) + return hr; + + if (SUCCEEDED(hr = D3D10CreateDevice1(adapter, driver_type, swrast, flags, D3D10_FEATURE_LEVEL_10_0, + D3D10_SDK_VERSION, (ID3D10Device1 **)device))) + return hr; + + return hr; +} diff --git a/include/d3dx10core.idl b/include/d3dx10core.idl index 0e2bf31..6d9927e 100644 --- a/include/d3dx10core.idl +++ b/include/d3dx10core.idl @@ -66,3 +66,5 @@ interface ID3DX10ThreadPump : IUnknown }; cpp_quote("HRESULT WINAPI D3DX10UnsetAllDeviceObjects(ID3D10Device *device);") +cpp_quote("HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type,") +cpp_quote(" HMODULE swrast, unsigned int flags, ID3D10Device **device);")

1 0

Michael Müller : ws2_32: Add semi-stub for DisconnectEx.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 59ffe4e321dae9aa5135baa333e614140282a70a URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ffe4e321dae9aa5135baa33… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Apr 20 16:03:57 2016 +0200 ws2_32: Add semi-stub for DisconnectEx. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 21 ++++++++++++++++++++- dlls/ws2_32/tests/sock.c | 4 ++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f62c9cd..8d58631 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3552,6 +3552,24 @@ connection_success: return TRUE; } +/*********************************************************************** + * DisconnectEx + */ +static BOOL WINAPI WS2_DisconnectEx( SOCKET s, LPOVERLAPPED ov, DWORD flags, DWORD reserved ) +{ + TRACE( "socket %04lx, ov %p, flags 0x%x, reserved 0x%x\n", s, ov, flags, reserved ); + + if (flags & TF_REUSE_SOCKET) + FIXME( "Reusing socket not supported yet\n" ); + + if (ov) + { + ov->Internal = STATUS_PENDING; + ov->InternalHigh = 0; + } + + return !WS_shutdown( s, SD_BOTH ); +} /*********************************************************************** * getpeername (WS2_32.5) @@ -4767,7 +4785,8 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID } else if ( IsEqualGUID(&disconnectex_guid, in_buff) ) { - FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented DisconnectEx\n"); + *(LPFN_DISCONNECTEX *)out_buff = WS2_DisconnectEx; + break; } else if ( IsEqualGUID(&acceptex_guid, in_buff) ) { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e5da804..00555a9 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7828,7 +7828,7 @@ static void test_DisconnectEx(void) &pDisconnectEx, sizeof(pDisconnectEx), &num_bytes, NULL, NULL); if (iret) { - skip("WSAIoctl failed to get DisconnectEx, error %d\n", WSAGetLastError()); + win_skip("WSAIoctl failed to get DisconnectEx, error %d\n", WSAGetLastError()); closesocket(connector); return; } @@ -7859,7 +7859,7 @@ static void test_DisconnectEx(void) memset(&overlapped, 0, sizeof(overlapped)); bret = pDisconnectEx(connector, &overlapped, 0, 0); ok(bret == FALSE, "DisconnectEx unexpectedly succeeded\n"); - ok(WSAGetLastError() == WSAENOTCONN, "expected WSAENOTCONN, got %d\n", WSAGetLastError()); + todo_wine ok(WSAGetLastError() == WSAENOTCONN, "expected WSAENOTCONN, got %d\n", WSAGetLastError()); iret = connect(connector, (struct sockaddr *)&address, addrlen); ok(iret == 0, "failed to connect, error %d\n", WSAGetLastError());

1 0

Michael Müller : ws2_32/tests: Add initial tests for DisconnectEx.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: 0625dd8bf6f60a90f33e2000c9c48860b01596ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=0625dd8bf6f60a90f33e2000c… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Apr 20 16:03:48 2016 +0200 ws2_32/tests: Add initial tests for DisconnectEx. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d5e01c8..e5da804 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7810,6 +7810,102 @@ end: closesocket(connector2); } +static void test_DisconnectEx(void) +{ + SOCKET listener, acceptor, connector; + LPFN_DISCONNECTEX pDisconnectEx; + GUID disconnectExGuid = WSAID_DISCONNECTEX; + struct sockaddr_in address; + DWORD num_bytes, flags; + OVERLAPPED overlapped; + int addrlen, iret; + BOOL bret; + + connector = socket(AF_INET, SOCK_STREAM, 0); + ok(connector != INVALID_SOCKET, "failed to create connector socket, error %d\n", WSAGetLastError()); + + iret = WSAIoctl(connector, SIO_GET_EXTENSION_FUNCTION_POINTER, &disconnectExGuid, sizeof(disconnectExGuid), + &pDisconnectEx, sizeof(pDisconnectEx), &num_bytes, NULL, NULL); + if (iret) + { + skip("WSAIoctl failed to get DisconnectEx, error %d\n", WSAGetLastError()); + closesocket(connector); + return; + } + + listener = socket(AF_INET, SOCK_STREAM, 0); + ok(listener != INVALID_SOCKET, "failed to create listener socket, error %d\n", WSAGetLastError()); + + memset(&address, 0, sizeof(address)); + address.sin_family = AF_INET; + address.sin_addr.s_addr = inet_addr("127.0.0.1"); + iret = bind(listener, (struct sockaddr *)&address, sizeof(address)); + ok(iret == 0, "failed to bind, error %d\n", WSAGetLastError()); + + addrlen = sizeof(address); + iret = getsockname(listener, (struct sockaddr *)&address, &addrlen); + ok(iret == 0, "failed to lookup bind address, error %d\n", WSAGetLastError()); + + iret = listen(listener, 1); + ok(iret == 0, "failed to listen, error %d\n", WSAGetLastError()); + + set_blocking(listener, TRUE); + + memset(&overlapped, 0, sizeof(overlapped)); + bret = pDisconnectEx(INVALID_SOCKET, &overlapped, 0, 0); + ok(bret == FALSE, "DisconnectEx unexpectedly succeeded\n"); + ok(WSAGetLastError() == WSAENOTSOCK, "expected WSAENOTSOCK, got %d\n", WSAGetLastError()); + + memset(&overlapped, 0, sizeof(overlapped)); + bret = pDisconnectEx(connector, &overlapped, 0, 0); + ok(bret == FALSE, "DisconnectEx unexpectedly succeeded\n"); + ok(WSAGetLastError() == WSAENOTCONN, "expected WSAENOTCONN, got %d\n", WSAGetLastError()); + + iret = connect(connector, (struct sockaddr *)&address, addrlen); + ok(iret == 0, "failed to connect, error %d\n", WSAGetLastError()); + + acceptor = accept(listener, NULL, NULL); + ok(acceptor != INVALID_SOCKET, "could not accept socket, error %d\n", WSAGetLastError()); + + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = WSACreateEvent(); + ok(overlapped.hEvent != WSA_INVALID_EVENT, "WSACreateEvent failed, error %d\n", WSAGetLastError()); + bret = pDisconnectEx(connector, &overlapped, 0, 0); + if (bret) + ok(overlapped.Internal == STATUS_PENDING, "expected STATUS_PENDING, got %08lx\n", overlapped.Internal); + else if (WSAGetLastError() == ERROR_IO_PENDING) + bret = WSAGetOverlappedResult(connector, &overlapped, &num_bytes, TRUE, &flags); + ok(bret, "DisconnectEx failed, error %d\n", WSAGetLastError()); + WSACloseEvent(overlapped.hEvent); + + iret = connect(connector, (struct sockaddr *)&address, sizeof(address)); + ok(iret != 0, "connect unexpectedly succeeded\n"); + ok(WSAGetLastError() == WSAEISCONN, "expected WSAEISCONN, got %d\n", WSAGetLastError()); + + closesocket(acceptor); + closesocket(connector); + + connector = socket(AF_INET, SOCK_STREAM, 0); + ok(connector != INVALID_SOCKET, "failed to create connector socket, error %d\n", WSAGetLastError()); + + iret = connect(connector, (struct sockaddr *)&address, addrlen); + ok(iret == 0, "failed to connect, error %d\n", WSAGetLastError()); + + acceptor = accept(listener, NULL, NULL); + ok(acceptor != INVALID_SOCKET, "could not accept socket, error %d\n", WSAGetLastError()); + + bret = pDisconnectEx(connector, NULL, 0, 0); + ok(bret, "DisconnectEx failed, error %d\n", WSAGetLastError()); + + iret = connect(connector, (struct sockaddr *)&address, sizeof(address)); + ok(iret != 0, "connect unexpectedly succeeded\n"); + ok(WSAGetLastError() == WSAEISCONN, "expected WSAEISCONN, got %d\n", WSAGetLastError()); + + closesocket(acceptor); + closesocket(connector); + closesocket(listener); +} + #define compare_file(h,s,o) compare_file2(h,s,o,__FILE__,__LINE__) static void compare_file2(HANDLE handle, SOCKET sock, int offset, const char *file, int line) @@ -9588,6 +9684,7 @@ START_TEST( sock ) test_getaddrinfo(); test_AcceptEx(); test_ConnectEx(); + test_DisconnectEx(); test_sioRoutingInterfaceQuery(); test_sioAddressListChange();

1 0

Michael Stefaniuc : mshtml: Use wine_dbgstr_rect() to trace RECTs.
by Alexandre Julliard 21 Apr '16

21 Apr '16

Module: wine Branch: master Commit: db8159ee89649954620169da7b168c8b71d61395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db8159ee89649954620169da7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 20 10:37:03 2016 +0200 mshtml: Use wine_dbgstr_rect() to trace RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/view.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 43ea3e3..8ca3caf 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -250,9 +250,8 @@ static HRESULT activate_window(HTMLDocumentObj *This) return hres; } - TRACE("got window context: %p %p {%d %d %d %d} {%d %d %d %d} {%d %x %p %p %d}\n", - pIPFrame, This->ip_window, posrect.left, posrect.top, posrect.right, posrect.bottom, - cliprect.left, cliprect.top, cliprect.right, cliprect.bottom, + TRACE("got window context: %p %p %s %s {%d %x %p %p %d}\n", + pIPFrame, This->ip_window, wine_dbgstr_rect(&posrect), wine_dbgstr_rect(&cliprect), frameinfo.cb, frameinfo.fMDIApp, frameinfo.hwndFrame, frameinfo.haccel, frameinfo.cAccelEntries); hres = IOleInPlaceSite_GetWindow(This->ipsite, &parent_hwnd);

1 0

Dmitry Timoshkov : user32: Change value of WM_MDICALCCHILDSCROLL to 0x003f.
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: 00b68720bf32748422e6ccab8629acf04aec9d5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=00b68720bf32748422e6ccab8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 20 15:35:08 2016 +0200 user32: Change value of WM_MDICALCCHILDSCROLL to 0x003f. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/mdi.c | 2 +- dlls/user32/tests/win.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 3366185..665610d 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -103,7 +103,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mdi); #define MDI_MAXTITLELENGTH 0xa1 -#define WM_MDICALCCHILDSCROLL 0x10ac /* this is exactly what Windows uses */ +#define WM_MDICALCCHILDSCROLL 0x003f /* this is exactly what Windows uses */ /* "More Windows..." definitions */ #define MDI_MOREWINDOWSLIMIT 9 /* after this number of windows, a "More Windows..." diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 673b9b5..c931d02 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2194,11 +2194,9 @@ static void test_mdi(void) gotit = TRUE; } else -todo_wine ok(msg.hwnd != mdi_client, "message %04x should not be posted to mdiclient\n", msg.message); DispatchMessageA(&msg); } -todo_wine ok(gotit, "message 0x003f should appear after SetWindowPos\n"); si.cbSize = sizeof(si);

1 0

Hans Leidekker : jsproxy/tests: Add tests.
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: 1f144fae1ab9f35ceca6607e744ecc64e4c86767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f144fae1ab9f35ceca6607e7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 20 10:14:50 2016 +0200 jsproxy/tests: Add tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/jsproxy/tests/Makefile.in | 5 ++ dlls/jsproxy/tests/jsproxy.c | 155 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 162 insertions(+) diff --git a/configure b/configure index ffb1825..dcec63c 100755 --- a/configure +++ b/configure @@ -17749,6 +17749,7 @@ wine_fn_config_dll joy.cpl enable_joy_cpl clean wine_fn_config_dll jscript enable_jscript clean wine_fn_config_test dlls/jscript/tests jscript_test wine_fn_config_dll jsproxy enable_jsproxy implib +wine_fn_config_test dlls/jsproxy/tests jsproxy_test wine_fn_config_dll kernel32 enable_kernel32 clean,implib wine_fn_config_test dlls/kernel32/tests kernel32_test wine_fn_config_dll kernelbase enable_kernelbase diff --git a/configure.ac b/configure.ac index 201bc77..b0d94ce 100644 --- a/configure.ac +++ b/configure.ac @@ -2997,6 +2997,7 @@ WINE_CONFIG_DLL(joy.cpl,,[clean]) WINE_CONFIG_DLL(jscript,,[clean]) WINE_CONFIG_TEST(dlls/jscript/tests) WINE_CONFIG_DLL(jsproxy,,[implib]) +WINE_CONFIG_TEST(dlls/jsproxy/tests) WINE_CONFIG_DLL(kernel32,,[clean,implib]) WINE_CONFIG_TEST(dlls/kernel32/tests) WINE_CONFIG_DLL(kernelbase) diff --git a/dlls/jsproxy/tests/Makefile.in b/dlls/jsproxy/tests/Makefile.in new file mode 100644 index 0000000..3569476 --- /dev/null +++ b/dlls/jsproxy/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = jsproxy.dll +IMPORTS = jsproxy + +C_SRCS = \ + jsproxy.c diff --git a/dlls/jsproxy/tests/jsproxy.c b/dlls/jsproxy/tests/jsproxy.c new file mode 100644 index 0000000..d23867b --- /dev/null +++ b/dlls/jsproxy/tests/jsproxy.c @@ -0,0 +1,155 @@ +/* + * Copyright 2016 Hans Leidekker for CodeWeavers + * + * 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 + */ + +#include <stdarg.h> +#include <stdlib.h> +#include <windef.h> +#include <winbase.h> +#include <wininet.h> + +#include "wine/test.h" + +static BOOL (WINAPI *pInternetInitializeAutoProxyDll) + (DWORD, LPSTR, LPSTR, AutoProxyHelperFunctions *, AUTO_PROXY_SCRIPT_BUFFER *); +static BOOL (WINAPI *pInternetDeInitializeAutoProxyDll)(LPSTR, DWORD); +static BOOL (WINAPI *pInternetGetProxyInfo)(LPCSTR, DWORD, LPSTR, DWORD, LPSTR *, LPDWORD); + +static void test_InternetInitializeAutoProxyDll(void) +{ + const char url[] = "http://localhost"; + char script[] = "function FindProxyForURL(url, host) {return \"DIRECT\";}\0test"; + char script2[] = "function FindProxyForURL(url, host) {return \"PROXY 10.0.0.1:8080\";}\0test"; + char *proxy, host[] = "localhost"; + AUTO_PROXY_SCRIPT_BUFFER buf; + DWORD err, len; + BOOL ret; + + buf.dwStructSize = sizeof(buf); + buf.lpszScriptBuffer = script; + buf.dwScriptBufferSize = 0; + SetLastError( 0xdeadbeef ); + ret = pInternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buf ); + err = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( err == ERROR_INVALID_PARAMETER, "got %u\n", err ); + + buf.dwScriptBufferSize = strlen(script) + 1; + ret = pInternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buf ); + ok( ret, "got %u\n", GetLastError() ); + + ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host), &proxy, &len ); + ok( ret, "got %u\n", GetLastError() ); + ok( !strcmp( proxy, "DIRECT" ), "got \"%s\"\n", proxy ); + GlobalFree( proxy ); + + buf.dwScriptBufferSize = strlen(script2) + 1; + buf.lpszScriptBuffer = script2; + ret = pInternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buf ); + ok( ret, "got %u\n", GetLastError() ); + + ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host), &proxy, &len ); + ok( ret, "got %u\n", GetLastError() ); + ok( !strcmp( proxy, "PROXY 10.0.0.1:8080" ), "got \"%s\"\n", proxy ); + GlobalFree( proxy ); + + buf.dwScriptBufferSize = strlen(script2) + 2; + ret = pInternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buf ); + ok( ret, "got %u\n", GetLastError() ); + + ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host), &proxy, &len ); + ok( ret, "got %u\n", GetLastError() ); + ok( !strcmp( proxy, "PROXY 10.0.0.1:8080" ), "got \"%s\"\n", proxy ); + GlobalFree( proxy ); + + ret = pInternetDeInitializeAutoProxyDll( NULL, 0 ); + ok( ret, "got %u\n", GetLastError() ); +} + +static void test_InternetGetProxyInfo(void) +{ + const char url[] = "http://localhost"; + char script[] = "function FindProxyForURL(url, host) { return \"DIRECT\"; }"; + char *proxy, host[] = "localhost"; + AUTO_PROXY_SCRIPT_BUFFER buf; + DWORD len, err; + BOOL ret; + + SetLastError( 0xdeadbeef ); + ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host), &proxy, &len ); + err = GetLastError(); + ok( !ret, "unexpected succes\n" ); + ok( err == ERROR_CAN_NOT_COMPLETE, "got %u\n", err ); + + buf.dwStructSize = sizeof(buf); + buf.lpszScriptBuffer = script; + buf.dwScriptBufferSize = strlen(script) + 1; + ret = pInternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buf ); + ok( ret, "got %u\n", GetLastError() ); + + len = 0; + proxy = NULL; + ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host), &proxy, &len ); + ok( ret, "got %u\n", GetLastError() ); + ok( !strcmp( proxy, "DIRECT" ), "got \"%s\"\n", proxy ); + ok( len == strlen("DIRECT") + 1, "got %u\n", len ); + GlobalFree( proxy ); + + len = 0; + proxy = NULL; + ret = pInternetGetProxyInfo( url, strlen(url) + 1, host, strlen(host), &proxy, &len ); + ok( ret, "got %u\n", GetLastError() ); + ok( !strcmp( proxy, "DIRECT" ), "got \"%s\"\n", proxy ); + ok( len == strlen("DIRECT") + 1, "got %u\n", len ); + GlobalFree( proxy ); + + len = 0; + proxy = NULL; + ret = pInternetGetProxyInfo( url, strlen(url) - 1, host, strlen(host), &proxy, &len ); + ok( ret, "got %u\n", GetLastError() ); + ok( !strcmp( proxy, "DIRECT" ), "got \"%s\"\n", proxy ); + ok( len == strlen("DIRECT") + 1, "got %u\n", len ); + GlobalFree( proxy ); + + len = 0; + proxy = NULL; + ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host) + 1, &proxy, &len ); + ok( ret, "got %u\n", GetLastError() ); + ok( !strcmp( proxy, "DIRECT" ), "got \"%s\"\n", proxy ); + ok( len == strlen("DIRECT") + 1, "got %u\n", len ); + GlobalFree( proxy ); + + ret = pInternetDeInitializeAutoProxyDll( NULL, 0 ); + ok( ret, "got %u\n", GetLastError() ); +} + +START_TEST(jsproxy) +{ + HMODULE module = LoadLibraryA( "jsproxy.dll" ); + pInternetInitializeAutoProxyDll = (void *)GetProcAddress( module, "InternetInitializeAutoProxyDll" ); + pInternetDeInitializeAutoProxyDll = (void *)GetProcAddress( module, "InternetDeInitializeAutoProxyDll" ); + pInternetGetProxyInfo = (void *)GetProcAddress( module, "InternetGetProxyInfo" ); + + if (!pInternetInitializeAutoProxyDll) + { + win_skip( "InternetInitializeAutoProxyDll not available\n" ); + return; + } + + test_InternetInitializeAutoProxyDll(); + test_InternetGetProxyInfo(); +}

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
75
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 April 2016