April 2011 - Wine-Commits - list.winehq.org

André Hentschel : ntdll: Remove Alpha support.
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: 6f9d1840efd814e372e689d8e2be09704baec77d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f9d1840efd814e372e689d8e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 19 19:26:57 2011 +0200 ntdll: Remove Alpha support. --- dlls/ntdll/nt.c | 2 -- dlls/ntdll/server.c | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index ef5f703..316e9f6 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -929,8 +929,6 @@ void fill_cpu_info(void) cached_sci.Architecture = PROCESSOR_ARCHITECTURE_PPC; #elif defined(__arm__) cached_sci.Architecture = PROCESSOR_ARCHITECTURE_ARM; -#elif defined(__ALPHA__) - cached_sci.Architecture = PROCESSOR_ARCHITECTURE_ALPHA; #elif defined(__sparc__) cached_sci.Architecture = PROCESSOR_ARCHITECTURE_SPARC; #else diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 2d88f10..3243f9f 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -90,8 +90,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(server); static const enum cpu_type client_cpu = CPU_x86; #elif defined(__x86_64__) static const enum cpu_type client_cpu = CPU_x86_64; -#elif defined(__ALPHA__) -static const enum cpu_type client_cpu = CPU_ALPHA; #elif defined(__powerpc__) static const enum cpu_type client_cpu = CPU_POWERPC; #elif defined(__sparc__)

1 0

Damjan Jovanovic : mmsystem: Improve 16 bit mapping for MCI_WHERE/PUT/ FREEZE/UNFREEZE.
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: 0e3204389ef1e3f00c5c67ba89c8927487155d4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e3204389ef1e3f00c5c67ba8… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Apr 19 22:55:44 2011 +0200 mmsystem: Improve 16 bit mapping for MCI_WHERE/PUT/FREEZE/UNFREEZE. --- dlls/mmsystem.dll16/mci16.c | 45 +++++++++++++++++++++++++++++++++++------- 1 files changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/mmsystem.dll16/mci16.c b/dlls/mmsystem.dll16/mci16.c index 80be9ef..2e90bbf 100644 --- a/dlls/mmsystem.dll16/mci16.c +++ b/dlls/mmsystem.dll16/mci16.c @@ -148,7 +148,6 @@ static MMSYSTEM_MapType MCI_MapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR* l case MCI_CUE: case MCI_CUT: case MCI_DELETE: - case MCI_FREEZE: case MCI_GETDEVCAPS: /* case MCI_INDEX: */ /* case MCI_MARK: */ @@ -156,7 +155,6 @@ static MMSYSTEM_MapType MCI_MapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR* l case MCI_PASTE: case MCI_PAUSE: case MCI_PLAY: - case MCI_PUT: case MCI_REALIZE: case MCI_RECORD: case MCI_RESUME: @@ -169,11 +167,31 @@ static MMSYSTEM_MapType MCI_MapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR* l case MCI_STEP: case MCI_STOP: /* case MCI_UNDO: */ - case MCI_UNFREEZE: case MCI_UPDATE: - case MCI_WHERE: *lParam = (DWORD)MapSL(*lParam); return MMSYSTEM_MAP_OK; + case MCI_WHERE: + case MCI_FREEZE: + case MCI_UNFREEZE: + case MCI_PUT: + { + LPMCI_DGV_RECT_PARMS mdrp32 = HeapAlloc(GetProcessHeap(), 0, + sizeof(LPMCI_DGV_RECT_PARMS16) + sizeof(MCI_DGV_RECT_PARMS)); + LPMCI_DGV_RECT_PARMS16 mdrp16 = MapSL(*lParam); + if (mdrp32) { + *(LPMCI_DGV_RECT_PARMS16*)(mdrp32) = mdrp16; + mdrp32 = (LPMCI_DGV_RECT_PARMS)((char*)mdrp32 + sizeof(LPMCI_DGV_RECT_PARMS16)); + mdrp32->dwCallback = mdrp16->dwCallback; + mdrp32->rc.left = mdrp16->rc.left; + mdrp32->rc.top = mdrp16->rc.top; + mdrp32->rc.right = mdrp16->rc.right; + mdrp32->rc.bottom = mdrp16->rc.bottom; + } else { + return MMSYSTEM_MAP_NOMEM; + } + *lParam = (DWORD)mdrp32; + } + return MMSYSTEM_MAP_OKMEM; case MCI_WINDOW: /* in fact, I would also need the dwFlags... to see * which members of lParam are effectively used @@ -343,7 +361,6 @@ static MMSYSTEM_MapType MCI_UnMapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR case MCI_CUE: case MCI_CUT: case MCI_DELETE: - case MCI_FREEZE: case MCI_GETDEVCAPS: /* case MCI_INDEX: */ /* case MCI_MARK: */ @@ -351,7 +368,6 @@ static MMSYSTEM_MapType MCI_UnMapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR case MCI_PASTE: case MCI_PAUSE: case MCI_PLAY: - case MCI_PUT: case MCI_REALIZE: case MCI_RECORD: case MCI_RESUME: @@ -364,11 +380,24 @@ static MMSYSTEM_MapType MCI_UnMapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR case MCI_STEP: case MCI_STOP: /* case MCI_UNDO: */ - case MCI_UNFREEZE: case MCI_UPDATE: - case MCI_WHERE: return MMSYSTEM_MAP_OK; + case MCI_WHERE: + case MCI_FREEZE: + case MCI_UNFREEZE: + case MCI_PUT: + if (lParam) { + LPMCI_DGV_RECT_PARMS16 mdrp16 = (LPMCI_DGV_RECT_PARMS16)lParam; + LPMCI_DGV_RECT_PARMS mdrp32 = (LPMCI_DGV_RECT_PARMS)((char*)lParam + sizeof(LPMCI_DGV_RECT_PARMS16)); + mdrp16->dwCallback = mdrp32->dwCallback; + mdrp16->rc.left = mdrp32->rc.left; + mdrp16->rc.top = mdrp32->rc.top; + mdrp16->rc.right = mdrp32->rc.right; + mdrp16->rc.bottom = mdrp32->rc.bottom; + HeapFree(GetProcessHeap(), 0, (LPVOID)lParam); + } + return MMSYSTEM_MAP_OK; case MCI_WINDOW: /* FIXME ?? see Map function */ return MMSYSTEM_MAP_OK;

1 0

Henri Verbeet : ddraw: Unset the viewports active device in IDirect3DDeviceImpl_3_DeleteViewport( ).
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: f1de9ad621ce8e109fbbe2e96ac8734278edcacc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1de9ad621ce8e109fbbe2e96… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 19 20:05:51 2011 +0200 ddraw: Unset the viewports active device in IDirect3DDeviceImpl_3_DeleteViewport(). --- dlls/ddraw/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 984afc3..11ac291 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -829,6 +829,7 @@ IDirect3DDeviceImpl_3_DeleteViewport(IDirect3DDevice3 *iface, { if (prev_viewport == NULL) This->viewport_list = cur_viewport->next; else prev_viewport->next = cur_viewport->next; + vp->active_device = NULL; /* TODO : add desactivate of the viewport and all associated lights... */ LeaveCriticalSection(&ddraw_cs); return D3D_OK;

1 0

Henri Verbeet : ddraw: Replace the viewport list with a standard Wine list.
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: fd1aac3e7556b119954687f453bba79f431764ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd1aac3e7556b119954687f45… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 19 20:05:52 2011 +0200 ddraw: Replace the viewport list with a standard Wine list. --- dlls/ddraw/ddraw_private.h | 5 +-- dlls/ddraw/device.c | 73 ++++++++++++++++++------------------------- 2 files changed, 33 insertions(+), 45 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 4c5d4cb..988d127 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -290,7 +290,7 @@ struct IDirect3DDeviceImpl IDirectDrawSurfaceImpl *target; /* Viewport management */ - IDirect3DViewportImpl *viewport_list; + struct list viewport_list; IDirect3DViewportImpl *current_viewport; D3DVIEWPORT7 active_viewport; @@ -471,8 +471,7 @@ struct IDirect3DViewportImpl D3DVIEWPORT2 vp2; } viewports; - /* Field used to chain viewports together */ - IDirect3DViewportImpl *next; + struct list entry; /* Lights list */ IDirect3DLightImpl *lights; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 11ac291..b1b4cf6 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -764,8 +764,7 @@ IDirect3DDeviceImpl_3_AddViewport(IDirect3DDevice3 *iface, return DDERR_INVALIDPARAMS; EnterCriticalSection(&ddraw_cs); - vp->next = This->viewport_list; - This->viewport_list = vp; + list_add_head(&This->viewport_list, &vp->entry); vp->active_device = This; /* Viewport must be usable for Clear() after AddViewport, so set active_device here. */ LeaveCriticalSection(&ddraw_cs); @@ -811,35 +810,27 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_AddViewport(IDirect3DDevice *iface, * DDERR_INVALIDPARAMS if the viewport wasn't found in the list * *****************************************************************************/ -static HRESULT WINAPI -IDirect3DDeviceImpl_3_DeleteViewport(IDirect3DDevice3 *iface, - IDirect3DViewport3 *Viewport) +static HRESULT WINAPI IDirect3DDeviceImpl_3_DeleteViewport(IDirect3DDevice3 *iface, IDirect3DViewport3 *viewport) { - IDirect3DDeviceImpl *This = device_from_device3(iface); - IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *) Viewport; - IDirect3DViewportImpl *cur_viewport, *prev_viewport = NULL; + IDirect3DDeviceImpl *device = device_from_device3(iface); + IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)viewport; - TRACE("iface %p, viewport %p.\n", iface, Viewport); + TRACE("iface %p, viewport %p.\n", iface, viewport); EnterCriticalSection(&ddraw_cs); - cur_viewport = This->viewport_list; - while (cur_viewport != NULL) + + if (vp->active_device != device) { - if (cur_viewport == vp) - { - if (prev_viewport == NULL) This->viewport_list = cur_viewport->next; - else prev_viewport->next = cur_viewport->next; - vp->active_device = NULL; - /* TODO : add desactivate of the viewport and all associated lights... */ - LeaveCriticalSection(&ddraw_cs); - return D3D_OK; - } - prev_viewport = cur_viewport; - cur_viewport = cur_viewport->next; + WARN("Viewport %p active device is %p.\n", vp, vp->active_device); + LeaveCriticalSection(&ddraw_cs); + return DDERR_INVALIDPARAMS; } + vp->active_device = NULL; + list_remove(&vp->entry); + LeaveCriticalSection(&ddraw_cs); - return DDERR_INVALIDPARAMS; + return D3D_OK; } static HRESULT WINAPI IDirect3DDeviceImpl_2_DeleteViewport(IDirect3DDevice2 *iface, @@ -890,7 +881,7 @@ IDirect3DDeviceImpl_3_NextViewport(IDirect3DDevice3 *iface, { IDirect3DDeviceImpl *This = device_from_device3(iface); IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Viewport3; - IDirect3DViewportImpl *res = NULL; + struct list *entry; TRACE("iface %p, viewport %p, next %p, flags %#x.\n", iface, Viewport3, lplpDirect3DViewport3, Flags); @@ -906,32 +897,29 @@ IDirect3DDeviceImpl_3_NextViewport(IDirect3DDevice3 *iface, switch (Flags) { case D3DNEXT_NEXT: - { - res = vp->next; - } - break; + entry = list_next(&This->viewport_list, &vp->entry); + break; + case D3DNEXT_HEAD: - { - res = This->viewport_list; - } - break; + entry = list_head(&This->viewport_list); + break; + case D3DNEXT_TAIL: - { - IDirect3DViewportImpl *cur_viewport = This->viewport_list; - if (cur_viewport != NULL) - { - while (cur_viewport->next != NULL) cur_viewport = cur_viewport->next; - } - res = cur_viewport; - } - break; + entry = list_tail(&This->viewport_list); + break; + default: + WARN("Invalid flags %#x.\n", Flags); *lplpDirect3DViewport3 = NULL; LeaveCriticalSection(&ddraw_cs); return DDERR_INVALIDPARAMS; } - *lplpDirect3DViewport3 = (IDirect3DViewport3 *)res; + if (entry) + *lplpDirect3DViewport3 = (IDirect3DViewport3 *)LIST_ENTRY(entry, IDirect3DViewportImpl, entry); + else + *lplpDirect3DViewport3 = NULL; + LeaveCriticalSection(&ddraw_cs); return D3D_OK; } @@ -6785,6 +6773,7 @@ HRESULT d3d_device_init(IDirect3DDeviceImpl *device, IDirectDrawImpl *ddraw, IDi device->ref = 1; device->ddraw = ddraw; device->target = target; + list_init(&device->viewport_list); if (!ddraw_handle_table_init(&device->handle_table, 64)) {

1 0

Alexandre Julliard : user32: Support creating animated icons, not only cursors.
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: 8970e29f44412e9d938b0a6b5fdec552e67884eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8970e29f44412e9d938b0a6b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 20 10:54:10 2011 +0200 user32: Support creating animated icons, not only cursors. --- dlls/user32/cursoricon.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index ba06e96..a4200d8 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1078,8 +1078,8 @@ static void riff_find_chunk( DWORD chunk_id, DWORD chunk_type, const riff_chunk_ * |- ... * \- CHUNK:icon */ -static HCURSOR CURSORICON_CreateIconFromANI( const LPBYTE bits, DWORD bits_size, - INT width, INT height, INT depth, UINT loadflags ) +static HCURSOR CURSORICON_CreateIconFromANI( const LPBYTE bits, DWORD bits_size, INT width, INT height, + INT depth, BOOL is_icon, UINT loadflags ) { struct animated_cursoricon_object *ani_icon_data; struct cursoricon_object *info; @@ -1161,7 +1161,7 @@ static HCURSOR CURSORICON_CreateIconFromANI( const LPBYTE bits, DWORD bits_size, info = get_icon_ptr( cursor ); ani_icon_data = (struct animated_cursoricon_object *) info; - info->is_icon = FALSE; + info->is_icon = is_icon; ani_icon_data->num_frames = header.num_frames; /* The .ANI stores the display rate in jiffies (1/60s) */ @@ -1195,7 +1195,7 @@ static HCURSOR CURSORICON_CreateIconFromANI( const LPBYTE bits, DWORD bits_size, /* Grab a frame from the animation */ frames[i] = create_icon_from_bmi( (BITMAPINFO *)bmi, NULL, NULL, NULL, info->hotspot, - FALSE, frameWidth, frameHeight, loadflags ); + is_icon, frameWidth, frameHeight, loadflags ); if (!frames[i]) { FIXME_(cursor)("failed to convert animated cursor frame.\n"); @@ -1284,7 +1284,8 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, /* Check if the resource is an animated icon/cursor */ if (!memcmp(bits, "RIFF", 4)) - return CURSORICON_CreateIconFromANI( bits, cbSize, width, height, 0 /* default depth */, cFlag ); + return CURSORICON_CreateIconFromANI( bits, cbSize, width, height, + 0 /* default depth */, bIcon, cFlag ); if (bIcon) { @@ -1334,7 +1335,7 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, /* Check for .ani. */ if (memcmp( bits, "RIFF", 4 ) == 0) { - hIcon = CURSORICON_CreateIconFromANI( bits, filesize, width, height, depth, loadflags ); + hIcon = CURSORICON_CreateIconFromANI( bits, filesize, width, height, depth, !fCursor, loadflags ); goto end; }

1 0

Henri Verbeet : wined3d: Decrement the vertex declaration refcount on stateblock destruction.
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: 0de0e817939c2737f297aebdfc253e962cb644a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0de0e817939c2737f297aebdf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 19 20:05:48 2011 +0200 wined3d: Decrement the vertex declaration refcount on stateblock destruction. --- dlls/wined3d/stateblock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 27b9831..79fbb2e 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -478,7 +478,7 @@ ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock) int counter; if (stateblock->state.vertex_declaration) - wined3d_vertex_declaration_incref(stateblock->state.vertex_declaration); + wined3d_vertex_declaration_decref(stateblock->state.vertex_declaration); for (counter = 0; counter < MAX_COMBINED_SAMPLERS; counter++) {

1 0

Alexandre Julliard : user32: Add support for loading animated cursors/ icons from resources.
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: 513e5c98a76c89b16639203ca8823680622e2795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=513e5c98a76c89b16639203ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 20 11:16:18 2011 +0200 user32: Add support for loading animated cursors/icons from resources. --- dlls/user32/cursoricon.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index a4200d8..014a4b9 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1403,7 +1403,15 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, if (!(hRsrc = FindResourceW( hInstance, name, (LPWSTR)(fCursor ? RT_GROUP_CURSOR : RT_GROUP_ICON) ))) - return 0; + { + /* try animated resource */ + if (!(hRsrc = FindResourceW( hInstance, name, + (LPWSTR)(fCursor ? RT_ANICURSOR : RT_ANIICON) ))) return 0; + if (!(handle = LoadResource( hInstance, hRsrc ))) return 0; + bits = LockResource( handle ); + return CURSORICON_CreateIconFromANI( bits, SizeofResource( hInstance, handle ), + width, height, depth, !fCursor, loadflags ); + } /* Find the best entry in the directory */

1 0

Henri Verbeet : ddraw: Introduce a separate function for texture creation.
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: 5492560cb5bdf0e66bddd395338d7dc7b01207be URL: http://source.winehq.org/git/wine.git/?a=commit;h=5492560cb5bdf0e66bddd3953… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 19 20:05:50 2011 +0200 ddraw: Introduce a separate function for texture creation. --- dlls/ddraw/ddraw.c | 42 ++---------------------------------------- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/surface.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 40 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index cf9c4c3..c2ea683 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3395,48 +3395,10 @@ static HRESULT CreateSurface(IDirectDrawImpl *ddraw, DDSURFACEDESC2 *DDSD, object->ifaceToRelease = (IUnknown *)&ddraw->IDirectDraw7_iface; /* Create a WineD3DTexture if a texture was requested */ - if(desc2.ddsCaps.dwCaps & DDSCAPS_TEXTURE) + if (desc2.ddsCaps.dwCaps & DDSCAPS_TEXTURE) { - enum wined3d_format_id Format; - UINT levels; - WINED3DPOOL Pool = WINED3DPOOL_DEFAULT; - ddraw->tex_root = object; - - if(desc2.ddsCaps.dwCaps & DDSCAPS_MIPMAP) - { - /* a mipmap is created, create enough levels */ - levels = desc2.u2.dwMipMapCount; - } - else - { - /* No mipmap is created, create one level */ - levels = 1; - } - - /* DDSCAPS_SYSTEMMEMORY textures are in WINED3DPOOL_SYSTEMMEM */ - if(DDSD->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) - { - Pool = WINED3DPOOL_SYSTEMMEM; - } - /* Should I forward the MANAGED cap to the managed pool ? */ - - /* Get the format. It's set already by CreateNewSurface */ - Format = PixelFormat_DD2WineD3D(&object->surface_desc.u4.ddpfPixelFormat); - - /* The surfaces are already created, the callback only - * passes the IWineD3DSurface to WineD3D - */ - if(desc2.ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) - { - hr = IWineD3DDevice_CreateCubeTexture(ddraw->wineD3DDevice, DDSD->dwWidth, levels, 0, - Format, Pool, object, &ddraw_null_wined3d_parent_ops, &object->wined3d_texture); - } - else - { - hr = IWineD3DDevice_CreateTexture(ddraw->wineD3DDevice, DDSD->dwWidth, DDSD->dwHeight, - levels, 0, Format, Pool, object, &ddraw_null_wined3d_parent_ops, &object->wined3d_texture); - } + ddraw_surface_create_texture(object); ddraw->tex_root = NULL; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 5cc09dd..4c5d4cb 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -219,6 +219,7 @@ struct IDirectDrawSurfaceImpl DWORD Handle; }; +HRESULT ddraw_surface_create_texture(IDirectDrawSurfaceImpl *surface) DECLSPEC_HIDDEN; void ddraw_surface_destroy(IDirectDrawSurfaceImpl *surface) DECLSPEC_HIDDEN; HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddraw, DDSURFACEDESC2 *desc, UINT mip_level, WINED3DSURFTYPE surface_type) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index c256819..40fd797 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3490,6 +3490,34 @@ static const struct IDirect3DTextureVtbl d3d_texture1_vtbl = d3d_texture1_Unload, }; +HRESULT ddraw_surface_create_texture(IDirectDrawSurfaceImpl *surface) +{ + const DDSURFACEDESC2 *desc = &surface->surface_desc; + enum wined3d_format_id format; + WINED3DPOOL pool; + UINT levels; + + if (desc->ddsCaps.dwCaps & DDSCAPS_MIPMAP) + levels = desc->u2.dwMipMapCount; + else + levels = 1; + + /* DDSCAPS_SYSTEMMEMORY textures are in WINED3DPOOL_SYSTEMMEM. + * Should I forward the MANAGED cap to the managed pool? */ + if (desc->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) + pool = WINED3DPOOL_SYSTEMMEM; + else + pool = WINED3DPOOL_DEFAULT; + + format = PixelFormat_DD2WineD3D(&surface->surface_desc.u4.ddpfPixelFormat); + if (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) + return IWineD3DDevice_CreateCubeTexture(surface->ddraw->wineD3DDevice, desc->dwWidth, + levels, 0, format, pool, surface, &ddraw_null_wined3d_parent_ops, &surface->wined3d_texture); + else + return IWineD3DDevice_CreateTexture(surface->ddraw->wineD3DDevice, desc->dwWidth, desc->dwHeight, + levels, 0, format, pool, surface, &ddraw_null_wined3d_parent_ops, &surface->wined3d_texture); +} + HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddraw, DDSURFACEDESC2 *desc, UINT mip_level, WINED3DSURFTYPE surface_type) {

1 0

Henri Verbeet : ddraw: Don' t bother unsetting resources on surface destruction.
by Alexandre Julliard April 20, 2011

April 20, 2011

Module: wine Branch: master Commit: 2b1b5dba43dfffc1550a4308c2bf7dd7b37c838d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b1b5dba43dfffc1550a4308c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 19 20:05:49 2011 +0200 ddraw: Don't bother unsetting resources on surface destruction. Uninit3D() / stateblock destruction already takes care of this. --- dlls/ddraw/surface.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 5601321..c256819 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -361,10 +361,6 @@ static ULONG WINAPI ddraw_surface7_Release(IDirectDrawSurface7 *iface) if((ddraw->d3d_initialized) && (This == ddraw->d3d_target)) { TRACE("(%p) Destroying the render target, uninitializing D3D\n", This); - /* Unset any index buffer, just to be sure */ - IWineD3DDevice_SetIndexBuffer(ddraw->wineD3DDevice, NULL, WINED3DFMT_UNKNOWN); - IWineD3DDevice_SetDepthStencilSurface(ddraw->wineD3DDevice, NULL); - IWineD3DDevice_SetVertexDeclaration(ddraw->wineD3DDevice, NULL); for (i = 0; i < ddraw->numConvertedDecls; ++i) { wined3d_vertex_declaration_decref(ddraw->decls[i].decl);

1 0

Christian Inci : crypt32: Fix CertStrToName' s CERT_NAME_STR_NO_QUOTING_FLAG usage.
by Alexandre Julliard April 19, 2011

April 19, 2011

Module: wine Branch: master Commit: 99f6894c6690d082a80c71673e1ab8e29793f2af URL: http://source.winehq.org/git/wine.git/?a=commit;h=99f6894c6690d082a80c71673… Author: Christian Inci <chris.pcguy.inci(a)gmail.com> Date: Sun Apr 17 01:22:10 2011 +0200 crypt32: Fix CertStrToName's CERT_NAME_STR_NO_QUOTING_FLAG usage. --- dlls/crypt32/str.c | 6 +++--- dlls/crypt32/tests/str.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 24f7c55..7444575 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -971,7 +971,7 @@ static BOOL CRYPT_EncodeValue(DWORD dwCertEncodingType, } static BOOL CRYPT_ValueToRDN(DWORD dwCertEncodingType, PCERT_NAME_INFO info, - PCCRYPT_OID_INFO keyOID, struct X500TokenW *value, LPCWSTR *ppszError) + PCCRYPT_OID_INFO keyOID, struct X500TokenW *value, DWORD dwStrType, LPCWSTR *ppszError) { BOOL ret = FALSE; @@ -1005,7 +1005,7 @@ static BOOL CRYPT_ValueToRDN(DWORD dwCertEncodingType, PCERT_NAME_INFO info, types = defaultTypes; /* Remove surrounding quotes */ - if (value->start[0] == '"') + if (value->start[0] == '"' && !(dwStrType & CERT_NAME_STR_NO_QUOTING_FLAG)) { value->start++; value->end--; @@ -1095,7 +1095,7 @@ BOOL WINAPI CertStrToNameW(DWORD dwCertEncodingType, LPCWSTR pszX500, { str = token.end; ret = CRYPT_ValueToRDN(dwCertEncodingType, &info, - keyOID, &token, ppszError); + keyOID, &token, dwStrType, ppszError); } } } diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index 4d69e5c..cbfdf4d 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -828,7 +828,7 @@ static void test_CertStrToNameA(void) "Expected ERROR_SUCCESS, got %08x\n", GetLastError()); ret = pCertStrToNameA(X509_ASN_ENCODING, "CN=\"abc\"", CERT_NAME_STR_NO_QUOTING_FLAG, NULL, buf, &size, NULL); - todo_wine ok(!ret && GetLastError() == ERROR_MORE_DATA, + ok(!ret && GetLastError() == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %08x\n", GetLastError()); for (i = 0; i < sizeof(namesA) / sizeof(namesA[0]); i++) {

1 0