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