wine-commits November 2009

wine-commits@winehq.org

3 participants
910 discussions

Huw Davies : include: Add asysta.idl.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: b03b1443b2efc75539d271d5a459d9307ec063ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=b03b1443b2efc75539d271d5a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 12 15:19:00 2009 +0000 include: Add asysta.idl. --- dlls/msdaps/usrmarshal.c | 31 ++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/asysta.idl | 51 ++++++++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + tools/make_makefiles | 1 + 5 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 6a436a3..8e15862 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -817,3 +817,34 @@ HRESULT __RPC_STUB IDBAsynchNotify_OnStop_Stub(IDBAsynchNotify* This, HCHAPTER h FIXME("(%p)->(%lx, %d, %08x, %s): stub\n", This, hChapter, eOperation, hrStatus, debugstr_w(pwszStatusText)); return E_NOTIMPL; } + +HRESULT CALLBACK IDBAsynchStatus_Abort_Proxy(IDBAsynchStatus* This, HCHAPTER hChapter, DBASYNCHOP eOperation) +{ + FIXME("(%p)->(%lx, %d): stub\n", This, hChapter, eOperation); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IDBAsynchStatus_Abort_Stub(IDBAsynchStatus* This, HCHAPTER hChapter, DBASYNCHOP eOperation, + IErrorInfo **ppErrorInfoRem) +{ + FIXME("(%p)->(%lx, %d, %p): stub\n", This, hChapter, eOperation, ppErrorInfoRem); + return E_NOTIMPL; +} + +HRESULT CALLBACK IDBAsynchStatus_GetStatus_Proxy(IDBAsynchStatus* This, HCHAPTER hChapter, DBASYNCHOP eOperation, + DBCOUNTITEM *pulProgress, DBCOUNTITEM *pulProgressMax, DBASYNCHPHASE *peAsynchPhase, + LPOLESTR *ppwszStatusText) +{ + FIXME("(%p)->(%lx, %d, %p, %p, %p, %p): stub\n", This, hChapter, eOperation, pulProgress, pulProgressMax, + peAsynchPhase, ppwszStatusText); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IDBAsynchStatus_GetStatus_Stub(IDBAsynchStatus* This, HCHAPTER hChapter, DBASYNCHOP eOperation, + DBCOUNTITEM *pulProgress, DBCOUNTITEM *pulProgressMax, DBASYNCHPHASE *peAsynchPhase, + LPOLESTR *ppwszStatusText, IErrorInfo **ppErrorInfoRem) +{ + FIXME("(%p)->(%lx, %d, %p, %p, %p, %p, %p): stub\n", This, hChapter, eOperation, pulProgress, pulProgressMax, + peAsynchPhase, ppwszStatusText, ppErrorInfoRem); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index 827d25e..88bafcc 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -107,6 +107,7 @@ SRCDIR_INCLUDES = \ af_irda.h \ appmgmt.h \ asynot.idl \ + asysta.idl \ audevcod.h \ audiosessiontypes.h \ aviriff.h \ diff --git a/include/asysta.idl b/include/asysta.idl new file mode 100644 index 0000000..e3e009e --- /dev/null +++ b/include/asysta.idl @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2009 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + object, + uuid(0c733a95-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IDBAsynchStatus : IUnknown +{ + [local] + HRESULT Abort([in] HCHAPTER hChapter, + [in] DBASYNCHOP eOperation); + + [call_as(Abort)] + HRESULT RemoteAbort([in] HCHAPTER hChapter, + [in] DBASYNCHOP eOperation, + [out] IErrorInfo **ppErrorInfoRem); + + [local] + HRESULT GetStatus([in] HCHAPTER hChapter, + [in] DBASYNCHOP eOperation, + [out, annotation("__out_opt")] DBCOUNTITEM *pulProgress, + [out, annotation("__out_opt")] DBCOUNTITEM *pulProgressMax, + [out, annotation("__out")] DBASYNCHPHASE *peAsynchPhase, + [out, annotation("__deref_opt_inout_opt")] LPOLESTR *ppwszStatusText); + + [call_as(GetStatus)] + HRESULT RemoteGetStatus([in] HCHAPTER hChapter, + [in] DBASYNCHOP eOperation, + [in, out, unique] DBCOUNTITEM *pulProgress, + [in, out, unique] DBCOUNTITEM *pulProgressMax, + [in, out, unique] DBASYNCHPHASE *peAsynchPhase, + [in, out, unique] LPOLESTR *ppwszStatusText, + [out] IErrorInfo **ppErrorInfoRem); +} diff --git a/include/oledb.idl b/include/oledb.idl index b9f0654..127df2b 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -55,6 +55,7 @@ typedef DWORD DBHASHVALUE; #include "dbinit.idl" #include "dbdsad.idl" #include "asynot.idl" +#include "asysta.idl" #include "sesprp.idl" #include "opnrst.idl" #include "row.idl" diff --git a/tools/make_makefiles b/tools/make_makefiles index 1ef571b..845f118 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -111,6 +111,7 @@ my %exported_wine_headers = ( my %private_idl_headers = ( "access.idl" => 1, "asynot.idl" => 1, + "asysta.idl" => 1, "axcore.idl" => 1, "axextend.idl" => 1, "binres.idl" => 1,

1 0

Maarten Lankhorst : avrt: Add stub for Av(Set, Revert) MmThreadCharacteristics.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: f17484205aea11caa6935703b27f2cddfb22bf40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f17484205aea11caa6935703b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 10 21:13:23 2009 +0100 avrt: Add stub for Av(Set,Revert)MmThreadCharacteristics. --- dlls/avrt/avrt.spec | 6 +++--- dlls/avrt/main.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/avrt/avrt.spec b/dlls/avrt/avrt.spec index 103798d..a253d9a 100644 --- a/dlls/avrt/avrt.spec +++ b/dlls/avrt/avrt.spec @@ -1,5 +1,5 @@ @ stub AvQuerySystemResponsiveness -@ stub AvRevertMmThreadCharacteristics +@ stdcall AvRevertMmThreadCharacteristics(long) @ stub AvRtCreateThreadOrderingGroup @ stub AvRtCreateThreadOrderingGroupExA @ stub AvRtCreateThreadOrderingGroupExW @@ -9,6 +9,6 @@ @ stub AvRtWaitOnThreadOrderingGroup @ stub AvSetMmMaxThreadCharacteristicsA @ stub AvSetMmMaxThreadCharacteristicsW -@ stub AvSetMmThreadCharacteristicsA -@ stub AvSetMmThreadCharacteristicsW +@ stdcall AvSetMmThreadCharacteristicsA(str ptr) +@ stdcall AvSetMmThreadCharacteristicsW(wstr ptr) @ stub AvSetMmThreadPriority diff --git a/dlls/avrt/main.c b/dlls/avrt/main.c index a39743c..c4e53dd 100644 --- a/dlls/avrt/main.c +++ b/dlls/avrt/main.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "wine/debug.h" #include "avrt.h" @@ -45,3 +46,47 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +HANDLE WINAPI AvSetMmThreadCharacteristicsA(LPCSTR TaskName, LPDWORD TaskIndex) +{ + HANDLE ret; + LPWSTR str = NULL; + + if (TaskName) + { + DWORD len = (lstrlenA(TaskName)+1); + str = HeapAlloc(GetProcessHeap, 0, len*sizeof(WCHAR)); + if (!str) + { + SetLastError(ERROR_OUTOFMEMORY); + return NULL; + } + MultiByteToWideChar(CP_ACP, 0, TaskName, len, str, len); + } + ret = AvSetMmThreadCharacteristicsW(str, TaskIndex); + HeapFree(GetProcessHeap(), 0, str); + return ret; +} + +HANDLE WINAPI AvSetMmThreadCharacteristicsW(LPCWSTR TaskName, LPDWORD TaskIndex) +{ + FIXME("(%s,%p): stub\n", debugstr_w(TaskName), TaskIndex); + + if (!TaskName) + { + SetLastError(ERROR_INVALID_TASK_NAME); + return NULL; + } + if (!TaskIndex) + { + SetLastError(ERROR_INVALID_HANDLE); + return NULL; + } + return (HANDLE)0x12345678; +} + +BOOL WINAPI AvRevertMmThreadCharacteristics(HANDLE AvrtHandle) +{ + FIXME("(%p): stub\n", AvrtHandle); + return 1; +}

1 0

Maarten Lankhorst : include: Add propkeydef header.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 201d3ce33f5523cd962d5f5ec3a7f8c784b8f17f URL: http://source.winehq.org/git/wine.git/?a=commit;h=201d3ce33f5523cd962d5f5ec… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Nov 12 13:45:05 2009 +0100 include: Add propkeydef header. --- include/Makefile.in | 1 + include/propkeydef.h | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index bf3c549..827d25e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -388,6 +388,7 @@ SRCDIR_INCLUDES = \ poppack.h \ powrprof.h \ profinfo.h \ + propkeydef.h \ propvarutil.h \ prsht.h \ psapi.h \ diff --git a/include/propkeydef.h b/include/propkeydef.h new file mode 100644 index 0000000..8507ddb --- /dev/null +++ b/include/propkeydef.h @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2009 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef PID_FIRST_USABLE +#define PID_FIRST_USABLE 2 +#endif + +#ifndef REFPROPERTYKEY +#ifdef __cplusplus +#define REFPROPERTYKEY const PROPERTYKEY & +#else /*!__cplusplus*/ +#define REFPROPERTYKEY const PROPERTYKEY * __MIDL_CONST +#endif +#endif + +#undef DEFINE_PROPERTYKEY + +#ifdef INITGUID +#ifdef __cplusplus +#define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ + EXTERN_C const PROPERTYKEY name DECLSPEC_HIDDEN DECLSPEC_ANY; \ + EXTERN_C const PROPERTYKEY name = \ + { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }, pid } +#else +#define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ + const PROPERTYKEY name DECLSPEC_HIDDEN DECLSPEC_ANY; \ + const PROPERTYKEY name = \ + { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }, pid } +#endif +#else +#define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ + EXTERN_C const PROPERTYKEY name DECLSPEC_HIDDEN DECLSPEC_ANY +#endif + +#ifndef IsEqualPropertyKey +#define IsEqualPropertyKey(a,b) (((a).pid == (b).pid) && IsEqualIID((a).fmtid,(b).fmtid)) +#endif + +#ifndef _PROPERTYKEY_EQUALITY_OPERATORS_ +#define _PROPERTYKEY_EQUALITY_OPERATORS_ +#ifdef __cplusplus +inline bool operator==(REFPROPERTYKEY guidOne, REFPROPERTYKEY guidOther) +{ + return IsEqualPropertyKey(guidOne, guidTwo); +} +inline bool operator!=(REFPROPERTYKEY guidOne, REFPROPERTYKEY guidOther) +{ + return !(guidOne == guidOther); +} +#endif +#endif

1 0

Henri Verbeet : ntdll: Fix the FileNameInformation info size.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 85d93d689e15f9394211c353d2959d5966f4f15d URL: http://source.winehq.org/git/wine.git/?a=commit;h=85d93d689e15f9394211c353d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 12 15:10:15 2009 +0100 ntdll: Fix the FileNameInformation info size. --- dlls/ntdll/file.c | 2 +- dlls/ntdll/tests/file.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 3b132ff..b62c7c2 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1551,7 +1551,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, sizeof(FILE_INTERNAL_INFORMATION), /* FileInternalInformation */ sizeof(FILE_EA_INFORMATION), /* FileEaInformation */ sizeof(FILE_ACCESS_INFORMATION), /* FileAccessInformation */ - sizeof(FILE_NAME_INFORMATION)-sizeof(WCHAR), /* FileNameInformation */ + sizeof(FILE_NAME_INFORMATION), /* FileNameInformation */ sizeof(FILE_RENAME_INFORMATION)-sizeof(WCHAR), /* FileRenameInformation */ 0, /* FileLinkInformation */ sizeof(FILE_NAMES_INFORMATION)-sizeof(WCHAR), /* FileNamesInformation */ diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index fba3bb7..ba6b07e 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -977,6 +977,9 @@ static void test_file_name_information(void) NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0 ); ok(h != INVALID_HANDLE_VALUE, "Failed to open file.\n"); + hr = pNtQueryInformationFile( h, &io, info, sizeof(*info) - 1, FileNameInformation ); + ok(hr == STATUS_INFO_LENGTH_MISMATCH, "NtQueryInformationFile returned %#x.\n", hr); + memset( info, 0xcc, info_size ); hr = pNtQueryInformationFile( h, &io, info, sizeof(*info), FileNameInformation ); ok(hr == STATUS_BUFFER_OVERFLOW, "NtQueryInformationFile returned %#x, expected %#x.\n",

1 0

Henri Verbeet : ntdll/tests: Add some tests for the NtQueryInformationFile( ) FileNameInformation class.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 4422e67126af09c2a0b07f914b924c6bdc1a7736 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4422e67126af09c2a0b07f914… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 12 15:10:14 2009 +0100 ntdll/tests: Add some tests for the NtQueryInformationFile() FileNameInformation class. --- dlls/ntdll/tests/file.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 76 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 2c23915..fba3bb7 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -34,6 +34,7 @@ #include "wine/test.h" #include "winternl.h" +#include "winuser.h" #ifndef IO_COMPLETION_ALL_ACCESS #define IO_COMPLETION_ALL_ACCESS 0x001F0003 @@ -938,6 +939,80 @@ static void test_iocompletion(void) } } +static void test_file_name_information(void) +{ + WCHAR *file_name, *volume_prefix, *expected; + FILE_NAME_INFORMATION *info; + UINT file_name_size; + IO_STATUS_BLOCK io; + UINT info_size; + HRESULT hr; + HANDLE h; + UINT len; + + file_name_size = GetSystemDirectoryW( NULL, 0 ); + file_name = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*file_name) ); + volume_prefix = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*volume_prefix) ); + expected = HeapAlloc( GetProcessHeap(), 0, file_name_size * sizeof(*volume_prefix) ); + + len = GetSystemDirectoryW( file_name, file_name_size ); + ok(len == file_name_size - 1, + "GetSystemDirectoryW returned %u, expected %u.\n", + len, file_name_size - 1); + + len = GetVolumePathNameW( file_name, volume_prefix, file_name_size ); + ok(len, "GetVolumePathNameW failed.\n"); + + len = lstrlenW( volume_prefix ); + if (len && volume_prefix[len - 1] == '\\') --len; + memcpy( expected, file_name + len, (file_name_size - len - 1) * sizeof(WCHAR) ); + expected[file_name_size - len - 1] = '\0'; + + /* A bit more than we actually need, but it keeps the calculation simple. */ + info_size = sizeof(*info) + (file_name_size * sizeof(WCHAR)); + info = HeapAlloc( GetProcessHeap(), 0, info_size ); + + h = CreateFileW( file_name, GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0 ); + ok(h != INVALID_HANDLE_VALUE, "Failed to open file.\n"); + + memset( info, 0xcc, info_size ); + hr = pNtQueryInformationFile( h, &io, info, sizeof(*info), FileNameInformation ); + ok(hr == STATUS_BUFFER_OVERFLOW, "NtQueryInformationFile returned %#x, expected %#x.\n", + hr, STATUS_BUFFER_OVERFLOW); + ok(U(io).Status == STATUS_BUFFER_OVERFLOW, "io.Status is %#x, expected %#x.\n", + U(io).Status, STATUS_BUFFER_OVERFLOW); + ok(info->FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), "info->FileNameLength is %u, expected %u.\n", + info->FileNameLength, lstrlenW( expected ) * sizeof(WCHAR)); + ok(info->FileName[2] == 0xcccc, "info->FileName[2] is %#x, expected 0xcccc.\n", info->FileName[2]); + ok(CharLowerW((LPWSTR)(UINT_PTR)info->FileName[1]) == CharLowerW((LPWSTR)(UINT_PTR)expected[1]), + "info->FileName[1] is %p, expected %p.\n", + CharLowerW((LPWSTR)(UINT_PTR)info->FileName[1]), CharLowerW((LPWSTR)(UINT_PTR)expected[1])); + ok(io.Information == sizeof(*info), "io.Information is %lu, expected %u.\n", io.Information, sizeof(*info)); + + memset( info, 0xcc, info_size ); + hr = pNtQueryInformationFile( h, &io, info, info_size, FileNameInformation ); + ok(hr == STATUS_SUCCESS, "NtQueryInformationFile returned %#x, expected %#x.\n", hr, STATUS_SUCCESS); + ok(U(io).Status == STATUS_SUCCESS, "io.Status is %#x, expected %#x.\n", U(io).Status, STATUS_SUCCESS); + ok(info->FileNameLength == lstrlenW( expected ) * sizeof(WCHAR), "info->FileNameLength is %u, expected %u.\n", + info->FileNameLength, lstrlenW( expected ) * sizeof(WCHAR)); + ok(info->FileName[info->FileNameLength / sizeof(WCHAR)] == 0xcccc, "info->FileName[%u] is %#x, expected 0xcccc.\n", + info->FileNameLength / sizeof(WCHAR), info->FileName[info->FileNameLength / sizeof(WCHAR)]); + info->FileName[info->FileNameLength / sizeof(WCHAR)] = '\0'; + ok(!lstrcmpiW( info->FileName, expected ), "info->FileName is %s, expected %s.\n", + wine_dbgstr_w( info->FileName ), wine_dbgstr_w( expected )); + ok(io.Information == FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + info->FileNameLength, + "io.Information is %lu, expected %u.\n", + io.Information, FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + info->FileNameLength); + + CloseHandle( h ); + HeapFree( GetProcessHeap(), 0, info ); + HeapFree( GetProcessHeap(), 0, expected ); + HeapFree( GetProcessHeap(), 0, volume_prefix ); + HeapFree( GetProcessHeap(), 0, file_name ); +} + START_TEST(file) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -972,4 +1047,5 @@ START_TEST(file) test_file_basic_information(); test_file_all_information(); test_file_both_information(); + test_file_name_information(); }

1 0

Henri Verbeet : ntdll: Implement the FileNameInformation class for NtQueryInformationFile().
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: cd6d01ac9d969c1473e86d7faac6ef5ac38a4156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd6d01ac9d969c1473e86d7fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 12 15:10:13 2009 +0100 ntdll: Implement the FileNameInformation class for NtQueryInformationFile(). --- dlls/ntdll/file.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 228646f..3b132ff 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1486,6 +1486,40 @@ NTSTATUS WINAPI NtSetVolumeInformationFile( return 0; } +static NTSTATUS server_get_unix_name( HANDLE handle, ANSI_STRING *unix_name ) +{ + data_size_t size = 1024; + NTSTATUS ret; + char *name; + + for (;;) + { + name = RtlAllocateHeap( GetProcessHeap(), 0, size + 1 ); + if (!name) return STATUS_NO_MEMORY; + unix_name->MaximumLength = size + 1; + + SERVER_START_REQ( get_handle_unix_name ) + { + req->handle = wine_server_obj_handle( handle ); + wine_server_set_reply( req, name, size ); + ret = wine_server_call( req ); + size = reply->name_len; + } + SERVER_END_REQ; + + if (!ret) + { + name[size] = 0; + unix_name->Buffer = name; + unix_name->Length = size; + break; + } + RtlFreeHeap( GetProcessHeap(), 0, name ); + if (ret != STATUS_BUFFER_OVERFLOW) break; + } + return ret; +} + /****************************************************************************** * NtQueryInformationFile [NTDLL.@] * ZwQueryInformationFile [NTDLL.@] @@ -1774,6 +1808,42 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, SERVER_END_REQ; } break; + case FileNameInformation: + { + FILE_NAME_INFORMATION *info = ptr; + ANSI_STRING unix_name; + + if (!(io->u.Status = server_get_unix_name( hFile, &unix_name ))) + { + LONG name_len = len - FIELD_OFFSET(FILE_NAME_INFORMATION, FileName); + UNICODE_STRING nt_name; + + io->u.Status = wine_unix_to_nt_file_name( &unix_name, &nt_name ); + RtlFreeAnsiString( &unix_name ); + + if (!io->u.Status) + { + const WCHAR *ptr = nt_name.Buffer; + const WCHAR *end = ptr + (nt_name.Length / sizeof(WCHAR)); + + /* Skip the volume mount point. */ + while (ptr != end && *ptr == '\\') ++ptr; + while (ptr != end && *ptr != '\\') ++ptr; + while (ptr != end && *ptr == '\\') ++ptr; + while (ptr != end && *ptr != '\\') ++ptr; + + info->FileNameLength = (end - ptr) * sizeof(WCHAR); + if (name_len < info->FileNameLength) io->u.Status = STATUS_BUFFER_OVERFLOW; + else name_len = info->FileNameLength; + + memcpy( info->FileName, ptr, name_len ); + RtlFreeUnicodeString( &nt_name ); + + io->Information = FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + name_len; + } + } + } + break; default: FIXME("Unsupported class (%d)\n", class); io->u.Status = STATUS_NOT_IMPLEMENTED;

1 0

Henri Verbeet : server: Store the Unix name in the fd.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 27705d51e1a3145d6f70cfeffad677adbf02d373 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27705d51e1a3145d6f70cfeff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 12 15:10:12 2009 +0100 server: Store the Unix name in the fd. --- include/wine/server_protocol.h | 20 +++++++++++++++++++- server/fd.c | 25 +++++++++++++++++++++++++ server/protocol.def | 9 +++++++++ server/request.h | 5 +++++ server/trace.c | 14 ++++++++++++++ 5 files changed, 72 insertions(+), 1 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d2b159a..fd52bfb 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1207,6 +1207,21 @@ struct alloc_file_handle_reply +struct get_handle_unix_name_request +{ + struct request_header __header; + obj_handle_t handle; +}; +struct get_handle_unix_name_reply +{ + struct reply_header __header; + data_size_t name_len; + /* VARARG(name,string); */ + char __pad_12[4]; +}; + + + struct get_handle_fd_request { struct request_header __header; @@ -4678,6 +4693,7 @@ enum request REQ_create_file, REQ_open_file_object, REQ_alloc_file_handle, + REQ_get_handle_unix_name, REQ_get_handle_fd, REQ_flush_file, REQ_lock_file, @@ -4925,6 +4941,7 @@ union generic_request struct create_file_request create_file_request; struct open_file_object_request open_file_object_request; struct alloc_file_handle_request alloc_file_handle_request; + struct get_handle_unix_name_request get_handle_unix_name_request; struct get_handle_fd_request get_handle_fd_request; struct flush_file_request flush_file_request; struct lock_file_request lock_file_request; @@ -5170,6 +5187,7 @@ union generic_reply struct create_file_reply create_file_reply; struct open_file_object_reply open_file_object_reply; struct alloc_file_handle_reply alloc_file_handle_reply; + struct get_handle_unix_name_reply get_handle_unix_name_reply; struct get_handle_fd_reply get_handle_fd_reply; struct flush_file_reply flush_file_reply; struct lock_file_reply lock_file_reply; @@ -5375,6 +5393,6 @@ union generic_reply struct free_user_handle_reply free_user_handle_reply; }; -#define SERVER_PROTOCOL_VERSION 392 +#define SERVER_PROTOCOL_VERSION 393 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/fd.c b/server/fd.c index 72ebcfe..f57ed97 100644 --- a/server/fd.c +++ b/server/fd.c @@ -190,6 +190,7 @@ struct fd unsigned int access; /* file access (FILE_READ_DATA etc.) */ unsigned int options; /* file options (FILE_DELETE_ON_CLOSE, FILE_SYNCHRONOUS...) */ unsigned int sharing; /* file sharing mode */ + char *unix_name; /* unix file name */ int unix_fd; /* unix file descriptor */ unsigned int no_fd_status;/* status to return when unix_fd is -1 */ unsigned int signaled :1; /* is the fd signaled? */ @@ -1368,6 +1369,7 @@ static void fd_destroy( struct object *obj ) if (fd->completion) release_object( fd->completion ); remove_fd_locks( fd ); + free( fd->unix_name ); list_remove( &fd->inode_entry ); if (fd->poll_index != -1) remove_poll_user( fd, fd->poll_index ); if (fd->inode) @@ -1438,6 +1440,7 @@ static struct fd *alloc_fd_object(void) fd->options = 0; fd->sharing = 0; fd->unix_fd = -1; + fd->unix_name = NULL; fd->signaled = 1; fd->fs_locks = 1; fd->poll_index = -1; @@ -1470,6 +1473,7 @@ struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *use fd->access = 0; fd->options = options; fd->sharing = 0; + fd->unix_name = NULL; fd->unix_fd = -1; fd->signaled = 0; fd->fs_locks = 0; @@ -1577,6 +1581,9 @@ struct fd *open_fd( const char *name, int flags, mode_t *mode, unsigned int acce } else rw_mode = O_RDONLY; + if (!(fd->unix_name = mem_alloc( strlen(name) + 1 ))) goto error; + strcpy( fd->unix_name, name ); + if ((fd->unix_fd = open( name, rw_mode | (flags & ~O_TRUNC), *mode )) == -1) { /* if we tried to open a directory for write access, retry read-only */ @@ -2003,6 +2010,24 @@ DECL_HANDLER(open_file_object) if (root) release_object( root ); } +/* get the Unix name from a file handle */ +DECL_HANDLER(get_handle_unix_name) +{ + struct fd *fd; + + if ((fd = get_handle_fd_obj( current->process, req->handle, 0 ))) + { + if (fd->unix_name) + { + data_size_t name_len = strlen( fd->unix_name ); + reply->name_len = name_len; + if (name_len <= get_reply_max_size()) set_reply_data( fd->unix_name, name_len ); + else set_error( STATUS_BUFFER_OVERFLOW ); + } + release_object( fd ); + } +} + /* get a Unix fd to access a file */ DECL_HANDLER(get_handle_fd) { diff --git a/server/protocol.def b/server/protocol.def index a0e1702..ca44e38 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1003,6 +1003,15 @@ enum event_op { PULSE_EVENT, SET_EVENT, RESET_EVENT }; @END +/* Get the Unix name from a file handle */ +@REQ(get_handle_unix_name) + obj_handle_t handle; /* file handle */ +@REPLY + data_size_t name_len; /* unix name length */ + VARARG(name,string); /* unix name */ +@END + + /* Get a Unix fd to access a file */ @REQ(get_handle_fd) obj_handle_t handle; /* handle to the file */ diff --git a/server/request.h b/server/request.h index 87b6a75..8aa8a9d 100644 --- a/server/request.h +++ b/server/request.h @@ -148,6 +148,7 @@ DECL_HANDLER(open_semaphore); DECL_HANDLER(create_file); DECL_HANDLER(open_file_object); DECL_HANDLER(alloc_file_handle); +DECL_HANDLER(get_handle_unix_name); DECL_HANDLER(get_handle_fd); DECL_HANDLER(flush_file); DECL_HANDLER(lock_file); @@ -394,6 +395,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_create_file, (req_handler)req_open_file_object, (req_handler)req_alloc_file_handle, + (req_handler)req_get_handle_unix_name, (req_handler)req_get_handle_fd, (req_handler)req_flush_file, (req_handler)req_lock_file, @@ -846,6 +848,9 @@ C_ASSERT( FIELD_OFFSET(struct alloc_file_handle_request, attributes) == 16 ); C_ASSERT( FIELD_OFFSET(struct alloc_file_handle_request, fd) == 20 ); C_ASSERT( FIELD_OFFSET(struct alloc_file_handle_reply, handle) == 8 ); C_ASSERT( sizeof(struct alloc_file_handle_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_handle_unix_name_request, handle) == 12 ); +C_ASSERT( FIELD_OFFSET(struct get_handle_unix_name_reply, name_len) == 8 ); +C_ASSERT( sizeof(struct get_handle_unix_name_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_handle_fd_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_handle_fd_reply, type) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_handle_fd_reply, removable) == 12 ); diff --git a/server/trace.c b/server/trace.c index b7dec85..a529e5b 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1457,6 +1457,17 @@ static void dump_alloc_file_handle_reply( const struct alloc_file_handle_reply * fprintf( stderr, " handle=%04x", req->handle ); } +static void dump_get_handle_unix_name_request( const struct get_handle_unix_name_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); +} + +static void dump_get_handle_unix_name_reply( const struct get_handle_unix_name_reply *req ) +{ + fprintf( stderr, " name_len=%u", req->name_len ); + dump_varargs_string( ", name=", cur_size ); +} + static void dump_get_handle_fd_request( const struct get_handle_fd_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -3832,6 +3843,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_create_file_request, (dump_func)dump_open_file_object_request, (dump_func)dump_alloc_file_handle_request, + (dump_func)dump_get_handle_unix_name_request, (dump_func)dump_get_handle_fd_request, (dump_func)dump_flush_file_request, (dump_func)dump_lock_file_request, @@ -4075,6 +4087,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_create_file_reply, (dump_func)dump_open_file_object_reply, (dump_func)dump_alloc_file_handle_reply, + (dump_func)dump_get_handle_unix_name_reply, (dump_func)dump_get_handle_fd_reply, (dump_func)dump_flush_file_reply, (dump_func)dump_lock_file_reply, @@ -4318,6 +4331,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "create_file", "open_file_object", "alloc_file_handle", + "get_handle_unix_name", "get_handle_fd", "flush_file", "lock_file",

1 0

Jacek Caban : mshtml: Download Gecko in DllRegisterServer.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 10b0b86cbc655099e3a070198bdfd4662e931b71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10b0b86cbc655099e3a070198… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 14:52:43 2009 +0100 mshtml: Download Gecko in DllRegisterServer. --- dlls/mshtml/main.c | 11 +++++++---- dlls/mshtml/nsembed.c | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 548c50c..6a358e5 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -391,9 +391,6 @@ static HRESULT register_server(BOOL do_register) if(FAILED(hres)) ERR("typelib registration failed: %08x\n", hres); - if(do_register && SUCCEEDED(hres)) - load_gecko(TRUE); - return hres; } @@ -405,7 +402,13 @@ static HRESULT register_server(BOOL do_register) */ HRESULT WINAPI DllRegisterServer(void) { - return register_server(TRUE); + HRESULT hres; + + hres = register_server(TRUE); + if(SUCCEEDED(hres)) + load_gecko(FALSE); + + return hres; } /*********************************************************************** diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 6207c13..2150a0f 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1615,7 +1615,7 @@ NSContainer *NSContainer_Create(HTMLDocumentObj *doc, NSContainer *parent) NSContainer *ret; nsresult nsres; - if(!load_gecko(FALSE)) + if(!load_gecko(TRUE)) return NULL; ret = heap_alloc_zero(sizeof(NSContainer));

1 0

Jacek Caban : mshtml: Moved GeckoUrl registry to mshtml.inf.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: ca32265d88d60c2e0d81822d2738a164b6310ad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca32265d88d60c2e0d81822d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 14:52:24 2009 +0100 mshtml: Moved GeckoUrl registry to mshtml.inf. --- dlls/mshtml/mshtml.inf | 7 ++++++- tools/wine.inf.in | 1 - 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/mshtml.inf b/dlls/mshtml/mshtml.inf index aa7e814..f493a3b 100644 --- a/dlls/mshtml/mshtml.inf +++ b/dlls/mshtml/mshtml.inf @@ -3,7 +3,7 @@ Signature="$CHICAGO$" [RegisterDll] -AddReg=Classes.Reg, Protocols.Reg, IE.Reg, FileAssoc.Reg +AddReg=Classes.Reg, Protocols.Reg, IE.Reg, FileAssoc.Reg, WineGecko.Reg [UnregisterDll] @@ -270,6 +270,11 @@ HKLM,"Software\Microsoft\Internet Explorer\AboutURLs","mozilla",2,"res://mshtml. HKLM,"Software\Microsoft\Internet Explorer\Default Behaviors","VML",, "CLSID:10072CEC-8CC1-11D1-986E-00A0C955B42E" HKLM,"Software\Microsoft\Internet Explorer\Default Behaviors","TIME",, "CLSID:476C391C-3E0D-11D2-B948-00C04FA32195" + +[WineGecko.Reg] +HKCU,Software\Wine\MSHTML,"GeckoUrl",,"http://source.winehq.org/winegecko.php" + + [FileAssoc.Reg] ;; AVI diff --git a/tools/wine.inf.in b/tools/wine.inf.in index cdd5218..03e6142 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -540,7 +540,6 @@ HKLM,System\CurrentControlSet\Control\Session Manager,,,"" HKLM,System\CurrentControlSet\Control\VMM32Files,,,"" HKCU,AppEvents\Schemes\Apps\Explorer\Navigating\.Current,,,"" HKCU,Software\Microsoft\Protected Storage System Provider,,,"" -HKCU,Software\Wine\MSHTML,"GeckoUrl",,"http://source.winehq.org/winegecko.php" HKLM,HARDWARE\DEVICEMAP\PARALLEL PORTS,,,"" HKLM,HARDWARE\DEVICEMAP\SERIALCOMM,,,"" ; Some apps requires at least four subkeys of Active Setup\Installed Components

1 0

Jacek Caban : mshtml: Get rid of no longer needed bind_complete in set_moniker.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 7f6630ee44e9f4bc2185056e9f15deecabe38e8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f6630ee44e9f4bc2185056e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 14:52:09 2009 +0100 mshtml: Get rid of no longer needed bind_complete in set_moniker. --- dlls/mshtml/persist.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 805d7f0..f3d23bd 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -152,7 +152,7 @@ static void set_downloading_proc(task_t *_task) } } -static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BOOL *bind_complete) +static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc) { nsChannelBSC *bscallback; LPOLESTR url = NULL; @@ -268,8 +268,6 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO IUnknown_Release((IUnknown*)bscallback); CoTaskMemFree(url); - if(bind_complete) - *bind_complete = FALSE; return S_OK; } @@ -357,19 +355,15 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva IMoniker *pimkName, LPBC pibc, DWORD grfMode) { HTMLDocument *This = PERSISTMON_THIS(iface); - BOOL bind_complete = FALSE; HRESULT hres; TRACE("(%p)->(%x %p %p %08x)\n", This, fFullyAvailable, pimkName, pibc, grfMode); - hres = set_moniker(This, pimkName, pibc, &bind_complete); + hres = set_moniker(This, pimkName, pibc); if(FAILED(hres)) return hres; - if(!bind_complete) - return start_binding(This->window, NULL, (BSCallback*)This->window->bscallback, pibc); - - return S_OK; + return start_binding(This->window, NULL, (BSCallback*)This->window->bscallback, pibc); } static HRESULT WINAPI PersistMoniker_Save(IPersistMoniker *iface, IMoniker *pimkName, @@ -626,7 +620,7 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, LPSTREAM return hres; } - hres = set_moniker(This, mon, NULL, NULL); + hres = set_moniker(This, mon, NULL); IMoniker_Release(mon); if(FAILED(hres)) return hres;

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
91
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 November 2009