January 2009 - Wine-commits

Christoph Korn : German Translation
by Jeremy Newman 21 Jan '09

21 Jan '09

Module: website Branch: master Commit: 6a6b659091e78f5cfad42d1d1de44cb1767bfd8e URL: http://source.winehq.org/git/website.git/?a=commit;h=6a6b659091e78f5cfad42d… Author: Christoph Korn <c_korn(a)gmx.de> Date: Tue Jan 20 19:27:56 2009 +0100 German Translation Hello, I have translated the download page for Ubuntu and Debian. Best regards Christoph Korn >From c54332f7ccbcab0f5be7a4f324f9115c5174de78 Mon Sep 17 00:00:00 2001 From: Christoph Korn <c_korn(a)gmx.de> Date: Tue, 20 Jan 2009 17:38:06 +0100 Subject: German translation for Ubuntu and Debian --- images/distro/de_ubuntu-softwaresources1.png | Bin 0 -> 60224 bytes images/distro/de_ubuntu-softwaresources2.png | Bin 0 -> 49699 bytes templates/de/download/deb.template | 100 ++++++++++++++++++++++++++ templates/de/download/deblenny.template | 49 +++++++++++++ 4 files changed, 149 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=6a6b659091e78f5cfa…

1 0

Nikolay Sivov : urlmon: Added a stub for HlinkSimpleNavigateToMoniker.
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: 0b8faac9e6874925f760106fabda76106ca55ecf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b8faac9e6874925f760106fa… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jan 21 01:47:30 2009 +0300 urlmon: Added a stub for HlinkSimpleNavigateToMoniker. --- dlls/urlmon/umon.c | 11 +++++++++++ dlls/urlmon/urlmon.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index b5ffa2a..521cfc2 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -1252,6 +1252,17 @@ HRESULT WINAPI URLDownloadToCacheFileW(LPUNKNOWN lpUnkCaller, LPCWSTR szURL, LPW } /*********************************************************************** + * HlinkSimpleNavigateToMoniker (URLMON.@) + */ +HRESULT WINAPI HlinkSimpleNavigateToMoniker(IMoniker *pmkTarget, + LPCWSTR szLocation, LPCWSTR szTargetFrameName, IUnknown *pUnk, + IBindCtx *pbc, IBindStatusCallback *pbsc, DWORD grfHLNF, DWORD dwReserved) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + +/*********************************************************************** * HlinkSimpleNavigateToString (URLMON.@) */ HRESULT WINAPI HlinkSimpleNavigateToString( LPCWSTR szTarget, diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 2001f0b..2ed9988 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -48,7 +48,7 @@ @ stub HlinkGoForward @ stub HlinkNavigateMoniker @ stdcall HlinkNavigateString(ptr wstr) -@ stub HlinkSimpleNavigateToMoniker +@ stdcall HlinkSimpleNavigateToMoniker(ptr wstr wstr ptr ptr ptr long long) @ stdcall HlinkSimpleNavigateToString(wstr wstr wstr ptr ptr ptr long long) @ stdcall IsAsyncMoniker(ptr) @ stdcall IsLoggingEnabledA(str)

1 0

Florian Köberle : user32/tests: Fixed error message.
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: 7b8b17dd42ba4021f828b0f11a5cd83521fe4f96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b8b17dd42ba4021f828b0f11… Author: Florian Köberle <florian(a)fkoeberle.de> Date: Tue Jan 20 13:52:33 2009 +0100 user32/tests: Fixed error message. --- dlls/user32/tests/win.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 9d6ba7f..c73856f 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5258,7 +5258,7 @@ static LRESULT WINAPI test_thick_child_size_winproc(HWND hwnd, UINT msg, WPARAM actualMaxSizeX = minmax->ptMaxSize.x; actualMaxSizeY = minmax->ptMaxSize.y; ok(actualMaxSizeX == expectedMaxSizeX && actualMaxSizeY == expectedMaxSizeY, - "expected maxTrack %dx%d, actual maxTrack %dx%d\n", + "expected maxSize %dx%d, actual maxSize %dx%d\n", expectedMaxSizeX, expectedMaxSizeY, actualMaxSizeX, actualMaxSizeY); expectedPosX = - getExpectedThickChildInc();

1 0

Florian Köberle : user32/tests: Extended test about thick child windows.
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: 72e6fe94318ce1df0bdb0e47f94dcff1375c0540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72e6fe94318ce1df0bdb0e47f… Author: Florian Köberle <florian(a)fkoeberle.de> Date: Tue Jan 20 13:52:34 2009 +0100 user32/tests: Extended test about thick child windows. --- dlls/user32/tests/win.c | 220 ++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 180 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=72e6fe94318ce1df0bdb0…

1 0

Mikołaj Zalewski : regedit: Don' t pass an ANSI string to vsprintfW.
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: f2235ef30d7084a1a7d9faadcd5ce96124045b6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2235ef30d7084a1a7d9faadc… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Jan 20 22:45:41 2009 +0100 regedit: Don't pass an ANSI string to vsprintfW. --- programs/regedit/edit.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 2c5b23d..d9f4005 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -436,13 +436,8 @@ BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, B if (showMessageBox) { - LPSTR visibleValueNameA = GetMultiByteString(visibleValueName); - if (messagebox(hwnd, MB_YESNO | MB_ICONEXCLAMATION, IDS_DELETE_BOX_TITLE, IDS_DELETE_BOX_TEXT, visibleValueNameA) != IDYES) - { - HeapFree(GetProcessHeap(), 0, visibleValueNameA); - goto done; - } - HeapFree(GetProcessHeap(), 0, visibleValueNameA); + if (messagebox(hwnd, MB_YESNO | MB_ICONEXCLAMATION, IDS_DELETE_BOX_TITLE, IDS_DELETE_BOX_TEXT, visibleValueName) != IDYES) + goto done; } lRet = RegDeleteValueW(hKey, valueName ? valueName : &empty);

1 0

Paul Vriens : quartz/tests: Fix some test failures on Win95.
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: 990810030503646d8bda8edf51da4d4ae81069f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=990810030503646d8bda8edf5… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jan 21 10:18:57 2009 +0100 quartz/tests: Fix some test failures on Win95. --- dlls/quartz/tests/filtergraph.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index e3ae100..6f9e4c8 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1434,7 +1434,13 @@ static HRESULT get_connected_filter_name(TestFilterImpl *pFilter, char *FilterNa IPin_Release(pin); if (FAILED(hr)) return hr; + SetLastError(0xdeadbeef); hr = IBaseFilter_QueryFilterInfo(pinInfo.pFilter, &filterInfo); + if (hr == S_OK && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + IBaseFilter_Release(pinInfo.pFilter); + return E_NOTIMPL; + } ok(hr == S_OK, "IBaseFilter_QueryFilterInfo failed with %x\n", hr); IBaseFilter_Release(pinInfo.pFilter); if (FAILED(hr)) return hr; @@ -1557,7 +1563,7 @@ static void test_render_filter_priority(void) hr = IFilterGraph2_Render(pgraph2, ((TestFilterImpl*)ptestfilter)->ppPins[0]); ok(hr == S_OK, "IFilterGraph2_Render failed with %08x\n", hr); - get_connected_filter_name((TestFilterImpl*)ptestfilter, ConnectedFilterName1); + hr = get_connected_filter_name((TestFilterImpl*)ptestfilter, ConnectedFilterName1); IFilterGraph2_Release(pgraph2); pgraph2 = NULL; @@ -1566,6 +1572,12 @@ static void test_render_filter_priority(void) IBaseFilter_Release(ptestfilter2); ptestfilter2 = NULL; + if (hr == E_NOTIMPL) + { + win_skip("Needed functions are not implemented\n"); + return; + } + hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (LPVOID*)&pgraph2); ok(hr == S_OK, "CoCreateInstance failed with %08x\n", hr); if (!pgraph2) goto out;

1 0

Austin English : iphplapi: Include sys/protosw.h for Net/OpenBSD.
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: 94021a1f425b554bf19690fa443cdb529de67566 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94021a1f425b554bf19690fa4… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jan 20 17:42:53 2009 -0600 iphplapi: Include sys/protosw.h for Net/OpenBSD. --- configure | 2 ++ configure.ac | 1 + dlls/iphlpapi/ipstats.c | 4 +++- include/config.h.in | 3 +++ 4 files changed, 9 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 6cacb05..8f4a3d8 100755 --- a/configure +++ b/configure @@ -7504,6 +7504,7 @@ done + for ac_header in \ AudioUnit/AudioUnit.h \ Carbon/Carbon.h \ @@ -7593,6 +7594,7 @@ for ac_header in \ sys/param.h \ sys/poll.h \ sys/prctl.h \ + sys/protosw.h \ sys/ptrace.h \ sys/reg.h \ sys/resource.h \ diff --git a/configure.ac b/configure.ac index e348d60..25e78e8 100644 --- a/configure.ac +++ b/configure.ac @@ -339,6 +339,7 @@ AC_CHECK_HEADERS(\ sys/param.h \ sys/poll.h \ sys/prctl.h \ + sys/protosw.h \ sys/ptrace.h \ sys/reg.h \ sys/resource.h \ diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index a4b5b48..f939200 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -97,7 +97,9 @@ #ifdef HAVE_NETINET_UDP_VAR_H #include <netinet/udp_var.h> #endif - +#ifdef HAVE_SYS_PROTOSW_H +#include <sys/protosw.h> +#endif #ifdef HAVE_SYS_SYSCTL_H #include <sys/sysctl.h> #endif diff --git a/include/config.h.in b/include/config.h.in index 69c1fee..bb43b61 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -846,6 +846,9 @@ /* Define to 1 if you have the <sys/prctl.h> header file. */ #undef HAVE_SYS_PRCTL_H +/* Define to 1 if you have the <sys/protosw.h> header file. */ +#undef HAVE_SYS_PROTOSW_H + /* Define to 1 if you have the <sys/ptrace.h> header file. */ #undef HAVE_SYS_PTRACE_H

1 0

Hans Leidekker : rpcrt4: Add a stub implementation of NdrGetUserMarshalInfo .
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: 1de7f2d50cb5d21fc7ac9a8d04c87319738d1b84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1de7f2d50cb5d21fc7ac9a8d0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 21 12:18:04 2009 +0100 rpcrt4: Add a stub implementation of NdrGetUserMarshalInfo. --- dlls/rpcrt4/rpcrt4.spec | 2 +- dlls/rpcrt4/rpcrt4_main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 2c86e68..56a55f6 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -203,7 +203,7 @@ @ stub NdrGetSimpleTypeBufferSize # wxp @ stub NdrGetSimpleTypeMemorySize # wxp @ stub NdrGetTypeFlags # wxp -@ stub NdrGetUserMarshallInfo +@ stdcall NdrGetUserMarshalInfo(ptr long ptr) @ stub NdrHardStructBufferSize #(ptr ptr ptr) @ stub NdrHardStructFree #(ptr ptr ptr) @ stub NdrHardStructMarshall #(ptr ptr ptr) diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index 537a005..1a6b61d 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -1016,3 +1016,9 @@ RPC_STATUS RPC_ENTRY RpcCancelThreadEx(void* ThreadHandle, LONG Timeout) else return rpc_cancel_thread(target_tid); } + +RPC_STATUS RPC_ENTRY NdrGetUserMarshalInfo(ULONG *flags, ULONG level, NDR_USER_MARSHAL_INFO *mi) +{ + FIXME("(%p, %u, %p)\n", flags, level, mi); + return RPC_X_INVALID_BUFFER; +}

1 0

Paul Vriens : shell32/tests: Fix a test failure on some platforms.
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: d615acc894ed13b30601b6e41283d04e67f9fce0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d615acc894ed13b30601b6e41… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jan 21 12:03:44 2009 +0100 shell32/tests: Fix a test failure on some platforms. --- dlls/shell32/tests/shlfolder.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 6a06fb7..a396cf0 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1090,7 +1090,10 @@ static void test_FolderShortcut(void) { static const GUID CLSID_UnixDosFolder = {0x9d20aae8, 0x0625, 0x44b0, {0x9c, 0xa7, 0x71, 0x88, 0x9c, 0x22, 0x54, 0xd9}}; - if (!pSHGetSpecialFolderPathW || !pStrRetToBufW) return; + if (!pSHGetSpecialFolderPathW || !pStrRetToBufW) { + win_skip("SHGetSpecialFolderPathW and/or StrRetToBufW are not available\n"); + return; + } /* These tests basically show, that CLSID_FolderShortcuts are initialized * via their IPersistPropertyBag interface. And that the target folder @@ -1098,6 +1101,10 @@ static void test_FolderShortcut(void) { */ hr = CoCreateInstance(&CLSID_FolderShortcut, NULL, CLSCTX_INPROC_SERVER, &IID_IPersistPropertyBag, (LPVOID*)&pPersistPropertyBag); + if (hr == REGDB_E_CLASSNOTREG) { + win_skip("CLSID_FolderShortcut is not implemented\n"); + return; + } ok (SUCCEEDED(hr), "CoCreateInstance failed! hr = 0x%08x\n", hr); if (FAILED(hr)) return;

1 0

Nikolay Sivov : aclui: Added stub dll.
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: 3406c9de33b43070439c738ffa26c0730a0823b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3406c9de33b43070439c738ff… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jan 20 20:02:51 2009 +0300 aclui: Added stub dll. --- configure | 9 ++ configure.ac | 1 + dlls/Makefile.in | 5 + dlls/aclui/Makefile.in | 13 +++ dlls/aclui/aclui.spec | 3 + dlls/aclui/aclui_main.c | 61 ++++++++++++ include/Makefile.in | 1 + include/aclui.h | 233 +++++++++++++++++++++++++++++++++++++++++++++++ include/objbase.h | 6 +- 9 files changed, 330 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3406c9de33b43070439c7…

1 0