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

Robert Shearman : wininet: Move URL cache hash table creation to a separate function.
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: 2ceb052496f32b22304c982f3824b8fc599714ac URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2ceb052496f32b22304c982… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Dec 31 13:20:29 2005 +0100 wininet: Move URL cache hash table creation to a separate function. --- dlls/wininet/urlcache.c | 65 +++++++++++++++++++++++------------------------ 1 files changed, 32 insertions(+), 33 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 80a5510..a19c54a 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -179,7 +179,7 @@ typedef struct _URLCACHECONTAINER /* List of all containers available */ static struct list UrlContainers = LIST_INIT(UrlContainers); -static BOOL URLCache_FindFirstFreeEntry(URLCACHE_HEADER * pHeader, DWORD dwBlocksNeeded, CACHEFILE_ENTRY ** ppEntry); +static HASH_CACHEFILE_ENTRY *URLCache_CreateHashTable(LPURLCACHE_HEADER pHeader, HASH_CACHEFILE_ENTRY *pPrevHash); /*********************************************************************** * URLCache_PathToObjectName (Internal) @@ -297,7 +297,6 @@ static BOOL URLCacheContainer_OpenIndex( WCHAR wszDirPath[MAX_PATH]; FILETIME ft; int i, j; - HASH_CACHEFILE_ENTRY *pPrevHash = 0; dwFileSize = NEWFILE_SIZE; @@ -328,37 +327,7 @@ static BOOL URLCacheContainer_OpenIndex( RegCloseKey(key); } - /* Now create the hash table entries. Windows would create - * these as needed, but WINE doesn't do that yet, so create - * four and hope it's enough. - */ - - for (i = 0; i < 4; ++i) - { - HASH_CACHEFILE_ENTRY *pHash; - DWORD dwOffset; - - /* Request 0x20 blocks - no need to check for failure here because - * we started with an empty file - */ - URLCache_FindFirstFreeEntry(pHeader, 0x20, (CACHEFILE_ENTRY **) &pHash); - - dwOffset = (BYTE *) pHash - (BYTE *) pHeader; - - if (pPrevHash) - pPrevHash->dwAddressNext = dwOffset; - else - pHeader->dwOffsetFirstHashTable = dwOffset; - pHash->CacheFileEntry.dwSignature = HASH_SIGNATURE; - pHash->CacheFileEntry.dwBlocksUsed = 0x20; - pHash->dwHashTableNumber = i; - for (j = 0; j < HASHTABLE_SIZE; ++j) - { - pHash->HashTable[j].dwOffsetEntry = 0; - pHash->HashTable[j].dwHashKey = HASHTABLE_FREE; - } - pPrevHash = pHash; - } + URLCache_CreateHashTable(pHeader, NULL); /* Last step - create the directories */ @@ -1307,6 +1276,36 @@ static BOOL URLCache_AddEntryToHash(LPCU return FALSE; } +static HASH_CACHEFILE_ENTRY *URLCache_CreateHashTable(LPURLCACHE_HEADER pHeader, HASH_CACHEFILE_ENTRY *pPrevHash) +{ + HASH_CACHEFILE_ENTRY *pHash; + DWORD dwOffset; + int i; + + if (!URLCache_FindFirstFreeEntry(pHeader, 0x20, (CACHEFILE_ENTRY **)&pHash)) + { + FIXME("no free space for hash table\n"); + SetLastError(ERROR_DISK_FULL); + return NULL; + } + + dwOffset = (BYTE *)pHash - (BYTE *)pHeader; + + if (pPrevHash) + pPrevHash->dwAddressNext = dwOffset; + else + pHeader->dwOffsetFirstHashTable = dwOffset; + pHash->CacheFileEntry.dwSignature = HASH_SIGNATURE; + pHash->CacheFileEntry.dwBlocksUsed = 0x20; + pHash->dwHashTableNumber = pPrevHash ? pPrevHash->dwHashTableNumber + 1 : 0; + for (i = 0; i < HASHTABLE_SIZE; i++) + { + pHash->HashTable[i].dwOffsetEntry = 0; + pHash->HashTable[i].dwHashKey = HASHTABLE_FREE; + } + return pHash; +} + /*********************************************************************** * GetUrlCacheEntryInfoExA (WININET.@) *

1 0

Jacek Caban : urlmon: Removed not used code.
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: 3a04ff683690171deceb49a44736978743eca706 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3a04ff683690171deceb49a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Dec 31 13:19:32 2005 +0100 urlmon: Removed not used code. --- dlls/urlmon/umon.c | 115 ++-------------------------------------------------- 1 files changed, 5 insertions(+), 110 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index d722220..affcdfa 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -3,6 +3,7 @@ * * Copyright 1999 Ulrich Czekalla for Corel Corporation * Copyright 2002 Huw D M Davies for CodeWeavers + * Copyright 2005 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -496,55 +497,6 @@ static HRESULT WINAPI URLMonikerImpl_Bin return E_NOTIMPL; } -typedef struct { - enum {OnProgress, OnDataAvailable} callback; -} URLMON_CallbackData; - - -#if 0 -static LRESULT CALLBACK URLMON_WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) -{ - return DefWindowProcA(hwnd, msg, wparam, lparam); -} - -static void PostOnProgress(URLMonikerImpl *This, UINT progress, UINT maxprogress, DWORD status, LPCWSTR *str) -{ -} - -static void CALLBACK URLMON_InternetCallback(HINTERNET hinet, /*DWORD_PTR*/ DWORD context, DWORD status, - void *status_info, DWORD status_info_len) -{ - URLMonikerImpl *This = (URLMonikerImpl *)context; - TRACE("handle %p this %p status %08lx\n", hinet, This, status); - - if(This->filesize == -1) { - switch(status) { - case INTERNET_STATUS_RESOLVING_NAME: - PostOnProgess(This, 0, 0, BINDSTATUS_FINDINGRESOURCE, status_info); - break; - case INTERNET_STATUS_CONNECTING_TO_SERVER: - PostOnProgress(This, 0, 0, BINDSTATUS_CONNECTING, NULL); - break; - case INTERNET_STATUS_SENDING_REQUEST: - PostOnProgress(This, 0, 0, BINDSTATUS_SENDINGREQUEST, NULL); - break; - case INTERNET_REQUEST_COMPLETE: - { - DWORD len, lensz = sizeof(len); - - HttpQueryInfoW(hrequest, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &len, &lensz, NULL); - TRACE("res = %ld gle = %08lx url len = %ld\n", hres, GetLastError(), len); - This->filesize = len; - break; - } - } - } - - return; -} -#endif - - /****************************************************************************** * URLMoniker_BindToStorage ******************************************************************************/ @@ -601,7 +553,7 @@ static HRESULT URLMonikerImpl_BindToStor if(SUCCEEDED(hres)) { WCHAR *urlcopy, *tmpwc; URL_COMPONENTSW url; - WCHAR *host, *path, *partial_path, *user, *pass; + WCHAR *host, *path, *user, *pass; DWORD lensz = sizeof(bind->expected_size); DWORD dwService = 0; BOOL bSuccess; @@ -622,17 +574,6 @@ static HRESULT URLMonikerImpl_BindToStor if (*tmpwc == '\\') *tmpwc = '/'; -#if 0 - if(!registered_wndclass) { - WNDCLASSA urlmon_wndclass = {0, URLMON_WndProc,0, 0, URLMON_hInstance, 0, 0, 0, NULL, "URLMON_Callback_Window_Class"}; - RegisterClassA(&urlmon_wndclass); - registered_wndclass = TRUE; - } - - This->hwndCallback = CreateWindowA("URLMON_Callback_Window_Class", NULL, 0, 0, 0, 0, 0, 0, 0, - URLMON_hInstance, NULL); - -#endif bind->expected_size = 0; bind->total_read = 0; @@ -667,15 +608,9 @@ static HRESULT URLMonikerImpl_BindToStor pass = 0; } - switch ((DWORD) url.nScheme) - { - case INTERNET_SCHEME_FTP: - case INTERNET_SCHEME_GOPHER: - case INTERNET_SCHEME_HTTP: - case INTERNET_SCHEME_HTTPS: - bind->hinternet = InternetOpenA("User Agent", 0, NULL, NULL, 0 /*INTERNET_FLAG_ASYNC*/); -/* InternetSetStatusCallback(bind->hinternet, URLMON_InternetCallback);*/ + do { + bind->hinternet = InternetOpenA("User Agent", 0, NULL, NULL, 0); if (!bind->hinternet) { hres = HRESULT_FROM_WIN32(GetLastError()); @@ -797,48 +732,8 @@ static HRESULT URLMonikerImpl_BindToStor InternetCloseHandle(bind->hconnect); InternetCloseHandle(bind->hinternet); - break; - - case INTERNET_SCHEME_FILE: - partial_path = bind->URLName + 5; /* Skip the "file:" part */ - if ((partial_path[0] != '/' && partial_path[0] != '\\') || - (partial_path[1] != '/' && partial_path[1] != '\\')) - { - hres = E_FAIL; - } - else - { - HANDLE h; - - partial_path += 2; - if (partial_path[0] == '/' || partial_path[0] == '\\') - ++partial_path; - h = CreateFileW(partial_path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); - if (h == (HANDLE) HFILE_ERROR) - { - hres = HRESULT_FROM_WIN32(GetLastError()); - } - else - { - char buf[4096]; - DWORD bufread; - - IBindStatusCallback_OnProgress(bind->pbscb, 0, 0, BINDSTATUS_CACHEFILENAMEAVAILABLE, szFileName); - - while (ReadFile(h, buf, sizeof(buf), &bufread, NULL) && bufread > 0) - hres = Binding_MoreCacheData(bind, buf, bufread); + } while(0); - CloseHandle(h); - hres = S_OK; - } - } - - break; - - default: - FIXME("Unsupported URI scheme"); - break; - } Binding_CloseCacheDownload(bind); Binding_FinishedDownload(bind, hres);

1 0

Robert Shearman : widl: Output sizing information for arrays in the generated marshaling code.
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: 8494f57d178a042559fc9e093dd8a60b5ff22907 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8494f57d178a042559fc9e0… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Dec 31 13:19:13 2005 +0100 widl: Output sizing information for arrays in the generated marshaling code. --- tools/widl/typegen.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 1346729..33eecbc 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -448,11 +448,31 @@ void marshall_arguments(FILE *file, int if (!has_length && !has_size) array_type = "FixedArray"; else if (has_length && !has_size) + { + print_file(file, indent, "_StubMsg.Offset = (unsigned long)0;\n"); /* FIXME */ + print_file(file, indent, "_StubMsg.ActualCount = (unsigned long)"); + write_expr(file, length_is, 1); + fprintf(file, ";\n\n"); array_type = "VaryingArray"; + } else if (!has_length && has_size) + { + print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); + write_expr(file, size_is ? size_is : var->array, 1); + fprintf(file, ";\n\n"); array_type = "ConformantArray"; + } else + { + print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); + write_expr(file, size_is ? size_is : var->array, 1); + fprintf(file, ";\n"); + print_file(file, indent, "_StubMsg.Offset = (unsigned long)0;\n"); /* FIXME */ + print_file(file, indent, "_StubMsg.ActualCount = (unsigned long)"); + write_expr(file, length_is, 1); + fprintf(file, ";\n\n"); array_type = "ConformantVaryingArray"; + } } print_file(file, indent,

1 0

Robert Shearman : widl: Export the bracket adding functionality of do_write_expr outside
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: ae94c2207fc5fb4afd0634ba11f7d816a4b38402 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ae94c2207fc5fb4afd0634b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sat Dec 31 13:18:49 2005 +0100 widl: Export the bracket adding functionality of do_write_expr outside of header.c. --- tools/widl/header.c | 37 ++++++++++++++++--------------------- tools/widl/header.h | 2 +- tools/widl/proxy.c | 6 +++--- 3 files changed, 20 insertions(+), 25 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 3b85adb..a8071b1 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -189,7 +189,7 @@ static void write_enums(FILE *h, var_t * write_name(h, v); if (v->eval) { fprintf(h, " = "); - write_expr(h, v->eval); + write_expr(h, v->eval, 0); } } if (PREV_LINK(v)) @@ -399,7 +399,7 @@ void write_typedef(type_t *type, const v fprintf(header, ";\n"); } -static void do_write_expr(FILE *h, expr_t *e, int p) +void write_expr(FILE *h, const expr_t *e, int brackets) { switch (e->type) { case EXPR_VOID: @@ -415,21 +415,21 @@ static void do_write_expr(FILE *h, expr_ break; case EXPR_NEG: fprintf(h, "-"); - do_write_expr(h, e->ref, 1); + write_expr(h, e->ref, 1); break; case EXPR_NOT: fprintf(h, "~"); - do_write_expr(h, e->ref, 1); + write_expr(h, e->ref, 1); break; case EXPR_PPTR: fprintf(h, "*"); - do_write_expr(h, e->ref, 1); + write_expr(h, e->ref, 1); break; case EXPR_CAST: fprintf(h, "("); write_type(h, e->u.tref->ref, NULL, e->u.tref->name); fprintf(h, ")"); - do_write_expr(h, e->ref, 1); + write_expr(h, e->ref, 1); break; case EXPR_SIZEOF: fprintf(h, "sizeof("); @@ -444,8 +444,8 @@ static void do_write_expr(FILE *h, expr_ case EXPR_SUB: case EXPR_AND: case EXPR_OR: - if (p) fprintf(h, "("); - do_write_expr(h, e->ref, 1); + if (brackets) fprintf(h, "("); + write_expr(h, e->ref, 1); switch (e->type) { case EXPR_SHL: fprintf(h, " << "); break; case EXPR_SHR: fprintf(h, " >> "); break; @@ -457,30 +457,25 @@ static void do_write_expr(FILE *h, expr_ case EXPR_OR: fprintf(h, " | "); break; default: break; } - do_write_expr(h, e->u.ext, 1); - if (p) fprintf(h, ")"); + write_expr(h, e->u.ext, 1); + if (brackets) fprintf(h, ")"); break; case EXPR_COND: - if (p) fprintf(h, "("); - do_write_expr(h, e->ref, 1); + if (brackets) fprintf(h, "("); + write_expr(h, e->ref, 1); fprintf(h, " ? "); - do_write_expr(h, e->u.ext, 1); + write_expr(h, e->u.ext, 1); fprintf(h, " : "); - do_write_expr(h, e->ext2, 1); - if (p) fprintf(h, ")"); + write_expr(h, e->ext2, 1); + if (brackets) fprintf(h, ")"); break; } } -void write_expr(FILE *h, expr_t *e) -{ - do_write_expr(h, e, 0); -} - void write_constdef(const var_t *v) { fprintf(header, "#define %s (", get_name(v)); - write_expr(header, v->eval); + write_expr(header, v->eval, 0); fprintf(header, ")\n\n"); } diff --git a/tools/widl/header.h b/tools/widl/header.h index de38a70..1a767c7 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -38,7 +38,7 @@ extern void write_interface(type_t *ifac extern void write_dispinterface(type_t *iface); extern void write_coclass(class_t *iface); extern void write_typedef(type_t *type, const var_t *names); -extern void write_expr(FILE *h, expr_t *e); +extern void write_expr(FILE *h, const expr_t *e, int brackets); extern void write_constdef(const var_t *v); extern void write_externdef(const var_t *v); extern void write_library(const char *name, attr_t *attr); diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 988f1e7..a953ff5 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -213,7 +213,7 @@ static void marshall_size_arg( var_t *ar if (expr) { print_proxy( "_StubMsg.MaxCount = ", arg->name ); - write_expr(proxy, expr); + write_expr(proxy, expr, 0); fprintf(proxy, ";\n\n"); print_proxy( "NdrConformantArrayBufferSize( &_StubMsg, (unsigned char*)%s, ", arg->name ); fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d]);\n", index ); @@ -305,7 +305,7 @@ static void marshall_copy_arg( var_t *ar if (expr) { print_proxy( "_StubMsg.MaxCount = ", arg->name ); - write_expr(proxy, expr); + write_expr(proxy, expr, 0); fprintf(proxy, ";\n\n"); print_proxy( "NdrConformantArrayMarshall( &_StubMsg, (unsigned char*)%s, ", arg->name ); fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d]);\n", index ); @@ -494,7 +494,7 @@ static void free_variable( var_t *arg ) if (expr) { print_proxy( "_StubMsg.MaxCount = ", arg->name ); - write_expr(proxy, expr); + write_expr(proxy, expr, 0); fprintf(proxy, ";\n\n"); print_proxy( "NdrClearOutParameters( &_StubMsg, "); fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d], ", index );

1 0

Mike McCormack : msi: Change some FIXME messages to comments.
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: b7270b8c2d92f5459adb75909b2aa833d4fa44d2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b7270b8c2d92f5459adb759… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Dec 31 13:18:11 2005 +0100 msi: Change some FIXME messages to comments. --- dlls/msi/action.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 5cb33c2..0a062ba 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3096,7 +3096,7 @@ static UINT ACTION_PublishProduct(MSIPAC } msi_free(buffer); - FIXME("Need to write more keys to the user registry\n"); + /* FIXME: Need to write more keys to the user registry */ hDb= alloc_msihandle( &package->db->hdr ); rc = MsiGetSummaryInformationW(hDb, NULL, 0, &hSumInfo); @@ -3540,7 +3540,7 @@ static UINT ACTION_RegisterProduct(MSIPA return rc; /* dump all the info i can grab */ - FIXME("Flesh out more information\n"); + /* FIXME: Flesh out more information */ msi_write_uninstall_property_vals( package, hkey ); @@ -3554,7 +3554,7 @@ static UINT ACTION_RegisterProduct(MSIPA RegSetValueExW(hkey,szUninstallString,0,REG_EXPAND_SZ,(LPBYTE)buffer,size); msi_free(buffer); - FIXME("Write real Estimated Size when we have it\n"); + /* FIXME: Write real Estimated Size when we have it */ msi_reg_set_val_dword( hkey, szEstimatedSize, 0 ); GetLocalTime(&systime);

1 0

Mike McCormack : msi: Define the property Intel if we're running on an Intel processor.
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: 04a086ad657f5188e7c8d5884b2d7abef134d997 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=04a086ad657f5188e7c8d58… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Dec 31 13:14:34 2005 +0100 msi: Define the property "Intel" if we're running on an Intel processor. --- dlls/msi/package.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 96bf46f..e2ba8e7 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -228,6 +228,8 @@ static VOID set_installer_properties(MSI static const WCHAR szScreenY[] = {'S','c','r','e','e','n','Y',0}; static const WCHAR szColorBits[] = {'C','o','l','o','r','B','i','t','s',0}; static const WCHAR szScreenFormat[] = {'%','d',0}; + static const WCHAR szIntel[] = { 'I','n','t','e','l',0 }; + SYSTEM_INFO sys_info; /* * Other things that probably should be set: @@ -353,6 +355,13 @@ static VOID set_installer_properties(MSI sprintfW( bufstr, szFormat2, MSI_MAJORVERSION, MSI_MINORVERSION); MSI_SetPropertyW( package, szVersionMsi, bufstr ); + GetSystemInfo( &sys_info ); + if (sys_info.u.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) + { + sprintfW( bufstr, szScreenFormat, sys_info.wProcessorLevel ); + MSI_SetPropertyW( package, szIntel, bufstr ); + } + /* Screen properties. */ dc = GetDC(0); sprintfW( bufstr, szScreenFormat, GetDeviceCaps( dc, HORZRES ) );

1 0

Mike McCormack : msi: Add stub actions for CCPSearch and RMCCPSearch.
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: f24a9e2a2494427b7391c93e822d2a4a9be97789 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f24a9e2a2494427b7391c93… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Dec 31 13:14:23 2005 +0100 msi: Add stub actions for CCPSearch and RMCCPSearch. --- dlls/msi/action.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index be2b686..5cb33c2 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4210,11 +4210,23 @@ static UINT ACTION_UnregisterFonts( MSIP return msi_unimplemented_action_stub( package, "UnregisterFonts", table ); } +static UINT ACTION_CCPSearch( MSIPACKAGE *package ) +{ + static const WCHAR table[] = { 'C','C','P','S','e','a','r','c','h',0 }; + return msi_unimplemented_action_stub( package, "CCPSearch", table ); +} + +static UINT ACTION_RMCCPSearch( MSIPACKAGE *package ) +{ + static const WCHAR table[] = { 'C','C','P','S','e','a','r','c','h',0 }; + return msi_unimplemented_action_stub( package, "RMCCPSearch", table ); +} + static struct _actions StandardActions[] = { { szAllocateRegistrySpace, ACTION_AllocateRegistrySpace }, { szAppSearch, ACTION_AppSearch }, { szBindImage, ACTION_BindImage }, - { szCCPSearch, NULL}, + { szCCPSearch, ACTION_CCPSearch}, { szCostFinalize, ACTION_CostFinalize }, { szCostInitialize, ACTION_CostInitialize }, { szCreateFolders, ACTION_CreateFolders }, @@ -4266,7 +4278,7 @@ static struct _actions StandardActions[] { szRemoveRegistryValues, NULL}, { szRemoveShortcuts, NULL}, { szResolveSource, ACTION_ResolveSource}, - { szRMCCPSearch, NULL}, + { szRMCCPSearch, ACTION_RMCCPSearch}, { szScheduleReboot, NULL}, { szSelfRegModules, ACTION_SelfRegModules }, { szSelfUnregModules, ACTION_SelfUnregModules },

1 0

Mike McCormack : riched20: Add newlines to ERR macro output.
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: 53858d61d070ff5eb34c597022c024a0a3368bdd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=53858d61d070ff5eb34c597… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Dec 31 13:14:12 2005 +0100 riched20: Add newlines to ERR macro output. --- dlls/riched20/reader.c | 50 ++++++++++++++++++++++++------------------------ 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 83cfb76..72cff65 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -219,7 +219,7 @@ void RTFInit(RTF_Info *info) info->rtfTextBuf = RTFAlloc (rtfBufSiz); info->pushedTextBuf = RTFAlloc (rtfBufSiz); if (info->rtfTextBuf == NULL || info->pushedTextBuf == NULL) - ERR ("Cannot allocate text buffers."); + ERR ("Cannot allocate text buffers.\n"); info->rtfTextBuf[0] = info->pushedTextBuf[0] = '\0'; } @@ -283,7 +283,7 @@ void RTFSetInputName(RTF_Info *info, cha info->inputName = RTFStrSave (name); if (info->inputName == NULL) - ERR ("RTFSetInputName: out of memory"); + ERR ("RTFSetInputName: out of memory\n"); } @@ -299,7 +299,7 @@ void RTFSetOutputName(RTF_Info *info, ch info->outputName = RTFStrSave (name); if (info->outputName == NULL) - ERR ("RTFSetOutputName: out of memory"); + ERR ("RTFSetOutputName: out of memory\n"); } @@ -388,7 +388,7 @@ void RTFRouteToken(RTF_Info *info) if (info->rtfClass < 0 || info->rtfClass >= rtfMaxClass) /* watchdog */ { - ERR( "Unknown class %d: %s (reader malfunction)", + ERR( "Unknown class %d: %s (reader malfunction)\n", info->rtfClass, info->rtfTextBuf); } if (RTFCheckCM (info, rtfControl, rtfDestination)) @@ -490,9 +490,9 @@ void RTFUngetToken(RTF_Info *info) TRACE("\n"); if (info->pushedClass >= 0) /* there's already an ungotten token */ - ERR ("cannot unget two tokens"); + ERR ("cannot unget two tokens\n"); if (info->rtfClass < 0) - ERR ("no token to unget"); + ERR ("no token to unget\n"); info->pushedClass = info->rtfClass; info->pushedMajor = info->rtfMajor; info->pushedMinor = info->rtfMinor; @@ -893,19 +893,19 @@ static void ReadFontTbl(RTF_Info *info) else if (RTFCheckCM (info, rtfGroup, rtfBeginGroup)) old = 0; /* brace */ else /* can't tell! */ - ERR ( "%s: Cannot determine format", fn); + ERR ( "%s: Cannot determine format\n", fn); } if (old == 0) /* need to find "{" here */ { if (!RTFCheckCM (info, rtfGroup, rtfBeginGroup)) - ERR ( "%s: missing \"{\"", fn); + ERR ( "%s: missing \"{\"\n", fn); RTFGetToken (info); /* yes, skip to next token */ if (info->rtfClass == rtfEOF) break; } fp = New (RTFFont); if (fp == NULL) - ERR ( "%s: cannot allocate font entry", fn); + ERR ( "%s: cannot allocate font entry\n", fn); fp->rtfNextFont = info->fontList; info->fontList = fp; @@ -991,7 +991,7 @@ static void ReadFontTbl(RTF_Info *info) *bp = '\0'; fp->rtfFName = RTFStrSave (buf); if (fp->rtfFName == NULL) - ERR ( "%s: cannot allocate font name", fn); + ERR ( "%s: cannot allocate font name\n", fn); /* already have next token; don't read one */ /* at bottom of loop */ continue; @@ -1012,7 +1012,7 @@ static void ReadFontTbl(RTF_Info *info) { RTFGetToken (info); if (!RTFCheckCM (info, rtfGroup, rtfEndGroup)) - ERR ( "%s: missing \"}\"", fn); + ERR ( "%s: missing \"}\"\n", fn); if (info->rtfClass == rtfEOF) break; } @@ -1026,7 +1026,7 @@ static void ReadFontTbl(RTF_Info *info) } } if (fp->rtfFNum == -1) - ERR( "%s: missing font number", fn); + ERR( "%s: missing font number\n", fn); /* * Could check other pieces of structure here, too, I suppose. */ @@ -1068,7 +1068,7 @@ static void ReadColorTbl(RTF_Info *info) break; cp = New (RTFColor); if (cp == NULL) - ERR ( "%s: cannot allocate color entry", fn); + ERR ( "%s: cannot allocate color entry\n", fn); cp->rtfCNum = cnum++; cp->rtfCRed = cp->rtfCGreen = cp->rtfCBlue = -1; cp->rtfNextColor = info->colorList; @@ -1086,7 +1086,7 @@ static void ReadColorTbl(RTF_Info *info) if (info->rtfClass == rtfEOF) break; if (!RTFCheckCM (info, rtfText, ';')) - ERR ("%s: malformed entry", fn); + ERR ("%s: malformed entry\n", fn); } RTFRouteToken (info); /* feed "}" back to router */ } @@ -1116,7 +1116,7 @@ static void ReadStyleSheet(RTF_Info *inf break; sp = New (RTFStyle); if (sp == NULL) - ERR ( "%s: cannot allocate stylesheet entry", fn); + ERR ( "%s: cannot allocate stylesheet entry\n", fn); sp->rtfSName = NULL; sp->rtfSNum = -1; sp->rtfSType = rtfParStyle; @@ -1128,7 +1128,7 @@ static void ReadStyleSheet(RTF_Info *inf sp->rtfExpanding = 0; info->styleList = sp; if (!RTFCheckCM (info, rtfGroup, rtfBeginGroup)) - ERR ( "%s: missing \"{\"", fn); + ERR ( "%s: missing \"{\"\n", fn); real_style = TRUE; for (;;) { @@ -1140,7 +1140,7 @@ static void ReadStyleSheet(RTF_Info *inf { if (RTFCheckMM (info, rtfSpecialChar, rtfOptDest)) { RTFGetToken(info); - ERR( "%s: skipping optional destination", fn); + ERR( "%s: skipping optional destination\n", fn); RTFSkipGroup(info); info->rtfClass = rtfGroup; info->rtfMajor = rtfEndGroup; @@ -1182,14 +1182,14 @@ static void ReadStyleSheet(RTF_Info *inf } sep = New (RTFStyleElt); if (sep == NULL) - ERR ( "%s: cannot allocate style element", fn); + ERR ( "%s: cannot allocate style element\n", fn); sep->rtfSEClass = info->rtfClass; sep->rtfSEMajor = info->rtfMajor; sep->rtfSEMinor = info->rtfMinor; sep->rtfSEParam = info->rtfParam; sep->rtfSEText = RTFStrSave (info->rtfTextBuf); if (sep->rtfSEText == NULL) - ERR ( "%s: cannot allocate style element text", fn); + ERR ( "%s: cannot allocate style element text\n", fn); if (sepLast == NULL) sp->rtfSSEList = sep; /* first element */ else /* add to end */ @@ -1203,7 +1203,7 @@ static void ReadStyleSheet(RTF_Info *inf * This passes over "{\*\keycode ... }, among * other things. A temporary (perhaps) hack. */ - ERR( "%s: skipping begin", fn); + ERR( "%s: skipping begin\n", fn); RTFSkipGroup (info); continue; } @@ -1224,7 +1224,7 @@ static void ReadStyleSheet(RTF_Info *inf *bp = '\0'; sp->rtfSName = RTFStrSave (buf); if (sp->rtfSName == NULL) - ERR ( "%s: cannot allocate style name", fn); + ERR ( "%s: cannot allocate style name\n", fn); } else /* unrecognized */ { @@ -1236,7 +1236,7 @@ static void ReadStyleSheet(RTF_Info *inf if (real_style) { RTFGetToken (info); if (!RTFCheckCM (info, rtfGroup, rtfEndGroup)) - ERR ( "%s: missing \"}\"", fn); + ERR ( "%s: missing \"}\"\n", fn); /* * Check over the style structure. A name is a must. * If no style number was specified, check whether it's the @@ -1248,12 +1248,12 @@ static void ReadStyleSheet(RTF_Info *inf * Some German RTF writers use "Standard" instead of "Normal". */ if (sp->rtfSName == NULL) - ERR ( "%s: missing style name", fn); + ERR ( "%s: missing style name\n", fn); if (sp->rtfSNum < 0) { if (strncmp (buf, "Normal", 6) != 0 && strncmp (buf, "Standard", 8) != 0) - ERR ( "%s: missing style number", fn); + ERR ( "%s: missing style number\n", fn); sp->rtfSNum = rtfNormalStyleNum; } if (sp->rtfSNextPar == -1) /* if \snext not given, */ @@ -1359,7 +1359,7 @@ void RTFExpandStyle(RTF_Info *info, int if (s == NULL) return; if (s->rtfExpanding != 0) - ERR ("Style expansion loop, style %d", n); + ERR ("Style expansion loop, style %d\n", n); s->rtfExpanding = 1; /* set expansion flag for loop detection */ /* * Expand "based-on" style (unless it's the same as the current

1 0

Robert Reif : comctl32: Create ipaddress in enabled state.
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: ac9b08702654707fa730a30a846289915ce67419 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac9b08702654707fa730a30… Author: Robert Reif <reif(a)earthlink.net> Date: Sat Dec 31 13:13:52 2005 +0100 comctl32: Create ipaddress in enabled state. --- dlls/comctl32/ipaddress.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index f4da2ff..aa59cb2 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -189,7 +189,7 @@ static LRESULT IPADDRESS_Create (HWND hw edit.bottom = rcClient.bottom - 2; infoPtr->Self = hwnd; - infoPtr->Enabled = FALSE; + infoPtr->Enabled = TRUE; infoPtr->Notify = lpCreate->hwndParent; for (i = 0; i < 4; i++) { @@ -208,6 +208,7 @@ static LRESULT IPADDRESS_Create (HWND hw part->OrigProc = (WNDPROC) SetWindowLongPtrW (part->EditHwnd, GWLP_WNDPROC, (DWORD_PTR)IPADDRESS_SubclassProc); + EnableWindow(part->EditHwnd, infoPtr->Enabled); } return 0;

1 0

Raphael Junqueira : wined3d: Added support for WINED3DFMT_X4R4G4B4.
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: ee5d72b136fa4fa0ba2d52a6df63e6581a7b63ee URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ee5d72b136fa4fa0ba2d52a… Author: Raphael Junqueira <fenix(a)club-internet.fr> Date: Sat Dec 31 13:13:34 2005 +0100 wined3d: Added support for WINED3DFMT_X4R4G4B4. --- dlls/wined3d/directx.c | 3 +++ dlls/wined3d/surface.c | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a0ae182..b9178a1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1073,6 +1073,9 @@ static BOOL IWineD3DImpl_IsGLXFBConfigCo case WINED3DFMT_A1R5G5B5: if (5 == rb && 5 == gb && 5 == bb && 1 == ab) return TRUE; break; + case WINED3DFMT_X4R4G4B4: + if (16 == buf_sz && 4 == rb && 4 == gb && 4 == bb) return TRUE; + break; case WINED3DFMT_R5G6B5: if (5 == rb && 6 == gb && 5 == bb) return TRUE; break; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e1711e6..793f4e1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -752,6 +752,25 @@ HRESULT WINAPI IWineD3DSurfaceImpl_Unloc glRasterPos3i(This->lockedRect.left, This->lockedRect.top, 1); vcheckGLcall("glRasterPos2f"); switch (This->resource.format) { + case WINED3DFMT_X4R4G4B4: + { + int size; + unsigned short *data; + data = (unsigned short *)This->resource.allocatedMemory; + size = (This->lockedRect.bottom - This->lockedRect.top) * (This->lockedRect.right - This->lockedRect.left); + while(size > 0) { + *data |= 0xF000; + data++; + size--; + } + } + case WINED3DFMT_A4R4G4B4: + { + glDrawPixels(This->lockedRect.right - This->lockedRect.left, (This->lockedRect.bottom - This->lockedRect.top)-1, + GL_RGBA, GL_UNSIGNED_SHORT_4_4_4_4_REV, This->resource.allocatedMemory); + vcheckGLcall("glDrawPixels"); + } + break; case WINED3DFMT_R5G6B5: { glDrawPixels(This->lockedRect.right - This->lockedRect.left, (This->lockedRect.bottom - This->lockedRect.top)-1,

1 0

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

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: 3275450c3d26b6155847d6713fb9326ff53c4cd6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3275450c3d26b6155847d67… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Dec 31 13:13:13 2005 +0100 wldap32: Document the value handling functions. --- dlls/wldap32/value.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 119 insertions(+), 9 deletions(-) diff --git a/dlls/wldap32/value.c b/dlls/wldap32/value.c index 0b89716..a3fa379 100644 --- a/dlls/wldap32/value.c +++ b/dlls/wldap32/value.c @@ -41,6 +41,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +/*********************************************************************** + * ldap_count_values_len (WLDAP32.@) + * + * Count the number of values in an array of berval structures. + * + * PARAMS + * vals [I] Pointer to an array of berval structures. + * + * RETURNS + * Success: The number of values counted. + * Failure: 0 + * + * NOTES + * Call ldap_count_values_len with the result of a call to + * ldap_get_values_len. + */ ULONG WLDAP32_ldap_count_values_len( struct WLDAP32_berval **vals ) { ULONG ret = LDAP_NOT_SUPPORTED; @@ -53,6 +69,11 @@ ULONG WLDAP32_ldap_count_values_len( str return ret; } +/*********************************************************************** + * ldap_count_valuesA (WLDAP32.@) + * + * See ldap_count_valuesW. + */ ULONG ldap_count_valuesA( PCHAR *vals ) { ULONG ret = LDAP_NOT_SUPPORTED; @@ -73,6 +94,22 @@ ULONG ldap_count_valuesA( PCHAR *vals ) return ret; } +/*********************************************************************** + * ldap_count_valuesW (WLDAP32.@) + * + * Count the number of values in a string array. + * + * PARAMS + * vals [I] Pointer to an array of strings. + * + * RETURNS + * Success: The number of values counted. + * Failure: 0 + * + * NOTES + * Call ldap_count_valuesW with the result of a call to + * ldap_get_valuesW. + */ ULONG ldap_count_valuesW( PWCHAR *vals ) { ULONG ret = LDAP_NOT_SUPPORTED; @@ -84,16 +121,17 @@ ULONG ldap_count_valuesW( PWCHAR *vals ) if (!vals) return 0; ret = 0; - while (*p) - { - ret++; - p++; - } + while (*p++) ret++; #endif return ret; } +/*********************************************************************** + * ldap_get_valuesA (WLDAP32.@) + * + * See ldap_get_valuesW. + */ PCHAR *ldap_get_valuesA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry, PCHAR attr ) { PCHAR *ret = NULL; @@ -166,6 +204,25 @@ static char **bv2str_array( struct berva } #endif +/*********************************************************************** + * ldap_get_valuesW (WLDAP32.@) + * + * Retrieve string values for a given attribute. + * + * PARAMS + * ld [I] Pointer to an LDAP context. + * entry [I] Entry to retrieve values from. + * attr [I] Attribute to retrieve values for. + * + * RETURNS + * Success: Pointer to a character array holding the values. + * Failure: NULL + * + * NOTES + * Call ldap_get_valuesW with the result of a call to + * ldap_first_entry or ldap_next_entry. Free the returned + * array with a call to ldap_value_freeW. + */ PWCHAR *ldap_get_valuesW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry, PWCHAR attr ) { PWCHAR *ret = NULL; @@ -193,8 +250,13 @@ PWCHAR *ldap_get_valuesW( WLDAP32_LDAP * return ret; } -struct WLDAP32_berval **ldap_get_values_lenA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *message, - PCHAR attr ) +/*********************************************************************** + * ldap_get_values_lenA (WLDAP32.@) + * + * See ldap_get_values_lenW. + */ +struct WLDAP32_berval **ldap_get_values_lenA( WLDAP32_LDAP *ld, + WLDAP32_LDAPMessage *message, PCHAR attr ) { #ifdef HAVE_LDAP WCHAR *attrW = NULL; @@ -216,8 +278,27 @@ struct WLDAP32_berval **ldap_get_values_ return NULL; } -struct WLDAP32_berval **ldap_get_values_lenW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *message, - PWCHAR attr ) +/*********************************************************************** + * ldap_get_values_lenW (WLDAP32.@) + * + * Retrieve binary values for a given attribute. + * + * PARAMS + * ld [I] Pointer to an LDAP context. + * message [I] Entry to retrieve values from. + * attr [I] Attribute to retrieve values for. + * + * RETURNS + * Success: Pointer to a berval array holding the values. + * Failure: NULL + * + * NOTES + * Call ldap_get_values_lenW with the result of a call to + * ldap_first_entry or ldap_next_entry. Free the returned + * array with a call to ldap_value_free_len. + */ +struct WLDAP32_berval **ldap_get_values_lenW( WLDAP32_LDAP *ld, + WLDAP32_LDAPMessage *message, PWCHAR attr ) { #ifdef HAVE_LDAP char *attrU = NULL; @@ -239,6 +320,18 @@ struct WLDAP32_berval **ldap_get_values_ return NULL; } +/*********************************************************************** + * ldap_value_free_len (WLDAP32.@) + * + * Free an array of berval structures. + * + * PARAMS + * vals [I] Array of berval structures. + * + * RETURNS + * Success: LDAP_SUCCESS + * Failure: An LDAP error code. + */ ULONG WLDAP32_ldap_value_free_len( struct WLDAP32_berval **vals ) { #ifdef HAVE_LDAP @@ -250,6 +343,11 @@ ULONG WLDAP32_ldap_value_free_len( struc return LDAP_SUCCESS; } +/*********************************************************************** + * ldap_value_freeA (WLDAP32.@) + * + * See ldap_value_freeW. + */ ULONG ldap_value_freeA( PCHAR *vals ) { TRACE( "(%p)\n", vals ); @@ -258,6 +356,18 @@ ULONG ldap_value_freeA( PCHAR *vals ) return LDAP_SUCCESS; } +/*********************************************************************** + * ldap_value_freeW (WLDAP32.@) + * + * Free an array of string values. + * + * PARAMS + * vals [I] Array of string values. + * + * RETURNS + * Success: LDAP_SUCCESS + * Failure: An LDAP error code. + */ ULONG ldap_value_freeW( PWCHAR *vals ) { TRACE( "(%p)\n", vals );

1 0

Hans Leidekker : wldap32: Copy embedded berval structures too.
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: ef387ae87cffa4a12d98fff2649fc8134af220ad URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ef387ae87cffa4a12d98fff… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat Dec 31 13:13:05 2005 +0100 wldap32: Copy embedded berval structures too. --- dlls/wldap32/wldap32.h | 154 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 137 insertions(+), 17 deletions(-) diff --git a/dlls/wldap32/wldap32.h b/dlls/wldap32/wldap32.h index 753a168..cae3138 100644 --- a/dlls/wldap32/wldap32.h +++ b/dlls/wldap32/wldap32.h @@ -237,6 +237,59 @@ static inline void strarrayfreeU( char * #ifdef HAVE_LDAP +static inline struct berval *bvdup( struct berval *bv ) +{ + struct berval *berval; + DWORD size = sizeof(struct berval) + bv->bv_len; + + berval = HeapAlloc( GetProcessHeap(), 0, size ); + if (berval) + { + char *val = (char *)berval + sizeof(struct berval); + + berval->bv_len = bv->bv_len; + berval->bv_val = val; + memcpy( val, bv->bv_val, bv->bv_len ); + } + return berval; +} + +static inline DWORD bvarraylen( struct berval **bv ) +{ + struct berval **p = bv; + while (*p) p++; + return p - bv; +} + +static inline struct berval **bvarraydup( struct berval **bv ) +{ + struct berval **berval = NULL; + DWORD size; + + if (bv) + { + size = sizeof(struct berval *) * (bvarraylen( bv ) + 1); + berval = HeapAlloc( GetProcessHeap(), 0, size ); + + if (berval) + { + struct berval **p = bv; + struct berval **q = berval; + + while (*p) *q++ = bvdup( *p++ ); + *q = NULL; + } + } + return berval; +} + +static inline void bvarrayfree( struct berval **bv ) +{ + struct berval **p = bv; + while (*p) HeapFree( GetProcessHeap(), 0, *p++ ); + HeapFree( GetProcessHeap(), 0, bv ); +} + static inline LDAPModW *modAtoW( LDAPModA *mod ) { LDAPModW *modW; @@ -248,7 +301,7 @@ static inline LDAPModW *modAtoW( LDAPMod modW->mod_type = strAtoW( mod->mod_type ); if (mod->mod_op & LDAP_MOD_BVALUES) - modW->mod_vals.modv_bvals = mod->mod_vals.modv_bvals; + modW->mod_vals.modv_bvals = bvarraydup( mod->mod_vals.modv_bvals ); else modW->mod_vals.modv_strvals = strarrayAtoW( mod->mod_vals.modv_strvals ); } @@ -266,7 +319,7 @@ static inline LDAPMod *modWtoU( LDAPModW modU->mod_type = strWtoU( mod->mod_type ); if (mod->mod_op & LDAP_MOD_BVALUES) - modU->mod_vals.modv_bvals = mod->mod_vals.modv_bvals; + modU->mod_vals.modv_bvals = bvarraydup( mod->mod_vals.modv_bvals ); else modU->mod_vals.modv_strvals = strarrayWtoU( mod->mod_vals.modv_strvals ); } @@ -275,14 +328,18 @@ static inline LDAPMod *modWtoU( LDAPModW static inline void modfreeW( LDAPModW *mod ) { - if (!(mod->mod_op & LDAP_MOD_BVALUES)) + if (mod->mod_op & LDAP_MOD_BVALUES) + bvarrayfree( mod->mod_vals.modv_bvals ); + else strarrayfreeW( mod->mod_vals.modv_strvals ); HeapFree( GetProcessHeap(), 0, mod ); } static inline void modfreeU( LDAPMod *mod ) { - if (!(mod->mod_op & LDAP_MOD_BVALUES)) + if (mod->mod_op & LDAP_MOD_BVALUES) + bvarrayfree( mod->mod_vals.modv_bvals ); + else strarrayfreeU( mod->mod_vals.modv_strvals ); HeapFree( GetProcessHeap(), 0, mod ); } @@ -368,52 +425,112 @@ static inline void modarrayfreeU( LDAPMo static inline LDAPControlW *controlAtoW( LDAPControlA *control ) { LDAPControlW *controlW; + DWORD len = control->ldctl_value.bv_len; + char *val = NULL; + + if (control->ldctl_value.bv_val) + { + val = HeapAlloc( GetProcessHeap(), 0, len ); + if (!val) return NULL; + memcpy( val, control->ldctl_value.bv_val, len ); + } controlW = HeapAlloc( GetProcessHeap(), 0, sizeof(LDAPControlW) ); - if (controlW) + if (!controlW) { - memcpy( controlW, control, sizeof(LDAPControlW) ); - controlW->ldctl_oid = strAtoW( control->ldctl_oid ); + HeapFree( GetProcessHeap(), 0, val ); + return NULL; } + + controlW->ldctl_oid = strAtoW( control->ldctl_oid ); + controlW->ldctl_value.bv_len = len; + controlW->ldctl_value.bv_val = val; + controlW->ldctl_iscritical = control->ldctl_iscritical; + return controlW; } static inline LDAPControlA *controlWtoA( LDAPControlW *control ) { LDAPControlA *controlA; + DWORD len = control->ldctl_value.bv_len; + char *val = NULL; + + if (control->ldctl_value.bv_val) + { + val = HeapAlloc( GetProcessHeap(), 0, len ); + if (!val) return NULL; + memcpy( val, control->ldctl_value.bv_val, len ); + } - controlA = HeapAlloc( GetProcessHeap(), 0, sizeof(LDAPControl) ); - if (controlA) + controlA = HeapAlloc( GetProcessHeap(), 0, sizeof(LDAPControlA) ); + if (!controlA) { - memcpy( controlA, control, sizeof(LDAPControlA) ); - controlA->ldctl_oid = strWtoA( control->ldctl_oid ); + HeapFree( GetProcessHeap(), 0, val ); + return NULL; } + + controlA->ldctl_oid = strWtoA( control->ldctl_oid ); + controlA->ldctl_value.bv_len = len; + controlA->ldctl_value.bv_val = val; + controlA->ldctl_iscritical = control->ldctl_iscritical; + return controlA; } static inline LDAPControl *controlWtoU( LDAPControlW *control ) { LDAPControl *controlU; + DWORD len = control->ldctl_value.bv_len; + char *val = NULL; + + if (control->ldctl_value.bv_val) + { + val = HeapAlloc( GetProcessHeap(), 0, len ); + if (!val) return NULL; + memcpy( val, control->ldctl_value.bv_val, len ); + } controlU = HeapAlloc( GetProcessHeap(), 0, sizeof(LDAPControl) ); - if (controlU) + if (!controlU) { - memcpy( controlU, control, sizeof(LDAPControl) ); - controlU->ldctl_oid = strWtoU( control->ldctl_oid ); + HeapFree( GetProcessHeap(), 0, val ); + return NULL; } + + controlU->ldctl_oid = strWtoU( control->ldctl_oid ); + controlU->ldctl_value.bv_len = len; + controlU->ldctl_value.bv_val = val; + controlU->ldctl_iscritical = control->ldctl_iscritical; + return controlU; } static inline LDAPControlW *controlUtoW( LDAPControl *control ) { LDAPControlW *controlW; + DWORD len = control->ldctl_value.bv_len; + char *val = NULL; + + if (control->ldctl_value.bv_val) + { + val = HeapAlloc( GetProcessHeap(), 0, len ); + if (!val) return NULL; + memcpy( val, control->ldctl_value.bv_val, len ); + } controlW = HeapAlloc( GetProcessHeap(), 0, sizeof(LDAPControlW) ); - if (controlW) + if (!controlW) { - memcpy( controlW, control, sizeof(LDAPControlW) ); - controlW->ldctl_oid = strUtoW( control->ldctl_oid ); + HeapFree( GetProcessHeap(), 0, val ); + return NULL; } + + controlW->ldctl_oid = strUtoW( control->ldctl_oid ); + controlW->ldctl_value.bv_len = len; + controlW->ldctl_value.bv_val = val; + controlW->ldctl_iscritical = control->ldctl_iscritical; + return controlW; } @@ -422,6 +539,7 @@ static inline void controlfreeA( LDAPCon if (control) { strfreeA( control->ldctl_oid ); + HeapFree( GetProcessHeap(), 0, control->ldctl_value.bv_val ); HeapFree( GetProcessHeap(), 0, control ); } } @@ -431,6 +549,7 @@ static inline void controlfreeW( LDAPCon if (control) { strfreeW( control->ldctl_oid ); + HeapFree( GetProcessHeap(), 0, control->ldctl_value.bv_val ); HeapFree( GetProcessHeap(), 0, control ); } } @@ -440,6 +559,7 @@ static inline void controlfreeU( LDAPCon if (control) { strfreeU( control->ldctl_oid ); + HeapFree( GetProcessHeap(), 0, control->ldctl_value.bv_val ); HeapFree( GetProcessHeap(), 0, control ); } }

1 0

Thomas Weidenmueller : comctl32: Fix error handling in PSM_ADDPAGE in case of memory
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: 3faa66ee2ab5274c2cb38e3364f4869e8928f8ff URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3faa66ee2ab5274c2cb38e3… Author: Thomas Weidenmueller <wine-patches(a)reactsoft.com> Date: Sat Dec 31 13:12:19 2005 +0100 comctl32: Fix error handling in PSM_ADDPAGE in case of memory allocation failure. --- dlls/comctl32/propsheet.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 08c55b8..78fdc43 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2288,6 +2288,7 @@ static LRESULT PROPSHEET_QuerySiblings(H static BOOL PROPSHEET_AddPage(HWND hwndDlg, HPROPSHEETPAGE hpage) { + PropPageInfo * ppi; PropSheetInfo * psInfo = (PropSheetInfo*) GetPropW(hwndDlg, PropSheetInfoStr); HWND hwndTabControl = GetDlgItem(hwndDlg, IDC_TABCONTROL); @@ -2298,9 +2299,13 @@ static BOOL PROPSHEET_AddPage(HWND hwndD /* * Allocate and fill in a new PropPageInfo entry. */ - psInfo->proppage = (PropPageInfo*) ReAlloc(psInfo->proppage, - sizeof(PropPageInfo) * - (psInfo->nPages + 1)); + ppi = (PropPageInfo*) ReAlloc(psInfo->proppage, + sizeof(PropPageInfo) * + (psInfo->nPages + 1)); + if (!ppi) + return FALSE; + + psInfo->proppage = ppi; if (!PROPSHEET_CollectPageInfo(ppsp, psInfo, psInfo->nPages)) return FALSE;

1 0

Henning Gerhardt : winecfg: Update German resource.
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

Module: wine Branch: refs/heads/master Commit: 42bf104b0d866043b6b17ba15a2e1ca1008a63b6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=42bf104b0d866043b6b17ba… Author: Henning Gerhardt <henning.gerhardt(a)web.de> Date: Sat Dec 31 13:12:31 2005 +0100 winecfg: Update German resource. --- programs/winecfg/De.rc | 42 +++++++++++++++++++++++------------------- 1 files changed, 23 insertions(+), 19 deletions(-) diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index c0e665c..ba643cf 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -26,7 +26,7 @@ IDR_WINECFG MENU DISCARDABLE BEGIN POPUP "" BEGIN - MENUITEM "Configure", IDC_AUDIO_CONFIGURE + MENUITEM "Konfigurieren", IDC_AUDIO_CONFIGURE END END @@ -60,31 +60,34 @@ IDD_GRAPHCFG DIALOG DISCARDABLE 0, 0, 2 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Bildschirmfarbtiefe: ",IDC_STATIC,8,10,70,30 - COMBOBOX IDC_SCREEN_DEPTH,80,8,170,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Bildschirmfarbtiefe: ",IDC_STATIC,8,10,70,30 + COMBOBOX IDC_SCREEN_DEPTH,80,8,170,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX " Fenstereinstellungen ",IDC_STATIC,8,25,244,120 + GROUPBOX " Fenstereinstellungen ",IDC_STATIC,8,25,244,180 + + CONTROL "Erlaube DirectX Anwendungen, dass die Maus ihr Fenster nicht verlassen kann.",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8 + CONTROL "Aktivierung der Doppelpufferung des Desktops",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,230,8 + LTEXT "Wenn die Fenster durch deinen Fenstermanager kontrolliert werden, dann werden sie die gleichen R�nder haben, der eingestellte virtuelle Desktop wird respektiert und sie werden in der Fensterliste auftauchen.\nWenn die Fenster nicht kontrolliert werden, werden sie unabh�ngig vom verwerdeten Fenstermanager sein. Das bedeutet, dass die Fenster sich nicht an den Desktop anpassen werden. Der Vorteil ist, dass dann die Emulation akkurater ist, was einigen Anwendungen hilft, besser zu arbeiten.", + IDC_STATIC,15,58,228,80 + CONTROL "Erlaube dem Fenstermanager die Fenster zu kontrollieren.",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,132,230,8 - CONTROL "Erlaube DirectX Anwendungen, dass die Maus das Anwendungsfenster nicht verlassen kann.",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8 - CONTROL "Aktivierung der Doppelpufferung des Desktops",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,230,8 - /* FIXME: the wording of this explanation could be a lot better */ LTEXT "Sie k�nnen entweder einen Windows Desktop emulieren, in dem alle Fenster in einem 'virtuellen Bildschirm' zusammen sind, oder Sie lassen es zu, dass die Fenster auf ihren normalen Desktop platziert werden.", - IDC_STATIC,15,73,228,28 - LTEXT "Desktop-Gr��e:",IDC_DESKTOP_SIZE,15,115,50,8,WS_DISABLED - LTEXT "X",IDC_DESKTOP_BY,114,115,8,8,WS_DISABLED + IDC_STATIC,15,146,228,28 + LTEXT "Desktop-Gr��e:",IDC_DESKTOP_SIZE,15,188,50,8,WS_DISABLED + LTEXT "X",IDC_DESKTOP_BY,114,188,8,8,WS_DISABLED CONTROL "Emuliere einen virtuellen Desktop",IDC_ENABLE_DESKTOP,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10 + BS_AUTOCHECKBOX | WS_TABSTOP,15,173,230,10 - EDITTEXT IDC_DESKTOP_WIDTH,70,115,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - EDITTEXT IDC_DESKTOP_HEIGHT,123,115,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_WIDTH,70,188,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_HEIGHT,123,188,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - GROUPBOX " Direct3D ",IDC_STATIC,8,140,244,120 + GROUPBOX " Direct3D ",IDC_STATIC,8,210,244,50 - LTEXT "Vertex Shader Unterst�tzung: ",IDC_STATIC,15,150,80,35 - COMBOBOX IDC_D3D_VSHADER_MODE,100,150,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Vertex Shader Unterst�tzung: ",IDC_STATIC,15,220,80,30 + COMBOBOX IDC_D3D_VSHADER_MODE,100,218,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Erlaube Pixel Shader (wenn es durch die Hardware unterst�tzt wird)", IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,170,230,10 + CONTROL "Erlaube Pixel Shader (wenn es durch die Hardware unterst�tzt wird)", IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,242,230,10 END IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250 @@ -134,7 +137,7 @@ BEGIN EDITTEXT IDC_EDIT_PATH,41,120,155,13,ES_AUTOHSCROLL | WS_TABSTOP PUSHBUTTON "&Durchsuchen",IDC_BUTTON_BROWSE_PATH,201,120,45,13 - LTEXT "&Typ:",IDC_STATIC,14,138,21,10 + LTEXT "&Typ:",IDC_STATIC_TYPE,14,138,21,10 COMBOBOX IDC_COMBO_TYPE,41,135,77,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Bezeichnung und Seriennummer",IDC_LABELSERIAL_STATIC,15,155,125,10 @@ -160,7 +163,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Treiber Auswahl ",IDC_STATIC,8,4,244,195 - LTEXT "Audio Treiber: ",IDC_STATIC,15,20,227,30 + LTEXT "W�hlen Sie einen Sound Treiber durch das Ausw�hlen eines verf�gbaren Treibers. Der Sound wird deaktiviert, wenn kein Treiber ausgew�hlt wird. Die Auswahl mehrer Treiber ist nicht empfohlen. Der Treiber kann durch einen Rechtsklick konfiguriert werden.",IDC_STATIC,15,20,227,30 CONTROL "Ger�te",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,50,140,140 PUSHBUTTON "Kontrollschirm",IDC_AUDIO_CONTROL_PANEL,170,50,59,14 GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 @@ -199,4 +202,5 @@ BEGIN IDS_WINECFG_TITLE "Wine-Konfiguration" IDS_THEMEFILE "Motiv-Dateien" IDS_THEMEFILE_SELECT "Motiv-Datei ausw�hlen" + IDS_AUDIO_MISSING "Zur Zeit ist kein Audio Treiber in der Registry eingetragen.\n\nEin bevorzugter Treiber wurde f�r Sie ausgew�hlt.\nSie k�nnen diesen Treiber nutzen oder einen anderen ausw�hlen, sofern dieser vorhanden ist.\n\nSie m�ssen auf Anwenden klicken, damit die �nderung �bernommen wird." END

1 0

CVSROOT/. log_accum
by Alexandre Julliard Dec. 31, 2005

Dec. 31, 2005

ChangeSet ID: 22006 CVSROOT: /opt/cvs-commit Module name: CVSROOT Changes by: julliard(a)winehq.org 2005/12/31 08:19:48 Modified files: . : log_accum Log message: Make sure to clean up all the temp files we use. Patch: http://cvs.winehq.org/patch.py?id=22006 Old revision New revision Changes Path 1.32 1.33 +3 -0 CVSROOT/log_accum Index: CVSROOT/log_accum diff -u -p CVSROOT/log_accum:1.32 CVSROOT/log_accum:1.33 --- CVSROOT/log_accum:1.32 31 Dec 2005 14:19:48 -0000 +++ CVSROOT/log_accum 31 Dec 2005 14:19:48 -0000 @@ -326,6 +326,8 @@ sub create_diff { push(@text, $_); } close(DIFF); + unlink $tmp_old unless $tmp_old = '/dev/null'; + unlink $tmp_new unless $tmp_new = '/dev/null'; return $#text > 4 ? @text : (); } @@ -674,6 +676,7 @@ if ($files[2] =~ /New/ && $files[3] =~ / &write_commitlog($commitlog, @text); } + &cleanup_tmpfiles() unless $debug; exit 0; }

1 0

bugzilla/template/en/default/global banner.htm ...
by Jeremy Newman Dec. 27, 2005

Dec. 27, 2005

ChangeSet ID: 22005 CVSROOT: /opt/cvs-commit Module name: bugzilla Changes by: jnewman(a)winehq.org 2005/12/27 14:55:49 Modified files: template/en/default/global: banner.html.tmpl Log message: change link Patch: http://cvs.winehq.org/patch.py?id=22005 Old revision New revision Changes Path 1.3 1.4 +1 -1 bugzilla/template/en/default/global/banner.html.tmpl Index: bugzilla/template/en/default/global/banner.html.tmpl diff -u -p bugzilla/template/en/default/global/banner.html.tmpl:1.3 bugzilla/template/en/default/global/banner.html.tmpl:1.4 --- bugzilla/template/en/default/global/banner.html.tmpl:1.3 27 Dec 2005 20:55:49 -0000 +++ bugzilla/template/en/default/global/banner.html.tmpl 27 Dec 2005 20:55:49 -0000 @@ -33,7 +33,7 @@ </td> <td width="468" align="center" valign="middle">  - <a href="http://www.codeweavers.com/products/support_wine/?ad=5" target="_top"><img + <a href="http://www.codeweavers.com/products/support_wine/?ad=21" target="_top"><img src="http://www.winehq.org/images/bannerads/cw-ad02.gif" width="468" height="60" border="0" alt="Support the Wine Project!" /></a>

1 0

lostwages/images/bannerads cw-ad02.xml
by Jeremy Newman Dec. 27, 2005

Dec. 27, 2005

ChangeSet ID: 22004 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2005/12/27 14:55:11 Modified files: images/bannerads: cw-ad02.xml Log message: change ad link Patch: http://cvs.winehq.org/patch.py?id=22004 Old revision New revision Changes Path 1.3 1.4 +1 -1 lostwages/images/bannerads/cw-ad02.xml Index: lostwages/images/bannerads/cw-ad02.xml diff -u -p lostwages/images/bannerads/cw-ad02.xml:1.3 lostwages/images/bannerads/cw-ad02.xml:1.4 --- lostwages/images/bannerads/cw-ad02.xml:1.3 27 Dec 2005 20:55:11 -0000 +++ lostwages/images/bannerads/cw-ad02.xml 27 Dec 2005 20:55:11 -0000 @@ -2,6 +2,6 @@ <!DOCTYPE bannerAd> <ad> <id>cw-ad04</id> - <url>http://www.codeweavers.com/products/support_wine/?ad=5</url> + <url>http://www.codeweavers.com/products/support_wine/?ad=21</url> <alt>Support the Wine Project!</alt> </ad>

1 0

Yuval Fledel : winetest: Only include d3d9 if it is being built.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: d00fe021d3add8a207f8881ccc007454d02c3494 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d00fe021d3add8a207f8881… Author: Yuval Fledel <yuvalfl(a)gmail.com> Date: Mon Dec 26 13:37:57 2005 +0100 winetest: Only include d3d9 if it is being built. --- programs/winetest/Makefile.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 4208b94..79c1766 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -19,14 +19,15 @@ RC_BINSRC = winetest.rc RC_BINARIES = wine.ico XFILES = ddraw_test.exe$(DLLEXT) +OPENGLFILES = d3d9_test.exe$(DLLEXT) TESTBINS = \ + @OPENGLFILES@ \ @XFILES@ \ advpack_test.exe$(DLLEXT) \ advapi32_test.exe$(DLLEXT) \ comctl32_test.exe$(DLLEXT) \ crypt32_test.exe$(DLLEXT) \ - d3d9_test.exe$(DLLEXT) \ dinput_test.exe$(DLLEXT) \ dsound_test.exe$(DLLEXT) \ gdi32_test.exe$(DLLEXT) \

1 0

Jacek Caban : urlmon: Added GetSecurityId implementation.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: fb042eb1229e93b855de979ae780c9762ab4fddb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fb042eb1229e93b855de979… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 26 13:27:25 2005 +0100 urlmon: Added GetSecurityId implementation. --- dlls/urlmon/sec_mgr.c | 75 ++++++++++++++++++++++++++++++++---- dlls/urlmon/tests/misc.c | 95 +++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 152 insertions(+), 18 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 576e82a..d2ac8e9 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -109,7 +109,7 @@ static HRESULT map_url_to_zone(LPCWSTR u size = sizeof(DWORD); res = RegQueryValueExW(hkey, schema, NULL, NULL, (PBYTE)zone, &size); if(res == ERROR_SUCCESS) - return S_OK; + return S_OK; *zone = 3; return S_OK; @@ -268,15 +268,17 @@ static HRESULT WINAPI SecManagerImpl_Map } static HRESULT WINAPI SecManagerImpl_GetSecurityId(IInternetSecurityManager *iface, - LPCWSTR pwszUrl, - BYTE *pbSecurityId, DWORD *pcbSecurityId, - DWORD_PTR dwReserved) + LPCWSTR pwszUrl, BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved) { SecManagerImpl *This = SECMGR_THIS(iface); + LPWSTR buf, ptr, ptr2; + DWORD size, zone, len; HRESULT hres; - TRACE("(%p)->(%s %p %p %08lx)\n", iface, debugstr_w(pwszUrl), pbSecurityId, pcbSecurityId, - dwReserved); + static const WCHAR wszFile[] = {'f','i','l','e',':'}; + + TRACE("(%p)->(%s %p %p %08lx)\n", iface, debugstr_w(pwszUrl), pbSecurityId, + pcbSecurityId, dwReserved); if(This->custom_manager) { hres = IInternetSecurityManager_GetSecurityId(This->custom_manager, @@ -285,8 +287,65 @@ static HRESULT WINAPI SecManagerImpl_Get return hres; } - FIXME("Default action is not implemented\n"); - return E_NOTIMPL; + if(!pwszUrl || !pbSecurityId || !pcbSecurityId) + return E_INVALIDARG; + + if(dwReserved) + FIXME("dwReserved is not supported\n"); + + len = strlenW(pwszUrl)+1; + buf = HeapAlloc(GetProcessHeap(), 0, (len+16)*sizeof(WCHAR)); + + hres = CoInternetParseUrl(pwszUrl, PARSE_SECURITY_URL, 0, buf, len, &size, 0); + if(FAILED(hres)) + memcpy(buf, pwszUrl, len*sizeof(WCHAR)); + + hres = map_url_to_zone(buf, &zone); + if(FAILED(hres)) { + HeapFree(GetProcessHeap(), 0, buf); + return hres == 0x80041001 ? E_INVALIDARG : hres; + } + + /* file protocol is a special case */ + if(strlenW(pwszUrl) >= sizeof(wszFile)/sizeof(WCHAR) + && !memcmp(buf, wszFile, sizeof(wszFile))) { + + static const BYTE secidFile[] = {'f','i','l','e',':'}; + + if(*pcbSecurityId < sizeof(secidFile)+sizeof(zone)) + return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + + memcpy(pbSecurityId, secidFile, sizeof(secidFile)); + *(DWORD*)(pbSecurityId+sizeof(secidFile)) = zone; + + *pcbSecurityId = sizeof(secidFile)+sizeof(zone); + return S_OK; + } + + ptr = strchrW(buf, ':'); + ptr2 = ++ptr; + while(*ptr2 == '/') + ptr2++; + if(ptr2 != ptr) + memmove(ptr, ptr2, (strlenW(ptr2)+1)*sizeof(WCHAR)); + + ptr = strchrW(ptr, '/'); + if(ptr) + *ptr = 0; + + len = WideCharToMultiByte(CP_ACP, 0, buf, -1, NULL, 0, NULL, NULL)-1; + + if(len+sizeof(DWORD) > *pcbSecurityId) + return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + + WideCharToMultiByte(CP_ACP, 0, buf, -1, (LPSTR)pbSecurityId, -1, NULL, NULL); + HeapFree(GetProcessHeap(), 0, buf); + + *(DWORD*)(pbSecurityId+len) = zone; + + *pcbSecurityId = len+sizeof(DWORD); + + return S_OK; } diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 1fd30a0..99b8c6f 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -26,6 +26,10 @@ #include "ole2.h" #include "urlmon.h" +#include "initguid.h" + +DEFINE_GUID(CLSID_AboutProtocol, 0x3050F406, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); + static void test_CreateFormatEnum(void) { IEnumFORMATETC *fenum = NULL, *fenum2 = NULL; @@ -409,25 +413,37 @@ static void test_FindMimeFromData(void) ok(hres == E_INVALIDARG, "FindMimeFromData failed: %08lx, expected E_INVALIDARG\n", hres); } +static const BYTE secid1[] = {'f','i','l','e',':',0,0,0,0}; +static const BYTE secid4[] ={'f','i','l','e',':',3,0,0,0}; +static const BYTE secid5[] = {'h','t','t','p',':','w','w','w','.','w','i','n','e','h','q', + '.','o','r','g',3,0,0,0}; +static const BYTE secid6[] = {'a','b','o','u','t',':','b','l','a','n','k',3,0,0,0}; +static const BYTE secid7[] = {'f','t','p',':','w','i','n','e','h','q','.','o','r','g', + 3,0,0,0}; + static struct secmgr_test { LPCWSTR url; DWORD zone; HRESULT zone_hres; + DWORD secid_size; + const BYTE *secid; + HRESULT secid_hres; } secmgr_tests[] = { - {url1, 0, S_OK}, - {url2, 100, 0x80041001}, - {url3, 0, S_OK}, - {url4, 3, S_OK}, - {url5, 3, S_OK}, - {url6, 3, S_OK}, - {url7, 3, S_OK} + {url1, 0, S_OK, sizeof(secid1), secid1, S_OK}, + {url2, 100, 0x80041001, 0, NULL, E_INVALIDARG}, + {url3, 0, S_OK, sizeof(secid1), secid1, S_OK}, + {url4, 3, S_OK, sizeof(secid4), secid4, S_OK}, + {url5, 3, S_OK, sizeof(secid5), secid5, S_OK}, + {url6, 3, S_OK, sizeof(secid6), secid6, S_OK}, + {url7, 3, S_OK, sizeof(secid7), secid7, S_OK} }; static void test_SecurityManager(void) { int i; IInternetSecurityManager *secmgr = NULL; - DWORD zone; + BYTE buf[512]; + DWORD zone, size; HRESULT hres; hres = CoInternetCreateSecurityManager(NULL, &secmgr, 0); @@ -437,17 +453,45 @@ static void test_SecurityManager(void) for(i=0; i < sizeof(secmgr_tests)/sizeof(secmgr_tests[0]); i++) { zone = 100; - hres = IInternetSecurityManager_MapUrlToZone(secmgr, secmgr_tests[i].url, &zone, 0); - ok(hres == secmgr_tests[i].zone_hres, "[%d] MapUrlToZone failed: %08lx, expected %08lx\n", + hres = IInternetSecurityManager_MapUrlToZone(secmgr, secmgr_tests[i].url, + &zone, 0); + ok(hres == secmgr_tests[i].zone_hres, + "[%d] MapUrlToZone failed: %08lx, expected %08lx\n", i, hres, secmgr_tests[i].zone_hres); ok(zone == secmgr_tests[i].zone, "[%d] zone=%ld, expected %ld\n", i, zone, secmgr_tests[i].zone); + + size = sizeof(buf); + memset(buf, 0xf0, sizeof(buf)); + hres = IInternetSecurityManager_GetSecurityId(secmgr, secmgr_tests[i].url, + buf, &size, 0); + ok(hres == secmgr_tests[i].secid_hres, + "[%d] GetSecurityId failed: %08lx, expected %08lx\n", + i, hres, secmgr_tests[i].secid_hres); + if(secmgr_tests[i].secid) { + ok(size == secmgr_tests[i].secid_size, "[%d] size=%ld, expected %ld\n", + i, size, secmgr_tests[i].secid_size); + ok(!memcmp(buf, secmgr_tests[i].secid, size), "[%d] wrong secid\n", i); + } } zone = 100; hres = IInternetSecurityManager_MapUrlToZone(secmgr, NULL, &zone, 0); ok(hres == E_INVALIDARG, "MapUrlToZone failed: %08lx, expected E_INVALIDARG\n", hres); + size = sizeof(buf); + hres = IInternetSecurityManager_GetSecurityId(secmgr, NULL, buf, &size, 0); + ok(hres == E_INVALIDARG, + "GetSecurityId failed: %08lx, expected E_INVALIDARG\n", hres); + hres = IInternetSecurityManager_GetSecurityId(secmgr, secmgr_tests[1].url, + NULL, &size, 0); + ok(hres == E_INVALIDARG, + "GetSecurityId failed: %08lx, expected E_INVALIDARG\n", hres); + hres = IInternetSecurityManager_GetSecurityId(secmgr, secmgr_tests[1].url, + buf, NULL, 0); + ok(hres == E_INVALIDARG, + "GetSecurityId failed: %08lx, expected E_INVALIDARG\n", hres); + IInternetSecurityManager_Release(secmgr); } @@ -486,12 +530,43 @@ static void test_ZoneManager(void) IInternetZoneManager_Release(zonemgr); } +static void register_protocols(void) +{ + IInternetSession *session; + IClassFactory *factory; + HRESULT hres; + + static const WCHAR wszAbout[] = {'a','b','o','u','t',0}; + + hres = CoInternetGetSession(0, &session, 0); + ok(hres == S_OK, "CoInternetGetSession failed: %08lx\n", hres); + if(FAILED(hres)) + return; + + hres = CoGetClassObject(&CLSID_AboutProtocol, CLSCTX_INPROC_SERVER, NULL, + &IID_IClassFactory, (void**)&factory); + ok(hres == S_OK, "Coud not get AboutProtocol factory: %08lx\n", hres); + if(FAILED(hres)) + return; + + IInternetSession_RegisterNameSpace(session, factory, &CLSID_AboutProtocol, + wszAbout, 0, NULL, 0); + IClassFactory_Release(factory); + +} + START_TEST(misc) { + OleInitialize(NULL); + + register_protocols(); + test_CreateFormatEnum(); test_RegisterFormatEnumerator(); test_CoInternetParseUrl(); test_FindMimeFromData(); test_SecurityManager(); test_ZoneManager(); + + OleUninitialize(); }

1 0

Jacek Caban : urlmon: Use pluggable protocol for file protocol.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 0cceb3386f876bbccad7b276bd870fba0a6dafa6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0cceb3386f876bbccad7b27… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 26 13:27:10 2005 +0100 urlmon: Use pluggable protocol for file protocol. --- dlls/urlmon/binding.c | 18 ++++++ dlls/urlmon/tests/url.c | 141 +++++++++++++++++++++++++++++++++++++++++------ dlls/urlmon/umon.c | 18 +++++- 3 files changed, 153 insertions(+), 24 deletions(-)

1 0

Robert Shearman : widl: Fix merge conflict.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: f56737579e49aab5592a928d98d1e8c11d539368 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f56737579e49aab5592a928… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:22:46 2005 +0100 widl: Fix merge conflict. --- tools/widl/typegen.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index bc3710a..1346729 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -413,7 +413,6 @@ void marshall_arguments(FILE *file, int fprintf(file, "_StubMsg.Buffer += sizeof("); write_type(file, var->type, var, var->tname); fprintf(file, ");\n"); - fprintf(file, "\n"); last_size = size; } @@ -588,7 +587,6 @@ void unmarshall_arguments(FILE *file, in fprintf(file, "_StubMsg.Buffer += sizeof("); write_type(file, var->type, var, var->tname); fprintf(file, ");\n"); - fprintf(file, "\n"); last_size = size; }

1 0

Robert Shearman : widl: Follow type references in procformat and typeformat string generation.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 93775adf75342a673367ed17de2225f38f9fa697 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=93775adf75342a673367ed1… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:22:32 2005 +0100 widl: Follow type references in procformat and typeformat string generation. --- tools/widl/typegen.c | 103 +++++++++++++++++++++++++++++++++++--------------- 1 files changed, 73 insertions(+), 30 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f1f791d..bc3710a 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -41,6 +41,9 @@ #include "widl.h" #include "typegen.h" +static size_t get_size_typeformatstring_type(const type_t *type, int ptr_level, + const expr_t *array, const char *name); + static int print_file(FILE *file, int indent, const char *format, ...) { va_list va; @@ -56,21 +59,34 @@ static int print_file(FILE *file, int in return r; } -static size_t write_procformatstring_var(FILE *file, int indent, var_t *var, int is_return, unsigned int *type_offset) +static inline int type_has_ref(const type_t *type) +{ + return (type->type == 0 && type->ref); +} + +static size_t write_procformatstring_type(FILE *file, int indent, + const type_t *type, int ptr_level, const expr_t *array, const char *name, + int is_in, int is_out, int is_return, unsigned int *type_offset) { size_t size; - if (var->ptr_level == 0 && !var->array) + + if (ptr_level == 0 && type_has_ref(type)) + return write_procformatstring_type(file, indent, type->ref, ptr_level, + array, name, is_in, is_out, + is_return, type_offset); + + if (ptr_level == 0 && !array) { if (is_return) print_file(file, indent, "0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); else print_file(file, indent, "0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - switch(var->type->type) + switch(type->type) { #define CASE_BASETYPE(fctype) \ case RPC_##fctype: \ - print_file(file, indent, "0x%02x, /* " #fctype " */\n", var->type->type); \ + print_file(file, indent, "0x%02x, /* " #fctype " */\n", RPC_##fctype); \ size = 2; /* includes param type prefix */ \ break @@ -90,20 +106,17 @@ static size_t write_procformatstring_var CASE_BASETYPE(FC_ERROR_STATUS_T); #undef CASE_BASETYPE default: - error("Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); + error("Unknown/unsupported type: %s (0x%02x)\n", name, type->type); size = 0; } } else { - int in_attr = is_attr(var->attrs, ATTR_IN); - int out_attr = is_attr(var->attrs, ATTR_OUT); - if (is_return) print_file(file, indent, "0x52, /* FC_RETURN_PARAM */\n"); - else if (in_attr && out_attr) + else if (is_in && is_out) print_file(file, indent, "0x50, /* FC_IN_OUT_PARAM */\n"); - else if (out_attr) + else if (is_out) print_file(file, indent, "0x51, /* FC_OUT_PARAM */\n"); else print_file(file, indent, "0x4d, /* FC_IN_PARAM */\n"); @@ -112,7 +125,7 @@ static size_t write_procformatstring_var print_file(file, indent, "NdrFcShort(0x%x),\n", *type_offset); size = 4; /* includes param type prefix */ } - *type_offset += get_size_typeformatstring_var(var); + *type_offset += get_size_typeformatstring_type(type, ptr_level, array, name); return size; } @@ -142,7 +155,14 @@ void write_procformatstring(FILE *file, while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - write_procformatstring_var(file, indent, var, FALSE, &type_offset); + int is_in = is_attr(var->attrs, ATTR_IN); + int is_out = is_attr(var->attrs, ATTR_OUT); + + if (!is_in && !is_out) is_in = TRUE; + write_procformatstring_type(file, indent, var->type, + var->ptr_level, var->array, var->name, + is_in, is_out, FALSE, &type_offset); + var = PREV_LINK(var); } } @@ -155,7 +175,9 @@ void write_procformatstring(FILE *file, print_file(file, indent, "0x5c, /* FC_PAD */\n"); } else - write_procformatstring_var(file, indent, var, TRUE, &type_offset); + write_procformatstring_type(file, indent, var->type, + var->ptr_level, var->array, var->name, FALSE, FALSE, TRUE, + &type_offset); } } @@ -168,23 +190,26 @@ void write_procformatstring(FILE *file, } -static size_t write_typeformatstring_var(FILE *file, int indent, var_t *var) +static size_t write_typeformatstring_type(FILE *file, int indent, + const type_t *type, int ptr_level, const expr_t *array, const char *name) { - int ptr_level = var->ptr_level; + if (ptr_level == 0 && type_has_ref(type)) + return write_typeformatstring_type(file, indent, + type->ref, 0 /* FIXME */, array, name); /* basic types don't need a type format string */ - if (ptr_level == 0 && !var->array) + if (ptr_level == 0 && !array) return 0; - if (ptr_level == 1 || - (var->ptr_level == 0 && var->array && !NEXT_LINK(var->array))) + if ((ptr_level == 1 && !type_has_ref(type)) || + (ptr_level == 0 && array && !NEXT_LINK(array))) { - switch (var->type->type) + switch (type->type) { #define CASE_BASETYPE(fctype) \ case RPC_##fctype: \ print_file(file, indent, "0x11, 0x08, /* FC_RP [simple_pointer] */\n"); \ - print_file(file, indent, "0x%02x, /* " #fctype " */\n", var->type->type); \ + print_file(file, indent, "0x%02x, /* " #fctype " */\n", RPC_##fctype); \ print_file(file, indent, "0x5c, /* FC_PAD */\n"); \ return 4 CASE_BASETYPE(FC_BYTE); @@ -204,10 +229,10 @@ static size_t write_typeformatstring_var CASE_BASETYPE(FC_IGNORE); CASE_BASETYPE(FC_ERROR_STATUS_T); default: - error("write_typeformatstring_var: Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); + error("write_typeformatstring_var: Unknown/unsupported type: %s (0x%02x)\n", name, type->type); } } - error("write_typeformatstring_var: Pointer level %d not supported for variable %s\n", ptr_level, var->name); + error("write_typeformatstring_var: Pointer level %d not supported for variable %s\n", ptr_level, name); return 0; } @@ -237,7 +262,8 @@ void write_typeformatstring(FILE *file, while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - write_typeformatstring_var(file, indent, var); + write_typeformatstring_type(file, indent, var->type, + var->ptr_level, var->array, var->name); var = PREV_LINK(var); } } @@ -252,13 +278,14 @@ void write_typeformatstring(FILE *file, print_file(file, indent, "\n"); } - -unsigned int get_required_buffer_size(const var_t *var, unsigned int *alignment) +static unsigned int get_required_buffer_size_type( + const type_t *type, int ptr_level, const expr_t *array, + const char *name, unsigned int *alignment) { *alignment = 0; - if (var->ptr_level == 0 && !var->array) + if (ptr_level == 0 && !array && !type_has_ref(type)) { - switch (var->type->type) + switch (type->type) { case RPC_FC_BYTE: case RPC_FC_CHAR: @@ -285,13 +312,20 @@ unsigned int get_required_buffer_size(co return 8; default: - error("get_required_buffer_size: Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); + error("get_required_buffer_size: Unknown/unsupported type: %s (0x%02x)\n", name, type->type); return 0; } } + if (ptr_level == 0 && type_has_ref(type)) + return get_required_buffer_size_type(type->ref, 0 /* FIXME */, array, name, alignment); return 0; } +unsigned int get_required_buffer_size(const var_t *var, unsigned int *alignment) +{ + return get_required_buffer_size_type(var->type, var->ptr_level, var->array, var->name, alignment); +} + void marshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type_offset, enum pass pass) { @@ -643,14 +677,23 @@ void unmarshall_arguments(FILE *file, in } +static size_t get_size_typeformatstring_type(const type_t *type, int ptr_level, + const expr_t *array, const char *name) +{ + return write_typeformatstring_type(NULL, 0, type, ptr_level, array, name); +} + + size_t get_size_procformatstring_var(var_t *var) { unsigned int type_offset = 2; - return write_procformatstring_var(NULL, 0, var, FALSE, &type_offset); + return write_procformatstring_type(NULL, 0, var->type, + var->ptr_level, var->array, var->name, FALSE, FALSE, FALSE, &type_offset); } size_t get_size_typeformatstring_var(var_t *var) { - return write_typeformatstring_var(NULL, 0, var); + return write_typeformatstring_type(NULL, 0, var->type, var->ptr_level, + var->array, var->name); }

1 0

Robert Shearman : widl: Handle marshaling and unmarshaling structures.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 7fb311b49f3c86ee78e4be97bbfee66e3ecc46b4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7fb311b49f3c86ee78e4be9… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:22:05 2005 +0100 widl: Handle marshaling and unmarshaling structures. --- tools/widl/typegen.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 42 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 1ed4ec7..f1f791d 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -428,11 +428,32 @@ void marshall_arguments(FILE *file, int } else { + const char *ndrtype; + switch (var->type->type) { + case RPC_FC_STRUCT: + ndrtype = "SimpleStruct"; + break; + case RPC_FC_CSTRUCT: + case RPC_FC_CPSTRUCT: + ndrtype = "ConformantStruct"; + break; + case RPC_FC_CVSTRUCT: + ndrtype = "ConformantVaryingStruct"; + break; + case RPC_FC_BOGUS_STRUCT: + ndrtype = "ComplexStruct"; + break; default: - error("marshall_arguments: Unsupported type: %s (0x%02x, ptr_level: 1)\n", var->name, var->type->type); + error("marshall_arguments: Unsupported type: %s (0x%02x, ptr_level: %d)\n", + var->name, var->type->type, var->ptr_level); + ndrtype = NULL; } + + print_file(file, indent, + "Ndr%sMarshall(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d]);\n", + ndrtype, var->name, *type_offset); } last_size = 1; } @@ -583,12 +604,32 @@ void unmarshall_arguments(FILE *file, in } else { + const char *ndrtype; + switch (var->type->type) { + case RPC_FC_STRUCT: + ndrtype = "SimpleStruct"; + break; + case RPC_FC_CSTRUCT: + case RPC_FC_CPSTRUCT: + ndrtype = "ConformantStruct"; + break; + case RPC_FC_CVSTRUCT: + ndrtype = "ConformantVaryingStruct"; + break; + case RPC_FC_BOGUS_STRUCT: + ndrtype = "ComplexStruct"; + break; default: error("unmarshall_arguments: Unsupported type: %s (0x%02x, ptr_level: %d)\n", var->name, var->type->type, var->ptr_level); + ndrtype = NULL; } + + print_file(file, indent, + "Ndr%sUnmarshall(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d], 0);\n", + ndrtype, var->name, *type_offset); } last_size = 1; }

1 0

Robert Shearman : widl: Out parameters.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 4acabfd719b18e6529995ad9c961c0fa0ed55541 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4acabfd719b18e6529995ad… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:21:38 2005 +0100 widl: Out parameters. Marshall and unmarshall out parameters for servers and clients respectively. Write out array components for declared local variables in generated server code. --- tools/widl/client.c | 2 ++ tools/widl/header.c | 2 +- tools/widl/header.h | 1 + tools/widl/server.c | 3 +++ 4 files changed, 7 insertions(+), 1 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 2c85e4a..f2d8ea2 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -210,6 +210,8 @@ static void write_function_stubs(type_t print_client("_StubMsg.BufferStart = (unsigned char *)_RpcMessage.Buffer;\n"); print_client("_StubMsg.BufferEnd = _StubMsg.BufferStart + _RpcMessage.BufferLength;\n\n"); + unmarshall_arguments(client, indent, func, &type_offset, PASS_OUT); + /* unmarshal return value */ if (!is_void(def->type, NULL)) { diff --git a/tools/widl/header.c b/tools/widl/header.c index b60cf8e..3b85adb 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -115,7 +115,7 @@ const char* get_name(const var_t *v) return v->name; } -static void write_array(FILE *h, const expr_t *v, int field) +void write_array(FILE *h, const expr_t *v, int field) { if (!v) return; while (NEXT_LINK(v)) v = NEXT_LINK(v); diff --git a/tools/widl/header.h b/tools/widl/header.h index 8adf929..de38a70 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -32,6 +32,7 @@ extern int is_object(attr_t *a); extern int is_local(attr_t *a); extern var_t *is_callas(attr_t *a); extern void write_args(FILE *h, var_t *arg, const char *name, int obj, int do_indent); +extern void write_array(FILE *h, const expr_t *v, int field); extern void write_forward(type_t *iface); extern void write_interface(type_t *iface); extern void write_dispinterface(type_t *iface); diff --git a/tools/widl/server.c b/tools/widl/server.c index ca4d0bd..61c688a 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -153,6 +153,7 @@ static void write_function_stubs(type_t write_type(server, var->type, var, var->tname); fprintf(server, " "); write_name(server, var); + write_array(server, var->array, 0); fprintf(server, ";\n"); var = PREV_LINK(var); @@ -293,6 +294,8 @@ static void write_function_stubs(type_t fprintf(server, "\n"); } + marshall_arguments(server, indent, func, &type_offset, PASS_OUT); + /* marshall the return value */ if (!is_void(def->type, NULL)) {

1 0

Robert Shearman : widl: Remove some duplication.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: e0dd7b6ed862b551e8e57ae115087b51af277ab1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e0dd7b6ed862b551e8e57ae… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:20:59 2005 +0100 widl: Remove some duplication. Remove some duplicated code by calling an improved get_required_buffer_size. Add some more newlines in the generated code to separate separate stages. Calculate the buffer size of [out] arguments in generated server code. Fix the direction passed into unmarshall_arguments. --- tools/widl/client.c | 46 +++++++--------------------------------------- tools/widl/server.c | 34 +++++++++++++++++++++++++++++++--- tools/widl/typegen.c | 23 +++++++++++++++++------ tools/widl/typegen.h | 2 +- 4 files changed, 56 insertions(+), 49 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 7bb5658..2c85e4a 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -76,43 +76,11 @@ static void print_message_buffer_size(fu while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - unsigned int alignment = 8; - - switch (var->type->type) - { - case RPC_FC_BYTE: - case RPC_FC_CHAR: - case RPC_FC_USMALL: - case RPC_FC_SMALL: - total_size += 1; - alignment = 1; - break; - - case RPC_FC_WCHAR: - case RPC_FC_USHORT: - case RPC_FC_SHORT: - total_size += 2 + alignment % 2; - alignment = 2; - break; - - case RPC_FC_ULONG: - case RPC_FC_LONG: - case RPC_FC_FLOAT: - case RPC_FC_ERROR_STATUS_T: - total_size += 4 + alignment % 4; - alignment = 4; - break; - - case RPC_FC_HYPER: - case RPC_FC_DOUBLE: - total_size += 8 + alignment % 8; - alignment = 8; - break; - - default: - alignment = 1; - } - + unsigned int alignment; + + total_size += get_required_buffer_size(var, &alignment); + total_size += alignment; + var = PREV_LINK(var); } } @@ -236,11 +204,11 @@ static void write_function_stubs(type_t print_client("NdrSendReceive(\n"); indent++; print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); - print_client("(unsigned char *)_StubMsg.Buffer);\n"); + print_client("(unsigned char *)_StubMsg.Buffer);\n\n"); indent--; print_client("_StubMsg.BufferStart = (unsigned char *)_RpcMessage.Buffer;\n"); - print_client("_StubMsg.BufferEnd = _StubMsg.BufferStart + _RpcMessage.BufferLength;\n"); + print_client("_StubMsg.BufferEnd = _StubMsg.BufferStart + _RpcMessage.BufferLength;\n\n"); /* unmarshal return value */ if (!is_void(def->type, NULL)) diff --git a/tools/widl/server.c b/tools/widl/server.c index e62acce..ca4d0bd 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -101,6 +101,7 @@ static void write_function_stubs(type_t while (func) { var_t *def = func->def; + unsigned long buffer_size = 0; /* check for a defined binding handle */ explicit_handle_var = get_explicit_handle_var(func); @@ -198,7 +199,7 @@ static void write_function_stubs(type_t indent -= 2; fprintf(server, "\n"); - unmarshall_arguments(server, indent, func, &type_offset, PASS_OUT); + unmarshall_arguments(server, indent, func, &type_offset, PASS_IN); } print_server("if (_StubMsg.Buffer > _StubMsg.BufferEnd)\n"); @@ -252,11 +253,34 @@ static void write_function_stubs(type_t fprintf(server, "();\n"); } - /* marshall the return value */ + if (func->args) + { + var_t *var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + if (is_attr(var->attrs, ATTR_OUT)) + { + unsigned int alignment; + buffer_size += get_required_buffer_size(var, &alignment); + buffer_size += alignment; + } + + var = PREV_LINK(var); + } + } + if (!is_void(def->type, NULL)) { + unsigned int alignment; + buffer_size += get_required_buffer_size(def, &alignment); + buffer_size += alignment; + } + + if (buffer_size) + { fprintf(server, "\n"); - print_server("_StubMsg.BufferLength = %uU;\n", get_required_buffer_size(def->type)); + print_server("_StubMsg.BufferLength = %uU;\n", buffer_size); print_server("_pRpcMessage->BufferLength = _StubMsg.BufferLength;\n"); fprintf(server, "\n"); print_server("_Status = I_RpcGetBuffer(_pRpcMessage);\n"); @@ -267,7 +291,11 @@ static void write_function_stubs(type_t fprintf(server, "\n"); print_server("_StubMsg.Buffer = (unsigned char *)_pRpcMessage->Buffer;\n"); fprintf(server, "\n"); + } + /* marshall the return value */ + if (!is_void(def->type, NULL)) + { print_server("*("); write_type(server, def->type, def, def->tname); fprintf(server, " *)_StubMsg.Buffer = _RetVal;\n"); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 5248689..1ed4ec7 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -253,32 +253,43 @@ void write_typeformatstring(FILE *file, } -unsigned int get_required_buffer_size(type_t *type) +unsigned int get_required_buffer_size(const var_t *var, unsigned int *alignment) { - switch(type->type) + *alignment = 0; + if (var->ptr_level == 0 && !var->array) { + switch (var->type->type) + { case RPC_FC_BYTE: case RPC_FC_CHAR: + case RPC_FC_USMALL: + case RPC_FC_SMALL: + return 1; + case RPC_FC_WCHAR: case RPC_FC_USHORT: case RPC_FC_SHORT: - case RPC_FC_USMALL: - case RPC_FC_SMALL: + *alignment = 2; + return 2; + case RPC_FC_ULONG: case RPC_FC_LONG: case RPC_FC_FLOAT: - case RPC_FC_IGNORE: case RPC_FC_ERROR_STATUS_T: + *alignment = 4; return 4; case RPC_FC_HYPER: case RPC_FC_DOUBLE: + *alignment = 8; return 8; default: - error("Unknown/unsupported type: %s (0x%02x)\n", type->name, type->type); + error("get_required_buffer_size: Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); return 0; + } } + return 0; } void marshall_arguments(FILE *file, int indent, func_t *func, diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index e494383..2660400 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -29,7 +29,7 @@ enum pass void write_procformatstring(FILE *file, type_t *iface); void write_typeformatstring(FILE *file, type_t *iface); -unsigned int get_required_buffer_size(type_t *type); +unsigned int get_required_buffer_size(const var_t *var, unsigned int *alignment); void marshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type_offset, enum pass pass); void unmarshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type_offset, enum pass pass); size_t get_size_procformatstring_var(var_t *var);

1 0

Robert Shearman : widl: Pass a state into marshall_arguments and unmarshall_arguments to
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 7e5cf94f13e44b3e287958b3973ce6c587dc7759 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7e5cf94f13e44b3e287958b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:14:28 2005 +0100 widl: Pass a state into marshall_arguments and unmarshall_arguments to decide which parameters should be considered based on their direction. --- tools/widl/client.c | 2 +- tools/widl/server.c | 2 +- tools/widl/typegen.c | 46 ++++++++++++++++++++++++++++++++++++++++++++-- tools/widl/typegen.h | 11 +++++++++-- 4 files changed, 55 insertions(+), 6 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 56b8f91..7bb5658 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -227,7 +227,7 @@ static void write_function_stubs(type_t /* marshal arguments */ - marshall_arguments(client, indent, func, &type_offset); + marshall_arguments(client, indent, func, &type_offset, PASS_IN); /* send/receive message */ /* print_client("NdrNsSendReceive(\n"); */ diff --git a/tools/widl/server.c b/tools/widl/server.c index 005d85b..e62acce 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -198,7 +198,7 @@ static void write_function_stubs(type_t indent -= 2; fprintf(server, "\n"); - unmarshall_arguments(server, indent, func, &type_offset); + unmarshall_arguments(server, indent, func, &type_offset, PASS_OUT); } print_server("if (_StubMsg.Buffer > _StubMsg.BufferEnd)\n"); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 1cf6c2d..5248689 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -281,7 +281,8 @@ unsigned int get_required_buffer_size(ty } } -void marshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type_offset) +void marshall_arguments(FILE *file, int indent, func_t *func, + unsigned int *type_offset, enum pass pass) { unsigned int last_size = 0; var_t *var; @@ -293,6 +294,26 @@ void marshall_arguments(FILE *file, int while (NEXT_LINK(var)) var = NEXT_LINK(var); for (; var; *type_offset += get_size_typeformatstring_var(var), var = PREV_LINK(var)) { + int in_attr = is_attr(var->attrs, ATTR_IN); + int out_attr = is_attr(var->attrs, ATTR_OUT); + + if (!in_attr && !out_attr) + in_attr = 1; + + switch (pass) + { + case PASS_IN: + if (!in_attr) + continue; + break; + case PASS_OUT: + if (!out_attr) + continue; + break; + case PASS_RETURN: + break; + } + if (var->ptr_level == 0 && !var->array) { unsigned int size; @@ -413,7 +434,8 @@ void marshall_arguments(FILE *file, int } } -void unmarshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type_offset) +void unmarshall_arguments(FILE *file, int indent, func_t *func, + unsigned int *type_offset, enum pass pass) { unsigned int last_size = 0; var_t *var; @@ -425,6 +447,26 @@ void unmarshall_arguments(FILE *file, in while (NEXT_LINK(var)) var = NEXT_LINK(var); for (; var; *type_offset += get_size_typeformatstring_var(var), var = PREV_LINK(var)) { + int in_attr = is_attr(var->attrs, ATTR_IN); + int out_attr = is_attr(var->attrs, ATTR_OUT); + + if (!in_attr && !out_attr) + in_attr = 1; + + switch (pass) + { + case PASS_IN: + if (!in_attr) + continue; + break; + case PASS_OUT: + if (!out_attr) + continue; + break; + case PASS_RETURN: + break; + } + if (var->ptr_level == 0 && !var->array) { unsigned int size; diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index c444132..e494383 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -20,10 +20,17 @@ */ +enum pass +{ + PASS_IN, + PASS_OUT, + PASS_RETURN +}; + void write_procformatstring(FILE *file, type_t *iface); void write_typeformatstring(FILE *file, type_t *iface); unsigned int get_required_buffer_size(type_t *type); -void marshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type_offset); -void unmarshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type_offset); +void marshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type_offset, enum pass pass); +void unmarshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type_offset, enum pass pass); size_t get_size_procformatstring_var(var_t *var); size_t get_size_typeformatstring_var(var_t *var);

1 0

Robert Shearman : widl: Generate marshaling and unmarshaling statements for arrays.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 24d1b71d918cbbe1e9fb0608d852a5c735a720b1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=24d1b71d918cbbe1e9fb060… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:13:41 2005 +0100 widl: Generate marshaling and unmarshaling statements for arrays. --- tools/widl/typegen.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 62 insertions(+), 6 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index c68c4a6..1cf6c2d 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -351,8 +351,8 @@ void marshall_arguments(FILE *file, int last_size = size; } - else if (var->ptr_level == 1 || - (var->ptr_level == 0 && var->array && !NEXT_LINK(var->array))) + else if ((var->ptr_level == 1 && !var->array) || + (var->ptr_level == 0 && var->array)) { if (is_attr(var->attrs, ATTR_STRING)) { @@ -368,6 +368,32 @@ void marshall_arguments(FILE *file, int error("marshall_arguments: Unsupported [string] type: %s (0x%02x, ptr_level: 1)\n", var->name, var->type->type); } } + else if (var->array) + { + const expr_t *length_is = get_attrp(var->attrs, ATTR_LENGTHIS); + const expr_t *size_is = get_attrp(var->attrs, ATTR_SIZEIS); + const char *array_type; + int has_length = length_is && (length_is->type != EXPR_VOID); + int has_size = size_is && (size_is->type != EXPR_VOID) && !var->array->is_const; + + if (NEXT_LINK(var->array)) /* multi-dimensional array */ + array_type = "ComplexArray"; + else + { + if (!has_length && !has_size) + array_type = "FixedArray"; + else if (has_length && !has_size) + array_type = "VaryingArray"; + else if (!has_length && has_size) + array_type = "ConformantArray"; + else + array_type = "ConformantVaryingArray"; + } + + print_file(file, indent, + "Ndr%sMarshall(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d]);\n", + array_type, var->name, *type_offset); + } else { switch (var->type->type) @@ -383,6 +409,7 @@ void marshall_arguments(FILE *file, int error("marshall_arguments: Pointer level %d not supported for variable %s\n", var->ptr_level, var->name); last_size = 1; } + fprintf(file, "\n"); } } @@ -457,8 +484,8 @@ void unmarshall_arguments(FILE *file, in last_size = size; } - else if (var->ptr_level == 1 || - (var->ptr_level == 0 && var->array && !NEXT_LINK(var->array))) + else if ((var->ptr_level == 1 && !var->array) || + (var->ptr_level == 0 && var->array)) { if (is_attr(var->attrs, ATTR_STRING)) { @@ -471,15 +498,43 @@ void unmarshall_arguments(FILE *file, in var->name, *type_offset); break; default: - error("unmarshall_arguments: Unsupported [string] type: %s (0x%02x, ptr_level: 1)\n", var->name, var->type->type); + error("unmarshall_arguments: Unsupported [string] type: %s (0x%02x, ptr_level: %d)\n", + var->name, var->type->type, var->ptr_level); } } + else if (var->array) + { + const expr_t *length_is = get_attrp(var->attrs, ATTR_LENGTHIS); + const expr_t *size_is = get_attrp(var->attrs, ATTR_SIZEIS); + const char *array_type; + int has_length = length_is && (length_is->type != EXPR_VOID); + int has_size = size_is && (size_is->type != EXPR_VOID) && !var->array->is_const; + + if (NEXT_LINK(var->array)) /* multi-dimensional array */ + array_type = "ComplexArray"; + else + { + if (!has_length && !has_size) + array_type = "FixedArray"; + else if (has_length && !has_size) + array_type = "VaryingArray"; + else if (!has_length && has_size) + array_type = "ConformantArray"; + else + array_type = "ConformantVaryingArray"; + } + + print_file(file, indent, + "Ndr%sUnmarshall(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d], 0);\n", + array_type, var->name, *type_offset); + } else { switch (var->type->type) { default: - error("unmarshall_arguments: Unsupported type: %s (0x%02x, ptr_level: 1)\n", var->name, var->type->type); + error("unmarshall_arguments: Unsupported type: %s (0x%02x, ptr_level: %d)\n", + var->name, var->type->type, var->ptr_level); } } last_size = 1; @@ -489,6 +544,7 @@ void unmarshall_arguments(FILE *file, in error("unmarshall_arguments: Pointer level %d not supported for variable %s\n", var->ptr_level, var->name); last_size = 1; } + fprintf(file, "\n"); } }

1 0

Robert Shearman : widl: Treat variables with array indices the same as pointers.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 25116ae360012e7568e091fd790eaf676e1d1ef9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=25116ae360012e7568e091f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:13:04 2005 +0100 widl: Treat variables with array indices the same as pointers. --- tools/widl/typegen.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index d20f566..c68c4a6 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -293,7 +293,7 @@ void marshall_arguments(FILE *file, int while (NEXT_LINK(var)) var = NEXT_LINK(var); for (; var; *type_offset += get_size_typeformatstring_var(var), var = PREV_LINK(var)) { - if (var->ptr_level == 0) + if (var->ptr_level == 0 && !var->array) { unsigned int size; unsigned int alignment = 0; @@ -351,7 +351,8 @@ void marshall_arguments(FILE *file, int last_size = size; } - else if (var->ptr_level == 1) + else if (var->ptr_level == 1 || + (var->ptr_level == 0 && var->array && !NEXT_LINK(var->array))) { if (is_attr(var->attrs, ATTR_STRING)) { @@ -397,7 +398,7 @@ void unmarshall_arguments(FILE *file, in while (NEXT_LINK(var)) var = NEXT_LINK(var); for (; var; *type_offset += get_size_typeformatstring_var(var), var = PREV_LINK(var)) { - if (var->ptr_level == 0) + if (var->ptr_level == 0 && !var->array) { unsigned int size; unsigned int alignment = 0; @@ -456,7 +457,8 @@ void unmarshall_arguments(FILE *file, in last_size = size; } - else if (var->ptr_level == 1) + else if (var->ptr_level == 1 || + (var->ptr_level == 0 && var->array && !NEXT_LINK(var->array))) { if (is_attr(var->attrs, ATTR_STRING)) {

1 0

Robert Shearman : widl: Advance the type format string whilst marshaling and
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: c0f4605b82528e5c27e2e07598fb848d7a296b91 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c0f4605b82528e5c27e2e07… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:12:46 2005 +0100 widl: Advance the type format string whilst marshaling and unmarshaling arguments. --- tools/widl/typegen.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f082b8c..d20f566 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -291,7 +291,7 @@ void marshall_arguments(FILE *file, int var = func->args; while (NEXT_LINK(var)) var = NEXT_LINK(var); - for (; var; var = PREV_LINK(var)) + for (; var; *type_offset += get_size_typeformatstring_var(var), var = PREV_LINK(var)) { if (var->ptr_level == 0) { @@ -395,7 +395,7 @@ void unmarshall_arguments(FILE *file, in var = func->args; while (NEXT_LINK(var)) var = NEXT_LINK(var); - for (; var; var = PREV_LINK(var)) + for (; var; *type_offset += get_size_typeformatstring_var(var), var = PREV_LINK(var)) { if (var->ptr_level == 0) {

1 0

Robert Shearman : widl: Convert the main while loops in marshall_arguments and
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: c8703d17b0b6c1fd672f557a085f0bb6b37a7b79 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c8703d17b0b6c1fd672f557… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:12:26 2005 +0100 widl: Convert the main while loops in marshall_arguments and unmarshall_arguments into for loops. --- tools/widl/typegen.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 48c18b4..f082b8c 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -291,7 +291,7 @@ void marshall_arguments(FILE *file, int var = func->args; while (NEXT_LINK(var)) var = NEXT_LINK(var); - while (var) + for (; var; var = PREV_LINK(var)) { if (var->ptr_level == 0) { @@ -382,8 +382,6 @@ void marshall_arguments(FILE *file, int error("marshall_arguments: Pointer level %d not supported for variable %s\n", var->ptr_level, var->name); last_size = 1; } - - var = PREV_LINK(var); } } @@ -397,7 +395,7 @@ void unmarshall_arguments(FILE *file, in var = func->args; while (NEXT_LINK(var)) var = NEXT_LINK(var); - while (var) + for (; var; var = PREV_LINK(var)) { if (var->ptr_level == 0) { @@ -489,8 +487,6 @@ void unmarshall_arguments(FILE *file, in error("unmarshall_arguments: Pointer level %d not supported for variable %s\n", var->ptr_level, var->name); last_size = 1; } - - var = PREV_LINK(var); } }

1 0

Robert Shearman : widl: Add support for marshalling and unmarshalling conformant strings.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 413738810f8fad7553f29b75eacce5b5c1f8cfa0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=413738810f8fad7553f29b7… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:12:03 2005 +0100 widl: Add support for marshalling and unmarshalling conformant strings. --- tools/widl/client.c | 3 ++ tools/widl/server.c | 3 ++ tools/widl/typegen.c | 64 +++++++++++++++++++++++++++++++++++++++++++++----- tools/widl/typegen.h | 4 ++- 4 files changed, 64 insertions(+), 10 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index ba73b35..56b8f91 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -128,6 +128,7 @@ static void write_function_stubs(type_t var_t *var; int method_count = 0; unsigned int proc_offset = 0; + unsigned int type_offset = 2; while (NEXT_LINK(func)) func = NEXT_LINK(func); while (func) @@ -226,7 +227,7 @@ static void write_function_stubs(type_t /* marshal arguments */ - marshall_arguments(client, indent, func); + marshall_arguments(client, indent, func, &type_offset); /* send/receive message */ /* print_client("NdrNsSendReceive(\n"); */ diff --git a/tools/widl/server.c b/tools/widl/server.c index 319094c..005d85b 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -95,6 +95,7 @@ static void write_function_stubs(type_t var_t *var; var_t* explicit_handle_var; unsigned int proc_offset = 0; + unsigned int type_offset = 2; while (NEXT_LINK(func)) func = NEXT_LINK(func); while (func) @@ -197,7 +198,7 @@ static void write_function_stubs(type_t indent -= 2; fprintf(server, "\n"); - unmarshall_arguments(server, indent, func); + unmarshall_arguments(server, indent, func, &type_offset); } print_server("if (_StubMsg.Buffer > _StubMsg.BufferEnd)\n"); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 87bf2ab..48c18b4 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -281,7 +281,7 @@ unsigned int get_required_buffer_size(ty } } -void marshall_arguments(FILE *file, int indent, func_t *func) +void marshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type_offset) { unsigned int last_size = 0; var_t *var; @@ -332,8 +332,8 @@ void marshall_arguments(FILE *file, int break; default: + error("marshall_arguments: Unsupported type: %s (0x%02x, ptr_level: 0)\n", var->name, var->type->type); size = 0; - error("Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); } if (alignment != 0) @@ -351,17 +351,43 @@ void marshall_arguments(FILE *file, int last_size = size; } + else if (var->ptr_level == 1) + { + if (is_attr(var->attrs, ATTR_STRING)) + { + switch (var->type->type) + { + case RPC_FC_CHAR: + case RPC_FC_WCHAR: + print_file(file, indent, + "NdrConformantStringMarshall(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d]);\n", + var->name, *type_offset); + break; + default: + error("marshall_arguments: Unsupported [string] type: %s (0x%02x, ptr_level: 1)\n", var->name, var->type->type); + } + } + else + { + switch (var->type->type) + { + default: + error("marshall_arguments: Unsupported type: %s (0x%02x, ptr_level: 1)\n", var->name, var->type->type); + } + } + last_size = 1; + } else { error("marshall_arguments: Pointer level %d not supported for variable %s\n", var->ptr_level, var->name); - last_size = 0; + last_size = 1; } var = PREV_LINK(var); } } -void unmarshall_arguments(FILE *file, int indent, func_t *func) +void unmarshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type_offset) { unsigned int last_size = 0; var_t *var; @@ -413,8 +439,8 @@ void unmarshall_arguments(FILE *file, in break; default: + error("unmarshall_arguments: Unsupported type: %s (0x%02x, ptr_level: 0)\n", var->name, var->type->type); size = 0; - error("Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); } if (alignment != 0) @@ -432,10 +458,36 @@ void unmarshall_arguments(FILE *file, in last_size = size; } + else if (var->ptr_level == 1) + { + if (is_attr(var->attrs, ATTR_STRING)) + { + switch (var->type->type) + { + case RPC_FC_CHAR: + case RPC_FC_WCHAR: + print_file(file, indent, + "NdrConformantStringUnmarshall(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d], 0);\n", + var->name, *type_offset); + break; + default: + error("unmarshall_arguments: Unsupported [string] type: %s (0x%02x, ptr_level: 1)\n", var->name, var->type->type); + } + } + else + { + switch (var->type->type) + { + default: + error("unmarshall_arguments: Unsupported type: %s (0x%02x, ptr_level: 1)\n", var->name, var->type->type); + } + } + last_size = 1; + } else { error("unmarshall_arguments: Pointer level %d not supported for variable %s\n", var->ptr_level, var->name); - last_size = 0; + last_size = 1; } var = PREV_LINK(var); diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index fe8dc38..c444132 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -23,7 +23,7 @@ void write_procformatstring(FILE *file, type_t *iface); void write_typeformatstring(FILE *file, type_t *iface); unsigned int get_required_buffer_size(type_t *type); -void marshall_arguments(FILE *file, int indent, func_t *func); -void unmarshall_arguments(FILE *file, int indent, func_t *func); +void marshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type_offset); +void unmarshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type_offset); size_t get_size_procformatstring_var(var_t *var); size_t get_size_typeformatstring_var(var_t *var);

1 0

Robert Shearman : widl: Add some const attributes.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 7f2419ceed5c90130a8ac2062d6daa5f2e487930 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7f2419ceed5c90130a8ac20… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:11:33 2005 +0100 widl: Add some const attributes. --- tools/widl/header.c | 46 +++++++++++++++++++++++----------------------- tools/widl/header.h | 20 ++++++++++---------- tools/widl/parser.y | 6 +++--- tools/widl/proxy.c | 6 +++--- tools/widl/write_msft.c | 2 +- 5 files changed, 40 insertions(+), 40 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index f68844b..b60cf8e 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -46,7 +46,7 @@ static void indent(FILE *h, int delta) if (delta > 0) indentation += delta; } -int is_attr(attr_t *a, enum attr_type t) +int is_attr(const attr_t *a, enum attr_type t) { while (a) { if (a->type == t) return 1; @@ -55,7 +55,7 @@ int is_attr(attr_t *a, enum attr_type t) return 0; } -void *get_attrp(attr_t *a, enum attr_type t) +void *get_attrp(const attr_t *a, enum attr_type t) { while (a) { if (a->type == t) return a->u.pval; @@ -64,7 +64,7 @@ void *get_attrp(attr_t *a, enum attr_typ return NULL; } -unsigned long get_attrv(attr_t *a, enum attr_type t) +unsigned long get_attrv(const attr_t *a, enum attr_type t) { while (a) { if (a->type == t) return a->u.ival; @@ -73,7 +73,7 @@ unsigned long get_attrv(attr_t *a, enum return 0; } -int is_void(type_t *t, var_t *v) +int is_void(const type_t *t, const var_t *v) { if (v && v->ptr_level) return 0; if (!t->type && !t->ref) return 1; @@ -90,7 +90,7 @@ static void write_guid(const char *guid_ uuid->Data4[6], uuid->Data4[7]); } -static void write_pident(FILE *h, var_t *v) +static void write_pident(FILE *h, const var_t *v) { int c; for (c=0; c<v->ptr_level; c++) { @@ -99,7 +99,7 @@ static void write_pident(FILE *h, var_t if (v->name) fprintf(h, "%s", v->name); } -void write_name(FILE *h, var_t *v) +void write_name(FILE *h, const var_t *v) { if (is_attr( v->attrs, ATTR_PROPGET )) fprintf(h, "get_" ); @@ -110,12 +110,12 @@ void write_name(FILE *h, var_t *v) fprintf(h, "%s", v->name); } -char* get_name(var_t *v) +const char* get_name(const var_t *v) { return v->name; } -static void write_array(FILE *h, expr_t *v, int field) +static void write_array(FILE *h, const expr_t *v, int field) { if (!v) return; while (NEXT_LINK(v)) v = NEXT_LINK(v); @@ -199,7 +199,7 @@ static void write_enums(FILE *h, var_t * fprintf(h, "\n"); } -void write_type(FILE *h, type_t *t, var_t *v, const char *n) +void write_type(FILE *h, type_t *t, const var_t *v, const char *n) { int c; @@ -381,10 +381,10 @@ void write_user_types(void) } } -void write_typedef(type_t *type, var_t *names) +void write_typedef(type_t *type, const var_t *names) { char *tname = names->tname; - var_t *lname; + const var_t *lname; while (NEXT_LINK(names)) names = NEXT_LINK(names); lname = names; fprintf(header, "typedef "); @@ -477,14 +477,14 @@ void write_expr(FILE *h, expr_t *e) do_write_expr(h, e, 0); } -void write_constdef(var_t *v) +void write_constdef(const var_t *v) { fprintf(header, "#define %s (", get_name(v)); write_expr(header, v->eval); fprintf(header, ")\n\n"); } -void write_externdef(var_t *v) +void write_externdef(const var_t *v) { fprintf(header, "extern const "); write_type(header, v->type, NULL, v->tname); @@ -545,7 +545,7 @@ var_t *is_callas(attr_t *a) return get_attrp(a, ATTR_CALLAS); } -static int write_method_macro(type_t *iface, char *name) +static int write_method_macro(const type_t *iface, const char *name) { int idx; func_t *cur = iface->funcs; @@ -636,7 +636,7 @@ void write_args(FILE *h, var_t *arg, con if (do_indent) indentation--; } -static void write_cpp_method_def(type_t *iface) +static void write_cpp_method_def(const type_t *iface) { func_t *cur = iface->funcs; @@ -659,7 +659,7 @@ static void write_cpp_method_def(type_t } } -static void do_write_c_method_def(type_t *iface, char *name) +static void do_write_c_method_def(const type_t *iface, char *name) { func_t *cur = iface->funcs; @@ -685,17 +685,17 @@ static void do_write_c_method_def(type_t } } -static void write_c_method_def(type_t *iface) +static void write_c_method_def(const type_t *iface) { do_write_c_method_def(iface, iface->name); } -static void write_c_disp_method_def(type_t *iface) +static void write_c_disp_method_def(const type_t *iface) { do_write_c_method_def(iface->ref, iface->name); } -static void write_method_proto(type_t *iface) +static void write_method_proto(const type_t *iface) { func_t *cur = iface->funcs; @@ -759,7 +759,7 @@ static void write_method_proto(type_t *i } } -static void write_function_proto(type_t *iface) +static void write_function_proto(const type_t *iface) { char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); int explicit_handle = is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE); @@ -816,13 +816,13 @@ void write_forward(type_t *iface) } } -static void write_iface_guid(type_t *iface) +static void write_iface_guid(const type_t *iface) { UUID *uuid = get_attrp(iface->attrs, ATTR_UUID); write_guid("IID", iface->name, uuid); } -static void write_dispiface_guid(type_t *iface) +static void write_dispiface_guid(const type_t *iface) { UUID *uuid = get_attrp(iface->attrs, ATTR_UUID); write_guid("DIID", iface->name, uuid); @@ -895,7 +895,7 @@ static void write_com_interface(type_t * fprintf(header,"\n#endif /* __%s_INTERFACE_DEFINED__ */\n\n", iface->name); } -static void write_rpc_interface(type_t *iface) +static void write_rpc_interface(const type_t *iface) { unsigned long ver = get_attrv(iface->attrs, ATTR_VERSION); char *var = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); diff --git a/tools/widl/header.h b/tools/widl/header.h index c649513..8adf929 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -21,13 +21,13 @@ #ifndef __WIDL_HEADER_H #define __WIDL_HEADER_H -extern int is_attr(attr_t *a, enum attr_type t); -extern void *get_attrp(attr_t *a, enum attr_type t); -extern unsigned long get_attrv(attr_t *a, enum attr_type t); -extern int is_void(type_t *t, var_t *v); -extern void write_name(FILE *h, var_t *v); -extern char* get_name(var_t *v); -extern void write_type(FILE *h, type_t *t, var_t *v, const char *n); +extern int is_attr(const attr_t *a, enum attr_type t); +extern void *get_attrp(const attr_t *a, enum attr_type t); +extern unsigned long get_attrv(const attr_t *a, enum attr_type t); +extern int is_void(const type_t *t, const var_t *v); +extern void write_name(FILE *h, const var_t *v); +extern const char* get_name(const var_t *v); +extern void write_type(FILE *h, type_t *t, const var_t *v, const char *n); extern int is_object(attr_t *a); extern int is_local(attr_t *a); extern var_t *is_callas(attr_t *a); @@ -36,10 +36,10 @@ extern void write_forward(type_t *iface) extern void write_interface(type_t *iface); extern void write_dispinterface(type_t *iface); extern void write_coclass(class_t *iface); -extern void write_typedef(type_t *type, var_t *names); +extern void write_typedef(type_t *type, const var_t *names); extern void write_expr(FILE *h, expr_t *e); -extern void write_constdef(var_t *v); -extern void write_externdef(var_t *v); +extern void write_constdef(const var_t *v); +extern void write_externdef(const var_t *v); extern void write_library(const char *name, attr_t *attr); extern void write_user_types(void); extern var_t* get_explicit_handle_var(func_t* func); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index a556108..7c32944 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -84,7 +84,7 @@ static var_t *make_var(char *name); static func_t *make_func(var_t *def, var_t *args); static class_t *make_class(char *name); -static type_t *reg_type(type_t *type, char *name, int t); +static type_t *reg_type(type_t *type, const char *name, int t); static type_t *reg_types(type_t *type, var_t *names, int t); static type_t *find_type(const char *name, int t); static type_t *find_type2(char *name, int t); @@ -1102,7 +1102,7 @@ static int hash_ident(const char *name) /***** type repository *****/ struct rtype { - char *name; + const char *name; type_t *type; int t; struct rtype *next; @@ -1110,7 +1110,7 @@ struct rtype { struct rtype *type_hash[HASHMAX]; -static type_t *reg_type(type_t *type, char *name, int t) +static type_t *reg_type(type_t *type, const char *name, int t) { struct rtype *nt; int hash; diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index c91d388..988f1e7 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -206,7 +206,7 @@ static void proxy_check_pointers( var_t static void marshall_size_arg( var_t *arg ) { int index = 0; - type_t *type = get_base_type(arg); + const type_t *type = get_base_type(arg); expr_t *expr; expr = get_attrp( arg->attrs, ATTR_SIZEIS ); @@ -728,7 +728,7 @@ static void stub_genmarshall( var_t *arg stub_gen_marshall_copydata( args ); } -static void gen_stub(type_t *iface, func_t *cur, char *cas) +static void gen_stub(type_t *iface, func_t *cur, const char *cas) { var_t *def = cur->def; var_t *arg; @@ -892,7 +892,7 @@ static void write_proxy(type_t *iface) var_t *def = cur->def; if (!is_local(def->attrs)) { var_t *cas = is_callas(def->attrs); - char *cname = cas ? cas->name : NULL; + const char *cname = cas ? cas->name : NULL; int idx = cur->idx; if (cname) { func_t *m = iface->funcs; diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 220fc50..bf1806b 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1627,7 +1627,7 @@ static HRESULT add_impl_type(msft_typein } static msft_typeinfo_t *create_msft_typeinfo(msft_typelib_t *typelib, enum type_kind kind, - char *name, attr_t *attr, int idx) + const char *name, attr_t *attr, int idx) { msft_typeinfo_t *msft_typeinfo; int nameoffset;

1 0

Robert Shearman : widl: Prepare marshall and unmarshall code generation functions for
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 73dff5c465224a7b4e9708c16125e8ae18097ebd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=73dff5c465224a7b4e9708c… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:09:36 2005 +0100 widl: Prepare marshall and unmarshall code generation functions for accepting pointers. --- tools/widl/typegen.c | 219 +++++++++++++++++++++++++++----------------------- 1 files changed, 117 insertions(+), 102 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 5f5eb3d..87bf2ab 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -146,7 +146,7 @@ void write_procformatstring(FILE *file, var = PREV_LINK(var); } } - + /* emit return value data */ var = func->def; if (is_void(var->type, NULL)) @@ -283,8 +283,6 @@ unsigned int get_required_buffer_size(ty void marshall_arguments(FILE *file, int indent, func_t *func) { - unsigned int alignment; - unsigned int size; unsigned int last_size = 0; var_t *var; @@ -295,60 +293,69 @@ void marshall_arguments(FILE *file, int while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - alignment = 0; - switch (var->type->type) + if (var->ptr_level == 0) { - case RPC_FC_BYTE: - case RPC_FC_CHAR: - case RPC_FC_SMALL: - case RPC_FC_USMALL: - size = 1; - alignment = 0; - break; + unsigned int size; + unsigned int alignment = 0; + switch (var->type->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + case RPC_FC_USMALL: + size = 1; + alignment = 0; + break; + + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + size = 2; + if (last_size != 0 && last_size < 2) + alignment = (2 - last_size); + break; + + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_FLOAT: + case RPC_FC_ERROR_STATUS_T: + size = 4; + if (last_size != 0 && last_size < 4) + alignment = (4 - last_size); + break; + + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + size = 8; + if (last_size != 0 && last_size < 4) + alignment = (4 - last_size); + break; + + default: + size = 0; + error("Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); + } - case RPC_FC_WCHAR: - case RPC_FC_USHORT: - case RPC_FC_SHORT: - size = 2; - if (last_size != 0 && last_size < 2) - alignment = (2 - last_size); - break; + if (alignment != 0) + print_file(file, indent, "_StubMsg.Buffer += %u;\n", alignment); - case RPC_FC_ULONG: - case RPC_FC_LONG: - case RPC_FC_FLOAT: - case RPC_FC_ERROR_STATUS_T: - size = 4; - if (last_size != 0 && last_size < 4) - alignment = (4 - last_size); - break; - - case RPC_FC_HYPER: - case RPC_FC_DOUBLE: - size = 8; - if (last_size != 0 && last_size < 4) - alignment = (4 - last_size); - break; + print_file(file, indent, "*("); + write_type(file, var->type, var, var->tname); + fprintf(file, " *)_StubMsg.Buffer = "); + write_name(file, var); + fprintf(file, ";\n"); + fprintf(file, "_StubMsg.Buffer += sizeof("); + write_type(file, var->type, var, var->tname); + fprintf(file, ");\n"); + fprintf(file, "\n"); - default: - size = 0; - error("Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); + last_size = size; + } + else + { + error("marshall_arguments: Pointer level %d not supported for variable %s\n", var->ptr_level, var->name); + last_size = 0; } - - if (alignment != 0) - print_file(file, indent, "_StubMsg.Buffer += %u;\n", alignment); - - print_file(file, indent, "*("); - write_type(file, var->type, var, var->tname); - fprintf(file, " *)_StubMsg.Buffer = "); - write_name(file, var); - fprintf(file, ";\n"); - fprintf(file, "_StubMsg.Buffer += sizeof("); - write_type(file, var->type, var, var->tname); - fprintf(file, ");\n"); - fprintf(file, "\n"); - - last_size = size; var = PREV_LINK(var); } @@ -356,8 +363,6 @@ void marshall_arguments(FILE *file, int void unmarshall_arguments(FILE *file, int indent, func_t *func) { - unsigned int alignment; - unsigned int size; unsigned int last_size = 0; var_t *var; @@ -368,60 +373,70 @@ void unmarshall_arguments(FILE *file, in while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - alignment = 0; - switch (var->type->type) + if (var->ptr_level == 0) { - case RPC_FC_BYTE: - case RPC_FC_CHAR: - case RPC_FC_SMALL: - case RPC_FC_USMALL: - size = 1; - alignment = 0; - break; + unsigned int size; + unsigned int alignment = 0; - case RPC_FC_WCHAR: - case RPC_FC_USHORT: - case RPC_FC_SHORT: - size = 2; - if (last_size != 0 && last_size < 2) - alignment = (2 - last_size); - break; + switch (var->type->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + case RPC_FC_USMALL: + size = 1; + alignment = 0; + break; + + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + size = 2; + if (last_size != 0 && last_size < 2) + alignment = (2 - last_size); + break; + + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_FLOAT: + case RPC_FC_ERROR_STATUS_T: + size = 4; + if (last_size != 0 && last_size < 4) + alignment = (4 - last_size); + break; + + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + size = 8; + if (last_size != 0 && last_size < 4) + alignment = (4 - last_size); + break; + + default: + size = 0; + error("Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); + } - case RPC_FC_ULONG: - case RPC_FC_LONG: - case RPC_FC_FLOAT: - case RPC_FC_ERROR_STATUS_T: - size = 4; - if (last_size != 0 && last_size < 4) - alignment = (4 - last_size); - break; + if (alignment != 0) + print_file(file, indent, "_StubMsg.Buffer += %u;\n", alignment); - case RPC_FC_HYPER: - case RPC_FC_DOUBLE: - size = 8; - if (last_size != 0 && last_size < 4) - alignment = (4 - last_size); - break; + print_file(file, indent, ""); + write_name(file, var); + fprintf(file, " = *("); + write_type(file, var->type, var, var->tname); + fprintf(file, " *)_StubMsg.Buffer;\n"); + fprintf(file, "_StubMsg.Buffer += sizeof("); + write_type(file, var->type, var, var->tname); + fprintf(file, ");\n"); + fprintf(file, "\n"); - default: - size = 0; - error("Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); + last_size = size; + } + else + { + error("unmarshall_arguments: Pointer level %d not supported for variable %s\n", var->ptr_level, var->name); + last_size = 0; } - - if (alignment != 0) - print_file(file, indent, "_StubMsg.Buffer += %u;\n", alignment); - - print_file(file, indent, ""); - write_name(file, var); - fprintf(file, " = *("); - write_type(file, var->type, var, var->tname); - fprintf(file, " *)_StubMsg.Buffer;\n"); - fprintf(file, "_StubMsg.Buffer += sizeof("); - write_type(file, var->type, var, var->tname); - fprintf(file, ");\n"); - fprintf(file, "\n"); - - last_size = size; var = PREV_LINK(var); }

1 0

Robert Shearman : widl: Fix SEGVs with client and server code generation when an
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 86c3a2e76a76c430dca2f4024700c22538511b6a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=86c3a2e76a76c430dca2f40… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:08:51 2005 +0100 widl: Fix SEGVs with client and server code generation when an interface has no methods. --- tools/widl/client.c | 54 ++++++++++++++++++++++------------------ tools/widl/server.c | 52 +++++++++++++++++++++------------------ tools/widl/typegen.c | 67 ++++++++++++++++++++++++++------------------------ 3 files changed, 92 insertions(+), 81 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 2d33496..ba73b35 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -403,32 +403,33 @@ static void write_formatdesc( const char static void write_formatstringsdecl(type_t *iface) { - func_t *func; - var_t *var; int byte_count = 1; print_client("#define TYPE_FORMAT_STRING_SIZE %d\n", 3); /* FIXME */ /* determine the proc format string size */ - func = iface->funcs; - while (NEXT_LINK(func)) func = NEXT_LINK(func); - while (func) + if (iface->funcs) { - /* argument list size */ - if (func->args) + func_t *func = iface->funcs; + while (NEXT_LINK(func)) func = NEXT_LINK(func); + while (func) { - var = func->args; - while (NEXT_LINK(var)) var = NEXT_LINK(var); - while (var) + /* argument list size */ + if (func->args) { - byte_count += 2; /* FIXME: determine real size */ - var = PREV_LINK(var); + var_t *var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + byte_count += 2; /* FIXME: determine real size */ + var = PREV_LINK(var); + } } + + /* return value size */ + byte_count += 2; /* FIXME: determine real size */ + func = PREV_LINK(func); } - - /* return value size */ - byte_count += 2; /* FIXME: determine real size */ - func = PREV_LINK(func); } print_client("#define PROC_FORMAT_STRING_SIZE %d\n", byte_count); @@ -492,15 +493,18 @@ void write_client(ifref_t *ifaces) fprintf(client, " */\n"); fprintf(client, "\n"); - write_formatstringsdecl(iface->iface); - write_implicithandledecl(iface->iface); - - write_clientinterfacedecl(iface->iface); - write_stubdescdecl(iface->iface); - write_bindinghandledecl(iface->iface); - - write_function_stubs(iface->iface); - write_stubdescriptor(iface->iface); + if (iface->iface->funcs) + { + write_formatstringsdecl(iface->iface); + write_implicithandledecl(iface->iface); + + write_clientinterfacedecl(iface->iface); + write_stubdescdecl(iface->iface); + write_bindinghandledecl(iface->iface); + + write_function_stubs(iface->iface); + write_stubdescriptor(iface->iface); + } print_client("#if !defined(__RPC_WIN32__)\n"); print_client("#error Invalid build platform for this stub.\n"); diff --git a/tools/widl/server.c b/tools/widl/server.c index b007a8f..319094c 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -428,32 +428,33 @@ static void write_formatdesc( const char static void write_formatstringsdecl(type_t *iface) { - func_t *func; - var_t *var; int byte_count = 1; print_server("#define TYPE_FORMAT_STRING_SIZE %d\n", 3); /* FIXME */ /* determine the proc format string size */ - func = iface->funcs; - while (NEXT_LINK(func)) func = NEXT_LINK(func); - while (func) + if (iface->funcs) { - /* argument list size */ - if (func->args) + func_t *func = iface->funcs; + while (NEXT_LINK(func)) func = NEXT_LINK(func); + while (func) { - var = func->args; - while (NEXT_LINK(var)) var = NEXT_LINK(var); - while (var) + /* argument list size */ + if (func->args) { - byte_count += 2; /* FIXME: determine real size */ - var = PREV_LINK(var); + var_t *var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + byte_count += 2; /* FIXME: determine real size */ + var = PREV_LINK(var); + } } + + /* return value size */ + byte_count += 2; /* FIXME: determine real size */ + func = PREV_LINK(func); } - - /* return value size */ - byte_count += 2; /* FIXME: determine real size */ - func = PREV_LINK(func); } print_server("#define PROC_FORMAT_STRING_SIZE %d\n", byte_count); @@ -503,14 +504,17 @@ void write_server(ifref_t *ifaces) fprintf(server, " */\n"); fprintf(server, "\n"); - write_formatstringsdecl(iface->iface); - write_serverinterfacedecl(iface->iface); - write_stubdescdecl(iface->iface); - - write_function_stubs(iface->iface); - - write_stubdescriptor(iface->iface); - write_dispatchtable(iface->iface); + if (iface->iface->funcs) + { + write_formatstringsdecl(iface->iface); + write_serverinterfacedecl(iface->iface); + write_stubdescdecl(iface->iface); + + write_function_stubs(iface->iface); + + write_stubdescriptor(iface->iface); + write_dispatchtable(iface->iface); + } print_server("#if !defined(__RPC_WIN32__)\n"); print_server("#error Invalid build platform for this stub.\n"); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 09420dc..5f5eb3d 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -119,7 +119,6 @@ static size_t write_procformatstring_var void write_procformatstring(FILE *file, type_t *iface) { int indent = 0; - func_t *func = iface->funcs; var_t *var; unsigned int type_offset = 2; @@ -130,32 +129,34 @@ void write_procformatstring(FILE *file, print_file(file, indent, "{\n"); indent++; - while (NEXT_LINK(func)) func = NEXT_LINK(func); - while (func) + if (iface->funcs) { - /* emit argument data */ - if (func->args) + func_t *func = iface->funcs; + while (NEXT_LINK(func)) func = NEXT_LINK(func); + for (; func; func = PREV_LINK(func)) { - var = func->args; - while (NEXT_LINK(var)) var = NEXT_LINK(var); - while (var) + /* emit argument data */ + if (func->args) { - write_procformatstring_var(file, indent, var, FALSE, &type_offset); - var = PREV_LINK(var); + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + write_procformatstring_var(file, indent, var, FALSE, &type_offset); + var = PREV_LINK(var); + } } + + /* emit return value data */ + var = func->def; + if (is_void(var->type, NULL)) + { + print_file(file, indent, "0x5b, /* FC_END */\n"); + print_file(file, indent, "0x5c, /* FC_PAD */\n"); + } + else + write_procformatstring_var(file, indent, var, TRUE, &type_offset); } - - /* emit return value data */ - var = func->def; - if (is_void(var->type, NULL)) - { - print_file(file, indent, "0x5b, /* FC_END */\n"); - print_file(file, indent, "0x5c, /* FC_PAD */\n"); - } - else - write_procformatstring_var(file, indent, var, TRUE, &type_offset); - - func = PREV_LINK(func); } print_file(file, indent, "0x0\n"); @@ -214,7 +215,6 @@ static size_t write_typeformatstring_var void write_typeformatstring(FILE *file, type_t *iface) { int indent = 0; - func_t *func = iface->funcs; var_t *var; print_file(file, indent, "static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n"); @@ -225,20 +225,23 @@ void write_typeformatstring(FILE *file, indent++; print_file(file, indent, "NdrFcShort(0x0),\n"); - while (NEXT_LINK(func)) func = NEXT_LINK(func); - while (func) + if (iface->funcs) { - if (func->args) + func_t *func = iface->funcs; + while (NEXT_LINK(func)) func = NEXT_LINK(func); + for (; func; func = PREV_LINK(func)) { - var = func->args; - while (NEXT_LINK(var)) var = NEXT_LINK(var); - while (var) + if (func->args) { - write_typeformatstring_var(file, indent, var); - var = PREV_LINK(var); + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + write_typeformatstring_var(file, indent, var); + var = PREV_LINK(var); + } } } - func = PREV_LINK(func); } print_file(file, indent, "0x0\n");

1 0

Robert Shearman : widl: Generate correct proc format strings for [out] and [in, out] parameters.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 73a25d316ddec23509fdd2ff0de3e5ced680bcba URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=73a25d316ddec23509fdd2f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:07:55 2005 +0100 widl: Generate correct proc format strings for [out] and [in, out] parameters. --- tools/widl/typegen.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 5724d96..09420dc 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -96,10 +96,18 @@ static size_t write_procformatstring_var } else { + int in_attr = is_attr(var->attrs, ATTR_IN); + int out_attr = is_attr(var->attrs, ATTR_OUT); + if (is_return) print_file(file, indent, "0x52, /* FC_RETURN_PARAM */\n"); + else if (in_attr && out_attr) + print_file(file, indent, "0x50, /* FC_IN_OUT_PARAM */\n"); + else if (out_attr) + print_file(file, indent, "0x51, /* FC_OUT_PARAM */\n"); else print_file(file, indent, "0x4d, /* FC_IN_PARAM */\n"); + print_file(file, indent, "0x01,\n"); print_file(file, indent, "NdrFcShort(0x%x),\n", *type_offset); size = 4; /* includes param type prefix */

1 0

Robert Shearman : widl: Use the same precendence rule for the conditional operator as in wpp.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: e59dcf53fcd5fbe2cabb500330090bff62480336 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e59dcf53fcd5fbe2cabb500… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:07:08 2005 +0100 widl: Use the same precendence rule for the conditional operator as in wpp. Fixes several shift/reduce warnings. --- tools/widl/parser.y | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 4fc19fb..a556108 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -216,7 +216,7 @@ static type_t std_uhyper = { "MIDL_uhype %type <str> libraryhdr %left ',' -%right COND +%right '?' ':' %left '|' %left '&' %left '-' '+' @@ -480,7 +480,7 @@ m_expr: { $$ = make_expr(EXPR_VOID) expr: aNUM { $$ = make_exprl(EXPR_NUM, $1); } | aHEXNUM { $$ = make_exprl(EXPR_HEXNUM, $1); } | aIDENTIFIER { $$ = make_exprs(EXPR_IDENTIFIER, $1); } - | expr '?' expr ':' expr %prec COND { $$ = make_expr3(EXPR_COND, $1, $3, $5); } + | expr '?' expr ':' expr { $$ = make_expr3(EXPR_COND, $1, $3, $5); } | expr '|' expr { $$ = make_expr2(EXPR_OR , $1, $3); } | expr '&' expr { $$ = make_expr2(EXPR_AND, $1, $3); } | expr '+' expr { $$ = make_expr2(EXPR_ADD, $1, $3); }

1 0

Robert Shearman : widl: Better array support.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 30a9f99bb95707c68c9247cbfafd1d4a878b0f71 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=30a9f99bb95707c68c9247c… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:06:29 2005 +0100 widl: Better array support. Treat variables with array indices the same as pointers when writing out the proc & type format strings. Fix a typo when writing out the proc format string where a non-return type was written out for a return type and vice-versa. --- tools/widl/typegen.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 1e6581a..5724d96 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -59,7 +59,7 @@ static int print_file(FILE *file, int in static size_t write_procformatstring_var(FILE *file, int indent, var_t *var, int is_return, unsigned int *type_offset) { size_t size; - if (var->ptr_level == 0) + if (var->ptr_level == 0 && !var->array) { if (is_return) print_file(file, indent, "0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); @@ -97,9 +97,9 @@ static size_t write_procformatstring_var else { if (is_return) - print_file(file, indent, "0x4d, /* FC_IN_PARAM */\n"); - else print_file(file, indent, "0x52, /* FC_RETURN_PARAM */\n"); + else + print_file(file, indent, "0x4d, /* FC_IN_PARAM */\n"); print_file(file, indent, "0x01,\n"); print_file(file, indent, "NdrFcShort(0x%x),\n", *type_offset); size = 4; /* includes param type prefix */ @@ -164,10 +164,11 @@ static size_t write_typeformatstring_var int ptr_level = var->ptr_level; /* basic types don't need a type format string */ - if (ptr_level == 0) + if (ptr_level == 0 && !var->array) return 0; - if (ptr_level == 1) + if (ptr_level == 1 || + (var->ptr_level == 0 && var->array && !NEXT_LINK(var->array))) { switch (var->type->type) {

1 0

Robert Shearman : widl: Support non-basic variables in proc format strings.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 783198be3795707a70d416eab2d8570ce3321dae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=783198be3795707a70d416e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:05:55 2005 +0100 widl: Support non-basic variables in proc format strings. --- tools/widl/typegen.c | 79 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 48 insertions(+), 31 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 1039eea..1e6581a 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -56,36 +56,55 @@ static int print_file(FILE *file, int in return r; } -static size_t write_procformatstring_var(FILE *file, int indent, var_t *var) +static size_t write_procformatstring_var(FILE *file, int indent, var_t *var, int is_return, unsigned int *type_offset) { size_t size; - switch(var->type->type) + if (var->ptr_level == 0) { + if (is_return) + print_file(file, indent, "0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); + else + print_file(file, indent, "0x4e, /* FC_IN_PARAM_BASETYPE */\n"); + + switch(var->type->type) + { #define CASE_BASETYPE(fctype) \ - case RPC_##fctype: \ - print_file(file, indent, "0x%02x, /* " #fctype " */\n", var->type->type); \ - size = 2; /* includes param type prefix */ \ - break - - CASE_BASETYPE(FC_BYTE); - CASE_BASETYPE(FC_CHAR); - CASE_BASETYPE(FC_WCHAR); - CASE_BASETYPE(FC_USHORT); - CASE_BASETYPE(FC_SHORT); - CASE_BASETYPE(FC_ULONG); - CASE_BASETYPE(FC_LONG); - CASE_BASETYPE(FC_HYPER); - CASE_BASETYPE(FC_IGNORE); - CASE_BASETYPE(FC_USMALL); - CASE_BASETYPE(FC_SMALL); - CASE_BASETYPE(FC_FLOAT); - CASE_BASETYPE(FC_DOUBLE); - CASE_BASETYPE(FC_ERROR_STATUS_T); + case RPC_##fctype: \ + print_file(file, indent, "0x%02x, /* " #fctype " */\n", var->type->type); \ + size = 2; /* includes param type prefix */ \ + break + + CASE_BASETYPE(FC_BYTE); + CASE_BASETYPE(FC_CHAR); + CASE_BASETYPE(FC_WCHAR); + CASE_BASETYPE(FC_USHORT); + CASE_BASETYPE(FC_SHORT); + CASE_BASETYPE(FC_ULONG); + CASE_BASETYPE(FC_LONG); + CASE_BASETYPE(FC_HYPER); + CASE_BASETYPE(FC_IGNORE); + CASE_BASETYPE(FC_USMALL); + CASE_BASETYPE(FC_SMALL); + CASE_BASETYPE(FC_FLOAT); + CASE_BASETYPE(FC_DOUBLE); + CASE_BASETYPE(FC_ERROR_STATUS_T); #undef CASE_BASETYPE - default: - error("Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); - size = 0; + default: + error("Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); + size = 0; + } + } + else + { + if (is_return) + print_file(file, indent, "0x4d, /* FC_IN_PARAM */\n"); + else + print_file(file, indent, "0x52, /* FC_RETURN_PARAM */\n"); + print_file(file, indent, "0x01,\n"); + print_file(file, indent, "NdrFcShort(0x%x),\n", *type_offset); + size = 4; /* includes param type prefix */ } + *type_offset += get_size_typeformatstring_var(var); return size; } @@ -94,6 +113,7 @@ void write_procformatstring(FILE *file, int indent = 0; func_t *func = iface->funcs; var_t *var; + unsigned int type_offset = 2; print_file(file, indent, "static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString =\n"); print_file(file, indent, "{\n"); @@ -112,8 +132,7 @@ void write_procformatstring(FILE *file, while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - print_file(file, indent, "0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - write_procformatstring_var(file, indent, var); + write_procformatstring_var(file, indent, var, FALSE, &type_offset); var = PREV_LINK(var); } } @@ -126,10 +145,7 @@ void write_procformatstring(FILE *file, print_file(file, indent, "0x5c, /* FC_PAD */\n"); } else - { - print_file(file, indent, "0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - write_procformatstring_var(file, indent, var); - } + write_procformatstring_var(file, indent, var, TRUE, &type_offset); func = PREV_LINK(func); } @@ -402,7 +418,8 @@ void unmarshall_arguments(FILE *file, in size_t get_size_procformatstring_var(var_t *var) { - return write_procformatstring_var(NULL, 0, var); + unsigned int type_offset = 2; + return write_procformatstring_var(NULL, 0, var, FALSE, &type_offset); }

1 0

Robert Shearman : widl: Add helper functions that return the size of procformat and
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 88fd90b4c591159ba0bf8cf4dfd3c3c39232d4dd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=88fd90b4c591159ba0bf8cf… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:05:29 2005 +0100 widl: Add helper functions that return the size of procformat and typeformat strings for variables. --- tools/widl/client.c | 5 +++-- tools/widl/server.c | 5 +++-- tools/widl/typegen.c | 29 +++++++++++++++++++++++++---- tools/widl/typegen.h | 2 ++ 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 3fd5f5c..2d33496 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -270,11 +270,12 @@ static void write_function_stubs(type_t while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - proc_offset += 2; /* FIXME */ + proc_offset += get_size_procformatstring_var(var); var = PREV_LINK(var); } } - proc_offset += 2; /* FIXME */ + if (!is_void(def->type, NULL)) + proc_offset += get_size_procformatstring_var(def); indent--; print_client("}\n"); diff --git a/tools/widl/server.c b/tools/widl/server.c index 6022f5a..b007a8f 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -299,11 +299,12 @@ static void write_function_stubs(type_t while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - proc_offset += 2; /* FIXME */ + proc_offset += get_size_procformatstring_var(var); var = PREV_LINK(var); } } - proc_offset += 2; /* FIXME */ + if (!is_void(def->type, NULL)) + proc_offset += get_size_procformatstring_var(def); func = PREV_LINK(func); } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index cb6e87b..1039eea 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -46,6 +46,8 @@ static int print_file(FILE *file, int in va_list va; int i, r; + if (!file) return 0; + va_start(va, format); for (i = 0; i < indent; i++) fprintf(file, " "); @@ -54,13 +56,15 @@ static int print_file(FILE *file, int in return r; } -static void write_procformatstring_var(FILE *file, int indent, var_t *var) +static size_t write_procformatstring_var(FILE *file, int indent, var_t *var) { + size_t size; switch(var->type->type) { #define CASE_BASETYPE(fctype) \ case RPC_##fctype: \ print_file(file, indent, "0x%02x, /* " #fctype " */\n", var->type->type); \ + size = 2; /* includes param type prefix */ \ break CASE_BASETYPE(FC_BYTE); @@ -80,7 +84,9 @@ static void write_procformatstring_var(F #undef CASE_BASETYPE default: error("Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); + size = 0; } + return size; } void write_procformatstring(FILE *file, type_t *iface) @@ -137,13 +143,13 @@ void write_procformatstring(FILE *file, } -static void write_typeformatstring_var(FILE *file, int indent, var_t *var) +static size_t write_typeformatstring_var(FILE *file, int indent, var_t *var) { int ptr_level = var->ptr_level; /* basic types don't need a type format string */ if (ptr_level == 0) - return; + return 0; if (ptr_level == 1) { @@ -154,7 +160,7 @@ static void write_typeformatstring_var(F print_file(file, indent, "0x11, 0x08, /* FC_RP [simple_pointer] */\n"); \ print_file(file, indent, "0x%02x, /* " #fctype " */\n", var->type->type); \ print_file(file, indent, "0x5c, /* FC_PAD */\n"); \ - break + return 4 CASE_BASETYPE(FC_BYTE); CASE_BASETYPE(FC_CHAR); CASE_BASETYPE(FC_SMALL); @@ -175,8 +181,11 @@ static void write_typeformatstring_var(F error("write_typeformatstring_var: Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); } } + error("write_typeformatstring_var: Pointer level %d not supported for variable %s\n", ptr_level, var->name); + return 0; } + void write_typeformatstring(FILE *file, type_t *iface) { int indent = 0; @@ -389,3 +398,15 @@ void unmarshall_arguments(FILE *file, in var = PREV_LINK(var); } } + + +size_t get_size_procformatstring_var(var_t *var) +{ + return write_procformatstring_var(NULL, 0, var); +} + + +size_t get_size_typeformatstring_var(var_t *var) +{ + return write_typeformatstring_var(NULL, 0, var); +} diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index 6670197..fe8dc38 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -25,3 +25,5 @@ void write_typeformatstring(FILE *file, unsigned int get_required_buffer_size(type_t *type); void marshall_arguments(FILE *file, int indent, func_t *func); void unmarshall_arguments(FILE *file, int indent, func_t *func); +size_t get_size_procformatstring_var(var_t *var); +size_t get_size_typeformatstring_var(var_t *var);

1 0

Robert Shearman : oleaut: Small re-organisation of ITypeInfo::Invoke.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: e6fa361967ce788cd9fea6a38a92ec4b9d7e517a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e6fa361967ce788cd9fea6a… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:04:31 2005 +0100 oleaut: Small re-organisation of ITypeInfo::Invoke. Only output the one function in the trace for ITypeInfo::Invoke. Process the return value on output in ITypeInfo::Invoke, but only copy it to pVarResult if pVarResult is not NULL. --- dlls/oleaut32/typelib.c | 68 +++++++++++++++++++++++++---------------------- 1 files changed, 36 insertions(+), 32 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 1c56c46..a3e9e86 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5320,7 +5320,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke if (TRACE_ON(ole)) { TRACE("invoking:\n"); - dump_TLBFuncDesc(pFuncInfo); + dump_TLBFuncDescOne(pFuncInfo); } switch (func_desc->funckind) { @@ -5430,39 +5430,43 @@ static HRESULT WINAPI ITypeInfo_fnInvoke args ); - if (pVarResult) { - for (i = 0; i < func_desc->cParams; i++) { - USHORT wParamFlags = func_desc->lprgelemdescParam[i].u.paramdesc.wParamFlags; - if (wParamFlags & PARAMFLAG_FRETVAL) { - ELEMDESC *elemdesc = &func_desc->lprgelemdescParam[i]; - TYPEDESC *tdesc = &elemdesc->tdesc; - VARIANTARG varresult; - V_VT(&varresult) = 0; - hres = typedescvt_to_variantvt((ITypeInfo *)iface, tdesc, &V_VT(&varresult)); - if (hres) - break; - /* FIXME: this is really messy - we should keep the - * args in VARIANTARGs rather than a DWORD array */ - memcpy(&V_UI4(&varresult), &args[i+1], sizeof(DWORD)); - if (TRACE_ON(ole)) - { - TRACE("varresult: "); - dump_Variant(&varresult); - } - hres = VariantCopyInd(pVarResult, &varresult); - /* free data stored in varresult. Note that - * VariantClear doesn't do what we want because we are - * working with byref types. */ - /* FIXME: clear safearrays, bstrs, records and - * variants here too */ - if ((V_VT(&varresult) == (VT_UNKNOWN | VT_BYREF)) || - (V_VT(&varresult) == (VT_DISPATCH | VT_BYREF))) - { - if(*V_UNKNOWNREF(&varresult)) - IUnknown_Release(*V_UNKNOWNREF(&varresult)); - } + for (i = 0; i < func_desc->cParams; i++) + { + USHORT wParamFlags = func_desc->lprgelemdescParam[i].u.paramdesc.wParamFlags; + if (wParamFlags & PARAMFLAG_FRETVAL) + { + ELEMDESC *elemdesc = &func_desc->lprgelemdescParam[i]; + TYPEDESC *tdesc = &elemdesc->tdesc; + VARIANTARG varresult; + V_VT(&varresult) = 0; + hres = typedescvt_to_variantvt((ITypeInfo *)iface, tdesc, &V_VT(&varresult)); + if (hres) break; + /* FIXME: this is really messy - we should keep the + * args in VARIANTARGs rather than a DWORD array */ + memcpy(&V_UI4(&varresult), &args[i+1], sizeof(DWORD)); + if (TRACE_ON(ole)) + { + TRACE("varresult: "); + dump_Variant(&varresult); + } + + if (pVarResult) + /* deref return value */ + hres = VariantCopyInd(pVarResult, &varresult); + + /* free data stored in varresult. Note that + * VariantClear doesn't do what we want because we are + * working with byref types. */ + /* FIXME: clear safearrays, bstrs, records and + * variants here too */ + if ((V_VT(&varresult) == (VT_UNKNOWN | VT_BYREF)) || + (V_VT(&varresult) == (VT_DISPATCH | VT_BYREF))) + { + if(*V_UNKNOWNREF(&varresult)) + IUnknown_Release(*V_UNKNOWNREF(&varresult)); } + break; } }

1 0

Robert Shearman : oleaut32: Convert some tabs to spaces and some other formatting changes.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 6b9743801135cad60a4f754034d30a1d8e871550 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6b9743801135cad60a4f754… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:04:02 2005 +0100 oleaut32: Convert some tabs to spaces and some other formatting changes. --- dlls/oleaut32/typelib.c | 137 +++++++++++++++++++++++++---------------------- 1 files changed, 73 insertions(+), 64 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 0e40e2b..1c56c46 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5326,41 +5326,44 @@ static HRESULT WINAPI ITypeInfo_fnInvoke switch (func_desc->funckind) { case FUNC_PUREVIRTUAL: case FUNC_VIRTUAL: { - DWORD res; - int numargs, numargs2, argspos, args2pos; - DWORD *args , *args2; + DWORD res; + int numargs, numargs2, argspos, args2pos; + DWORD *args , *args2; VARIANT *rgvarg = HeapAlloc(GetProcessHeap(), 0, sizeof(VARIANT) * func_desc->cParams); memcpy(rgvarg,pDispParams->rgvarg,sizeof(VARIANT)*pDispParams->cArgs); - hres = S_OK; - numargs = 1; /* sizeof(thisptr) */ - numargs2 = 0; - for (i = 0; i < func_desc->cParams; i++) { + hres = S_OK; + numargs = 1; /* sizeof(thisptr) */ + numargs2 = 0; + for (i = 0; i < func_desc->cParams; i++) + { TYPEDESC *tdesc = &func_desc->lprgelemdescParam[i].tdesc; - numargs += _argsize(tdesc->vt); - if (i>=pDispParams->cArgs) { /* arguments to return */ - if (tdesc->vt == VT_PTR) { - numargs2 += _argsize(tdesc->u.lptdesc->vt); - } else { - FIXME("The variant type here should have been VT_PTR, not vt %d\n", tdesc->vt); - numargs2 += _argsize(tdesc->vt); - } - } - } + numargs += _argsize(tdesc->vt); + if (i>=pDispParams->cArgs) { /* arguments to return */ + if (tdesc->vt == VT_PTR) { + numargs2 += _argsize(tdesc->u.lptdesc->vt); + } else { + FIXME("The variant type here should have been VT_PTR, not vt %d\n", tdesc->vt); + numargs2 += _argsize(tdesc->vt); + } + } + } - args = HeapAlloc(GetProcessHeap(),0,sizeof(DWORD)*numargs); - args2 = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(DWORD)*numargs2); + args = HeapAlloc(GetProcessHeap(),0,sizeof(DWORD)*numargs); + args2 = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(DWORD)*numargs2); - args[0] = (DWORD)pIUnk; - argspos = 1; args2pos = 0; - for (i = 0; i < func_desc->cParams; i++) { - ELEMDESC *elemdesc = &(func_desc->lprgelemdescParam[i]); - TYPEDESC *tdesc = &(elemdesc->tdesc); - USHORT paramFlags = elemdesc->u.paramdesc.wParamFlags; - int arglen = _argsize(tdesc->vt); + args[0] = (DWORD)pIUnk; + argspos = 1; args2pos = 0; + for (i = 0; i < func_desc->cParams; i++) + { + ELEMDESC *elemdesc = &(func_desc->lprgelemdescParam[i]); + TYPEDESC *tdesc = &(elemdesc->tdesc); + USHORT paramFlags = elemdesc->u.paramdesc.wParamFlags; + int arglen = _argsize(tdesc->vt); - if (i<pDispParams->cArgs) { + if (i<pDispParams->cArgs) + { VARIANT *arg = &rgvarg[pDispParams->cArgs-i-1]; if (paramFlags & PARAMFLAG_FOPT) { @@ -5381,7 +5384,9 @@ static HRESULT WINAPI ITypeInfo_fnInvoke hres = _copy_arg(iface, tdesc, &args[argspos], arg, tdesc->vt); if (FAILED(hres)) goto func_fail; argspos += arglen; - } else if (paramFlags & PARAMFLAG_FOPT) { + } + else if (paramFlags & PARAMFLAG_FOPT) + { VARIANT *arg = &rgvarg[i]; if (i < func_desc->cParams - func_desc->cParamsOpt) @@ -5395,36 +5400,38 @@ static HRESULT WINAPI ITypeInfo_fnInvoke hres = _copy_arg(iface, tdesc, &args[argspos], arg, tdesc->vt); if (FAILED(hres)) goto func_fail; argspos += arglen; - } else { - if (tdesc->vt == VT_PTR) - arglen = _argsize(tdesc->u.lptdesc->vt); - else - FIXME("set %d to pointer for get (type is %d)\n",i,tdesc->vt); - - /* Supply pointers for the rest, so propertyget works*/ - args[argspos] = (DWORD)&args2[args2pos]; - - /* If pointer to variant, pass reference it. */ - if ((tdesc->vt == VT_PTR) && - (tdesc->u.lptdesc->vt == VT_VARIANT) && - pVarResult + } + else + { + if (tdesc->vt == VT_PTR) + arglen = _argsize(tdesc->u.lptdesc->vt); + else + FIXME("set %d to pointer for get (type is %d)\n",i,tdesc->vt); + + /* Supply pointers for the rest, so propertyget works*/ + args[argspos] = (DWORD)&args2[args2pos]; + + /* If pointer to variant, pass reference it. */ + if ((tdesc->vt == VT_PTR) && + (tdesc->u.lptdesc->vt == VT_VARIANT) && + pVarResult ) args[argspos]= (DWORD)pVarResult; - argspos += 1; - args2pos += arglen; - } - } - if (func_desc->cParamsOpt < 0) - FIXME("Does not support optional parameters (%d)\n", func_desc->cParamsOpt); + argspos += 1; + args2pos += arglen; + } + } + if (func_desc->cParamsOpt < 0) + FIXME("Does not support optional parameters (%d)\n", func_desc->cParamsOpt); - res = _invoke((*(FARPROC**)pIUnk)[func_desc->oVft/4], - func_desc->callconv, - numargs, - args - ); + res = _invoke((*(FARPROC**)pIUnk)[func_desc->oVft/4], + func_desc->callconv, + numargs, + args + ); - if (pVarResult) { - for (i = 0; i < func_desc->cParams; i++) { + if (pVarResult) { + for (i = 0; i < func_desc->cParams; i++) { USHORT wParamFlags = func_desc->lprgelemdescParam[i].u.paramdesc.wParamFlags; if (wParamFlags & PARAMFLAG_FRETVAL) { ELEMDESC *elemdesc = &func_desc->lprgelemdescParam[i]; @@ -5455,19 +5462,21 @@ static HRESULT WINAPI ITypeInfo_fnInvoke IUnknown_Release(*V_UNKNOWNREF(&varresult)); } break; - } - } - } + } + } + } + + if ((func_desc->elemdescFunc.tdesc.vt == VT_HRESULT) && FAILED(res)) + { + WARN("invoked function failed with error 0x%08lx\n", res); + hres = DISP_E_EXCEPTION; + if (pExcepInfo) pExcepInfo->scode = res; + } - if ((func_desc->elemdescFunc.tdesc.vt == VT_HRESULT) && FAILED(res)) { - WARN("invoked function failed with error 0x%08lx\n", res); - hres = DISP_E_EXCEPTION; - if (pExcepInfo) pExcepInfo->scode = res; - } func_fail: HeapFree(GetProcessHeap(), 0, rgvarg); - HeapFree(GetProcessHeap(),0,args2); - HeapFree(GetProcessHeap(),0,args); + HeapFree(GetProcessHeap(),0,args2); + HeapFree(GetProcessHeap(),0,args); break; } case FUNC_DISPATCH: {

1 0

Robert Shearman : oleaut32: Initialize member IDs to MEMBERID_NIL inITypeInfo::GetIDsOfNames.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: fa49c971f1f705d3faa91ee23ce5101b319acc1d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fa49c971f1f705d3faa91ee… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:03:27 2005 +0100 oleaut32: Initialize member IDs to MEMBERID_NIL inITypeInfo::GetIDsOfNames. Better tracing. --- dlls/oleaut32/typelib.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 965342c..0e40e2b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3614,7 +3614,11 @@ static HRESULT WINAPI ITypeLib2_fnGetTyp TRACE("(%p)\n\tguid:\t%s)\n",This,debugstr_guid(guid)); - if (!pTypeInfo) return TYPE_E_ELEMENTNOTFOUND; + if (!pTypeInfo) + { + WARN("-- element not found\n"); + return TYPE_E_ELEMENTNOTFOUND; + } /* search linked list for guid */ while( !IsEqualIID(guid,&pTypeInfo->TypeAttr.guid) ) @@ -3624,7 +3628,7 @@ static HRESULT WINAPI ITypeLib2_fnGetTyp if (!pTypeInfo) { /* end of list reached */ - TRACE("-- element not found\n"); + WARN("-- element not found\n"); return TYPE_E_ELEMENTNOTFOUND; } } @@ -4771,11 +4775,17 @@ static HRESULT WINAPI ITypeInfo_fnGetIDs TLBFuncDesc * pFDesc; TLBVarDesc * pVDesc; HRESULT ret=S_OK; + int i; TRACE("(%p) Name %s cNames %d\n", This, debugstr_w(*rgszNames), cNames); + + /* init out parameters in case of failure */ + for (i = 0; i < cNames; i++) + pMemId[i] = MEMBERID_NIL; + for(pFDesc=This->funclist; pFDesc; pFDesc=pFDesc->next) { - int i, j; + int j; if(!lstrcmpiW(*rgszNames, pFDesc->Name)) { if(cNames) *pMemId=pFDesc->funcdesc.memid; for(i=1; i < cNames; i++){ @@ -4787,6 +4797,7 @@ static HRESULT WINAPI ITypeInfo_fnGetIDs else ret=DISP_E_UNKNOWNNAME; }; + TRACE("-- 0x%08lx\n", ret); return ret; } }

1 0

Robert Shearman : ole: Improve typelib traces.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 088fc70ede7ee8ff2dc8990bbd6e86dfcaa9cb7d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=088fc70ede7ee8ff2dc8990… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:02:47 2005 +0100 ole: Improve typelib traces. Move the debug channel check from dump_TLBFuncDesc[One] to its callers for more flexibility in which channel controls the output. --- dlls/oleaut32/typelib.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 29585a3..965342c 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1145,8 +1145,6 @@ static const char * typekind_desc[] = static void dump_TLBFuncDescOne(const TLBFuncDesc * pfd) { int i; - if (!TRACE_ON(typelib)) - return; MESSAGE("%s(%u)\n", debugstr_w(pfd->Name), pfd->funcdesc.cParams); for (i=0;i<pfd->funcdesc.cParams;i++) MESSAGE("\tparm%d: %s\n",i,debugstr_w(pfd->pParamDesc[i].Name)); @@ -1282,14 +1280,16 @@ static void dump_DispParms(const DISPPAR static void dump_TypeInfo(const ITypeInfoImpl * pty) { TRACE("%p ref=%lu\n", pty, pty->ref); + TRACE("%s %s\n", debugstr_w(pty->Name), debugstr_w(pty->DocString)); TRACE("attr:%s\n", debugstr_guid(&(pty->TypeAttr.guid))); TRACE("kind:%s\n", typekind_desc[pty->TypeAttr.typekind]); TRACE("fct:%u var:%u impl:%u\n", pty->TypeAttr.cFuncs, pty->TypeAttr.cVars, pty->TypeAttr.cImplTypes); + TRACE("wTypeFlags: 0x%04x\n", pty->TypeAttr.wTypeFlags); TRACE("parent tlb:%p index in TLB:%u\n",pty->pTypeLib, pty->index); - TRACE("%s %s\n", debugstr_w(pty->Name), debugstr_w(pty->DocString)); if (pty->TypeAttr.typekind == TKIND_MODULE) TRACE("dllname:%s\n", debugstr_w(pty->DllName)); - dump_TLBFuncDesc(pty->funclist); + if (TRACE_ON(ole)) + dump_TLBFuncDesc(pty->funclist); dump_TLBVarDesc(pty->varlist); dump_TLBImplType(pty->impltypelist); } @@ -2968,7 +2968,8 @@ static SLTG_TypeInfoTail *SLTG_ProcessIn if(pFunc->next == 0xffff) break; } pTI->TypeAttr.cFuncs = num; - dump_TLBFuncDesc(pTI->funclist); + if (TRACE_ON(typelib)) + dump_TLBFuncDesc(pTI->funclist); return (SLTG_TypeInfoTail*)(pFirstItem + pMemHeader->cbExtra); } @@ -5593,7 +5594,8 @@ static HRESULT WINAPI ITypeInfo_fnGetDll for(pFDesc=This->funclist; pFDesc; pFDesc=pFDesc->next) if(pFDesc->funcdesc.memid==memid){ dump_TypeInfo(This); - dump_TLBFuncDescOne(pFDesc); + if (TRACE_ON(ole)) + dump_TLBFuncDescOne(pFDesc); if (pBstrDllName) *pBstrDllName = SysAllocString(This->DllName);

1 0

Jesse Allen : msvcrt: More printf tests for I64 integer size support.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: c5dc38874ab16dc4707447f280fb43ec5841a9cc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c5dc38874ab16dc4707447f… Author: Jesse Allen <the3dfxdude(a)gmail.com> Date: Mon Dec 26 13:01:49 2005 +0100 msvcrt: More printf tests for I64 integer size support. --- dlls/msvcrt/tests/printf.c | 150 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 144 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 28ddf49..f13ac2d 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -39,12 +39,153 @@ static void test_sprintf( void ) } ok( r==23, "return count wrong\n"); - todo_wine { format = "%I64d"; r = sprintf(buffer,format,((ULONGLONG)0xffffffff)*0xffffffff); ok(!strcmp(buffer,"-8589934591"),"Problem with long long\n"); ok( r==11, "return count wrong\n"); - } + + format = "%+8I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer," +100") && r==8,"+8I64d failed: '%s'\n", buffer); + + format = "%+.8I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer,"+00000100") && r==9,"+.8I64d failed: '%s'\n", buffer); + + format = "%+10.8I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer," +00000100") && r==10,"+10.8I64d failed: '%s'\n", buffer); + format = "%_1I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer,"_1I64d") && r==6,"_1I64d failed\n"); + + format = "%-1.5I64d"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer,"-00100") && r==6,"-1.5I64d failed: '%s'\n", buffer); + + format = "%5I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer," 100") && r==5,"5I64d failed: '%s'\n", buffer); + + format = "%5I64d"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer," -100") && r==5,"5I64d failed: '%s'\n", buffer); + + format = "%-5I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer,"100 ") && r==5,"-5I64d failed: '%s'\n", buffer); + + format = "%-5I64d"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer,"-100 ") && r==5,"-5I64d failed: '%s'\n", buffer); + + format = "%-.5I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer,"00100") && r==5,"-.5I64d failed: '%s'\n", buffer); + + format = "%-.5I64d"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer,"-00100") && r==6,"-.5I64d failed: '%s'\n", buffer); + + format = "%-8.5I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer,"00100 ") && r==8,"-8.5I64d failed: '%s'\n", buffer); + + format = "%-8.5I64d"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer,"-00100 ") && r==8,"-8.5I64d failed: '%s'\n", buffer); + + format = "%05I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer,"00100") && r==5,"05I64d failed: '%s'\n", buffer); + + format = "%05I64d"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer,"-0100") && r==5,"05I64d failed: '%s'\n", buffer); + + format = "% I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer," 100") && r==4,"' I64d' failed: '%s'\n", buffer); + + format = "% I64d"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer,"-100") && r==4,"' I64d' failed: '%s'\n", buffer); + + format = "% 5I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer," 100") && r==5,"' 5I64d' failed: '%s'\n", buffer); + + format = "% 5I64d"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer," -100") && r==5,"' 5I64d' failed: '%s'\n", buffer); + + format = "% .5I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer," 00100") && r==6,"' .5I64d' failed: '%s'\n", buffer); + + format = "% .5I64d"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer,"-00100") && r==6,"' .5I64d' failed: '%s'\n", buffer); + + format = "% 8.5I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer," 00100") && r==8,"' 8.5I64d' failed: '%s'\n", buffer); + + format = "% 8.5I64d"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer," -00100") && r==8,"' 8.5I64d' failed: '%s'\n", buffer); + + format = "%.0I64d"; + r = sprintf(buffer,format,(LONGLONG)0); + ok(r==0,".0I64d failed: '%s'\n", buffer); + + format = "%#+21.18I64x"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer," 0x00ffffffffffffff9c") && r==21,"#+21.18I64x failed: '%s'\n", buffer); + + format = "%#.25I64o"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer,"0001777777777777777777634") && r==25,"#.25I64o failed: '%s'\n", buffer); + + format = "%#+24.20I64o"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer," 01777777777777777777634") && r==24,"#+24.20I64o failed: '%s'\n", buffer); + + format = "%#+18.21I64X"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer,"0X00000FFFFFFFFFFFFFF9C") && r==23,"#+18.21I64X failed: '%s '\n", buffer); + + format = "%#+20.24I64o"; + r = sprintf(buffer,format,(LONGLONG)-100); + ok(!strcmp(buffer,"001777777777777777777634") && r==24,"#+20.24I64o failed: '%s'\n", buffer); + + format = "%#+25.22I64u"; + r = sprintf(buffer,format,(LONGLONG)-1); + ok(!strcmp(buffer," 0018446744073709551615") && r==25,"#+25.22I64u conversion failed: '%s'\n", buffer); + + format = "%#+25.22I64u"; + r = sprintf(buffer,format,(LONGLONG)-1); + ok(!strcmp(buffer," 0018446744073709551615") && r==25,"#+25.22I64u failed: '%s'\n", buffer); + + format = "%#+30.25I64u"; + r = sprintf(buffer,format,(LONGLONG)-1); + ok(!strcmp(buffer," 0000018446744073709551615") && r==30,"#+30.25I64u failed: '%s'\n", buffer); + + format = "%+#25.22I64d"; + r = sprintf(buffer,format,(LONGLONG)-1); + ok(!strcmp(buffer," -0000000000000000000001") && r==25,"+#25.22I64d failed: '%s'\n", buffer); + + format = "%#-8.5I64o"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer,"00144 ") && r==8,"-8.5I64o failed: '%s'\n", buffer); + + format = "%#-+ 08.5I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer,"+00100 ") && r==8,"'#-+ 08.5I64d failed: '%s'\n", buffer); + + format = "%#-+ 08.5I64d"; + r = sprintf(buffer,format,(LONGLONG)100); + ok(!strcmp(buffer,"+00100 ") && r==8,"#-+ 08.5I64d failed: '%s'\n", buffer); format = "%lld"; r = sprintf(buffer,format,((ULONGLONG)0xffffffff)*0xffffffff); @@ -336,10 +477,7 @@ static void test_swprintf( void ) ok(wcsstr(buffer,e008) != 0,"Sprintf different\n"); } swprintf(buffer,I64d,((ULONGLONG)0xffffffff)*0xffffffff); - todo_wine - { - ok(wcslen(buffer) == 11,"Problem with long long\n"); - } + ok(wcslen(buffer) == 11,"Problem with long long\n"); swprintf(buffer,S,string); ok(wcslen(buffer) == 6,"Problem with \"%%S\" interpretation\n"); }

1 0

Jesse Allen : msvcrt: pf_integer_conv for I64.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 419d493aacd808ebc0a1abfe8d760b5b4aed93d6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=419d493aacd808ebc0a1abf… Author: Jesse Allen <the3dfxdude(a)gmail.com> Date: Mon Dec 26 13:01:38 2005 +0100 msvcrt: pf_integer_conv for I64. - Add pf_integer_conv and pf_is_integer_format. - Update pf_fill to handle printing the sign for signed integers. - Handle I64 integer sizes using pf_integer_conv and pf_output_format_A. --- dlls/msvcrt/wcs.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 100 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 503a998..db86437 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -285,6 +285,16 @@ static inline int pf_fill( pf_output *ou { int i, r = 0; + if( flags->Sign && !( flags->Format == 'd' || flags->Format == 'i' ) ) + flags->Sign = 0; + + if( left && flags->Sign ) + { + flags->FieldLength--; + if( flags->PadZero ) + r = pf_output_stringA( out, &flags->Sign, 1 ); + } + if( ( !left && flags->LeftAlign ) || ( left && !flags->LeftAlign )) { @@ -297,6 +307,9 @@ static inline int pf_fill( pf_output *ou } } + if( left && flags->Sign && !flags->PadZero ) + r = pf_output_stringA( out, &flags->Sign, 1 ); + return r; } @@ -344,6 +357,14 @@ static inline int pf_output_format_A( pf return r; } +static inline BOOL pf_is_integer_format( char fmt ) +{ + static const char float_fmts[] = "diouxX"; + if (!fmt) + return FALSE; + return strchr( float_fmts, fmt ) ? TRUE : FALSE; +} + static inline BOOL pf_is_double_format( char fmt ) { static const char float_fmts[] = "aeEfgG"; @@ -385,6 +406,70 @@ static void pf_rebuild_format_string( ch *p++ = 0; } +/* pf_integer_conv: prints x to buf, including alternate formats, + but not the sign */ +static void pf_integer_conv( char *buf, pf_flags *flags, LONGLONG x ) +{ + unsigned int base; + char *digits; + + int i, j, k; + char tmp[40]; + + base = 10; + if( flags->Format == 'o' ) + base = 8; + else if( flags->Format == 'x' || flags->Format == 'X' ) + base = 16; + + if( flags->Format == 'X' ) + digits = "0123456789ABCDEFX"; + else + digits = "0123456789abcdefx"; + + if( x < 0 && ( flags->Format == 'd' || flags->Format == 'i' ) ) + { + x = -x; + flags->Sign = '-'; + } + + /* Do conversion (backwards) */ + i = 0; + if( x == 0 && flags->Precision ) + tmp[i++] = '0'; + else + while( x != 0 ) + { + j = (ULONGLONG) x % base; + x = (ULONGLONG) x / base; + tmp[i++] = digits[j]; + } + k = flags->Precision - i; + while( k-- > 0 ) + tmp[i++] = '0'; + if( flags->Alternate ) + { + if( base == 16 ) + { + tmp[i++] = digits[16]; + tmp[i++] = '0'; + } + else if( base == 8 && tmp[i-1] != '0' ) + tmp[i++] = '0'; + } + + /* Reverse for buf */ + j = 0; + while( i-- > 0 ) + buf[j++] = tmp[i]; + buf[j] = '\0'; + + /* Adjust precision so pf_fill won't truncate the number later */ + flags->Precision = strlen( buf ); + + return; +} + /********************************************************************* * pf_vsnprintf (INTERNAL) * @@ -583,6 +668,21 @@ static int pf_vsnprintf( pf_output *out, *x = out->used; } + /* deal with 64-bit integers */ + else if( pf_is_integer_format( flags.Format ) && flags.IntegerDouble ) + { + char number[40], *x = number; + + if( flags.FieldLength >= sizeof number ) + x = HeapAlloc( GetProcessHeap(), 0, flags.FieldLength+1 ); + + pf_integer_conv( x, &flags, va_arg(valist, LONGLONG) ); + + r = pf_output_format_A( out, x, -1, &flags ); + if( x != number ) + HeapFree( GetProcessHeap(), 0, number ); + } + /* deal with integers and floats using libc's printf */ else if( pf_is_valid_format( flags.Format ) ) {

1 0

Jesse Allen : msvcrt: Do not treat %ll as an IntegerDouble in printf.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: ee058ed0781865ad035e5296f5d7c2d28a0ed6fa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ee058ed0781865ad035e529… Author: Jesse Allen <the3dfxdude(a)gmail.com> Date: Mon Dec 26 13:00:35 2005 +0100 msvcrt: Do not treat %ll as an IntegerDouble in printf. --- dlls/msvcrt/wcs.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 5ef929b..503a998 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -489,10 +489,7 @@ static int pf_vsnprintf( pf_output *out, { if( *p == 'h' || *p == 'l' || *p == 'L' ) { - if( flags.IntegerLength == *p ) /* FIXME: this is wrong */ - flags.IntegerDouble++; - else - flags.IntegerLength = *p; + flags.IntegerLength = *p; p++; } else if( *p == 'I' )

1 0

Jesse Allen : msvcrt: Parse I, I32, and I64 integer size flags in printf.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 6c70942a057644e926367a68486bc96222f1d573 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6c70942a057644e926367a6… Author: Jesse Allen <the3dfxdude(a)gmail.com> Date: Mon Dec 26 13:00:01 2005 +0100 msvcrt: Parse I, I32, and I64 integer size flags in printf. --- dlls/msvcrt/tests/printf.c | 15 +++++++++++++++ dlls/msvcrt/wcs.c | 14 ++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index d96c61e..28ddf49 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -56,6 +56,21 @@ static void test_sprintf( void ) ok(!strcmp(buffer, "I"), "Problem with \"I\" interpretation\n"); ok( r==1, "return count wrong\n"); + format = "%I0d"; + r = sprintf(buffer,format,1); + ok(!strcmp(buffer,"I0d"),"I0d failed\n"); + ok( r==3, "return count wrong\n"); + + format = "%I32d"; + r = sprintf(buffer,format,1); + ok(!strcmp(buffer,"1"),"I32d failed\n"); + ok( r==1, "return count wrong\n"); + + format = "%I64D"; + r = sprintf(buffer,format,(LONGLONG)-1); + ok(!strcmp(buffer,"D"),"I64D failed: %s\n",buffer); + ok( r==1, "return count wrong\n"); + format = "% d"; r = sprintf(buffer,format,1); ok(!strcmp(buffer, " 1"),"Problem with sign place-holder: '%s'\n",buffer); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 83a713e..5ef929b 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -495,6 +495,20 @@ static int pf_vsnprintf( pf_output *out, flags.IntegerLength = *p; p++; } + else if( *p == 'I' ) + { + if( *(p+1) == '6' && *(p+2) == '4' ) + { + flags.IntegerDouble++; + p += 3; + } + else if( *(p+1) == '3' && *(p+2) == '2' ) + p += 3; + else if( isdigit(*(p+1)) || *(p+1) == 0 ) + break; + else + p++; + } else if( *p == 'w' ) flags.WideString = *p++; else if( *p == 'F' )

1 0

Rolf Kalbermatter : urlmon: Implement BindAsyncMoniker function.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 81c446ef5def256073af8daa709dc8237bee4548 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=81c446ef5def256073af8da… Author: Rolf Kalbermatter <rolf.kalbermatter(a)citeng.com> Date: Mon Dec 26 12:59:42 2005 +0100 urlmon: Implement BindAsyncMoniker function. --- dlls/urlmon/umon.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/urlmon/urlmon.spec | 2 +- 2 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index cbf70de..ebe5c07 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -1350,6 +1350,42 @@ HRESULT WINAPI IsAsyncMoniker(IMoniker * } /*********************************************************************** + * BindAsyncMoniker (URLMON.@) + * + * Bind a bind status callback to an asynchronous URL Moniker. + * + * PARAMS + * pmk [I] Moniker object to bind status callback to + * grfOpt [I] Options, seems not used + * pbsc [I] Status callback to bind + * iidResult [I] Interface to return + * ppvResult [O] Resulting asynchronous moniker object + * + * RETURNS + * Success: S_OK. + * Failure: E_INVALIDARG, if any argument is invalid, or + * E_OUTOFMEMORY if memory allocation fails. + */ +HRESULT WINAPI BindAsyncMoniker(IMoniker *pmk, DWORD grfOpt, IBindStatusCallback *pbsc, REFIID iidResult, LPVOID *ppvResult) +{ + LPBC pbc = NULL; + HRESULT hr = E_INVALIDARG; + + if (pmk && ppvResult) + { + *ppvResult = NULL; + + hr = CreateAsyncBindCtx(0, pbsc, NULL, &pbc); + if (hr == NOERROR) + { + hr = IMoniker_BindToObject(pmk, pbc, NULL, iidResult, ppvResult); + IBindCtx_Release(pbc); + } + } + return hr; +} + +/*********************************************************************** * RegisterBindStatusCallback (URLMON.@) * * Register a bind status callback. diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 639675e..46e5f28 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -7,7 +7,7 @@ @ stub AsyncGetClassBits @ stub AsyncInstallDistributionUnit -@ stub BindAsyncMoniker +@ stdcall BindAsyncMoniker(ptr long ptr ptr ptr) @ stdcall CoGetClassObjectFromURL(ptr wstr long long wstr ptr long ptr ptr ptr) @ stub CoInstall @ stdcall CoInternetCombineUrl(wstr wstr long wstr long ptr long)

1 0

Jacek Caban : urlmon: URL with two slashes is valid.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 7b4d59c5a0a41413c50d45ad97bcc974e6dd4b59 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7b4d59c5a0a41413c50d45a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 26 12:59:31 2005 +0100 urlmon: URL with two slashes is valid. --- dlls/urlmon/file.c | 6 ++++-- dlls/urlmon/tests/protocol.c | 14 +++++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index b1b156c..fcdb772 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -145,8 +145,10 @@ static HRESULT WINAPI FileProtocol_Start IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_SENDINGREQUEST, &null_char); file_name = url+sizeof(wszFile)/sizeof(WCHAR); - if(file_name[0] == '/' && file_name[1] == '/' && file_name[2] == '/') - file_name += 3; + if(file_name[0] == '/' && file_name[1] == '/') + file_name += 2; + if(*file_name == '/') + file_name++; This->file = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index da59fc6..c920aa4 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -452,7 +452,8 @@ static void test_file_protocol(void) { HANDLE file; static const WCHAR wszFile[] = {'f','i','l','e',':',0}; - static const WCHAR wszFile2[] = {'f','i','l','e',':','/','/','/',0}; + static const WCHAR wszFile2[] = {'f','i','l','e',':','/','/',0}; + static const WCHAR wszFile3[] = {'f','i','l','e',':','/','/','/',0}; static const char html_doc[] = "<HTML></HTML>"; file = CreateFileW(wszIndexHtml, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, @@ -488,7 +489,18 @@ static void test_file_protocol(void) { memcpy(buf+len, wszIndexHtml, sizeof(wszIndexHtml)); file_name = buf + sizeof(wszFile2)/sizeof(WCHAR)-1; + bindf = 0; + test_file_protocol_url(buf); + bindf = BINDF_FROMURLMON; + test_file_protocol_url(buf); + + memcpy(buf, wszFile3, sizeof(wszFile3)); + len = sizeof(wszFile3)/sizeof(WCHAR)-1; + len += GetCurrentDirectoryW(sizeof(buf)/sizeof(WCHAR)-len, buf+len); + buf[len++] = '\\'; + memcpy(buf+len, wszIndexHtml, sizeof(wszIndexHtml)); + file_name = buf + sizeof(wszFile3)/sizeof(WCHAR)-1; bindf = 0; test_file_protocol_url(buf); bindf = BINDF_FROMURLMON;

1 0

Alexander N. Sørnes : winecfg: Updated Norwegian Bokmål resources.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 0334ba93efcf2b814181e403e9451a515bb70dcf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0334ba93efcf2b814181e40… Author: Alexander N. Sørnes <alex(a)thehandofagony.com> Date: Mon Dec 26 12:58:43 2005 +0100 winecfg: Updated Norwegian Bokmål resources. --- programs/winecfg/No.rc | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index d92dd09..91b0f75 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -63,27 +63,30 @@ BEGIN LTEXT "Fargedybde: ",IDC_STATIC,8,10,70,30 COMBOBOX IDC_SCREEN_DEPTH,80,8,170,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX " Vinduinnstillinger ",IDC_STATIC,8,25,244,110 + GROUPBOX " Vinduinnstillinger ",IDC_STATIC,8,25,244,180 CONTROL "Tillat DirectX-programmer � hindre musen fra � forlate vinduet",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8 CONTROL "Aktiver dobbelt hurtigminne for skrivebordet",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,230,8 - + LTEXT "Hvis vinduer kontrolleres av din standardvindusbehandler, f�r de vanlige rammer, og respekterer det virtuelle skrivebordet ditt og vises i vinduslisten.\n\nHvis de er ukontrollerte er de koblet fra vindusbehandleren. Dette betyr at de ikke integreres like godt med skrivebordet ditt, men emuleringen blir mer presis s�nn at noen programmer virker bedre.", + IDC_STATIC,15,58,228,80 + CONTROL "Tillat vindusbehandleren � kontrollere vinduene",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,132,230,8 + LTEXT "Du kan velge � emulere et Windows-skrivebord, der alle vinduene er bundet i en virtuell skjerm, eller du kan f� vinduene til � oppf�re seg som andre programmer p� skrivebordet.", - IDC_STATIC,15,73,228,28 - LTEXT "Skrivebordsstrrelse:",IDC_DESKTOP_SIZE,15,115,44,8,WS_DISABLED - LTEXT "X",IDC_DESKTOP_BY,108,115,8,8,WS_DISABLED + IDC_STATIC,15,146,228,28 + LTEXT "Skrivebordsstrrelse:",IDC_DESKTOP_SIZE,15,188,44,8,WS_DISABLED + LTEXT "X",IDC_DESKTOP_BY,108,188,8,8,WS_DISABLED CONTROL "Emuler et virtuelt skrivebord",IDC_ENABLE_DESKTOP,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10 + BS_AUTOCHECKBOX | WS_TABSTOP,15,173,230,10 - EDITTEXT IDC_DESKTOP_WIDTH,64,115,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - EDITTEXT IDC_DESKTOP_HEIGHT,117,115,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_WIDTH,64,188,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_HEIGHT,117,188,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - GROUPBOX " Direct3D ",IDC_STATIC,8,140,244,120 + GROUPBOX " Direct3D ",IDC_STATIC,8,210,244,50 - LTEXT "Verteks-skyggelegging: ",IDC_STATIC,15,150,80,30 - COMBOBOX IDC_D3D_VSHADER_MODE,100,148,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Verteks-skyggelegging: ",IDC_STATIC,15,220,80,30 + COMBOBOX IDC_D3D_VSHADER_MODE,100,218,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Tillat piksel-skyggelegger (hvis maskinvaren st�tter det)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,165,230,10 + CONTROL "Tillat piksel-skyggelegger (hvis maskinvaren st�tter det)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,237,230,10 END IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250

1 0

Jacek Caban : shlwapi: Fix UrlCanonicalize.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: bb8a7478bc2b945bd082a9db8f987a1609c71f59 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bb8a7478bc2b945bd082a9d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 26 12:58:28 2005 +0100 shlwapi: Fix UrlCanonicalize. - Added support for URL_FILE_USE_PATHURL. - Fix handling of '/' and '\'. --- dlls/shlwapi/tests/path.c | 9 ++++++ dlls/shlwapi/url.c | 69 +++++++++++++++++++++++++++++++-------------- 2 files changed, 56 insertions(+), 22 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index eca68b9..1efbe0f 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -60,10 +60,19 @@ const TEST_URL_CANONICALIZE TEST_CANONIC {"http://www.winehq.org/tests/../?query=x&return=y", 0, S_OK, "http://www.winehq.org/?query=x&return=y"}, {"http://www.winehq.org/tests/..#example", 0, S_OK, "http://www.winehq.org/#example"}, {"http://www.winehq.org/tests/../#example", 0, S_OK, "http://www.winehq.org/#example"}, + {"http://www.winehq.org/tests\\../#example", 0, S_OK, "http://www.winehq.org/#example"}, + {"http://www.winehq.org/tests/..\\#example", 0, S_OK, "http://www.winehq.org/#example"}, + {"http://www.winehq.org\\tests/../#example", 0, S_OK, "http://www.winehq.org/#example"}, {"http://www.winehq.org/tests/../#example", URL_DONT_SIMPLIFY, S_OK, "http://www.winehq.org/tests/../#example"}, {"http://www.winehq.org/tests/foo bar", URL_ESCAPE_SPACES_ONLY| URL_DONT_ESCAPE_EXTRA_INFO , S_OK, "http://www.winehq.org/tests/foo%20bar"}, {"http://www.winehq.org/tests/foo%20bar", URL_UNESCAPE , S_OK, "http://www.winehq.org/tests/foo bar"}, {"file:///c:/tests/foo%20bar", URL_UNESCAPE , S_OK, "file:///c:/tests/foo bar"}, + {"file:///c:/tests\\foo%20bar", URL_UNESCAPE , S_OK, "file:///c:/tests/foo bar"}, + {"file:///c:/tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\tests\\foo bar"}, + {"file://c:/tests/../tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\tests\\foo bar"}, + {"file://c:/tests\\../tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\tests\\foo bar"}, + {"file://c:/tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\tests\\foo bar"}, + {"file:///c://tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\\\tests\\foo bar"} }; typedef struct _TEST_URL_ESCAPE { diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index d25628e..4e5c691 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -327,9 +327,10 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR { HRESULT hr = S_OK; DWORD EscapeFlags; - LPWSTR lpszUrlCpy, wk1, wk2, mp, root; + LPWSTR lpszUrlCpy, wk1, wk2, mp, mp2, root; INT nByteLen, state; DWORD nLen, nWkLen; + WCHAR slash = dwFlags & URL_FILE_USE_PATHURL ? '\\' : '/'; TRACE("(%s %p %p 0x%08lx)\n", debugstr_w(pszUrl), pszCanonicalized, pcchCanonicalized, dwFlags); @@ -376,23 +377,37 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR *wk2++ = *wk1++; if (*wk1 != L'/') {state = 6; break;} *wk2++ = *wk1++; + if((dwFlags & URL_FILE_USE_PATHURL) && *wk1 == '/') + wk1++; state = 4; break; case 3: nWkLen = strlenW(wk1); memcpy(wk2, wk1, (nWkLen + 1) * sizeof(WCHAR)); + mp = wk2; wk1 += nWkLen; wk2 += nWkLen; + + while(mp < wk2) { + if(*mp == '/' || *mp == '\\') + *mp = slash; + mp++; + } break; case 4: - if (!isalnumW(*wk1) && (*wk1 != L'-') && (*wk1 != L'.')) {state = 3; break;} - while(isalnumW(*wk1) || (*wk1 == L'-') || (*wk1 == L'.')) *wk2++ = *wk1++; - state = 5; - break; - case 5: - if (*wk1 != L'/') {state = 3; break;} - *wk2++ = *wk1++; - state = 6; + if (!isalnumW(*wk1) && (*wk1 != L'-') && (*wk1 != L'.') && (*wk1 != ':')) + {state = 3; break;} + while(isalnumW(*wk1) || (*wk1 == L'-') || (*wk1 == L'.') || (*wk1 == ':')) + *wk2++ = *wk1++; + state = 5; + break; + case 5: + if (*wk1 != '/' && *wk1 != '\\') {state = 3; break;} + while(*wk1 == '/') { + *wk2++ = slash; + wk1++; + } + state = 6; break; case 6: /* Now at root location, cannot back up any more. */ @@ -400,7 +415,11 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR root = wk2-1; while (*wk1) { TRACE("wk1=%c\n", (CHAR)*wk1); - mp = strchrW(wk1, L'/'); + + mp = strchrW(wk1, '/'); + mp2 = strchrW(wk1, '\\'); + if(mp2 && mp2 < mp) + mp = mp2; if (!mp) { nWkLen = strlenW(wk1); memcpy(wk2, wk1, (nWkLen + 1) * sizeof(WCHAR)); @@ -408,35 +427,41 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR wk2 += nWkLen; continue; } - nLen = mp - wk1 + 1; - memcpy(wk2, wk1, nLen * sizeof(WCHAR)); - wk2 += nLen; - wk1 += nLen; + nLen = mp - wk1; + if(nLen) { + memcpy(wk2, wk1, nLen * sizeof(WCHAR)); + wk2 += nLen; + wk1 += nLen; + } + *wk2++ = slash; + wk1++; + if (*wk1 == L'.') { TRACE("found '/.'\n"); - if (*(wk1+1) == L'/') { + if (wk1[1] == '/' || wk1[1] == '\\') { /* case of /./ -> skip the ./ */ wk1 += 2; } - else if (*(wk1+1) == L'.') { + else if (wk1[1] == '.') { /* found /.. look for next / */ TRACE("found '/..'\n"); - if (*(wk1+2) == L'/' || *(wk1+2) == L'?' || *(wk1+2) == L'#' || *(wk1+2) == 0) { + if (wk1[2] == '/' || wk1[2] == '\\' ||wk1[2] == '?' + || wk1[2] == '#' || !wk1[2]) { /* case /../ -> need to backup wk2 */ TRACE("found '/../'\n"); *(wk2-1) = L'\0'; /* set end of string */ - mp = strrchrW(root, L'/'); + mp = strrchrW(root, slash); if (mp && (mp >= root)) { /* found valid backup point */ wk2 = mp + 1; - if(*(wk1+2) != L'/') + if(wk1[2] != '/' && wk1[2] != '\\') wk1 += 2; else wk1 += 3; } else { - /* did not find point, restore '/' */ - *(wk2-1) = L'/'; + /* did not find point, restore '/' */ + *(wk2-1) = slash; } } } @@ -458,7 +483,7 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR while ((nLen > 0) && ((lpszUrlCpy[nLen-1] == '\r')||(lpszUrlCpy[nLen-1] == '\n'))) lpszUrlCpy[--nLen]=0; - if(dwFlags & URL_UNESCAPE) + if(dwFlags & (URL_UNESCAPE | URL_FILE_USE_PATHURL)) UrlUnescapeW(lpszUrlCpy, NULL, &nLen, URL_UNESCAPE_INPLACE); if((EscapeFlags = dwFlags & (URL_ESCAPE_UNSAFE |

1 0

Rolf Kalbermatter : msrle32: Spelling fix.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: f989f620760bd6e11d677dbe90295f7e5ce1de83 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f989f620760bd6e11d677db… Author: Rolf Kalbermatter <rolf.kalbermatter(a)citeng.com> Date: Mon Dec 26 12:58:11 2005 +0100 msrle32: Spelling fix. --- dlls/msrle32/msrle32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 5376688..7a4deca 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -18,7 +18,7 @@ /* TODO: * - some improvements possible - * - implement DecompressSetPalette? -- does we need it for anything? + * - implement DecompressSetPalette? -- do we need it for anything? */ #include <assert.h>

1 0

Eric Pouech : dbghelp: Internal search routines can now be case sensitive/insensitive.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: a959732fffda2455b349b8610e9f9f3ac82d10f3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a959732fffda2455b349b86… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 26 12:57:26 2005 +0100 dbghelp: Internal search routines can now be case sensitive/insensitive. - Now handling option SYMOPT_CASE_INSENSITIVE for symbol search. - Quick implementation of SymSearch on top of SymEnumSymbols (should be the other way around). --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/symbol.c | 51 +++++++++++++++++++++++++++++++++++++++++---- include/dbghelp.h | 5 ++++ 3 files changed, 53 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 0d7106b..92ccd49 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -86,7 +86,7 @@ @ stdcall SymRegisterCallback(long ptr ptr) @ stdcall SymRegisterFunctionEntryCallback64(ptr ptr double) @ stdcall SymRegisterFunctionEntryCallback(ptr ptr ptr) -@ stub SymSearch +@ stdcall SymSearch(long double long long str double ptr ptr long) @ stdcall SymSetContext(long ptr ptr) @ stdcall SymSetOptions(long) @ stdcall SymSetParentWindow(long) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 74634d1..2e840e2 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -738,7 +738,8 @@ static BOOL symt_enum_locals(struct proc BOOL ret; regex_t preg; - compile_regex(mask ? mask : "*", -1, &preg, FALSE); + compile_regex(mask ? mask : "*", -1, &preg, + dbghelp_options & SYMOPT_CASE_INSENSITIVE); ret = symt_enum_locals_helper(pcs, module, &preg, EnumSymbolsCallback, UserContext, sym_info, &((struct symt_function*)sym)->vchildren); @@ -785,8 +786,10 @@ BOOL WINAPI SymEnumSymbols(HANDLE hProce if (bang == Mask) return FALSE; - compile_regex(Mask, bang - Mask, &mod_regex, FALSE); - compile_regex(bang + 1, -1, &sym_regex, FALSE); + compile_regex(Mask, bang - Mask, &mod_regex, + dbghelp_options & SYMOPT_CASE_INSENSITIVE); + compile_regex(bang + 1, -1, &sym_regex, + dbghelp_options & SYMOPT_CASE_INSENSITIVE); for (module = pcs->lmodules; module; module = module->next) { @@ -829,7 +832,8 @@ BOOL WINAPI SymEnumSymbols(HANDLE hProce Mask = bang + 1; } - compile_regex(Mask ? Mask : "*", -1, &sym_regex, FALSE); + compile_regex(Mask ? Mask : "*", -1, &sym_regex, + dbghelp_options & SYMOPT_CASE_INSENSITIVE); symt_enum_module(module, &sym_regex, EnumSymbolsCallback, UserContext); regfree(&sym_regex); @@ -1311,3 +1315,42 @@ BOOL WINAPI SymMatchString(PCSTR string, return ret; } +/****************************************************************** + * SymSearch (DBGHELP.@) + */ +BOOL WINAPI SymSearch(HANDLE hProcess, ULONG64 BaseOfDll, DWORD Index, + DWORD SymTag, PCSTR Mask, DWORD64 Address, + PSYM_ENUMERATESYMBOLS_CALLBACK EnumSymbolsCallback, + PVOID UserContext, DWORD Options) +{ + TRACE("(%p %s %lu %lu %s %s %p %p %lx)\n", + hProcess, wine_dbgstr_longlong(BaseOfDll), Index, SymTag, Mask, + wine_dbgstr_longlong(Address), EnumSymbolsCallback, + UserContext, Options); + + if (Index != 0) + { + FIXME("Unsupported searching for a given Index (%lu)\n", Index); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (SymTag != 0) + { + FIXME("Unsupported searching for a given SymTag (%lu)\n", SymTag); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (Address != 0) + { + FIXME("Unsupported searching for a given Address (%s)\n", wine_dbgstr_longlong(Address)); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (Options != SYMSEARCH_GLOBALSONLY) + { + FIXME("Unsupported searching with options (%lx)\n", Options); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + return SymEnumSymbols(hProcess, BaseOfDll, Mask, EnumSymbolsCallback, UserContext); +} diff --git a/include/dbghelp.h b/include/dbghelp.h index c08e214..dd2aad8 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -800,6 +800,10 @@ typedef struct _TI_FINDCHILDREN_PARAMS #define UNDNAME_NO_ARGUMENTS (0x2000) #define UNDNAME_NO_SPECIAL_SYMS (0x4000) +#define SYMSEARCH_MASKOBJS 0x01 +#define SYMSEARCH_RECURSE 0x02 +#define SYMSEARCH_GLOBALSONLY 0x04 + BOOL WINAPI SymGetTypeInfo(HANDLE, DWORD64, ULONG, IMAGEHLP_SYMBOL_TYPE_INFO, PVOID); typedef BOOL (CALLBACK *PSYM_ENUMERATESYMBOLS_CALLBACK)(PSYMBOL_INFO, ULONG, PVOID); BOOL WINAPI SymEnumTypes(HANDLE, ULONG64, PSYM_ENUMERATESYMBOLS_CALLBACK, PVOID); @@ -822,6 +826,7 @@ BOOL WINAPI SymUnDName(PIMAGEHLP_SYMBOL, DWORD WINAPI UnDecorateSymbolName(LPCSTR, LPSTR, DWORD, DWORD); BOOL WINAPI SymMatchString(PCSTR string, PCSTR re, BOOL _case); BOOL WINAPI SymMatchStringW(PCWSTR string, PCWSTR re, BOOL _case); +BOOL WINAPI SymSearch(HANDLE, ULONG64, DWORD, DWORD, PCSTR, DWORD64, PSYM_ENUMERATESYMBOLS_CALLBACK, PVOID, DWORD); /************************* * Source Files *

1 0

Maxime Bellengé : msvcrt: Prevent a crash if TlsGetValue returns NULL in DLL_THREAD_DETACH.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: def7563526f17c01d61c66f684930bda92334445 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=def7563526f17c01d61c66f… Author: Maxime Bellengé <maxime.bellenge(a)wanadoo.fr> Date: Mon Dec 26 12:57:06 2005 +0100 msvcrt: Prevent a crash if TlsGetValue returns NULL in DLL_THREAD_DETACH. --- dlls/msvcrt/main.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index a79d12f..779a293 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -70,8 +70,11 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, case DLL_THREAD_DETACH: /* Free TLS */ tls = TlsGetValue(msvcrt_tls_index); - HeapFree(GetProcessHeap(),0,tls->efcvt_buffer); - HeapFree(GetProcessHeap(),0,tls->wasctime_buffer); + if (tls) + { + HeapFree(GetProcessHeap(),0,tls->efcvt_buffer); + HeapFree(GetProcessHeap(),0,tls->wasctime_buffer); + } HeapFree(GetProcessHeap(), 0, tls); TRACE("finished thread free\n"); break;

1 0

Dmitry Timoshkov : x11drv: Update Canadian keyboard layout to better match the X11 one
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 328e18c2852b775412a03ffb3c9f71e0e5aa3570 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=328e18c2852b775412a03ff… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Dec 26 12:56:26 2005 +0100 x11drv: Update Canadian keyboard layout to better match the X11 one --- dlls/x11drv/keyboard.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/x11drv/keyboard.c b/dlls/x11drv/keyboard.c index 3c8e591..e011446 100644 --- a/dlls/x11drv/keyboard.c +++ b/dlls/x11drv/keyboard.c @@ -401,7 +401,7 @@ static const char main_key_ET[MAIN_LEN][ "<>" }; -/*** Canadian French keyboard layout */ +/*** Canadian French keyboard layout (setxkbmap ca_enhanced) */ static const char main_key_CF[MAIN_LEN][4] = { "#|\\","1!�","2\"@","3/�","4$�","5%�","6?�","7&�","8*�","9(�","0)�","-_�","=+�", @@ -411,13 +411,11 @@ static const char main_key_CF[MAIN_LEN][ "��" }; -/*** Canadian CAN/CSA Z243.200-92 keyboard layout - *** Contributed by Jean-Michel Dault <jmdault(a)revolutionlinux.com> */ +/*** Canadian keyboard layout (setxkbmap ca) */ static const char main_key_CA[MAIN_LEN][4] = { - "/\\","1!��","2@�","3#��","4$��","5%�","6?�","7&","8*","9(","0)","-_","=+", - "qQ","wW","eE","rR��","tT","yY","uU","iI","oO��","pP��","^��","��~", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO��","pP��","^��","��~", "aA��","sSߧ","dD��","fF","gG","hH","jJ","kK","lL",";:�","��","��", "zZ","xX","cC��","vV","bB","nN","mM��",",'",".\"��","��", "��" @@ -901,7 +899,7 @@ static const struct { {0x0406, "Danish keyboard layout", &main_key_DA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x040c, "French keyboard layout", &main_key_FR, &main_key_scan_qwerty, &main_key_vkey_azerty}, {0x0c0c, "Canadian French keyboard layout", &main_key_CF, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0c0c, "Canadian CAN/CSA-Z243.200-92 keyboard layout", &main_key_CA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0c0c, "Canadian keyboard layout", &main_key_CA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x080c, "Belgian keyboard layout", &main_key_BE, &main_key_scan_qwerty, &main_key_vkey_azerty}, {0x0816, "Portuguese keyboard layout", &main_key_PT, &main_key_scan_qwerty, &main_key_vkey_qwerty}, {0x0416, "Brazilian ABNT-2 keyboard layout", &main_key_PT_br, &main_key_scan_abnt_qwerty, &main_key_vkey_abnt_qwerty},

1 0

Robert Shearman : Fix detection of V1a prop variant library in test suite.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 85128db39cf1960827ecb39b748c5d190563fc71 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=85128db39cf1960827ecb39… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 12:56:48 2005 +0100 Fix detection of V1a prop variant library in test suite. --- dlls/ole32/tests/propvariant.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index aa630c1..e8619e7 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -140,7 +140,7 @@ static void test_validtypes(void) hr = PropVariantClear(&propvar); if (hr == S_OK) { - propvar.vt = VT_I8; + propvar.vt = VT_I8 | VT_ARRAY; hr = PropVariantClear(&propvar); if (hr == S_OK) {

1 0

James Hawkins : shell32: Clean up the SHFileOperation tests.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 22ddd114a80854e4240ae0138fe2cad35c6cf56a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=22ddd114a80854e4240ae01… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Dec 26 12:56:06 2005 +0100 shell32: Clean up the SHFileOperation tests. - Make sure to create all the files used by the new tests. - Add a couple more SHFileOperation tests. - Fix some of the old tests. --- dlls/shell32/tests/shlfileop.c | 53 +++++++++++++++++++++++++++++++++++----- 1 files changed, 46 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 60418ed..fe753b7 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -75,8 +75,12 @@ static void init_shfo_tests(void) createTestFile("test1.txt"); createTestFile("test2.txt"); createTestFile("test3.txt"); + createTestFile("test_5.txt"); CreateDirectoryA("test4.txt", NULL); CreateDirectoryA("testdir2", NULL); + CreateDirectoryA("testdir2\\nested", NULL); + createTestFile("testdir2\\one.txt"); + createTestFile("testdir2\\nested\\two.txt"); } /* cleans after tests */ @@ -85,17 +89,22 @@ static void clean_after_shfo_tests(void) DeleteFileA("test1.txt"); DeleteFileA("test2.txt"); DeleteFileA("test3.txt"); + DeleteFileA("test_5.txt"); DeleteFileA("test4.txt\\test1.txt"); DeleteFileA("test4.txt\\test2.txt"); DeleteFileA("test4.txt\\test3.txt"); RemoveDirectoryA("test4.txt"); + DeleteFileA("testdir2\\one.txt"); DeleteFileA("testdir2\\test1.txt"); DeleteFileA("testdir2\\test2.txt"); DeleteFileA("testdir2\\test3.txt"); DeleteFileA("testdir2\\test4.txt\\test1.txt"); + DeleteFileA("testdir2\\nested\\two.txt"); RemoveDirectoryA("testdir2\\test4.txt"); + RemoveDirectoryA("testdir2\\nested"); RemoveDirectoryA("testdir2"); - DeleteFileA("nonexistent\\test2.txt"); + DeleteFileA("nonexistent\\notreal\\test2.txt"); + RemoveDirectoryA("nonexistent\\notreal"); RemoveDirectoryA("nonexistent"); } @@ -180,8 +189,8 @@ static void test_delete(void) { ok(!SHFileOperation(&shfo), "Failed to delete files\n"); ok(!file_exists("test1.txt"), "test1.txt should be removed\n"); + ok(!file_exists("test_5.txt"), "test_5.txt should be removed\n"); } - ok(!file_exists("test_5.txt"), "test_5.txt should be removed\n"); ok(file_exists("test4.txt"), "test4.txt should not be removed\n"); /* FOF_FILESONLY only deletes a dir if explicitly specified */ @@ -191,8 +200,8 @@ static void test_delete(void) { ok(!SHFileOperation(&shfo), "Failed to delete files\n"); ok(!file_exists("test4.txt"), "test4.txt should be removed\n"); + ok(!file_exists("test_5.txt"), "test_5.txt should be removed\n"); } - ok(!file_exists("test_5.txt"), "test_5.txt should be removed\n"); ok(file_exists("test1.txt"), "test1.txt should not be removed\n"); /* try to delete an invalid filename */ @@ -251,9 +260,9 @@ static void test_delete(void) todo_wine { ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", ret); + ok(!file_exists("testdir2\\one.txt"), "Expected testdir2\\one.txt to not exist\n"); + ok(!file_exists("testdir2\\nested"), "Expected testdir2\\nested to exist\n"); } - ok(!file_exists("testdir2\\one.txt"), "Expected testdir2\\one.txt to not exist\n"); - ok(!file_exists("testdir2\\nested"), "Expected testdir2\\nested to exist\n"); } /* tests the FO_RENAME action */ @@ -332,6 +341,22 @@ static void test_rename(void) ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); ok(file_exists("test2.txt"), "Expected test2.txt to exist\n"); + /* pFrom doesn't exist */ + shfo.pFrom = "idontexist\0"; + shfo.pTo = "newfile\0"; + retval = SHFileOperationA(&shfo); + ok(retval == 1026, "Expected 1026, got %ld\n", retval); + ok(!file_exists("newfile"), "Expected newfile to not exist\n"); + + /* pTo already exist */ + shfo.pFrom = "test1.txt\0"; + shfo.pTo = "test2.txt\0"; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_ALREADY_EXISTS, "Expected ERROR_ALREADY_EXISTS, got %ld\n", retval); + } + /* pFrom is valid, but pTo is empty */ shfo.pFrom = "test1.txt\0"; shfo.pTo = "\0"; @@ -541,6 +566,18 @@ static void test_copy(void) ok(DeleteFile("testdir2\\b.txt"), "Expected testdir2\\b.txt to exist\n"); ok(RemoveDirectory("testdir2\\c.txt"), "Expected testdir2\\c.txt to exist\n"); + /* try many dest files without FOF_MULTIDESTFILES flag */ + shfo.pFrom = "test1.txt\0test2.txt\0test3.txt\0"; + shfo.pTo = "a.txt\0b.txt\0c.txt\0"; + shfo.fAnyOperationsAborted = FALSE; + shfo.fFlags &= ~FOF_MULTIDESTFILES; + retval = SHFileOperation(&shfo); + todo_wine + { + ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %ld\n", retval); + } + ok(!file_exists("a.txt"), "Expected a.txt to not exist\n"); + /* try a glob */ shfo.pFrom = "test?.txt\0"; shfo.pTo = "testdir2\0"; @@ -660,7 +697,8 @@ static void test_copy(void) retval = SHFileOperation(&shfo); todo_wine { - ok(retval == 113, "Expected 113, got %ld\n", retval); + ok(retval == ERROR_NO_MORE_SEARCH_HANDLES, + "Expected ERROR_NO_MORE_SEARCH_HANDLES, got %ld\n", retval); ok(!shfo.fAnyOperationsAborted, "Expected no operations to be aborted\n"); ok(DeleteFile("b.txt"), "Expected b.txt to exist\n"); } @@ -730,6 +768,7 @@ static void test_copy(void) retval = SHFileOperation(&shfo); ok(retval == 1026, "Expected 1026, got %ld\n", retval); ok(!file_exists("nonexistent\\e.txt"), "Expected nonexistent\\e.txt to not exist\n"); + ok(!file_exists("nonexistent"), "Expected nonexistent to not exist\n"); } /* tests the FO_MOVE action */ @@ -883,7 +922,7 @@ static void test_move(void) { ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %ld\n", retval); } - ok(!file_exists("dir1"), "Expected dir1 to exist\n"); + ok(!file_exists("dir1"), "Expected dir1 to not exist\n"); /* try to overwrite an existing file */ shfo.pTo = "test3.txt\0";

1 0

Robert Reif : winecfg: Use hourglass cursor when opening audio drivers.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 35a92c86d537e4824b8f2da8d50c76f5d205b1d1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=35a92c86d537e4824b8f2da… Author: Robert Reif <reif(a)earthlink.net> Date: Mon Dec 26 12:55:40 2005 +0100 winecfg: Use hourglass cursor when opening audio drivers. Misbehaving drivers can take a while to open so change to the hour glass cursor when opening them. --- programs/winecfg/audio.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 1d0a424..3d78e92 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -181,6 +181,7 @@ static void initAudioDeviceTree(HWND hDl HWND tree = NULL; HIMAGELIST hImageList; HBITMAP hBitMap; + HCURSOR old_cursor; tree = GetDlgItem(hDlg, IDC_AUDIO_TREE); @@ -205,6 +206,11 @@ static void initAudioDeviceTree(HWND hDl insert.u.item.cChildren = 1; root = (HTREEITEM)SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_INSERTITEM, 0, (LPARAM)&insert); + /* change to the wait cursor because this can take a while if there is a + * misbehaving driver that takes a long time to open + */ + old_cursor = SetCursor(LoadCursor(0, IDC_WAIT)); + /* iterate over list of loaded drivers */ for (pAudioDrv = loadedAudioDrv, i = 0; *pAudioDrv->szName; i++, pAudioDrv++) { HDRVR hdrv; @@ -433,6 +439,9 @@ static void initAudioDeviceTree(HWND hDl } } + /* restore the original cursor */ + SetCursor(old_cursor); + SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_SELECTITEM, 0, 0); SendDlgItemMessage(hDlg, IDC_AUDIO_TREE, TVM_EXPAND, TVE_EXPAND, (LPARAM)root); for (j = 0; j < i; j++) @@ -444,6 +453,7 @@ static void findAudioDrivers(void) { int numFound = 0; const AUDIO_DRIVER *pAudioDrv = NULL; + HCURSOR old_cursor; /* delete an existing list */ if (loadedAudioDrv) @@ -452,6 +462,11 @@ static void findAudioDrivers(void) loadedAudioDrv = 0; } + /* change to the wait cursor because this can take a while if there is a + * misbehaving driver that takes a long time to open + */ + old_cursor = SetCursor(LoadCursor(0, IDC_WAIT)); + for (pAudioDrv = getAudioDrivers(); *pAudioDrv->szName; pAudioDrv++) { if (strlen(pAudioDrv->szDriver)) @@ -476,6 +491,9 @@ static void findAudioDrivers(void) } } + /* restore the original cursor */ + SetCursor(old_cursor); + /* terminate list with empty driver */ loadedAudioDrv = HeapReAlloc(GetProcessHeap(), 0, loadedAudioDrv, (numFound + 1) * sizeof(AUDIO_DRIVER)); CopyMemory(&loadedAudioDrv[numFound], pAudioDrv, sizeof(AUDIO_DRIVER));

1 0

Ulrich Czekalla : atl: Implement AtlComPtrAssign.
by Alexandre Julliard Dec. 26, 2005

Dec. 26, 2005

Module: wine Branch: refs/heads/master Commit: 9da8128e4f3e0a340752053c03efda749b4126b4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9da8128e4f3e0a340752053… Author: Ulrich Czekalla <ulrich(a)codeweavers.com> Date: Mon Dec 26 12:55:22 2005 +0100 atl: Implement AtlComPtrAssign. According to MSDN AtlModuleInit should initialize the modules critical sections. --- dlls/atl/atl.spec | 2 +- dlls/atl/atl_main.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index 471a194..9d0b482 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -22,7 +22,7 @@ 27 stub AtlHiMetricToPixel 28 stub AtlPixelToHiMetric 29 stub AtlDevModeW2A -30 stub AtlComPtrAssign +30 stdcall AtlComPtrAssign(ptr ptr) 31 stub AtlComQIPtrAssign 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) 34 stub AtlGetVersion diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index bcf25f0..a620f9e 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -73,6 +73,10 @@ HRESULT WINAPI AtlModuleInit(_ATL_MODULE pM->m_pObjMap = p; pM->m_hHeap = GetProcessHeap(); + InitializeCriticalSection(&pM->u.m_csTypeInfoHolder); + InitializeCriticalSection(&pM->m_csWindowCreate); + InitializeCriticalSection(&pM->m_csObjMap); + /* call mains */ i = 0; if (pM->m_pObjMap != NULL && size > ATLVer1Size) @@ -181,6 +185,17 @@ BOOL WINAPI AtlAxWinInit(void) } +IUnknown* WINAPI AtlComPtrAssign(IUnknown** pp, IUnknown *p) +{ + TRACE("(%p %p)\n", pp, p); + + if (p) IUnknown_AddRef(p); + if (*pp) IUnknown_Release(*pp); + *pp = p; + return p; +} + + HRESULT WINAPI AtlInternalQueryInterface(LPVOID this, const _ATL_INTMAP_ENTRY* pEntries, REFIID iid, LPVOID* ppvObject) { int i = 0;

1 0

lostwages/wwn wn20051223_302.xml
by WineHQ Dec. 24, 2005

Dec. 24, 2005

ChangeSet ID: 21961 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2005/12/24 01:39:43 Modified files: wwn : wn20051223_302.xml Log message: fixups in WWN #302 Patch: http://cvs.winehq.org/patch.py?id=21961 Old revision New revision Changes Path 1.1 1.2 +10 -8 lostwages/wwn/wn20051223_302.xml Index: lostwages/wwn/wn20051223_302.xml diff -u -p lostwages/wwn/wn20051223_302.xml:1.1 lostwages/wwn/wn20051223_302.xml:1.2 --- lostwages/wwn/wn20051223_302.xml:1.1 24 Dec 2005 7:39:43 -0000 +++ lostwages/wwn/wn20051223_302.xml 24 Dec 2005 7:39:43 -0000 @@ -168,7 +168,7 @@ going to beta without any real attempt freeze release cycle is not a good thing. At the very minimum I would think that we should know when the releases are going to happen but we do not even know that. -<Rant> +</Rant> </quote> Alexandre replied: @@ -261,12 +261,12 @@ and <a href="http://bugs.winehq.org">Bug and report problems. </section> <section - title="" - subject="" - archive="http://www.winehq.com/pipermail/wine-devel/2005-October/.html" - posts="" + title="OSDL Desktop Summit" + subject="[Desktop_architects] Portland, a w(h)iney comment" + archive="http://lists.osdl.org/pipermail/desktop_architects/2005-December/000354.html" + posts="1" > -<topic></topic> +<topic>Project Management</topic> We mentioned a few weeks ago (WWN <a href="http://www.winehq.com/?issue=299#Desktop%20Summit">#299</a>) there was a desktop summit being sponsored by OSDL. Well, Jeremy White and Dan @@ -297,7 +297,7 @@ and PageMaker. No one seems to care that Wine runs 3 of those 4. -<Rodney Dangerfield> We get no respect! <Rodney Dangerfield> +<Rodney Dangerfield> We get no respect! </Rodney Dangerfield> <grin> @@ -473,7 +473,9 @@ lines of code.</quote> Aric looked into it and noticed on SpecOps' <a href="http://www.specopslabs.com/partners-stratigicpartners.htm">Partners</a> -page that IBM and TurboLinux were both listed. +page that IBM and TurboLinux were both listed. Given their long history with +the community, presumably both of those companies would want to make sure the +licensing was followed. So, anyone out there have TurboLinux FUJI? Do you have the source code changes to Wine?

1 0

lostwages/ news/2005122301.xml wwn/wn20051223_ ...
by WineHQ Dec. 24, 2005

Dec. 24, 2005

ChangeSet ID: 21960 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2005/12/24 01:13:37 Added files: news : 2005122301.xml wwn : wn20051223_302.xml Log message: WWN #302 Patch: http://cvs.winehq.org/patch.py?id=21960 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2005122301.xml Added 1.1 +0 -0 lostwages/wwn/wn20051223_302.xml

1 0

lostwages/ include/winehq.conf news/2005122201.xml
by WineHQ Dec. 22, 2005

Dec. 22, 2005

ChangeSet ID: 21959 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2005/12/22 13:22:09 Modified files: include : winehq.conf Added files: news : 2005122201.xml Log message: news about Wine-0.9.4 Patch: http://cvs.winehq.org/patch.py?id=21959 Old revision New revision Changes Path 1.27 1.28 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2005122201.xml Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.27 lostwages/include/winehq.conf:1.28 --- lostwages/include/winehq.conf:1.27 22 Dec 2005 19:22: 9 -0000 +++ lostwages/include/winehq.conf 22 Dec 2005 19:22: 9 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.3 +snapshot_date: 0.9.4 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 Index: lostwages/news/2005122201.xml diff -u -p /dev/null lostwages/news/2005122201.xml:1.1 --- /dev/null 22 Dec 2005 19:22: 9 -0000 +++ lostwages/news/2005122201.xml 22 Dec 2005 19:22: 9 -0000 @@ -0,0 +1,30 @@ +<news> + <date>December 22, 2005</date> + <title>Wine 0.9.4 Released</title> + <body> + +Just in time for Christmas, a new CVS snapshot is out, wine-0.9.4. As +you might have noticed, we're seeing more snapshots now that we're in beta. +We'll cover that process in more detail in this week's Wine Weekly News. Until +then, happy compiling! + +Alexandre noted the following changes: +<ul> + <li>Improvements to the IDL compiler.</li> + <li>Some infrastructure work for loadable driver support.</li> + <li>The usual assortment of Direct3D improvements.</li> + <li>IME support in the edit control.</li> + <li>Better support for AVI animations.</li> + <li>Debugging support improvements.</li> + <li>Relay traces now work on NX platforms.</li> +</ul> + + Binary packages are in the process of being built, but the source is + <a href="http://prdownloads.sourceforge.net/wine/wine-0.9.4.tar.bz2">available + now</a>. You can find out more about this release in the + <a href="?announce=1.108">announcement</a>. Check out our + <a href="/site/download">download page</a> for packages for your favorite + distribution. + + </body> +</news>

1 0

Tag wine-0.9.4 : Alexandre Julliard : Release 0.9.4
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/tags/wine-0.9.4 Tag: f153d54a9b4f9681c93e085136e19026c876f994 URL: http://source.winehq.org/git/?p=wine.git;a=tag;h=f153d54a9b4f9681c93e085136… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 22 18:28:20 2005 +0100 Release 0.9.4

1 0

Alexandre Julliard : Release 0.9.4.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: 4d05f2444a51c2eb4bf75afd9d6784368ebb9e71 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4d05f2444a51c2eb4bf75af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 22 18:28:20 2005 +0100 Release 0.9.4. --- ANNOUNCE | 20 + ChangeLog | 1128 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 configure | 18 - 4 files changed, 1148 insertions(+), 20 deletions(-)

1 0

Michael Jung : shell32: Added some test to document native ITEMIDLIST format.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: 259fd0340752477dbed99d5fdb6d82276911a838 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=259fd0340752477dbed99d5… Author: Michael Jung <mjung(a)iss.tu-darmstadt.de> Date: Thu Dec 22 17:16:11 2005 +0100 shell32: Added some test to document native ITEMIDLIST format. --- dlls/shell32/tests/shlfolder.c | 150 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 150 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 8c0d7f7..7a51844 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1059,6 +1059,155 @@ void test_FolderShortcut(void) { IPersistFolder3_Release(pPersistFolder3); } +#include "pshpack1.h" +struct FileStructA { + BYTE type; + BYTE dummy; + DWORD dwFileSize; + WORD uFileDate; /* In our current implementation this is */ + WORD uFileTime; /* FileTimeToDosDate(WIN32_FIND_DATA->ftLastWriteTime) */ + WORD uFileAttribs; + CHAR szName[1]; +}; + +struct FileStructW { + WORD cbLen; /* Length of this element. */ + BYTE abFooBar1[6]; /* Beyond any recognition. */ + WORD uDate; /* FileTimeToDosDate(WIN32_FIND_DATA->ftCreationTime)? */ + WORD uTime; /* (this is currently speculation) */ + WORD uDate2; /* FileTimeToDosDate(WIN32_FIND_DATA->ftLastAccessTime)? */ + WORD uTime2; /* (this is currently speculation) */ + BYTE abFooBar2[4]; /* Beyond any recognition. */ + WCHAR wszName[1]; /* The long filename in unicode. */ + /* Just for documentation: Right after the unicode string: */ + WORD cbOffset; /* FileStructW's offset from the beginning of the SHITMEID. + * SHITEMID->cb == uOffset + cbLen */ +}; +#include "poppack.h" + +void test_ITEMIDLIST_format(void) { + WCHAR wszPersonal[MAX_PATH]; + LPSHELLFOLDER psfDesktop, psfPersonal; + LPITEMIDLIST pidlPersonal, pidlFile; + HANDLE hFile; + HRESULT hr; + BOOL bResult; + WCHAR wszFile[3][17] = { { 'e','v','e','n','_',0 }, { 'o','d','d','_',0 }, + { 'l','o','n','g','e','r','_','t','h','a','n','.','8','_','3',0 } }; + int i; + + if(!pSHGetSpecialFolderPathW) return; + + bResult = pSHGetSpecialFolderPathW(NULL, wszPersonal, CSIDL_PERSONAL, FALSE); + ok(bResult, "SHGetSpecialFolderPathW failed! Last error: %08lx\n", GetLastError()); + if (!bResult) return; + + bResult = SetCurrentDirectoryW(wszPersonal); + ok(bResult, "SetCurrentDirectory failed! Last error: %ld\n", GetLastError()); + if (!bResult) return; + + hr = SHGetDesktopFolder(&psfDesktop); + ok(SUCCEEDED(hr), "SHGetDesktopFolder failed! hr: %08lx\n", hr); + if (FAILED(hr)) return; + + hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, wszPersonal, NULL, &pidlPersonal, NULL); + ok(SUCCEEDED(hr), "psfDesktop->ParseDisplayName failed! hr = %08lx\n", hr); + if (FAILED(hr)) { + IShellFolder_Release(psfDesktop); + return; + } + + hr = IShellFolder_BindToObject(psfDesktop, pidlPersonal, NULL, &IID_IShellFolder, + (LPVOID*)&psfPersonal); + IShellFolder_Release(psfDesktop); + ILFree(pidlPersonal); + ok(SUCCEEDED(hr), "psfDesktop->BindToObject failed! hr = %08lx\n", hr); + if (FAILED(hr)) return; + + for (i=0; i<3; i++) { + CHAR szFile[MAX_PATH]; + struct FileStructA *pFileStructA; + WORD cbOffset; + + WideCharToMultiByte(CP_ACP, 0, wszFile[i], -1, szFile, MAX_PATH, NULL, NULL); + + hFile = CreateFileW(wszFile[i], GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_FLAG_WRITE_THROUGH, NULL); + ok(hFile != INVALID_HANDLE_VALUE, "CreateFile failed! (%ld)\n", GetLastError()); + if (hFile == INVALID_HANDLE_VALUE) { + IShellFolder_Release(psfPersonal); + return; + } + CloseHandle(hFile); + + hr = IShellFolder_ParseDisplayName(psfPersonal, NULL, NULL, wszFile[i], NULL, &pidlFile, NULL); + DeleteFileW(wszFile[i]); + ok(SUCCEEDED(hr), "psfPersonal->ParseDisplayName failed! hr: %08lx\n", hr); + if (FAILED(hr)) { + IShellFolder_Release(psfPersonal); + return; + } + + pFileStructA = (struct FileStructA *)pidlFile->mkid.abID; + ok(pFileStructA->type == 0x32, "PIDLTYPE should be 0x32!\n"); + ok(pFileStructA->dummy == 0x00, "Dummy Byte should be 0x00!\n"); + ok(pFileStructA->dwFileSize == 0, "Filesize should be zero!\n"); + + if (i < 2) /* First two file names are already in valid 8.3 format */ + ok(!strcmp(szFile, (CHAR*)&pidlFile->mkid.abID[12]), "Wrong file name!\n"); + else + /* WinXP stores a derived 8.3 dos name (LONGER~1.8_3) here. We probably + * can't implement this correctly, since unix filesystems don't support + * this nasty short/long filename stuff. So we'll probably stay with our + * current habbit of storing the long filename here, which seems to work + * just fine. */ + todo_wine { ok(pidlFile->mkid.abID[18] == '~', "Should be derived 8.3 name!\n"); } + + if (i == 0) /* First file name has an even number of chars. No need for alignment. */ + todo_wine { ok(pidlFile->mkid.abID[12 + strlen(szFile) + 1] != '\0', + "Alignment byte, where there shouldn't be!\n"); } + + if (i == 1) /* Second file name has an uneven number of chars => alignment byte */ + ok(pidlFile->mkid.abID[12 + strlen(szFile) + 1] == '\0', + "There should be an alignment byte, but isn't!\n"); + + /* The offset of the FileStructW member is stored as a WORD at the end of the pidl. */ + cbOffset = *(WORD*)(((LPBYTE)pidlFile)+pidlFile->mkid.cb-sizeof(WORD)); + todo_wine { ok (cbOffset >= sizeof(struct FileStructA) && + cbOffset <= pidlFile->mkid.cb - sizeof(struct FileStructW), + "Wrong offset value (%d) stored at the end of the PIDL\n", cbOffset); } + + if (cbOffset >= sizeof(struct FileStructA) && + cbOffset <= pidlFile->mkid.cb - sizeof(struct FileStructW)) + { + struct FileStructW *pFileStructW = (struct FileStructW *)(((LPBYTE)pidlFile)+cbOffset); + + ok(pidlFile->mkid.cb == cbOffset + pFileStructW->cbLen, + "FileStructW's offset and length should add up to the PIDL's length!\n"); + + if (pidlFile->mkid.cb == cbOffset + pFileStructW->cbLen) { + /* Since we just created the file, time of creation, + * time of last access and time of last write access just be the same. + * These tests seem to fail sometimes (on WinXP), if the test is run again shortly + * after the first run. I do remember something with NTFS keeping the creation time + * if a file is deleted and then created again within a couple of seconds or so. + * Might be the reason. */ + ok (pFileStructA->uFileDate == pFileStructW->uDate && + pFileStructA->uFileTime == pFileStructW->uTime, + "Last write time should match creation time!\n"); + + ok (pFileStructA->uFileDate == pFileStructW->uDate2 && + pFileStructA->uFileTime == pFileStructW->uTime2, + "Last write time should match last access time!\n"); + + ok (!lstrcmpW(wszFile[i], pFileStructW->wszName), + "The filename should be stored in unicode at this position!\n"); + } + } + + ILFree(pidlFile); + } +} + START_TEST(shlfolder) { init_function_pointers(); @@ -1074,6 +1223,7 @@ START_TEST(shlfolder) test_SHGetPathFromIDList(); test_CallForAttributes(); test_FolderShortcut(); + test_ITEMIDLIST_format(); OleUninitialize(); }

1 0

Alexandre Julliard : user/tests: Remove todo_wine from a few tests that (usually) succeed.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: 0e6b4c43de329e298058bb4eb98e6140e3b13231 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0e6b4c43de329e298058bb4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 22 17:15:54 2005 +0100 user/tests: Remove todo_wine from a few tests that (usually) succeed. --- dlls/user/tests/msg.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/user/tests/msg.c b/dlls/user/tests/msg.c index 449f604..3cdaf5e 100644 --- a/dlls/user/tests/msg.c +++ b/dlls/user/tests/msg.c @@ -6775,9 +6775,7 @@ static void test_PeekMessage(void) qs_all_input &= ~QS_RAWINPUT; qs_input &= ~QS_RAWINPUT; } -todo_wine { ok(qstatus == 0, "wrong qstatus %08lx\n", qstatus); -} trace("signalling to send message\n"); SetEvent(info.hevent[EV_SENDMSG]); @@ -6790,13 +6788,11 @@ todo_wine { ok(GetLastError() == ERROR_INVALID_FLAGS, "wrong error %ld\n", GetLastError()); qstatus = GetQueueStatus(qs_all_input); -todo_wine { ok(qstatus == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE), "wrong qstatus %08lx\n", qstatus); -} while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(WmUser, "WmUser", TRUE); /* todo_wine */ + ok_sequence(WmUser, "WmUser", FALSE); qstatus = GetQueueStatus(qs_all_input); ok(qstatus == 0, "wrong qstatus %08lx\n", qstatus);

1 0

Dmitry Timoshkov : mciavi32: Rewrite asynchronous MCI_PLAY command handling.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: 43cbb44f4fe9ebd68cf86d8dec5a70df6c5e92ba URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=43cbb44f4fe9ebd68cf86d8… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 22 17:15:33 2005 +0100 mciavi32: Rewrite asynchronous MCI_PLAY command handling. Rewrite asynchronous MCI_PLAY command handling in MCIAVI driver, make it more responsive to commands in the MCI_MODE_PLAY state by checking hStopEvent even if the time frame between frames has expired. --- dlls/mciavi32/mciavi.c | 155 +++++++++++++++++++--------------------- dlls/mciavi32/private_mciavi.h | 1 2 files changed, 75 insertions(+), 81 deletions(-) diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index 8f1074c..a1f04f9 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -44,74 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mciavi); static DWORD MCIAVI_mciStop(UINT, DWORD, LPMCI_GENERIC_PARMS); -/* =================================================================== - * =================================================================== - * FIXME: should be using the new mmThreadXXXX functions from WINMM - * instead of those - * it would require to add a wine internal flag to mmThreadCreate - * in order to pass a 32 bit function instead of a 16 bit one - * =================================================================== - * =================================================================== */ - -struct SCA { - MCIDEVICEID wDevID; - UINT wMsg; - DWORD_PTR dwParam1; - DWORD_PTR dwParam2; -}; - -/************************************************************************** - * MCI_SCAStarter [internal] - */ -static DWORD CALLBACK MCI_SCAStarter(LPVOID arg) -{ - struct SCA* sca = (struct SCA*)arg; - DWORD ret; - - TRACE("In thread before async command (%08x,%04x,%08lx,%08lx)\n", - sca->wDevID, sca->wMsg, sca->dwParam1, sca->dwParam2); - ret = mciSendCommandA(sca->wDevID, sca->wMsg, sca->dwParam1 | MCI_WAIT, sca->dwParam2); - TRACE("In thread after async command (%08x,%04x,%08lx,%08lx)\n", - sca->wDevID, sca->wMsg, sca->dwParam1, sca->dwParam2); - HeapFree(GetProcessHeap(), 0, sca); - return ret; -} - -/************************************************************************** - * MCI_SendCommandAsync [internal] - */ -static DWORD MCI_SendCommandAsync(UINT wDevID, UINT wMsg, DWORD dwParam1, - DWORD_PTR dwParam2, UINT size) -{ - HANDLE handle; - struct SCA* sca = HeapAlloc(GetProcessHeap(), 0, sizeof(struct SCA) + size); - - if (sca == 0) - return MCIERR_OUT_OF_MEMORY; - - sca->wDevID = wDevID; - sca->wMsg = wMsg; - sca->dwParam1 = dwParam1; - - if (size && dwParam2) { - sca->dwParam2 = (DWORD_PTR)sca + sizeof(struct SCA); - /* copy structure passed by program in dwParam2 to be sure - * we can still use it whatever the program does - */ - memcpy((LPVOID)sca->dwParam2, (LPVOID)dwParam2, size); - } else { - sca->dwParam2 = dwParam2; - } - - if ((handle = CreateThread(NULL, 0, MCI_SCAStarter, sca, 0, NULL)) == 0) { - WARN("Couldn't allocate thread for async command handling, sending synchronously\n"); - return MCI_SCAStarter(&sca); - } - SetThreadPriority(handle, THREAD_PRIORITY_TIME_CRITICAL); - CloseHandle(handle); - return 0; -} - /*======================================================================* * MCI AVI implemantation * *======================================================================*/ @@ -152,6 +84,7 @@ static DWORD MCIAVI_drvOpen(LPCWSTR str, return 0; InitializeCriticalSection(&wma->cs); + wma->ack_event = CreateEventW(NULL, FALSE, FALSE, NULL); wma->hStopEvent = CreateEventW(NULL, FALSE, FALSE, NULL); wma->wDevID = modp->wDeviceID; wma->wCommandTable = mciLoadCommandResource(MCIAVI_hInstance, mciAviWStr, 0); @@ -184,6 +117,7 @@ static DWORD MCIAVI_drvClose(DWORD dwDev mciSetDriverData(dwDevID, 0); mciFreeCommandResource(wma->wCommandTable); + CloseHandle(wma->ack_event); CloseHandle(wma->hStopEvent); LeaveCriticalSection(&wma->cs); @@ -393,6 +327,61 @@ DWORD MCIAVI_mciClose(UINT wDevID, DWORD return dwRet; } +static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms); + +struct MCIAVI_play_data +{ + MCIDEVICEID wDevID; + DWORD flags; + MCI_PLAY_PARMS params; +}; + +/* + * MCIAVI_mciPlay_thread + * + * FIXME: probably should use a common worker thread created at the driver + * load time and queue all async commands to it. + */ +static DWORD WINAPI MCIAVI_mciPlay_thread(LPVOID arg) +{ + struct MCIAVI_play_data *data = (struct MCIAVI_play_data *)arg; + DWORD ret; + + TRACE("In thread before async play command (id %08x, flags %08lx)\n", data->wDevID, data->flags); + ret = MCIAVI_mciPlay(data->wDevID, data->flags | MCI_WAIT, &data->params); + TRACE("In thread after async play command (id %08x, flags %08lx)\n", data->wDevID, data->flags); + + HeapFree(GetProcessHeap(), 0, data); + return ret; +} + +/* + * MCIAVI_mciPlay_async + */ +static DWORD MCIAVI_mciPlay_async(WINE_MCIAVI *wma, DWORD dwFlags, LPMCI_PLAY_PARMS lpParams) +{ + HANDLE handle, ack_event = wma->ack_event; + struct MCIAVI_play_data *data = HeapAlloc(GetProcessHeap(), 0, sizeof(struct MCIAVI_play_data)); + + if (!data) return MCIERR_OUT_OF_MEMORY; + + data->wDevID = wma->wDevID; + data->flags = dwFlags; + memcpy(&data->params, lpParams, sizeof(MCI_PLAY_PARMS)); + + if (!(handle = CreateThread(NULL, 0, MCIAVI_mciPlay_thread, data, 0, NULL))) + { + WARN("Couldn't create thread for async play, playing synchronously\n"); + return MCIAVI_mciPlay_thread(data); + } + SetThreadPriority(handle, THREAD_PRIORITY_TIME_CRITICAL); + CloseHandle(handle); + /* wait until the thread starts up, so the app could see a changed status */ + WaitForSingleObject(ack_event, INFINITE); + TRACE("Async play has started\n"); + return 0; +} + /*************************************************************************** * MCIAVI_mciPlay [internal] */ @@ -429,10 +418,8 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, LeaveCriticalSection(&wma->cs); - if (!(dwFlags & MCI_WAIT)) { - return MCI_SendCommandAsync(wDevID, MCI_PLAY, dwFlags, - (DWORD_PTR)lpParms, sizeof(MCI_PLAY_PARMS)); - } + if (!(dwFlags & MCI_WAIT)) + return MCIAVI_mciPlay_async(wma, dwFlags, lpParms); if (!(GetWindowLongW(wma->hWndPaint, GWL_STYLE) & WS_VISIBLE)) ShowWindow(wma->hWndPaint, SW_SHOWNA); @@ -460,16 +447,20 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, if (wma->dwStatus == MCI_MODE_PLAY) { LeaveCriticalSection(&wma->cs); + SetEvent(wma->ack_event); return 0; } if (wma->dwToVideoFrame <= wma->dwCurrVideoFrame) { dwRet = 0; + SetEvent(wma->ack_event); goto mci_play_done; } wma->dwStatus = MCI_MODE_PLAY; + /* signal the state change */ + SetEvent(wma->ack_event); if (dwFlags & (MCI_DGV_PLAY_REPEAT|MCI_DGV_PLAY_REVERSE|MCI_MCIAVI_PLAY_WINDOW|MCI_MCIAVI_PLAY_FULLSCREEN)) FIXME("Unsupported flag %08lx\n", dwFlags); @@ -492,6 +483,7 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, while (wma->dwStatus == MCI_MODE_PLAY) { HDC hDC; + DWORD ret; tc = GetTickCount(); @@ -504,7 +496,6 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, if (wma->lpWaveFormat) { HANDLE events[2]; - DWORD ret; events[0] = wma->hStopEvent; events[1] = wma->hEvent; @@ -522,15 +513,15 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, delta = GetTickCount() - tc; if (delta < frameTime) - { - DWORD ret; + delta = frameTime - delta; + else + delta = 0; - LeaveCriticalSection(&wma->cs); - ret = MsgWaitForMultipleObjectsEx(1, &wma->hStopEvent, frameTime - delta, - QS_ALLINPUT, MWMO_INPUTAVAILABLE); - EnterCriticalSection(&wma->cs); - if (ret == WAIT_OBJECT_0) break; - } + LeaveCriticalSection(&wma->cs); + ret = MsgWaitForMultipleObjectsEx(1, &wma->hStopEvent, delta, + QS_ALLINPUT, MWMO_INPUTAVAILABLE); + EnterCriticalSection(&wma->cs); + if (ret == WAIT_OBJECT_0) break; if (wma->dwCurrVideoFrame < dwToFrame) wma->dwCurrVideoFrame++; @@ -618,6 +609,8 @@ static DWORD MCIAVI_mciStop(UINT wDevID, EnterCriticalSection(&wma->cs); + TRACE("current status %04lx\n", wma->dwStatus); + switch (wma->dwStatus) { case MCI_MODE_PLAY: case MCI_MODE_RECORD: diff --git a/dlls/mciavi32/private_mciavi.h b/dlls/mciavi32/private_mciavi.h index 2cbed11..cd11f76 100644 --- a/dlls/mciavi32/private_mciavi.h +++ b/dlls/mciavi32/private_mciavi.h @@ -80,6 +80,7 @@ typedef struct { /* data for the background mechanism */ CRITICAL_SECTION cs; HANDLE hStopEvent; + HANDLE ack_event; /* acknowledge that an async command has started */ } WINE_MCIAVI; extern HINSTANCE MCIAVI_hInstance;

1 0

Ulrich Czekalla : ole32: Return error instead of asserting if storage file is corrupt.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: 707fa2c3a25421a0a805ab466cdc90e3ddc89ed4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=707fa2c3a25421a0a805ab4… Author: Ulrich Czekalla <ulrich(a)codeweavers.com> Date: Thu Dec 22 17:15:05 2005 +0100 ole32: Return error instead of asserting if storage file is corrupt. --- dlls/ole32/stg_stream.c | 37 +++++++++++++------------------------ dlls/ole32/storage32.c | 32 +++++++++++++++++++++----------- dlls/ole32/storage32.h | 2 +- include/winerror.h | 1 + 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 928028b..40f0e81 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -273,7 +273,7 @@ static HRESULT WINAPI StgStreamImpl_Read */ if (This->smallBlockChain!=0) { - SmallBlockChainStream_ReadAt(This->smallBlockChain, + res = SmallBlockChainStream_ReadAt(This->smallBlockChain, This->currentPosition, bytesToReadFromBuffer, pv, @@ -282,7 +282,7 @@ static HRESULT WINAPI StgStreamImpl_Read } else if (This->bigBlockChain!=0) { - BlockChainStream_ReadAt(This->bigBlockChain, + res = BlockChainStream_ReadAt(This->bigBlockChain, This->currentPosition, bytesToReadFromBuffer, pv, @@ -300,30 +300,19 @@ static HRESULT WINAPI StgStreamImpl_Read goto end; } - /* - * We should always be able to read the proper amount of data from the - * chain. - */ - assert(bytesToReadFromBuffer == *pcbRead); - - /* - * Advance the pointer for the number of positions read. - */ - This->currentPosition.u.LowPart += *pcbRead; - - if(*pcbRead != cb) + if (SUCCEEDED(res)) { - WARN("read %ld instead of the required %ld bytes !\n", *pcbRead, cb); - /* - * this used to return S_FALSE, however MSDN docu says that an app should - * be prepared to handle error in case of stream end reached, as *some* - * implementations *might* return an error (IOW: most do *not*). - * As some program fails on returning S_FALSE, I better use S_OK here. - */ - res = S_OK; + /* + * We should always be able to read the proper amount of data from the + * chain. + */ + assert(bytesToReadFromBuffer == *pcbRead); + + /* + * Advance the pointer for the number of positions read. + */ + This->currentPosition.u.LowPart += *pcbRead; } - else - res = S_OK; end: TRACE("<-- %08lx\n", res); diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 708d994..c9d696e 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3414,7 +3414,8 @@ BlockChainStream* Storage32Impl_SmallBlo ULARGE_INTEGER size, offset; ULONG cbRead, cbWritten, cbTotalRead, cbTotalWritten; ULONG propertyIndex; - BOOL successRead, successWrite; + BOOL successWrite; + HRESULT successRead; StgProperty chainProperty; BYTE *buffer; BlockChainStream *bbTempChain = NULL; @@ -3463,7 +3464,7 @@ BlockChainStream* Storage32Impl_SmallBlo offset.u.LowPart += This->smallBlockSize; - } while (successRead && successWrite); + } while (SUCCEEDED(successRead) && successWrite); HeapFree(GetProcessHeap(),0,buffer); assert(cbTotalRead == cbTotalWritten); @@ -4397,6 +4398,9 @@ BOOL BlockChainStream_ReadAt(BlockChainS blockNoInSequence--; } + if ((blockNoInSequence > 0) && (blockIndex == BLOCK_END_OF_CHAIN)) + return FALSE; /* We failed to find the starting block */ + This->lastBlockNoInSequenceIndex = blockIndex; /* @@ -5098,13 +5102,14 @@ ULONG SmallBlockChainStream_GetNextFreeB * bytesRead may be NULL. * Failure will be returned if the specified number of bytes has not been read. */ -BOOL SmallBlockChainStream_ReadAt( +HRESULT SmallBlockChainStream_ReadAt( SmallBlockChainStream* This, ULARGE_INTEGER offset, ULONG size, void* buffer, ULONG* bytesRead) { + HRESULT rc = S_OK; ULARGE_INTEGER offsetInBigBlockFile; ULONG blockNoInSequence = offset.u.LowPart / This->parentStorage->smallBlockSize; @@ -5127,9 +5132,9 @@ BOOL SmallBlockChainStream_ReadAt( while ( (blockNoInSequence > 0) && (blockIndex != BLOCK_END_OF_CHAIN)) { - if(FAILED(SmallBlockChainStream_GetNextBlockInChain(This, blockIndex, - &blockIndex))) - return FALSE; + rc = SmallBlockChainStream_GetNextBlockInChain(This, blockIndex, &blockIndex); + if(FAILED(rc)) + return rc; blockNoInSequence--; } @@ -5158,27 +5163,32 @@ BOOL SmallBlockChainStream_ReadAt( /* * Read those bytes in the buffer from the small block file. + * The small block has already been identified so it shouldn't fail + * unless the file is corrupt. */ - BlockChainStream_ReadAt(This->parentStorage->smallBlockRootChain, + if (!BlockChainStream_ReadAt(This->parentStorage->smallBlockRootChain, offsetInBigBlockFile, bytesToReadInBuffer, bufferWalker, - &bytesReadFromBigBlockFile); + &bytesReadFromBigBlockFile)) + return STG_E_DOCFILECORRUPT; assert(bytesReadFromBigBlockFile == bytesToReadInBuffer); /* * Step to the next big block. */ - if(FAILED(SmallBlockChainStream_GetNextBlockInChain(This, blockIndex, &blockIndex))) - return FALSE; + rc = SmallBlockChainStream_GetNextBlockInChain(This, blockIndex, &blockIndex); + if(FAILED(rc)) + return rc; + bufferWalker += bytesToReadInBuffer; size -= bytesToReadInBuffer; *bytesRead += bytesToReadInBuffer; offsetInBlock = 0; /* There is no offset on the next block */ } - return (size == 0); + return rc; } /****************************************************************************** diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 4061a06..0472524 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -667,7 +667,7 @@ void SmallBlockChainStream_FreeBlock( ULONG SmallBlockChainStream_GetNextFreeBlock( SmallBlockChainStream* This); -BOOL SmallBlockChainStream_ReadAt( +HRESULT SmallBlockChainStream_ReadAt( SmallBlockChainStream* This, ULARGE_INTEGER offset, ULONG size, diff --git a/include/winerror.h b/include/winerror.h index bf866da..b824c79 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -1691,6 +1691,7 @@ #define STG_E_SHAREREQUIRED _HRESULT_TYPEDEF_(0x80030106L) #define STG_E_NOTFILEBASEDSTORAGE _HRESULT_TYPEDEF_(0x80030107L) #define STG_E_EXTANTMARSHALLINGS _HRESULT_TYPEDEF_(0x80030108L) +#define STG_E_DOCFILECORRUPT _HRESULT_TYPEDEF_(0x80030109L) #define STG_E_STATUS_COPY_PROTECTION_FAILURE _HRESULT_TYPEDEF_(0x80030305L) #define STG_E_CSS_AUTHENTICATION_FAILURE _HRESULT_TYPEDEF_(0x80030306L)

1 0

Dmitry Timoshkov : user32/tests: Add a PeekMessage test.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: b61b82011e616eb369dbfb01c036d6c796866ea5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b61b82011e616eb369dbfb0… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 22 13:58:11 2005 +0100 user32/tests: Add a PeekMessage test. --- dlls/user/tests/msg.c | 285 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 284 insertions(+), 1 deletions(-) diff --git a/dlls/user/tests/msg.c b/dlls/user/tests/msg.c index 5d54386..449f604 100644 --- a/dlls/user/tests/msg.c +++ b/dlls/user/tests/msg.c @@ -24,7 +24,7 @@ #include <stdarg.h> #include <stdio.h> -#define _WIN32_WINNT 0x0500 /* For WM_CHANGEUISTATE */ +#define _WIN32_WINNT 0x0501 /* For WM_CHANGEUISTATE,QS_RAWINPUT */ #include "windef.h" #include "winbase.h" @@ -6680,6 +6680,288 @@ static void test_edit_messages(void) /**************************** End of Edit test ******************************/ +static const struct message WmChar[] = { + { WM_CHAR, sent|wparam, 'z' }, + { 0 } +}; + +static const struct message WmKeyDownUp[] = { + { WM_KEYDOWN, sent|wparam|lparam, 'N', 0x00000001 }, + { WM_KEYUP, sent|wparam|lparam, 'N', 0xc0000001 }, + { 0 } +}; + +static const struct message WmUserChar[] = { + { WM_USER, sent }, + { WM_CHAR, sent|wparam, 'z' }, + { 0 } +}; + +#define EV_START_STOP 0 +#define EV_SENDMSG 1 +#define EV_ACK 2 + +struct thread_info_2 +{ + HWND hwnd; + HANDLE hevent[3]; /* 0 - start/stop, 1 - SendMessage, 2 - ack */ +}; + +static DWORD CALLBACK send_msg_thread_2(void *param) +{ + DWORD ret; + struct thread_info_2 *info = param; + + trace("thread: waiting for start\n"); + WaitForSingleObject(info->hevent[EV_START_STOP], INFINITE); + trace("thread: looping\n"); + + while (1) + { + ret = WaitForMultipleObjects(2, info->hevent, FALSE, INFINITE); + + switch (ret) + { + case WAIT_OBJECT_0 + EV_START_STOP: + trace("thread: exiting\n"); + return 0; + + case WAIT_OBJECT_0 + EV_SENDMSG: + trace("thread: sending message\n"); + SendNotifyMessageA(info->hwnd, WM_USER, 0, 0); + SetEvent(info->hevent[EV_ACK]); + break; + + default: + trace("unexpected return: %04lx\n", ret); + assert(0); + break; + } + } + return 0; +} + +static void test_PeekMessage(void) +{ + MSG msg; + HANDLE hthread; + DWORD tid, qstatus; + UINT qs_all_input = QS_ALLINPUT; + UINT qs_input = QS_INPUT; + struct thread_info_2 info; + + info.hwnd = CreateWindowA("TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, + 100, 100, 200, 200, 0, 0, 0, NULL); + ShowWindow(info.hwnd, SW_SHOW); + UpdateWindow(info.hwnd); + + info.hevent[EV_START_STOP] = CreateEventA(NULL, 0, 0, NULL); + info.hevent[EV_SENDMSG] = CreateEventA(NULL, 0, 0, NULL); + info.hevent[EV_ACK] = CreateEventA(NULL, 0, 0, NULL); + + hthread = CreateThread(NULL, 0, send_msg_thread_2, &info, 0, &tid); + + trace("signalling to start looping\n"); + SetEvent(info.hevent[EV_START_STOP]); + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + flush_sequence(); + + SetLastError(0xdeadbeef); + qstatus = GetQueueStatus(qs_all_input); + if (GetLastError() == ERROR_INVALID_FLAGS) + { + trace("QS_RAWINPUT not supported on this platform\n"); + qs_all_input &= ~QS_RAWINPUT; + qs_input &= ~QS_RAWINPUT; + } +todo_wine { + ok(qstatus == 0, "wrong qstatus %08lx\n", qstatus); +} + + trace("signalling to send message\n"); + SetEvent(info.hevent[EV_SENDMSG]); + WaitForSingleObject(info.hevent[EV_ACK], INFINITE); + + /* pass invalid QS_xxxx flags */ + SetLastError(0xdeadbeef); + qstatus = GetQueueStatus(0xffffffff); + ok(qstatus == 0, "GetQueueStatus should fail: %08lx\n", qstatus); + ok(GetLastError() == ERROR_INVALID_FLAGS, "wrong error %ld\n", GetLastError()); + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE), + "wrong qstatus %08lx\n", qstatus); +} + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(WmUser, "WmUser", TRUE); /* todo_wine */ + + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == 0, "wrong qstatus %08lx\n", qstatus); + + keybd_event('N', 0, 0, 0); + keybd_event('N', 0, KEYEVENTF_KEYUP, 0); + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == MAKELONG(QS_KEY, QS_KEY), + "wrong qstatus %08lx\n", qstatus); + + PostMessageA(info.hwnd, WM_CHAR, 'z', 0); + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == MAKELONG(QS_POSTMESSAGE, QS_POSTMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); + + InvalidateRect(info.hwnd, NULL, FALSE); + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == MAKELONG(QS_PAINT, QS_PAINT|QS_POSTMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); + + trace("signalling to send message\n"); + SetEvent(info.hevent[EV_SENDMSG]); + WaitForSingleObject(info.hevent[EV_ACK], INFINITE); + + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE|QS_PAINT|QS_POSTMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | (qs_input << 16))) DispatchMessageA(&msg); + ok_sequence(WmUser, "WmUser", TRUE); /* todo_wine */ + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(0, QS_PAINT|QS_POSTMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + + trace("signalling to send message\n"); + SetEvent(info.hevent[EV_SENDMSG]); + WaitForSingleObject(info.hevent[EV_ACK], INFINITE); + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE|QS_PAINT|QS_POSTMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | PM_QS_POSTMESSAGE)) DispatchMessageA(&msg); + ok_sequence(WmUser, "WmUser", FALSE); + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(0, QS_PAINT|QS_POSTMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | PM_QS_POSTMESSAGE)) DispatchMessageA(&msg); + ok_sequence(WmChar, "WmChar", TRUE); /* todo_wine */ + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(0, QS_PAINT|QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | PM_QS_PAINT)) DispatchMessageA(&msg); + ok_sequence(WmPaint, "WmPaint", TRUE); /* todo_wine */ + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(0, QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + + trace("signalling to send message\n"); + SetEvent(info.hevent[EV_SENDMSG]); + WaitForSingleObject(info.hevent[EV_ACK], INFINITE); + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + + PostMessageA(info.hwnd, WM_CHAR, 'z', 0); + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(QS_POSTMESSAGE, QS_SENDMESSAGE|QS_POSTMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + + while (PeekMessageA(&msg, 0, WM_CHAR, WM_CHAR, PM_REMOVE)) DispatchMessage(&msg); + ok_sequence(WmUserChar, "WmUserChar", FALSE); + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(0, QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + + PostMessageA(info.hwnd, WM_CHAR, 'z', 0); + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(QS_POSTMESSAGE, QS_POSTMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + + trace("signalling to send message\n"); + SetEvent(info.hevent[EV_SENDMSG]); + WaitForSingleObject(info.hevent[EV_ACK], INFINITE); + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE|QS_POSTMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | (QS_KEY << 16))) DispatchMessage(&msg); + ok_sequence(WmUser, "WmUser", TRUE); /* todo_wine */ + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(0, QS_POSTMESSAGE|QS_KEY), + "wrong qstatus %08lx\n", qstatus); +} + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | (QS_RAWINPUT << 16))) DispatchMessage(&msg); + ok_sequence(WmKeyDownUp, "WmKeyDownUp", TRUE); /* todo_wine */ + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(0, QS_POSTMESSAGE), + "wrong qstatus %08lx\n", qstatus); +} + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE)) DispatchMessage(&msg); + ok_sequence(WmEmptySeq, "WmEmptySeq", FALSE); + + qstatus = GetQueueStatus(qs_all_input); +todo_wine { + ok(qstatus == MAKELONG(0, QS_POSTMESSAGE), + "wrong qstatus %08lx\n", qstatus); +} + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(WmChar, "WmChar", TRUE); /* todo_wine */ + + qstatus = GetQueueStatus(qs_all_input); + ok(qstatus == 0, + "wrong qstatus %08lx\n", qstatus); + + trace("signalling to exit\n"); + SetEvent(info.hevent[EV_START_STOP]); + + WaitForSingleObject(hthread, INFINITE); + + CloseHandle(hthread); + CloseHandle(info.hevent[0]); + CloseHandle(info.hevent[1]); + CloseHandle(info.hevent[2]); + + DestroyWindow(info.hwnd); +} + + START_TEST(msg) { BOOL ret; @@ -6723,6 +7005,7 @@ START_TEST(msg) hEvent_hook = 0; #endif + test_PeekMessage(); test_scrollwindowex(); test_messages(); test_mdi_messages();

1 0

Eric Pouech : kernel/tests: Check that we successfully open the console.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: 8218d91758dfc805a3fee2e9cb039df473fd7e2e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8218d91758dfc805a3fee2e… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Thu Dec 22 13:55:03 2005 +0100 kernel/tests: Check that we successfully open the console. --- dlls/kernel/tests/console.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/kernel/tests/console.c b/dlls/kernel/tests/console.c index a7f3253..edd1eff 100644 --- a/dlls/kernel/tests/console.c +++ b/dlls/kernel/tests/console.c @@ -567,7 +567,7 @@ START_TEST(console) /* first, we detach and open a fresh console to play with */ FreeConsole(); - AllocConsole(); + ok(AllocConsole(), "Couldn't alloc console\n"); hConIn = CreateFileA("CONIN$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); hConOut = CreateFileA("CONOUT$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); @@ -585,7 +585,6 @@ START_TEST(console) /* will test line scrolling at the bottom of the screen */ /* testBottomScroll(); */ /* will test all the scrolling operations */ - /* this one is disabled for now, Wine's result are way too bad */ testScroll(hConOut, sbi.dwSize); /* will test sb creation / modification... */ /* testScreenBuffer() */

1 0

Alexandre Julliard : server: Fixed console access rights handling.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: b4fa1b914c70d621343254d289579ab8b8e53ede URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b4fa1b914c70d621343254d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 22 13:54:34 2005 +0100 server: Fixed console access rights handling. --- server/console.c | 58 ++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 37 insertions(+), 21 deletions(-)

1 0

Raphael Junqueira : opengl: Fix last wgl regression.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: 2d708edc5f715c2957790b3f926cf308f679de59 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2d708edc5f715c2957790b3… Author: Raphael Junqueira <fenix(a)club-internet.fr> Date: Thu Dec 22 13:54:01 2005 +0100 opengl: Fix last wgl regression. Fix wgl regression: test glx server version and extensions to use (and not use glXQueryDrawable on older glx implementations). --- dlls/opengl32/wgl.c | 147 ++++++++++++++++++++++++++++++++++++----------- dlls/opengl32/wgl_ext.c | 13 +++- dlls/opengl32/wgl_ext.h | 13 ++++ 3 files changed, 133 insertions(+), 40 deletions(-)

1 0

James Hawkins : shell32: Add tests for SHFileOperation's FO_MOVE command.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: 036d5eff7bf6d2146d036066336aff842d15c988 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=036d5eff7bf6d2146d03606… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 22 11:19:13 2005 +0100 shell32: Add tests for SHFileOperation's FO_MOVE command. --- dlls/shell32/tests/shlfileop.c | 81 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index e73a513..60418ed 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -738,6 +738,7 @@ static void test_move(void) SHFILEOPSTRUCTA shfo, shfo2; CHAR from[MAX_PATH]; CHAR to[MAX_PATH]; + DWORD retval; shfo.hwnd = NULL; shfo.wFunc = FO_MOVE; @@ -750,7 +751,8 @@ static void test_move(void) set_curr_dir_path(from, "test1.txt\0"); set_curr_dir_path(to, "test4.txt\0"); ok(!SHFileOperationA(&shfo), "Prepare test to check how directories are moved recursively\n"); - ok(file_exists("test4.txt\\test1.txt"), "The file is moved\n"); + ok(!file_exists("test1.txt"), "test1.txt should not exist\n"); + ok(file_exists("test4.txt\\test1.txt"), "The file is not moved\n"); set_curr_dir_path(from, "test?.txt\0"); set_curr_dir_path(to, "testdir2\0"); @@ -815,6 +817,83 @@ static void test_move(void) set_curr_dir_path(from, "test6.txt\0"); set_curr_dir_path(to, "test4.txt\0"); ok(!SHFileOperationA(&shfo), "Move dir back\n"); + + /* move one file to two others */ + init_shfo_tests(); + shfo.pFrom = "test1.txt\0"; + shfo.pTo = "a.txt\0b.txt\0"; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", retval); + ok(!file_exists("test1.txt"), "Expected test1.txt to not exist\n"); + ok(DeleteFile("a.txt"), "Expected a.txt to exist\n"); + } + ok(!file_exists("b.txt"), "Expected b.txt to not exist\n"); + + /* move two files to one other */ + shfo.pFrom = "test2.txt\0test3.txt\0"; + shfo.pTo = "test1.txt\0"; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %ld\n", retval); + ok(!file_exists("test1.txt"), "Expected test1.txt to not exist\n"); + } + ok(file_exists("test2.txt"), "Expected test2.txt to exist\n"); + ok(file_exists("test3.txt"), "Expected test3.txt to exist\n"); + + /* move a directory into itself */ + shfo.pFrom = "test4.txt\0"; + shfo.pTo = "test4.txt\\b.txt\0"; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", retval); + } + ok(!RemoveDirectory("test4.txt\\b.txt"), "Expected test4.txt\\b.txt to not exist\n"); + ok(file_exists("test4.txt"), "Expected test4.txt to exist\n"); + + /* move many files without FOF_MULTIDESTFILES */ + shfo.pFrom = "test2.txt\0test3.txt\0"; + shfo.pTo = "d.txt\0e.txt\0"; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %ld\n", retval); + } + ok(!DeleteFile("d.txt"), "Expected d.txt to not exist\n"); + ok(!DeleteFile("e.txt"), "Expected e.txt to not exist\n"); + + /* number of sources != number of targets */ + shfo.pTo = "d.txt\0"; + shfo.fFlags |= FOF_MULTIDESTFILES; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %ld\n", retval); + } + ok(!DeleteFile("d.txt"), "Expected d.txt to not exist\n"); + + /* FO_MOVE does not create dest directories */ + shfo.pFrom = "test2.txt\0"; + shfo.pTo = "dir1\\dir2\\test2.txt\0"; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %ld\n", retval); + } + ok(!file_exists("dir1"), "Expected dir1 to exist\n"); + + /* try to overwrite an existing file */ + shfo.pTo = "test3.txt\0"; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", retval); + ok(!file_exists("test2.txt"), "Expected test2.txt to not exist\n"); + } + ok(file_exists("test3.txt"), "Expected test3.txt to exist\n"); } static void test_sh_create_dir(void)

1 0

James Hawkins : shell32: Add tests for SHFileOperation's FO_COPY command.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: d49181f99a1b4a2a0c719928b418c1c096811911 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d49181f99a1b4a2a0c71992… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 22 11:17:19 2005 +0100 shell32: Add tests for SHFileOperation's FO_COPY command. --- dlls/shell32/tests/shlfileop.c | 280 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 272 insertions(+), 8 deletions(-)

1 0

James Hawkins : shell32: Add tests for SHFileOperation's FO_RENAME command.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: edf423ab8693f0c8883ef9bef1329e2de7465984 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=edf423ab8693f0c8883ef9b… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 22 11:16:57 2005 +0100 shell32: Add tests for SHFileOperation's FO_RENAME command. --- dlls/shell32/tests/shlfileop.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 1a6edd5..7a0c22a 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -323,6 +323,40 @@ static void test_rename(void) set_curr_dir_path(to, "test4.txt\0"); retval = SHFileOperationA(&shfo); ok(!retval, "Rename dir back failed, retval = %ld\n", retval); + + /* try to rename more than one file to a single file */ + shfo.pFrom = "test1.txt\0test2.txt\0"; + shfo.pTo = "a.txt\0"; + retval = SHFileOperationA(&shfo); + ok(retval == ERROR_GEN_FAILURE, "Expected ERROR_GEN_FAILURE, got %ld\n", retval); + ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); + ok(file_exists("test2.txt"), "Expected test2.txt to exist\n"); + + /* pFrom is valid, but pTo is empty */ + shfo.pFrom = "test1.txt\0"; + shfo.pTo = "\0"; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_CANCELLED, "Expected ERROR_CANCELLED, got %ld\n", retval); + } + ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); + + /* pFrom is empty */ + shfo.pFrom = "\0"; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_ACCESS_DENIED, "Expected ERROR_ACCESS_DENIED, got %ld\n", retval); + } + + /* pFrom is NULL */ + shfo.pFrom = NULL; + retval = SHFileOperationA(&shfo); + todo_wine + { + ok(retval == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", retval); + } } /* tests the FO_COPY action */

1 0

James Hawkins : shell32: Add tests for SHFileOperation's FO_DELETE command.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: d3c3bc1d3a29d7e8aacfcf04c07331fc83b7dff7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d3c3bc1d3a29d7e8aacfcf0… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 22 11:15:42 2005 +0100 shell32: Add tests for SHFileOperation's FO_DELETE command. --- dlls/shell32/tests/shlfileop.c | 83 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 83 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index a850c3b..1a6edd5 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -171,6 +171,89 @@ static void test_delete(void) ok(!file_exists("test4.txt"), "Directory should be removed\n"); } ok(file_exists("test2.txt"), "This file should not be removed\n"); + + /* FOF_FILESONLY does not delete a dir matching a wildcard */ + init_shfo_tests(); + shfo.fFlags |= FOF_FILESONLY; + shfo.pFrom = "*.txt\0"; + todo_wine + { + ok(!SHFileOperation(&shfo), "Failed to delete files\n"); + ok(!file_exists("test1.txt"), "test1.txt should be removed\n"); + } + ok(!file_exists("test_5.txt"), "test_5.txt should be removed\n"); + ok(file_exists("test4.txt"), "test4.txt should not be removed\n"); + + /* FOF_FILESONLY only deletes a dir if explicitly specified */ + init_shfo_tests(); + shfo.pFrom = "test_?.txt\0test4.txt\0"; + todo_wine + { + ok(!SHFileOperation(&shfo), "Failed to delete files\n"); + ok(!file_exists("test4.txt"), "test4.txt should be removed\n"); + } + ok(!file_exists("test_5.txt"), "test_5.txt should be removed\n"); + ok(file_exists("test1.txt"), "test1.txt should not be removed\n"); + + /* try to delete an invalid filename */ + init_shfo_tests(); + shfo.pFrom = "\0"; + shfo.fFlags &= ~FOF_FILESONLY; + shfo.fAnyOperationsAborted = FALSE; + ret = SHFileOperation(&shfo); + todo_wine + { + ok(ret == ERROR_ACCESS_DENIED, "Expected ERROR_ACCESS_DENIED, got %ld\n", ret); + } + ok(!shfo.fAnyOperationsAborted, "Expected no aborted operations\n"); + ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); + + /* try an invalid function */ + init_shfo_tests(); + shfo.pFrom = "test1.txt\0"; + shfo.wFunc = 0; + ret = SHFileOperation(&shfo); + todo_wine + { + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %ld\n", ret); + } + ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); + + /* try an invalid list, only one null terminator */ + init_shfo_tests(); + shfo.pFrom = ""; + shfo.wFunc = FO_DELETE; + ret = SHFileOperation(&shfo); + todo_wine + { + ok(ret == ERROR_ACCESS_DENIED, "Expected ERROR_ACCESS_DENIED, got %ld\n", ret); + } + ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); + + /* delete a dir, and then a file inside the dir, same as + * deleting a nonexistent file + */ + init_shfo_tests(); + shfo.pFrom = "testdir2\0testdir2\\one.txt\0"; + ret = SHFileOperation(&shfo); + todo_wine + { + ok(ret == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %ld\n", ret); + ok(!file_exists("testdir2"), "Expected testdir2 to not exist\n"); + } + ok(!file_exists("testdir2\\one.txt"), "Expected testdir2\\one.txt to not exist\n"); + + /* try the FOF_NORECURSION flag, continues deleting subdirs */ + init_shfo_tests(); + shfo.pFrom = "testdir2\0"; + shfo.fFlags |= FOF_NORECURSION; + ret = SHFileOperation(&shfo); + todo_wine + { + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %ld\n", ret); + } + ok(!file_exists("testdir2\\one.txt"), "Expected testdir2\\one.txt to not exist\n"); + ok(!file_exists("testdir2\\nested"), "Expected testdir2\\nested to exist\n"); } /* tests the FO_RENAME action */

1 0

Robert Reif : winecfg: Add unmanaged windows configuration.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: e998da5e0738266e03fb5e4623611f3cf738665c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e998da5e0738266e03fb5e4… Author: Robert Reif <reif(a)earthlink.net> Date: Thu Dec 22 11:15:32 2005 +0100 winecfg: Add unmanaged windows configuration. --- programs/winecfg/En.rc | 26 +++++++++++++++----------- programs/winecfg/x11drvdlg.c | 18 ++++++++++++++++++ 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index 3f37bf8..887aa81 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -65,28 +65,31 @@ BEGIN LTEXT "Screen color depth: ",IDC_STATIC,8,10,70,30 COMBOBOX IDC_SCREEN_DEPTH,80,8,170,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX " Window settings ",IDC_STATIC,8,25,244,110 + GROUPBOX " Window settings ",IDC_STATIC,8,25,244,180 CONTROL "Allow DirectX apps to stop the mouse leaving their window",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8 CONTROL "Enable desktop double buffering",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,230,8 + LTEXT "If windows are managed by your window manager, then they will have the standard borders, they will respect your virtual desktop and appear in your window list. \n\nIf the windows are unmanaged, they will be disconnected from your window manager. This will mean the windows do not integrate as closely with your desktop, but the emulation will be more accurate so it can help some programs to work better.", + IDC_STATIC,15,58,228,80 + CONTROL "Allow the window manager to control the windows",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,132,230,8 /* FIXME: the wording of this explanation could be a lot better */ LTEXT "You can choose to emulate a windows desktop, where all the windows are confined to one 'virtual screen', or you can have the windows placed on your standard desktop.", - IDC_STATIC,15,73,228,28 - LTEXT "Desktop size:",IDC_DESKTOP_SIZE,15,115,44,8,WS_DISABLED - LTEXT "X",IDC_DESKTOP_BY,108,115,8,8,WS_DISABLED + IDC_STATIC,15,146,228,28 + LTEXT "Desktop size:",IDC_DESKTOP_SIZE,15,188,44,8,WS_DISABLED + LTEXT "X",IDC_DESKTOP_BY,108,188,8,8,WS_DISABLED CONTROL "Emulate a virtual desktop",IDC_ENABLE_DESKTOP,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10 + BS_AUTOCHECKBOX | WS_TABSTOP,15,173,230,10 - EDITTEXT IDC_DESKTOP_WIDTH,64,115,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - EDITTEXT IDC_DESKTOP_HEIGHT,117,115,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_WIDTH,64,188,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_HEIGHT,117,188,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - GROUPBOX " Direct3D ",IDC_STATIC,8,140,244,120 + GROUPBOX " Direct3D ",IDC_STATIC,8,210,244,50 - LTEXT "Vertex Shader Support: ",IDC_STATIC,15,150,80,30 - COMBOBOX IDC_D3D_VSHADER_MODE,100,148,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Vertex Shader Support: ",IDC_STATIC,15,220,80,30 + COMBOBOX IDC_D3D_VSHADER_MODE,100,218,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Allow Pixel Shader (if supported by hardware)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,165,230,10 + CONTROL "Allow Pixel Shader (if supported by hardware)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,237,230,10 END IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250 @@ -219,6 +222,7 @@ BEGIN CONTROL "Allow DirectX apps to stop the mouse leaving their window",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8 CONTROL "Enable desktop double buffering",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,230,8 + CONTROL "Allow the window manager to manage created windows",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,55,230,8 GROUPBOX " Window settings ",IDC_STATIC,8,25,244,110 diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index 4f93241..9348bbd 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -154,6 +154,13 @@ static void init_dialog(HWND dialog) } HeapFree(GetProcessHeap(), 0, buf); + buf = get_reg_key(config_key, keypath("X11 Driver"), "Managed", "Y"); + if (IS_OPTION_TRUE(*buf)) + CheckDlgButton(dialog, IDC_ENABLE_MANAGED, BST_CHECKED); + else + CheckDlgButton(dialog, IDC_ENABLE_MANAGED, BST_UNCHECKED); + HeapFree(GetProcessHeap(), 0, buf); + SendDlgItemMessage(dialog, IDC_D3D_VSHADER_MODE, CB_RESETCONTENT, 0, 0); for (it = 0; NULL != D3D_VS_Modes[it]; ++it) { SendDlgItemMessage(dialog, IDC_D3D_VSHADER_MODE, CB_ADDSTRING, 0, (LPARAM) D3D_VS_Modes[it]); @@ -221,6 +228,16 @@ static void on_enable_desktop_clicked(HW update_gui_for_desktop_mode(dialog); } +static void on_enable_managed_clicked(HWND dialog) { + WINE_TRACE("\n"); + + if (IsDlgButtonChecked(dialog, IDC_ENABLE_MANAGED) == BST_CHECKED) { + set_reg_key(config_key, keypath("X11 Driver"), "Managed", "Y"); + } else { + set_reg_key(config_key, keypath("X11 Driver"), "Managed", "N"); + } +} + static void on_screen_depth_changed(HWND dialog) { char *newvalue = get_text(dialog, IDC_SCREEN_DEPTH); char *spaceIndex = strchr(newvalue, ' '); @@ -290,6 +307,7 @@ GraphDlgProc(HWND hDlg, UINT uMsg, WPARA SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); switch(LOWORD(wParam)) { case IDC_ENABLE_DESKTOP: on_enable_desktop_clicked(hDlg); break; + case IDC_ENABLE_MANAGED: on_enable_managed_clicked(hDlg); break; case IDC_DX_MOUSE_GRAB: on_dx_mouse_grab_clicked(hDlg); break; case IDC_DOUBLE_BUFFER: on_double_buffer_clicked(hDlg); break; case IDC_D3D_PSHADER_MODE: on_d3d_pshader_mode_clicked(hDlg); break;

1 0

Eric Pouech : dbghelp: Correct handling for all module names.
by Alexandre Julliard Dec. 22, 2005

Dec. 22, 2005

Module: wine Branch: refs/heads/master Commit: 87ab6e6cd85901f8b87dec8a234ac45dbe27c00a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=87ab6e6cd85901f8b87dec8… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Thu Dec 22 11:11:39 2005 +0100 dbghelp: Correct handling for all module names. --- dlls/dbghelp/module.c | 44 +++++++++++++++++++++++++++----------------- 1 files changed, 27 insertions(+), 17 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index c00cc74..2b0de8c 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -33,10 +33,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); -static void module_fill_module(const char* in, char* out, unsigned size) +static const char* ext[] = {".acm", ".dll", ".drv", ".exe", ".ocx", ".vxd", NULL}; + +static int match_ext(const char* ptr, size_t len) +{ + const char**e; + size_t l; + + for (e = ext; *e; e++) + { + l = strlen(*e); + if (l >= len) return FALSE; + if (strncasecmp(&ptr[len - l], *e, l)) continue; + return l; + } + return 0; +} + +static void module_fill_module(const char* in, char* out, size_t size) { - const char *ptr,*endptr; - unsigned len; + const char *ptr,*endptr; + size_t len, l; endptr = in + strlen(in); for (ptr = endptr - 1; @@ -46,24 +63,17 @@ static void module_fill_module(const cha len = min(endptr-ptr,size-1); memcpy(out, ptr, len); out[len] = '\0'; - if (len > 4 && - (!strcasecmp(&out[len - 4], ".dll") || !strcasecmp(&out[len - 4], ".exe"))) - out[len - 4] = '\0'; - else if (((len > 12 && out[len - 13] == '/') || len == 12) && + if (len > 4 && (l = match_ext(out, len))) + out[len - l] = '\0'; + else if (len > 12 && (!strcasecmp(out + len - 12, "wine-pthread") || !strcasecmp(out + len - 12, "wine-kthread"))) - lstrcpynA(out, "<wine-loader>",size); + lstrcpynA(out, "<wine-loader>", size); else { - if (len > 7 && - (!strcasecmp(&out[len - 7], ".dll.so") || !strcasecmp(&out[len - 7], ".exe.so"))) - strcpy(&out[len - 7], "<elf>"); - else if (len > 7 && - out[len - 7] == '.' && !strcasecmp(&out[len - 3], ".so")) - { - if (len + 3 < size) strcpy(&out[len - 3], "<elf>"); - else WARN("Buffer too short: %s\n", out); - } + if (len > 3 && !strcasecmp(&out[len - 3], ".so") && + (l = match_ext(out, len - 3))) + strcpy(&out[len - l - 3], "<elf>"); } while ((*out = tolower(*out))) out++; }

1 0

Bill Medland : msi: Prevent array underflow in MsiFormat when measuring with zero-length buffer.
by Alexandre Julliard Dec. 21, 2005

Dec. 21, 2005

Module: wine Branch: refs/heads/master Commit: b56ed22277549dd7aa9a2b35951f9b2db7be870f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b56ed22277549dd7aa9a2b3… Author: Bill Medland <billmedland(a)mercuryspeed.com> Date: Wed Dec 21 21:19:47 2005 +0100 msi: Prevent array underflow in MsiFormat when measuring with zero-length buffer. --- dlls/msi/format.c | 8 +++++++- dlls/msi/tests/format.c | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index c280541..85f9028 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -639,10 +639,15 @@ UINT MSI_FormatRecordA( MSIPACKAGE* pack len = deformat_string_internal(package,rec,&deformated,strlenW(rec), record, NULL); + /* If len is zero then WideCharToMultiByte will return 0 indicating + * failure, but that will do just as well since we are ignoring + * possible errors. + */ lenA = WideCharToMultiByte(CP_ACP,0,deformated,len,NULL,0,NULL,NULL); if (buffer) { + /* Ditto above */ WideCharToMultiByte(CP_ACP,0,deformated,len,buffer,*size,NULL, NULL); if (*size>lenA) { @@ -652,7 +657,8 @@ UINT MSI_FormatRecordA( MSIPACKAGE* pack else { rc = ERROR_MORE_DATA; - buffer[(*size)-1] = 0; + if (*size) + buffer[(*size)-1] = 0; } } else diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index 11cd455..59c6f11 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -109,7 +109,7 @@ static void test_formatrecord(void) char buffer[100]; MSIHANDLE hrec; UINT r; - DWORD sz=100; + DWORD sz; r = MsiFormatRecord(0, 0, NULL, NULL ); ok( r == ERROR_INVALID_HANDLE, "wrong error\n"); @@ -122,6 +122,11 @@ static void test_formatrecord(void) ok( r == ERROR_SUCCESS, "format failed\n"); buffer[0] = 'x'; buffer[1] = 0; + sz=0; + r = MsiFormatRecord(0, hrec, buffer+1, &sz); + ok( r == ERROR_MORE_DATA && buffer[0] == 'x', "format failed measuring with buffer\n"); + ok( sz == 16, "size wrong\n"); + sz=100; r = MsiFormatRecord(0, hrec, buffer, &sz); ok( r == ERROR_SUCCESS, "format failed with empty buffer\n"); ok( sz == 16, "size wrong\n");

1 0

James Hawkins : shell32: Remove the '.\' prefix from filenames, because it hides a
by Alexandre Julliard Dec. 21, 2005

Dec. 21, 2005

Module: wine Branch: refs/heads/master Commit: bad4a1dc5fc0d057153a64a23bb47174ec66c866 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bad4a1dc5fc0d057153a64a… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Dec 21 21:18:19 2005 +0100 shell32: Remove the '.\\' prefix from filenames, because it hides a bug in SHFileOperation. --- dlls/shell32/tests/shlfileop.c | 173 ++++++++++++++++++++-------------------- 1 files changed, 88 insertions(+), 85 deletions(-)

1 0

Ivan Leo Puoti : ddraw: Fix DirectDrawSurface::QueryInterface crash.
by Alexandre Julliard Dec. 21, 2005

Dec. 21, 2005

Module: wine Branch: refs/heads/master Commit: 3cc9e40c3bae7571574565a719cded877ccef29b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3cc9e40c3bae7571574565a… Author: Ivan Leo Puoti <ivanleo(a)gmail.com> Date: Wed Dec 21 21:11:54 2005 +0100 ddraw: Fix DirectDrawSurface::QueryInterface crash. --- dlls/ddraw/surface_main.c | 3 +++ dlls/ddraw/tests/dsurface.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/surface_main.c b/dlls/ddraw/surface_main.c index fd10394..ba11359 100644 --- a/dlls/ddraw/surface_main.c +++ b/dlls/ddraw/surface_main.c @@ -160,6 +160,9 @@ Main_DirectDrawSurface_QueryInterface(LP *ppObj = NULL; + if(!riid) + return DDERR_INVALIDPARAMS; + if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IDirectDrawSurface7, riid) || IsEqualGUID(&IID_IDirectDrawSurface4, riid)) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 10faf02..e1e0c93 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -3,6 +3,7 @@ * * Copyright (C) 2005 Antoine Chavasse (a.chavasse(a)gmail.com) * Copyright (C) 2005 Christian Costa + * Copyright 2005 Ivan Leo Puoti * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -220,11 +221,38 @@ static void SrcColorKey32BlitTest(void) IDirectDrawSurface_Release(lpDst); } +static void QueryInterface(void) +{ + LPDIRECTDRAWSURFACE dsurface; + DDSURFACEDESC surface; + LPVOID object; + HRESULT ret; + + /* Create a surface */ + ZeroMemory(&surface, sizeof(surface)); + surface.dwSize = sizeof(surface); + surface.dwFlags = DDSD_WIDTH | DDSD_HEIGHT; + surface.dwHeight = 10; + surface.dwWidth = 10; + ret = IDirectDraw_CreateSurface(lpDD, &surface, &dsurface, NULL); + if(ret != DD_OK) + { + ok(FALSE, "IDirectDraw::CreateSurface failed with error %lx\n", ret); + return; + } + + /* Call IUnkown::QueryInterface */ + ret = IDirectDrawSurface_QueryInterface(dsurface, 0, &object); + ok(ret == DDERR_INVALIDPARAMS, "IDirectDrawSurface::QueryInterface returned %lx\n", ret); + + IDirectDrawSurface_Release(dsurface); +} START_TEST(dsurface) { CreateDirectDraw(); MipMapCreationTest(); SrcColorKey32BlitTest(); + QueryInterface(); ReleaseDirectDraw(); }

1 0

Detlef Riekenberg : winspool: Add version resource.
by Alexandre Julliard Dec. 21, 2005

Dec. 21, 2005

Module: wine Branch: refs/heads/master Commit: 8827bcfd741f5dfed7e43fa36b2ea74a9944c86a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8827bcfd741f5dfed7e43fa… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Dec 21 21:11:43 2005 +0100 winspool: Add version resource. --- dlls/winspool/winspool.rc | 16 ++++++++++++++++ include/wine/wine_common_ver.rc | 8 ++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/winspool/winspool.rc b/dlls/winspool/winspool.rc index cc7344c..006e2ae 100644 --- a/dlls/winspool/winspool.rc +++ b/dlls/winspool/winspool.rc @@ -22,6 +22,22 @@ #include "winbase.h" #include "winuser.h" #include "wspool.h" +#include "winver.h" + +#define WINE_FILENAME_STR "winspool.drv" +#define WINE_FILEDESCRIPTION_STR "Wine core printer driver" + +#define WINE_FILETYPE VFT_DRV +#define WINE_FILESUBTYPE VFT2_DRV_PRINTER + +/* Same Version as WinXP_sp2 */ +#define WINE_FILEVERSION 5,1,2600,2180 +#define WINE_FILEVERSION_STR "5.1.2600.2180" + +#define WINE_PRODUCTVERSION 5,1,2600,2180 +#define WINE_PRODUCTVERSION_STR "5.1.2600.2180" + +#include "wine/wine_common_ver.rc" #include "Bg.rc" #include "De.rc" diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index c1fd409..2f15de5 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -51,6 +51,10 @@ never complain. #define WINE_FILETYPE VFT_DLL #endif +#ifndef WINE_FILESUBTYPE +#define WINE_FILESUBTYPE VFT2_UNKNOWN +#endif + #ifndef WINE_PRODUCTVERSION #define WINE_PRODUCTVERSION 1,0,0,0 #endif @@ -66,11 +70,11 @@ never complain. VS_VERSION_INFO VERSIONINFO FILEVERSION WINE_FILEVERSION PRODUCTVERSION WINE_PRODUCTVERSION -FILEFLAGSMASK 0 +FILEFLAGSMASK 63 FILEFLAGS 0 FILEOS VOS_UNKNOWN FILETYPE WINE_FILETYPE -FILESUBTYPE VFT2_UNKNOWN +FILESUBTYPE WINE_FILESUBTYPE { BLOCK "StringFileInfo" {

1 0

Alexandre Julliard : msvcrt: Return a per-thread buffer in localtime and gmtime.
by Alexandre Julliard Dec. 21, 2005

Dec. 21, 2005

Module: wine Branch: refs/heads/master Commit: 06c1a36bce839e06d0cb962f4b45bb1a2fc9dd55 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=06c1a36bce839e06d0cb962… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 21 20:54:26 2005 +0100 msvcrt: Return a per-thread buffer in localtime and gmtime. --- dlls/msvcrt/msvcrt.h | 25 ++++++++++---------- dlls/msvcrt/time.c | 64 +++++++++++++++++++++++++------------------------- 2 files changed, 45 insertions(+), 44 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index b454579..68f5ca6 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -74,6 +74,18 @@ typedef void (*MSVCRT__beginthread_start typedef unsigned int (__stdcall *MSVCRT__beginthreadex_start_routine_t)(void *); typedef int (*MSVCRT__onexit_t)(void); +struct MSVCRT_tm { + int tm_sec; + int tm_min; + int tm_hour; + int tm_mday; + int tm_mon; + int tm_year; + int tm_wday; + int tm_yday; + int tm_isdst; +}; + /* TLS data */ extern DWORD msvcrt_tls_index; @@ -84,6 +96,7 @@ struct __thread_data { unsigned char *mbstok_next; /* next ptr for mbstok() */ char *efcvt_buffer; /* buffer for ecvt/fcvt */ MSVCRT_wchar_t *wasctime_buffer; /* buffer for asctime */ + struct MSVCRT_tm time_buffer; /* buffer for localtime/gmtime */ int fpecode; MSVCRT_terminate_function terminate_handler; MSVCRT_unexpected_function unexpected_handler; @@ -173,18 +186,6 @@ extern unsigned msvcrt_create_io_inherit #define _RT_CRNL 252 #define _RT_BANNER 255 -struct MSVCRT_tm { - int tm_sec; - int tm_min; - int tm_hour; - int tm_mday; - int tm_mon; - int tm_year; - int tm_wday; - int tm_yday; - int tm_isdst; -}; - struct MSVCRT__timeb { MSVCRT_time_t time; unsigned short millitm; diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index f462aa7..9b26770 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -54,9 +54,6 @@ static inline int IsLeapYear(int Year) #define TICKSPERMSEC 10000 #define TICKS_1601_TO_1970 (SECS_1601_TO_1970 * TICKSPERSEC) -/* native uses a single static buffer for localtime/gmtime/mktime */ -static struct MSVCRT_tm tm; - /********************************************************************** * mktime (MSVCRT.@) */ @@ -65,7 +62,7 @@ MSVCRT_time_t MSVCRT_mktime(struct MSVCR MSVCRT_time_t secs; FILETIME lft, uft; ULONGLONG time; - struct MSVCRT_tm ts; + struct MSVCRT_tm ts, *ptm; int cleaps, day; ts=*t; @@ -125,7 +122,7 @@ MSVCRT_time_t MSVCRT_mktime(struct MSVCR secs = time - SECS_1601_TO_1970; /* compute tm_wday, tm_yday and renormalize the other fields of the * tm structure */ - if( MSVCRT_localtime( &secs)) *t = tm; + if ((ptm = MSVCRT_localtime( &secs ))) *t = *ptm; return secs; } @@ -135,8 +132,8 @@ MSVCRT_time_t MSVCRT_mktime(struct MSVCR */ struct MSVCRT_tm* MSVCRT_localtime(const MSVCRT_time_t* secs) { + thread_data_t * const data = msvcrt_get_thread_data(); int i; - FILETIME ft, lft; SYSTEMTIME st; DWORD tzid; @@ -152,34 +149,37 @@ struct MSVCRT_tm* MSVCRT_localtime(const if (st.wYear < 1970) return NULL; - tm.tm_sec = st.wSecond; - tm.tm_min = st.wMinute; - tm.tm_hour = st.wHour; - tm.tm_mday = st.wDay; - tm.tm_year = st.wYear - 1900; - tm.tm_mon = st.wMonth - 1; - tm.tm_wday = st.wDayOfWeek; + data->time_buffer.tm_sec = st.wSecond; + data->time_buffer.tm_min = st.wMinute; + data->time_buffer.tm_hour = st.wHour; + data->time_buffer.tm_mday = st.wDay; + data->time_buffer.tm_year = st.wYear - 1900; + data->time_buffer.tm_mon = st.wMonth - 1; + data->time_buffer.tm_wday = st.wDayOfWeek; - for (i = tm.tm_yday = 0; i < st.wMonth - 1; i++) { - tm.tm_yday += MonthLengths[IsLeapYear(st.wYear)][i]; + for (i = data->time_buffer.tm_yday = 0; i < st.wMonth - 1; i++) { + data->time_buffer.tm_yday += MonthLengths[IsLeapYear(st.wYear)][i]; } - tm.tm_yday += st.wDay - 1; + data->time_buffer.tm_yday += st.wDay - 1; tzid = GetTimeZoneInformation(&tzinfo); if (tzid == TIME_ZONE_ID_INVALID) - tm.tm_isdst = -1; + data->time_buffer.tm_isdst = -1; else - tm.tm_isdst = (tzid == TIME_ZONE_ID_DAYLIGHT?1:0); + data->time_buffer.tm_isdst = (tzid == TIME_ZONE_ID_DAYLIGHT?1:0); - return &tm; + return &data->time_buffer; } +/********************************************************************* + * gmtime (MSVCRT.@) + */ struct MSVCRT_tm* MSVCRT_gmtime(const MSVCRT_time_t* secs) { + thread_data_t * const data = msvcrt_get_thread_data(); int i; - FILETIME ft; SYSTEMTIME st; @@ -192,21 +192,21 @@ struct MSVCRT_tm* MSVCRT_gmtime(const MS if (st.wYear < 1970) return NULL; - tm.tm_sec = st.wSecond; - tm.tm_min = st.wMinute; - tm.tm_hour = st.wHour; - tm.tm_mday = st.wDay; - tm.tm_year = st.wYear - 1900; - tm.tm_mon = st.wMonth - 1; - tm.tm_wday = st.wDayOfWeek; - for (i = tm.tm_yday = 0; i < st.wMonth - 1; i++) { - tm.tm_yday += MonthLengths[IsLeapYear(st.wYear)][i]; + data->time_buffer.tm_sec = st.wSecond; + data->time_buffer.tm_min = st.wMinute; + data->time_buffer.tm_hour = st.wHour; + data->time_buffer.tm_mday = st.wDay; + data->time_buffer.tm_year = st.wYear - 1900; + data->time_buffer.tm_mon = st.wMonth - 1; + data->time_buffer.tm_wday = st.wDayOfWeek; + for (i = data->time_buffer.tm_yday = 0; i < st.wMonth - 1; i++) { + data->time_buffer.tm_yday += MonthLengths[IsLeapYear(st.wYear)][i]; } - tm.tm_yday += st.wDay - 1; - tm.tm_isdst = 0; + data->time_buffer.tm_yday += st.wDay - 1; + data->time_buffer.tm_isdst = 0; - return &tm; + return &data->time_buffer; } /**********************************************************************

1 0

H. Verbeet : d3d9: Add traces for when shader support is missing in the shader test.
by Alexandre Julliard Dec. 21, 2005

Dec. 21, 2005

Module: wine Branch: refs/heads/master Commit: 2bb87a90b28f1d66f41e4d31a8aa741b06d8fe4b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2bb87a90b28f1d66f41e4d3… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Dec 21 20:45:07 2005 +0100 d3d9: Add traces for when shader support is missing in the shader test. --- dlls/d3d9/tests/shader.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/shader.c b/dlls/d3d9/tests/shader.c index 6da5164..563d5fa 100644 --- a/dlls/d3d9/tests/shader.c +++ b/dlls/d3d9/tests/shader.c @@ -151,8 +151,11 @@ START_TEST(shader) { test_get_set_vertex_shader(device_ptr); } + else trace("No vertex shader support, skipping test\n"); + if (caps.PixelShaderVersion & 0xffff) { test_get_set_pixel_shader(device_ptr); } + else trace("No pixel shader support, skipping test\n"); }

1 0

Hans Leidekker : kernel: Some documentation improvements.
by Alexandre Julliard Dec. 21, 2005

Dec. 21, 2005

Module: wine Branch: refs/heads/master Commit: fa57544a4699d558aace5a286939037ca73d3987 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fa57544a4699d558aace5a2… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Dec 21 20:44:49 2005 +0100 kernel: Some documentation improvements. --- dlls/kernel/process.c | 54 ++++++++++++++++++++++++++++++------------------- 1 files changed, 33 insertions(+), 21 deletions(-) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index 19d945b..4bfbbc9 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -2127,17 +2127,19 @@ void WINAPI ExitProcess( DWORD status ) /*********************************************************************** - * GetExitCodeProcess [KERNEL32.@] + * GetExitCodeProcess [KERNEL32.@] * - * Gets termination status of specified process + * Gets termination status of specified process. + * + * PARAMS + * hProcess [in] Handle to the process. + * lpExitCode [out] Address to receive termination status. * * RETURNS * Success: TRUE * Failure: FALSE */ -BOOL WINAPI GetExitCodeProcess( - HANDLE hProcess, /* [in] handle to the process */ - LPDWORD lpExitCode) /* [out] address to receive termination status */ +BOOL WINAPI GetExitCodeProcess( HANDLE hProcess, LPDWORD lpExitCode ) { NTSTATUS status; PROCESS_BASIC_INFORMATION pbi; @@ -2166,12 +2168,12 @@ UINT WINAPI SetErrorMode( UINT mode ) /********************************************************************** - * TlsAlloc [KERNEL32.@] Allocates a TLS index. + * TlsAlloc [KERNEL32.@] * - * Allocates a thread local storage index + * Allocates a thread local storage index. * * RETURNS - * Success: TLS Index + * Success: TLS index. * Failure: 0xFFFFFFFF */ DWORD WINAPI TlsAlloc( void ) @@ -2209,16 +2211,18 @@ DWORD WINAPI TlsAlloc( void ) /********************************************************************** - * TlsFree [KERNEL32.@] Releases a TLS index. + * TlsFree [KERNEL32.@] * - * Releases a thread local storage index, making it available for reuse + * Releases a thread local storage index, making it available for reuse. + * + * PARAMS + * index [in] TLS index to free. * * RETURNS * Success: TRUE * Failure: FALSE */ -BOOL WINAPI TlsFree( - DWORD index) /* [in] TLS Index to free */ +BOOL WINAPI TlsFree( DWORD index ) { BOOL ret; @@ -2241,14 +2245,18 @@ BOOL WINAPI TlsFree( /********************************************************************** - * TlsGetValue [KERNEL32.@] Gets value in a thread's TLS slot + * TlsGetValue [KERNEL32.@] + * + * Gets value in a thread's TLS slot. + * + * PARAMS + * index [in] TLS index to retrieve value for. * * RETURNS - * Success: Value stored in calling thread's TLS slot for index - * Failure: 0 and GetLastError() returns NO_ERROR + * Success: Value stored in calling thread's TLS slot for index. + * Failure: 0 and GetLastError() returns NO_ERROR. */ -LPVOID WINAPI TlsGetValue( - DWORD index) /* [in] TLS index to retrieve value for */ +LPVOID WINAPI TlsGetValue( DWORD index ) { LPVOID ret; @@ -2273,15 +2281,19 @@ LPVOID WINAPI TlsGetValue( /********************************************************************** - * TlsSetValue [KERNEL32.@] Stores a value in the thread's TLS slot. + * TlsSetValue [KERNEL32.@] + * + * Stores a value in the thread's TLS slot. + * + * PARAMS + * index [in] TLS index to set value for. + * value [in] Value to be stored. * * RETURNS * Success: TRUE * Failure: FALSE */ -BOOL WINAPI TlsSetValue( - DWORD index, /* [in] TLS index to set value for */ - LPVOID value) /* [in] Value to be stored */ +BOOL WINAPI TlsSetValue( DWORD index, LPVOID value ) { if (index < TLS_MINIMUM_AVAILABLE) {

1 0

Marcus Meissner : msvcrt: Implemented wctime(), wasctime().
by Alexandre Julliard Dec. 21, 2005

Dec. 21, 2005

Module: wine Branch: refs/heads/master Commit: 9a583763eefb7cec46e0b4b031cf71d6b5d2a5ae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9a583763eefb7cec46e0b4b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Dec 21 20:23:47 2005 +0100 msvcrt: Implemented wctime(), wasctime(). Free thread data in DLL_THREAD_DETACH. --- dlls/msvcrt/main.c | 2 ++ dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/time.c | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index b8660bb..a79d12f 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -70,6 +70,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, case DLL_THREAD_DETACH: /* Free TLS */ tls = TlsGetValue(msvcrt_tls_index); + HeapFree(GetProcessHeap(),0,tls->efcvt_buffer); + HeapFree(GetProcessHeap(),0,tls->wasctime_buffer); HeapFree(GetProcessHeap(), 0, tls); TRACE("finished thread free\n"); break; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index d46f738..b454579 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -83,6 +83,7 @@ struct __thread_data { unsigned long thread_doserrno; unsigned char *mbstok_next; /* next ptr for mbstok() */ char *efcvt_buffer; /* buffer for ecvt/fcvt */ + MSVCRT_wchar_t *wasctime_buffer; /* buffer for asctime */ int fpecode; MSVCRT_terminate_function terminate_handler; MSVCRT_unexpected_function unexpected_handler; diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f964f29..a4d3ade 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -487,7 +487,7 @@ @ cdecl _vsnprintf(ptr long ptr ptr) MSVCRT_vsnprintf @ cdecl _vsnwprintf(ptr long wstr long) MSVCRT_vsnwprintf @ cdecl _waccess(wstr long) -@ stub _wasctime #(ptr) MSVCRT__wasctime +@ cdecl _wasctime(ptr) MSVCRT__wasctime @ cdecl _wchdir(wstr) @ cdecl _wchmod(wstr long) @ extern _wcmdln MSVCRT__wcmdln @@ -503,7 +503,7 @@ @ cdecl _wcsrev(wstr) @ cdecl _wcsset(wstr long) @ cdecl _wcsupr(wstr) ntdll._wcsupr -@ stub _wctime #(ptr) +@ cdecl _wctime(ptr) MSVCRT__wctime @ extern _wenviron @ stub _wexecl #(wstr wstr) varargs @ stub _wexecle #(wstr wstr) varargs diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index f7daab5..f462aa7 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -410,3 +410,35 @@ void MSVCRT__tzset(void) lstrcpynA(tzname_dst, tzname[1], sizeof(tzname_dst)); tzname_dst[sizeof(tzname_dst) - 1] = '\0'; } + +/********************************************************************* + * _wctime (MSVCRT.@) + */ +MSVCRT_wchar_t *MSVCRT__wasctime(const struct MSVCRT_tm *mstm) { + thread_data_t *data = msvcrt_get_thread_data(); + struct tm xtm; + + memset(&xtm,0,sizeof(xtm)); + xtm.tm_sec = mstm->tm_sec; + xtm.tm_min = mstm->tm_min; + xtm.tm_hour = mstm->tm_hour; + xtm.tm_mday = mstm->tm_mday; + xtm.tm_mon = mstm->tm_mon; + xtm.tm_year = mstm->tm_year; + xtm.tm_wday = mstm->tm_wday; + xtm.tm_yday = mstm->tm_yday; + xtm.tm_isdst = mstm->tm_isdst; + + if (!data->wasctime_buffer) + data->wasctime_buffer = MSVCRT_malloc( 30*sizeof(MSVCRT_wchar_t) ); /* ought to be enough */ + MultiByteToWideChar( CP_UNIXCP, 0, asctime(&xtm), -1, data->wasctime_buffer, 30 ); + return data->wasctime_buffer; +} + +/********************************************************************* + * _wctime (MSVCRT.@) + */ +MSVCRT_wchar_t *MSVCRT__wctime(MSVCRT_time_t *time) +{ + return MSVCRT__wasctime( MSVCRT_localtime(time) ); +}

1 0

Robert Reif : winecfg: Select an audio driver on fresh install.
by Alexandre Julliard Dec. 21, 2005

Dec. 21, 2005

Module: wine Branch: refs/heads/master Commit: 9f34fd378754b3e8632cd29bef8dd2205865028a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9f34fd378754b3e8632cd29… Author: Robert Reif <reif(a)earthlink.net> Date: Wed Dec 21 20:07:56 2005 +0100 winecfg: Select an audio driver on fresh install. --- programs/winecfg/En.rc | 1 + programs/winecfg/audio.c | 67 ++++++++++++++++++++++++++++++++++++++++--- programs/winecfg/resource.h | 1 + 3 files changed, 64 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index 5a750ff..3f37bf8 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -201,6 +201,7 @@ BEGIN IDS_WINECFG_TITLE "Wine configuration" IDS_THEMEFILE "Theme files" IDS_THEMEFILE_SELECT "Select a theme file" + IDS_AUDIO_MISSING "There is no audio driver currently specified in the registry.\n\nA recommended driver has been selected for you.\nYou can use this driver or select another driver if available.\n\nYou must click Apply for the selection to take effect." END diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index ae079df..1d0a424 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -516,6 +516,23 @@ start_over: free(tokens); } +static void selectDriver(HWND hDlg, const char * driver) +{ + WCHAR text[1024]; + WCHAR caption[64]; + + strcpy(curAudioDriver, driver); + set_reg_key(config_key, "Drivers", "Audio", curAudioDriver); + + if (LoadStringW(GetModuleHandle(NULL), IDS_AUDIO_MISSING, text, sizeof(text)/sizeof(text[0]))) + { + if (LoadStringW(GetModuleHandle(NULL), IDS_WINECFG_TITLE, caption, sizeof(caption)/sizeof(caption[0]))) + MessageBoxW(hDlg, text, caption, MB_OK | MB_ICONINFORMATION); + } + + SendMessage(GetParent(hDlg), PSM_CHANGED, (WPARAM) hDlg, 0); /* enable apply button */ +} + static void initAudioDlg (HWND hDlg) { int i; @@ -523,14 +540,54 @@ static void initAudioDlg (HWND hDlg) WINE_TRACE("\n"); - /* make a local copy of the current registry setting */ - strcpy(curAudioDriver, get_reg_key(config_key, "Drivers", "Audio", "")); - - WINE_TRACE("curAudioDriver = %s\n", curAudioDriver); - /* make a list of all drivers that can be loaded */ findAudioDrivers(); + /* get current registry setting if available */ + buf = get_reg_key(config_key, "Drivers", "Audio", NULL); + + /* check for first time install and set a default driver + * select in this order: oss, alsa, first available driver, none + */ + if (buf == NULL) + { + const AUDIO_DRIVER *pAudioDrv = NULL; + + /* select oss if available */ + for (pAudioDrv = loadedAudioDrv; *pAudioDrv->szName; pAudioDrv++) + { + if (strcmp(pAudioDrv->szDriver, "oss") == 0) + { + selectDriver(hDlg, "oss"); + break; + } + } + + if (strlen(curAudioDriver) == 0) + { + /* select alsa if available */ + for (pAudioDrv = loadedAudioDrv; *pAudioDrv->szName; pAudioDrv++) + { + if (strcmp(pAudioDrv->szDriver, "alsa") == 0) + { + selectDriver(hDlg, "alsa"); + break; + } + } + } + + if (strlen(curAudioDriver) == 0) + { + /* select first available driver */ + if (*loadedAudioDrv->szDriver) + selectDriver(hDlg, loadedAudioDrv->szDriver); + } + } + else /* make a local copy of the current registry setting */ + strcpy(curAudioDriver, buf); + + WINE_TRACE("curAudioDriver = %s\n", curAudioDriver); + /* check for drivers that can't be loaded */ checkRegistrySetting(hDlg); diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index e79f861..df7f0b9 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -141,6 +141,7 @@ #define IDR_WINECFG 1305 #define IDB_CHECKBOX 1306 #define IDB_DEVICE 1307 +#define IDS_AUDIO_MISSING 1308 /* appearance tab */ #define IDC_THEME_COLORCOMBO 1401

1 0

Saulius Krasuckas : mscms: Test only one invalid GetStandardColorSpaceProfile() param in a
by Alexandre Julliard Dec. 21, 2005

Dec. 21, 2005

Module: wine Branch: refs/heads/master Commit: 975ffe8abc823ee5e7d9a617d22b3e0e697fc1b7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=975ffe8abc823ee5e7d9a61… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Wed Dec 21 20:07:42 2005 +0100 mscms: Test only one invalid GetStandardColorSpaceProfile() param in a single check. --- dlls/mscms/tests/profile.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 45b569c..0797161 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -460,6 +460,19 @@ static void test_GetStandardColorSpacePr /* Parameter checks */ + /* Single invalid parameter checks */ + todo_wine + fail_GSCSPA(machine, SPACE_RGB, newprofile, &size, sizeP, (GLE == ERROR_NOT_SUPPORTED)); + todo_wine + fail_GSCSPA(NULL, (DWORD)-1, newprofile, &size, sizeP, (GLE == ERROR_FILE_NOT_FOUND)); + todo_wine + fail_GSCSPA(NULL, SPACE_RGB, NULL, &size, sizeP, (GLE == ERROR_INSUFFICIENT_BUFFER)); + todo_wine + fail_GSCSPA(NULL, SPACE_RGB, newprofile, NULL, sizeP, (GLE == ERROR_INVALID_PARAMETER)); + todo_wine + fail_GSCSPA(NULL, SPACE_RGB, newprofile, &size, 0, (GLE == ERROR_MORE_DATA || GLE == ERROR_INSUFFICIENT_BUFFER)); + + /* Several invalid parameter checks */ todo_wine fail_GSCSPA(machine, 0, newprofile, &size, 0, (GLE == ERROR_INVALID_PARAMETER || GLE == ERROR_NOT_SUPPORTED)); todo_wine @@ -514,6 +527,19 @@ static void test_GetStandardColorSpacePr /* Parameter checks */ + /* Single invalid parameter checks */ + todo_wine + fail_GSCSPW(machineW, SPACE_RGB, newprofile, &size, sizeP, (GLE == ERROR_NOT_SUPPORTED)); + todo_wine + fail_GSCSPW(NULL, (DWORD)-1, newprofile, &size, sizeP, (GLE == ERROR_FILE_NOT_FOUND)); + todo_wine + fail_GSCSPW(NULL, SPACE_RGB, NULL, &size, sizeP, (GLE == ERROR_INSUFFICIENT_BUFFER)); + todo_wine + fail_GSCSPW(NULL, SPACE_RGB, newprofile, NULL, sizeP, (GLE == ERROR_INVALID_PARAMETER)); + todo_wine + fail_GSCSPW(NULL, SPACE_RGB, newprofile, &size, 0, (GLE == ERROR_MORE_DATA || GLE == ERROR_INSUFFICIENT_BUFFER)); + + /* Several invalid parameter checks */ todo_wine fail_GSCSPW(machineW, 0, newprofile, &size, 0, (GLE == ERROR_INVALID_PARAMETER || GLE == ERROR_NOT_SUPPORTED)); todo_wine

1 0

Jesse Allen : msvcrt: Fix printf sign flags.
by Alexandre Julliard Dec. 21, 2005

Dec. 21, 2005

Module: wine Branch: refs/heads/master Commit: 180326bb0aa5adfe6906728f40f1cd27be617f1c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=180326bb0aa5adfe6906728… Author: Jesse Allen <the3dfxdude(a)gmail.com> Date: Wed Dec 21 20:07:03 2005 +0100 msvcrt: Fix printf sign flags. Fix the printf sign flags so that '+' doesn't always override ' ' space alone. If they both appear, continue parsing and let '+' take precedence. --- dlls/msvcrt/tests/printf.c | 10 ++++++++++ dlls/msvcrt/wcs.c | 5 ++++- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 3979a95..d96c61e 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -56,6 +56,16 @@ static void test_sprintf( void ) ok(!strcmp(buffer, "I"), "Problem with \"I\" interpretation\n"); ok( r==1, "return count wrong\n"); + format = "% d"; + r = sprintf(buffer,format,1); + ok(!strcmp(buffer, " 1"),"Problem with sign place-holder: '%s'\n",buffer); + ok( r==2, "return count wrong\n"); + + format = "%+ d"; + r = sprintf(buffer,format,1); + ok(!strcmp(buffer, "+1"),"Problem with sign flags: '%s'\n",buffer); + ok( r==2, "return count wrong\n"); + format = "%S"; r = sprintf(buffer,format,wide); ok(!strcmp(buffer,"wide"),"Problem with wide string format\n"); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index efb93d8..83a713e 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -438,7 +438,10 @@ static int pf_vsnprintf( pf_output *out, while (*p) { if( *p == '+' || *p == ' ' ) - flags.Sign = '+'; + { + if ( flags.Sign != '+' ) + flags.Sign = *p; + } else if( *p == '-' ) flags.LeftAlign = *p; else if( *p == '0' )

1 0

Dmitry Timoshkov : msvideo: Handle ESC key press in the MCIWND class as an alias to stop command.
by Alexandre Julliard Dec. 21, 2005

Dec. 21, 2005

Module: wine Branch: refs/heads/master Commit: b6c4beda587072c658f75fea3cb4b1e88ce58ad4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b6c4beda587072c658f75fe… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Dec 21 20:07:22 2005 +0100 msvideo: Handle ESC key press in the MCIWND class as an alias to stop command. --- dlls/msvideo/mciwnd.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/msvideo/mciwnd.c b/dlls/msvideo/mciwnd.c index cf52beb..4524e5e 100644 --- a/dlls/msvideo/mciwnd.c +++ b/dlls/msvideo/mciwnd.c @@ -429,6 +429,21 @@ static LRESULT mci_get_devcaps(MCIWndInf return mci_devcaps.dwReturn; } +static LRESULT MCIWND_KeyDown(MCIWndInfo *mwi, UINT key) +{ + TRACE("%p, key %04x\n", mwi->hWnd, key); + + switch(key) + { + case VK_ESCAPE: + SendMessageW(mwi->hWnd, MCI_STOP, 0, 0); + return 0; + + default: + return 0; + } +} + static LRESULT WINAPI MCIWndProc(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam) { MCIWndInfo *mwi; @@ -477,6 +492,9 @@ static LRESULT WINAPI MCIWndProc(HWND hW case WM_COMMAND: return MCIWND_Command(mwi, wParam, lParam); + case WM_KEYDOWN: + return MCIWND_KeyDown(mwi, wParam); + case WM_NCACTIVATE: if (mwi->uTimer) {

1 0