October 2008 - Wine-Commits

Juan Lang : wintrust: Fix test failures on Win9x.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: 04a65b3cb8549acc8e2c94a568150148a3e4f28d URL: http://source.winehq.org/git/wine.git/?a=commit;h=04a65b3cb8549acc8e2c94a56… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 8 15:06:28 2008 -0700 wintrust: Fix test failures on Win9x. --- dlls/wintrust/tests/asn.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index eb9ca0f..a3557e7 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -83,7 +83,9 @@ static void test_encodeSPCLink(void) SetLastError(0xdeadbeef); ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_LINK_STRUCT, &link, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(!ret && GetLastError() == CRYPT_E_INVALID_IA5_STRING, + ok(!ret && + (GetLastError() == CRYPT_E_INVALID_IA5_STRING || + GetLastError() == OSS_BAD_PTR /* Win9x */), "Expected CRYPT_E_INVALID_IA5_STRING, got %08x\n", GetLastError()); /* Unlike the crypt32 string encoding routines, size is not set to the * index of the first invalid character. @@ -229,7 +231,9 @@ static void test_decodeSPCLink(void) ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_LINK_STRUCT, badMonikerSPCLink, sizeof(badMonikerSPCLink), CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - ok(!ret && GetLastError() == CRYPT_E_BAD_ENCODE, + ok(!ret && + (GetLastError() == CRYPT_E_BAD_ENCODE || + GetLastError() == OSS_DATA_ERROR /* Win9x */), "Expected CRYPT_E_BAD_ENCODE, got %08x\n", GetLastError()); } @@ -296,6 +300,11 @@ static void test_encodeSPCPEImage(void) imageData.Flags.cbData = sizeof(flags); ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_PE_IMAGE_DATA_STRUCT, &imageData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + if (!ret && GetLastError() == OSS_TOO_LONG) + { + skip("SPC_PE_IMAGE_DATA_STRUCT not supported\n"); + return; + } ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (ret) {

1 0

Lei Zhang : regedit: Pass VK_DELETE messages to Listview/ Treeview child windows.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: a4ed7a1003ad5a86d27a9a1ada57c0aa0e4ca34f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4ed7a1003ad5a86d27a9a1ad… Author: Lei Zhang <thestig(a)google.com> Date: Wed Oct 8 14:39:31 2008 -0700 regedit: Pass VK_DELETE messages to Listview/Treeview child windows. --- programs/regedit/framewnd.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index ca836e2..a801703 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -681,7 +681,9 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) break; } case ID_EDIT_DELETE: - if (GetFocus() == g_pChildWnd->hTreeWnd) { + { + HWND hWndDelete = GetFocus(); + if (hWndDelete == g_pChildWnd->hTreeWnd) { WCHAR* keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); if (keyPath == 0 || *keyPath == 0) { MessageBeep(MB_ICONHAND); @@ -689,7 +691,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) DeleteNode(g_pChildWnd->hTreeWnd, 0); } HeapFree(GetProcessHeap(), 0, keyPath); - } else if (GetFocus() == g_pChildWnd->hListWnd) { + } else if (hWndDelete == g_pChildWnd->hListWnd) { WCHAR* keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); curIndex = ListView_GetNextItem(g_pChildWnd->hListWnd, -1, LVNI_SELECTED); while(curIndex != -1) { @@ -713,8 +715,12 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) } RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath, NULL); HeapFree(GetProcessHeap(), 0, keyPath); - } + } else if (IsChild(g_pChildWnd->hTreeWnd, hWndDelete) || + IsChild(g_pChildWnd->hListWnd, hWndDelete)) { + SendMessage(hWndDelete, WM_KEYDOWN, VK_DELETE, 0); + } break; + } case ID_EDIT_MODIFY: { LPCWSTR valueName = GetValueName(g_pChildWnd->hListWnd);

1 0

Alistair Leslie-Hughes : msxml3: Add IXMLHTTPRequest support.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: bcc1fda7276121668a92d8445cefed2777f2adce URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcc1fda7276121668a92d8445… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 3 21:50:59 2008 +1000 msxml3: Add IXMLHTTPRequest support. --- dlls/msxml3/Makefile.in | 1 + dlls/msxml3/dispex.c | 1 + dlls/msxml3/factory.c | 5 + dlls/msxml3/httprequest.c | 343 +++++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/msxml_private.h | 2 + dlls/msxml3/tests/domdoc.c | 15 +- include/msxml2.idl | 54 +++++++ 7 files changed, 414 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bcc1fda7276121668a92d…

1 0

Alexander Morozov : ntoskrnl.exe: Fix trace typo.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: 7541ecbf4c5f0eaa8f19df44392b7a6bb6c520be URL: http://source.winehq.org/git/wine.git/?a=commit;h=7541ecbf4c5f0eaa8f19df443… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Thu Oct 9 13:00:00 2008 +0400 ntoskrnl.exe: Fix trace typo. --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 9af2f16..1ed3040 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -663,7 +663,7 @@ void WINAPI IofCompleteRequest( IRP *irp, UCHAR priority_boost ) TRACE( "calling %p( %p, %p, %p )\n", routine, irpsp->DeviceObject, irp, irpsp->Context ); stat = routine( irpsp->DeviceObject, irp, irpsp->Context ); - TRACE( "CompletionRoutine returned %x\n", status ); + TRACE( "CompletionRoutine returned %x\n", stat ); if (STATUS_MORE_PROCESSING_REQUIRED == stat) return; }

1 0

Paul Vriens : user32/tests: Don't crash on NT4.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: 4ac4401c418403581bf001b6fefa9b098e7e5119 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ac4401c418403581bf001b6f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Oct 9 11:59:42 2008 +0200 user32/tests: Don't crash on NT4. --- dlls/user32/tests/text.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 7627280..5523ff2 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -139,11 +139,14 @@ static void test_DrawTextCalcRect(void) ok( (rect.left == rect.right && rect.bottom == rect.top), "rectangle should be empty got %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); - SetRect( &rect, 10,10, 100, 100); - textheight = DrawTextExW(hdc, NULL, -1, &rect, DT_CALCRECT, NULL ); - ok( !(rect.left == rect.right && rect.bottom == rect.top), - "rectangle should NOT be empty got %d,%d-%d,%d\n", - rect.left, rect.top, rect.right, rect.bottom ); + if (0) { + SetRect( &rect, 10,10, 100, 100); + /* Crashes on NT4 */ + textheight = DrawTextExW(hdc, NULL, -1, &rect, DT_CALCRECT, NULL ); + ok( !(rect.left == rect.right && rect.bottom == rect.top), + "rectangle should NOT be empty got %d,%d-%d,%d\n", + rect.left, rect.top, rect.right, rect.bottom ); + } SetRect( &rect, 10,10, 100, 100); textheight = DrawTextExW(hdc, NULL, 0, &rect, DT_CALCRECT, NULL ); ok( !(rect.left == rect.right && rect.bottom == rect.top),

1 0

Paul Vriens : shell32/tests: Fix a failure on NT4.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: 025a39e209fbb8dca623827e05d867830fc1002a URL: http://source.winehq.org/git/wine.git/?a=commit;h=025a39e209fbb8dca623827e0… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Oct 9 09:52:17 2008 +0200 shell32/tests: Fix a failure on NT4. --- dlls/shell32/tests/shelllink.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 83aae3f..76bc3d2 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -217,13 +217,15 @@ static void test_get_set(void) } - /* test path with quotes (Win98 IShellLinkA_SetPath returns S_FALSE, WinXP returns S_OK) */ + /* test path with quotes (IShellLinkA_SetPath returns S_FALSE on W2K and below and S_OK on XP and above */ r = IShellLinkA_SetPath(sl, "\"c:\\nonexistent\\file\""); ok(r==S_FALSE || r == S_OK, "SetPath failed (0x%08x)\n", r); r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), NULL, SLGP_RAWPATH); ok(r==S_OK, "GetPath failed (0x%08x)\n", r); - ok(!lstrcmp(buffer, "C:\\nonexistent\\file"), "case doesn't match\n"); + ok(!lstrcmp(buffer, "C:\\nonexistent\\file") || + broken(!lstrcmp(buffer, "C:\\\"c:\\nonexistent\\file\"")), /* NT4 */ + "case doesn't match\n"); r = IShellLinkA_SetPath(sl, "\"c:\\foo"); ok(r==S_FALSE || r == S_OK || r == E_INVALIDARG /* Vista */, "SetPath failed (0x%08x)\n", r);

1 0

Paul Vriens : wintrust/tests: Vista/W2K8 have some extra struct members.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: b7787ec0c8737c5f3c6fcb1c9f1bb400131c185e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7787ec0c8737c5f3c6fcb1c9… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Oct 9 11:25:05 2008 +0200 wintrust/tests: Vista/W2K8 have some extra struct members. --- dlls/wintrust/tests/softpub.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 5509bce..5c5d892 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -506,7 +506,8 @@ static void test_get_known_usages(void) */ for (ptr = usages; *ptr; ptr++) { - ok((*ptr)->cbSize == sizeof(CRYPT_OID_INFO), + ok((*ptr)->cbSize == sizeof(CRYPT_OID_INFO) || + (*ptr)->cbSize == (sizeof(CRYPT_OID_INFO) + 2 * sizeof(LPCWSTR)), /* Vista */ "unexpected size %d\n", (*ptr)->cbSize); /* Each returned usage is in the CRYPT_ENHKEY_USAGE_OID_GROUP_ID group */ ok((*ptr)->dwGroupId == CRYPT_ENHKEY_USAGE_OID_GROUP_ID,

1 0

James Hawkins : msi: Initialize the count variable to zero.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: 68268dc3df2c6a05528ec9fe68959730f7417718 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68268dc3df2c6a05528ec9fe6… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Oct 9 04:45:25 2008 -0500 msi: Initialize the count variable to zero. --- dlls/msi/dialog.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 799aa48..2dcb868 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2247,6 +2247,7 @@ static UINT msi_listbox_add_items( struct msi_listbox_info *info, LPCWSTR proper return r; /* just get the number of records */ + count = 0; r = MSI_IterateRecords( view, &count, NULL, NULL ); info->num_items = count;

1 0

James Hawkins : msi: Add extra constraints on the formatting string of edit path text.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: 451aff9ae54c0817a33e205df1c144d3b8bd0942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=451aff9ae54c0817a33e205df… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Oct 9 00:54:04 2008 -0500 msi: Add extra constraints on the formatting string of edit path text. --- dlls/msi/dialog.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index add7876..799aa48 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1204,12 +1204,15 @@ static UINT msi_dialog_combo_control( msi_dialog *dialog, MSIRECORD *rec ) return ERROR_SUCCESS; } +/* length of 2^32 + 1 */ +#define MAX_NUM_DIGITS 11 + static UINT msi_dialog_edit_control( msi_dialog *dialog, MSIRECORD *rec ) { msi_control *control; LPCWSTR prop, text; LPWSTR val, begin, end; - WCHAR num[10]; + WCHAR num[MAX_NUM_DIGITS]; DWORD limit; control = msi_dialog_add_control( dialog, rec, szEdit, @@ -1222,7 +1225,9 @@ static UINT msi_dialog_edit_control( msi_dialog *dialog, MSIRECORD *rec ) begin = strchrW( text, '{' ); end = strchrW( text, '}' ); - if ( begin && end && end > begin ) + if ( begin && end && end > begin && + begin[0] >= '0' && begin[0] <= '9' && + end - begin < MAX_NUM_DIGITS) { lstrcpynW( num, begin + 1, end - begin ); limit = atolW( num );

1 0

Paul Vriens : ole32/tests: Fix two failures on NT4.
by Alexandre Julliard Oct. 9, 2008

Oct. 9, 2008

Module: wine Branch: master Commit: 6d15749d142940bb509a235f762a078da16bfadf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d15749d142940bb509a235f7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 8 20:37:57 2008 +0200 ole32/tests: Fix two failures on NT4. --- dlls/ole32/tests/dragdrop.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index ad10a58..b759981 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -137,7 +137,9 @@ START_TEST(dragdrop) NULL, NULL, NULL); hr = RegisterDragDrop(hwnd, &DropTarget); - ok(hr == E_OUTOFMEMORY, "RegisterDragDrop without OLE initialized should have returned E_OUTOFMEMORY instead of 0x%08x\n", hr); + ok(hr == E_OUTOFMEMORY || + broken(hr == CO_E_NOTINITIALIZED), /* NT4 */ + "RegisterDragDrop without OLE initialized should have returned E_OUTOFMEMORY instead of 0x%08x\n", hr); OleInitialize(NULL); @@ -164,7 +166,9 @@ START_TEST(dragdrop) hr = RevokeDragDrop(hwnd); ok_ole_success(hr, "RevokeDragDrop"); - ok(droptarget_release_called == 1, "DropTarget_Release should have been called once, not %d times\n", droptarget_release_called); + ok(droptarget_release_called == 1 || + broken(droptarget_release_called == 0), /* NT4 */ + "DropTarget_Release should have been called once, not %d times\n", droptarget_release_called); hr = RevokeDragDrop(NULL); ok(hr == DRAGDROP_E_INVALIDHWND, "RevokeDragDrop with NULL hwnd should return DRAGDROP_E_INVALIDHWND instead of 0x%08x\n", hr);

1 0