March 2017 - Wine-commits - list.winehq.org

Jacek Caban : server: Introduce pipe message queue.
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: 9db22fdfcf3bbc2e1956c0812361083097246602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9db22fdfcf3bbc2e1956c0812… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 21 13:03:03 2017 +0100 server: Introduce pipe message queue. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 8113b18..044bc97 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -65,6 +65,14 @@ enum pipe_state struct named_pipe; +struct pipe_message +{ + struct list entry; /* entry in message queue */ + data_size_t read_pos; /* already read bytes */ + struct iosb *iosb; /* message iosb */ + struct async *async; /* async of pending write */ +}; + struct pipe_end { struct object obj; /* object header */ @@ -72,6 +80,7 @@ struct pipe_end unsigned int flags; /* pipe flags */ struct pipe_end *connection; /* the other end of the pipe */ data_size_t buffer_size;/* size of buffered data that doesn't block caller */ + struct list message_queue; }; struct pipe_server @@ -379,6 +388,13 @@ static void notify_empty( struct pipe_server *server ) fd_async_wake_up( server->pipe_end.fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); } +static void free_message( struct pipe_message *message ) +{ + list_remove( &message->entry ); + if (message->iosb) release_object( message->iosb ); + free( message ); +} + static void pipe_end_disconnect( struct pipe_end *pipe_end, unsigned int status ) { struct pipe_end *connection = pipe_end->connection; @@ -409,6 +425,18 @@ static void do_disconnect( struct pipe_server *server ) server->pipe_end.fd = NULL; } +static void pipe_end_destroy( struct pipe_end *pipe_end ) +{ + struct pipe_message *message; + + while (!list_empty( &pipe_end->message_queue )) + { + message = LIST_ENTRY( list_head(&pipe_end->message_queue), struct pipe_message, entry ); + assert( !message->async ); + free_message( message ); + } +} + static void pipe_server_destroy( struct object *obj) { struct pipe_server *server = (struct pipe_server *)obj; @@ -423,6 +451,7 @@ static void pipe_server_destroy( struct object *obj) do_disconnect( server ); } + pipe_end_destroy( &server->pipe_end ); if (server->client) { server->client->server = NULL; @@ -467,6 +496,8 @@ static void pipe_client_destroy( struct object *obj) server->client = NULL; client->server = NULL; } + + pipe_end_destroy( &client->pipe_end ); if (client->pipe_end.fd) release_object( client->pipe_end.fd ); } @@ -550,7 +581,7 @@ static int pipe_data_remaining( struct pipe_server *server ) assert( server->client ); if (use_server_io( &server->pipe_end )) - return 0; + return !list_empty( &server->client->pipe_end.message_queue ); fd = get_unix_fd( server->client->pipe_end.fd ); if (fd < 0) @@ -721,6 +752,7 @@ static void init_pipe_end( struct pipe_end *pipe_end, unsigned int pipe_flags, d pipe_end->flags = pipe_flags; pipe_end->connection = NULL; pipe_end->buffer_size = buffer_size; + list_init( &pipe_end->message_queue ); } static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned int options,

1 0

Michael Stefaniuc : include: Use offsetof() instead of open coding it.
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: fd578822dd5dd5b1a28264cc57681512304252c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd578822dd5dd5b1a28264cc5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 21 22:57:37 2017 +0100 include: Use offsetof() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wintrust.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wintrust.h b/include/wintrust.h index 5da3720..20fb296 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -429,7 +429,7 @@ typedef struct _CRYPT_PROVUI_FUNCS { #include <poppack.h> -#define WVT_OFFSETOF(t,f) ((ULONG)((ULONG_PTR)(&((t*)0)->f))) +#define WVT_OFFSETOF(t,f) ((ULONG)(offsetof(t, f))) #define WVT_ISINSTRUCT(t,s,f) (WVT_OFFSETOF(t,f) + sizeof(((t*)0)->f) <= (s)) #define WVT_IS_CBSTRUCT_GT_MEMBEROFFSET(t,s,f) WVT_ISINSTRUCT(t,s,f)

1 0

Henri Verbeet : wordpad: Fall back to the default position if the saved position is off-screen.
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: ff0a34e9c95b6c7fee8453ee30d36bda21c01713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff0a34e9c95b6c7fee8453ee3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 21 22:59:13 2017 +0100 wordpad: Fall back to the default position if the saved position is off-screen. This condition is particularly easy to trigger when switching from a multi-head setup to a virtual desktop. Inspired by some fairly similar code in notepad. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/wordpad.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 0647a19..01a9da2 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2731,6 +2731,9 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar HWND hRulerWnd; POINTL EditPoint; DWORD bMaximized; + MONITORINFO info; + HMONITOR monitor; + int x, y; static const WCHAR wszAccelTable[] = {'M','A','I','N','A','C','C','E','L', 'T','A','B','L','E','\0'}; @@ -2767,8 +2770,18 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar RegisterClassExW(&wc); registry_read_winrect(&rc); + monitor = MonitorFromRect(&rc, MONITOR_DEFAULTTOPRIMARY); + info.cbSize = sizeof(info); + GetMonitorInfoW(monitor, &info); + + x = rc.left; + y = rc.top; + IntersectRect(&info.rcWork, &info.rcWork, &rc); + if (IsRectEmpty(&info.rcWork)) + x = y = CW_USEDEFAULT; + hMainWnd = CreateWindowExW(0, wszMainWndClass, wszAppTitle, WS_CLIPCHILDREN|WS_OVERLAPPEDWINDOW, - rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, NULL, NULL, hInstance, NULL); + x, y, rc.right - rc.left, rc.bottom - rc.top, NULL, NULL, hInstance, NULL); registry_read_maximized(&bMaximized); if ((nCmdShow == SW_SHOWNORMAL || nCmdShow == SW_SHOWDEFAULT) && bMaximized)

1 0

Gijs Vermeulen : msvcp100: Add stub for Concurrency:: is_current_task_group_canceling.
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: 7f1044f212447c6ab520e87cc929d8f3484146be URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f1044f212447c6ab520e87cc… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Mar 22 10:55:17 2017 +0100 msvcp100: Add stub for Concurrency::is_current_task_group_canceling. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 2 +- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp90/misc.c | 10 ++++++++++ 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 51ac8fe..9aa59be 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -477,7 +477,7 @@ @ stub ?from_numa_node(a)location@Concurrency@@SA?AV12(a)G@Z @ stub -arch=i386 ?get_error_code(a)scheduler_resource_allocation_error@Concurrency@@QBEJXZ @ stub -arch=win64 ?get_error_code(a)scheduler_resource_allocation_error@Concurrency@@QEBAJXZ -@ stub ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ +@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ(ptr) msvcp120.?is_current_task_group_canceling(a)Concurrency@@YA_NXZ @ thiscall -arch=i386 ?lock(a)critical_section@Concurrency@@QAEXXZ(ptr) msvcr120.?lock(a)critical_section@Concurrency@@QAEXXZ @ cdecl -arch=win64 ?lock(a)critical_section@Concurrency@@QEAAXXZ(ptr) msvcr120.?lock(a)critical_section@Concurrency@@QEAAXXZ @ thiscall -arch=win32 ?lock(a)reader_writer_lock@Concurrency@@QAEXXZ(ptr) msvcr120.?lock(a)reader_writer_lock@Concurrency@@QAEXXZ diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index a50c2f5..6841678 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2068,7 +2068,7 @@ @ extern ?is_bounded(a)_Num_base@std@@2_NB std_Num_base_is_bounded @ extern ?is_bounded(a)_Num_float_base@std@@2_NB std_Num_float_base_is_bounded @ extern ?is_bounded(a)_Num_int_base@std@@2_NB std_Num_int_base_is_bounded -@ stub ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ +@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ(ptr) is_current_task_group_canceling @ extern ?is_exact(a)_Num_base@std@@2_NB std_Num_base_is_exact @ extern ?is_exact(a)_Num_float_base@std@@2_NB std_Num_float_base_is_exact @ extern ?is_exact(a)_Num_int_base@std@@2_NB std_Num_int_base_is_exact diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index a7c3297..602cb2b 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -2832,7 +2832,7 @@ @ cdecl -arch=arm ?is@?$ctype(a)_W@std@@QBA_NF_W(a)Z(ptr long long) ctype_wchar_is_ch @ thiscall -arch=i386 ?is@?$ctype(a)_W@std@@QBE_NF_W(a)Z(ptr long long) ctype_wchar_is_ch @ cdecl -arch=win64 ?is@?$ctype(a)_W@std@@QEBA_NF_W(a)Z(ptr long long) ctype_wchar_is_ch -@ stub ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ +@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ(ptr) is_current_task_group_canceling @ stub ?is_task_cancellation_requested(a)Concurrency@@YA_NXZ @ cdecl -arch=arm ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAXXZ(ptr) basic_istream_char_isfx @ thiscall -arch=i386 ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ(ptr) basic_istream_char_isfx diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 61d4b32..a839575 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -2774,7 +2774,7 @@ @ cdecl -arch=arm ?is@?$ctype(a)_W@std@@QBA_NF_W(a)Z(ptr long long) ctype_wchar_is_ch @ thiscall -arch=i386 ?is@?$ctype(a)_W@std@@QBE_NF_W(a)Z(ptr long long) ctype_wchar_is_ch @ cdecl -arch=win64 ?is@?$ctype(a)_W@std@@QEBA_NF_W(a)Z(ptr long long) ctype_wchar_is_ch -@ stub ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ +@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ(ptr) is_current_task_group_canceling @ cdecl -arch=arm ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAXXZ(ptr) basic_istream_char_isfx @ thiscall -arch=i386 ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ(ptr) basic_istream_char_isfx @ cdecl -arch=win64 ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAXXZ(ptr) basic_istream_char_isfx diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index f649bbc..6bc6e5a 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -2774,7 +2774,7 @@ @ cdecl -arch=arm ?is@?$ctype(a)_W@std@@QBA_NF_W(a)Z(ptr long long) msvcp120.?is@?$ctype(a)_W@std@@QBA_NF_W(a)Z @ thiscall -arch=i386 ?is@?$ctype(a)_W@std@@QBE_NF_W(a)Z(ptr long long) msvcp120.?is@?$ctype(a)_W@std@@QBE_NF_W(a)Z @ cdecl -arch=win64 ?is@?$ctype(a)_W@std@@QEBA_NF_W(a)Z(ptr long long) msvcp120.?is@?$ctype(a)_W@std@@QEBA_NF_W(a)Z -@ stub ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ +@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ(ptr) msvcp120.?is_current_task_group_canceling(a)Concurrency@@YA_NXZ @ cdecl -arch=arm ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAXXZ(ptr) msvcp120.?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAXXZ @ thiscall -arch=i386 ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ(ptr) msvcp120.?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ @ cdecl -arch=win64 ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAXXZ(ptr) msvcp120.?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAXXZ diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index fad324e..81a6f81 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1400,6 +1400,16 @@ void __cdecl _Unlock_shared_ptr_spin_lock(void) } #endif +/* ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ */ +MSVCP_bool __cdecl is_current_task_group_canceling(void *this) +{ + static int once; + + if (!once++) + FIXME("(%p) stub\n", this); + return FALSE; +} + #if _MSVCP_VER >= 140 typedef struct { void *unk0;

1 0

Hans Leidekker : odbccp32/tests: RegGetValueA is not available on Windows XP.
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: 49b644d7a2b0ac60cf34dc00d1e626cf52a5f574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49b644d7a2b0ac60cf34dc00d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 22 12:32:27 2017 +0100 odbccp32/tests: RegGetValueA is not available on Windows XP. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/tests/misc.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index 905468c..4fdf584 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -420,7 +420,7 @@ void test_SQLInstallDriverEx(void) BOOL ret, sql_ret; DWORD cnt, error_code = 0; HKEY hkey; - DWORD reg_ret; + LONG res; GetSystemDirectoryA(syspath, MAX_PATH); @@ -441,18 +441,21 @@ void test_SQLInstallDriverEx(void) if (ret) { - reg_ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBCINST.INI\\WINE ODBC Driver", 0, KEY_READ, &hkey); - ok(reg_ret == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); - if (reg_ret == ERROR_SUCCESS) + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBCINST.INI\\WINE ODBC Driver", 0, KEY_READ, &hkey); + ok(res == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); + if (res == ERROR_SUCCESS) { - DWORD type, size = MAX_PATH; + DWORD type = 0xdeadbeef, size = MAX_PATH; char driverpath[MAX_PATH]; strcpy(driverpath, syspath); strcat(driverpath, "\\sample.dll"); - reg_ret = RegGetValueA(hkey, NULL, "Driver", RRF_RT_REG_SZ, &type, &path, &size); - ok(reg_ret == ERROR_SUCCESS, "RegGetValueA failed\n"); + memset(path, 0, sizeof(path)); + res = RegQueryValueExA(hkey, "Driver", NULL, &type, (BYTE *)path, &size); + ok(res == ERROR_SUCCESS, "got %d\n", res); + ok(type == REG_SZ, "got %u\n", type); + ok(size == strlen(driverpath) + 1, "got %u\n", size); ok(!strcmp(path, driverpath), "invalid path %s\n", path); RegCloseKey(hkey);

1 0

Hans Leidekker : mpr/tests: Try other drive letters if J: is already assigned.
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: 25e78e0412685201b97bbe9df8133304e3e7dc72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25e78e0412685201b97bbe9df… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 22 13:58:53 2017 +0100 mpr/tests: Try other drive letters if J: is already assigned. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/tests/mpr.c | 84 +++++++++++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 41 deletions(-) diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c index ee1ff3a..085ecda 100644 --- a/dlls/mpr/tests/mpr.c +++ b/dlls/mpr/tests/mpr.c @@ -261,54 +261,56 @@ static void test_WNetCachePassword(void) static void test_WNetUseConnection(void) { - DWORD ret; - DWORD bufSize; - DWORD outRes; + DWORD ret, bufSize, outRes; LPNETRESOURCEA netRes; - CHAR outBuf[4]; + char outBuf[4], drive[] = "J:", letter; - if (pWNetUseConnectionA) + if (!pWNetUseConnectionA) { - netRes = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(NETRESOURCEA) + sizeof("\\\\127.0.0.1\\c$") + sizeof("J:")); - netRes->dwType = RESOURCETYPE_DISK; - netRes->dwDisplayType = RESOURCEDISPLAYTYPE_SHARE; - netRes->dwUsage = RESOURCEUSAGE_CONNECTABLE; - netRes->lpLocalName = (LPSTR)((LPBYTE)netRes + sizeof(NETRESOURCEA)); - netRes->lpRemoteName = (LPSTR)((LPBYTE)netRes + sizeof(NETRESOURCEA) + sizeof("J:")); - strcpy(netRes->lpLocalName, "J:"); + win_skip("WNetUseConnection() is not supported.\n"); + return; + } + netRes = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(NETRESOURCEA) + sizeof("\\\\127.0.0.1\\c$") + sizeof("J:")); + netRes->dwType = RESOURCETYPE_DISK; + netRes->dwDisplayType = RESOURCEDISPLAYTYPE_SHARE; + netRes->dwUsage = RESOURCEUSAGE_CONNECTABLE; + netRes->lpLocalName = (LPSTR)((LPBYTE)netRes + sizeof(NETRESOURCEA)); + netRes->lpRemoteName = (LPSTR)((LPBYTE)netRes + sizeof(NETRESOURCEA) + sizeof("J:")); + + for (letter = 'J'; letter <= 'Z'; letter++) + { + drive[0] = letter; + strcpy(netRes->lpLocalName, drive); strcpy(netRes->lpRemoteName, "\\\\127.0.0.1\\c$"); bufSize = 0; ret = pWNetUseConnectionA(NULL, netRes, NULL, NULL, 0, NULL, &bufSize, &outRes); - todo_wine - ok(ret == WN_SUCCESS, "Unexpected return: %u\n", ret); - ok(bufSize == 0, "Unexpected buffer size: %u\n", bufSize); - if (ret == WN_SUCCESS) - WNetCancelConnectionA("J:", TRUE); - bufSize = 0; - ret = pWNetUseConnectionA(NULL, netRes, NULL, NULL, 0, outBuf, &bufSize, &outRes); - todo_wine - ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return: %u\n", ret); - ok(bufSize == 0, "Unexpected buffer size: %u\n", bufSize); - if (ret == WN_SUCCESS) - WNetCancelConnectionA("J:", TRUE); - bufSize = 1; - todo_wine { - ret = pWNetUseConnectionA(NULL, netRes, NULL, NULL, 0, outBuf, &bufSize, &outRes); - ok(ret == ERROR_MORE_DATA, "Unexpected return: %u\n", ret); - ok(bufSize == 3, "Unexpected buffer size: %u\n", bufSize); - if (ret == WN_SUCCESS) - WNetCancelConnectionA("J:", TRUE); - bufSize = 4; - ret = pWNetUseConnectionA(NULL, netRes, NULL, NULL, 0, outBuf, &bufSize, &outRes); - ok(ret == WN_SUCCESS, "Unexpected return: %u\n", ret); - } - ok(bufSize == 4, "Unexpected buffer size: %u\n", bufSize); - if (ret == WN_SUCCESS) - WNetCancelConnectionA("J:", TRUE); - HeapFree(GetProcessHeap(), 0, netRes); - } else { - win_skip("WNetUseConnection() is not supported.\n"); + if (ret == ERROR_ALREADY_ASSIGNED) continue; } + todo_wine ok(ret == WN_SUCCESS, "Unexpected return: %u\n", ret); + ok(bufSize == 0, "Unexpected buffer size: %u\n", bufSize); + if (ret == WN_SUCCESS) WNetCancelConnectionA(drive, TRUE); + + bufSize = 0; + ret = pWNetUseConnectionA(NULL, netRes, NULL, NULL, 0, outBuf, &bufSize, &outRes); + todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return: %u\n", ret); + ok(bufSize == 0, "Unexpected buffer size: %u\n", bufSize); + if (ret == WN_SUCCESS) WNetCancelConnectionA(drive, TRUE); + + todo_wine { + bufSize = 1; + ret = pWNetUseConnectionA(NULL, netRes, NULL, NULL, 0, outBuf, &bufSize, &outRes); + ok(ret == ERROR_MORE_DATA, "Unexpected return: %u\n", ret); + ok(bufSize == 3, "Unexpected buffer size: %u\n", bufSize); + if (ret == WN_SUCCESS) WNetCancelConnectionA(drive, TRUE); + + bufSize = 4; + ret = pWNetUseConnectionA(NULL, netRes, NULL, NULL, 0, outBuf, &bufSize, &outRes); + ok(ret == WN_SUCCESS, "Unexpected return: %u\n", ret); + } + ok(bufSize == 4, "Unexpected buffer size: %u\n", bufSize); + if (ret == WN_SUCCESS) WNetCancelConnectionA(drive, TRUE); + + HeapFree(GetProcessHeap(), 0, netRes); } START_TEST(mpr)

1 0

Józef Kucia : d3d11: Avoid spurious FIXME messages about unhandled DXBC chunks.
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: cac8f8dc42864eae7f28322790f1c94958b045dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cac8f8dc42864eae7f2832279… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 22 09:40:54 2017 +0100 d3d11: Avoid spurious FIXME messages about unhandled DXBC chunks. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/inputlayout.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index 7604f05..620e663 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -28,15 +28,10 @@ static HRESULT isgn_handler(const char *data, DWORD data_size, DWORD tag, void * { struct wined3d_shader_signature *is = ctx; - switch(tag) - { - case TAG_ISGN: - return shader_parse_signature(data, data_size, is); + if (tag != TAG_ISGN) + return S_OK; - default: - FIXME("Unhandled chunk %s.\n", debugstr_an((const char *)&tag, 4)); - return S_OK; - } + return shader_parse_signature(data, data_size, is); } static HRESULT d3d11_input_layout_to_wined3d_declaration(const D3D11_INPUT_ELEMENT_DESC *element_descs,

1 0

Józef Kucia : d3d11: Make extracting input signature more robust.
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: 0362b418fcda520a724ab888c65b4d432547502a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0362b418fcda520a724ab888c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 22 09:40:55 2017 +0100 d3d11: Make extracting input signature more robust. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/inputlayout.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index 620e663..3d7135a 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -31,6 +31,11 @@ static HRESULT isgn_handler(const char *data, DWORD data_size, DWORD tag, void * if (tag != TAG_ISGN) return S_OK; + if (is->elements) + { + FIXME("Multiple input signatures.\n"); + shader_free_signature(is); + } return shader_parse_signature(data, data_size, is); } @@ -42,6 +47,7 @@ static HRESULT d3d11_input_layout_to_wined3d_declaration(const D3D11_INPUT_ELEME unsigned int i; HRESULT hr; + memset(&is, 0, sizeof(is)); if (FAILED(hr = parse_dxbc(shader_byte_code, shader_byte_code_length, isgn_handler, &is))) { ERR("Failed to parse input signature.\n");

1 0

Józef Kucia : d3d11: Avoid magic number in d3d10_device_SOSetTargets().
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: a1ef2347b16e17f4a3ac8a1fcf1e5a5de4844e43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1ef2347b16e17f4a3ac8a1fc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 22 09:40:56 2017 +0100 d3d11: Avoid magic number in d3d10_device_SOSetTargets(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c641ccf..b0b4045 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3706,7 +3706,7 @@ static void STDMETHODCALLTYPE d3d10_device_SOSetTargets(ID3D10Device1 *iface, TRACE("iface %p, target_count %u, targets %p, offsets %p.\n", iface, target_count, targets, offsets); - count = min(target_count, 4); + count = min(target_count, D3D10_SO_BUFFER_SLOT_COUNT); wined3d_mutex_lock(); for (i = 0; i < count; ++i) {

1 0

Józef Kucia : wined3d: Do not generate FFP fragment shader when SM4 vertex shader is active.
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: 56ce1d3dec4b7a699a910983f1e255ee1c0c138d URL: http://source.winehq.org/git/wine.git/?a=commit;h=56ce1d3dec4b7a699a910983f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 22 09:40:57 2017 +0100 wined3d: Do not generate FFP fragment shader when SM4 vertex shader is active. We should not ever generate fixed-function replacement shaders in D3D10+. It is perfectly valid to draw with NULL pixel shader, e.g. for stream output. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b24f512..3385d83 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8869,7 +8869,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const pshader, &ps_compile_args, &np2fixup_info); ps_list = &pshader->linked_programs; } - else if (priv->fragment_pipe == &glsl_fragment_pipe) + else if (priv->fragment_pipe == &glsl_fragment_pipe + && !(vshader && vshader->reg_maps.shader_version.major >= 4)) { struct glsl_ffp_fragment_shader *ffp_shader; struct ffp_frag_settings settings;

1 0