May 2007 - Wine-commits - list.winehq.org

Stefan Dösinger : ddraw: Always set fullscreen mode in wined3d.
by Alexandre Julliard 10 May '07

10 May '07

Module: wine Branch: master Commit: df891b823ac6801d7359d7e398d5fa8832607328 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df891b823ac6801d7359d7e39… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 7 18:32:19 2007 +0200 ddraw: Always set fullscreen mode in wined3d. DDSCL_NORMAL is not set at initialization. Instead of making this a & DDSCL_NORMAL || == 0 check just set fullscreen mode always. WineD3D will catch NOP changes anyway. --- dlls/ddraw/ddraw.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 16672f3..dd1b078 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -465,13 +465,9 @@ IDirectDrawImpl_SetCooperativeLevel(IDirectDraw7 *iface, } */ - /* Switch from normal to full screen mode? */ - if(This->cooperative_level & DDSCL_NORMAL) - { - This->cooperative_level &= ~DDSCL_NORMAL; - IWineD3DDevice_SetFullscreen(This->wineD3DDevice, - TRUE); - } + This->cooperative_level &= ~DDSCL_NORMAL; + IWineD3DDevice_SetFullscreen(This->wineD3DDevice, + TRUE); /* Don't override focus windows or private device windows */ if( hwnd &&

1 0

Stefan Dösinger : ddraw: Fix stupid bug when setting surface client memory.
by Alexandre Julliard 10 May '07

10 May '07

Module: wine Branch: master Commit: 1b94a5eefde0871bc4eacd664a54e295c977f9a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b94a5eefde0871bc4eacd664… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 7 19:42:07 2007 +0200 ddraw: Fix stupid bug when setting surface client memory. --- dlls/ddraw/surface.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 220444d..d0c93d7 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2001,12 +2001,6 @@ IDirectDrawSurfaceImpl_SetSurfaceDesc(IDirectDrawSurface7 *iface, if(!DDSD) return DDERR_INVALIDPARAMS; - if (DDSD->dwFlags & DDSD_LPSURFACE && DDSD->lpSurface) - { - ERR("Setting the surface memory isn't supported yet\n"); - return DDERR_INVALIDPARAMS; - - } if (DDSD->dwFlags & DDSD_PIXELFORMAT) { newFormat = PixelFormat_DD2WineD3D(&DDSD->u4.ddpfPixelFormat); @@ -2047,14 +2041,19 @@ IDirectDrawSurfaceImpl_SetSurfaceDesc(IDirectDrawSurface7 *iface, DDCKEY_SRCBLT, (WINEDDCOLORKEY *) &DDSD->ddckCKSrcBlt); } - if (DDSD->dwFlags & DDSD_LPSURFACE) + if (DDSD->dwFlags & DDSD_LPSURFACE && DDSD->lpSurface) { hr = IWineD3DSurface_SetMem(This->WineD3DSurface, DDSD->lpSurface); if(hr != WINED3D_OK) { /* No need for a trace here, wined3d does that for us */ - return hr; + switch(hr) + { + case WINED3DERR_INVALIDCALL: return DDERR_INVALIDPARAMS; + default: break; /* Go on */ + } } + } This->surface_desc = *DDSD;

1 0

Stefan Dösinger : wined3d: Manage private data in a wine linked list.
by Alexandre Julliard 10 May '07

10 May '07

Module: wine Branch: master Commit: d08585e6ecaffa956ad937718191d6bb27c6f5dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d08585e6ecaffa956ad937718… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 7 20:46:24 2007 +0200 wined3d: Manage private data in a wine linked list. --- dlls/wined3d/device.c | 1 + dlls/wined3d/resource.c | 96 +++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 7 +-- 3 files changed, 55 insertions(+), 49 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9a419f0..16df8a5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -109,6 +109,7 @@ static void WINAPI IWineD3DDeviceImpl_AddResource(IWineD3DDevice *iface, IWineD3 object->resource.format = Format; \ object->resource.usage = Usage; \ object->resource.size = _size; \ + list_init(&object->resource.privateData); \ /* Check that we have enough video ram left */ \ if (Pool == WINED3DPOOL_DEFAULT) { \ if (IWineD3DDevice_GetAvailableTextureMem(iface) <= _size) { \ diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index a463d82..d99adb2 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -88,58 +88,66 @@ HRESULT WINAPI IWineD3DResourceImpl_GetDevice(IWineD3DResource *iface, IWineD3DD return WINED3D_OK; } -static PrivateData** IWineD3DResourceImpl_FindPrivateData(IWineD3DResourceImpl *This, +static PrivateData* IWineD3DResourceImpl_FindPrivateData(IWineD3DResourceImpl *This, REFGUID tag) { - PrivateData** data; - for (data = &This->resource.privateData; *data != NULL; data = &(*data)->next) + PrivateData *data; + struct list *entry; + + TRACE("Searching for private data %s\n", debugstr_guid(tag)); + LIST_FOR_EACH(entry, &This->resource.privateData) { - if (IsEqualGUID(&(*data)->tag, tag)) break; + data = LIST_ENTRY(entry, PrivateData, entry); + if (IsEqualGUID(&data->tag, tag)) { + TRACE("Found %p\n", data); + return data; + } } - return data; + TRACE("Not found\n"); + return NULL; } HRESULT WINAPI IWineD3DResourceImpl_SetPrivateData(IWineD3DResource *iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; - PrivateData **data; + PrivateData *data; - TRACE("(%p) : %p %p %d %d\n", This, refguid, pData, SizeOfData, Flags); + TRACE("(%p) : %s %p %d %d\n", This, debugstr_guid(refguid), pData, SizeOfData, Flags); data = IWineD3DResourceImpl_FindPrivateData(This, refguid); - if (*data == NULL) + if (data == NULL) { - *data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**data)); - if (NULL == *data) return E_OUTOFMEMORY; + data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)); + if (NULL == data) return E_OUTOFMEMORY; - (*data)->tag = *refguid; - (*data)->flags = Flags; + data->tag = *refguid; + data->flags = Flags; #if 0 (*data)->uniquenessValue = This->uniquenessValue; #endif if (Flags & WINED3DSPD_IUNKNOWN) { - (*data)->ptr.object = (LPUNKNOWN)pData; - (*data)->size = sizeof(LPUNKNOWN); - IUnknown_AddRef((*data)->ptr.object); + data->ptr.object = (LPUNKNOWN)pData; + data->size = sizeof(LPUNKNOWN); + IUnknown_AddRef(data->ptr.object); } else { - (*data)->ptr.data = HeapAlloc(GetProcessHeap(), 0, SizeOfData); - if (NULL == (*data)->ptr.data) { - HeapFree(GetProcessHeap(), 0, *data); + data->ptr.data = HeapAlloc(GetProcessHeap(), 0, SizeOfData); + if (NULL == data->ptr.data) { + HeapFree(GetProcessHeap(), 0, data); return E_OUTOFMEMORY; } - (*data)->size = SizeOfData; - memcpy((*data)->ptr.data, pData, SizeOfData); + data->size = SizeOfData; + memcpy(data->ptr.data, pData, SizeOfData); } - /* link it in */ - (*data)->next = This->resource.privateData; - This->resource.privateData = *data; + list_add_tail(&This->resource.privateData, &data->entry); return WINED3D_OK; } else { /* I don't actually know how windows handles this case. The only - * reason I don't just call FreePrivateData is because I want to - * guarantee SetPrivateData working when using LPUNKNOWN or data - * that is no larger than the old data. */ + * reason I don't just call FreePrivateData is because I want to + * guarantee SetPrivateData working when using LPUNKNOWN or data + * that is no larger than the old data. + */ + FIXME("Handle overwriting private data in SetPrivateData\n"); return E_FAIL; } @@ -149,11 +157,11 @@ HRESULT WINAPI IWineD3DResourceImpl_SetPrivateData(IWineD3DResource *iface, REFG HRESULT WINAPI IWineD3DResourceImpl_GetPrivateData(IWineD3DResource *iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; - PrivateData **data; + PrivateData *data; TRACE("(%p) : %p %p %p\n", This, refguid, pData, pSizeOfData); data = IWineD3DResourceImpl_FindPrivateData(This, refguid); - if (*data == NULL) return WINED3DERR_NOTFOUND; + if (data == NULL) return WINED3DERR_NOTFOUND; #if 0 /* This may not be right. */ @@ -161,41 +169,39 @@ HRESULT WINAPI IWineD3DResourceImpl_GetPrivateData(IWineD3DResource *iface, REFG && (*data)->uniquenessValue != This->uniquenessValue) return DDERR_EXPIRED; #endif - if (*pSizeOfData < (*data)->size) { - *pSizeOfData = (*data)->size; + if (*pSizeOfData < data->size) { + *pSizeOfData = data->size; return WINED3DERR_MOREDATA; } - if ((*data)->flags & WINED3DSPD_IUNKNOWN) { - *(LPUNKNOWN *)pData = (*data)->ptr.object; - IUnknown_AddRef((*data)->ptr.object); + if (data->flags & WINED3DSPD_IUNKNOWN) { + *(LPUNKNOWN *)pData = data->ptr.object; + IUnknown_AddRef(data->ptr.object); } else { - memcpy(pData, (*data)->ptr.data, (*data)->size); + memcpy(pData, data->ptr.data, data->size); } return WINED3D_OK; } HRESULT WINAPI IWineD3DResourceImpl_FreePrivateData(IWineD3DResource *iface, REFGUID refguid) { IWineD3DResourceImpl *This = (IWineD3DResourceImpl *)iface; - PrivateData **data; + PrivateData *data; - TRACE("(%p) : %p\n", This, refguid); - /* TODO: move this code off into a linked list class */ + TRACE("(%p) : %s\n", This, debugstr_guid(refguid)); data = IWineD3DResourceImpl_FindPrivateData(This, refguid); - if (*data == NULL) return WINED3DERR_NOTFOUND; - - *data = (*data)->next; + if (data == NULL) return WINED3DERR_NOTFOUND; - if ((*data)->flags & WINED3DSPD_IUNKNOWN) + if (data->flags & WINED3DSPD_IUNKNOWN) { - if ((*data)->ptr.object != NULL) - IUnknown_Release((*data)->ptr.object); + if (data->ptr.object != NULL) + IUnknown_Release(data->ptr.object); } else { - HeapFree(GetProcessHeap(), 0, (*data)->ptr.data); + HeapFree(GetProcessHeap(), 0, data->ptr.data); } + list_remove(&data->entry); - HeapFree(GetProcessHeap(), 0, *data); + HeapFree(GetProcessHeap(), 0, data); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ce2dae3..c7a9744 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -741,11 +741,10 @@ static inline BOOL isStateDirty(WineD3DContext *context, DWORD state) { return context->isStateDirty[idx] & (1 << shift); } -/* Support for IWineD3DResource ::Set/Get/FreePrivateData. I don't think - * anybody uses it for much so a good implementation is optional. */ +/* Support for IWineD3DResource ::Set/Get/FreePrivateData. */ typedef struct PrivateData { - struct PrivateData* next; + struct list entry; GUID tag; DWORD flags; /* DDSPD_* */ @@ -777,7 +776,7 @@ typedef struct IWineD3DResourceClass DWORD usage; WINED3DFORMAT format; BYTE *allocatedMemory; - PrivateData *privateData; + struct list privateData; } IWineD3DResourceClass;

1 0

Misha Koshelev : msi/tests: automation: Add more tests for Installer:: RegistryValue.
by Alexandre Julliard 10 May '07

10 May '07

Module: wine Branch: master Commit: 2b7d8cb9d560848cf8e4ae7eb6181f84962ba495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b7d8cb9d560848cf8e4ae7eb… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Wed May 9 07:56:44 2007 -0500 msi/tests: automation: Add more tests for Installer::RegistryValue. Add test for a new error condition and tests for returning data from values of different registry value types. --- dlls/msi/tests/automation.c | 133 +++++++++++++++++++++++++++++++------------ 1 files changed, 96 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b7d8cb9d560848cf8e4a…

1 0

Thomas Spear : regedit: Spelling and grammar fixes.
by Alexandre Julliard 10 May '07

10 May '07

Module: wine Branch: master Commit: abf204cd3c992c81cf8982f294d48417d405e3af URL: http://source.winehq.org/git/wine.git/?a=commit;h=abf204cd3c992c81cf8982f29… Author: Thomas Spear <Speeddymon(a)gmail.com> Date: Wed May 9 11:18:29 2007 -0500 regedit: Spelling and grammar fixes. --- programs/regedit/regedit.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 1ede60f..116be3d 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -32,15 +32,15 @@ static const char *usage = "filename - registry file name\n" "regpath - name of the registry key\n" "\n" - "When is called without any switches adds contents of the specified\n" - "registry file to the registry\n" + "When regedit is called without any switches, it adds the contents of the\n" + "specified registry file to the registry\n" "\n" "Switches:\n" " /E - exports contents of the specified registry key to the specified\n" " file. Exports the whole registry if no key is specified.\n" " /D - deletes specified registry key\n" " /S - silent execution, can be used with any other switch.\n" - " The only existing mode, exists for compatibility with Windows regedit.\n" + " Default. The only existing mode, exists for compatibility with Windows regedit.\n" " /V - advanced mode, can be used with any other switch.\n" " Ignored, exists for compatibility with Windows regedit.\n" " /L - location of system.dat file. Can be used with any other switch.\n" @@ -48,7 +48,7 @@ static const char *usage = " /R - location of user.dat file. Can be used with any other switch.\n" " Ignored. Exists for compatibility with Windows regedit.\n" " /? - print this help. Any other switches are ignored.\n" - " /C - create registry from. Not implemented.\n" + " /C - create registry from file. Not implemented.\n" "\n" "The switches are case-insensitive, can be prefixed either by '-' or '/'.\n" "This program is command-line compatible with Microsoft Windows\n" @@ -73,7 +73,7 @@ static void error_unknown_switch(char chu, char *s) fprintf(stderr,"%s: Undefined switch /%c!\n", getAppName(), chu); } else { fprintf(stderr,"%s: Alphabetic character is expected after '%c' " - "in swit ch specification\n", getAppName(), *(s - 1)); + "in switch specification\n", getAppName(), *(s - 1)); } exit(1); } @@ -161,7 +161,7 @@ BOOL PerformRegAction(REGEDIT_ACTION action, LPSTR s) get_file_name(&s, filename); if (!filename[0]) { - fprintf(stderr,"%s: No file name is specified\n", getAppName()); + fprintf(stderr,"%s: No file name was specified\n", getAppName()); fprintf(stderr,usage); exit(1); } @@ -203,7 +203,7 @@ BOOL PerformRegAction(REGEDIT_ACTION action, LPSTR s) get_file_name(&s, reg_key_name); if (!reg_key_name[0]) { - fprintf(stderr,"%s: No registry key is specified for removal\n", + fprintf(stderr,"%s: No registry key was specified for removal\n", getAppName()); fprintf(stderr,usage); exit(1); @@ -217,7 +217,7 @@ BOOL PerformRegAction(REGEDIT_ACTION action, LPSTR s) filename[0] = '\0'; get_file_name(&s, filename); if (!filename[0]) { - fprintf(stderr,"%s: No file name is specified\n", getAppName()); + fprintf(stderr,"%s: No file name was specified\n", getAppName()); fprintf(stderr,usage); exit(1); }

1 0

Stefan Dösinger : ddraw: Some caps fixes.
by Alexandre Julliard 10 May '07

10 May '07

Module: wine Branch: master Commit: d9fef10b71b9add27cfaeffa6d7e3ab42342bba7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9fef10b71b9add27cfaeffa6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 9 11:49:27 2007 +0200 ddraw: Some caps fixes. Cards at DirectX7 times did not support non power of 2 textures, and some games check the capatiblity flags incorrectly. Rollcage expects the D3DPTEXTURECAPS_POW2 (limitation) flag set and fails with the reference rasterizer which support NP2 textures and doesn't have the cap set. --- dlls/ddraw/direct3d.c | 25 +++++++- dlls/ddraw/tests/d3d.c | 155 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 174 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d9fef10b71b9add27cfae…

1 0

Eric Pouech : kernel32: Set the new definition for an activation context, and implement adding/releasing references to it.
by Alexandre Julliard 09 May '07

09 May '07

Module: wine Branch: master Commit: fe3869388ab2e7dadd091ccc7878ba9bafb5dc3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe3869388ab2e7dadd091ccc7… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon May 7 21:49:47 2007 +0200 kernel32: Set the new definition for an activation context, and implement adding/releasing references to it. --- dlls/kernel32/actctx.c | 71 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 62 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/actctx.c b/dlls/kernel32/actctx.c index fbf50d0..06bc8e5 100644 --- a/dlls/kernel32/actctx.c +++ b/dlls/kernel32/actctx.c @@ -46,6 +46,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(actctx); #define ACTCTX_FAKE_HANDLE ((HANDLE) 0xf00baa) #define ACTCTX_FAKE_COOKIE ((ULONG_PTR) 0xf00bad) +#define ACTCTX_MAGIC 0xC07E3E11 + +struct actctx +{ + ULONG magic; + LONG ref_count; +}; + /*********************************************************************** * CreateActCtxA (KERNEL32.@) * @@ -130,15 +138,44 @@ done: */ HANDLE WINAPI CreateActCtxW(PCACTCTXW pActCtx) { - FIXME("%p %08x\n", pActCtx, pActCtx ? pActCtx->dwFlags : 0); + struct actctx* actctx; + DWORD ret = ERROR_SUCCESS; - if (!pActCtx) - return INVALID_HANDLE_VALUE; - if (pActCtx->cbSize != sizeof *pActCtx) - return INVALID_HANDLE_VALUE; - if (pActCtx->dwFlags & ~ACTCTX_FLAGS_ALL) + TRACE("%p %08x\n", pActCtx, pActCtx ? pActCtx->dwFlags : 0); + + if (!pActCtx || pActCtx->cbSize != sizeof(*pActCtx) || + (pActCtx->dwFlags & ~ACTCTX_FLAGS_ALL)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return INVALID_HANDLE_VALUE; + } + actctx = HeapAlloc(GetProcessHeap(), 0, sizeof(*actctx)); + if (!actctx) return INVALID_HANDLE_VALUE; + + actctx->magic = ACTCTX_MAGIC; + actctx->ref_count = 1; + + if (ret == ERROR_SUCCESS) + { + return (HANDLE)actctx; + } + + ReleaseActCtx((HANDLE)actctx); + SetLastError(ret); return INVALID_HANDLE_VALUE; - return ACTCTX_FAKE_HANDLE; +} + +static struct actctx* check_actctx(HANDLE h) +{ + struct actctx* actctx = (struct actctx*)h; + + switch (actctx->magic) + { + case ACTCTX_MAGIC: return actctx; + default: + SetLastError(ERROR_INVALID_HANDLE); + return NULL; + } } /*********************************************************************** @@ -204,7 +241,12 @@ BOOL WINAPI GetCurrentActCtx(HANDLE* phActCtx) */ void WINAPI AddRefActCtx(HANDLE hActCtx) { - FIXME("%p\n", hActCtx); + struct actctx* actctx; + + TRACE("%p\n", hActCtx); + + if ((actctx = check_actctx(hActCtx))) + InterlockedIncrement( &actctx->ref_count ); } /*********************************************************************** @@ -214,7 +256,18 @@ void WINAPI AddRefActCtx(HANDLE hActCtx) */ void WINAPI ReleaseActCtx(HANDLE hActCtx) { - FIXME("%p\n", hActCtx); + struct actctx* actctx; + + TRACE("%p\n", hActCtx); + + if ((actctx = check_actctx(hActCtx))) + { + if (!InterlockedDecrement( &actctx->ref_count )) + { + actctx->magic = 0; + HeapFree(GetProcessHeap(), 0, actctx); + } + } } /***********************************************************************

1 0

Stefan Dösinger : wined3d: Implement environment bump mapping with GL_ATI_envmap_bumpmap.
by Alexandre Julliard 09 May '07

09 May '07

Module: wine Branch: master Commit: 28170f04747a396a4ca419c1f646212dab923627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28170f04747a396a4ca419c1f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 4 14:28:09 2007 +0200 wined3d: Implement environment bump mapping with GL_ATI_envmap_bumpmap. --- dlls/ddraw/device.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/wined3d/directx.c | 27 ++++++++++++++++++++++----- dlls/wined3d/state.c | 13 +++++++++++++ dlls/wined3d/utils.c | 40 ++++++++++++++++++++++++++++++++++++++++ include/wine/wined3d_gl.h | 8 ++++---- 5 files changed, 116 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 63b06e8..de3c9db 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1119,6 +1119,16 @@ IDirect3DDeviceImpl_7_EnumTextureFormats(IDirect3DDevice7 *iface, WINED3DFMT_DXT5, }; + WINED3DFORMAT BumpFormatList[] = { + WINED3DFMT_V8U8, + WINED3DFMT_L6V5U5, + WINED3DFMT_X8L8V8U8, + WINED3DFMT_Q8W8V8U8, + WINED3DFMT_V16U16, + WINED3DFMT_W11V11U10, + WINED3DFMT_A2W10V10U10 + }; + TRACE("(%p)->(%p,%p): Relay\n", This, Callback, Arg); if(!Callback) @@ -1150,6 +1160,33 @@ IDirect3DDeviceImpl_7_EnumTextureFormats(IDirect3DDevice7 *iface, } } } + + for(i = 0; i < sizeof(BumpFormatList) / sizeof(WINED3DFORMAT); i++) + { + hr = IWineD3D_CheckDeviceFormat(This->ddraw->wineD3D, + 0 /* Adapter */, + 0 /* DeviceType */, + 0 /* AdapterFormat */, + WINED3DUSAGE_QUERY_LEGACYBUMPMAP, + 0 /* ResourceType */, + BumpFormatList[i]); + if(hr == D3D_OK) + { + DDPIXELFORMAT pformat; + + memset(&pformat, 0, sizeof(pformat)); + pformat.dwSize = sizeof(pformat); + PixelFormat_WineD3DtoDD(&pformat, BumpFormatList[i]); + + TRACE("Enumerating WineD3DFormat %d\n", BumpFormatList[i]); + hr = Callback(&pformat, Arg); + if(hr != DDENUMRET_OK) + { + TRACE("Format enumeration cancelled by application\n"); + return D3D_OK; + } + } + } TRACE("End of enumeration\n"); return D3D_OK; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 60e3694..ccca582 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1679,6 +1679,20 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt TRACE_(d3d_caps)("[FAILED]\n"); return WINED3DERR_NOTAVAILABLE; } + } else if(Usage & WINED3DUSAGE_QUERY_LEGACYBUMPMAP) { + if(GL_SUPPORT(ATI_ENVMAP_BUMPMAP)) { + switch (CheckFormat) { + case WINED3DFMT_V8U8: + TRACE_(d3d_caps)("[OK]\n"); + return WINED3D_OK; + default: + TRACE_(d3d_caps)("[FAILED]\n"); + return WINED3DERR_NOTAVAILABLE; + } + /* TODO: GL_NV_TEXTURE_SHADER */ + } + TRACE_(d3d_caps)("[FAILED]\n"); + return WINED3DERR_NOTAVAILABLE; } if (GL_SUPPORT(EXT_TEXTURE_COMPRESSION_S3TC)) { @@ -2209,12 +2223,15 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, WINED3DTEXOPCAPS_MODULATEINVCOLOR_ADDALPHA; } - + if(GL_SUPPORT(ATI_ENVMAP_BUMPMAP)) { + *pCaps->TextureOpCaps |= WINED3DTEXOPCAPS_BUMPENVMAP; + } else if(GL_SUPPORT(NV_TEXTURE_SHADER)) { + /* TODO: environment bump mapping support with GL_NV_texture_shader */ + } #if 0 - *pCaps->TextureOpCaps |= WINED3DTEXOPCAPS_BUMPENVMAP; - /* FIXME: Add - WINED3DTEXOPCAPS_BUMPENVMAPLUMINANCE - WINED3DTEXOPCAPS_PREMODULATE */ + /* FIXME: Add + *pCaps->TextureOpCaps |= WINED3DTEXOPCAPS_BUMPENVMAPLUMINANCE + WINED3DTEXOPCAPS_PREMODULATE */ #endif *pCaps->MaxTextureBlendStages = GL_LIMITS(texture_stages); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e0c5fbf..1b5115c 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2164,6 +2164,19 @@ static void tex_bumpenvmat(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine shaderconstant(STATE_PIXELSHADERCONSTANT, stateblock, context); } } + + if(GL_SUPPORT(ATI_ENVMAP_BUMPMAP)) { + if(stage >= GL_LIMITS(texture_stages)) { + WARN("Bump env matrix of unsupported stage set\n"); + } else if(GL_SUPPORT(ARB_MULTITEXTURE)) { + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + stage)); + checkGLcall("GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + stage))"); + } + GL_EXTCALL(glTexBumpParameterfvATI(GL_BUMP_ROT_MATRIX_ATI, + (float *) &(stateblock->textureState[stage][WINED3DTSS_BUMPENVMAT00]))); + checkGLcall("glTexBumpParameterfvATI"); + } + /* TODO: GL_NV_texture_shader */ } static void transform_world(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9ab4e76..e71b49b 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2168,6 +2168,46 @@ void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, WINED3DTEXTUREOP } else Handled = FALSE; break; + case WINED3DTOP_BUMPENVMAPLUMINANCE: + if(GL_SUPPORT(ATI_ENVMAP_BUMPMAP)) { + /* Some apps use BUMPENVMAPLUMINANCE instead of D3DTOP_BUMPENVMAP, although + * they check for the non-luminance cap flag. Well, give them what they asked + * for :-) + */ + WARN("Application uses WINED3DTOP_BUMPENVMAPLUMINANCE\n"); + } else { + Handled = FALSE; + break; + } + /* Fall through */ + case WINED3DTOP_BUMPENVMAP: + if(GL_SUPPORT(ATI_ENVMAP_BUMPMAP)) { + TRACE("Using ati bumpmap on stage %d, target %d\n", Stage, Stage + 1); + glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_BUMP_ENVMAP_ATI); + checkGLcall("glTexEnvi(GL_TEXTURE_ENV, comb_target, GL_BUMP_ENVMAP_ATI)"); + glTexEnvi(GL_TEXTURE_ENV, GL_BUMP_TARGET_ATI, GL_TEXTURE0_ARB + Stage + 1); + checkGLcall("glTexEnvi(GL_TEXTURE_ENV, GL_BUMP_TARGET_ATI, GL_TEXTURE0_ARB + Stage + 1)"); + glTexEnvi(GL_TEXTURE_ENV, src0_target, src3); + checkGLcall("GL_TEXTURE_ENV, src0_target, src3"); + glTexEnvi(GL_TEXTURE_ENV, opr0_target, opr3); + checkGLcall("GL_TEXTURE_ENV, opr0_target, opr3"); + glTexEnvi(GL_TEXTURE_ENV, src1_target, src1); + checkGLcall("GL_TEXTURE_ENV, src0_target, src1"); + glTexEnvi(GL_TEXTURE_ENV, opr1_target, opr1); + checkGLcall("GL_TEXTURE_ENV, opr1_target, opr1"); + glTexEnvi(GL_TEXTURE_ENV, src2_target, src2); + checkGLcall("GL_TEXTURE_ENV, src0_target, src1"); + glTexEnvi(GL_TEXTURE_ENV, opr2_target, opr2); + checkGLcall("GL_TEXTURE_ENV, opr2_target, opr2"); + + Handled = TRUE; + } else { + /* If GL_NV_TEXTURE_SHADER is supported insted the GL_NV_register_combiner path + * will be taken instead + */ + Handled = FALSE; + } + break; default: Handled = FALSE; } diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index c325539..b8a0715 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -1192,10 +1192,10 @@ typedef void (APIENTRY * PGLFNFINISHOBJECTAPPLEPROC) (GLenum, GLuint); #define GL_BUMP_ENVMAP_ATI 0x877B #define GL_BUMP_TARGET_ATI 0x877C #endif -typedef void (APIENTRY * PGLFNTEXBUMPPARAMETERIVATIPROC) (GLenum, GLuint); -typedef void (APIENTRY * PGLFNTEXBUMPPARAMETERFVATIPROC) (GLenum, GLuint); -typedef void (APIENTRY * PGLFNGETTEXBUMPPARAMETERIVATIPROC) (GLenum, GLuint); -typedef void (APIENTRY * PGLFNGETTEXBUMPPARAMETERFVATIPROC) (GLenum, GLuint); +typedef void (APIENTRY * PGLFNTEXBUMPPARAMETERIVATIPROC) (GLenum, GLint *); +typedef void (APIENTRY * PGLFNTEXBUMPPARAMETERFVATIPROC) (GLenum, GLfloat *); +typedef void (APIENTRY * PGLFNGETTEXBUMPPARAMETERIVATIPROC) (GLenum, GLint *); +typedef void (APIENTRY * PGLFNGETTEXBUMPPARAMETERFVATIPROC) (GLenum, GLfloat *); /* GL_VERSION_2_0 */ #ifndef GL_VERSION_2_0

1 0

Stefan Dösinger : ddraw: More tests and fixes on surface attachments.
by Alexandre Julliard 09 May '07

09 May '07

Module: wine Branch: master Commit: bed50115eeba9ddce7003455ac805cbb698e2375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bed50115eeba9ddce7003455a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 4 18:31:14 2007 +0200 ddraw: More tests and fixes on surface attachments. --- dlls/ddraw/ddraw.c | 16 ++- dlls/ddraw/ddraw_private.h | 2 + dlls/ddraw/ddraw_thunks.c | 4 + dlls/ddraw/surface.c | 71 ++++++------ dlls/ddraw/surface_thunks.c | 40 ++++++- dlls/ddraw/tests/dsurface.c | 256 ++++++++++++++++++++++++++++++++++++++++++- 6 files changed, 344 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bed50115eeba9ddce7003…

1 0

Stefan Dösinger : wined3d: Some more ProcessVertices fixes.
by Alexandre Julliard 09 May '07

09 May '07

Module: wine Branch: master Commit: ca52d34189e06555bf966024b4492f8a8e914f3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca52d34189e06555bf966024b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun May 6 18:39:29 2007 +0200 wined3d: Some more ProcessVertices fixes. Remove vbos from the input strided data from the fixed function attributes explicitly and avoid writing beyond the end of a temporary buffer when cloning a windows bug. --- dlls/wined3d/device.c | 57 ++++++++++++++++++++++++++++++++---------------- 1 files changed, 38 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1bf959f..9a419f0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3537,7 +3537,13 @@ process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCo } if(dest->vbo) { - dest_conv_addr = HeapAlloc(GetProcessHeap(), 0, dwCount * get_flexible_vertex_size(DestFVF)); + unsigned char extrabytes = 0; + /* If the destination vertex buffer has D3DFVF_XYZ position(non-rhw), native d3d writes RHW position, where the RHW + * gets written into the 4 bytes after the Z position. In the case of a dest buffer that only has D3DFVF_XYZ data, + * this may write 4 extra bytes beyond the area that should be written + */ + if(DestFVF == WINED3DFVF_XYZ) extrabytes = 4; + dest_conv_addr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwCount * get_flexible_vertex_size(DestFVF) + extrabytes); if(!dest_conv_addr) { ERR("Out of memory\n"); /* Continue without storing converted vertices */ @@ -3871,25 +3877,38 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ProcessVertices(IWineD3DDevice *iface, * * Also get the start index in, but only loop over all elements if there's something to add at all. */ - for(i=0; i < 16; i++) { - if(strided.u.input[i].VBO) { - IWineD3DVertexBufferImpl *vb = (IWineD3DVertexBufferImpl *) This->stateBlock->streamSource[strided.u.input[i].streamNo]; - - /* The vertex buffer is supposed to have a system memory copy */ - strided.u.input[i].VBO = 0; - strided.u.input[i].lpData = (BYTE *) ((unsigned long) strided.u.input[i].lpData + (unsigned long) vb->resource.allocatedMemory); - ENTER_GL(); - GL_EXTCALL(glDeleteBuffersARB(1, &vb->vbo)); - vb->vbo = 0; - LEAVE_GL(); - - /* To be safe. An app could technically draw, then call ProcessVertices, then draw again without ever changing the stream sources */ - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_STREAMSRC); - } - if(strided.u.input[i].lpData) { - strided.u.input[i].lpData += strided.u.input[i].dwStride * SrcStartIndex; - } +#define FIXSRC(type) \ + if(strided.u.s.type.VBO) { \ + IWineD3DVertexBufferImpl *vb = (IWineD3DVertexBufferImpl *) This->stateBlock->streamSource[strided.u.s.type.streamNo]; \ + strided.u.s.type.VBO = 0; \ + strided.u.s.type.lpData = (BYTE *) ((unsigned long) strided.u.s.type.lpData + (unsigned long) vb->resource.allocatedMemory); \ + ENTER_GL(); \ + GL_EXTCALL(glDeleteBuffersARB(1, &vb->vbo)); \ + vb->vbo = 0; \ + LEAVE_GL(); \ + } \ + if(strided.u.s.type.lpData) { \ + strided.u.s.type.lpData += strided.u.s.type.dwStride * SrcStartIndex; \ + } + FIXSRC(position); + FIXSRC(blendWeights); + FIXSRC(blendMatrixIndices); + FIXSRC(normal); + FIXSRC(pSize); + FIXSRC(diffuse); + FIXSRC(specular); + for(i = 0; i < WINED3DDP_MAXTEXCOORD; i++) { + FIXSRC(texCoords[i]); } + FIXSRC(position2); + FIXSRC(normal2); + FIXSRC(tangent); + FIXSRC(binormal); + FIXSRC(tessFactor); + FIXSRC(fog); + FIXSRC(depth); + FIXSRC(sample); +#undef FIXSRC } return process_vertices_strided(This, DestIndex, VertexCount, &strided, (IWineD3DVertexBufferImpl *) pDestBuffer, Flags);

1 0