wine-commits June 2010

wine-commits@winehq.org

3 participants
663 discussions

Alexandre Julliard : configure: Disable clean and depend rules for disabled top-level directories.
by Alexandre Julliard 30 Jun '10

30 Jun '10

Module: wine Branch: master Commit: 9bdd0272ce45b7d720b1b7d0cf90c744a967cc4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bdd0272ce45b7d720b1b7d0c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 30 17:34:20 2010 +0200 configure: Disable clean and depend rules for disabled top-level directories. --- aclocal.m4 | 7 ++++--- configure | 9 ++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 69d0e1a..a77f15e 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -183,9 +183,10 @@ wine_fn_config_makefile () { ac_dir=$[1] ac_enable=$[2] - wine_fn_all_dir_rules $ac_dir "Make.rules \$(MAKEDEP)" + AS_VAR_IF([$ac_enable],[no],[return 0]) - AS_VAR_IF([$ac_enable],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ + wine_fn_all_dir_rules $ac_dir "Make.rules \$(MAKEDEP)" + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "all: $ac_dir .PHONY: $ac_dir $ac_dir: $ac_dir/Makefile dummy @@ -197,7 +198,7 @@ install-lib:: $ac_dir install-dev:: $ac_dir @cd $ac_dir && \$(MAKE) install-dev uninstall:: $ac_dir/Makefile - @cd $ac_dir && \$(MAKE) uninstall"]) + @cd $ac_dir && \$(MAKE) uninstall" } wine_fn_config_lib () diff --git a/configure b/configure index 530c551..4847297 100755 --- a/configure +++ b/configure @@ -13989,13 +13989,13 @@ wine_fn_config_makefile () { ac_dir=$1 ac_enable=$2 - wine_fn_all_dir_rules $ac_dir "Make.rules \$(MAKEDEP)" - eval as_val=\$$ac_enable if test "x$as_val" = x""no; then : + return 0 +fi -else - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ + wine_fn_all_dir_rules $ac_dir "Make.rules \$(MAKEDEP)" + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "all: $ac_dir .PHONY: $ac_dir $ac_dir: $ac_dir/Makefile dummy @@ -14008,7 +14008,6 @@ install-dev:: $ac_dir @cd $ac_dir && \$(MAKE) install-dev uninstall:: $ac_dir/Makefile @cd $ac_dir && \$(MAKE) uninstall" -fi } wine_fn_config_lib ()

1 0

Vitaly Lipatov : kernel32: Add Russian translation.
by Alexandre Julliard 30 Jun '10

30 Jun '10

Module: wine Branch: master Commit: 43ed0c177cc93985f701ec694e789d5343f13c06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43ed0c177cc93985f701ec694… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sat Jun 26 18:08:56 2010 +0400 kernel32: Add Russian translation. --- .gitignore | 1 + dlls/kernel32/Makefile.in | 3 +- dlls/kernel32/nls/winerr_rus.mc | 3736 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 3739 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=43ed0c177cc93985f701e…

1 0

Alexander Nicolaysen Sørnes : mapi32: Add Norwegian Bokmål translation.
by Alexandre Julliard 30 Jun '10

30 Jun '10

Module: wine Branch: master Commit: 7f0273a98f1aeb29d621d99df073c242213aff2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f0273a98f1aeb29d621d99df… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jun 30 16:11:21 2010 +0200 mapi32: Add Norwegian Bokmål translation. --- dlls/mapi32/Makefile.in | 1 + dlls/mapi32/No.rc | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index 41140e5..6197cd5 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -25,6 +25,7 @@ RC_SRCS = \ Ko.rc \ Lt.rc \ Nl.rc \ + No.rc \ Pl.rc \ Pt.rc \ Ro.rc \ diff --git a/dlls/mapi32/No.rc b/dlls/mapi32/No.rc new file mode 100644 index 0000000..5e4d8c5 --- /dev/null +++ b/dlls/mapi32/No.rc @@ -0,0 +1,32 @@ +/* +* MAPI32 Norwegian Bokmål resources +* +* Copyright 2010 Alexander N. Sørnes <alex(a)thehandofagony.com> +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Lesser General Public +* License as published by the Free Software Foundation; either +* version 2.1 of the License, or (at your option) any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this library; if not, write to the Free Software +* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +* +*/ + +#include "res.h" + +#pragma code_page(65001) + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL + +STRINGTABLE +{ + IDS_NO_MAPI_CLIENT, "Klarte ikke sende e-post fordi en MAPI-klient ikke er installert." + IDS_SEND_MAIL, "Send e-post" +}

1 0

Alexander Nicolaysen Sørnes : wordpad: Update Norwegian Bokmål translation.
by Alexandre Julliard 30 Jun '10

30 Jun '10

Module: wine Branch: master Commit: 6cf3823a8cb6c7fbd119b77642ed9d6c10618427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cf3823a8cb6c7fbd119b7764… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jun 30 16:08:13 2010 +0200 wordpad: Update Norwegian Bokmål translation. --- programs/wordpad/No.rc | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index 7fa0c84..592f93b 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -128,7 +128,7 @@ BEGIN MENUITEM "Fuchsia" ID_COLOR_FUCHSIA MENUITEM "Aqua" ID_COLOR_AQUA MENUITEM "Hvit" ID_COLOR_WHITE - MENUITEM "Automatic" ID_COLOR_AUTOMATIC + MENUITEM "Automatisk" ID_COLOR_AUTOMATIC END END @@ -192,7 +192,7 @@ Caption "" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Linjebryting", -1, 10, 10, 130, 85 - RADIOBUTTON "No line wrapping", IDC_PAGEFMT_WN, 18, 25, 117, 15 + RADIOBUTTON "Ingen linjebryting", IDC_PAGEFMT_WN, 18, 25, 117, 15 RADIOBUTTON "Bryt tekst etter v&indusbredden", IDC_PAGEFMT_WW, 18, 45, 117, 15 RADIOBUTTON "Bryt tekst etter &margen", IDC_PAGEFMT_WM, 18, 65, 117, 15 GROUPBOX "Verktøylinjer", -1, 150, 10, 120, 85 @@ -247,6 +247,12 @@ BEGIN STRING_PREVIEW_ZOOMIN, "Zoom in" STRING_PREVIEW_ZOOMOUT, "Zoom out" STRING_PREVIEW_CLOSE, "Lukk" + STRING_PREVIEW_PAGE, "Side" + STRING_PREVIEW_PAGES, "Sider" + STRING_UNITS_CM, "cm" + STRING_UNITS_IN, "in" + STRING_UNITS_INCH, "inch" + STRING_UNITS_PT, "pt" END STRINGTABLE DISCARDABLE @@ -259,7 +265,7 @@ BEGIN "vil føre til at all formatering går tapt. Er du " \ "sikker på at du vil fortsette?" STRING_INVALID_NUMBER, "Ugyldig tallformat" - STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage-dokumenter støttes ikke" STRING_WRITE_FAILED, "Klarte ikke lagre filen." STRING_WRITE_ACCESS_DENIED, "Du har ikke tilgang til å lagre filen." STRING_OPEN_FAILED, "Klarte ikke åpne filen."

1 0

Mikko Rasa : ddraw: Grow index buffer as needed.
by Alexandre Julliard 30 Jun '10

30 Jun '10

Module: wine Branch: master Commit: f18cb4c2f45878c40bbc27f826c4d97ddba304a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f18cb4c2f45878c40bbc27f82… Author: Mikko Rasa <tdb(a)tdb.fi> Date: Wed Jun 30 11:40:29 2010 +0300 ddraw: Grow index buffer as needed. --- dlls/ddraw/device.c | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index aba7bdc..6b00d4f 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4299,6 +4299,7 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, DWORD stride = get_flexible_vertex_size(vb->fvf); WORD *LockedIndices; HRESULT hr; + WINED3DBUFFER_DESC desc; TRACE("(%p)->(%08x,%p,%d,%d,%p,%d,%08x)\n", This, PrimitiveType, vb, StartVertex, NumVertices, Indices, IndexCount, Flags); @@ -4320,6 +4321,37 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, return hr; } + /* check that the buffer is large enough to hold the indices, + * reallocate if necessary. + */ + hr = IWineD3DBuffer_GetDesc(This->indexbuffer, &desc); + if(desc.Size < IndexCount * sizeof(WORD)) + { + UINT size = max(desc.Size * 2, IndexCount * sizeof(WORD)); + IWineD3DBuffer *buffer; + IUnknown *parent; + + TRACE("Growing index buffer to %u bytes\n", size); + + IWineD3DBuffer_GetParent(This->indexbuffer, &parent); + hr = IWineD3DDevice_CreateIndexBuffer(This->wineD3DDevice, size, + WINED3DUSAGE_DYNAMIC /* Usage */, WINED3DPOOL_DEFAULT, &buffer, parent, + &ddraw_null_wined3d_parent_ops); + if(hr != D3D_OK) + { + ERR("(%p) IWineD3DDevice::CreateIndexBuffer failed with hr = %08x\n", This, hr); + IParent_Release(parent); + LeaveCriticalSection(&ddraw_cs); + return hr; + } + + IWineD3DBuffer_Release(This->indexbuffer); + This->indexbuffer = buffer; + + ((IParentImpl *)parent)->child = (IUnknown *)buffer; + IParent_Release(parent); + } + /* copy the index stream into the index buffer. * A new IWineD3DDevice method could be created * which takes an user pointer containing the indices @@ -4331,7 +4363,6 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, IndexCount * sizeof(WORD), (BYTE **) &LockedIndices, 0 /* Flags */); - assert(IndexCount < 0x100000); if(hr != D3D_OK) { ERR("(%p) IWineD3DBuffer::Map failed with hr = %08x\n", This, hr);

1 0

Alexandre Julliard : ntdll/tests: Add some tests for NtQuerySymbolicLinkObject.
by Alexandre Julliard 30 Jun '10

30 Jun '10

Module: wine Branch: master Commit: 929ba3f11dc5c37ddbd37ed97119367cb149b0cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=929ba3f11dc5c37ddbd37ed97… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 30 16:11:55 2010 +0200 ntdll/tests: Add some tests for NtQuerySymbolicLinkObject. --- dlls/ntdll/tests/om.c | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index d052c35..24339bb 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -44,6 +44,7 @@ static NTSTATUS (WINAPI *pNtOpenDirectoryObject)(PHANDLE, ACCESS_MASK, POBJECT_A static NTSTATUS (WINAPI *pNtCreateDirectoryObject)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES); static NTSTATUS (WINAPI *pNtOpenSymbolicLinkObject)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES); static NTSTATUS (WINAPI *pNtCreateSymbolicLinkObject)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, PUNICODE_STRING); +static NTSTATUS (WINAPI *pNtQuerySymbolicLinkObject)(HANDLE,PUNICODE_STRING,PULONG); static NTSTATUS (WINAPI *pNtQueryObject)(HANDLE,OBJECT_INFORMATION_CLASS,PVOID,ULONG,PULONG); @@ -402,13 +403,44 @@ static void test_directory(void) is_nt4 = (status == STATUS_OBJECT_NAME_NOT_FOUND); /* nt4 doesn't have Local\\ symlink */ if (!is_nt4) { + WCHAR buffer[256]; + ULONG len, full_len; + ok(status == STATUS_SUCCESS, "Failed to open SymbolicLink(%08x)\n", status); pRtlFreeUnicodeString(&str); InitializeObjectAttributes(&attr, &str, 0, dir, NULL); pRtlCreateUnicodeStringFromAsciiz(&str, "one more level"); DIR_TEST_CREATE_FAILURE(&h, STATUS_OBJECT_TYPE_MISMATCH) pRtlFreeUnicodeString(&str); - pNtClose(h); + + str.Buffer = buffer; + str.MaximumLength = sizeof(buffer); + len = 0xdeadbeef; + memset( buffer, 0xaa, sizeof(buffer) ); + status = pNtQuerySymbolicLinkObject( dir, &str, &len ); + ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08x\n", status ); + full_len = str.Length + sizeof(WCHAR); + ok( len == full_len, "bad length %u/%u\n", len, full_len ); + ok( buffer[len / sizeof(WCHAR) - 1] == 0, "no terminating null\n" ); + + str.MaximumLength = str.Length; + len = 0xdeadbeef; + status = pNtQuerySymbolicLinkObject( dir, &str, &len ); + ok( status == STATUS_BUFFER_TOO_SMALL, "NtQuerySymbolicLinkObject failed %08x\n", status ); + ok( len == full_len, "bad length %u/%u\n", len, full_len ); + + str.MaximumLength = 0; + len = 0xdeadbeef; + status = pNtQuerySymbolicLinkObject( dir, &str, &len ); + ok( status == STATUS_BUFFER_TOO_SMALL, "NtQuerySymbolicLinkObject failed %08x\n", status ); + ok( len == full_len, "bad length %u/%u\n", len, full_len ); + + str.MaximumLength = str.Length + sizeof(WCHAR); + len = 0xdeadbeef; + status = pNtQuerySymbolicLinkObject( dir, &str, &len ); + ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08x\n", status ); + ok( len == full_len, "bad length %u/%u\n", len, full_len ); + pNtClose(dir); } @@ -710,6 +742,7 @@ START_TEST(om) pNtCreateDirectoryObject= (void *)GetProcAddress(hntdll, "NtCreateDirectoryObject"); pNtOpenSymbolicLinkObject = (void *)GetProcAddress(hntdll, "NtOpenSymbolicLinkObject"); pNtCreateSymbolicLinkObject = (void *)GetProcAddress(hntdll, "NtCreateSymbolicLinkObject"); + pNtQuerySymbolicLinkObject = (void *)GetProcAddress(hntdll, "NtQuerySymbolicLinkObject"); pNtCreateSemaphore = (void *)GetProcAddress(hntdll, "NtCreateSemaphore"); pNtCreateTimer = (void *)GetProcAddress(hntdll, "NtCreateTimer"); pNtCreateSection = (void *)GetProcAddress(hntdll, "NtCreateSection");

1 0

Alexandre Julliard : ntdll: Append a terminating null and return the correct length in NtQuerySymbolicLinkObject .
by Alexandre Julliard 30 Jun '10

30 Jun '10

Module: wine Branch: master Commit: 6df7e7b94362f874a5b5a46cda0eead8f517c651 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6df7e7b94362f874a5b5a46cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 30 16:11:42 2010 +0200 ntdll: Append a terminating null and return the correct length in NtQuerySymbolicLinkObject. --- dlls/ntdll/om.c | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index c5d9b84..0e64ddd 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -634,33 +634,36 @@ NTSTATUS WINAPI NtCreateSymbolicLinkObject(OUT PHANDLE SymbolicLinkHandle,IN ACC * ZwQuerySymbolicLinkObject [NTDLL.@] * * Query a namespace symbolic link object target name. - * + * * PARAMS - * LinkHandle [I] Handle to a symbolic link object - * LinkTarget [O] Destination for the symbolic link target - * ReturnedLength [O] Size of returned data + * handle [I] Handle to a symbolic link object + * target [O] Destination for the symbolic link target + * length [O] Size of returned data * * RETURNS * Success: ERROR_SUCCESS. * Failure: An NTSTATUS error code. */ -NTSTATUS WINAPI NtQuerySymbolicLinkObject(IN HANDLE LinkHandle, IN OUT PUNICODE_STRING LinkTarget, - OUT PULONG ReturnedLength OPTIONAL) +NTSTATUS WINAPI NtQuerySymbolicLinkObject( HANDLE handle, PUNICODE_STRING target, PULONG length ) { NTSTATUS ret; - TRACE("(%p,%p,%p)\n", LinkHandle, LinkTarget, ReturnedLength); - if (!LinkTarget) return STATUS_ACCESS_VIOLATION; + TRACE("(%p,%p,%p)\n", handle, target, length ); + + if (!target) return STATUS_ACCESS_VIOLATION; SERVER_START_REQ(query_symlink) { - req->handle = wine_server_obj_handle( LinkHandle ); - wine_server_set_reply( req, LinkTarget->Buffer, LinkTarget->MaximumLength ); + req->handle = wine_server_obj_handle( handle ); + if (target->MaximumLength >= sizeof(WCHAR)) + wine_server_set_reply( req, target->Buffer, target->MaximumLength - sizeof(WCHAR) ); if (!(ret = wine_server_call( req ))) { - LinkTarget->Length = wine_server_reply_size(reply); - if (ReturnedLength) *ReturnedLength = LinkTarget->Length; + target->Length = wine_server_reply_size(reply); + target->Buffer[target->Length / sizeof(WCHAR)] = 0; + if (length) *length = reply->total + sizeof(WCHAR); } + else if (length && ret == STATUS_BUFFER_TOO_SMALL) *length = reply->total + sizeof(WCHAR); } SERVER_END_REQ; return ret;

1 0

Alexandre Julliard : server: Return the total length of the target in query_symlink.
by Alexandre Julliard 30 Jun '10

30 Jun '10

Module: wine Branch: master Commit: 4c1f36cb68d744fe5ed3d52a4ea531b72b1dcac3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c1f36cb68d744fe5ed3d52a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 30 16:11:03 2010 +0200 server: Return the total length of the target in query_symlink. --- include/wine/server_protocol.h | 4 +++- server/protocol.def | 1 + server/request.h | 3 ++- server/symlink.c | 1 + server/trace.c | 4 +++- 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 20bb4a2..1a78bc2 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4395,7 +4395,9 @@ struct query_symlink_request struct query_symlink_reply { struct reply_header __header; + data_size_t total; /* VARARG(target_name,unicode_str); */ + char __pad_12[4]; }; @@ -5485,6 +5487,6 @@ union generic_reply struct set_cursor_reply set_cursor_reply; }; -#define SERVER_PROTOCOL_VERSION 401 +#define SERVER_PROTOCOL_VERSION 402 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index e4e8ec3..e41cd18 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3057,6 +3057,7 @@ enum message_type @REQ(query_symlink) obj_handle_t handle; /* handle to the symlink */ @REPLY + data_size_t total; /* total needed size for name */ VARARG(target_name,unicode_str); /* target name */ @END diff --git a/server/request.h b/server/request.h index ef6adea..722fc25 100644 --- a/server/request.h +++ b/server/request.h @@ -1980,7 +1980,8 @@ C_ASSERT( FIELD_OFFSET(struct open_symlink_reply, handle) == 8 ); C_ASSERT( sizeof(struct open_symlink_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct query_symlink_request, handle) == 12 ); C_ASSERT( sizeof(struct query_symlink_request) == 16 ); -C_ASSERT( sizeof(struct query_symlink_reply) == 8 ); +C_ASSERT( FIELD_OFFSET(struct query_symlink_reply, total) == 8 ); +C_ASSERT( sizeof(struct query_symlink_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_object_info_request, handle) == 12 ); C_ASSERT( sizeof(struct get_object_info_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_object_info_reply, access) == 8 ); diff --git a/server/symlink.c b/server/symlink.c index 2ec7ed5..2330fde 100644 --- a/server/symlink.c +++ b/server/symlink.c @@ -214,6 +214,7 @@ DECL_HANDLER(query_symlink) SYMBOLIC_LINK_QUERY, &symlink_ops ); if (!symlink) return; + reply->total = symlink->len; if (get_reply_max_size() < symlink->len) set_error( STATUS_BUFFER_TOO_SMALL ); else diff --git a/server/trace.c b/server/trace.c index ec87dab..fd2318e 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3594,7 +3594,8 @@ static void dump_query_symlink_request( const struct query_symlink_request *req static void dump_query_symlink_reply( const struct query_symlink_reply *req ) { - dump_varargs_unicode_str( " target_name=", cur_size ); + fprintf( stderr, " total=%u", req->total ); + dump_varargs_unicode_str( ", target_name=", cur_size ); } static void dump_get_object_info_request( const struct get_object_info_request *req ) @@ -4607,6 +4608,7 @@ static const struct { "GENERIC_NOT_MAPPED", STATUS_GENERIC_NOT_MAPPED }, { "HANDLES_CLOSED", STATUS_HANDLES_CLOSED }, { "HANDLE_NOT_CLOSABLE", STATUS_HANDLE_NOT_CLOSABLE }, + { "HOST_UNREACHABLE", STATUS_HOST_UNREACHABLE }, { "ILLEGAL_FUNCTION", STATUS_ILLEGAL_FUNCTION }, { "INSTANCE_NOT_AVAILABLE", STATUS_INSTANCE_NOT_AVAILABLE }, { "INSUFFICIENT_RESOURCES", STATUS_INSUFFICIENT_RESOURCES },

1 0

Alexandre Julliard : gdiplus/tests: Comment out a test that corrupts the stack on Vista.
by Alexandre Julliard 30 Jun '10

30 Jun '10

Module: wine Branch: master Commit: 4b9258d165d0a7c745814d24bf404b477cee829e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b9258d165d0a7c745814d24b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 30 14:17:13 2010 +0200 gdiplus/tests: Comment out a test that corrupts the stack on Vista. --- dlls/gdiplus/tests/pen.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index 0bdf280..b742118 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -225,9 +225,15 @@ static void test_dasharray(void) /* Try to set with count = 0. */ GdipSetPenDashStyle(pen, DashStyleDot); + if (0) /* corrupts stack on 64-bit Vista */ + { status = GdipSetPenDashArray(pen, dashes, 0); ok(status == OutOfMemory || status == InvalidParameter, "Expected OutOfMemory or InvalidParameter, got %.8x\n", status); + } + status = GdipSetPenDashArray(pen, dashes, -1); + ok(status == OutOfMemory || status == InvalidParameter, + "Expected OutOfMemory or InvalidParameter, got %.8x\n", status); GdipGetPenDashStyle(pen, &style); expect(DashStyleDot, style);

1 0

Alexandre Julliard : ntdll/tests: Add a test for the exception resulting from an icebp instruction.
by Alexandre Julliard 30 Jun '10

30 Jun '10

Module: wine Branch: master Commit: f712af41f5b82315e0966d8a8b1405a649f2c63f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f712af41f5b82315e0966d8a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 30 11:55:32 2010 +0200 ntdll/tests: Add a test for the exception resulting from an icebp instruction. --- dlls/ntdll/tests/exception.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 598544e..701b6bb 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -203,6 +203,9 @@ static const struct exception { { 0x1e, 0x06, 0x31, 0xc0, 0x8e, 0xd8, 0x8e, 0xc0, 0xfa, 0x07, 0x1f, 0xc3 }, /* push %ds; push %es; xorl %eax,%eax; mov %ax,%ds; mov %ax,%es; cli; pop %es; pop %ds; ret */ 8, 1, TRUE, STATUS_PRIVILEGED_INSTRUCTION, 0 }, + + { { 0xf1, 0x90, 0xc3 }, /* icebp; nop; ret */ + 1, 1, FALSE, STATUS_SINGLE_STEP, 0 }, }; static int got_exception;

1 0

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 June 2010