- wine-devel - winehq.org

[PATCH v5 1/3] include: Add UI Automation Pattern ID definitions.
by Connor McAdams 27 Sep '21

27 Sep '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- include/uiautomationclient.idl | 43 ++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/include/uiautomationclient.idl b/include/uiautomationclient.idl index ca768ba6d07..9f8b303f1fe 100644 --- a/include/uiautomationclient.idl +++ b/include/uiautomationclient.idl @@ -27,6 +27,49 @@ import "uiautomationcore.idl"; library UIAutomationClient { importlib ("stdole2.tlb"); + /* FIXME: Uncomment when properly supported in widl + [dllname("<no entry points>")] + module UIA_PatternIds + { + */ + const long UIA_InvokePatternId = 10000; + const long UIA_SelectionPatternId = 10001; + const long UIA_ValuePatternId = 10002; + const long UIA_RangeValuePatternId = 10003; + const long UIA_ScrollPatternId = 10004; + const long UIA_ExpandCollapsePatternId = 10005; + const long UIA_GridPatternId = 10006; + const long UIA_GridItemPatternId = 10007; + const long UIA_MultipleViewPatternId = 10008; + const long UIA_WindowPatternId = 10009; + const long UIA_SelectionItemPatternId = 10010; + const long UIA_DockPatternId = 10011; + const long UIA_TablePatternId = 10012; + const long UIA_TableItemPatternId = 10013; + const long UIA_TextPatternId = 10014; + const long UIA_TogglePatternId = 10015; + const long UIA_TransformPatternId = 10016; + const long UIA_ScrollItemPatternId = 10017; + const long UIA_LegacyIAccessiblePatternId = 10018; + const long UIA_ItemContainerPatternId = 10019; + const long UIA_VirtualizedItemPatternId = 10020; + const long UIA_SynchronizedInputPatternId = 10021; + const long UIA_ObjectModelPatternId = 10022; + const long UIA_AnnotationPatternId = 10023; + const long UIA_TextPattern2Id = 10024; + const long UIA_StylesPatternId = 10025; + const long UIA_SpreadsheetPatternId = 10026; + const long UIA_SpreadsheetItemPatternId = 10027; + const long UIA_TransformPattern2Id = 10028; + const long UIA_TextChildPatternId = 10029; + const long UIA_DragPatternId = 10030; + const long UIA_DropTargetPatternId = 10031; + const long UIA_TextEditPatternId = 10032; + const long UIA_CustomNavigationPatternId = 10033; + /* + } + */ + /* FIXME: Uncomment when properly supported in widl [dllname("<no entry points>")] module UIA_PropertyIds -- 2.25.1

2 3

[PATCH] po: Update German translation.
by Julian Rüger 27 Sep '21

27 Sep '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH v15] ntdll: Allow renaming a file/directory to a different case of itself.
by Gabriel Ivăncescu 27 Sep '21

27 Sep '21

Renaming a file or directory from e.g. foobar to FooBar (or any other case change) should work, like on Windows, instead of being a no-op. Clobbering an existing file must also respect the new case. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46203 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v15: Tried to make it clearer in the server code when separating the path/file components (and explain why we can't use stdlib functions, because of trailing slashes). dlls/kernel32/tests/file.c | 4 +- dlls/ntdll/tests/file.c | 4 +- dlls/ntdll/unix/file.c | 58 +++++++++++++++++++- server/fd.c | 108 ++++++++++++++++++++++++++----------- server/protocol.def | 2 + 5 files changed, 138 insertions(+), 38 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index ea0a32f..15bfc13 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2040,7 +2040,7 @@ static void test_MoveFileA(void) ok(hfile != INVALID_HANDLE_VALUE, "FindFirstFileA: failed, error %d\n", GetLastError()); if (hfile != INVALID_HANDLE_VALUE) { - todo_wine ok(!lstrcmpA(strrchr(tempdir, '\\') + 1, find_data.cFileName), + ok(!lstrcmpA(strrchr(tempdir, '\\') + 1, find_data.cFileName), "MoveFile failed to change casing on same file: got %s\n", find_data.cFileName); } CloseHandle(hfile); @@ -2085,7 +2085,7 @@ static void test_MoveFileA(void) ok(hfile != INVALID_HANDLE_VALUE, "FindFirstFileA: failed, error %d\n", GetLastError()); if (hfile != INVALID_HANDLE_VALUE) { - todo_wine ok(!lstrcmpA(strrchr(tempdir, '\\') + 1, find_data.cFileName), + ok(!lstrcmpA(strrchr(tempdir, '\\') + 1, find_data.cFileName), "MoveFile failed to change casing on same directory: got %s\n", find_data.cFileName); } CloseHandle(hfile); diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 19ae5f2..c6178d3 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2315,7 +2315,7 @@ static void test_file_link_information(void) ok(handle != INVALID_HANDLE_VALUE, "FindFirstFileW: failed, error %d\n", GetLastError()); if (handle != INVALID_HANDLE_VALUE) { - todo_wine ok(!lstrcmpW(wcsrchr(newpath, '\\') + 1, find_data.cFileName), + ok(!lstrcmpW(wcsrchr(newpath, '\\') + 1, find_data.cFileName), "Link did not change casing on existing target file: got %s\n", wine_dbgstr_w(find_data.cFileName)); } @@ -2900,7 +2900,7 @@ static void test_file_link_information(void) ok(handle != INVALID_HANDLE_VALUE, "FindFirstFileW: failed, error %d\n", GetLastError()); if (handle != INVALID_HANDLE_VALUE) { - todo_wine ok(!lstrcmpW(wcsrchr(oldpath, '\\') + 1, find_data.cFileName), + ok(!lstrcmpW(wcsrchr(oldpath, '\\') + 1, find_data.cFileName), "Link did not change casing on same file: got %s\n", wine_dbgstr_w(find_data.cFileName)); } diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index e6f8139..c23f957 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3591,6 +3591,52 @@ NTSTATUS WINAPI wine_unix_to_nt_file_name( const char *name, WCHAR *buffer, ULON } +/*********************************************************************** + * get_filename_case + * + * Get the unix filename, with the case from NT name's last component. + */ +static char *get_filename_case( const OBJECT_ATTRIBUTES *attr ) +{ + const WCHAR *p, *nt_filename = attr->ObjectName->Buffer; + int len = attr->ObjectName->Length / sizeof(WCHAR); + char *file_case; + + /* skip the device and prefix (allow slashes for unix namespace) */ + if (!attr->RootDirectory) + { + int pos = get_dos_prefix_len( attr->ObjectName ); + while (pos < len) + { + WCHAR c = nt_filename[pos++]; + if (c == '\\' || c == '/') break; + } + nt_filename += pos; + len -= pos; + } + + /* strip off trailing backslashes */ + for (; len; len--) + if (nt_filename[len - 1] != '\\' && nt_filename[len - 1] != '/') + break; + + /* get the last component */ + for (p = nt_filename + len; p != nt_filename; p--) + if (p[-1] == '\\' || p[-1] == '/') + break; + len -= p - nt_filename; + nt_filename = p; + + if ((file_case = malloc( len * 3 + 1 ))) + { + len = ntdll_wcstoumbs( nt_filename, len, file_case, len * 3, TRUE ); + if (len < 0 || len > MAX_DIR_ENTRY_LEN) len = 0; + file_case[len] = 0; + } + return file_case; +} + + /*********************************************************************** * get_full_path * @@ -4531,8 +4577,8 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, { FILE_RENAME_INFORMATION *info = ptr; UNICODE_STRING name_str, redir; + char *unix_name, *file_case; OBJECT_ATTRIBUTES attr; - char *unix_name; name_str.Buffer = info->FileName; name_str.Length = info->FileNameLength; @@ -4543,20 +4589,24 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, status = nt_to_unix_file_name( &attr, &unix_name, FILE_OPEN_IF ); if (status == STATUS_SUCCESS || status == STATUS_NO_SUCH_FILE) { + file_case = get_filename_case( &attr ); SERVER_START_REQ( set_fd_name_info ) { req->handle = wine_server_obj_handle( handle ); req->rootdir = wine_server_obj_handle( attr.RootDirectory ); req->namelen = attr.ObjectName->Length; + req->caselen = file_case ? strlen( file_case ) : 0; req->link = FALSE; req->replace = info->ReplaceIfExists; wine_server_add_data( req, attr.ObjectName->Buffer, attr.ObjectName->Length ); + wine_server_add_data( req, file_case, req->caselen ); wine_server_add_data( req, unix_name, strlen(unix_name) ); status = wine_server_call( req ); } SERVER_END_REQ; free( unix_name ); + free( file_case ); } free( redir.Buffer ); } @@ -4568,8 +4618,8 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, { FILE_LINK_INFORMATION *info = ptr; UNICODE_STRING name_str, redir; + char *unix_name, *file_case; OBJECT_ATTRIBUTES attr; - char *unix_name; name_str.Buffer = info->FileName; name_str.Length = info->FileNameLength; @@ -4580,20 +4630,24 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, status = nt_to_unix_file_name( &attr, &unix_name, FILE_OPEN_IF ); if (status == STATUS_SUCCESS || status == STATUS_NO_SUCH_FILE) { + file_case = get_filename_case( &attr ); SERVER_START_REQ( set_fd_name_info ) { req->handle = wine_server_obj_handle( handle ); req->rootdir = wine_server_obj_handle( attr.RootDirectory ); req->namelen = attr.ObjectName->Length; + req->caselen = file_case ? strlen( file_case ) : 0; req->link = TRUE; req->replace = info->ReplaceIfExists; wine_server_add_data( req, attr.ObjectName->Buffer, attr.ObjectName->Length ); + wine_server_add_data( req, file_case, req->caselen ); wine_server_add_data( req, unix_name, strlen(unix_name) ); status = wine_server_call( req ); } SERVER_END_REQ; free( unix_name ); + free( file_case ); } free( redir.Buffer ); } diff --git a/server/fd.c b/server/fd.c index ad1b7a1..f2d7aaf 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2533,11 +2533,14 @@ static void set_fd_disposition( struct fd *fd, int unlink ) /* set new name for the fd */ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, data_size_t len, - struct unicode_str nt_name, int create_link, int replace ) + const char *file_case, data_size_t caselen, struct unicode_str nt_name, + int create_link, int replace ) { + size_t pathlen = 0, filenamelen; struct inode *inode; struct stat st, st2; - char *name; + int different_case; + char *name, *p; if (!fd->inode || !fd->unix_name) { @@ -2571,6 +2574,30 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, da name = combined_name; } + /* get path len up to last component, ignoring trailing slashes */ + for (p = name; *p;) + if (*p++ == '/' && *p) + pathlen = p - name; + + /* get filename ptr and len, without trailing slashes */ + filenamelen = p - name - pathlen; + p = name + pathlen; + while (filenamelen && p[filenamelen - 1] == '/') + filenamelen--; + + different_case = caselen && (filenamelen != caselen || memcmp( p, file_case, caselen )); + + if (filenamelen < caselen) + { + p = realloc( name, pathlen + caselen + 1 ); + if (!p) + { + set_error( STATUS_NO_MEMORY ); + goto failed; + } + name = p; + } + /* when creating a hard link, source cannot be a dir */ if (create_link && !fstat( fd->unix_fd, &st ) && S_ISDIR( st.st_mode )) { @@ -2583,47 +2610,61 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, da if (!fstat( fd->unix_fd, &st2 ) && st.st_ino == st2.st_ino && st.st_dev == st2.st_dev) { if (create_link && !replace) set_error( STATUS_OBJECT_NAME_COLLISION ); - free( name ); - return; - } + if (!different_case) + { + free( name ); + return; + } - if (!replace) - { - set_error( STATUS_OBJECT_NAME_COLLISION ); - goto failed; + /* creating a link with a different case on itself renames the file */ + create_link = 0; } - - /* can't replace directories or special files */ - if (!S_ISREG( st.st_mode )) + else { - set_error( STATUS_ACCESS_DENIED ); - goto failed; - } + if (!replace) + { + set_error( STATUS_OBJECT_NAME_COLLISION ); + goto failed; + } - /* can't replace an opened file */ - if ((inode = get_inode( st.st_dev, st.st_ino, -1 ))) - { - int is_empty = list_empty( &inode->open ); - release_object( inode ); - if (!is_empty) + /* can't replace directories or special files */ + if (!S_ISREG( st.st_mode )) { set_error( STATUS_ACCESS_DENIED ); goto failed; } - } - /* link() expects that the target doesn't exist */ - /* rename() cannot replace files with directories */ - if (create_link || S_ISDIR( st2.st_mode )) - { - if (unlink( name )) + /* can't replace an opened file */ + if ((inode = get_inode( st.st_dev, st.st_ino, -1 ))) { - file_set_error(); - goto failed; + int is_empty = list_empty( &inode->open ); + release_object( inode ); + if (!is_empty) + { + set_error( STATUS_ACCESS_DENIED ); + goto failed; + } + } + + /* link() expects that the target doesn't exist */ + /* rename() cannot replace files with directories */ + if (create_link || S_ISDIR( st2.st_mode ) || different_case) + { + if (unlink( name )) + { + file_set_error(); + goto failed; + } } } } + if (different_case) + { + memcpy( name + pathlen, file_case, caselen ); + name[pathlen + caselen] = 0; + } + if (create_link) { if (link( fd->unix_name, name )) @@ -2965,16 +3006,19 @@ DECL_HANDLER(set_fd_disp_info) /* set fd name information */ DECL_HANDLER(set_fd_name_info) { + const char *fullname, *file_case; struct fd *fd, *root_fd = NULL; struct unicode_str nt_name; - if (req->namelen > get_req_data_size()) + if (req->namelen > get_req_data_size() || get_req_data_size() - req->namelen < req->caselen) { set_error( STATUS_INVALID_PARAMETER ); return; } nt_name.str = get_req_data(); nt_name.len = (req->namelen / sizeof(WCHAR)) * sizeof(WCHAR); + file_case = (const char *)get_req_data() + req->namelen; + fullname = file_case + req->caselen; if (req->rootdir) { @@ -2988,8 +3032,8 @@ DECL_HANDLER(set_fd_name_info) if ((fd = get_handle_fd_obj( current->process, req->handle, 0 ))) { - set_fd_name( fd, root_fd, (const char *)get_req_data() + req->namelen, - get_req_data_size() - req->namelen, nt_name, req->link, req->replace ); + set_fd_name( fd, root_fd, fullname, (const char *)get_req_data() + get_req_data_size() - fullname, + file_case, req->caselen, nt_name, req->link, req->replace ); release_object( fd ); } if (root_fd) release_object( root_fd ); diff --git a/server/protocol.def b/server/protocol.def index a7a4b7c..64af573 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3542,9 +3542,11 @@ struct handle_info obj_handle_t handle; /* handle to a file or directory */ obj_handle_t rootdir; /* root directory */ data_size_t namelen; /* length of NT name in bytes */ + data_size_t caselen; /* length of the actual case filename */ int link; /* link instead of renaming */ int replace; /* replace an existing file? */ VARARG(name,unicode_str,namelen); /* NT name */ + VARARG(actual_case,string,caselen); /* new file name's actual case (without path) */ VARARG(filename,string); /* new file name */ @END -- 2.31.1

1 0

[PATCH 8/8] oleacc: Add put_accValue function for edit client accessible object.
by Piotr Caban 27 Sep '21

27 Sep '21

From: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/client.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)

1 0

[PATCH 7/8] oleacc: Add default client IAccessible::put_accValue implementation.
by Piotr Caban 27 Sep '21

27 Sep '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/client.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)

1 0

[PATCH 6/8] oleacc: Add get_accValue function for edit client accessible object.
by Piotr Caban 27 Sep '21

27 Sep '21

From: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/client.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-)

1 0

[PATCH 5/8] oleacc: Add get_accKeyboardShortcut function for edit client accessible object.
by Piotr Caban 27 Sep '21

27 Sep '21

From: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/client.c | 67 +++++++++++++++++++++++++++++++------------- 1 file changed, 47 insertions(+), 20 deletions(-)

1 0

[PATCH 4/8] oleacc: Add get_accName function for edit client accessible object.
by Piotr Caban 27 Sep '21

27 Sep '21

From: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/client.c | 92 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 72 insertions(+), 20 deletions(-)

1 0

[PATCH 3/8] oleacc: Add get_accState function for edit client accessible object.
by Piotr Caban 27 Sep '21

27 Sep '21

From: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/client.c | 60 +++++++++++++++++++++++++++++++++----------- 1 file changed, 45 insertions(+), 15 deletions(-)

1 0

[PATCH 2/8] oleacc: Add get_accRole implementation for edit client accessible object.
by Piotr Caban 27 Sep '21

27 Sep '21

From: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/client.c | 32 ++++++++++++++++++++++++++++---- dlls/oleacc/oleacc_private.h | 1 + 2 files changed, 29 insertions(+), 4 deletions(-)

1 0

[PATCH 1/8] oleacc: Reorganize class specific behaviour handling.
by Piotr Caban 27 Sep '21

27 Sep '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/client.c | 35 +++++++++++++++ dlls/oleacc/main.c | 82 +++++----------------------------- dlls/oleacc/oleacc_private.h | 7 +++ dlls/oleacc/tests/main.c | 85 ++++++++++++++++++++++++++++++++++++ dlls/oleacc/window.c | 9 ++++ 5 files changed, 146 insertions(+), 72 deletions(-)

1 0

[PATCH v4 1/2] uiautomationcore: Implement UiaHostProviderFromHwnd.
by Connor McAdams 27 Sep '21

27 Sep '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- -v4: replace cast to long with HandleToUlong. dlls/uiautomationcore/Makefile.in | 1 + dlls/uiautomationcore/uia_main.c | 125 +++++++++++++++++++++++++++++- 2 files changed, 124 insertions(+), 2 deletions(-) diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in index 71ea7b99c94..1f6ad85c24f 100644 --- a/dlls/uiautomationcore/Makefile.in +++ b/dlls/uiautomationcore/Makefile.in @@ -1,5 +1,6 @@ MODULE = uiautomationcore.dll IMPORTLIB = uiautomationcore +IMPORTS = oleaut32 user32 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 2dada95af80..1e46b6e7e32 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -16,9 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + +#include "windows.h" +#include "initguid.h" #include "uiautomation.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(uiautomation); @@ -84,10 +89,126 @@ void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *callback) FIXME("(%p): stub\n", callback); } +typedef struct { + IRawElementProviderSimple IRawElementProviderSimple_iface; + LONG ref; + + HWND hwnd; +} HwndProvider; + +static inline HwndProvider *impl_from_HwndProvider(IRawElementProviderSimple *iface) +{ + return CONTAINING_RECORD(iface, HwndProvider, IRawElementProviderSimple_iface); +} + +HRESULT WINAPI HwndProvider_QueryInterface(IRawElementProviderSimple *iface, REFIID riid, void **ppv) +{ + if (IsEqualIID(riid, &IID_IRawElementProviderSimple) || + IsEqualIID(riid, &IID_IUnknown)) + *ppv = iface; + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IRawElementProviderSimple_AddRef(iface); + return S_OK; +} + +ULONG WINAPI HwndProvider_AddRef(IRawElementProviderSimple *iface) +{ + HwndProvider *This = impl_from_HwndProvider(iface); + return InterlockedIncrement(&This->ref); +} + +ULONG WINAPI HwndProvider_Release(IRawElementProviderSimple *iface) +{ + HwndProvider *This = impl_from_HwndProvider(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + if (!ref) + heap_free(This); + + return ref; +} + +HRESULT WINAPI HwndProvider_get_ProviderOptions(IRawElementProviderSimple *iface, + enum ProviderOptions *ret_val) +{ + *ret_val = ProviderOptions_ServerSideProvider; + return S_OK; +} + +HRESULT WINAPI HwndProvider_GetPatternProvider(IRawElementProviderSimple *iface, + PATTERNID pattern_id, IUnknown **ret_val) +{ + *ret_val = NULL; + return S_OK; +} + +HRESULT WINAPI HwndProvider_GetPropertyValue(IRawElementProviderSimple *iface, + PROPERTYID property_id, VARIANT *ret_val) +{ + HwndProvider *This = impl_from_HwndProvider(iface); + + switch (property_id) + { + case UIA_NativeWindowHandlePropertyId: + V_VT(ret_val) = VT_I4; + V_I4(ret_val) = HandleToUlong(This->hwnd); + break; + + case UIA_ProviderDescriptionPropertyId: + V_VT(ret_val) = VT_BSTR; + V_BSTR(ret_val) = SysAllocString(L"Wine: HWND Provider Proxy"); + break; + + default: + V_VT(ret_val) = VT_EMPTY; + break; + } + + return S_OK; +} + +HRESULT WINAPI HwndProvider_get_HostRawElementProvider(IRawElementProviderSimple *iface, + IRawElementProviderSimple **ret_val) +{ + *ret_val = NULL; + return S_OK; +} + +IRawElementProviderSimpleVtbl HwndProviderVtbl = { + HwndProvider_QueryInterface, + HwndProvider_AddRef, + HwndProvider_Release, + HwndProvider_get_ProviderOptions, + HwndProvider_GetPatternProvider, + HwndProvider_GetPropertyValue, + HwndProvider_get_HostRawElementProvider, +}; + HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **provider) { - FIXME("(%p, %p): stub\n", hwnd, provider); - return E_NOTIMPL; + HwndProvider *hwnd_prov; + + TRACE("(%p, %p)\n", hwnd, provider); + + *provider = NULL; + if (!IsWindow(hwnd)) + return E_INVALIDARG; + + hwnd_prov = heap_alloc_zero(sizeof(*hwnd_prov)); + if (!hwnd_prov) + return E_OUTOFMEMORY; + + hwnd_prov->IRawElementProviderSimple_iface.lpVtbl = &HwndProviderVtbl; + hwnd_prov->ref = 1; + hwnd_prov->hwnd = hwnd; + *provider = &hwnd_prov->IRawElementProviderSimple_iface; + + return S_OK; } HRESULT WINAPI UiaDisconnectProvider(IRawElementProviderSimple *provider) -- 2.25.1

3 5

[PATCH resend] wininet: Set context length for http status 403
by Alistair Leslie-Hughes 27 Sep '21

27 Sep '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/http.c | 4 +++- dlls/wininet/tests/http.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index e9363208471..4bfd93aa3be 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2918,7 +2918,9 @@ static DWORD set_content_length(http_request_t *request) WCHAR encoding[20]; DWORD size; - if(request->status_code == HTTP_STATUS_NO_CONTENT || !wcscmp(request->verb, L"HEAD")) { + if(request->status_code == HTTP_STATUS_NO_CONTENT || request->status_code == HTTP_STATUS_NOT_MODIFIED || + !wcscmp(request->verb, L"HEAD")) + { request->contentLength = request->netconn_stream.content_length = 0; return ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index bf4dce80bef..d32f01be2c5 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2381,6 +2381,11 @@ static DWORD CALLBACK server_thread(LPVOID param) static const char nocontentmsg[] = "HTTP/1.1 204 No Content\r\nConnection: close\r\n\r\n"; send(c, nocontentmsg, sizeof(nocontentmsg)-1, 0); } + if (strstr(buffer, "GET /test_not_modified")) + { + static const char notmodifiedmsg[] = "HTTP/1.1 304 Not Modified\r\nConnection: close\r\n\r\n"; + send(c, notmodifiedmsg, sizeof(notmodifiedmsg)-1, 0); + } if (strstr(buffer, "GET /test_conn_close")) { static const char conn_close_response[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\nsome content"; @@ -3487,6 +3492,37 @@ static void test_no_content(int port) CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); } +static void test_not_modified(int port) +{ + DWORD len; + char buf[256]; + HINTERNET ses, con, req; + BOOL ret; + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, NULL, "/test_not_modified", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 304); + + len = sizeof(buf)-1; + ret = HttpQueryInfoA(req, HTTP_QUERY_CONTENT_LENGTH, buf, &len, 0); + ok(!ret, "HttpQueryInfo should have failed\n"); + ok(GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND , "got %u\n", GetLastError()); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_conn_close(int port) { HINTERNET session, connection, req; @@ -6060,6 +6096,7 @@ static void test_http_connection(void) test_HttpSendRequestW(si.port); test_options(si.port); test_no_content(si.port); + test_not_modified(si.port); test_conn_close(si.port); test_no_cache(si.port); test_cache_read_gzipped(si.port); -- 2.33.0

2 1

[PATCH] include: Add SPSTREAMFORMAT enum values
by Alistair Leslie-Hughes 27 Sep '21

27 Sep '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/sapi.idl | 75 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/include/sapi.idl b/include/sapi.idl index 59c2540ba21..d2c1aac8afc 100644 --- a/include/sapi.idl +++ b/include/sapi.idl @@ -351,6 +351,81 @@ typedef [hidden] enum SPVALUETYPE SPDF_ALL = 0x000000ff } SPVALUETYPE; +typedef [hidden] enum SPSTREAMFORMAT +{ + SPSF_Default = -1, + SPSF_NoAssignedFormat = 0, + SPSF_Text, + SPSF_NonStandardFormat, + SPSF_ExtendedAudioFormat, + SPSF_8kHz8BitMono, + SPSF_8kHz8BitStereo, + SPSF_8kHz16BitMono, + SPSF_8kHz16BitStereo, + SPSF_11kHz8BitMono, + SPSF_11kHz8BitStereo, + SPSF_11kHz16BitMono, + SPSF_11kHz16BitStereo, + SPSF_12kHz8BitMono, + SPSF_12kHz8BitStereo, + SPSF_12kHz16BitMono, + SPSF_12kHz16BitStereo, + SPSF_16kHz8BitMono, + SPSF_16kHz8BitStereo, + SPSF_16kHz16BitMono, + SPSF_16kHz16BitStereo, + SPSF_22kHz8BitMono, + SPSF_22kHz8BitStereo, + SPSF_22kHz16BitMono, + SPSF_22kHz16BitStereo, + SPSF_24kHz8BitMono, + SPSF_24kHz8BitStereo, + SPSF_24kHz16BitMono, + SPSF_24kHz16BitStereo, + SPSF_32kHz8BitMono, + SPSF_32kHz8BitStereo, + SPSF_32kHz16BitMono, + SPSF_32kHz16BitStereo, + SPSF_44kHz8BitMono, + SPSF_44kHz8BitStereo, + SPSF_44kHz16BitMono, + SPSF_44kHz16BitStereo, + SPSF_48kHz8BitMono, + SPSF_48kHz8BitStereo, + SPSF_48kHz16BitMono, + SPSF_48kHz16BitStereo, + SPSF_TrueSpeech_8kHz1BitMono, + SPSF_CCITT_ALaw_8kHzMono, + SPSF_CCITT_ALaw_8kHzStereo, + SPSF_CCITT_ALaw_11kHzMono, + SPSF_CCITT_ALaw_11kHzStereo, + SPSF_CCITT_ALaw_22kHzMono, + SPSF_CCITT_ALaw_22kHzStereo, + SPSF_CCITT_ALaw_44kHzMono, + SPSF_CCITT_ALaw_44kHzStereo, + SPSF_CCITT_uLaw_8kHzMono, + SPSF_CCITT_uLaw_8kHzStereo, + SPSF_CCITT_uLaw_11kHzMono, + SPSF_CCITT_uLaw_11kHzStereo, + SPSF_CCITT_uLaw_22kHzMono, + SPSF_CCITT_uLaw_22kHzStereo, + SPSF_CCITT_uLaw_44kHzMono, + SPSF_CCITT_uLaw_44kHzStereo, + SPSF_ADPCM_8kHzMono, + SPSF_ADPCM_8kHzStereo, + SPSF_ADPCM_11kHzMono, + SPSF_ADPCM_11kHzStereo, + SPSF_ADPCM_22kHzMono, + SPSF_ADPCM_22kHzStereo, + SPSF_ADPCM_44kHzMono, + SPSF_ADPCM_44kHzStereo, + SPSF_GSM610_8kHzMono, + SPSF_GSM610_11kHzMono, + SPSF_GSM610_22kHzMono, + SPSF_GSM610_44kHzMono, + SPSF_NUM_FORMATS +} SPSTREAMFORMAT; + typedef unsigned short SPPHONEID; typedef [restricted, hidden] struct SPPHRASEELEMENT -- 2.33.0

1 0

[PATCH 1/5] ole32/tests: Systematically check for supported moniker interfaces.
by Nikolay Sivov 27 Sep '21

27 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/moniker.c | 59 ++++++++++++++++++++++++++++++++++---- 1 file changed, 53 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index ae46db110b6..db068f1426f 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -36,6 +36,21 @@ #include "wine/test.h" #include "wine/heap.h" +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + #define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08x\n", hr) #define CHECK_EXPECTED_METHOD(method_name) \ @@ -1896,6 +1911,13 @@ static void test_class_moniker(void) hr = CreateClassMoniker(&GUID_NULL, &moniker); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + check_interface(moniker, &IID_IMoniker, TRUE); + check_interface(moniker, &IID_IPersist, TRUE); + check_interface(moniker, &IID_IPersistStream, TRUE); + check_interface(moniker, &CLSID_ClassMoniker, TRUE); + check_interface(moniker, &IID_IROTData, TRUE); + check_interface(moniker, &IID_IMarshal, TRUE); + hr = IMoniker_GetSizeMax(moniker, &size); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(size.QuadPart == 20, "Unexpected size %u.\n", size.LowPart); @@ -2222,6 +2244,14 @@ static void test_file_monikers(void) hr = CreateFileMoniker(filename, &moniker); ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + check_interface(moniker, &IID_IMoniker, TRUE); +todo_wine + check_interface(moniker, &IID_IPersist, FALSE); + check_interface(moniker, &IID_IPersistStream, TRUE); + check_interface(moniker, &CLSID_FileMoniker, TRUE); + check_interface(moniker, &IID_IROTData, TRUE); + check_interface(moniker, &IID_IMarshal, TRUE); + hr = IMoniker_BindToStorage(moniker, NULL, NULL, &IID_IStorage, (void **)&storage); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); @@ -2753,6 +2783,14 @@ static void test_anti_moniker(void) hr = CreateAntiMoniker(&moniker); ok_ole_success(hr, CreateAntiMoniker); + check_interface(moniker, &IID_IMoniker, TRUE); +todo_wine + check_interface(moniker, &IID_IPersist, FALSE); + check_interface(moniker, &IID_IPersistStream, TRUE); + check_interface(moniker, &CLSID_AntiMoniker, TRUE); + check_interface(moniker, &IID_IROTData, TRUE); + check_interface(moniker, &IID_IMarshal, TRUE); + hr = IMoniker_QueryInterface(moniker, &CLSID_AntiMoniker, (void **)&unknown); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n"); @@ -3067,6 +3105,13 @@ static void test_generic_composite_moniker(void) hr = CreateGenericComposite(moniker1, moniker2, &moniker); ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + check_interface(moniker, &IID_IMoniker, TRUE); +todo_wine + check_interface(moniker, &IID_IPersist, FALSE); + check_interface(moniker, &IID_IPersistStream, TRUE); + check_interface(moniker, &IID_IROTData, TRUE); + check_interface(moniker, &IID_IMarshal, TRUE); + hr = CreateGenericComposite(moniker1, moniker2, &moniker); ok(hr == S_OK, "Failed to create composite, hr %#x.\n", hr); TEST_MONIKER_TYPE(moniker, MKSYS_GENERICCOMPOSITE); @@ -3253,7 +3298,6 @@ static void test_pointer_moniker(void) FILETIME filetime; IUnknown *unknown; IStream *stream; - IROTData *rotdata; LPOLESTR display_name; IMarshal *marshal; LARGE_INTEGER pos; @@ -3267,6 +3311,14 @@ static void test_pointer_moniker(void) hr = CreatePointerMoniker((IUnknown *)&factory.IClassFactory_iface, &moniker); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + check_interface(moniker, &IID_IMoniker, TRUE); +todo_wine + check_interface(moniker, &IID_IPersist, FALSE); + check_interface(moniker, &IID_IPersistStream, TRUE); + check_interface(moniker, &CLSID_PointerMoniker, TRUE); + check_interface(moniker, &IID_IMarshal, TRUE); + check_interface(moniker, &IID_IROTData, FALSE); + hr = IMoniker_QueryInterface(moniker, &IID_IMoniker, NULL); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); @@ -3318,11 +3370,6 @@ static void test_pointer_moniker(void) hr = IMoniker_IsDirty(moniker); ok(hr == S_FALSE, "IMoniker_IsDirty should return S_FALSE, not 0x%08x\n", hr); - /* IROTData::GetComparisonData test */ - - hr = IMoniker_QueryInterface(moniker, &IID_IROTData, (void **)&rotdata); - ok(hr == E_NOINTERFACE, "IMoniker_QueryInterface(IID_IROTData) should have returned E_NOINTERFACE instead of 0x%08x\n", hr); - /* Saving */ hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); -- 2.33.0

1 4

[PATCH v2 1/3] ntdll: Implement LdrGetDllHandleEx() function.
by Paul Gofman 27 Sep '21

27 Sep '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/kernel32/tests/module.c | 107 +++++++++++++++++++++++++++++++++++ dlls/ntdll/loader.c | 44 ++++++++++++-- dlls/ntdll/ntdll.spec | 1 + include/winternl.h | 5 ++ 4 files changed, 152 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 0066f7de5a8..5ca137ad6ba 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -39,6 +39,9 @@ static BOOL (WINAPI *pK32GetModuleInformation)(HANDLE process, HMODULE module, static NTSTATUS (WINAPI *pLdrGetDllDirectory)(UNICODE_STRING*); static NTSTATUS (WINAPI *pLdrSetDllDirectory)(UNICODE_STRING*); +static NTSTATUS (WINAPI *pLdrGetDllHandle)( LPCWSTR load_path, ULONG flags, const UNICODE_STRING *name, HMODULE *base ); +static NTSTATUS (WINAPI *pLdrGetDllHandleEx)( ULONG flags, LPCWSTR load_path, ULONG *dll_characteristics, + const UNICODE_STRING *name, HMODULE *base ); static BOOL is_unicode_enabled = TRUE; @@ -826,6 +829,8 @@ static void init_pointers(void) mod = GetModuleHandleA( "ntdll.dll" ); MAKEFUNC(LdrGetDllDirectory); MAKEFUNC(LdrSetDllDirectory); + MAKEFUNC(LdrGetDllHandle); + MAKEFUNC(LdrGetDllHandleEx); #undef MAKEFUNC /* before Windows 7 this was not exported in kernel32 */ @@ -1143,6 +1148,107 @@ static void test_SetDefaultDllDirectories(void) pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_DEFAULT_DIRS ); } +static void check_refcount( HMODULE mod, unsigned int refcount ) +{ + unsigned int i; + BOOL ret; + + for (i = 0; i < min( refcount, 10 ); ++i) + { + ret = FreeLibrary( mod ); + ok( ret || broken( refcount == ~0u && GetLastError() == ERROR_MOD_NOT_FOUND && i == 2 ) /* Win8 */, + "Refcount test failed, i %u, error %u.\n", i, GetLastError() ); + if (!ret) return; + } + if (refcount != ~0u) + { + ret = FreeLibrary( mod ); + ok( !ret && GetLastError() == ERROR_MOD_NOT_FOUND, "Refcount test failed, ret %d, error %u.\n", + ret, GetLastError() ); + } +} + +static void test_LdrGetDllHandleEx(void) +{ + HMODULE mod, loaded_mod; + UNICODE_STRING name; + NTSTATUS status; + unsigned int i; + + if (!pLdrGetDllHandleEx) + { + win_skip( "LdrGetDllHandleEx is not available.\n" ); + return; + } + + RtlInitUnicodeString( &name, L"unknown.dll" ); + status = pLdrGetDllHandleEx( 0, NULL, NULL, &name, &mod ); + ok( status == STATUS_DLL_NOT_FOUND, "Got unexpected status %#x.\n", status ); + + RtlInitUnicodeString( &name, L"authz.dll" ); + loaded_mod = LoadLibraryW( name.Buffer ); + ok( !!loaded_mod, "Failed to load module.\n" ); + status = pLdrGetDllHandleEx( 0, NULL, NULL, &name, &mod ); + ok( !status, "Got unexpected status %#x.\n", status ); + ok( mod == loaded_mod, "got %p\n", mod ); + winetest_push_context( "Flags 0" ); + check_refcount( loaded_mod, 2 ); + winetest_pop_context(); + + loaded_mod = LoadLibraryW( name.Buffer ); + ok( !!loaded_mod, "Failed to load module.\n" ); + status = pLdrGetDllHandleEx( LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, NULL, + NULL, &name, &mod ); + ok( !status, "Got unexpected status %#x.\n", status ); + ok( mod == loaded_mod, "got %p\n", mod ); + winetest_push_context( "LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT" ); + check_refcount( loaded_mod, 1 ); + winetest_pop_context(); + + loaded_mod = LoadLibraryW( name.Buffer ); + ok( !!loaded_mod, "Failed to load module.\n" ); + status = pLdrGetDllHandle( NULL, ~0u, &name, &mod ); + ok( !status, "Got unexpected status %#x.\n", status ); + ok( mod == loaded_mod, "got %p\n", mod ); + winetest_push_context( "LdrGetDllHandle" ); + check_refcount( loaded_mod, 1 ); + winetest_pop_context(); + + loaded_mod = LoadLibraryW( name.Buffer ); + ok( !!loaded_mod, "Failed to load module.\n" ); + status = pLdrGetDllHandleEx( 4, NULL, NULL, (void *)&name, &mod ); + ok( !status, "Got unexpected status %#x.\n", status ); + ok( mod == loaded_mod, "got %p\n", mod ); + winetest_push_context( "Flag 4" ); + check_refcount( loaded_mod, 2 ); + winetest_pop_context(); + + for (i = 3; i < 32; ++i) + { + loaded_mod = LoadLibraryW( name.Buffer ); + ok( !!loaded_mod, "Failed to load module.\n" ); + status = pLdrGetDllHandleEx( 1 << i, NULL, NULL, &name, &mod ); + ok( status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status ); + winetest_push_context( "Invalid flags, i %u", i ); + check_refcount( loaded_mod, 1 ); + winetest_pop_context(); + } + + status = pLdrGetDllHandleEx( LDR_GET_DLL_HANDLE_EX_FLAG_PIN | LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, + NULL, NULL, &name, &mod ); + ok( status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status ); + + loaded_mod = LoadLibraryW( name.Buffer ); + ok( !!loaded_mod, "Failed to load module.\n" ); + status = pLdrGetDllHandleEx( LDR_GET_DLL_HANDLE_EX_FLAG_PIN, NULL, + NULL, &name, &mod ); + ok( !status, "Got unexpected status %#x.\n", status ); + ok( mod == loaded_mod, "got %p\n", mod ); + winetest_push_context( "LDR_GET_DLL_HANDLE_EX_FLAG_PIN" ); + check_refcount( loaded_mod, ~0u ); + winetest_pop_context(); +} + START_TEST(module) { WCHAR filenameW[MAX_PATH]; @@ -1175,4 +1281,5 @@ START_TEST(module) testK32GetModuleInformation(); test_AddDllDirectory(); test_SetDefaultDllDirectories(); + test_LdrGetDllHandleEx(); } diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 819cf51b9fc..3e3f991eba2 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2996,16 +2996,33 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags, /****************************************************************** - * LdrGetDllHandle (NTDLL.@) + * LdrGetDllHandleEx (NTDLL.@) */ -NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_STRING *name, HMODULE *base ) +NTSTATUS WINAPI LdrGetDllHandleEx( ULONG flags, LPCWSTR load_path, ULONG *dll_characteristics, + const UNICODE_STRING *name, HMODULE *base ) { - NTSTATUS status; + static const ULONG supported_flags = LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT + | LDR_GET_DLL_HANDLE_EX_FLAG_PIN; + static const ULONG valid_flags = LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT + | LDR_GET_DLL_HANDLE_EX_FLAG_PIN | 4; + SECTION_IMAGE_INFORMATION image_info; UNICODE_STRING nt_name; + struct file_id id; + NTSTATUS status; WINE_MODREF *wm; HANDLE mapping; - SECTION_IMAGE_INFORMATION image_info; - struct file_id id; + + TRACE( "flag %#x, load_path %p, dll_characteristics %p, name %p, base %p.\n", + flags, load_path, dll_characteristics, name, base ); + + if (flags & ~valid_flags) return STATUS_INVALID_PARAMETER; + + if ((flags & (LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT | LDR_GET_DLL_HANDLE_EX_FLAG_PIN)) + == (LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT | LDR_GET_DLL_HANDLE_EX_FLAG_PIN)) + return STATUS_INVALID_PARAMETER; + + if (flags & ~supported_flags) FIXME( "Unsupported flags %#x.\n", flags ); + if (dll_characteristics) FIXME( "dll_characteristics unsupported.\n" ); RtlEnterCriticalSection( &loader_section ); @@ -3019,12 +3036,29 @@ NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_S } RtlFreeUnicodeString( &nt_name ); + if (!status) + { + if (flags & LDR_GET_DLL_HANDLE_EX_FLAG_PIN) + LdrAddRefDll( LDR_ADDREF_DLL_PIN, *base ); + else if (!(flags & LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) + LdrAddRefDll( 0, *base ); + } + RtlLeaveCriticalSection( &loader_section ); TRACE( "%s -> %p (load path %s)\n", debugstr_us(name), status ? NULL : *base, debugstr_w(load_path) ); return status; } +/****************************************************************** + * LdrGetDllHandle (NTDLL.@) + */ +NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_STRING *name, HMODULE *base ) +{ + return LdrGetDllHandleEx( LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, load_path, NULL, name, base ); +} + + /****************************************************************** * LdrAddRefDll (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 9837b09fd51..0f8ddbea669 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -88,6 +88,7 @@ @ stub LdrFlushAlternateResourceModules @ stdcall LdrGetDllDirectory(ptr) @ stdcall LdrGetDllHandle(wstr long ptr ptr) +@ stdcall LdrGetDllHandleEx(long ptr ptr ptr ptr) # @ stub LdrGetDllHandleEx @ stdcall LdrGetDllPath(wstr long ptr ptr) @ stdcall LdrGetProcedureAddress(ptr ptr long ptr) diff --git a/include/winternl.h b/include/winternl.h index 9e96591ad8e..7a3a5e94702 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3380,6 +3380,10 @@ typedef void (CALLBACK *PLDR_DLL_NOTIFICATION_FUNCTION)(ULONG, LDR_DLL_NOTIFICAT /* flag for LdrAddRefDll */ #define LDR_ADDREF_DLL_PIN 0x00000001 +/* flags for LdrGetDllHandleEx */ +#define LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT 0x00000001 +#define LDR_GET_DLL_HANDLE_EX_FLAG_PIN 0x00000002 + #define LDR_DLL_NOTIFICATION_REASON_LOADED 1 #define LDR_DLL_NOTIFICATION_REASON_UNLOADED 2 @@ -3778,6 +3782,7 @@ NTSYSAPI NTSTATUS WINAPI LdrFindResourceDirectory_U(HMODULE,const LDR_RESOURCE_ NTSYSAPI NTSTATUS WINAPI LdrFindResource_U(HMODULE,const LDR_RESOURCE_INFO*,ULONG,const IMAGE_RESOURCE_DATA_ENTRY**); NTSYSAPI NTSTATUS WINAPI LdrGetDllDirectory(UNICODE_STRING*); NTSYSAPI NTSTATUS WINAPI LdrGetDllHandle(LPCWSTR, ULONG, const UNICODE_STRING*, HMODULE*); +NTSYSAPI NTSTATUS WINAPI LdrGetDllHandleEx(ULONG, LPCWSTR, ULONG *, const UNICODE_STRING*, HMODULE*); NTSYSAPI NTSTATUS WINAPI LdrGetDllPath(PCWSTR,ULONG,PWSTR*,PWSTR*); NTSYSAPI NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE, const ANSI_STRING*, ULONG, void**); NTSYSAPI NTSTATUS WINAPI LdrLoadDll(LPCWSTR, DWORD, const UNICODE_STRING*, HMODULE*); -- 2.31.1

2 3

[PATCH 9/9] gdi32: Move __wine_get_wgl_driver to driver.c.
by Jacek Caban 27 Sep '21

27 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/driver.c | 17 +++++++++++++++++ dlls/gdi32/opengl.c | 18 ------------------ 2 files changed, 17 insertions(+), 18 deletions(-)

2 1

[PATCH 8/9] gdi32: Read screen DPI config in init_font_options.
by Jacek Caban 27 Sep '21

27 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 39 +++++++++++++++-------- dlls/gdi32/gdiobj.c | 65 ++++++-------------------------------- dlls/gdi32/ntgdi_private.h | 3 +- 3 files changed, 36 insertions(+), 71 deletions(-)

2 1

[PATCH 7/9] gdi32: Directly use ntdll in load_registry_fonts.
by Jacek Caban 27 Sep '21

27 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 53 ++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 26 deletions(-)

2 1

[PATCH 6/9] gdi32: Directly use ntdll in update_external_font_keys.
by Jacek Caban 27 Sep '21

27 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 65 ++++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 29 deletions(-)

2 1

[PATCH 5/9] gdi32: Directly use ntdll in load_system_bitmap_fonts and load_file_system_fonts.
by Jacek Caban 27 Sep '21

27 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-)

2 1

[PATCH 4/9] gdi32: Directly use ntdll in get_associated_charset_info.
by Jacek Caban 27 Sep '21

27 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-)

2 1

[PATCH 2/9] gdi32: Directly use ntdll in update_codepage.
by Jacek Caban 27 Sep '21

27 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 128 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 89 insertions(+), 39 deletions(-)

2 1

[PATCH 1/9] gdi32: Directly use ntdll in update_font_system_link_info.
by Jacek Caban 27 Sep '21

27 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 89 +++++++++++++++++++++++++++-------------------- 1 file changed, 51 insertions(+), 38 deletions(-)

2 1

[PATCH v2 1/3] winegstreamer/media_source: Emit absolute presentation timestamp.
by Giovanni Mascellani 27 Sep '21

27 Sep '21

Currently the media source emit a presentation timestamp relative to when the playback was last restarted. I.e., the frame that sits two seconds inside a media file will get timestamp 2 if playback was started at the beginning of the file, but will get timestamp 1 if playback was last restarted at second 1. This does not match Windows behavior, where each frame always gets the same timestamp independently from where playback was started. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v2: Add a more complete description. dlls/winegstreamer/media_source.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 825bad8da27..a10ad998231 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -100,8 +100,6 @@ struct media_source SOURCE_SHUTDOWN, } state; - LONGLONG start_time; - HANDLE read_thread; bool read_thread_shutdown; }; @@ -274,7 +272,6 @@ static void start_pipeline(struct media_source *source, struct source_async_comm position->vt = VT_I8; position->hVal.QuadPart = 0; } - source->start_time = position->hVal.QuadPart; for (i = 0; i < source->stream_count; i++) { @@ -427,7 +424,7 @@ static void send_buffer(struct media_stream *stream, const struct wg_parser_even goto out; } - if (FAILED(hr = IMFSample_SetSampleTime(sample, event->u.buffer.pts - stream->parent_source->start_time))) + if (FAILED(hr = IMFSample_SetSampleTime(sample, event->u.buffer.pts))) { ERR("Failed to set sample time, hr %#x.\n", hr); goto out; -- 2.33.0

2 5

[PATCH 3/9] ntdll: Directly use ntdll in init_font_options.
by Jacek Caban 27 Sep '21

27 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 61 +++++++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 26 deletions(-)

1 0

[PATCH] ntdll: Make the Unix syscall entry points use the SysV ABI.
by Zebediah Figura 27 Sep '21

27 Sep '21

Restore XMM registers considered volatile by the SysV ABI but nonvolatile by the Microsoft ABI in wine_syscall_dispatcher. This avoids needing to save and restore them in (almost) every ntdll entry point, which saves some 25 kB of text. In practice this only affects x86_64, since ARM uses a unified ABI across platforms and i386 differs only in stack cleanup (and the syscall dispatcher is agnonstic thereto). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Granted, 25 kB is not a lot, although I'd argue that any small amount of space is worth saving. There might potentially be a performance gain, but given that we have the syscall dispatcher as something of a bottleneck anyway, it seems like it would take a bit of contrivance for these register saves to actually matter. And of course the patch is huge, although that's mostly just because it touches the declaration and definition of every syscall function. The only other interesting part is in the x86_64 syscall dispatcher itself. Note also that the definition of WINE_SYSCALL is guarded by _NTSYSTEM_. This looks like it breaks import from Unix libraries, but in practice the only Unix library to import Nt* syscalls defines _NTSYSTEM_. This seems a bit fragile to me, but the current state looks already fragile, so I'm leaving it alone in this patch, for now... dlls/ntdll/unix/debug.c | 6 +- dlls/ntdll/unix/env.c | 12 +- dlls/ntdll/unix/file.c | 142 ++++----- dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/process.c | 34 +- dlls/ntdll/unix/registry.c | 88 +++--- dlls/ntdll/unix/security.c | 70 ++--- dlls/ntdll/unix/server.c | 14 +- dlls/ntdll/unix/signal_arm.c | 8 +- dlls/ntdll/unix/signal_arm64.c | 10 +- dlls/ntdll/unix/signal_i386.c | 8 +- dlls/ntdll/unix/signal_x86_64.c | 42 ++- dlls/ntdll/unix/sync.c | 220 ++++++------- dlls/ntdll/unix/system.c | 46 +-- dlls/ntdll/unix/thread.c | 48 +-- dlls/ntdll/unix/virtual.c | 82 ++--- include/wine/debug.h | 1 - include/wine/server.h | 6 +- include/wine/unixlib.h | 2 +- include/winternl.h | 539 ++++++++++++++++---------------- 20 files changed, 704 insertions(+), 676 deletions(-) diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index a2a63b5a9f4..b360e9b33b6 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -255,7 +255,7 @@ const char * __cdecl __wine_dbg_strdup( const char *str ) /*********************************************************************** * __wine_dbg_write (NTDLL.@) */ -int WINAPI __wine_dbg_write( const char *str, unsigned int len ) +int WINE_SYSCALL __wine_dbg_write( const char *str, unsigned int len ) { return write( 2, str, len ); } @@ -336,8 +336,8 @@ void dbg_init(void) /*********************************************************************** * NtTraceControl (NTDLL.@) */ -NTSTATUS WINAPI NtTraceControl( ULONG code, void *inbuf, ULONG inbuf_len, - void *outbuf, ULONG outbuf_len, ULONG *size ) +NTSTATUS WINE_SYSCALL NtTraceControl( ULONG code, void *inbuf, ULONG inbuf_len, + void *outbuf, ULONG outbuf_len, ULONG *size ) { FIXME( "code %u, inbuf %p, inbuf_len %u, outbuf %p, outbuf_len %u, size %p\n", code, inbuf, inbuf_len, outbuf, outbuf_len, size ); diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index ae1afb2797b..5a973c4aa71 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -2383,7 +2383,7 @@ void *create_startup_info( const UNICODE_STRING *nt_image, const RTL_USER_PROCES /************************************************************************** * NtGetNlsSectionPtr (NTDLL.@) */ -NTSTATUS WINAPI NtGetNlsSectionPtr( ULONG type, ULONG id, void *unknown, void **ptr, SIZE_T *size ) +NTSTATUS WINE_SYSCALL NtGetNlsSectionPtr( ULONG type, ULONG id, void *unknown, void **ptr, SIZE_T *size ) { UNICODE_STRING nameW; OBJECT_ATTRIBUTES attr; @@ -2418,7 +2418,7 @@ NTSTATUS WINAPI NtGetNlsSectionPtr( ULONG type, ULONG id, void *unknown, void ** /********************************************************************** * NtQueryDefaultLocale (NTDLL.@) */ -NTSTATUS WINAPI NtQueryDefaultLocale( BOOLEAN user, LCID *lcid ) +NTSTATUS WINE_SYSCALL NtQueryDefaultLocale( BOOLEAN user, LCID *lcid ) { *lcid = user ? user_lcid : system_lcid; return STATUS_SUCCESS; @@ -2428,7 +2428,7 @@ NTSTATUS WINAPI NtQueryDefaultLocale( BOOLEAN user, LCID *lcid ) /********************************************************************** * NtSetDefaultLocale (NTDLL.@) */ -NTSTATUS WINAPI NtSetDefaultLocale( BOOLEAN user, LCID lcid ) +NTSTATUS WINE_SYSCALL NtSetDefaultLocale( BOOLEAN user, LCID lcid ) { if (user) user_lcid = lcid; else @@ -2443,7 +2443,7 @@ NTSTATUS WINAPI NtSetDefaultLocale( BOOLEAN user, LCID lcid ) /********************************************************************** * NtQueryDefaultUILanguage (NTDLL.@) */ -NTSTATUS WINAPI NtQueryDefaultUILanguage( LANGID *lang ) +NTSTATUS WINE_SYSCALL NtQueryDefaultUILanguage( LANGID *lang ) { *lang = user_ui_language; return STATUS_SUCCESS; @@ -2453,7 +2453,7 @@ NTSTATUS WINAPI NtQueryDefaultUILanguage( LANGID *lang ) /********************************************************************** * NtSetDefaultUILanguage (NTDLL.@) */ -NTSTATUS WINAPI NtSetDefaultUILanguage( LANGID lang ) +NTSTATUS WINE_SYSCALL NtSetDefaultUILanguage( LANGID lang ) { user_ui_language = lang; return STATUS_SUCCESS; @@ -2463,7 +2463,7 @@ NTSTATUS WINAPI NtSetDefaultUILanguage( LANGID lang ) /********************************************************************** * NtQueryInstallUILanguage (NTDLL.@) */ -NTSTATUS WINAPI NtQueryInstallUILanguage( LANGID *lang ) +NTSTATUS WINE_SYSCALL NtQueryInstallUILanguage( LANGID *lang ) { *lang = system_ui_language; return STATUS_SUCCESS; diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index e6f813966a5..ccb587f1cb1 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -2393,10 +2393,10 @@ static NTSTATUS get_cached_dir_data( HANDLE handle, struct dir_data **data_ret, /****************************************************************************** * NtQueryDirectoryFile (NTDLL.@) */ -NTSTATUS WINAPI NtQueryDirectoryFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_routine, - void *apc_context, IO_STATUS_BLOCK *io, void *buffer, ULONG length, - FILE_INFORMATION_CLASS info_class, BOOLEAN single_entry, - UNICODE_STRING *mask, BOOLEAN restart_scan ) +NTSTATUS WINE_SYSCALL NtQueryDirectoryFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_routine, + void *apc_context, IO_STATUS_BLOCK *io, void *buffer, ULONG length, + FILE_INFORMATION_CLASS info_class, BOOLEAN single_entry, + UNICODE_STRING *mask, BOOLEAN restart_scan ) { int cwd, fd, needs_close; enum server_fd_type type; @@ -3432,8 +3432,8 @@ NTSTATUS nt_to_unix_file_name( const OBJECT_ATTRIBUTES *attr, char **name_ret, U * element doesn't have to exist; in that case STATUS_NO_SUCH_FILE is * returned, but the unix name is still filled in properly. */ -NTSTATUS WINAPI wine_nt_to_unix_file_name( const OBJECT_ATTRIBUTES *attr, char *nameA, ULONG *size, - UINT disposition ) +NTSTATUS WINE_SYSCALL wine_nt_to_unix_file_name( const OBJECT_ATTRIBUTES *attr, char *nameA, + ULONG *size, UINT disposition ) { char *buffer = NULL; NTSTATUS status; @@ -3572,7 +3572,7 @@ NTSTATUS unix_to_nt_file_name( const char *name, WCHAR **nt ) /****************************************************************** * wine_unix_to_nt_file_name */ -NTSTATUS WINAPI wine_unix_to_nt_file_name( const char *name, WCHAR *buffer, ULONG *size ) +NTSTATUS WINE_SYSCALL wine_unix_to_nt_file_name( const char *name, WCHAR *buffer, ULONG *size ) { WCHAR *nt_name = NULL; NTSTATUS status; @@ -3730,10 +3730,10 @@ NTSTATUS open_unix_file( HANDLE *handle, const char *unix_name, ACCESS_MASK acce /****************************************************************************** * NtCreateFile (NTDLL.@) */ -NTSTATUS WINAPI NtCreateFile( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, - IO_STATUS_BLOCK *io, LARGE_INTEGER *alloc_size, - ULONG attributes, ULONG sharing, ULONG disposition, - ULONG options, void *ea_buffer, ULONG ea_length ) +NTSTATUS WINE_SYSCALL NtCreateFile( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, + IO_STATUS_BLOCK *io, LARGE_INTEGER *alloc_size, + ULONG attributes, ULONG sharing, ULONG disposition, + ULONG options, void *ea_buffer, ULONG ea_length ) { OBJECT_ATTRIBUTES new_attr; UNICODE_STRING nt_name; @@ -3821,8 +3821,8 @@ NTSTATUS WINAPI NtCreateFile( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBU /****************************************************************************** * NtOpenFile (NTDLL.@) */ -NTSTATUS WINAPI NtOpenFile( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, - IO_STATUS_BLOCK *io, ULONG sharing, ULONG options ) +NTSTATUS WINE_SYSCALL NtOpenFile( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, + IO_STATUS_BLOCK *io, ULONG sharing, ULONG options ) { return NtCreateFile( handle, access, attr, io, NULL, 0, sharing, FILE_OPEN, options, NULL, 0 ); } @@ -3831,9 +3831,9 @@ NTSTATUS WINAPI NtOpenFile( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTE /****************************************************************************** * NtCreateMailslotFile (NTDLL.@) */ -NTSTATUS WINAPI NtCreateMailslotFile( HANDLE *handle, ULONG access, OBJECT_ATTRIBUTES *attr, - IO_STATUS_BLOCK *io, ULONG options, ULONG quota, ULONG msg_size, - LARGE_INTEGER *timeout ) +NTSTATUS WINE_SYSCALL NtCreateMailslotFile( HANDLE *handle, ULONG access, OBJECT_ATTRIBUTES *attr, + IO_STATUS_BLOCK *io, ULONG options, ULONG quota, ULONG msg_size, + LARGE_INTEGER *timeout ) { NTSTATUS status; data_size_t len; @@ -3864,11 +3864,11 @@ NTSTATUS WINAPI NtCreateMailslotFile( HANDLE *handle, ULONG access, OBJECT_ATTRI /****************************************************************** * NtCreateNamedPipeFile (NTDLL.@) */ -NTSTATUS WINAPI NtCreateNamedPipeFile( HANDLE *handle, ULONG access, OBJECT_ATTRIBUTES *attr, - IO_STATUS_BLOCK *io, ULONG sharing, ULONG dispo, ULONG options, - ULONG pipe_type, ULONG read_mode, ULONG completion_mode, - ULONG max_inst, ULONG inbound_quota, ULONG outbound_quota, - LARGE_INTEGER *timeout ) +NTSTATUS WINE_SYSCALL NtCreateNamedPipeFile( HANDLE *handle, ULONG access, OBJECT_ATTRIBUTES *attr, + IO_STATUS_BLOCK *io, ULONG sharing, ULONG dispo, ULONG options, + ULONG pipe_type, ULONG read_mode, ULONG completion_mode, + ULONG max_inst, ULONG inbound_quota, ULONG outbound_quota, + LARGE_INTEGER *timeout ) { NTSTATUS status; data_size_t len; @@ -3913,7 +3913,7 @@ NTSTATUS WINAPI NtCreateNamedPipeFile( HANDLE *handle, ULONG access, OBJECT_ATTR /****************************************************************** * NtDeleteFile (NTDLL.@) */ -NTSTATUS WINAPI NtDeleteFile( OBJECT_ATTRIBUTES *attr ) +NTSTATUS WINE_SYSCALL NtDeleteFile( OBJECT_ATTRIBUTES *attr ) { HANDLE handle; NTSTATUS status; @@ -3938,8 +3938,8 @@ NTSTATUS WINAPI NtDeleteFile( OBJECT_ATTRIBUTES *attr ) /****************************************************************************** * NtQueryFullAttributesFile (NTDLL.@) */ -NTSTATUS WINAPI NtQueryFullAttributesFile( const OBJECT_ATTRIBUTES *attr, - FILE_NETWORK_OPEN_INFORMATION *info ) +NTSTATUS WINE_SYSCALL NtQueryFullAttributesFile( const OBJECT_ATTRIBUTES *attr, + FILE_NETWORK_OPEN_INFORMATION *info ) { char *unix_name; NTSTATUS status; @@ -3984,7 +3984,7 @@ NTSTATUS WINAPI NtQueryFullAttributesFile( const OBJECT_ATTRIBUTES *attr, /****************************************************************************** * NtQueryAttributesFile (NTDLL.@) */ -NTSTATUS WINAPI NtQueryAttributesFile( const OBJECT_ATTRIBUTES *attr, FILE_BASIC_INFORMATION *info ) +NTSTATUS WINE_SYSCALL NtQueryAttributesFile( const OBJECT_ATTRIBUTES *attr, FILE_BASIC_INFORMATION *info ) { char *unix_name; NTSTATUS status; @@ -4017,8 +4017,8 @@ NTSTATUS WINAPI NtQueryAttributesFile( const OBJECT_ATTRIBUTES *attr, FILE_BASIC /****************************************************************************** * NtQueryInformationFile (NTDLL.@) */ -NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, - void *ptr, LONG len, FILE_INFORMATION_CLASS class ) +NTSTATUS WINE_SYSCALL NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, + void *ptr, LONG len, FILE_INFORMATION_CLASS class ) { static const size_t info_sizes[] = { @@ -4306,8 +4306,8 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, /****************************************************************************** * NtSetInformationFile (NTDLL.@) */ -NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, - void *ptr, ULONG len, FILE_INFORMATION_CLASS class ) +NTSTATUS WINE_SYSCALL NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, + void *ptr, ULONG len, FILE_INFORMATION_CLASS class ) { int fd, needs_close; NTSTATUS status = STATUS_SUCCESS; @@ -5107,9 +5107,9 @@ static NTSTATUS set_pending_write( HANDLE device ) /****************************************************************************** * NtReadFile (NTDLL.@) */ -NTSTATUS WINAPI NtReadFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, void *buffer, ULONG length, - LARGE_INTEGER *offset, ULONG *key ) +NTSTATUS WINE_SYSCALL NtReadFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, + IO_STATUS_BLOCK *io, void *buffer, ULONG length, + LARGE_INTEGER *offset, ULONG *key ) { int result, unix_handle, needs_close; unsigned int options; @@ -5304,9 +5304,9 @@ err: /****************************************************************************** * NtReadFileScatter (NTDLL.@) */ -NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, FILE_SEGMENT_ELEMENT *segments, - ULONG length, LARGE_INTEGER *offset, ULONG *key ) +NTSTATUS WINE_SYSCALL NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, + IO_STATUS_BLOCK *io, FILE_SEGMENT_ELEMENT *segments, + ULONG length, LARGE_INTEGER *offset, ULONG *key ) { int result, unix_handle, needs_close; unsigned int options; @@ -5382,9 +5382,9 @@ error: /****************************************************************************** * NtWriteFile (NTDLL.@) */ -NTSTATUS WINAPI NtWriteFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, const void *buffer, ULONG length, - LARGE_INTEGER *offset, ULONG *key ) +NTSTATUS WINE_SYSCALL NtWriteFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, + IO_STATUS_BLOCK *io, const void *buffer, ULONG length, + LARGE_INTEGER *offset, ULONG *key ) { int result, unix_handle, needs_close; unsigned int options; @@ -5606,9 +5606,9 @@ err: /****************************************************************************** * NtWriteFileGather (NTDLL.@) */ -NTSTATUS WINAPI NtWriteFileGather( HANDLE file, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, - IO_STATUS_BLOCK *io, FILE_SEGMENT_ELEMENT *segments, - ULONG length, LARGE_INTEGER *offset, ULONG *key ) +NTSTATUS WINE_SYSCALL NtWriteFileGather( HANDLE file, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, + IO_STATUS_BLOCK *io, FILE_SEGMENT_ELEMENT *segments, + ULONG length, LARGE_INTEGER *offset, ULONG *key ) { int result, unix_handle, needs_close; unsigned int options; @@ -5694,9 +5694,9 @@ NTSTATUS WINAPI NtWriteFileGather( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap /****************************************************************************** * NtDeviceIoControlFile (NTDLL.@) */ -NTSTATUS WINAPI NtDeviceIoControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_context, - IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, ULONG in_size, - void *out_buffer, ULONG out_size ) +NTSTATUS WINE_SYSCALL NtDeviceIoControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_context, + IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, ULONG in_size, + void *out_buffer, ULONG out_size ) { ULONG device = (code >> 16); NTSTATUS status = STATUS_NOT_SUPPORTED; @@ -5764,9 +5764,9 @@ static void ignore_server_ioctl_struct_holes( ULONG code, const void *in_buffer, /****************************************************************************** * NtFsControlFile (NTDLL.@) */ -NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_context, - IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, ULONG in_size, - void *out_buffer, ULONG out_size ) +NTSTATUS WINE_SYSCALL NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_context, + IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, ULONG in_size, + void *out_buffer, ULONG out_size ) { NTSTATUS status; @@ -5861,7 +5861,7 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap /****************************************************************************** * NtFlushBuffersFile (NTDLL.@) */ -NTSTATUS WINAPI NtFlushBuffersFile( HANDLE handle, IO_STATUS_BLOCK *io ) +NTSTATUS WINE_SYSCALL NtFlushBuffersFile( HANDLE handle, IO_STATUS_BLOCK *io ) { NTSTATUS ret; HANDLE wait_handle; @@ -5919,7 +5919,7 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE handle, IO_STATUS_BLOCK *io ) /************************************************************************** * NtCancelIoFile (NTDLL.@) */ -NTSTATUS WINAPI NtCancelIoFile( HANDLE handle, IO_STATUS_BLOCK *io_status ) +NTSTATUS WINE_SYSCALL NtCancelIoFile( HANDLE handle, IO_STATUS_BLOCK *io_status ) { NTSTATUS status; @@ -5944,7 +5944,7 @@ NTSTATUS WINAPI NtCancelIoFile( HANDLE handle, IO_STATUS_BLOCK *io_status ) /************************************************************************** * NtCancelIoFileEx (NTDLL.@) */ -NTSTATUS WINAPI NtCancelIoFileEx( HANDLE handle, IO_STATUS_BLOCK *io, IO_STATUS_BLOCK *io_status ) +NTSTATUS WINE_SYSCALL NtCancelIoFileEx( HANDLE handle, IO_STATUS_BLOCK *io, IO_STATUS_BLOCK *io_status ) { NTSTATUS status; @@ -5969,9 +5969,9 @@ NTSTATUS WINAPI NtCancelIoFileEx( HANDLE handle, IO_STATUS_BLOCK *io, IO_STATUS_ /****************************************************************** * NtLockFile (NTDLL.@) */ -NTSTATUS WINAPI NtLockFile( HANDLE file, HANDLE event, PIO_APC_ROUTINE apc, void* apc_user, - IO_STATUS_BLOCK *io_status, LARGE_INTEGER *offset, - LARGE_INTEGER *count, ULONG *key, BOOLEAN dont_wait, BOOLEAN exclusive ) +NTSTATUS WINE_SYSCALL NtLockFile( HANDLE file, HANDLE event, PIO_APC_ROUTINE apc, void* apc_user, + IO_STATUS_BLOCK *io_status, LARGE_INTEGER *offset, + LARGE_INTEGER *count, ULONG *key, BOOLEAN dont_wait, BOOLEAN exclusive ) { static int warn; NTSTATUS ret; @@ -6028,8 +6028,8 @@ NTSTATUS WINAPI NtLockFile( HANDLE file, HANDLE event, PIO_APC_ROUTINE apc, void /****************************************************************** * NtUnlockFile (NTDLL.@) */ -NTSTATUS WINAPI NtUnlockFile( HANDLE handle, IO_STATUS_BLOCK *io_status, LARGE_INTEGER *offset, - LARGE_INTEGER *count, ULONG *key ) +NTSTATUS WINE_SYSCALL NtUnlockFile( HANDLE handle, IO_STATUS_BLOCK *io_status, LARGE_INTEGER *offset, + LARGE_INTEGER *count, ULONG *key ) { NTSTATUS status; @@ -6139,9 +6139,9 @@ static BOOL read_changes_apc( void *user, ULONG_PTR *info, NTSTATUS *status ) /****************************************************************************** * NtNotifyChangeDirectoryFile (NTDLL.@) */ -NTSTATUS WINAPI NtNotifyChangeDirectoryFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, - void *apc_context, IO_STATUS_BLOCK *iosb, void *buffer, - ULONG buffer_size, ULONG filter, BOOLEAN subtree ) +NTSTATUS WINE_SYSCALL NtNotifyChangeDirectoryFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, + void *apc_context, IO_STATUS_BLOCK *iosb, void *buffer, + ULONG buffer_size, ULONG filter, BOOLEAN subtree ) { struct async_fileio_read_changes *fileio; NTSTATUS status; @@ -6382,9 +6382,9 @@ static NTSTATUS get_device_info( int fd, FILE_FS_DEVICE_INFORMATION *info ) /****************************************************************************** * NtQueryVolumeInformationFile (NTDLL.@) */ -NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, - void *buffer, ULONG length, - FS_INFORMATION_CLASS info_class ) +NTSTATUS WINE_SYSCALL NtQueryVolumeInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, + void *buffer, ULONG length, + FS_INFORMATION_CLASS info_class ) { int fd, needs_close; struct stat st; @@ -6652,8 +6652,8 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, IO_STATUS_BLOCK *io /****************************************************************************** * NtSetVolumeInformationFile (NTDLL.@) */ -NTSTATUS WINAPI NtSetVolumeInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, void *info, - ULONG length, FS_INFORMATION_CLASS class ) +NTSTATUS WINE_SYSCALL NtSetVolumeInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, void *info, + ULONG length, FS_INFORMATION_CLASS class ) { FIXME( "(%p,%p,%p,0x%08x,0x%08x) stub\n", handle, io, info, length, class ); return STATUS_SUCCESS; @@ -6663,9 +6663,9 @@ NTSTATUS WINAPI NtSetVolumeInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, /****************************************************************** * NtQueryEaFile (NTDLL.@) */ -NTSTATUS WINAPI NtQueryEaFile( HANDLE handle, IO_STATUS_BLOCK *io, void *buffer, ULONG length, - BOOLEAN single_entry, void *list, ULONG list_len, - ULONG *index, BOOLEAN restart ) +NTSTATUS WINE_SYSCALL NtQueryEaFile( HANDLE handle, IO_STATUS_BLOCK *io, void *buffer, ULONG length, + BOOLEAN single_entry, void *list, ULONG list_len, + ULONG *index, BOOLEAN restart ) { FIXME( "(%p,%p,%p,%d,%d,%p,%d,%p,%d) stub\n", handle, io, buffer, length, single_entry, list, list_len, index, restart ); @@ -6676,7 +6676,7 @@ NTSTATUS WINAPI NtQueryEaFile( HANDLE handle, IO_STATUS_BLOCK *io, void *buffer, /****************************************************************** * NtSetEaFile (NTDLL.@) */ -NTSTATUS WINAPI NtSetEaFile( HANDLE handle, IO_STATUS_BLOCK *io, void *buffer, ULONG length ) +NTSTATUS WINE_SYSCALL NtSetEaFile( HANDLE handle, IO_STATUS_BLOCK *io, void *buffer, ULONG length ) { FIXME( "(%p,%p,%p,%d) stub\n", handle, io, buffer, length ); return STATUS_ACCESS_DENIED; @@ -6710,8 +6710,8 @@ static void *put_object_type_info( OBJECT_TYPE_INFORMATION *p, struct object_typ /************************************************************************** * NtQueryObject (NTDLL.@) */ -NTSTATUS WINAPI NtQueryObject( HANDLE handle, OBJECT_INFORMATION_CLASS info_class, - void *ptr, ULONG len, ULONG *used_len ) +NTSTATUS WINE_SYSCALL NtQueryObject( HANDLE handle, OBJECT_INFORMATION_CLASS info_class, + void *ptr, ULONG len, ULONG *used_len ) { NTSTATUS status; @@ -6909,8 +6909,8 @@ NTSTATUS WINAPI NtQueryObject( HANDLE handle, OBJECT_INFORMATION_CLASS info_clas /************************************************************************** * NtSetInformationObject (NTDLL.@) */ -NTSTATUS WINAPI NtSetInformationObject( HANDLE handle, OBJECT_INFORMATION_CLASS info_class, - void *ptr, ULONG len ) +NTSTATUS WINE_SYSCALL NtSetInformationObject( HANDLE handle, OBJECT_INFORMATION_CLASS info_class, + void *ptr, ULONG len ) { NTSTATUS status; diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 5e39209eddc..00f696f9890 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1405,7 +1405,7 @@ NTSTATUS ntdll_init_syscalls( ULONG id, SYSTEM_SERVICE_TABLE *table, void **disp /*********************************************************************** * __wine_unix_call */ -NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ) +NTSTATUS WINE_SYSCALL __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ) { return ((unixlib_entry_t*)(UINT_PTR)handle)[code]( args ); } diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index f5b8b5315cd..755675fa318 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -615,12 +615,12 @@ static NTSTATUS alloc_handle_list( const PS_ATTRIBUTE *handles_attr, obj_handle_ /********************************************************************** * NtCreateUserProcess (NTDLL.@) */ -NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_handle_ptr, - ACCESS_MASK process_access, ACCESS_MASK thread_access, - OBJECT_ATTRIBUTES *process_attr, OBJECT_ATTRIBUTES *thread_attr, - ULONG process_flags, ULONG thread_flags, - RTL_USER_PROCESS_PARAMETERS *params, PS_CREATE_INFO *info, - PS_ATTRIBUTE_LIST *ps_attr ) +NTSTATUS WINE_SYSCALL NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_handle_ptr, + ACCESS_MASK process_access, ACCESS_MASK thread_access, + OBJECT_ATTRIBUTES *process_attr, OBJECT_ATTRIBUTES *thread_attr, + ULONG process_flags, ULONG thread_flags, + RTL_USER_PROCESS_PARAMETERS *params, PS_CREATE_INFO *info, + PS_ATTRIBUTE_LIST *ps_attr ) { NTSTATUS status; BOOL success = FALSE; @@ -874,7 +874,7 @@ done: /****************************************************************************** * NtTerminateProcess (NTDLL.@) */ -NTSTATUS WINAPI NtTerminateProcess( HANDLE handle, LONG exit_code ) +NTSTATUS WINE_SYSCALL NtTerminateProcess( HANDLE handle, LONG exit_code ) { NTSTATUS ret; BOOL self; @@ -971,8 +971,8 @@ void fill_vm_counters( VM_COUNTERS_EX *pvmi, int unix_pid ) /********************************************************************** * NtQueryInformationProcess (NTDLL.@) */ -NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class, void *info, - ULONG size, ULONG *ret_len ) +NTSTATUS WINE_SYSCALL NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class, void *info, + ULONG size, ULONG *ret_len ) { NTSTATUS ret = STATUS_SUCCESS; ULONG len = 0; @@ -1417,7 +1417,7 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class /********************************************************************** * NtSetInformationProcess (NTDLL.@) */ -NTSTATUS WINAPI NtSetInformationProcess( HANDLE handle, PROCESSINFOCLASS class, void *info, ULONG size ) +NTSTATUS WINE_SYSCALL NtSetInformationProcess( HANDLE handle, PROCESSINFOCLASS class, void *info, ULONG size ) { NTSTATUS ret = STATUS_SUCCESS; @@ -1543,8 +1543,8 @@ NTSTATUS WINAPI NtSetInformationProcess( HANDLE handle, PROCESSINFOCLASS class, /********************************************************************** * NtOpenProcess (NTDLL.@) */ -NTSTATUS WINAPI NtOpenProcess( HANDLE *handle, ACCESS_MASK access, - const OBJECT_ATTRIBUTES *attr, const CLIENT_ID *id ) +NTSTATUS WINE_SYSCALL NtOpenProcess( HANDLE *handle, ACCESS_MASK access, + const OBJECT_ATTRIBUTES *attr, const CLIENT_ID *id ) { NTSTATUS status; @@ -1566,7 +1566,7 @@ NTSTATUS WINAPI NtOpenProcess( HANDLE *handle, ACCESS_MASK access, /********************************************************************** * NtSuspendProcess (NTDLL.@) */ -NTSTATUS WINAPI NtSuspendProcess( HANDLE handle ) +NTSTATUS WINE_SYSCALL NtSuspendProcess( HANDLE handle ) { NTSTATUS ret; @@ -1583,7 +1583,7 @@ NTSTATUS WINAPI NtSuspendProcess( HANDLE handle ) /********************************************************************** * NtResumeProcess (NTDLL.@) */ -NTSTATUS WINAPI NtResumeProcess( HANDLE handle ) +NTSTATUS WINE_SYSCALL NtResumeProcess( HANDLE handle ) { NTSTATUS ret; @@ -1600,7 +1600,7 @@ NTSTATUS WINAPI NtResumeProcess( HANDLE handle ) /********************************************************************** * NtDebugActiveProcess (NTDLL.@) */ -NTSTATUS WINAPI NtDebugActiveProcess( HANDLE process, HANDLE debug ) +NTSTATUS WINE_SYSCALL NtDebugActiveProcess( HANDLE process, HANDLE debug ) { NTSTATUS ret; @@ -1619,7 +1619,7 @@ NTSTATUS WINAPI NtDebugActiveProcess( HANDLE process, HANDLE debug ) /********************************************************************** * NtRemoveProcessDebug (NTDLL.@) */ -NTSTATUS WINAPI NtRemoveProcessDebug( HANDLE process, HANDLE debug ) +NTSTATUS WINE_SYSCALL NtRemoveProcessDebug( HANDLE process, HANDLE debug ) { NTSTATUS ret; @@ -1638,7 +1638,7 @@ NTSTATUS WINAPI NtRemoveProcessDebug( HANDLE process, HANDLE debug ) /********************************************************************** * NtDebugContinue (NTDLL.@) */ -NTSTATUS WINAPI NtDebugContinue( HANDLE handle, CLIENT_ID *client, NTSTATUS status ) +NTSTATUS WINE_SYSCALL NtDebugContinue( HANDLE handle, CLIENT_ID *client, NTSTATUS status ) { NTSTATUS ret; diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c index 265ed39bd17..c32dbcf1a5e 100644 --- a/dlls/ntdll/unix/registry.c +++ b/dlls/ntdll/unix/registry.c @@ -72,8 +72,8 @@ NTSTATUS open_hkcu_key( const char *path, HANDLE *key ) /****************************************************************************** * NtCreateKey (NTDLL.@) */ -NTSTATUS WINAPI NtCreateKey( HANDLE *key, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, - ULONG index, const UNICODE_STRING *class, ULONG options, ULONG *dispos ) +NTSTATUS WINE_SYSCALL NtCreateKey( HANDLE *key, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, + ULONG index, const UNICODE_STRING *class, ULONG options, ULONG *dispos ) { NTSTATUS ret; data_size_t len; @@ -107,9 +107,9 @@ NTSTATUS WINAPI NtCreateKey( HANDLE *key, ACCESS_MASK access, const OBJECT_ATTRI /****************************************************************************** * NtCreateKeyTransacted (NTDLL.@) */ -NTSTATUS WINAPI NtCreateKeyTransacted( HANDLE *key, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, - ULONG index, const UNICODE_STRING *class, ULONG options, - HANDLE transacted, ULONG *dispos ) +NTSTATUS WINE_SYSCALL NtCreateKeyTransacted( HANDLE *key, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, + ULONG index, const UNICODE_STRING *class, ULONG options, + HANDLE transacted, ULONG *dispos ) { FIXME( "(%p,%s,%s,%x,%x,%p,%p)\n", attr->RootDirectory, debugstr_us(attr->ObjectName), debugstr_us(class), options, access, transacted, key ); @@ -120,7 +120,7 @@ NTSTATUS WINAPI NtCreateKeyTransacted( HANDLE *key, ACCESS_MASK access, const OB /****************************************************************************** * NtOpenKeyEx (NTDLL.@) */ -NTSTATUS WINAPI NtOpenKeyEx( HANDLE *key, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, ULONG options ) +NTSTATUS WINE_SYSCALL NtOpenKeyEx( HANDLE *key, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, ULONG options ) { NTSTATUS ret; @@ -150,7 +150,7 @@ NTSTATUS WINAPI NtOpenKeyEx( HANDLE *key, ACCESS_MASK access, const OBJECT_ATTRI /****************************************************************************** * NtOpenKey (NTDLL.@) */ -NTSTATUS WINAPI NtOpenKey( HANDLE *key, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) +NTSTATUS WINE_SYSCALL NtOpenKey( HANDLE *key, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) { return NtOpenKeyEx( key, access, attr, 0 ); } @@ -159,8 +159,8 @@ NTSTATUS WINAPI NtOpenKey( HANDLE *key, ACCESS_MASK access, const OBJECT_ATTRIBU /****************************************************************************** * NtOpenKeyTransactedEx (NTDLL.@) */ -NTSTATUS WINAPI NtOpenKeyTransactedEx( HANDLE *key, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, - ULONG options, HANDLE transaction ) +NTSTATUS WINE_SYSCALL NtOpenKeyTransactedEx( HANDLE *key, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, + ULONG options, HANDLE transaction ) { FIXME( "(%p %x %p %x %p)\n", key, access, attr, options, transaction ); return STATUS_NOT_IMPLEMENTED; @@ -170,8 +170,8 @@ NTSTATUS WINAPI NtOpenKeyTransactedEx( HANDLE *key, ACCESS_MASK access, const OB /****************************************************************************** * NtOpenKeyTransacted (NTDLL.@) */ -NTSTATUS WINAPI NtOpenKeyTransacted( HANDLE *key, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, - HANDLE transaction ) +NTSTATUS WINE_SYSCALL NtOpenKeyTransacted( HANDLE *key, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, + HANDLE transaction ) { return NtOpenKeyTransactedEx( key, access, attr, 0, transaction ); } @@ -180,7 +180,7 @@ NTSTATUS WINAPI NtOpenKeyTransacted( HANDLE *key, ACCESS_MASK access, const OBJE /****************************************************************************** * NtDeleteKey (NTDLL.@) */ -NTSTATUS WINAPI NtDeleteKey( HANDLE key ) +NTSTATUS WINE_SYSCALL NtDeleteKey( HANDLE key ) { NTSTATUS ret; @@ -199,7 +199,7 @@ NTSTATUS WINAPI NtDeleteKey( HANDLE key ) /****************************************************************************** * NtRenameKey (NTDLL.@) */ -NTSTATUS WINAPI NtRenameKey( HANDLE handle, UNICODE_STRING *name ) +NTSTATUS WINE_SYSCALL NtRenameKey( HANDLE handle, UNICODE_STRING *name ) { FIXME( "(%p %s)\n", handle, debugstr_us(name) ); return STATUS_NOT_IMPLEMENTED; @@ -332,8 +332,8 @@ static NTSTATUS enumerate_key( HANDLE handle, int index, KEY_INFORMATION_CLASS i /****************************************************************************** * NtEnumerateKey (NTDLL.@) */ -NTSTATUS WINAPI NtEnumerateKey( HANDLE handle, ULONG index, KEY_INFORMATION_CLASS info_class, - void *info, DWORD length, DWORD *result_len ) +NTSTATUS WINE_SYSCALL NtEnumerateKey( HANDLE handle, ULONG index, KEY_INFORMATION_CLASS info_class, + void *info, DWORD length, DWORD *result_len ) { /* -1 means query key, so avoid it here */ if (index == (ULONG)-1) return STATUS_NO_MORE_ENTRIES; @@ -344,8 +344,8 @@ NTSTATUS WINAPI NtEnumerateKey( HANDLE handle, ULONG index, KEY_INFORMATION_CLAS /****************************************************************************** * NtQueryKey (NTDLL.@) */ -NTSTATUS WINAPI NtQueryKey( HANDLE handle, KEY_INFORMATION_CLASS info_class, - void *info, DWORD length, DWORD *result_len ) +NTSTATUS WINE_SYSCALL NtQueryKey( HANDLE handle, KEY_INFORMATION_CLASS info_class, + void *info, DWORD length, DWORD *result_len ) { return enumerate_key( handle, -1, info_class, info, length, result_len ); } @@ -354,7 +354,7 @@ NTSTATUS WINAPI NtQueryKey( HANDLE handle, KEY_INFORMATION_CLASS info_class, /****************************************************************************** * NtSetInformationKey (NTDLL.@) */ -NTSTATUS WINAPI NtSetInformationKey( HANDLE key, int class, void *info, ULONG length ) +NTSTATUS WINE_SYSCALL NtSetInformationKey( HANDLE key, int class, void *info, ULONG length ) { FIXME( "(%p,0x%08x,%p,0x%08x) stub\n", key, class, info, length ); return STATUS_SUCCESS; @@ -411,8 +411,8 @@ static void copy_key_value_info( KEY_VALUE_INFORMATION_CLASS info_class, void *i /****************************************************************************** * NtEnumerateValueKey (NTDLL.@) */ -NTSTATUS WINAPI NtEnumerateValueKey( HANDLE handle, ULONG index, KEY_VALUE_INFORMATION_CLASS info_class, - void *info, DWORD length, DWORD *result_len ) +NTSTATUS WINE_SYSCALL NtEnumerateValueKey( HANDLE handle, ULONG index, KEY_VALUE_INFORMATION_CLASS info_class, + void *info, DWORD length, DWORD *result_len ) { NTSTATUS ret; void *ptr; @@ -454,9 +454,9 @@ NTSTATUS WINAPI NtEnumerateValueKey( HANDLE handle, ULONG index, KEY_VALUE_INFOR /****************************************************************************** * NtQueryValueKey (NTDLL.@) */ -NTSTATUS WINAPI NtQueryValueKey( HANDLE handle, const UNICODE_STRING *name, - KEY_VALUE_INFORMATION_CLASS info_class, - void *info, DWORD length, DWORD *result_len ) +NTSTATUS WINE_SYSCALL NtQueryValueKey( HANDLE handle, const UNICODE_STRING *name, + KEY_VALUE_INFORMATION_CLASS info_class, + void *info, DWORD length, DWORD *result_len ) { NTSTATUS ret; UCHAR *data_ptr; @@ -523,8 +523,8 @@ NTSTATUS WINAPI NtQueryValueKey( HANDLE handle, const UNICODE_STRING *name, /****************************************************************************** * NtQueryMultipleValueKey (NTDLL.@) */ -NTSTATUS WINAPI NtQueryMultipleValueKey( HANDLE key, KEY_MULTIPLE_VALUE_INFORMATION *info, - ULONG count, void *buffer, ULONG length, ULONG *retlen ) +NTSTATUS WINE_SYSCALL NtQueryMultipleValueKey( HANDLE key, KEY_MULTIPLE_VALUE_INFORMATION *info, + ULONG count, void *buffer, ULONG length, ULONG *retlen ) { FIXME( "(%p,%p,0x%08x,%p,0x%08x,%p) stub!\n", key, info, count, buffer, length, retlen ); return STATUS_SUCCESS; @@ -534,8 +534,8 @@ NTSTATUS WINAPI NtQueryMultipleValueKey( HANDLE key, KEY_MULTIPLE_VALUE_INFORMAT /****************************************************************************** * NtSetValueKey (NTDLL.@) */ -NTSTATUS WINAPI NtSetValueKey( HANDLE key, const UNICODE_STRING *name, ULONG index, - ULONG type, const void *data, ULONG count ) +NTSTATUS WINE_SYSCALL NtSetValueKey( HANDLE key, const UNICODE_STRING *name, ULONG index, + ULONG type, const void *data, ULONG count ) { NTSTATUS ret; @@ -560,7 +560,7 @@ NTSTATUS WINAPI NtSetValueKey( HANDLE key, const UNICODE_STRING *name, ULONG ind /****************************************************************************** * NtDeleteValueKey (NTDLL.@) */ -NTSTATUS WINAPI NtDeleteValueKey( HANDLE key, const UNICODE_STRING *name ) +NTSTATUS WINE_SYSCALL NtDeleteValueKey( HANDLE key, const UNICODE_STRING *name ) { NTSTATUS ret; @@ -582,10 +582,10 @@ NTSTATUS WINAPI NtDeleteValueKey( HANDLE key, const UNICODE_STRING *name ) /****************************************************************************** * NtNotifyChangeMultipleKeys (NTDLL.@) */ -NTSTATUS WINAPI NtNotifyChangeMultipleKeys( HANDLE key, ULONG count, OBJECT_ATTRIBUTES *attr, - HANDLE event, PIO_APC_ROUTINE apc, void *apc_context, - IO_STATUS_BLOCK *io, ULONG filter, BOOLEAN subtree, - void *buffer, ULONG length, BOOLEAN async ) +NTSTATUS WINE_SYSCALL NtNotifyChangeMultipleKeys( HANDLE key, ULONG count, OBJECT_ATTRIBUTES *attr, + HANDLE event, PIO_APC_ROUTINE apc, void *apc_context, + IO_STATUS_BLOCK *io, ULONG filter, BOOLEAN subtree, + void *buffer, ULONG length, BOOLEAN async ) { NTSTATUS ret; @@ -625,9 +625,9 @@ NTSTATUS WINAPI NtNotifyChangeMultipleKeys( HANDLE key, ULONG count, OBJECT_ATTR /****************************************************************************** * NtNotifyChangeKey (NTDLL.@) */ -NTSTATUS WINAPI NtNotifyChangeKey( HANDLE key, HANDLE event, PIO_APC_ROUTINE apc, void *apc_context, - IO_STATUS_BLOCK *io, ULONG filter, BOOLEAN subtree, - void *buffer, ULONG length, BOOLEAN async ) +NTSTATUS WINE_SYSCALL NtNotifyChangeKey( HANDLE key, HANDLE event, PIO_APC_ROUTINE apc, void *apc_context, + IO_STATUS_BLOCK *io, ULONG filter, BOOLEAN subtree, + void *buffer, ULONG length, BOOLEAN async ) { return NtNotifyChangeMultipleKeys( key, 0, NULL, event, apc, apc_context, io, filter, subtree, buffer, length, async ); @@ -637,7 +637,7 @@ NTSTATUS WINAPI NtNotifyChangeKey( HANDLE key, HANDLE event, PIO_APC_ROUTINE apc /****************************************************************************** * NtFlushKey (NTDLL.@) */ -NTSTATUS WINAPI NtFlushKey( HANDLE key ) +NTSTATUS WINE_SYSCALL NtFlushKey( HANDLE key ) { NTSTATUS ret; @@ -656,7 +656,7 @@ NTSTATUS WINAPI NtFlushKey( HANDLE key ) /****************************************************************************** * NtLoadKey (NTDLL.@) */ -NTSTATUS WINAPI NtLoadKey( const OBJECT_ATTRIBUTES *attr, OBJECT_ATTRIBUTES *file ) +NTSTATUS WINE_SYSCALL NtLoadKey( const OBJECT_ATTRIBUTES *attr, OBJECT_ATTRIBUTES *file ) { NTSTATUS ret; HANDLE key; @@ -698,7 +698,7 @@ NTSTATUS WINAPI NtLoadKey( const OBJECT_ATTRIBUTES *attr, OBJECT_ATTRIBUTES *fil /****************************************************************************** * NtLoadKey2 (NTDLL.@) */ -NTSTATUS WINAPI NtLoadKey2( const OBJECT_ATTRIBUTES *attr, OBJECT_ATTRIBUTES *file, ULONG flags ) +NTSTATUS WINE_SYSCALL NtLoadKey2( const OBJECT_ATTRIBUTES *attr, OBJECT_ATTRIBUTES *file, ULONG flags ) { FIXME( "(%p,%p,0x%08x) semi-stub: ignoring flags\n", attr, file, flags ); return NtLoadKey( attr, file ); @@ -708,7 +708,7 @@ NTSTATUS WINAPI NtLoadKey2( const OBJECT_ATTRIBUTES *attr, OBJECT_ATTRIBUTES *fi /****************************************************************************** * NtUnloadKey (NTDLL.@) */ -NTSTATUS WINAPI NtUnloadKey( OBJECT_ATTRIBUTES *attr ) +NTSTATUS WINE_SYSCALL NtUnloadKey( OBJECT_ATTRIBUTES *attr ) { NTSTATUS ret; @@ -733,7 +733,7 @@ NTSTATUS WINAPI NtUnloadKey( OBJECT_ATTRIBUTES *attr ) /****************************************************************************** * NtSaveKey (NTDLL.@) */ -NTSTATUS WINAPI NtSaveKey( HANDLE key, HANDLE file ) +NTSTATUS WINE_SYSCALL NtSaveKey( HANDLE key, HANDLE file ) { NTSTATUS ret; @@ -753,7 +753,7 @@ NTSTATUS WINAPI NtSaveKey( HANDLE key, HANDLE file ) /****************************************************************************** * NtRestoreKey (NTDLL.@) */ -NTSTATUS WINAPI NtRestoreKey( HANDLE key, HANDLE file, ULONG flags ) +NTSTATUS WINE_SYSCALL NtRestoreKey( HANDLE key, HANDLE file, ULONG flags ) { FIXME( "(%p,%p,0x%08x) stub\n", key, file, flags ); return STATUS_SUCCESS; @@ -763,7 +763,7 @@ NTSTATUS WINAPI NtRestoreKey( HANDLE key, HANDLE file, ULONG flags ) /****************************************************************************** * NtReplaceKey (NTDLL.@) */ -NTSTATUS WINAPI NtReplaceKey( OBJECT_ATTRIBUTES *attr, HANDLE key, OBJECT_ATTRIBUTES *replace ) +NTSTATUS WINE_SYSCALL NtReplaceKey( OBJECT_ATTRIBUTES *attr, HANDLE key, OBJECT_ATTRIBUTES *replace ) { FIXME( "(%s,%p,%s),stub!\n", debugstr_us(attr->ObjectName), key, debugstr_us(replace->ObjectName) ); return STATUS_SUCCESS; @@ -777,8 +777,8 @@ NTSTATUS WINAPI NtReplaceKey( OBJECT_ATTRIBUTES *attr, HANDLE key, OBJECT_ATTRIB * unless there is some app which explicitly depends on that, there is * no good reason to reproduce that. */ -NTSTATUS WINAPI NtQueryLicenseValue( const UNICODE_STRING *name, ULONG *type, - void *data, ULONG length, ULONG *retlen ) +NTSTATUS WINE_SYSCALL NtQueryLicenseValue( const UNICODE_STRING *name, ULONG *type, + void *data, ULONG length, ULONG *retlen ) { static const WCHAR nameW[] = {'M','a','c','h','i','n','e','\\', 'S','o','f','t','w','a','r','e','\\', diff --git a/dlls/ntdll/unix/security.c b/dlls/ntdll/unix/security.c index 8e3afd078b4..52b7896c941 100644 --- a/dlls/ntdll/unix/security.c +++ b/dlls/ntdll/unix/security.c @@ -40,7 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); /*********************************************************************** * NtOpenProcessToken (NTDLL.@) */ -NTSTATUS WINAPI NtOpenProcessToken( HANDLE process, DWORD access, HANDLE *handle ) +NTSTATUS WINE_SYSCALL NtOpenProcessToken( HANDLE process, DWORD access, HANDLE *handle ) { return NtOpenProcessTokenEx( process, access, 0, handle ); } @@ -49,7 +49,7 @@ NTSTATUS WINAPI NtOpenProcessToken( HANDLE process, DWORD access, HANDLE *handle /*********************************************************************** * NtOpenProcessTokenEx (NTDLL.@) */ -NTSTATUS WINAPI NtOpenProcessTokenEx( HANDLE process, DWORD access, DWORD attributes, HANDLE *handle ) +NTSTATUS WINE_SYSCALL NtOpenProcessTokenEx( HANDLE process, DWORD access, DWORD attributes, HANDLE *handle ) { NTSTATUS ret; @@ -74,7 +74,7 @@ NTSTATUS WINAPI NtOpenProcessTokenEx( HANDLE process, DWORD access, DWORD attrib /*********************************************************************** * NtOpenThreadToken (NTDLL.@) */ -NTSTATUS WINAPI NtOpenThreadToken( HANDLE thread, DWORD access, BOOLEAN self, HANDLE *handle ) +NTSTATUS WINE_SYSCALL NtOpenThreadToken( HANDLE thread, DWORD access, BOOLEAN self, HANDLE *handle ) { return NtOpenThreadTokenEx( thread, access, self, 0, handle ); } @@ -83,8 +83,8 @@ NTSTATUS WINAPI NtOpenThreadToken( HANDLE thread, DWORD access, BOOLEAN self, HA /*********************************************************************** * NtOpenThreadTokenEx (NTDLL.@) */ -NTSTATUS WINAPI NtOpenThreadTokenEx( HANDLE thread, DWORD access, BOOLEAN self, DWORD attributes, - HANDLE *handle ) +NTSTATUS WINE_SYSCALL NtOpenThreadTokenEx( HANDLE thread, DWORD access, BOOLEAN self, DWORD attributes, + HANDLE *handle ) { NTSTATUS ret; @@ -110,8 +110,8 @@ NTSTATUS WINAPI NtOpenThreadTokenEx( HANDLE thread, DWORD access, BOOLEAN self, /*********************************************************************** * NtDuplicateToken (NTDLL.@) */ -NTSTATUS WINAPI NtDuplicateToken( HANDLE token, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, - SECURITY_IMPERSONATION_LEVEL level, TOKEN_TYPE type, HANDLE *handle ) +NTSTATUS WINE_SYSCALL NtDuplicateToken( HANDLE token, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, + SECURITY_IMPERSONATION_LEVEL level, TOKEN_TYPE type, HANDLE *handle ) { NTSTATUS status; data_size_t len; @@ -148,8 +148,8 @@ NTSTATUS WINAPI NtDuplicateToken( HANDLE token, ACCESS_MASK access, OBJECT_ATTRI /*********************************************************************** * NtQueryInformationToken (NTDLL.@) */ -NTSTATUS WINAPI NtQueryInformationToken( HANDLE token, TOKEN_INFORMATION_CLASS class, - void *info, ULONG length, ULONG *retlen ) +NTSTATUS WINE_SYSCALL NtQueryInformationToken( HANDLE token, TOKEN_INFORMATION_CLASS class, + void *info, ULONG length, ULONG *retlen ) { static const ULONG info_len [] = { @@ -514,7 +514,7 @@ NTSTATUS WINAPI NtQueryInformationToken( HANDLE token, TOKEN_INFORMATION_CLASS c /*********************************************************************** * NtSetInformationToken (NTDLL.@) */ -NTSTATUS WINAPI NtSetInformationToken( HANDLE token, TOKEN_INFORMATION_CLASS class, +NTSTATUS WINE_SYSCALL NtSetInformationToken( HANDLE token, TOKEN_INFORMATION_CLASS class, void *info, ULONG length ) { NTSTATUS ret = STATUS_NOT_IMPLEMENTED; @@ -579,9 +579,9 @@ NTSTATUS WINAPI NtSetInformationToken( HANDLE token, TOKEN_INFORMATION_CLASS cla /*********************************************************************** * NtCreateLowBoxToken (NTDLL.@) */ -NTSTATUS WINAPI NtCreateLowBoxToken( HANDLE *token_handle, HANDLE token, ACCESS_MASK access, - OBJECT_ATTRIBUTES *attr, SID *sid, ULONG count, - SID_AND_ATTRIBUTES *capabilities, ULONG handle_count, HANDLE *handle ) +NTSTATUS WINE_SYSCALL NtCreateLowBoxToken( HANDLE *token_handle, HANDLE token, ACCESS_MASK access, + OBJECT_ATTRIBUTES *attr, SID *sid, ULONG count, + SID_AND_ATTRIBUTES *capabilities, ULONG handle_count, HANDLE *handle ) { FIXME("(%p, %p, %x, %p, %p, %u, %p, %u, %p): stub\n", token_handle, token, access, attr, sid, count, capabilities, handle_count, handle ); @@ -595,8 +595,8 @@ NTSTATUS WINAPI NtCreateLowBoxToken( HANDLE *token_handle, HANDLE token, ACCESS_ /*********************************************************************** * NtAdjustGroupsToken (NTDLL.@) */ -NTSTATUS WINAPI NtAdjustGroupsToken( HANDLE token, BOOLEAN reset, TOKEN_GROUPS *groups, - ULONG length, TOKEN_GROUPS *prev, ULONG *retlen ) +NTSTATUS WINE_SYSCALL NtAdjustGroupsToken( HANDLE token, BOOLEAN reset, TOKEN_GROUPS *groups, + ULONG length, TOKEN_GROUPS *prev, ULONG *retlen ) { FIXME( "%p %d %p %u %p %p\n", token, reset, groups, length, prev, retlen ); return STATUS_NOT_IMPLEMENTED; @@ -606,8 +606,8 @@ NTSTATUS WINAPI NtAdjustGroupsToken( HANDLE token, BOOLEAN reset, TOKEN_GROUPS * /*********************************************************************** * NtAdjustPrivilegesToken (NTDLL.@) */ -NTSTATUS WINAPI NtAdjustPrivilegesToken( HANDLE token, BOOLEAN disable, TOKEN_PRIVILEGES *privs, - DWORD length, TOKEN_PRIVILEGES *prev, DWORD *retlen ) +NTSTATUS WINE_SYSCALL NtAdjustPrivilegesToken( HANDLE token, BOOLEAN disable, TOKEN_PRIVILEGES *privs, + DWORD length, TOKEN_PRIVILEGES *prev, DWORD *retlen ) { NTSTATUS ret; @@ -639,8 +639,8 @@ NTSTATUS WINAPI NtAdjustPrivilegesToken( HANDLE token, BOOLEAN disable, TOKEN_PR /*********************************************************************** * NtFilterToken (NTDLL.@) */ -NTSTATUS WINAPI NtFilterToken( HANDLE token, ULONG flags, TOKEN_GROUPS *disable_sids, - TOKEN_PRIVILEGES *privileges, TOKEN_GROUPS *restrict_sids, HANDLE *new_token ) +NTSTATUS WINE_SYSCALL NtFilterToken( HANDLE token, ULONG flags, TOKEN_GROUPS *disable_sids, + TOKEN_PRIVILEGES *privileges, TOKEN_GROUPS *restrict_sids, HANDLE *new_token ) { data_size_t privileges_len = 0; data_size_t sids_len = 0; @@ -702,7 +702,7 @@ NTSTATUS WINAPI NtFilterToken( HANDLE token, ULONG flags, TOKEN_GROUPS *disable_ /*********************************************************************** * NtPrivilegeCheck (NTDLL.@) */ -NTSTATUS WINAPI NtPrivilegeCheck( HANDLE token, PRIVILEGE_SET *privs, BOOLEAN *res ) +NTSTATUS WINE_SYSCALL NtPrivilegeCheck( HANDLE token, PRIVILEGE_SET *privs, BOOLEAN *res ) { NTSTATUS status; @@ -723,7 +723,7 @@ NTSTATUS WINAPI NtPrivilegeCheck( HANDLE token, PRIVILEGE_SET *privs, BOOLEAN *r /*********************************************************************** * NtImpersonateAnonymousToken (NTDLL.@) */ -NTSTATUS WINAPI NtImpersonateAnonymousToken( HANDLE thread ) +NTSTATUS WINE_SYSCALL NtImpersonateAnonymousToken( HANDLE thread ) { FIXME( "(%p): stub\n", thread ); return STATUS_NOT_IMPLEMENTED; @@ -733,9 +733,9 @@ NTSTATUS WINAPI NtImpersonateAnonymousToken( HANDLE thread ) /*********************************************************************** * NtAccessCheck (NTDLL.@) */ -NTSTATUS WINAPI NtAccessCheck( PSECURITY_DESCRIPTOR descr, HANDLE token, ACCESS_MASK access, - GENERIC_MAPPING *mapping, PRIVILEGE_SET *privs, ULONG *retlen, - ULONG *access_granted, NTSTATUS *access_status) +NTSTATUS WINE_SYSCALL NtAccessCheck( PSECURITY_DESCRIPTOR descr, HANDLE token, ACCESS_MASK access, + GENERIC_MAPPING *mapping, PRIVILEGE_SET *privs, ULONG *retlen, + ULONG *access_granted, NTSTATUS *access_status) { struct object_attributes *objattr; data_size_t len; @@ -787,12 +787,12 @@ NTSTATUS WINAPI NtAccessCheck( PSECURITY_DESCRIPTOR descr, HANDLE token, ACCESS_ /*********************************************************************** * NtAccessCheckAndAuditAlarm (NTDLL.@) */ -NTSTATUS WINAPI NtAccessCheckAndAuditAlarm( UNICODE_STRING *subsystem, HANDLE handle, - UNICODE_STRING *typename, UNICODE_STRING *objectname, - PSECURITY_DESCRIPTOR descr, ACCESS_MASK access, - GENERIC_MAPPING *mapping, BOOLEAN creation, - ACCESS_MASK *access_granted, BOOLEAN *access_status, - BOOLEAN *onclose ) +NTSTATUS WINE_SYSCALL NtAccessCheckAndAuditAlarm( UNICODE_STRING *subsystem, HANDLE handle, + UNICODE_STRING *typename, UNICODE_STRING *objectname, + PSECURITY_DESCRIPTOR descr, ACCESS_MASK access, + GENERIC_MAPPING *mapping, BOOLEAN creation, + ACCESS_MASK *access_granted, BOOLEAN *access_status, + BOOLEAN *onclose ) { FIXME( "(%s, %p, %s, %p, 0x%08x, %p, %d, %p, %p, %p), stub\n", debugstr_us(subsystem), handle, debugstr_us(typename), descr, access, @@ -804,8 +804,8 @@ NTSTATUS WINAPI NtAccessCheckAndAuditAlarm( UNICODE_STRING *subsystem, HANDLE ha /*********************************************************************** * NtQuerySecurityObject (NTDLL.@) */ -NTSTATUS WINAPI NtQuerySecurityObject( HANDLE handle, SECURITY_INFORMATION info, - PSECURITY_DESCRIPTOR descr, ULONG length, ULONG *retlen ) +NTSTATUS WINE_SYSCALL NtQuerySecurityObject( HANDLE handle, SECURITY_INFORMATION info, + PSECURITY_DESCRIPTOR descr, ULONG length, ULONG *retlen ) { SECURITY_DESCRIPTOR_RELATIVE *psd = descr; NTSTATUS status; @@ -864,7 +864,7 @@ NTSTATUS WINAPI NtQuerySecurityObject( HANDLE handle, SECURITY_INFORMATION info, /*********************************************************************** * NtSetSecurityObject (NTDLL.@) */ -NTSTATUS WINAPI NtSetSecurityObject( HANDLE handle, SECURITY_INFORMATION info, PSECURITY_DESCRIPTOR descr ) +NTSTATUS WINE_SYSCALL NtSetSecurityObject( HANDLE handle, SECURITY_INFORMATION info, PSECURITY_DESCRIPTOR descr ) { struct object_attributes *objattr; struct security_descriptor *sd; @@ -909,7 +909,7 @@ NTSTATUS WINAPI NtSetSecurityObject( HANDLE handle, SECURITY_INFORMATION info, P /*********************************************************************** * NtAllocateLocallyUniqueId (NTDLL.@) */ -NTSTATUS WINAPI NtAllocateLocallyUniqueId( LUID *luid ) +NTSTATUS WINE_SYSCALL NtAllocateLocallyUniqueId( LUID *luid ) { NTSTATUS status; @@ -934,7 +934,7 @@ NTSTATUS WINAPI NtAllocateLocallyUniqueId( LUID *luid ) /*********************************************************************** * NtAllocateUuids (NTDLL.@) */ -NTSTATUS WINAPI NtAllocateUuids( ULARGE_INTEGER *time, ULONG *delta, ULONG *sequence, UCHAR *seed ) +NTSTATUS WINE_SYSCALL NtAllocateUuids( ULARGE_INTEGER *time, ULONG *delta, ULONG *sequence, UCHAR *seed ) { FIXME( "(%p,%p,%p,%p), stub.\n", time, delta, sequence, seed ); return STATUS_SUCCESS; diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 53d34e1858a..51341c80613 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -282,7 +282,7 @@ unsigned int server_call_unlocked( void *req_ptr ) * * Perform a server call. */ -unsigned int CDECL wine_server_call( void *req_ptr ) +unsigned int WINE_SYSCALL_CDECL wine_server_call( void *req_ptr ) { sigset_t old_set; unsigned int ret; @@ -698,7 +698,7 @@ unsigned int server_wait( const select_op_t *select_op, data_size_t size, UINT f /*********************************************************************** * NtContinue (NTDLL.@) */ -NTSTATUS WINAPI NtContinue( CONTEXT *context, BOOLEAN alertable ) +NTSTATUS WINE_SYSCALL NtContinue( CONTEXT *context, BOOLEAN alertable ) { user_apc_t apc; NTSTATUS status; @@ -715,7 +715,7 @@ NTSTATUS WINAPI NtContinue( CONTEXT *context, BOOLEAN alertable ) /*********************************************************************** * NtTestAlert (NTDLL.@) */ -NTSTATUS WINAPI NtTestAlert(void) +NTSTATUS WINE_SYSCALL NtTestAlert(void) { user_apc_t apc; NTSTATUS status; @@ -1062,7 +1062,7 @@ done: /*********************************************************************** * wine_server_fd_to_handle */ -NTSTATUS CDECL wine_server_fd_to_handle( int fd, unsigned int access, unsigned int attributes, HANDLE *handle ) +NTSTATUS WINE_SYSCALL_CDECL wine_server_fd_to_handle( int fd, unsigned int access, unsigned int attributes, HANDLE *handle ) { NTSTATUS ret; @@ -1086,7 +1086,7 @@ NTSTATUS CDECL wine_server_fd_to_handle( int fd, unsigned int access, unsigned i * * Retrieve the file descriptor corresponding to a file handle. */ -NTSTATUS CDECL wine_server_handle_to_fd( HANDLE handle, unsigned int access, int *unix_fd, +NTSTATUS WINE_SYSCALL_CDECL wine_server_handle_to_fd( HANDLE handle, unsigned int access, int *unix_fd, unsigned int *options ) { int needs_close; @@ -1663,7 +1663,7 @@ NTSTATUS WINAPI DbgUiIssueRemoteBreakin( HANDLE process ) /****************************************************************************** * NtDuplicateObject */ -NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, HANDLE dest_process, HANDLE *dest, +NTSTATUS WINE_SYSCALL NtDuplicateObject( HANDLE source_process, HANDLE source, HANDLE dest_process, HANDLE *dest, ACCESS_MASK access, ULONG attributes, ULONG options ) { sigset_t sigset; @@ -1725,7 +1725,7 @@ NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, HANDLE /************************************************************************** * NtClose */ -NTSTATUS WINAPI NtClose( HANDLE handle ) +NTSTATUS WINE_SYSCALL NtClose( HANDLE handle ) { sigset_t sigset; HANDLE port; diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index f024879b81f..0e6f1594e88 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -355,7 +355,7 @@ void *get_wow_context( CONTEXT *context ) * NtSetContextThread (NTDLL.@) * ZwSetContextThread (NTDLL.@) */ -NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) +NTSTATUS WINE_SYSCALL NtSetContextThread( HANDLE handle, const CONTEXT *context ) { NTSTATUS ret; struct syscall_frame *frame = arm_thread_data()->syscall_frame; @@ -405,7 +405,7 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) * NtGetContextThread (NTDLL.@) * ZwGetContextThread (NTDLL.@) */ -NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) +NTSTATUS WINE_SYSCALL NtGetContextThread( HANDLE handle, CONTEXT *context ) { struct syscall_frame *frame = arm_thread_data()->syscall_frame; DWORD needed_flags = context->ContextFlags & ~CONTEXT_ARM; @@ -622,7 +622,7 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void /*********************************************************************** * NtCallbackReturn (NTDLL.@) */ -NTSTATUS WINAPI NtCallbackReturn( void *ret_ptr, ULONG ret_len, NTSTATUS status ) +NTSTATUS WINE_SYSCALL NtCallbackReturn( void *ret_ptr, ULONG ret_len, NTSTATUS status ) { struct user_callback_frame *frame = (struct user_callback_frame *)arm_thread_data()->syscall_frame; @@ -890,7 +890,7 @@ NTSTATUS get_thread_ldt_entry( HANDLE handle, void *data, ULONG len, ULONG *ret_ * NtSetLdtEntries (NTDLL.@) * ZwSetLdtEntries (NTDLL.@) */ -NTSTATUS WINAPI NtSetLdtEntries( ULONG sel1, LDT_ENTRY entry1, ULONG sel2, LDT_ENTRY entry2 ) +NTSTATUS WINE_SYSCALL NtSetLdtEntries( ULONG sel1, LDT_ENTRY entry1, ULONG sel2, LDT_ENTRY entry2 ) { return STATUS_NOT_IMPLEMENTED; } diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 145277b5418..0d667ad868b 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -445,7 +445,7 @@ void *get_wow_context( CONTEXT *context ) * NtSetContextThread (NTDLL.@) * ZwSetContextThread (NTDLL.@) */ -NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) +NTSTATUS WINE_SYSCALL NtSetContextThread( HANDLE handle, const CONTEXT *context ) { struct syscall_frame *frame = arm64_thread_data()->syscall_frame; NTSTATUS ret = STATUS_SUCCESS; @@ -494,7 +494,7 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) * NtGetContextThread (NTDLL.@) * ZwGetContextThread (NTDLL.@) */ -NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) +NTSTATUS WINE_SYSCALL NtGetContextThread( HANDLE handle, CONTEXT *context ) { struct syscall_frame *frame = arm64_thread_data()->syscall_frame; DWORD needed_flags = context->ContextFlags & ~CONTEXT_ARM64; @@ -771,7 +771,7 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void /*********************************************************************** * NtCallbackReturn (NTDLL.@) */ -NTSTATUS WINAPI NtCallbackReturn( void *ret_ptr, ULONG ret_len, NTSTATUS status ) +NTSTATUS WINE_SYSCALL NtCallbackReturn( void *ret_ptr, ULONG ret_len, NTSTATUS status ) { struct user_callback_frame *frame = (struct user_callback_frame *)arm64_thread_data()->syscall_frame; @@ -1076,7 +1076,7 @@ NTSTATUS get_thread_ldt_entry( HANDLE handle, void *data, ULONG len, ULONG *ret_ * NtSetLdtEntries (NTDLL.@) * ZwSetLdtEntries (NTDLL.@) */ -NTSTATUS WINAPI NtSetLdtEntries( ULONG sel1, LDT_ENTRY entry1, ULONG sel2, LDT_ENTRY entry2 ) +NTSTATUS WINE_SYSCALL NtSetLdtEntries( ULONG sel1, LDT_ENTRY entry1, ULONG sel2, LDT_ENTRY entry2 ) { return STATUS_NOT_IMPLEMENTED; } @@ -1403,7 +1403,7 @@ __ASM_GLOBAL_FUNC( __wine_longjmp, /********************************************************************** * NtCurrentTeb (NTDLL.@) */ -TEB * WINAPI NtCurrentTeb(void) +TEB * WINE_SYSCALL NtCurrentTeb(void) { return pthread_getspecific( teb_key ); } diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index e123f2c2a79..838a85874af 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -876,7 +876,7 @@ void *get_wow_context( CONTEXT *context ) * NtSetContextThread (NTDLL.@) * ZwSetContextThread (NTDLL.@) */ -NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) +NTSTATUS WINE_SYSCALL NtSetContextThread( HANDLE handle, const CONTEXT *context ) { NTSTATUS ret = STATUS_SUCCESS; struct syscall_frame *frame = x86_thread_data()->syscall_frame; @@ -989,7 +989,7 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) * Note: we use a small assembly wrapper to save the necessary registers * in case we are fetching the context of the current thread. */ -NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) +NTSTATUS WINE_SYSCALL NtGetContextThread( HANDLE handle, CONTEXT *context ) { struct syscall_frame *frame = x86_thread_data()->syscall_frame; DWORD needed_flags = context->ContextFlags & ~CONTEXT_i386; @@ -1606,7 +1606,7 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void /*********************************************************************** * NtCallbackReturn (NTDLL.@) */ -NTSTATUS WINAPI NtCallbackReturn( void *ret_ptr, ULONG ret_len, NTSTATUS status ) +NTSTATUS WINE_SYSCALL NtCallbackReturn( void *ret_ptr, ULONG ret_len, NTSTATUS status ) { struct user_callback_frame *frame = (struct user_callback_frame *)x86_thread_data()->syscall_frame; @@ -2196,7 +2196,7 @@ NTSTATUS get_thread_ldt_entry( HANDLE handle, void *data, ULONG len, ULONG *ret_ * NtSetLdtEntries (NTDLL.@) * ZwSetLdtEntries (NTDLL.@) */ -NTSTATUS WINAPI NtSetLdtEntries( ULONG sel1, LDT_ENTRY entry1, ULONG sel2, LDT_ENTRY entry2 ) +NTSTATUS WINE_SYSCALL NtSetLdtEntries( ULONG sel1, LDT_ENTRY entry1, ULONG sel2, LDT_ENTRY entry2 ) { sigset_t sigset; diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 9b18180301a..e0dbbcc88e4 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1687,7 +1687,7 @@ void *get_wow_context( CONTEXT *context ) * NtSetContextThread (NTDLL.@) * ZwSetContextThread (NTDLL.@) */ -NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) +NTSTATUS WINE_SYSCALL NtSetContextThread( HANDLE handle, const CONTEXT *context ) { NTSTATUS ret = STATUS_SUCCESS; DWORD flags = context->ContextFlags & ~CONTEXT_AMD64; @@ -1791,7 +1791,7 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) * NtGetContextThread (NTDLL.@) * ZwGetContextThread (NTDLL.@) */ -NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) +NTSTATUS WINE_SYSCALL NtGetContextThread( HANDLE handle, CONTEXT *context ) { struct syscall_frame *frame = amd64_thread_data()->syscall_frame; DWORD needed_flags = context->ContextFlags & ~CONTEXT_AMD64; @@ -2331,7 +2331,7 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void /*********************************************************************** * NtCallbackReturn (NTDLL.@) */ -NTSTATUS WINAPI NtCallbackReturn( void *ret_ptr, ULONG ret_len, NTSTATUS status ) +NTSTATUS WINE_SYSCALL NtCallbackReturn( void *ret_ptr, ULONG ret_len, NTSTATUS status ) { struct user_callback_frame *frame = (struct user_callback_frame *)amd64_thread_data()->syscall_frame; @@ -2800,7 +2800,7 @@ NTSTATUS get_thread_ldt_entry( HANDLE handle, void *data, ULONG len, ULONG *ret_ * NtSetLdtEntries (NTDLL.@) * ZwSetLdtEntries (NTDLL.@) */ -NTSTATUS WINAPI NtSetLdtEntries( ULONG sel1, LDT_ENTRY entry1, ULONG sel2, LDT_ENTRY entry2 ) +NTSTATUS WINE_SYSCALL NtSetLdtEntries( ULONG sel1, LDT_ENTRY entry1, ULONG sel2, LDT_ENTRY entry2 ) { return STATUS_NOT_IMPLEMENTED; } @@ -3172,10 +3172,12 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "leaq -0x98(%rbp),%rcx\n" "2:\n\t" #endif - "leaq 0x28(%rsp),%rsi\n\t" /* first argument */ + "leaq 0x38(%rsp),%rsi\n\t" /* first (sysv) stack parameter */ "movq %rcx,%rsp\n\t" + "movq 0x18(%rcx),%r12\n\t" /* stash second parameter */ + "movq %r8,%rdx\n\t" /* third parameter */ + "movq %r9,%r14\n\t" /* stash fourth parameter */ "movq 0x00(%rcx),%rax\n\t" - "movq 0x18(%rcx),%rdx\n\t" "movl %eax,%ebx\n\t" "shrl $8,%ebx\n\t" "andl $0x30,%ebx\n\t" /* syscall table number */ @@ -3186,7 +3188,13 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "jae 5f\n\t" "movq 24(%rbx),%rcx\n\t" /* table->ArgumentTable */ "movzbl (%rcx,%rax),%ecx\n\t" - "subq $0x20,%rcx\n\t" + "cmpq $0x20,%rcx\n\t" + "jbe 1f\n\t" + "movq -16(%rsi),%r8\n\t" /* fifth parameter */ + "cmpq $0x28,%rcx\n\t" + "jbe 1f\n\t" + "movq -8(%rsi),%r9\n\t" /* sixth parameter */ + "subq $0x30,%rcx\n\t" "jbe 1f\n\t" "subq %rcx,%rsp\n\t" "shrq $3,%rcx\n\t" @@ -3194,8 +3202,9 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "movq %rsp,%rdi\n\t" "cld\n\t" "rep; movsq\n" - "1:\tmovq %r10,%rcx\n\t" - "subq $0x20,%rsp\n\t" + "1:\tmovq %r10,%rdi\n\t" /* first parameter */ + "movq %r12,%rsi\n\t" /* second parameter */ + "movq %r14,%rcx\n\t" /* fourth parameter */ "movq (%rbx),%r10\n\t" /* table->ServiceTable */ "callq *(%r10,%rax,8)\n\t" "leaq -0x98(%rbp),%rcx\n" @@ -3216,9 +3225,20 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "xrstor64 0xc0(%rcx)\n\t" "movq %r11,%rax\n\t" "movl 0x94(%rcx),%edx\n\t" - "jmp 4f\n" + "jmp 5f\n" "3:\tfxrstor64 0xc0(%rcx)\n" - "4:\tmovq 0x98(%rcx),%rbp\n\t" + "jmp 5f\n" + "4:\tmovaps 0x1c0(%rcx),%xmm6\n\t" + "movaps 0x1d0(%rcx),%xmm7\n\t" + "movaps 0x1e0(%rcx),%xmm8\n\t" + "movaps 0x1f0(%rcx),%xmm9\n\t" + "movaps 0x200(%rcx),%xmm10\n\t" + "movaps 0x210(%rcx),%xmm11\n\t" + "movaps 0x220(%rcx),%xmm12\n\t" + "movaps 0x230(%rcx),%xmm13\n\t" + "movaps 0x240(%rcx),%xmm14\n\t" + "movaps 0x250(%rcx),%xmm15\n\t" + "5:\tmovq 0x98(%rcx),%rbp\n\t" "movq 0x68(%rcx),%r15\n\t" "movq 0x60(%rcx),%r14\n\t" "movq 0x58(%rcx),%r13\n\t" diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 5a5d49bf4bd..54726acfb9c 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -314,8 +314,8 @@ static NTSTATUS validate_open_object_attributes( const OBJECT_ATTRIBUTES *attr ) /****************************************************************************** * NtCreateSemaphore (NTDLL.@) */ -NTSTATUS WINAPI NtCreateSemaphore( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, - LONG initial, LONG max ) +NTSTATUS WINE_SYSCALL NtCreateSemaphore( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, + LONG initial, LONG max ) { NTSTATUS ret; data_size_t len; @@ -344,7 +344,7 @@ NTSTATUS WINAPI NtCreateSemaphore( HANDLE *handle, ACCESS_MASK access, const OBJ /****************************************************************************** * NtOpenSemaphore (NTDLL.@) */ -NTSTATUS WINAPI NtOpenSemaphore( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) +NTSTATUS WINE_SYSCALL NtOpenSemaphore( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) { NTSTATUS ret; @@ -369,8 +369,8 @@ NTSTATUS WINAPI NtOpenSemaphore( HANDLE *handle, ACCESS_MASK access, const OBJEC /****************************************************************************** * NtQuerySemaphore (NTDLL.@) */ -NTSTATUS WINAPI NtQuerySemaphore( HANDLE handle, SEMAPHORE_INFORMATION_CLASS class, - void *info, ULONG len, ULONG *ret_len ) +NTSTATUS WINE_SYSCALL NtQuerySemaphore( HANDLE handle, SEMAPHORE_INFORMATION_CLASS class, + void *info, ULONG len, ULONG *ret_len ) { NTSTATUS ret; SEMAPHORE_BASIC_INFORMATION *out = info; @@ -403,7 +403,7 @@ NTSTATUS WINAPI NtQuerySemaphore( HANDLE handle, SEMAPHORE_INFORMATION_CLASS cla /****************************************************************************** * NtReleaseSemaphore (NTDLL.@) */ -NTSTATUS WINAPI NtReleaseSemaphore( HANDLE handle, ULONG count, ULONG *previous ) +NTSTATUS WINE_SYSCALL NtReleaseSemaphore( HANDLE handle, ULONG count, ULONG *previous ) { NTSTATUS ret; @@ -424,8 +424,8 @@ NTSTATUS WINAPI NtReleaseSemaphore( HANDLE handle, ULONG count, ULONG *previous /************************************************************************** * NtCreateEvent (NTDLL.@) */ -NTSTATUS WINAPI NtCreateEvent( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, - EVENT_TYPE type, BOOLEAN state ) +NTSTATUS WINE_SYSCALL NtCreateEvent( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, + EVENT_TYPE type, BOOLEAN state ) { NTSTATUS ret; data_size_t len; @@ -454,7 +454,7 @@ NTSTATUS WINAPI NtCreateEvent( HANDLE *handle, ACCESS_MASK access, const OBJECT_ /****************************************************************************** * NtOpenEvent (NTDLL.@) */ -NTSTATUS WINAPI NtOpenEvent( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) +NTSTATUS WINE_SYSCALL NtOpenEvent( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) { NTSTATUS ret; @@ -479,7 +479,7 @@ NTSTATUS WINAPI NtOpenEvent( HANDLE *handle, ACCESS_MASK access, const OBJECT_AT /****************************************************************************** * NtSetEvent (NTDLL.@) */ -NTSTATUS WINAPI NtSetEvent( HANDLE handle, LONG *prev_state ) +NTSTATUS WINE_SYSCALL NtSetEvent( HANDLE handle, LONG *prev_state ) { NTSTATUS ret; @@ -498,7 +498,7 @@ NTSTATUS WINAPI NtSetEvent( HANDLE handle, LONG *prev_state ) /****************************************************************************** * NtResetEvent (NTDLL.@) */ -NTSTATUS WINAPI NtResetEvent( HANDLE handle, LONG *prev_state ) +NTSTATUS WINE_SYSCALL NtResetEvent( HANDLE handle, LONG *prev_state ) { NTSTATUS ret; @@ -517,7 +517,7 @@ NTSTATUS WINAPI NtResetEvent( HANDLE handle, LONG *prev_state ) /****************************************************************************** * NtClearEvent (NTDLL.@) */ -NTSTATUS WINAPI NtClearEvent( HANDLE handle ) +NTSTATUS WINE_SYSCALL NtClearEvent( HANDLE handle ) { /* FIXME: same as NtResetEvent ??? */ return NtResetEvent( handle, NULL ); @@ -527,7 +527,7 @@ NTSTATUS WINAPI NtClearEvent( HANDLE handle ) /****************************************************************************** * NtPulseEvent (NTDLL.@) */ -NTSTATUS WINAPI NtPulseEvent( HANDLE handle, LONG *prev_state ) +NTSTATUS WINE_SYSCALL NtPulseEvent( HANDLE handle, LONG *prev_state ) { NTSTATUS ret; @@ -546,8 +546,8 @@ NTSTATUS WINAPI NtPulseEvent( HANDLE handle, LONG *prev_state ) /****************************************************************************** * NtQueryEvent (NTDLL.@) */ -NTSTATUS WINAPI NtQueryEvent( HANDLE handle, EVENT_INFORMATION_CLASS class, - void *info, ULONG len, ULONG *ret_len ) +NTSTATUS WINE_SYSCALL NtQueryEvent( HANDLE handle, EVENT_INFORMATION_CLASS class, + void *info, ULONG len, ULONG *ret_len ) { NTSTATUS ret; EVENT_BASIC_INFORMATION *out = info; @@ -581,8 +581,8 @@ NTSTATUS WINAPI NtQueryEvent( HANDLE handle, EVENT_INFORMATION_CLASS class, /****************************************************************************** * NtCreateMutant (NTDLL.@) */ -NTSTATUS WINAPI NtCreateMutant( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, - BOOLEAN owned ) +NTSTATUS WINE_SYSCALL NtCreateMutant( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, + BOOLEAN owned ) { NTSTATUS ret; data_size_t len; @@ -609,7 +609,7 @@ NTSTATUS WINAPI NtCreateMutant( HANDLE *handle, ACCESS_MASK access, const OBJECT /************************************************************************** * NtOpenMutant (NTDLL.@) */ -NTSTATUS WINAPI NtOpenMutant( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) +NTSTATUS WINE_SYSCALL NtOpenMutant( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) { NTSTATUS ret; @@ -634,7 +634,7 @@ NTSTATUS WINAPI NtOpenMutant( HANDLE *handle, ACCESS_MASK access, const OBJECT_A /************************************************************************** * NtReleaseMutant (NTDLL.@) */ -NTSTATUS WINAPI NtReleaseMutant( HANDLE handle, LONG *prev_count ) +NTSTATUS WINE_SYSCALL NtReleaseMutant( HANDLE handle, LONG *prev_count ) { NTSTATUS ret; @@ -652,8 +652,8 @@ NTSTATUS WINAPI NtReleaseMutant( HANDLE handle, LONG *prev_count ) /****************************************************************** * NtQueryMutant (NTDLL.@) */ -NTSTATUS WINAPI NtQueryMutant( HANDLE handle, MUTANT_INFORMATION_CLASS class, - void *info, ULONG len, ULONG *ret_len ) +NTSTATUS WINE_SYSCALL NtQueryMutant( HANDLE handle, MUTANT_INFORMATION_CLASS class, + void *info, ULONG len, ULONG *ret_len ) { NTSTATUS ret; MUTANT_BASIC_INFORMATION *out = info; @@ -687,7 +687,7 @@ NTSTATUS WINAPI NtQueryMutant( HANDLE handle, MUTANT_INFORMATION_CLASS class, /************************************************************************** * NtCreateJobObject (NTDLL.@) */ -NTSTATUS WINAPI NtCreateJobObject( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) +NTSTATUS WINE_SYSCALL NtCreateJobObject( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) { NTSTATUS ret; data_size_t len; @@ -712,7 +712,7 @@ NTSTATUS WINAPI NtCreateJobObject( HANDLE *handle, ACCESS_MASK access, const OBJ /************************************************************************** * NtOpenJobObject (NTDLL.@) */ -NTSTATUS WINAPI NtOpenJobObject( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) +NTSTATUS WINE_SYSCALL NtOpenJobObject( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) { NTSTATUS ret; @@ -737,7 +737,7 @@ NTSTATUS WINAPI NtOpenJobObject( HANDLE *handle, ACCESS_MASK access, const OBJEC /************************************************************************** * NtTerminateJobObject (NTDLL.@) */ -NTSTATUS WINAPI NtTerminateJobObject( HANDLE handle, NTSTATUS status ) +NTSTATUS WINE_SYSCALL NtTerminateJobObject( HANDLE handle, NTSTATUS status ) { NTSTATUS ret; @@ -758,8 +758,8 @@ NTSTATUS WINAPI NtTerminateJobObject( HANDLE handle, NTSTATUS status ) /************************************************************************** * NtQueryInformationJobObject (NTDLL.@) */ -NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS class, void *info, - ULONG len, ULONG *ret_len ) +NTSTATUS WINE_SYSCALL NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS class, void *info, + ULONG len, ULONG *ret_len ) { NTSTATUS ret; @@ -853,7 +853,7 @@ NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS c /************************************************************************** * NtSetInformationJobObject (NTDLL.@) */ -NTSTATUS WINAPI NtSetInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS class, void *info, ULONG len ) +NTSTATUS WINE_SYSCALL NtSetInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS class, void *info, ULONG len ) { NTSTATUS status = STATUS_NOT_IMPLEMENTED; JOBOBJECT_BASIC_LIMIT_INFORMATION *basic_limit; @@ -908,7 +908,7 @@ NTSTATUS WINAPI NtSetInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS cla /************************************************************************** * NtIsProcessInJob (NTDLL.@) */ -NTSTATUS WINAPI NtIsProcessInJob( HANDLE process, HANDLE job ) +NTSTATUS WINE_SYSCALL NtIsProcessInJob( HANDLE process, HANDLE job ) { NTSTATUS status; @@ -928,7 +928,7 @@ NTSTATUS WINAPI NtIsProcessInJob( HANDLE process, HANDLE job ) /************************************************************************** * NtAssignProcessToJobObject (NTDLL.@) */ -NTSTATUS WINAPI NtAssignProcessToJobObject( HANDLE job, HANDLE process ) +NTSTATUS WINE_SYSCALL NtAssignProcessToJobObject( HANDLE job, HANDLE process ) { NTSTATUS status; @@ -948,8 +948,8 @@ NTSTATUS WINAPI NtAssignProcessToJobObject( HANDLE job, HANDLE process ) /********************************************************************** * NtCreateDebugObject (NTDLL.@) */ -NTSTATUS WINAPI NtCreateDebugObject( HANDLE *handle, ACCESS_MASK access, - OBJECT_ATTRIBUTES *attr, ULONG flags ) +NTSTATUS WINE_SYSCALL NtCreateDebugObject( HANDLE *handle, ACCESS_MASK access, + OBJECT_ATTRIBUTES *attr, ULONG flags ) { NTSTATUS ret; data_size_t len; @@ -976,8 +976,8 @@ NTSTATUS WINAPI NtCreateDebugObject( HANDLE *handle, ACCESS_MASK access, /********************************************************************** * NtSetInformationDebugObject (NTDLL.@) */ -NTSTATUS WINAPI NtSetInformationDebugObject( HANDLE handle, DEBUGOBJECTINFOCLASS class, - void *info, ULONG len, ULONG *ret_len ) +NTSTATUS WINE_SYSCALL NtSetInformationDebugObject( HANDLE handle, DEBUGOBJECTINFOCLASS class, + void *info, ULONG len, ULONG *ret_len ) { NTSTATUS ret; ULONG flags; @@ -1073,8 +1073,8 @@ static NTSTATUS event_data_to_state_change( const debug_event_t *data, DBGUI_WAI /********************************************************************** * NtWaitForDebugEvent (NTDLL.@) */ -NTSTATUS WINAPI NtWaitForDebugEvent( HANDLE handle, BOOLEAN alertable, LARGE_INTEGER *timeout, - DBGUI_WAIT_STATE_CHANGE *state ) +NTSTATUS WINE_SYSCALL NtWaitForDebugEvent( HANDLE handle, BOOLEAN alertable, LARGE_INTEGER *timeout, + DBGUI_WAIT_STATE_CHANGE *state ) { debug_event_t data; NTSTATUS ret; @@ -1108,7 +1108,7 @@ NTSTATUS WINAPI NtWaitForDebugEvent( HANDLE handle, BOOLEAN alertable, LARGE_INT /************************************************************************** * NtCreateDirectoryObject (NTDLL.@) */ -NTSTATUS WINAPI NtCreateDirectoryObject( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr ) +NTSTATUS WINE_SYSCALL NtCreateDirectoryObject( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr ) { NTSTATUS ret; data_size_t len; @@ -1133,7 +1133,7 @@ NTSTATUS WINAPI NtCreateDirectoryObject( HANDLE *handle, ACCESS_MASK access, OBJ /************************************************************************** * NtOpenDirectoryObject (NTDLL.@) */ -NTSTATUS WINAPI NtOpenDirectoryObject( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) +NTSTATUS WINE_SYSCALL NtOpenDirectoryObject( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) { NTSTATUS ret; @@ -1158,9 +1158,9 @@ NTSTATUS WINAPI NtOpenDirectoryObject( HANDLE *handle, ACCESS_MASK access, const /************************************************************************** * NtQueryDirectoryObject (NTDLL.@) */ -NTSTATUS WINAPI NtQueryDirectoryObject( HANDLE handle, DIRECTORY_BASIC_INFORMATION *buffer, - ULONG size, BOOLEAN single_entry, BOOLEAN restart, - ULONG *context, ULONG *ret_size ) +NTSTATUS WINE_SYSCALL NtQueryDirectoryObject( HANDLE handle, DIRECTORY_BASIC_INFORMATION *buffer, + ULONG size, BOOLEAN single_entry, BOOLEAN restart, + ULONG *context, ULONG *ret_size ) { NTSTATUS ret; @@ -1207,8 +1207,8 @@ NTSTATUS WINAPI NtQueryDirectoryObject( HANDLE handle, DIRECTORY_BASIC_INFORMATI /************************************************************************** * NtCreateSymbolicLinkObject (NTDLL.@) */ -NTSTATUS WINAPI NtCreateSymbolicLinkObject( HANDLE *handle, ACCESS_MASK access, - OBJECT_ATTRIBUTES *attr, UNICODE_STRING *target ) +NTSTATUS WINE_SYSCALL NtCreateSymbolicLinkObject( HANDLE *handle, ACCESS_MASK access, + OBJECT_ATTRIBUTES *attr, UNICODE_STRING *target ) { NTSTATUS ret; data_size_t len; @@ -1236,8 +1236,8 @@ NTSTATUS WINAPI NtCreateSymbolicLinkObject( HANDLE *handle, ACCESS_MASK access, /************************************************************************** * NtOpenSymbolicLinkObject (NTDLL.@) */ -NTSTATUS WINAPI NtOpenSymbolicLinkObject( HANDLE *handle, ACCESS_MASK access, - const OBJECT_ATTRIBUTES *attr ) +NTSTATUS WINE_SYSCALL NtOpenSymbolicLinkObject( HANDLE *handle, ACCESS_MASK access, + const OBJECT_ATTRIBUTES *attr ) { NTSTATUS ret; @@ -1262,7 +1262,7 @@ NTSTATUS WINAPI NtOpenSymbolicLinkObject( HANDLE *handle, ACCESS_MASK access, /************************************************************************** * NtQuerySymbolicLinkObject (NTDLL.@) */ -NTSTATUS WINAPI NtQuerySymbolicLinkObject( HANDLE handle, UNICODE_STRING *target, ULONG *length ) +NTSTATUS WINE_SYSCALL NtQuerySymbolicLinkObject( HANDLE handle, UNICODE_STRING *target, ULONG *length ) { NTSTATUS ret; @@ -1289,7 +1289,7 @@ NTSTATUS WINAPI NtQuerySymbolicLinkObject( HANDLE handle, UNICODE_STRING *target /************************************************************************** * NtMakeTemporaryObject (NTDLL.@) */ -NTSTATUS WINAPI NtMakeTemporaryObject( HANDLE handle ) +NTSTATUS WINE_SYSCALL NtMakeTemporaryObject( HANDLE handle ) { NTSTATUS ret; @@ -1308,8 +1308,8 @@ NTSTATUS WINAPI NtMakeTemporaryObject( HANDLE handle ) /************************************************************************** * NtCreateTimer (NTDLL.@) */ -NTSTATUS WINAPI NtCreateTimer( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, - TIMER_TYPE type ) +NTSTATUS WINE_SYSCALL NtCreateTimer( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, + TIMER_TYPE type ) { NTSTATUS ret; data_size_t len; @@ -1338,7 +1338,7 @@ NTSTATUS WINAPI NtCreateTimer( HANDLE *handle, ACCESS_MASK access, const OBJECT_ /************************************************************************** * NtOpenTimer (NTDLL.@) */ -NTSTATUS WINAPI NtOpenTimer( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) +NTSTATUS WINE_SYSCALL NtOpenTimer( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) { NTSTATUS ret; @@ -1363,8 +1363,8 @@ NTSTATUS WINAPI NtOpenTimer( HANDLE *handle, ACCESS_MASK access, const OBJECT_AT /************************************************************************** * NtSetTimer (NTDLL.@) */ -NTSTATUS WINAPI NtSetTimer( HANDLE handle, const LARGE_INTEGER *when, PTIMER_APC_ROUTINE callback, - void *arg, BOOLEAN resume, ULONG period, BOOLEAN *state ) +NTSTATUS WINE_SYSCALL NtSetTimer( HANDLE handle, const LARGE_INTEGER *when, PTIMER_APC_ROUTINE callback, + void *arg, BOOLEAN resume, ULONG period, BOOLEAN *state ) { NTSTATUS ret = STATUS_SUCCESS; @@ -1391,7 +1391,7 @@ NTSTATUS WINAPI NtSetTimer( HANDLE handle, const LARGE_INTEGER *when, PTIMER_APC /************************************************************************** * NtCancelTimer (NTDLL.@) */ -NTSTATUS WINAPI NtCancelTimer( HANDLE handle, BOOLEAN *state ) +NTSTATUS WINE_SYSCALL NtCancelTimer( HANDLE handle, BOOLEAN *state ) { NTSTATUS ret; @@ -1409,8 +1409,8 @@ NTSTATUS WINAPI NtCancelTimer( HANDLE handle, BOOLEAN *state ) /****************************************************************************** * NtQueryTimer (NTDLL.@) */ -NTSTATUS WINAPI NtQueryTimer( HANDLE handle, TIMER_INFORMATION_CLASS class, - void *info, ULONG len, ULONG *ret_len ) +NTSTATUS WINE_SYSCALL NtQueryTimer( HANDLE handle, TIMER_INFORMATION_CLASS class, + void *info, ULONG len, ULONG *ret_len ) { TIMER_BASIC_INFORMATION *basic_info = info; NTSTATUS ret; @@ -1458,8 +1458,8 @@ NTSTATUS WINAPI NtQueryTimer( HANDLE handle, TIMER_INFORMATION_CLASS class, /****************************************************************** * NtWaitForMultipleObjects (NTDLL.@) */ -NTSTATUS WINAPI NtWaitForMultipleObjects( DWORD count, const HANDLE *handles, BOOLEAN wait_any, - BOOLEAN alertable, const LARGE_INTEGER *timeout ) +NTSTATUS WINE_SYSCALL NtWaitForMultipleObjects( DWORD count, const HANDLE *handles, BOOLEAN wait_any, + BOOLEAN alertable, const LARGE_INTEGER *timeout ) { select_op_t select_op; UINT i, flags = SELECT_INTERRUPTIBLE; @@ -1476,7 +1476,7 @@ NTSTATUS WINAPI NtWaitForMultipleObjects( DWORD count, const HANDLE *handles, BO /****************************************************************** * NtWaitForSingleObject (NTDLL.@) */ -NTSTATUS WINAPI NtWaitForSingleObject( HANDLE handle, BOOLEAN alertable, const LARGE_INTEGER *timeout ) +NTSTATUS WINE_SYSCALL NtWaitForSingleObject( HANDLE handle, BOOLEAN alertable, const LARGE_INTEGER *timeout ) { return NtWaitForMultipleObjects( 1, &handle, FALSE, alertable, timeout ); } @@ -1485,8 +1485,8 @@ NTSTATUS WINAPI NtWaitForSingleObject( HANDLE handle, BOOLEAN alertable, const L /****************************************************************** * NtSignalAndWaitForSingleObject (NTDLL.@) */ -NTSTATUS WINAPI NtSignalAndWaitForSingleObject( HANDLE signal, HANDLE wait, - BOOLEAN alertable, const LARGE_INTEGER *timeout ) +NTSTATUS WINE_SYSCALL NtSignalAndWaitForSingleObject( HANDLE signal, HANDLE wait, + BOOLEAN alertable, const LARGE_INTEGER *timeout ) { select_op_t select_op; UINT flags = SELECT_INTERRUPTIBLE; @@ -1504,7 +1504,7 @@ NTSTATUS WINAPI NtSignalAndWaitForSingleObject( HANDLE signal, HANDLE wait, /****************************************************************** * NtYieldExecution (NTDLL.@) */ -NTSTATUS WINAPI NtYieldExecution(void) +NTSTATUS WINE_SYSCALL NtYieldExecution(void) { #ifdef HAVE_SCHED_YIELD sched_yield(); @@ -1518,7 +1518,7 @@ NTSTATUS WINAPI NtYieldExecution(void) /****************************************************************** * NtDelayExecution (NTDLL.@) */ -NTSTATUS WINAPI NtDelayExecution( BOOLEAN alertable, const LARGE_INTEGER *timeout ) +NTSTATUS WINE_SYSCALL NtDelayExecution( BOOLEAN alertable, const LARGE_INTEGER *timeout ) { /* if alertable, we need to query the server */ if (alertable) return server_wait( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, timeout ); @@ -1560,7 +1560,7 @@ NTSTATUS WINAPI NtDelayExecution( BOOLEAN alertable, const LARGE_INTEGER *timeou /****************************************************************************** * NtQueryPerformanceCounter (NTDLL.@) */ -NTSTATUS WINAPI NtQueryPerformanceCounter( LARGE_INTEGER *counter, LARGE_INTEGER *frequency ) +NTSTATUS WINE_SYSCALL NtQueryPerformanceCounter( LARGE_INTEGER *counter, LARGE_INTEGER *frequency ) { counter->QuadPart = monotonic_counter(); if (frequency) frequency->QuadPart = TICKSPERSEC; @@ -1571,7 +1571,7 @@ NTSTATUS WINAPI NtQueryPerformanceCounter( LARGE_INTEGER *counter, LARGE_INTEGER /*********************************************************************** * NtQuerySystemTime (NTDLL.@) */ -NTSTATUS WINAPI NtQuerySystemTime( LARGE_INTEGER *time ) +NTSTATUS WINE_SYSCALL NtQuerySystemTime( LARGE_INTEGER *time ) { #ifdef HAVE_CLOCK_GETTIME struct timespec ts; @@ -1609,7 +1609,7 @@ NTSTATUS WINAPI NtQuerySystemTime( LARGE_INTEGER *time ) /*********************************************************************** * NtSetSystemTime (NTDLL.@) */ -NTSTATUS WINAPI NtSetSystemTime( const LARGE_INTEGER *new, LARGE_INTEGER *old ) +NTSTATUS WINE_SYSCALL NtSetSystemTime( const LARGE_INTEGER *new, LARGE_INTEGER *old ) { LARGE_INTEGER now; LONGLONG diff; @@ -1626,7 +1626,7 @@ NTSTATUS WINAPI NtSetSystemTime( const LARGE_INTEGER *new, LARGE_INTEGER *old ) /*********************************************************************** * NtQueryTimerResolution (NTDLL.@) */ -NTSTATUS WINAPI NtQueryTimerResolution( ULONG *min_res, ULONG *max_res, ULONG *current_res ) +NTSTATUS WINE_SYSCALL NtQueryTimerResolution( ULONG *min_res, ULONG *max_res, ULONG *current_res ) { TRACE( "(%p,%p,%p)\n", min_res, max_res, current_res ); *max_res = *current_res = 10000; /* See NtSetTimerResolution() */ @@ -1638,7 +1638,7 @@ NTSTATUS WINAPI NtQueryTimerResolution( ULONG *min_res, ULONG *max_res, ULONG *c /*********************************************************************** * NtSetTimerResolution (NTDLL.@) */ -NTSTATUS WINAPI NtSetTimerResolution( ULONG res, BOOLEAN set, ULONG *current_res ) +NTSTATUS WINE_SYSCALL NtSetTimerResolution( ULONG res, BOOLEAN set, ULONG *current_res ) { static BOOL has_request = FALSE; @@ -1666,7 +1666,7 @@ NTSTATUS WINAPI NtSetTimerResolution( ULONG res, BOOLEAN set, ULONG *current_res /****************************************************************************** * NtSetIntervalProfile (NTDLL.@) */ -NTSTATUS WINAPI NtSetIntervalProfile( ULONG interval, KPROFILE_SOURCE source ) +NTSTATUS WINE_SYSCALL NtSetIntervalProfile( ULONG interval, KPROFILE_SOURCE source ) { FIXME( "%u,%d\n", interval, source ); return STATUS_SUCCESS; @@ -1676,7 +1676,7 @@ NTSTATUS WINAPI NtSetIntervalProfile( ULONG interval, KPROFILE_SOURCE source ) /****************************************************************************** * NtGetTickCount (NTDLL.@) */ -ULONG WINAPI NtGetTickCount(void) +ULONG WINE_SYSCALL NtGetTickCount(void) { /* note: we ignore TickCountMultiplier */ return user_shared_data->u.TickCount.LowPart; @@ -1703,8 +1703,8 @@ LONGLONG WINAPI RtlGetSystemTimePrecise(void) /****************************************************************************** * NtCreateKeyedEvent (NTDLL.@) */ -NTSTATUS WINAPI NtCreateKeyedEvent( HANDLE *handle, ACCESS_MASK access, - const OBJECT_ATTRIBUTES *attr, ULONG flags ) +NTSTATUS WINE_SYSCALL NtCreateKeyedEvent( HANDLE *handle, ACCESS_MASK access, + const OBJECT_ATTRIBUTES *attr, ULONG flags ) { NTSTATUS ret; data_size_t len; @@ -1730,7 +1730,7 @@ NTSTATUS WINAPI NtCreateKeyedEvent( HANDLE *handle, ACCESS_MASK access, /****************************************************************************** * NtOpenKeyedEvent (NTDLL.@) */ -NTSTATUS WINAPI NtOpenKeyedEvent( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) +NTSTATUS WINE_SYSCALL NtOpenKeyedEvent( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) { NTSTATUS ret; @@ -1754,8 +1754,8 @@ NTSTATUS WINAPI NtOpenKeyedEvent( HANDLE *handle, ACCESS_MASK access, const OBJE /****************************************************************************** * NtWaitForKeyedEvent (NTDLL.@) */ -NTSTATUS WINAPI NtWaitForKeyedEvent( HANDLE handle, const void *key, - BOOLEAN alertable, const LARGE_INTEGER *timeout ) +NTSTATUS WINE_SYSCALL NtWaitForKeyedEvent( HANDLE handle, const void *key, + BOOLEAN alertable, const LARGE_INTEGER *timeout ) { select_op_t select_op; UINT flags = SELECT_INTERRUPTIBLE; @@ -1773,8 +1773,8 @@ NTSTATUS WINAPI NtWaitForKeyedEvent( HANDLE handle, const void *key, /****************************************************************************** * NtReleaseKeyedEvent (NTDLL.@) */ -NTSTATUS WINAPI NtReleaseKeyedEvent( HANDLE handle, const void *key, - BOOLEAN alertable, const LARGE_INTEGER *timeout ) +NTSTATUS WINE_SYSCALL NtReleaseKeyedEvent( HANDLE handle, const void *key, + BOOLEAN alertable, const LARGE_INTEGER *timeout ) { select_op_t select_op; UINT flags = SELECT_INTERRUPTIBLE; @@ -1792,8 +1792,8 @@ NTSTATUS WINAPI NtReleaseKeyedEvent( HANDLE handle, const void *key, /*********************************************************************** * NtCreateIoCompletion (NTDLL.@) */ -NTSTATUS WINAPI NtCreateIoCompletion( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, - ULONG threads ) +NTSTATUS WINE_SYSCALL NtCreateIoCompletion( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, + ULONG threads ) { NTSTATUS status; data_size_t len; @@ -1821,7 +1821,7 @@ NTSTATUS WINAPI NtCreateIoCompletion( HANDLE *handle, ACCESS_MASK access, OBJECT /*********************************************************************** * NtOpenIoCompletion (NTDLL.@) */ -NTSTATUS WINAPI NtOpenIoCompletion( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) +NTSTATUS WINE_SYSCALL NtOpenIoCompletion( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) { NTSTATUS status; @@ -1846,8 +1846,8 @@ NTSTATUS WINAPI NtOpenIoCompletion( HANDLE *handle, ACCESS_MASK access, const OB /*********************************************************************** * NtSetIoCompletion (NTDLL.@) */ -NTSTATUS WINAPI NtSetIoCompletion( HANDLE handle, ULONG_PTR key, ULONG_PTR value, - NTSTATUS status, SIZE_T count ) +NTSTATUS WINE_SYSCALL NtSetIoCompletion( HANDLE handle, ULONG_PTR key, ULONG_PTR value, + NTSTATUS status, SIZE_T count ) { NTSTATUS ret; @@ -1870,8 +1870,8 @@ NTSTATUS WINAPI NtSetIoCompletion( HANDLE handle, ULONG_PTR key, ULONG_PTR value /*********************************************************************** * NtRemoveIoCompletion (NTDLL.@) */ -NTSTATUS WINAPI NtRemoveIoCompletion( HANDLE handle, ULONG_PTR *key, ULONG_PTR *value, - IO_STATUS_BLOCK *io, LARGE_INTEGER *timeout ) +NTSTATUS WINE_SYSCALL NtRemoveIoCompletion( HANDLE handle, ULONG_PTR *key, ULONG_PTR *value, + IO_STATUS_BLOCK *io, LARGE_INTEGER *timeout ) { NTSTATUS status; @@ -1901,8 +1901,8 @@ NTSTATUS WINAPI NtRemoveIoCompletion( HANDLE handle, ULONG_PTR *key, ULONG_PTR * /*********************************************************************** * NtRemoveIoCompletionEx (NTDLL.@) */ -NTSTATUS WINAPI NtRemoveIoCompletionEx( HANDLE handle, FILE_IO_COMPLETION_INFORMATION *info, ULONG count, - ULONG *written, LARGE_INTEGER *timeout, BOOLEAN alertable ) +NTSTATUS WINE_SYSCALL NtRemoveIoCompletionEx( HANDLE handle, FILE_IO_COMPLETION_INFORMATION *info, ULONG count, + ULONG *written, LARGE_INTEGER *timeout, BOOLEAN alertable ) { NTSTATUS status; ULONG i = 0; @@ -1944,8 +1944,8 @@ NTSTATUS WINAPI NtRemoveIoCompletionEx( HANDLE handle, FILE_IO_COMPLETION_INFORM /*********************************************************************** * NtQueryIoCompletion (NTDLL.@) */ -NTSTATUS WINAPI NtQueryIoCompletion( HANDLE handle, IO_COMPLETION_INFORMATION_CLASS class, - void *buffer, ULONG len, ULONG *ret_len ) +NTSTATUS WINE_SYSCALL NtQueryIoCompletion( HANDLE handle, IO_COMPLETION_INFORMATION_CLASS class, + void *buffer, ULONG len, ULONG *ret_len ) { NTSTATUS status; @@ -1981,9 +1981,9 @@ NTSTATUS WINAPI NtQueryIoCompletion( HANDLE handle, IO_COMPLETION_INFORMATION_CL /*********************************************************************** * NtCreateSection (NTDLL.@) */ -NTSTATUS WINAPI NtCreateSection( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, - const LARGE_INTEGER *size, ULONG protect, - ULONG sec_flags, HANDLE file ) +NTSTATUS WINE_SYSCALL NtCreateSection( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, + const LARGE_INTEGER *size, ULONG protect, + ULONG sec_flags, HANDLE file ) { NTSTATUS ret; unsigned int file_access; @@ -2036,7 +2036,7 @@ NTSTATUS WINAPI NtCreateSection( HANDLE *handle, ACCESS_MASK access, const OBJEC /*********************************************************************** * NtOpenSection (NTDLL.@) */ -NTSTATUS WINAPI NtOpenSection( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) +NTSTATUS WINE_SYSCALL NtOpenSection( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) { NTSTATUS ret; @@ -2061,8 +2061,8 @@ NTSTATUS WINAPI NtOpenSection( HANDLE *handle, ACCESS_MASK access, const OBJECT_ /*********************************************************************** * NtCreatePort (NTDLL.@) */ -NTSTATUS WINAPI NtCreatePort( HANDLE *handle, OBJECT_ATTRIBUTES *attr, ULONG info_len, - ULONG data_len, ULONG *reserved ) +NTSTATUS WINE_SYSCALL NtCreatePort( HANDLE *handle, OBJECT_ATTRIBUTES *attr, ULONG info_len, + ULONG data_len, ULONG *reserved ) { FIXME( "(%p,%p,%u,%u,%p),stub!\n", handle, attr, info_len, data_len, reserved ); return STATUS_NOT_IMPLEMENTED; @@ -2072,9 +2072,9 @@ NTSTATUS WINAPI NtCreatePort( HANDLE *handle, OBJECT_ATTRIBUTES *attr, ULONG inf /*********************************************************************** * NtConnectPort (NTDLL.@) */ -NTSTATUS WINAPI NtConnectPort( HANDLE *handle, UNICODE_STRING *name, SECURITY_QUALITY_OF_SERVICE *qos, - LPC_SECTION_WRITE *write, LPC_SECTION_READ *read, ULONG *max_len, - void *info, ULONG *info_len ) +NTSTATUS WINE_SYSCALL NtConnectPort( HANDLE *handle, UNICODE_STRING *name, SECURITY_QUALITY_OF_SERVICE *qos, + LPC_SECTION_WRITE *write, LPC_SECTION_READ *read, ULONG *max_len, + void *info, ULONG *info_len ) { FIXME( "(%p,%s,%p,%p,%p,%p,%p,%p),stub!\n", handle, debugstr_us(name), qos, write, read, max_len, info, info_len ); @@ -2086,9 +2086,9 @@ NTSTATUS WINAPI NtConnectPort( HANDLE *handle, UNICODE_STRING *name, SECURITY_QU /*********************************************************************** * NtSecureConnectPort (NTDLL.@) */ -NTSTATUS WINAPI NtSecureConnectPort( HANDLE *handle, UNICODE_STRING *name, SECURITY_QUALITY_OF_SERVICE *qos, - LPC_SECTION_WRITE *write, PSID sid, LPC_SECTION_READ *read, - ULONG *max_len, void *info, ULONG *info_len ) +NTSTATUS WINE_SYSCALL NtSecureConnectPort( HANDLE *handle, UNICODE_STRING *name, SECURITY_QUALITY_OF_SERVICE *qos, + LPC_SECTION_WRITE *write, PSID sid, LPC_SECTION_READ *read, + ULONG *max_len, void *info, ULONG *info_len ) { FIXME( "(%p,%s,%p,%p,%p,%p,%p,%p,%p),stub!\n", handle, debugstr_us(name), qos, write, sid, read, max_len, info, info_len ); @@ -2099,7 +2099,7 @@ NTSTATUS WINAPI NtSecureConnectPort( HANDLE *handle, UNICODE_STRING *name, SECUR /*********************************************************************** * NtListenPort (NTDLL.@) */ -NTSTATUS WINAPI NtListenPort( HANDLE handle, LPC_MESSAGE *msg ) +NTSTATUS WINE_SYSCALL NtListenPort( HANDLE handle, LPC_MESSAGE *msg ) { FIXME("(%p,%p),stub!\n", handle, msg ); return STATUS_NOT_IMPLEMENTED; @@ -2109,8 +2109,8 @@ NTSTATUS WINAPI NtListenPort( HANDLE handle, LPC_MESSAGE *msg ) /*********************************************************************** * NtAcceptConnectPort (NTDLL.@) */ -NTSTATUS WINAPI NtAcceptConnectPort( HANDLE *handle, ULONG id, LPC_MESSAGE *msg, BOOLEAN accept, - LPC_SECTION_WRITE *write, LPC_SECTION_READ *read ) +NTSTATUS WINE_SYSCALL NtAcceptConnectPort( HANDLE *handle, ULONG id, LPC_MESSAGE *msg, BOOLEAN accept, + LPC_SECTION_WRITE *write, LPC_SECTION_READ *read ) { FIXME("(%p,%u,%p,%d,%p,%p),stub!\n", handle, id, msg, accept, write, read ); return STATUS_NOT_IMPLEMENTED; @@ -2120,7 +2120,7 @@ NTSTATUS WINAPI NtAcceptConnectPort( HANDLE *handle, ULONG id, LPC_MESSAGE *msg, /*********************************************************************** * NtCompleteConnectPort (NTDLL.@) */ -NTSTATUS WINAPI NtCompleteConnectPort( HANDLE handle ) +NTSTATUS WINE_SYSCALL NtCompleteConnectPort( HANDLE handle ) { FIXME( "(%p),stub!\n", handle ); return STATUS_NOT_IMPLEMENTED; @@ -2130,7 +2130,7 @@ NTSTATUS WINAPI NtCompleteConnectPort( HANDLE handle ) /*********************************************************************** * NtRegisterThreadTerminatePort (NTDLL.@) */ -NTSTATUS WINAPI NtRegisterThreadTerminatePort( HANDLE handle ) +NTSTATUS WINE_SYSCALL NtRegisterThreadTerminatePort( HANDLE handle ) { FIXME( "(%p),stub!\n", handle ); return STATUS_NOT_IMPLEMENTED; @@ -2140,7 +2140,7 @@ NTSTATUS WINAPI NtRegisterThreadTerminatePort( HANDLE handle ) /*********************************************************************** * NtRequestWaitReplyPort (NTDLL.@) */ -NTSTATUS WINAPI NtRequestWaitReplyPort( HANDLE handle, LPC_MESSAGE *msg_in, LPC_MESSAGE *msg_out ) +NTSTATUS WINE_SYSCALL NtRequestWaitReplyPort( HANDLE handle, LPC_MESSAGE *msg_in, LPC_MESSAGE *msg_out ) { FIXME( "(%p,%p,%p),stub!\n", handle, msg_in, msg_out ); if (msg_in) @@ -2155,7 +2155,7 @@ NTSTATUS WINAPI NtRequestWaitReplyPort( HANDLE handle, LPC_MESSAGE *msg_in, LPC_ /*********************************************************************** * NtReplyWaitReceivePort (NTDLL.@) */ -NTSTATUS WINAPI NtReplyWaitReceivePort( HANDLE handle, ULONG *id, LPC_MESSAGE *reply, LPC_MESSAGE *msg ) +NTSTATUS WINE_SYSCALL NtReplyWaitReceivePort( HANDLE handle, ULONG *id, LPC_MESSAGE *reply, LPC_MESSAGE *msg ) { FIXME("(%p,%p,%p,%p),stub!\n", handle, id, reply, msg ); return STATUS_NOT_IMPLEMENTED; @@ -2212,7 +2212,7 @@ static ULONG integral_atom_name( WCHAR *buffer, ULONG len, RTL_ATOM atom ) /*********************************************************************** * NtAddAtom (NTDLL.@) */ -NTSTATUS WINAPI NtAddAtom( const WCHAR *name, ULONG length, RTL_ATOM *atom ) +NTSTATUS WINE_SYSCALL NtAddAtom( const WCHAR *name, ULONG length, RTL_ATOM *atom ) { NTSTATUS status = is_integral_atom( name, length / sizeof(WCHAR), atom ); @@ -2234,7 +2234,7 @@ NTSTATUS WINAPI NtAddAtom( const WCHAR *name, ULONG length, RTL_ATOM *atom ) /*********************************************************************** * NtDeleteAtom (NTDLL.@) */ -NTSTATUS WINAPI NtDeleteAtom( RTL_ATOM atom ) +NTSTATUS WINE_SYSCALL NtDeleteAtom( RTL_ATOM atom ) { NTSTATUS status; @@ -2251,7 +2251,7 @@ NTSTATUS WINAPI NtDeleteAtom( RTL_ATOM atom ) /*********************************************************************** * NtFindAtom (NTDLL.@) */ -NTSTATUS WINAPI NtFindAtom( const WCHAR *name, ULONG length, RTL_ATOM *atom ) +NTSTATUS WINE_SYSCALL NtFindAtom( const WCHAR *name, ULONG length, RTL_ATOM *atom ) { NTSTATUS status = is_integral_atom( name, length / sizeof(WCHAR), atom ); @@ -2273,8 +2273,8 @@ NTSTATUS WINAPI NtFindAtom( const WCHAR *name, ULONG length, RTL_ATOM *atom ) /*********************************************************************** * NtQueryInformationAtom (NTDLL.@) */ -NTSTATUS WINAPI NtQueryInformationAtom( RTL_ATOM atom, ATOM_INFORMATION_CLASS class, - void *ptr, ULONG size, ULONG *retsize ) +NTSTATUS WINE_SYSCALL NtQueryInformationAtom( RTL_ATOM atom, ATOM_INFORMATION_CLASS class, + void *ptr, ULONG size, ULONG *retsize ) { NTSTATUS status; diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 82c9f0da492..deafdd01073 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2359,8 +2359,8 @@ static void read_dev_urandom( void *buf, ULONG len ) /****************************************************************************** * NtQuerySystemInformation (NTDLL.@) */ -NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, - void *info, ULONG size, ULONG *ret_size ) +NTSTATUS WINE_SYSCALL NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, + void *info, ULONG size, ULONG *ret_size ) { NTSTATUS ret = STATUS_SUCCESS; ULONG len = 0; @@ -3121,9 +3121,9 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, /****************************************************************************** * NtQuerySystemInformationEx (NTDLL.@) */ -NTSTATUS WINAPI NtQuerySystemInformationEx( SYSTEM_INFORMATION_CLASS class, - void *query, ULONG query_len, - void *info, ULONG size, ULONG *ret_size ) +NTSTATUS WINE_SYSCALL NtQuerySystemInformationEx( SYSTEM_INFORMATION_CLASS class, + void *query, ULONG query_len, + void *info, ULONG size, ULONG *ret_size ) { ULONG len = 0; NTSTATUS ret = STATUS_NOT_IMPLEMENTED; @@ -3237,7 +3237,7 @@ NTSTATUS WINAPI NtQuerySystemInformationEx( SYSTEM_INFORMATION_CLASS class, /****************************************************************************** * NtSetSystemInformation (NTDLL.@) */ -NTSTATUS WINAPI NtSetSystemInformation( SYSTEM_INFORMATION_CLASS class, void *info, ULONG length ) +NTSTATUS WINE_SYSCALL NtSetSystemInformation( SYSTEM_INFORMATION_CLASS class, void *info, ULONG length ) { FIXME( "(0x%08x,%p,0x%08x) stub\n", class, info, length ); return STATUS_SUCCESS; @@ -3247,8 +3247,8 @@ NTSTATUS WINAPI NtSetSystemInformation( SYSTEM_INFORMATION_CLASS class, void *in /****************************************************************************** * NtQuerySystemEnvironmentValue (NTDLL.@) */ -NTSTATUS WINAPI NtQuerySystemEnvironmentValue( UNICODE_STRING *name, WCHAR *buffer, ULONG length, - ULONG *retlen ) +NTSTATUS WINE_SYSCALL NtQuerySystemEnvironmentValue( UNICODE_STRING *name, WCHAR *buffer, ULONG length, + ULONG *retlen ) { FIXME( "(%s, %p, %u, %p), stub\n", debugstr_us(name), buffer, length, retlen ); return STATUS_NOT_IMPLEMENTED; @@ -3258,8 +3258,8 @@ NTSTATUS WINAPI NtQuerySystemEnvironmentValue( UNICODE_STRING *name, WCHAR *buff /****************************************************************************** * NtQuerySystemEnvironmentValueEx (NTDLL.@) */ -NTSTATUS WINAPI NtQuerySystemEnvironmentValueEx( UNICODE_STRING *name, GUID *vendor, void *buffer, - ULONG *retlen, ULONG *attrib ) +NTSTATUS WINE_SYSCALL NtQuerySystemEnvironmentValueEx( UNICODE_STRING *name, GUID *vendor, void *buffer, + ULONG *retlen, ULONG *attrib ) { FIXME( "(%s, %s, %p, %p, %p), stub\n", debugstr_us(name), debugstr_guid(vendor), buffer, retlen, attrib ); @@ -3270,8 +3270,8 @@ NTSTATUS WINAPI NtQuerySystemEnvironmentValueEx( UNICODE_STRING *name, GUID *ven /****************************************************************************** * NtSystemDebugControl (NTDLL.@) */ -NTSTATUS WINAPI NtSystemDebugControl( SYSDBG_COMMAND command, void *in_buff, ULONG in_len, - void *out_buff, ULONG out_len, ULONG *retlen ) +NTSTATUS WINE_SYSCALL NtSystemDebugControl( SYSDBG_COMMAND command, void *in_buff, ULONG in_len, + void *out_buff, ULONG out_len, ULONG *retlen ) { FIXME( "(%d, %p, %d, %p, %d, %p), stub\n", command, in_buff, in_len, out_buff, out_len, retlen ); return STATUS_NOT_IMPLEMENTED; @@ -3281,7 +3281,7 @@ NTSTATUS WINAPI NtSystemDebugControl( SYSDBG_COMMAND command, void *in_buff, ULO /****************************************************************************** * NtShutdownSystem (NTDLL.@) */ -NTSTATUS WINAPI NtShutdownSystem( SHUTDOWN_ACTION action ) +NTSTATUS WINE_SYSCALL NtShutdownSystem( SHUTDOWN_ACTION action ) { FIXME( "%d\n", action ); return STATUS_SUCCESS; @@ -3451,8 +3451,8 @@ static NTSTATUS fill_battery_state( SYSTEM_BATTERY_STATE *bs ) /****************************************************************************** * NtPowerInformation (NTDLL.@) */ -NTSTATUS WINAPI NtPowerInformation( POWER_INFORMATION_LEVEL level, void *input, ULONG in_size, - void *output, ULONG out_size ) +NTSTATUS WINE_SYSCALL NtPowerInformation( POWER_INFORMATION_LEVEL level, void *input, ULONG in_size, + void *output, ULONG out_size ) { TRACE( "(%d,%p,%d,%p,%d)\n", level, input, in_size, output, out_size ); switch (level) @@ -3637,7 +3637,7 @@ NTSTATUS WINAPI NtPowerInformation( POWER_INFORMATION_LEVEL level, void *input, /****************************************************************************** * NtLoadDriver (NTDLL.@) */ -NTSTATUS WINAPI NtLoadDriver( const UNICODE_STRING *name ) +NTSTATUS WINE_SYSCALL NtLoadDriver( const UNICODE_STRING *name ) { FIXME( "(%s), stub!\n", debugstr_us(name) ); return STATUS_NOT_IMPLEMENTED; @@ -3647,7 +3647,7 @@ NTSTATUS WINAPI NtLoadDriver( const UNICODE_STRING *name ) /****************************************************************************** * NtUnloadDriver (NTDLL.@) */ -NTSTATUS WINAPI NtUnloadDriver( const UNICODE_STRING *name ) +NTSTATUS WINE_SYSCALL NtUnloadDriver( const UNICODE_STRING *name ) { FIXME( "(%s), stub!\n", debugstr_us(name) ); return STATUS_NOT_IMPLEMENTED; @@ -3657,7 +3657,7 @@ NTSTATUS WINAPI NtUnloadDriver( const UNICODE_STRING *name ) /****************************************************************************** * NtDisplayString (NTDLL.@) */ -NTSTATUS WINAPI NtDisplayString( UNICODE_STRING *string ) +NTSTATUS WINE_SYSCALL NtDisplayString( UNICODE_STRING *string ) { ERR( "%s\n", debugstr_us(string) ); return STATUS_SUCCESS; @@ -3667,9 +3667,9 @@ NTSTATUS WINAPI NtDisplayString( UNICODE_STRING *string ) /****************************************************************************** * NtRaiseHardError (NTDLL.@) */ -NTSTATUS WINAPI NtRaiseHardError( NTSTATUS status, ULONG count, - UNICODE_STRING *params_mask, void **params, - HARDERROR_RESPONSE_OPTION option, HARDERROR_RESPONSE *response ) +NTSTATUS WINE_SYSCALL NtRaiseHardError( NTSTATUS status, ULONG count, + UNICODE_STRING *params_mask, void **params, + HARDERROR_RESPONSE_OPTION option, HARDERROR_RESPONSE *response ) { FIXME( "%08x stub\n", status ); return STATUS_NOT_IMPLEMENTED; @@ -3679,7 +3679,7 @@ NTSTATUS WINAPI NtRaiseHardError( NTSTATUS status, ULONG count, /****************************************************************************** * NtInitiatePowerAction (NTDLL.@) */ -NTSTATUS WINAPI NtInitiatePowerAction( POWER_ACTION action, SYSTEM_POWER_STATE state, +NTSTATUS WINE_SYSCALL NtInitiatePowerAction( POWER_ACTION action, SYSTEM_POWER_STATE state, ULONG flags, BOOLEAN async ) { FIXME( "(%d,%d,0x%08x,%d),stub\n", action, state, flags, async ); @@ -3690,7 +3690,7 @@ NTSTATUS WINAPI NtInitiatePowerAction( POWER_ACTION action, SYSTEM_POWER_STATE s /****************************************************************************** * NtSetThreadExecutionState (NTDLL.@) */ -NTSTATUS WINAPI NtSetThreadExecutionState( EXECUTION_STATE new_state, EXECUTION_STATE *old_state ) +NTSTATUS WINE_SYSCALL NtSetThreadExecutionState( EXECUTION_STATE new_state, EXECUTION_STATE *old_state ) { static EXECUTION_STATE current = ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED | ES_USER_PRESENT; diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index e88a935ca31..622a7e57454 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1235,9 +1235,9 @@ static void update_attr_list( PS_ATTRIBUTE_LIST *attr, const CLIENT_ID *id, TEB /*********************************************************************** * NtCreateThread (NTDLL.@) */ -NTSTATUS WINAPI NtCreateThread( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, - HANDLE process, CLIENT_ID *id, CONTEXT *ctx, INITIAL_TEB *teb, - BOOLEAN suspended ) +NTSTATUS WINE_SYSCALL NtCreateThread( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, + HANDLE process, CLIENT_ID *id, CONTEXT *ctx, INITIAL_TEB *teb, + BOOLEAN suspended ) { FIXME( "%p %d %p %p %p %p %p %d, stub!\n", handle, access, attr, process, id, ctx, teb, suspended ); return STATUS_NOT_IMPLEMENTED; @@ -1246,10 +1246,10 @@ NTSTATUS WINAPI NtCreateThread( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRI /*********************************************************************** * NtCreateThreadEx (NTDLL.@) */ -NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, - HANDLE process, PRTL_THREAD_START_ROUTINE start, void *param, - ULONG flags, ULONG_PTR zero_bits, SIZE_T stack_commit, - SIZE_T stack_reserve, PS_ATTRIBUTE_LIST *attr_list ) +NTSTATUS WINE_SYSCALL NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, + HANDLE process, PRTL_THREAD_START_ROUTINE start, void *param, + ULONG flags, ULONG_PTR zero_bits, SIZE_T stack_commit, + SIZE_T stack_reserve, PS_ATTRIBUTE_LIST *attr_list ) { sigset_t sigset; pthread_t pthread_id; @@ -1508,7 +1508,7 @@ NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_c /******************************************************************* * NtRaiseException (NTDLL.@) */ -NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance ) +NTSTATUS WINE_SYSCALL NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance ) { NTSTATUS status = send_debug_event( rec, context, first_chance ); @@ -1533,8 +1533,8 @@ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL /*********************************************************************** * NtOpenThread (NTDLL.@) */ -NTSTATUS WINAPI NtOpenThread( HANDLE *handle, ACCESS_MASK access, - const OBJECT_ATTRIBUTES *attr, const CLIENT_ID *id ) +NTSTATUS WINE_SYSCALL NtOpenThread( HANDLE *handle, ACCESS_MASK access, + const OBJECT_ATTRIBUTES *attr, const CLIENT_ID *id ) { NTSTATUS ret; @@ -1556,7 +1556,7 @@ NTSTATUS WINAPI NtOpenThread( HANDLE *handle, ACCESS_MASK access, /****************************************************************************** * NtSuspendThread (NTDLL.@) */ -NTSTATUS WINAPI NtSuspendThread( HANDLE handle, ULONG *count ) +NTSTATUS WINE_SYSCALL NtSuspendThread( HANDLE handle, ULONG *count ) { NTSTATUS ret; @@ -1576,7 +1576,7 @@ NTSTATUS WINAPI NtSuspendThread( HANDLE handle, ULONG *count ) /****************************************************************************** * NtResumeThread (NTDLL.@) */ -NTSTATUS WINAPI NtResumeThread( HANDLE handle, ULONG *count ) +NTSTATUS WINE_SYSCALL NtResumeThread( HANDLE handle, ULONG *count ) { NTSTATUS ret; @@ -1596,7 +1596,7 @@ NTSTATUS WINAPI NtResumeThread( HANDLE handle, ULONG *count ) /****************************************************************************** * NtAlertResumeThread (NTDLL.@) */ -NTSTATUS WINAPI NtAlertResumeThread( HANDLE handle, ULONG *count ) +NTSTATUS WINE_SYSCALL NtAlertResumeThread( HANDLE handle, ULONG *count ) { FIXME( "stub: should alert thread %p\n", handle ); return NtResumeThread( handle, count ); @@ -1606,7 +1606,7 @@ NTSTATUS WINAPI NtAlertResumeThread( HANDLE handle, ULONG *count ) /****************************************************************************** * NtAlertThread (NTDLL.@) */ -NTSTATUS WINAPI NtAlertThread( HANDLE handle ) +NTSTATUS WINE_SYSCALL NtAlertThread( HANDLE handle ) { FIXME( "stub: %p\n", handle ); return STATUS_NOT_IMPLEMENTED; @@ -1616,7 +1616,7 @@ NTSTATUS WINAPI NtAlertThread( HANDLE handle ) /****************************************************************************** * NtTerminateThread (NTDLL.@) */ -NTSTATUS WINAPI NtTerminateThread( HANDLE handle, LONG exit_code ) +NTSTATUS WINE_SYSCALL NtTerminateThread( HANDLE handle, LONG exit_code ) { NTSTATUS ret; BOOL self = (handle == GetCurrentThread()); @@ -1640,8 +1640,8 @@ NTSTATUS WINAPI NtTerminateThread( HANDLE handle, LONG exit_code ) /****************************************************************************** * NtQueueApcThread (NTDLL.@) */ -NTSTATUS WINAPI NtQueueApcThread( HANDLE handle, PNTAPCFUNC func, ULONG_PTR arg1, - ULONG_PTR arg2, ULONG_PTR arg3 ) +NTSTATUS WINE_SYSCALL NtQueueApcThread( HANDLE handle, PNTAPCFUNC func, ULONG_PTR arg1, + ULONG_PTR arg2, ULONG_PTR arg3 ) { NTSTATUS ret; @@ -1845,8 +1845,8 @@ static BOOL is_process_wow64( const CLIENT_ID *id ) /****************************************************************************** * NtQueryInformationThread (NTDLL.@) */ -NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, - void *data, ULONG length, ULONG *ret_len ) +NTSTATUS WINE_SYSCALL NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, + void *data, ULONG length, ULONG *ret_len ) { NTSTATUS status; @@ -2102,8 +2102,8 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, /****************************************************************************** * NtSetInformationThread (NTDLL.@) */ -NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, - const void *data, ULONG length ) +NTSTATUS WINE_SYSCALL NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, + const void *data, ULONG length ) { NTSTATUS status; @@ -2276,7 +2276,7 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, /****************************************************************************** * NtGetCurrentProcessorNumber (NTDLL.@) */ -ULONG WINAPI NtGetCurrentProcessorNumber(void) +ULONG WINE_SYSCALL NtGetCurrentProcessorNumber(void) { ULONG processor; @@ -2313,8 +2313,8 @@ ULONG WINAPI NtGetCurrentProcessorNumber(void) /****************************************************************************** * NtGetNextThread (NTDLL.@) */ -NTSTATUS WINAPI NtGetNextThread( HANDLE process, HANDLE thread, ACCESS_MASK access, ULONG attributes, - ULONG flags, HANDLE *handle ) +NTSTATUS WINE_SYSCALL NtGetNextThread( HANDLE process, HANDLE thread, ACCESS_MASK access, ULONG attributes, + ULONG flags, HANDLE *handle ) { HANDLE ret_handle = 0; NTSTATUS ret; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 984af2d4a21..f3f38007682 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3734,8 +3734,8 @@ void virtual_set_large_address_space(void) * NtAllocateVirtualMemory (NTDLL.@) * ZwAllocateVirtualMemory (NTDLL.@) */ -NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG_PTR zero_bits, - SIZE_T *size_ptr, ULONG type, ULONG protect ) +NTSTATUS WINE_SYSCALL NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG_PTR zero_bits, + SIZE_T *size_ptr, ULONG type, ULONG protect ) { void *base; unsigned int vprot; @@ -3872,9 +3872,9 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG_PTR z * NtAllocateVirtualMemoryEx (NTDLL.@) * ZwAllocateVirtualMemoryEx (NTDLL.@) */ -NTSTATUS WINAPI NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *size_ptr, ULONG type, - ULONG protect, MEM_EXTENDED_PARAMETER *parameters, - ULONG count ) +NTSTATUS WINE_SYSCALL NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *size_ptr, ULONG type, + ULONG protect, MEM_EXTENDED_PARAMETER *parameters, + ULONG count ) { if (count && !parameters) return STATUS_INVALID_PARAMETER; @@ -3888,7 +3888,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *s * NtFreeVirtualMemory (NTDLL.@) * ZwFreeVirtualMemory (NTDLL.@) */ -NTSTATUS WINAPI NtFreeVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *size_ptr, ULONG type ) +NTSTATUS WINE_SYSCALL NtFreeVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *size_ptr, ULONG type ) { struct file_view *view; char *base; @@ -3975,8 +3975,8 @@ NTSTATUS WINAPI NtFreeVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *si * NtProtectVirtualMemory (NTDLL.@) * ZwProtectVirtualMemory (NTDLL.@) */ -NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *size_ptr, - ULONG new_prot, ULONG *old_prot ) +NTSTATUS WINE_SYSCALL NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *size_ptr, + ULONG new_prot, ULONG *old_prot ) { struct file_view *view; sigset_t sigset; @@ -4309,9 +4309,9 @@ static NTSTATUS get_memory_section_name( HANDLE process, LPCVOID addr, * NtQueryVirtualMemory (NTDLL.@) * ZwQueryVirtualMemory (NTDLL.@) */ -NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, - MEMORY_INFORMATION_CLASS info_class, - PVOID buffer, SIZE_T len, SIZE_T *res_len ) +NTSTATUS WINE_SYSCALL NtQueryVirtualMemory( HANDLE process, LPCVOID addr, + MEMORY_INFORMATION_CLASS info_class, + PVOID buffer, SIZE_T len, SIZE_T *res_len ) { NTSTATUS status; @@ -4355,7 +4355,7 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, * NtLockVirtualMemory (NTDLL.@) * ZwLockVirtualMemory (NTDLL.@) */ -NTSTATUS WINAPI NtLockVirtualMemory( HANDLE process, PVOID *addr, SIZE_T *size, ULONG unknown ) +NTSTATUS WINE_SYSCALL NtLockVirtualMemory( HANDLE process, PVOID *addr, SIZE_T *size, ULONG unknown ) { NTSTATUS status = STATUS_SUCCESS; @@ -4392,7 +4392,7 @@ NTSTATUS WINAPI NtLockVirtualMemory( HANDLE process, PVOID *addr, SIZE_T *size, * NtUnlockVirtualMemory (NTDLL.@) * ZwUnlockVirtualMemory (NTDLL.@) */ -NTSTATUS WINAPI NtUnlockVirtualMemory( HANDLE process, PVOID *addr, SIZE_T *size, ULONG unknown ) +NTSTATUS WINE_SYSCALL NtUnlockVirtualMemory( HANDLE process, PVOID *addr, SIZE_T *size, ULONG unknown ) { NTSTATUS status = STATUS_SUCCESS; @@ -4429,9 +4429,9 @@ NTSTATUS WINAPI NtUnlockVirtualMemory( HANDLE process, PVOID *addr, SIZE_T *size * NtMapViewOfSection (NTDLL.@) * ZwMapViewOfSection (NTDLL.@) */ -NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_ptr, ULONG_PTR zero_bits, - SIZE_T commit_size, const LARGE_INTEGER *offset_ptr, SIZE_T *size_ptr, - SECTION_INHERIT inherit, ULONG alloc_type, ULONG protect ) +NTSTATUS WINE_SYSCALL NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_ptr, ULONG_PTR zero_bits, + SIZE_T commit_size, const LARGE_INTEGER *offset_ptr, SIZE_T *size_ptr, + SECTION_INHERIT inherit, ULONG alloc_type, ULONG protect ) { NTSTATUS res; SIZE_T mask = granularity_mask; @@ -4504,7 +4504,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p * NtUnmapViewOfSection (NTDLL.@) * ZwUnmapViewOfSection (NTDLL.@) */ -NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr ) +NTSTATUS WINE_SYSCALL NtUnmapViewOfSection( HANDLE process, PVOID addr ) { struct file_view *view; NTSTATUS status = STATUS_NOT_MAPPED_VIEW; @@ -4600,8 +4600,8 @@ void virtual_fill_image_information( const pe_image_info_t *pe_info, SECTION_IMA * NtQuerySection (NTDLL.@) * ZwQuerySection (NTDLL.@) */ -NTSTATUS WINAPI NtQuerySection( HANDLE handle, SECTION_INFORMATION_CLASS class, void *ptr, - SIZE_T size, SIZE_T *ret_size ) +NTSTATUS WINE_SYSCALL NtQuerySection( HANDLE handle, SECTION_INFORMATION_CLASS class, void *ptr, + SIZE_T size, SIZE_T *ret_size ) { NTSTATUS status; pe_image_info_t image_info; @@ -4654,8 +4654,8 @@ NTSTATUS WINAPI NtQuerySection( HANDLE handle, SECTION_INFORMATION_CLASS class, * NtFlushVirtualMemory (NTDLL.@) * ZwFlushVirtualMemory (NTDLL.@) */ -NTSTATUS WINAPI NtFlushVirtualMemory( HANDLE process, LPCVOID *addr_ptr, - SIZE_T *size_ptr, ULONG unknown ) +NTSTATUS WINE_SYSCALL NtFlushVirtualMemory( HANDLE process, LPCVOID *addr_ptr, + SIZE_T *size_ptr, ULONG unknown ) { struct file_view *view; NTSTATUS status = STATUS_SUCCESS; @@ -4702,8 +4702,8 @@ NTSTATUS WINAPI NtFlushVirtualMemory( HANDLE process, LPCVOID *addr_ptr, * NtGetWriteWatch (NTDLL.@) * ZwGetWriteWatch (NTDLL.@) */ -NTSTATUS WINAPI NtGetWriteWatch( HANDLE process, ULONG flags, PVOID base, SIZE_T size, PVOID *addresses, - ULONG_PTR *count, ULONG *granularity ) +NTSTATUS WINE_SYSCALL NtGetWriteWatch( HANDLE process, ULONG flags, PVOID base, SIZE_T size, PVOID *addresses, + ULONG_PTR *count, ULONG *granularity ) { NTSTATUS status = STATUS_SUCCESS; sigset_t sigset; @@ -4748,7 +4748,7 @@ NTSTATUS WINAPI NtGetWriteWatch( HANDLE process, ULONG flags, PVOID base, SIZE_T * NtResetWriteWatch (NTDLL.@) * ZwResetWriteWatch (NTDLL.@) */ -NTSTATUS WINAPI NtResetWriteWatch( HANDLE process, PVOID base, SIZE_T size ) +NTSTATUS WINE_SYSCALL NtResetWriteWatch( HANDLE process, PVOID base, SIZE_T size ) { NTSTATUS status = STATUS_SUCCESS; sigset_t sigset; @@ -4776,8 +4776,8 @@ NTSTATUS WINAPI NtResetWriteWatch( HANDLE process, PVOID base, SIZE_T size ) * NtReadVirtualMemory (NTDLL.@) * ZwReadVirtualMemory (NTDLL.@) */ -NTSTATUS WINAPI NtReadVirtualMemory( HANDLE process, const void *addr, void *buffer, - SIZE_T size, SIZE_T *bytes_read ) +NTSTATUS WINE_SYSCALL NtReadVirtualMemory( HANDLE process, const void *addr, void *buffer, + SIZE_T size, SIZE_T *bytes_read ) { NTSTATUS status; @@ -4806,8 +4806,8 @@ NTSTATUS WINAPI NtReadVirtualMemory( HANDLE process, const void *addr, void *buf * NtWriteVirtualMemory (NTDLL.@) * ZwWriteVirtualMemory (NTDLL.@) */ -NTSTATUS WINAPI NtWriteVirtualMemory( HANDLE process, void *addr, const void *buffer, - SIZE_T size, SIZE_T *bytes_written ) +NTSTATUS WINE_SYSCALL NtWriteVirtualMemory( HANDLE process, void *addr, const void *buffer, + SIZE_T size, SIZE_T *bytes_written ) { NTSTATUS status; @@ -4836,7 +4836,7 @@ NTSTATUS WINAPI NtWriteVirtualMemory( HANDLE process, void *addr, const void *bu * NtAreMappedFilesTheSame (NTDLL.@) * ZwAreMappedFilesTheSame (NTDLL.@) */ -NTSTATUS WINAPI NtAreMappedFilesTheSame(PVOID addr1, PVOID addr2) +NTSTATUS WINE_SYSCALL NtAreMappedFilesTheSame(PVOID addr1, PVOID addr2) { struct file_view *view1, *view2; NTSTATUS status; @@ -4876,7 +4876,7 @@ NTSTATUS WINAPI NtAreMappedFilesTheSame(PVOID addr1, PVOID addr2) /********************************************************************** * NtFlushInstructionCache (NTDLL.@) */ -NTSTATUS WINAPI NtFlushInstructionCache( HANDLE handle, const void *addr, SIZE_T size ) +NTSTATUS WINE_SYSCALL NtFlushInstructionCache( HANDLE handle, const void *addr, SIZE_T size ) { #if defined(__x86_64__) || defined(__i386__) /* no-op */ @@ -4901,7 +4901,7 @@ NTSTATUS WINAPI NtFlushInstructionCache( HANDLE handle, const void *addr, SIZE_T /********************************************************************** * NtFlushProcessWriteBuffers (NTDLL.@) */ -void WINAPI NtFlushProcessWriteBuffers(void) +void WINE_SYSCALL NtFlushProcessWriteBuffers(void) { static int once = 0; if (!once++) FIXME( "stub\n" ); @@ -4911,8 +4911,8 @@ void WINAPI NtFlushProcessWriteBuffers(void) /********************************************************************** * NtCreatePagingFile (NTDLL.@) */ -NTSTATUS WINAPI NtCreatePagingFile( UNICODE_STRING *name, LARGE_INTEGER *min_size, - LARGE_INTEGER *max_size, LARGE_INTEGER *actual_size ) +NTSTATUS WINE_SYSCALL NtCreatePagingFile( UNICODE_STRING *name, LARGE_INTEGER *min_size, + LARGE_INTEGER *max_size, LARGE_INTEGER *actual_size ) { FIXME( "(%s %p %p %p) stub\n", debugstr_us(name), min_size, max_size, actual_size ); return STATUS_SUCCESS; @@ -4924,8 +4924,8 @@ NTSTATUS WINAPI NtCreatePagingFile( UNICODE_STRING *name, LARGE_INTEGER *min_siz * NtWow64AllocateVirtualMemory64 (NTDLL.@) * ZwWow64AllocateVirtualMemory64 (NTDLL.@) */ -NTSTATUS WINAPI NtWow64AllocateVirtualMemory64( HANDLE process, ULONG64 *ret, ULONG64 zero_bits, - ULONG64 *size_ptr, ULONG type, ULONG protect ) +NTSTATUS WINE_SYSCALL NtWow64AllocateVirtualMemory64( HANDLE process, ULONG64 *ret, ULONG64 zero_bits, + ULONG64 *size_ptr, ULONG type, ULONG protect ) { void *base; SIZE_T size; @@ -4980,8 +4980,8 @@ NTSTATUS WINAPI NtWow64AllocateVirtualMemory64( HANDLE process, ULONG64 *ret, UL * NtWow64ReadVirtualMemory64 (NTDLL.@) * ZwWow64ReadVirtualMemory64 (NTDLL.@) */ -NTSTATUS WINAPI NtWow64ReadVirtualMemory64( HANDLE process, ULONG64 addr, void *buffer, - ULONG64 size, ULONG64 *bytes_read ) +NTSTATUS WINE_SYSCALL NtWow64ReadVirtualMemory64( HANDLE process, ULONG64 addr, void *buffer, + ULONG64 size, ULONG64 *bytes_read ) { NTSTATUS status; @@ -5012,8 +5012,8 @@ NTSTATUS WINAPI NtWow64ReadVirtualMemory64( HANDLE process, ULONG64 addr, void * * NtWow64WriteVirtualMemory64 (NTDLL.@) * ZwWow64WriteVirtualMemory64 (NTDLL.@) */ -NTSTATUS WINAPI NtWow64WriteVirtualMemory64( HANDLE process, ULONG64 addr, const void *buffer, - ULONG64 size, ULONG64 *bytes_written ) +NTSTATUS WINE_SYSCALL NtWow64WriteVirtualMemory64( HANDLE process, ULONG64 addr, const void *buffer, + ULONG64 size, ULONG64 *bytes_written ) { NTSTATUS status; @@ -5044,8 +5044,8 @@ NTSTATUS WINAPI NtWow64WriteVirtualMemory64( HANDLE process, ULONG64 addr, const * NtWow64GetNativeSystemInformation (NTDLL.@) * ZwWow64GetNativeSystemInformation (NTDLL.@) */ -NTSTATUS WINAPI NtWow64GetNativeSystemInformation( SYSTEM_INFORMATION_CLASS class, void *info, - ULONG len, ULONG *retlen ) +NTSTATUS WINE_SYSCALL NtWow64GetNativeSystemInformation( SYSTEM_INFORMATION_CLASS class, void *info, + ULONG len, ULONG *retlen ) { switch (class) { diff --git a/include/wine/debug.h b/include/wine/debug.h index 6aac7fe82e8..2255f62e502 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -143,7 +143,6 @@ struct __wine_debug_channel #endif /* !__GNUC__ && !__SUNPRO_C */ -extern int WINAPI __wine_dbg_write( const char *str, unsigned int len ); extern unsigned char __cdecl __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ); extern const char * __cdecl __wine_dbg_strdup( const char *str ); extern int __cdecl __wine_dbg_output( const char *str ); diff --git a/include/wine/server.h b/include/wine/server.h index 57bcdbbb00d..9cb2a469cce 100644 --- a/include/wine/server.h +++ b/include/wine/server.h @@ -49,9 +49,9 @@ struct __server_request_info struct __server_iovec data[__SERVER_MAX_DATA]; /* request variable size data */ }; -extern unsigned int CDECL wine_server_call( void *req_ptr ); -extern int CDECL wine_server_fd_to_handle( int fd, unsigned int access, unsigned int attributes, HANDLE *handle ); -extern int CDECL wine_server_handle_to_fd( HANDLE handle, unsigned int access, int *unix_fd, unsigned int *options ); +extern unsigned int WINE_SYSCALL_CDECL wine_server_call( void *req_ptr ); +extern int WINE_SYSCALL_CDECL wine_server_fd_to_handle( int fd, unsigned int access, unsigned int attributes, HANDLE *handle ); +extern int WINE_SYSCALL_CDECL wine_server_handle_to_fd( HANDLE handle, unsigned int access, int *unix_fd, unsigned int *options ); /* do a server call and set the last error code */ static inline unsigned int wine_server_call_err( void *req_ptr ) diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index 072401a0714..2406a6df032 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -24,7 +24,7 @@ typedef NTSTATUS (*unixlib_entry_t)( void *args ); typedef UINT64 unixlib_handle_t; -extern NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ); +extern NTSTATUS WINE_SYSCALL __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ); /* some useful helpers from ntdll */ extern DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ); diff --git a/include/winternl.h b/include/winternl.h index 9e96591ad8e..aee57cbef33 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3755,6 +3755,14 @@ typedef struct * Function declarations */ +#if defined(WINE_UNIX_LIB) && defined(_NTSYSTEM_) +#define WINE_SYSCALL +#define WINE_SYSCALL_CDECL +#else +#define WINE_SYSCALL WINAPI +#define WINE_SYSCALL_CDECL CDECL +#endif + NTSYSAPI void WINAPI DbgBreakPoint(void); NTSYSAPI NTSTATUS WINAPIV DbgPrint(LPCSTR fmt, ...); NTSYSAPI NTSTATUS WINAPIV DbgPrintEx(ULONG iComponentId, ULONG Level, LPCSTR fmt, ...); @@ -3794,264 +3802,264 @@ NTSYSAPI void WINAPI LdrShutdownThread(void); NTSYSAPI NTSTATUS WINAPI LdrUnloadDll(HMODULE); NTSYSAPI NTSTATUS WINAPI LdrUnlockLoaderLock(ULONG,ULONG_PTR); NTSYSAPI NTSTATUS WINAPI LdrUnregisterDllNotification(void*); -NTSYSAPI NTSTATUS WINAPI NtAcceptConnectPort(PHANDLE,ULONG,PLPC_MESSAGE,BOOLEAN,PLPC_SECTION_WRITE,PLPC_SECTION_READ); -NTSYSAPI NTSTATUS WINAPI NtAccessCheck(PSECURITY_DESCRIPTOR,HANDLE,ACCESS_MASK,PGENERIC_MAPPING,PPRIVILEGE_SET,PULONG,PULONG,NTSTATUS*); -NTSYSAPI NTSTATUS WINAPI NtAccessCheckAndAuditAlarm(PUNICODE_STRING,HANDLE,PUNICODE_STRING,PUNICODE_STRING,PSECURITY_DESCRIPTOR,ACCESS_MASK,PGENERIC_MAPPING,BOOLEAN,PACCESS_MASK,PBOOLEAN,PBOOLEAN); -NTSYSAPI NTSTATUS WINAPI NtAddAtom(const WCHAR*,ULONG,RTL_ATOM*); -NTSYSAPI NTSTATUS WINAPI NtAdjustGroupsToken(HANDLE,BOOLEAN,PTOKEN_GROUPS,ULONG,PTOKEN_GROUPS,PULONG); -NTSYSAPI NTSTATUS WINAPI NtAdjustPrivilegesToken(HANDLE,BOOLEAN,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD); -NTSYSAPI NTSTATUS WINAPI NtAlertResumeThread(HANDLE,PULONG); -NTSYSAPI NTSTATUS WINAPI NtAlertThread(HANDLE ThreadHandle); -NTSYSAPI NTSTATUS WINAPI NtAllocateLocallyUniqueId(PLUID lpLuid); -NTSYSAPI NTSTATUS WINAPI NtAllocateUuids(PULARGE_INTEGER,PULONG,PULONG,PUCHAR); -NTSYSAPI NTSTATUS WINAPI NtAllocateVirtualMemory(HANDLE,PVOID*,ULONG_PTR,SIZE_T*,ULONG,ULONG); -NTSYSAPI NTSTATUS WINAPI NtAllocateVirtualMemoryEx(HANDLE,PVOID*,SIZE_T*,ULONG,ULONG,MEM_EXTENDED_PARAMETER*,ULONG); -NTSYSAPI NTSTATUS WINAPI NtAreMappedFilesTheSame(PVOID,PVOID); -NTSYSAPI NTSTATUS WINAPI NtAssignProcessToJobObject(HANDLE,HANDLE); -NTSYSAPI NTSTATUS WINAPI NtCallbackReturn(PVOID,ULONG,NTSTATUS); -NTSYSAPI NTSTATUS WINAPI NtCancelIoFile(HANDLE,PIO_STATUS_BLOCK); -NTSYSAPI NTSTATUS WINAPI NtCancelIoFileEx(HANDLE,PIO_STATUS_BLOCK,PIO_STATUS_BLOCK); -NTSYSAPI NTSTATUS WINAPI NtCancelTimer(HANDLE, BOOLEAN*); -NTSYSAPI NTSTATUS WINAPI NtClearEvent(HANDLE); -NTSYSAPI NTSTATUS WINAPI NtClose(HANDLE); -NTSYSAPI NTSTATUS WINAPI NtCloseObjectAuditAlarm(PUNICODE_STRING,HANDLE,BOOLEAN); -NTSYSAPI NTSTATUS WINAPI NtCompleteConnectPort(HANDLE); -NTSYSAPI NTSTATUS WINAPI NtConnectPort(PHANDLE,PUNICODE_STRING,PSECURITY_QUALITY_OF_SERVICE,PLPC_SECTION_WRITE,PLPC_SECTION_READ,PULONG,PVOID,PULONG); -NTSYSAPI NTSTATUS WINAPI NtContinue(PCONTEXT,BOOLEAN); -NTSYSAPI NTSTATUS WINAPI NtCreateDebugObject(HANDLE*,ACCESS_MASK,OBJECT_ATTRIBUTES*,ULONG); -NTSYSAPI NTSTATUS WINAPI NtCreateDirectoryObject(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES); -NTSYSAPI NTSTATUS WINAPI NtCreateEvent(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES *,EVENT_TYPE,BOOLEAN); -NTSYSAPI NTSTATUS WINAPI NtCreateEventPair(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES); -NTSYSAPI NTSTATUS WINAPI NtCreateFile(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,PLARGE_INTEGER,ULONG,ULONG,ULONG,ULONG,PVOID,ULONG); -NTSYSAPI NTSTATUS WINAPI NtCreateIoCompletion(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,ULONG); -NTSYSAPI NTSTATUS WINAPI NtCreateJobObject(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); -NTSYSAPI NTSTATUS WINAPI NtCreateKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG,const UNICODE_STRING*,ULONG,PULONG); -NTSYSAPI NTSTATUS WINAPI NtCreateKeyTransacted(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG,const UNICODE_STRING*,ULONG,HANDLE,ULONG*); -NTSYSAPI NTSTATUS WINAPI NtCreateKeyedEvent(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG); -NTSYSAPI NTSTATUS WINAPI NtCreateLowBoxToken(HANDLE*,HANDLE,ACCESS_MASK,OBJECT_ATTRIBUTES*,SID*,ULONG,SID_AND_ATTRIBUTES*,ULONG,HANDLE*); -NTSYSAPI NTSTATUS WINAPI NtCreateMailslotFile(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,ULONG,ULONG,ULONG,PLARGE_INTEGER); -NTSYSAPI NTSTATUS WINAPI NtCreateMutant(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*,BOOLEAN); -NTSYSAPI NTSTATUS WINAPI NtCreateNamedPipeFile(PHANDLE,ULONG,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,PLARGE_INTEGER); -NTSYSAPI NTSTATUS WINAPI NtCreatePagingFile(PUNICODE_STRING,PLARGE_INTEGER,PLARGE_INTEGER,PLARGE_INTEGER); -NTSYSAPI NTSTATUS WINAPI NtCreatePort(PHANDLE,POBJECT_ATTRIBUTES,ULONG,ULONG,PULONG); -NTSYSAPI NTSTATUS WINAPI NtCreateProcess(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,HANDLE,BOOLEAN,HANDLE,HANDLE,HANDLE); -NTSYSAPI NTSTATUS WINAPI NtCreateProfile(PHANDLE,HANDLE,PVOID,ULONG,ULONG,PVOID,ULONG,KPROFILE_SOURCE,KAFFINITY); -NTSYSAPI NTSTATUS WINAPI NtCreateSection(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*,const LARGE_INTEGER*,ULONG,ULONG,HANDLE); -NTSYSAPI NTSTATUS WINAPI NtCreateSemaphore(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,LONG,LONG); -NTSYSAPI NTSTATUS WINAPI NtCreateSymbolicLinkObject(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PUNICODE_STRING); -NTSYSAPI NTSTATUS WINAPI NtCreateThread(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,HANDLE,PCLIENT_ID,PCONTEXT,PINITIAL_TEB,BOOLEAN); -NTSYSAPI NTSTATUS WINAPI NtCreateThreadEx(HANDLE*,ACCESS_MASK,OBJECT_ATTRIBUTES*,HANDLE,PRTL_THREAD_START_ROUTINE,void*,ULONG,ULONG_PTR,SIZE_T,SIZE_T,PS_ATTRIBUTE_LIST*); -NTSYSAPI NTSTATUS WINAPI NtCreateTimer(HANDLE*, ACCESS_MASK, const OBJECT_ATTRIBUTES*, TIMER_TYPE); -NTSYSAPI NTSTATUS WINAPI NtCreateToken(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,TOKEN_TYPE,PLUID,PLARGE_INTEGER,PTOKEN_USER,PTOKEN_GROUPS,PTOKEN_PRIVILEGES,PTOKEN_OWNER,PTOKEN_PRIMARY_GROUP,PTOKEN_DEFAULT_DACL,PTOKEN_SOURCE); -NTSYSAPI NTSTATUS WINAPI NtCreateUserProcess(HANDLE*,HANDLE*,ACCESS_MASK,ACCESS_MASK,OBJECT_ATTRIBUTES*,OBJECT_ATTRIBUTES*,ULONG,ULONG,RTL_USER_PROCESS_PARAMETERS*,PS_CREATE_INFO*,PS_ATTRIBUTE_LIST*); -NTSYSAPI NTSTATUS WINAPI NtDebugActiveProcess(HANDLE,HANDLE); -NTSYSAPI NTSTATUS WINAPI NtDebugContinue(HANDLE,CLIENT_ID*,NTSTATUS); -NTSYSAPI NTSTATUS WINAPI NtDelayExecution(BOOLEAN,const LARGE_INTEGER*); -NTSYSAPI NTSTATUS WINAPI NtDeleteAtom(RTL_ATOM); -NTSYSAPI NTSTATUS WINAPI NtDeleteFile(POBJECT_ATTRIBUTES); -NTSYSAPI NTSTATUS WINAPI NtDeleteKey(HANDLE); -NTSYSAPI NTSTATUS WINAPI NtDeleteValueKey(HANDLE,const UNICODE_STRING *); -NTSYSAPI NTSTATUS WINAPI NtDeviceIoControlFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,PVOID,ULONG,PVOID,ULONG); -NTSYSAPI NTSTATUS WINAPI NtDisplayString(PUNICODE_STRING); -NTSYSAPI NTSTATUS WINAPI NtDuplicateObject(HANDLE,HANDLE,HANDLE,PHANDLE,ACCESS_MASK,ULONG,ULONG); -NTSYSAPI NTSTATUS WINAPI NtDuplicateToken(HANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,SECURITY_IMPERSONATION_LEVEL,TOKEN_TYPE,PHANDLE); -NTSYSAPI NTSTATUS WINAPI NtEnumerateKey(HANDLE,ULONG,KEY_INFORMATION_CLASS,void *,DWORD,DWORD *); -NTSYSAPI NTSTATUS WINAPI NtEnumerateValueKey(HANDLE,ULONG,KEY_VALUE_INFORMATION_CLASS,PVOID,ULONG,PULONG); -NTSYSAPI NTSTATUS WINAPI NtExtendSection(HANDLE,PLARGE_INTEGER); -NTSYSAPI NTSTATUS WINAPI NtFilterToken(HANDLE,ULONG,TOKEN_GROUPS*,TOKEN_PRIVILEGES*,TOKEN_GROUPS*,HANDLE*); -NTSYSAPI NTSTATUS WINAPI NtFindAtom(const WCHAR*,ULONG,RTL_ATOM*); -NTSYSAPI NTSTATUS WINAPI NtFlushBuffersFile(HANDLE,IO_STATUS_BLOCK*); -NTSYSAPI NTSTATUS WINAPI NtFlushInstructionCache(HANDLE,LPCVOID,SIZE_T); -NTSYSAPI NTSTATUS WINAPI NtFlushKey(HANDLE); -NTSYSAPI void WINAPI NtFlushProcessWriteBuffers(void); -NTSYSAPI NTSTATUS WINAPI NtFlushVirtualMemory(HANDLE,LPCVOID*,SIZE_T*,ULONG); -NTSYSAPI NTSTATUS WINAPI NtFlushWriteBuffer(VOID); -NTSYSAPI NTSTATUS WINAPI NtFreeVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG); -NTSYSAPI NTSTATUS WINAPI NtFsControlFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,PVOID,ULONG,PVOID,ULONG); -NTSYSAPI NTSTATUS WINAPI NtGetContextThread(HANDLE,CONTEXT*); -NTSYSAPI ULONG WINAPI NtGetCurrentProcessorNumber(void); -NTSYSAPI NTSTATUS WINAPI NtGetNextThread(HANDLE,HANDLE,ACCESS_MASK,ULONG,ULONG,HANDLE*); -NTSYSAPI NTSTATUS WINAPI NtGetNlsSectionPtr(ULONG,ULONG,void*,void**,SIZE_T*); -NTSYSAPI NTSTATUS WINAPI NtGetPlugPlayEvent(ULONG,ULONG,PVOID,ULONG); -NTSYSAPI ULONG WINAPI NtGetTickCount(VOID); -NTSYSAPI NTSTATUS WINAPI NtGetWriteWatch(HANDLE,ULONG,PVOID,SIZE_T,PVOID*,ULONG_PTR*,ULONG*); -NTSYSAPI NTSTATUS WINAPI NtImpersonateAnonymousToken(HANDLE); -NTSYSAPI NTSTATUS WINAPI NtImpersonateClientOfPort(HANDLE,PPORT_MESSAGE); -NTSYSAPI NTSTATUS WINAPI NtImpersonateThread(HANDLE,HANDLE,PSECURITY_QUALITY_OF_SERVICE); -NTSYSAPI NTSTATUS WINAPI NtInitializeRegistry(BOOLEAN); -NTSYSAPI NTSTATUS WINAPI NtInitiatePowerAction(POWER_ACTION,SYSTEM_POWER_STATE,ULONG,BOOLEAN); -NTSYSAPI NTSTATUS WINAPI NtIsProcessInJob(HANDLE,HANDLE); -NTSYSAPI NTSTATUS WINAPI NtListenPort(HANDLE,PLPC_MESSAGE); -NTSYSAPI NTSTATUS WINAPI NtLoadDriver(const UNICODE_STRING *); -NTSYSAPI NTSTATUS WINAPI NtLoadKey(const OBJECT_ATTRIBUTES *,OBJECT_ATTRIBUTES *); -NTSYSAPI NTSTATUS WINAPI NtLoadKey2(const OBJECT_ATTRIBUTES *,OBJECT_ATTRIBUTES *,ULONG); -NTSYSAPI NTSTATUS WINAPI NtLockFile(HANDLE,HANDLE,PIO_APC_ROUTINE,void*,PIO_STATUS_BLOCK,PLARGE_INTEGER,PLARGE_INTEGER,ULONG*,BOOLEAN,BOOLEAN); -NTSYSAPI NTSTATUS WINAPI NtLockVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG); -NTSYSAPI NTSTATUS WINAPI NtMakeTemporaryObject(HANDLE); -NTSYSAPI NTSTATUS WINAPI NtMapViewOfSection(HANDLE,HANDLE,PVOID*,ULONG_PTR,SIZE_T,const LARGE_INTEGER*,SIZE_T*,SECTION_INHERIT,ULONG,ULONG); -NTSYSAPI NTSTATUS WINAPI NtNotifyChangeDirectoryFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,PVOID,ULONG,ULONG,BOOLEAN); -NTSYSAPI NTSTATUS WINAPI NtNotifyChangeKey(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,BOOLEAN,PVOID,ULONG,BOOLEAN); -NTSYSAPI NTSTATUS WINAPI NtNotifyChangeMultipleKeys(HANDLE,ULONG,OBJECT_ATTRIBUTES*,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,BOOLEAN,PVOID,ULONG,BOOLEAN); -NTSYSAPI NTSTATUS WINAPI NtOpenDirectoryObject(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); -NTSYSAPI NTSTATUS WINAPI NtOpenEvent(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES *); -NTSYSAPI NTSTATUS WINAPI NtOpenEventPair(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); -NTSYSAPI NTSTATUS WINAPI NtOpenFile(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,ULONG,ULONG); -NTSYSAPI NTSTATUS WINAPI NtOpenIoCompletion(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); -NTSYSAPI NTSTATUS WINAPI NtOpenJobObject(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); -NTSYSAPI NTSTATUS WINAPI NtOpenKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES *); -NTSYSAPI NTSTATUS WINAPI NtOpenKeyEx(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG); -NTSYSAPI NTSTATUS WINAPI NtOpenKeyTransacted(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,HANDLE); -NTSYSAPI NTSTATUS WINAPI NtOpenKeyTransactedEx(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG,HANDLE); -NTSYSAPI NTSTATUS WINAPI NtOpenKeyedEvent(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*); -NTSYSAPI NTSTATUS WINAPI NtOpenMutant(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); -NTSYSAPI NTSTATUS WINAPI NtOpenObjectAuditAlarm(PUNICODE_STRING,PHANDLE,PUNICODE_STRING,PUNICODE_STRING,PSECURITY_DESCRIPTOR,HANDLE,ACCESS_MASK,ACCESS_MASK,PPRIVILEGE_SET,BOOLEAN,BOOLEAN,PBOOLEAN); -NTSYSAPI NTSTATUS WINAPI NtOpenProcess(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,const CLIENT_ID*); -NTSYSAPI NTSTATUS WINAPI NtOpenProcessToken(HANDLE,DWORD,HANDLE *); -NTSYSAPI NTSTATUS WINAPI NtOpenProcessTokenEx(HANDLE,DWORD,DWORD,HANDLE *); -NTSYSAPI NTSTATUS WINAPI NtOpenSection(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*); -NTSYSAPI NTSTATUS WINAPI NtOpenSemaphore(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); -NTSYSAPI NTSTATUS WINAPI NtOpenSymbolicLinkObject(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); -NTSYSAPI NTSTATUS WINAPI NtOpenThread(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*,const CLIENT_ID*); -NTSYSAPI NTSTATUS WINAPI NtOpenThreadToken(HANDLE,DWORD,BOOLEAN,HANDLE *); -NTSYSAPI NTSTATUS WINAPI NtOpenThreadTokenEx(HANDLE,DWORD,BOOLEAN,DWORD,HANDLE *); -NTSYSAPI NTSTATUS WINAPI NtOpenTimer(HANDLE*, ACCESS_MASK, const OBJECT_ATTRIBUTES*); -NTSYSAPI NTSTATUS WINAPI NtPowerInformation(POWER_INFORMATION_LEVEL,PVOID,ULONG,PVOID,ULONG); -NTSYSAPI NTSTATUS WINAPI NtPrivilegeCheck(HANDLE,PPRIVILEGE_SET,PBOOLEAN); -NTSYSAPI NTSTATUS WINAPI NtPrivilegeObjectAuditAlarm(PUNICODE_STRING,HANDLE,HANDLE,ULONG,PPRIVILEGE_SET,BOOLEAN); -NTSYSAPI NTSTATUS WINAPI NtPrivilegedServiceAuditAlarm(PUNICODE_STRING,PUNICODE_STRING,HANDLE,PPRIVILEGE_SET,BOOLEAN); -NTSYSAPI NTSTATUS WINAPI NtProtectVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG,ULONG*); -NTSYSAPI NTSTATUS WINAPI NtPulseEvent(HANDLE,LONG*); -NTSYSAPI NTSTATUS WINAPI NtQueueApcThread(HANDLE,PNTAPCFUNC,ULONG_PTR,ULONG_PTR,ULONG_PTR); -NTSYSAPI NTSTATUS WINAPI NtQueryAttributesFile(const OBJECT_ATTRIBUTES*,FILE_BASIC_INFORMATION*); -NTSYSAPI NTSTATUS WINAPI NtQueryDefaultLocale(BOOLEAN,LCID*); -NTSYSAPI NTSTATUS WINAPI NtQueryDefaultUILanguage(LANGID*); -NTSYSAPI NTSTATUS WINAPI NtQueryDirectoryFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,PVOID,ULONG,FILE_INFORMATION_CLASS,BOOLEAN,PUNICODE_STRING,BOOLEAN); -NTSYSAPI NTSTATUS WINAPI NtQueryDirectoryObject(HANDLE,PDIRECTORY_BASIC_INFORMATION,ULONG,BOOLEAN,BOOLEAN,PULONG,PULONG); -NTSYSAPI NTSTATUS WINAPI NtQueryEaFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,BOOLEAN,PVOID,ULONG,PULONG,BOOLEAN); -NTSYSAPI NTSTATUS WINAPI NtQueryEvent(HANDLE,EVENT_INFORMATION_CLASS,PVOID,ULONG,PULONG); -NTSYSAPI NTSTATUS WINAPI NtQueryFullAttributesFile(const OBJECT_ATTRIBUTES*,FILE_NETWORK_OPEN_INFORMATION*); -NTSYSAPI NTSTATUS WINAPI NtQueryInformationAtom(RTL_ATOM,ATOM_INFORMATION_CLASS,PVOID,ULONG,ULONG*); -NTSYSAPI NTSTATUS WINAPI NtQueryInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,LONG,FILE_INFORMATION_CLASS); -NTSYSAPI NTSTATUS WINAPI NtQueryInformationJobObject(HANDLE,JOBOBJECTINFOCLASS,PVOID,ULONG,PULONG); -NTSYSAPI NTSTATUS WINAPI NtQueryInformationPort(HANDLE,PORT_INFORMATION_CLASS,PVOID,ULONG,PULONG); -NTSYSAPI NTSTATUS WINAPI NtQueryInformationProcess(HANDLE,PROCESSINFOCLASS,PVOID,ULONG,PULONG); -NTSYSAPI NTSTATUS WINAPI NtQueryInformationThread(HANDLE,THREADINFOCLASS,PVOID,ULONG,PULONG); -NTSYSAPI NTSTATUS WINAPI NtQueryInformationToken(HANDLE,TOKEN_INFORMATION_CLASS,PVOID,ULONG,PULONG); -NTSYSAPI NTSTATUS WINAPI NtQueryInstallUILanguage(LANGID*); -NTSYSAPI NTSTATUS WINAPI NtQueryIntervalProfile(KPROFILE_SOURCE,PULONG); -NTSYSAPI NTSTATUS WINAPI NtQueryIoCompletion(HANDLE,IO_COMPLETION_INFORMATION_CLASS,PVOID,ULONG,PULONG); -NTSYSAPI NTSTATUS WINAPI NtQueryKey(HANDLE,KEY_INFORMATION_CLASS,void *,DWORD,DWORD *); -NTSYSAPI NTSTATUS WINAPI NtQueryMultipleValueKey(HANDLE,PKEY_MULTIPLE_VALUE_INFORMATION,ULONG,PVOID,ULONG,PULONG); -NTSYSAPI NTSTATUS WINAPI NtQueryMutant(HANDLE,MUTANT_INFORMATION_CLASS,PVOID,ULONG,PULONG); -NTSYSAPI NTSTATUS WINAPI NtQueryObject(HANDLE, OBJECT_INFORMATION_CLASS, PVOID, ULONG, PULONG); -NTSYSAPI NTSTATUS WINAPI NtQueryOpenSubKeys(POBJECT_ATTRIBUTES,PULONG); -NTSYSAPI NTSTATUS WINAPI NtQueryPerformanceCounter(PLARGE_INTEGER, PLARGE_INTEGER); -NTSYSAPI NTSTATUS WINAPI NtQuerySecurityObject(HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,ULONG,PULONG); -NTSYSAPI NTSTATUS WINAPI NtQuerySection(HANDLE,SECTION_INFORMATION_CLASS,PVOID,SIZE_T,SIZE_T*); -NTSYSAPI NTSTATUS WINAPI NtQuerySemaphore(HANDLE,SEMAPHORE_INFORMATION_CLASS,PVOID,ULONG,PULONG); -NTSYSAPI NTSTATUS WINAPI NtQuerySymbolicLinkObject(HANDLE,PUNICODE_STRING,PULONG); -NTSYSAPI NTSTATUS WINAPI NtQuerySystemEnvironmentValue(PUNICODE_STRING,PWCHAR,ULONG,PULONG); -NTSYSAPI NTSTATUS WINAPI NtQuerySystemEnvironmentValueEx(PUNICODE_STRING,GUID*,void*,ULONG*,ULONG*); -NTSYSAPI NTSTATUS WINAPI NtQuerySystemInformation(SYSTEM_INFORMATION_CLASS,PVOID,ULONG,PULONG); -NTSYSAPI NTSTATUS WINAPI NtQuerySystemInformationEx(SYSTEM_INFORMATION_CLASS,void*,ULONG,void*,ULONG,ULONG*); -NTSYSAPI NTSTATUS WINAPI NtQuerySystemTime(PLARGE_INTEGER); -NTSYSAPI NTSTATUS WINAPI NtQueryTimer(HANDLE,TIMER_INFORMATION_CLASS,PVOID,ULONG,PULONG); -NTSYSAPI NTSTATUS WINAPI NtQueryTimerResolution(PULONG,PULONG,PULONG); -NTSYSAPI NTSTATUS WINAPI NtQueryValueKey(HANDLE,const UNICODE_STRING *,KEY_VALUE_INFORMATION_CLASS,void *,DWORD,DWORD *); -NTSYSAPI NTSTATUS WINAPI NtQueryLicenseValue(const UNICODE_STRING *,ULONG *,PVOID,ULONG,ULONG *); -NTSYSAPI NTSTATUS WINAPI NtQueryVirtualMemory(HANDLE,LPCVOID,MEMORY_INFORMATION_CLASS,PVOID,SIZE_T,SIZE_T*); -NTSYSAPI NTSTATUS WINAPI NtQueryVolumeInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FS_INFORMATION_CLASS); -NTSYSAPI NTSTATUS WINAPI NtRaiseException(PEXCEPTION_RECORD,PCONTEXT,BOOL); -NTSYSAPI NTSTATUS WINAPI NtRaiseHardError(NTSTATUS,ULONG,PUNICODE_STRING,PVOID*,HARDERROR_RESPONSE_OPTION,PHARDERROR_RESPONSE); -NTSYSAPI NTSTATUS WINAPI NtReadFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,PVOID,ULONG,PLARGE_INTEGER,PULONG); -NTSYSAPI NTSTATUS WINAPI NtReadFileScatter(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,FILE_SEGMENT_ELEMENT*,ULONG,PLARGE_INTEGER,PULONG); -NTSYSAPI NTSTATUS WINAPI NtReadRequestData(HANDLE,PLPC_MESSAGE,ULONG,PVOID,ULONG,PULONG); -NTSYSAPI NTSTATUS WINAPI NtReadVirtualMemory(HANDLE,const void*,void*,SIZE_T,SIZE_T*); -NTSYSAPI NTSTATUS WINAPI NtRegisterThreadTerminatePort(HANDLE); -NTSYSAPI NTSTATUS WINAPI NtReleaseKeyedEvent(HANDLE,const void*,BOOLEAN,const LARGE_INTEGER*); -NTSYSAPI NTSTATUS WINAPI NtReleaseMutant(HANDLE,PLONG); -NTSYSAPI NTSTATUS WINAPI NtReleaseSemaphore(HANDLE,ULONG,PULONG); -NTSYSAPI NTSTATUS WINAPI NtRemoveIoCompletion(HANDLE,PULONG_PTR,PULONG_PTR,PIO_STATUS_BLOCK,PLARGE_INTEGER); -NTSYSAPI NTSTATUS WINAPI NtRemoveIoCompletionEx(HANDLE,FILE_IO_COMPLETION_INFORMATION*,ULONG,ULONG*,LARGE_INTEGER*,BOOLEAN); -NTSYSAPI NTSTATUS WINAPI NtRemoveProcessDebug(HANDLE,HANDLE); -NTSYSAPI NTSTATUS WINAPI NtRenameKey(HANDLE,UNICODE_STRING*); -NTSYSAPI NTSTATUS WINAPI NtReplaceKey(POBJECT_ATTRIBUTES,HANDLE,POBJECT_ATTRIBUTES); -NTSYSAPI NTSTATUS WINAPI NtReplyPort(HANDLE,PLPC_MESSAGE); -NTSYSAPI NTSTATUS WINAPI NtReplyWaitReceivePort(HANDLE,PULONG,PLPC_MESSAGE,PLPC_MESSAGE); -NTSYSAPI NTSTATUS WINAPI NtReplyWaitReceivePortEx(HANDLE,PVOID*,PPORT_MESSAGE,PPORT_MESSAGE,PLARGE_INTEGER); -NTSYSAPI NTSTATUS WINAPI NtReplyWaitReplyPort(HANDLE,PLPC_MESSAGE); -NTSYSAPI NTSTATUS WINAPI NtRequestPort(HANDLE,PLPC_MESSAGE); -NTSYSAPI NTSTATUS WINAPI NtRequestWaitReplyPort(HANDLE,PLPC_MESSAGE,PLPC_MESSAGE); -NTSYSAPI NTSTATUS WINAPI NtResetEvent(HANDLE,LONG*); -NTSYSAPI NTSTATUS WINAPI NtResetWriteWatch(HANDLE,PVOID,SIZE_T); -NTSYSAPI NTSTATUS WINAPI NtRestoreKey(HANDLE,HANDLE,ULONG); -NTSYSAPI NTSTATUS WINAPI NtResumeProcess(HANDLE); -NTSYSAPI NTSTATUS WINAPI NtResumeThread(HANDLE,PULONG); -NTSYSAPI NTSTATUS WINAPI NtSaveKey(HANDLE,HANDLE); -NTSYSAPI NTSTATUS WINAPI NtSecureConnectPort(PHANDLE,PUNICODE_STRING,PSECURITY_QUALITY_OF_SERVICE,PLPC_SECTION_WRITE,PSID,PLPC_SECTION_READ,PULONG,PVOID,PULONG); -NTSYSAPI NTSTATUS WINAPI NtSetContextThread(HANDLE,const CONTEXT*); -NTSYSAPI NTSTATUS WINAPI NtSetDefaultHardErrorPort(HANDLE); -NTSYSAPI NTSTATUS WINAPI NtSetDefaultLocale(BOOLEAN,LCID); -NTSYSAPI NTSTATUS WINAPI NtSetDefaultUILanguage(LANGID); -NTSYSAPI NTSTATUS WINAPI NtSetEaFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG); -NTSYSAPI NTSTATUS WINAPI NtSetEvent(HANDLE,LONG*); -NTSYSAPI NTSTATUS WINAPI NtSetHighEventPair(HANDLE); -NTSYSAPI NTSTATUS WINAPI NtSetHighWaitLowEventPair(HANDLE); -NTSYSAPI NTSTATUS WINAPI NtSetHighWaitLowThread(VOID); -NTSYSAPI NTSTATUS WINAPI NtSetInformationDebugObject(HANDLE,DEBUGOBJECTINFOCLASS,PVOID,ULONG,ULONG*); -NTSYSAPI NTSTATUS WINAPI NtSetInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FILE_INFORMATION_CLASS); -NTSYSAPI NTSTATUS WINAPI NtSetInformationJobObject(HANDLE,JOBOBJECTINFOCLASS,PVOID,ULONG); -NTSYSAPI NTSTATUS WINAPI NtSetInformationKey(HANDLE,const int,PVOID,ULONG); -NTSYSAPI NTSTATUS WINAPI NtSetInformationObject(HANDLE, OBJECT_INFORMATION_CLASS, PVOID, ULONG); -NTSYSAPI NTSTATUS WINAPI NtSetInformationProcess(HANDLE,PROCESS_INFORMATION_CLASS,PVOID,ULONG); -NTSYSAPI NTSTATUS WINAPI NtSetInformationThread(HANDLE,THREADINFOCLASS,LPCVOID,ULONG); -NTSYSAPI NTSTATUS WINAPI NtSetInformationToken(HANDLE,TOKEN_INFORMATION_CLASS,PVOID,ULONG); -NTSYSAPI NTSTATUS WINAPI NtSetIntervalProfile(ULONG,KPROFILE_SOURCE); -NTSYSAPI NTSTATUS WINAPI NtSetIoCompletion(HANDLE,ULONG_PTR,ULONG_PTR,NTSTATUS,SIZE_T); -NTSYSAPI NTSTATUS WINAPI NtSetLdtEntries(ULONG,LDT_ENTRY,ULONG,LDT_ENTRY); -NTSYSAPI NTSTATUS WINAPI NtSetLowEventPair(HANDLE); -NTSYSAPI NTSTATUS WINAPI NtSetLowWaitHighEventPair(HANDLE); -NTSYSAPI NTSTATUS WINAPI NtSetLowWaitHighThread(VOID); -NTSYSAPI NTSTATUS WINAPI NtSetSecurityObject(HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR); -NTSYSAPI NTSTATUS WINAPI NtSetSystemEnvironmentValue(PUNICODE_STRING,PUNICODE_STRING); -NTSYSAPI NTSTATUS WINAPI NtSetSystemInformation(SYSTEM_INFORMATION_CLASS,PVOID,ULONG); -NTSYSAPI NTSTATUS WINAPI NtSetSystemPowerState(POWER_ACTION,SYSTEM_POWER_STATE,ULONG); -NTSYSAPI NTSTATUS WINAPI NtSetSystemTime(const LARGE_INTEGER*,LARGE_INTEGER*); -NTSYSAPI NTSTATUS WINAPI NtSetThreadExecutionState(EXECUTION_STATE,EXECUTION_STATE*); -NTSYSAPI NTSTATUS WINAPI NtSetTimer(HANDLE, const LARGE_INTEGER*, PTIMER_APC_ROUTINE, PVOID, BOOLEAN, ULONG, BOOLEAN*); -NTSYSAPI NTSTATUS WINAPI NtSetTimerResolution(ULONG,BOOLEAN,PULONG); -NTSYSAPI NTSTATUS WINAPI NtSetValueKey(HANDLE,const UNICODE_STRING *,ULONG,ULONG,const void *,ULONG); -NTSYSAPI NTSTATUS WINAPI NtSetVolumeInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FS_INFORMATION_CLASS); -NTSYSAPI NTSTATUS WINAPI NtSignalAndWaitForSingleObject(HANDLE,HANDLE,BOOLEAN,const LARGE_INTEGER*); -NTSYSAPI NTSTATUS WINAPI NtShutdownSystem(SHUTDOWN_ACTION); -NTSYSAPI NTSTATUS WINAPI NtStartProfile(HANDLE); -NTSYSAPI NTSTATUS WINAPI NtStopProfile(HANDLE); -NTSYSAPI NTSTATUS WINAPI NtSuspendProcess(HANDLE); -NTSYSAPI NTSTATUS WINAPI NtSuspendThread(HANDLE,PULONG); -NTSYSAPI NTSTATUS WINAPI NtSystemDebugControl(SYSDBG_COMMAND,PVOID,ULONG,PVOID,ULONG,PULONG); -NTSYSAPI NTSTATUS WINAPI NtTerminateJobObject(HANDLE,NTSTATUS); -NTSYSAPI NTSTATUS WINAPI NtTerminateProcess(HANDLE,LONG); -NTSYSAPI NTSTATUS WINAPI NtTerminateThread(HANDLE,LONG); -NTSYSAPI NTSTATUS WINAPI NtTestAlert(VOID); -NTSYSAPI NTSTATUS WINAPI NtTraceControl(ULONG,void*,ULONG,void*,ULONG,ULONG*); -NTSYSAPI NTSTATUS WINAPI NtUnloadDriver(const UNICODE_STRING *); -NTSYSAPI NTSTATUS WINAPI NtUnloadKey(POBJECT_ATTRIBUTES); -NTSYSAPI NTSTATUS WINAPI NtUnloadKeyEx(POBJECT_ATTRIBUTES,HANDLE); -NTSYSAPI NTSTATUS WINAPI NtUnlockFile(HANDLE,PIO_STATUS_BLOCK,PLARGE_INTEGER,PLARGE_INTEGER,PULONG); -NTSYSAPI NTSTATUS WINAPI NtUnlockVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG); -NTSYSAPI NTSTATUS WINAPI NtUnmapViewOfSection(HANDLE,PVOID); -NTSYSAPI NTSTATUS WINAPI NtVdmControl(ULONG,PVOID); -NTSYSAPI NTSTATUS WINAPI NtWaitForDebugEvent(HANDLE,BOOLEAN,LARGE_INTEGER*,DBGUI_WAIT_STATE_CHANGE*); -NTSYSAPI NTSTATUS WINAPI NtWaitForKeyedEvent(HANDLE,const void*,BOOLEAN,const LARGE_INTEGER*); -NTSYSAPI NTSTATUS WINAPI NtWaitForSingleObject(HANDLE,BOOLEAN,const LARGE_INTEGER*); -NTSYSAPI NTSTATUS WINAPI NtWaitForMultipleObjects(ULONG,const HANDLE*,BOOLEAN,BOOLEAN,const LARGE_INTEGER*); -NTSYSAPI NTSTATUS WINAPI NtWaitHighEventPair(HANDLE); -NTSYSAPI NTSTATUS WINAPI NtWaitLowEventPair(HANDLE); -NTSYSAPI NTSTATUS WINAPI NtWriteFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,const void*,ULONG,PLARGE_INTEGER,PULONG); -NTSYSAPI NTSTATUS WINAPI NtWriteFileGather(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,FILE_SEGMENT_ELEMENT*,ULONG,PLARGE_INTEGER,PULONG); -NTSYSAPI NTSTATUS WINAPI NtWriteRequestData(HANDLE,PLPC_MESSAGE,ULONG,PVOID,ULONG,PULONG); -NTSYSAPI NTSTATUS WINAPI NtWriteVirtualMemory(HANDLE,void*,const void*,SIZE_T,SIZE_T*); -NTSYSAPI NTSTATUS WINAPI NtYieldExecution(void); +NTSYSAPI NTSTATUS WINE_SYSCALL NtAcceptConnectPort(PHANDLE,ULONG,PLPC_MESSAGE,BOOLEAN,PLPC_SECTION_WRITE,PLPC_SECTION_READ); +NTSYSAPI NTSTATUS WINE_SYSCALL NtAccessCheck(PSECURITY_DESCRIPTOR,HANDLE,ACCESS_MASK,PGENERIC_MAPPING,PPRIVILEGE_SET,PULONG,PULONG,NTSTATUS*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtAccessCheckAndAuditAlarm(PUNICODE_STRING,HANDLE,PUNICODE_STRING,PUNICODE_STRING,PSECURITY_DESCRIPTOR,ACCESS_MASK,PGENERIC_MAPPING,BOOLEAN,PACCESS_MASK,PBOOLEAN,PBOOLEAN); +NTSYSAPI NTSTATUS WINE_SYSCALL NtAddAtom(const WCHAR*,ULONG,RTL_ATOM*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtAdjustGroupsToken(HANDLE,BOOLEAN,PTOKEN_GROUPS,ULONG,PTOKEN_GROUPS,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtAdjustPrivilegesToken(HANDLE,BOOLEAN,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD); +NTSYSAPI NTSTATUS WINE_SYSCALL NtAlertResumeThread(HANDLE,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtAlertThread(HANDLE ThreadHandle); +NTSYSAPI NTSTATUS WINE_SYSCALL NtAllocateLocallyUniqueId(PLUID lpLuid); +NTSYSAPI NTSTATUS WINE_SYSCALL NtAllocateUuids(PULARGE_INTEGER,PULONG,PULONG,PUCHAR); +NTSYSAPI NTSTATUS WINE_SYSCALL NtAllocateVirtualMemory(HANDLE,PVOID*,ULONG_PTR,SIZE_T*,ULONG,ULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtAllocateVirtualMemoryEx(HANDLE,PVOID*,SIZE_T*,ULONG,ULONG,MEM_EXTENDED_PARAMETER*,ULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtAreMappedFilesTheSame(PVOID,PVOID); +NTSYSAPI NTSTATUS WINE_SYSCALL NtAssignProcessToJobObject(HANDLE,HANDLE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCallbackReturn(PVOID,ULONG,NTSTATUS); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCancelIoFile(HANDLE,PIO_STATUS_BLOCK); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCancelIoFileEx(HANDLE,PIO_STATUS_BLOCK,PIO_STATUS_BLOCK); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCancelTimer(HANDLE, BOOLEAN*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtClearEvent(HANDLE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtClose(HANDLE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCloseObjectAuditAlarm(PUNICODE_STRING,HANDLE,BOOLEAN); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCompleteConnectPort(HANDLE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtConnectPort(PHANDLE,PUNICODE_STRING,PSECURITY_QUALITY_OF_SERVICE,PLPC_SECTION_WRITE,PLPC_SECTION_READ,PULONG,PVOID,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtContinue(PCONTEXT,BOOLEAN); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCreateDebugObject(HANDLE*,ACCESS_MASK,OBJECT_ATTRIBUTES*,ULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCreateDirectoryObject(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCreateEvent(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES *,EVENT_TYPE,BOOLEAN); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCreateEventPair(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCreateFile(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,PLARGE_INTEGER,ULONG,ULONG,ULONG,ULONG,PVOID,ULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCreateIoCompletion(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,ULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCreateJobObject(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCreateKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG,const UNICODE_STRING*,ULONG,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCreateKeyTransacted(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG,const UNICODE_STRING*,ULONG,HANDLE,ULONG*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCreateKeyedEvent(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCreateLowBoxToken(HANDLE*,HANDLE,ACCESS_MASK,OBJECT_ATTRIBUTES*,SID*,ULONG,SID_AND_ATTRIBUTES*,ULONG,HANDLE*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCreateMailslotFile(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,ULONG,ULONG,ULONG,PLARGE_INTEGER); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCreateMutant(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*,BOOLEAN); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCreateNamedPipeFile(PHANDLE,ULONG,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,PLARGE_INTEGER); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCreatePagingFile(PUNICODE_STRING,PLARGE_INTEGER,PLARGE_INTEGER,PLARGE_INTEGER); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCreatePort(PHANDLE,POBJECT_ATTRIBUTES,ULONG,ULONG,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCreateProcess(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,HANDLE,BOOLEAN,HANDLE,HANDLE,HANDLE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCreateProfile(PHANDLE,HANDLE,PVOID,ULONG,ULONG,PVOID,ULONG,KPROFILE_SOURCE,KAFFINITY); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCreateSection(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*,const LARGE_INTEGER*,ULONG,ULONG,HANDLE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCreateSemaphore(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,LONG,LONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCreateSymbolicLinkObject(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PUNICODE_STRING); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCreateThread(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,HANDLE,PCLIENT_ID,PCONTEXT,PINITIAL_TEB,BOOLEAN); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCreateThreadEx(HANDLE*,ACCESS_MASK,OBJECT_ATTRIBUTES*,HANDLE,PRTL_THREAD_START_ROUTINE,void*,ULONG,ULONG_PTR,SIZE_T,SIZE_T,PS_ATTRIBUTE_LIST*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCreateTimer(HANDLE*, ACCESS_MASK, const OBJECT_ATTRIBUTES*, TIMER_TYPE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCreateToken(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,TOKEN_TYPE,PLUID,PLARGE_INTEGER,PTOKEN_USER,PTOKEN_GROUPS,PTOKEN_PRIVILEGES,PTOKEN_OWNER,PTOKEN_PRIMARY_GROUP,PTOKEN_DEFAULT_DACL,PTOKEN_SOURCE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtCreateUserProcess(HANDLE*,HANDLE*,ACCESS_MASK,ACCESS_MASK,OBJECT_ATTRIBUTES*,OBJECT_ATTRIBUTES*,ULONG,ULONG,RTL_USER_PROCESS_PARAMETERS*,PS_CREATE_INFO*,PS_ATTRIBUTE_LIST*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtDebugActiveProcess(HANDLE,HANDLE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtDebugContinue(HANDLE,CLIENT_ID*,NTSTATUS); +NTSYSAPI NTSTATUS WINE_SYSCALL NtDelayExecution(BOOLEAN,const LARGE_INTEGER*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtDeleteAtom(RTL_ATOM); +NTSYSAPI NTSTATUS WINE_SYSCALL NtDeleteFile(POBJECT_ATTRIBUTES); +NTSYSAPI NTSTATUS WINE_SYSCALL NtDeleteKey(HANDLE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtDeleteValueKey(HANDLE,const UNICODE_STRING *); +NTSYSAPI NTSTATUS WINE_SYSCALL NtDeviceIoControlFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,PVOID,ULONG,PVOID,ULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtDisplayString(PUNICODE_STRING); +NTSYSAPI NTSTATUS WINE_SYSCALL NtDuplicateObject(HANDLE,HANDLE,HANDLE,PHANDLE,ACCESS_MASK,ULONG,ULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtDuplicateToken(HANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,SECURITY_IMPERSONATION_LEVEL,TOKEN_TYPE,PHANDLE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtEnumerateKey(HANDLE,ULONG,KEY_INFORMATION_CLASS,void *,DWORD,DWORD *); +NTSYSAPI NTSTATUS WINE_SYSCALL NtEnumerateValueKey(HANDLE,ULONG,KEY_VALUE_INFORMATION_CLASS,PVOID,ULONG,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtExtendSection(HANDLE,PLARGE_INTEGER); +NTSYSAPI NTSTATUS WINE_SYSCALL NtFilterToken(HANDLE,ULONG,TOKEN_GROUPS*,TOKEN_PRIVILEGES*,TOKEN_GROUPS*,HANDLE*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtFindAtom(const WCHAR*,ULONG,RTL_ATOM*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtFlushBuffersFile(HANDLE,IO_STATUS_BLOCK*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtFlushInstructionCache(HANDLE,LPCVOID,SIZE_T); +NTSYSAPI NTSTATUS WINE_SYSCALL NtFlushKey(HANDLE); +NTSYSAPI void WINE_SYSCALL NtFlushProcessWriteBuffers(void); +NTSYSAPI NTSTATUS WINE_SYSCALL NtFlushVirtualMemory(HANDLE,LPCVOID*,SIZE_T*,ULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtFlushWriteBuffer(VOID); +NTSYSAPI NTSTATUS WINE_SYSCALL NtFreeVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtFsControlFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,PVOID,ULONG,PVOID,ULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtGetContextThread(HANDLE,CONTEXT*); +NTSYSAPI ULONG WINE_SYSCALL NtGetCurrentProcessorNumber(void); +NTSYSAPI NTSTATUS WINE_SYSCALL NtGetNextThread(HANDLE,HANDLE,ACCESS_MASK,ULONG,ULONG,HANDLE*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtGetNlsSectionPtr(ULONG,ULONG,void*,void**,SIZE_T*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtGetPlugPlayEvent(ULONG,ULONG,PVOID,ULONG); +NTSYSAPI ULONG WINE_SYSCALL NtGetTickCount(VOID); +NTSYSAPI NTSTATUS WINE_SYSCALL NtGetWriteWatch(HANDLE,ULONG,PVOID,SIZE_T,PVOID*,ULONG_PTR*,ULONG*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtImpersonateAnonymousToken(HANDLE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtImpersonateClientOfPort(HANDLE,PPORT_MESSAGE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtImpersonateThread(HANDLE,HANDLE,PSECURITY_QUALITY_OF_SERVICE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtInitializeRegistry(BOOLEAN); +NTSYSAPI NTSTATUS WINE_SYSCALL NtInitiatePowerAction(POWER_ACTION,SYSTEM_POWER_STATE,ULONG,BOOLEAN); +NTSYSAPI NTSTATUS WINE_SYSCALL NtIsProcessInJob(HANDLE,HANDLE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtListenPort(HANDLE,PLPC_MESSAGE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtLoadDriver(const UNICODE_STRING *); +NTSYSAPI NTSTATUS WINE_SYSCALL NtLoadKey(const OBJECT_ATTRIBUTES *,OBJECT_ATTRIBUTES *); +NTSYSAPI NTSTATUS WINE_SYSCALL NtLoadKey2(const OBJECT_ATTRIBUTES *,OBJECT_ATTRIBUTES *,ULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtLockFile(HANDLE,HANDLE,PIO_APC_ROUTINE,void*,PIO_STATUS_BLOCK,PLARGE_INTEGER,PLARGE_INTEGER,ULONG*,BOOLEAN,BOOLEAN); +NTSYSAPI NTSTATUS WINE_SYSCALL NtLockVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtMakeTemporaryObject(HANDLE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtMapViewOfSection(HANDLE,HANDLE,PVOID*,ULONG_PTR,SIZE_T,const LARGE_INTEGER*,SIZE_T*,SECTION_INHERIT,ULONG,ULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtNotifyChangeDirectoryFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,PVOID,ULONG,ULONG,BOOLEAN); +NTSYSAPI NTSTATUS WINE_SYSCALL NtNotifyChangeKey(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,BOOLEAN,PVOID,ULONG,BOOLEAN); +NTSYSAPI NTSTATUS WINE_SYSCALL NtNotifyChangeMultipleKeys(HANDLE,ULONG,OBJECT_ATTRIBUTES*,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,BOOLEAN,PVOID,ULONG,BOOLEAN); +NTSYSAPI NTSTATUS WINE_SYSCALL NtOpenDirectoryObject(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtOpenEvent(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES *); +NTSYSAPI NTSTATUS WINE_SYSCALL NtOpenEventPair(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtOpenFile(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,ULONG,ULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtOpenIoCompletion(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtOpenJobObject(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtOpenKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES *); +NTSYSAPI NTSTATUS WINE_SYSCALL NtOpenKeyEx(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtOpenKeyTransacted(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,HANDLE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtOpenKeyTransactedEx(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG,HANDLE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtOpenKeyedEvent(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtOpenMutant(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtOpenObjectAuditAlarm(PUNICODE_STRING,PHANDLE,PUNICODE_STRING,PUNICODE_STRING,PSECURITY_DESCRIPTOR,HANDLE,ACCESS_MASK,ACCESS_MASK,PPRIVILEGE_SET,BOOLEAN,BOOLEAN,PBOOLEAN); +NTSYSAPI NTSTATUS WINE_SYSCALL NtOpenProcess(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,const CLIENT_ID*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtOpenProcessToken(HANDLE,DWORD,HANDLE *); +NTSYSAPI NTSTATUS WINE_SYSCALL NtOpenProcessTokenEx(HANDLE,DWORD,DWORD,HANDLE *); +NTSYSAPI NTSTATUS WINE_SYSCALL NtOpenSection(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtOpenSemaphore(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtOpenSymbolicLinkObject(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtOpenThread(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*,const CLIENT_ID*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtOpenThreadToken(HANDLE,DWORD,BOOLEAN,HANDLE *); +NTSYSAPI NTSTATUS WINE_SYSCALL NtOpenThreadTokenEx(HANDLE,DWORD,BOOLEAN,DWORD,HANDLE *); +NTSYSAPI NTSTATUS WINE_SYSCALL NtOpenTimer(HANDLE*, ACCESS_MASK, const OBJECT_ATTRIBUTES*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtPowerInformation(POWER_INFORMATION_LEVEL,PVOID,ULONG,PVOID,ULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtPrivilegeCheck(HANDLE,PPRIVILEGE_SET,PBOOLEAN); +NTSYSAPI NTSTATUS WINE_SYSCALL NtPrivilegeObjectAuditAlarm(PUNICODE_STRING,HANDLE,HANDLE,ULONG,PPRIVILEGE_SET,BOOLEAN); +NTSYSAPI NTSTATUS WINE_SYSCALL NtPrivilegedServiceAuditAlarm(PUNICODE_STRING,PUNICODE_STRING,HANDLE,PPRIVILEGE_SET,BOOLEAN); +NTSYSAPI NTSTATUS WINE_SYSCALL NtProtectVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG,ULONG*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtPulseEvent(HANDLE,LONG*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQueueApcThread(HANDLE,PNTAPCFUNC,ULONG_PTR,ULONG_PTR,ULONG_PTR); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQueryAttributesFile(const OBJECT_ATTRIBUTES*,FILE_BASIC_INFORMATION*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQueryDefaultLocale(BOOLEAN,LCID*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQueryDefaultUILanguage(LANGID*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQueryDirectoryFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,PVOID,ULONG,FILE_INFORMATION_CLASS,BOOLEAN,PUNICODE_STRING,BOOLEAN); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQueryDirectoryObject(HANDLE,PDIRECTORY_BASIC_INFORMATION,ULONG,BOOLEAN,BOOLEAN,PULONG,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQueryEaFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,BOOLEAN,PVOID,ULONG,PULONG,BOOLEAN); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQueryEvent(HANDLE,EVENT_INFORMATION_CLASS,PVOID,ULONG,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQueryFullAttributesFile(const OBJECT_ATTRIBUTES*,FILE_NETWORK_OPEN_INFORMATION*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQueryInformationAtom(RTL_ATOM,ATOM_INFORMATION_CLASS,PVOID,ULONG,ULONG*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQueryInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,LONG,FILE_INFORMATION_CLASS); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQueryInformationJobObject(HANDLE,JOBOBJECTINFOCLASS,PVOID,ULONG,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQueryInformationPort(HANDLE,PORT_INFORMATION_CLASS,PVOID,ULONG,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQueryInformationProcess(HANDLE,PROCESSINFOCLASS,PVOID,ULONG,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQueryInformationThread(HANDLE,THREADINFOCLASS,PVOID,ULONG,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQueryInformationToken(HANDLE,TOKEN_INFORMATION_CLASS,PVOID,ULONG,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQueryInstallUILanguage(LANGID*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQueryIntervalProfile(KPROFILE_SOURCE,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQueryIoCompletion(HANDLE,IO_COMPLETION_INFORMATION_CLASS,PVOID,ULONG,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQueryKey(HANDLE,KEY_INFORMATION_CLASS,void *,DWORD,DWORD *); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQueryMultipleValueKey(HANDLE,PKEY_MULTIPLE_VALUE_INFORMATION,ULONG,PVOID,ULONG,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQueryMutant(HANDLE,MUTANT_INFORMATION_CLASS,PVOID,ULONG,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQueryObject(HANDLE, OBJECT_INFORMATION_CLASS, PVOID, ULONG, PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQueryOpenSubKeys(POBJECT_ATTRIBUTES,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQueryPerformanceCounter(PLARGE_INTEGER, PLARGE_INTEGER); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQuerySecurityObject(HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,ULONG,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQuerySection(HANDLE,SECTION_INFORMATION_CLASS,PVOID,SIZE_T,SIZE_T*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQuerySemaphore(HANDLE,SEMAPHORE_INFORMATION_CLASS,PVOID,ULONG,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQuerySymbolicLinkObject(HANDLE,PUNICODE_STRING,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQuerySystemEnvironmentValue(PUNICODE_STRING,PWCHAR,ULONG,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQuerySystemEnvironmentValueEx(PUNICODE_STRING,GUID*,void*,ULONG*,ULONG*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQuerySystemInformation(SYSTEM_INFORMATION_CLASS,PVOID,ULONG,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQuerySystemInformationEx(SYSTEM_INFORMATION_CLASS,void*,ULONG,void*,ULONG,ULONG*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQuerySystemTime(PLARGE_INTEGER); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQueryTimer(HANDLE,TIMER_INFORMATION_CLASS,PVOID,ULONG,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQueryTimerResolution(PULONG,PULONG,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQueryValueKey(HANDLE,const UNICODE_STRING *,KEY_VALUE_INFORMATION_CLASS,void *,DWORD,DWORD *); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQueryLicenseValue(const UNICODE_STRING *,ULONG *,PVOID,ULONG,ULONG *); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQueryVirtualMemory(HANDLE,LPCVOID,MEMORY_INFORMATION_CLASS,PVOID,SIZE_T,SIZE_T*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtQueryVolumeInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FS_INFORMATION_CLASS); +NTSYSAPI NTSTATUS WINE_SYSCALL NtRaiseException(PEXCEPTION_RECORD,PCONTEXT,BOOL); +NTSYSAPI NTSTATUS WINE_SYSCALL NtRaiseHardError(NTSTATUS,ULONG,PUNICODE_STRING,PVOID*,HARDERROR_RESPONSE_OPTION,PHARDERROR_RESPONSE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtReadFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,PVOID,ULONG,PLARGE_INTEGER,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtReadFileScatter(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,FILE_SEGMENT_ELEMENT*,ULONG,PLARGE_INTEGER,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtReadRequestData(HANDLE,PLPC_MESSAGE,ULONG,PVOID,ULONG,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtReadVirtualMemory(HANDLE,const void*,void*,SIZE_T,SIZE_T*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtRegisterThreadTerminatePort(HANDLE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtReleaseKeyedEvent(HANDLE,const void*,BOOLEAN,const LARGE_INTEGER*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtReleaseMutant(HANDLE,PLONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtReleaseSemaphore(HANDLE,ULONG,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtRemoveIoCompletion(HANDLE,PULONG_PTR,PULONG_PTR,PIO_STATUS_BLOCK,PLARGE_INTEGER); +NTSYSAPI NTSTATUS WINE_SYSCALL NtRemoveIoCompletionEx(HANDLE,FILE_IO_COMPLETION_INFORMATION*,ULONG,ULONG*,LARGE_INTEGER*,BOOLEAN); +NTSYSAPI NTSTATUS WINE_SYSCALL NtRemoveProcessDebug(HANDLE,HANDLE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtRenameKey(HANDLE,UNICODE_STRING*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtReplaceKey(POBJECT_ATTRIBUTES,HANDLE,POBJECT_ATTRIBUTES); +NTSYSAPI NTSTATUS WINE_SYSCALL NtReplyPort(HANDLE,PLPC_MESSAGE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtReplyWaitReceivePort(HANDLE,PULONG,PLPC_MESSAGE,PLPC_MESSAGE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtReplyWaitReceivePortEx(HANDLE,PVOID*,PPORT_MESSAGE,PPORT_MESSAGE,PLARGE_INTEGER); +NTSYSAPI NTSTATUS WINE_SYSCALL NtReplyWaitReplyPort(HANDLE,PLPC_MESSAGE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtRequestPort(HANDLE,PLPC_MESSAGE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtRequestWaitReplyPort(HANDLE,PLPC_MESSAGE,PLPC_MESSAGE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtResetEvent(HANDLE,LONG*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtResetWriteWatch(HANDLE,PVOID,SIZE_T); +NTSYSAPI NTSTATUS WINE_SYSCALL NtRestoreKey(HANDLE,HANDLE,ULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtResumeProcess(HANDLE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtResumeThread(HANDLE,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSaveKey(HANDLE,HANDLE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSecureConnectPort(PHANDLE,PUNICODE_STRING,PSECURITY_QUALITY_OF_SERVICE,PLPC_SECTION_WRITE,PSID,PLPC_SECTION_READ,PULONG,PVOID,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetContextThread(HANDLE,const CONTEXT*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetDefaultHardErrorPort(HANDLE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetDefaultLocale(BOOLEAN,LCID); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetDefaultUILanguage(LANGID); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetEaFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetEvent(HANDLE,LONG*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetHighEventPair(HANDLE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetHighWaitLowEventPair(HANDLE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetHighWaitLowThread(VOID); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetInformationDebugObject(HANDLE,DEBUGOBJECTINFOCLASS,PVOID,ULONG,ULONG*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FILE_INFORMATION_CLASS); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetInformationJobObject(HANDLE,JOBOBJECTINFOCLASS,PVOID,ULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetInformationKey(HANDLE,const int,PVOID,ULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetInformationObject(HANDLE, OBJECT_INFORMATION_CLASS, PVOID, ULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetInformationProcess(HANDLE,PROCESS_INFORMATION_CLASS,PVOID,ULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetInformationThread(HANDLE,THREADINFOCLASS,LPCVOID,ULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetInformationToken(HANDLE,TOKEN_INFORMATION_CLASS,PVOID,ULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetIntervalProfile(ULONG,KPROFILE_SOURCE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetIoCompletion(HANDLE,ULONG_PTR,ULONG_PTR,NTSTATUS,SIZE_T); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetLdtEntries(ULONG,LDT_ENTRY,ULONG,LDT_ENTRY); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetLowEventPair(HANDLE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetLowWaitHighEventPair(HANDLE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetLowWaitHighThread(VOID); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetSecurityObject(HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetSystemEnvironmentValue(PUNICODE_STRING,PUNICODE_STRING); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetSystemInformation(SYSTEM_INFORMATION_CLASS,PVOID,ULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetSystemPowerState(POWER_ACTION,SYSTEM_POWER_STATE,ULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetSystemTime(const LARGE_INTEGER*,LARGE_INTEGER*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetThreadExecutionState(EXECUTION_STATE,EXECUTION_STATE*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetTimer(HANDLE, const LARGE_INTEGER*, PTIMER_APC_ROUTINE, PVOID, BOOLEAN, ULONG, BOOLEAN*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetTimerResolution(ULONG,BOOLEAN,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetValueKey(HANDLE,const UNICODE_STRING *,ULONG,ULONG,const void *,ULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSetVolumeInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FS_INFORMATION_CLASS); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSignalAndWaitForSingleObject(HANDLE,HANDLE,BOOLEAN,const LARGE_INTEGER*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtShutdownSystem(SHUTDOWN_ACTION); +NTSYSAPI NTSTATUS WINE_SYSCALL NtStartProfile(HANDLE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtStopProfile(HANDLE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSuspendProcess(HANDLE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSuspendThread(HANDLE,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtSystemDebugControl(SYSDBG_COMMAND,PVOID,ULONG,PVOID,ULONG,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtTerminateJobObject(HANDLE,NTSTATUS); +NTSYSAPI NTSTATUS WINE_SYSCALL NtTerminateProcess(HANDLE,LONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtTerminateThread(HANDLE,LONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtTestAlert(VOID); +NTSYSAPI NTSTATUS WINE_SYSCALL NtTraceControl(ULONG,void*,ULONG,void*,ULONG,ULONG*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtUnloadDriver(const UNICODE_STRING *); +NTSYSAPI NTSTATUS WINE_SYSCALL NtUnloadKey(POBJECT_ATTRIBUTES); +NTSYSAPI NTSTATUS WINE_SYSCALL NtUnloadKeyEx(POBJECT_ATTRIBUTES,HANDLE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtUnlockFile(HANDLE,PIO_STATUS_BLOCK,PLARGE_INTEGER,PLARGE_INTEGER,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtUnlockVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtUnmapViewOfSection(HANDLE,PVOID); +NTSYSAPI NTSTATUS WINE_SYSCALL NtVdmControl(ULONG,PVOID); +NTSYSAPI NTSTATUS WINE_SYSCALL NtWaitForDebugEvent(HANDLE,BOOLEAN,LARGE_INTEGER*,DBGUI_WAIT_STATE_CHANGE*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtWaitForKeyedEvent(HANDLE,const void*,BOOLEAN,const LARGE_INTEGER*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtWaitForSingleObject(HANDLE,BOOLEAN,const LARGE_INTEGER*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtWaitForMultipleObjects(ULONG,const HANDLE*,BOOLEAN,BOOLEAN,const LARGE_INTEGER*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtWaitHighEventPair(HANDLE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtWaitLowEventPair(HANDLE); +NTSYSAPI NTSTATUS WINE_SYSCALL NtWriteFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,const void*,ULONG,PLARGE_INTEGER,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtWriteFileGather(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,FILE_SEGMENT_ELEMENT*,ULONG,PLARGE_INTEGER,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtWriteRequestData(HANDLE,PLPC_MESSAGE,ULONG,PVOID,ULONG,PULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtWriteVirtualMemory(HANDLE,void*,const void*,SIZE_T,SIZE_T*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtYieldExecution(void); NTSYSAPI NTSTATUS WINAPI RtlAbsoluteToSelfRelativeSD(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PULONG); NTSYSAPI void WINAPI RtlAcquirePebLock(void); @@ -4449,10 +4457,10 @@ NTSYSAPI NTSTATUS WINAPI RtlWow64GetThreadContext(HANDLE,WOW64_CONTEXT*); NTSYSAPI NTSTATUS WINAPI RtlWow64GetThreadSelectorEntry(HANDLE,THREAD_DESCRIPTOR_INFORMATION*,ULONG,ULONG*); NTSYSAPI NTSTATUS WINAPI RtlWow64SetThreadContext(HANDLE,const WOW64_CONTEXT*); #else -NTSYSAPI NTSTATUS WINAPI NtWow64AllocateVirtualMemory64(HANDLE,ULONG64*,ULONG64,ULONG64*,ULONG,ULONG); -NTSYSAPI NTSTATUS WINAPI NtWow64GetNativeSystemInformation(SYSTEM_INFORMATION_CLASS,void*,ULONG,ULONG*); -NTSYSAPI NTSTATUS WINAPI NtWow64ReadVirtualMemory64(HANDLE,ULONG64,void*,ULONG64,ULONG64*); -NTSYSAPI NTSTATUS WINAPI NtWow64WriteVirtualMemory64(HANDLE,ULONG64,const void*,ULONG64,ULONG64*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtWow64AllocateVirtualMemory64(HANDLE,ULONG64*,ULONG64,ULONG64*,ULONG,ULONG); +NTSYSAPI NTSTATUS WINE_SYSCALL NtWow64GetNativeSystemInformation(SYSTEM_INFORMATION_CLASS,void*,ULONG,ULONG*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtWow64ReadVirtualMemory64(HANDLE,ULONG64,void*,ULONG64,ULONG64*); +NTSYSAPI NTSTATUS WINE_SYSCALL NtWow64WriteVirtualMemory64(HANDLE,ULONG64,const void*,ULONG64,ULONG64*); NTSYSAPI LONGLONG WINAPI RtlConvertLongToLargeInteger(LONG); NTSYSAPI ULONGLONG WINAPI RtlConvertUlongToLargeInteger(ULONG); NTSYSAPI LONGLONG WINAPI RtlEnlargedIntegerMultiply(INT,INT); @@ -4512,9 +4520,9 @@ NTSYSAPI void WINAPI TpWaitForWork(TP_WORK *,BOOL); /* Wine internal functions */ -NTSYSAPI NTSTATUS WINAPI wine_nt_to_unix_file_name( const OBJECT_ATTRIBUTES *attr, char *nameA, ULONG *size, - UINT disposition ); -NTSYSAPI NTSTATUS WINAPI wine_unix_to_nt_file_name( const char *name, WCHAR *buffer, ULONG *size ); +NTSYSAPI NTSTATUS WINE_SYSCALL wine_nt_to_unix_file_name( const OBJECT_ATTRIBUTES *attr, char *nameA, + ULONG *size, UINT disposition ); +NTSYSAPI NTSTATUS WINE_SYSCALL wine_unix_to_nt_file_name( const char *name, WCHAR *buffer, ULONG *size ); /*********************************************************************** @@ -4602,6 +4610,7 @@ static inline PLIST_ENTRY RemoveTailList(PLIST_ENTRY le) #ifdef __WINESRC__ /* Wine internal functions */ +extern int WINE_SYSCALL __wine_dbg_write( const char *str, unsigned int len ); extern NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ); /* The thread information for 16-bit threads */ -- 2.33.0

3 2

[PATCH v3 1/2] winebus.sys: Fix non-Linux builds
by Rémi Bernon 27 Sep '21

27 Sep '21

From: Gerald Pfeifer <gerald(a)pfeifer.com> commit 40a9f69a1de088fb72c6b8966bc4333dea5fdfff winebus.sys: Rename UDEV bus device variables to be consistent. Introducing a struct base_device, and hidraw_device / lnxev_device depending on the sub-type of the device. moved an existing use of ABS_VOLUME that was guarded by #ifdef HAS_PROPER_INPUT_HEADER outside that guard, breaking the build on non-Linux platforms. Address this by putting appropriate guards in place. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/bus_udev.c | 48 ++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 88db78360e2..fce3a7672d9 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -110,11 +110,23 @@ struct base_device int device_fd; }; +static inline struct base_device *impl_from_unix_device(struct unix_device *iface) +{ + return CONTAINING_RECORD(iface, struct base_device, unix_device); +} + struct hidraw_device { struct base_device base; }; +static inline struct hidraw_device *hidraw_impl_from_unix_device(struct unix_device *iface) +{ + return CONTAINING_RECORD(impl_from_unix_device(iface), struct hidraw_device, base); +} + +#ifdef HAS_PROPER_INPUT_HEADER + #define HID_REL_MAX (REL_MISC+1) #define HID_ABS_MAX (ABS_VOLUME+1) @@ -130,21 +142,13 @@ struct lnxev_device int haptic_effect_id; }; -static inline struct base_device *impl_from_unix_device(struct unix_device *iface) -{ - return CONTAINING_RECORD(iface, struct base_device, unix_device); -} - -static inline struct hidraw_device *hidraw_impl_from_unix_device(struct unix_device *iface) -{ - return CONTAINING_RECORD(impl_from_unix_device(iface), struct hidraw_device, base); -} - static inline struct lnxev_device *lnxev_impl_from_unix_device(struct unix_device *iface) { return CONTAINING_RECORD(impl_from_unix_device(iface), struct lnxev_device, base); } +#endif /* HAS_PROPER_INPUT_HEADER */ + #define MAX_DEVICES 128 static int close_fds[MAX_DEVICES]; static struct pollfd poll_fds[MAX_DEVICES]; @@ -201,6 +205,18 @@ static struct base_device *find_device_from_fd(int fd) return NULL; } +static struct base_device *find_device_from_udev(struct udev_device *dev) +{ + struct base_device *impl; + + LIST_FOR_EACH_ENTRY(impl, &device_list, struct base_device, unix_device.entry) + if (impl->udev_device == dev) return impl; + + return NULL; +} + +#ifdef HAS_PROPER_INPUT_HEADER + static const char *get_device_syspath(struct udev_device *dev) { struct udev_device *parent; @@ -224,18 +240,6 @@ static struct base_device *find_device_from_syspath(const char *path) return NULL; } -static struct base_device *find_device_from_udev(struct udev_device *dev) -{ - struct base_device *impl; - - LIST_FOR_EACH_ENTRY(impl, &device_list, struct base_device, unix_device.entry) - if (impl->udev_device == dev) return impl; - - return NULL; -} - -#ifdef HAS_PROPER_INPUT_HEADER - static const BYTE ABS_TO_HID_MAP[][2] = { {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_X}, /*ABS_X*/ {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_Y}, /*ABS_Y*/ -- 2.33.0

1 1

[PATCH 1/5] dinput: Use a custom HID joystick state instead of DIJOYSTATE2.
by Rémi Bernon 27 Sep '21

27 Sep '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/joystick_hid.c | 83 ++++++++++++++------------------------ 1 file changed, 31 insertions(+), 52 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 30e63c16cb8..6eb1a98c13b 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -136,10 +136,11 @@ static inline const char *debugstr_hid_caps( struct hid_caps *caps ) return "(unknown type)"; } +#define DEVICE_STATE_MAX_SIZE 1024 + struct hid_joystick { IDirectInputDeviceImpl base; - DIJOYSTATE2 state; HANDLE device; OVERLAPPED read_ovl; @@ -160,6 +161,7 @@ struct hid_joystick ULONG usages_count; BYTE device_state_report_id; + BYTE device_state[DEVICE_STATE_MAX_SIZE]; }; static inline struct hid_joystick *impl_from_IDirectInputDevice8W( IDirectInputDevice8W *iface ) @@ -660,7 +662,7 @@ static HRESULT WINAPI hid_joystick_GetDeviceState( IDirectInputDevice8W *iface, EnterCriticalSection( &impl->base.crit ); if (!impl->base.acquired) hr = DIERR_NOTACQUIRED; - else fill_DataFormat( ptr, len, &impl->state, &impl->base.data_format ); + else fill_DataFormat( ptr, len, impl->device_state, &impl->base.data_format ); LeaveCriticalSection( &impl->base.crit ); return hr; @@ -796,7 +798,8 @@ static const IDirectInputDevice8WVtbl hid_joystick_vtbl = struct parse_device_state_params { - DIJOYSTATE2 old_state; + BYTE old_state[DEVICE_STATE_MAX_SIZE]; + BYTE buttons[128]; DWORD time; DWORD seq; }; @@ -806,12 +809,18 @@ static BOOL check_device_state_button( struct hid_joystick *impl, struct hid_cap { IDirectInputDevice8W *iface = &impl->base.IDirectInputDevice8W_iface; struct parse_device_state_params *params = data; - DWORD i = DIDFT_GETINSTANCE( instance->dwType ); + BYTE old_value, value; if (!(instance->dwType & DIDFT_BUTTON)) FIXME( "unexpected object type %#x, expected DIDFT_BUTTON\n", instance->dwType ); - else if (params->old_state.rgbButtons[i] != impl->state.rgbButtons[i]) - queue_event( iface, instance->dwType, impl->state.rgbButtons[i], params->time, params->seq ); + else + { + value = params->buttons[instance->wUsage - 1]; + old_value = params->old_state[instance->dwOfs]; + impl->device_state[instance->dwOfs] = value; + if (old_value != value) + queue_event( iface, instance->dwType, value, params->time, params->seq ); + } return DIENUM_CONTINUE; } @@ -842,8 +851,8 @@ static BOOL read_device_state_value( struct hid_joystick *impl, struct hid_caps struct parse_device_state_params *params = data; char *report_buf = impl->input_report_buf; HIDP_VALUE_CAPS *value_caps = caps->value; + LONG old_value, value; NTSTATUS status; - LONG value; if (!(instance->dwType & (DIDFT_POV | DIDFT_AXIS))) FIXME( "unexpected object type %#x, expected DIDFT_POV | DIDFT_AXIS\n", instance->dwType ); @@ -855,47 +864,10 @@ static BOOL read_device_state_value( struct hid_joystick *impl, struct hid_caps instance->wUsagePage, instance->wUsage, status ); value = scale_value( logical_value, value_caps, value_caps->PhysicalMin, value_caps->PhysicalMax ); - switch (instance->dwOfs) - { - case DIJOFS_X: - if (impl->state.lX == value) break; - impl->state.lX = value; - queue_event( iface, instance->dwType, value, params->time, params->seq ); - break; - case DIJOFS_Y: - if (impl->state.lY == value) break; - impl->state.lY = value; - queue_event( iface, instance->dwType, value, params->time, params->seq ); - break; - case DIJOFS_Z: - if (impl->state.lZ == value) break; - impl->state.lZ = value; - queue_event( iface, instance->dwType, value, params->time, params->seq ); - break; - case DIJOFS_RX: - if (impl->state.lRx == value) break; - impl->state.lRx = value; + old_value = *(LONG *)(params->old_state + instance->dwOfs); + *(LONG *)(impl->device_state + instance->dwOfs) = value; + if (old_value != value) queue_event( iface, instance->dwType, value, params->time, params->seq ); - break; - case DIJOFS_RY: - if (impl->state.lRy == value) break; - impl->state.lRy = value; - queue_event( iface, instance->dwType, value, params->time, params->seq ); - break; - case DIJOFS_RZ: - if (impl->state.lRz == value) break; - impl->state.lRz = value; - queue_event( iface, instance->dwType, value, params->time, params->seq ); - break; - case DIJOFS_POV( 0 ): - if (impl->state.rgdwPOV[0] == value) break; - impl->state.rgdwPOV[0] = value; - queue_event( iface, instance->dwType, value, params->time, params->seq ); - break; - default: - FIXME( "unimplemented offset %#x.\n", instance->dwOfs ); - break; - } } return DIENUM_CONTINUE; @@ -911,6 +883,7 @@ static HRESULT hid_joystick_read_state( IDirectInputDevice8W *iface ) }; struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); ULONG i, count, report_len = impl->caps.InputReportByteLength; + DIDATAFORMAT *format = impl->base.data_format.wine_df; struct parse_device_state_params params = {0}; char *report_buf = impl->input_report_buf; USAGE_AND_PAGE *usages; @@ -944,11 +917,11 @@ static HRESULT hid_joystick_read_state( IDirectInputDevice8W *iface ) if (report_buf[0] == impl->device_state_report_id) { - params.old_state = impl->state; params.time = GetCurrentTime(); params.seq = impl->base.dinput->evsequence++; + memcpy( params.old_state, impl->device_state, format->dwDataSize ); + memset( impl->device_state, 0, format->dwDataSize ); - memset( impl->state.rgbButtons, 0, sizeof(impl->state.rgbButtons) ); while (count--) { usages = impl->usages_buf + count; @@ -957,12 +930,12 @@ static HRESULT hid_joystick_read_state( IDirectInputDevice8W *iface ) else if (usages->Usage >= 128) FIXME( "ignoring extraneous button %d.\n", usages->Usage ); else - impl->state.rgbButtons[usages->Usage - 1] = 0x80; + params.buttons[usages->Usage - 1] = 0x80; } enum_value_objects( impl, &filter, DIDFT_ALL, read_device_state_value, &params ); enum_button_objects( impl, &filter, DIDFT_ALL, check_device_state_button, &params ); - if (memcmp( &params.old_state, &impl->state, sizeof(impl->state) ) && impl->base.hEvent) + if (impl->base.hEvent && memcmp( &params.old_state, impl->device_state, format->dwDataSize )) SetEvent( impl->base.hEvent ); } @@ -1231,6 +1204,7 @@ static BOOL init_objects( struct hid_joystick *impl, struct hid_caps *caps, DIDATAFORMAT *format = impl->base.data_format.wine_df; format->dwNumObjs++; + format->dwDataSize = max( format->dwDataSize, instance->dwOfs + sizeof(LONG) ); if (instance->dwType & DIDFT_BUTTON) impl->dev_caps.dwButtons++; if (instance->dwType & DIDFT_AXIS) impl->dev_caps.dwAxes++; if (instance->dwType & DIDFT_POV) impl->dev_caps.dwPOVs++; @@ -1360,12 +1334,17 @@ static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID enum_button_objects( impl, &filter, DIDFT_ALL, init_objects, NULL ); format = impl->base.data_format.wine_df; + if (format->dwDataSize > DEVICE_STATE_MAX_SIZE) + { + FIXME( "unable to create device, state is too large\n" ); + goto failed; + } + size = format->dwNumObjs * sizeof(*format->rgodf); if (!(format->rgodf = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ))) goto failed; format->dwSize = sizeof(*format); format->dwObjSize = sizeof(*format->rgodf); format->dwFlags = DIDF_ABSAXIS; - format->dwDataSize = sizeof(impl->state); index = 0; enum_value_objects( impl, &filter, DIDFT_ALL, init_data_format, &index ); -- 2.33.0

2 5

[PATCH] krnl386: Don't handle %ss in fix_selector().
by Zebediah Figura 27 Sep '21

27 Sep '21

Loading %ss with zero isn't valid either. If %ss is invalid we have bigger problems anyway. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- There's not much point to this patch other than deleting a line of code. dlls/krnl386.exe16/wowthunk.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/krnl386.exe16/wowthunk.c b/dlls/krnl386.exe16/wowthunk.c index 0e9e9b6744c..800f3c275a5 100644 --- a/dlls/krnl386.exe16/wowthunk.c +++ b/dlls/krnl386.exe16/wowthunk.c @@ -93,7 +93,6 @@ static BOOL fix_selector( CONTEXT *context ) switch(instr[0]) { case 0x07: /* pop es */ - case 0x17: /* pop ss */ case 0x1f: /* pop ds */ break; case 0x0f: /* extended instruction */ -- 2.33.0

1 0

[PATCH v2] winebus.sys: Fix non-Linux builds
by Gerald Pfeifer 26 Sep '21

26 Sep '21

commit 40a9f69a1de088fb72c6b8966bc4333dea5fdfff winebus.sys: Rename UDEV bus device variables to be consistent. Introducing a struct base_device, and hidraw_device / lnxev_device depending on the sub-type of the device. moved an existing use of ABS_VOLUME that was guarded by #ifdef HAS_PROPER_INPUT_HEADER outside that guard, breaking the build on non-Linux platforms. Address this by putting appropriate guards in place. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/winebus.sys/bus_udev.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 88db78360e2..4f398e495fc 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -116,6 +116,9 @@ struct hidraw_device }; #define HID_REL_MAX (REL_MISC+1) + +#ifdef HAS_PROPER_INPUT_HEADER + #define HID_ABS_MAX (ABS_VOLUME+1) struct lnxev_device @@ -130,6 +133,8 @@ struct lnxev_device int haptic_effect_id; }; +#endif + static inline struct base_device *impl_from_unix_device(struct unix_device *iface) { return CONTAINING_RECORD(iface, struct base_device, unix_device); @@ -140,11 +145,15 @@ static inline struct hidraw_device *hidraw_impl_from_unix_device(struct unix_dev return CONTAINING_RECORD(impl_from_unix_device(iface), struct hidraw_device, base); } +#ifdef HAS_PROPER_INPUT_HEADER + static inline struct lnxev_device *lnxev_impl_from_unix_device(struct unix_device *iface) { return CONTAINING_RECORD(impl_from_unix_device(iface), struct lnxev_device, base); } +#endif + #define MAX_DEVICES 128 static int close_fds[MAX_DEVICES]; static struct pollfd poll_fds[MAX_DEVICES]; -- 2.31.1

1 0

[PATCH] winebus.sys: Fix non-Linux builds
by Gerald Pfeifer 26 Sep '21

26 Sep '21

commit 40a9f69a1de088fb72c6b8966bc4333dea5fdfff winebus.sys: Rename UDEV bus device variables to be consistent. Introducing a struct base_device, and hidraw_device / lnxev_device depending on the sub-type of the device. moved an existing use of ABS_VOLUME that was guarded by #ifdef HAS_PROPER_INPUT_HEADER outside that guard, breaking the build on non-Linux platforms. Address this by putting appropriate guards in place again. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/winebus.sys/bus_udev.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 88db78360e2..4f398e495fc 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -116,6 +116,9 @@ struct hidraw_device }; #define HID_REL_MAX (REL_MISC+1) + +#ifdef HAS_PROPER_INPUT_HEADER + #define HID_ABS_MAX (ABS_VOLUME+1) struct lnxev_device @@ -130,6 +133,8 @@ struct lnxev_device int haptic_effect_id; }; +#endif + static inline struct base_device *impl_from_unix_device(struct unix_device *iface) { return CONTAINING_RECORD(iface, struct base_device, unix_device); @@ -140,11 +145,15 @@ static inline struct hidraw_device *hidraw_impl_from_unix_device(struct unix_dev return CONTAINING_RECORD(impl_from_unix_device(iface), struct hidraw_device, base); } +#ifdef HAS_PROPER_INPUT_HEADER + static inline struct lnxev_device *lnxev_impl_from_unix_device(struct unix_device *iface) { return CONTAINING_RECORD(impl_from_unix_device(iface), struct lnxev_device, base); } +#endif + #define MAX_DEVICES 128 static int close_fds[MAX_DEVICES]; static struct pollfd poll_fds[MAX_DEVICES]; -- 2.31.1

1 0

[PATCH 00/12 v2] Seventh step (and last to date) for Dwarf 3/4 support in dbghelp
by Eric Pouech 26 Sep '21

26 Sep '21

The following series implements: - better support for some compilation units descriptions - DW_OP_call_frame_cfa implementation: gcc when emitting dwarf4, heavily uses this for describing vars/parameters. - silencing some unsupported yet elements - now letting dbghelp, **by default**, load compilations unit with dwarf 2, 3 or 4 debug information - by option, let wine be compiled with dwarf4 debug information (default is still dwarf 2) (using DEBUGFORMAT=dwarf-4 and CROSSDEBUG=dwarf-4 as configure options) Changes from v2 - more silencing - reordered patch order for having configure bits at the end - added support for local variables with constant values - simplified a bit call_frame_cfa handling Last patch requires re-running autoconf before applying. A+ --- Eric Pouech (12): dbghelp/dwarf: Fixed a couple of parent/child mismatch dbghelp/dwarf: Added support for partial compilation units dbghelp/dwarf: added support for DW_TAG_imported_unit dbghelp/dwarf: pass cuhead to loc_compute_frame dbghelp/dwarf: split dwarf2_virtual_unwind into two functions dbghelp/dwarf: Added support for OP_call_frame_cfa dbghelp/dwarf: Silence a couple of dwarf DIE's tag in load_one_debug_entry dbghelp/dwarf: downgrade FIXME into WARN for empty range dbghelp/dwarf: added support for local variables with constant values dbghelp/dwarf: fix incorrect WARN dbghelp/dwarf: Bumping max supported version (by default) up to 4 configure: allow picking up a dedicated dwarf version from command line configure | 168 ++++++++++++++++++++++---- configure.ac | 15 ++- dlls/dbghelp/dbghelp_private.h | 4 + dlls/dbghelp/dwarf.c | 212 +++++++++++++++++++++++---------- dlls/dbghelp/symbol.c | 36 ++++++ 5 files changed, 347 insertions(+), 88 deletions(-)

1 12

[PATCH] po: Update Dutch translation
by Floris Renaud 25 Sep '21

25 Sep '21

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/po/nl.po b/po/nl.po index e4616d5aacf..e0daa9dff21 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-09-11 20:20+0200\n" +"PO-Revision-Date: 2021-09-25 22:40+0200\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -787,7 +787,7 @@ msgstr "Gelijke &hoofd-/kleine letters" #: dlls/comdlg32/comdlg32.rc:325 dlls/joy.cpl/joy.rc:76 msgid "Direction" -msgstr "Zoekrichting" +msgstr "Oriëntatie" #: dlls/comdlg32/comdlg32.rc:326 programs/view/view.rc:42 msgid "&Up" @@ -3722,34 +3722,28 @@ msgid "&Disable" msgstr "&Uitzetten" #: dlls/joy.cpl/joy.rc:41 -#, fuzzy -#| msgid "Reset" msgid "&Reset" -msgstr "Terugzetten" +msgstr "&Terugzetten" #: dlls/joy.cpl/joy.rc:42 msgid "&Enable" -msgstr "Activ&eren" +msgstr "&Activeren" #: dlls/joy.cpl/joy.rc:43 -#, fuzzy -#| msgid "Edit Override" msgid "&Override" -msgstr "DLL Bewerken" +msgstr "&Overschrijven" #: dlls/joy.cpl/joy.rc:44 msgid "Connected" msgstr "Verbonden" #: dlls/joy.cpl/joy.rc:46 -#, fuzzy -#| msgid "Voice input device:" msgid "Connected (xinput device)" -msgstr "Steminvoer apparaat:" +msgstr "Verbonden (xinput apparaat)" #: dlls/joy.cpl/joy.rc:48 msgid "Disabled" -msgstr "Deactiveren" +msgstr "Uitgeschakeld" #: dlls/joy.cpl/joy.rc:50 msgid "" @@ -3757,7 +3751,7 @@ msgid "" "updated here until you restart this applet." msgstr "" "Na het uit- of inschakelen van een apparaat zullen de aangesloten joysticks " -"niet vernieuwd worden totdat u deze applet herstart." +"niet vernieuwd worden totdat deze applicatie herstart wordt." #: dlls/joy.cpl/joy.rc:55 msgid "Test Joystick" -- 2.33.0

1 0

[PATCH 1/5] d3d10/effect: Validate shared object types against the pool.
by Nikolay Sivov 25 Sep '21

25 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10/effect.c | 81 +++++++++++++++++++++++++++++++++++--- dlls/d3d10/tests/effect.c | 34 ++++++++++------ 3 files changed, 99 insertions(+), 18 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 21530b3d30c..7f64e811e9f 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -270,7 +270,7 @@ struct d3d10_effect DWORD variable_count; DWORD local_variable_count; DWORD sharedbuffers_count; - DWORD sharedobjects_count; + DWORD shared_object_count; DWORD technique_count; DWORD index_offset; DWORD texture_count; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 71bc8161c76..1913d621ecc 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -50,6 +50,7 @@ static inline struct d3d10_effect *impl_from_ID3D10EffectPool(ID3D10EffectPool * } static const struct ID3D10EffectVtbl d3d10_effect_pool_effect_vtbl; +static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v); static const struct ID3D10EffectTechniqueVtbl d3d10_effect_technique_vtbl; static const struct ID3D10EffectPassVtbl d3d10_effect_pass_vtbl; @@ -2096,8 +2097,8 @@ static HRESULT create_state_object(struct d3d10_effect_variable *v) return S_OK; } -static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, - const char **ptr, struct d3d10_effect_variable *v) +static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, + const char **ptr, BOOL shared_type_desc, struct d3d10_effect_variable *v) { unsigned int i; HRESULT hr; @@ -2119,6 +2120,9 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, read_dword(ptr, &v->explicit_bind_point); TRACE("Variable explicit bind point %#x.\n", v->explicit_bind_point); + /* Shared variable description contains only type information. */ + if (shared_type_desc) return S_OK; + switch (v->type->basetype) { case D3D10_SVT_TEXTURE: @@ -2534,6 +2538,50 @@ static void d3d10_effect_type_destroy(struct wine_rb_entry *entry, void *context heap_free(t); } +static BOOL d3d10_effect_types_match(const struct d3d10_effect_type *t1, + const struct d3d10_effect_type *t2) +{ + unsigned int i; + + if (strcmp(t1->name, t2->name)) return FALSE; + if (t1->basetype != t2->basetype) return FALSE; + if (t1->type_class != t2->type_class) return FALSE; + if (t1->element_count != t2->element_count) return FALSE; + if (t1->element_count) return d3d10_effect_types_match(t1->elementtype, t2->elementtype); + if (t1->member_count != t2->member_count) return FALSE; + if (t1->column_count != t2->column_count) return FALSE; + if (t1->row_count != t2->row_count) return FALSE; + + for (i = 0; i < t1->member_count; ++i) + { + if (strcmp(t1->members[i].name, t2->members[i].name)) return FALSE; + if (t1->members[i].buffer_offset != t2->members[i].buffer_offset) return FALSE; + if (!d3d10_effect_types_match(t1->members[i].type, t2->members[i].type)) return FALSE; + } + + return TRUE; +} + +static HRESULT d3d10_effect_validate_shared_variable(const struct d3d10_effect *effect, + const struct d3d10_effect_variable *v) +{ + ID3D10EffectVariable *sv = effect->pool->lpVtbl->GetVariableByName(effect->pool, v->name); + + if (!sv->lpVtbl->IsValid(sv)) + { + WARN("Variable %s wasn't found in the pool.\n", debugstr_a(v->name)); + return E_INVALIDARG; + } + + if (!d3d10_effect_types_match(impl_from_ID3D10EffectVariable(sv)->type, v->type)) + { + WARN("Variable %s type does not match pool type.\n", debugstr_a(v->name)); + return E_INVALIDARG; + } + + return S_OK; +} + static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD data_size) { const char *ptr; @@ -2596,10 +2644,27 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d v->ID3D10EffectVariable_iface.lpVtbl = &d3d10_effect_variable_vtbl; v->buffer = &null_local_buffer; - if (FAILED(hr = parse_fx10_local_variable(data, data_size, &ptr, v))) + if (FAILED(hr = parse_fx10_object_variable(data, data_size, &ptr, FALSE, v))) return hr; } + for (i = 0; i < e->shared_object_count; ++i) + { + struct d3d10_effect_variable o = { 0 }; + + o.effect = e; + + if (FAILED(hr = parse_fx10_object_variable(data, data_size, &ptr, TRUE, &o))) + { + d3d10_effect_variable_destroy(&o); + return hr; + } + + hr = d3d10_effect_validate_shared_variable(e, &o); + d3d10_effect_variable_destroy(&o); + if (FAILED(hr)) return hr; + } + for (i = 0; i < e->technique_count; ++i) { struct d3d10_effect_technique *t = &e->techniques[i]; @@ -2644,8 +2709,8 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s read_dword(&ptr, &unused); TRACE("Pool variable count: %u\n", unused); - read_dword(&ptr, &e->sharedobjects_count); - TRACE("Pool objects count: %u\n", e->sharedobjects_count); + read_dword(&ptr, &e->shared_object_count); + TRACE("Pool objects count: %u\n", e->shared_object_count); read_dword(&ptr, &e->technique_count); TRACE("Technique count: %u\n", e->technique_count); @@ -2683,6 +2748,12 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s read_dword(&ptr, &e->anonymous_shader_count); TRACE("Anonymous shader count: %u\n", e->anonymous_shader_count); + if (!e->pool && e->shared_object_count) + { + WARN("Effect requires a pool to load.\n"); + return E_FAIL; + } + return parse_fx10_body(e, ptr, data_size - (ptr - data)); } diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 9daf3faf8d0..5e54925abb2 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -6335,11 +6335,15 @@ cbuffer l_cb2 float f3; }; +shared BlendState s_blendstate; +shared Texture s_texture; +shared PixelShader ps; + technique10 tech_child { pass P0 { - SetPixelShader(NULL); + SetPixelShader(ps); SetVertexShader(NULL); SetGeometryShader(NULL); } @@ -6347,19 +6351,25 @@ technique10 tech_child #endif static DWORD fx_test_pool_child[] = { - 0x43425844, 0x5addae59, 0x62b6f327, 0x0ca7b6a5, 0x61338a81, 0x00000001, 0x00000198, 0x00000001, - 0x00000024, 0x30315846, 0x0000016c, 0xfeff1001, 0x00000002, 0x00000002, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000001, 0x00000070, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x43425844, 0x22800afa, 0xe318151b, 0xcb3e7d52, 0x186ecbe3, 0x00000001, 0x00000249, 0x00000001, + 0x00000024, 0x30315846, 0x0000021d, 0xfeff1001, 0x00000002, 0x00000002, 0x00000000, 0x00000000, + 0x00000000, 0x00000003, 0x00000001, 0x000000f1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x62635f6c, 0x6f6c6600, 0x09007461, 0x01000000, 0x00000000, 0x04000000, 0x10000000, 0x04000000, 0x09000000, - 0x66000009, 0x4f430030, 0x30524f4c, 0x635f6c00, 0x66003262, 0x65740033, 0x635f6863, 0x646c6968, - 0x00305000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, - 0x00000002, 0x00000000, 0x00000004, 0x00000010, 0x00000000, 0x00000001, 0xffffffff, 0x00000000, - 0x0000002b, 0x0000000f, 0x0000002e, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000035, - 0x00000010, 0x00000000, 0x00000001, 0xffffffff, 0x00000000, 0x0000003b, 0x0000000f, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000003e, 0x00000001, 0x00000000, 0x00000049, - 0x00000003, 0x00000000, 0x00000007, 0x00000000, 0x00000001, 0x0000004c, 0x00000006, 0x00000000, - 0x00000001, 0x00000058, 0x00000008, 0x00000000, 0x00000001, 0x00000064, + 0x66000009, 0x4f430030, 0x30524f4c, 0x635f6c00, 0x66003262, 0x6c420033, 0x53646e65, 0x65746174, + 0x00003e00, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000200, 0x625f7300, + 0x646e656c, 0x74617473, 0x65740065, 0x72757478, 0x00720065, 0x00020000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00090000, 0x5f730000, 0x74786574, 0x00657275, 0x65786950, 0x6168536c, + 0x00726564, 0x000000a0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, + 0x74007370, 0x5f686365, 0x6c696863, 0x30500064, 0x00000100, 0x00000200, 0x00000000, 0x00000100, + 0x00000200, 0x00000000, 0x00000400, 0x00001000, 0x00000000, 0x00000100, 0xffffff00, 0x000000ff, + 0x00002b00, 0x00000f00, 0x00002e00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00003500, + 0x00001000, 0x00000000, 0x00000100, 0xffffff00, 0x000000ff, 0x00003b00, 0x00000f00, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00006500, 0x00004900, 0x00000000, 0xffffff00, + 0x000096ff, 0x00007a00, 0x00000000, 0xffffff00, 0x0000c8ff, 0x0000ac00, 0x00000000, 0xffffff00, + 0x0000cbff, 0x00000100, 0x00000000, 0x0000d600, 0x00000300, 0x00000000, 0x00000700, 0x00000000, + 0x00000200, 0x0000c800, 0x00000600, 0x00000000, 0x00000100, 0x0000d900, 0x00000800, 0x00000000, + 0x00000100, 0x0000e500, 0x00000000, }; static void test_effect_pool(void) -- 2.33.0

3 11

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 25 Sep '21

25 Sep '21

1 0

[PATCH 1/5] include: Define EVENT_OBJECT_INVOKED.
by Connor McAdams 25 Sep '21

25 Sep '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- include/winuser.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winuser.h b/include/winuser.h index 260024d7e91..898c9034e33 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3256,6 +3256,7 @@ typedef struct #define EVENT_OBJECT_HELPCHANGE 0x8010 #define EVENT_OBJECT_DEFACTIONCHANGE 0x8011 #define EVENT_OBJECT_ACCELERATORCHANGE 0x8012 +#define EVENT_OBJECT_INVOKED 0x8013 /* Sound events */ #define SOUND_SYSTEM_STARTUP 1 -- 2.25.1

2 8

Wine staging 6.18 release
by Alistair Leslie-Hughes 25 Sep '21

25 Sep '21

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.18 (616 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * ntoskrnl.exe: Return driver dispatch result to caller. * ntoskrnl.exe: Always copy the buffer for non-METHOD_BUFFERED ioctls. * server: Delay completing a synchronous IRP. * shell32: Set SFGAO_HASSUBFOLDER correctly for unixfs. * shell32: Do not use unixfs for devices without mountpoint. * api-ms-win-core-psapi-l1-1-0: Add K32GetModuleBaseNameW and K32GetModuleInformation. * api-ms-win-core-psapi-ansi-l1-1-0: add K32GetModuleBaseNameA Added: * [49089] fltmgr.sys: Implement FltBuildDefaultSecurityDescriptor. * [47505] wininet: Stop LevelHead from crashing on startup. * [49641] sapi: Implement ISpObjectToken-CreateInstance. * [51775] sapi: Allow iteration of Token objects. Updated: * mfplat-streaming-support Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] winegcc: Only add -static-libgcc if -nodefaultlibs weren't given. (Clang)
by Chip Davis 25 Sep '21

25 Sep '21

The flag does nothing if -nodefaultlibs or -nostdlib were given, because the driver does not automatically link to libgcc/compiler-rt in that case. Clang will warn about this, which is annoying, which clutters up the output, and which makes it impossible to use -Werror when building with Clang. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- tools/winegcc/winegcc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 256c97bde000..90aab7925ceb 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -538,7 +538,8 @@ static struct strarray get_link_args( struct options *opts, const char *output_n strarray_add( &flags, "-Wl,--large-address-aware" ); /* make sure we don't need a libgcc_s dll on Windows */ - strarray_add( &flags, "-static-libgcc" ); + if (!opts->nodefaultlibs && !opts->use_msvcrt) + strarray_add( &flags, "-static-libgcc" ); if (opts->debug_file && strendswith(opts->debug_file, ".pdb")) strarray_add(&link_args, strmake("-Wl,-pdb,%s", opts->debug_file)); -- 2.33.0

1 0

[PATCH 1/2] ntdll: Implement LdrGetDllHandleEx() function.
by Paul Gofman 24 Sep '21

24 Sep '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/kernel32/tests/module.c | 107 +++++++++++++++++++++++++++++++++++ dlls/ntdll/loader.c | 44 ++++++++++++-- dlls/ntdll/ntdll.spec | 1 + include/winternl.h | 5 ++ 4 files changed, 152 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 0066f7de5a8..5ca137ad6ba 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -39,6 +39,9 @@ static BOOL (WINAPI *pK32GetModuleInformation)(HANDLE process, HMODULE module, static NTSTATUS (WINAPI *pLdrGetDllDirectory)(UNICODE_STRING*); static NTSTATUS (WINAPI *pLdrSetDllDirectory)(UNICODE_STRING*); +static NTSTATUS (WINAPI *pLdrGetDllHandle)( LPCWSTR load_path, ULONG flags, const UNICODE_STRING *name, HMODULE *base ); +static NTSTATUS (WINAPI *pLdrGetDllHandleEx)( ULONG flags, LPCWSTR load_path, ULONG *dll_characteristics, + const UNICODE_STRING *name, HMODULE *base ); static BOOL is_unicode_enabled = TRUE; @@ -826,6 +829,8 @@ static void init_pointers(void) mod = GetModuleHandleA( "ntdll.dll" ); MAKEFUNC(LdrGetDllDirectory); MAKEFUNC(LdrSetDllDirectory); + MAKEFUNC(LdrGetDllHandle); + MAKEFUNC(LdrGetDllHandleEx); #undef MAKEFUNC /* before Windows 7 this was not exported in kernel32 */ @@ -1143,6 +1148,107 @@ static void test_SetDefaultDllDirectories(void) pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_DEFAULT_DIRS ); } +static void check_refcount( HMODULE mod, unsigned int refcount ) +{ + unsigned int i; + BOOL ret; + + for (i = 0; i < min( refcount, 10 ); ++i) + { + ret = FreeLibrary( mod ); + ok( ret || broken( refcount == ~0u && GetLastError() == ERROR_MOD_NOT_FOUND && i == 2 ) /* Win8 */, + "Refcount test failed, i %u, error %u.\n", i, GetLastError() ); + if (!ret) return; + } + if (refcount != ~0u) + { + ret = FreeLibrary( mod ); + ok( !ret && GetLastError() == ERROR_MOD_NOT_FOUND, "Refcount test failed, ret %d, error %u.\n", + ret, GetLastError() ); + } +} + +static void test_LdrGetDllHandleEx(void) +{ + HMODULE mod, loaded_mod; + UNICODE_STRING name; + NTSTATUS status; + unsigned int i; + + if (!pLdrGetDllHandleEx) + { + win_skip( "LdrGetDllHandleEx is not available.\n" ); + return; + } + + RtlInitUnicodeString( &name, L"unknown.dll" ); + status = pLdrGetDllHandleEx( 0, NULL, NULL, &name, &mod ); + ok( status == STATUS_DLL_NOT_FOUND, "Got unexpected status %#x.\n", status ); + + RtlInitUnicodeString( &name, L"authz.dll" ); + loaded_mod = LoadLibraryW( name.Buffer ); + ok( !!loaded_mod, "Failed to load module.\n" ); + status = pLdrGetDllHandleEx( 0, NULL, NULL, &name, &mod ); + ok( !status, "Got unexpected status %#x.\n", status ); + ok( mod == loaded_mod, "got %p\n", mod ); + winetest_push_context( "Flags 0" ); + check_refcount( loaded_mod, 2 ); + winetest_pop_context(); + + loaded_mod = LoadLibraryW( name.Buffer ); + ok( !!loaded_mod, "Failed to load module.\n" ); + status = pLdrGetDllHandleEx( LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, NULL, + NULL, &name, &mod ); + ok( !status, "Got unexpected status %#x.\n", status ); + ok( mod == loaded_mod, "got %p\n", mod ); + winetest_push_context( "LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT" ); + check_refcount( loaded_mod, 1 ); + winetest_pop_context(); + + loaded_mod = LoadLibraryW( name.Buffer ); + ok( !!loaded_mod, "Failed to load module.\n" ); + status = pLdrGetDllHandle( NULL, ~0u, &name, &mod ); + ok( !status, "Got unexpected status %#x.\n", status ); + ok( mod == loaded_mod, "got %p\n", mod ); + winetest_push_context( "LdrGetDllHandle" ); + check_refcount( loaded_mod, 1 ); + winetest_pop_context(); + + loaded_mod = LoadLibraryW( name.Buffer ); + ok( !!loaded_mod, "Failed to load module.\n" ); + status = pLdrGetDllHandleEx( 4, NULL, NULL, (void *)&name, &mod ); + ok( !status, "Got unexpected status %#x.\n", status ); + ok( mod == loaded_mod, "got %p\n", mod ); + winetest_push_context( "Flag 4" ); + check_refcount( loaded_mod, 2 ); + winetest_pop_context(); + + for (i = 3; i < 32; ++i) + { + loaded_mod = LoadLibraryW( name.Buffer ); + ok( !!loaded_mod, "Failed to load module.\n" ); + status = pLdrGetDllHandleEx( 1 << i, NULL, NULL, &name, &mod ); + ok( status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status ); + winetest_push_context( "Invalid flags, i %u", i ); + check_refcount( loaded_mod, 1 ); + winetest_pop_context(); + } + + status = pLdrGetDllHandleEx( LDR_GET_DLL_HANDLE_EX_FLAG_PIN | LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, + NULL, NULL, &name, &mod ); + ok( status == STATUS_INVALID_PARAMETER, "Got unexpected status %#x.\n", status ); + + loaded_mod = LoadLibraryW( name.Buffer ); + ok( !!loaded_mod, "Failed to load module.\n" ); + status = pLdrGetDllHandleEx( LDR_GET_DLL_HANDLE_EX_FLAG_PIN, NULL, + NULL, &name, &mod ); + ok( !status, "Got unexpected status %#x.\n", status ); + ok( mod == loaded_mod, "got %p\n", mod ); + winetest_push_context( "LDR_GET_DLL_HANDLE_EX_FLAG_PIN" ); + check_refcount( loaded_mod, ~0u ); + winetest_pop_context(); +} + START_TEST(module) { WCHAR filenameW[MAX_PATH]; @@ -1175,4 +1281,5 @@ START_TEST(module) testK32GetModuleInformation(); test_AddDllDirectory(); test_SetDefaultDllDirectories(); + test_LdrGetDllHandleEx(); } diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 819cf51b9fc..339873129f3 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2996,16 +2996,33 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH LdrLoadDll(LPCWSTR path_name, DWORD flags, /****************************************************************** - * LdrGetDllHandle (NTDLL.@) + * LdrGetDllHandleEx (NTDLL.@) */ -NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_STRING *name, HMODULE *base ) +NTSTATUS WINAPI LdrGetDllHandleEx( ULONG flags, LPCWSTR load_path, ULONG *dll_characteristics, + const UNICODE_STRING *name, HMODULE *base ) { - NTSTATUS status; + static const ULONG supported_flags = LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT + | LDR_GET_DLL_HANDLE_EX_FLAG_PIN; + static const ULONG valid_flags = LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT + | LDR_GET_DLL_HANDLE_EX_FLAG_PIN | 4; + SECTION_IMAGE_INFORMATION image_info; UNICODE_STRING nt_name; + struct file_id id; + NTSTATUS status; WINE_MODREF *wm; HANDLE mapping; - SECTION_IMAGE_INFORMATION image_info; - struct file_id id; + + TRACE( "flag %#x, load_path %p, dll_characteristics %p, name %p, base %p.\n", + flags, load_path, dll_characteristics, name, base ); + + if (flags & ~valid_flags) return STATUS_INVALID_PARAMETER; + + if ((flags & (LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT | LDR_GET_DLL_HANDLE_EX_FLAG_PIN)) + == (LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT | LDR_GET_DLL_HANDLE_EX_FLAG_PIN)) + return STATUS_INVALID_PARAMETER; + + if (flags & ~supported_flags) FIXME( "Unsupported flags %#x.\n", flags ); + if (dll_characteristics) FIXME( "dll_characteristics unsupported.\n" ); RtlEnterCriticalSection( &loader_section ); @@ -3019,12 +3036,29 @@ NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_S } RtlFreeUnicodeString( &nt_name ); + if (!status) + { + if (flags & LDR_GET_DLL_HANDLE_EX_FLAG_PIN) + LdrAddRefDll( LDR_ADDREF_DLL_PIN, *base ); + else if (!(flags & LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) + LdrAddRefDll( 0, *base ); + } + RtlLeaveCriticalSection( &loader_section ); TRACE( "%s -> %p (load path %s)\n", debugstr_us(name), status ? NULL : *base, debugstr_w(load_path) ); return status; } +/****************************************************************** + * LdrGetDllHandle (NTDLL.@) + */ +NTSTATUS WINAPI LdrGetDllHandle( LPCWSTR load_path, ULONG flags, const UNICODE_STRING *name, HMODULE *base ) +{ + return LdrGetDllHandleEx( LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, load_path, NULL, name, base ); +} + + /****************************************************************** * LdrAddRefDll (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 9837b09fd51..0f8ddbea669 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -88,6 +88,7 @@ @ stub LdrFlushAlternateResourceModules @ stdcall LdrGetDllDirectory(ptr) @ stdcall LdrGetDllHandle(wstr long ptr ptr) +@ stdcall LdrGetDllHandleEx(long ptr ptr ptr ptr) # @ stub LdrGetDllHandleEx @ stdcall LdrGetDllPath(wstr long ptr ptr) @ stdcall LdrGetProcedureAddress(ptr ptr long ptr) diff --git a/include/winternl.h b/include/winternl.h index 9e96591ad8e..7a3a5e94702 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3380,6 +3380,10 @@ typedef void (CALLBACK *PLDR_DLL_NOTIFICATION_FUNCTION)(ULONG, LDR_DLL_NOTIFICAT /* flag for LdrAddRefDll */ #define LDR_ADDREF_DLL_PIN 0x00000001 +/* flags for LdrGetDllHandleEx */ +#define LDR_GET_DLL_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT 0x00000001 +#define LDR_GET_DLL_HANDLE_EX_FLAG_PIN 0x00000002 + #define LDR_DLL_NOTIFICATION_REASON_LOADED 1 #define LDR_DLL_NOTIFICATION_REASON_UNLOADED 2 @@ -3778,6 +3782,7 @@ NTSYSAPI NTSTATUS WINAPI LdrFindResourceDirectory_U(HMODULE,const LDR_RESOURCE_ NTSYSAPI NTSTATUS WINAPI LdrFindResource_U(HMODULE,const LDR_RESOURCE_INFO*,ULONG,const IMAGE_RESOURCE_DATA_ENTRY**); NTSYSAPI NTSTATUS WINAPI LdrGetDllDirectory(UNICODE_STRING*); NTSYSAPI NTSTATUS WINAPI LdrGetDllHandle(LPCWSTR, ULONG, const UNICODE_STRING*, HMODULE*); +NTSYSAPI NTSTATUS WINAPI LdrGetDllHandleEx(ULONG, LPCWSTR, ULONG *, const UNICODE_STRING*, HMODULE*); NTSYSAPI NTSTATUS WINAPI LdrGetDllPath(PCWSTR,ULONG,PWSTR*,PWSTR*); NTSYSAPI NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE, const ANSI_STRING*, ULONG, void**); NTSYSAPI NTSTATUS WINAPI LdrLoadDll(LPCWSTR, DWORD, const UNICODE_STRING*, HMODULE*); -- 2.31.1

1 1

[PATCH v3 1/8] oleacc: Reorganize class specific behaviour handling.
by Connor McAdams 24 Sep '21

24 Sep '21

From: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/client.c | 36 ++++++++++++++++ dlls/oleacc/main.c | 82 +++++------------------------------- dlls/oleacc/oleacc_private.h | 7 +++ 3 files changed, 53 insertions(+), 72 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 93f6b590f78..333a95dc388 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -19,6 +19,7 @@ #define COBJMACROS #include "oleacc_private.h" +#include "commctrl.h" #include "wine/debug.h" #include "wine/heap.h" @@ -650,6 +651,39 @@ static const IEnumVARIANTVtbl ClientEnumVARIANTVtbl = { Client_EnumVARIANT_Clone }; +static const struct win_class_data classes[] = { + {WC_LISTBOXW, 0x10000, TRUE}, + {L"#32768", 0x10001, TRUE}, /* menu */ + {WC_BUTTONW, 0x10002, TRUE}, + {WC_STATICW, 0x10003, TRUE}, + {WC_EDITW, 0x10004, TRUE}, + {WC_COMBOBOXW, 0x10005, TRUE}, + {L"#32770", 0x10006, TRUE}, /* dialog */ + {L"#32771", 0x10007, TRUE}, /* winswitcher */ + {L"MDIClient", 0x10008, TRUE}, + {L"#32769", 0x10009, TRUE}, /* desktop */ + {WC_SCROLLBARW, 0x1000a, TRUE}, + {STATUSCLASSNAMEW, 0x1000b, TRUE}, + {TOOLBARCLASSNAMEW, 0x1000c, TRUE}, + {PROGRESS_CLASSW, 0x1000d, TRUE}, + {ANIMATE_CLASSW, 0x1000e, TRUE}, + {WC_TABCONTROLW, 0x1000f, TRUE}, + {HOTKEY_CLASSW, 0x10010, TRUE}, + {WC_HEADERW, 0x10011, TRUE}, + {TRACKBAR_CLASSW, 0x10012, TRUE}, + {WC_LISTVIEWW, 0x10013, TRUE}, + {UPDOWN_CLASSW, 0x10016, TRUE}, + {TOOLTIPS_CLASSW, 0x10018, TRUE}, + {WC_TREEVIEWW, 0x10019, TRUE}, + {MONTHCAL_CLASSW, 0, TRUE}, + {DATETIMEPICK_CLASSW, 0, TRUE}, + {WC_IPADDRESSW, 0, TRUE}, + {L"RICHEDIT", 0x1001c, TRUE}, + {L"RichEdit20A", 0, TRUE}, + {L"RichEdit20W", 0, TRUE}, + {NULL} +}; + HRESULT create_client_object(HWND hwnd, const IID *iid, void **obj) { Client *client; @@ -662,6 +696,8 @@ HRESULT create_client_object(HWND hwnd, const IID *iid, void **obj) if(!client) return E_OUTOFMEMORY; + find_class_data(hwnd, classes); + client->IAccessible_iface.lpVtbl = &ClientVtbl; client->IOleWindow_iface.lpVtbl = &ClientOleWindowVtbl; client->IEnumVARIANT_iface.lpVtbl = &ClientEnumVARIANTVtbl; diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index db9f646988c..3ce616ae0c1 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -20,13 +20,6 @@ #define COBJMACROS -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "ole2.h" -#include "commctrl.h" -#include "rpcproxy.h" - #include "initguid.h" #include "oleacc_private.h" #include "resource.h" @@ -37,50 +30,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); static const WCHAR lresult_atom_prefix[] = {'w','i','n','e','_','o','l','e','a','c','c',':'}; -typedef HRESULT (*accessible_create)(HWND, const IID*, void**); - extern HRESULT WINAPI OLEACC_DllGetClassObject(REFCLSID, REFIID, void**) DECLSPEC_HIDDEN; extern BOOL WINAPI OLEACC_DllMain(HINSTANCE, DWORD, void*) DECLSPEC_HIDDEN; extern HRESULT WINAPI OLEACC_DllRegisterServer(void) DECLSPEC_HIDDEN; extern HRESULT WINAPI OLEACC_DllUnregisterServer(void) DECLSPEC_HIDDEN; -static struct { - const WCHAR *name; - DWORD idx; - accessible_create create_client; - accessible_create create_window; -} builtin_classes[] = { - {WC_LISTBOXW, 0x10000, NULL, NULL}, - {L"#32768", 0x10001, NULL, NULL}, /* menu */ - {WC_BUTTONW, 0x10002, NULL, NULL}, - {WC_STATICW, 0x10003, NULL, NULL}, - {WC_EDITW, 0x10004, NULL, NULL}, - {WC_COMBOBOXW, 0x10005, NULL, NULL}, - {L"#32770", 0x10006, NULL, NULL}, /* dialog */ - {L"#32771", 0x10007, NULL, NULL}, /* winswitcher */ - {L"MDIClient", 0x10008, NULL, NULL}, - {L"#32769", 0x10009, NULL, NULL}, /* desktop */ - {WC_SCROLLBARW, 0x1000a, NULL, NULL}, - {STATUSCLASSNAMEW, 0x1000b, NULL, NULL}, - {TOOLBARCLASSNAMEW, 0x1000c, NULL, NULL}, - {PROGRESS_CLASSW, 0x1000d, NULL, NULL}, - {ANIMATE_CLASSW, 0x1000e, NULL, NULL}, - {WC_TABCONTROLW, 0x1000f, NULL, NULL}, - {HOTKEY_CLASSW, 0x10010, NULL, NULL}, - {WC_HEADERW, 0x10011, NULL, NULL}, - {TRACKBAR_CLASSW, 0x10012, NULL, NULL}, - {WC_LISTVIEWW, 0x10013, NULL, NULL}, - {UPDOWN_CLASSW, 0x10016, NULL, NULL}, - {TOOLTIPS_CLASSW, 0x10018, NULL, NULL}, - {WC_TREEVIEWW, 0x10019, NULL, NULL}, - {MONTHCAL_CLASSW, 0, NULL, NULL}, - {DATETIMEPICK_CLASSW, 0, NULL, NULL}, - {WC_IPADDRESSW, 0, NULL, NULL}, - {L"RICHEDIT", 0x1001c, NULL, NULL}, - {L"RichEdit20A", 0, NULL, NULL}, - {L"RichEdit20W", 0, NULL, NULL}, -}; - static HINSTANCE oleacc_handle = 0; int convert_child_id(VARIANT *v) @@ -94,7 +48,7 @@ int convert_child_id(VARIANT *v) } } -static accessible_create get_builtin_accessible_obj(HWND hwnd, LONG objid) +const struct win_class_data* find_class_data(HWND hwnd, const struct win_class_data *classes) { WCHAR class_name[64]; int i, idx; @@ -103,31 +57,21 @@ static accessible_create get_builtin_accessible_obj(HWND hwnd, LONG objid) return NULL; TRACE("got window class: %s\n", debugstr_w(class_name)); - for(i=0; i<ARRAY_SIZE(builtin_classes); i++) { - if(!wcsicmp(class_name, builtin_classes[i].name)) { - accessible_create ret; - - ret = (objid==OBJID_CLIENT ? - builtin_classes[i].create_client : - builtin_classes[i].create_window); - if(!ret) + for(i=0; classes[i].name; i++) { + if(!wcsicmp(class_name, classes[i].name)) { + if(classes[i].stub) FIXME("unhandled window class: %s\n", debugstr_w(class_name)); - return ret; + return &classes[i]; } } idx = SendMessageW(hwnd, WM_GETOBJECT, 0, OBJID_QUERYCLASSNAMEIDX); if(idx) { - for(i=0; i<ARRAY_SIZE(builtin_classes); i++) { - if(idx == builtin_classes[i].idx) { - accessible_create ret; - - ret = (objid==OBJID_CLIENT ? - builtin_classes[i].create_client : - builtin_classes[i].create_window); - if(!ret) - FIXME("unhandled class name idx: %x\n", idx); - return ret; + for(i=0; classes[i].name; i++) { + if(idx == classes[i].idx) { + if(classes[i].stub) + FIXME("unhandled window class: %s\n", debugstr_w(class_name)); + return &classes[i]; } } @@ -140,19 +84,13 @@ static accessible_create get_builtin_accessible_obj(HWND hwnd, LONG objid) HRESULT WINAPI CreateStdAccessibleObject( HWND hwnd, LONG idObject, REFIID riidInterface, void** ppvObject ) { - accessible_create create; - TRACE("%p %d %s %p\n", hwnd, idObject, debugstr_guid( riidInterface ), ppvObject ); switch(idObject) { case OBJID_CLIENT: - create = get_builtin_accessible_obj(hwnd, idObject); - if(create) return create(hwnd, riidInterface, ppvObject); return create_client_object(hwnd, riidInterface, ppvObject); case OBJID_WINDOW: - create = get_builtin_accessible_obj(hwnd, idObject); - if(create) return create(hwnd, riidInterface, ppvObject); return create_window_object(hwnd, riidInterface, ppvObject); default: FIXME("unhandled object id: %d\n", idObject); diff --git a/dlls/oleacc/oleacc_private.h b/dlls/oleacc/oleacc_private.h index 32561ef3d2f..64926b6abb7 100644 --- a/dlls/oleacc/oleacc_private.h +++ b/dlls/oleacc/oleacc_private.h @@ -18,6 +18,13 @@ #include "oleacc_classes.h" +struct win_class_data { + const WCHAR *name; + DWORD idx; + BOOL stub; +}; +const struct win_class_data* find_class_data(HWND, const struct win_class_data*) DECLSPEC_HIDDEN; + HRESULT create_client_object(HWND, const IID*, void**) DECLSPEC_HIDDEN; HRESULT create_window_object(HWND, const IID*, void**) DECLSPEC_HIDDEN; HRESULT get_accpropservices_factory(REFIID, void**) DECLSPEC_HIDDEN; -- 2.25.1

2 9

[PATCH 00/10] Seventh step (and last to date) for Dwarf 3/4 support in dbghelp
by Eric Pouech 24 Sep '21

24 Sep '21

The following series implements: - better support for some compilation units descriptions - DW_OP_call_frame_cfa implementation: gcc when emitting dwarf4, heavily uses this for describing vars/parameters. - silencing some unsupported yet elements - now letting dbghelp, **by default**, load compilations unit with dwarf 2, 3 or 4 debug information - by option, let wine be compiled with dwarf4 debug information (default is still dwarf 2) A+ --- Eric Pouech (10): dbghelp/dwarf: Fixed a couple of parent/child mismatch dbghelp/dwarf: add vchildren field to SymTagExe's symt to retrieve all children (SymTagCompiland) dbghelp/dwarf: Added support for partial compilation units dbghelp/dwarf: added support for DW_TAG_imported_unit dbghelp/dwarf: pass cuhead to loc_compute_frame dbghelp/dwarf: split dwarf2_virtual_unwind into two functions dbghelp/dwarf: Added support for OP_call_frame_cfa dbghelp/dwarf: Silence a couple of dwarf DIE's tag in load_one_debug_entry configure: allow picking up a dedicated dwarf version from command line dbghelp/dwarf: Bumping max supported version (by default) up to 4 configure.ac | 15 ++- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/dwarf.c | 187 +++++++++++++++++++++++---------- dlls/dbghelp/symbol.c | 4 + dlls/dbghelp/type.c | 4 + 5 files changed, 153 insertions(+), 58 deletions(-)

1 10

[PATCH v2 1/7] oleacc: Add default edit client accessible object creation function.
by Connor McAdams 24 Sep '21

24 Sep '21

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/oleacc/client.c | 17 +++++++++++++++-- dlls/oleacc/main.c | 2 +- dlls/oleacc/oleacc_private.h | 1 + 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 93f6b590f78..99be7d9fa37 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -34,6 +34,7 @@ typedef struct { HWND hwnd; HWND enum_pos; + INT role; } Client; static inline Client* impl_from_Client(IAccessible *iface) @@ -220,7 +221,7 @@ static HRESULT WINAPI Client_get_accRole(IAccessible *iface, VARIANT varID, VARI } V_VT(pvarRole) = VT_I4; - V_I4(pvarRole) = ROLE_SYSTEM_CLIENT; + V_I4(pvarRole) = This->role; return S_OK; } @@ -650,7 +651,8 @@ static const IEnumVARIANTVtbl ClientEnumVARIANTVtbl = { Client_EnumVARIANT_Clone }; -HRESULT create_client_object(HWND hwnd, const IID *iid, void **obj) +static HRESULT create_class_object(HWND hwnd, const IID *iid, void **obj, + INT role) { Client *client; HRESULT hres; @@ -668,8 +670,19 @@ HRESULT create_client_object(HWND hwnd, const IID *iid, void **obj) client->ref = 1; client->hwnd = hwnd; client->enum_pos = 0; + client->role = role; hres = IAccessible_QueryInterface(&client->IAccessible_iface, iid, obj); IAccessible_Release(&client->IAccessible_iface); return hres; } + +HRESULT create_client_object(HWND hwnd, const IID *iid, void **obj) +{ + return create_class_object(hwnd, iid, obj, ROLE_SYSTEM_CLIENT); +} + +HRESULT create_edit_client_object(HWND hwnd, const IID *iid, void **obj) +{ + return create_class_object(hwnd, iid, obj, ROLE_SYSTEM_TEXT); +} diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index db9f646988c..813ebc64a6e 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -54,7 +54,7 @@ static struct { {L"#32768", 0x10001, NULL, NULL}, /* menu */ {WC_BUTTONW, 0x10002, NULL, NULL}, {WC_STATICW, 0x10003, NULL, NULL}, - {WC_EDITW, 0x10004, NULL, NULL}, + {WC_EDITW, 0x10004, create_edit_client_object, NULL}, {WC_COMBOBOXW, 0x10005, NULL, NULL}, {L"#32770", 0x10006, NULL, NULL}, /* dialog */ {L"#32771", 0x10007, NULL, NULL}, /* winswitcher */ diff --git a/dlls/oleacc/oleacc_private.h b/dlls/oleacc/oleacc_private.h index 32561ef3d2f..144009b1f33 100644 --- a/dlls/oleacc/oleacc_private.h +++ b/dlls/oleacc/oleacc_private.h @@ -19,6 +19,7 @@ #include "oleacc_classes.h" HRESULT create_client_object(HWND, const IID*, void**) DECLSPEC_HIDDEN; +HRESULT create_edit_client_object(HWND, const IID*, void**) DECLSPEC_HIDDEN; HRESULT create_window_object(HWND, const IID*, void**) DECLSPEC_HIDDEN; HRESULT get_accpropservices_factory(REFIID, void**) DECLSPEC_HIDDEN; -- 2.25.1

2 9

[PATCH] po: Update Japanese translation.
by Akihiro Sagawa 24 Sep '21

24 Sep '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- po/ja.po | 468 +++++++++++++++++++++++-------------------------------- 1 file changed, 192 insertions(+), 276 deletions(-)

1 0

[PATCH 1/5] ole32/itemmoniker: Always use generic composition in ComposeWith().
by Nikolay Sivov 24 Sep '21

24 Sep '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/itemmoniker.c | 76 +++++------------------------ dlls/ole32/tests/moniker.c | 97 ++++++++++++++++++++++---------------- 2 files changed, 68 insertions(+), 105 deletions(-) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index c42cc75c224..770b042aac7 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -511,77 +511,23 @@ static HRESULT WINAPI ItemMonikerImpl_Reduce(IMoniker* iface, return MK_S_REDUCED_TO_SELF; } -/****************************************************************************** - * ItemMoniker_ComposeWith - ******************************************************************************/ -static HRESULT WINAPI ItemMonikerImpl_ComposeWith(IMoniker* iface, - IMoniker* pmkRight, - BOOL fOnlyIfNotGeneric, - IMoniker** ppmkComposite) -{ - HRESULT res=S_OK; - DWORD mkSys,mkSys2, order; - IEnumMoniker* penumMk=0; - IMoniker *pmostLeftMk=0; - IMoniker* tempMkComposite=0; - - TRACE("(%p,%p,%d,%p)\n",iface,pmkRight,fOnlyIfNotGeneric,ppmkComposite); - - if ((ppmkComposite==NULL)||(pmkRight==NULL)) - return E_POINTER; - - *ppmkComposite=0; - - if (is_anti_moniker(pmkRight, &order)) - { - return order > 1 ? create_anti_moniker(order - 1, ppmkComposite) : S_OK; - } - else - /* if pmkRight is a composite whose leftmost component is an anti-moniker, */ - /* the returned moniker is the composite after the leftmost anti-moniker is removed. */ - IMoniker_IsSystemMoniker(pmkRight,&mkSys); - if(mkSys==MKSYS_GENERICCOMPOSITE){ - - res=IMoniker_Enum(pmkRight,TRUE,&penumMk); - - if (FAILED(res)) - return res; - - res=IEnumMoniker_Next(penumMk,1,&pmostLeftMk,NULL); - - IMoniker_IsSystemMoniker(pmostLeftMk,&mkSys2); - if(mkSys2==MKSYS_ANTIMONIKER){ - - IMoniker_Release(pmostLeftMk); +static HRESULT WINAPI ItemMonikerImpl_ComposeWith(IMoniker *iface, IMoniker *right, + BOOL only_if_not_generic, IMoniker **result) +{ + DWORD order; - tempMkComposite=iface; - IMoniker_AddRef(iface); + TRACE("%p, %p, %d, %p\n", iface, right, only_if_not_generic, result); - while(IEnumMoniker_Next(penumMk,1,&pmostLeftMk,NULL)==S_OK){ + if (!result || !right) + return E_POINTER; - res=CreateGenericComposite(tempMkComposite,pmostLeftMk,ppmkComposite); + *result = NULL; - IMoniker_Release(tempMkComposite); - IMoniker_Release(pmostLeftMk); + if (is_anti_moniker(right, &order)) + return order > 1 ? create_anti_moniker(order - 1, result) : S_OK; - tempMkComposite=*ppmkComposite; - IMoniker_AddRef(tempMkComposite); - } - return res; - } - else - return CreateGenericComposite(iface,pmkRight,ppmkComposite); - } - /* If pmkRight is not an anti-moniker, the method combines the two monikers into a generic - composite if fOnlyIfNotGeneric is FALSE; if fOnlyIfNotGeneric is TRUE, the method returns - a NULL moniker and a return value of MK_E_NEEDGENERIC */ - else - if (!fOnlyIfNotGeneric) - return CreateGenericComposite(iface,pmkRight,ppmkComposite); - - else - return MK_E_NEEDGENERIC; + return only_if_not_generic ? MK_E_NEEDGENERIC : CreateGenericComposite(iface, right, result); } /****************************************************************************** diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 4d40dcb6e4b..1b44c80fe45 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -127,6 +127,43 @@ static IMoniker *create_antimoniker(DWORD level) return moniker; } +static HRESULT create_moniker_from_desc(const char *desc, unsigned int *eaten, + IMoniker **moniker) +{ + IMoniker *left, *right; + WCHAR nameW[3]; + HRESULT hr; + + desc += *eaten; + + switch (*desc) + { + case 'I': + nameW[0] = desc[0]; + nameW[1] = desc[1]; + nameW[2] = 0; + *eaten += 2; + return CreateItemMoniker(L"!", nameW, moniker); + case 'A': + *eaten += 2; + *moniker = create_antimoniker(desc[1] - '0'); + return S_OK; + case 'C': + (*eaten)++; + hr = create_moniker_from_desc(desc, eaten, &left); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = create_moniker_from_desc(desc, eaten, &right); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = CreateGenericComposite(left, right, moniker); + IMoniker_Release(left); + IMoniker_Release(right); + return hr; + default: + ok(0, "Unexpected description %s.\n", desc); + return E_NOTIMPL; + } +} + static SIZE_T round_global_size(SIZE_T size) { static SIZE_T global_size_alignment = -1; @@ -2267,7 +2304,7 @@ static void test_item_moniker(void) "Moniker_IsRunning", NULL }; - IMoniker *moniker, *moniker2, *moniker3, *reduced, *anti, *inverse; + IMoniker *moniker, *moniker2, *moniker3, *reduced, *anti, *inverse, *c; DWORD i, hash, eaten, cookie; HRESULT hr; IBindCtx *bindctx; @@ -2589,7 +2626,7 @@ todo_wine ok(!moniker2, "Unexpected pointer.\n"); IMoniker_Release(anti); - /* I + A2 -> (A) */ + /* I + A2 -> A */ anti = create_antimoniker(2); hr = IMoniker_ComposeWith(moniker, anti, TRUE, &moniker2); ok(hr == S_OK, "Failed to compose, hr %#x.\n", hr); @@ -2601,6 +2638,24 @@ todo_wine IMoniker_Release(anti); + /* I + (A,A3) -> A3 */ + + /* Simplification has to through generic composite logic, + even when resolved to non-composite, generic composite option has to be enabled. */ + eaten = 0; + hr = create_moniker_from_desc("CA1A3", &eaten, &c); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMoniker_ComposeWith(moniker, c, TRUE, &moniker2); + ok(hr == MK_E_NEEDGENERIC, "Unexpected hr %#x.\n", hr); + hr = IMoniker_ComposeWith(moniker, c, FALSE, &moniker2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + TEST_MONIKER_TYPE(moniker2, MKSYS_ANTIMONIKER); + hr = IMoniker_Hash(moniker2, &hash); + ok(hr == S_OK, "Failed to get hash, hr %#x.\n", hr); + ok(hash == 0x80000003, "Unexpected hash.\n"); + IMoniker_Release(moniker2); + IMoniker_Release(c); + IMoniker_Release(moniker); /* CommonPrefixWith */ @@ -2893,43 +2948,6 @@ todo_wine IMoniker_Release(moniker2); } -static HRESULT create_moniker_from_desc(const char *desc, unsigned int *eaten, - IMoniker **moniker) -{ - IMoniker *left, *right; - WCHAR nameW[3]; - HRESULT hr; - - desc += *eaten; - - switch (*desc) - { - case 'I': - nameW[0] = desc[0]; - nameW[1] = desc[1]; - nameW[2] = 0; - *eaten += 2; - return CreateItemMoniker(L"!", nameW, moniker); - case 'A': - *eaten += 2; - *moniker = create_antimoniker(desc[1] - '0'); - return S_OK; - case 'C': - (*eaten)++; - hr = create_moniker_from_desc(desc, eaten, &left); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = create_moniker_from_desc(desc, eaten, &right); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = CreateGenericComposite(left, right, moniker); - IMoniker_Release(left); - IMoniker_Release(right); - return hr; - default: - ok(0, "Unexpected description %s.\n", desc); - return E_NOTIMPL; - } -} - static void test_generic_composite_moniker(void) { static const struct simplify_test @@ -3154,7 +3172,6 @@ todo_wine /* See if non-generic composition is possible */ hr = IMoniker_ComposeWith(moniker1, moniker, TRUE, &moniker2); -todo_wine ok(hr == MK_E_NEEDGENERIC, "Unexpected hr %#x.\n", hr); hr = IBindCtx_GetRunningObjectTable(bindctx, &rot); -- 2.33.0

1 4

[PATCH 2/2] gdi32: Avoid calling kernel32 from ntgdi functions.
by Jacek Caban 24 Sep '21

24 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dibdrv/dc.c | 4 ++-- dlls/gdi32/driver.c | 2 +- dlls/gdi32/gdiobj.c | 2 +- dlls/gdi32/printdrv.c | 8 ++++++-- 4 files changed, 10 insertions(+), 6 deletions(-)

2 1

[PATCH 1/2] gdi32: Don't use MulDiv in ntgdi functions.
by Jacek Caban 24 Sep '21

24 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/clipping.c | 4 ++-- dlls/gdi32/driver.c | 4 ++-- dlls/gdi32/font.c | 4 ++-- dlls/gdi32/gdiobj.c | 2 +- dlls/gdi32/mapping.c | 36 ++++++++++++++++++++++++++++++------ dlls/gdi32/ntgdi_private.h | 1 + 6 files changed, 38 insertions(+), 13 deletions(-)

2 1

[PATCH] gdi32: Handle NULL name when setting registry value.
by Nikolay Sivov 24 Sep '21

24 Sep '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51789 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Value name is always NULL when called for second family name. dlls/gdi32/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 274c1d83aba..6011f258499 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -506,7 +506,7 @@ static HKEY reg_create_key( HKEY root, const WCHAR *name, ULONG name_len, static void set_reg_value( HKEY hkey, const WCHAR *name, UINT type, const void *value, DWORD count ) { - unsigned int name_size = lstrlenW( name ) * sizeof(WCHAR); + unsigned int name_size = name ? lstrlenW( name ) * sizeof(WCHAR) : 0; UNICODE_STRING nameW = { name_size, name_size, (WCHAR *)name }; NtSetValueKey( hkey, &nameW, 0, type, value, count ); } -- 2.33.0

3 2

[PATCH v2 1/6] winebus.sys: Check for SDL_JoystickRumble presence at runtime.
by Rémi Bernon 24 Sep '21

24 Sep '21

It's been introduced in SDL2 2.0.9, released on 2018/10/31. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 31915a9fa0d..f71da77b77e 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -102,11 +102,11 @@ MAKE_FUNCPTR(SDL_HapticRumbleSupported); MAKE_FUNCPTR(SDL_HapticRunEffect); MAKE_FUNCPTR(SDL_HapticStopAll); MAKE_FUNCPTR(SDL_JoystickIsHaptic); -MAKE_FUNCPTR(SDL_JoystickRumble); MAKE_FUNCPTR(SDL_memset); MAKE_FUNCPTR(SDL_GameControllerAddMapping); MAKE_FUNCPTR(SDL_RegisterEvents); MAKE_FUNCPTR(SDL_PushEvent); +static int (*pSDL_JoystickRumble)(SDL_Joystick *joystick, Uint16 low_frequency_rumble, Uint16 high_frequency_rumble, Uint32 duration_ms); static Uint16 (*pSDL_JoystickGetProduct)(SDL_Joystick * joystick); static Uint16 (*pSDL_JoystickGetProductVersion)(SDL_Joystick * joystick); static Uint16 (*pSDL_JoystickGetVendor)(SDL_Joystick * joystick); @@ -181,7 +181,7 @@ static BOOL descriptor_add_haptic(struct sdl_device *impl) pSDL_HapticRumbleInit(impl->sdl_haptic); } - if (!pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0)) + if (pSDL_JoystickRumble && !pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0)) impl->effect_support |= WINE_SDL_JOYSTICK_RUMBLE; if (impl->effect_support & EFFECT_SUPPORT_HAPTICS) @@ -658,12 +658,12 @@ NTSTATUS sdl_bus_init(void *args) LOAD_FUNCPTR(SDL_HapticRunEffect); LOAD_FUNCPTR(SDL_HapticStopAll); LOAD_FUNCPTR(SDL_JoystickIsHaptic); - LOAD_FUNCPTR(SDL_JoystickRumble); LOAD_FUNCPTR(SDL_memset); LOAD_FUNCPTR(SDL_GameControllerAddMapping); LOAD_FUNCPTR(SDL_RegisterEvents); LOAD_FUNCPTR(SDL_PushEvent); #undef LOAD_FUNCPTR + pSDL_JoystickRumble = dlsym(sdl_handle, "SDL_JoystickRumble"); pSDL_JoystickGetProduct = dlsym(sdl_handle, "SDL_JoystickGetProduct"); pSDL_JoystickGetProductVersion = dlsym(sdl_handle, "SDL_JoystickGetProductVersion"); pSDL_JoystickGetVendor = dlsym(sdl_handle, "SDL_JoystickGetVendor"); -- 2.33.0

1 5

[PATCH 1/5] configure: Check for SDL_JoystickRumble presence.
by Rémi Bernon 24 Sep '21

24 Sep '21

It's been introduced in SDL2 2.0.9, released on 2018/11/31. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- configure.ac | 4 +++- dlls/winebus.sys/bus_sdl.c | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 15b7c2add2a..4d87d516bd1 100644 --- a/configure.ac +++ b/configure.ac @@ -1701,7 +1701,9 @@ if test "x$with_sdl" != "xno" then WINE_PACKAGE_FLAGS(SDL2,[sdl2],[-lSDL2],,, [AC_CHECK_HEADERS([SDL.h], - [WINE_CHECK_SONAME(SDL2,SDL_Init,,,[$SDL2_LIBS],[[libSDL2-2.0*]])])]) + [WINE_CHECK_SONAME(SDL2,SDL_Init,,,[$SDL2_LIBS],[[libSDL2-2.0*]])]) + WINE_CHECK_LIB_FUNCS([SDL_JoystickRumble], [$SDL2_LIBS]) + ]) fi WINE_NOTICE_WITH(sdl,[test "x$ac_cv_lib_soname_SDL2" = "x"], [libSDL2 ${notice_platform}development files not found, SDL2 won't be supported.]) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 31915a9fa0d..6e7c359deea 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -102,7 +102,9 @@ MAKE_FUNCPTR(SDL_HapticRumbleSupported); MAKE_FUNCPTR(SDL_HapticRunEffect); MAKE_FUNCPTR(SDL_HapticStopAll); MAKE_FUNCPTR(SDL_JoystickIsHaptic); +#ifdef HAVE_SDL_JOYSTICKRUMBLE MAKE_FUNCPTR(SDL_JoystickRumble); +#endif MAKE_FUNCPTR(SDL_memset); MAKE_FUNCPTR(SDL_GameControllerAddMapping); MAKE_FUNCPTR(SDL_RegisterEvents); @@ -181,8 +183,10 @@ static BOOL descriptor_add_haptic(struct sdl_device *impl) pSDL_HapticRumbleInit(impl->sdl_haptic); } +#ifdef HAVE_SDL_JOYSTICKRUMBLE if (!pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0)) impl->effect_support |= WINE_SDL_JOYSTICK_RUMBLE; +#endif if (impl->effect_support & EFFECT_SUPPORT_HAPTICS) { @@ -365,8 +369,10 @@ NTSTATUS sdl_device_haptics_start(struct unix_device *iface, DWORD duration_ms, effect.leftright.small_magnitude = buzz_intensity; if (impl->sdl_haptic) pSDL_HapticStopAll(impl->sdl_haptic); +#ifdef HAVE_SDL_JOYSTICKRUMBLE if (impl->effect_support & WINE_SDL_JOYSTICK_RUMBLE) pSDL_JoystickRumble(impl->sdl_joystick, 0, 0, 0); +#endif if (!effect.leftright.large_magnitude && !effect.leftright.small_magnitude) return STATUS_SUCCESS; @@ -383,11 +389,13 @@ NTSTATUS sdl_device_haptics_start(struct unix_device *iface, DWORD duration_ms, float magnitude = (effect.leftright.large_magnitude + effect.leftright.small_magnitude) / 2.0 / 32767.0; pSDL_HapticRumblePlay(impl->sdl_haptic, magnitude, effect.leftright.length); } +#ifdef HAVE_SDL_JOYSTICKRUMBLE else if (impl->effect_support & WINE_SDL_JOYSTICK_RUMBLE) { pSDL_JoystickRumble(impl->sdl_joystick, effect.leftright.large_magnitude, effect.leftright.small_magnitude, -1); } +#endif return STATUS_SUCCESS; } @@ -658,7 +666,9 @@ NTSTATUS sdl_bus_init(void *args) LOAD_FUNCPTR(SDL_HapticRunEffect); LOAD_FUNCPTR(SDL_HapticStopAll); LOAD_FUNCPTR(SDL_JoystickIsHaptic); +#ifdef HAVE_SDL_JOYSTICKRUMBLE LOAD_FUNCPTR(SDL_JoystickRumble); +#endif LOAD_FUNCPTR(SDL_memset); LOAD_FUNCPTR(SDL_GameControllerAddMapping); LOAD_FUNCPTR(SDL_RegisterEvents); -- 2.33.0

2 7

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel