June 2021 - Wine-Commits - list.winehq.org

Rémi Bernon : hid: Always return node count in HidP_GetLinkCollectionNodes.
by Alexandre Julliard June 28, 2021

June 28, 2021

Module: wine Branch: master Commit: 7f0e91f5aa8a6b1d47a89aabad256f8f0a39efd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f0e91f5aa8a6b1d47a89aab… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 28 09:22:01 2021 +0200 hid: Always return node count in HidP_GetLinkCollectionNodes. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 2 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 750dbce9f26..6a9fba6e425 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -731,8 +731,8 @@ NTSTATUS WINAPI HidP_GetLinkCollectionNodes( HIDP_LINK_COLLECTION_NODE *nodes, U if (preparsed->magic != HID_MAGIC) return HIDP_STATUS_INVALID_PREPARSED_DATA; - if (capacity < preparsed->caps.NumberLinkCollectionNodes) return HIDP_STATUS_BUFFER_TOO_SMALL; count = *nodes_len = preparsed->caps.NumberLinkCollectionNodes; + if (capacity < count) return HIDP_STATUS_BUFFER_TOO_SMALL; for (i = 0; i < count; ++i) { diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index f9bb9e87cda..a3c2a303a59 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1852,7 +1852,6 @@ static void test_hidp(HANDLE file, int report_id) collection_count = 0; status = HidP_GetLinkCollectionNodes(collections, &collection_count, preparsed_data); ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetLinkCollectionNodes returned %#x\n", status); - todo_wine ok(collection_count == caps.NumberLinkCollectionNodes, "got %d collection nodes, expected %d\n", collection_count, caps.NumberLinkCollectionNodes); collection_count = ARRAY_SIZE(collections);

1 0

Zhiyi Zhang : light.msstyles: Add Tab parts.
by Alexandre Julliard June 28, 2021

June 28, 2021

Module: wine Branch: master Commit: ace01c30f87399c30dcbe27bb6a46533d57f8176 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ace01c30f87399c30dcbe27b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 28 10:30:06 2021 +0800 light.msstyles: Add Tab parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 5 ++ dlls/light.msstyles/blue_tab_background.bmp | Bin 0 -> 19338 bytes dlls/light.msstyles/blue_tab_background.svg | 13 ++++ dlls/light.msstyles/blue_tab_item.bmp | Bin 0 -> 1658 bytes dlls/light.msstyles/blue_tab_item.svg | 108 +++++++++++++++++++++++++++ dlls/light.msstyles/blue_tab_item_left.bmp | Bin 0 -> 1658 bytes dlls/light.msstyles/blue_tab_item_left.svg | 111 ++++++++++++++++++++++++++++ dlls/light.msstyles/blue_tab_item_right.bmp | Bin 0 -> 1658 bytes dlls/light.msstyles/blue_tab_item_right.svg | 109 +++++++++++++++++++++++++++ dlls/light.msstyles/blue_tab_pane_edge.bmp | Bin 0 -> 9354 bytes dlls/light.msstyles/blue_tab_pane_edge.svg | 16 ++++ dlls/light.msstyles/light.rc | 104 ++++++++++++++++++++++++++ 12 files changed, 466 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ace01c30f87399c30dcb…

1 0

Zhiyi Zhang : light.msstyles: Add TreeView parts.
by Alexandre Julliard June 28, 2021

June 28, 2021

Module: wine Branch: master Commit: 5daeb032c7aa4ed51adac969d2ed087acfd69577 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5daeb032c7aa4ed51adac969… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 28 10:29:44 2021 +0800 light.msstyles: Add TreeView parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 5 +++- .../blue_treeview_expand_collapse_10px.bmp | Bin 0 -> 938 bytes .../blue_treeview_expand_collapse_10px.svg | 16 +++++++++++ .../blue_treeview_expand_collapse_15px.bmp | Bin 0 -> 1938 bytes .../blue_treeview_expand_collapse_15px.svg | 16 +++++++++++ .../blue_treeview_expand_collapse_9px.bmp | Bin 0 -> 786 bytes .../blue_treeview_expand_collapse_9px.svg | 16 +++++++++++ dlls/light.msstyles/light.rc | 31 +++++++++++++++++++++ 8 files changed, 83 insertions(+), 1 deletion(-) diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index ec23c395b3a..c0b55dd966d 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -44,4 +44,7 @@ SVG_SRCS = \ blue_toolbar_buttons_split_dropdown.svg \ blue_toolbar_buttons_split_dropdown_glyph.svg \ blue_toolbar_separator_horizontal.svg \ - blue_toolbar_separator_vertical.svg + blue_toolbar_separator_vertical.svg \ + blue_treeview_expand_collapse_10px.svg \ + blue_treeview_expand_collapse_15px.svg \ + blue_treeview_expand_collapse_9px.svg diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_10px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_10px.bmp new file mode 100644 index 00000000000..31860c071b5 Binary files /dev/null and b/dlls/light.msstyles/blue_treeview_expand_collapse_10px.bmp differ diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_10px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_10px.svg new file mode 100644 index 00000000000..370531f67bc --- /dev/null +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_10px.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:10-32" width="10" height="20" version="1.1" viewBox="0 0 2.6458 5.2917" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g> + <path d="m0.92604 2.3616 1.2446-1.0424-1.2446-1.0424z" fill="none" stroke="#aeaeae" stroke-width=".26458"/> + <path d="m0.26458 4.7625h1.8521v-1.8521z" fill="#3096fa" stroke-width=".19844"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_15px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_15px.bmp new file mode 100644 index 00000000000..8f55669d86d Binary files /dev/null and b/dlls/light.msstyles/blue_treeview_expand_collapse_15px.bmp differ diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_15px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_15px.svg new file mode 100644 index 00000000000..d219da9b6f4 --- /dev/null +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_15px.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:15-32" width="15" height="30" version="1.1" viewBox="0 0 3.9687 7.9375" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g> + <path d="m0.92604 3.7042 2.5586-1.7198-2.5586-1.7198z" fill="none" stroke="#aeaeae" stroke-width=".26458"/> + <path d="m0.26458 7.4083h3.175v-3.175z" fill="#3096fa" stroke-width=".19844"/> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_9px.bmp b/dlls/light.msstyles/blue_treeview_expand_collapse_9px.bmp new file mode 100644 index 00000000000..239cf2d779f Binary files /dev/null and b/dlls/light.msstyles/blue_treeview_expand_collapse_9px.bmp differ diff --git a/dlls/light.msstyles/blue_treeview_expand_collapse_9px.svg b/dlls/light.msstyles/blue_treeview_expand_collapse_9px.svg new file mode 100644 index 00000000000..15ba25f8094 --- /dev/null +++ b/dlls/light.msstyles/blue_treeview_expand_collapse_9px.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:9-32" width="9" height="18" version="1.1" viewBox="0 0 2.3812 4.7625" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g> + <path d="m0.66146 2.0842 0.99269-0.89372-0.99269-0.89372z" fill="none" stroke="#aeaeae" stroke-width=".26458"/> + <path d="m0.26458 4.4979h1.5875v-1.5875z" fill="#3096fa" stroke-width=".19844"/> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index b7a8f538536..5aea6c02610 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -634,6 +634,27 @@ BLUE_INI TEXTFILE "GlyphType = ImageGlyph\r\n" "GlyphImageFile = blue_toolbar_buttons_split_dropdown_glyph.bmp\r\n" "GlyphTransparent = True\r\n" + +"\r\n; TreeView\r\n" +"[TreeView]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 1\r\n" +"FillColor = 255 255 255\r\n" +"BorderColor = 174 174 174\r\n" + +"[TreeView.Glyph]\r\n" +"BgType = ImageFile\r\n" +"SizingType = TrueSize\r\n" +"ImageCount = 2\r\n" +"ImageLayout = vertical\r\n" +"ImageSelectType = Dpi\r\n" +"UniformSizing = True\r\n" +"ImageFile1 = blue_treeview_expand_collapse_9px.bmp\r\n" +"ImageFile2 = blue_treeview_expand_collapse_10px.bmp\r\n" +"ImageFile3 = blue_treeview_expand_collapse_15px.bmp\r\n" +"MinDpi1 = 96\r\n" +"MinDpi2 = 133\r\n" +"MinDpi3 = 150\r\n" } /* Button */ @@ -769,6 +790,16 @@ BLUE_TOOLBAR_BUTTONS_SPLIT_DROPDOWN_BMP BITMAP "blue_toolbar_buttons_split_dropd /* @makedep: blue_toolbar_buttons_split_dropdown_glyph.bmp */ BLUE_TOOLBAR_BUTTONS_SPLIT_DROPDOWN_GLYPH_BMP BITMAP "blue_toolbar_buttons_split_dropdown_glyph.bmp" +/* TreeView */ +/* @makedep: blue_treeview_expand_collapse_9px.bmp */ +BLUE_TREEVIEW_EXPAND_COLLAPSE_9PX_BMP BITMAP "blue_treeview_expand_collapse_9px.bmp" + +/* @makedep: blue_treeview_expand_collapse_10px.bmp */ +BLUE_TREEVIEW_EXPAND_COLLAPSE_10PX_BMP BITMAP "blue_treeview_expand_collapse_10px.bmp" + +/* @makedep: blue_treeview_expand_collapse_15px.bmp */ +BLUE_TREEVIEW_EXPAND_COLLAPSE_15PX_BMP BITMAP "blue_treeview_expand_collapse_15px.bmp" + /* File version */ #define WINE_FILEDESCRIPTION_STR "Light Theme" #define WINE_FILENAME_STR "light.msstyles"

1 0

Qian Hong : server: Forbid deleting files with an open mapping.
by Alexandre Julliard June 28, 2021

June 28, 2021

Module: wine Branch: master Commit: 73d0bb77409b1a27fd25169516759cf0bd9d3d9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=73d0bb77409b1a27fd251695… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Jun 25 00:28:49 2021 -0500 server: Forbid deleting files with an open mapping. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 8 ++++---- server/fd.c | 11 +++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 5d234114fd5..19ae5f2ac21 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3329,14 +3329,14 @@ todo_wine fdi.DoDeleteFile = TRUE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation ); - todo_wine ok( res == STATUS_CANNOT_DELETE, "got %#x\n", res ); + ok( res == STATUS_CANNOT_DELETE, "got %#x\n", res ); res = GetFileAttributesA( buffer ); ok( res != INVALID_FILE_ATTRIBUTES, "expected file to exist\n" ); CloseHandle( mapping ); CloseHandle( handle ); res = DeleteFileA( buffer ); - todo_wine ok( res, "got error %u\n", GetLastError() ); + ok( res, "got error %u\n", GetLastError() ); GetTempFileNameA( tmp_path, "dis", 0, buffer ); handle = CreateFileA( buffer, GENERIC_READ | GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); @@ -3373,14 +3373,14 @@ todo_wine fdi.DoDeleteFile = TRUE; res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation ); - todo_wine ok( res == STATUS_CANNOT_DELETE, "got %#x\n", res ); + ok( res == STATUS_CANNOT_DELETE, "got %#x\n", res ); res = GetFileAttributesA( buffer ); ok( res != INVALID_FILE_ATTRIBUTES, "expected file to exist\n" ); UnmapViewOfFile( view ); CloseHandle( handle ); res = DeleteFileA( buffer ); - todo_wine ok( res, "got error %u\n", GetLastError() ); + ok( res, "got error %u\n", GetLastError() ); GetTempFileNameA( tmp_path, "dis", 0, buffer ); handle = CreateFileA( buffer, GENERIC_READ | GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); diff --git a/server/fd.c b/server/fd.c index bfa2805d82b..e326354d127 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2452,6 +2452,17 @@ static void set_fd_disposition( struct fd *fd, int unlink ) if (unlink) { + struct fd *fd_ptr; + + LIST_FOR_EACH_ENTRY( fd_ptr, &fd->inode->open, struct fd, inode_entry ) + { + if (fd_ptr->access & FILE_MAPPING_ACCESS) + { + set_error( STATUS_CANNOT_DELETE ); + return; + } + } + if (fstat( fd->unix_fd, &st ) == -1) { file_set_error();

1 0

Alexandre Julliard : ntdll: Only update the data that was requested in the destination context.
by Alexandre Julliard June 28, 2021

June 28, 2021

Module: wine Branch: master Commit: ee65ea88ee7144e63cc10b0a5525bdfda688c93b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee65ea88ee7144e63cc10b0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 26 11:13:24 2021 +0200 ntdll: Only update the data that was requested in the destination context. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/thread.c | 100 ++++++++++++++++++++++++----------------------- 1 file changed, 51 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ee65ea88ee7144e63cc1…

1 0

Alexandre Julliard : ntdll: Support converting server contexts from one machine to another.
by Alexandre Julliard June 28, 2021

June 28, 2021

Module: wine Branch: master Commit: f64d86eb0aa9e53b872f2c611d5889cd91f70ddc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f64d86eb0aa9e53b872f2c61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 26 11:11:01 2021 +0200 ntdll: Support converting server contexts from one machine to another. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 72 ------- dlls/ntdll/unix/thread.c | 459 ++++++++++++++++++++++++++++++++++------- dlls/ntdll/unix/unix_private.h | 2 + 3 files changed, 383 insertions(+), 150 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f64d86eb0aa9e53b872f…

1 0

Alexandre Julliard : ntdll: Avoid crash on shutting down partially initialized thread.
by Alexandre Julliard June 28, 2021

June 28, 2021

Module: wine Branch: master Commit: 364099f528f83f0056f00178d9be6fe332692dc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=364099f528f83f0056f00178… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 27 19:32:48 2021 +0200 ntdll: Avoid crash on shutting down partially initialized thread. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 54806b0ab22..14cc105b64d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3411,7 +3411,7 @@ void WINAPI LdrShutdownThread(void) if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.DllBase, DLL_THREAD_DETACH ); RtlAcquirePebLock(); - RemoveEntryList( &NtCurrentTeb()->TlsLinks ); + if (NtCurrentTeb()->TlsLinks.Flink) RemoveEntryList( &NtCurrentTeb()->TlsLinks ); if ((pointers = NtCurrentTeb()->ThreadLocalStoragePointer)) { for (i = 0; i < tls_module_count; i++) RtlFreeHeap( GetProcessHeap(), 0, pointers[i] );

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard June 28, 2021

June 28, 2021

Module: wine Branch: master Commit: e5f42e9c0cddfc48d1f0247f6b309167fb7f36a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5f42e9c0cddfc48d1f0247f… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Sun Jun 27 14:06:45 2021 +0200 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/nl.po b/po/nl.po index f57e73cc0a8..46076ff7ae2 100644 --- a/po/nl.po +++ b/po/nl.po @@ -6984,10 +6984,8 @@ msgid "Resource is not currently available.\n" msgstr "Bron is tijdelijk niet beschikbaar.\n" #: dlls/light.msstyles/light.rc:30 dlls/light.msstyles/light.rc:37 -#, fuzzy -#| msgid "Class Name:" msgid "Classic Blue" -msgstr "Klassenaam:" +msgstr "Klassiek Blauw" #: dlls/light.msstyles/light.rc:43 dlls/light.msstyles/light.rc:49 #: programs/winhlp32/winhlp32.rc:53 programs/winhlp32/winhlp32.rc:73

1 0

Qian Hong : ntdll/tests: Test deleting files with an open mapping.
by Alexandre Julliard June 28, 2021

June 28, 2021

Module: wine Branch: master Commit: 7316122011305885736debf18227788fb57a8a2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7316122011305885736debf1… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Jun 25 00:28:48 2021 -0500 ntdll/tests: Test deleting files with an open mapping. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 91 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index b7b46365911..5d234114fd5 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2960,12 +2960,13 @@ static void test_file_disposition_information(void) { char tmp_path[MAX_PATH], buffer[MAX_PATH + 16]; DWORD dirpos; - HANDLE handle, handle2, handle3; + HANDLE handle, handle2, handle3, mapping; NTSTATUS res; IO_STATUS_BLOCK io; FILE_DISPOSITION_INFORMATION fdi; BOOL fileDeleted; - DWORD fdi2; + DWORD fdi2, size; + void *view; GetTempPathA( MAX_PATH, tmp_path ); @@ -3312,6 +3313,94 @@ todo_wine ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); fileDeleted = RemoveDirectoryA( buffer ); ok( fileDeleted, "Directory should have been deleted\n" ); + + /* a file with an open mapping handle cannot be deleted */ + + GetTempFileNameA( tmp_path, "dis", 0, buffer ); + handle = CreateFileA( buffer, GENERIC_READ | GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError() ); + WriteFile(handle, "data", 4, &size, NULL); + mapping = CreateFileMappingA( handle, NULL, PAGE_READONLY, 0, 4, NULL ); + ok( !!mapping, "failed to create mapping, error %u\n", GetLastError() ); + + fdi.DoDeleteFile = FALSE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation ); + ok( !res, "got %#x\n", res ); + + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation ); + todo_wine ok( res == STATUS_CANNOT_DELETE, "got %#x\n", res ); + res = GetFileAttributesA( buffer ); + ok( res != INVALID_FILE_ATTRIBUTES, "expected file to exist\n" ); + + CloseHandle( mapping ); + CloseHandle( handle ); + res = DeleteFileA( buffer ); + todo_wine ok( res, "got error %u\n", GetLastError() ); + + GetTempFileNameA( tmp_path, "dis", 0, buffer ); + handle = CreateFileA( buffer, GENERIC_READ | GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError() ); + WriteFile(handle, "data", 4, &size, NULL); + mapping = CreateFileMappingA( handle, NULL, PAGE_READONLY, 0, 4, NULL ); + ok( !!mapping, "failed to create mapping, error %u\n", GetLastError() ); + CloseHandle( mapping ); + + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation ); + ok( !res, "got %#x\n", res ); + + CloseHandle( handle ); + res = DeleteFileA( buffer ); + ok( !res, "expected failure\n" ); + ok( GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError() ); + + /* a file with an open view cannot be deleted */ + + GetTempFileNameA( tmp_path, "dis", 0, buffer ); + handle = CreateFileA( buffer, GENERIC_READ | GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError() ); + WriteFile(handle, "data", 4, &size, NULL); + mapping = CreateFileMappingA( handle, NULL, PAGE_READONLY, 0, 4, NULL ); + ok( !!mapping, "failed to create mapping, error %u\n", GetLastError() ); + view = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 4 ); + ok( !!view, "failed to map view, error %u\n", GetLastError() ); + CloseHandle( mapping ); + + fdi.DoDeleteFile = FALSE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation ); + ok( !res, "got %#x\n", res ); + + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation ); + todo_wine ok( res == STATUS_CANNOT_DELETE, "got %#x\n", res ); + res = GetFileAttributesA( buffer ); + ok( res != INVALID_FILE_ATTRIBUTES, "expected file to exist\n" ); + + UnmapViewOfFile( view ); + CloseHandle( handle ); + res = DeleteFileA( buffer ); + todo_wine ok( res, "got error %u\n", GetLastError() ); + + GetTempFileNameA( tmp_path, "dis", 0, buffer ); + handle = CreateFileA( buffer, GENERIC_READ | GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "failed to create file, error %u\n", GetLastError() ); + WriteFile(handle, "data", 4, &size, NULL); + mapping = CreateFileMappingA( handle, NULL, PAGE_READONLY, 0, 4, NULL ); + ok( !!mapping, "failed to create mapping, error %u\n", GetLastError() ); + view = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 4 ); + ok( !!view, "failed to map view, error %u\n", GetLastError() ); + CloseHandle( mapping ); + UnmapViewOfFile( view ); + + fdi.DoDeleteFile = TRUE; + res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation ); + ok( !res, "got %#x\n", res ); + + CloseHandle( handle ); + res = DeleteFileA( buffer ); + ok( !res, "expected failure\n" ); + ok( GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError() ); } static void test_file_name_information(void)

1 0

Alexandre Julliard : server: Support both native and wow64 register contexts.
by Alexandre Julliard June 28, 2021

June 28, 2021

Module: wine Branch: master Commit: 8ac411ed6dc7a9390178a01e6f07a963a593d406 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ac411ed6dc7a9390178a01e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 26 11:13:05 2021 +0200 server: Support both native and wow64 register contexts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 2 - dlls/ntdll/unix/server.c | 5 +- dlls/ntdll/unix/signal_arm.c | 18 ++++ dlls/ntdll/unix/signal_arm64.c | 18 ++++ dlls/ntdll/unix/signal_i386.c | 18 ++++ dlls/ntdll/unix/signal_x86_64.c | 18 ++++ dlls/ntdll/unix/thread.c | 84 ++++++++++++--- dlls/ntdll/unix/unix_private.h | 2 + include/wine/server_protocol.h | 12 ++- server/protocol.def | 9 +- server/request.h | 3 +- server/thread.c | 225 +++++++++++++++++++++++++--------------- server/trace.c | 24 ++++- 13 files changed, 323 insertions(+), 115 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8ac411ed6dc7a9390178…

1 0