March 2008 - Wine-commits - list.winehq.org

Roderick Colenbrander : wined3d: Check the texture capabilities we offer for the different texture types ( cube, plain, volume).
by Alexandre Julliard 17 Mar '08

17 Mar '08

Module: wine Branch: master Commit: ecf24604e220514d8237ab198822bd6b6963621a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecf24604e220514d8237ab198… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Mar 16 16:20:27 2008 +0000 wined3d: Check the texture capabilities we offer for the different texture types (cube, plain, volume). --- dlls/wined3d/directx.c | 235 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 230 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ecf24604e220514d8237a…

1 0

Roderick Colenbrander : wined3d: Check the render target capabilities of a resource type.
by Alexandre Julliard 17 Mar '08

17 Mar '08

Module: wine Branch: master Commit: d44c2956512117f8f03f77b38d35fb0503418962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d44c2956512117f8f03f77b38… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Mar 16 16:37:38 2008 +0000 wined3d: Check the render target capabilities of a resource type. --- dlls/wined3d/directx.c | 147 +++++++++++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 2 + 2 files changed, 110 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 89ee91b..97989ba 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1845,6 +1845,73 @@ WINED3DFORMAT DepthStencilFormat) return FALSE; } +/* Check the render target capabilities of a format */ +static BOOL CheckRenderTargetCapability(WINED3DFORMAT AdapterFormat, WINED3DFORMAT CheckFormat) +{ + UINT Adapter = 0; + + /* Filter out non-RT formats */ + switch(CheckFormat) + { + /* Don't offer 8bit, windows doesn't either although we could emulate it */ + case WINED3DFMT_A8P8: + case WINED3DFMT_P8: + + /* No DXTC render targets */ + case WINED3DFMT_DXT1: + case WINED3DFMT_DXT2: + case WINED3DFMT_DXT3: + case WINED3DFMT_DXT4: + case WINED3DFMT_DXT5: + return FALSE; + default: + break; + } + + if(wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { + WineD3D_PixelFormat *cfgs = Adapters[Adapter].cfgs; + int it; + short AdapterRed, AdapterGreen, AdapterBlue, AdapterAlpha, AdapterTotalSize; + short CheckRed, CheckGreen, CheckBlue, CheckAlpha, CheckTotalSize; + + getColorBits(AdapterFormat, &AdapterRed, &AdapterGreen, &AdapterBlue, &AdapterAlpha, &AdapterTotalSize); + getColorBits(CheckFormat, &CheckRed, &CheckGreen, &CheckBlue, &CheckAlpha, &CheckTotalSize); + + /* In backbuffer mode the front and backbuffer share the same WGL pixelformat. + * The format must match in RGB, alpha is allowed to be different. (Only the backbuffer can have alpha) */ + if(!((AdapterRed == CheckRed) && (AdapterGreen == CheckGreen) && (AdapterBlue == CheckBlue))) { + TRACE_(d3d_caps)("[FAILED]\n"); + return FALSE; + } + + /* Check if there is a WGL pixel format matching the requirements, the format should also be window + * drawable (not offscreen; e.g. Nvidia offers R5G6B5 for pbuffers even when X is running at 24bit) */ + for (it = 0; it < Adapters[Adapter].nCfgs; ++it) { + if (cfgs[it].windowDrawable && IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(&cfgs[it], CheckFormat)) { + TRACE_(d3d_caps)("iPixelFormat=%d is compatible with CheckFormat=%s\n", cfgs[it].iPixelFormat, debug_d3dformat(CheckFormat)); + return TRUE; + } + } + } else if(wined3d_settings.offscreen_rendering_mode == ORM_PBUFFER) { + /* We can propably use this function in FBO mode too on some drivers to get some basic indication of the capabilities. */ + WineD3D_PixelFormat *cfgs = Adapters[Adapter].cfgs; + int it; + + /* Check if there is a WGL pixel format matching the requirements, the pixel format should also be usable with pbuffers */ + for (it = 0; it < Adapters[Adapter].nCfgs; ++it) { + if (cfgs[it].pbufferDrawable && IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(&cfgs[it], CheckFormat)) { + TRACE_(d3d_caps)("iPixelFormat=%d is compatible with CheckFormat=%s\n", cfgs[it].iPixelFormat, debug_d3dformat(CheckFormat)); + return TRUE; + } + } + } else if(wined3d_settings.offscreen_rendering_mode == ORM_FBO){ + /* For now return TRUE for FBOs until we have some proper checks. + * Note that this function will only be called when the format is around for texturing. */ + return TRUE; + } + return FALSE; +} + /* Check if a texture format is supported on the given adapter */ static BOOL CheckTextureCapability(UINT Adapter, WINED3DFORMAT CheckFormat) { @@ -2095,6 +2162,15 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt /* No usage checks were requested, so return because we know that the format is supported */ if(!Usage) return WINED3D_OK; + + if(Usage & WINED3DUSAGE_RENDERTARGET) { + if(CheckRenderTargetCapability(AdapterFormat, CheckFormat)) { + UsageCaps |= WINED3DUSAGE_RENDERTARGET; + } else { + TRACE_(d3d_caps)("[FAILED] - No rendertarget support\n"); + return WINED3DERR_NOTAVAILABLE; + } + } } } } else if(RType == WINED3DRTYPE_SURFACE) { @@ -2111,7 +2187,16 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt TRACE_(d3d_caps)("[FAILED] - No depthstencil support\n"); return WINED3DERR_NOTAVAILABLE; } - } + } + + if(Usage & WINED3DUSAGE_RENDERTARGET) { + if(CheckRenderTargetCapability(AdapterFormat, CheckFormat)) { + UsageCaps |= WINED3DUSAGE_RENDERTARGET; + } else { + TRACE_(d3d_caps)("[FAILED] - No rendertarget support\n"); + return WINED3DERR_NOTAVAILABLE; + } + } } else if(RType == WINED3DRTYPE_TEXTURE) { /* Texture allows: * - D3DUSAGE_AUTOGENMIPMAP @@ -2130,6 +2215,14 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt if(!Usage) return WINED3D_OK; + if(Usage & WINED3DUSAGE_RENDERTARGET) { + if(CheckRenderTargetCapability(AdapterFormat, CheckFormat)) { + UsageCaps |= WINED3DUSAGE_RENDERTARGET; + } else { + TRACE_(d3d_caps)("[FAILED] - No rendertarget support\n"); + return WINED3DERR_NOTAVAILABLE; + } + } } else if(CheckDepthStencilCapability(Adapter, AdapterFormat, CheckFormat)) { if(Usage & WINED3DUSAGE_DEPTHSTENCIL) UsageCaps |= WINED3DUSAGE_DEPTHSTENCIL; @@ -2215,43 +2308,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt } } - if(Usage & WINED3DUSAGE_RENDERTARGET) { - switch (CheckFormat) { - case WINED3DFMT_R8G8B8: - case WINED3DFMT_A8R8G8B8: - case WINED3DFMT_X8R8G8B8: - case WINED3DFMT_R5G6B5: - case WINED3DFMT_X1R5G5B5: - case WINED3DFMT_A1R5G5B5: - case WINED3DFMT_A4R4G4B4: - case WINED3DFMT_R3G3B2: - case WINED3DFMT_X4R4G4B4: - case WINED3DFMT_A8B8G8R8: - case WINED3DFMT_X8B8G8R8: - case WINED3DFMT_P8: - case WINED3DFMT_G16R16: - TRACE_(d3d_caps)("[OK]\n"); - return WINED3D_OK; - case WINED3DFMT_R16F: - case WINED3DFMT_A16B16G16R16F: - if (!GL_SUPPORT(ARB_HALF_FLOAT_PIXEL) || !GL_SUPPORT(ARB_TEXTURE_FLOAT)) { - TRACE_(d3d_caps)("[FAILED]\n"); - return WINED3DERR_NOTAVAILABLE; - } - TRACE_(d3d_caps)("[OK]\n"); - return WINED3D_OK; - case WINED3DFMT_A32B32G32R32F: - if (!GL_SUPPORT(ARB_TEXTURE_FLOAT)) { - TRACE_(d3d_caps)("[FAILED]\n"); - return WINED3DERR_NOTAVAILABLE; - } - TRACE_(d3d_caps)("[OK]\n"); - return WINED3D_OK; - default: - TRACE_(d3d_caps)("[FAILED]\n"); - return WINED3DERR_NOTAVAILABLE; - } - } else if(Usage & WINED3DUSAGE_QUERY_LEGACYBUMPMAP) { + if(Usage & WINED3DUSAGE_QUERY_LEGACYBUMPMAP) { if(GL_SUPPORT(NV_REGISTER_COMBINERS) && GL_SUPPORT(NV_TEXTURE_SHADER2)) { switch (CheckFormat) { case WINED3DFMT_V8U8: @@ -3672,6 +3729,7 @@ BOOL InitAdapters(void) { PUSH1(WGL_ALPHA_BITS_ARB) PUSH1(WGL_DEPTH_BITS_ARB) PUSH1(WGL_STENCIL_BITS_ARB) + PUSH1(WGL_DRAW_TO_WINDOW_ARB) for(iPixelFormat=1; iPixelFormat<=Adapters[0].nCfgs; iPixelFormat++) { res = GL_EXTCALL(wglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, nAttribs, attribs, values)); @@ -3687,8 +3745,19 @@ BOOL InitAdapters(void) { cfgs->alphaSize = values[3]; cfgs->depthSize = values[4]; cfgs->stencilSize = values[5]; + cfgs->windowDrawable = values[6]; + + cfgs->pbufferDrawable = FALSE; + /* Check for pbuffer support when it is around as wglGetPixelFormatAttribiv fails for unknown +attributes. */ + if(GL_SUPPORT(WGL_ARB_PBUFFER)) { + int attrib = WGL_DRAW_TO_PBUFFER_ARB; + int value; + if(GL_EXTCALL(wglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, 1, &attrib, &value))) + cfgs->pbufferDrawable = value; + } - TRACE("iPixelFormat=%d, RGBA=%d/%d/%d/%d, depth=%d, stencil=%d\n", cfgs->iPixelFormat, cfgs->redSize, cfgs->greenSize, cfgs->blueSize, cfgs->alphaSize, cfgs->depthSize, cfgs->stencilSize); + TRACE("iPixelFormat=%d, RGBA=%d/%d/%d/%d, depth=%d, stencil=%d, windowDrawable=%d, pbufferDrawable=%d\n", cfgs->iPixelFormat, cfgs->redSize, cfgs->greenSize, cfgs->blueSize, cfgs->alphaSize, cfgs->depthSize, cfgs->stencilSize, cfgs->windowDrawable, cfgs->pbufferDrawable); cfgs++; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a3efde9..6b0cfb8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -638,6 +638,8 @@ typedef struct WineD3D_PixelFormat int iPixelFormat; /* WGL pixel format */ int redSize, greenSize, blueSize, alphaSize; int depthSize, stencilSize; + BOOL windowDrawable; + BOOL pbufferDrawable; } WineD3D_PixelFormat; /* The adapter structure */

1 0

Joris Huizer : qmgr/tests: Test the correct handle.
by Alexandre Julliard 17 Mar '08

17 Mar '08

Module: wine Branch: master Commit: b6a152917126d0ed3d985e0866c56f691236de69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6a152917126d0ed3d985e086… Author: Joris Huizer <jorishuizer(a)debian> Date: Sat Mar 15 18:54:08 2008 +0100 qmgr/tests: Test the correct handle. --- dlls/qmgr/tests/job.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c index cc64b0c..fe58fa3 100644 --- a/dlls/qmgr/tests/job.c +++ b/dlls/qmgr/tests/job.c @@ -319,7 +319,7 @@ static void compareFiles(WCHAR *n1, WCHAR *n2) f2 = CreateFileW(n2, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - ok(f1 != INVALID_HANDLE_VALUE, "CreateFile\n"); + ok(f2 != INVALID_HANDLE_VALUE, "CreateFile\n"); /* Neither of these files is very big */ ok(ReadFile(f1, b1, sizeof b1, &s1, NULL), "ReadFile\n");

1 0

Andrew Talbot : rsaenh: Assign to structs instead of using memcpy.
by Alexandre Julliard 17 Mar '08

17 Mar '08

Module: wine Branch: master Commit: 038169b6a7014417305742e8c323c79585ce5b46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=038169b6a7014417305742e8c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 15 23:25:38 2008 +0000 rsaenh: Assign to structs instead of using memcpy. --- dlls/rsaenh/implglue.c | 4 ++-- dlls/rsaenh/rsaenh.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index bb39a7b..68a9380 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -134,7 +134,7 @@ BOOL finalize_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, BYTE *pbHash BOOL duplicate_hash_impl(ALG_ID aiAlgid, CONST HASH_CONTEXT *pSrcHashContext, HASH_CONTEXT *pDestHashContext) { - memcpy(pDestHashContext, pSrcHashContext, sizeof(HASH_CONTEXT)); + *pDestHashContext = *pSrcHashContext; return TRUE; } @@ -227,7 +227,7 @@ BOOL duplicate_key_impl(ALG_ID aiAlgid, CONST KEY_CONTEXT *pSrcKeyContext, case CALG_AES_128: case CALG_AES_192: case CALG_AES_256: - memcpy(pDestKeyContext, pSrcKeyContext, sizeof(KEY_CONTEXT)); + *pDestKeyContext = *pSrcKeyContext; break; case CALG_RSA_KEYX: case CALG_RSA_SIGN: diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index ded6df7..e31bace 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -548,7 +548,7 @@ static BOOL copy_hmac_info(PHMAC_INFO *dst, const HMAC_INFO *src) { if (!src) return FALSE; *dst = HeapAlloc(GetProcessHeap(), 0, sizeof(HMAC_INFO)); if (!*dst) return FALSE; - memcpy(*dst, src, sizeof(HMAC_INFO)); + **dst = *src; (*dst)->pbInnerString = NULL; (*dst)->pbOuterString = NULL; if ((*dst)->cbInnerString == 0) (*dst)->cbInnerString = RSAENH_HMAC_DEF_PAD_LEN; @@ -1837,7 +1837,7 @@ BOOL WINAPI RSAENH_CPDuplicateHash(HCRYPTPROV hUID, HCRYPTHASH hHash, DWORD *pdw destroy_hash, (OBJECTHDR**)&pDestHash); if (*phHash != (HCRYPTHASH)INVALID_HANDLE_VALUE) { - memcpy(pDestHash, pSrcHash, sizeof(CRYPTHASH)); + *pDestHash = *pSrcHash; duplicate_hash_impl(pSrcHash->aiAlgid, &pSrcHash->context, &pDestHash->context); copy_hmac_info(&pDestHash->pHMACInfo, pSrcHash->pHMACInfo); copy_data_blob(&pDestHash->tpPRFParams.blobLabel, &pSrcHash->tpPRFParams.blobLabel); @@ -1893,7 +1893,7 @@ BOOL WINAPI RSAENH_CPDuplicateKey(HCRYPTPROV hUID, HCRYPTKEY hKey, DWORD *pdwRes (OBJECTHDR**)&pDestKey); if (*phKey != (HCRYPTKEY)INVALID_HANDLE_VALUE) { - memcpy(pDestKey, pSrcKey, sizeof(CRYPTKEY)); + *pDestKey = *pSrcKey; copy_data_blob(&pDestKey->siSChannelInfo.blobServerRandom, &pSrcKey->siSChannelInfo.blobServerRandom); copy_data_blob(&pDestKey->siSChannelInfo.blobClientRandom,

1 0

Andrew Talbot : setupapi: Assign to structs instead of using memcpy.
by Alexandre Julliard 17 Mar '08

17 Mar '08

Module: wine Branch: master Commit: bd0fec2511cc33fe1bbbc311d5c48f83a909a7fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd0fec2511cc33fe1bbbc311d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 15 23:25:45 2008 +0000 setupapi: Assign to structs instead of using memcpy. --- dlls/setupapi/devinst.c | 27 +++++++++++---------------- dlls/setupapi/misc.c | 2 +- dlls/setupapi/setupx_main.c | 2 +- dlls/setupapi/virtcopy.c | 4 ++-- 4 files changed, 15 insertions(+), 20 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index c90170b..f7c3839 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -352,13 +352,11 @@ static BOOL SETUPDI_AddInterfaceInstance(PSP_DEVINFO_DATA DeviceInfoData, iface->cInstances++; instance->cbSize = sizeof(SP_DEVICE_INTERFACE_DATA); - memcpy(&instance->InterfaceClassGuid, - InterfaceClassGuid, sizeof(GUID)); + instance->InterfaceClassGuid = *InterfaceClassGuid; instance->Flags = SPINT_ACTIVE; /* FIXME */ instance->Reserved = (ULONG_PTR)ifaceInfo; if (newInterface) - memcpy(&iface->guid, InterfaceClassGuid, - sizeof(GUID)); + iface->guid = *InterfaceClassGuid; key = SetupDiCreateDeviceInterfaceRegKeyW(devInfo->set, instance, 0, KEY_WRITE, NULL, NULL); if (key != INVALID_HANDLE_VALUE) @@ -555,7 +553,7 @@ static BOOL SETUPDI_AddDeviceToSet(struct DeviceInfoSet *set, SP_DEVINFO_DATA *DeviceInfoData = &set->devices[set->cDevices++]; DeviceInfoData->cbSize = sizeof(SP_DEVINFO_DATA); - memcpy(&DeviceInfoData->ClassGuid, guid, sizeof(GUID)); + DeviceInfoData->ClassGuid = *guid; DeviceInfoData->DevInst = devInfo->devId; DeviceInfoData->Reserved = (ULONG_PTR)devInfo; SETUPDI_GuidToString(guid, classGuidStr); @@ -1498,7 +1496,7 @@ BOOL WINAPI SetupDiCreateDeviceInfoW( ret = FALSE; } else - memcpy(DeviceInfoData, dev, sizeof(SP_DEVINFO_DATA)); + *DeviceInfoData = *dev; } } } @@ -2383,7 +2381,7 @@ BOOL WINAPI SetupDiGetDeviceInfoListDetailA( SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - memcpy(&DevInfoData->ClassGuid, &set->ClassGuid, sizeof(GUID)); + DevInfoData->ClassGuid = set->ClassGuid; DevInfoData->RemoteMachineHandle = NULL; DevInfoData->RemoteMachineName[0] = '\0'; return TRUE; @@ -2416,7 +2414,7 @@ BOOL WINAPI SetupDiGetDeviceInfoListDetailW( SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - memcpy(&DevInfoData->ClassGuid, &set->ClassGuid, sizeof(GUID)); + DevInfoData->ClassGuid = set->ClassGuid; DevInfoData->RemoteMachineHandle = NULL; DevInfoData->RemoteMachineName[0] = '\0'; return TRUE; @@ -2513,7 +2511,7 @@ BOOL WINAPI SetupDiCreateDeviceInterfaceW( ret = FALSE; } else - memcpy(DeviceInterfaceData, iface, sizeof(*iface)); + *DeviceInterfaceData = *iface; } } return ret; @@ -2770,8 +2768,7 @@ BOOL WINAPI SetupDiEnumDeviceInterfaces( if ((ret = SETUPDI_FindInterface(devInfo, InterfaceClassGuid, &iface))) { if (MemberIndex < iface->cInstances) - memcpy(DeviceInterfaceData, &iface->instances[MemberIndex], - sizeof(SP_DEVICE_INTERFACE_DATA)); + *DeviceInterfaceData = iface->instances[MemberIndex]; else { SetLastError(ERROR_NO_MORE_ITEMS); @@ -2801,9 +2798,7 @@ BOOL WINAPI SetupDiEnumDeviceInterfaces( { DWORD instanceIndex = MemberIndex - cEnumerated; - memcpy(DeviceInterfaceData, - &iface->instances[instanceIndex], - sizeof(SP_DEVICE_INTERFACE_DATA)); + *DeviceInterfaceData = iface->instances[instanceIndex]; cEnumerated += instanceIndex + 1; found = TRUE; ret = TRUE; @@ -2916,7 +2911,7 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA( else DeviceInterfaceDetailData->DevicePath[0] = '\0'; if (DeviceInfoData && DeviceInfoData->cbSize == sizeof(SP_DEVINFO_DATA)) - memcpy(DeviceInfoData, info->device, sizeof(SP_DEVINFO_DATA)); + *DeviceInfoData = *info->device; ret = TRUE; } else @@ -2984,7 +2979,7 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW( else DeviceInterfaceDetailData->DevicePath[0] = '\0'; if (DeviceInfoData && DeviceInfoData->cbSize == sizeof(SP_DEVINFO_DATA)) - memcpy(DeviceInfoData, info->device, sizeof(SP_DEVINFO_DATA)); + *DeviceInfoData = *info->device; ret = TRUE; } else diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index a915875..62abc85 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -511,7 +511,7 @@ BOOL WINAPI FileExists(LPCWSTR lpFileName, LPWIN32_FIND_DATAW lpFileFindData) FindClose(hFind); if (lpFileFindData) - memcpy(lpFileFindData, &FindData, sizeof(WIN32_FIND_DATAW)); + *lpFileFindData = FindData; SetErrorMode(uErrorMode); diff --git a/dlls/setupapi/setupx_main.c b/dlls/setupapi/setupx_main.c index 197eac3..606ffb8 100644 --- a/dlls/setupapi/setupx_main.c +++ b/dlls/setupapi/setupx_main.c @@ -476,7 +476,7 @@ RETERR16 WINAPI CtlSetLdd16(LPLOGDISKDESC pldd) HeapFree(heap, 0, pCurrLDD->pszDiskName); } - memcpy(pCurrLDD, pldd, sizeof(LOGDISKDESC_S)); + *pCurrLDD = *pldd; if (pldd->pszPath) { diff --git a/dlls/setupapi/virtcopy.c b/dlls/setupapi/virtcopy.c index 782bb97..b969d1d 100644 --- a/dlls/setupapi/virtcopy.c +++ b/dlls/setupapi/virtcopy.c @@ -250,10 +250,10 @@ static RETERR16 VCP_VirtnodeCreate(const VCPFILESPEC *vfsSrc, const VCPFILESPEC lpvn->cbSize = sizeof(VIRTNODE); if (vfsSrc) - memcpy(&lpvn->vfsSrc, vfsSrc, sizeof(VCPFILESPEC)); + lpvn->vfsSrc = *vfsSrc; if (vfsDst) - memcpy(&lpvn->vfsDst, vfsDst, sizeof(VCPFILESPEC)); + lpvn->vfsDst = *vfsDst; lpvn->fl = fl; lpvn->lParam = lParam;

1 0

Andrew Talbot : secur32: Assign to structs instead of using memcpy.
by Alexandre Julliard 17 Mar '08

17 Mar '08

Module: wine Branch: master Commit: 599f58cc7c96cc42efd99176e218184601073777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=599f58cc7c96cc42efd99176e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 15 23:25:42 2008 +0000 secur32: Assign to structs instead of using memcpy. --- dlls/secur32/secur32.c | 2 +- dlls/secur32/wrapper.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 01e0480..5eb4bcd 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -745,7 +745,7 @@ SECURITY_STATUS WINAPI EnumerateSecurityPackagesW(PULONG pcPackages, { PSecPkgInfoW pkgInfo = *ppPackageInfo + i++; - memcpy(pkgInfo, &package->infoW, sizeof(SecPkgInfoW)); + *pkgInfo = package->infoW; if (package->infoW.Name) { TRACE("Name[%d] = %s\n", i - 1, debugstr_w(package->infoW.Name)); diff --git a/dlls/secur32/wrapper.c b/dlls/secur32/wrapper.c index d51165a..2ab241d 100644 --- a/dlls/secur32/wrapper.c +++ b/dlls/secur32/wrapper.c @@ -45,7 +45,7 @@ static SECURITY_STATUS SECUR32_makeSecHandle(PSecHandle phSec, if (newSec) { - memcpy(newSec, realHandle, sizeof(*realHandle)); + *newSec = *realHandle; phSec->dwUpper = (ULONG_PTR)package; phSec->dwLower = (ULONG_PTR)newSec; ret = SEC_E_OK; @@ -778,7 +778,7 @@ SECURITY_STATUS WINAPI QuerySecurityPackageInfoW(SEC_WCHAR *pszPackageName, PWSTR nextString = (PWSTR)((PBYTE)*ppPackageInfo + sizeof(SecPkgInfoW)); - memcpy(*ppPackageInfo, &package->infoW, sizeof(package->infoW)); + **ppPackageInfo = package->infoW; if (package->infoW.Name) { (*ppPackageInfo)->Name = nextString;

1 0

Jeremy White : winetest: Modified to allow git style versioning (e.g. sha1 id) in the test 'start' lines.
by Alexandre Julliard 17 Mar '08

17 Mar '08

Module: tools Branch: master Commit: f31527596749f902b096eea8bc9339f39f7ab259 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f31527596749f902b096eea8… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Feb 5 10:28:23 2008 -0600 winetest: Modified to allow git style versioning (e.g. sha1 id) in the test 'start' lines. --- winetest/dissect | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 61024cd..6293c1c 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -172,7 +172,7 @@ $lines = 0; while (<IN>) { if (!defined $dll) { # new test next if /^\s*$/; - m[([_.a-z0-9]+):([_a-z0-9]+) start ([/_.a-z0-9]+) (-|[.0-9]+)\r?$] + m[([_.a-z0-9]+):([_a-z0-9]+) start ([/_.a-z0-9]+) (-|[.0-9a-f]+)\r?$] or mydie "no start line:$.: $_"; ($dll,$unit,$source,$rev) = ($1,$2,$3,$4); open OUT, ">:raw", $tmpfile or mydie "unable to open '$tmpfile' for writing: $!\n";

1 0

Jeremy White : winetest: Revise to detect cvs versus git revision ids, and point to the right web tree.
by Alexandre Julliard 17 Mar '08

17 Mar '08

Module: tools Branch: master Commit: 9c4a57c4c0172bb5965e347737b60f7c7c5ff3f8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=9c4a57c4c0172bb5965e3477… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Feb 5 11:33:41 2008 -0600 winetest: Revise to detect cvs versus git revision ids, and point to the right web tree. --- winetest/gather | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/winetest/gather b/winetest/gather index 8208e19..b0e4d7d 100755 --- a/winetest/gather +++ b/winetest/gather @@ -145,8 +145,15 @@ foreach my $file (glob "$datadir/$build/*/summary.txt") { } else { $report->{results}->{$testname} = [$count, $todo, $error, $skipped]; } - $alltests{$testname} = "http://cvs.winehq.org/cvsweb/wine/$source" . ($rev ne "-"?"#rev$rev":"") - unless exists $alltests{$testname}; + if ($rev =~ /\./) { + $alltests{$testname} = "http://cvs.winehq.org/cvsweb/wine/$source" . ($rev ne "-"?"#rev$rev":"") + unless exists $alltests{$testname}; + } + else { + $alltests{$testname} = "http://source.winehq.org/git/wine.git/?a=blob;f=$source;" . + ($rev ne "-" ? "h=$rev;" : "hb=master;") + unless exists $alltests{$testname}; + } if ($count ne "failed") { if (defined $group->{extrema}->{$testname}) { my $extrema = $group->{extrema}->{$testname};

1 0

Francois Gouget : winetest: Add some heuristics to detect missing dlls in version 3 reports.
by Alexandre Julliard 15 Mar '08

15 Mar '08

Module: tools Branch: master Commit: ae814d4f9001d80292ffb3f856a4b66d5bceb0ff URL: http://source.winehq.org/git/tools.git/?a=commit;h=ae814d4f9001d80292ffb3f8… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 14 20:11:04 2008 +0100 winetest: Add some heuristics to detect missing dlls in version 3 reports. --- winetest/dissect | 28 ++++++++++++++++++++++++---- winetest/gather | 10 ++++++++-- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 82a6912..61024cd 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -153,13 +153,17 @@ if ($wine) { } # Dll information is only available in new type reports +my %dllinfo; +chomp; if (/^Dll info:\r?$/) { - open DLLINFO, ">$tmpdir/dllinfo.txt" or mydie "unable to open '$tmpdir/dllinfo.txt' for writing: $!\n"; - while (($_ = <IN>) =~ s/^ //) { print DLLINFO; } - close DLLINFO or mydie "error writing to '$tmpdir/dllinfo.txt': $!\n"; + while ($_ = <IN>) { + chomp; + last if (!/^\s+([^ =]+)=(.*)\r?$/); + $dllinfo{$1}=$2; + } } -/Test output:\r?/ or mydie "no test header: $_"; +/^Test output:/ or mydie "no test header: $_"; my ($dll, $unit, $source, $rev, $result); my ($lines,$total, $todo, $failed, $skipped); $dll = undef; # state machine starts @@ -187,6 +191,14 @@ while (<IN>) { $todo += $3; $failed += $4; print OUT; + } elsif (/^.*$unit.*: Tests skipped: (?:$dll(?:\.dll)? cannot be loaded|$dll(?:\.dll)? not found|Could not load $dll(?:\.dll)?)\r?$/) { + # We find these lines in report version 3 files + $dllinfo{$dll}="dll is missing"; + print OUT; + } elsif (/^.*$unit.*:Could not load $dll/) { + # We find these lines in report version 3 files + $dllinfo{$dll}="dll is missing"; + print OUT; } elsif (/$dll:$unit done $(-?\d+)$\r?$/) { chomp; # current test ended if ($lines==0) { @@ -223,6 +235,14 @@ if (defined $dll) { close SUM or mydie "error writing to '$tmpdir/summary.txt': $!\n"; close IN; +if (%dllinfo) { + open DLLINFO, ">$tmpdir/dllinfo.txt" or mydie "unable to open '$tmpdir/dllinfo.txt' for writing: $!\n"; + foreach my $dll (sort keys %dllinfo) { + print DLLINFO "$dll=$dllinfo{$dll}\n"; + } + close DLLINFO or mydie "error writing to '$tmpdir/dllinfo.txt': $!\n"; +} + my $builddir = "$datadir/$testbuild"; foreach ($datadir, $builddir) { if (!(-d $_ || mkdir $_)) { diff --git a/winetest/gather b/winetest/gather index a84e5be..8208e19 100755 --- a/winetest/gather +++ b/winetest/gather @@ -139,7 +139,12 @@ foreach my $file (glob "$datadir/$build/*/summary.txt") { $report->{dllmissing}->{$dll} = 1; next; } - $report->{results}->{$testname} = [$count, $todo, $error, $skipped]; + if ($count eq "0" and exists $report->{dllmissing}->{$dll}) { + # Mark this test as missing because of a missing dll + $report->{results}->{$testname} = ["dll missing", "-", "-", "-"]; + } else { + $report->{results}->{$testname} = [$count, $todo, $error, $skipped]; + } $alltests{$testname} = "http://cvs.winehq.org/cvsweb/wine/$source" . ($rev ne "-"?"#rev$rev":"") unless exists $alltests{$testname}; if ($count ne "failed") { @@ -309,8 +314,9 @@ sub singletest($$$) { } elsif ($count eq "dll missing") { my ($dll, $unit) = split(/:/, $testname); $dll.=".dll" if ($dll !~ /\./); + my $href=(-r "$datadir/$build/$file") ? "href=\"$file\"" : ""; print OUT <<"EOF"; - <td class="skip_pass"><a + <td class="skip_pass"><a $href title="No tests run as $dll is not present on this system" >n/a</a></td> EOF

1 0

Francois Gouget : winetest: s/$subtest/$unit/ for consistency.
by Alexandre Julliard 15 Mar '08

15 Mar '08

Module: tools Branch: master Commit: 072d86af829edacaa9a14c7c399a260d597dfeca URL: http://source.winehq.org/git/tools.git/?a=commit;h=072d86af829edacaa9a14c7c… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 14 19:55:31 2008 +0100 winetest: s/$subtest/$unit/ for consistency. --- winetest/gather | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/winetest/gather b/winetest/gather index 9f46589..6c006f9 100755 --- a/winetest/gather +++ b/winetest/gather @@ -280,7 +280,7 @@ sub singletest($$$) { my $fail = -r "$datadir/$build/$file"?"<a href=\"$file\">$msg</a>":$msg; print OUT " <td class=\"note\">$fail</td>\n"; } elsif ($count eq "dll missing") { - my ($dll, $subtest) = split(/:/, $testname); + my ($dll, $unit) = split(/:/, $testname); $dll.=".dll" if ($dll !~ /\./); print OUT <<"EOF"; <td class="skip_pass"><a

1 0