wine-commits July 2011

wine-commits@winehq.org

2 participants
838 discussions

Henri Verbeet : wined3d: Get rid of some IWineD3D* references.
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: b1664a2c85d326b39a2c2816c61836c1de189410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1664a2c85d326b39a2c2816c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 3 22:27:21 2011 +0200 wined3d: Get rid of some IWineD3D* references. --- dlls/wined3d/buffer.c | 13 ++++++------- dlls/wined3d/clipper.c | 3 +-- dlls/wined3d/device.c | 6 ++---- dlls/wined3d/directx.c | 6 ------ dlls/wined3d/query.c | 2 -- dlls/wined3d/resource.c | 2 -- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/swapchain.c | 7 +++---- 8 files changed, 14 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index ea94c7e..fa14f3a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -119,7 +119,7 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, const struc { GLenum error, gl_usage; - TRACE("Creating an OpenGL vertex buffer object for IWineD3DVertexBuffer %p Usage(%s)\n", + TRACE("Creating an OpenGL vertex buffer object for wined3d_buffer %p with usage %s.\n", This, debug_d3dusage(This->resource.usage)); ENTER_GL(); @@ -131,12 +131,11 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, const struc */ while (glGetError() != GL_NO_ERROR); - /* Basically the FVF parameter passed to CreateVertexBuffer is no good - * It is the FVF set with IWineD3DDevice::SetFVF or the Vertex Declaration set with - * IWineD3DDevice::SetVertexDeclaration that decides how the vertices in the buffer - * look like. This means that on each DrawPrimitive call the vertex buffer has to be verified - * to check if the rhw and color values are in the correct format. - */ + /* Basically the FVF parameter passed to CreateVertexBuffer is no good. + * The vertex declaration from the device determines how the data in the + * buffer is interpreted. This means that on each draw call the buffer has + * to be verified to check if the rhw and color values are in the correct + * format. */ GL_EXTCALL(glGenBuffersARB(1, &This->buffer_object)); error = glGetError(); diff --git a/dlls/wined3d/clipper.c b/dlls/wined3d/clipper.c index e5131d7..0829cde 100644 --- a/dlls/wined3d/clipper.c +++ b/dlls/wined3d/clipper.c @@ -1,5 +1,4 @@ -/* IWineD3DClipper implementation - * +/* * Copyright 2000 (c) Marcus Meissner * Copyright 2000 (c) TransGaming Technologies Inc. * Copyright 2006 (c) Stefan Dösinger diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 180fd49..f3fceac 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1,6 +1,4 @@ /* - * IWineD3DDevice implementation - * * Copyright 2002 Lionel Ulmer * Copyright 2002-2005 Jason Edmeades * Copyright 2003-2004 Raphael Junqueira @@ -4377,7 +4375,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, hr = wined3d_device_update_surface(device, src_surface, NULL, dst_surface, NULL); if (FAILED(hr)) { - WARN("IWineD3DDevice_UpdateSurface failed, hr %#x.\n", hr); + WARN("Failed to update surface, hr %#x.\n", hr); return hr; } } @@ -4396,7 +4394,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, hr = wined3d_device_update_surface(device, src_surface, NULL, dst_surface, NULL); if (FAILED(hr)) { - WARN("IWineD3DDevice_UpdateSurface failed, hr %#x.\n", hr); + WARN("Failed to update surface, hr %#x.\n", hr); return hr; } } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ce4a058..504cb2c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1,6 +1,4 @@ /* - * IWineD3D implementation - * * Copyright 2002-2004 Jason Edmeades * Copyright 2003-2004 Raphael Junqueira * Copyright 2004 Christian Costa @@ -412,10 +410,6 @@ ULONG CDECL wined3d_decref(struct wined3d *wined3d) return refcount; } -/********************************************************** - * IWineD3D parts follows - **********************************************************/ - /* GL locking is done by the caller */ static inline BOOL test_arb_vs_offset_limit(const struct wined3d_gl_info *gl_info) { diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index ca4426f..2deb337 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1,6 +1,4 @@ /* - * IWineD3DQuery implementation - * * Copyright 2005 Oliver Stieber * Copyright 2007-2008 Stefan Dösinger for CodeWeavers * Copyright 2009-2010 Henri Verbeet for CodeWeavers. diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 699a61b..4dbe46e 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -1,6 +1,4 @@ /* - * IWineD3DResource Implementation - * * Copyright 2002-2004 Jason Edmeades * Copyright 2003-2004 Raphael Junqueira * Copyright 2004 Christian Costa diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 114be69..5fb667d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5281,8 +5281,8 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surfa * This path will only be entered for d3d7 and ddraw apps, because d3d8/9 offer no way to blit TO the front buffer */ - /* Check rects - IWineD3DDevice_Present doesn't handle them */ - while(1) + /* Check rects - wined3d_swapchain_present() doesn't handle them. */ + for (;;) { TRACE("Looking if a Present can be done...\n"); /* Source Rectangle must be full surface */ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index a64c0db..2242f66 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -351,9 +351,8 @@ static void swapchain_blit(struct wined3d_swapchain *swapchain, ENTER_GL(); context_bind_fbo(context2, GL_FRAMEBUFFER, NULL); - /* Set up the texture. The surface is not in a IWineD3D*Texture container, - * so there are no d3d texture settings to dirtify - */ + /* Set up the texture. The surface is not in a wined3d_texture + * container, so there are no D3D texture settings to dirtify. */ device->blitter->set_shader(device->blit_priv, context2->gl_info, backbuffer); glTexParameteri(backbuffer->texture_target, GL_TEXTURE_MIN_FILTER, gl_filter); glTexParameteri(backbuffer->texture_target, GL_TEXTURE_MAG_FILTER, gl_filter); @@ -693,7 +692,7 @@ void x11_copy_to_screen(struct wined3d_swapchain *swapchain, const RECT *rect) if (front->clipper) { RECT xrc; - HWND hwnd = ((IWineD3DClipperImpl *)front->clipper)->hWnd; + HWND hwnd = front->clipper->hWnd; if (hwnd && GetClientRect(hwnd,&xrc)) { OffsetRect(&xrc, offset.x, offset.y);

1 0

Henri Verbeet : wined3d: Move some enums to directx.c.
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: 0c716b77e576ab8e9da10a3c59eefd0c57b02d50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c716b77e576ab8e9da10a3c5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 3 22:27:20 2011 +0200 wined3d: Move some enums to directx.c. --- dlls/wined3d/directx.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 39 --------------------------------------- 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b1dd957..ce4a058 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -32,6 +32,44 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_caps); #define WINE_DEFAULT_VIDMEM (64 * 1024 * 1024) +/* The driver names reflect the lowest GPU supported + * by a certain driver, so DRIVER_AMD_R300 supports + * R3xx, R4xx and R5xx GPUs. */ +enum wined3d_display_driver +{ + DRIVER_AMD_RAGE_128PRO, + DRIVER_AMD_R100, + DRIVER_AMD_R300, + DRIVER_AMD_R600, + DRIVER_INTEL_GMA800, + DRIVER_INTEL_GMA900, + DRIVER_INTEL_GMA950, + DRIVER_INTEL_GMA3000, + DRIVER_NVIDIA_TNT, + DRIVER_NVIDIA_GEFORCE2MX, + DRIVER_NVIDIA_GEFORCEFX, + DRIVER_NVIDIA_GEFORCE6, + DRIVER_UNKNOWN +}; + +enum wined3d_driver_model +{ + DRIVER_MODEL_WIN9X, + DRIVER_MODEL_NT40, + DRIVER_MODEL_NT5X, + DRIVER_MODEL_NT6X +}; + +enum wined3d_gl_vendor +{ + GL_VENDOR_UNKNOWN, + GL_VENDOR_APPLE, + GL_VENDOR_FGLRX, + GL_VENDOR_INTEL, + GL_VENDOR_MESA, + GL_VENDOR_NVIDIA, +}; + /* The d3d device ID */ static const GUID IID_D3DDEVICE_D3DUID = { 0xaeb2cdd4, 0x6e41, 0x43ea, { 0x94,0x1c,0x83,0x61,0xcc,0x76,0x07,0x81 } }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 32b50d2..79b6f27 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1279,45 +1279,6 @@ struct wined3d_pixel_format int numSamples; }; -/* The driver names reflect the lowest GPU supported - * by a certain driver, so DRIVER_AMD_R300 supports - * R3xx, R4xx and R5xx GPUs. */ -enum wined3d_display_driver -{ - DRIVER_AMD_RAGE_128PRO, - DRIVER_AMD_R100, - DRIVER_AMD_R300, - DRIVER_AMD_R600, - DRIVER_INTEL_GMA800, - DRIVER_INTEL_GMA900, - DRIVER_INTEL_GMA950, - DRIVER_INTEL_GMA3000, - DRIVER_NVIDIA_TNT, - DRIVER_NVIDIA_GEFORCE2MX, - DRIVER_NVIDIA_GEFORCEFX, - DRIVER_NVIDIA_GEFORCE6, - DRIVER_UNKNOWN -}; - -enum wined3d_driver_model -{ - DRIVER_MODEL_WIN9X, - DRIVER_MODEL_NT40, - DRIVER_MODEL_NT5X, - DRIVER_MODEL_NT6X -}; - -enum wined3d_gl_vendor -{ - GL_VENDOR_UNKNOWN, - GL_VENDOR_APPLE, - GL_VENDOR_FGLRX, - GL_VENDOR_INTEL, - GL_VENDOR_MESA, - GL_VENDOR_NVIDIA, -}; - - enum wined3d_pci_vendor { HW_VENDOR_SOFTWARE = 0x0000,

1 0

Henri Verbeet : wined3d: Get rid of some macros.
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: 8f6ae4ba38b4fd3cf268bf2de8b890f2c4ddfb1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f6ae4ba38b4fd3cf268bf2de… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 3 22:27:19 2011 +0200 wined3d: Get rid of some macros. --- dlls/wined3d/directx.c | 90 +++++++++++++++++++++++++++------------- dlls/wined3d/wined3d_private.h | 7 --- 2 files changed, 61 insertions(+), 36 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f45ff04..b1dd957 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1398,14 +1398,35 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s return HW_VENDOR_NVIDIA; } +static UINT d3d_level_from_gl_info(const struct wined3d_gl_info *gl_info) +{ + UINT level = 0; + if (gl_info->supported[ARB_MULTITEXTURE]) + level = 6; + if (gl_info->supported[ARB_TEXTURE_COMPRESSION] + && gl_info->supported[ARB_TEXTURE_CUBE_MAP] + && gl_info->supported[ARB_TEXTURE_ENV_DOT3]) + level = 7; + if (level == 7 && gl_info->supported[ARB_MULTISAMPLE] + && gl_info->supported[ARB_TEXTURE_BORDER_CLAMP]) + level = 8; + if (level == 8 && gl_info->supported[ARB_FRAGMENT_PROGRAM] + && gl_info->supported[ARB_VERTEX_SHADER]) + level = 9; + if (level == 9 && gl_info->supported[EXT_GPU_SHADER4]) + level = 10; + + return level; +} static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl_info *gl_info, const char *gl_renderer) { + UINT d3d_level = d3d_level_from_gl_info(gl_info); unsigned int i; - if (WINE_D3D10_CAPABLE(gl_info)) + if (d3d_level >= 10) { static const struct { @@ -1480,7 +1501,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl /* Both the GeforceFX, 6xxx and 7xxx series support D3D9. The last two types have more * shader capabilities, so we use the shader capabilities to distinguish between FX and 6xxx/7xxx. */ - if (WINE_D3D9_CAPABLE(gl_info) && gl_info->supported[NV_VERTEX_PROGRAM3]) + if (d3d_level >= 9 && gl_info->supported[NV_VERTEX_PROGRAM3]) { static const struct { @@ -1514,7 +1535,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl return CARD_NVIDIA_GEFORCE_6200; /* Geforce 6100/6150/6200/7300/7400/7500 */ } - if (WINE_D3D9_CAPABLE(gl_info)) + if (d3d_level >= 9) { /* GeforceFX - highend */ if (strstr(gl_renderer, "5800") @@ -1538,7 +1559,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl return CARD_NVIDIA_GEFORCEFX_5200; /* GeforceFX 5100/5200/5250/5300/5500 */ } - if (WINE_D3D8_CAPABLE(gl_info)) + if (d3d_level >= 8) { if (strstr(gl_renderer, "GeForce4 Ti") || strstr(gl_renderer, "Quadro4")) { @@ -1548,7 +1569,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl return CARD_NVIDIA_GEFORCE3; /* Geforce3 standard/Ti200/Ti500, Quadro DCC */ } - if (WINE_D3D7_CAPABLE(gl_info)) + if (d3d_level >= 7) { if (strstr(gl_renderer, "GeForce4 MX")) { @@ -1579,11 +1600,13 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_info *gl_info, const char *gl_renderer) { + UINT d3d_level = d3d_level_from_gl_info(gl_info); + /* See http://developer.amd.com/drivers/pc_vendor_id/Pages/default.aspx * * Beware: renderer string do not match exact card model, * eg HD 4800 is returned for multiple cards, even for RV790 based ones. */ - if (WINE_D3D10_CAPABLE(gl_info)) + if (d3d_level >= 10) { unsigned int i; @@ -1648,7 +1671,7 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in return CARD_AMD_RADEON_HD3200; } - if (WINE_D3D8_CAPABLE(gl_info)) + if (d3d_level >= 9) { /* Radeon R5xx */ if (strstr(gl_renderer, "X1600") @@ -1687,15 +1710,11 @@ static enum wined3d_pci_device select_card_amd_binary(const struct wined3d_gl_in return CARD_AMD_RADEON_9500; /* Radeon 9500/9550/9600/9700/9800/X300/X550/X600 */ } - if (WINE_D3D8_CAPABLE(gl_info)) - { + if (d3d_level >= 8) return CARD_AMD_RADEON_8500; /* Radeon 8500/9000/9100/9200/9300 */ - } - if (WINE_D3D7_CAPABLE(gl_info)) - { + if (d3d_level >= 7) return CARD_AMD_RADEON_7200; /* Radeon 7000/7100/7200/7500 */ - } return CARD_AMD_RAGE_128PRO; } @@ -1728,6 +1747,7 @@ static enum wined3d_pci_device select_card_intel(const struct wined3d_gl_info *g static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info *gl_info, const char *gl_renderer) { + UINT d3d_level; unsigned int i; /* See http://developer.amd.com/drivers/pc_vendor_id/Pages/default.aspx @@ -1817,7 +1837,8 @@ static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info } } - if (WINE_D3D9_CAPABLE(gl_info)) + d3d_level = d3d_level_from_gl_info(gl_info); + if (d3d_level >= 9) { static const struct { @@ -1853,15 +1874,11 @@ static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info } } - if (WINE_D3D8_CAPABLE(gl_info)) - { + if (d3d_level >= 8) return CARD_AMD_RADEON_8500; /* Radeon 8500/9000/9100/9200/9300 */ - } - if (WINE_D3D7_CAPABLE(gl_info)) - { + if (d3d_level >= 7) return CARD_AMD_RADEON_7200; /* Radeon 7000/7100/7200/7500 */ - } return CARD_AMD_RAGE_128PRO; } @@ -1869,6 +1886,8 @@ static enum wined3d_pci_device select_card_amd_mesa(const struct wined3d_gl_info static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_info *gl_info, const char *gl_renderer) { + UINT d3d_level; + if (strstr(gl_renderer, "Gallium")) { unsigned int i; @@ -1944,10 +1963,16 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i } FIXME_(d3d_caps)("Unknown renderer %s.\n", debugstr_a(gl_renderer)); - if (WINE_D3D9_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCEFX_5600; - if (WINE_D3D8_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCE3; - if (WINE_D3D7_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCE; - if (WINE_D3D6_CAPABLE(gl_info)) return CARD_NVIDIA_RIVA_TNT; + + d3d_level = d3d_level_from_gl_info(gl_info); + if (d3d_level >= 9) + return CARD_NVIDIA_GEFORCEFX_5600; + if (d3d_level >= 8) + return CARD_NVIDIA_GEFORCE3; + if (d3d_level >= 7) + return CARD_NVIDIA_GEFORCE; + if (d3d_level >= 6) + return CARD_NVIDIA_RIVA_TNT; return CARD_NVIDIA_RIVA_128; } @@ -1977,6 +2002,8 @@ static const struct vendor_card_selection vendor_card_select_table[] = static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info *gl_info, const char *gl_renderer, enum wined3d_gl_vendor *gl_vendor, enum wined3d_pci_vendor *card_vendor) { + UINT d3d_level; + /* Above is a list of Nvidia and ATI GPUs. Both vendors have dozens of * different GPUs with roughly the same features. In most cases GPUs from a * certain family differ in clockspeeds, the amount of video memory and the @@ -2050,10 +2077,15 @@ static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info * * for Nvidia was because the hardware and drivers they make are of good quality. This makes * them a good generic choice. */ *card_vendor = HW_VENDOR_NVIDIA; - if (WINE_D3D9_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCEFX_5600; - if (WINE_D3D8_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCE3; - if (WINE_D3D7_CAPABLE(gl_info)) return CARD_NVIDIA_GEFORCE; - if (WINE_D3D6_CAPABLE(gl_info)) return CARD_NVIDIA_RIVA_TNT; + d3d_level = d3d_level_from_gl_info(gl_info); + if (d3d_level >= 9) + return CARD_NVIDIA_GEFORCEFX_5600; + if (d3d_level >= 8) + return CARD_NVIDIA_GEFORCE3; + if (d3d_level >= 7) + return CARD_NVIDIA_GEFORCE; + if (d3d_level >= 6) + return CARD_NVIDIA_RIVA_TNT; return CARD_NVIDIA_RIVA_128; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e8fddb7..32b50d2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1245,13 +1245,6 @@ void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) DEC void context_set_tls_idx(DWORD idx) DECLSPEC_HIDDEN; void context_surface_update(struct wined3d_context *context, const struct wined3d_surface *surface) DECLSPEC_HIDDEN; -/* Macros for doing basic GPU detection based on opengl capabilities */ -#define WINE_D3D6_CAPABLE(gl_info) (gl_info->supported[ARB_MULTITEXTURE]) -#define WINE_D3D7_CAPABLE(gl_info) (gl_info->supported[ARB_TEXTURE_COMPRESSION] && gl_info->supported[ARB_TEXTURE_CUBE_MAP] && gl_info->supported[ARB_TEXTURE_ENV_DOT3]) -#define WINE_D3D8_CAPABLE(gl_info) WINE_D3D7_CAPABLE(gl_info) && (gl_info->supported[ARB_MULTISAMPLE] && gl_info->supported[ARB_TEXTURE_BORDER_CLAMP]) -#define WINE_D3D9_CAPABLE(gl_info) WINE_D3D8_CAPABLE(gl_info) && (gl_info->supported[ARB_FRAGMENT_PROGRAM] && gl_info->supported[ARB_VERTEX_SHADER]) -#define WINE_D3D10_CAPABLE(gl_info) WINE_D3D9_CAPABLE(gl_info) && (gl_info->supported[EXT_GPU_SHADER4]) - /***************************************************************************** * Internal representation of a light */

1 0

Piotr Caban : shell32: Implement folder renaming in SHBrowseForFolder.
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: 1226422a08a70084c3328bc713cae7930950b36b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1226422a08a70084c3328bc71… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jul 3 14:42:26 2011 +0200 shell32: Implement folder renaming in SHBrowseForFolder. --- dlls/shell32/brsfolder.c | 49 ++++++++++++++++++++++++++++++++++++++- dlls/shell32/tests/brsfolder.c | 4 +- 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 48e19cd..71d2d0b 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -574,6 +574,46 @@ static HRESULT BrsFolder_Treeview_Changed( browse_info *info, NMTREEVIEWW *pnmtv return 0; } +static LRESULT BrsFolder_Treeview_Rename(browse_info *info, NMTVDISPINFOW *pnmtv) +{ + LPTV_ITEMDATA item_data; + WCHAR old_path[MAX_PATH], new_path[MAX_PATH], *p; + NMTREEVIEWW nmtv; + TVITEMW item; + + if(!pnmtv->item.pszText) + return 0; + + item.mask = TVIF_HANDLE|TVIF_PARAM; + item.hItem = (HTREEITEM)SendMessageW(info->hwndTreeView, TVM_GETNEXTITEM, TVGN_CARET, 0); + SendMessageW(info->hwndTreeView, TVM_GETITEMW, 0, (LPARAM)&item); + item_data = (LPTV_ITEMDATA)item.lParam; + + SHGetPathFromIDListW(item_data->lpifq, old_path); + if(!(p = strrchrW(old_path, '\\'))) + return 0; + p = new_path+(p-old_path+1); + memcpy(new_path, old_path, (p-new_path)*sizeof(WCHAR)); + strcpyW(p, pnmtv->item.pszText); + + if(!MoveFileW(old_path, new_path)) + return 0; + + SHFree(item_data->lpifq); + SHFree(item_data->lpi); + item_data->lpifq = SHSimpleIDListFromPathW(new_path); + IShellFolder_ParseDisplayName(item_data->lpsfParent, NULL, NULL, + pnmtv->item.pszText, NULL, &item_data->lpi, NULL); + + item.mask = TVIF_HANDLE|TVIF_TEXT; + item.pszText = pnmtv->item.pszText; + SendMessageW(info->hwndTreeView, TVM_SETITEMW, 0, (LPARAM)&item); + + nmtv.itemNew.lParam = item.lParam; + BrsFolder_Treeview_Changed(info, &nmtv); + return 0; +} + static LRESULT BrsFolder_OnNotify( browse_info *info, UINT CtlID, LPNMHDR lpnmh ) { NMTREEVIEWW *pnmtv = (NMTREEVIEWW *)lpnmh; @@ -597,6 +637,10 @@ static LRESULT BrsFolder_OnNotify( browse_info *info, UINT CtlID, LPNMHDR lpnmh case TVN_SELCHANGEDW: return BrsFolder_Treeview_Changed( info, pnmtv ); + case TVN_ENDLABELEDITA: + case TVN_ENDLABELEDITW: + return BrsFolder_Treeview_Rename( info, (LPNMTVDISPINFOW)pnmtv ); + default: WARN("unhandled (%d)\n", pnmtv->hdr.code); break; @@ -680,8 +724,9 @@ static BOOL BrsFolder_OnCreate( HWND hWnd, browse_info *info ) static HRESULT BrsFolder_Rename(browse_info *info, HTREEITEM rename) { - FIXME("\n"); - return E_NOTIMPL; + SendMessageW(info->hwndTreeView, TVM_SELECTITEM, TVGN_CARET, (LPARAM)rename); + SendMessageW(info->hwndTreeView, TVM_EDITLABELW, 0, (LPARAM)rename); + return S_OK; } static HRESULT BrsFolder_NewFolder(browse_info *info) diff --git a/dlls/shell32/tests/brsfolder.c b/dlls/shell32/tests/brsfolder.c index 03dff74..4dea03e 100644 --- a/dlls/shell32/tests/brsfolder.c +++ b/dlls/shell32/tests/brsfolder.c @@ -222,14 +222,14 @@ static void test_click_make_new_folder_button(void) /* There should be a new folder foo inside the test folder */ strcpy(new_folder_path, test_folder_path); strcat(new_folder_path, new_folder_name); - todo_wine ok(does_folder_or_file_exist(new_folder_path) + ok(does_folder_or_file_exist(new_folder_path) || broken(!does_folder_or_file_exist(new_folder_path)) /* W95, W98, XP, W2K3 */, "The new folder did not get the name %s\n", new_folder_name); /* Dialog should return a pidl pointing to the new folder */ ok(SHGetPathFromIDListA(pidl, new_folder_pidl_path), "SHGetPathFromIDList failed for new folder.\n"); - todo_wine ok(strcmp(new_folder_path, new_folder_pidl_path) == 0 + ok(strcmp(new_folder_path, new_folder_pidl_path) == 0 || broken(strcmp(new_folder_path, new_folder_pidl_path) != 0) /* earlier than Vista */, "SHBrowseForFolder did not return the pidl for the new folder. " "Expected '%s' got '%s'\n", new_folder_path, new_folder_pidl_path);

1 0

Piotr Caban : shell32: Implement "make new folder" functionality in SHBrowseForFolder.
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: 74c47d0a6709386ea8d28566c5d91fae4d4373e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74c47d0a6709386ea8d28566c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jul 3 13:55:39 2011 +0200 shell32: Implement "make new folder" functionality in SHBrowseForFolder. --- dlls/shell32/brsfolder.c | 120 ++++++++++++++++++++++++++++++++++++--- dlls/shell32/tests/brsfolder.c | 2 +- 2 files changed, 111 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 3a7a736..48e19cd 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -18,7 +18,6 @@ * FIXME: * - many memory leaks * - many flags unimplemented - * - implement new dialog style "make new folder" button * - implement editbox */ @@ -35,6 +34,7 @@ #include "shell32_main.h" #include "shellapi.h" #include "shresdef.h" +#include "shellfolder.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -489,17 +489,20 @@ static void BrsFolder_CheckValidSelection( browse_info *info, LPTV_ITEMDATA lptv if (FAILED(r) || !(dwAttributes & (SFGAO_FILESYSANCESTOR|SFGAO_FILESYSTEM))) bEnabled = FALSE; } - if (lpBrowseInfo->ulFlags & BIF_RETURNONLYFSDIRS) - { - dwAttributes = SFGAO_FOLDER | SFGAO_FILESYSTEM; - r = IShellFolder_GetAttributesOf(lptvid->lpsfParent, 1, - (LPCITEMIDLIST*)&lptvid->lpi, &dwAttributes); - if (FAILED(r) || + + dwAttributes = SFGAO_FOLDER | SFGAO_FILESYSTEM; + r = IShellFolder_GetAttributesOf(lptvid->lpsfParent, 1, + (LPCITEMIDLIST*)&lptvid->lpi, &dwAttributes); + if (FAILED(r) || ((dwAttributes & (SFGAO_FOLDER|SFGAO_FILESYSTEM)) != (SFGAO_FOLDER|SFGAO_FILESYSTEM))) - { + { + if (lpBrowseInfo->ulFlags & BIF_RETURNONLYFSDIRS) bEnabled = FALSE; - } + EnableWindow(GetDlgItem(info->hWnd, IDD_MAKENEWFOLDER), FALSE); } + else + EnableWindow(GetDlgItem(info->hWnd, IDD_MAKENEWFOLDER), TRUE); + SendMessageW(info->hWnd, BFFM_ENABLEOK, 0, bEnabled); } @@ -675,6 +678,103 @@ static BOOL BrsFolder_OnCreate( HWND hWnd, browse_info *info ) return TRUE; } +static HRESULT BrsFolder_Rename(browse_info *info, HTREEITEM rename) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT BrsFolder_NewFolder(browse_info *info) +{ + DWORD flags = BrowseFlagsToSHCONTF(info->lpBrowseInfo->ulFlags); + IShellFolder *desktop, *cur; + ISFHelper *sfhelper; + WCHAR name[MAX_PATH]; + HTREEITEM parent, added; + LPTV_ITEMDATA item_data; + LPITEMIDLIST new_item; + TVITEMW item; + HRESULT hr; + int len; + + if(!info->pidlRet) { + ERR("Make new folder button should be disabled\n"); + return E_FAIL; + } + + /* Create new directory */ + hr = SHGetDesktopFolder(&desktop); + if(FAILED(hr)) + return hr; + hr = IShellFolder_BindToObject(desktop, info->pidlRet, 0, &IID_IShellFolder, (void**)&cur); + IShellFolder_Release(desktop); + if(FAILED(hr)) + return hr; + + hr = IShellFolder_QueryInterface(cur, &IID_ISFHelper, (void**)&sfhelper); + if(FAILED(hr)) + return hr; + + hr = SHGetPathFromIDListW(info->pidlRet, name); + if(FAILED(hr)) + goto cleanup; + + len = strlenW(name); + if(len<MAX_PATH) + name[len++] = '\\'; + hr = ISFHelper_GetUniqueName(sfhelper, &name[len], MAX_PATH-len); + ISFHelper_Release(sfhelper); + if(FAILED(hr)) + goto cleanup; + + hr = E_FAIL; + if(!CreateDirectoryW(name, NULL)) + goto cleanup; + + /* Update parent of newly created directory */ + parent = (HTREEITEM)SendMessageW(info->hwndTreeView, TVM_GETNEXTITEM, TVGN_CARET, 0); + if(!parent) + goto cleanup; + + SendMessageW(info->hwndTreeView, TVM_EXPAND, TVE_EXPAND, (LPARAM)parent); + + memset(&item, 0, sizeof(TVITEMW)); + item.mask = TVIF_PARAM|TVIF_STATE; + item.hItem = parent; + SendMessageW(info->hwndTreeView, TVM_GETITEMW, 0, (LPARAM)&item); + item_data = (LPTV_ITEMDATA)item.lParam; + if(!item_data) + goto cleanup; + + if(item_data->pEnumIL) + IEnumIDList_Release(item_data->pEnumIL); + hr = IShellFolder_EnumObjects(cur, info->hwndTreeView, flags, &item_data->pEnumIL); + if(FAILED(hr)) + goto cleanup; + + /* Update treeview */ + if(!(item.state&TVIS_EXPANDEDONCE)) { + item.mask = TVIF_STATE; + item.state = TVIS_EXPANDEDONCE; + item.stateMask = TVIS_EXPANDEDONCE; + SendMessageW(info->hwndTreeView, TVM_SETITEMW, 0, (LPARAM)&item); + } + + hr = IShellFolder_ParseDisplayName(cur, NULL, NULL, name+len, NULL, &new_item, NULL); + if(FAILED(hr)) + goto cleanup; + + added = InsertTreeViewItem(info, cur, new_item, item_data->lpifq, NULL, parent); + IShellFolder_Release(cur); + SHFree(new_item); + + SendMessageW(info->hwndTreeView, TVM_SORTCHILDREN, FALSE, (LPARAM)parent); + return BrsFolder_Rename(info, added); + +cleanup: + return hr; +} + static BOOL BrsFolder_OnCommand( browse_info *info, UINT id ) { LPBROWSEINFOW lpBrowseInfo = info->lpBrowseInfo; @@ -695,7 +795,7 @@ static BOOL BrsFolder_OnCommand( browse_info *info, UINT id ) return TRUE; case IDD_MAKENEWFOLDER: - FIXME("make new folder not implemented\n"); + BrsFolder_NewFolder(info); return TRUE; } return FALSE; diff --git a/dlls/shell32/tests/brsfolder.c b/dlls/shell32/tests/brsfolder.c index c3e9d3c..03dff74 100644 --- a/dlls/shell32/tests/brsfolder.c +++ b/dlls/shell32/tests/brsfolder.c @@ -216,7 +216,7 @@ static void test_click_make_new_folder_button(void) pidl = SHBrowseForFolder(&bi); number_of_folders = get_number_of_folders(test_folder_path); - todo_wine ok(number_of_folders == 1 || broken(number_of_folders == 0) /* W95, W98 */, + ok(number_of_folders == 1 || broken(number_of_folders == 0) /* W95, W98 */, "Clicking \"Make New Folder\" button did not result in a new folder.\n"); /* There should be a new folder foo inside the test folder */

1 0

Piotr Caban : shell32: Update currently selected folder in SHBrowseForFolder dialog.
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: f984d4d7f98861a2dab3d5aa4f820068b84ce2b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f984d4d7f98861a2dab3d5aa4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jul 3 13:55:27 2011 +0200 shell32: Update currently selected folder in SHBrowseForFolder dialog. --- dlls/shell32/brsfolder.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index b97a753..3a7a736 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -556,10 +556,15 @@ static LRESULT BrsFolder_Treeview_Expand( browse_info *info, NMTREEVIEWW *pnmtv static HRESULT BrsFolder_Treeview_Changed( browse_info *info, NMTREEVIEWW *pnmtv ) { LPTV_ITEMDATA lptvid = (LPTV_ITEMDATA) pnmtv->itemNew.lParam; + WCHAR name[MAX_PATH]; lptvid = (LPTV_ITEMDATA) pnmtv->itemNew.lParam; ILFree(info->pidlRet); info->pidlRet = ILClone(lptvid->lpifq); + + if (GetName(lptvid->lpsfParent, lptvid->lpi, SHGDN_NORMAL, name)) + SetWindowTextW( GetDlgItem(info->hWnd, IDD_FOLDERTEXT), name ); + browsefolder_callback( info->lpBrowseInfo, info->hWnd, BFFM_SELCHANGED, (LPARAM)info->pidlRet ); BrsFolder_CheckValidSelection( info, lptvid );

1 0

André Hentschel : user32: Remove dead code (clang).
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: 9cd2d61b6e7bbaacd7f23d59048249de0daeb472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cd2d61b6e7bbaacd7f23d590… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jul 3 13:33:53 2011 +0200 user32: Remove dead code (clang). --- dlls/user32/sysparams.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 5423bcf..6c5955a 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2987,7 +2987,7 @@ DWORD_PTR WINAPI SetSysColorsTemp( const COLORREF *pPens, const HBRUSH *pBrushes LPVOID p = pOldCol; *(DWORD *)p = n; p = (char*)p + sizeof(DWORD); memcpy(p, SysColorPens, n*sizeof(HPEN)); p = (char*)p + n*sizeof(HPEN); - memcpy(p, SysColorBrushes, n*sizeof(HBRUSH)); p = (char*)p + n*sizeof(HBRUSH); + memcpy(p, SysColorBrushes, n*sizeof(HBRUSH)); for (i=0; i < n; i++) {

1 0

André Hentschel : winebuild: Remove dead code (clang).
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: 14ac50c7b785f8b806df4b8e437e6ba94b04d1f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14ac50c7b785f8b806df4b8e4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jul 3 13:33:33 2011 +0200 winebuild: Remove dead code (clang). --- tools/winebuild/parser.c | 2 +- tools/winebuild/res32.c | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 705601e..6a1eb85 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -114,7 +114,7 @@ static int get_next_line(void) static const char * GetToken( int allow_eol ) { - char *p = ParseNext; + char *p; char *token = TokenBuffer; for (;;) diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index e3f46ee..729aa2f 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -188,7 +188,6 @@ static void dump_res_data( const struct resource *res ) size -= 4; } output( "0x%08x\n", get_dword() ); - size -= 4; assert( input_buffer_pos == input_buffer_size ); }

1 0

Nikolay Sivov : user32/tests: Test that class data is set with wrong size value too.
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: 4843cff6ef9fee3b04d98975da22a89dd1531169 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4843cff6ef9fee3b04d98975d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 3 15:06:52 2011 +0400 user32/tests: Test that class data is set with wrong size value too. --- dlls/user32/tests/class.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index ed288aa..57d3632 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -954,22 +954,28 @@ if (0) { /* crashes under XP */ "expected ERROR_NOACCESS, got %d\n", GetLastError()); wcx.cbSize = 0; + wcx.lpfnWndProc = NULL; SetLastError(0xdeadbeef); ret = GetClassInfoExA(0, "static", &wcx); ok(ret, "GetClassInfoExA() error %d\n", GetLastError()); ok(wcx.cbSize == 0, "expected 0, got %u\n", wcx.cbSize); + ok(wcx.lpfnWndProc != NULL, "got null proc\n"); wcx.cbSize = sizeof(wcx) - 1; + wcx.lpfnWndProc = NULL; SetLastError(0xdeadbeef); ret = GetClassInfoExA(0, "static", &wcx); ok(ret, "GetClassInfoExA() error %d\n", GetLastError()); ok(wcx.cbSize == sizeof(wcx) - 1, "expected sizeof(wcx)-1, got %u\n", wcx.cbSize); + ok(wcx.lpfnWndProc != NULL, "got null proc\n"); wcx.cbSize = sizeof(wcx) + 1; + wcx.lpfnWndProc = NULL; SetLastError(0xdeadbeef); ret = GetClassInfoExA(0, "static", &wcx); ok(ret, "GetClassInfoExA() error %d\n", GetLastError()); ok(wcx.cbSize == sizeof(wcx) + 1, "expected sizeof(wcx)+1, got %u\n", wcx.cbSize); + ok(wcx.lpfnWndProc != NULL, "got null proc\n"); } START_TEST(class)

1 0

Nikolay Sivov : comctl32/tests: Test more return values in tests (Clang).
by Alexandre Julliard 04 Jul '11

04 Jul '11

Module: wine Branch: master Commit: 39694168080c52551464eea02f54ed6c83497e1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=39694168080c52551464eea02… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 3 11:50:26 2011 +0400 comctl32/tests: Test more return values in tests (Clang). --- dlls/comctl32/tests/listview.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index e0dfd72..15a0b5d 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -777,6 +777,8 @@ static void test_images(void) ok(r == 0, "should return zero\n"); r = SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELONG(100,50)); + ok(r != 0, "got 0\n"); + /* returns dimensions */ r = SendMessage(hwnd, LVM_GETITEMCOUNT, 0, 0); @@ -3856,7 +3858,7 @@ static void test_notifyformat(void) CCM_SETUNICODEFORMAT == LVM_SETUNICODEFORMAT */ r = SendMessage(hwnd, LVM_GETUNICODEFORMAT, 0, 0); expect(0, r); - r = SendMessage(hwnd, WM_NOTIFYFORMAT, 0, NF_QUERY); + SendMessage(hwnd, WM_NOTIFYFORMAT, 0, NF_QUERY); /* set */ r = SendMessage(hwnd, LVM_SETUNICODEFORMAT, 1, 0); expect(0, r); @@ -4405,6 +4407,8 @@ static void test_approximate_viewrect(void) expect(MAKELONG(77,827), ret); ret = SendMessage(hwnd, LVM_SETICONSPACING, 0, MAKELPARAM(50, 50)); + ok(ret != 0, "got 0\n"); + ret = SendMessage(hwnd, LVM_APPROXIMATEVIEWRECT, 11, MAKELPARAM(100,100)); expect(MAKELONG(102,302), ret);

1 0

← Newer
1
...
75
76
77
78
79
80
81
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2011