wine-commits February 2006

wine-commits@winehq.org

4 participants
696 discussions

Kevin Koltzau : widl: Fix 64bit warning.
by Alexandre Julliard 22 Feb '06

22 Feb '06

Module: wine Branch: refs/heads/master Commit: a8b209752f65d403c1c24b5ddc141de23c4e237d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a8b209752f65d403c1c24b5… Author: Kevin Koltzau <kevin(a)plop.org> Date: Wed Feb 22 13:52:53 2006 -0500 widl: Fix 64bit warning. --- tools/widl/typegen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index acde725..d9b722c 100644 --- a/tools/widl/typegen.c +++ b/… [View More]

1 0

Kevin Koltzau : x11drv: Fix 64bit warning.
by Alexandre Julliard 22 Feb '06

22 Feb '06

Module: wine Branch: refs/heads/master Commit: 77da4fc5b55740957e78df8f8c4e438ef34b5186 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=77da4fc5b55740957e78df8… Author: Kevin Koltzau <kevin(a)plop.org> Date: Wed Feb 22 13:53:19 2006 -0500 x11drv: Fix 64bit warning. --- dlls/x11drv/clipboard.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/x11drv/clipboard.c b/dlls/x11drv/clipboard.c index 3821c2c..567edd9 100644 --- a/dlls/… [View More]

1 0

Robert Shearman : msi: Fix heap overflow in ITERATE_CreateShortcuts.
by Alexandre Julliard 22 Feb '06

22 Feb '06

Module: wine Branch: refs/heads/master Commit: 4ac8567497737ae7bc6f2d4fcbfc1a53e0c903ea URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4ac8567497737ae7bc6f2d4… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Feb 22 16:31:00 2006 +0000 msi: Fix heap overflow in ITERATE_CreateShortcuts. --- dlls/msi/action.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 636f01c..9f342e6 100644 --- … [View More]

1 0

Robert Shearman : msi: Init size before passing to RegEnumValue.
by Alexandre Julliard 22 Feb '06

22 Feb '06

Module: wine Branch: refs/heads/master Commit: ecc5c18f4eb10586a0fcb137d73322fd24c7156a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ecc5c18f4eb10586a0fcb13… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Feb 22 16:30:57 2006 +0000 msi: Init size before passing to RegEnumValue. --- dlls/msi/source.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index e0ed472..779bbc4 100644 --- a/dlls/msi/… [View More]

1 0

Robert Shearman : msi: Always set a value for intype in ready_volume.
by Alexandre Julliard 22 Feb '06

22 Feb '06

Module: wine Branch: refs/heads/master Commit: e664435f50607f708adecee374fdb9f640057834 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e664435f50607f708adecee… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Feb 22 16:30:54 2006 +0000 msi: Always set a value for intype in ready_volume. Remove a memory leak. --- dlls/msi/files.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 8c381ad..… [View More]

1 0

Robert Shearman : msi: Fix heap overflow in save_string_table.
by Alexandre Julliard 22 Feb '06

22 Feb '06

Module: wine Branch: refs/heads/master Commit: 66c9cbbe0fd23d52a500d4d276ee8743c87fa336 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=66c9cbbe0fd23d52a500d4d… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Feb 22 16:30:50 2006 +0000 msi: Fix heap overflow in save_string_table. Fix heap overflow caused by not accounting for the dummy first item, which contains the codepage. --- dlls/msi/table.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) … [View More]

1 0

Robert Shearman : ole: Make the CoCreateInstance test succeed.
by Alexandre Julliard 22 Feb '06

22 Feb '06

Module: wine Branch: refs/heads/master Commit: 6c529a72737fdf54eac63faaedd36d46e720d06d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6c529a72737fdf54eac63fa… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Feb 22 16:26:25 2006 +0000 ole: Make the CoCreateInstance test succeed. Move the uninitialized apartment check after zeroing out the return value. --- dlls/ole32/compobj.c | 12 ++++++------ dlls/ole32/tests/compobj.c | 2 -- 2 files changed, 6 … [View More]

1 0

Brian Chang : riched20: EM_SETOPTIONS/EM_GETOPTIONS base implementation.
by Alexandre Julliard 22 Feb '06

22 Feb '06

Module: wine Branch: refs/heads/master Commit: 8f6ba475e80592867be6927a3a5a83377add4630 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8f6ba475e80592867be6927… Author: Brian Chang <brianch(a)seas.ucla.edu> Date: Tue Feb 21 13:49:19 2006 -0800 riched20: EM_SETOPTIONS/EM_GETOPTIONS base implementation. ECO_READONLY implemented and tested. --- dlls/riched20/editor.c | 59 +++++++++++++++++++++++++++++++++++++++--- dlls/riched20/tests/editor.c | 50 +++++++++++++++… [View More]+++++++++++++++++++++ 2 files changed, 105 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 496210e..05e84cb 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -56,7 +56,7 @@ + EM_GETLINECOUNT returns number of rows, not of paragraphs + EM_GETMODIFY - EM_GETOLEINTERFACE - - EM_GETOPTIONS + + EM_GETOPTIONS + EM_GETPARAFORMAT - EM_GETPASSWORDCHAR 2.0 - EM_GETPUNCTUATION 1.0asian @@ -102,7 +102,7 @@ - EM_SETLIMITTEXT + EM_SETMODIFY (not sure if implementation is correct) - EM_SETOLECALLBACK - - EM_SETOPTIONS + + EM_SETOPTIONS (partially implemented) - EM_SETPALETTE 2.0 + EM_SETPARAFORMAT - EM_SETPASSWORDCHAR 2.0 @@ -1325,7 +1325,6 @@ LRESULT WINAPI RichEditANSIWndProc(HWND UNSUPPORTED_MSG(EM_GETLIMITTEXT) UNSUPPORTED_MSG(EM_GETLINE) /* UNSUPPORTED_MSG(EM_GETOLEINTERFACE) separate stub */ - UNSUPPORTED_MSG(EM_GETOPTIONS) UNSUPPORTED_MSG(EM_GETPASSWORDCHAR) UNSUPPORTED_MSG(EM_GETREDONAME) UNSUPPORTED_MSG(EM_GETTEXTMODE) @@ -1341,7 +1340,6 @@ LRESULT WINAPI RichEditANSIWndProc(HWND UNSUPPORTED_MSG(EM_SETEDITSTYLE) UNSUPPORTED_MSG(EM_SETFONTSIZE) UNSUPPORTED_MSG(EM_SETLANGOPTIONS) - UNSUPPORTED_MSG(EM_SETOPTIONS) UNSUPPORTED_MSG(EM_SETPALETTE) UNSUPPORTED_MSG(EM_SETPASSWORDCHAR) UNSUPPORTED_MSG(EM_SETSCROLLPOS) @@ -1410,6 +1408,59 @@ LRESULT WINAPI RichEditANSIWndProc(HWND case EM_REDO: ME_Redo(editor); return 0; + case EM_GETOPTIONS: + { + /* these flags are equivalent to the ES_* counterparts */ + DWORD mask = ECO_VERTICAL | ECO_AUTOHSCROLL | ECO_AUTOVSCROLL | + ECO_NOHIDESEL | ECO_READONLY | ECO_WANTRETURN; + DWORD settings = GetWindowLongW(hWnd, GWL_STYLE) & mask; + + return settings; + } + case EM_SETOPTIONS: + { + /* these flags are equivalent to ES_* counterparts + * ECO_READONLY is already implemented in the code, only requires + * setting the bit to work + */ + DWORD mask = ECO_VERTICAL | ECO_AUTOHSCROLL | ECO_AUTOVSCROLL | + ECO_NOHIDESEL | ECO_READONLY | ECO_WANTRETURN; + DWORD raw = GetWindowLongW(hWnd, GWL_STYLE); + DWORD settings = mask & raw; + + switch(wParam) + { + case ECOOP_SET: + settings = lParam; + break; + case ECOOP_OR: + settings |= lParam; + break; + case ECOOP_AND: + settings &= lParam; + break; + case ECOOP_XOR: + settings ^= lParam; + } + SetWindowLongW(hWnd, GWL_STYLE, (raw & ~mask) | (settings & mask)); + + if (lParam & ECO_AUTOWORDSELECTION) + FIXME("ECO_AUTOWORDSELECTION not implemented yet!\n"); + if (lParam & ECO_SELECTIONBAR) + FIXME("ECO_SELECTIONBAR not implemented yet!\n"); + if (lParam & ECO_VERTICAL) + FIXME("ECO_VERTICAL not implemented yet!\n"); + if (lParam & ECO_AUTOHSCROLL) + FIXME("ECO_AUTOHSCROLL not implemented yet!\n"); + if (lParam & ECO_AUTOVSCROLL) + FIXME("ECO_AUTOVSCROLL not implemented yet!\n"); + if (lParam & ECO_NOHIDESEL) + FIXME("ECO_NOHIDESEL not implemented yet!\n"); + if (lParam & ECO_WANTRETURN) + FIXME("ECO_WANTRETURN not implemented yet!\n"); + + return settings; + } case EM_SETSEL: { ME_InvalidateSelection(editor); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index b650785..814fc1c 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -488,6 +488,54 @@ static void test_TM_PLAINTEXT() DestroyWindow(hwndRichEdit); } +/* FIXME: Extra '\r' appended at end of gotten text*/ +static void test_WM_GETTEXT() +{ + HWND hwndRichEdit = new_richedit(NULL); + static const char text[] = "Hello. My name is RichEdit!"; + char buffer[1024] = {0}; + int result; + + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text); + SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + result = strcmp(buffer,text); + todo_wine{ + ok(result == 0, + "WM_GETTEXT: settext and gettext differ. strcmp: %d\n", result); + } +} + +/* FIXME: need to test unimplemented options and robustly test wparam */ +static void test_EM_SETOPTIONS() +{ + HWND hwndRichEdit = new_richedit(NULL); + static const char text[] = "Hello. My name is RichEdit!"; + char buffer[1024] = {0}; + + /* NEGATIVE TESTING - NO OPTIONS SET */ + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text); + SendMessage(hwndRichEdit, EM_SETOPTIONS, ECOOP_SET, 0); + + /* testing no readonly by sending 'a' to the control*/ + SetFocus(hwndRichEdit); + SendMessage(hwndRichEdit, WM_CHAR, 'a', 0x1E0001); + SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok(buffer[0]=='a', + "EM_SETOPTIONS: Text not changed! s1:%s s2:%s\n", text, buffer); + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text); + + /* READONLY - sending 'a' to the control */ + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text); + SendMessage(hwndRichEdit, EM_SETOPTIONS, ECOOP_SET, ECO_READONLY); + SetFocus(hwndRichEdit); + SendMessage(hwndRichEdit, WM_CHAR, 'a', 0x1E0001); + SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + ok(buffer[0]==text[0], + "EM_SETOPTIONS: Text changed! s1:%s s2:%s\n", text, buffer); + + DestroyWindow(hwndRichEdit); +} + START_TEST( editor ) { MSG msg; @@ -502,6 +550,8 @@ START_TEST( editor ) test_EM_SCROLLCARET(); test_EM_SETTEXTMODE(); test_TM_PLAINTEXT(); + test_EM_SETOPTIONS(); + test_WM_GETTEXT(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging. [View Less]

1 0

Juan Lang : crypt32: Tidy up tests.
by Alexandre Julliard 22 Feb '06

22 Feb '06

Module: wine Branch: refs/heads/master Commit: 5d3889412d877c8808be38ba94b773eda6383c6c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5d3889412d877c8808be38b… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Feb 22 08:02:36 2006 -0800 crypt32: Tidy up tests. Fix up encoded data to use BYTE arrays rather than strings, and remove extraneous NULL bytes from the end of some of them --- dlls/crypt32/tests/encode.c | 109 +++++++++++++-------------- dlls/crypt32/tests/… [View More]

1 0

Juan Lang : crypt32: Add stubs for CryptFindOIDInfo and I_CryptInstallAsn1Module.
by Alexandre Julliard 22 Feb '06

22 Feb '06

Module: wine Branch: refs/heads/master Commit: d740f342b94dd6cf3d4e307c2206665f07fde185 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d740f342b94dd6cf3d4e307… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Feb 22 07:37:24 2006 -0800 crypt32: Add stubs for CryptFindOIDInfo and I_CryptInstallAsn1Module. Move CryptVerifyMessageSignature stub to main.c. --- dlls/crypt32/cert.c | 10 ---------- dlls/crypt32/crypt32.spec | 3 ++- dlls/crypt32/main.c | … [View More] 16 ++++++++++++++++ dlls/crypt32/oid.c | 7 +++++++ 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index c969edb..1b38c40 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -314,16 +314,6 @@ BOOL WINAPI CryptVerifyCertificateSignat return ret; } -BOOL WINAPI CryptVerifyMessageSignature(/*PCRYPT_VERIFY_MESSAGE_PARA*/ void* pVerifyPara, - DWORD dwSignerIndex, const BYTE* pbSignedBlob, DWORD cbSignedBlob, - BYTE* pbDecoded, DWORD* pcbDecoded, PCCERT_CONTEXT* ppSignerCert) -{ - FIXME("stub: %p, %ld, %p, %ld, %p, %p, %p\n", - pVerifyPara, dwSignerIndex, pbSignedBlob, cbSignedBlob, - pbDecoded, pcbDecoded, ppSignerCert); - return FALSE; -} - BOOL WINAPI CertGetEnhancedKeyUsage(PCCERT_CONTEXT pCertContext, DWORD dwFlags, PCERT_ENHKEY_USAGE pUsage, DWORD *pcbUsage) { diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 1ba868b..abeff35 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -102,7 +102,7 @@ @ stub CryptExportPKCS8 @ stdcall CryptExportPublicKeyInfo(long long long ptr ptr) @ stdcall CryptExportPublicKeyInfoEx(long long long str long ptr ptr ptr) -@ stub CryptFindOIDInfo +@ stdcall CryptFindOIDInfo(long ptr long) @ stub CryptFormatObject @ stdcall CryptFreeOIDFunctionAddress(long long) @ stub CryptGetAsyncParam @@ -181,6 +181,7 @@ @ stdcall I_CryptGetOssGlobal(long) @ stdcall I_CryptGetTls(long) @ stub I_CryptInsertLruEntry +@ stdcall I_CryptInstallAsn1Module(long long long) @ stdcall I_CryptInstallOssGlobal(long long long) @ stub I_CryptReleaseLruEntry @ stdcall I_CryptSetTls(long ptr) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 4a7de5f..6333f0c 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -365,6 +365,12 @@ BOOL WINAPI I_CryptInstallOssGlobal(DWOR return FALSE; } +BOOL WINAPI I_CryptInstallAsn1Module(void *x, DWORD y, DWORD z) +{ + FIXME("%p %08lx %08lx\n", x, y, z); + return TRUE; +} + BOOL WINAPI CryptQueryObject(DWORD dwObjectType, const void* pvObject, DWORD dwExpectedContentTypeFlags, DWORD dwExpectedFormatTypeFlags, DWORD dwFlags, DWORD* pdwMsgAndCertEncodingType, DWORD* pdwContentType, @@ -377,3 +383,13 @@ BOOL WINAPI CryptQueryObject(DWORD dwObj phCertStore, phMsg, ppvContext); return FALSE; } + +BOOL WINAPI CryptVerifyMessageSignature(/*PCRYPT_VERIFY_MESSAGE_PARA*/ void* pVerifyPara, + DWORD dwSignerIndex, const BYTE* pbSignedBlob, DWORD cbSignedBlob, + BYTE* pbDecoded, DWORD* pcbDecoded, PCCERT_CONTEXT* ppSignerCert) +{ + FIXME("stub: %p, %ld, %p, %ld, %p, %p, %p\n", + pVerifyPara, dwSignerIndex, pbSignedBlob, cbSignedBlob, + pbDecoded, pcbDecoded, ppSignerCert); + return FALSE; +} diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index f9c4be8..f474639 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -84,6 +84,13 @@ BOOL WINAPI CryptEnumOIDInfo(DWORD dwGro return TRUE; } +PCCRYPT_OID_INFO WINAPI CryptFindOIDInfo(DWORD dwKeyType, void *pvKey, + DWORD dwGroupId) +{ + FIXME("(%ld, %p, %ld): stub\n", dwKeyType, pvKey, dwGroupId); + return NULL; +} + /* There is no free function associated with this; therefore, the sets are * freed when crypt32.dll is unloaded. */ [View Less]

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
70
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2006