February 2009 - Wine-Commits

Alexandre Julliard : secur32: Properly initialize the helper structure when fork support is missing.
by Alexandre Julliard Feb. 16, 2009

Feb. 16, 2009

Module: wine Branch: master Commit: 21a7b21b65d00b7879368d0448dbeda18abff0de URL: http://source.winehq.org/git/wine.git/?a=commit;h=21a7b21b65d00b7879368d044… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 16 11:53:22 2009 +0100 secur32: Properly initialize the helper structure when fork support is missing. --- dlls/secur32/ntlm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 38c5134..7e44dd7 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1982,6 +1982,7 @@ void SECUR32_initNTLMSP(void) /* Cheat and allocate a helper anyway, so cleanup later will work. */ helper = HeapAlloc(GetProcessHeap(),0, sizeof(NegoHelper)); helper->major = helper->minor = helper->micro = -1; + helper->pipe_in = helper->pipe_out = -1; } else check_version(helper);

1 0

Alexandre Julliard : user32/tests: Another fix for lack of color cursor support.
by Alexandre Julliard Feb. 16, 2009

Feb. 16, 2009

Module: wine Branch: master Commit: a069ee48d529505afc92db6b73f87de82fbc5be1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a069ee48d529505afc92db6b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 16 11:51:44 2009 +0100 user32/tests: Another fix for lack of color cursor support. --- dlls/user32/tests/cursoricon.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index d67de48..9475534 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -911,7 +911,8 @@ static void test_CreateIconFromResource(void) ok(icon_info.fIcon == FALSE, "fIcon != FALSE.\n"); ok(icon_info.xHotspot == 3, "xHotspot is %u.\n", icon_info.xHotspot); ok(icon_info.yHotspot == 3, "yHotspot is %u.\n", icon_info.yHotspot); - ok(icon_info.hbmColor != NULL, "No hbmColor!\n"); + ok(icon_info.hbmColor != NULL || broken(!icon_info.hbmColor) /* no color cursor support */, + "No hbmColor!\n"); ok(icon_info.hbmMask != NULL, "No hbmMask!\n"); }

1 0

Alistair Leslie-Hughes : urlmon: Correctly test to see if PutProperty_CLASSIDPROP is called.
by Alexandre Julliard Feb. 16, 2009

Feb. 16, 2009

Module: wine Branch: master Commit: cc0a46ad6473d3a92023579d12ce00518d5664ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc0a46ad6473d3a92023579d1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 6 20:03:47 2009 +1100 urlmon: Correctly test to see if PutProperty_CLASSIDPROP is called. --- dlls/urlmon/tests/url.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index c062cf8..e5895c4 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -313,7 +313,7 @@ static DWORD WINAPI thread_proc(PVOID arg) CHECK_CALLED(Obj_OnProgress_BEGINSYNCOPERATION); CHECK_CALLED(CreateInstance); CHECK_CALLED(PutProperty_MIMETYPEPROP); - CLEAR_CALLED(PutProperty_CLASSIDPROP); + CHECK_CALLED(PutProperty_CLASSIDPROP); CHECK_CALLED(Load); CHECK_CALLED(Obj_OnProgress_ENDSYNCOPERATION); CHECK_CALLED(OnObjectAvailable); @@ -612,7 +612,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, CHECK_CALLED(Obj_OnProgress_BEGINSYNCOPERATION); CHECK_CALLED(CreateInstance); CHECK_CALLED(PutProperty_MIMETYPEPROP); - CLEAR_CALLED(PutProperty_CLASSIDPROP); + CHECK_CALLED(PutProperty_CLASSIDPROP); CHECK_CALLED(Load); CHECK_CALLED(Obj_OnProgress_ENDSYNCOPERATION); CHECK_CALLED(OnObjectAvailable);

1 0

Aurimas Fischer : wineps.drv: Add Lithuanian translation.
by Alexandre Julliard Feb. 16, 2009

Feb. 16, 2009

Module: wine Branch: master Commit: b1afd00dc9577803e4683ac0560aa2e2bdf33a1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1afd00dc9577803e4683ac05… Author: Aurimas Fischer <aurimas(a)gmail.com> Date: Sun Feb 15 21:59:38 2009 +0200 wineps.drv: Add Lithuanian translation. --- dlls/wineps.drv/rsrc.rc | 1 + dlls/wineps.drv/wps_Lt.rc | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/rsrc.rc b/dlls/wineps.drv/rsrc.rc index 4475e92..7513cb3 100644 --- a/dlls/wineps.drv/rsrc.rc +++ b/dlls/wineps.drv/rsrc.rc @@ -43,6 +43,7 @@ #include "wps_It.rc" #include "wps_Ja.rc" #include "wps_Ko.rc" +#include "wps_Lt.rc" #include "wps_Nl.rc" #include "wps_No.rc" #include "wps_Pt.rc" diff --git a/dlls/wineps.drv/wps_Lt.rc b/dlls/wineps.drv/wps_Lt.rc new file mode 100644 index 0000000..5476cb1 --- /dev/null +++ b/dlls/wineps.drv/wps_Lt.rc @@ -0,0 +1,41 @@ +/* + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.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 + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215 +STYLE WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE +CAPTION "Popierius" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Popieriaus &dydis:", -1, 10, 6, 100, 8 + LISTBOX IDD_PAPERS, 10, 15, 200, 45, LBS_STANDARD | LBS_HASSTRINGS | + WS_TABSTOP + GROUPBOX "Padėtis", -1, 10, 80, 200, 50 + CONTROL "&Stačias", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | + WS_TABSTOP, 20, 90, 60, 10 + CONTROL "&Gulsčias", IDD_ORIENT_LANDSCAPE, "Button", BS_AUTORADIOBUTTON, + 20, 110, 60, 10 + LTEXT "Dvigubas:", IDD_DUPLEX_NAME, 10, 140, 100, 8 + COMBOBOX IDD_DUPLEX, 10, 151, 200, 20, CBS_DROPDOWNLIST | CBS_HASSTRINGS | + WS_TABSTOP +} +#pragma code_page(default)

1 0

Aurimas Fischer : comdlg32: Add Lithuanian translation.
by Alexandre Julliard Feb. 16, 2009

Feb. 16, 2009

Module: wine Branch: master Commit: 6ddf8760ff089a09c56dd556687a4605227e64e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ddf8760ff089a09c56dd5566… Author: Aurimas Fischer <aurimas(a)gmail.com> Date: Fri Feb 6 00:30:45 2009 +0200 comdlg32: Add Lithuanian translation. --- dlls/comdlg32/cdlg_Lt.rc | 486 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/comdlg32/rsrc.rc | 1 + 2 files changed, 487 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6ddf8760ff089a09c56dd…

1 0

Juan Lang : advapi32: Fix failing tests on a number of systems.
by Alexandre Julliard Feb. 16, 2009

Feb. 16, 2009

Module: wine Branch: master Commit: 6991d557965e54f064062d3958f8d92e767ace40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6991d557965e54f064062d395… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Feb 13 09:27:04 2009 -0800 advapi32: Fix failing tests on a number of systems. --- dlls/advapi32/tests/cred.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index 58103c6..bb6935b 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -238,7 +238,13 @@ static void test_generic(void) new_cred.UserName = (char *)"winetest"; ret = pCredWriteA(&new_cred, 0); - ok(ret, "CredWriteA failed with error %d\n", GetLastError()); + ok(ret || broken(GetLastError() == ERROR_NO_SUCH_LOGON_SESSION), + "CredWriteA failed with error %d\n", GetLastError()); + if (!ret) + { + skip("couldn't write generic credentials, skipping tests\n"); + return; + } ret = pCredEnumerateA(NULL, 0, &count, &creds); ok(ret, "CredEnumerateA failed with error %d\n", GetLastError());

1 0

Juan Lang : odbccp32: Fix a couple failing tests, and log more information about remaining failures.
by Alexandre Julliard Feb. 16, 2009

Feb. 16, 2009

Module: wine Branch: master Commit: 401b1b36ccb90d109bbb5d267f8635ad55d36dd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=401b1b36ccb90d109bbb5d267… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Feb 13 09:53:50 2009 -0800 odbccp32: Fix a couple failing tests, and log more information about remaining failures. --- dlls/odbccp32/tests/misc.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index ba8e5f4..044846c 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -112,14 +112,24 @@ static void test_SQLInstallDriverManager(void) /* Length OK */ bool_ret = SQLInstallDriverManager(target_path, MAX_PATH, NULL); sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); - ok(bool_ret, "SQLInstallDriverManager unexpectedly failed\n"); - ok(sql_ret == SQL_NO_DATA, "Expected SQL_NO_DATA, got %d\n", sql_ret); + ok(bool_ret, "SQLInstallDriverManager unexpectedly failed: %d\n", + error_code); + if (bool_ret) + ok(sql_ret == SQL_NO_DATA, "Expected SQL_NO_DATA, got %d\n", sql_ret); + else + ok(sql_ret == SQL_SUCCESS_WITH_INFO, + "Expected SQL_SUCCESS_WITH_INFO, got %d\n", sql_ret); path_out = 0xcafe; bool_ret = SQLInstallDriverManager(target_path, MAX_PATH, &path_out); sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); - ok(bool_ret, "SQLInstallDriverManager unexpectedly failed\n"); - ok(sql_ret == SQL_NO_DATA, "Expected SQL_NO_DATA, got %d\n", sql_ret); + ok(bool_ret, "SQLInstallDriverManager unexpectedly failed: %d\n", + error_code); + if (bool_ret) + ok(sql_ret == SQL_NO_DATA, "Expected SQL_NO_DATA, got %d\n", sql_ret); + else + ok(sql_ret == SQL_SUCCESS_WITH_INFO, + "Expected SQL_SUCCESS_WITH_INFO, got %d\n", sql_ret); /* path_out should in practice be less than 0xcafe */ ok(path_out != 0xcafe, "Expected path_out to show the correct amount of bytes\n"); }

1 0

Aric Stewart : gdiplus: In GdipDrawString do not NULL terminate the buffer. It is unneeded and overruns the buffer.
by Alexandre Julliard Feb. 16, 2009

Feb. 16, 2009

Module: wine Branch: master Commit: 43caae838611248314d7e79284f88f613fe14d12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43caae838611248314d7e7928… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Feb 13 10:15:59 2009 -0600 gdiplus: In GdipDrawString do not NULL terminate the buffer. It is unneeded and overruns the buffer. --- dlls/gdiplus/graphics.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 2673042..9df9e21 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1901,7 +1901,6 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string j++; } - stringdup[j] = 0; length = j; while(sum < length){

1 0

Alexandre Julliard : ntdll: Don' t fail in NtMapViewOfSection for 4Gb+ files if an explicit size is specified .
by Alexandre Julliard Feb. 16, 2009

Feb. 16, 2009

Module: wine Branch: master Commit: d916d98d028cf9d1e413f8724342a0da30dc9b5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d916d98d028cf9d1e413f8724… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 16 11:47:32 2009 +0100 ntdll: Don't fail in NtMapViewOfSection for 4Gb+ files if an explicit size is specified. --- dlls/ntdll/virtual.c | 42 +++++++++++++++++++++++++----------------- 1 files changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 0b14564..dce8cf0 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2284,8 +2284,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p NTSTATUS res; mem_size_t full_size; ACCESS_MASK access; - SIZE_T size = 0; - SIZE_T mask = get_mask( zero_bits ); + SIZE_T size, mask = get_mask( zero_bits ); int unix_handle = -1, needs_close; unsigned int map_vprot, vprot; void *base; @@ -2298,7 +2297,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p offset.QuadPart = offset_ptr ? offset_ptr->QuadPart : 0; TRACE("handle=%p process=%p addr=%p off=%x%08x size=%lx access=%x\n", - handle, process, *addr_ptr, offset.u.HighPart, offset.u.LowPart, size, protect ); + handle, process, *addr_ptr, offset.u.HighPart, offset.u.LowPart, *size_ptr, protect ); /* Check parameters */ @@ -2367,19 +2366,17 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p SERVER_END_REQ; if (res) return res; - size = full_size; - if (size != full_size) - { - WARN( "Sizes larger than 4Gb (%s) not supported on this platform\n", - wine_dbgstr_longlong(full_size) ); - if (dup_mapping) NtClose( dup_mapping ); - return STATUS_INVALID_PARAMETER; - } - if ((res = server_get_unix_fd( handle, 0, &unix_handle, &needs_close, NULL, NULL ))) goto done; if (map_vprot & VPROT_IMAGE) { + size = full_size; + if (size != full_size) /* truncated */ + { + WARN( "Modules larger than 4Gb (%s) not supported\n", wine_dbgstr_longlong(full_size) ); + res = STATUS_INVALID_PARAMETER; + goto done; + } if (shared_file) { int shared_fd, shared_needs_close; @@ -2401,13 +2398,24 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p return res; } - if ((offset.QuadPart >= size) || (*size_ptr > size - offset.QuadPart)) + res = STATUS_INVALID_PARAMETER; + if (offset.QuadPart >= full_size) goto done; + if (*size_ptr) { - res = STATUS_INVALID_PARAMETER; - goto done; + if (*size_ptr > full_size - offset.QuadPart) goto done; + size = ROUND_SIZE( offset.u.LowPart, *size_ptr ); + if (size < *size_ptr) goto done; /* wrap-around */ + } + else + { + size = full_size - offset.QuadPart; + if (size != full_size - offset.QuadPart) /* truncated */ + { + WARN( "Files larger than 4Gb (%s) not supported on this platform\n", + wine_dbgstr_longlong(full_size) ); + goto done; + } } - if (*size_ptr) size = ROUND_SIZE( offset.u.LowPart, *size_ptr ); - else size = size - offset.QuadPart; /* Reserve a properly aligned area */

1 0

Juan Lang : wintrust: Fix a few failing tests.
by Alexandre Julliard Feb. 16, 2009

Feb. 16, 2009

Module: wine Branch: master Commit: ae2c086e6c54871502c7589ca070df9fdbfae4ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae2c086e6c54871502c7589ca… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Feb 13 09:45:26 2009 -0800 wintrust: Fix a few failing tests. --- dlls/wintrust/tests/softpub.c | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 5c5d892..3e4347d 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -303,12 +303,20 @@ static void testObjTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) ret = funcs->pfnObjectTrust(&data); ok(ret == S_FALSE, "Expected S_FALSE, got %08x\n", ret); ok(data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == - TRUST_E_NOSIGNATURE, "Expected TRUST_E_NOSIGNATURE, got %08x\n", + TRUST_E_NOSIGNATURE || + data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == + TRUST_E_SUBJECT_FORM_UNKNOWN, + "Expected TRUST_E_NOSIGNATURE or TRUST_E_SUBJECT_FORM_UNKNOWN, got %08x\n", data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV]); - ok(!memcmp(&provDataSIP.gSubject, &unknown, sizeof(unknown)), - "Unexpected subject GUID\n"); - ok(provDataSIP.pSip != NULL, "Expected a SIP\n"); - ok(provDataSIP.psSipSubjectInfo != NULL, "Expected a subject info\n"); + if (data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] == + TRUST_E_NOSIGNATURE) + { + ok(!memcmp(&provDataSIP.gSubject, &unknown, sizeof(unknown)), + "Unexpected subject GUID\n"); + ok(provDataSIP.pSip != NULL, "Expected a SIP\n"); + ok(provDataSIP.psSipSubjectInfo != NULL, + "Expected a subject info\n"); + } funcs->pfnFree(data.padwTrustStepErrors); } } @@ -444,10 +452,11 @@ static void test_wintrust(void) getNotepadPath(notepadPathW, MAX_PATH); file.pcwszFilePath = notepadPathW; r = WinVerifyTrust(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); - ok(r == TRUST_E_NOSIGNATURE, "expected TRUST_E_NOSIGNATURE, got %08x\n", r); + ok(r == TRUST_E_NOSIGNATURE || r == CRYPT_E_FILE_ERROR, + "expected TRUST_E_NOSIGNATURE or CRYPT_E_FILE_ERROR, got %08x\n", r); hr = WinVerifyTrustEx(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); - ok(hr == TRUST_E_NOSIGNATURE, "expected TRUST_E_NOSIGNATURE, got %08x\n", - hr); + ok(hr == TRUST_E_NOSIGNATURE || r == CRYPT_E_FILE_ERROR, + "expected TRUST_E_NOSIGNATURE or CRYPT_E_FILE_ERROR, got %08x\n", hr); } static BOOL (WINAPI * pWTHelperGetKnownUsages)(DWORD action, PCCRYPT_OID_INFO **usages);

1 0