November 2005 - Wine-Commits

wine/dlls/dxdiagn provider.c container.c Makef ...
by Alexandre Julliard Nov. 7, 2005

Nov. 7, 2005

ChangeSet ID: 21140 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/07 10:39:41 Modified files: dlls/dxdiagn : provider.c container.c Makefile.in Log message: Raphael Junqueira <fenix(a)club-internet.fr> - bug fixes on AddProp, AddContainer (stupid buffer overflows) - more complete container hierarchy - DXDiag_AddFileDescContainer service to fill dll info - almost complete DXDiag_InitDXDiagDirectXFilesContainer (for now) Patch: http://cvs.winehq.org/patch.py?id=21140 Old revision New revision Changes Path 1.10 1.11 +191 -5 wine/dlls/dxdiagn/provider.c 1.9 1.10 +2 -2 wine/dlls/dxdiagn/container.c 1.5 1.6 +2 -2 wine/dlls/dxdiagn/Makefile.in

1 0

wine/dlls/user sysparams.c
by Alexandre Julliard Nov. 7, 2005

Nov. 7, 2005

ChangeSet ID: 21139 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/07 10:39:21 Modified files: dlls/user : sysparams.c Log message: Rein Klazes <wijn(a)wanadoo.nl> Make SystemParametersInfoA( SPI_SETNONCLIENTMETRICS, ...) work by adding the needed non client metrics A->W conversions. Patch: http://cvs.winehq.org/patch.py?id=21139 Old revision New revision Changes Path 1.38 1.39 +52 -0 wine/dlls/user/sysparams.c Index: wine/dlls/user/sysparams.c diff -u -p wine/dlls/user/sysparams.c:1.38 wine/dlls/user/sysparams.c:1.39 --- wine/dlls/user/sysparams.c:1.38 7 Nov 2005 16:39:21 -0000 +++ wine/dlls/user/sysparams.c 7 Nov 2005 16:39:21 -0000 @@ -403,6 +403,25 @@ static void SYSPARAMS_LogFont32WTo32A( c font32A->lfFaceName[LF_FACESIZE-1] = 0; } +static void SYSPARAMS_LogFont32ATo32W( const LOGFONTA* font32A, LPLOGFONTW font32W ) +{ + font32W->lfHeight = font32A->lfHeight; + font32W->lfWidth = font32A->lfWidth; + font32W->lfEscapement = font32A->lfEscapement; + font32W->lfOrientation = font32A->lfOrientation; + font32W->lfWeight = font32A->lfWeight; + font32W->lfItalic = font32A->lfItalic; + font32W->lfUnderline = font32A->lfUnderline; + font32W->lfStrikeOut = font32A->lfStrikeOut; + font32W->lfCharSet = font32A->lfCharSet; + font32W->lfOutPrecision = font32A->lfOutPrecision; + font32W->lfClipPrecision = font32A->lfClipPrecision; + font32W->lfQuality = font32A->lfQuality; + font32W->lfPitchAndFamily = font32A->lfPitchAndFamily; + MultiByteToWideChar( CP_ACP, 0, font32A->lfFaceName, -1, font32W->lfFaceName, LF_FACESIZE ); + font32W->lfFaceName[LF_FACESIZE-1] = 0; +} + static void SYSPARAMS_NonClientMetrics32ATo16( const NONCLIENTMETRICSA* lpnm32, LPNONCLIENTMETRICS16 lpnm16 ) { lpnm16->iBorderWidth = lpnm32->iBorderWidth; @@ -439,6 +458,24 @@ static void SYSPARAMS_NonClientMetrics32 SYSPARAMS_LogFont32WTo32A( &lpnm32W->lfMessageFont, &lpnm32A->lfMessageFont ); } +static void SYSPARAMS_NonClientMetrics32ATo32W( const NONCLIENTMETRICSA* lpnm32A, LPNONCLIENTMETRICSW lpnm32W ) +{ + lpnm32W->iBorderWidth = lpnm32A->iBorderWidth; + lpnm32W->iScrollWidth = lpnm32A->iScrollWidth; + lpnm32W->iScrollHeight = lpnm32A->iScrollHeight; + lpnm32W->iCaptionWidth = lpnm32A->iCaptionWidth; + lpnm32W->iCaptionHeight = lpnm32A->iCaptionHeight; + SYSPARAMS_LogFont32ATo32W( &lpnm32A->lfCaptionFont, &lpnm32W->lfCaptionFont ); + lpnm32W->iSmCaptionWidth = lpnm32A->iSmCaptionWidth; + lpnm32W->iSmCaptionHeight = lpnm32A->iSmCaptionHeight; + SYSPARAMS_LogFont32ATo32W( &lpnm32A->lfSmCaptionFont, &lpnm32W->lfSmCaptionFont ); + lpnm32W->iMenuWidth = lpnm32A->iMenuWidth; + lpnm32W->iMenuHeight = lpnm32A->iMenuHeight; + SYSPARAMS_LogFont32ATo32W( &lpnm32A->lfMenuFont, &lpnm32W->lfMenuFont ); + SYSPARAMS_LogFont32ATo32W( &lpnm32A->lfStatusFont, &lpnm32W->lfStatusFont ); + SYSPARAMS_LogFont32ATo32W( &lpnm32A->lfMessageFont, &lpnm32W->lfMessageFont ); +} + /*********************************************************************** * get_volatile_regkey @@ -2143,6 +2180,21 @@ BOOL WINAPI SystemParametersInfoA( UINT break; } + case SPI_SETNONCLIENTMETRICS: /* 42 WINVER >= 0x400 */ + { + NONCLIENTMETRICSW tmp; + LPNONCLIENTMETRICSA lpnmA = (LPNONCLIENTMETRICSA)pvParam; + if (lpnmA && lpnmA->cbSize == sizeof(NONCLIENTMETRICSA)) + { + tmp.cbSize = sizeof(NONCLIENTMETRICSW); + SYSPARAMS_NonClientMetrics32ATo32W( lpnmA, &tmp ); + ret = SystemParametersInfoW( uiAction, uiParam, &tmp, fuWinIni ); + } + else + ret = FALSE; + break; + } + case SPI_GETICONMETRICS: /* 45 WINVER >= 0x400 */ { ICONMETRICSW tmp;

1 0

wine/dlls/secur32 secur32.c
by Alexandre Julliard Nov. 7, 2005

Nov. 7, 2005

ChangeSet ID: 21138 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/07 10:39:00 Modified files: dlls/secur32 : secur32.c Log message: Stefan Huehner <stefan(a)huehner.org> Fix segfault when querying non-existent SecurityProvider. Patch: http://cvs.winehq.org/patch.py?id=21138 Old revision New revision Changes Path 1.12 1.13 +8 -3 wine/dlls/secur32/secur32.c Index: wine/dlls/secur32/secur32.c diff -u -p wine/dlls/secur32/secur32.c:1.12 wine/dlls/secur32/secur32.c:1.13 --- wine/dlls/secur32/secur32.c:1.12 7 Nov 2005 16:39: 0 -0000 +++ wine/dlls/secur32/secur32.c 7 Nov 2005 16:39: 0 -0000 @@ -573,16 +573,21 @@ static void SECUR32_initializeProviders( SecurePackage *SECUR32_findPackageW(PWSTR packageName) { SecurePackage *ret = NULL; + BOOL matched = FALSE; if (packageTable && packageName) { LIST_FOR_EACH_ENTRY(ret, &packageTable->table, SecurePackage, entry) { - if (!lstrcmpiW(ret->infoW.Name, packageName)) - break; + matched = !lstrcmpiW(ret->infoW.Name, packageName); + if (matched) + break; } - if (ret && ret->provider && !ret->provider->loaded) + if (!matched) + return NULL; + + if (ret->provider && !ret->provider->loaded) { ret->provider->lib = LoadLibraryW(ret->provider->moduleName); if (ret->provider->lib)

1 0

wine/dlls/amstream amstream_private.h amstream ...
by Alexandre Julliard Nov. 7, 2005

Nov. 7, 2005

ChangeSet ID: 21137 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/07 10:38:49 Modified files: dlls/amstream : amstream_private.h amstream.c Makefile.in Added files: dlls/amstream : mediastream.c Log message: Christian Costa <titan.costa(a)wanadoo.fr> Add stub implementation of IMediaStream interface. Patch: http://cvs.winehq.org/patch.py?id=21137 Old revision New revision Changes Path 1.1 1.2 +2 -0 wine/dlls/amstream/amstream_private.h 1.11 1.12 +64 -8 wine/dlls/amstream/amstream.c 1.4 1.5 +1 -0 wine/dlls/amstream/Makefile.in Added 1.1 +0 -0 wine/dlls/amstream/mediastream.c

1 0

wine/dlls/atl atl_main.c atl.spec
by Alexandre Julliard Nov. 7, 2005

Nov. 7, 2005

ChangeSet ID: 21136 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/07 10:38:31 Modified files: dlls/atl : atl_main.c atl.spec Log message: Vitaly Lipatov <lav(a)etersoft.ru> AtlAxWinInit dummy implementation. Patch: http://cvs.winehq.org/patch.py?id=21136 Old revision New revision Changes Path 1.15 1.16 +16 -0 wine/dlls/atl/atl_main.c 1.11 1.12 +1 -1 wine/dlls/atl/atl.spec Index: wine/dlls/atl/atl_main.c diff -u -p wine/dlls/atl/atl_main.c:1.15 wine/dlls/atl/atl_main.c:1.16 --- wine/dlls/atl/atl_main.c:1.15 7 Nov 2005 16:38:31 -0000 +++ wine/dlls/atl/atl_main.c 7 Nov 2005 16:38:31 -0000 @@ -165,6 +165,22 @@ HRESULT WINAPI AtlModuleUnregisterServer return S_OK; } +/*********************************************************************** + * AtlAxWinInit [ATL.@] + * Initializes the control-hosting code: registering the AtlAxWin7 and AtlAxWinLic7 window + * classes and some messages. + * + * RETURNS + * TRUE or FALSE + */ + +HRESULT WINAPI AtlAxWinInit(void) +{ + FIXME("Try use native atl.dll if possible\n"); + return E_FAIL; +} + + HRESULT WINAPI AtlInternalQueryInterface(LPVOID this, const _ATL_INTMAP_ENTRY* pEntries, REFIID iid, LPVOID* ppvObject) { int i = 0; Index: wine/dlls/atl/atl.spec diff -u -p wine/dlls/atl/atl.spec:1.11 wine/dlls/atl/atl.spec:1.12 --- wine/dlls/atl/atl.spec:1.11 7 Nov 2005 16:38:32 -0000 +++ wine/dlls/atl/atl.spec 7 Nov 2005 16:38:32 -0000 @@ -33,7 +33,7 @@ 39 stub AtlAxCreateControl 40 stub AtlAxCreateControlEx 41 stub AtlAxAttachControl -42 stub AtlAxWinInit +42 stdcall AtlAxWinInit() 43 stub AtlModuleAddCreateWndData 44 stub AtlModuleExtractCreateWndData 45 stub AtlModuleRegisterWndClassInfoW

1 0

wine/ include/winternl.h dlls/ntdll/rtlstr.c d ...
by Alexandre Julliard Nov. 7, 2005

Nov. 7, 2005

ChangeSet ID: 21135 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/07 05:14:45 Modified files: include : winternl.h dlls/ntdll : rtlstr.c ntdll.spec Log message: Ivan Leo Puoti <ivanleo(a)gmail.com> Implement RtlInitAnsiStringEx. Patch: http://cvs.winehq.org/patch.py?id=21135 Old revision New revision Changes Path 1.167 1.168 +1 -0 wine/include/winternl.h 1.55 1.56 +33 -0 wine/dlls/ntdll/rtlstr.c 1.200 1.201 +1 -0 wine/dlls/ntdll/ntdll.spec Index: wine/include/winternl.h diff -u -p wine/include/winternl.h:1.167 wine/include/winternl.h:1.168 --- wine/include/winternl.h:1.167 7 Nov 2005 11:14:45 -0000 +++ wine/include/winternl.h 7 Nov 2005 11:14:45 -0000 @@ -2070,6 +2070,7 @@ PVOID WINAPI RtlImageRvaToVa(const I NTSTATUS WINAPI RtlImpersonateSelf(SECURITY_IMPERSONATION_LEVEL); void WINAPI RtlInitString(PSTRING,PCSZ); void WINAPI RtlInitAnsiString(PANSI_STRING,PCSZ); +NTSTATUS WINAPI RtlInitAnsiStringEx(PANSI_STRING,PCSZ); void WINAPI RtlInitUnicodeString(PUNICODE_STRING,PCWSTR); NTSTATUS WINAPI RtlInitUnicodeStringEx(PUNICODE_STRING,PCWSTR); NTSTATUS WINAPI RtlInitializeCriticalSection(RTL_CRITICAL_SECTION *); Index: wine/dlls/ntdll/rtlstr.c diff -u -p wine/dlls/ntdll/rtlstr.c:1.55 wine/dlls/ntdll/rtlstr.c:1.56 --- wine/dlls/ntdll/rtlstr.c:1.55 7 Nov 2005 11:14:45 -0000 +++ wine/dlls/ntdll/rtlstr.c 7 Nov 2005 11:14:45 -0000 @@ -102,6 +102,39 @@ void WINAPI RtlInitAnsiString( else target->Length = target->MaximumLength = 0; } +/************************************************************************** + * RtlInitAnsiStringEx (NTDLL.@) + * + * Initializes a buffered ansi string. + * + * RETURNS + * An appropriate NTSTATUS value. + * + * NOTES + * Assigns source to target->Buffer. The length of source is assigned to + * target->Length and target->MaximumLength. If source is NULL the length + * of source is assumed to be 0. + */ +NTSTATUS WINAPI RtlInitAnsiStringEx(PANSI_STRING target, PCSZ source) +{ + if (source) + { + unsigned int len = strlen(source); + if (len+1 > 0xffff) + return STATUS_NAME_TOO_LONG; + + target->Buffer = (PCHAR) source; + target->Length = len; + target->MaximumLength = len + 1; + } + else + { + target->Buffer = NULL; + target->Length = 0; + target->MaximumLength = 0; + } + return STATUS_SUCCESS; +} /************************************************************************** * RtlInitString (NTDLL.@) Index: wine/dlls/ntdll/ntdll.spec diff -u -p wine/dlls/ntdll/ntdll.spec:1.200 wine/dlls/ntdll/ntdll.spec:1.201 --- wine/dlls/ntdll/ntdll.spec:1.200 7 Nov 2005 11:14:45 -0000 +++ wine/dlls/ntdll/ntdll.spec 7 Nov 2005 11:14:45 -0000 @@ -650,6 +650,7 @@ @ stdcall RtlImageRvaToVa(ptr long long ptr) @ stdcall RtlImpersonateSelf(long) @ stdcall RtlInitAnsiString(ptr str) +@ stdcall RtlInitAnsiStringEx(ptr str) @ stub RtlInitCodePageTable # @ stub RtlInitMemoryStream @ stub RtlInitNlsTables

1 0

wine/dlls/wined3d drawprim.c
by Alexandre Julliard Nov. 7, 2005

Nov. 7, 2005

ChangeSet ID: 21134 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/07 05:13:26 Modified files: dlls/wined3d : drawprim.c Log message: Oliver Stieber <oliver_stieber(a)yahoo.co.uk> Verify that the texture coordinate used in DrawStridedSlow is in range before trying to referencing the associated data. Patch: http://cvs.winehq.org/patch.py?id=21134 Old revision New revision Changes Path 1.31 1.32 +8 -2 wine/dlls/wined3d/drawprim.c Index: wine/dlls/wined3d/drawprim.c diff -u -p wine/dlls/wined3d/drawprim.c:1.31 wine/dlls/wined3d/drawprim.c:1.32 --- wine/dlls/wined3d/drawprim.c:1.31 7 Nov 2005 11:13:26 -0000 +++ wine/dlls/wined3d/drawprim.c 7 Nov 2005 11:13:26 -0000 @@ -1317,13 +1317,19 @@ static void drawStridedSlow(IWineD3DDevi if (This->stateBlock->textures[textureNo] != NULL) { int coordIdx = This->stateBlock->textureState[textureNo][D3DTSS_TEXCOORDINDEX]; - float *ptrToCoords = (float *)(sd->u.s.texCoords[coordIdx].lpData + (SkipnStrides * sd->u.s.texCoords[coordIdx].dwStride)); + float *ptrToCoords = NULL; float s = 0.0, t = 0.0, r = 0.0, q = 0.0; if (coordIdx > 7) { VTRACE(("tex: %d - Skip tex coords, as being system generated\n", textureNo)); continue; - } else if (sd->u.s.texCoords[coordIdx].lpData == NULL) { + } else if (coordIdx < 0) { + FIXME("tex: %d - Coord index %d is less than zero, expect a crash.\n", textureNo, coordIdx); + continue; + } + + ptrToCoords = (float *)(sd->u.s.texCoords[coordIdx].lpData + (SkipnStrides * sd->u.s.texCoords[coordIdx].dwStride)); + if (sd->u.s.texCoords[coordIdx].lpData == NULL) { TRACE("tex: %d - Skipping tex coords, as no data supplied\n", textureNo); continue; } else {

1 0

wine/dlls/wined3d device.c
by Alexandre Julliard Nov. 7, 2005

Nov. 7, 2005

ChangeSet ID: 21133 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/07 05:12:38 Modified files: dlls/wined3d : device.c Log message: Oliver Stieber <oliver_stieber(a)yahoo.co.uk> Prevent SetFVF from clearing down the vertex declaration of the FVF is zero. This is required for Prince of Persia, The sands of time. Patch: http://cvs.winehq.org/patch.py?id=21133 Old revision New revision Changes Path 1.93 1.94 +10 -6 wine/dlls/wined3d/device.c Index: wine/dlls/wined3d/device.c diff -u -p wine/dlls/wined3d/device.c:1.93 wine/dlls/wined3d/device.c:1.94 --- wine/dlls/wined3d/device.c:1.93 7 Nov 2005 11:12:38 -0000 +++ wine/dlls/wined3d/device.c 7 Nov 2005 11:12:38 -0000 @@ -1650,6 +1650,7 @@ UINT WINAPI IWineD3DDeviceImpl_GetAvaila *****/ HRESULT WINAPI IWineD3DDeviceImpl_SetFVF(IWineD3DDevice *iface, DWORD fvf) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + HRESULT hr = D3D_OK; /* Update the current state block */ This->updateStateBlock->fvf = fvf; @@ -1657,13 +1658,16 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetFVF This->updateStateBlock->set.fvf = TRUE; TRACE("(%p) : FVF Shader FVF set to %lx\n", This, fvf); - /* clear down the vertex declaration - NOTE: Axis and Allies doesn't work properly otherwise - (may be a stateblock problem though!) - */ - /* No difference if recording or not */ - return IWineD3DDevice_SetVertexDeclaration(iface, NULL); + if (0 != fvf) { + /* clear down the vertex declaration + NOTE: Axis and Allies doesn't work properly otherwise + (may be a stateblock problem though!) + */ + hr = IWineD3DDevice_SetVertexDeclaration(iface, NULL); + } + + return hr; }

1 0

wine/dlls/ntdll resource.c
by Alexandre Julliard Nov. 7, 2005

Nov. 7, 2005

ChangeSet ID: 21132 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/07 05:11:59 Modified files: dlls/ntdll : resource.c Log message: Robert Shearman <rob(a)codeweavers.com> LdrAccessResource should pop 16 bytes off the stack since it is a WINAPI function. Patch: http://cvs.winehq.org/patch.py?id=21132 Old revision New revision Changes Path 1.16 1.17 +1 -1 wine/dlls/ntdll/resource.c Index: wine/dlls/ntdll/resource.c diff -u -p wine/dlls/ntdll/resource.c:1.16 wine/dlls/ntdll/resource.c:1.17 --- wine/dlls/ntdll/resource.c:1.16 7 Nov 2005 11:11:59 -0000 +++ wine/dlls/ntdll/resource.c 7 Nov 2005 11:11:59 -0000 @@ -373,7 +373,7 @@ __ASM_GLOBAL_FUNC( LdrAccessResource, "pushl 8(%ebp)\n" "call access_resource\n" "leave\n" - "ret\n" + "ret $16\n" ); #else NTSTATUS WINAPI LdrAccessResource( HMODULE hmod, const IMAGE_RESOURCE_DATA_ENTRY *entry,

1 0

wine/dlls/oleaut32 tests/olepicture.c olepicture.c
by Alexandre Julliard Nov. 7, 2005

Nov. 7, 2005

ChangeSet ID: 21131 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard(a)winehq.org 2005/11/07 05:09:10 Modified files: dlls/oleaut32/tests: olepicture.c dlls/oleaut32 : olepicture.c Log message: Marcus Meissner <marcus(a)jet.franken.de> Added support of loading of IPicture data from non-statable IStreams. Added testcases for this. Patch: http://cvs.winehq.org/patch.py?id=21131 Old revision New revision Changes Path 1.3 1.4 +328 -34 wine/dlls/oleaut32/tests/olepicture.c 1.68 1.69 +72 -26 wine/dlls/oleaut32/olepicture.c

1 0