September 2008 - Wine-commits

Juan Lang : crypt32: Check length of sequence before checking tag.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: 254f9b9c01d9aee3c475843ea0357b5b90de9e8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=254f9b9c01d9aee3c475843ea… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 8 12:30:01 2008 -0700 crypt32: Check length of sequence before checking tag. --- dlls/crypt32/decode.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index eb782d3..0d46fe3 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -475,6 +475,11 @@ static BOOL CRYPT_AsnDecodeSequence(struct AsnDecodeSequenceItem items[], cbEncoded, dwFlags, pDecodePara, pvStructInfo, *pcbStructInfo, startingPointer); + if (!cbEncoded) + { + SetLastError(CRYPT_E_ASN1_EOD); + return FALSE; + } if (pbEncoded[0] == ASN_SEQUENCE) { DWORD dataLen;

1 0

Juan Lang : crypt32: Don' t store redundant copy of detached hash message data.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: 7c83565580baea7e77cce478971f5c8d9f5fbe12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c83565580baea7e77cce4789… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 8 12:43:15 2008 -0700 crypt32: Don't store redundant copy of detached hash message data. --- dlls/crypt32/msg.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 1c07e05..54c5bb0 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1723,15 +1723,13 @@ static BOOL CDecodeMsg_FinalizeHashedContent(CDecodeMsg *msg, { /* Unlike for non-detached messages, the data were never stored as * the content param, but were saved in msg->detached_data instead. - * Set the content property with the detached data so the data may - * be hashed. */ - ContextPropertyList_SetProperty(msg->properties, - CMSG_CONTENT_PARAM, msg->detached_data.pbData, - msg->detached_data.cbData); + content.pbData = msg->detached_data.pbData; + content.cbData = msg->detached_data.cbData; } - ret = ContextPropertyList_FindProperty(msg->properties, - CMSG_CONTENT_PARAM, &content); + else + ret = ContextPropertyList_FindProperty(msg->properties, + CMSG_CONTENT_PARAM, &content); if (ret) ret = CryptHashData(msg->u.hash, content.pbData, content.cbData, 0); }

1 0

Juan Lang : crypt32: Add stub for CryptVerifyMessageHash.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: 3cef67d5ca185068da6ac499b0a05276ab87d0a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cef67d5ca185068da6ac499b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 8 12:43:41 2008 -0700 crypt32: Add stub for CryptVerifyMessageHash. --- dlls/crypt32/crypt32.spec | 2 +- dlls/crypt32/message.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 8476345..8beff93 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -187,7 +187,7 @@ @ stdcall CryptVerifyCertificateSignatureEx(long long long ptr long ptr long ptr) @ stdcall CryptVerifyDetachedMessageHash(ptr ptr long long ptr ptr ptr ptr) @ stub CryptVerifyDetachedMessageSignature -@ stub CryptVerifyMessageHash +@ stdcall CryptVerifyMessageHash(ptr ptr long ptr ptr ptr ptr) @ stdcall CryptVerifyMessageSignature(ptr long ptr long ptr ptr ptr) @ stub CryptVerifyMessageSignatureWithKey @ stub CryptVerifySignatureU diff --git a/dlls/crypt32/message.c b/dlls/crypt32/message.c index 9413dd6..5440a4c 100644 --- a/dlls/crypt32/message.c +++ b/dlls/crypt32/message.c @@ -318,3 +318,13 @@ BOOL WINAPI CryptVerifyDetachedMessageHash(PCRYPT_HASH_MESSAGE_PARA pHashPara, } return ret; } + +BOOL WINAPI CryptVerifyMessageHash(PCRYPT_HASH_MESSAGE_PARA pHashPara, + BYTE *pbHashedBlob, DWORD cbHashedBlob, BYTE *pbToBeHashed, + DWORD *pcbToBeHashed, BYTE *pbComputedHash, DWORD *pcbComputedHash) +{ + FIXME("(%p, %p, %d, %p, %p, %p, %p): stub\n", pHashPara, pbHashedBlob, + cbHashedBlob, pbToBeHashed, pcbToBeHashed, pbComputedHash, + pcbComputedHash); + return FALSE; +}

1 0

Juan Lang : crypt32: Add tests for CryptVerifyMessageHash.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: c097a7a6a63564c967ff52918e253612637f55b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c097a7a6a63564c967ff52918… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 8 12:44:03 2008 -0700 crypt32: Add tests for CryptVerifyMessageHash. --- dlls/crypt32/tests/message.c | 68 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/message.c b/dlls/crypt32/tests/message.c index d515d9b..e1d7cf0 100644 --- a/dlls/crypt32/tests/message.c +++ b/dlls/crypt32/tests/message.c @@ -190,6 +190,73 @@ static void test_verify_detached_message_hash(void) ok(ret, "CryptVerifyDetachedMessageHash failed: %08x\n", GetLastError()); } +static BYTE hashContent[] = { +0x30,0x47,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x05,0xa0,0x3a, +0x30,0x38,0x02,0x01,0x00,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d, +0x02,0x05,0x05,0x00,0x30,0x13,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01, +0x07,0x01,0xa0,0x06,0x04,0x04,0x01,0x02,0x03,0x04,0x04,0x10,0x08,0xd6,0xc0, +0x5a,0x21,0x51,0x2a,0x79,0xa1,0xdf,0xeb,0x9d,0x2a,0x8f,0x26,0x2f }; + +static void test_verify_message_hash(void) +{ + BOOL ret; + CRYPT_HASH_MESSAGE_PARA para; + DWORD size; + BYTE *buf = NULL; + + memset(&para, 0, sizeof(para)); + /* Crash */ + if (0) + ret = CryptVerifyMessageHash(NULL, NULL, 0, NULL, NULL, NULL, NULL); + SetLastError(0xdeadbeef); + ret = CryptVerifyMessageHash(&para, NULL, 0, NULL, NULL, NULL, NULL); + todo_wine + ok(!ret && GetLastError() == E_INVALIDARG, + "expected E_INVALIDARG, got %08x\n", GetLastError()); + para.cbSize = sizeof(para); + SetLastError(0xdeadbeef); + ret = CryptVerifyMessageHash(&para, NULL, 0, NULL, NULL, NULL, NULL); + todo_wine + ok(!ret && GetLastError() == E_INVALIDARG, + "expected E_INVALIDARG, got %08x\n", GetLastError()); + para.dwMsgEncodingType = PKCS_7_ASN_ENCODING; + SetLastError(0xdeadbeef); + ret = CryptVerifyMessageHash(&para, NULL, 0, NULL, NULL, NULL, NULL); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, + "expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); + /* Verifying the hash of a detached message succeeds? */ + ret = CryptVerifyMessageHash(&para, detachedHashContent, + sizeof(detachedHashContent), NULL, NULL, NULL, NULL); + todo_wine + ok(ret, "CryptVerifyMessageHash failed: %08x\n", GetLastError()); + /* As does verifying the hash of a regular message. */ + ret = CryptVerifyMessageHash(&para, hashContent, sizeof(hashContent), + NULL, NULL, NULL, NULL); + todo_wine + ok(ret, "CryptVerifyMessageHash failed: %08x\n", GetLastError()); + ret = CryptVerifyMessageHash(&para, hashContent, sizeof(hashContent), + NULL, &size, NULL, NULL); + todo_wine + ok(ret, "CryptVerifyMessageHash failed: %08x\n", GetLastError()); + if (ret) + buf = CryptMemAlloc(size); + if (buf) + { + size = 1; + ret = CryptVerifyMessageHash(&para, hashContent, sizeof(hashContent), + buf, &size, NULL, NULL); + ok(!ret && GetLastError() == ERROR_MORE_DATA, + "expected ERROR_MORE_DATA, got %08x\n", GetLastError()); + ret = CryptVerifyMessageHash(&para, hashContent, sizeof(hashContent), + buf, &size, NULL, NULL); + ok(ret, "CryptVerifyMessageHash failed: %08x\n", GetLastError()); + ok(size == sizeof(msgData), "unexpected size %d\n", size); + ok(!memcmp(buf, msgData, size), "unexpected value\n"); + CryptMemFree(buf); + } +} + static const BYTE signedContent[] = { 0x30,0x81,0xb2,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x02,0xa0, 0x81,0xa4,0x30,0x81,0xa1,0x02,0x01,0x01,0x31,0x0e,0x30,0x0c,0x06,0x08,0x2a, @@ -522,6 +589,7 @@ START_TEST(message) { test_msg_get_signer_count(); test_verify_detached_message_hash(); + test_verify_message_hash(); test_verify_message_signature(); test_hash_message(); }

1 0

Juan Lang : crypt32: Implement CryptVerifyMessageHash.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: f98eb4a8a0aaa3244b4308c5dd4ba29eb4e1f9fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f98eb4a8a0aaa3244b4308c5d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 8 12:45:09 2008 -0700 crypt32: Implement CryptVerifyMessageHash. --- dlls/crypt32/message.c | 36 ++++++++++++++++++++++++++++++++++-- dlls/crypt32/tests/message.c | 5 ----- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/message.c b/dlls/crypt32/message.c index 5440a4c..b419866 100644 --- a/dlls/crypt32/message.c +++ b/dlls/crypt32/message.c @@ -323,8 +323,40 @@ BOOL WINAPI CryptVerifyMessageHash(PCRYPT_HASH_MESSAGE_PARA pHashPara, BYTE *pbHashedBlob, DWORD cbHashedBlob, BYTE *pbToBeHashed, DWORD *pcbToBeHashed, BYTE *pbComputedHash, DWORD *pcbComputedHash) { - FIXME("(%p, %p, %d, %p, %p, %p, %p): stub\n", pHashPara, pbHashedBlob, + HCRYPTMSG msg; + BOOL ret = FALSE; + + TRACE("(%p, %p, %d, %p, %p, %p, %p)\n", pHashPara, pbHashedBlob, cbHashedBlob, pbToBeHashed, pcbToBeHashed, pbComputedHash, pcbComputedHash); - return FALSE; + + if (pHashPara->cbSize != sizeof(CRYPT_HASH_MESSAGE_PARA)) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + if (GET_CMSG_ENCODING_TYPE(pHashPara->dwMsgEncodingType) != + PKCS_7_ASN_ENCODING) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + msg = CryptMsgOpenToDecode(pHashPara->dwMsgEncodingType, 0, 0, + pHashPara->hCryptProv, NULL, NULL); + if (msg) + { + ret = CryptMsgUpdate(msg, pbHashedBlob, cbHashedBlob, TRUE); + if (ret) + { + ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_HASH, NULL); + if (ret && pcbToBeHashed) + ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, + pbToBeHashed, pcbToBeHashed); + if (ret && pcbComputedHash) + ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 0, + pbComputedHash, pcbComputedHash); + } + CryptMsgClose(msg); + } + return ret; } diff --git a/dlls/crypt32/tests/message.c b/dlls/crypt32/tests/message.c index e1d7cf0..271bc2d 100644 --- a/dlls/crypt32/tests/message.c +++ b/dlls/crypt32/tests/message.c @@ -210,19 +210,16 @@ static void test_verify_message_hash(void) ret = CryptVerifyMessageHash(NULL, NULL, 0, NULL, NULL, NULL, NULL); SetLastError(0xdeadbeef); ret = CryptVerifyMessageHash(&para, NULL, 0, NULL, NULL, NULL, NULL); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); para.cbSize = sizeof(para); SetLastError(0xdeadbeef); ret = CryptVerifyMessageHash(&para, NULL, 0, NULL, NULL, NULL, NULL); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); para.dwMsgEncodingType = PKCS_7_ASN_ENCODING; SetLastError(0xdeadbeef); ret = CryptVerifyMessageHash(&para, NULL, 0, NULL, NULL, NULL, NULL); - todo_wine ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, "expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); /* Verifying the hash of a detached message succeeds? */ @@ -233,11 +230,9 @@ static void test_verify_message_hash(void) /* As does verifying the hash of a regular message. */ ret = CryptVerifyMessageHash(&para, hashContent, sizeof(hashContent), NULL, NULL, NULL, NULL); - todo_wine ok(ret, "CryptVerifyMessageHash failed: %08x\n", GetLastError()); ret = CryptVerifyMessageHash(&para, hashContent, sizeof(hashContent), NULL, &size, NULL, NULL); - todo_wine ok(ret, "CryptVerifyMessageHash failed: %08x\n", GetLastError()); if (ret) buf = CryptMemAlloc(size);

1 0

Gerald Pfeifer : comctl32: Remove unused paramters from MONTHCAL_GetRange, MONTHCAL_MouseMove, and MONTHCAL_Create.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: 3dbdb311287978e00fbf04b7ebcec7b6a4cefbb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dbdb311287978e00fbf04b7e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Sep 7 16:20:38 2008 +0200 comctl32: Remove unused paramters from MONTHCAL_GetRange, MONTHCAL_MouseMove, and MONTHCAL_Create. --- dlls/comctl32/monthcal.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 0c0a45c..a3f9658 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -994,7 +994,7 @@ MONTHCAL_SetRange(MONTHCAL_INFO *infoPtr, WPARAM wParam, LPARAM lParam) static LRESULT -MONTHCAL_GetRange(HWND hwnd, WPARAM wParam, LPARAM lParam) +MONTHCAL_GetRange(HWND hwnd, LPARAM lParam) { MONTHCAL_INFO *infoPtr = MONTHCAL_GetInfoPtr(hwnd); SYSTEMTIME *lprgSysTimeArray = (SYSTEMTIME *)lParam; @@ -1631,7 +1631,7 @@ MONTHCAL_Timer(MONTHCAL_INFO *infoPtr, WPARAM wParam) static LRESULT -MONTHCAL_MouseMove(MONTHCAL_INFO *infoPtr, WPARAM wParam, LPARAM lParam) +MONTHCAL_MouseMove(MONTHCAL_INFO *infoPtr, LPARAM lParam) { MCHITTESTINFO ht; int oldselday, selday, hit; @@ -1891,7 +1891,7 @@ static LRESULT theme_changed (const MONTHCAL_INFO* infoPtr) /* FIXME: check whether dateMin/dateMax need to be adjusted. */ static LRESULT -MONTHCAL_Create(HWND hwnd, WPARAM wParam, LPARAM lParam) +MONTHCAL_Create(HWND hwnd, LPARAM lParam) { MONTHCAL_INFO *infoPtr; @@ -2021,7 +2021,7 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return MONTHCAL_SetFirstDayOfWeek(infoPtr, lParam); case MCM_GETRANGE: - return MONTHCAL_GetRange(hwnd, wParam, lParam); + return MONTHCAL_GetRange(hwnd, lParam); case MCM_SETRANGE: return MONTHCAL_SetRange(infoPtr, wParam, lParam); @@ -2048,7 +2048,7 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return MONTHCAL_LButtonDown(infoPtr, lParam); case WM_MOUSEMOVE: - return MONTHCAL_MouseMove(infoPtr, wParam, lParam); + return MONTHCAL_MouseMove(infoPtr, lParam); case WM_LBUTTONUP: return MONTHCAL_LButtonUp(infoPtr, lParam); @@ -2064,7 +2064,7 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return MONTHCAL_Size(infoPtr, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); case WM_CREATE: - return MONTHCAL_Create(hwnd, wParam, lParam); + return MONTHCAL_Create(hwnd, lParam); case WM_SETFONT: return MONTHCAL_SetFont(infoPtr, (HFONT)wParam, (BOOL)lParam);

1 0

Alexander Nicolaysen Sørnes : notepad: Only append .txt to missing files without a dot in them.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: 87a871efe49a5b976f1b56fd61b17378e1be01f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87a871efe49a5b976f1b56fd6… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Sep 5 12:48:33 2008 +0200 notepad: Only append .txt to missing files without a dot in them. --- programs/notepad/main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index f231f20..a9d3c3b 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -31,6 +31,7 @@ #include "main.h" #include "dialog.h" #include "notepad_res.h" +#include "wine/unicode.h" NOTEPAD_GLOBALS Globals; static ATOM aFINDMSGSTRING; @@ -590,7 +591,7 @@ static void HandleCommandLine(LPWSTR cmdline) static const WCHAR txtW[] = { '.','t','x','t',0 }; /* try to find file with ".txt" extension */ - if (!lstrcmp(txtW, cmdline + lstrlen(cmdline) - lstrlen(txtW))) + if (strchrW(PathFindFileNameW(cmdline), '.')) { file_exists = FALSE; file_name = cmdline;

1 0

Alexander Nicolaysen Sørnes : regedit: Convert parts of export handling to unicode.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: 32f890939f961bfd6cea4f7156a5b2d85ac13181 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32f890939f961bfd6cea4f715… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Sep 8 21:44:08 2008 +0200 regedit: Convert parts of export handling to unicode. --- programs/regedit/framewnd.c | 6 +-- programs/regedit/regedit.c | 10 ++- programs/regedit/regproc.c | 164 ++++++++++++++++++++++--------------------- programs/regedit/regproc.h | 2 +- 4 files changed, 95 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32f890939f961bfd6cea4…

1 0

Gerald Pfeifer : wordpad: Shed off unused parameters from on_fontlist_modified, OnCreate, OnUser, OnNotify, and OnInitPopupMenu.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: 95613fbdd28e0dbe0d6d8b965311ef9c202727b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95613fbdd28e0dbe0d6d8b965… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Sep 7 16:05:26 2008 +0200 wordpad: Shed off unused parameters from on_fontlist_modified, OnCreate, OnUser, OnNotify, and OnInitPopupMenu. --- programs/wordpad/wordpad.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index d98758a..adad55c 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -467,7 +467,7 @@ static void set_default_font(void) SendMessageW(hEditorWnd, EM_SETCHARFORMAT, SCF_DEFAULT, (LPARAM)&fmt); } -static void on_fontlist_modified(HWND hwndFontList, LPWSTR wszNewFaceName) +static void on_fontlist_modified(LPWSTR wszNewFaceName) { CHARFORMAT2W format; ZeroMemory(&format, sizeof(format)); @@ -1702,7 +1702,7 @@ static int context_menu(LPARAM lParam) return 0; } -static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) +static LRESULT OnCreate( HWND hWnd ) { HWND hToolBarWnd, hFormatBarWnd, hReBarWnd, hFontListWnd, hSizeListWnd, hRulerWnd; HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE); @@ -1858,7 +1858,7 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) return 0; } -static LRESULT OnUser( HWND hWnd, WPARAM wParam, LPARAM lParam) +static LRESULT OnUser( HWND hWnd ) { HWND hwndEditor = GetDlgItem(hWnd, IDC_EDITOR); HWND hwndReBar = GetDlgItem(hWnd, IDC_REBAR); @@ -1910,7 +1910,7 @@ static LRESULT OnUser( HWND hWnd, WPARAM wParam, LPARAM lParam) return 0; } -static LRESULT OnNotify( HWND hWnd, WPARAM wParam, LPARAM lParam) +static LRESULT OnNotify( HWND hWnd, LPARAM lParam) { HWND hwndEditor = GetDlgItem(hWnd, IDC_EDITOR); HWND hwndReBar = GetDlgItem(hWnd, IDC_REBAR); @@ -1925,10 +1925,10 @@ static LRESULT OnNotify( HWND hWnd, WPARAM wParam, LPARAM lParam) NMCBEENDEDIT *endEdit = (NMCBEENDEDIT *)lParam; if(pHdr->hwndFrom == hwndFontList) { - on_fontlist_modified(hwndFontList, (LPWSTR)endEdit->szText); + on_fontlist_modified((LPWSTR)endEdit->szText); } else if (pHdr->hwndFrom == hwndSizeList) { - on_sizelist_modified(hwndSizeList, (LPWSTR)endEdit->szText); + on_sizelist_modified(hwndFontList,(LPWSTR)endEdit->szText); } } return 0; @@ -2322,7 +2322,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) WCHAR buffer[LF_FACESIZE]; HWND hwndFontList = (HWND)lParam; get_comboexlist_selection(hwndFontList, buffer, LF_FACESIZE); - on_fontlist_modified(hwndFontList, buffer); + on_fontlist_modified(buffer); } break; @@ -2343,7 +2343,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) return 0; } -static LRESULT OnInitPopupMenu( HWND hWnd, WPARAM wParam, LPARAM lParam ) +static LRESULT OnInitPopupMenu( HWND hWnd, WPARAM wParam ) { HMENU hMenu = (HMENU)wParam; HWND hwndEditor = GetDlgItem(hWnd, IDC_EDITOR); @@ -2456,13 +2456,13 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara switch(msg) { case WM_CREATE: - return OnCreate( hWnd, wParam, lParam ); + return OnCreate( hWnd ); case WM_USER: - return OnUser( hWnd, wParam, lParam ); + return OnUser( hWnd ); case WM_NOTIFY: - return OnNotify( hWnd, wParam, lParam ); + return OnNotify( hWnd, lParam ); case WM_COMMAND: if(preview_isactive()) @@ -2494,7 +2494,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara return 0; case WM_INITMENUPOPUP: - return OnInitPopupMenu( hWnd, wParam, lParam ); + return OnInitPopupMenu( hWnd, wParam ); case WM_SIZE: return OnSize( hWnd, wParam, lParam );

1 0

James Hawkins : riched20: Fix two typos that cause a failing test.
by Alexandre Julliard 09 Sep '08

09 Sep '08

Module: wine Branch: master Commit: ce8e69d4b1d7525443f167b2dc18d8470c9518dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce8e69d4b1d7525443f167b2d… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Sep 8 17:24:25 2008 -0500 riched20: Fix two typos that cause a failing test. --- dlls/riched20/tests/editor.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index ea94019..41dce86 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -38,7 +38,7 @@ static CHAR string1[MAX_PATH], string2[MAX_PATH], string3[MAX_PATH]; WideCharToMultiByte(CP_ACP, 0, szString1, -1, string1, MAX_PATH, NULL, NULL); \ WideCharToMultiByte(CP_ACP, 0, szString2, -1, string2, MAX_PATH, NULL, NULL); \ WideCharToMultiByte(CP_ACP, 0, szString3, -1, string3, MAX_PATH, NULL, NULL); \ - ok(!lstrcmpW(szString3, szString1) || !lstrcmpW(szString3, szString1), \ + ok(!lstrcmpW(szString3, szString1) || !lstrcmpW(szString3, szString2), \ format, string1, string2, string3); static HMODULE hmoduleRichEdit; @@ -3217,7 +3217,7 @@ static void test_EM_SETTEXTEX(void) 'm', 'e', 'T', 'e', 'x', 't', 0}; WCHAR TestItem1altn[] = {'T','T','e','s','t','S','o','m','e','T','e','x','t', - '\n','t','S','o','m','e','T','e','x','t',0}; + '\r','t','S','o','m','e','T','e','x','t',0}; WCHAR TestItem2[] = {'T', 'e', 's', 't', 'S', 'o', 'm', 'e', 'T', 'e', 'x', 't',

1 0