September 2017 - Wine-Commits

Nikolay Sivov : shell32: Implement FolderItem attributes properties.
by Alexandre Julliard Sept. 26, 2017

Sept. 26, 2017

Module: wine Branch: master Commit: d935fa69d80d9afe93875155b94b0dfc1609508a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d935fa69d80d9afe93875155b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 26 12:57:51 2017 +0300 shell32: Implement FolderItem attributes properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 49 +++++++++++++++++++++++++------------- dlls/shell32/tests/shelldispatch.c | 7 ++++++ 2 files changed, 40 insertions(+), 16 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 82c62ae..57170ee 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -83,6 +83,7 @@ typedef struct { LONG ref; FolderImpl *folder; WCHAR *path; /* if NULL, folder path is used */ + DWORD attributes; } FolderItemImpl; typedef struct { @@ -788,36 +789,48 @@ static HRESULT WINAPI FolderItemImpl_get_GetFolder(FolderItem2 *iface, return E_NOTIMPL; } -static HRESULT WINAPI FolderItemImpl_get_IsLink(FolderItem2 *iface, - VARIANT_BOOL *pb) +static HRESULT WINAPI FolderItemImpl_get_IsLink(FolderItem2 *iface, VARIANT_BOOL *b) { - FIXME("(%p,%p)\n", iface, pb); + FolderItemImpl *This = impl_from_FolderItem(iface); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, b); + + *b = This->attributes & SFGAO_LINK ? VARIANT_TRUE : VARIANT_FALSE; + + return S_OK; } -static HRESULT WINAPI FolderItemImpl_get_IsFolder(FolderItem2 *iface, - VARIANT_BOOL *pb) +static HRESULT WINAPI FolderItemImpl_get_IsFolder(FolderItem2 *iface, VARIANT_BOOL *b) { - FIXME("(%p,%p)\n", iface, pb); + FolderItemImpl *This = impl_from_FolderItem(iface); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, b); + + *b = This->attributes & SFGAO_FOLDER ? VARIANT_TRUE : VARIANT_FALSE; + + return S_OK; } -static HRESULT WINAPI FolderItemImpl_get_IsFileSystem(FolderItem2 *iface, - VARIANT_BOOL *pb) +static HRESULT WINAPI FolderItemImpl_get_IsFileSystem(FolderItem2 *iface, VARIANT_BOOL *b) { - FIXME("(%p,%p)\n", iface, pb); + FolderItemImpl *This = impl_from_FolderItem(iface); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, b); + + *b = This->attributes & SFGAO_FILESYSTEM ? VARIANT_TRUE : VARIANT_FALSE; + + return S_OK; } -static HRESULT WINAPI FolderItemImpl_get_IsBrowsable(FolderItem2 *iface, - VARIANT_BOOL *pb) +static HRESULT WINAPI FolderItemImpl_get_IsBrowsable(FolderItem2 *iface, VARIANT_BOOL *b) { - FIXME("(%p,%p)\n", iface, pb); + FolderItemImpl *This = impl_from_FolderItem(iface); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, b); + + *b = This->attributes & SFGAO_BROWSABLE ? VARIANT_TRUE : VARIANT_FALSE; + + return S_OK; } static HRESULT WINAPI FolderItemImpl_get_ModifyDate(FolderItem2 *iface, @@ -924,6 +937,7 @@ static const FolderItem2Vtbl FolderItemImpl_Vtbl = { static HRESULT FolderItem_Constructor(FolderImpl *folder, const WCHAR *path, FolderItem **item) { + PIDLIST_ABSOLUTE pidl; FolderItemImpl *This; TRACE("%s\n", debugstr_w(path)); @@ -942,6 +956,9 @@ static HRESULT FolderItem_Constructor(FolderImpl *folder, const WCHAR *path, Fol This->folder = folder; Folder3_AddRef(&folder->Folder3_iface); + if (SHParseDisplayName(This->path, NULL, &pidl, ~0u, &This->attributes) == S_OK) + ILFree(pidl); + *item = (FolderItem *)&This->FolderItem2_iface; return S_OK; } diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 06e73dd..462be18 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -594,6 +594,8 @@ static void test_items(void) /* test the folder item corresponding to each file */ for (i = 0; i < sizeof(file_defs)/sizeof(file_defs[0]); i++) { + VARIANT_BOOL b; + V_I4(&int_index) = i; variant_set_string(&str_index, file_defs[i].name); @@ -629,6 +631,11 @@ static void test_items(void) "file_defs[%d]: expected %s, got %s\n", i, wine_dbgstr_w(path), wine_dbgstr_w(bstr)); SysFreeString(bstr); + b = 0xdead; + r = FolderItem_get_IsFolder(item, &b); + ok(r == S_OK, "Failed to get IsFolder property, %#x.\n", r); + ok(file_defs[i].type == DIRECTORY ? b == VARIANT_TRUE : b == VARIANT_FALSE, "Unexpected prop value %#x.\n", b); + FolderItem_Release(item); if (file_defs[i].type == DIRECTORY)

1 0

Nikolay Sivov : shell32: Store simple full path for FolderItem.
by Alexandre Julliard Sept. 26, 2017

Sept. 26, 2017

Module: wine Branch: master Commit: 0d87da46a92a878e650a533052fe88bacd5e92bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d87da46a92a878e650a53305… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 26 12:57:50 2017 +0300 shell32: Store simple full path for FolderItem. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 97 +++++++++++++------------------------- dlls/shell32/tests/shelldispatch.c | 6 +-- 2 files changed, 36 insertions(+), 67 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 8930e88..82c62ae 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -67,6 +67,7 @@ typedef struct { IDispatch *application; IShellFolder2 *folder; PIDLIST_ABSOLUTE pidl; + WCHAR path[MAX_PATH]; } FolderImpl; typedef struct { @@ -81,7 +82,7 @@ typedef struct { FolderItem2 FolderItem2_iface; LONG ref; FolderImpl *folder; - VARIANT dir; + WCHAR *path; /* if NULL, folder path is used */ } FolderItemImpl; typedef struct { @@ -657,8 +658,8 @@ static ULONG WINAPI FolderItemImpl_Release(FolderItem2 *iface) if (!ref) { - VariantClear(&This->dir); Folder3_Release(&This->folder->Folder3_iface); + HeapFree(GetProcessHeap(), 0, This->path); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -759,40 +760,14 @@ static HRESULT WINAPI FolderItemImpl_put_Name(FolderItem2 *iface, BSTR bs) return E_NOTIMPL; } -static HRESULT WINAPI FolderItemImpl_get_Path(FolderItem2 *iface, BSTR *pbs) +static HRESULT WINAPI FolderItemImpl_get_Path(FolderItem2 *iface, BSTR *path) { FolderItemImpl *This = impl_from_FolderItem(iface); - HRESULT ret = S_OK; - WCHAR *pathW; - int len; - TRACE("(%p,%p)\n", iface, pbs); + TRACE("(%p,%p)\n", iface, path); - *pbs = NULL; - if (V_VT(&This->dir) == VT_I4) - { - pathW = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); - if (!pathW) return E_OUTOFMEMORY; - ret = SHGetFolderPathW(NULL, V_I4(&This->dir), NULL, SHGFP_TYPE_CURRENT, - pathW); - if (ret == S_OK) - *pbs = SysAllocString(pathW); - else if (ret == E_INVALIDARG) - { - FIXME("not implemented for %#x\n", V_I4(&This->dir)); - ret = E_NOTIMPL; - } - HeapFree(GetProcessHeap(), 0, pathW); - } - else /* VT_BSTR */ - { - pathW = V_BSTR(&This->dir); - len = lstrlenW(pathW); - *pbs = SysAllocStringLen(pathW, pathW[len - 1] == '\\' ? len - 1 : len); - } - if (ret == S_OK && !*pbs) - ret = E_OUTOFMEMORY; - return ret; + *path = SysAllocString(This->path ? This->path : This->folder->path); + return *path ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI FolderItemImpl_get_GetLink(FolderItem2 *iface, @@ -947,33 +922,28 @@ static const FolderItem2Vtbl FolderItemImpl_Vtbl = { FolderItemImpl_ExtendedProperty }; -static HRESULT FolderItem_Constructor(FolderImpl *folder, VARIANT *dir, FolderItem **ppfi) +static HRESULT FolderItem_Constructor(FolderImpl *folder, const WCHAR *path, FolderItem **item) { FolderItemImpl *This; - HRESULT ret; - TRACE("%s\n", debugstr_variant(dir)); + TRACE("%s\n", debugstr_w(path)); - *ppfi = NULL; + *item = NULL; + + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This)); + if (!This) + return E_OUTOFMEMORY; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(FolderItemImpl)); - if (!This) return E_OUTOFMEMORY; This->FolderItem2_iface.lpVtbl = &FolderItemImpl_Vtbl; This->ref = 1; - - VariantInit(&This->dir); - ret = VariantCopy(&This->dir, dir); - if (FAILED(ret)) - { - HeapFree(GetProcessHeap(), 0, This); - return E_OUTOFMEMORY; - } + if (path) + This->path = strdupW(path); This->folder = folder; Folder3_AddRef(&folder->Folder3_iface); - *ppfi = (FolderItem *)&This->FolderItem2_iface; - return ret; + *item = (FolderItem *)&This->FolderItem2_iface; + return S_OK; } static HRESULT WINAPI FolderItemsImpl_QueryInterface(FolderItems3 *iface, @@ -1116,7 +1086,6 @@ static HRESULT WINAPI FolderItemsImpl_Item(FolderItems3 *iface, VARIANT index, F FolderItemsImpl *This = impl_from_FolderItems(iface); WCHAR buffW[MAX_PATH], *display_name; HRESULT hr; - VARIANT v; TRACE("(%p,%s,%p)\n", iface, debugstr_variant(&index), item); @@ -1158,18 +1127,14 @@ static HRESULT WINAPI FolderItemsImpl_Item(FolderItems3 *iface, VARIANT index, F break; } case VT_ERROR: - return FolderItem_Constructor(This->folder, &This->folder->dir, item); + return FolderItem_Constructor(This->folder, NULL, item); default: FIXME("Index type %d not handled.\n", V_VT(&index)); return E_NOTIMPL; } - V_VT(&v) = VT_BSTR; - V_BSTR(&v) = SysAllocString(display_name); - hr = FolderItem_Constructor(This->folder, &v, item); - VariantClear(&v); - return hr; + return FolderItem_Constructor(This->folder, display_name, item); } static HRESULT WINAPI FolderItemsImpl__NewEnum(FolderItems3 *iface, IUnknown **ppunk) @@ -1521,7 +1486,6 @@ static HRESULT WINAPI FolderImpl_ParseName(Folder3 *iface, BSTR name, FolderItem FolderItem *self; BSTR str; WCHAR pathW[MAX_PATH]; - VARIANT v; HRESULT hr; TRACE("(%p,%s,%p)\n", iface, debugstr_w(name), item); @@ -1544,11 +1508,7 @@ static HRESULT WINAPI FolderImpl_ParseName(Folder3 *iface, BSTR name, FolderItem if (!PathFileExistsW(pathW)) return S_FALSE; - V_VT(&v) = VT_BSTR; - V_BSTR(&v) = SysAllocString(pathW); - hr = FolderItem_Constructor(This, &v, item); - VariantClear(&v); - return hr; + return FolderItem_Constructor(This, pathW, item); } static HRESULT WINAPI FolderImpl_NewFolder(Folder3 *iface, BSTR bName, @@ -1584,13 +1544,13 @@ static HRESULT WINAPI FolderImpl_GetDetailsOf(Folder3 *iface, VARIANT vItem, return E_NOTIMPL; } -static HRESULT WINAPI FolderImpl_get_Self(Folder3 *iface, FolderItem **ppfi) +static HRESULT WINAPI FolderImpl_get_Self(Folder3 *iface, FolderItem **item) { FolderImpl *This = impl_from_Folder(iface); - TRACE("(%p,%p)\n", iface, ppfi); + TRACE("(%p,%p)\n", iface, item); - return FolderItem_Constructor(This, &This->dir, ppfi); + return FolderItem_Constructor(This, NULL, item); } static HRESULT WINAPI FolderImpl_get_OfflineStatus(Folder3 *iface, LONG *pul) @@ -1667,7 +1627,10 @@ static const Folder3Vtbl FolderImpl_Vtbl = { static HRESULT Folder_Constructor(VARIANT *dir, IShellFolder2 *folder, LPITEMIDLIST pidl, Folder **ret) { + PCUITEMID_CHILD last_part; + IShellFolder2 *parent; FolderImpl *This; + STRRET strret; HRESULT hr; *ret = NULL; @@ -1680,6 +1643,12 @@ static HRESULT Folder_Constructor(VARIANT *dir, IShellFolder2 *folder, LPITEMIDL This->ref = 1; This->folder = folder; This->pidl = pidl; + + hr = SHBindToParent(pidl, &IID_IShellFolder2, (void **)&parent, &last_part); + IShellFolder2_GetDisplayNameOf(parent, last_part, SHGDN_FORPARSING, &strret); + StrRetToBufW(&strret, NULL, This->path, sizeof(This->path)/sizeof(*This->path)); + IShellFolder2_Release(parent); + IShellDispatch_Constructor(NULL, &IID_IDispatch, (void **)&This->application); VariantInit(&This->dir); diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 757ef45..06e73dd 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -244,10 +244,10 @@ static void test_namespace(void) r = Folder2_get_Self(folder2, &item); ok(r == S_OK, "Folder::get_Self failed: %08x\n", r); r = FolderItem_get_Path(item, &item_path); -todo_wine { ok(r == S_OK, "FolderItem::get_Path failed: %08x\n", r); - ok(!lstrcmpW(item_path, clsidW), "expected %s, got %s\n", wine_dbgstr_w(clsidW), wine_dbgstr_w(item_path)); -} + /* TODO: we return lowercase GUID here */ + ok(!lstrcmpiW(item_path, clsidW), "expected %s, got %s\n", wine_dbgstr_w(clsidW), wine_dbgstr_w(item_path)); + SysFreeString(item_path); FolderItem_Release(item); Folder2_Release(folder2);

1 0

Nikolay Sivov : shell32: Use shellfolder API to construct FolderItems.
by Alexandre Julliard Sept. 26, 2017

Sept. 26, 2017

Module: wine Branch: master Commit: 7c638b00c74a297fc5bcb8c62b2ccfe8ac89a4f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c638b00c74a297fc5bcb8c62… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 26 12:57:49 2017 +0300 shell32: Use shellfolder API to construct FolderItems. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 195 ++++++++++++++++++++++--------------- dlls/shell32/tests/shelldispatch.c | 3 + 2 files changed, 118 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c638b00c74a297fc5bcb…

1 0

Alexandre Julliard : server: Implement NtAreMappedFilesTheSame functionality on the server side.
by Alexandre Julliard Sept. 26, 2017

Sept. 26, 2017

Module: wine Branch: master Commit: aa90910e93f568d9e8814996bff46614fbefdc22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa90910e93f568d9e8814996b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 26 14:55:13 2017 +0200 server: Implement NtAreMappedFilesTheSame functionality on the server side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 35 ++++++++++------------------------- include/wine/server_protocol.h | 19 ++++++++++++++++++- server/mapping.c | 13 +++++++++++++ server/protocol.def | 7 +++++++ server/request.h | 5 +++++ server/trace.c | 10 ++++++++++ 6 files changed, 63 insertions(+), 26 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d6ccddc..c2492d9 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1306,25 +1306,6 @@ static NTSTATUS allocate_dos_memory( struct file_view **view, unsigned int vprot /*********************************************************************** - * stat_mapping_file - * - * Stat the underlying file for a memory view. - */ -static NTSTATUS stat_mapping_file( struct file_view *view, struct stat *st ) -{ - NTSTATUS status; - int unix_fd, needs_close; - - if (!view->mapping) return STATUS_NOT_MAPPED_VIEW; - if (!(status = server_get_unix_fd( view->mapping, 0, &unix_fd, &needs_close, NULL, NULL ))) - { - if (fstat( unix_fd, st ) == -1) status = FILE_GetNtStatus(); - if (needs_close) close( unix_fd ); - } - return status; -} - -/*********************************************************************** * map_image * * Map an executable (PE format) image into memory. @@ -3337,7 +3318,6 @@ NTSTATUS WINAPI NtWriteVirtualMemory( HANDLE process, void *addr, const void *bu NTSTATUS WINAPI NtAreMappedFilesTheSame(PVOID addr1, PVOID addr2) { struct file_view *view1, *view2; - struct stat st1, st2; NTSTATUS status; sigset_t sigset; @@ -3354,13 +3334,18 @@ NTSTATUS WINAPI NtAreMappedFilesTheSame(PVOID addr1, PVOID addr2) status = STATUS_CONFLICTING_ADDRESSES; else if (view1 == view2) status = STATUS_SUCCESS; - else if (!(view1->protect & SEC_IMAGE) || !(view2->protect & SEC_IMAGE)) + else if ((view1->protect & VPROT_SYSTEM) || (view2->protect & VPROT_SYSTEM)) status = STATUS_NOT_SAME_DEVICE; - else if (!stat_mapping_file( view1, &st1 ) && !stat_mapping_file( view2, &st2 ) && - st1.st_dev == st2.st_dev && st1.st_ino == st2.st_ino) - status = STATUS_SUCCESS; else - status = STATUS_NOT_SAME_DEVICE; + { + SERVER_START_REQ( is_same_mapping ) + { + req->base1 = wine_server_client_ptr( view1->base ); + req->base2 = wine_server_client_ptr( view2->base ); + status = wine_server_call( req ); + } + SERVER_END_REQ; + } server_leave_uninterrupted_section( &csVirtual, &sigset ); return status; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ff0cb1e..5e42e1a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2289,6 +2289,20 @@ struct add_mapping_committed_range_reply }; + +struct is_same_mapping_request +{ + struct request_header __header; + char __pad_12[4]; + client_ptr_t base1; + client_ptr_t base2; +}; +struct is_same_mapping_reply +{ + struct reply_header __header; +}; + + #define SNAP_PROCESS 0x00000001 #define SNAP_THREAD 0x00000002 @@ -5662,6 +5676,7 @@ enum request REQ_unmap_view, REQ_get_mapping_committed_range, REQ_add_mapping_committed_range, + REQ_is_same_mapping, REQ_create_snapshot, REQ_next_process, REQ_next_thread, @@ -5955,6 +5970,7 @@ union generic_request struct unmap_view_request unmap_view_request; struct get_mapping_committed_range_request get_mapping_committed_range_request; struct add_mapping_committed_range_request add_mapping_committed_range_request; + struct is_same_mapping_request is_same_mapping_request; struct create_snapshot_request create_snapshot_request; struct next_process_request next_process_request; struct next_thread_request next_thread_request; @@ -6246,6 +6262,7 @@ union generic_reply struct unmap_view_reply unmap_view_reply; struct get_mapping_committed_range_reply get_mapping_committed_range_reply; struct add_mapping_committed_range_reply add_mapping_committed_range_reply; + struct is_same_mapping_reply is_same_mapping_reply; struct create_snapshot_reply create_snapshot_reply; struct next_process_reply next_process_reply; struct next_thread_reply next_thread_reply; @@ -6446,6 +6463,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 539 +#define SERVER_PROTOCOL_VERSION 540 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/mapping.c b/server/mapping.c index 03cffd1..b7ddbf5 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -961,3 +961,16 @@ DECL_HANDLER(add_mapping_committed_range) if (view) add_committed_range( view, req->offset, req->offset + req->size ); } + +/* check if two memory maps are for the same file */ +DECL_HANDLER(is_same_mapping) +{ + struct memory_view *view1 = find_mapped_view( current->process, req->base1 ); + struct memory_view *view2 = find_mapped_view( current->process, req->base2 ); + + if (!view1 || !view2) return; + if (!view1->fd || !view2->fd || + !(view1->flags & SEC_IMAGE) || !(view2->flags & SEC_IMAGE) || + !is_same_file_fd( view1->fd, view2->fd )) + set_error( STATUS_NOT_SAME_DEVICE ); +} diff --git a/server/protocol.def b/server/protocol.def index ed0cf7d..dd18031 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1760,6 +1760,13 @@ enum char_info_mode @END +/* Check if two memory maps are for the same file */ +(a)REQ(is_same_mapping) + client_ptr_t base1; /* first view base address */ + client_ptr_t base2; /* second view base address */ +(a)END + + #define SNAP_PROCESS 0x00000001 #define SNAP_THREAD 0x00000002 /* Create a snapshot */ diff --git a/server/request.h b/server/request.h index 10a708e..69fbfd3 100644 --- a/server/request.h +++ b/server/request.h @@ -200,6 +200,7 @@ DECL_HANDLER(map_view); DECL_HANDLER(unmap_view); DECL_HANDLER(get_mapping_committed_range); DECL_HANDLER(add_mapping_committed_range); +DECL_HANDLER(is_same_mapping); DECL_HANDLER(create_snapshot); DECL_HANDLER(next_process); DECL_HANDLER(next_thread); @@ -492,6 +493,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_unmap_view, (req_handler)req_get_mapping_committed_range, (req_handler)req_add_mapping_committed_range, + (req_handler)req_is_same_mapping, (req_handler)req_create_snapshot, (req_handler)req_next_process, (req_handler)req_next_thread, @@ -1288,6 +1290,9 @@ C_ASSERT( FIELD_OFFSET(struct add_mapping_committed_range_request, base) == 16 ) C_ASSERT( FIELD_OFFSET(struct add_mapping_committed_range_request, offset) == 24 ); C_ASSERT( FIELD_OFFSET(struct add_mapping_committed_range_request, size) == 32 ); C_ASSERT( sizeof(struct add_mapping_committed_range_request) == 40 ); +C_ASSERT( FIELD_OFFSET(struct is_same_mapping_request, base1) == 16 ); +C_ASSERT( FIELD_OFFSET(struct is_same_mapping_request, base2) == 24 ); +C_ASSERT( sizeof(struct is_same_mapping_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct create_snapshot_request, attributes) == 12 ); C_ASSERT( FIELD_OFFSET(struct create_snapshot_request, flags) == 16 ); C_ASSERT( sizeof(struct create_snapshot_request) == 24 ); diff --git a/server/trace.c b/server/trace.c index a3acdab..0f034fa 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2276,6 +2276,12 @@ static void dump_add_mapping_committed_range_request( const struct add_mapping_c dump_uint64( ", size=", &req->size ); } +static void dump_is_same_mapping_request( const struct is_same_mapping_request *req ) +{ + dump_uint64( " base1=", &req->base1 ); + dump_uint64( ", base2=", &req->base2 ); +} + static void dump_create_snapshot_request( const struct create_snapshot_request *req ) { fprintf( stderr, " attributes=%08x", req->attributes ); @@ -4571,6 +4577,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_unmap_view_request, (dump_func)dump_get_mapping_committed_range_request, (dump_func)dump_add_mapping_committed_range_request, + (dump_func)dump_is_same_mapping_request, (dump_func)dump_create_snapshot_request, (dump_func)dump_next_process_request, (dump_func)dump_next_thread_request, @@ -4860,6 +4867,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, (dump_func)dump_get_mapping_committed_range_reply, NULL, + NULL, (dump_func)dump_create_snapshot_reply, (dump_func)dump_next_process_reply, (dump_func)dump_next_thread_reply, @@ -5149,6 +5157,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "unmap_view", "get_mapping_committed_range", "add_mapping_committed_range", + "is_same_mapping", "create_snapshot", "next_process", "next_thread", @@ -5429,6 +5438,7 @@ static const struct { "NOT_IMPLEMENTED", STATUS_NOT_IMPLEMENTED }, { "NOT_MAPPED_VIEW", STATUS_NOT_MAPPED_VIEW }, { "NOT_REGISTRY_FILE", STATUS_NOT_REGISTRY_FILE }, + { "NOT_SAME_DEVICE", STATUS_NOT_SAME_DEVICE }, { "NOT_SUPPORTED", STATUS_NOT_SUPPORTED }, { "NO_DATA_DETECTED", STATUS_NO_DATA_DETECTED }, { "NO_IMPERSONATION_TOKEN", STATUS_NO_IMPERSONATION_TOKEN },

1 0

Alexandre Julliard : server: Store the mapped file descriptor in the memory view.
by Alexandre Julliard Sept. 26, 2017

Sept. 26, 2017

Module: wine Branch: master Commit: b1b4f5d451cf2ee821514b5479ddd9aae4d33a8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1b4f5d451cf2ee821514b547… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 26 14:50:43 2017 +0200 server: Store the mapped file descriptor in the memory view. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/debugger.c | 9 ++++----- server/file.h | 2 +- server/mapping.c | 11 ++++++++--- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/server/debugger.c b/server/debugger.c index 2eb794a..37f1934 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -169,9 +169,9 @@ static int fill_create_process_event( struct debug_event *event, const void *arg event->data.create_process.name = exe_module->name; event->data.create_process.unicode = 1; - if (exe_module->mapping) /* the doc says write access too, but this doesn't seem a good idea */ - event->data.create_process.file = open_mapping_file( debugger, exe_module->mapping, GENERIC_READ, - FILE_SHARE_READ | FILE_SHARE_WRITE ); + /* the doc says write access too, but this doesn't seem a good idea */ + event->data.create_process.file = open_mapping_file( debugger, exe_module->base, GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE ); return 1; } @@ -200,8 +200,7 @@ static int fill_load_dll_event( struct debug_event *event, const void *arg ) event->data.load_dll.dbg_size = dll->dbg_size; event->data.load_dll.name = dll->name; event->data.load_dll.unicode = 1; - if (dll->mapping) - event->data.load_dll.handle = open_mapping_file( debugger, dll->mapping, GENERIC_READ, + event->data.load_dll.handle = open_mapping_file( debugger, dll->base, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE ); return 1; } diff --git a/server/file.h b/server/file.h index b67b749..512b03a 100644 --- a/server/file.h +++ b/server/file.h @@ -147,7 +147,7 @@ extern mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner extern struct mapping *get_mapping_obj( struct process *process, obj_handle_t handle, unsigned int access ); -extern obj_handle_t open_mapping_file( struct process *process, struct mapping *mapping, +extern obj_handle_t open_mapping_file( struct process *process, client_ptr_t base, unsigned int access, unsigned int sharing ); extern struct mapping *grab_mapping_unless_removable( struct mapping *mapping ); extern void free_mapped_views( struct process *process ); diff --git a/server/mapping.c b/server/mapping.c index a75438a..03cffd1 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -85,6 +85,7 @@ static const struct object_ops ranges_ops = struct memory_view { struct list entry; /* entry in per-process view list */ + struct fd *fd; /* fd for mapped file */ struct ranges *committed; /* list of committed ranges in this mapping */ unsigned int flags; /* SEC_* flags */ client_ptr_t base; /* view base address (in process addr space) */ @@ -259,6 +260,7 @@ static struct memory_view *find_mapped_view( struct process *process, client_ptr static void free_memory_view( struct memory_view *view ) { + if (view->fd) release_object( view->fd ); if (view->committed) release_object( view->committed ); list_remove( &view->entry ); free( view ); @@ -731,13 +733,15 @@ struct mapping *get_mapping_obj( struct process *process, obj_handle_t handle, u } /* open a new file handle to the file backing the mapping */ -obj_handle_t open_mapping_file( struct process *process, struct mapping *mapping, +obj_handle_t open_mapping_file( struct process *process, client_ptr_t base, unsigned int access, unsigned int sharing ) { obj_handle_t handle; - struct file *file = create_file_for_fd_obj( mapping->fd, access, sharing ); + struct memory_view *view = find_mapped_view( process, base ); + struct file *file; - if (!file) return 0; + if (!view || !view->fd) return 0; + if (!(file = create_file_for_fd_obj( view->fd, access, sharing ))) return 0; handle = alloc_handle( process, file, access, 0 ); release_object( file ); return handle; @@ -925,6 +929,7 @@ DECL_HANDLER(map_view) view->size = req->size; view->start = req->start; view->flags = mapping->flags; + view->fd = !is_fd_removable( mapping->fd ) ? (struct fd *)grab_object( mapping->fd ) : NULL; view->committed = mapping->committed ? (struct ranges *)grab_object( mapping->committed ) : NULL; list_add_tail( &current->process->views, &view->entry ); }

1 0

Alexandre Julliard : server: Access the list of committed ranges directly from the mapped view.
by Alexandre Julliard Sept. 26, 2017

Sept. 26, 2017

Module: wine Branch: master Commit: 26314a56d327fb08b107f607f4e8871308df30a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26314a56d327fb08b107f607f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 26 14:38:46 2017 +0200 server: Access the list of committed ranges directly from the mapped view. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 4 +-- include/wine/server_protocol.h | 8 +++-- server/mapping.c | 67 +++++++++++++++++++++--------------------- server/protocol.def | 4 +-- server/request.h | 14 ++++----- server/trace.c | 4 +-- 6 files changed, 51 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=26314a56d327fb08b107f…

1 0

Alexandre Julliard : server: Make the memory ranges structure into a proper object.
by Alexandre Julliard Sept. 26, 2017

Sept. 26, 2017

Module: wine Branch: master Commit: 7e6cf601f4ff3fa613563ed539d42fb43968e037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e6cf601f4ff3fa613563ed53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 26 14:30:18 2017 +0200 server: Make the memory ranges structure into a proper object. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mapping.c | 99 ++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 74 insertions(+), 25 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index 5e71f28..af93be1 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -46,13 +46,39 @@ /* list of memory ranges, used to store committed info */ struct ranges { - unsigned int count; - unsigned int max; + struct object obj; /* object header */ + unsigned int count; /* number of used ranges */ + unsigned int max; /* number of allocated ranges */ struct range { file_pos_t start; file_pos_t end; - } ranges[1]; + } *ranges; +}; + +static void ranges_dump( struct object *obj, int verbose ); +static void ranges_destroy( struct object *obj ); + +static const struct object_ops ranges_ops = +{ + sizeof(struct ranges), /* size */ + ranges_dump, /* dump */ + no_get_type, /* get_type */ + no_add_queue, /* add_queue */ + NULL, /* remove_queue */ + NULL, /* signaled */ + NULL, /* satisfied */ + no_signal, /* signal */ + no_get_fd, /* get_fd */ + no_map_access, /* map_access */ + default_get_sd, /* get_sd */ + default_set_sd, /* set_sd */ + no_lookup_name, /* lookup_name */ + no_link_name, /* link_name */ + NULL, /* unlink_name */ + no_open_file, /* open_file */ + no_close_handle, /* close_handle */ + ranges_destroy /* destroy */ }; /* memory view mapped in client address space */ @@ -127,6 +153,18 @@ static size_t page_mask; #define ROUND_SIZE(size) (((size) + page_mask) & ~page_mask) +static void ranges_dump( struct object *obj, int verbose ) +{ + struct ranges *ranges = (struct ranges *)obj; + fprintf( stderr, "Memory ranges count=%u\n", ranges->count ); +} + +static void ranges_destroy( struct object *obj ) +{ + struct ranges *ranges = (struct ranges *)obj; + free( ranges->ranges ); +} + /* extend a file beyond the current end of file */ static int grow_file( int unix_fd, file_pos_t new_size ) { @@ -262,26 +300,27 @@ static inline void get_section_sizes( const IMAGE_SECTION_HEADER *sec, size_t *m static void add_committed_range( struct mapping *mapping, file_pos_t start, file_pos_t end ) { unsigned int i, j; + struct ranges *committed = mapping->committed; struct range *ranges; - if (!mapping->committed) return; /* everything committed already */ + if (!committed) return; /* everything committed already */ - for (i = 0, ranges = mapping->committed->ranges; i < mapping->committed->count; i++) + for (i = 0, ranges = committed->ranges; i < committed->count; i++) { if (ranges[i].start > end) break; if (ranges[i].end < start) continue; if (ranges[i].start > start) ranges[i].start = start; /* extend downwards */ if (ranges[i].end < end) /* extend upwards and maybe merge with next */ { - for (j = i + 1; j < mapping->committed->count; j++) + for (j = i + 1; j < committed->count; j++) { if (ranges[j].start > end) break; if (ranges[j].end > end) end = ranges[j].end; } if (j > i + 1) { - memmove( &ranges[i + 1], &ranges[j], (mapping->committed->count - j) * sizeof(*ranges) ); - mapping->committed->count -= j - (i + 1); + memmove( &ranges[i + 1], &ranges[j], (committed->count - j) * sizeof(*ranges) ); + committed->count -= j - (i + 1); } ranges[i].end = end; } @@ -290,33 +329,33 @@ static void add_committed_range( struct mapping *mapping, file_pos_t start, file /* now add a new range */ - if (mapping->committed->count == mapping->committed->max) + if (committed->count == committed->max) { - unsigned int new_size = mapping->committed->max * 2; - struct ranges *new_ptr = realloc( mapping->committed, offsetof( struct ranges, ranges[new_size] )); + unsigned int new_size = committed->max * 2; + struct range *new_ptr = realloc( committed->ranges, new_size * sizeof(*new_ptr) ); if (!new_ptr) return; - new_ptr->max = new_size; - ranges = new_ptr->ranges; - mapping->committed = new_ptr; + committed->max = new_size; + committed->ranges = new_ptr; } - memmove( &ranges[i + 1], &ranges[i], (mapping->committed->count - i) * sizeof(*ranges) ); + memmove( &ranges[i + 1], &ranges[i], (committed->count - i) * sizeof(*ranges) ); ranges[i].start = start; ranges[i].end = end; - mapping->committed->count++; + committed->count++; } /* find the range containing start and return whether it's committed */ static int find_committed_range( struct mapping *mapping, file_pos_t start, mem_size_t *size ) { unsigned int i; + struct ranges *committed = mapping->committed; struct range *ranges; - if (!mapping->committed) /* everything is committed */ + if (!committed) /* everything is committed */ { *size = mapping->size - start; return 1; } - for (i = 0, ranges = mapping->committed->ranges; i < mapping->committed->count; i++) + for (i = 0, ranges = committed->ranges; i < committed->count; i++) { if (ranges[i].start > start) { @@ -533,6 +572,21 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s return STATUS_INVALID_FILE_FOR_SECTION; } +static struct ranges *create_ranges(void) +{ + struct ranges *ranges = alloc_object( &ranges_ops ); + + if (!ranges) return NULL; + ranges->count = 0; + ranges->max = 8; + if (!(ranges->ranges = mem_alloc( ranges->max * sizeof(ranges->ranges) ))) + { + release_object( ranges ); + return NULL; + } + return ranges; +} + static unsigned int get_mapping_flags( obj_handle_t handle, unsigned int flags ) { switch (flags & (SEC_IMAGE | SEC_RESERVE | SEC_COMMIT | SEC_FILE)) @@ -639,12 +693,7 @@ static struct object *create_mapping( struct object *root, const struct unicode_ set_error( STATUS_INVALID_PARAMETER ); goto error; } - if (flags & SEC_RESERVE) - { - if (!(mapping->committed = mem_alloc( offsetof(struct ranges, ranges[8]) ))) goto error; - mapping->committed->count = 0; - mapping->committed->max = 8; - } + if ((flags & SEC_RESERVE) && !(mapping->committed = create_ranges())) goto error; mapping->size = (mapping->size + page_mask) & ~((mem_size_t)page_mask); if ((unix_fd = create_temp_file( mapping->size )) == -1) goto error; if (!(mapping->fd = create_anonymous_fd( &mapping_fd_ops, unix_fd, &mapping->obj, @@ -718,12 +767,12 @@ static void mapping_destroy( struct object *obj ) struct mapping *mapping = (struct mapping *)obj; assert( obj->ops == &mapping_ops ); if (mapping->fd) release_object( mapping->fd ); + if (mapping->committed) release_object( mapping->committed ); if (mapping->shared_file) { release_object( mapping->shared_file ); list_remove( &mapping->shared_entry ); } - free( mapping->committed ); } static enum server_fd_type mapping_get_fd_type( struct fd *fd )

1 0

Alexandre Julliard : server: Keep track of mapped memory views.
by Alexandre Julliard Sept. 26, 2017

Sept. 26, 2017

Module: wine Branch: master Commit: a557934c76c0e0bed6b73e5c8f79a0df059ff2de URL: http://source.winehq.org/git/wine.git/?a=commit;h=a557934c76c0e0bed6b73e5c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 26 14:11:49 2017 +0200 server: Keep track of mapped memory views. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 44 ++++++++++++++++--- include/wine/server_protocol.h | 38 ++++++++++++++++- server/file.h | 1 + server/mapping.c | 97 ++++++++++++++++++++++++++++++++++++++++++ server/process.c | 2 + server/process.h | 1 + server/protocol.def | 16 +++++++ server/request.h | 12 ++++++ server/trace.c | 21 +++++++++ 9 files changed, 225 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a557934c76c0e0bed6b73…

1 0

Alistair Leslie-Hughes : msvcrt: Implement clearerr_s.
by Alexandre Julliard Sept. 26, 2017

Sept. 26, 2017

Module: wine Branch: master Commit: fae0570a88d8859f67a1ad15ec3162a5bf5726a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fae0570a88d8859f67a1ad15e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 25 22:30:12 2017 +0000 msvcrt: Implement clearerr_s. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 15 +++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- include/msvcrt/stdio.h | 1 + 11 files changed, 25 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 6c46519..98bb853 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -113,7 +113,7 @@ @ cdecl _wtmpnam(ptr) ucrtbase._wtmpnam @ cdecl _wtmpnam_s(ptr long) ucrtbase._wtmpnam_s @ cdecl clearerr(ptr) ucrtbase.clearerr -@ stub clearerr_s +@ cdecl clearerr_s(ptr) ucrtbase.clearerr_s @ cdecl fclose(ptr) ucrtbase.fclose @ cdecl feof(ptr) ucrtbase.feof @ cdecl ferror(ptr) ucrtbase.ferror diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 1c95da9..340a41a 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1647,7 +1647,7 @@ @ cdecl ceil(double) MSVCRT_ceil @ cdecl -arch=arm,x86_64,arm64 ceilf(float) MSVCRT_ceilf @ cdecl clearerr(ptr) MSVCRT_clearerr -@ stub clearerr_s +@ cdecl clearerr_s(ptr) MSVCRT_clearerr_s @ cdecl clock() MSVCRT_clock @ cdecl cos(double) MSVCRT_cos @ cdecl -arch=arm,x86_64,arm64 cosf(float) MSVCRT_cosf diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 86209ac..cc90e0c 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2004,7 +2004,7 @@ @ cdecl ceil(double) MSVCRT_ceil @ cdecl -arch=arm,x86_64,arm64 ceilf(float) MSVCRT_ceilf @ cdecl clearerr(ptr) MSVCRT_clearerr -@ stub clearerr_s +@ cdecl clearerr_s(ptr) MSVCRT_clearerr_s @ cdecl clock() MSVCRT_clock @ cdecl cos(double) MSVCRT_cos @ cdecl -arch=arm,x86_64,arm64 cosf(float) MSVCRT_cosf diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index ad25b17..fabe0f8 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2079,7 +2079,7 @@ @ stub cimagf @ stub cimagl @ cdecl clearerr(ptr) MSVCRT_clearerr -@ stub clearerr_s +@ cdecl clearerr_s(ptr) MSVCRT_clearerr_s @ cdecl clock() MSVCRT_clock @ stub clog @ stub clog10 diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index b37ab32..38c2707 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1745,7 +1745,7 @@ @ stub cimagf @ stub cimagl @ cdecl clearerr(ptr) msvcr120.clearerr -@ stub clearerr_s +@ cdecl clearerr_s(ptr) msvcr120.clearerr_s @ cdecl clock() msvcr120.clock @ stub clog @ stub clog10 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index a08748c..d0e9be0 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1329,7 +1329,7 @@ @ cdecl ceil(double) MSVCRT_ceil @ cdecl -arch=arm,x86_64,arm64 ceilf(float) MSVCRT_ceilf @ cdecl clearerr(ptr) MSVCRT_clearerr -@ stub clearerr_s +@ cdecl clearerr_s(ptr) MSVCRT_clearerr_s @ cdecl clock() MSVCRT_clock @ cdecl cos(double) MSVCRT_cos @ cdecl -arch=arm,x86_64,arm64 cosf(float) MSVCRT_cosf diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 1604d62..c3a6d2e 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1302,7 +1302,7 @@ @ cdecl ceil(double) MSVCRT_ceil @ cdecl -arch=arm,x86_64,arm64 ceilf(float) MSVCRT_ceilf @ cdecl clearerr(ptr) MSVCRT_clearerr -@ stub clearerr_s +@ cdecl clearerr_s(ptr) MSVCRT_clearerr_s @ cdecl clock() MSVCRT_clock @ cdecl cos(double) MSVCRT_cos @ cdecl cosh(double) MSVCRT_cosh diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 8af9bc2..2b43a20 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1467,6 +1467,21 @@ void CDECL MSVCRT_clearerr(MSVCRT_FILE* file) } /********************************************************************* + * clearerr_s (MSVCRT.@) + */ +int CDECL MSVCRT_clearerr_s(MSVCRT_FILE* file) +{ + TRACE(":file (%p)\n",file); + + if (!MSVCRT_CHECK_PMT(file != NULL)) return MSVCRT_EINVAL; + + MSVCRT__lock_file(file); + file->_flag &= ~(MSVCRT__IOERR | MSVCRT__IOEOF); + MSVCRT__unlock_file(file); + return 0; +} + +/********************************************************************* * rewind (MSVCRT.@) */ void CDECL MSVCRT_rewind(MSVCRT_FILE* file) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 4e80308..e72fd7d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1264,7 +1264,7 @@ @ cdecl ceil(double) MSVCRT_ceil @ cdecl -arch=arm,x86_64,arm64 ceilf(float) MSVCRT_ceilf @ cdecl clearerr(ptr) MSVCRT_clearerr -# stub clearerr_s(ptr) +@ cdecl clearerr_s(ptr) MSVCRT_clearerr_s @ cdecl clock() MSVCRT_clock @ cdecl cos(double) MSVCRT_cos @ cdecl cosh(double) MSVCRT_cosh diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 9512a22..26b773c 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2222,7 +2222,7 @@ @ stub cimagf @ stub cimagl @ cdecl clearerr(ptr) MSVCRT_clearerr -@ stub clearerr_s +@ cdecl clearerr_s(ptr) MSVCRT_clearerr_s @ cdecl clock() MSVCRT_clock @ stub clog @ stub clog10 diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 0606d07..31b0427 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -143,6 +143,7 @@ int __cdecl _putc_nolock(int,FILE*); int __cdecl _ungetc_nolock(int,FILE*); void __cdecl clearerr(FILE*); +errno_t __cdecl clearerr_s(FILE*); int __cdecl fclose(FILE*); int __cdecl feof(FILE*); int __cdecl ferror(FILE*);

1 0

Fabian Maurer : dx8vb: Add stub dll.
by Alexandre Julliard Sept. 26, 2017

Sept. 26, 2017

Module: wine Branch: master Commit: b4456d0fa929aec25e275e1b5e1ca8a79742133d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4456d0fa929aec25e275e1b5… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Sep 24 16:35:01 2017 +0200 dx8vb: Add stub dll. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/dx8vb/Makefile.in | 4 ++ dlls/dx8vb/dx8vb.spec | 139 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/dx8vb/main.c | 45 ++++++++++++++++ 5 files changed, 191 insertions(+) diff --git a/configure b/configure index fc981b6..425f15d 100755 --- a/configure +++ b/configure @@ -1199,6 +1199,7 @@ enable_dssenh enable_dswave enable_dwmapi enable_dwrite +enable_dx8vb enable_dxdiagn enable_dxgi enable_dxva2 @@ -18329,6 +18330,7 @@ wine_fn_config_test dlls/dswave/tests dswave_test wine_fn_config_dll dwmapi enable_dwmapi implib wine_fn_config_dll dwrite enable_dwrite implib wine_fn_config_test dlls/dwrite/tests dwrite_test +wine_fn_config_dll dx8vb enable_dx8vb wine_fn_config_dll dxdiagn enable_dxdiagn clean wine_fn_config_test dlls/dxdiagn/tests dxdiagn_test wine_fn_config_lib dxerr8 diff --git a/configure.ac b/configure.ac index faa7791..518e9d3 100644 --- a/configure.ac +++ b/configure.ac @@ -3112,6 +3112,7 @@ WINE_CONFIG_TEST(dlls/dswave/tests) WINE_CONFIG_DLL(dwmapi,,[implib]) WINE_CONFIG_DLL(dwrite,,[implib]) WINE_CONFIG_TEST(dlls/dwrite/tests) +WINE_CONFIG_DLL(dx8vb) WINE_CONFIG_DLL(dxdiagn,,[clean]) WINE_CONFIG_TEST(dlls/dxdiagn/tests) WINE_CONFIG_LIB(dxerr8) diff --git a/dlls/dx8vb/Makefile.in b/dlls/dx8vb/Makefile.in new file mode 100644 index 0000000..ce3237c --- /dev/null +++ b/dlls/dx8vb/Makefile.in @@ -0,0 +1,4 @@ +MODULE = dx8vb.dll + +C_SRCS = \ + main.c diff --git a/dlls/dx8vb/dx8vb.spec b/dlls/dx8vb/dx8vb.spec new file mode 100644 index 0000000..973d4b3 --- /dev/null +++ b/dlls/dx8vb/dx8vb.spec @@ -0,0 +1,139 @@ +@ stub VB_D3DXVec2Dot +@ stub VB_D3DXVec2CCW +@ stub VB_D3DXVec2Add +@ stub VB_D3DXVec2Subtract +@ stub VB_D3DXVec2Minimize +@ stub VB_D3DXVec2Maximize +@ stub VB_D3DXVec2Scale +@ stub VB_D3DXVec2Lerp +@ stub VB_D3DXVec2Normalize +@ stub VB_D3DXVec2Hermite +@ stub VB_D3DXVec2BaryCentric +@ stub VB_D3DXVec2Transform +@ stub VB_D3DXVec2TransformCoord +@ stub VB_D3DXVec2TransformNormal +@ stub VB_D3DXVec3Length +@ stub VB_D3DXVec3LengthSq +@ stub VB_D3DXVec3Dot +@ stub VB_D3DXVec3Cross +@ stub VB_D3DXVec3Add +@ stub VB_D3DXVec3Subtract +@ stub VB_D3DXVec3Minimize +@ stub VB_D3DXVec3Maximize +@ stub VB_D3DXVec3Scale +@ stub VB_D3DXVec3Lerp +@ stub VB_D3DXVec3Normalize +@ stub VB_D3DXVec3Hermite +@ stub VB_D3DXVec3BaryCentric +@ stub VB_D3DXVec3Transform +@ stub VB_D3DXVec3TransformCoord +@ stub VB_D3DXVec3TransformNormal +@ stub VB_D3DXVec4Length +@ stub VB_D3DXVec4LengthSq +@ stub VB_D3DXVec4Dot +@ stub VB_D3DXVec4Add +@ stub VB_D3DXVec4Subtract +@ stub VB_D3DXVec4Minimize +@ stub VB_D3DXVec4Maximize +@ stub VB_D3DXVec4Scale +@ stub VB_D3DXVec4Lerp +@ stub VB_D3DXVec4Cross +@ stub VB_D3DXVec4Normalize +@ stub VB_D3DXVec4Hermite +@ stub VB_D3DXVec4BaryCentric +@ stub VB_D3DXVec4Transform +@ stub VB_D3DXMatrixIdentity +@ stub VB_D3DXMatrixIsIdentity +@ stub VB_D3DXMatrixfDeterminant +@ stub VB_D3DXMatrixMultiply +@ stub VB_D3DXMatrixTranspose +@ stub VB_D3DXMatrixInverse +@ stub VB_D3DXMatrixScaling +@ stub VB_D3DXMatrixTranslation +@ stub VB_D3DXMatrixRotationX +@ stub VB_D3DXMatrixRotationY +@ stub VB_D3DXMatrixRotationZ +@ stub VB_D3DXMatrixRotationAxis +@ stub VB_D3DXMatrixRotationQuaternion +@ stub VB_D3DXMatrixRotationYawPitchRoll +@ stub VB_D3DXMatrixTransformation +@ stub VB_D3DXMatrixAffineTransformation +@ stub VB_D3DXMatrixLookAtRH +@ stub VB_D3DXMatrixLookAtLH +@ stub VB_D3DXMatrixPerspectiveRH +@ stub VB_D3DXMatrixPerspectiveLH +@ stub VB_D3DXMatrixPerspectiveFovRH +@ stub VB_D3DXMatrixPerspectiveFovLH +@ stub VB_D3DXMatrixPerspectiveOffCenterRH +@ stub VB_D3DXMatrixPerspectiveOffCenterLH +@ stub VB_D3DXMatrixOrthoRH +@ stub VB_D3DXMatrixOrthoLH +@ stub VB_D3DXMatrixOrthoOffCenterRH +@ stub VB_D3DXMatrixOrthoOffCenterLH +@ stub VB_D3DXMatrixShadow +@ stub VB_D3DXMatrixReflect +@ stub VB_D3DXQuaternionLength +@ stub VB_D3DXQuaternionLengthSq +@ stub VB_D3DXQuaternionIdentity +@ stub VB_D3DXQuaternionIsIdentity +@ stub VB_D3DXQuaternionConjugate +@ stub VB_D3DXQuaternionToAxisAngle +@ stub VB_D3DXQuaternionRotationMatrix +@ stub VB_D3DXQuaternionRotationAxis +@ stub VB_D3DXQuaternionRotationYawPitchRoll +@ stub VB_D3DXQuaternionMultiply +@ stub VB_D3DXQuaternionNormalize +@ stub VB_D3DXQuaternionInverse +@ stub VB_D3DXQuaternionLn +@ stub VB_D3DXQuaternionExp +@ stub VB_D3DXQuaternionSlerp +@ stub VB_D3DXQuaternionSquad +@ stub VB_D3DXQuaternionBaryCentric +@ stub VB_D3DXPlaneDot +@ stub VB_D3DXPlaneDotCoord +@ stub VB_D3DXPlaneDotNormal +@ stub VB_D3DXPlaneNormalize +@ stub VB_D3DXPlaneIntersectLine +@ stub VB_D3DXPlaneFromPointNormal +@ stub VB_D3DXPlaneFromPoints +@ stub VB_D3DXPlaneTransform +@ stub VB_D3DXColorNegative +@ stub VB_D3DXColorAdd +@ stub VB_D3DXColorSubtract +@ stub VB_D3DXColorScale +@ stub VB_D3DXColorModulate +@ stub VB_D3DXColorLerp +@ stub VB_D3DXColorAdjustSaturation +@ stub VB_D3DXColorAdjustContrast +@ stub VB_D3DXVec2Length +@ stub VB_D3DXVec2LengthSq +@ stub D3DVertexBuffer8SetData +@ stub D3DVertexBuffer8GetData +@ stub D3DIndexBuffer8SetData +@ stub D3DIndexBuffer8GetData +@ stub DXLockArray8 +@ stub DXUnlockArray8 +@ stub VB_NewBuffer +@ stub VB_AddDataToBuffer +@ stub VB_AddStringToBuffer +@ stub VB_GetDataFromBuffer +@ stub VB_GetStringFromBuffer +@ stub VB_D3DXVec2CatmullRom +@ stub VB_D3DXVec3CatmullRom +@ stub VB_D3DXVec4CatmullRom +@ stub VB_D3DXVec3Project +@ stub VB_D3DXVec3Unproject +@ stub VB_D3DColorRGBA +@ stub VB_D3DColorARGB +@ stub VB_D3DColorXRGB +@ stub VB_D3DColorMake +@ stub VB_D3DXQuaternionDot +@ stub D3DXMeshVertexBuffer8SetData +@ stub D3DXMeshVertexBuffer8GetData +@ stub D3DXMeshIndexBuffer8SetData +@ stub D3DXMeshIndexBuffer8GetData +@ stub DXCopyMemory +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer diff --git a/dlls/dx8vb/main.c b/dlls/dx8vb/main.c new file mode 100644 index 0000000..0b60e34 --- /dev/null +++ b/dlls/dx8vb/main.c @@ -0,0 +1,45 @@ +/* + * Copyright 2017 Fabian Maurer + * + * 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 <string.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dx8vb); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + TRACE("(0x%p, %d, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +}

1 0