December 2005 - Wine-commits

Thomas Weidenmueller : comctl32: Fix error handling in PSM_ADDPAGE in case of memory
by Alexandre Julliard 31 Dec '05

31 Dec '05

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 31 Dec '05

31 Dec '05

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

Hans Leidekker : wldap32: Copy embedded berval structures too.
by Alexandre Julliard 31 Dec '05

31 Dec '05

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

Hans Leidekker : wldap32: Document the value handling functions.
by Alexandre Julliard 31 Dec '05

31 Dec '05

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

CVSROOT/. log_accum
by Alexandre Julliard 31 Dec '05

31 Dec '05

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 27 Dec '05

27 Dec '05

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 27 Dec '05

27 Dec '05

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 26 Dec '05

26 Dec '05

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 26 Dec '05

26 Dec '05

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 26 Dec '05

26 Dec '05

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