wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Alexandre Julliard : user32: Split the code that deals with the 16-bit edit buffer handle to separate functions .
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 7e9721f8f2542971eb3cc89b29c949e1cb64c91a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e9721f8f2542971eb3cc89b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 11 17:04:59 2009 +0100 user32: Split the code that deals with the 16-bit edit buffer handle to separate functions. --- dlls/user32/edit.c | 252 +++++++++++++++++++--------------------------------- 1 files changed, 92 insertions(+), 160 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e9721f8f2542971eb3cc…

1 0

Alexandre Julliard : user32: Add a thunking mechanism for 16-bit edit word break procedures.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: dcec342b50524562844f64d43d423ed2c83c1f97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcec342b50524562844f64d43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 11 14:52:28 2009 +0100 user32: Add a thunking mechanism for 16-bit edit word break procedures. --- dlls/user32/edit.c | 122 +++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 88 insertions(+), 34 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index b512aa4..c5a78c7 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -131,7 +131,6 @@ typedef struct and just line width for single line controls */ INT region_posx; /* Position of cursor relative to region: */ INT region_posy; /* -1: to left, 0: within, 1: to right */ - EDITWORDBREAKPROC16 word_break_proc16; void *word_break_proc; /* 32-bit word break proc: ANSI or Unicode */ INT line_count; /* number of lines */ INT y_offset; /* scroll offset in number of lines */ @@ -252,6 +251,90 @@ static HBRUSH EDIT_NotifyCtlColor(EDITSTATE *es, HDC hdc) } +/********************************************************************** + * Support for word break proc thunks + */ + +#define MAX_THUNKS 32 + +#include <pshpack1.h> +static struct word_break_thunk +{ + BYTE popl_eax; /* popl %eax (return address) */ + BYTE pushl_proc16; /* pushl proc16 */ + EDITWORDBREAKPROC16 proc16; + BYTE pushl_eax; /* pushl %eax */ + BYTE jmp; /* ljmp call_word_break_proc16 */ + DWORD callback; +} *word_break_thunks; +#include <poppack.h> + +/********************************************************************** + * call_word_break_proc16 + */ +static INT16 CALLBACK call_word_break_proc16( SEGPTR proc16, LPSTR text, INT index, INT count, INT action ) +{ + SEGPTR segptr; + WORD args[5]; + DWORD result; + + segptr = MapLS( text ); + args[4] = SELECTOROF(segptr); + args[3] = OFFSETOF(segptr); + args[2] = index; + args[1] = count; + args[0] = action; + WOWCallback16Ex( proc16, WCB16_PASCAL, sizeof(args), args, &result ); + UnMapLS( segptr ); + return LOWORD(result); +} + +/****************************************************************** + * add_word_break_thunk + */ +static struct word_break_thunk *add_word_break_thunk( EDITWORDBREAKPROC16 proc16 ) +{ + struct word_break_thunk *thunk; + + if (!word_break_thunks) + { + word_break_thunks = VirtualAlloc( NULL, MAX_THUNKS * sizeof(*thunk), + MEM_COMMIT, PAGE_EXECUTE_READWRITE ); + if (!word_break_thunks) return NULL; + + for (thunk = word_break_thunks; thunk < &word_break_thunks[MAX_THUNKS]; thunk++) + { + thunk->popl_eax = 0x58; /* popl %eax */ + thunk->pushl_proc16 = 0x68; /* pushl proc16 */ + thunk->pushl_eax = 0x50; /* pushl %eax */ + thunk->jmp = 0xe9; /* jmp call_word_break_proc16 */ + thunk->callback = (char *)call_word_break_proc16 - (char *)(&thunk->callback + 1); + } + } + for (thunk = word_break_thunks; thunk < &word_break_thunks[MAX_THUNKS]; thunk++) + if (thunk->proc16 == proc16) return thunk; + + for (thunk = word_break_thunks; thunk < &word_break_thunks[MAX_THUNKS]; thunk++) + { + if (thunk->proc16) continue; + thunk->proc16 = proc16; + return thunk; + } + FIXME("Out of word break thunks\n"); + return NULL; +} + +/****************************************************************** + * get_word_break_thunk + */ +static EDITWORDBREAKPROC16 get_word_break_thunk( EDITWORDBREAKPROCA proc ) +{ + struct word_break_thunk *thunk = (struct word_break_thunk *)proc; + if (word_break_thunks && thunk >= word_break_thunks && thunk < &word_break_thunks[MAX_THUNKS]) + return thunk->proc16; + return NULL; +} + /********************************************************************* * * EDIT_WordBreakProc @@ -336,28 +419,7 @@ static INT EDIT_CallWordBreakProc(EDITSTATE *es, INT start, INT index, INT count { INT ret; - if (es->word_break_proc16) { - HGLOBAL16 hglob16; - SEGPTR segptr; - INT countA; - WORD args[5]; - DWORD result; - - countA = WideCharToMultiByte(CP_ACP, 0, es->text + start, count, NULL, 0, NULL, NULL); - hglob16 = GlobalAlloc16(GMEM_MOVEABLE | GMEM_ZEROINIT, countA); - segptr = WOWGlobalLock16(hglob16); - WideCharToMultiByte(CP_ACP, 0, es->text + start, count, MapSL(segptr), countA, NULL, NULL); - args[4] = SELECTOROF(segptr); - args[3] = OFFSETOF(segptr); - args[2] = index; - args[1] = countA; - args[0] = action; - WOWCallback16Ex((DWORD)es->word_break_proc16, WCB16_PASCAL, sizeof(args), args, &result); - ret = LOWORD(result); - GlobalUnlock16(hglob16); - GlobalFree16(hglob16); - } - else if (es->word_break_proc) + if (es->word_break_proc) { if(es->is_unicode) { @@ -3091,7 +3153,6 @@ static void EDIT_EM_SetWordBreakProc(EDITSTATE *es, void *wbp) return; es->word_break_proc = wbp; - es->word_break_proc16 = NULL; if ((es->style & ES_MULTILINE) && !(es->style & ES_AUTOHSCROLL)) { EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); @@ -3107,15 +3168,8 @@ static void EDIT_EM_SetWordBreakProc(EDITSTATE *es, void *wbp) */ static void EDIT_EM_SetWordBreakProc16(EDITSTATE *es, EDITWORDBREAKPROC16 wbp) { - if (es->word_break_proc16 == wbp) - return; - - es->word_break_proc = NULL; - es->word_break_proc16 = wbp; - if ((es->style & ES_MULTILINE) && !(es->style & ES_AUTOHSCROLL)) { - EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); - EDIT_UpdateText(es, NULL, TRUE); - } + struct word_break_thunk *thunk = add_word_break_thunk( wbp ); + if (thunk) EDIT_EM_SetWordBreakProc( es, thunk ); } @@ -5048,7 +5102,7 @@ static LRESULT EditWndProc_common( HWND hwnd, UINT msg, break; case EM_GETWORDBREAKPROC16: - result = (LRESULT)es->word_break_proc16; + result = (LRESULT)get_word_break_thunk( es->word_break_proc ); break; case EM_GETWORDBREAKPROC: result = (LRESULT)es->word_break_proc;

1 0

Alexandre Julliard : msi/tests: Fix a handle leak.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 8b50188f571c298ff2a99aefe7fa0832a37f51b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b50188f571c298ff2a99aefe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 11 19:19:27 2009 +0100 msi/tests: Fix a handle leak. --- dlls/msi/tests/record.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index 2c8f5bf..369c855 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -604,6 +604,8 @@ static void test_fieldzero(void) r = MsiRecordIsNull(rec, 0); ok(r == FALSE, "Expected FALSE, got %d\n", r); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); MsiCloseHandle(rec); MsiCloseHandle(hdb); DeleteFileA(msifile);

1 0

Paul Vriens : winetest: Detect Windows 2008 R2.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: tools Branch: master Commit: 1cf288a59d0b9ccd86e9caa7d14e4231fe526bd8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1cf288a59d0b9ccd86e9caa7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Dec 12 19:31:08 2009 +0100 winetest: Detect Windows 2008 R2. --- winetest/dissect | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 4436b26..16cc118 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -182,7 +182,11 @@ if ($plid==1 && $major==4) { $version = "2008"; } } elsif ($minor == 1) { - $version = "win7"; + if ($product==1) { + $version = "win7"; + } elsif ($product==3) { + $version = "2008"; + } } } } elsif ($plid==3) {

1 0

Alexandre Julliard : Initial import of the server-side scripts for the patch tracker.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: tools Branch: master Commit: f5897624decc9a10fa6902d74c1d3d3e38fc0b5b URL: http://source.winehq.org/git/tools.git/?a=commit;h=f5897624decc9a10fa6902d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 14 12:44:39 2009 +0100 Initial import of the server-side scripts for the patch tracker. --- patches/expire | 159 ++++++++++++++++++++++++++++++++++++++++++++++++++ patches/filter | 160 +++++++++++++++++++++++++++++++++++++++++++++++++++ patches/index.cgi | 156 +++++++++++++++++++++++++++++++++++++++++++++++++ patches/patches.css | 59 +++++++++++++++++++ 4 files changed, 534 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=f5897624decc9a10fa69…

1 0

Alexander Nicolaysen Sørnes : application_queue: Show a link for merging with any app when processing entries
by Alexander Nicolaysen Sørnes 13 Dec '09

13 Dec '09

Module: appdb Branch: master Commit: fcf23ec690b71eab7f9400dc61dc1fa7bf8d367d URL: http://source.winehq.org/git/appdb.git/?a=commit;h=fcf23ec690b71eab7f9400dc… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sun Dec 13 21:23:14 2009 +0100 application_queue: Show a link for merging with any app when processing entries --- include/application_queue.php | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/application_queue.php b/include/application_queue.php index 44d4901..b1bdc69 100644 --- a/include/application_queue.php +++ b/include/application_queue.php @@ -295,6 +295,14 @@ class application_queue echo " \n"; echo "Partial matches \n"; $this->displayDuplicateTable(searchForApplicationPartial($this->oApp->sName, $this->oApp->objectGetId())); + echo ' '; + if($this->oApp->iAppId && $this->oApp->canEdit()) + { + echo "<a href=\"objectManager.php?sClass=application&". + "bIsQueue=true&sAction=showMoveChildren&iId=". + $this->oApp->iAppId. + "\">Merge with another application</a>"; + } } function displayDuplicateTable($hResult)

1 0

Alexander Nicolaysen Sørnes : util: Replace split() calls in search functions as it is deprecated in newer versions
by Alexander Nicolaysen Sørnes 13 Dec '09

13 Dec '09

Module: appdb Branch: master Commit: da35126ebca59a5f13d7c9aa79047ceb242d1374 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=da35126ebca59a5f13d7c9aa… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sun Dec 13 21:01:53 2009 +0100 util: Replace split() calls in search functions as it is deprecated in newer versions --- include/util.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/util.php b/include/util.php index 7eba466..e856aff 100644 --- a/include/util.php +++ b/include/util.php @@ -404,7 +404,7 @@ function cleanupSearchWords($search_words) $filtered_search = ""; /* search each word in $search_words */ - $split_words = split(" ", $search_words); + $split_words = explode(" ", $search_words); $removed_words = ''; foreach($split_words as $key=>$value) @@ -501,7 +501,7 @@ function searchForApplication($search_words, $iExcludeAppId = null) /* remove any search words less than 4 letters */ $split_words = array(); - $split_search_words = split(" ", $search_words); + $split_search_words = explode(" ", $search_words); foreach($split_search_words as $key=>$value) { if(strlen($value) >= 4)

1 0

Andrew Nguyen : tables: Fix a few syntax errors in appdb_tables.sql
by Alexander Nicolaysen Sørnes 12 Dec '09

12 Dec '09

Module: appdb Branch: master Commit: 9f3b96665df1b7ad0bf04b7b60b8f3e6118c6d37 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9f3b96665df1b7ad0bf04b7b… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sat Dec 12 15:40:31 2009 +0100 tables: Fix a few syntax errors in appdb_tables.sql --- tables/appdb_tables.sql | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tables/appdb_tables.sql b/tables/appdb_tables.sql index d2bfbb8..d883108 100644 --- a/tables/appdb_tables.sql +++ b/tables/appdb_tables.sql @@ -142,7 +142,7 @@ create table appData ( submitTime datetime NOT NULL, submitterId int(11) NOT NULL default '0', state enum('accepted','queued','rejected') NOT NULL default 'accepted', - testedVersion text NOT NULL + testedVersion text NOT NULL, KEY id (id), KEY versionId (versionId) ); @@ -173,7 +173,7 @@ create table appNotes ( appId int not null, submitterId int not null, submitTime datetime not null, - linkedWith int not null + linkedWith int not null, key(noteId) );

1 0

Juan Lang : winhttp: Free OpenSSL error strings at unload.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 9352509eb27625fa3d02f30de409cf4e8e71402e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9352509eb27625fa3d02f30de… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Dec 11 08:16:25 2009 -0800 winhttp: Free OpenSSL error strings at unload. --- dlls/winhttp/net.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 6512db5..034b229 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -122,6 +122,7 @@ MAKE_FUNCPTR( BIO_new_fp ); MAKE_FUNCPTR( CRYPTO_num_locks ); MAKE_FUNCPTR( CRYPTO_set_id_callback ); MAKE_FUNCPTR( CRYPTO_set_locking_callback ); +MAKE_FUNCPTR( ERR_free_strings ); MAKE_FUNCPTR( ERR_get_error ); MAKE_FUNCPTR( ERR_error_string ); MAKE_FUNCPTR( X509_STORE_CTX_get_ex_data ); @@ -442,6 +443,7 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LOAD_FUNCPTR( CRYPTO_num_locks ); LOAD_FUNCPTR( CRYPTO_set_id_callback ); LOAD_FUNCPTR( CRYPTO_set_locking_callback ); + LOAD_FUNCPTR( ERR_free_strings ); LOAD_FUNCPTR( ERR_get_error ); LOAD_FUNCPTR( ERR_error_string ); LOAD_FUNCPTR( X509_STORE_CTX_get_ex_data ); @@ -499,6 +501,7 @@ void netconn_unload( void ) #if defined(SONAME_LIBSSL) && defined(SONAME_LIBCRYPTO) if (libcrypto_handle) { + pERR_free_strings(); wine_dlclose( libcrypto_handle, NULL, 0 ); } if (libssl_handle)

1 0

Juan Lang : crypt32: Accept end certificates with no extended key usage extension if a particular key usage is requested .
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 01a7cbf843213459495790e01be6dfa0fbc2e2b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01a7cbf843213459495790e01… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Dec 11 08:12:54 2009 -0800 crypt32: Accept end certificates with no extended key usage extension if a particular key usage is requested. --- dlls/crypt32/chain.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index dd92af2..e5ad7dc 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2541,10 +2541,11 @@ static void CRYPT_CheckUsages(PCERT_CHAIN_CONTEXT chain, * key usage extension be present and that a particular purpose * be indicated in order for the certificate to be acceptable to * that application." - * For now I'm being more conservative and disallowing it. + * Not all web sites include the extended key usage extension, so + * accept chains without it. */ - WARN_(chain)("requested usage from a certificate with no usages\n"); - validForUsage = FALSE; + TRACE_(chain)("requested usage from certificate with no usages\n"); + validForUsage = TRUE; } if (!validForUsage) {

1 0

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 December 2009