November 2005 - Wine-commits

wine/dlls/opengl32 wgl_ext.c
by Alexandre Julliard 24 Nov '05

24 Nov '05

ChangeSet ID: 21430 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/24 12:45:12 Modified files: dlls/opengl32 : wgl_ext.c Log message: Raphael Junqueira <fenix(a)club-internet.fr> Fix incorrect implementation of WGL_COLOR_BITS_ARB. Patch: http://cvs.winehq.org/patch.py?id=21430 Old revision New revision Changes Path 1.12 1.13 +46 -4 wine/dlls/opengl32/wgl_ext.c Index: wine/dlls/opengl32/wgl_ext.c diff -u -p wine/dlls/opengl32/wgl_ext.c:1.12 wine/dlls/opengl32/wgl_ext.c:1.13 --- wine/dlls/opengl32/wgl_ext.c:1.12 24 Nov 2005 18:45:12 -0000 +++ wine/dlls/opengl32/wgl_ext.c 24 Nov 2005 18:45:12 -0000 @@ -340,6 +340,9 @@ static unsigned ConvertAttribWGLtoGLX(co unsigned nAttribs = 0; unsigned cur = 0; int pop; + int isColor = 0; + int wantColorBits = 0; + int sz_alpha = 0; while (0 != iWGLAttr[cur]) { TRACE("pAttr[%d] = %x\n", cur, iWGLAttr[cur]); @@ -347,8 +350,7 @@ static unsigned ConvertAttribWGLtoGLX(co switch (iWGLAttr[cur]) { case WGL_COLOR_BITS_ARB: pop = iWGLAttr[++cur]; - PUSH2(oGLXAttr, GLX_BUFFER_SIZE, pop); - TRACE("pAttr[%d] = WGL_COLOR_BITS_ARB: %d\n", cur, pop); + wantColorBits = pop; /** see end */ break; case WGL_BLUE_BITS_ARB: pop = iWGLAttr[++cur]; @@ -367,6 +369,7 @@ static unsigned ConvertAttribWGLtoGLX(co break; case WGL_ALPHA_BITS_ARB: pop = iWGLAttr[++cur]; + sz_alpha = pop; PUSH2(oGLXAttr, GLX_ALPHA_SIZE, pop); TRACE("pAttr[%d] = GLX_ALPHA_SIZE: %d\n", cur, pop); break; @@ -390,7 +393,7 @@ static unsigned ConvertAttribWGLtoGLX(co pop = iWGLAttr[++cur]; switch (pop) { case WGL_TYPE_RGBA_ARB: pop = GLX_RGBA_BIT; break ; - case WGL_TYPE_COLORINDEX_ARB: pop = GLX_COLOR_INDEX_BIT; break ; + case WGL_TYPE_COLORINDEX_ARB: pop = GLX_COLOR_INDEX_BIT; isColor = 1; break ; default: ERR("unexpected PixelType(%x)\n", pop); pop = 0; @@ -452,6 +455,37 @@ static unsigned ConvertAttribWGLtoGLX(co } ++cur; } + + /** + * Trick as WGL_COLOR_BITS_ARB != GLX_BUFFER_SIZE + * WGL_COLOR_BITS_ARB + WGL_ALPHA_BITS_ARB == GLX_BUFFER_SIZE + * + * WGL_COLOR_BITS_ARB + * The number of color bitplanes in each color buffer. For RGBA + * pixel types, it is the size of the color buffer, excluding the + * alpha bitplanes. For color-index pixels, it is the size of the + * color index buffer. + * + * GLX_BUFFER_SIZE + * This attribute defines the number of bits per color buffer. + * For GLX FBConfigs that correspond to a PseudoColor or StaticColor visual, + * this is equal to the depth value reported in the X11 visual. + * For GLX FBConfigs that correspond to TrueColor or DirectColor visual, + * this is the sum of GLX_RED_SIZE, GLX_GREEN_SIZE, GLX_BLUE_SIZE, and GLX_ALPHA_SIZE. + * + */ + if (0 < wantColorBits) { + if (!isColor) { + wantColorBits += sz_alpha; + } + if (32 < wantColorBits) { + ERR("buggy %d GLX_BUFFER_SIZE default to 32\n", wantColorBits); + wantColorBits = 32; + } + PUSH2(oGLXAttr, GLX_BUFFER_SIZE, wantColorBits); + TRACE("pAttr[%d] = WGL_COLOR_BITS_ARB: %d\n", cur, wantColorBits); + } + return nAttribs; } @@ -534,8 +568,16 @@ GLboolean WINAPI wglGetPixelFormatAttrib continue ; case WGL_COLOR_BITS_ARB: - curGLXAttr = GLX_BUFFER_SIZE; + /** see ConvertAttribWGLtoGLX for explain */ + if (nCfgs < iPixelFormat || 0 >= iPixelFormat) goto pix_error; + curCfg = cfgs[iPixelFormat - 1]; + hTest = glXGetFBConfigAttrib(display, curCfg, GLX_BUFFER_SIZE, piValues + i); + if (hTest) goto get_error; + hTest = glXGetFBConfigAttrib(display, curCfg, GLX_ALPHA_SIZE, &tmp); + if (hTest) goto get_error; + piValues[i] = piValues[i] - tmp; break; + case WGL_BLUE_BITS_ARB: curGLXAttr = GLX_BLUE_SIZE; break;

1 0

wine/include wincrypt.h
by Alexandre Julliard 24 Nov '05

24 Nov '05

ChangeSet ID: 21429 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/24 12:45:05 Modified files: include : wincrypt.h Log message: Juan Lang <juan_lang(a)yahoo.com> Add more declarations. Patch: http://cvs.winehq.org/patch.py?id=21429 Old revision New revision Changes Path 1.60 1.61 +76 -0 wine/include/wincrypt.h Index: wine/include/wincrypt.h diff -u -p wine/include/wincrypt.h:1.60 wine/include/wincrypt.h:1.61 --- wine/include/wincrypt.h:1.60 24 Nov 2005 18:45: 5 -0000 +++ wine/include/wincrypt.h 24 Nov 2005 18:45: 5 -0000 @@ -843,6 +843,59 @@ typedef struct _CERT_CREATE_CONTEXT_PARA void *pvFree; } CERT_CREATE_CONTEXT_PARA, *PCERT_CREATE_CONTEXT_PARA; +typedef struct _CRYPT_OID_FUNC_ENTRY { + LPCSTR pszOID; + void *pvFuncAddr; +} CRYPT_OID_FUNC_ENTRY, *PCRYPT_OID_FUNC_ENTRY; + +typedef BOOL (WINAPI *PFN_CRYPT_ENUM_OID_FUNC)(DWORD dwEncodingType, + LPCSTR pszFuncName, LPCSTR pszOID, DWORD cValue, const DWORD rgdwValueType[], + LPCWSTR const rgpwszValueName[], const BYTE * const rgpbValueData[], + const DWORD rgcbValueData[], void *pvArg); + +#define CRYPT_MATCH_ANY_ENCODING_TYPE 0xffffffff + +typedef struct _CRYPT_OID_INFO { + DWORD cbSize; + LPCSTR pszOID; + LPCWSTR pwszName; + DWORD dwGroupId; + union { + DWORD dwValue; + ALG_ID Algid; + DWORD dwLength; + } DUMMYUNIONNAME; + CRYPT_DATA_BLOB ExtraInfo; +} CRYPT_OID_INFO, *PCRYPT_OID_INFO; +typedef const CRYPT_OID_INFO CCRYPT_OID_INFO, *PCCRYPT_OID_INFO; + +typedef BOOL (WINAPI *PFN_CRYPT_ENUM_OID_INFO)(PCCRYPT_OID_INFO pInfo, + void *pvArg); + +/* OID group IDs */ +#define CRYPT_HASH_ALG_OID_GROUP_ID 1 +#define CRYPT_ENCRYPT_ALG_OID_GROUP_ID 2 +#define CRYPT_PUBKEY_ALG_OID_GROUP_ID 3 +#define CRYPT_SIGN_ALG_OID_GROUP_ID 4 +#define CRYPT_RDN_ATTR_OID_GROUP_ID 5 +#define CRYPT_EXT_OR_ATTR_OID_GROUP_ID 6 +#define CRYPT_ENHKEY_USAGE_OID_GROUP_ID 7 +#define CRYPT_POLICY_OID_GROUP_ID 8 +#define CRYPT_TEMPLATE_OID_GROUP_ID 9 +#define CRYPT_LAST_OID_GROUP_ID 9 + +#define CRYPT_FIRST_ALG_OID_GROUP_ID CRYPT_HASH_ALG_OID_GROUP_ID +#define CRYPT_LAST_ALG_OID_GROUP_ID CRYPT_SIGN_ALG_OID_GROUP_ID + +#define CRYPT_OID_INHIBIT_SIGNATURE_FORMAT_FLAG 0x1 +#define CRYPT_OID_USE_PUBKEY_PARA_FOR_PKCS7_FLAG 0x2 +#define CRYPT_OID_NO_NULL_ALGORITHM_PARA_FLAG 0x4 + +#define CRYPT_OID_INFO_OID_KEY 1 +#define CRYPT_OID_INFO_NAME_KEY 2 +#define CRYPT_OID_INFO_ALGID_KEY 3 +#define CRYPT_OID_INFO_SIGN_KEY 4 + /* Algorithm IDs */ #define GET_ALG_CLASS(x) (x & (7 << 13)) @@ -2287,7 +2340,30 @@ BOOL WINAPI CryptSetOIDFunctionValue(DWO const BYTE *pbValueData, DWORD cbValueData); BOOL WINAPI CryptUnregisterDefaultOIDFunction(DWORD,LPCSTR,LPCWSTR); BOOL WINAPI CryptUnregisterOIDFunction(DWORD,LPCSTR,LPCSTR); +BOOL WINAPI CryptEnumOIDFunction(DWORD dwEncodingType, LPCSTR pszFuncName, + LPCSTR pszOID, DWORD dwFlags, void *pvArg, + PFN_CRYPT_ENUM_OID_FUNC pfnEnumOIDFunc); HCRYPTOIDFUNCSET WINAPI CryptInitOIDFunctionSet(LPCSTR,DWORD); +BOOL WINAPI CryptGetDefaultOIDDllList(HCRYPTOIDFUNCSET hFuncSet, + DWORD dwEncodingType, LPWSTR pwszDllList, DWORD *pcchDllList); +BOOL WINAPI CryptGetDefaultOIDFunctionAddress(HCRYPTOIDFUNCSET hFuncSet, + DWORD dwEncodingType, LPCWSTR pwszDll, DWORD dwFlags, void *ppvFuncAddr, + HCRYPTOIDFUNCADDR *phFuncAddr); +BOOL WINAPI CryptGetOIDFunctionAddress(HCRYPTOIDFUNCSET hFuncSet, + DWORD dwEncodingType, LPCSTR pszOID, DWORD dwFlags, void **ppvFuncAddr, + HCRYPTOIDFUNCADDR *phFuncAddr); +BOOL WINAPI CryptFreeOIDFunctionAddress(HCRYPTOIDFUNCADDR hFuncAddr, + DWORD dwFlags); +BOOL WINAPI CryptInstallOIDFunctionAddress(HMODULE hModule, + DWORD dwEncodingType, LPCSTR pszFuncName, DWORD cFuncEntry, + const CRYPT_OID_FUNC_ENTRY rgFuncEntry[], DWORD dwFlags); + +BOOL WINAPI CryptEnumOIDInfo(DWORD dwGroupId, DWORD dwFlags, void *pvArg, + PFN_CRYPT_ENUM_OID_INFO pfnEnumOIDInfo); +PCCRYPT_OID_INFO WINAPI CryptFindOIDInfo(DWORD dwKeyType, void *pvKey, + DWORD dwGroupId); +BOOL WINAPI CryptRegisterOIDInfo(PCCRYPT_OID_INFO pInfo, DWORD dwFlags); +BOOL WINAPI CryptUnregisterOIDInfo(PCCRYPT_OID_INFO pInfo); LPCSTR WINAPI CertAlgIdToOID(DWORD dwAlgId); DWORD WINAPI CertOIDToAlgId(LPCSTR pszObjId);

1 0

wine/ dlls/comctl32/rebar.c dlls/comctl32/tool ...
by Alexandre Julliard 23 Nov '05

23 Nov '05

ChangeSet ID: 21428 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/23 13:29:21 Modified files: dlls/comctl32 : rebar.c tooltips.c dlls/d3d8 : shader.c dlls/dinput : dinput_main.c effect_linuxinput.c joystick_linuxinput.c dlls/iphlpapi : iphlpapi_main.c dlls/quartz : filesource.c dlls/rsaenh : mpi.c tomcrypt.h dlls/shell32 : shellpath.c dlls/user : edit.c dlls/user/tests: sysparams.c dlls/uxtheme : draw.c dlls/wined3d : basetexture.c device.c pixelshader.c stateblock.c surface.c utils.c vertexshader.c wined3d_private.h dlls/winedos : dosaspi.c dlls/wineps : download.c dlls/wininet : ftp.c dlls/wininet/tests: http.c dlls/winspool/tests: info.c dlls/wintab32 : context.c programs/progman: En.rc programs/winedbg: gdbproxy.c tools/widl : write_msft.c tools/wrc : translation.c Log message: Francois Gouget <fgouget(a)free.fr> Assorted spelling fixes. Patch: http://cvs.winehq.org/patch.py?id=21428 Old revision New revision Changes Path 1.113 1.114 +2 -2 wine/dlls/comctl32/rebar.c 1.80 1.81 +1 -1 wine/dlls/comctl32/tooltips.c 1.36 1.37 +5 -5 wine/dlls/d3d8/shader.c 1.59 1.60 +1 -1 wine/dlls/dinput/dinput_main.c 1.4 1.5 +1 -1 wine/dlls/dinput/effect_linuxinput.c 1.34 1.35 +1 -1 wine/dlls/dinput/joystick_linuxinput.c 1.21 1.22 +3 -3 wine/dlls/iphlpapi/iphlpapi_main.c 1.18 1.19 +1 -1 wine/dlls/quartz/filesource.c 1.5 1.6 +2 -2 wine/dlls/rsaenh/mpi.c 1.1 1.2 +1 -1 wine/dlls/rsaenh/tomcrypt.h 1.107 1.108 +1 -1 wine/dlls/shell32/shellpath.c 1.42 1.43 +2 -2 wine/dlls/user/edit.c 1.45 1.46 +2 -2 wine/dlls/user/tests/sysparams.c 1.35 1.36 +2 -2 wine/dlls/uxtheme/draw.c 1.20 1.21 +1 -1 wine/dlls/wined3d/basetexture.c 1.99 1.100 +16 -16 wine/dlls/wined3d/device.c 1.3 1.4 +9 -9 wine/dlls/wined3d/pixelshader.c 1.26 1.27 +1 -1 wine/dlls/wined3d/stateblock.c 1.30 1.31 +1 -1 wine/dlls/wined3d/surface.c 1.17 1.18 +1 -1 wine/dlls/wined3d/utils.c 1.17 1.18 +12 -12 wine/dlls/wined3d/vertexshader.c 1.69 1.70 +1 -1 wine/dlls/wined3d/wined3d_private.h 1.12 1.13 +1 -1 wine/dlls/winedos/dosaspi.c 1.13 1.14 +1 -1 wine/dlls/wineps/download.c 1.58 1.59 +2 -2 wine/dlls/wininet/ftp.c 1.34 1.35 +1 -1 wine/dlls/wininet/tests/http.c 1.11 1.12 +1 -1 wine/dlls/winspool/tests/info.c 1.14 1.15 +1 -1 wine/dlls/wintab32/context.c 1.6 1.7 +1 -1 wine/programs/progman/En.rc 1.28 1.29 +4 -4 wine/programs/winedbg/gdbproxy.c 1.38 1.39 +1 -1 wine/tools/widl/write_msft.c 1.2 1.3 +2 -2 wine/tools/wrc/translation.c

1 0

wine/dlls ntdll/resource.c usp10/usp10.c winin ...
by Alexandre Julliard 23 Nov '05

23 Nov '05

ChangeSet ID: 21427 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/23 13:26:37 Modified files: dlls/ntdll : resource.c dlls/usp10 : usp10.c dlls/wininet : internet.c Log message: Francois Gouget <fgouget(a)free.fr> Documentation tweaks to make winapi_check happy. Also specify the documented spec file entry. Patch: http://cvs.winehq.org/patch.py?id=21427 Old revision New revision Changes Path 1.19 1.20 +4 -1 wine/dlls/ntdll/resource.c 1.4 1.5 +32 -0 wine/dlls/usp10/usp10.c 1.144 1.145 +16 -12 wine/dlls/wininet/internet.c

1 0

wine/dlls/msvideo rsrc.rc msvfw32_De.rc
by Alexandre Julliard 23 Nov '05

23 Nov '05

ChangeSet ID: 21426 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/23 13:26:23 Modified files: dlls/msvideo : rsrc.rc Added files: dlls/msvideo : msvfw32_De.rc Log message: Henning Gerhardt <henning.gerhardt(a)web.de> Add German resource file for msvideo. Patch: http://cvs.winehq.org/patch.py?id=21426 Old revision New revision Changes Path 1.2 1.3 +1 -0 wine/dlls/msvideo/rsrc.rc Added 1.1 +0 -0 wine/dlls/msvideo/msvfw32_De.rc Index: wine/dlls/msvideo/rsrc.rc diff -u -p wine/dlls/msvideo/rsrc.rc:1.2 wine/dlls/msvideo/rsrc.rc:1.3 --- wine/dlls/msvideo/rsrc.rc:1.2 23 Nov 2005 19:26:23 -0000 +++ wine/dlls/msvideo/rsrc.rc 23 Nov 2005 19:26:23 -0000 @@ -20,5 +20,6 @@ #include "winuser.h" #include "msvideo_private.h" +#include "msvfw32_De.rc" #include "msvfw32_En.rc" #include "msvfw32_Ko.rc" Index: wine/dlls/msvideo/msvfw32_De.rc diff -u -p /dev/null wine/dlls/msvideo/msvfw32_De.rc:1.1 --- /dev/null 23 Nov 2005 19:26:23 -0000 +++ wine/dlls/msvideo/msvfw32_De.rc 23 Nov 2005 19:26:23 -0000 @@ -0,0 +1,52 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * Copyright 2005 Henning Gerhardt + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Video Compression" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK",IDOK,129,2,49,14 + PUSHBUTTON "Abbrechen",IDCANCEL,129,18,49,14 + + LTEXT "&Komprimierer:",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "Kon&figurieren...",882,129,36,49,14 + PUSHBUTTON "&Über...",883,129,52,49,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "Komprimierungsqualität:",886,9,34,80,8 + + CONTROL "&Key Frame aller",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + EDITTEXT 888,78,60,22,12 + LTEXT "frames",889,103,62,26,10 + + CONTROL "&Datenrate",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + EDITTEXT 895,78,76,22,12 + LTEXT "KB/sec",896,102,78,26,10 +} + +STRINGTABLE DISCARDABLE +{ + IDS_FULLFRAMES "Vollständige Frames (Unkomprimiert)" +}

1 0

wine/ dlls/wldap32/control.c dlls/wldap32/init ...
by Alexandre Julliard 23 Nov '05

23 Nov '05

ChangeSet ID: 21425 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/23 13:26:15 Modified files: dlls/wldap32 : control.c init.c winldap_private.h include : winldap.h tools/winapi : win32.api Log message: Francois Gouget <fgouget(a)free.fr> winldap.h should include windeh.f and schnlsp.h. Enclose the API definitions in an extern "C" section and define LDAPAPI. Better stick to the types defined by the PSDK. Fix the ldap_create_vlv_control*() prototypes. Update win32.api. Patch: http://cvs.winehq.org/patch.py?id=21425 Old revision New revision Changes Path 1.3 1.4 +2 -2 wine/dlls/wldap32/control.c 1.7 1.8 +1 -1 wine/dlls/wldap32/init.c 1.31 1.32 +2 -2 wine/dlls/wldap32/winldap_private.h 1.5 1.6 +23 -6 wine/include/winldap.h 1.57 1.58 +6 -1 wine/tools/winapi/win32.api Index: wine/dlls/wldap32/control.c diff -u -p wine/dlls/wldap32/control.c:1.3 wine/dlls/wldap32/control.c:1.4 --- wine/dlls/wldap32/control.c:1.3 23 Nov 2005 19:26:15 -0000 +++ wine/dlls/wldap32/control.c 23 Nov 2005 19:26:15 -0000 @@ -162,7 +162,7 @@ ULONG ldap_create_sort_controlW( WLDAP32 } INT ldap_create_vlv_controlA( WLDAP32_LDAP *ld, WLDAP32_LDAPVLVInfo *info, - char critical, LDAPControlA **control ) + UCHAR critical, LDAPControlA **control ) { INT ret = LDAP_NOT_SUPPORTED; #ifdef HAVE_LDAP @@ -182,7 +182,7 @@ INT ldap_create_vlv_controlA( WLDAP32_LD } INT ldap_create_vlv_controlW( WLDAP32_LDAP *ld, WLDAP32_LDAPVLVInfo *info, - char critical, LDAPControlW **control ) + UCHAR critical, LDAPControlW **control ) { INT ret = LDAP_NOT_SUPPORTED; #ifdef HAVE_LDAP Index: wine/dlls/wldap32/init.c diff -u -p wine/dlls/wldap32/init.c:1.7 wine/dlls/wldap32/init.c:1.8 --- wine/dlls/wldap32/init.c:1.7 23 Nov 2005 19:26:15 -0000 +++ wine/dlls/wldap32/init.c 23 Nov 2005 19:26:15 -0000 @@ -264,7 +264,7 @@ exit: return NULL; } -ULONG ldap_connect( WLDAP32_LDAP *ld, LDAP_TIMEVAL *timeout ) +ULONG ldap_connect( WLDAP32_LDAP *ld, struct l_timeval *timeout ) { TRACE( "(%p, %p)\n", ld, timeout ); Index: wine/dlls/wldap32/winldap_private.h diff -u -p wine/dlls/wldap32/winldap_private.h:1.31 wine/dlls/wldap32/winldap_private.h:1.32 --- wine/dlls/wldap32/winldap_private.h:1.31 23 Nov 2005 19:26:15 -0000 +++ wine/dlls/wldap32/winldap_private.h 23 Nov 2005 19:26:15 -0000 @@ -291,8 +291,8 @@ ULONG ldap_create_page_controlA(WLDAP32_ ULONG ldap_create_page_controlW(WLDAP32_PLDAP,ULONG,struct WLDAP32_berval*,UCHAR,PLDAPControlW*); ULONG ldap_create_sort_controlA(WLDAP32_PLDAP,PLDAPSortKeyA*,UCHAR,PLDAPControlA*); ULONG ldap_create_sort_controlW(WLDAP32_PLDAP,PLDAPSortKeyW*,UCHAR,PLDAPControlW*); -INT ldap_create_vlv_controlA(WLDAP32_LDAP*,WLDAP32_LDAPVLVInfo*,char,LDAPControlA**); -INT ldap_create_vlv_controlW(WLDAP32_LDAP*,WLDAP32_LDAPVLVInfo*,char,LDAPControlW**); +INT ldap_create_vlv_controlA(WLDAP32_LDAP*,WLDAP32_LDAPVLVInfo*,UCHAR,LDAPControlA**); +INT ldap_create_vlv_controlW(WLDAP32_LDAP*,WLDAP32_LDAPVLVInfo*,UCHAR,LDAPControlW**); ULONG ldap_deleteA(WLDAP32_LDAP*,PCHAR); ULONG ldap_deleteW(WLDAP32_LDAP*,PWCHAR); ULONG ldap_delete_extA(WLDAP32_LDAP*,PCHAR,PLDAPControlA*,PLDAPControlA*,ULONG*); Index: wine/include/winldap.h diff -u -p wine/include/winldap.h:1.5 wine/include/winldap.h:1.6 --- wine/include/winldap.h:1.5 23 Nov 2005 19:26:15 -0000 +++ wine/include/winldap.h 23 Nov 2005 19:26:15 -0000 @@ -19,6 +19,14 @@ #ifndef __WINE_WINLDAP_H #define __WINE_WINLDAP_H +#include <windef.h> +#include <schnlsp.h> + +#ifndef LDAPAPI +#define LDAPAPI __cdecl +#endif + + typedef enum { LDAP_SUCCESS = 0x00, LDAP_OPERATIONS_ERROR = 0x01, @@ -361,6 +369,11 @@ typedef struct ldap_apifeature_infoW DECL_WINELIB_TYPE_AW(LDAPAPIFeatureInfo) + +#ifdef __cplusplus +extern "C" { +#endif + LDAP *cldap_openA(PCHAR,ULONG); LDAP *cldap_openW(PWCHAR,ULONG); #define cldap_open WINELIB_NAME_AW(cldap_open) @@ -401,7 +414,7 @@ ULONG ldap_compare_ext_sW(LDAP*,PWCHAR,P ULONG ldap_compare_sA(LDAP*,PCHAR,PCHAR,PCHAR); ULONG ldap_compare_sW(LDAP*,PWCHAR,PWCHAR,PWCHAR); #define ldap_compare_s WINELIB_NAME_AW(ldap_compare_s) -ULONG ldap_connect(LDAP*,LDAP_TIMEVAL*); +ULONG ldap_connect(LDAP*,struct l_timeval*); ULONG ldap_control_freeA(LDAPControlA*); ULONG ldap_control_freeW(LDAPControlW*); #define ldap_control_free WINELIB_NAME_AW(ldap_control_free) @@ -420,8 +433,8 @@ ULONG ldap_create_page_controlW(PLDAP,UL ULONG ldap_create_sort_controlA(PLDAP,PLDAPSortKeyA*,UCHAR,PLDAPControlA*); ULONG ldap_create_sort_controlW(PLDAP,PLDAPSortKeyW*,UCHAR,PLDAPControlW*); #define ldap_create_sort_control WINELIB_NAME_AW(ldap_create_sort_control) -INT ldap_create_vlv_controlA(LDAP*,LDAPVLVInfo*,char,LDAPControlA**); -INT ldap_create_vlv_controlW(LDAP*,LDAPVLVInfo*,char,LDAPControlW**); +INT ldap_create_vlv_controlA(PLDAP,PLDAPVLVInfo,UCHAR,PLDAPControlA*); +INT ldap_create_vlv_controlW(PLDAP,PLDAPVLVInfo,UCHAR,PLDAPControlW*); #define ldap_create_vlv_control WINELIB_NAME_AW(ldap_create_vlv_control) ULONG ldap_deleteA(LDAP*,PCHAR); ULONG ldap_deleteW(LDAP*,PWCHAR); @@ -533,8 +546,8 @@ ULONG ldap_parse_resultW(LDAP*,LDAPMessa ULONG ldap_parse_sort_controlA(LDAP*,PLDAPControlA*,ULONG*,PCHAR*); ULONG ldap_parse_sort_controlW(LDAP*,PLDAPControlW*,ULONG*,PWCHAR*); #define ldap_parse_sort_control WINELIB_NAME_AW(ldap_parse_sort_control) -int ldap_parse_vlv_controlA(LDAP*,LDAPControlA**,unsigned long*,unsigned long*,struct berval**,int*); -int ldap_parse_vlv_controlW(LDAP*,LDAPControlW**,unsigned long*,unsigned long*,struct berval**,int*); +int ldap_parse_vlv_controlA(LDAP*,PLDAPControlA*,unsigned long*,unsigned long*,struct berval**,int*); +int ldap_parse_vlv_controlW(LDAP*,PLDAPControlW*,unsigned long*,unsigned long*,struct berval**,int*); #define ldap_parse_vlv_control WINELIB_NAME_AW(ldap_parse_vlv_control) void ldap_perror(LDAP*,const PCHAR); ULONG ldap_rename_extA(LDAP*,PCHAR,PCHAR,PCHAR,INT,PLDAPControlA*,PLDAPControlA*,ULONG*); @@ -593,7 +606,7 @@ LDAP *ldap_sslinitW(PWCHAR,ULONG,int); ULONG ldap_start_tls_sA(LDAP*,PULONG,LDAPMessage**,PLDAPControlA*,PLDAPControlA*); ULONG ldap_start_tls_sW(LDAP*,PULONG,LDAPMessage**,PLDAPControlW*,PLDAPControlW*); #define ldap_start_tls_s WINELIB_NAME_AW(ldap_start_tls_s) -ULONG ldap_startup(LDAP_VERSION_INFO*,HANDLE*); +ULONG ldap_startup(PLDAP_VERSION_INFO,HANDLE*); BOOLEAN ldap_stop_tls_s(LDAP*); ULONG ldap_ufn2dnA(PCHAR,PCHAR*); ULONG ldap_ufn2dnW(PWCHAR,PWCHAR*); @@ -624,4 +637,8 @@ ULONG LdapMapErrorToWin32(ULONG); int LdapUnicodeToUTF8(LPCWSTR,int,LPSTR,int); int LdapUTF8ToUnicode(LPCSTR,int,LPWSTR,int); +#ifdef __cplusplus +} +#endif + #endif /* __WINE_WINLDAP_H */ Index: wine/tools/winapi/win32.api diff -u -p wine/tools/winapi/win32.api:1.57 wine/tools/winapi/win32.api:1.58 --- wine/tools/winapi/win32.api:1.57 23 Nov 2005 19:26:15 -0000 +++ wine/tools/winapi/win32.api 23 Nov 2005 19:26:15 -0000 @@ -5074,6 +5074,7 @@ void %long +BOOLEAN INT HANDLE UCHAR @@ -5085,17 +5086,20 @@ int BerElement * BERVAL * CHAR ** +HANDLE * LDAPControlA * LDAPControlA ** LDAPControlW * LDAPControlW ** LDAPModA *[] LDAPModW *[] -LDAP_TIMEVAL * PBERVAL * PCHAR * PCHAR[] +PLDAP_VERSION_INFO +PLDAPControlA PLDAPControlA * +PLDAPControlW PLDAPControlW * PLDAPSortKeyA * PLDAPSortKeyW * @@ -5108,6 +5112,7 @@ WLDAP32_BerElement ** WLDAP32_LDAP * WLDAP32_LDAPMessage * WLDAP32_LDAPMessage ** +WLDAP32_LDAPVLVInfo * int * struct WLDAP32_berval * struct WLDAP32_berval **

1 0

wine/ dlls/kernel/relay16.c dlls/msvcrt/misc.c ...
by Alexandre Julliard 23 Nov '05

23 Nov '05

ChangeSet ID: 21424 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/23 13:26:03 Modified files: dlls/kernel : relay16.c dlls/msvcrt : misc.c dlls/ntdll : loader.c relay.c resource.c signal_i386.c dlls/user : winproc.c libs/wine : port.c loader : preloader.c tools/winebuild: import.c Log message: Preserve 16-byte stack alignment in the various assembly functions. Needed for MacOSX. Patch: http://cvs.winehq.org/patch.py?id=21424 Old revision New revision Changes Path 1.23 1.24 +15 -6 wine/dlls/kernel/relay16.c 1.13 1.14 +2 -1 wine/dlls/msvcrt/misc.c 1.107 1.108 +1 -0 wine/dlls/ntdll/loader.c 1.29 1.30 +15 -6 wine/dlls/ntdll/relay.c 1.18 1.19 +11 -10 wine/dlls/ntdll/resource.c 1.105 1.106 +2 -0 wine/dlls/ntdll/signal_i386.c 1.13 1.14 +1 -0 wine/dlls/user/winproc.c 1.14 1.15 +2 -0 wine/libs/wine/port.c 1.16 1.17 +1 -1 wine/loader/preloader.c 1.112 1.113 +1 -0 wine/tools/winebuild/import.c

1 0

wine/dlls/msvideo msvfw32_En.rc rsrc.rc msvfw3 ...
by Alexandre Julliard 23 Nov '05

23 Nov '05

ChangeSet ID: 21423 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/23 13:25:29 Modified files: dlls/msvideo : msvfw32_En.rc rsrc.rc Added files: dlls/msvideo : msvfw32_Ko.rc Log message: YunSong Hwang <hys545(a)dreamwiz.com> Add Korean translation. Patch: http://cvs.winehq.org/patch.py?id=21423 Old revision New revision Changes Path 1.1 1.2 +1 -1 wine/dlls/msvideo/msvfw32_En.rc 1.1 1.2 +2 -0 wine/dlls/msvideo/rsrc.rc Added 1.1 +0 -0 wine/dlls/msvideo/msvfw32_Ko.rc Index: wine/dlls/msvideo/msvfw32_En.rc diff -u -p wine/dlls/msvideo/msvfw32_En.rc:1.1 wine/dlls/msvideo/msvfw32_En.rc:1.2 --- wine/dlls/msvideo/msvfw32_En.rc:1.1 23 Nov 2005 19:25:29 -0000 +++ wine/dlls/msvideo/msvfw32_En.rc 23 Nov 2005 19:25:29 -0000 @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "msvideo_private.h" +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU Index: wine/dlls/msvideo/rsrc.rc diff -u -p wine/dlls/msvideo/rsrc.rc:1.1 wine/dlls/msvideo/rsrc.rc:1.2 --- wine/dlls/msvideo/rsrc.rc:1.1 23 Nov 2005 19:25:29 -0000 +++ wine/dlls/msvideo/rsrc.rc 23 Nov 2005 19:25:29 -0000 @@ -18,5 +18,7 @@ #include "windef.h" #include "winuser.h" +#include "msvideo_private.h" #include "msvfw32_En.rc" +#include "msvfw32_Ko.rc" Index: wine/dlls/msvideo/msvfw32_Ko.rc diff -u -p /dev/null wine/dlls/msvideo/msvfw32_Ko.rc:1.1 --- /dev/null 23 Nov 2005 19:25:29 -0000 +++ wine/dlls/msvideo/msvfw32_Ko.rc 23 Nov 2005 19:25:29 -0000 @@ -0,0 +1,52 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * Copyright 2005 YunSong Hwang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Video Compression" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "È®ÀÎ",IDOK,129,2,49,14 + PUSHBUTTON "ÃëŒÒ",IDCANCEL,129,18,49,14 + + LTEXT "ŸÐÃà(&Co):",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "Œ³Á€(&f)...",882,129,36,49,14 + PUSHBUTTON "Á€ºž(&A)...",883,129,52,49,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "ŸÐÃà Ç°Áú(&Q):",886,9,34,80,8 + + CONTROL "žðµç Å° ÇÁ·¹ÀÓ(&K)",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + EDITTEXT 888,78,60,22,12 + LTEXT "ÇÁ·¹ÀÓ",889,103,62,26,10 + + CONTROL "µ¥ÀÌÅž ÀüŒÛÀ²(&D)",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + EDITTEXT 895,78,76,22,12 + LTEXT "KB/sec",896,102,78,26,10 +} + +STRINGTABLE DISCARDABLE +{ + IDS_FULLFRAMES "ÀüÃ€ ÇÁ·¹ÀÓ(ºñŸÐÃà)" +}

1 0

wine/dlls/advpack/tests advpack.c
by Alexandre Julliard 23 Nov '05

23 Nov '05

ChangeSet ID: 21422 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/23 13:25:20 Modified files: dlls/advpack/tests: advpack.c Log message: Francois Gouget <fgouget(a)free.fr> Add trailing '\n' to trace() call. Patch: http://cvs.winehq.org/patch.py?id=21422 Old revision New revision Changes Path 1.9 1.10 +1 -1 wine/dlls/advpack/tests/advpack.c Index: wine/dlls/advpack/tests/advpack.c diff -u -p wine/dlls/advpack/tests/advpack.c:1.9 wine/dlls/advpack/tests/advpack.c:1.10 --- wine/dlls/advpack/tests/advpack.c:1.9 23 Nov 2005 19:25:20 -0000 +++ wine/dlls/advpack/tests/advpack.c 23 Nov 2005 19:25:20 -0000 @@ -189,7 +189,7 @@ static void translateinfstring_test() if(hr == HRESULT_FROM_WIN32(ERROR_MOD_NOT_FOUND)) { - trace("WinNT 3.51 detected. Skipping tests for TranslateInfString()"); + trace("WinNT 3.51 detected. Skipping tests for TranslateInfString()\n"); return; }

1 0

wine/ dlls/winsock/socket.c include/ws2tcpip.h ...
by Alexandre Julliard 23 Nov '05

23 Nov '05

ChangeSet ID: 21421 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/23 13:25:16 Modified files: dlls/winsock : socket.c include : ws2tcpip.h tools/winapi : win32.api Log message: Francois Gouget <fgouget(a)free.fr> Add LPADDRINFO, missing IP_* defines and missing APIs. Enclose the API definitions in an extern "C" section. Define function pointer types if INCL_WINSOCK_API_TYPEDEFS is defined. Better stick to the types defined by the PSDK. Update win32.api. Patch: http://cvs.winehq.org/patch.py?id=21421 Old revision New revision Changes Path 1.197 1.198 +2 -2 wine/dlls/winsock/socket.c 1.7 1.8 +77 -23 wine/include/ws2tcpip.h 1.56 1.57 +7 -0 wine/tools/winapi/win32.api Index: wine/dlls/winsock/socket.c diff -u -p wine/dlls/winsock/socket.c:1.197 wine/dlls/winsock/socket.c:1.198 --- wine/dlls/winsock/socket.c:1.197 23 Nov 2005 19:25:16 -0000 +++ wine/dlls/winsock/socket.c 23 Nov 2005 19:25:16 -0000 @@ -3123,7 +3123,7 @@ static int convert_eai_u2w(int unixret) /*********************************************************************** * getaddrinfo (WS2_32.@) */ -int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const ADDRINFOA *hints, ADDRINFOA **res) +int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addrinfo *hints, struct WS_addrinfo **res) { #if HAVE_GETADDRINFO struct addrinfo *unixaires = NULL; @@ -3223,7 +3223,7 @@ outofmem: /*********************************************************************** * GetAddrInfoW (WS2_32.@) */ -int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hints, ADDRINFOW **res) +int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hints, PADDRINFOW *res) { FIXME("empty stub!\n"); return EAI_FAIL; Index: wine/include/ws2tcpip.h diff -u -p wine/include/ws2tcpip.h:1.7 wine/include/ws2tcpip.h:1.8 --- wine/include/ws2tcpip.h:1.7 23 Nov 2005 19:25:16 -0000 +++ wine/include/ws2tcpip.h 23 Nov 2005 19:25:16 -0000 @@ -53,7 +53,7 @@ typedef struct WS(addrinfoW) struct WS(addrinfoW)* ai_next; } ADDRINFOW, *PADDRINFOW; -typedef ADDRINFOA ADDRINFO; +typedef ADDRINFOA ADDRINFO, *LPADDRINFO; /* * Multicast group information @@ -136,27 +136,39 @@ typedef struct _INTERFACE_INFO #endif /* USE_WS_PREFIX */ #ifndef USE_WS_PREFIX -#define IP_OPTIONS 1 -#define IP_HDRINCL 2 -#define IP_TOS 3 -#define IP_TTL 4 -#define IP_MULTICAST_IF 9 -#define IP_MULTICAST_TTL 10 -#define IP_MULTICAST_LOOP 11 -#define IP_ADD_MEMBERSHIP 12 -#define IP_DROP_MEMBERSHIP 13 -#define IP_DONTFRAGMENT 14 +#define IP_OPTIONS 1 +#define IP_HDRINCL 2 +#define IP_TOS 3 +#define IP_TTL 4 +#define IP_MULTICAST_IF 9 +#define IP_MULTICAST_TTL 10 +#define IP_MULTICAST_LOOP 11 +#define IP_ADD_MEMBERSHIP 12 +#define IP_DROP_MEMBERSHIP 13 +#define IP_DONTFRAGMENT 14 +#define IP_ADD_SOURCE_MEMBERSHIP 15 +#define IP_DROP_SOURCE_MEMBERSHIP 16 +#define IP_BLOCK_SOURCE 17 +#define IP_UNBLOCK_SOURCE 18 +#define IP_PKTINFO 19 +#define IP_RECEIVE_BROADCAST 22 #else -#define WS_IP_OPTIONS 1 -#define WS_IP_HDRINCL 2 -#define WS_IP_TOS 3 -#define WS_IP_TTL 4 -#define WS_IP_MULTICAST_IF 9 -#define WS_IP_MULTICAST_TTL 10 -#define WS_IP_MULTICAST_LOOP 11 -#define WS_IP_ADD_MEMBERSHIP 12 -#define WS_IP_DROP_MEMBERSHIP 13 -#define WS_IP_DONTFRAGMENT 14 +#define WS_IP_OPTIONS 1 +#define WS_IP_HDRINCL 2 +#define WS_IP_TOS 3 +#define WS_IP_TTL 4 +#define WS_IP_MULTICAST_IF 9 +#define WS_IP_MULTICAST_TTL 10 +#define WS_IP_MULTICAST_LOOP 11 +#define WS_IP_ADD_MEMBERSHIP 12 +#define WS_IP_DROP_MEMBERSHIP 13 +#define WS_IP_DONTFRAGMENT 14 +#define WS_IP_ADD_SOURCE_MEMBERSHIP 15 +#define WS_IP_DROP_SOURCE_MEMBERSHIP 16 +#define WS_IP_BLOCK_SOURCE 17 +#define WS_IP_UNBLOCK_SOURCE 18 +#define WS_IP_PKTINFO 19 +#define WS_IP_RECEIVE_BROADCAST 22 #endif /* USE_WS_PREFIX */ /* Possible Windows flags for getaddrinfo() */ @@ -190,7 +202,49 @@ typedef struct _INTERFACE_INFO # define WS_EAI_SOCKTYPE WSAESOCKTNOSUPPORT #endif -int WINAPI WS(getaddrinfo)(LPCSTR,LPCSTR,const ADDRINFOA *,ADDRINFOA **); -int WINAPI GetAddrInfoW(LPCWSTR,LPCWSTR,const ADDRINFOW *,ADDRINFOW **); + +#ifdef __cplusplus +extern "C" { +#endif + +void WINAPI WS(freeaddrinfo)(LPADDRINFO); +#define FreeAddrInfoA WS(freeaddrinfo) +void WINAPI FreeAddrInfoW(PADDRINFOW); +#define FreeAddrInfo WINELIB_NAME_AW(FreeAddrInfo) +int WINAPI WS(getaddrinfo)(const char*,const char*,const struct WS(addrinfo)*,struct WS(addrinfo)**); +#define GetAddrInfoA WS(getaddrinfo) +int WINAPI GetAddrInfoW(PCWSTR,PCWSTR,const ADDRINFOW*,PADDRINFOW*); +#define GetAddrInfo WINELIB_NAME_AW(GetAddrInfo) +int WINAPI WS(getnameinfo)(const struct sockaddr*,socklen_t,char*,DWORD,char*,DWORD,int); +#define GetNameInfoA WS(getnameinfo) +INT WINAPI GetNameInfoW(const SOCKADDR*,socklen_t,PWCHAR,DWORD,PWCHAR,DWORD,INT); +#define GetNameInfo WINELIB_NAME_AW(GetNameInfo) + +/* + * Ws2tcpip Function Typedefs + * + * Remember to keep this section in sync with the + * prototypes above. + */ +#if INCL_WINSOCK_API_TYPEDEFS + +typedef void (WINAPI *LPFN_FREEADDRINFO)(LPADDRINFO); +#define LPFN_FREEADDRINFOA LPFN_FREEADDRINFO +typedef void (WINAPI *LPFN_FREEADDRINFOW)(PADDRINFOW); +#define LPFN_FREEADDRINFOT WINELIB_NAME_AW(LPFN_FREEADDRINFO) +typedef int (WINAPI *LPFN_GETADDRINFO)(const char*,const char*,const struct WS(addrinfo)*,struct WS(addrinfo)**); +#define LPFN_GETADDRINFOA LPFN_GETADDRINFO +typedef int (WINAPI *LPFN_GETADDRINFOW)(PCWSTR,PCWSTR,const ADDRINFOW*,PADDRINFOW*); +#define LPFN_GETADDRINFOT WINELIB_NAME_AW(LPFN_GETADDRINFO) +typedef int (WINAPI *LPFN_GETNAMEINFO)(const struct sockaddr*,socklen_t,char*,DWORD,char*,DWORD,int); +#define LPFN_GETNAMEINFOA LPFN_GETNAMEINFO +typedef int (WINAPI *LPFN_GETNAMEINFOW)(const SOCKADDR*,socklen_t,PWCHAR,DWORD,PWCHAR,DWORD,INT); +#define LPFN_GETNAMEINFOT WINELIB_NAME_AW(LPFN_GETNAMEINFO) + +#endif + +#ifdef __cplusplus +} +#endif #endif /* __WS2TCPIP__ */ Index: wine/tools/winapi/win32.api diff -u -p wine/tools/winapi/win32.api:1.56 wine/tools/winapi/win32.api:1.57 --- wine/tools/winapi/win32.api:1.56 23 Nov 2005 19:25:16 -0000 +++ wine/tools/winapi/win32.api 23 Nov 2005 19:25:16 -0000 @@ -2431,13 +2431,16 @@ SOCKET %ptr LPDWORD +LPINT LPOVERLAPPED LPTRANSMIT_FILE_BUFFERS PVOID +struct sockaddr ** %void void +VOID %%msxml3.dll @@ -5185,6 +5188,7 @@ u_short %ptr +ADDRINFOW * FARPROC INT * LPCONDITIONPROC @@ -5209,8 +5213,11 @@ LPWSASERVICECLASSINFOA LPWSASERVICECLASSINFOW LPWSAQUERYSETA LPWSAQUERYSETW +PADDRINFOW * WS_fd_set * int * +struct WS_addrinfo * +struct WS_addrinfo ** struct WS_hostent * struct WS_protoent * struct WS_servent *

1 0