May 2017 - Wine-Commits - list.winehq.org

Jacek Caban : wininet/tests: Added redirection tests using test server.
by Alexandre Julliard May 31, 2017

May 31, 2017

Module: wine Branch: master Commit: 23e78c01afea3e406a3728fe6d75cbdc96d601f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23e78c01afea3e406a3728fe6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 31 16:04:46 2017 +0200 wininet/tests: Added redirection tests using test server. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 249658a..ddc1137 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4561,6 +4561,11 @@ static void server_send_string(const char *msg) send(server_socket, msg, strlen(msg), 0); } +static size_t server_read_data(char *buf, size_t buf_size) +{ + return recv(server_socket, buf, buf_size, 0); +} + static BOOL skip_receive_notification_tests; static DWORD received_response_size; @@ -5152,6 +5157,98 @@ static void test_long_url(int port) close_request(&req); } +static void test_redirect(int port) +{ + char buf[4000], *p, expect_url[INTERNET_MAX_URL_LENGTH]; + INTERNET_BUFFERSW ib; + test_request_t req; + size_t size; + + if(!is_ie7plus) + return; + + skip_receive_notification_tests = TRUE; + + memset(&ib, 0, sizeof(ib)); + ib.dwStructSize = sizeof(ib); + ib.lpvBuffer = buf; + + trace("Testing redirection...\n"); + + open_socket_request(port, &req); + + SET_OPTIONAL(INTERNET_STATUS_COOKIE_SENT); + SET_EXPECT(INTERNET_STATUS_REDIRECT); + SET_EXPECT(INTERNET_STATUS_SENDING_REQUEST); + SET_EXPECT(INTERNET_STATUS_REQUEST_SENT); + + server_send_string("HTTP/1.1 302 Found\r\n" + "Server: winetest\r\n" + "Location: test_redirection\r\n" + "Connection: keep-alive\r\n" + "Content-Length: 0\r\n" + "\r\n"); + + size = server_read_data(buf, sizeof(buf)); + buf[size] = 0; + p = strstr(buf, "\r\n"); + if(p) *p = 0; + ok(p && !strcmp(buf, "GET /test_redirection HTTP/1.1"), "unexpected request %s\n", buf); + + CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST); + + sprintf(expect_url, "http://localhost:%u/test_redirection", port); + test_request_url(req.request, expect_url); + + SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + + server_send_string("HTTP/1.1 200 OK\r\n" + "Server: winetest\r\n" + "Content-Length: 3\r\n" + "\r\n" + "xxx"); + + WaitForSingleObject(complete_event, INFINITE); + + CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_SENT); + CHECK_NOTIFIED(INTERNET_STATUS_REDIRECT); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + ok(req_error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", req_error); + + test_status_code(req.request, 200); + + close_connection(); + close_async_handle(req.session, 2); + + trace("Test redirect to non-http URL...\n"); + + open_socket_request(port, &req); + + SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + + server_send_string("HTTP/1.1 302 Found\r\n" + "Server: winetest\r\n" + "Location: test:non:http/url\r\n" + "Connection: keep-alive\r\n" + "Content-Length: 0\r\n" + "\r\n"); + + WaitForSingleObject(complete_event, INFINITE); + + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + ok(req_error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", req_error); + + sprintf(expect_url, "http://localhost:%u/socket", port); + test_request_url(req.request, expect_url); + test_status_code(req.request, 302); + + close_connection(); + close_async_handle(req.session, 2); + + skip_receive_notification_tests = FALSE; +} + static void test_remove_dot_segments(int port) { test_request_t req; @@ -5218,6 +5315,7 @@ static void test_http_connection(void) test_http_read(si.port); test_connection_break(si.port); test_long_url(si.port); + test_redirect(si.port); test_remove_dot_segments(si.port); /* send the basic request again to shutdown the server thread */

1 0

Jacek Caban : mshtmhst.idl: Added missing DOCHOSTUIFLAG values.
by Alexandre Julliard May 31, 2017

May 31, 2017

Module: wine Branch: master Commit: 1fbb661ed1745bdfdcd1287c730f63503ee3f13f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fbb661ed1745bdfdcd1287c7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 31 19:51:31 2017 +0200 mshtmhst.idl: Added missing DOCHOSTUIFLAG values. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmhst.idl | 54 +++++++++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/include/mshtmhst.idl b/include/mshtmhst.idl index 344a88f..81b16ed 100644 --- a/include/mshtmhst.idl +++ b/include/mshtmhst.idl @@ -113,30 +113,36 @@ typedef enum tagDOCHOSTUIDBLCLK typedef enum tagDOCHOSTUIFLAG { - DOCHOSTUIFLAG_DIALOG = 0x00000001, - DOCHOSTUIFLAG_DISABLE_HELP_MENU = 0x00000002, - DOCHOSTUIFLAG_NO3DBORDER = 0x00000004, - DOCHOSTUIFLAG_SCROLL_NO = 0x00000008, - DOCHOSTUIFLAG_DISABLE_SCRIPT_INACTIVE = 0x00000010, - DOCHOSTUIFLAG_OPENNEWWIN = 0x00000020, - DOCHOSTUIFLAG_DISABLE_OFFSCREEN = 0x00000040, - DOCHOSTUIFLAG_FLAT_SCROLLBAR = 0x00000080, - DOCHOSTUIFLAG_DIV_BLOCKDEFAULT = 0x00000100, - DOCHOSTUIFLAG_ACTIVATE_CLIENTHIT_ONLY = 0x00000200, - DOCHOSTUIFLAG_OVERRIDEBEHAVIORFACTORY = 0x00000400, - DOCHOSTUIFLAG_CODEPAGELINKEDFONTS = 0x00000800, - DOCHOSTUIFLAG_URL_ENCODING_DISABLE_UTF8 = 0x00001000, - DOCHOSTUIFLAG_URL_ENCODING_ENABLE_UTF8 = 0x00002000, - DOCHOSTUIFLAG_ENABLE_FORMS_AUTOCOMPLETE = 0x00004000, - DOCHOSTUIFLAG_ENABLE_INPLACE_NAVIGATION = 0x00010000, - DOCHOSTUIFLAG_IME_ENABLE_RECONVERSION = 0x00020000, - DOCHOSTUIFLAG_THEME = 0x00040000, - DOCHOSTUIFLAG_NOTHEME = 0x00080000, - DOCHOSTUIFLAG_NOPICS = 0x00100000, - DOCHOSTUIFLAG_NO3DOUTERBORDER = 0x00200000, - DOCHOSTUIFLAG_DISABLE_EDIT_NS_FIXUP = 0x00400000, - DOCHOSTUIFLAG_LOCAL_MACHINE_ACCESS_CHECK = 0x00800000, - DOCHOSTUIFLAG_DISABLE_UNTRUSTEDPROTOCOL = 0x01000000 + DOCHOSTUIFLAG_DIALOG = 0x00000001, + DOCHOSTUIFLAG_DISABLE_HELP_MENU = 0x00000002, + DOCHOSTUIFLAG_NO3DBORDER = 0x00000004, + DOCHOSTUIFLAG_SCROLL_NO = 0x00000008, + DOCHOSTUIFLAG_DISABLE_SCRIPT_INACTIVE = 0x00000010, + DOCHOSTUIFLAG_OPENNEWWIN = 0x00000020, + DOCHOSTUIFLAG_DISABLE_OFFSCREEN = 0x00000040, + DOCHOSTUIFLAG_FLAT_SCROLLBAR = 0x00000080, + DOCHOSTUIFLAG_DIV_BLOCKDEFAULT = 0x00000100, + DOCHOSTUIFLAG_ACTIVATE_CLIENTHIT_ONLY = 0x00000200, + DOCHOSTUIFLAG_OVERRIDEBEHAVIORFACTORY = 0x00000400, + DOCHOSTUIFLAG_CODEPAGELINKEDFONTS = 0x00000800, + DOCHOSTUIFLAG_URL_ENCODING_DISABLE_UTF8 = 0x00001000, + DOCHOSTUIFLAG_URL_ENCODING_ENABLE_UTF8 = 0x00002000, + DOCHOSTUIFLAG_ENABLE_FORMS_AUTOCOMPLETE = 0x00004000, + DOCHOSTUIFLAG_ENABLE_INPLACE_NAVIGATION = 0x00010000, + DOCHOSTUIFLAG_IME_ENABLE_RECONVERSION = 0x00020000, + DOCHOSTUIFLAG_THEME = 0x00040000, + DOCHOSTUIFLAG_NOTHEME = 0x00080000, + DOCHOSTUIFLAG_NOPICS = 0x00100000, + DOCHOSTUIFLAG_NO3DOUTERBORDER = 0x00200000, + DOCHOSTUIFLAG_DISABLE_EDIT_NS_FIXUP = 0x00400000, + DOCHOSTUIFLAG_LOCAL_MACHINE_ACCESS_CHECK = 0x00800000, + DOCHOSTUIFLAG_DISABLE_UNTRUSTEDPROTOCOL = 0x01000000, + DOCHOSTUIFLAG_HOST_NAVIGATES = 0x02000000, + DOCHOSTUIFLAG_ENABLE_REDIRECT_NOTIFICATION = 0x04000000, + DOCHOSTUIFLAG_USE_WINDOWLESS_SELECTCONTROL = 0x08000000, + DOCHOSTUIFLAG_USE_WINDOWED_SELECTCONTROL = 0x10000000, + DOCHOSTUIFLAG_ENABLE_ACTIVEX_INACTIVATE_MODE = 0x20000000, + DOCHOSTUIFLAG_DPI_AWARE = 0x40000000 } DOCHOSTUIFLAG; [

1 0

Jacek Caban : rpcrt4: Store server thread handle in RpcServerProtseq.
by Alexandre Julliard May 31, 2017

May 31, 2017

Module: wine Branch: master Commit: 5c81f8295e379bf09b51466eb387b6df9c9d70bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c81f8295e379bf09b51466eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 31 17:30:10 2017 +0200 rpcrt4: Store server thread handle in RpcServerProtseq. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_server.c | 37 ++++++++++++++++++------------------- dlls/rpcrt4/rpc_server.h | 4 ++-- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index dcfac70..d8225f3 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -669,21 +669,26 @@ static DWORD CALLBACK RPCRT4_server_thread(LPVOID the_arg) { /* cleanup */ cps->ops->free_wait_array(cps, objs); - - EnterCriticalSection(&cps->cs); - LIST_FOR_EACH_ENTRY(conn, &cps->listeners, RpcConnection, protseq_entry) - RPCRT4_CloseConnection(conn); - LIST_FOR_EACH_ENTRY(conn, &cps->connections, RpcConnection, protseq_entry) - rpcrt4_conn_close_read(conn); - LeaveCriticalSection(&cps->cs); - - if (res == 0 && !std_listen) - SetEvent(cps->server_ready_event); break; } else if (res == 0) set_ready_event = TRUE; } + + EnterCriticalSection(&cps->cs); + LIST_FOR_EACH_ENTRY(conn, &cps->listeners, RpcConnection, protseq_entry) + RPCRT4_CloseConnection(conn); + LIST_FOR_EACH_ENTRY(conn, &cps->connections, RpcConnection, protseq_entry) + rpcrt4_conn_close_read(conn); + LeaveCriticalSection(&cps->cs); + + if (res == 0 && !std_listen) + SetEvent(cps->server_ready_event); + + EnterCriticalSection(&listen_cs); + CloseHandle(cps->server_thread); + cps->server_thread = NULL; + LeaveCriticalSection(&listen_cs); return 0; } @@ -707,21 +712,15 @@ static void RPCRT4_sync_with_server_thread(RpcServerProtseq *ps) static RPC_STATUS RPCRT4_start_listen_protseq(RpcServerProtseq *ps, BOOL auto_listen) { RPC_STATUS status = RPC_S_OK; - HANDLE server_thread; EnterCriticalSection(&listen_cs); - if (ps->is_listening) goto done; + if (ps->server_thread) goto done; if (!ps->mgr_mutex) ps->mgr_mutex = CreateMutexW(NULL, FALSE, NULL); if (!ps->server_ready_event) ps->server_ready_event = CreateEventW(NULL, FALSE, FALSE, NULL); - server_thread = CreateThread(NULL, 0, RPCRT4_server_thread, ps, 0, NULL); - if (!server_thread) - { + ps->server_thread = CreateThread(NULL, 0, RPCRT4_server_thread, ps, 0, NULL); + if (!ps->server_thread) status = RPC_S_OUT_OF_RESOURCES; - goto done; - } - ps->is_listening = TRUE; - CloseHandle(server_thread); done: LeaveCriticalSection(&listen_cs); diff --git a/dlls/rpcrt4/rpc_server.h b/dlls/rpcrt4/rpc_server.h index 130dde7..5e04365 100644 --- a/dlls/rpcrt4/rpc_server.h +++ b/dlls/rpcrt4/rpc_server.h @@ -37,8 +37,8 @@ typedef struct _RpcServerProtseq struct list connections; /* CS cs */ CRITICAL_SECTION cs; - /* is the server currently listening? */ - BOOL is_listening; /* CS ::listen_cs */ + /* handle to listening thread */ + HANDLE server_thread; /* CS ::listen_cs */ /* mutex for ensuring only one thread can change state at a time */ HANDLE mgr_mutex; /* set when server thread has finished opening connections */

1 0

Jacek Caban : wininet: Correctly handle redirects to non-http URLs.
by Alexandre Julliard May 31, 2017

May 31, 2017

Module: wine Branch: master Commit: 9c959154f62840f2c8de45f2a082d5793ae1ece4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c959154f62840f2c8de45f2a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 31 16:03:57 2017 +0200 wininet: Correctly handle redirects to non-http URLs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 2172f5f..17a1919 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3993,7 +3993,16 @@ static WCHAR *get_redirect_url(http_request_t *request) return NULL; } + urlComponents.dwSchemeLength = 1; + b = InternetCrackUrlW(redirect_url, url_length, 0, &urlComponents); + if(b && urlComponents.dwSchemeLength && + urlComponents.nScheme != INTERNET_SCHEME_HTTP && urlComponents.nScheme != INTERNET_SCHEME_HTTPS) { + TRACE("redirect to non-http URL\n"); + return NULL; + } + urlComponents.lpszScheme = (request->hdr.dwFlags & INTERNET_FLAG_SECURE) ? szHttps : szHttp; + urlComponents.dwSchemeLength = 0; urlComponents.lpszHostName = request->server->name; urlComponents.nPort = request->server->port; urlComponents.lpszUserName = session->userName;

1 0

Hugh McMaster : regedit: Update handling of the 'Copy Key Name' menu item.
by Alexandre Julliard May 31, 2017

May 31, 2017

Module: wine Branch: master Commit: 48716cba984d5462f876962e5582c1825d0e9a15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48716cba984d5462f876962e5… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 31 13:07:36 2017 +0000 regedit: Update handling of the 'Copy Key Name' menu item. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index d8f3e6d..0aec59a 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -154,6 +154,16 @@ static void update_delete_and_rename_items(HMENU hMenu, WCHAR *keyName) EnableMenuItem(hMenu, ID_EDIT_RENAME, state_r | MF_BYCOMMAND); } +static void update_copy_keyname_item(HMENU hMenu, WCHAR *keyName) +{ + unsigned int state = MF_ENABLED; + + if (!g_pChildWnd->nFocusPanel && !keyName) + state = MF_GRAYED; + + EnableMenuItem(hMenu, ID_EDIT_COPYKEYNAME, state | MF_BYCOMMAND); +} + static void UpdateMenuItems(HMENU hMenu) { HWND hwndTV = g_pChildWnd->hTreeWnd; BOOL bAllowEdit = FALSE; @@ -170,6 +180,7 @@ static void UpdateMenuItems(HMENU hMenu) { update_expand_or_collapse_item(hwndTV, selection, hMenu); EnableMenuItem(hMenu, ID_EDIT_MODIFY, (bAllowEdit ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); update_delete_and_rename_items(hMenu, keyName); + update_copy_keyname_item(hMenu, keyName); EnableMenuItem(hMenu, ID_FAVORITES_ADDTOFAVORITES, (hRootKey ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); EnableMenuItem(hMenu, ID_FAVORITES_REMOVEFAVORITE, (GetMenuItemCount(hMenu)>2 ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND);

1 0

Hugh McMaster : regedit: Update handling of the 'Rename' menu item.
by Alexandre Julliard May 31, 2017

May 31, 2017

Module: wine Branch: master Commit: 2aff2f612ac42a9e8b1f79199bfbe9076f7d98e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aff2f612ac42a9e8b1f79199… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 31 13:07:25 2017 +0000 regedit: Update handling of the 'Rename' menu item. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index f63b1e1..d8f3e6d 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -132,23 +132,26 @@ update: SetMenuItemInfoW(hMenu, ID_TREE_EXPAND_COLLAPSE, FALSE, &info); } -static void update_delete_item(HMENU hMenu, WCHAR *keyName) +static void update_delete_and_rename_items(HMENU hMenu, WCHAR *keyName) { - unsigned int state = MF_ENABLED; + unsigned int state_d = MF_ENABLED, state_r = MF_ENABLED; if (!g_pChildWnd->nFocusPanel) { if (!keyName || !*keyName) - state = MF_GRAYED; + state_d = state_r = MF_GRAYED; } else { - if (SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, - MAKELPARAM(LVIS_FOCUSED | LVIS_SELECTED, 0)) == -1) - state = MF_GRAYED; + int index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, + MAKELPARAM(LVIS_FOCUSED | LVIS_SELECTED, 0)); + + if (index == -1) state_d = MF_GRAYED; + if (index < 1) state_r = MF_GRAYED; } - EnableMenuItem(hMenu, ID_EDIT_DELETE, state | MF_BYCOMMAND); + EnableMenuItem(hMenu, ID_EDIT_DELETE, state_d | MF_BYCOMMAND); + EnableMenuItem(hMenu, ID_EDIT_RENAME, state_r | MF_BYCOMMAND); } static void UpdateMenuItems(HMENU hMenu) { @@ -166,8 +169,7 @@ static void UpdateMenuItems(HMENU hMenu) { update_expand_or_collapse_item(hwndTV, selection, hMenu); EnableMenuItem(hMenu, ID_EDIT_MODIFY, (bAllowEdit ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); - update_delete_item(hMenu, keyName); - EnableMenuItem(hMenu, ID_EDIT_RENAME, (bAllowEdit ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); + update_delete_and_rename_items(hMenu, keyName); EnableMenuItem(hMenu, ID_FAVORITES_ADDTOFAVORITES, (hRootKey ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); EnableMenuItem(hMenu, ID_FAVORITES_REMOVEFAVORITE, (GetMenuItemCount(hMenu)>2 ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND);

1 0

Hugh McMaster : regedit: Update the status bar when moving to the ' Computer' root node.
by Alexandre Julliard May 31, 2017

May 31, 2017

Module: wine Branch: master Commit: 2689792cd45fe79edc7ff7bea5822a749fb386f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2689792cd45fe79edc7ff7bea… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 31 13:06:55 2017 +0000 regedit: Update the status bar when moving to the 'Computer' root node. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 2f77f2f..0e4ed57 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -180,6 +180,7 @@ static void OnTreeSelectionChanged(HWND hwndTV, HWND hwndLV, HTREEITEM hItem, BO if (rootitem == hItem) { SendMessageW(hwndLV, LVM_DELETEALLITEMS, 0, 0); + UpdateStatusBar(); return; }

1 0

Akihiro Sagawa : kernel32/tests: Add more tests related to the zero_bits parameter.
by Alexandre Julliard May 31, 2017

May 31, 2017

Module: wine Branch: master Commit: 5bd58bb2751c843c9f87a3d4ce035d734511bed7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bd58bb2751c843c9f87a3d4c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 31 22:48:43 2017 +0900 kernel32/tests: Add more tests related to the zero_bits parameter. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 40de97a..d66644b 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -386,6 +386,24 @@ static void test_VirtualAlloc(void) ok(status == STATUS_CONFLICTING_ADDRESSES, "NtAllocateVirtualMemory returned %08x\n", status); if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); + /* 21 zero bits is valid */ + size = 0x1000; + addr2 = NULL; + status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 21, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + ok(status == STATUS_SUCCESS || status == STATUS_NO_MEMORY, + "NtAllocateVirtualMemory returned %08x\n", status); + if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); + + /* 22 zero bits is invalid */ + size = 0x1000; + addr2 = NULL; + status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 22, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + todo_wine + ok(status == STATUS_INVALID_PARAMETER_3, "NtAllocateVirtualMemory returned %08x\n", status); + if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); + /* AT_ROUND_TO_PAGE flag is not supported for VirtualAlloc */ SetLastError(0xdeadbeef); addr2 = VirtualAlloc(addr1, 0x1000, MEM_RESERVE | MEM_COMMIT | AT_ROUND_TO_PAGE, PAGE_EXECUTE_READWRITE); @@ -1146,6 +1164,18 @@ static void test_NtMapViewOfSection(void) ok( !status, "NtUnmapViewOfSection failed status %x\n", status ); } + /* 22 zero bits isn't acceptable */ + ptr2 = NULL; + size = 0; + status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 22, 0, &offset, &size, 1, 0, PAGE_READWRITE ); + todo_wine + ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); + if (status == STATUS_SUCCESS) + { + status = pNtUnmapViewOfSection( hProcess, ptr2 ); + ok( !status, "NtUnmapViewOfSection failed status %x\n", status ); + } + /* mapping at the same page conflicts */ ptr2 = ptr; size = 0;

1 0

Józef Kucia : d3d8: Validate adapter format in CheckDeviceFormat().
by Alexandre Julliard May 31, 2017

May 31, 2017

Module: wine Branch: master Commit: aea576b10f4f72941a8fb3da94ee3959ef0ae384 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aea576b10f4f72941a8fb3da9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 31 11:43:16 2017 +0200 d3d8: Validate adapter format in CheckDeviceFormat(). 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/d3d8/directx.c | 6 ++++++ dlls/d3d8/tests/device.c | 17 +++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 107e32d..24bd831 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -241,6 +241,12 @@ static HRESULT WINAPI d3d8_CheckDeviceFormat(IDirect3D8 *iface, UINT adapter, D3 TRACE("iface %p, adapter %u, device_type %#x, adapter_format %#x, usage %#x, resource_type %#x, format %#x.\n", iface, adapter, device_type, adapter_format, usage, resource_type, format); + if (!adapter_format) + { + WARN("Invalid adapter format.\n"); + return D3DERR_INVALIDCALL; + } + usage = usage & (WINED3DUSAGE_MASK | WINED3DUSAGE_QUERY_MASK); switch (resource_type) { diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 6b34ff1..54f6505 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -7925,12 +7925,29 @@ static void test_swapchain_parameters(void) static void test_check_device_format(void) { + D3DDEVTYPE device_type; IDirect3D8 *d3d; HRESULT hr; d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); + for (device_type = D3DDEVTYPE_HAL; device_type <= D3DDEVTYPE_SW; ++device_type) + { + hr = IDirect3D8_CheckDeviceFormat(d3d, 0, device_type, D3DFMT_UNKNOWN, + 0, D3DRTYPE_SURFACE, D3DFMT_A8R8G8B8); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x, device type %#x.\n", hr, device_type); + hr = IDirect3D8_CheckDeviceFormat(d3d, 0, device_type, D3DFMT_UNKNOWN, + 0, D3DRTYPE_TEXTURE, D3DFMT_A8R8G8B8); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x, device type %#x.\n", hr, device_type); + hr = IDirect3D8_CheckDeviceFormat(d3d, 0, device_type, D3DFMT_UNKNOWN, + 0, D3DRTYPE_SURFACE, D3DFMT_X8R8G8B8); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x, device type %#x.\n", hr, device_type); + hr = IDirect3D8_CheckDeviceFormat(d3d, 0, device_type, D3DFMT_UNKNOWN, + 0, D3DRTYPE_TEXTURE, D3DFMT_X8R8G8B8); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x, device type %#x.\n", hr, device_type); + } + hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, D3DRTYPE_VERTEXBUFFER, D3DFMT_VERTEXDATA); todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);

1 0

Henri Verbeet : wined3d: Only warn about 0 compare functions in wined3d_gl_compare_func().
by Alexandre Julliard May 31, 2017

May 31, 2017

Module: wine Branch: master Commit: 3821dcf996f873a8d18a7e765d332889e12f6ea2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3821dcf996f873a8d18a7e765… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 31 11:07:02 2017 +0200 wined3d: Only warn about 0 compare functions in wined3d_gl_compare_func(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index bc5b098..950c4d5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -301,7 +301,10 @@ GLenum wined3d_gl_compare_func(enum wined3d_cmp_func f) case WINED3D_CMP_ALWAYS: return GL_ALWAYS; default: - FIXME("Unrecognized compare function %#x.\n", f); + if (!f) + WARN("Unrecognized compare function %#x.\n", f); + else + FIXME("Unrecognized compare function %#x.\n", f); return GL_NONE; } }

1 0