December 2005 - Wine-Commits

Hans Leidekker : wldap32: Implement some page handling functions.
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: bf2f5a8f173c74268d9ee8799feb802304e791bd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bf2f5a8f173c74268d9ee87… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Dec 31 13:34:19 2005 +0100 wldap32: Implement some page handling functions. Implement ldap_create_page_control{A,W} and ldap_parse_page_control{A,W}. Move the page handling functions into their own file. --- dlls/wldap32/Makefile.in | 1 dlls/wldap32/control.c | 43 ------ dlls/wldap32/misc.c | 29 ---- dlls/wldap32/page.c | 276 ++++++++++++++++++++++++++++++++++++++++ dlls/wldap32/parse.c | 18 --- dlls/wldap32/search.c | 26 ---- dlls/wldap32/winldap_private.h | 4 + 7 files changed, 281 insertions(+), 116 deletions(-) create mode 100644 dlls/wldap32/page.c

1 0

Hans Leidekker : wldap32: Document the functions that handle extended operations.
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: 4a047373a7c9b77daf7cd9be2f068b454a18fac2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4a047373a7c9b77daf7cd9b… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Dec 31 13:33:40 2005 +0100 wldap32: Document the functions that handle extended operations. --- dlls/wldap32/extended.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 76 insertions(+), 0 deletions(-) diff --git a/dlls/wldap32/extended.c b/dlls/wldap32/extended.c index cbb440d..e34adbc 100644 --- a/dlls/wldap32/extended.c +++ b/dlls/wldap32/extended.c @@ -41,6 +41,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +/*********************************************************************** + * ldap_close_extended_op (WLDAP32.@) + * + * Close an extended operation. + * + * PARAMS + * ld [I] Pointer to an LDAP context. + * msgid [I] Message ID of the operation to be closed. + * + * RETURNS + * Success: LDAP_SUCCESS + * Failure: An LDAP error code. + * + * NOTES + * Contrary to native, OpenLDAP does not require us to close + * extended operations, so this is a no-op. + */ ULONG ldap_close_extended_op( WLDAP32_LDAP *ld, ULONG msgid ) { TRACE( "(%p, 0x%08lx)\n", ld, msgid ); @@ -49,6 +66,11 @@ ULONG ldap_close_extended_op( WLDAP32_LD return LDAP_SUCCESS; } +/*********************************************************************** + * ldap_extended_operationA (WLDAP32.@) + * + * See ldap_extended_operationW. + */ ULONG ldap_extended_operationA( WLDAP32_LDAP *ld, PCHAR oid, struct WLDAP32_berval *data, PLDAPControlA *serverctrls, PLDAPControlA *clientctrls, ULONG *message ) { @@ -88,6 +110,31 @@ exit: return ret; } +/*********************************************************************** + * ldap_extended_operationW (WLDAP32.@) + * + * Perform an extended operation (asynchronous mode). + * + * PARAMS + * ld [I] Pointer to an LDAP context. + * oid [I] OID of the extended operation. + * data [I] Data needed by the operation. + * serverctrls [I] Array of LDAP server controls. + * clientctrls [I] Array of LDAP client controls. + * message [O] Message ID of the extended operation. + * + * RETURNS + * Success: LDAP_SUCCESS + * Failure: An LDAP error code. + * + * NOTES + * The data parameter should be set to NULL if the operation + * requires no data. Call ldap_result with the message ID to + * get the result of the operation or ldap_abandon to cancel + * the operation. The serverctrls and clientctrls parameters + * are optional and should be set to NULL if not used. Call + * ldap_close_extended_op to close the operation. + */ ULONG ldap_extended_operationW( WLDAP32_LDAP *ld, PWCHAR oid, struct WLDAP32_berval *data, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls, ULONG *message ) { @@ -128,6 +175,11 @@ exit: return ret; } +/*********************************************************************** + * ldap_extended_operation_sA (WLDAP32.@) + * + * See ldap_extended_operation_sW. + */ ULONG ldap_extended_operation_sA( WLDAP32_LDAP *ld, PCHAR oid, struct WLDAP32_berval *data, PLDAPControlA *serverctrls, PLDAPControlA *clientctrls, PCHAR *retoid, struct WLDAP32_berval **retdata ) @@ -175,6 +227,30 @@ exit: return ret; } +/*********************************************************************** + * ldap_extended_operation_sW (WLDAP32.@) + * + * Perform an extended operation (synchronous mode). + * + * PARAMS + * ld [I] Pointer to an LDAP context. + * oid [I] OID of the extended operation. + * data [I] Data needed by the operation. + * serverctrls [I] Array of LDAP server controls. + * clientctrls [I] Array of LDAP client controls. + * retoid [O] OID of the server response message. + * retdata [O] Data returned by the server. + * + * RETURNS + * Success: LDAP_SUCCESS + * Failure: An LDAP error code. + * + * NOTES + * The data parameter should be set to NULL if the operation + * requires no data. The serverctrls, clientctrls, retoid and + * and retdata parameters are also optional. Set to NULL if not + * used. Free retoid and retdata after use with ldap_memfree. + */ ULONG ldap_extended_operation_sW( WLDAP32_LDAP *ld, PWCHAR oid, struct WLDAP32_berval *data, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls, PWCHAR *retoid, struct WLDAP32_berval **retdata )

1 0

Hans Leidekker : wldap32: Document the init functions.
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: 8228d224c64a7da4a0661554c1f8588bddfb090c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8228d224c64a7da4a066155… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Dec 31 13:33:31 2005 +0100 wldap32: Document the init functions. Fix two bugs. --- dlls/wldap32/init.c | 179 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 173 insertions(+), 6 deletions(-) diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c index 90581cd..da2c9d8 100644 --- a/dlls/wldap32/init.c +++ b/dlls/wldap32/init.c @@ -137,7 +137,7 @@ static char *join_hostnames( char *schem char *res, *p, *q, **v; unsigned int i = 0, size = 0; static const char sep[] = " ", fmt[] = ":%ld"; - char port[6]; + char port[7]; sprintf( port, fmt, portnumber ); @@ -198,18 +198,26 @@ static char *join_hostnames( char *schem static char *urlify_hostnames( char *scheme, char *hostnames, ULONG port ) { - char *url, **strarray; + char *url = NULL, **strarray; strarray = split_hostnames( hostnames ); - url = join_hostnames( scheme, strarray, port ); - strarrayfreeU( strarray ); + if (strarray) + url = join_hostnames( scheme, strarray, port ); + else + return NULL; + strarrayfreeU( strarray ); return url; } #endif WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +/*********************************************************************** + * cldap_openA (WLDAP32.@) + * + * See cldap_openW. + */ WLDAP32_LDAP *cldap_openA( PCHAR hostname, ULONG portnumber ) { #ifdef HAVE_LDAP @@ -233,6 +241,27 @@ exit: return NULL; } +/*********************************************************************** + * cldap_openW (WLDAP32.@) + * + * Initialize an LDAP context and create a UDP connection. + * + * PARAMS + * hostname [I] Name of the host to connect to. + * portnumber [I] Portnumber to use. + * + * RETURNS + * Success: Pointer to an LDAP context. + * Failure: NULL + * + * NOTES + * The hostname string can be a space separated string of hostnames, + * in which case the LDAP runtime will try to connect to the hosts + * in order, until a connection can be made. A hostname may have a + * trailing portnumber (separated from the hostname by a ':'), which + * will take precedence over the portnumber supplied as a parameter + * to this function. + */ WLDAP32_LDAP *cldap_openW( PWCHAR hostname, ULONG portnumber ) { #ifdef HAVE_LDAP @@ -264,14 +293,37 @@ exit: return NULL; } +/*********************************************************************** + * ldap_connect (WLDAP32.@) + * + * Connect to an LDAP server. + * + * PARAMS + * ld [I] Pointer to an LDAP context. + * timeout [I] Pointer to an l_timeval structure specifying the + * timeout in seconds. + * + * RETURNS + * Success: LDAP_SUCCESS + * Failure: An LDAP error code. + * + * NOTES + * The timeout parameter may be NULL in which case a default timeout + * value will be used. + */ ULONG ldap_connect( WLDAP32_LDAP *ld, struct l_timeval *timeout ) { TRACE( "(%p, %p)\n", ld, timeout ); - if (!ld || !timeout) return WLDAP32_LDAP_PARAM_ERROR; + if (!ld) return WLDAP32_LDAP_PARAM_ERROR; return LDAP_SUCCESS; /* FIXME: do something, e.g. ping the host */ } +/*********************************************************************** + * ldap_initA (WLDAP32.@) + * + * See ldap_initW. + */ WLDAP32_LDAP *ldap_initA( PCHAR hostname, ULONG portnumber ) { #ifdef HAVE_LDAP @@ -295,6 +347,28 @@ exit: return NULL; } +/*********************************************************************** + * ldap_initW (WLDAP32.@) + * + * Initialize an LDAP context and create a TCP connection. + * + * PARAMS + * hostname [I] Name of the host to connect to. + * portnumber [I] Portnumber to use. + * + * RETURNS + * Success: Pointer to an LDAP context. + * Failure: NULL + * + * NOTES + * The hostname string can be a space separated string of hostnames, + * in which case the LDAP runtime will try to connect to the hosts + * in order, until a connection can be made. A hostname may have a + * trailing portnumber (separated from the hostname by a ':'), which + * will take precedence over the portnumber supplied as a parameter + * to this function. The connection will not be made until the first + * LDAP function that needs it is called. + */ WLDAP32_LDAP *ldap_initW( PWCHAR hostname, ULONG portnumber ) { #ifdef HAVE_LDAP @@ -326,6 +400,11 @@ exit: return NULL; } +/*********************************************************************** + * ldap_openA (WLDAP32.@) + * + * See ldap_openW. + */ WLDAP32_LDAP *ldap_openA( PCHAR hostname, ULONG portnumber ) { #ifdef HAVE_LDAP @@ -349,6 +428,27 @@ exit: return NULL; } +/*********************************************************************** + * ldap_openW (WLDAP32.@) + * + * Initialize an LDAP context and create a TCP connection. + * + * PARAMS + * hostname [I] Name of the host to connect to. + * portnumber [I] Portnumber to use. + * + * RETURNS + * Success: Pointer to an LDAP context. + * Failure: NULL + * + * NOTES + * The hostname string can be a space separated string of hostnames, + * in which case the LDAP runtime will try to connect to the hosts + * in order, until a connection can be made. A hostname may have a + * trailing portnumber (separated from the hostname by a ':'), which + * will take precedence over the portnumber supplied as a parameter + * to this function. + */ WLDAP32_LDAP *ldap_openW( PWCHAR hostname, ULONG portnumber ) { #ifdef HAVE_LDAP @@ -380,6 +480,11 @@ exit: return NULL; } +/*********************************************************************** + * ldap_sslinitA (WLDAP32.@) + * + * See ldap_sslinitW. + */ WLDAP32_LDAP *ldap_sslinitA( PCHAR hostname, ULONG portnumber, int secure ) { #ifdef HAVE_LDAP @@ -402,6 +507,29 @@ WLDAP32_LDAP *ldap_sslinitA( PCHAR hostn return NULL; } +/*********************************************************************** + * ldap_sslinitW (WLDAP32.@) + * + * Initialize an LDAP context and create a secure TCP connection. + * + * PARAMS + * hostname [I] Name of the host to connect to. + * portnumber [I] Portnumber to use. + * secure [I] Ask the server to create an SSL connection. + * + * RETURNS + * Success: Pointer to an LDAP context. + * Failure: NULL + * + * NOTES + * The hostname string can be a space separated string of hostnames, + * in which case the LDAP runtime will try to connect to the hosts + * in order, until a connection can be made. A hostname may have a + * trailing portnumber (separated from the hostname by a ':'), which + * will take precedence over the portnumber supplied as a parameter + * to this function. The connection will not be made until the first + * LDAP function that needs it is called. + */ WLDAP32_LDAP *ldap_sslinitW( PWCHAR hostname, ULONG portnumber, int secure ) { #ifdef HAVE_LDAP @@ -436,6 +564,11 @@ exit: return NULL; } +/*********************************************************************** + * ldap_start_tls_sA (WLDAP32.@) + * + * See ldap_start_tls_sW. + */ ULONG ldap_start_tls_sA( WLDAP32_LDAP *ld, PULONG retval, WLDAP32_LDAPMessage **result, PLDAPControlA *serverctrls, PLDAPControlA *clientctrls ) { @@ -468,6 +601,25 @@ exit: return ret; } +/*********************************************************************** + * ldap_start_tls_s (WLDAP32.@) + * + * Start TLS encryption on an LDAP connection. + * + * PARAMS + * ld [I] Pointer to an LDAP context. + * retval [I] Return value from the server. + * result [I] Response message from the server. + * serverctrls [I] Array of LDAP server controls. + * clientctrls [I] Array of LDAP client controls. + * + * RETURNS + * Success: LDAP_SUCCESS + * Failure: An LDAP error code. + * + * NOTES + * LDAP function that needs it is called. + */ ULONG ldap_start_tls_sW( WLDAP32_LDAP *ld, PULONG retval, WLDAP32_LDAPMessage **result, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls ) { @@ -500,14 +652,29 @@ exit: return ret; } +/*********************************************************************** + * ldap_startup (WLDAP32.@) + */ ULONG ldap_startup( PLDAP_VERSION_INFO version, HANDLE *instance ) { TRACE( "(%p, %p)\n", version, instance ); return LDAP_SUCCESS; } +/*********************************************************************** + * ldap_stop_tls_s (WLDAP32.@) + * + * Stop TLS encryption on an LDAP connection. + * + * PARAMS + * ld [I] Pointer to an LDAP context. + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ BOOLEAN ldap_stop_tls_s( WLDAP32_LDAP *ld ) { TRACE( "(%p)\n", ld ); - return 0; /* FIXME: find a way to stop tls on a connection */ + return TRUE; /* FIXME: find a way to stop tls on a connection */ }

1 0

Vitaliy Margolen : winecfg: Default for DXGrab is NO.
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: 95e5eccb157ca297e636249cf70fb1cac2ae5787 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=95e5eccb157ca297e636249… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sat Dec 31 13:32:59 2005 +0100 winecfg: Default for DXGrab is NO. --- programs/winecfg/x11drvdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index 9348bbd..ed0ab5c 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -135,7 +135,7 @@ static void init_dialog(HWND dialog) SendDlgItemMessage(dialog, IDC_DESKTOP_WIDTH, EM_LIMITTEXT, RES_MAXLEN, 0); SendDlgItemMessage(dialog, IDC_DESKTOP_HEIGHT, EM_LIMITTEXT, RES_MAXLEN, 0); - buf = get_reg_key(config_key, keypath("X11 Driver"), "DXGrab", "Y"); + buf = get_reg_key(config_key, keypath("X11 Driver"), "DXGrab", "N"); if (IS_OPTION_TRUE(*buf)) CheckDlgButton(dialog, IDC_DX_MOUSE_GRAB, BST_CHECKED); else

1 0

Milko Krachounov : winecfg: Fix a mess with the Bulgarian resource file and translate the
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: b3ec64a8a872b4bafe5ebe842320636075bc39c3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b3ec64a8a872b4bafe5ebe8… Author: Milko Krachounov <milko(a)3mhz.net> Date: Sat Dec 31 13:32:52 2005 +0100 winecfg: Fix a mess with the Bulgarian resource file and translate the untranslated strings. --- programs/winecfg/Bg.rc | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc index 45c9c97..2e2f153 100644 --- a/programs/winecfg/Bg.rc +++ b/programs/winecfg/Bg.rc @@ -26,7 +26,7 @@ IDR_WINECFG MENU DISCARDABLE BEGIN POPUP "" BEGIN - MENUITEM "Configure", IDC_AUDIO_CONFIGURE + MENUITEM "��", IDC_AUDIO_CONFIGURE END END @@ -162,11 +162,11 @@ IDD_AUDIOCFG DIALOG DISCARDABLE 0, 0, 2 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Driver Selection ",IDC_STATIC,8,4,244,195 - LTEXT "�� ",IDC_STATIC,15,20,227,30 - CONTROL "��",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,140 - PUSHBUTTON "�� ",IDC_AUDIO_CONTROL_PANEL,170,50,69,14 - GROUPBOX " DirectSound ",IDC_STATIC,8,75,244,120 + GROUPBOX " �� ",IDC_STATIC,8,4,244,195 + LTEXT "�� . �� . �� . �� .",IDC_STATIC,15,20,227,50 + CONTROL "��",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,70,140,120 + PUSHBUTTON "�� ",IDC_AUDIO_CONTROL_PANEL,170,70,69,14 + GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 LTEXT "�� : ",IDC_STATIC,15,215,90,10 COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "�� ",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 @@ -202,4 +202,5 @@ BEGIN IDS_WINECFG_TITLE "�� Wine" IDS_THEMEFILE "�� " IDS_THEMEFILE_SELECT "�� " + IDS_AUDIO_MISSING "�� .\n\n�� .\n�� .\n\n�� , �� ." END

1 0

Jacek Caban : urlmon: Added http protocol tests (currently failing in Wine).
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: 37263f573a55a0775d1017437e382fc570b9395d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=37263f573a55a0775d10174… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Dec 31 13:32:40 2005 +0100 urlmon: Added http protocol tests (currently failing in Wine). --- dlls/urlmon/tests/protocol.c | 481 ++++++++++++++++++++++++++++++++++++++---- 1 files changed, 432 insertions(+), 49 deletions(-)

1 0

Alexandre Julliard : ntdll/tests: Try to fail more gracefully on win9x.
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: f54a59c0725c8024b66a3f3b51c8c823b5e8f988 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f54a59c0725c8024b66a3f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 31 13:24:02 2005 +0100 ntdll/tests: Try to fail more gracefully on win9x. Link to NtCurrentTeb dynamically. --- dlls/ntdll/tests/exception.c | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index f213b27..0667e57 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -18,6 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <assert.h> #include <stdarg.h> #ifndef _WIN32_WINNT @@ -36,6 +37,8 @@ #ifdef __i386__ +static struct _TEB * (WINAPI *pNtCurrentTeb)(void); + /* Test various instruction combinations that cause a protection fault on the i386, * and check what the resulting exception looks like. */ @@ -51,6 +54,8 @@ static const struct exception } exceptions[] = { /* test some privileged instructions */ + { { 0xfb, 0xc3 }, /* sti; ret */ + 0, 1, STATUS_PRIVILEGED_INSTRUCTION, 0 }, { { 0x6c, 0xc3 }, /* insb (%dx); ret */ 0, 1, STATUS_PRIVILEGED_INSTRUCTION, 0 }, { { 0x6d, 0xc3 }, /* insl (%dx); ret */ @@ -77,8 +82,6 @@ static const struct exception 0, 1, STATUS_PRIVILEGED_INSTRUCTION, 0 }, { { 0xfa, 0xc3 }, /* cli; ret */ 0, 1, STATUS_PRIVILEGED_INSTRUCTION, 0 }, - { { 0xfb, 0xc3 }, /* sti; ret */ - 0, 1, STATUS_PRIVILEGED_INSTRUCTION, 0 }, /* test long jump to invalid selector */ { { 0xea, 0, 0, 0, 0, 0, 0, 0xc3 }, /* ljmp $0,$0; ret */ @@ -198,19 +201,27 @@ static void test_prot_fault(void) const struct exception *except; } exc_frame; + pNtCurrentTeb = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "NtCurrentTeb" ); + assert( pNtCurrentTeb ); + exc_frame.frame.Handler = handler; - exc_frame.frame.Prev = NtCurrentTeb()->Tib.ExceptionList; - NtCurrentTeb()->Tib.ExceptionList = &exc_frame.frame; + exc_frame.frame.Prev = pNtCurrentTeb()->Tib.ExceptionList; + pNtCurrentTeb()->Tib.ExceptionList = &exc_frame.frame; for (i = 0; i < sizeof(exceptions)/sizeof(exceptions[0]); i++) { void (*func)(void) = (void *)exceptions[i].code; exc_frame.except = &exceptions[i]; got_exception = 0; func(); + if (!i && !got_exception) + { + trace( "No exception, assuming win9x, no point in testing further\n" ); + break; + } ok( got_exception == (exceptions[i].status != 0), "%u: bad exception count %d\n", i, got_exception ); } - NtCurrentTeb()->Tib.ExceptionList = exc_frame.frame.Prev; + pNtCurrentTeb()->Tib.ExceptionList = exc_frame.frame.Prev; } #endif /* __i386__ */

1 0

Dan Kegel : commdlg: Let the color picker respond properly to keystrokes.
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: 0ab7cfc5b2e003be5b11069e53e4d296ac75a8b6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0ab7cfc5b2e003be5b11069… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Dec 31 13:23:30 2005 +0100 commdlg: Let the color picker respond properly to keystrokes. --- dlls/commdlg/colordlg.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/commdlg/colordlg.c b/dlls/commdlg/colordlg.c index 99061d1..10cf04f 100644 --- a/dlls/commdlg/colordlg.c +++ b/dlls/commdlg/colordlg.c @@ -671,7 +671,7 @@ void CC_EditSetHSL( HWND hDlg, int h, in { char buffer[10]; LCCPRIV lpp = (LCCPRIV)GetWindowLongPtrW(hDlg, DWLP_USER); - lpp->updating = TRUE; + if (IsWindowVisible( GetDlgItem(hDlg, 0x2c6) )) /* if full size */ { lpp->updating = TRUE; @@ -938,7 +938,7 @@ LRESULT CC_WMCommand( HWND hDlg, WPARAM COLORREF *cr; LCCPRIV lpp = (LCCPRIV)GetWindowLongPtrW(hDlg, DWLP_USER); TRACE("CC_WMCommand wParam=%x lParam=%lx\n", wParam, lParam); - switch (wParam) + switch (LOWORD(wParam)) { case 0x2c2: /* edit notify RGB */ case 0x2c3: @@ -950,7 +950,7 @@ LRESULT CC_WMCommand( HWND hDlg, WPARAM g = GetGValue(lpp->lpcc->rgbResult); b= GetBValue(lpp->lpcc->rgbResult); xx = 0; - switch (wParam) + switch (LOWORD(wParam)) { case 0x2c2: if ((xx = (i != r))) r = i; break; case 0x2c3: if ((xx = (i != g))) g = i; break; @@ -975,9 +975,9 @@ LRESULT CC_WMCommand( HWND hDlg, WPARAM case 0x2c1: if (notifyCode == EN_UPDATE && !lpp->updating) { - i = CC_CheckDigitsInEdit(hwndCtl , wParam == 0x2bf ? 239:240); + i = CC_CheckDigitsInEdit(hwndCtl , LOWORD(wParam) == 0x2bf ? 239:240); xx = 0; - switch (wParam) + switch (LOWORD(wParam)) { case 0x2bf: if ((xx = ( i != lpp->h))) lpp->h = i; break; case 0x2c0: if ((xx = ( i != lpp->s))) lpp->s = i; break;

1 0

Robert Shearman : wininet: Handle the cache being full better in CommitUrlCacheEntryInternal.
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: 7b4b4b793059edda89f432551d49703cf3a803dc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7b4b4b793059edda89f4325… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Dec 31 13:21:19 2005 +0100 wininet: Handle the cache being full better in CommitUrlCacheEntryInternal. Move the freeing of allocation blocks for an entry into URLCache_DeleteEntry. Call URLCache_DeleteEntry to rollback from failure in CommitUrlCacheEntryInternal. --- dlls/wininet/urlcache.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index d12bb5a..f143512 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -785,8 +785,17 @@ static BOOL URLCache_FindFirstFreeEntry( * FALSE if it failed * */ -static BOOL URLCache_DeleteEntry(CACHEFILE_ENTRY * pEntry) +static BOOL URLCache_DeleteEntry(LPURLCACHE_HEADER pHeader, CACHEFILE_ENTRY * pEntry) { + DWORD dwStartBlock; + DWORD dwBlock; + BYTE * AllocationTable = (LPBYTE)pHeader + ALLOCATION_TABLE_OFFSET; + + /* update allocation table */ + dwStartBlock = ((DWORD)((BYTE *)pEntry - (BYTE *)pHeader)) / BLOCKSIZE; + for (dwBlock = dwStartBlock; dwBlock < dwStartBlock + pEntry->dwBlocksUsed; dwBlock++) + URLCache_Allocation_BlockFree(AllocationTable, dwBlock); + ZeroMemory(pEntry, pEntry->dwBlocksUsed * BLOCKSIZE); return TRUE; } @@ -2199,6 +2208,7 @@ static BOOL WINAPI CommitUrlCacheEntryIn if (!URLCache_AddEntryToHash(pHeader, achUrl, (DWORD)((LPBYTE)pUrlEntry - (LPBYTE)pHeader))) { + URLCache_DeleteEntry(pHeader, &pUrlEntry->CacheFileEntry); URLCacheContainer_UnlockIndex(pContainer, pHeader); return FALSE; } @@ -2496,9 +2506,6 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR URLCACHECONTAINER * pContainer; LPURLCACHE_HEADER pHeader; CACHEFILE_ENTRY * pEntry; - DWORD dwStartBlock; - DWORD dwBlock; - BYTE * AllocationTable; TRACE("(%s)\n", debugstr_a(lpszUrlName)); @@ -2519,14 +2526,7 @@ BOOL WINAPI DeleteUrlCacheEntryA(LPCSTR return FALSE; } - AllocationTable = (LPBYTE)pHeader + ALLOCATION_TABLE_OFFSET; - - /* update allocation table */ - dwStartBlock = ((DWORD)pEntry - (DWORD)pHeader) / BLOCKSIZE; - for (dwBlock = dwStartBlock; dwBlock < dwStartBlock + pEntry->dwBlocksUsed; dwBlock++) - URLCache_Allocation_BlockFree(AllocationTable, dwBlock); - - URLCache_DeleteEntry(pEntry); + URLCache_DeleteEntry(pHeader, pEntry); URLCache_DeleteEntryFromHash(pHeader, lpszUrlName);

1 0

Robert Shearman : wininet: Create new hash tables for URL cache on demand.
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: 13f2ce26dd055dc5fd6887d053004b3dc2a4e2e1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=13f2ce26dd055dc5fd6887d… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Dec 31 13:20:54 2005 +0100 wininet: Create new hash tables for URL cache on demand. --- dlls/wininet/urlcache.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index a19c54a..d12bb5a 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1233,7 +1233,7 @@ static BOOL URLCache_DeleteEntryFromHash * FALSE if the entry could not be added * */ -static BOOL URLCache_AddEntryToHash(LPCURLCACHE_HEADER pHeader, LPCSTR lpszUrl, DWORD dwOffsetEntry) +static BOOL URLCache_AddEntryToHash(LPURLCACHE_HEADER pHeader, LPCSTR lpszUrl, DWORD dwOffsetEntry) { /* see URLCache_FindEntryInHash for structure of hash tables */ @@ -1272,8 +1272,13 @@ static BOOL URLCache_AddEntryToHash(LPCU } } } - FIXME("need to create another hash table\n"); - return FALSE; + pHashEntry = URLCache_CreateHashTable(pHeader, pHashEntry); + if (!pHashEntry) + return FALSE; + + pHashEntry->HashTable[offset].dwHashKey = key; + pHashEntry->HashTable[offset].dwOffsetEntry = dwOffsetEntry; + return TRUE; } static HASH_CACHEFILE_ENTRY *URLCache_CreateHashTable(LPURLCACHE_HEADER pHeader, HASH_CACHEFILE_ENTRY *pPrevHash) @@ -2149,6 +2154,7 @@ static BOOL WINAPI CommitUrlCacheEntryIn { URLCacheContainer_UnlockIndex(pContainer, pHeader); ERR("no free entries\n"); + SetLastError(ERROR_DISK_FULL); return FALSE; }

1 0