wine-commits March 2015

wine-commits@winehq.org

2 participants
775 discussions

Shuai Meng : shell32: Also return Attributes in GetFolderDefinition.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: 0becff824466b330675fabbd59241a150eebabeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0becff824466b330675fabbd5… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Mon Mar 2 16:12:19 2015 +0800 shell32: Also return Attributes in GetFolderDefinition. --- dlls/vbscript/global.c | 25 +++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 448b886..012383b 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1268,8 +1268,29 @@ static HRESULT Global_ChrB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_Asc(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres; + BSTR bstr; + WCHAR ret; + + TRACE("(%s)\n", debugstr_variant(arg)); + + switch(V_VT(arg)) { + case VT_NULL: + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + case VT_EMPTY: + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + case VT_BSTR: + bstr = V_BSTR(arg); + default: + hres = to_string(arg, &bstr); + if(FAILED(hres)) + return hres; + } + + ret = bstr[0]; + if(ret == 0) + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + return return_short(res, ret); } /* The function supports only single-byte and double-byte character sets. It diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 8c92cf5..a44f8e6 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1324,4 +1324,46 @@ Call testRGBError(&h4d&, -2, &h2f&, 5) Call ok(getVT(Timer) = "VT_R4", "getVT(Timer) = " & getVT(Timer)) + +Sub testAscError(strings, error_num) + on error resume next + Dim x + + Call Err.clear() + x = Asc(strings) + Call ok(Err.number = error_num, "Err.number = " & Err.number) +End Sub + +Call ok(Asc(0) = 48, "Asc(0) = " & Asc(0)) +Call ok(getVT(Asc(0)) = "VT_I2", "getVT(Asc(0)) = " & getVT(Asc(0))) +Call ok(Asc(-32769) = 45, "Asc(-32769) = " & Asc(-32769)) +Call ok(getVT(Asc(-32769)) = "VT_I2", "getVT(Asc(-32769)) = " & getVT(Asc(-32769))) +Call ok(Asc(CSng(90.68)) = 57, "Asc(CSng(90.68)) = " & Asc(CSng(90.68))) +Call ok(getVT(Asc(CSng(90.68))) = "VT_I2", "getVT(Asc(CSng(90.68))) = " & getVT(Asc(CSng(90.68)))) +Call ok(Asc(123) = 49, "Asc(123) = " & Asc(123)) +Call ok(getVT(Asc(123)) = "VT_I2", "getVT(Asc(123)) = " & getVT(Asc(123))) +Call ok(Asc(CCur(234)) = 50, "Asc(CCur(234)) = " & Asc(CCur(234))) +Call ok(getVT(Asc(CCur(234))) = "VT_I2", "getVT(Asc(CCur(234))) = " & getVT(Asc(CCur(234)))) +Call ok(Asc("abc") = 97, "Asc(""abc"") = " & Asc("abc")) +Call ok(getVT(Asc("abc")) = "VT_I2", "getVT(Asc(""abc"")) = " & getVT(Asc("abc"))) +Call ok(Asc("?") = 63, "Asc(""?"") = " & Asc("?")) +Call ok(getVT(Asc("?")) = "VT_I2", "getVT(Asc(""?"")) = " & getVT(Asc("?"))) +Call ok(Asc(" space") = 32, "Asc("" space"") = " & Asc(" space")) +Call ok(getVT(Asc(" space")) = "VT_I2", "getVT(Asc("" space"")) = " & getVT(Asc(" space"))) +Call ok(Asc("@") = 64, "Asc(""@"") = " & Asc("@")) +Call ok(getVT(Asc("@")) = "VT_I2", "getVT(Asc(""@"")) = " & getVT(Asc("@"))) +Call ok(Asc("\n") = 92, "Asc(""\n"") = " & Asc("\n")) +Call ok(getVT(Asc("\n")) = "VT_I2", "getVT(Asc(""\n"")) = " & getVT(Asc("\n"))) +if isEnglishLang then + Call ok(Asc(False) = 70, "Asc(False) = " & Asc(False)) + Call ok(getVT(Asc(False)) = "VT_I2", "getVT(Asc(False)) = " & getVT(Asc(False))) + Call ok(Asc(True) = 84, "Asc(True) = " & Asc(True)) + Call ok(getVT(Asc(True)) = "VT_I2", "getVT(Asc(True)) = " & getVT(Asc(True))) +End if +Call ok(Asc(CByte(7)) = 55, "Asc(CByte(7)) = " & Asc(CByte(7))) +Call ok(getVT(Asc(CByte(7))) = "VT_I2", "getVT(Asc(CByte(7))) = " & getVT(Asc(CByte(7)))) +Call testAscError(Empty, 5) +Call testAscError(Null, 94) +Call testAscError("", 5) + Call reportSuccess()

1 0

Vincent Povirk : winemono.php: Added 4.5.6 release.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: tools Branch: master Commit: bd2235d27b9e1c769251ab0363d8946cb87d7374 URL: http://source.winehq.org/git/tools.git/?a=commit;h=bd2235d27b9e1c769251ab03… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Mar 2 13:24:42 2015 -0600 winemono.php: Added 4.5.6 release. --- winemono.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/winemono.php b/winemono.php index 10bf13f..3758d0e 100644 --- a/winemono.php +++ b/winemono.php @@ -4,7 +4,7 @@ */ // Default version if none given -$sVersion = '4.5.4'; +$sVersion = '4.5.6'; // Suffix appended to base name of file $sFileSuffix = ''; @@ -30,7 +30,8 @@ $aFileSizes = array( '0.0.4'=>44408320, '0.0.8'=>46967296, '4.5.2'=>52502528, - '4.5.4'=>53706752 + '4.5.4'=>53706752, + '4.5.6'=>53705216 ); // Exact size of the file:

1 0

Amine Khaldi : include: Correct DDSCAPS2 and DDSURFACEDESC2 structures and their uses.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: 21bfc8c440f5d478bbb91f2f631ff02c37d2d2e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21bfc8c440f5d478bbb91f2f6… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Sat Feb 28 09:22:59 2015 +0100 include: Correct DDSCAPS2 and DDSURFACEDESC2 structures and their uses. --- dlls/ddraw/ddraw.c | 4 ++-- dlls/ddraw/device.c | 2 +- dlls/ddraw/surface.c | 24 ++++++++++++------------ dlls/ddraw/tests/ddraw4.c | 16 ++++++++-------- dlls/ddraw/tests/ddraw7.c | 18 +++++++++--------- dlls/ddraw/utils.c | 10 +++++----- dlls/ddrawex/ddraw.c | 4 ++-- dlls/dxdiagn/provider.c | 4 ++-- include/ddraw.h | 10 ++++++++-- 9 files changed, 49 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21bfc8c440f5d478bbb91…

1 0

Nikolay Sivov : services: Locate service image in proper system dir for WOW64 case.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: 38bba54f325880a35acc98d1c5c408beb629414b URL: http://source.winehq.org/git/wine.git/?a=commit;h=38bba54f325880a35acc98d1c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 1 02:24:02 2015 +0300 services: Locate service image in proper system dir for WOW64 case. --- programs/services/services.c | 106 +++++++++++++++++++++++++++++-------------- 1 file changed, 71 insertions(+), 35 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index dd79770..1335837 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -621,35 +621,15 @@ static LPWSTR service_get_pipe_name(void) return name; } -static DWORD service_start_process(struct service_entry *service_entry, HANDLE *process) +static DWORD get_service_binary_path(const struct service_entry *service_entry, WCHAR **path) { - PROCESS_INFORMATION pi; - STARTUPINFOW si; - LPWSTR path = NULL; - DWORD size; - BOOL r; - - service_lock_exclusive(service_entry); - - if (!env) - { - HANDLE htok; - - if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY|TOKEN_DUPLICATE, &htok)) - CreateEnvironmentBlock(&env, htok, FALSE); - - if (!env) - WINE_ERR("failed to create services environment\n"); - } + DWORD size = ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName, NULL, 0); - size = ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName,NULL,0); - path = HeapAlloc(GetProcessHeap(),0,size*sizeof(WCHAR)); - if (!path) - { - service_unlock(service_entry); + *path = HeapAlloc(GetProcessHeap(), 0, size*sizeof(WCHAR)); + if (!*path) return ERROR_NOT_ENOUGH_SERVER_MEMORY; - } - ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName,path,size); + + ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName, *path, size); if (service_entry->config.dwServiceType == SERVICE_KERNEL_DRIVER) { @@ -660,25 +640,81 @@ static DWORD service_start_process(struct service_entry *service_entry, HANDLE * GetSystemDirectoryW( system_dir, MAX_PATH ); if (is_win64) { - if (!GetBinaryTypeW( path, &type )) + if (!GetBinaryTypeW( *path, &type )) { - HeapFree( GetProcessHeap(), 0, path ); - service_unlock(service_entry); + HeapFree( GetProcessHeap(), 0, *path ); return GetLastError(); } if (type == SCS_32BIT_BINARY) GetSystemWow64DirectoryW( system_dir, MAX_PATH ); } len = strlenW( system_dir ) + sizeof(winedeviceW)/sizeof(WCHAR) + strlenW(service_entry->name); - HeapFree( GetProcessHeap(), 0, path ); - if (!(path = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + HeapFree( GetProcessHeap(), 0, *path ); + if (!(*path = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + return ERROR_NOT_ENOUGH_SERVER_MEMORY; + + lstrcpyW( *path, system_dir ); + lstrcatW( *path, winedeviceW ); + lstrcatW( *path, service_entry->name ); + return ERROR_SUCCESS; + } + + /* if service image is configured to systemdir, redirect it to wow64 systemdir */ + if (service_entry->is_wow64) + { + WCHAR system_dir[MAX_PATH], *redirected; + DWORD len; + + GetSystemDirectoryW( system_dir, MAX_PATH ); + len = strlenW( system_dir ); + + if (strncmpiW( system_dir, *path, len )) + return ERROR_SUCCESS; + + GetSystemWow64DirectoryW( system_dir, MAX_PATH ); + + redirected = HeapAlloc( GetProcessHeap(), 0, (strlenW( *path ) + strlenW( system_dir ))*sizeof(WCHAR)); + if (!redirected) { - service_unlock(service_entry); + HeapFree( GetProcessHeap(), 0, *path ); return ERROR_NOT_ENOUGH_SERVER_MEMORY; } - lstrcpyW( path, system_dir ); - lstrcatW( path, winedeviceW ); - lstrcatW( path, service_entry->name ); + + strcpyW( redirected, system_dir ); + strcatW( redirected, &(*path)[len] ); + HeapFree( GetProcessHeap(), 0, *path ); + *path = redirected; + TRACE("redirected to %s\n", debugstr_w(redirected)); + } + + return ERROR_SUCCESS; +} + +static DWORD service_start_process(struct service_entry *service_entry, HANDLE *process) +{ + PROCESS_INFORMATION pi; + STARTUPINFOW si; + LPWSTR path = NULL; + DWORD err; + BOOL r; + + service_lock_exclusive(service_entry); + + if (!env) + { + HANDLE htok; + + if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY|TOKEN_DUPLICATE, &htok)) + CreateEnvironmentBlock(&env, htok, FALSE); + + if (!env) + WINE_ERR("failed to create services environment\n"); + } + + if ((err = get_service_binary_path(service_entry, &path))) + { + service_unlock(service_entry); + return err; } ZeroMemory(&si, sizeof(STARTUPINFOW));

1 0

Marcus Meissner : dsound: If 3d sound is disabled, just return (Coverity).
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: a83e8e88ea05822e21aace9e0b82060bfa1dc02f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a83e8e88ea05822e21aace9e0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Mar 1 14:04:56 2015 +0100 dsound: If 3d sound is disabled, just return (Coverity). --- dlls/dsound/sound3d.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index c53783e..439cfac 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -177,7 +177,7 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) TRACE("3D processing disabled\n"); /* this one is here only to eliminate annoying warning message */ DSOUND_RecalcVolPan (&dsb->volpan); - break; + return; case DS3DMODE_NORMAL: TRACE("Normal 3D processing mode\n"); /* we need to calculate distance between buffer and listener*/

1 0

Bruno Jesus : kernel32: GetTempPathW must zero the remaining buffer.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: f16cf541068831074a6891688d947f0ce32abdd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f16cf541068831074a6891688… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Feb 28 20:11:08 2015 -0300 kernel32: GetTempPathW must zero the remaining buffer. --- dlls/kernel32/path.c | 6 +++++- dlls/kernel32/tests/path.c | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 475b1f6..1048214 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -623,9 +623,13 @@ DWORD WINAPI GetTempPathW( DWORD count, LPWSTR path ) if (count) { - lstrcpynW(path, tmp_path, count); + lstrcpynW(path, tmp_path, ret); if (count >= ret) + { + /* the remaining buffer must be zeroed */ + memset(path + ret, 0, (count - ret) * sizeof(WCHAR)); ret--; /* return length without 0 */ + } else if (count < 4) path[0] = 0; /* avoid returning ambiguous "X:" */ } diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 8b07b8f..a5c0f41 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1012,7 +1012,6 @@ static void test_GetTempPathW(char* tmp_dir) ok(len == lstrlenW(buf), "returned length should be equal to the length of string\n"); /* The rest of the buffer must be zeroed */ for(len++; len < sizeof(buf) / sizeof(buf[0]); len++) - todo_wine ok(buf[len] == '\0', "expected NULL at [%d], got 0x%x\n", len, buf[len]); }

1 0

Mark Harmstone : comctl32: Call OpenThemeData on themed scrollbars.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: 050bda2ece4f249d2973c3d4e1a1f5f3671de053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=050bda2ece4f249d2973c3d4e… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Feb 28 16:37:08 2015 +0000 comctl32: Call OpenThemeData on themed scrollbars. --- dlls/comctl32/theme_scrollbar.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/theme_scrollbar.c b/dlls/comctl32/theme_scrollbar.c index 9978598..ed2c051 100644 --- a/dlls/comctl32/theme_scrollbar.c +++ b/dlls/comctl32/theme_scrollbar.c @@ -38,7 +38,39 @@ LRESULT CALLBACK THEMING_ScrollbarSubclassProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, ULONG_PTR dwRefData) { + const WCHAR* themeClass = WC_SCROLLBARW; + HTHEME theme; + LRESULT result; + TRACE("(%p, 0x%x, %lu, %lu, %lu)\n", hwnd, msg, wParam, lParam, dwRefData); - return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); + switch (msg) { + case WM_CREATE: + result = THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + OpenThemeData(hwnd, themeClass); + return result; + + case WM_DESTROY: + theme = GetWindowTheme(hwnd); + CloseThemeData(theme); + return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + + case WM_THEMECHANGED: + theme = GetWindowTheme(hwnd); + CloseThemeData(theme); + OpenThemeData(hwnd, themeClass); + break; + + case WM_SYSCOLORCHANGE: + theme = GetWindowTheme(hwnd); + if (!theme) return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + /* Do nothing. When themed, a WM_THEMECHANGED will be received, too, + * which will do the repaint. */ + break; + + default: + return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + } + + return 0; }

1 0

Alexandre Julliard : ntdll: Don' t queue a user APC when there is no callback function.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: 577cb166d48e5c6f270237179cdbeb82a68b1ac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=577cb166d48e5c6f270237179… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 17:53:40 2015 +0900 ntdll: Don't queue a user APC when there is no callback function. --- dlls/ntdll/file.c | 89 ++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 62 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 0323b23..43b6097 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -331,9 +331,10 @@ NTSTATUS WINAPI NtCreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATTRIB struct async_fileio { - HANDLE handle; - PIO_APC_ROUTINE apc; - void *apc_arg; + struct async_fileio *next; + HANDLE handle; + PIO_APC_ROUTINE apc; + void *apc_arg; }; struct async_fileio_read @@ -353,13 +354,46 @@ struct async_fileio_write unsigned int count; }; +static struct async_fileio *fileio_freelist; + +static void release_fileio( struct async_fileio *io ) +{ + for (;;) + { + struct async_fileio *next = fileio_freelist; + io->next = next; + if (interlocked_cmpxchg_ptr( (void **)&fileio_freelist, io, next ) == next) return; + } +} + +static struct async_fileio *alloc_fileio( DWORD size, HANDLE handle, PIO_APC_ROUTINE apc, void *arg ) +{ + /* first free remaining previous fileinfos */ + + struct async_fileio *io = interlocked_xchg_ptr( (void **)&fileio_freelist, NULL ); + + while (io) + { + struct async_fileio *next = io->next; + RtlFreeHeap( GetProcessHeap(), 0, io ); + io = next; + } + + if ((io = RtlAllocateHeap( GetProcessHeap(), 0, size ))) + { + io->handle = handle; + io->apc = apc; + io->apc_arg = arg; + } + return io; +} /* callback for file I/O user APC */ static void WINAPI fileio_apc( void *arg, IO_STATUS_BLOCK *io, ULONG reserved ) { struct async_fileio *async = arg; if (async->apc) async->apc( async->apc_arg, io, reserved ); - RtlFreeHeap( GetProcessHeap(), 0, async ); + release_fileio( async ); } /*********************************************************************** @@ -466,7 +500,10 @@ static NTSTATUS FILE_AsyncReadService(void *user, PIO_STATUS_BLOCK iosb, NTSTATU { iosb->u.Status = status; iosb->Information = fileio->already; - *apc = fileio_apc; + if (fileio->io.apc) + *apc = fileio_apc; + else + release_fileio( &fileio->io ); } return status; } @@ -741,14 +778,12 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, goto done; } - if (!(fileio = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(*fileio)))) + fileio = (struct async_fileio_read *)alloc_fileio( sizeof(*fileio), hFile, apc, apc_user ); + if (!fileio) { status = STATUS_NO_MEMORY; goto err; } - fileio->io.handle = hFile; - fileio->io.apc = apc; - fileio->io.apc_arg = apc_user; fileio->already = total; fileio->count = length; fileio->buffer = buffer; @@ -963,7 +998,10 @@ static NTSTATUS FILE_AsyncWriteService(void *user, IO_STATUS_BLOCK *iosb, NTSTAT { iosb->u.Status = status; iosb->Information = fileio->already; - *apc = fileio_apc; + if (fileio->io.apc) + *apc = fileio_apc; + else + release_fileio( &fileio->io ); } return status; } @@ -1142,14 +1180,12 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, { struct async_fileio_write *fileio; - if (!(fileio = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(*fileio)))) + fileio = (struct async_fileio_write *)alloc_fileio( sizeof(*fileio), hFile, apc, apc_user ); + if (!fileio) { status = STATUS_NO_MEMORY; goto err; } - fileio->io.handle = hFile; - fileio->io.apc = apc; - fileio->io.apc_arg = apc_user; fileio->already = total; fileio->count = length; fileio->buffer = buffer; @@ -1353,7 +1389,10 @@ static NTSTATUS ioctl_completion( void *arg, IO_STATUS_BLOCK *io, NTSTATUS statu if (status != STATUS_PENDING) { io->u.Status = status; - if (async->io.apc || async->event) *apc = fileio_apc; + if (async->io.apc) + *apc = fileio_apc; + else + release_fileio( &async->io ); } return status; } @@ -1371,11 +1410,8 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, ULONG options; ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_context; - if (!(async = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*async) ))) + if (!(async = (struct async_ioctl *)alloc_fileio( sizeof(*async), handle, apc, apc_context ))) return STATUS_NO_MEMORY; - async->io.handle = handle; - async->io.apc = apc; - async->io.apc_arg = apc_context; async->event = event; async->buffer = out_buffer; async->size = out_size; @@ -1410,7 +1446,6 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, NtWaitForSingleObject( wait_handle, (options & FILE_SYNCHRONOUS_IO_ALERT), NULL ); status = io->u.Status; NtClose( wait_handle ); - RtlFreeHeap( GetProcessHeap(), 0, async ); } return status; @@ -1740,7 +1775,10 @@ static NTSTATUS read_changes_apc( void *user, PIO_STATUS_BLOCK iosb, NTSTATUS st iosb->u.Status = ret; iosb->Information = size; - *apc = fileio_apc; + if (fileio->io.apc) + *apc = fileio_apc; + else + release_fileio( &fileio->io ); return ret; } @@ -1772,13 +1810,10 @@ NTSTATUS WINAPI NtNotifyChangeDirectoryFile( HANDLE handle, HANDLE event, PIO_AP if (!iosb) return STATUS_ACCESS_VIOLATION; if (filter == 0 || (filter & ~FILE_NOTIFY_ALL)) return STATUS_INVALID_PARAMETER; - fileio = RtlAllocateHeap( GetProcessHeap(), 0, offsetof( struct read_changes_fileio, data[size] )); - if (!fileio) - return STATUS_NO_MEMORY; + fileio = (struct read_changes_fileio *)alloc_fileio( offsetof(struct read_changes_fileio, data[size]), + handle, apc, apc_context ); + if (!fileio) return STATUS_NO_MEMORY; - fileio->io.handle = handle; - fileio->io.apc = apc; - fileio->io.apc_arg = apc_context; fileio->buffer = buffer; fileio->buffer_size = buffer_size; fileio->data_size = size;

1 0

Alexandre Julliard : ntdll: Move NtNotifyChangeDirectoryFile to file.c and make it use the standard fileio structure.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: ff84bf8bdd118479b7aaabc393db66ff356bff92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff84bf8bdd118479b7aaabc39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 20:56:40 2015 +0900 ntdll: Move NtNotifyChangeDirectoryFile to file.c and make it use the standard fileio structure. --- dlls/ntdll/directory.c | 157 ------------------------------------------------- dlls/ntdll/file.c | 138 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+), 157 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff84bf8bdd118479b7aaa…

1 0

Alexandre Julliard : ntdll: Use the fileio structure and callback also for ioctl calls.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: 4f43d743e07ab1b809de70d10972d6f97ba1f3fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f43d743e07ab1b809de70d10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 16:56:47 2015 +0900 ntdll: Use the fileio structure and callback also for ioctl calls. --- dlls/ntdll/file.c | 44 +++++++++++++++++--------------------------- 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 5232027..6e3825f 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -336,22 +336,22 @@ struct async_fileio void *apc_arg; }; -typedef struct +struct async_fileio_read { struct async_fileio io; char* buffer; unsigned int already; unsigned int count; BOOL avail_mode; -} async_fileio_read; +}; -typedef struct +struct async_fileio_write { struct async_fileio io; const char *buffer; unsigned int already; unsigned int count; -} async_fileio_write; +}; /* callback for file I/O user APC */ @@ -416,7 +416,7 @@ NTSTATUS FILE_GetNtStatus(void) */ static NTSTATUS FILE_AsyncReadService(void *user, PIO_STATUS_BLOCK iosb, NTSTATUS status, void **apc) { - async_fileio_read *fileio = user; + struct async_fileio_read *fileio = user; int fd, needs_close, result; switch (status) @@ -730,7 +730,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, if (async_read) { - async_fileio_read *fileio; + struct async_fileio_read *fileio; BOOL avail_mode; if ((status = get_io_avail_mode( hFile, type, &avail_mode ))) @@ -923,7 +923,7 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap */ static NTSTATUS FILE_AsyncWriteService(void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status, void **apc) { - async_fileio_write *fileio = user; + struct async_fileio_write *fileio = user; int result, fd, needs_close; enum server_fd_type type; @@ -1140,7 +1140,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, if (async_write) { - async_fileio_write *fileio; + struct async_fileio_write *fileio; if (!(fileio = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(*fileio)))) { @@ -1327,22 +1327,12 @@ NTSTATUS WINAPI NtWriteFileGather( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap struct async_ioctl { - HANDLE handle; /* handle to the device */ - HANDLE event; /* async event */ - void *buffer; /* buffer for output */ - ULONG size; /* size of buffer */ - PIO_APC_ROUTINE apc; /* user apc params */ - void *apc_arg; + struct async_fileio io; + HANDLE event; /* async event */ + void *buffer; /* buffer for output */ + ULONG size; /* size of buffer */ }; -/* callback for ioctl user APC */ -static void WINAPI ioctl_apc( void *arg, IO_STATUS_BLOCK *io, ULONG reserved ) -{ - struct async_ioctl *async = arg; - if (async->apc) async->apc( async->apc_arg, io, reserved ); - RtlFreeHeap( GetProcessHeap(), 0, async ); -} - /* callback for ioctl async I/O completion */ static NTSTATUS ioctl_completion( void *arg, IO_STATUS_BLOCK *io, NTSTATUS status, void **apc ) { @@ -1352,7 +1342,7 @@ static NTSTATUS ioctl_completion( void *arg, IO_STATUS_BLOCK *io, NTSTATUS statu { SERVER_START_REQ( get_ioctl_result ) { - req->handle = wine_server_obj_handle( async->handle ); + req->handle = wine_server_obj_handle( async->io.handle ); req->user_arg = wine_server_client_ptr( async ); wine_server_set_reply( req, async->buffer, async->size ); status = wine_server_call( req ); @@ -1363,7 +1353,7 @@ static NTSTATUS ioctl_completion( void *arg, IO_STATUS_BLOCK *io, NTSTATUS statu if (status != STATUS_PENDING) { io->u.Status = status; - if (async->apc || async->event) *apc = ioctl_apc; + if (async->io.apc || async->event) *apc = fileio_apc; } return status; } @@ -1383,12 +1373,12 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, if (!(async = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*async) ))) return STATUS_NO_MEMORY; - async->handle = handle; + async->io.handle = handle; + async->io.apc = apc; + async->io.apc_arg = apc_context; async->event = event; async->buffer = out_buffer; async->size = out_size; - async->apc = apc; - async->apc_arg = apc_context; SERVER_START_REQ( ioctl ) {

1 0

← Newer
1
...
71
72
73
74
75
76
77
78
Older →

Jump to page:

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-commits March 2015