January 2010 - Wine-commits

Łukasz Wojniłowicz : Polish translation for release 1.1.36
by Jeremy Newman 11 Jan '10

11 Jan '10

Module: website Branch: master Commit: b552126b4ce0ef3a75ae8dbde7ed8741f2bb8028 URL: http://source.winehq.org/git/website.git/?a=commit;h=b552126b4ce0ef3a75ae8d… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Jan 9 09:31:46 2010 +0100 Polish translation for release 1.1.36 --- news/pl/2010010801.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2010010801.xml b/news/pl/2010010801.xml new file mode 100644 index 0000000..710ce78 --- /dev/null +++ b/news/pl/2010010801.xml @@ -0,0 +1,17 @@ +<news> +<date>Styczeń 8, 2010</date> +<title>Wydano Wine 1.1.36</title> +<body> + Wydanie rozwojowe Wine 1.1.36 jest już dostępne. + <a href="{$root}/announce/1.1.36">Co nowego</a> w tym wydaniu: +<ul> + <li>Ukończenie odseparowywania kodu 16-bitowego.</li> + <li>Ulepszone wsparcie dla Shader Model 4.</li> + <li>Masa poprawionych wycieków pamięci.</li> + <li>Ulepszone wsparcie debugowania dla MinGW.</li> + <li>Liczne poprawki w MSHTML.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.36.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkróce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alexandre Julliard : Wine release 1.1.36
by Alexandre Julliard 08 Jan '10

08 Jan '10

Module: website Branch: master Commit: 6d39c08f0cc98058dfab8150369c20ef534b25b1 URL: http://source.winehq.org/git/website.git/?a=commit;h=6d39c08f0cc98058dfab81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 8 20:27:58 2010 +0100 Wine release 1.1.36 --- news/en/2010010801.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2010010801.xml b/news/en/2010010801.xml new file mode 100644 index 0000000..6a1c2e9 --- /dev/null +++ b/news/en/2010010801.xml @@ -0,0 +1,17 @@ +<news> +<date>January 8, 2010</date> +<title>Wine 1.1.36 Released</title> +<body> + The Wine development release 1.1.36 is now available. + <a href="{$root}/announce/1.1.36">What's new</a> in this release: +<ul> + <li>Completion of the 16-bit separation.</li> + <li>Improved Shader Model 4 support.</li> + <li>A ton of memory leak fixes.</li> + <li>Improved debugging support for MinGW.</li> + <li>A number of MSHTML fixes.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.36.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.1.36.
by Alexandre Julliard 08 Jan '10

08 Jan '10

Module: wine Branch: master Commit: 21b6c3202a506d32c198d9b87c4666fc5cf658aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=21b6c3202a506d32c198d9b87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 8 20:20:11 2010 +0100 Release 1.1.36. --- ANNOUNCE | 1503 +++++++++++++++++++++++++++++-------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 713 insertions(+), 810 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21b6c3202a506d32c198d…

1 0

Tag wine-1.1.36 : Alexandre Julliard : Release 1.1.36
by Alexandre Julliard 08 Jan '10

08 Jan '10

Module: wine Branch: refs/tags/wine-1.1.36 Tag: 8493cf4993ceda44b0d40d921e3cb92f586f9d95 URL: http://source.winehq.org/git/wine.git/?a=tag;h=8493cf4993ceda44b0d40d921e3c… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 8 20:20:11 2010 +0100 Release 1.1.36

1 0

Paul Vriens : shell32: Fix length parameter for ZeroMemory (Coccinelle).
by Alexandre Julliard 08 Jan '10

08 Jan '10

Module: wine Branch: master Commit: cb5e6f378a2465b439aa0acfa1e25e5319f72688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb5e6f378a2465b439aa0acfa… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jan 8 09:23:40 2010 +0100 shell32: Fix length parameter for ZeroMemory (Coccinelle). --- dlls/shell32/shfldr_fs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 77a98f3..091c1e0 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1504,7 +1504,7 @@ IFSFldr_PersistFolder3_GetFolderTargetInfo (IPersistFolder3 * iface, { IGenericSFImpl *This = impl_from_IPersistFolder3(iface); FIXME ("(%p)->(%p)\n", This, ppfti); - ZeroMemory (ppfti, sizeof (ppfti)); + ZeroMemory (ppfti, sizeof (*ppfti)); return E_NOTIMPL; }

1 0

Paul Vriens : d3d9/tests: Fix size parameter for memcmp (Coccinelle).
by Alexandre Julliard 08 Jan '10

08 Jan '10

Module: wine Branch: master Commit: e38e54e3f458260e20142a0b74dddcbab8070f50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e38e54e3f458260e20142a0b7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jan 8 09:31:46 2010 +0100 d3d9/tests: Fix size parameter for memcmp (Coccinelle). --- dlls/d3d9/tests/vertexdeclaration.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/vertexdeclaration.c b/dlls/d3d9/tests/vertexdeclaration.c index 82538ab..72b8f9f 100644 --- a/dlls/d3d9/tests/vertexdeclaration.c +++ b/dlls/d3d9/tests/vertexdeclaration.c @@ -214,7 +214,7 @@ static void test_get_declaration(IDirect3DVertexDeclaration9 *decl_ptr, D3DVERTE ok(hret == D3D_OK && num_elements == expected_num_elements, "GetDeclaration returned: hret 0x%x, num_elements %d. " "Expected hret 0x%x, num_elements %d.\n", hret, num_elements, D3D_OK, expected_num_elements); - i = memcmp(decl, vertex_decl, sizeof(vertex_decl)); + i = memcmp(decl, vertex_decl, sizeof(*vertex_decl)); ok (!i, "Original and returned vertexdeclarations are not the same\n"); ZeroMemory(decl, sizeof(D3DVERTEXELEMENT9) * expected_num_elements); @@ -223,7 +223,7 @@ static void test_get_declaration(IDirect3DVertexDeclaration9 *decl_ptr, D3DVERTE ok(hret == D3D_OK && num_elements == expected_num_elements, "GetDeclaration returned: hret 0x%x, num_elements %d. " "Expected hret 0x%x, num_elements %d.\n", hret, num_elements, D3D_OK, expected_num_elements); - i = memcmp(decl, vertex_decl, sizeof(vertex_decl)); + i = memcmp(decl, vertex_decl, sizeof(*vertex_decl)); ok (!i, "Original and returned vertexdeclarations are not the same\n"); HeapFree(GetProcessHeap(), 0, decl);

1 0

Paul Vriens : ntdll: Fix length parameter for NtQueryValueKey (Coccinelle).
by Alexandre Julliard 08 Jan '10

08 Jan '10

Module: wine Branch: master Commit: 2e03013fc0873524a7f8c0c78d455b7f3bac8966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e03013fc0873524a7f8c0c78… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jan 8 09:27:21 2010 +0100 ntdll: Fix length parameter for NtQueryValueKey (Coccinelle). --- dlls/ntdll/relay.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 1981e51..7fd3c35 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -147,7 +147,7 @@ static const WCHAR **load_list( HKEY hkey, const WCHAR *value ) const WCHAR **list = NULL; RtlInitUnicodeString( &name, value ); - status = NtQueryValueKey( hkey, &name, KeyValuePartialInformation, buffer, sizeof(buffer), &count ); + status = NtQueryValueKey( hkey, &name, KeyValuePartialInformation, buffer, sizeof(initial_buffer), &count ); if (status == STATUS_BUFFER_OVERFLOW) { buffer = RtlAllocateHeap( GetProcessHeap(), 0, count );

1 0

Alexandre Julliard : server: Add support for returning the object name in NtQueryObject.
by Alexandre Julliard 08 Jan '10

08 Jan '10

Module: wine Branch: master Commit: 658dae988df5427c392a021d2bed9e8219b403df URL: http://source.winehq.org/git/wine.git/?a=commit;h=658dae988df5427c392a021d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 8 13:01:50 2010 +0100 server: Add support for returning the object name in NtQueryObject. --- dlls/ntdll/om.c | 36 ++++++++++++++++++++++++++ dlls/ntdll/tests/om.c | 54 ++++++++++++++++++++++++++++++++++++++++ include/wine/server_protocol.h | 5 +++- server/handle.c | 3 ++ server/object.c | 29 +++++++++++++++++++++ server/object.h | 1 + server/protocol.def | 2 + server/request.h | 3 +- server/trace.c | 2 + 9 files changed, 133 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=658dae988df5427c392a0…

1 0

Alexandre Julliard : ntdll: Return a correct name also for file objects in NtQueryObject.
by Alexandre Julliard 08 Jan '10

08 Jan '10

Module: wine Branch: master Commit: 574eace36eaf555d568216c0a01ecdbcc204f532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=574eace36eaf555d568216c0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 8 13:16:57 2010 +0100 ntdll: Return a correct name also for file objects in NtQueryObject. --- dlls/ntdll/file.c | 2 +- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/om.c | 28 ++++++++++++++++++++++++++++ dlls/ntdll/tests/om.c | 13 +++++++++++++ 4 files changed, 43 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index b81d38c..741395d 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1633,7 +1633,7 @@ NTSTATUS fill_stat_info( const struct stat *st, void *ptr, FILE_INFORMATION_CLAS return STATUS_SUCCESS; } -static NTSTATUS server_get_unix_name( HANDLE handle, ANSI_STRING *unix_name ) +NTSTATUS server_get_unix_name( HANDLE handle, ANSI_STRING *unix_name ) { data_size_t size = 1024; NTSTATUS ret; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index e1e67ea..32966b7 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -142,6 +142,7 @@ extern NTSTATUS TAPE_DeviceIoControl(HANDLE hDevice, struct stat; extern NTSTATUS FILE_GetNtStatus(void); extern NTSTATUS fill_stat_info( const struct stat *st, void *ptr, FILE_INFORMATION_CLASS class ); +extern NTSTATUS server_get_unix_name( HANDLE handle, ANSI_STRING *unix_name ); extern void DIR_init_windows_dir( const WCHAR *windir, const WCHAR *sysdir ); extern BOOL DIR_is_hidden_file( const UNICODE_STRING *name ); extern NTSTATUS DIR_unmount_device( HANDLE handle ); diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index e9677d0..c5d9b84 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -88,6 +88,34 @@ NTSTATUS WINAPI NtQueryObject(IN HANDLE handle, case ObjectNameInformation: { OBJECT_NAME_INFORMATION* p = ptr; + ANSI_STRING unix_name; + + /* first try as a file object */ + + if (!(status = server_get_unix_name( handle, &unix_name ))) + { + UNICODE_STRING nt_name; + NTSTATUS status; + + if (!(status = wine_unix_to_nt_file_name( &unix_name, &nt_name ))) + { + if (sizeof(*p) + nt_name.MaximumLength <= len) + { + p->Name.Buffer = (WCHAR *)(p + 1); + p->Name.Length = nt_name.Length; + p->Name.MaximumLength = nt_name.MaximumLength; + memcpy( p->Name.Buffer, nt_name.Buffer, nt_name.MaximumLength ); + } + else status = STATUS_INFO_LENGTH_MISMATCH; + if (used_len) *used_len = sizeof(*p) + nt_name.MaximumLength; + RtlFreeUnicodeString( &nt_name ); + } + RtlFreeAnsiString( &unix_name ); + break; + } + else if (status != STATUS_OBJECT_TYPE_MISMATCH) break; + + /* not a file, treat as a generic object */ SERVER_START_REQ( get_object_info ) { diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index cf9a1a5..1bab21d 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -627,6 +627,7 @@ static void test_query_object(void) NTSTATUS status; ULONG len; UNICODE_STRING *str; + char dir[MAX_PATH]; handle = CreateEventA( NULL, FALSE, FALSE, "test_event" ); @@ -667,6 +668,18 @@ static void test_query_object(void) ok( str->Length == 0, "unexpected len %u\n", len ); ok( str->Buffer == NULL, "unexpected ptr %p\n", str->Buffer ); pNtClose( handle ); + + GetWindowsDirectoryA( dir, MAX_PATH ); + handle = CreateFileA( dir, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, + FILE_FLAG_BACKUP_SEMANTICS, 0 ); + len = 0; + status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(buffer), &len ); + ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); + ok( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len ); + str = (UNICODE_STRING *)buffer; + ok( sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR) == len, "unexpected len %u\n", len ); + trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); + pNtClose( handle ); } START_TEST(om)

1 0

Alexandre Julliard : ntdll: Don' t require read access to the root directory for normal opens, similarly to the open by id case.
by Alexandre Julliard 08 Jan '10

08 Jan '10

Module: wine Branch: master Commit: 25bee84030d63ca09a35e4a9a4fe2ecd9c3150d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25bee84030d63ca09a35e4a9a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 8 15:54:20 2010 +0100 ntdll: Don't require read access to the root directory for normal opens, similarly to the open by id case. --- dlls/ntdll/directory.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 7b124af..ecd9418 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2550,8 +2550,7 @@ NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, ANSI_STRING * return STATUS_NO_MEMORY; unix_name[0] = '.'; - if (!(status = server_get_unix_fd( attr->RootDirectory, FILE_READ_DATA, &root_fd, - &needs_close, &type, NULL ))) + if (!(status = server_get_unix_fd( attr->RootDirectory, 0, &root_fd, &needs_close, &type, NULL ))) { if (type != FD_TYPE_DIR) {

1 0