July 2008 - Wine-Commits - list.winehq.org

Reece Dunn : crypt32: Check Vista error codes for the msg tests.
by Alexandre Julliard July 29, 2008

July 29, 2008

Module: wine Branch: master Commit: 6a21ab270b2a9dc04ad38714f410e1ab27872f02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a21ab270b2a9dc04ad38714f… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Mon Jul 28 09:34:06 2008 +0100 crypt32: Check Vista error codes for the msg tests. --- dlls/crypt32/tests/msg.c | 51 ++++++++++++++++++++++++++++----------------- 1 files changed, 32 insertions(+), 19 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 0e66842..bfebeaa 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -383,9 +383,10 @@ static void test_data_msg_update(void) /* Can't update a message with no data */ SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, NULL, 0, TRUE); - /* NT: E_INVALIDARG, 9x: unchanged */ - ok(!ret && (GetLastError() == E_INVALIDARG || GetLastError() == 0xdeadbeef), - "Expected E_INVALIDARG or 0xdeadbeef, got 0x%x\n", GetLastError()); + /* This test returns FALSE on XP and earlier but TRUE on Vista, so can't be tested. + * GetLastError is either E_INVALIDARG (NT) or unset (9x/Vista), so it doesn't + * make sense to test this. + */ /* Curiously, a valid update will now fail as well, presumably because of * the last (invalid, but final) update. @@ -809,10 +810,11 @@ static void test_hash_msg_get_param(void) /* By getting the hash, further updates are not allowed */ SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); - /* NT: NTE_BAD_HASH_STATE, 9x: NTE_BAD_ALGID */ ok(!ret && - (GetLastError() == NTE_BAD_HASH_STATE || GetLastError() == NTE_BAD_ALGID), - "Expected NTE_BAD_HASH_STATE or NTE_BAD_ALGID, got 0x%x\n", GetLastError()); + (GetLastError() == NTE_BAD_HASH_STATE /* NT */ || + GetLastError() == NTE_BAD_ALGID /* 9x */ || + GetLastError() == CRYPT_E_MSG_ERROR /* Vista */), + "Expected NTE_BAD_HASH_STATE or NTE_BAD_ALGID or CRYPT_E_MSG_ERROR, got 0x%x\n", GetLastError()); /* Even after a final update, the hash data aren't available */ SetLastError(0xdeadbeef); @@ -857,10 +859,11 @@ static void test_hash_msg_get_param(void) */ SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); - /* NT: NTE_BAD_HASH_STATE, 9x: NTE_BAD_ALGID */ ok(!ret && - (GetLastError() == NTE_BAD_HASH_STATE || GetLastError() == NTE_BAD_ALGID), - "Expected NTE_BAD_HASH_STATE or NTE_BAD_ALGID, got 0x%x\n", GetLastError()); + (GetLastError() == NTE_BAD_HASH_STATE /* NT */ || + GetLastError() == NTE_BAD_ALGID /* 9x */ || + GetLastError() == CRYPT_E_MSG_ERROR /* Vista */), + "Expected NTE_BAD_HASH_STATE or NTE_BAD_ALGID or CRYPT_E_MSG_ERROR, got 0x%x\n", GetLastError()); CryptMsgClose(msg); } @@ -2462,24 +2465,30 @@ static void test_msg_control(void) /* Again, cert info needs to have a public key set */ SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); - ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, - "Expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); + ok(!ret && + (GetLastError() == CRYPT_E_ASN1_EOD || + GetLastError() == TRUST_E_NOSIGNATURE /* Vista */), + "Expected CRYPT_E_ASN1_EOD or TRUST_E_NOSIGNATURE, got %08x\n", GetLastError()); /* The public key is supposed to be in encoded form.. */ certInfo.SubjectPublicKeyInfo.Algorithm.pszObjId = oid_rsa_rsa; certInfo.SubjectPublicKeyInfo.PublicKey.cbData = sizeof(aKey); certInfo.SubjectPublicKeyInfo.PublicKey.pbData = aKey; SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); - ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, - "Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError()); + ok(!ret && + (GetLastError() == CRYPT_E_ASN1_BADTAG || + GetLastError() == TRUST_E_NOSIGNATURE /* Vista */), + "Expected CRYPT_E_ASN1_BADTAG or TRUST_E_NOSIGNATURE, got %08x\n", GetLastError()); /* but not as a X509_PUBLIC_KEY_INFO.. */ certInfo.SubjectPublicKeyInfo.Algorithm.pszObjId = NULL; certInfo.SubjectPublicKeyInfo.PublicKey.cbData = sizeof(encodedPubKey); certInfo.SubjectPublicKeyInfo.PublicKey.pbData = encodedPubKey; SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); - ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, - "Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError()); + ok(!ret && + (GetLastError() == CRYPT_E_ASN1_BADTAG || + GetLastError() == TRUST_E_NOSIGNATURE /* Vista */), + "Expected CRYPT_E_ASN1_BADTAG or TRUST_E_NOSIGNATURE, got %08x\n", GetLastError()); /* This decodes successfully, but it doesn't match any key in the message */ certInfo.SubjectPublicKeyInfo.PublicKey.cbData = sizeof(mod_encoded); certInfo.SubjectPublicKeyInfo.PublicKey.pbData = mod_encoded; @@ -2490,8 +2499,10 @@ static void test_msg_control(void) * now. */ todo_wine - ok(!ret && GetLastError() == NTE_BAD_SIGNATURE, - "Expected NTE_BAD_SIGNATURE, got %08x\n", GetLastError()); + ok(!ret && + (GetLastError() == NTE_BAD_SIGNATURE || + GetLastError() == TRUST_E_NOSIGNATURE /* Vista */), + "Expected NTE_BAD_SIGNATURE or TRUST_E_NOSIGNATURE, got %08x\n", GetLastError()); CryptMsgClose(msg); /* A message with no data doesn't have a valid signature */ msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); @@ -2502,8 +2513,10 @@ static void test_msg_control(void) certInfo.SubjectPublicKeyInfo.PublicKey.pbData = pubKey; SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); - ok(!ret && GetLastError() == NTE_BAD_SIGNATURE, - "Expected NTE_BAD_SIGNATURE, got %08x\n", GetLastError()); + ok(!ret && + (GetLastError() == NTE_BAD_SIGNATURE || + GetLastError() == TRUST_E_NOSIGNATURE /* Vista */), + "Expected NTE_BAD_SIGNATURE or TRUST_E_NOSIGNATURE, got %08x\n", GetLastError()); CryptMsgClose(msg); /* Finally, this succeeds */ msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL);

1 0

Vladimir Pankratov : taskmgr: Remove unused code.
by Alexandre Julliard July 29, 2008

July 29, 2008

Module: wine Branch: master Commit: 1d1dfc1f18f3e3a99ff0bcdd665711e59ea786f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d1dfc1f18f3e3a99ff0bcdd6… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Tue Jul 29 14:29:24 2008 +0500 taskmgr: Remove unused code. --- programs/taskmgr/Da.rc | 15 --------------- programs/taskmgr/De.rc | 15 --------------- programs/taskmgr/En.rc | 15 --------------- programs/taskmgr/Fr.rc | 15 --------------- programs/taskmgr/Ja.rc | 15 --------------- programs/taskmgr/Ko.rc | 15 --------------- programs/taskmgr/Nl.rc | 15 --------------- programs/taskmgr/No.rc | 15 --------------- programs/taskmgr/Pl.rc | 15 --------------- programs/taskmgr/Ru.rc | 15 --------------- programs/taskmgr/Si.rc | 15 --------------- programs/taskmgr/Tr.rc | 15 --------------- programs/taskmgr/resource.h | 3 --- 13 files changed, 0 insertions(+), 183 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1d1dfc1f18f3e3a99ff0b…

1 0

Hongbo Ni : user32: Implement WM_UNICHAR for edit control.
by Alexandre Julliard July 29, 2008

July 29, 2008

Module: wine Branch: master Commit: aaf67e9e737686c11eb3dc1a9802eff6a539320b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaf67e9e737686c11eb3dc1a9… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Wed Jul 23 21:54:39 2008 +1000 user32: Implement WM_UNICHAR for edit control. --- dlls/user32/edit.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index b37b5dc..dcf9550 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -860,6 +860,24 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, break; } + case WM_UNICHAR: + if (unicode) + { + if (wParam == UNICODE_NOCHAR) return TRUE; + if (wParam <= 0x000fffff) + { + if(wParam > 0xffff) /* convert to surrogates */ + { + wParam -= 0x10000; + EDIT_WM_Char(es, (wParam >> 10) + 0xd800); + EDIT_WM_Char(es, (wParam & 0x03ff) + 0xdc00); + } + else EDIT_WM_Char(es, wParam); + } + return 0; + } + break; + case WM_CLEAR: EDIT_WM_Clear(es); break;

1 0

Hongbo Ni : riched32: Implement WM_UNICHAR support.
by Alexandre Julliard July 29, 2008

July 29, 2008

Module: wine Branch: master Commit: 3cb685c861ea803dbd05b0b5a9566b9f971ecbad URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cb685c861ea803dbd05b0b5a… Author: Hongbo Ni <hongbo(a)njstar.com> Date: Wed Jul 23 21:55:46 2008 +1000 riched32: Implement WM_UNICHAR support. --- dlls/riched20/editor.c | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 1e5a395..c747c31 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -140,10 +140,10 @@ + WM_SETTEXT (resets undo stack !) (proper style?) ANSI&Unicode - WM_STYLECHANGING - WM_STYLECHANGED (things like read-only flag) - - WM_UNICHAR - + + WM_UNICHAR + Notifications - + * EN_CHANGE (sent from the wrong place) - EN_CORRECTTEXT - EN_DROPFILES @@ -2101,10 +2101,9 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, UNSUPPORTED_MSG(EM_SETWORDBREAKPROCEX) UNSUPPORTED_MSG(WM_STYLECHANGING) UNSUPPORTED_MSG(WM_STYLECHANGED) -/* UNSUPPORTED_MSG(WM_UNICHAR) FIXME missing in Wine headers */ - + /* Messages specific to Richedit controls */ - + case EM_STREAMIN: return ME_StreamIn(editor, wParam, (EDITSTREAM*)lParam, TRUE); case EM_STREAMOUT: @@ -3263,6 +3262,23 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, } return 0; } + case WM_UNICHAR: + if (unicode) + { + if(wParam == UNICODE_NOCHAR) return TRUE; + if(wParam <= 0x000fffff) + { + if(wParam > 0xffff) /* convert to surrogates */ + { + wParam -= 0x10000; + SendMessageW(editor->hWnd, WM_CHAR, (wParam >> 10) + 0xd800, 0); + SendMessageW(editor->hWnd, WM_CHAR, (wParam & 0x03ff) + 0xdc00, 0); + } + else SendMessageW(editor->hWnd, WM_CHAR, wParam, 0); + } + return 0; + } + break; case EM_STOPGROUPTYPING: ME_CommitUndo(editor); /* End coalesced undos for typed characters */ return 0;

1 0

Zac Brown : winhttp: Add stub implementation for WinHttpWriteData.
by Alexandre Julliard July 29, 2008

July 29, 2008

Module: wine Branch: master Commit: deb49f6f8395d74ec1824055aaab07943d6bbc2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=deb49f6f8395d74ec1824055a… Author: Zac Brown <zac(a)zacbrown.org> Date: Sun Jul 27 18:49:58 2008 -0700 winhttp: Add stub implementation for WinHttpWriteData. --- dlls/winhttp/main.c | 12 ++++++++++++ dlls/winhttp/winhttp.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index 28eb120..18059ba 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -247,3 +247,15 @@ BOOL WINAPI WinHttpCloseHandle (HINTERNET hInternet) SetLastError(ERROR_NOT_SUPPORTED); return FALSE; } + +/*********************************************************************** + * WinHttpWriteData (winhttp.@) + */ +BOOL WINAPI WinHttpWriteData (HINTERNET hRequest, LPCVOID lpBuffer, + DWORD dwNumberOfBytesToWrite, LPDWORD lpdwNumberOfBytesWritten) +{ + FIXME("(%p, %d, %p): stub\n", lpBuffer, dwNumberOfBytesToWrite, lpdwNumberOfBytesWritten); + + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; +} diff --git a/dlls/winhttp/winhttp.spec b/dlls/winhttp/winhttp.spec index 1017c71..c6ada03 100644 --- a/dlls/winhttp/winhttp.spec +++ b/dlls/winhttp/winhttp.spec @@ -28,4 +28,4 @@ @ stub WinHttpSetTimeouts @ stub WinHttpTimeFromSystemTime @ stub WinHttpTimeToSystemTime -@ stub WinHttpWriteData +@ stdcall WinHttpWriteData(ptr ptr long ptr)

1 0

Gerald Pfeifer : comctl32: Remove unused parameter from _read_bitmap().
by Alexandre Julliard July 29, 2008

July 29, 2008

Module: wine Branch: master Commit: 1cdb06c69c8f3a43098d07e910eff23ebe79f476 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cdb06c69c8f3a43098d07e91… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Jul 27 22:18:39 2008 +0200 comctl32: Remove unused parameter from _read_bitmap(). --- dlls/comctl32/imagelist.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index a673b1b..f909155 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -1899,7 +1899,7 @@ static int DIB_GetDIBImageBytes( int width, int height, int depth ) /* helper for ImageList_Read, see comments below */ -static BOOL _read_bitmap(HIMAGELIST himl, HDC hdcIml, LPSTREAM pstm) +static BOOL _read_bitmap(HDC hdcIml, LPSTREAM pstm) { BITMAPFILEHEADER bmfh; int bitsperpixel, palspace; @@ -2006,14 +2006,14 @@ HIMAGELIST WINAPI ImageList_Read (LPSTREAM pstm) if (!himl) return NULL; - if (!_read_bitmap(himl, himl->hdcImage, pstm)) + if (!_read_bitmap(himl->hdcImage, pstm)) { WARN("failed to read bitmap from stream\n"); return NULL; } if (ilHead.flags & ILC_MASK) { - if (!_read_bitmap(himl, himl->hdcMask, pstm)) + if (!_read_bitmap(himl->hdcMask, pstm)) { WARN("failed to read mask bitmap from stream\n"); return NULL;

1 0

Gerald Pfeifer : comctl32: Push down function scope variable into the different case statements which allows us using more specific types in case .
by Alexandre Julliard July 29, 2008

July 29, 2008

Module: wine Branch: master Commit: d585d422093921a95e37061b3b403b7eb99dfee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d585d422093921a95e37061b3… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Jul 27 22:16:59 2008 +0200 comctl32: Push down function scope variable into the different case statements which allows us using more specific types in case. --- dlls/comctl32/updown.c | 35 ++++++++++++++++++++++++----------- 1 files changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index a971afa..38879db 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -817,7 +817,6 @@ static void UPDOWN_HandleMouseEvent (UPDOWN_INFO *infoPtr, UINT msg, INT x, INT static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { UPDOWN_INFO *infoPtr = UPDOWN_GetInfoPtr (hwnd); - int temp; static const WCHAR themeClass[] = {'S','p','i','n',0}; HTHEME theme; @@ -903,6 +902,8 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L /* if initial timer, kill it and start the repeat timer */ if(wParam == TIMER_AUTOREPEAT) { + int temp; + KillTimer(hwnd, TIMER_AUTOREPEAT); /* if no accel info given, used default timer */ if(infoPtr->AccelCount==0 || infoPtr->AccelVect==0) { @@ -917,6 +918,8 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L /* now, if the mouse is above us, do the thing...*/ if(infoPtr->Flags & FLAG_MOUSEIN) { + int temp; + temp = infoPtr->AccelIndex == -1 ? 1 : infoPtr->AccelVect[infoPtr->AccelIndex].nInc; UPDOWN_DoAction(infoPtr, temp, infoPtr->Flags & FLAG_ARROW); @@ -972,13 +975,16 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L case UDM_GETACCEL: if (wParam==0 && lParam==0) return infoPtr->AccelCount; if (wParam && lParam) { - temp = min(infoPtr->AccelCount, wParam); + int temp = min(infoPtr->AccelCount, wParam); memcpy((void *)lParam, infoPtr->AccelVect, temp*sizeof(UDACCEL)); return temp; } return 0; case UDM_SETACCEL: + { + unsigned temp; + TRACE("UDM_SETACCEL\n"); if(infoPtr->AccelVect) { @@ -996,14 +1002,14 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L TRACE("%d: nSec %u nInc %u\n", temp, infoPtr->AccelVect[temp].nSec, infoPtr->AccelVect[temp].nInc); return TRUE; - + } case UDM_GETBASE: return infoPtr->Base; case UDM_SETBASE: TRACE("UpDown Ctrl new base(%ld), hwnd=%p\n", wParam, hwnd); if (wParam==10 || wParam==16) { - temp = infoPtr->Base; + WPARAM temp = infoPtr->Base; infoPtr->Base = wParam; return temp; } @@ -1016,11 +1022,14 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L return (LRESULT)UPDOWN_SetBuddy (infoPtr, (HWND)wParam); case UDM_GETPOS: - temp = UPDOWN_GetBuddyInt (infoPtr); + { + int temp = UPDOWN_GetBuddyInt (infoPtr); return MAKELONG(infoPtr->CurVal, temp ? 0 : 1); - + } case UDM_SETPOS: - temp = (short)LOWORD(lParam); + { + int temp = (short)LOWORD(lParam); + TRACE("UpDown Ctrl new value(%d), hwnd=%p\n", temp, hwnd); if(!UPDOWN_InBounds(infoPtr, temp)) { if(temp < infoPtr->MinVal) temp = infoPtr->MinVal; @@ -1030,7 +1039,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L infoPtr->CurVal = temp; UPDOWN_SetBuddyInt (infoPtr); return wParam; /* return prev value */ - + } case UDM_GETRANGE: return MAKELONG(infoPtr->MaxVal, infoPtr->MinVal); @@ -1062,6 +1071,9 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L return infoPtr->CurVal; case UDM_SETPOS32: + { + int temp; + if(!UPDOWN_InBounds(infoPtr, (int)lParam)) { if((int)lParam < infoPtr->MinVal) lParam = infoPtr->MinVal; if((int)lParam > infoPtr->MaxVal) lParam = infoPtr->MaxVal; @@ -1070,17 +1082,18 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L infoPtr->CurVal = (int)lParam; /* set the new value */ UPDOWN_SetBuddyInt (infoPtr); return temp; /* return prev value */ - + } case UDM_GETUNICODEFORMAT: /* we lie a bit here, we're always using Unicode internally */ return infoPtr->UnicodeFormat; case UDM_SETUNICODEFORMAT: + { /* do we really need to honour this flag? */ - temp = infoPtr->UnicodeFormat; + int temp = infoPtr->UnicodeFormat; infoPtr->UnicodeFormat = (BOOL)wParam; return temp; - + } default: if ((message >= WM_USER) && (message < WM_APP) && !COMCTL32_IsReflectedMessage(message)) ERR("unknown msg %04x wp=%04lx lp=%08lx\n", message, wParam, lParam);

1 0

Dustin Brody : riched20: EM_SETTEXTTEX obeys ST_SELECTION with RTF inputs.
by Alexandre Julliard July 29, 2008

July 29, 2008

Module: wine Branch: master Commit: 3a805d289ec5445ac87ab5712788d3e2fbf7f0d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a805d289ec5445ac87ab5712… Author: Dustin Brody <ne4(a)parsoma.net> Date: Mon Jul 28 21:24:48 2008 -0400 riched20: EM_SETTEXTTEX obeys ST_SELECTION with RTF inputs. --- dlls/riched20/editor.c | 2 +- dlls/riched20/tests/editor.c | 85 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 78 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a801ee2..1e5a395 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2308,7 +2308,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, style = ME_GetSelectionInsertStyle(editor); ME_InternalDeleteText(editor, from, to - from); if (pStruct->codepage != 1200 && lParam && !strncmp((char *)lParam, "{\\rtf", 5)) - ME_StreamInRTFString(editor, 0, (char *)lParam); + ME_StreamInRTFString(editor, 1, (char *)lParam); else ME_InsertTextFromCursor(editor, 0, wszText, len, style); ME_ReleaseStyle(style); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index e6bc67f..15cef75 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3180,6 +3180,12 @@ static void test_EM_SETTEXTEX(void) WCHAR TestItem1[] = {'T', 'e', 's', 't', 'S', 'o', 'm', 'e', 'T', 'e', 'x', 't', 0}; + WCHAR TestItem1alt[] = {'T', 'T', 'e', 's', + 't', 'S', 'o', 'm', + 'e', 'T', 'e', 'x', + 't', 't', 'S', 'o', + 'm', 'e', 'T', 'e', + 'x', 't', 0}; WCHAR TestItem2[] = {'T', 'e', 's', 't', 'S', 'o', 'm', 'e', 'T', 'e', 'x', 't', @@ -3208,6 +3214,7 @@ static void test_EM_SETTEXTEX(void) ' ','\r', 0}; #define MAX_BUF_LEN 1024 WCHAR buf[MAX_BUF_LEN]; + char bufACP[MAX_BUF_LEN]; char * p; int result; CHARRANGE cr; @@ -3227,7 +3234,7 @@ static void test_EM_SETTEXTEX(void) "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n"); /* Unlike WM_SETTEXT/WM_GETTEXT pair, EM_SETTEXTEX/EM_GETTEXTEX does not - convert \r to \r\n on return + convert \r to \r\n on return: !ST_SELECTION && Unicode && !\rtf */ setText.codepage = 1200; /* no constant for unicode */ getText.codepage = 1200; /* no constant for unicode */ @@ -3273,7 +3280,7 @@ static void test_EM_SETTEXTEX(void) "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n"); - /* \r\n pairs get changed into \r */ + /* \r\n pairs get changed into \r: !ST_SELECTION && Unicode && !\rtf */ setText.codepage = 1200; /* no constant for unicode */ getText.codepage = 1200; /* no constant for unicode */ getText.cb = MAX_BUF_LEN; @@ -3286,7 +3293,7 @@ static void test_EM_SETTEXTEX(void) ok(lstrcmpW(buf, TestItem3_after) == 0, "EM_SETTEXTEX did not convert properly\n"); - /* \n also gets changed to \r */ + /* \n also gets changed to \r: !ST_SELECTION && Unicode && !\rtf */ setText.codepage = 1200; /* no constant for unicode */ getText.codepage = 1200; /* no constant for unicode */ getText.cb = MAX_BUF_LEN; @@ -3299,7 +3306,7 @@ static void test_EM_SETTEXTEX(void) ok(lstrcmpW(buf, TestItem3_after) == 0, "EM_SETTEXTEX did not convert properly\n"); - /* \r\r\n gets changed into single space */ + /* \r\r\n gets changed into single space: !ST_SELECTION && Unicode && !\rtf */ setText.codepage = 1200; /* no constant for unicode */ getText.codepage = 1200; /* no constant for unicode */ getText.cb = MAX_BUF_LEN; @@ -3312,6 +3319,7 @@ static void test_EM_SETTEXTEX(void) ok(lstrcmpW(buf, TestItem4_after) == 0, "EM_SETTEXTEX did not convert properly\n"); + /* !ST_SELECTION && Unicode && !\rtf */ result = SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) NULL); SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); @@ -3321,14 +3329,14 @@ static void test_EM_SETTEXTEX(void) ok(lstrlenW(buf) == 0, "EM_SETTEXTEX with NULL lParam should clear rich edit.\n"); - /* put some text back */ + /* put some text back: !ST_SELECTION && Unicode && !\rtf */ setText.flags = 0; SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) TestItem1); /* select some text */ cr.cpMax = 1; cr.cpMin = 3; SendMessage(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM) &cr); - /* replace current selection */ + /* replace current selection: ST_SELECTION && Unicode && !\rtf */ setText.flags = ST_SELECTION; result = SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) NULL); @@ -3337,14 +3345,14 @@ static void test_EM_SETTEXTEX(void) " with no text should return 0. Got %i\n", result); - /* put some text back */ + /* put some text back: !ST_SELECTION && Unicode && !\rtf */ setText.flags = 0; SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) TestItem1); /* select some text */ cr.cpMax = 1; cr.cpMin = 3; SendMessage(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM) &cr); - /* replace current selection */ + /* replace current selection: ST_SELECTION && Unicode && !\rtf */ setText.flags = ST_SELECTION; result = SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) TestItem1); @@ -3369,6 +3377,7 @@ static void test_EM_SETTEXTEX(void) (WPARAM)(SF_RTF), (LPARAM)&es); trace("EM_STREAMOUT produced: \n%s\n", (char *)buf); + /* !ST_SELECTION && !Unicode && \rtf */ setText.codepage = CP_ACP;/* EM_STREAMOUT saved as ANSI string */ getText.codepage = 1200; /* no constant for unicode */ getText.cb = MAX_BUF_LEN; @@ -3382,6 +3391,66 @@ static void test_EM_SETTEXTEX(void) ok(lstrcmpW(buf, TestItem1) == 0, "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n"); + /* The following test demonstrates that EM_SETTEXTEX supports RTF strings with a selection */ + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) "TestSomeText"); /* TestItem1 */ + p = (char *)buf; + es.dwCookie = (DWORD_PTR)&p; + es.dwError = 0; + es.pfnCallback = test_WM_SETTEXT_esCallback; + memset(buf, 0, sizeof(buf)); + SendMessage(hwndRichEdit, EM_STREAMOUT, + (WPARAM)(SF_RTF), (LPARAM)&es); + trace("EM_STREAMOUT produced: \n%s\n", (char *)buf); + + /* select some text */ + cr.cpMax = 1; + cr.cpMin = 3; + SendMessage(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM) &cr); + + /* ST_SELECTION && !Unicode && \rtf */ + setText.codepage = CP_ACP;/* EM_STREAMOUT saved as ANSI string */ + getText.codepage = 1200; /* no constant for unicode */ + getText.cb = MAX_BUF_LEN; + getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefChar = NULL; + + setText.flags = ST_SELECTION; + SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) buf); + SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); + ok(lstrcmpW(buf, TestItem1alt) == 0, + "EM_GETTEXTEX results not what was set by EM_SETTEXTEX when" + " using ST_SELECTION on an RTF string and non-Unicode\n"); + + /* The following test demonstrates that EM_SETTEXTEX replacing a selection */ + setText.codepage = 1200; /* no constant for unicode */ + getText.codepage = CP_ACP; + getText.cb = MAX_BUF_LEN; + + setText.flags = 0; + SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) TestItem1); /* TestItem1 */ + SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) bufACP); + + /* select some text */ + cr.cpMax = 1; + cr.cpMin = 3; + SendMessage(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM) &cr); + + /* ST_SELECTION && !Unicode && !\rtf */ + setText.codepage = CP_ACP; + getText.codepage = 1200; /* no constant for unicode */ + getText.cb = MAX_BUF_LEN; + getText.flags = GT_DEFAULT; + getText.lpDefaultChar = NULL; + getText.lpUsedDefChar = NULL; + + setText.flags = ST_SELECTION; + SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) bufACP); + SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); + ok(lstrcmpW(buf, TestItem1alt) == 0, + "EM_GETTEXTEX results not what was set by EM_SETTEXTEX when" + " using ST_SELECTION and non-Unicode\n"); + DestroyWindow(hwndRichEdit); }

1 0

Owen Rudge : appwiz.cpl: Gather extra information for Support Info dialog.
by Alexandre Julliard July 29, 2008

July 29, 2008

Module: wine Branch: master Commit: ac3337ee91562779180cff976e22c47148f94cf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac3337ee91562779180cff976… Author: Owen Rudge <owen(a)owenrudge.net> Date: Mon Jul 28 15:16:35 2008 +0100 appwiz.cpl: Gather extra information for Support Info dialog. --- dlls/appwiz.cpl/En.rc | 1 + dlls/appwiz.cpl/appwiz.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/appwiz.cpl/res.h | 1 + 3 files changed, 86 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/En.rc b/dlls/appwiz.cpl/En.rc index 155f46c..b75715b 100644 --- a/dlls/appwiz.cpl/En.rc +++ b/dlls/appwiz.cpl/En.rc @@ -28,6 +28,7 @@ STRINGTABLE IDS_TAB1_TITLE, "Applications" IDS_UNINSTALL_FAILED, "Unable to execute the uninstaller, '%s'. Do you want to remove the uninstall entry for this program from the registry?" + IDS_NOT_SPECIFIED, "Not specified" IDS_COLUMN_NAME, "Name" IDS_COLUMN_PUBLISHER, "Publisher" diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 7312a27..44bf3b2 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -78,6 +78,14 @@ static const WCHAR DisplayIconW[] = {'D','i','s','p','l','a','y','I','c','o','n' static const WCHAR DisplayVersionW[] = {'D','i','s','p','l','a','y','V','e','r', 's','i','o','n',0}; static const WCHAR PublisherW[] = {'P','u','b','l','i','s','h','e','r',0}; +static const WCHAR ContactW[] = {'C','o','n','t','a','c','t',0}; +static const WCHAR HelpLinkW[] = {'H','e','l','p','L','i','n','k',0}; +static const WCHAR HelpTelephoneW[] = {'H','e','l','p','T','e','l','e','p','h', + 'o','n','e',0}; +static const WCHAR ReadmeW[] = {'R','e','a','d','m','e',0}; +static const WCHAR URLUpdateInfoW[] = {'U','R','L','U','p','d','a','t','e','I', + 'n','f','o',0}; +static const WCHAR CommentsW[] = {'C','o','m','m','e','n','t','s',0}; static const WCHAR UninstallCommandlineW[] = {'U','n','i','n','s','t','a','l','l', 'S','t','r','i','n','g',0}; @@ -418,6 +426,46 @@ static void UninstallProgram(int id) } } +/********************************************************************************** + * Name : SetInfoDialogText + * Description: Sets the text of a label in a window, based upon a registry entry + * or string passed to the function. + * Parameters : hKey - registry entry to read from, NULL if not reading + * from registry + * lpKeyName - key to read from, or string to check if hKey is NULL + * lpAltMessage - alternative message if entry not found + * hWnd - handle of dialog box + * iDlgItem - ID of label in dialog box + */ +static void SetInfoDialogText(HKEY hKey, LPWSTR lpKeyName, LPWSTR lpAltMessage, + HWND hWnd, int iDlgItem) +{ + WCHAR buf[MAX_STRING_LEN]; + DWORD buflen; + HWND hWndDlgItem; + + hWndDlgItem = GetDlgItem(hWnd, iDlgItem); + + /* if hKey is null, lpKeyName contains the string we want to check */ + if (hKey == NULL) + { + if ((lpKeyName) && (lstrlenW(lpKeyName) > 0)) + SetWindowTextW(hWndDlgItem, lpKeyName); + else + SetWindowTextW(hWndDlgItem, lpAltMessage); + } + else + { + buflen = MAX_STRING_LEN; + + if ((RegQueryValueExW(hKey, lpKeyName, 0, 0, (LPBYTE) buf, &buflen) == + ERROR_SUCCESS) && (lstrlenW(buf) > 0)) + SetWindowTextW(hWndDlgItem, buf); + else + SetWindowTextW(hWndDlgItem, lpAltMessage); + } +} + /****************************************************************************** * Name : SupportInfoDlgProc * Description: Callback procedure for support info dialog @@ -430,8 +478,11 @@ static void UninstallProgram(int id) static BOOL CALLBACK SupportInfoDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { APPINFO *iter; + HKEY hkey; WCHAR oldtitle[MAX_STRING_LEN]; WCHAR buf[MAX_STRING_LEN]; + WCHAR key[MAX_STRING_LEN]; + WCHAR notfound[MAX_STRING_LEN]; switch(msg) { @@ -440,6 +491,37 @@ static BOOL CALLBACK SupportInfoDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPAR { if (iter->id == (int) lParam) { + lstrcpyW(key, PathUninstallW); + lstrcatW(key, BackSlashW); + lstrcatW(key, iter->regkey); + + /* check the application's registry entries */ + RegOpenKeyExW(iter->regroot, key, 0, KEY_READ, &hkey); + + /* Load our "not specified" string */ + LoadStringW(hInst, IDS_NOT_SPECIFIED, notfound, + sizeof(notfound) / sizeof(notfound[0])); + + /* Update the data for items already read into the structure */ + SetInfoDialogText(NULL, iter->publisher, notfound, hWnd, + IDC_INFO_PUBLISHER); + SetInfoDialogText(NULL, iter->version, notfound, hWnd, + IDC_INFO_VERSION); + + /* And now update the data for those items in the registry */ + SetInfoDialogText(hkey, (LPWSTR) ContactW, notfound, hWnd, + IDC_INFO_CONTACT); + SetInfoDialogText(hkey, (LPWSTR) HelpLinkW, notfound, hWnd, + IDC_INFO_SUPPORT); + SetInfoDialogText(hkey, (LPWSTR) HelpTelephoneW, notfound, hWnd, + IDC_INFO_PHONE); + SetInfoDialogText(hkey, (LPWSTR) ReadmeW, notfound, hWnd, + IDC_INFO_README); + SetInfoDialogText(hkey, (LPWSTR) URLUpdateInfoW, notfound, hWnd, + IDC_INFO_UPDATES); + SetInfoDialogText(hkey, (LPWSTR) CommentsW, notfound, hWnd, + IDC_INFO_COMMENTS); + /* Update the main label with the app name */ if (GetWindowTextW(GetDlgItem(hWnd, IDC_INFO_LABEL), oldtitle, MAX_STRING_LEN) != 0) @@ -448,6 +530,8 @@ static BOOL CALLBACK SupportInfoDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPAR SetWindowTextW(GetDlgItem(hWnd, IDC_INFO_LABEL), buf); } + RegCloseKey(hkey); + break; } } diff --git a/dlls/appwiz.cpl/res.h b/dlls/appwiz.cpl/res.h index ea32be8..34129c4 100644 --- a/dlls/appwiz.cpl/res.h +++ b/dlls/appwiz.cpl/res.h @@ -49,6 +49,7 @@ #define IDS_CPL_DESC 2 #define IDS_TAB1_TITLE 3 #define IDS_UNINSTALL_FAILED 4 +#define IDS_NOT_SPECIFIED 5 #define IDS_COLUMN_NAME 6 #define IDS_COLUMN_PUBLISHER 7 #define IDS_COLUMN_VERSION 8

1 0

Alexander Nicolaysen Sørnes : appwiz.cpl : Fix overlapping controls.
by Alexandre Julliard July 29, 2008

July 29, 2008

Module: wine Branch: master Commit: 12a6140280b446ecccc1cdcf75cbebe81b7d39c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12a6140280b446ecccc1cdcf7… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Jul 28 14:02:39 2008 +0200 appwiz.cpl: Fix overlapping controls. --- dlls/appwiz.cpl/En.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/appwiz.cpl/En.rc b/dlls/appwiz.cpl/En.rc index b75715b..22c0879 100644 --- a/dlls/appwiz.cpl/En.rc +++ b/dlls/appwiz.cpl/En.rc @@ -46,7 +46,7 @@ FONT 8, "MS Sans Serif" CONTROL "&Install...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 - CONTROL "The following software can be automatically removed. To remove a program or to modify its installed components, select it from the list and click Add/Remove.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 36 + CONTROL "The following software can be automatically removed. To remove a program or to modify its installed components, select it from the list and click Add/Remove.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 CONTROL "Add/&Remove...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 198, 64, 14 CONTROL "&Support Info...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 176, 198, 64, 14

1 0